Merge origin/main (#984 , the canvas shell) into the cleanup branch

Conflicts resolved in 16 files. Where main's new shell, classic page and tests depend on a wire format or a signature the cleanup had changed, main wins; where main only extended code the cleanup had restructured, main's change is carried over into the new structure: - MCP HTTP server: the poll response keeps main's separate export fields (exportFormat, exportXml, exportOptions, exportId with a random id) instead of the cleanup's pendingExport object; the classic preview page is main's version - MCP index: start_session keeps the cleanup's structure and gains main's BROWSER=none, previewUrl and same-origin note; get_selection is written in the registerTool style; create_new_diagram keeps the cleanup's helpers with main's comment - history: addHistory takes main's source parameter and returns the index again (main's signature) - new-diagram: the cleanup's prepareNewModel split plus main's page ids for diagrams without one - diagram context: one ExportResult type (main's, with optional fields) for both the tagged exports and main's requestExport; the cleanup's single export resolver stays - versions store and version-text test: main's VersionItem base type and describeChangeSummary rename, without the legacy history conversion the cleanup removed - dictionaries: main's shell section added; openFileHint stays removed (unused on main too) - tests: the server wiring test keeps the SDK client and gains main's session cases; the HTTP server test uses main's export fields; the DOM polyfill comes from tests/setup.ts - package.json: main's postcss kept, the cleanup's removals kept; lockfile regenerated
test: shared e2e helpers, vi.stubEnv, drop placeholder specs
2026-10-12 12:39:52 +08:00 · 2026-10-12 11:59:51 +09:00 · 2026-10-12 09:11:25 +09:00 · 2026-10-12 08:30:43 +09:00 · 2026-10-12 08:28:39 +09:00 · 2026-10-12 08:27:28 +09:00
10 changed files with 1707 additions and 1469 deletions
@@ -12,13 +12,13 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          ref: ${{ github.event.pull_request.head.sha }}
          token: ${{ secrets.GITHUB_TOKEN }}

      - name: Setup Node.js
-        uses: actions/setup-node@v7
+        uses: actions/setup-node@v6
        with:
          node-version: '24'

@@ -23,14 +23,14 @@ jobs:
      
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3

      - name: Log in to GitHub Container Registry
        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
        with:
          registry: ${{ env.REGISTRY }}
          username: ${{ github.actor }}
@@ -38,7 +38,7 @@ jobs:

      - name: Extract metadata (tags, labels)
        id: meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
        with:
          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
          tags: |
@@ -51,7 +51,7 @@ jobs:
            type=raw,value=latest,enable={{is_default_branch}}

      - name: Build and push Docker image
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
        with:
          context: .
          push: ${{ github.event_name != 'pull_request' }}
@@ -68,7 +68,7 @@ jobs:
      # Push to AWS ECR for App Runner auto-deploy
      - name: Configure AWS credentials
        if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
-        uses: aws-actions/configure-aws-credentials@v6
+        uses: aws-actions/configure-aws-credentials@v5
        with:
          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -26,10 +26,10 @@ jobs:
    runs-on: ${{ matrix.os }}
    steps:
      - name: Checkout code
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6

      - name: Setup Node.js
-        uses: actions/setup-node@v7
+        uses: actions/setup-node@v6
        with:
          node-version: 24
          cache: "npm"
@@ -50,10 +50,10 @@ jobs:
    runs-on: windows-latest
    steps:
      - name: Checkout code
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6

      - name: Setup Node.js
-        uses: actions/setup-node@v7
+        uses: actions/setup-node@v6
        with:
          node-version: 24
          cache: "npm"
@@ -69,7 +69,7 @@ jobs:
          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

      - name: Upload unsigned artifacts for signing
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
        id: upload-unsigned
        with:
          name: windows-unsigned
@@ -77,7 +77,7 @@ jobs:
          retention-days: 1

      - name: Sign with SignPath
-        uses: signpath/github-action-submit-signing-request@v3
+        uses: signpath/github-action-submit-signing-request@v2
        with:
          api-token: ${{ secrets.SIGNPATH_API_TOKEN }}
          organization-id: '880a211d-2cd3-4e7b-8d04-3d1f8eb39df5'
@@ -92,7 +92,7 @@ jobs:
          output-artifact-directory: release-signed

      - name: Upload signed artifacts to release
-        uses: softprops/action-gh-release@v3
+        uses: softprops/action-gh-release@v2
        with:
          files: release-signed/*.exe
        env:
@@ -39,10 +39,10 @@ jobs:
        working-directory: packages/mcp-server
    steps:
      - name: Checkout
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6

      - name: Setup Node.js
-        uses: actions/setup-node@v7
+        uses: actions/setup-node@v6
        with:
          node-version: 24
          cache: "npm"
@@ -18,10 +18,10 @@ jobs:
    name: Lint & Unit Tests
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6

      - name: Setup Node.js
-        uses: actions/setup-node@v7
+        uses: actions/setup-node@v6
        with:
          node-version: "24"
          cache: "npm"
@@ -46,15 +46,15 @@ jobs:
    name: MCP Server & Shell
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          # HEAD^1 is the base branch for the version bump reminder below
          fetch-depth: 2

      - name: Setup Node.js
-        uses: actions/setup-node@v7
+        uses: actions/setup-node@v6
        with:
-          node-version: "24"
+          node-version: "20"
          cache: "npm"
          cache-dependency-path: |
            package-lock.json
@@ -69,7 +69,7 @@ jobs:
        run: npm --prefix packages/mcp-server ci

      - name: Cache Playwright browsers
-        uses: actions/cache@v6
+        uses: actions/cache@v5
        id: playwright-cache
        with:
          path: ~/.cache/ms-playwright
@@ -129,7 +129,7 @@ jobs:
          fi

      - name: Upload test results
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
        if: always()
        with:
          name: playwright-report-mcp-shell
@@ -146,10 +146,10 @@ jobs:
      matrix:
        shard: [1, 2, 3, 4, 5, 6]
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6

      - name: Setup Node.js
-        uses: actions/setup-node@v7
+        uses: actions/setup-node@v6
        with:
          node-version: "24"
          cache: "npm"
@@ -158,7 +158,7 @@ jobs:
        run: npm ci

      - name: Cache Playwright browsers
-        uses: actions/cache@v6
+        uses: actions/cache@v5
        id: playwright-cache
        with:
          path: ~/.cache/ms-playwright
@@ -181,7 +181,7 @@ jobs:
          CI: true

      - name: Upload test results
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
        if: always()
        with:
          name: playwright-report-${{ matrix.shard }}
@@ -19,7 +19,7 @@ jobs:
    if: github.event_name != 'issue_comment'
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/stale@v11
+      - uses: actions/stale@v9
        with:
          only-issue-labels: "wait for confrim"
          days-before-issue-stale: 15
@@ -44,11 +44,11 @@
        "@aihubmix/ai-sdk-provider": "^2.2.1",
        "@aws-sdk/client-dynamodb": "^3.957.0",
        "@aws-sdk/credential-providers": "^3.943.0",
-        "@extractus/article-extractor": "^9.0.0",
+        "@extractus/article-extractor": "^8.0.18",
        "@formatjs/intl-localematcher": "^0.9.0",
-        "@langfuse/client": "^5.0.0",
-        "@langfuse/otel": "^5.0.0",
-        "@langfuse/tracing": "^5.0.0",
+        "@langfuse/client": "^4.4.9",
+        "@langfuse/otel": "^4.4.4",
+        "@langfuse/tracing": "^4.4.9",
        "@next/third-parties": "^16.0.6",
        "@openrouter/ai-sdk-provider": "^2.10.0",
        "@opentelemetry/api": "^1.9.0",
@@ -70,12 +70,12 @@
        "cmdk": "^1.1.1",
        "idb": "^8.0.3",
        "jsonrepair": "^3.13.1",
-        "lucide-react": "^1.0.0",
-        "nanoid": "^6.0.0",
+        "lucide-react": "^0.577.0",
+        "nanoid": "^5.0.0",
        "negotiator": "^1.0.0",
        "next": "^16.0.7",
        "ollama-ai-provider-v2": "^3.6.0",
-        "pako": "^3.0.0",
+        "pako": "^2.1.0",
        "prism-react-renderer": "^2.4.1",
        "react": "^19.1.2",
        "react-dom": "^19.1.2",
@@ -111,24 +111,24 @@
        "@testing-library/react": "^16.3.1",
        "@types/negotiator": "^0.6.4",
        "@types/node": "^24.0.0",
-        "@types/pako": "^3.0.0",
+        "@types/pako": "^2.0.3",
        "@types/react": "^19",
        "@types/react-dom": "^19",
        "@types/turndown": "^5.0.6",
-        "@vitejs/plugin-react": "^6.0.0",
+        "@vitejs/plugin-react": "^5.1.2",
        "cross-env": "^10.1.0",
-        "dotenv": "^18.0.0",
+        "dotenv": "^16.6.1",
        "electron": "^41.10.6",
        "electron-builder": "^26.0.12",
        "esbuild": "^0.28.0",
        "husky": "^9.1.7",
-        "jsdom": "^30.0.0",
-        "lint-staged": "^17.0.0",
+        "jsdom": "^27.4.0",
+        "lint-staged": "^16.2.7",
        "postcss": "^8.5.6",
        "tailwindcss": "^4",
-        "typescript": "^7.0.0",
+        "typescript": "^5",
        "vite-tsconfig-paths": "^6.0.3",
-        "vitest": "^5.0.0",
+        "vitest": "^4.0.16",
        "wrangler": "^4.60.0"
    },
    "overrides": {
@@ -44,16 +44,16 @@
        "@modelcontextprotocol/sdk": "^1.31.0",
        "linkedom": "^0.18.0",
        "open": "^11.0.0",
-        "pako": "^3.0.0",
+        "pako": "^2.2.0",
        "saxes": "^6.0.0",
        "zod": "^4.0.0"
    },
    "devDependencies": {
        "@types/node": "^24.0.0",
-        "@types/pako": "^3.0.0",
+        "@types/pako": "^2.0.4",
        "tsx": "^4.19.0",
-        "typescript": "^7.0.0",
-        "vitest": "^5.0.0"
+        "typescript": "^5",
+        "vitest": "^4.1.8"
    },
    "engines": {
        "node": ">=18"
Author	SHA1	Message	Date
dayuan.jiang	d87c3c0bab	Merge origin/main (#984 , the canvas shell) into the cleanup branch Conflicts resolved in 16 files. Where main's new shell, classic page and tests depend on a wire format or a signature the cleanup had changed, main wins; where main only extended code the cleanup had restructured, main's change is carried over into the new structure: - MCP HTTP server: the poll response keeps main's separate export fields (exportFormat, exportXml, exportOptions, exportId with a random id) instead of the cleanup's pendingExport object; the classic preview page is main's version - MCP index: start_session keeps the cleanup's structure and gains main's BROWSER=none, previewUrl and same-origin note; get_selection is written in the registerTool style; create_new_diagram keeps the cleanup's helpers with main's comment - history: addHistory takes main's source parameter and returns the index again (main's signature) - new-diagram: the cleanup's prepareNewModel split plus main's page ids for diagrams without one - diagram context: one ExportResult type (main's, with optional fields) for both the tagged exports and main's requestExport; the cleanup's single export resolver stays - versions store and version-text test: main's VersionItem base type and describeChangeSummary rename, without the legacy history conversion the cleanup removed - dictionaries: main's shell section added; openFileHint stays removed (unused on main too) - tests: the server wiring test keeps the SDK client and gains main's session cases; the HTTP server test uses main's export fields; the DOM polyfill comes from tests/setup.ts - package.json: main's postcss kept, the cleanup's removals kept; lockfile regenerated	2026-10-12 11:59:51 +09:00
dayuan.jiang	1333ed68c6	test: shared e2e helpers, vi.stubEnv, drop placeholder specs - tests/e2e/lib: openApp(page, { path, config }), MODEL_CONFIGS_KEY, savedModelConfigs, settingsDialog, chunkedReplies, sse() and toolCallEvents() replace about 70 copies of goto + wait for iframe, three local openApp functions, 14 window.fetch overrides and the Node-side SSE serialisers; unused fixtures removed - delete theme, save, history, model-config, upload and copy-paste specs (the copy-button test moves to chat.spec.ts); trim iframe-interaction, history-restore, keyboard and smoke to tests that can fail; file-upload asserts on the preview image - settings-review-fixes.spec.ts split by topic into settings-bedrock, settings-tabs-sync and settings-providers - unit tests use vi.stubEnv with unstubEnvs: true instead of hand-written process.env save and restore loops	2026-10-12 09:11:25 +09:00
dayuan.jiang	9a6a808187	chore: refresh package-lock.json and tidy leftovers from the merge - package-lock.json regenerated for the removed dependencies, dotenv and the devDependency move of @opennextjs/cloudflare - lib/admin: SettingType and getSettingsPath are file-internal - components/chat/chat-engine.tsx: comment no longer mentions click counts	2026-10-12 08:30:43 +09:00
dayuan.jiang	fb87291cde	refactor(settings): remove wrapper layers, dead props and unused dictionary keys - components/model-selector.tsx uses Dialog, Command and Tooltip directly; delete components/ai-elements/model-selector.tsx and components/button-with-tooltip.tsx; one renderGroups for both lists; no "Server · " prefix round trip - components/ui: drop CommandDialog, CommandShortcut and six unused shadcn exports - model-config-dialog: no type-to-confirm on provider delete; provider-credentials-fields: drop footer and bedrockApiKey - hooks/use-model-config.ts and lib/types/model-config.ts: remove the 2025-12 single-provider migration, resetConfig, selectedModel and fields nothing reads - components/chat/TemplateFormDialog.tsx replaces the create and edit dialogs; TemplatePanel drops the setInput fallback, the templatesChanged listener, dictionary fallbacks and formatLastUsed; lib/template-storage.ts drops getTemplate, clickCount and indexes - reasoning.tsx becomes one component; shimmer uses a CSS keyframe (motion and @radix-ui/react-use-controllable-state removed) - error-toast.tsx deleted in favour of toast.error; ValidationCard drops the idle status; dev-xml-simulator uses English literals - admin: no enum setting type, shared types from lib/admin (AdminProviderInput stays exported for that), ENABLE_HISTORY_XML_REPLACE entry removed - app/globals.css: drop check-pop, --ease-spring, --duration-normal and the shadow aliases - dictionaries: 81 unused keys removed from all four languages	2026-10-12 08:28:39 +09:00
dayuan.jiang	14f29af939	refactor(prompt): share the Styles paragraphs with the MCP drawing guide lib/system-prompts.ts takes the three Styles paragraphs from styleRules() in packages/mcp-server/src/xml-examples.ts; the generated prompt is byte-identical. packages/mcp-server/tests/load-diagram.test.ts drops its own DOM polyfill setup now that vitest installs it once.	2026-10-12 08:27:28 +09:00
dayuan.jiang	fc8ffc5655	refactor(mcp-server): remove dead code and fold repeated tool plumbing - index.ts: registerTool() does the session check, try/catch and the write queue for all 15 tools; fail()/ok(), syncFromBrowser(), commitDocument() and describePages() replace the copied blocks; drop pickPageSelector, currentSession.version, the input ?? {} defaults; add_page reuses prepareNewModel() split out of prepareNewDiagram - xml-validation.ts: drop the hand-written syntax checks that saxes already reports, MAX_XML_SIZE and the stale header - http-server.ts: one pendingExport object, no unread response fields, no CORS/OPTIONS branch for same-origin requests, fewer exports - diagram-operations parseNewCell(), addHistory returns void, normalizeToMxfile without host, foldCells without layer, expandStyles removed, unused preview.css rule removed, no .d.ts output - xml-examples.ts styleRules() shares the Styles paragraphs with the web prompt - tests: setupFiles installs the DOM polyfill once, server-wiring uses the SDK client, mcp-core.test.ts drops the cases MCP tests already cover	2026-10-12 08:25:47 +09:00
dayuan.jiang	165175be20	chore: update comments that mentioned the removed preset system and useObject	2026-10-12 08:18:02 +09:00
dayuan.jiang	06621764b2	refactor(chat): drop redesign leftovers and old-format migrations - stores/versions-store.ts, hooks/use-session-manager.ts, lib/session-storage.ts: remove the diagramHistory conversion layer, the localStorage chat migration and the empty templates store - stores/canvas-store.ts, lib/drawio/editor-bridge.ts: remove the pages list nothing read - components/chat/chat-engine.tsx: use the context's chartXMLRef and latestSvgRef instead of local copies, subscribe to one settings field, stop prefetching quota limits (lib/use-quota-manager.tsx takes the values from the 429 body), readDiagramFile delegates to the MCP loader (which now strips XML prologs and accepts <svg:svg>) - contexts/diagram-context.tsx: one requestTaggedExport path for thumbnails, validation, fetch and save; fetchDiagramXml replaces handleExport plus the exported resolver map - hooks/use-validate-diagram.ts and app/api/validate-diagram: plain fetch returning JSON instead of a streamed object nobody consumed - hooks/use-diagram-tool-handlers.ts: drop the DEBUG blocks; canvas vars inheritance lives in placeOnPage (lib/diagram-pages.ts) - lobby-hero, icon-button, drawio-frame: remove unreachable branches and unused props	2026-10-12 08:17:11 +09:00
dayuan.jiang	3a9168e5b3	refactor(pages): one about page per language, no R2 cache by default - app/[lang]/about/page.tsx renders en, zh and ja (zh-Hant falls back to zh) from one JSX tree with per-language texts and generateMetadata; delete the cn/ and ja/ copies and redirect their old URLs - app/[lang]/layout.tsx: use hasLocale, an OG locale table, and real zh/ja title and description - components/icons/github.tsx replaces react-icons and lucide's deprecated Github icon - quota-limit-toast: read the dictionary keys directly, shadow-float - Cloudflare: defineCloudflareConfig({}) without R2, no r2_buckets, no dev-time OpenNext init, cf-typegen script removed, @opennextjs/cloudflare moves to devDependencies, docs updated	2026-10-12 08:16:49 +09:00
dayuan.jiang	8ca2d03e7f	refactor(server): drop stale prompt text, duplicated routes and dead options - lib/system-prompts.ts: delete the extended prompt kept only to reach the 4096-token cache threshold of two old Claude models; describe the current canvas-first UI in the App Features section - app/api/chat/route.ts: remove the server-side example cache (the browser answers examples itself), the ENABLE_HISTORY_XML_REPLACE option and its helper, the unread messageMetadata fields; the DEBUG_LLM_PAYLOAD blocks become one describeMessages summary - app/api/log-feedback and log-save share scoreLatestTrace in lib/langfuse.ts - app/api/admin/test-model and validate-model call a shared testModelConnection() instead of one route faking a request to the other and passing trust through the body - lib/dynamo-quota-manager.ts reads the failing item from the conditional update instead of a second GetItem - lib/ai-providers.ts: geminiThinkingOptions helper for the google and vertexai cases, drop the unused fourth resolveBaseURL parameter - edge-functions: always stream, shrink messageSchema, drop model aliases nothing sends - delete app/api/chat/xml_guide.md, parseOutputTokenLimit, unused type exports and export keywords on file-internal symbols - env.example: drop variables nothing reads, document the quota, validation and analytics variables, mention the apiKeyEnv array form (also in docs/*/ai-providers.md)	2026-10-12 08:15:15 +09:00
dayuan.jiang	610ba6872d	refactor(electron): remove the configuration-preset system and read .env with dotenv - delete electron/settings, the settings preload and window, the config-presets IPC channels, the Configuration menu and the preset watcher in scripts/electron-dev.mjs; config-manager.ts keeps only the user locale (still read from config-presets.json so the saved language survives) - electron/main/env-loader.ts parses .env with dotenv instead of a hand-written parser; electron:compile bundles dependencies - drop the unreachable development branches in port-manager.ts and next-server.ts, the duplicated locale normalisation in menu-i18n.ts, the unused electronAPI members, resources/entitlements.mac.plist - scripts/copy-dereferenced.cjs shared by afterPack and prepare-electron-build - CI: delete ci.yml, move type check and concurrency into test.yml, Node 24 everywhere, docker-build only on main - remove unused dependencies (@xmldom/xmldom, remark-gfm, @anthropic-ai/tokenizer, @testing-library/user-event, concurrently, wait-on, eslint, eslint-config-next, @vitest/coverage-v8, shx), .eslintrc.json and the vitest coverage block	2026-10-12 08:11:10 +09:00
dayuan.jiang	a3664367ce	refactor(lib): reuse MCP helpers for streaming preview and SVG extraction - lib/utils.ts: remove convertToLegalXml and replaceNodes; the streaming preview now goes through wrapCellsInModel, autoFixXml and replacePageModel like the final commit path does - lib/utils.ts: extractDiagramXML reuses extractSvgEmbeddedXml, pageElement and decompressPageContent instead of hand-written SVG parsing and pako inflation - lib/use-file-processor.tsx: messages parameter is required, drop the English default texts only tests used - hooks/use-dictionary.ts, lib/i18n/utils.ts: drop duplicate default exports nobody imported - tests updated accordingly	2026-10-12 08:05:13 +09:00