diff --git a/.codex/environments/environment.toml b/.codex/environments/environment.toml new file mode 100644 index 000000000..a0a8ad4de --- /dev/null +++ b/.codex/environments/environment.toml @@ -0,0 +1,11 @@ +# THIS IS AUTOGENERATED. DO NOT EDIT MANUALLY +version = 1 +name = "Sherlock Desktop" + +[setup] +script = "" + +[[actions]] +name = "Run" +icon = "run" +command = "./script/build_and_run.sh" diff --git a/.githooks/commit-msg b/.githooks/commit-msg new file mode 100755 index 000000000..4aa857a08 --- /dev/null +++ b/.githooks/commit-msg @@ -0,0 +1,23 @@ +#!/bin/sh + +set -eu + +message_file="$1" +node - "$message_file" <<'NODE' +const fs = require('node:fs') + +const messagePath = process.argv[2] +const message = fs + .readFileSync(messagePath, 'utf8') + .split(/\r?\n/) + .filter((line) => !line.trimStart().startsWith('#')) + .join('\n') + .trim() + +if (!/[\u3400-\u9fff\uf900-\ufaff]/u.test(message)) { + process.stderr.write( + '提交信息必须包含中文说明，例如：修复：确保正式版使用最新内置 Skill。\n' + ) + process.exit(1) +} +NODE diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 40e7650ed..0938ab481 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,48 +35,30 @@ jobs: if: startsWith(github.ref, 'refs/tags/v') run: npm version --no-git-tag-version --allow-same-version "${{ github.ref_name }}" - run: npm ci - - run: npm test + - run: npm test -- test/update.test.ts test/sidebar-update-control.test.ts test/release.test.ts test/macos-self-signed-update.test.ts test/macos-package-runtime.test.ts test/brand-migration.test.ts - run: npm run typecheck - - name: Validate Apple release secrets + - name: Validate Sherlock signing secrets if: startsWith(github.ref, 'refs/tags/v') env: - CSC_LINK: ${{ secrets.DESKTOP_CSC_LINK }} - CSC_KEY_PASSWORD: ${{ secrets.DESKTOP_CSC_KEY_PASSWORD }} - APPLE_API_KEY_CONTENT: ${{ secrets.DESKTOP_APPLE_API_KEY }} - APPLE_API_KEY_ID: ${{ secrets.DESKTOP_APPLE_API_KEY_ID }} - APPLE_API_ISSUER: ${{ secrets.DESKTOP_APPLE_API_ISSUER }} - APPLE_TEAM_ID: ${{ secrets.DESKTOP_APPLE_TEAM_ID }} + CSC_LINK: ${{ secrets.SHERLOCK_MACOS_CSC_LINK }} + CSC_KEY_PASSWORD: ${{ secrets.SHERLOCK_MACOS_CSC_KEY_PASSWORD }} run: | - required=(CSC_LINK CSC_KEY_PASSWORD APPLE_API_KEY_CONTENT APPLE_API_KEY_ID APPLE_API_ISSUER APPLE_TEAM_ID) + required=(CSC_LINK CSC_KEY_PASSWORD) for name in "${required[@]}"; do test -n "${!name}" || { echo "::error::Missing required secret: $name"; exit 1; } done - - name: Prepare Apple notarization key - if: startsWith(github.ref, 'refs/tags/v') - env: - APPLE_API_KEY_CONTENT: ${{ secrets.DESKTOP_APPLE_API_KEY }} - APPLE_API_KEY_ID: ${{ secrets.DESKTOP_APPLE_API_KEY_ID }} - APPLE_API_ISSUER: ${{ secrets.DESKTOP_APPLE_API_ISSUER }} - APPLE_TEAM_ID: ${{ secrets.DESKTOP_APPLE_TEAM_ID }} - run: | - key_path="$RUNNER_TEMP/AuthKey_${APPLE_API_KEY_ID}.p8" - printf '%s' "$APPLE_API_KEY_CONTENT" > "$key_path" - chmod 600 "$key_path" - echo "APPLE_API_KEY=$key_path" >> "$GITHUB_ENV" - echo "APPLE_API_KEY_ID=$APPLE_API_KEY_ID" >> "$GITHUB_ENV" - echo "APPLE_API_ISSUER=$APPLE_API_ISSUER" >> "$GITHUB_ENV" - echo "APPLE_TEAM_ID=$APPLE_TEAM_ID" >> "$GITHUB_ENV" - name: Prepare macOS signing keychain if: startsWith(github.ref, 'refs/tags/v') id: signing_keychain env: - CSC_LINK: ${{ secrets.DESKTOP_CSC_LINK }} - CSC_KEY_PASSWORD: ${{ secrets.DESKTOP_CSC_KEY_PASSWORD }} + CSC_LINK: ${{ secrets.SHERLOCK_MACOS_CSC_LINK }} + CSC_KEY_PASSWORD: ${{ secrets.SHERLOCK_MACOS_CSC_KEY_PASSWORD }} run: node scripts/prepare-macos-signing-keychain.mjs - name: Build signed Apple Silicon package if: startsWith(github.ref, 'refs/tags/v') env: CSC_KEYCHAIN: ${{ steps.signing_keychain.outputs.keychain }} + CSC_NAME: ${{ steps.signing_keychain.outputs.identity }} run: npm run package:mac:arm64 - name: Build unsigned Apple Silicon verification package if: ${{ !startsWith(github.ref, 'refs/tags/v') }} @@ -85,27 +67,23 @@ jobs: run: npm run package:mac:arm64 - name: Preserve Apple Silicon update metadata run: mv dist/latest-mac.yml dist/latest-mac-arm64.yml - - name: Sign, notarize, and staple Apple Silicon DMG + - name: Sign Apple Silicon DMG with the Sherlock update identity if: startsWith(github.ref, 'refs/tags/v') env: CSC_KEYCHAIN: ${{ steps.signing_keychain.outputs.keychain }} + CSC_IDENTITY: ${{ steps.signing_keychain.outputs.identity }} run: | - dmg_path="dist/dsh-desktop-mac-arm64.dmg" - identity="$(security find-identity -v -p codesigning "$CSC_KEYCHAIN" | awk '/Developer ID Application/ { print $2; exit }')" - test -n "$identity" || { echo "::error::Developer ID Application identity not found"; exit 1; } - codesign --keychain "$CSC_KEYCHAIN" --sign "$identity" --timestamp --force "$dmg_path" - xcrun notarytool submit "$dmg_path" \ - --key "$APPLE_API_KEY" \ - --key-id "$APPLE_API_KEY_ID" \ - --issuer "$APPLE_API_ISSUER" \ - --wait \ - --no-s3-acceleration - xcrun stapler staple "$dmg_path" + dmg_path="dist/sherlock-mac-arm64.dmg" + test -n "$CSC_IDENTITY" || { echo "::error::Sherlock update identity not found"; exit 1; } + codesign --keychain "$CSC_KEYCHAIN" --sign "$CSC_IDENTITY" --timestamp=none --force "$dmg_path" + - name: Refresh Apple Silicon update metadata after DMG signing + run: node scripts/refresh-mac-update-metadata.mjs --metadata dist/latest-mac-arm64.yml --dmg dist/sherlock-mac-arm64.dmg - name: Remove temporary signing keychain if: always() && startsWith(github.ref, 'refs/tags/v') env: SIGNING_KEYCHAIN: ${{ steps.signing_keychain.outputs.keychain }} SIGNING_CERTIFICATE: ${{ steps.signing_keychain.outputs.certificate }} + SIGNING_PUBLIC_CERTIFICATE: ${{ steps.signing_keychain.outputs.public_certificate }} SIGNING_KEYCHAIN_LIST: ${{ steps.signing_keychain.outputs.keychain_list }} run: | if [ -n "$SIGNING_KEYCHAIN_LIST" ] && [ -f "$SIGNING_KEYCHAIN_LIST" ]; then @@ -116,26 +94,23 @@ jobs: security list-keychains -d user -s "${keychains[@]}" rm -f "$SIGNING_KEYCHAIN_LIST" fi + test -z "$SIGNING_PUBLIC_CERTIFICATE" || security remove-trusted-cert "$SIGNING_PUBLIC_CERTIFICATE" || true test -z "$SIGNING_KEYCHAIN" || security delete-keychain "$SIGNING_KEYCHAIN" || rm -f "$SIGNING_KEYCHAIN" test -z "$SIGNING_CERTIFICATE" || rm -f "$SIGNING_CERTIFICATE" - test -z "$APPLE_API_KEY" || rm -f "$APPLE_API_KEY" - - name: Verify signed and notarized Apple Silicon app + test -z "$SIGNING_PUBLIC_CERTIFICATE" || rm -f "$SIGNING_PUBLIC_CERTIFICATE" + - name: Verify signed Apple Silicon app and DMG if: startsWith(github.ref, 'refs/tags/v') run: | - app_path="dist/mac-arm64/DSH Desktop.app" + app_path="dist/mac-arm64/Sherlock.app" codesign --verify --deep --strict --verbose=2 "$app_path" - spctl --assess --type execute --verbose=4 "$app_path" - xcrun stapler validate "$app_path" - codesign --verify --verbose=2 dist/dsh-desktop-mac-arm64.dmg - spctl --assess --type open --context context:primary-signature --verbose=4 dist/dsh-desktop-mac-arm64.dmg - xcrun stapler validate dist/dsh-desktop-mac-arm64.dmg + codesign --verify --verbose=2 dist/sherlock-mac-arm64.dmg - uses: actions/upload-artifact@v4 with: name: macos-apple-silicon path: | - dist/dsh-desktop-mac-arm64.dmg - dist/dsh-desktop-mac-arm64.zip - dist/dsh-desktop-mac-arm64.zip.blockmap + dist/sherlock-mac-arm64.dmg + dist/sherlock-mac-arm64.zip + dist/sherlock-mac-arm64.zip.blockmap dist/latest-mac-arm64.yml if-no-files-found: error @@ -153,48 +128,30 @@ jobs: if: startsWith(github.ref, 'refs/tags/v') run: npm version --no-git-tag-version --allow-same-version "${{ github.ref_name }}" - run: npm ci - - run: npm test + - run: npm test -- test/update.test.ts test/sidebar-update-control.test.ts test/release.test.ts test/macos-self-signed-update.test.ts test/macos-package-runtime.test.ts test/brand-migration.test.ts - run: npm run typecheck - - name: Validate Apple release secrets + - name: Validate Sherlock signing secrets if: startsWith(github.ref, 'refs/tags/v') env: - CSC_LINK: ${{ secrets.DESKTOP_CSC_LINK }} - CSC_KEY_PASSWORD: ${{ secrets.DESKTOP_CSC_KEY_PASSWORD }} - APPLE_API_KEY_CONTENT: ${{ secrets.DESKTOP_APPLE_API_KEY }} - APPLE_API_KEY_ID: ${{ secrets.DESKTOP_APPLE_API_KEY_ID }} - APPLE_API_ISSUER: ${{ secrets.DESKTOP_APPLE_API_ISSUER }} - APPLE_TEAM_ID: ${{ secrets.DESKTOP_APPLE_TEAM_ID }} + CSC_LINK: ${{ secrets.SHERLOCK_MACOS_CSC_LINK }} + CSC_KEY_PASSWORD: ${{ secrets.SHERLOCK_MACOS_CSC_KEY_PASSWORD }} run: | - required=(CSC_LINK CSC_KEY_PASSWORD APPLE_API_KEY_CONTENT APPLE_API_KEY_ID APPLE_API_ISSUER APPLE_TEAM_ID) + required=(CSC_LINK CSC_KEY_PASSWORD) for name in "${required[@]}"; do test -n "${!name}" || { echo "::error::Missing required secret: $name"; exit 1; } done - - name: Prepare Apple notarization key - if: startsWith(github.ref, 'refs/tags/v') - env: - APPLE_API_KEY_CONTENT: ${{ secrets.DESKTOP_APPLE_API_KEY }} - APPLE_API_KEY_ID: ${{ secrets.DESKTOP_APPLE_API_KEY_ID }} - APPLE_API_ISSUER: ${{ secrets.DESKTOP_APPLE_API_ISSUER }} - APPLE_TEAM_ID: ${{ secrets.DESKTOP_APPLE_TEAM_ID }} - run: | - key_path="$RUNNER_TEMP/AuthKey_${APPLE_API_KEY_ID}.p8" - printf '%s' "$APPLE_API_KEY_CONTENT" > "$key_path" - chmod 600 "$key_path" - echo "APPLE_API_KEY=$key_path" >> "$GITHUB_ENV" - echo "APPLE_API_KEY_ID=$APPLE_API_KEY_ID" >> "$GITHUB_ENV" - echo "APPLE_API_ISSUER=$APPLE_API_ISSUER" >> "$GITHUB_ENV" - echo "APPLE_TEAM_ID=$APPLE_TEAM_ID" >> "$GITHUB_ENV" - name: Prepare macOS signing keychain if: startsWith(github.ref, 'refs/tags/v') id: signing_keychain env: - CSC_LINK: ${{ secrets.DESKTOP_CSC_LINK }} - CSC_KEY_PASSWORD: ${{ secrets.DESKTOP_CSC_KEY_PASSWORD }} + CSC_LINK: ${{ secrets.SHERLOCK_MACOS_CSC_LINK }} + CSC_KEY_PASSWORD: ${{ secrets.SHERLOCK_MACOS_CSC_KEY_PASSWORD }} run: node scripts/prepare-macos-signing-keychain.mjs - name: Build signed Intel package if: startsWith(github.ref, 'refs/tags/v') env: CSC_KEYCHAIN: ${{ steps.signing_keychain.outputs.keychain }} + CSC_NAME: ${{ steps.signing_keychain.outputs.identity }} run: npm run package:mac:x64 - name: Build unsigned Intel verification package if: ${{ !startsWith(github.ref, 'refs/tags/v') }} @@ -203,27 +160,23 @@ jobs: run: npm run package:mac:x64 - name: Preserve Intel update metadata run: mv dist/latest-mac.yml dist/latest-mac-x64.yml - - name: Sign, notarize, and staple Intel DMG + - name: Sign Intel DMG with the Sherlock update identity if: startsWith(github.ref, 'refs/tags/v') env: CSC_KEYCHAIN: ${{ steps.signing_keychain.outputs.keychain }} + CSC_IDENTITY: ${{ steps.signing_keychain.outputs.identity }} run: | - dmg_path="dist/dsh-desktop-mac-x64.dmg" - identity="$(security find-identity -v -p codesigning "$CSC_KEYCHAIN" | awk '/Developer ID Application/ { print $2; exit }')" - test -n "$identity" || { echo "::error::Developer ID Application identity not found"; exit 1; } - codesign --keychain "$CSC_KEYCHAIN" --sign "$identity" --timestamp --force "$dmg_path" - xcrun notarytool submit "$dmg_path" \ - --key "$APPLE_API_KEY" \ - --key-id "$APPLE_API_KEY_ID" \ - --issuer "$APPLE_API_ISSUER" \ - --wait \ - --no-s3-acceleration - xcrun stapler staple "$dmg_path" + dmg_path="dist/sherlock-mac-x64.dmg" + test -n "$CSC_IDENTITY" || { echo "::error::Sherlock update identity not found"; exit 1; } + codesign --keychain "$CSC_KEYCHAIN" --sign "$CSC_IDENTITY" --timestamp=none --force "$dmg_path" + - name: Refresh Intel update metadata after DMG signing + run: node scripts/refresh-mac-update-metadata.mjs --metadata dist/latest-mac-x64.yml --dmg dist/sherlock-mac-x64.dmg - name: Remove temporary signing keychain if: always() && startsWith(github.ref, 'refs/tags/v') env: SIGNING_KEYCHAIN: ${{ steps.signing_keychain.outputs.keychain }} SIGNING_CERTIFICATE: ${{ steps.signing_keychain.outputs.certificate }} + SIGNING_PUBLIC_CERTIFICATE: ${{ steps.signing_keychain.outputs.public_certificate }} SIGNING_KEYCHAIN_LIST: ${{ steps.signing_keychain.outputs.keychain_list }} run: | if [ -n "$SIGNING_KEYCHAIN_LIST" ] && [ -f "$SIGNING_KEYCHAIN_LIST" ]; then @@ -234,26 +187,23 @@ jobs: security list-keychains -d user -s "${keychains[@]}" rm -f "$SIGNING_KEYCHAIN_LIST" fi + test -z "$SIGNING_PUBLIC_CERTIFICATE" || security remove-trusted-cert "$SIGNING_PUBLIC_CERTIFICATE" || true test -z "$SIGNING_KEYCHAIN" || security delete-keychain "$SIGNING_KEYCHAIN" || rm -f "$SIGNING_KEYCHAIN" test -z "$SIGNING_CERTIFICATE" || rm -f "$SIGNING_CERTIFICATE" - test -z "$APPLE_API_KEY" || rm -f "$APPLE_API_KEY" - - name: Verify signed and notarized Intel app + test -z "$SIGNING_PUBLIC_CERTIFICATE" || rm -f "$SIGNING_PUBLIC_CERTIFICATE" + - name: Verify signed Intel app and DMG if: startsWith(github.ref, 'refs/tags/v') run: | - app_path="dist/mac/DSH Desktop.app" + app_path="dist/mac/Sherlock.app" codesign --verify --deep --strict --verbose=2 "$app_path" - spctl --assess --type execute --verbose=4 "$app_path" - xcrun stapler validate "$app_path" - codesign --verify --verbose=2 dist/dsh-desktop-mac-x64.dmg - spctl --assess --type open --context context:primary-signature --verbose=4 dist/dsh-desktop-mac-x64.dmg - xcrun stapler validate dist/dsh-desktop-mac-x64.dmg + codesign --verify --verbose=2 dist/sherlock-mac-x64.dmg - uses: actions/upload-artifact@v4 with: name: macos-intel path: | - dist/dsh-desktop-mac-x64.dmg - dist/dsh-desktop-mac-x64.zip - dist/dsh-desktop-mac-x64.zip.blockmap + dist/sherlock-mac-x64.dmg + dist/sherlock-mac-x64.zip + dist/sherlock-mac-x64.zip.blockmap dist/latest-mac-x64.yml if-no-files-found: error @@ -271,7 +221,7 @@ jobs: if: startsWith(github.ref, 'refs/tags/v') run: npm version --no-git-tag-version --allow-same-version "${{ github.ref_name }}" - run: npm ci - - run: npm test + - run: npm test -- test/update.test.ts test/sidebar-update-control.test.ts test/release.test.ts test/brand-migration.test.ts test/runtime.test.ts - run: npm run typecheck - name: Build Windows release package if: startsWith(github.ref, 'refs/tags/v') @@ -285,7 +235,7 @@ jobs: run: | $userData = Join-Path $env:APPDATA 'dsh-desktop-dev' $logPath = Join-Path $userData 'logs\harness.log' - $executable = 'dist-dev\win-unpacked\DSH Desktop Dev.exe' + $executable = 'dist-dev\win-unpacked\Sherlock Dev.exe' if (Test-Path $userData) { Remove-Item -Recurse -Force $userData } $desktop = Start-Process -FilePath $executable -PassThru try { @@ -294,7 +244,7 @@ jobs: $endpoint = $null while ((Get-Date) -lt $deadline) { if ($desktop.HasExited) { - throw "DSH Desktop Dev exited before Harness was ready (exit code $($desktop.ExitCode))." + throw "Sherlock Dev exited before Harness was ready (exit code $($desktop.ExitCode))." } if (Test-Path $logPath) { $log = Get-Content -Raw $logPath @@ -352,7 +302,7 @@ jobs: throw 'Harness process exited after workspace and session creation.' } if ($desktop.HasExited) { - throw "DSH Desktop Dev exited after workspace and session creation (exit code $($desktop.ExitCode))." + throw "Sherlock Dev exited after workspace and session creation (exit code $($desktop.ExitCode))." } Write-Host 'Packaged Windows Harness smoke test passed.' } finally { @@ -373,16 +323,16 @@ jobs: --repo $env:GITHUB_REPOSITORY ` --target $env:GITHUB_SHA ` --prerelease ` - --title 'DSH Desktop Windows Workspace Test' ` + --title 'Sherlock Windows Workspace Test' ` --notes "Windows x64 development build for validating workspace selection and session startup on affected machines. This build pins Koffi 3.1.5 for the stable native Windows binaries, uses an isolated app identity and user data directory, and has passed a packaged Harness smoke test that creates a Unicode-path workspace and session." ` - 'dist-dev/dsh-desktop-dev-windows-x64-setup.exe#DSH Desktop Dev Windows x64 Setup' + 'dist-dev/sherlock-dev-windows-x64-setup.exe#Sherlock Dev Windows x64 Setup' - uses: actions/upload-artifact@v4 if: startsWith(github.ref, 'refs/tags/v') with: name: windows-x64 path: | - dist/dsh-desktop-windows-x64-setup.exe - dist/dsh-desktop-windows-x64-setup.exe.blockmap + dist/sherlock-windows-x64-setup.exe + dist/sherlock-windows-x64-setup.exe.blockmap dist/latest.yml if-no-files-found: error - uses: actions/upload-artifact@v4 @@ -390,8 +340,8 @@ jobs: with: name: windows-x64-dev path: | - dist-dev/dsh-desktop-dev-windows-x64-setup.exe - dist-dev/dsh-desktop-dev-windows-x64-setup.exe.blockmap + dist-dev/sherlock-dev-windows-x64-setup.exe + dist-dev/sherlock-dev-windows-x64-setup.exe.blockmap dist-dev/latest.yml if-no-files-found: error @@ -439,7 +389,7 @@ jobs: gh release create "$RELEASE_TAG" release-assets/* \ --verify-tag \ --generate-notes \ - --title "DSH Desktop $RELEASE_TAG" \ + --title "Sherlock $RELEASE_TAG" \ --repo "$GITHUB_REPOSITORY" fi - name: Mirror release assets to ModelScope @@ -470,3 +420,33 @@ jobs: ) print(f"✅ Uploaded {src} -> {repo_id}/releases/latest") PY + - name: Validate Cloudflare release secrets + env: + CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} + CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} + run: | + required=(CLOUDFLARE_API_TOKEN CLOUDFLARE_ACCOUNT_ID) + for name in "${required[@]}"; do + test -n "${!name}" || { echo "::error::Missing required secret: $name"; exit 1; } + done + - name: Publish immutable release and promote Cloudflare metadata + env: + CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} + CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} + run: | + npm run release:cloudflare -- \ + --bucket sherlock-releases \ + --version "${GITHUB_REF_NAME#v}" \ + --tag "$GITHUB_REF_NAME" \ + --assets release-assets \ + --prepared release-cloudflare + - name: Verify public Cloudflare update feed + run: | + set -euo pipefail + version="${GITHUB_REF_NAME#v}" + metadata_url="https://updates.evanarts.com/latest/latest-mac.yml" + asset_url="https://updates.evanarts.com/releases/$GITHUB_REF_NAME/sherlock-mac-arm64.zip" + curl -fsS "$metadata_url" | grep -F "version: $version" + curl -fsSI "$metadata_url" | grep -Eiq '^cache-control:.*no-cache' + curl -fsS --range 0-0 -o /dev/null "$asset_url" + curl -fsSI "$asset_url" | grep -Eiq '^cache-control:.*immutable' diff --git a/.gitignore b/.gitignore index 9180d8c20..6e87a7a00 100644 --- a/.gitignore +++ b/.gitignore @@ -2,15 +2,23 @@ node_modules/ out/ dist/ dist-dev/ +dist-legacy/ +dist-notarized/ +dist-release/ +release-assets/ +release-cloudflare/ +.playwright-cli/ +artifacts/ .DS_Store *.log coverage/ build/icon.iconset/ build/app-icon.iconset/ build/icon-1024.png +build/sherlock-plugin-profile/ .env .env.* !.env.example .coaligne/ .coaligneignore - +.worktrees/ diff --git a/.superpowers/sdd/2026-08-27-research-canvas-visual-components/progress.md b/.superpowers/sdd/2026-08-27-research-canvas-visual-components/progress.md new file mode 100644 index 000000000..18e21f81b --- /dev/null +++ b/.superpowers/sdd/2026-08-27-research-canvas-visual-components/progress.md @@ -0,0 +1,242 @@ +# SDD ledger — plan: docs/superpowers/plans/2026-08-27-research-canvas-visual-components.md + +## Baseline + +- Workspace: linked worktree `/Users/heyafeng/Documents/ChatGPT/dsh/.worktrees/research-canvas-file-drop` +- Branch: `codex/research-canvas-file-drop` +- Baseline: 3 focused files, 151 tests passed, 0 failed. +- Spec: `docs/superpowers/specs/2026-08-27-research-canvas-visual-components-design.md` + +## Pre-flight interface scan + +| Tasks | Producer / consumer interface | Finding | +|---|---|---| +| 1 -> 4/5/6 | Shared InputBar CSS and conversation dependency patch | Clean: later tasks must regenerate rather than replace the patch. | +| 2 -> 3/6 | Trusted main-frame predicate, preload main-frame gate, frame navigation policy | Clean: preview and HTML depend on these guards. | +| 3 -> 5/6 | Preview admission descriptor, capability URL, revoke lifecycle | Clean: renderer nodes consume descriptors but never raw arbitrary paths. | +| 3 -> 7 | Main-owned authorization persistence and packaged protocol registration | Clean: final restart/package QA must exercise this boundary. | +| 4 -> 5/6 | Normalized node size, shared frame, resize actions, viewport geometry | Clean: rich content extends the frame rather than adding independent geometry. | +| 5 -> 6 | Visibility lifecycle and preview-body event ownership | Clean: PDF/HTML reuse image/message lifecycle hooks. | +| 6 -> 7 | PDF.js worker/dependency packaging and HTML sandbox | Clean: final package QA is the consumer. | + +## Per-task consistency scan + +| Task | Tests vs implementation | Files vs outputs | Finding | +|---|---|---|---| +| 1 | Exact 8 px behavior plus horizontal non-regression | Conversation runtime, test, durable patch | Clean. | +| 2 | Child-frame denial and privileged IPC behavior | Preload/main security files and focused tests | Clean. | +| 3 | Real service boundaries, ranges, traversal and revocation | New main service plus main/preload wiring | Clean. | +| 4 | Pure geometry plus rendered pointer behavior | Workspace runtime, declarations, durable patch | Clean. | +| 5 | Full text/auto height plus image ratio/lifecycle | Shared frame consumers and durable patch | Clean. | +| 6 | PDF wheel/render lifecycle and HTML sandbox | Dependency, runtime, protocol and durable patch | Clean. | +| 7 | Spec checklist plus packaged UI interaction | QA record and only focused fixes if necessary | Clean. | + +## Rulings + +- Ruling: The main-owned preview registry persists an opaque authorization id, + source kind, real authorized path/root, session identity, and node identity; + renderer canvas JSON may reference only the opaque authorization id — this + preserves restart recovery without trusting a renderer-written path. Cost if + wrong: preview recovery could require reauthorization or expose local files. +- Ruling: HTML scripts remain disabled until Task 2's child-frame bridge and IPC + tests are green; only then may Task 6 add `allow-scripts` under opaque origin + and network-blocking CSP. Cost if wrong: dynamic local HTML is static rather + than interactive, but application privileges remain protected. +- Ruling: Every dependency-bundle task regenerates the full conversation patch + from the current installed tree and validates reverse application. Cost if + wrong: a later regeneration could silently drop an earlier task's ignored + node_modules edit. +- Ruling: Task 3 keeps the existing `getPathForFile(File)` bridge only as a + temporary compatibility path for the current Finder drop/message attachment + runtime; the new preview capability never consumes or returns that raw path, + and Task 5 must migrate the rich-node consumer before removing or narrowing + the legacy method. Cost if wrong: removing it now would regress existing drops, + while leaving it after migration would retain an unnecessary path surface. +- Ruling: Task 4 uses one geometry policy for later rich consumers: unsupported + generic files stay compact at 220 x 64 with no resize handles; assistant, + image, PDF, and HTML nodes use the spec defaults (360-wide auto assistant, + 320-wide image, page-ratio PDF, and 480 x 360 HTML), a 32 px title bar, + type-specific minimums, and a shared 2400 x 2400 world-unit ceiling. Image + and PDF content ratio excludes the title bar. Cost if wrong: later preview + tasks may need a narrowly tested constant adjustment, but they will not gain + a second geometry model. +- Ruling: Preview lifecycle distinguishes permanent revocation from transient + release. Deleting a canvas node revokes its durable authorization; scrolling + it offscreen, switching sessions, or unmounting releases only the exact + ephemeral capability token so restart/session restoration remains possible. + Cost if wrong: treating unmount as durable revocation would make persisted + image/PDF/HTML nodes permanently unavailable after ordinary navigation. +- Ruling: A right-sidebar file may receive a rich preview only from a drag + payload containing the active session id plus a cwd-relative path generated + by the Better Sidebar FileTree; its existing absolute path remains only for + the legacy message-attachment flow and is never used as preview authority. + Tool-result chips without that identity remain generic. Cost if wrong: using + the renderer absolute path would reopen arbitrary-path and symlink escape. +- Ruling: Task 6 keeps the HTML iframe opaque (`sandbox="allow-scripts"` + without `allow-same-origin`) and continues rejecting `Origin: null`. Relative + webfont requests therefore cannot be authorized safely in v1; HTML falls back + to system fonts, while self-contained `data:` fonts remain CSP-eligible. + Capability-scoped CSS, images, and classic external scripts are supported; + media extensions are not admitted in v1. Cost if wrong: loosening CORS or + sandboxing would trade a cosmetic/content limitation for a broken local-file + authority boundary. +- Ruling: PDF.js is an exact development dependency whose browser library, + worker, CMaps, standard fonts, and license are copied into the app-served + `sherlock-pdfjs` directory with stable `.js` names. Raw `pdfjs-dist` and its + canvas-only optional native dependency are excluded from Electron packaging. + Cost if wrong: `.mjs` is served with an unusable MIME/fallback by the current + static host, while packaging the source dependency adds tens of megabytes not + used by the renderer. +- Task 1: fix round 1 ruling: the review correctly found that the pre-task + durable patch was stale relative to already approved installed-tree Research + work. Split that catch-up into an explicit prerequisite commit, then keep the + Task 1 range limited to vertical composer behavior. Rewriting the unpushed + implementer's latest commit with `git reset --soft` is permitted because it + preserves every working-tree byte; `--hard` is forbidden. Cost if wrong: the + patch split could omit an earlier Research feature or leave Task 1 mixed with + unrelated horizontal rules. + +## Task progress + +- Task 1: fix round 1/5 (2 addressed, 1 open — dependency InputBar DOM still + reconstructed by the test-owned slot mock; commits a3f49dc7..fafbb274). +- Task 1: fix round 2/5 (1 addressed, 0 open — real installed InputBar mounted; + commit f4750cf2). +- Task 1: reopened after Task 2 type gate (7 TypeScript errors in the new real + InputBar regression; runtime tests remain green). +- Task 1: fix round 3/5 (7 type errors addressed, 0 open; commit 636b0257). +- Task 1: complete (commits a3f49dc7..636b0257, review clean). +- Task 2: review found 1 critical and 2 important issues — child-initiated + top-frame navigation is not distinguished from main-frame initiation, and + several privileged IPC checks are source inspections rather than invoked + behavior tests. Fix round 1 required. +- Task 2: fix round 1/5 (2 addressed, 2 open — null initiator must fail closed; + production handler wiring still lacks behavior invocation; one directly + affected composer test keeps a stale source assertion; commit 02f21dca). +- Task 2: fix round 2/5 (3 addressed, 0 open — null initiators fail closed, + production privileged handlers are behavior-tested, and the stale source + assertion was removed; commit 21976958). +- Task 2: complete (commits 95441af7..21976958, review clean). +- Task 3: review found 2 important issues — revoke mutations are not + transactional when durable storage fails, and the custom protocol lacks the + exact-origin CORS response contract required by PDF.js. Fix round 1 required. +- Task 3: fix round 1/5 (1 addressed, 1 open — untrusted or missing main + windows still allow no-Origin protocol reads; commit a31b7320). +- Task 3: fix round 2/5 (1 addressed, 0 open — no trusted Harness window now + denies no-Origin reads before filesystem access; commit 8c58a84d). +- Task 3: complete (commits 6806e63d..8c58a84d, review clean). +- Task 4: review found 2 important issues — aspect-locked geometry ignores the + declared minimum height for extreme ratios, and re-adding a deduplicated + assistant artifact discards its manually persisted size. Fix round 1 required. +- Task 4: fix round 1/5 (2 addressed, 0 open — aspect-locked nodes now honor + both declared minimum dimensions, and deduplicated artifacts retain manual + geometry; commit 5be76dbe). +- Task 4: complete (commits 1a3e2d01..5be76dbe, review clean; one non-blocking + CSS constant-duplication minor remains intentionally unchanged). +- Task 5: implementation complete, review pending — full assistant Markdown, + auto/manual height, capability image lifecycle, Finder/sidebar secure + admission, exact ephemeral release, and durable deletion revoke are focused + green (4 files, 174 tests); typecheck and patch durability gates pass. +- Task 5: dual review found 6 confirmed important issues — registry/drop concurrency and + capacity can orphan durable authorizations, same-path legacy drops can + downgrade rich nodes, failed deletion revocation lacks recovery, image errors + retain a live token, and research-file clipboard tags are not session-bound. + The reported global Markdown CSS change was disproved by commit history and + an existing 0.6.0 regression test. Fix round 1 required. +- Task 5: fix round 1/5 (6 addressed, 0 open — concurrent admission/drop + serialization, capacity orphan revocation, authorized same-path preservation, + failure-safe durable deletion retry, idempotent image-error release, and + active-session clipboard authority are behavior-tested; commit + `修复研究预览授权与拖入生命周期`). +- Task 5: fix-round re-review found 3 important issues — revocation can race an + in-flight admission and be undone, a lost successful revoke response is not + idempotently recoverable, and orphan cleanup failures have no durable retry + state. Fix round 2 required. +- Task 5: fix round 2/5 (3 addressed, 0 open — node/session revocation + generations prevent in-flight admission resurrection, already-absent durable + revocation is idempotent, and a bounded persistent orphan outbox retries on + canvas remount without resurrecting visible nodes; commit + `修复研究预览撤销竞态与重试`). +- Task 5: fix-round 2 re-review found 3 important issues — the orphan outbox + prefix is rejected by production durable storage, its parser is quadratic and + does not stop at capacity, and revocation generation maps grow for absent + identities. Fix round 3 required. +- Task 5: fix round 3/5 (3 addressed, 0 open — production IPC storage restores + the outbox after restart and propagates rejected writes, parsing is linear and + stops at 256, and only in-flight admissions retain bounded revocation markers; + commit `修复研究预览持久存储与资源上限`). +- Task 5: fix-round 3 re-review found 1 important issue — admission happens + before the durable orphan outbox reservation, so IPC loss or unmount can + create more authorizations than the bounded retry journal can retain. Fix + round 4 required. +- Task 5: fix round 4/5 (1 addressed, 0 open — Finder/sidebar admission now + requires a durable pre-admission journal; persisted rich nodes clear it while + lost, rejected, unmounted, or displaced admissions retry idempotent revoke; + same-path batches and StrictMode replay are behavior-tested; commit + `修复研究预览跨挂载授权日志`). +- Task 5: fix-round 4 re-review found 1 important issue — drop settlement did + not distinguish a rejected `files.v1` write from a durable rich-node commit, + while restart cleanup could revoke a legitimate rich node whose outbox clear + had failed. Fix round 5 required. +- Task 5: fix round 5/5 (1 addressed, 0 open — workspace file persistence now + returns the actual `files.v1` durability result; failed file commits revoke + before clearing their journal, while restart recognizes a durable rich node + and only retries journal completion; commit + `修复研究预览持久提交判定`). +- Task 5: complete (commits 251fbbca..97509297, dual final review clean; full + assistant Markdown, proportional image preview, pre-admission journaling, + exact capability lifecycle, and durable retry semantics are focused green). +- Task 6: implementation complete, review pending — single-page PDF.js render, + bounded wheel/page state, cancellation and resource cleanup, pinned/staged + PDF.js assets, capability-only opaque HTML iframe, exact-token CSP, relative + root fencing, and shared interaction shield are focused green (4 files, 204 + tests); directly affected main/preload/security tests (4 files, 41 tests), + typecheck, staging idempotence, dependency/package contract, diff check, and + full conversation patch reverse check pass. +- Task 6: final security/UI review found 2 important and 2 minor issues — PDF + image decoding lacked a finite limit, abandoned staging directories were not + reclaimed, the canvas used border-box width instead of preview-body width, + and document/loading teardown double-destroyed one PDF.js owner. Fix round 1 + required. +- Task 6: fix round 1/5 (4 addressed, 0 open — `maxImageSize` is capped at + 8,000,000 pixels; owned stale/current staging is safely reclaimed; a body + `ResizeObserver` keeps auto/selected/manual canvases within client dimensions; + and one loading-task owner contains async teardown rejection; 4 focused files, + 206 tests, typecheck, diff check, and full patch reverse check pass; commit + `修复PDF预览资源与布局边界`). +- Task 6: fix-round 1 re-review found 1 important issue — width-only PDF + fitting can vertically overflow a landscape preview body, and the outer-width + fallback starts `getPage` before body bounds are measured. Fix round 2 + required. +- Task 6: fix round 2/5 (1 addressed, 0 open — renderer measures both body + dimensions, starts no page work before both are positive, and fits each page + with `min(clientWidth, clientHeight * pageRatio)`; mounted portrait/landscape + auto/selected/manual regressions prove every render viewport uses measured + bounds with no horizontal or vertical overflow; 4 focused files, 207 tests, + security tests, typecheck, diff check, and full patch reverse check pass; + commit `修复PDF预览二维内容适配`). +- Task 6: fix-round 2 re-review found 1 important issue — a positive body size + survives offscreen unmount, so selection/geometry changes made while + offscreen can start one stale `getPage` on re-entry before the new body is + measured. Fix round 3 required. +- Task 6: fix round 3/5 (1 addressed, 0 open — leaving visible/ready now + synchronously invalidates both measured dimensions in layout; mounted + visible→offscreen→mutation→visible coverage proves page/render counts do not + grow before remeasurement and exactly one 436 px body-fit render follows; + 4 focused files, 207 tests, 41 security tests, typecheck, diff check, and full + patch reverse check pass; commit `修复PDF预览重入测量状态`). +- Task 6: complete (commits 2c64c9a5..250d9f23, dual final review clean; + PDF decode/backing limits, portrait/landscape two-dimensional fitting, + offscreen re-entry, single-owner teardown, staged assets, and opaque HTML + capability boundaries are focused green). +- Task 7: complete — the exact 0.7.3 packaged app was rebuilt, signed, launched, + and verified in the real Sherlock window; the packaged server's live + production frontend recorded exact Chat/Research composer geometry, a full + Markdown assistant canvas component, and zero console warnings/errors. + Computer Use limitations around Chromium custom `DataTransfer` and pointer + capture are explicitly separated from the mounted behavior-test evidence in + `design-qa.md`; no cursor-only interaction was mislabeled as a pass. +- Whole-plan gate: 239/239 focused feature tests, 20/20 directly affected + sidebar/loading regressions, 9/9 main/preload trust regressions, typecheck, + diff check, 24/24 clean dependency patch replay, PDF.js staging parity, + package verification, and Developer ID signature verification passed. diff --git a/.superpowers/sdd/2026-08-27-research-canvas-visual-components/task-3-report.md b/.superpowers/sdd/2026-08-27-research-canvas-visual-components/task-3-report.md new file mode 100644 index 000000000..c1ec753a5 --- /dev/null +++ b/.superpowers/sdd/2026-08-27-research-canvas-visual-components/task-3-report.md @@ -0,0 +1,130 @@ +# Task 3 实施报告：研究文件安全预览协议 + +## Status + +- 已完成 Task 3 的主进程持久授权表、短期 capability、只读预览协议、Finder/sidebar 窄 admission bridge 和显式撤销接口。 +- 当前版本保持 `0.7.3`；未发布、未改公开更新源，也未运行全量测试。 +- 本任务的本地提交信息为：`支持研究文件安全预览协议`。 + +## 现有契约与接口选择 + +- Better Sidebar 的 renderer 拖拽 `{ path, name }` 可伪造，既有 `/sidebar/file` 仅做 lexical containment，因此没有复用它作为预览授权凭据。 +- sidebar admission 固定为 `{ sessionId, nodeId, relativePath }`。主进程从 `${userData}/harness/storages/workspace.json` 反查 session 对应的权威 workspace root，再对 root 和目标执行 `realpath` 与分隔符安全的 containment 检查；renderer 不能提交 root 或绝对路径。 +- Finder admission 在 preload 内对真实 `File` 调用 `webUtils.getPathForFile`。空路径或合成 File 不触发 IPC；renderer 得到的仅是 `{ authorizationId, url, contentType, name }` descriptor。 +- renderer 可持久化的画布 JSON 只需要保留 opaque `authorizationId`。重启恢复必须同时匹配主进程持久记录中的 `(sessionId, nodeId)`，不会采用 renderer 写入的 path。 +- 既有 `dshDesktop.getPathForFile(File)` 暂时只为当前附件发送/Finder drop 兼容保留；新的 preview capability 不读取其返回值，也没有 `read(path)` 或 `admitFinderPath`。Task 5 在 rich-node consumer 完成迁移并建立回归后再删除或收窄该 legacy 方法。 + +## Implementation + +- 新增 `src/main/state/research-file-preview.ts`： + - `${userData}/research-file-preview/authorizations.v1.json` 下的有界 JSON 授权存储，原子 temp/rename 写入，文件权限 `0600`；持久数据不含 capability token。 + - Finder 与 sidebar admission、重启 reissue、authorization/node/session revoke，以及短期 token 过期处理。 + - `sherlock-preview:///...` 的 GET/HEAD handler；支持 200、单 Range 206、无效/多 Range 416，并返回准确 `Content-Length`、`Content-Range`、MIME。 + - 图片、SVG、PDF、HTML 及 HTML 相对 CSS/图片/脚本的扩展名与 magic 检查；每次请求重新 `realpath`，阻止 `..`、encoded slash/backslash/NUL 和 symlink escape。 + - `Cache-Control: no-store`、`X-Content-Type-Options: nosniff`、`Referrer-Policy: no-referrer` 与阻断网络、子 frame、对象、表单、base URL 的 CSP。Task 2 安全门虽然已经通过，但脚本执行仍由后续 Task 6 在 sandbox iframe 接线时显式开放；当前静态 HTML 为 fail-closed。 +- `src/main/index.ts` 在 app ready 前注册 privileged scheme，在 ready 后、`createWindow()` 前安装 `protocol.handle`，且未把 `sherlock-preview:` 加入 `isTrustedAppUrl`。 +- 新增 preload helper，所有新 preview API 只在已有 `process.isMainFrame` 分支内暴露；主进程 IPC 复用 Task 2 的 trusted main-frame 校验。 + +## TDD Evidence + +### RED + +先创建 `test/research-file-preview.test.ts` 并扩展 `test/research-file-drop.test.ts`，随后运行： + +```text +npm test -- --run test/research-file-preview.test.ts test/research-file-drop.test.ts +``` + +预期失败原因：生产模块 `../src/main/state/research-file-preview` 尚不存在，同时 preload 尚无 `researchPreview` descriptor bridge；既有 Research drop 测试仍为绿色。这确认失败来自缺失的新行为，而非既有回归。 + +自审阶段又先增加 HTML 顶层预览可被 sandbox iframe 装载的 CSP 行为断言；它因 CSP 含 `frame-ancestors 'none'` 得到 RED，随后删除该会阻断预览组件自身嵌入的 directive，并保留 `frame-src 'none'` 来阻止预览内容继续嵌套页面。 + +### GREEN + +```text +npm test -- --run test/research-file-preview.test.ts test/research-file-drop.test.ts +Test Files 2 passed (2) +Tests 63 passed (63) +``` + +覆盖 Finder/sidebar admission、主进程 workspace identity、持久恢复、token 过期/撤销、GET/HEAD、开区间/后缀 Range、416、多 Range 拒绝、MIME/magic、HTML 子资源、encoded traversal、symlink escape、真实生产 IPC handler 的 trusted-main-frame 行为，以及 synthetic File 零 IPC。 + +直接受影响的 Task 2 安全边界回归： + +```text +npm test -- --run test/preload-main-frame.test.ts test/security.test.ts test/ipc-trust.test.ts +Test Files 3 passed (3) +Tests 11 passed (11) +``` + +## Typecheck and hygiene + +```text +npm run typecheck +> tsc --noEmit -p tsconfig.node.json +exit 0 + +git diff --check +exit 0 +``` + +## Risks / follow-up boundary + +- Task 3 只生产安全 preview descriptor 与协议。Task 5/6 才会让 rich canvas node 消费 descriptor、在节点删除/session 切换时调用 revoke，并完成图片/PDF/HTML 的真实组件接线。 +- 当前 HTML 脚本由 CSP 禁用；Task 6 必须同时用 sandbox iframe（无 `allow-same-origin`、表单、popup、下载、top navigation）及既有 Task 2 frame/IPC 测试来证明可安全开放本 capability 下的脚本。 +- 最终 packaged app 与真实画布交互验证属于 Task 7；本任务按计划只执行聚焦测试、类型检查与 diff 检查。 + +## Review fix round 1/5 + +### 撤销事务性 + +评审指出 `revokeAuthorization`、`revokeNode`、`revokeSession` 原先会先删除内存授权和 capability，再忽略 `storage.save(false)` 并返回成功。这会让旧磁盘授权在重启后复活，同时误导调用方撤销已经持久化。 + +先增加三组表驱动行为测试，在可控存储拒绝写入时得到 RED：三种入口都返回了 `true`，而测试要求 `false`。实现改为先构造保留授权候选集合，只有 `storage.save` 成功后才提交内存删除与 token 撤销。失败时内存、旧 token 和磁盘记录全部保持一致；写入恢复后再次撤销成功，重启也无法 restore。 + +### 动态主窗口 Origin 与 Chromium CORS + +评审确认 `corsEnabled/supportFetchAPI` 本身不足以让 Task 6 的 PDF.js 从动态 Harness origin 跨源 fetch。先增加真实 registry + production protocol wrapper 行为测试，得到 RED：`handleResearchFilePreviewProtocolRequest` 尚不存在。 + +实现后的 protocol wrapper 每次请求都从当前 `mainWindow.webContents.getURL()` 解析 origin，并复用可信应用 URL 策略，仅接受实际 `http://127.0.0.1:` 或 `http://localhost:` origin。renderer 无法传入 allowed origin。带 Origin 的合法请求精确回显： + +- `Access-Control-Allow-Origin: <当前精确 origin>`； +- `Vary: Origin`； +- `Access-Control-Expose-Headers: Accept-Ranges, Content-Length, Content-Range, Content-Type`。 + +错误端口、外部 origin 或当前窗口不是可信 Harness HTTP URL 时，在任何 `realpath/stat/read/stream` 前返回 403，且不返回 ACAO。无 Origin 的 image/iframe navigation 保持原 capability 语义。另窄支持 OPTIONS，只接受 GET/HEAD 与 `Range` 请求头，并返回相同精确 origin、`Access-Control-Allow-Headers: Range` 和允许方法。 + +本轮 GREEN： + +```text +npm test -- --run test/research-file-preview.test.ts test/research-file-drop.test.ts +Test Files 2 passed (2) +Tests 68 passed (68) + +npm test -- --run test/preload-main-frame.test.ts test/security.test.ts test/ipc-trust.test.ts +Test Files 3 passed (3) +Tests 11 passed (11) + +npm run typecheck +> tsc --noEmit -p tsconfig.node.json +exit 0 +``` + +当前仓库没有小型 Electron/Chromium CORS 集成 harness，因此本轮用真实 service、真实文件访问和生产 origin wrapper 验证边界；Task 7 仍需在本地构建的真实 Sherlock 中用 PDF.js 验证动态端口的 Range fetch。 + +## Review fix round 2/5 + +评审继续验证发现：round 1 的 `researchPreviewOriginForWindow()` 会对缺失、已销毁或非可信 URL 的窗口返回 `null`，但 production wrapper 仍把 `null` 交给 registry；无 Origin 导航因此绕过 CORS 分支并读取文件。 + +先新增六组零读取回归，覆盖： + +- main window 缺失； +- main window 已销毁； +- 外部 HTTP URL； +- `file:` URL； +- `dsh-recovery:` URL； +- loopback HTTPS 等其他非 Harness HTTP URL。 + +GET 与 HEAD 均有覆盖。RED 时六组都实际返回 200；修复后 production wrapper 在无法取得可信 Harness HTTP origin 时直接返回 403，完全不会进入 registry，因此 capability/path 与注入 filesystem 的 `realpath/stat/readSlice/stream` 调用数均为 0。可信窗口下无 Origin 的 image/iframe navigation 仍由已有测试保持为 200。 + +本轮提交信息：`拒绝无可信窗口的研究预览`。 diff --git a/.superpowers/sdd/2026-08-27-research-canvas-visual-components/task-4-report.md b/.superpowers/sdd/2026-08-27-research-canvas-visual-components/task-4-report.md new file mode 100644 index 000000000..8a5f83b64 --- /dev/null +++ b/.superpowers/sdd/2026-08-27-research-canvas-visual-components/task-4-report.md @@ -0,0 +1,145 @@ +# Task 4 report — persistent canvas geometry and corner resize + +## Status + +Implemented one normalized geometry model for Research canvas nodes, persisted +the normalized shape, replaced fixed hit rectangles with real node dimensions, +and added four-corner resize behavior to the installed conversation renderer. +No composer, sidebar, version, update-feed, or release code was changed. + +## RED + +The first focused run was made after adding pure and mounted-renderer tests and +before changing the installed dependency: + +```text +Test Files 2 failed (2) +Tests 10 failed | 120 passed (130) +``` + +The failures were the intended missing behavior: no exported geometry +normalizer or resize helper, viewport rectangles still fixed at 220 x 64, +legacy JSON lacked normalized sizes, and the mounted real `ResearchCanvas` +rendered no handles, preview shield, or live resize operation. + +A second narrow RED cycle covered preview wheel ownership. The mounted real +rich preview body bubbled into the canvas wheel listener and produced +`defaultPrevented: true`; after the ownership guard it remained unprevented and +the viewport stayed unchanged. + +## Geometry policy + +All values are world units. `x` and `y` remain node centers. + +| Kind | Default | Minimum | Aspect behavior | +|---|---:|---:|---| +| Generic unsupported file | 220 x 64 | fixed | not resizable; no handles | +| Assistant artifact | 360 x 240 | 240 x 120 | free; 240 is the Task 4 safe auto-height placeholder | +| Image / SVG | 320 x 272 | 160 x 152 | 4:3 content plus 32 title pixels | +| PDF | 320 x 446.117647 | 240 x 342.588235 | 17:22 page content plus 32 title pixels | +| HTML | 480 x 360 | 320 x 240 | free | + +The shared title bar is 32 px. The shared maximum is 2400 x 2400. Image and +PDF `aspectRatio` applies only to content height, never to the title bar. +Persisted natural ratios are admitted only when finite and between 0.25 and 8, +then narrowed to the type's feasible range under both its minimum dimensions +and the 2400 x 2400 ceiling. Invalid, non-finite, and negative sizes fall back +to the kind default; finite sizes are clamped. Legacy nodes normalize on load +and are repaired on the next workspace persistence write. + +Rich-kind detection is centralized: supported `image/*` and known image/SVG +extensions map to image, PDF MIME/extension maps to PDF, HTML/XHTML +MIME/extension maps to HTML, supported assistant artifact kinds map to +assistant, and everything else maps to generic. + +## Interaction semantics + +- Space-pan is checked first, including pointer-down over a resize handle or an + interactive preview body. +- A selected rich node renders NW, NE, SW, and SE handles. A generic node never + renders handles. +- Resize precedes normal card movement and changes only the operated node, even + when a group is selected. +- Pointer screen deltas are divided by canvas scale. The actual clamped size + delta shifts the center by half, keeping the opposite corner fixed. +- Assistant and HTML resize freely. Image and PDF resize proportionally using + their content ratio. +- Live move/resize publishes in-memory geometry without storage writes. + Pointer-up, pointer-cancel, window blur, and unmount each persist once. +- The title/noninteractive frame remains the move surface; marked rich preview + bodies own pointer and wheel interaction. +- Rich nodes always contain a real preview shield layer. Space-pan, node move, + and resize activate it through root interaction state so Task 6 iframes + cannot steal an active pointer. No generic card or fake iframe was used in + the rendered tests. +- Existing selection, group move, marquee, Delete, and context deletion paths + remain exercised by the focused mounted-renderer suite. + +## Patch evidence + +The installed dependency was regenerated with: + +```text +npx patch-package @deepseek-ai/dsh-client-ui-conversation +✔ Created file patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch +``` + +The regenerated full patch still contains the approved shared InputBar +`padding-bottom: 8px` replacement and the previous Research implementation, +plus the new normalizer, resize helper, shared rich frame, handles, shield, and +pointer operation branches. `git apply --check --reverse` succeeds against the +installed tree. + +No `.d.ts` file was changed: the package's public declaration index does not +declare the existing Research runtime/testing exports, and Task 4 did not +change a consumed TypeScript contract. + +## Review fix round 1 + +Review identified two important boundary defects and both received a separate +RED/GREEN cycle: + +1. An admitted wide image ratio of 8 previously normalized 160 x 52, violating + the image policy's 160 x 152 minimum. A new pure regression failed with that + exact result. Normalization and resize now share constraints whose minimum + width is `max(type minWidth, (type minHeight - titleHeight) * ratio)` and + whose maximum width accounts for both global width and content-height + ceilings. The regression now yields 960 x 152; a 0.25 ratio also remains at + least 160 x 672. Ratios are narrowed further only when the type minima and + global maxima otherwise have no feasible intersection. +2. Repositioning a deduplicated assistant artifact rebuilt it without geometry, + resetting 720 x 480 manual state to 360 x 240 auto. A new pure regression + failed with that reset. The found-node branch now retains its canonical + persisted width, height, size mode, and applicable aspect ratio while still + updating title, content, and center position. + +The review-fix RED was `2 failed | 58 passed` in +`test/research-file-drop.test.ts`; its immediate GREEN was `60 passed`. + +## GREEN and verification + +Final evidence is recorded from fresh runs immediately before commit: + +- `npm test -- --run test/research-file-drop.test.ts test/sherlock-composer-workspace-ui.test.ts` + — 2 files, 132 tests passed. +- `npm run typecheck` — exit 0. +- `git diff --check` — exit 0. +- `git apply --check --reverse patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch` + — exit 0. + +## Self-review and risks + +- Geometry is defined once and both persistence and viewport hit-testing call + that same normalizer; Task 5/6 should extend preview bodies, not introduce a + second sizing model. +- Assistant auto height intentionally remains a safe 240-unit placeholder until + Task 5 installs the specified `ResizeObserver` measurement. +- Image natural ratio and PDF first-page ratio will replace their initial + ratios in Tasks 5/6. The current admission bounds prevent corrupt persisted + ratios from producing unusable geometry. +- HTML and PDF bodies are placeholders at this task boundary. The shared frame, + wheel/pointer ownership marker, and shield are production renderer behavior + ready for their real preview consumers. +- No full test suite or local packaged-app run was performed because this task's + brief requires only the two focused files, typecheck, patch validation, and + diff checks; final real-app QA belongs to Task 7. diff --git a/.superpowers/sdd/2026-08-27-research-canvas-visual-components/task-6-report.md b/.superpowers/sdd/2026-08-27-research-canvas-visual-components/task-6-report.md new file mode 100644 index 000000000..32616e828 --- /dev/null +++ b/.superpowers/sdd/2026-08-27-research-canvas-visual-components/task-6-report.md @@ -0,0 +1,129 @@ +# Task 6 实施报告：PDF 与 HTML 研究画布预览 + +## Status + +- 已完成 PDF 单页预览、页码标题、滚轮翻页、DPR/像素上限、渲染取消与完整资源释放；首屏比例仅在自动默认几何时写回，手动或已持久比例不会被覆盖。 +- 已完成仅使用 capability URL 的 HTML iframe，使用 `sandbox="allow-scripts"`、`no-referrer`、lazy loading、限制 Permissions Policy、精确 capability CSP 与授权根目录围栏。 +- PDF.js 精确固定为 `4.10.38` 开发依赖；幂等脚本将 library、worker、CMaps、standard fonts 和 LICENSE 复制到真实 web frontend 静态输入目录，并从 Electron 包输入排除原始依赖与仅由其引入的 `@napi-rs/canvas*`。 +- 未修改输入框宽度/位置、loading、应用版本、发布或更新逻辑；未运行全量测试或本地发布构建。 + +## PDF behavior + +- production wheel helper 统一处理 pixel/line/page `deltaMode`，80 px 等效阈值、180 ms 节流、方向反转清零和 `1...pageCount` 边界；每次最多翻一页。PDF body 始终消费 wheel，包括 Command/metaKey wheel，避免同一事件继续平移或缩放画布。 +- PDF.js `getDocument` 使用同源 staged worker/CMaps/fonts，明确 `useWasm: false`、`isEvalSupported: false` 与独立的 `maxImageSize: 8_000_000`，避免单张超大图片在进入 canvas backing-store 限制前造成无界解码；未加入版本兼容性未验证的 `canvasMaxAreaInBytes`。每次页码或尺寸变化先 cancel 旧 render task，再用 generation 防止取消后晚到的 promise 发布旧页。 +- backing-store helper 以 O(1) 比例缩放限制 DPR 和 8,000,000 canvas pixels，覆盖极端、无效与畸形尺寸，不使用逐像素循环或会突破上限的硬下限。 +- 首个 PDF page viewport 仅在 `sizeMode: auto` 且节点仍为 Task 4 默认 PDF 比例时写回内容比例；32 px 标题栏不计入比例。手动几何、已知比例、重入、翻页和 resize 不会再次覆盖。 +- PDF canvas 同时测量 mounted preview body 的实际 `clientWidth` 与 `clientHeight`，每页以 `min(clientWidth, clientHeight * pageRatio)` 计算 CSS/backing 宽度，并由 `ResizeObserver` 响应普通/选中边框和手动 resize；不再把 border-box 外框宽度写入内容区。任一维尚未测得时不调用 `getPage` 或 `render`，避免旧外框宽度抢跑。离开 visible/ready 时在 layout 阶段同步把测量归零，因此离屏期间改变 selection/geometry 后重入也必须等待新 body 测量。DOM 回归以独立 literal 覆盖 portrait/landscape、auto/selected/manual，以及 offscreen mutation/re-entry；所有 production render viewport 均为当前 measured body-fit width，且 `scrollWidth == clientWidth`、`scrollHeight == clientHeight`。 +- 离屏、unmount 或换页/缩放会 cancel render、`page.cleanup()`、清零 canvas backing，并通过 loading task 这一单一 owner 销毁 PDF document/worker。teardown 的同步异常与异步 rejection 都被局部消费，避免 `PDFDocumentProxy.destroy()` 委托同一 loading task 后重复 destroy；随后只释放 exact ephemeral token。回到视口从 durable authorization 恢复。加载、文档、取页或渲染错误均保留文件名标题和本地错误态。 +- loader 使用真实 `/sherlock-pdfjs/loader.js` module script；失败会移除残留 script 并清除共享 promise，后续可重新加载，不会挂在永不触发的旧标签上。 + +## PDF.js packaging + +- `pdfjs-dist@4.10.38` 位于 exact `devDependencies`。staging 脚本校验真实安装版本，将 ESM 源字节复制为静态服务器能够以 JavaScript MIME 提供的 `pdf.min.js` 与 `pdf.worker.min.js`，同时复制 CMaps、standard fonts、LICENSE 和稳定 loader。 +- 脚本接入 `postinstall` 与 `build`，先写进程级 staging 目录再替换目标。启动时只清理由脚本 exact `.staging-` 前缀产生且进程已不存在的 sibling，保留相似名称与仍存活进程；当前 staging 始终在 `finally` 清理。测试覆盖旧目录回收、相似目录保留、copy 失败无残留、两次稳定文件 hash；真实目录连续执行两次的 189 文件 SHA-256 清单也完全相同。 +- production-like HTTP 测试调用真实 static server，确认 loader/library/worker 返回 `text/javascript` 和真实 PDF.js 字节，而不是 `.mjs` 的错误 MIME 或 SPA index fallback。 +- electron-builder `files` 明确排除 `node_modules/pdfjs-dist/**`、`node_modules/@napi-rs/canvas/**` 和 `node_modules/@napi-rs/canvas-*/**`；`npm ls --all` 确认本仓库的 `@napi-rs/canvas` 仅由 PDF.js 引入。浏览器实际只消费约定的 staged assets。 + +## HTML security and interaction + +- iframe `src` 只能来自主进程恢复的 `sherlock-preview:///`，不使用 `srcdoc`、`file://` 或 renderer path。固定 `sandbox="allow-scripts"`，不授予 same-origin、forms、popups、downloads、modals 或 top navigation。 +- root HTML CSP 为 default-deny。style/image/classic external script source精确收敛到当前 capability token；允许 inline style 但禁止 inline script/eval。`connect-src`、object、nested frame、worker、manifest、form 和 base replacement 全部关闭，`frame-ancestors` 精确为当前 Harness origin；另一 capability token 不在允许源中。 +- 相对 CSS/图片/经典外部脚本仍经主进程真实根目录与 symlink 围栏；module/fetch 的 opaque `Origin: null` 继续拒绝。iframe 普通 wheel 不由父 canvas prevent，viewport 不变；选择变化不重建 iframe，离屏释放后重入恢复新 token，晚到 restore 会释放 exact token。 +- Task 4/5 shared shield 在节点拖动、四角 resize 与 Space-pan 时覆盖 iframe，结束后恢复交互；节点离屏仍保留同尺寸、可选择/移动 placeholder。 + +## Security Ruling + +- opaque sandbox 下，相对 webfont 的浏览器请求携带 `Origin: null`。为保持既有能力协议拒绝 `Origin: null`，v1 不放宽 CORS、不加 `allow-same-origin`，HTML 使用系统字体降级；CSP 仅允许自包含 `data:` font。 +- 当前 admission map 未加入音视频扩展，因此 v1 不宣称支持相对 media。首版支持 capability-scoped CSS、图片和经典外部脚本；这比 scheme-wide 资源授权或扩大文件类型更符合最小权限。 +- HappyDOM 可验证 iframe policy、父层事件、身份稳定和 capability lifecycle，但不能证明真实 Chromium iframe 内部滚动/脚本视觉效果；留给 Task 7 packaged Electron fixture 进行真实交互验收。 + +## TDD evidence + +### RED + +首次在生产实现前运行四个聚焦文件： + +```text +npm test -- --run test/research-file-drop.test.ts test/sherlock-composer-workspace-ui.test.ts test/research-file-preview.test.ts test/pdfjs-assets.test.ts +Test Files 4 failed (4) +Tests 9 failed | 191 passed (200) +``` + +失败覆盖：缺少 PDF.js staging/精确依赖、wheel/DPR helpers、dynamic HTML CSP，以及真实 mounted PDF/HTML consumers。 + +后续收紧测试在实现前分别得到： + +```text +真实 .js/MIME 与 extreme backing-store: 3 failed +PDF 首屏比例 helper: 1 failed +PDF loader 失败残留 tag: 1 failed +opaque iframe font-src ruling: 1 failed +LICENSE/devDependency/package 排除: 2 failed +``` + +最终安全/UI 复核新增 RED： + +```text +maxImageSize + stale/current staging cleanup: +Test Files 2 failed (2) +Tests 3 failed | 102 skipped (105) + +border-box body sizing: +Test Files 1 failed (1) +Tests 1 failed | 101 skipped (102) + +single PDF teardown owner: +Test Files 1 failed (1) +Tests 1 failed | 101 skipped (102) + +二维 body-fit re-review: +Test Files 1 failed (1) +Tests 1 failed | 102 skipped (103) +Failure body 0x0 时已提前 getPage(1) + +offscreen re-entry measurement re-review: +Test Files 1 failed (1) +Tests 1 failed | 102 skipped (103) +Failure re-entry 新测量前 pages 从 3 错误增长为 4 +``` + +### GREEN + +```text +npm test -- --run test/research-file-drop.test.ts test/sherlock-composer-workspace-ui.test.ts test/research-file-preview.test.ts test/pdfjs-assets.test.ts +Test Files 4 passed (4) +Tests 207 passed (207) + +npm test -- --run test/preload-main-frame.test.ts test/ipc-trust.test.ts test/security.test.ts test/research-file-preview.test.ts +Test Files 4 passed (4) +Tests 41 passed (41) + +npm run typecheck +tsc --noEmit -p tsconfig.node.json +PASS +``` + +其他门禁： + +- `git diff --check`: PASS +- full conversation patch `git apply --reverse --check`: PASS +- PDF.js actual staging two-run SHA-256 comparison: PASS（189 files） +- `npm ls pdfjs-dist @napi-rs/canvas --all`: `pdfjs-dist@4.10.38 -> @napi-rs/canvas@0.1.100` +- package contract：exact devDependency、LICENSE、真实 HTTP JavaScript MIME/bytes、raw dependency exclusions、staging lifecycle，以及 portrait/landscape 二维 body-fit 全部包含在 207/207 聚焦结果中。 + +## Files + +- `package.json`, `package-lock.json` +- `scripts/install-pdfjs-assets.mjs` +- `src/main/state/research-file-preview.ts` +- `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js` +- `patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch` +- `test/pdfjs-assets.test.ts` +- `test/research-file-drop.test.ts` +- `test/research-file-preview.test.ts` +- `test/sherlock-composer-workspace-ui.test.ts` +- `.superpowers/sdd/2026-08-27-research-canvas-visual-components/progress.md` + +## Remaining QA + +- Task 7 必须在真实 packaged Electron 中验证 PDF worker 加载、高清屏 canvas、真实 PDF wheel/resize/offscreen，以及 opaque iframe 内部滚动、经典外部脚本、相对 CSS/图片和拖动/缩放 shield。Task 6 不以 HappyDOM 结果替代该用户可见验收。 diff --git a/AGENTS.md b/AGENTS.md new file mode 100644 index 000000000..d94a71872 --- /dev/null +++ b/AGENTS.md @@ -0,0 +1,13 @@ +# Sherlock 项目约定 + +- 当用户说“本地启动看看”“构建给我测试”“测试一下最新版本”或同义表达时，必须走 `docs/sherlock-local-test-runbook.md`：使用 `./script/build_and_run.sh --verify` 构建并启动本地测试版，明确跳过 Apple 公证，不上传 Cloudflare、不修改公开更新源、不递增版本、不推送源码或标签；完成后必须核验真实 Sherlock 主界面而非只检查进程，并让应用保持打开供用户测试。 +- 只有当用户明确说“更新上传发布正式版”“发布 Sherlock 正式版”“发布大版本”或明确要求对外发布/让现有用户升级时，才使用 `sherlock-release` 技能并完整执行 `docs/sherlock-formal-release-runbook.md`。这里的“发布大版本”指正式对外发行，不是日常本地预览。 +- 若用户未指定版本，默认把当前正式版本的补丁号加一，例如 `0.6.3` 升到 `0.6.4`；发布前仍须与 Cloudflare 线上版本比较，禁止复用或降低版本号。 +- 该触发语授权：同步当前开发成果到正式构建、修改版本号、运行聚焦检查、打包和签名、发布到 Sherlock 的 Cloudflare R2、验证公开更新源、提交并推送发布相关源码到既有 Fork 发布分支。 +- 不要强行合并 `dataelement/dsh-desktop` 的上游 `main`，不要覆盖或提交无关的用户改动。 +- 每次完成一项修改并通过相关聚焦验证后，必须创建本地 Git 提交；提交信息必须用中文清楚说明内容，不得把多个 session 的未确认改动混入同一提交。 +- 多 session 功能必须按 `docs/sherlock-multi-session-integration-runbook.md` 交接、预检、集成和接受；本地 `main` 是日常集成权威，禁止自动上游同步。上游差异只在独立 `codex/upstream-sync/` 审阅流程处理。 +- 功能 worktree 不得构建或替换共享 Sherlock 客户端。Plan A 集成工具现已生效；Plan B 的共享客户端来源/构建 runner 和 Plan C 的隔离功能预览尚未生效。Plan B 落地前，本地测试请求仍按本文件既有 `docs/sherlock-local-test-runbook.md` 规则执行。 +- 正式构建只能从干净的本地 `main` 提交执行；若其他本地分支仍有尚未合并到 `main` 的提交，或其他 worktree 仍有未提交的修改，必须停止构建并先完成取舍、提交或合并。 +- 当版本为 `1.0.0`、`2.0.0` 等大版本时，必须在正式构建提交上创建本地注释标签 `V1.0.0`、`V2.0.0`。未经用户明确授权，不得向远端推送任何版本标签，以免触发未配置的 GitHub Actions。 +- 开发完成不要运行全功能测试；只运行发布手册列出的聚焦测试以及被本次改动直接影响的测试。 diff --git a/README.md b/README.md index bc44c5fbf..4535e397f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

DSH Desktop logo - DSH Desktop + Sherlock

@@ -18,20 +18,22 @@ Windows

-![DSH Desktop overview with portable presets, model providers, and phone control](docs/images/dsh-desktop-hero-v020.png) +![Sherlock overview with portable presets, model providers, and phone control](docs/images/dsh-desktop-hero-v020.png)

Beyond official DeepSeek models, DSH Desktop supports mainstream third-party model providers—with more DSH-powered desktop experiences coming soon.

-DSH Desktop packages the local DeepSeek Harness web experience as a desktop application. It launches a local Harness instance automatically, manages a random loopback port, persists profiles, plugins, and sessions, and opens the full interface as soon as Harness is ready. Project workspaces are added and managed entirely in the Harness interface. +Sherlock packages the local DeepSeek Harness web experience as a desktop application. It launches a local Harness instance automatically, manages a random loopback port, persists profiles, plugins, and sessions, and opens the full interface as soon as Harness is ready. Project workspaces are added and managed entirely in the Harness interface. > [!IMPORTANT] -> DSH Desktop is currently an early preview and depends on the rapidly evolving `@deepseek-ai/dsh@0.1.0-rc.7`. macOS releases are code-signed and notarized by Apple; current installers are distributed through the official website. +> Sherlock currently depends on the rapidly evolving `@deepseek-ai/dsh@0.1.0-rc.7`. Public macOS releases are signed with a Developer ID certificate and notarized by Apple. A stable legacy Sherlock signing identity is retained only inside the compatibility update bridge for existing 0.6.3 installations. ## Download -Download DSH Desktop for macOS and Windows from the [official website](https://www.dshdesktop.com/#download). +Download Sherlock for macOS and Windows from the [official website](https://www.dshdesktop.com/#download). -Installed macOS and Windows builds check for updates automatically after startup and every six hours. Updates download in the background and prompt you to restart when they are ready. You can also choose **Check for Updates…** from the application menu. +On macOS, open the DMG and drag Sherlock into Applications. The Developer ID signature and stapled Apple notarization ticket allow Gatekeeper to verify the download normally. + +Installed builds check for updates after startup and every six hours. When a release is available, a compact blue 28×28 rounded-rectangle download button appears at the lower-right of the sidebar. Click it to download; once ready, click again and confirm the restart to install. The button stays hidden when no update is available. You can also choose **Check for Updates…** from the application menu. ## Community @@ -61,9 +63,9 @@ DeepSeek Harness already provides a complete agent runtime and Web UI. DSH Deskt - Gracefully terminates the Harness child process when the desktop app exits - Listens only on a random `127.0.0.1` port for each launch - Removes Node.js privileges from the renderer and enables `contextIsolation`, sandboxing, and navigation restrictions -- Uses the DSH brand logo consistently in the desktop window and Harness sidebar +- Uses the Sherlock brand consistently in the desktop window and Harness sidebar - Imports and exports complete custom Agent presets as portable [`.dshpreset` packages](docs/preset-packages.md), with conflict checks and a trust warning before installation -- Includes a production DSH app icon in macOS ICNS and Windows ICO formats +- Includes a production Sherlock app icon in macOS ICNS and Windows ICO formats ## Friends @@ -147,11 +149,11 @@ build/ Application icon assets ## Current validation status -- macOS Apple Silicon: development workflow, real Harness startup, DMG packaging, code signing, Apple notarization, and mounted artifact verified +- macOS Apple Silicon: development workflow, real Harness startup, DMG packaging, and stable self-signed code-signing path provided - macOS Intel: packaging configuration and platform checks provided; runtime verification still requires an Intel Mac or runner - Windows x64: NSIS/Portable configuration and platform checks provided; runtime verification still requires a Windows runner - Windows ARM64: not currently supported -- Automatic updates: not yet integrated +- Automatic updates: Cloudflare feed and explicit sidebar download/install flow integrated ## Upstream version and patches diff --git a/README.zh.md b/README.zh.md index 9c2e26d55..160554b67 100644 --- a/README.zh.md +++ b/README.zh.md @@ -1,6 +1,6 @@

DSH Desktop logo - DSH Desktop + Sherlock

@@ -18,20 +18,22 @@ Windows

-![DSH Desktop 的 Preset、模型提供方与手机控制能力](docs/images/dsh-desktop-hero-v020.png) +![Sherlock 的 Preset、模型提供方与手机控制能力](docs/images/dsh-desktop-hero-v020.png)

除了 DeepSeek 官方模型，DSH Desktop 也支持主流第三方模型提供方。更多基于 DSH 的有趣桌面体验即将推出。

-DSH Desktop 把 DeepSeek Harness 的本地 Web 体验封装为桌面应用：应用会自动启动本地 Harness、管理随机回环端口、持久化 Profile/插件/会话，并在 Harness 就绪后直接进入完整界面。项目工作区在 Harness 界面中统一添加和管理。 +Sherlock 把 DeepSeek Harness 的本地 Web 体验封装为桌面应用：应用会自动启动本地 Harness、管理随机回环端口、持久化 Profile/插件/会话，并在 Harness 就绪后直接进入完整界面。项目工作区在 Harness 界面中统一添加和管理。 > [!IMPORTANT] -> DSH Desktop 当前处于早期预览阶段，并依赖仍在快速迭代的 `@deepseek-ai/dsh@0.1.0-rc.7`。macOS 正式包已完成代码签名并通过 Apple 公证，当前安装包统一通过官网分发。 +> Sherlock 当前依赖仍在快速迭代的 `@deepseek-ai/dsh@0.1.0-rc.7`。macOS 正式包使用同一个长期稳定的 Sherlock 自签名升级身份，不依赖 Apple 公证，也不通过 Mac App Store 分发。 ## 下载安装 -请前往 [DSH Desktop 官网](https://www.dshdesktop.com/#download)下载 macOS 和 Windows 安装包。 +请前往 [Sherlock 官网](https://www.dshdesktop.com/#download)下载 macOS 和 Windows 安装包。 -已安装的 macOS 和 Windows 版本会在启动后及每六小时自动检查更新。更新将在后台下载，准备完成后提示重启安装；也可以从应用菜单选择 **检查更新…** 手动检查。 +macOS 首次安装时，请打开 DMG、把 Sherlock 拖入“应用程序”，然后在“应用程序”里右键或按住 Control 点击 **Sherlock.app**，选择 **打开**。由于本版本不使用 Apple 公证，这一步只需在首次启动时完成一次。 + +已安装版本会在启动后及每六小时检查更新。有新版本时，左侧边栏右下角才会出现蓝色圆形下载按钮；点击后开始下载，下载完成后再次点击并确认重启即可安装。没有更新时按钮保持隐藏。也可以从应用菜单选择 **检查更新…** 手动检查。 ## 加入社区 @@ -61,9 +63,9 @@ DeepSeek Harness 本身提供完整的 Agent Runtime 与 Web UI。DSH Desktop - 退出桌面应用时优雅终止 Harness 子进程 - 每次启动仅监听随机的 `127.0.0.1` 端口 - Renderer 关闭 Node.js 权限，启用 `contextIsolation`、sandbox 与导航限制 -- 在桌面窗口与 Harness 侧栏统一使用 DSH 品牌 Logo +- 在桌面窗口与 Harness 侧栏统一使用 Sherlock 品牌 Logo - 可把完整的自定义 Agent 预设导入/导出为便携的 [`.dshpreset` 压缩包](docs/preset-packages.md)，安装前会检查命名冲突并提示信任风险 -- 正式 DSH 应用图标，支持 macOS ICNS 与 Windows ICO +- 正式 Sherlock 应用图标，支持 macOS ICNS 与 Windows ICO ## 友情链接 @@ -147,11 +149,11 @@ build/ 应用图标资源 ## 当前验证状态 -- macOS Apple Silicon：开发运行、真实 Harness 启动、DMG 打包、代码签名、Apple 公证与挂载验证均已完成 +- macOS Apple Silicon：已提供开发运行、真实 Harness 启动、DMG 打包与稳定自签名代码签名链路 - macOS Intel：打包配置与平台检查已提供，需要在 Intel Mac/Runner 上完成运行验证 - Windows x64：NSIS/Portable 配置与平台检查已提供，需要在 Windows/Runner 上完成运行验证 - Windows ARM64：当前不支持 -- 自动更新：尚未接入 +- 自动更新：已接入 Cloudflare 更新源与侧边栏显式下载/安装流程 ## 上游版本与补丁 diff --git a/build/app-icon.png b/build/app-icon.png index 65bb73b46..d59618740 100644 Binary files a/build/app-icon.png and b/build/app-icon.png differ diff --git a/build/app-update-notarized.yml b/build/app-update-notarized.yml new file mode 100644 index 000000000..db8171646 --- /dev/null +++ b/build/app-update-notarized.yml @@ -0,0 +1,3 @@ +provider: generic +url: https://updates.evanarts.com/notarized/latest/ +updaterCacheDirName: sherlock-updater diff --git a/build/dsh-desktop.patch.yml b/build/dsh-desktop.patch.yml index 34c24083a..a1b12f749 100644 --- a/build/dsh-desktop.patch.yml +++ b/build/dsh-desktop.patch.yml @@ -1,19 +1,44 @@ -# DSH Desktop delegates directory selection to Electron's system dialog. Keep +# Sherlock delegates directory selection to Electron's system dialog. Keep # the renderless client surface, but do not load the Koffi-based Host worker: # on Windows it can exit before reporting a result inside packaged Electron. - id: directory-picker disabled: true +# Sherlock is provider-neutral. Keep the user-configured providers, but do not +# mount the upstream built-in DeepSeek adapter in the desktop profile. +- id: llm-deepseek + disabled: true + +# Search follows the model selected for the active session. The provider reads +# that route's user-configured endpoint and credential for each request, so the +# desktop never requires or silently falls back to DEEPSEEK_API_KEY. +- id: web + config: + searchProvider: sherlock-session-model + +- id: web-search-deepseek + disabled: true + - insert: - id: directory-picker-electron-desktop-surface name: '@deepseek-ai/dsh-client-ui-directory-picker-native' - # DSH Desktop owns the fixed-target dsh-market installer and its lightweight + - id: web-search-session-model + name: dsh-web-search-session-model + + # Sherlock owns the fixed-target dsh-market installer and its lightweight # settings entry. After dshmarket is installed and Harness restarts, the # community plugin replaces the placeholder with its complete market UI. - - id: dsh-desktop-market-installer + - id: sherlock-market-installer + # Compatibility: this package name is part of the upstream Harness + # dependency closure; the plugin's visible identity remains Sherlock. name: dsh-desktop-market-installer + # Canvas generation runs in isolated child sessions owned by Sherlock, so + # it stays independent from the visible Research conversation. + - id: sherlock-research-task-runtime + name: dsh-research-task-runtime + # dsh-market normally offers to restart its own Node process after mutations. # The desktop shell has the real lifecycle authority, so keep that behavior off # whenever the optional plugin is present in the composed profile. diff --git a/build/harness-node-entry.mjs b/build/harness-node-entry.mjs index c86fbd902..577d54c42 100644 --- a/build/harness-node-entry.mjs +++ b/build/harness-node-entry.mjs @@ -1,3 +1,4 @@ +import { registerHooks } from 'node:module' import { pathToFileURL } from 'node:url' const [dshEntryPath, ...dshArguments] = process.argv.slice(2) @@ -16,6 +17,39 @@ process.stdout.write(`[harness-node] execPath=${process.execPath}\n`) process.stdout.write(`[harness-node] cwd=${process.cwd()}\n`) process.stdout.write(`[harness-node] DSH_HOME=${process.env.DSH_HOME ?? ''}\n`) +const bundledWebSearchEntry = process.env.DSH_DESKTOP_WEB_SEARCH_ENTRY +const bundledMarketInstallerEntry = process.env.DSH_DESKTOP_MARKET_INSTALLER_ENTRY +const bundledResearchTaskEntry = process.env.DSH_DESKTOP_RESEARCH_TASK_ENTRY +const bundledPackageEntries = new Map([ + ...(bundledWebSearchEntry + ? [['dsh-web-search-session-model', bundledWebSearchEntry]] + : []), + ...(bundledMarketInstallerEntry + ? [['dsh-desktop-market-installer', bundledMarketInstallerEntry]] + : []), + ...(bundledResearchTaskEntry + ? [['dsh-research-task-runtime', bundledResearchTaskEntry]] + : []) +]) +if (bundledPackageEntries.size > 0) { + registerHooks({ + resolve(specifier, context, nextResolve) { + const bundledEntry = bundledPackageEntries.get(specifier) + if (bundledEntry) return { url: bundledEntry, shortCircuit: true } + return nextResolve(specifier, context) + } + }) +} +if (bundledWebSearchEntry) { + process.stdout.write('[harness-node] bundled session-model web search mapped\n') +} +if (bundledMarketInstallerEntry) { + process.stdout.write('[harness-node] bundled market installer mapped\n') +} +if (bundledResearchTaskEntry) { + process.stdout.write('[harness-node] bundled Research task runtime mapped\n') +} + if (!dshEntryPath) { report('startup error', 'missing DSH entry path') process.exitCode = 1 diff --git a/build/icon.icns b/build/icon.icns index ccd7f8ee6..c9a5b08e0 100644 Binary files a/build/icon.icns and b/build/icon.icns differ diff --git a/build/icon.ico b/build/icon.ico index ef4054499..9fc8b477e 100644 Binary files a/build/icon.ico and b/build/icon.ico differ diff --git a/build/plugin-recovery.html b/build/plugin-recovery.html index a6421dd23..9025ca8a9 100644 --- a/build/plugin-recovery.html +++ b/build/plugin-recovery.html @@ -7,7 +7,7 @@ http-equiv="Content-Security-Policy" content="default-src 'none'; img-src 'self' file:; style-src 'unsafe-inline'; script-src 'unsafe-inline'" /> - DSH Desktop + Sherlock
- -

Starting DSH Desktop

-

First launch may take a moment.

+ +

Starting…

diff --git a/config/sherlock-integration-batches/20260831-02.json b/config/sherlock-integration-batches/20260831-02.json new file mode 100644 index 000000000..c49f63613 --- /dev/null +++ b/config/sherlock-integration-batches/20260831-02.json @@ -0,0 +1,421 @@ +{ + "schemaVersion": 1, + "batchId": "20260831-02", + "branch": "codex/integration/20260831-02", + "baseMainCommit": "aeaed5505e7f413ffd6a6d7393af00f39e8abcf6", + "expectedMainCommit": "aeaed5505e7f413ffd6a6d7393af00f39e8abcf6", + "createdAt": "2026-08-31T04:04:44.364Z", + "features": [ + { + "handoff": { + "schemaVersion": 1, + "featureName": "Sherlock 会话集成控制", + "branch": "codex/feat/session-integration-controls-20260831", + "baseCommit": "d7e688325d475836e3394bed5607c526997233bb", + "tipCommit": "61585d482ad1ed9eb31435b53148aef4041265dc", + "commits": [ + { + "commit": "77fdc812ddda44ab5bb4ac3c1aa3e2ff0751e671", + "parents": [ + "d7e688325d475836e3394bed5607c526997233bb" + ], + "subject": "重构：统一 Sherlock Git 仓库状态检查" + }, + { + "commit": "c6b65572c1796f58b186f618a3754acae91e487a", + "parents": [ + "77fdc812ddda44ab5bb4ac3c1aa3e2ff0751e671" + ], + "subject": "修复：收紧 Sherlock Git 状态边界" + }, + { + "commit": "9babe0f19d34f8d0c4e0b7f60cc42a6632e911ca", + "parents": [ + "c6b65572c1796f58b186f618a3754acae91e487a" + ], + "subject": "工具：增加功能会话提交交接卡" + }, + { + "commit": "f68a4f673301c228f4da8ddbe771f366cd48ce63", + "parents": [ + "9babe0f19d34f8d0c4e0b7f60cc42a6632e911ca" + ], + "subject": "修复：收紧功能交接卡信任边界" + }, + { + "commit": "f215d3618182f9c7c0fce3908e7b89312646e141", + "parents": [ + "f68a4f673301c228f4da8ddbe771f366cd48ce63" + ], + "subject": "修复：拒绝无评分重命名状态" + }, + { + "commit": "c1e2e95a1057b31c926a8d86c5621f49b8849830", + "parents": [ + "f215d3618182f9c7c0fce3908e7b89312646e141" + ], + "subject": "工具：增加集成批次清单与只读预检" + }, + { + "commit": "bda3727056734d678c63e6057f863b95a66d8a66", + "parents": [ + "c1e2e95a1057b31c926a8d86c5621f49b8849830" + ], + "subject": "修复：补齐集成预检阶段门禁" + }, + { + "commit": "35207e5cca3789f89f16dbb667ae740709825e2e", + "parents": [ + "bda3727056734d678c63e6057f863b95a66d8a66" + ], + "subject": "修复：验证批次已合并证据" + }, + { + "commit": "7e28afb06e7bd6cd58ebda132452c7d4a90ee63f", + "parents": [ + "35207e5cca3789f89f16dbb667ae740709825e2e" + ], + "subject": "工具：增加单一集成批次租约" + }, + { + "commit": "b1aa2b0665117890f0c7df41d1711cb93f81ecf3", + "parents": [ + "7e28afb06e7bd6cd58ebda132452c7d4a90ee63f" + ], + "subject": "修复：防止租约归档竞态覆盖" + }, + { + "commit": "cfc43da8c04241c9ce56c8b051991cc305bc4cd4", + "parents": [ + "b1aa2b0665117890f0c7df41d1711cb93f81ecf3" + ], + "subject": "修复：以独占目录安全归档租约" + }, + { + "commit": "ca293acc86b67d83024fc50cdf1e16d4d3e4ef73", + "parents": [ + "cfc43da8c04241c9ce56c8b051991cc305bc4cd4" + ], + "subject": "工具：增加集成批次创建与接管" + }, + { + "commit": "0004e9b4090364628e783742bec77af9d3fb7e5b", + "parents": [ + "ca293acc86b67d83024fc50cdf1e16d4d3e4ef73" + ], + "subject": "修复：保留批次创建竞态现场" + }, + { + "commit": "d3f5d8a1de3257b3b2cebd0e9015294e4147df7a", + "parents": [ + "0004e9b4090364628e783742bec77af9d3fb7e5b" + ], + "subject": "集成：按完整功能历史合并并支持恢复" + }, + { + "commit": "98d5f66bde68ce85bc1e9a41254209e657940bf0", + "parents": [ + "d3f5d8a1de3257b3b2cebd0e9015294e4147df7a" + ], + "subject": "修复：补齐合并中断恢复状态" + }, + { + "commit": "14fcb8d713bd18f71d101b44e67b1fcc3b75f683", + "parents": [ + "98d5f66bde68ce85bc1e9a41254209e657940bf0" + ], + "subject": "集成：增加验收绑定与主分支安全推进" + }, + { + "commit": "dfa183aeaf46287d53968994ac0c6dd024313733", + "parents": [ + "14fcb8d713bd18f71d101b44e67b1fcc3b75f683" + ], + "subject": "修复：补齐主分支晋升确认与恢复" + }, + { + "commit": "432a405950029ca08dd0a2e597f0447f72df87da", + "parents": [ + "dfa183aeaf46287d53968994ac0c6dd024313733" + ], + "subject": "构建：增加共享客户端来源门禁" + }, + { + "commit": "b0d784841be997c93773ff79d464bce57dd1967c", + "parents": [ + "432a405950029ca08dd0a2e597f0447f72df87da" + ], + "subject": "文档：落地 Sherlock 多会话集成规范" + }, + { + "commit": "61585d482ad1ed9eb31435b53148aef4041265dc", + "parents": [ + "b0d784841be997c93773ff79d464bce57dd1967c" + ], + "subject": "修复：校准集成运行手册与退出码契约" + } + ], + "files": [ + { + "status": "M", + "path": "AGENTS.md" + }, + { + "status": "M", + "path": "docs/git-version-management.md" + }, + { + "status": "A", + "path": "docs/sherlock-multi-session-integration-runbook.md" + }, + { + "status": "M", + "path": "package.json" + }, + { + "status": "A", + "path": "scripts/create-sherlock-session-handoff.mjs" + }, + { + "status": "A", + "path": "scripts/lib/sherlock-active-batch.d.mts" + }, + { + "status": "A", + "path": "scripts/lib/sherlock-active-batch.mjs" + }, + { + "status": "A", + "path": "scripts/lib/sherlock-git-state.d.mts" + }, + { + "status": "A", + "path": "scripts/lib/sherlock-git-state.mjs" + }, + { + "status": "A", + "path": "scripts/lib/sherlock-integration-cli-outcome.d.mts" + }, + { + "status": "A", + "path": "scripts/lib/sherlock-integration-cli-outcome.mjs" + }, + { + "status": "A", + "path": "scripts/lib/sherlock-integration-executor.d.mts" + }, + { + "status": "A", + "path": "scripts/lib/sherlock-integration-executor.mjs" + }, + { + "status": "A", + "path": "scripts/lib/sherlock-integration-model.d.mts" + }, + { + "status": "A", + "path": "scripts/lib/sherlock-integration-model.mjs" + }, + { + "status": "A", + "path": "scripts/lib/sherlock-integration-preflight.d.mts" + }, + { + "status": "A", + "path": "scripts/lib/sherlock-integration-preflight.mjs" + }, + { + "status": "A", + "path": "scripts/lib/sherlock-shared-source-gate.d.mts" + }, + { + "status": "A", + "path": "scripts/lib/sherlock-shared-source-gate.mjs" + }, + { + "status": "A", + "path": "scripts/manage-sherlock-integration.mjs" + }, + { + "status": "M", + "path": "scripts/verify-formal-git-state.mjs" + }, + { + "status": "A", + "path": "scripts/verify-sherlock-integration.mjs" + }, + { + "status": "A", + "path": "test/active-integration-lease.test.ts" + }, + { + "status": "M", + "path": "test/formal-git-state.test.ts" + }, + { + "status": "A", + "path": "test/git-workflow-state.test.ts" + }, + { + "status": "A", + "path": "test/helpers/git-workflow-fixture.ts" + }, + { + "status": "A", + "path": "test/integration-batch.test.ts" + }, + { + "status": "A", + "path": "test/integration-cli-contract.test.ts" + }, + { + "status": "A", + "path": "test/integration-executor.test.ts" + }, + { + "status": "A", + "path": "test/session-handoff.test.ts" + }, + { + "status": "A", + "path": "test/shared-source-gate.test.ts" + }, + { + "status": "A", + "path": "vitest.config.ts" + } + ], + "checks": [ + { + "argv": [ + "npx", + "vitest", + "run", + "test/integration-cli-contract.test.ts" + ], + "outcome": "passed", + "summary": "Task 9 CLI contract 6/6", + "verifiedCommit": "61585d482ad1ed9eb31435b53148aef4041265dc", + "completedAt": "2026-08-31T03:51:47.000Z", + "timeoutMs": 120000 + }, + { + "argv": [ + "npx", + "vitest", + "run", + "test/formal-git-state.test.ts", + "test/git-local-policy.test.ts" + ], + "outcome": "passed", + "summary": "Task 9 formal/local policy 12/12", + "verifiedCommit": "61585d482ad1ed9eb31435b53148aef4041265dc", + "completedAt": "2026-08-31T03:51:47.000Z", + "timeoutMs": 120000 + }, + { + "argv": [ + "npm", + "run", + "typecheck" + ], + "outcome": "passed", + "summary": "Task 9 typecheck", + "verifiedCommit": "61585d482ad1ed9eb31435b53148aef4041265dc", + "completedAt": "2026-08-31T03:51:47.000Z", + "timeoutMs": 120000 + } + ], + "uiVerification": { + "outcome": "not-applicable", + "summary": "local Git workflow tooling has no client UI" + }, + "acceptanceCriteria": [ + "功能交接精确绑定 61585d482ad1ed9eb31435b53148aef4041265dc", + "集成仅重跑 Task 9 聚焦检查与类型检查", + "验收和晋升在用户明确接受前保持待定" + ], + "risks": [ + "canonical main 的 dist-local-0.7.4/ 未跟踪输出将阻止后续正式晋升源码清洁门禁，需由外部处理" + ], + "generatedAt": "2026-08-31T03:51:47.000Z" + }, + "merged": { + "mergeCommit": "06f193405e640ddfb2b104023f0e946cb0546ded", + "verificationCommit": "06f193405e640ddfb2b104023f0e946cb0546ded", + "checks": [ + { + "argv": [ + "npx", + "vitest", + "run", + "test/integration-cli-contract.test.ts" + ], + "outcome": "passed", + "summary": "已在暂存合并树执行：npx vitest run test/integration-cli-contract.test.ts", + "verifiedCommit": "06f193405e640ddfb2b104023f0e946cb0546ded", + "completedAt": "2026-08-31T04:05:01.205Z", + "timeoutMs": 120000 + }, + { + "argv": [ + "npx", + "vitest", + "run", + "test/formal-git-state.test.ts", + "test/git-local-policy.test.ts" + ], + "outcome": "passed", + "summary": "已在暂存合并树执行：npx vitest run test/formal-git-state.test.ts test/git-local-policy.test.ts", + "verifiedCommit": "06f193405e640ddfb2b104023f0e946cb0546ded", + "completedAt": "2026-08-31T04:05:01.205Z", + "timeoutMs": 120000 + }, + { + "argv": [ + "npm", + "run", + "typecheck" + ], + "outcome": "passed", + "summary": "已在暂存合并树执行：npm run typecheck", + "verifiedCommit": "06f193405e640ddfb2b104023f0e946cb0546ded", + "completedAt": "2026-08-31T04:05:01.205Z", + "timeoutMs": 120000 + } + ], + "recordedAt": "2026-08-31T04:05:01.205Z" + } + } + ], + "integrationChecks": [ + { + "argv": [ + "npx", + "vitest", + "run", + "test/integration-cli-contract.test.ts" + ], + "timeoutMs": 120000 + }, + { + "argv": [ + "npx", + "vitest", + "run", + "test/formal-git-state.test.ts", + "test/git-local-policy.test.ts" + ], + "timeoutMs": 120000 + }, + { + "argv": [ + "npm", + "run", + "typecheck" + ], + "timeoutMs": 120000 + } + ], + "mainSynchronizations": [] +} diff --git a/config/sherlock-integration-batches/20260902-01.json b/config/sherlock-integration-batches/20260902-01.json new file mode 100644 index 000000000..a867a89bf --- /dev/null +++ b/config/sherlock-integration-batches/20260902-01.json @@ -0,0 +1,709 @@ +{ + "schemaVersion": 1, + "batchId": "20260902-01", + "branch": "codex/integration/20260902-01", + "baseMainCommit": "92ffca452ff50ec7eef0ffe8c0006a30e2454845", + "expectedMainCommit": "92ffca452ff50ec7eef0ffe8c0006a30e2454845", + "createdAt": "2026-09-01T23:02:52.715Z", + "features": [ + { + "handoff": { + "schemaVersion": 1, + "featureName": "研究画布链接与智能容器修复", + "branch": "codex/feat/research-selection-actions-20260831", + "baseCommit": "92ffca452ff50ec7eef0ffe8c0006a30e2454845", + "tipCommit": "9de649c477b5002835f5dae1333888ff158b7ccf", + "commits": [ + { + "commit": "420595a9f79087dbec07b5a964c7ed3c9ea0e8fe", + "parents": [ + "92ffca452ff50ec7eef0ffe8c0006a30e2454845" + ], + "subject": "功能：新增研究画布选中内容生成工具栏" + }, + { + "commit": "73f17a0431ba69127f2b1bea0d48bd11a348284d", + "parents": [ + "420595a9f79087dbec07b5a964c7ed3c9ea0e8fe" + ], + "subject": "功能：完善研究画布思维导图生成模式" + }, + { + "commit": "b2eef021b7173ceecfe3737c96fa56285001f683", + "parents": [ + "73f17a0431ba69127f2b1bea0d48bd11a348284d" + ], + "subject": "修正：限制简要思维导图节点密度" + }, + { + "commit": "96c8c05fc99d6d935e15e1ad4b0563fd3b2d47cb", + "parents": [ + "b2eef021b7173ceecfe3737c96fa56285001f683" + ], + "subject": "修正：优化思维导图组件框与横向布局" + }, + { + "commit": "015755aed38a06d53f80ffe3192733553e0167f5", + "parents": [ + "96c8c05fc99d6d935e15e1ad4b0563fd3b2d47cb" + ], + "subject": "修正：重建研究画布依赖补丁" + }, + { + "commit": "415f9161fe25d6083a9fa146039d6113af6436db", + "parents": [ + "015755aed38a06d53f80ffe3192733553e0167f5" + ], + "subject": "修正：统一思维导图组件顶栏样式" + }, + { + "commit": "8326e6c3dce414c52f5c197ff928d2ec1215c47d", + "parents": [ + "415f9161fe25d6083a9fa146039d6113af6436db" + ], + "subject": "修复：连接复杂思维导图根节点" + }, + { + "commit": "c17fc5dff8479199046674ad4b4eaf82fdd13df1", + "parents": [ + "8326e6c3dce414c52f5c197ff928d2ec1215c47d" + ], + "subject": "修复：允许未激活窗口首次点击搜索" + }, + { + "commit": "eadd9450cf716cd58713ae3d86984543899a4c78", + "parents": [ + "c17fc5dff8479199046674ad4b4eaf82fdd13df1" + ], + "subject": "修复：显示侧栏搜索框并优化导图文字排版" + }, + { + "commit": "1b04dcf7aca47c31f08130b757fe5173bceff2a5", + "parents": [ + "eadd9450cf716cd58713ae3d86984543899a4c78" + ], + "subject": "设计：画布生成任务独立并发执行" + }, + { + "commit": "f412e892f4aa62986e05119391c3bf662ddb697f", + "parents": [ + "1b04dcf7aca47c31f08130b757fe5173bceff2a5" + ], + "subject": "文档：明确排队任务子会话标识可选" + }, + { + "commit": "4841258a1b95e355aba285fc2a14a414c76a4572", + "parents": [ + "f412e892f4aa62986e05119391c3bf662ddb697f" + ], + "subject": "计划：拆解画布独立生成任务实施步骤" + }, + { + "commit": "de5ba62b359735a0f7004a12117cb3c9704fe441", + "parents": [ + "4841258a1b95e355aba285fc2a14a414c76a4572" + ], + "subject": "功能：定义画布生成任务服务契约" + }, + { + "commit": "42acef46a033a3e0976f6d2bc471005600fb486b", + "parents": [ + "de5ba62b359735a0f7004a12117cb3c9704fe441" + ], + "subject": "功能：支持画布任务四路并发调度" + }, + { + "commit": "33b8f7d22e446c165552a76cc89921643d46da60", + "parents": [ + "42acef46a033a3e0976f6d2bc471005600fb486b" + ], + "subject": "功能：接入画布子任务运行与恢复服务" + }, + { + "commit": "51d4a341dee40af855b6e26f4343ebcea3c89973", + "parents": [ + "33b8f7d22e446c165552a76cc89921643d46da60" + ], + "subject": "构建：打包画布生成任务运行服务" + }, + { + "commit": "5f9a3271788d74a07c49d1c9cace7f7e0a320ea8", + "parents": [ + "51d4a341dee40af855b6e26f4343ebcea3c89973" + ], + "subject": "修复：确保画布任务终态可被客户端接收" + }, + { + "commit": "19fd1035daf3fb8a06e13e9e0311fe562bc69b6e", + "parents": [ + "5f9a3271788d74a07c49d1c9cace7f7e0a320ea8" + ], + "subject": "功能：在画布组件内并发执行生成任务" + }, + { + "commit": "a7bc2d2efa38a57cbf645922f5d8e52a7f747a39", + "parents": [ + "19fd1035daf3fb8a06e13e9e0311fe562bc69b6e" + ], + "subject": "修复：启动画布任务并持续同步状态" + }, + { + "commit": "e9543254aa1396450baebdf44e93ce1de79b4297", + "parents": [ + "a7bc2d2efa38a57cbf645922f5d8e52a7f747a39" + ], + "subject": "修复：通过宿主会话解析器启动画布任务" + }, + { + "commit": "84bf22c6e576d8596f4799a4a531fc877669b72b", + "parents": [ + "e9543254aa1396450baebdf44e93ce1de79b4297" + ], + "subject": "修复：隔离画布任务的外部工具能力" + }, + { + "commit": "85829a0fb7a0a08927b79cf3cc08ab5919c14284", + "parents": [ + "84bf22c6e576d8596f4799a4a531fc877669b72b" + ], + "subject": "优化：紧凑显示已发送的引用标签" + }, + { + "commit": "5590be1741511da600ea60101443418b784b5f3e", + "parents": [ + "85829a0fb7a0a08927b79cf3cc08ab5919c14284" + ], + "subject": "修复：回收文件生成结果并紧凑排列引用标签" + }, + { + "commit": "bed9fa322125046f89003fb80408df53efe6087a", + "parents": [ + "5590be1741511da600ea60101443418b784b5f3e" + ], + "subject": "完善：研究标签显示类型图标并支持画布定位" + }, + { + "commit": "3d3a26c5aca6c1b66cd907a46403c50b5f9d4643", + "parents": [ + "bed9fa322125046f89003fb80408df53efe6087a" + ], + "subject": "修复：支持从PPT组件生成思维导图" + }, + { + "commit": "925d7f70305c31c271590b4041c0ef90e434abf9", + "parents": [ + "3d3a26c5aca6c1b66cd907a46403c50b5f9d4643" + ], + "subject": "功能：支持编辑思维导图节点并统一短语对齐" + }, + { + "commit": "173797b4db0ed2a0f04e497fa1cacaae1fde4387", + "parents": [ + "925d7f70305c31c271590b4041c0ef90e434abf9" + ], + "subject": "功能：支持整理画布并全选全部组件" + }, + { + "commit": "2e480a238bc521f4b71a146b4000bcc58ff91e13", + "parents": [ + "173797b4db0ed2a0f04e497fa1cacaae1fde4387" + ], + "subject": "功能：支持编辑总结提炼内容" + }, + { + "commit": "aa1a55497df9e39602637d1dbc8a484bfa9cfc44", + "parents": [ + "2e480a238bc521f4b71a146b4000bcc58ff91e13" + ], + "subject": "文档：规划研究画布全局功能栏" + }, + { + "commit": "a9dea0f4d922770598df041d65dd0de1cac7c159", + "parents": [ + "aa1a55497df9e39602637d1dbc8a484bfa9cfc44" + ], + "subject": "功能：建立研究网页组件安全边界" + }, + { + "commit": "4e73b381de1146dee3b7fb4ef3e541a1d892f72a", + "parents": [ + "a9dea0f4d922770598df041d65dd0de1cac7c159" + ], + "subject": "功能：支持智能容器独立生成任务" + }, + { + "commit": "2d2c73f390896eda223dd0536fac153af974572d", + "parents": [ + "4e73b381de1146dee3b7fb4ef3e541a1d892f72a" + ], + "subject": "功能：新增研究画布链接与智能容器" + }, + { + "commit": "853dd68898d3f3b165e3b37e9a195e88acaae081", + "parents": [ + "2d2c73f390896eda223dd0536fac153af974572d" + ], + "subject": "构建：设置本地测试版版本为 0.7.6" + }, + { + "commit": "dc4de5c9ea3c2e936d9683ecdf7cf51f4e653a76", + "parents": [ + "853dd68898d3f3b165e3b37e9a195e88acaae081" + ], + "subject": "修复：规范化链接组件中的网址空格" + }, + { + "commit": "2c62f89b6c80edef839c2b6be9c98ce3480d2c62", + "parents": [ + "dc4de5c9ea3c2e936d9683ecdf7cf51f4e653a76" + ], + "subject": "设计：明确研究组件标题自适应与下载方案" + }, + { + "commit": "a902791ee694b857f30e16fce98d1464bd79ba85", + "parents": [ + "2c62f89b6c80edef839c2b6be9c98ce3480d2c62" + ], + "subject": "设计：补充微信文章安全阅读视图" + }, + { + "commit": "4b5ae8a0bfa8d000d71af8b1acc895c4edcd4b27", + "parents": [ + "a902791ee694b857f30e16fce98d1464bd79ba85" + ], + "subject": "计划：拆分研究网页体验与组件下载实施" + }, + { + "commit": "f42136eb7e6cbc66001497699dff0eaa0471a30f", + "parents": [ + "4b5ae8a0bfa8d000d71af8b1acc895c4edcd4b27" + ], + "subject": "功能：新增微信文章安全阅读服务" + }, + { + "commit": "e9fe95e3a9f686d10e07e6f571fbe0392896265e", + "parents": [ + "f42136eb7e6cbc66001497699dff0eaa0471a30f" + ], + "subject": "功能：扩展研究网页检查与阅读桥" + }, + { + "commit": "413267fdbc09410734c115cc70bae7464a03531b", + "parents": [ + "e9fe95e3a9f686d10e07e6f571fbe0392896265e" + ], + "subject": "功能：持久化网页标题并计算自适应布局" + }, + { + "commit": "93cb88ebcbc1ec2b504a9e9a50292b3b090cb56b", + "parents": [ + "413267fdbc09410734c115cc70bae7464a03531b" + ], + "subject": "修复：自适应展示网页并错开画布底栏" + }, + { + "commit": "6258cdc9b5210577637f7c1343fff834ebc219bd", + "parents": [ + "93cb88ebcbc1ec2b504a9e9a50292b3b090cb56b" + ], + "subject": "功能：新增研究组件安全下载服务" + }, + { + "commit": "ea7cf0275bdcc51f3d13cb359c8272c784189238", + "parents": [ + "6258cdc9b5210577637f7c1343fff834ebc219bd" + ], + "subject": "功能：按组件类型生成下载描述" + }, + { + "commit": "4b4903d506764c3b4a8a24e64392aeb08f9473c5", + "parents": [ + "ea7cf0275bdcc51f3d13cb359c8272c784189238" + ], + "subject": "功能：思维导图支持矢量与图片下载" + }, + { + "commit": "9d1a7043798cf720c13e7b3550024aae9fa640cb", + "parents": [ + "4b4903d506764c3b4a8a24e64392aeb08f9473c5" + ], + "subject": "功能：所有研究组件增加下载入口" + }, + { + "commit": "803f04605c0b7b89ba873a40155e11749bc69139", + "parents": [ + "9d1a7043798cf720c13e7b3550024aae9fa640cb" + ], + "subject": "修复：原生生成监控容器并读取微信正文" + }, + { + "commit": "a21da56404896561c43f227b05cf6960b02077fc", + "parents": [ + "803f04605c0b7b89ba873a40155e11749bc69139" + ], + "subject": "优化：缩小画布底栏并放宽缩放下限" + }, + { + "commit": "56c60e12a5b8dcedde886e6094d17856fa0f25be", + "parents": [ + "a21da56404896561c43f227b05cf6960b02077fc" + ], + "subject": "优化：整理画布改为内容自适应混合平铺" + }, + { + "commit": "5cf401cfe9c279273d7c30de87768e83108b806b", + "parents": [ + "56c60e12a5b8dcedde886e6094d17856fa0f25be" + ], + "subject": "修复：恢复链接读取与智能容器生成" + }, + { + "commit": "2293083892654886da57b2046c414d849a96ebc1", + "parents": [ + "5cf401cfe9c279273d7c30de87768e83108b806b" + ], + "subject": "修复：补齐微信文章组件读取授权" + }, + { + "commit": "9de649c477b5002835f5dae1333888ff158b7ccf", + "parents": [ + "2293083892654886da57b2046c414d849a96ebc1" + ], + "subject": "修复：消除微信链接组件读取竞态" + } + ], + "files": [ + { + "status": "M", + "path": "build/dsh-desktop.patch.yml" + }, + { + "status": "M", + "path": "build/harness-node-entry.mjs" + }, + { + "status": "M", + "path": "build/sherlock-bundled-plugins.json" + }, + { + "status": "A", + "path": "docs/superpowers/plans/2026-09-01-research-canvas-downloads.md" + }, + { + "status": "A", + "path": "docs/superpowers/plans/2026-09-01-research-canvas-global-toolbar.md" + }, + { + "status": "A", + "path": "docs/superpowers/plans/2026-09-01-research-canvas-isolated-generation-tasks.md" + }, + { + "status": "A", + "path": "docs/superpowers/plans/2026-09-01-research-web-link-experience.md" + }, + { + "status": "A", + "path": "docs/superpowers/specs/2026-09-01-research-canvas-global-toolbar-design.md" + }, + { + "status": "A", + "path": "docs/superpowers/specs/2026-09-01-research-canvas-isolated-generation-tasks-design.md" + }, + { + "status": "A", + "path": "docs/superpowers/specs/2026-09-01-research-canvas-title-resize-download-design.md" + }, + { + "status": "M", + "path": "package-lock.json" + }, + { + "status": "M", + "path": "package.json" + }, + { + "status": "A", + "path": "packages/dsh-research-task-runtime/index.js" + }, + { + "status": "A", + "path": "packages/dsh-research-task-runtime/package.json" + }, + { + "status": "M", + "path": "patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch" + }, + { + "status": "M", + "path": "patches/@deepseek-ai+dsh-client-ui-workspace+0.1.0-rc.7.patch" + }, + { + "status": "M", + "path": "src/main/index.ts" + }, + { + "status": "M", + "path": "src/main/runtime/harness-runtime.ts" + }, + { + "status": "M", + "path": "src/main/security.ts" + }, + { + "status": "A", + "path": "src/main/state/research-canvas-export.ts" + }, + { + "status": "M", + "path": "src/main/state/research-file-preview.ts" + }, + { + "status": "A", + "path": "src/main/state/research-link-frame.ts" + }, + { + "status": "A", + "path": "src/main/state/research-web-reader.ts" + }, + { + "status": "M", + "path": "src/preload/index.ts" + }, + { + "status": "A", + "path": "src/preload/research-canvas-export.ts" + }, + { + "status": "A", + "path": "src/preload/research-link-frame.ts" + }, + { + "status": "A", + "path": "src/preload/research-web-reader.ts" + }, + { + "status": "M", + "path": "test/bundled-plugin-profile.test.ts" + }, + { + "status": "M", + "path": "test/dsh-file-drop-compat.test.ts" + }, + { + "status": "M", + "path": "test/harness-bundled-package-resolution.test.ts" + }, + { + "status": "A", + "path": "test/research-canvas-export.test.ts" + }, + { + "status": "M", + "path": "test/research-file-drop.test.ts" + }, + { + "status": "M", + "path": "test/research-file-preview.test.ts" + }, + { + "status": "A", + "path": "test/research-link-frame.test.ts" + }, + { + "status": "A", + "path": "test/research-task-runtime.test.js" + }, + { + "status": "A", + "path": "test/research-web-reader.test.ts" + }, + { + "status": "M", + "path": "test/runtime.test.ts" + }, + { + "status": "M", + "path": "test/security.test.ts" + }, + { + "status": "M", + "path": "test/sherlock-composer-workspace-ui.test.ts" + }, + { + "status": "M", + "path": "test/sidebar-vibrancy.test.ts" + } + ], + "checks": [ + { + "argv": [ + "npx", + "vitest", + "run", + "test/research-web-reader.test.ts", + "test/research-task-runtime.test.js" + ], + "outcome": "passed", + "summary": "网页读取与容器任务运行时 41 项聚焦测试通过", + "verifiedCommit": "9de649c477b5002835f5dae1333888ff158b7ccf", + "completedAt": "2026-09-01T23:01:52.000Z", + "timeoutMs": 120000 + }, + { + "argv": [ + "npx", + "vitest", + "run", + "test/sherlock-composer-workspace-ui.test.ts", + "-t", + "(renders public WeChat articles through the scriptless safe reader|keeps responsive web viewport scaling|uses the authorized frame name|renders generated container)" + ], + "outcome": "passed", + "summary": "微信链接单次授权读取与画布链接容器聚焦测试通过", + "verifiedCommit": "9de649c477b5002835f5dae1333888ff158b7ccf", + "completedAt": "2026-09-01T23:01:52.000Z", + "timeoutMs": 120000 + }, + { + "argv": [ + "npm", + "run", + "typecheck" + ], + "outcome": "passed", + "summary": "TypeScript 类型检查通过", + "verifiedCommit": "9de649c477b5002835f5dae1333888ff158b7ccf", + "completedAt": "2026-09-01T23:01:52.000Z", + "timeoutMs": 120000 + }, + { + "argv": [ + "npm", + "run", + "build" + ], + "outcome": "passed", + "summary": "Electron Vite 构建通过", + "verifiedCommit": "9de649c477b5002835f5dae1333888ff158b7ccf", + "completedAt": "2026-09-01T23:01:52.000Z", + "timeoutMs": 120000 + } + ], + "uiVerification": { + "outcome": "passed", + "summary": "受控渲染已验证微信文章仅授权读取一次并显示安全正文；真实打包客户端仍将作为最终验收门。" + }, + "acceptanceCriteria": [ + "微信文章链接在组件内显示真实标题与安全阅读正文", + "微信标题回写不触发重复授权或失败态", + "智能容器任务完成后显示原生 KPI 图表表格或文字组件" + ], + "risks": [ + "外部网站仍可能因网络或服务端策略临时不可用", + "真实客户端验证前不得接受或晋升该批次" + ], + "generatedAt": "2026-09-01T23:01:52.000Z" + }, + "merged": { + "mergeCommit": "0eda55171b2acd81b99003966d94fa85821a839f", + "verificationCommit": "0eda55171b2acd81b99003966d94fa85821a839f", + "checks": [ + { + "argv": [ + "npx", + "vitest", + "run", + "test/research-web-reader.test.ts", + "test/research-task-runtime.test.js" + ], + "outcome": "passed", + "summary": "已在暂存合并树执行：npx vitest run test/research-web-reader.test.ts test/research-task-runtime.test.js", + "verifiedCommit": "0eda55171b2acd81b99003966d94fa85821a839f", + "completedAt": "2026-09-01T23:12:52.558Z", + "timeoutMs": 120000 + }, + { + "argv": [ + "npx", + "vitest", + "run", + "test/sherlock-composer-workspace-ui.test.ts", + "-t", + "(renders public WeChat articles through the scriptless safe reader|keeps responsive web viewport scaling|uses the authorized frame name|renders generated container)" + ], + "outcome": "passed", + "summary": "已在暂存合并树执行：npx vitest run test/sherlock-composer-workspace-ui.test.ts -t (renders public WeChat articles through the scriptless safe reader|keeps responsive web viewport scaling|uses the authorized frame name|renders generated container)", + "verifiedCommit": "0eda55171b2acd81b99003966d94fa85821a839f", + "completedAt": "2026-09-01T23:12:52.558Z", + "timeoutMs": 120000 + }, + { + "argv": [ + "npm", + "run", + "typecheck" + ], + "outcome": "passed", + "summary": "已在暂存合并树执行：npm run typecheck", + "verifiedCommit": "0eda55171b2acd81b99003966d94fa85821a839f", + "completedAt": "2026-09-01T23:12:52.558Z", + "timeoutMs": 120000 + }, + { + "argv": [ + "npm", + "run", + "build" + ], + "outcome": "passed", + "summary": "已在暂存合并树执行：npm run build", + "verifiedCommit": "0eda55171b2acd81b99003966d94fa85821a839f", + "completedAt": "2026-09-01T23:12:52.558Z", + "timeoutMs": 120000 + } + ], + "recordedAt": "2026-09-01T23:12:52.558Z" + } + } + ], + "integrationChecks": [ + { + "argv": [ + "npx", + "vitest", + "run", + "test/research-web-reader.test.ts", + "test/research-task-runtime.test.js" + ], + "timeoutMs": 120000 + }, + { + "argv": [ + "npx", + "vitest", + "run", + "test/sherlock-composer-workspace-ui.test.ts", + "-t", + "(renders public WeChat articles through the scriptless safe reader|keeps responsive web viewport scaling|uses the authorized frame name|renders generated container)" + ], + "timeoutMs": 120000 + }, + { + "argv": [ + "npm", + "run", + "typecheck" + ], + "timeoutMs": 120000 + }, + { + "argv": [ + "npm", + "run", + "build" + ], + "timeoutMs": 120000 + } + ], + "mainSynchronizations": [] +} diff --git a/config/sherlock-integration-batches/20260902-02.json b/config/sherlock-integration-batches/20260902-02.json new file mode 100644 index 000000000..80d4d846d --- /dev/null +++ b/config/sherlock-integration-batches/20260902-02.json @@ -0,0 +1,104 @@ +{ + "schemaVersion": 1, + "batchId": "20260902-02", + "branch": "codex/integration/20260902-02", + "baseMainCommit": "5b1373bcc0a11105a92814c1ebb53e6059c509e0", + "expectedMainCommit": "5b1373bcc0a11105a92814c1ebb53e6059c509e0", + "createdAt": "2026-09-01T23:54:01.813Z", + "features": [ + { + "handoff": { + "schemaVersion": 1, + "featureName": "研究画布 0.7.6 实机验收记录", + "branch": "codex/feat/research-selection-actions-qa-20260831", + "baseCommit": "92ffca452ff50ec7eef0ffe8c0006a30e2454845", + "tipCommit": "87348b34f93d02431e436271ced716c84c903983", + "commits": [ + { + "commit": "b2836276a47c3bb514d22aed1b7407067eee04a4", + "parents": [ + "92ffca452ff50ec7eef0ffe8c0006a30e2454845" + ], + "subject": "验证：记录研究组件生成工具栏实机设计验收" + }, + { + "commit": "56a010933430ea9911769dc81aaa0f620687177a", + "parents": [ + "b2836276a47c3bb514d22aed1b7407067eee04a4" + ], + "subject": "文档：记录思维导图顶栏视觉复核" + }, + { + "commit": "87348b34f93d02431e436271ced716c84c903983", + "parents": [ + "56a010933430ea9911769dc81aaa0f620687177a" + ], + "subject": "文档：记录复杂导图连线与搜索焦点复核" + } + ], + "files": [ + { + "status": "M", + "path": "design-qa.md" + } + ], + "checks": [ + { + "argv": [ + "git", + "diff", + "--check", + "92ffca452ff50ec7eef0ffe8c0006a30e2454845..87348b34f93d02431e436271ced716c84c903983" + ], + "outcome": "passed", + "summary": "三条实机验收记录的差异格式检查通过", + "verifiedCommit": "87348b34f93d02431e436271ced716c84c903983", + "completedAt": "2026-09-01T23:53:36Z", + "timeoutMs": 30000 + } + ], + "uiVerification": { + "outcome": "passed", + "summary": "记录了研究组件生成工具栏、思维导图顶栏、复杂导图连线与侧栏搜索焦点的真实客户端复核。" + }, + "acceptanceCriteria": [ + "保留 0.7.6 研究画布相关实机验收证据。" + ], + "risks": [], + "generatedAt": "2026-09-01T23:53:36Z" + }, + "merged": { + "mergeCommit": "8b327b961ed6fd559388c7b25b5928fb10871bf3", + "verificationCommit": "8b327b961ed6fd559388c7b25b5928fb10871bf3", + "checks": [ + { + "argv": [ + "git", + "diff", + "--check", + "92ffca452ff50ec7eef0ffe8c0006a30e2454845..87348b34f93d02431e436271ced716c84c903983" + ], + "outcome": "passed", + "summary": "已在暂存合并树执行：git diff --check 92ffca452ff50ec7eef0ffe8c0006a30e2454845..87348b34f93d02431e436271ced716c84c903983", + "verifiedCommit": "8b327b961ed6fd559388c7b25b5928fb10871bf3", + "completedAt": "2026-09-01T23:54:14.904Z", + "timeoutMs": 30000 + } + ], + "recordedAt": "2026-09-01T23:54:14.904Z" + } + } + ], + "integrationChecks": [ + { + "argv": [ + "git", + "diff", + "--check", + "92ffca452ff50ec7eef0ffe8c0006a30e2454845..87348b34f93d02431e436271ced716c84c903983" + ], + "timeoutMs": 30000 + } + ], + "mainSynchronizations": [] +} diff --git a/config/sherlock-r2-release-inventory.json b/config/sherlock-r2-release-inventory.json new file mode 100644 index 000000000..c0d730965 --- /dev/null +++ b/config/sherlock-r2-release-inventory.json @@ -0,0 +1,52 @@ +{ + "schemaVersion": 1, + "releases": { + "0.6.3": [ + "releases/v0.6.3/sherlock-mac-arm64.dmg", + "releases/v0.6.3/sherlock-mac-arm64.zip", + "releases/v0.6.3/sherlock-mac-arm64.zip.blockmap" + ], + "0.6.4": [ + "releases/v0.6.4/sherlock-mac-arm64-legacy.zip", + "releases/v0.6.4/sherlock-mac-arm64-legacy.zip.blockmap", + "releases/v0.6.4/sherlock-mac-arm64.dmg", + "releases/v0.6.4/sherlock-mac-arm64.zip", + "releases/v0.6.4/sherlock-mac-arm64.zip.blockmap" + ], + "0.6.5": [ + "releases/v0.6.5/sherlock-mac-arm64-legacy.zip", + "releases/v0.6.5/sherlock-mac-arm64-legacy.zip.blockmap", + "releases/v0.6.5/sherlock-mac-arm64.dmg", + "releases/v0.6.5/sherlock-mac-arm64.zip", + "releases/v0.6.5/sherlock-mac-arm64.zip.blockmap" + ], + "0.6.6": [ + "releases/v0.6.6/sherlock-mac-arm64-legacy.zip", + "releases/v0.6.6/sherlock-mac-arm64-legacy.zip.blockmap", + "releases/v0.6.6/sherlock-mac-arm64.dmg", + "releases/v0.6.6/sherlock-mac-arm64.zip", + "releases/v0.6.6/sherlock-mac-arm64.zip.blockmap" + ], + "0.6.8": [ + "releases/v0.6.8/sherlock-mac-arm64-legacy.zip", + "releases/v0.6.8/sherlock-mac-arm64-legacy.zip.blockmap", + "releases/v0.6.8/sherlock-mac-arm64.dmg", + "releases/v0.6.8/sherlock-mac-arm64.zip", + "releases/v0.6.8/sherlock-mac-arm64.zip.blockmap" + ], + "0.7.3": [ + "releases/v0.7.3/sherlock-mac-arm64-legacy.zip", + "releases/v0.7.3/sherlock-mac-arm64-legacy.zip.blockmap", + "releases/v0.7.3/sherlock-mac-arm64.dmg", + "releases/v0.7.3/sherlock-mac-arm64.zip", + "releases/v0.7.3/sherlock-mac-arm64.zip.blockmap" + ], + "0.7.6": [ + "releases/v0.7.6/sherlock-mac-arm64-legacy.zip", + "releases/v0.7.6/sherlock-mac-arm64-legacy.zip.blockmap", + "releases/v0.7.6/sherlock-mac-arm64.dmg", + "releases/v0.7.6/sherlock-mac-arm64.zip", + "releases/v0.7.6/sherlock-mac-arm64.zip.blockmap" + ] + } +} diff --git a/design-qa.md b/design-qa.md new file mode 100644 index 000000000..ea7fcc89a --- /dev/null +++ b/design-qa.md @@ -0,0 +1,168 @@ +# 研究模式全局右栏与画布文件设计 QA + +## 设计基线 + +- 研究模式成品参考：`/var/folders/rm/jy4dz49s171fl1dxd9qr3hh80000gp/T/codex-clipboard-310aa5f4-0744-4807-b91a-f143b116f511.png`。 +- 对话模式全局侧边栏顶栏参考：`/var/folders/rm/jy4dz49s171fl1dxd9qr3hh80000gp/T/codex-clipboard-44e987c8-76f5-4c9c-a2c9-b18f61d47e87.png`。 +- 窄屏问题参考：`/var/folders/rm/jy4dz49s171fl1dxd9qr3hh80000gp/T/codex-clipboard-1deab8b3-3fdf-4558-b2e0-80cf70dd1033.png`。 +- 当前宽屏实机图：`/tmp/sherlock-research-global-wide.png`，1178 × 768 px。 +- 当前窄屏实机图：`/tmp/sherlock-research-global-narrow.png`，900 × 768 px。 +- 精确应用路径：`/Users/heyafeng/Documents/ChatGPT/dsh/.worktrees/research-canvas-file-drop/dist-notarized/mac-arm64/Sherlock.app`。 + +## 全局右侧栏 + +- Research 不再创建私有右栏，而是复用 `dsh-better-sidebar` 的全局页签、分栏、折叠和宽度状态。 +- 进入 Research 自动展开右栏；离开时恢复进入前的页签、开关和宽度状态。 +- `对话` 固定在最左侧，不能关闭、不能拖动；现有 `Files` 及后续页签排列在它后面，仍使用原有关闭和新建页签交互。 +- 真实应用可访问性树顺序为 `对话`、`Files`、`新建标签页`；关闭按钮只属于 `Files`，`对话` 没有关闭控件。 +- 消息历史、执行过程、消息动作、统计和同一个 composer 完整迁入右栏；中央只保留点阵画布，不再出现底部重复输入框。 + +## 画布文件与输入附件 + +- 画布文件支持单选、Shift/Command 增选、空白区域框选、多选、单卡拖动和整组拖动，位置及选择状态按会话持久化。 +- 选中的文件同步为输入框附件标签；标签仅保留文件名和删除按钮，不再显示左右移动箭头。标签可直接拖动排序，删除标签只取消本次附件，不会删除画布节点或磁盘文件。 +- 已选画布节点支持 `Delete` / `Backspace` 删除，也支持右键 `从画布删除`；删除只更新画布状态，不会删除源文件。 +- 实机已验证右键菜单准确显示 `从画布删除`，并已通过 `Delete` 删除测试卡片；源目录临时测试文件随后清理，未发生磁盘联动删除。 +- Computer Use 无法稳定构造 Electron 自定义 `DataTransfer` MIME，因此 Finder/Files → 画布拖入和真实文件标签的像素状态未冒充为实机自动验证；对应行为由聚焦测试覆盖，当前测试包保持打开供手动拖入复核。 + +## 响应式比较 + +- 在与窄屏参考同一比较输入中检查当前 900 × 768 实机图：右栏内容自然换行，长路径限制在消息列内，动作行和输入框不再互相覆盖。 +- 窄窗时左侧工作区导航自动收为图标栏，中央画布仍保有可操作宽度；右栏保持统一顶栏和固定底部 composer。 +- 输入框内模型、上下文、访问模式和发送按钮在可用宽度内收缩；状态统计允许裁切/省略，不侵入消息动作区。 +- 宽屏下右栏默认宽度与参考一致地保持稳定，中央画布吸收额外空间；没有重复页签、重复 composer 或水平滚动条。 + +## 运行时修复与验证 + +1. 修复可选全局侧栏过早注入导致 session chat store 重复挂载、应用进入 Harness recovery 的问题；共享 store seat 完成挂载后才接入侧栏。 +2. 修复对话内容直接跨 React 根渲染导致 `slot machinery rendered outside the installed renderer tree`；现在由原会话树创建 portal，右栏仅提供宿主节点。 +3. 为打包插件增加内容指纹；插件代码变化即重新安装用户 profile，避免 manifest/version 未变时继续加载旧实现。 +4. 为已有的可关闭 `对话` 页签增加启动时协调：重新落位到右侧第一个 pane，并更新为固定、不可关闭状态。 +5. 聚焦测试：`research-file-drop`、`sherlock-composer-workspace-ui`、`desktop-shell-controls`、`bundled-plugin-profile` 共 107/107 通过。 +6. `npm run typecheck`、`git diff --check`、应用签名验证均通过；构建明确跳过 Apple 公证，没有上传、改版本或修改公开更新源。 + +## 视觉结论 + +- 现有 Sherlock 深色 token、字体、间距、图标和页签顶栏均直接复用，没有引入第二套研究侧栏视觉。 +- 当前实现解决了参考图 3 中统计信息遮挡消息动作、输入区在窄栏中挤压的主要问题。 +- 同画面对照未发现残留 P0/P1/P2：无裁切正文、无错误页、无重复输入、无可关闭的固定对话页签、无窄屏横向溢出。 + +final result: passed + +## 研究画布选中内容生成工具栏 QA（2026-08-31） + +### 比较证据 + +- Source visual truth: `/var/folders/rm/jy4dz49s171fl1dxd9qr3hh80000gp/T/codex-clipboard-2b9becae-be06-4343-bfce-365bbc4b02e4.png`，556 × 328 px。 +- Rendered implementation: `/tmp/sherlock-research-selection-toolbar-final-622d9ccc.jpeg`，1178 × 768 px；真实本地包 `/Users/heyafeng/Documents/ChatGPT/dsh/.worktrees/integration-20260831-03/dist-notarized/mac-arm64/Sherlock.app`，集成提交 `622d9ccc6f1b97d273492207aecdb3ffd65a73ec`，版本 0.7.5。 +- Viewport: Sherlock 标准窗口 1178 × 768 CSS px；系统截图为 1178 × 768 px，device density normalization 为 1:1。参考图没有可验证的 CSS viewport，因此只比较组件结构、位置、密度、字体层级、图标风格和表面处理，不虚构逐像素比例结论。 +- State: Research 深色主题；一个完整可见的 PDF 组件处于选中状态，工具栏位于选择框上方。参考图为浅色主题且包含更多通用画布操作；本实现按用户范围只预置“生成思维导图”“总结提炼”。 +- Full-view comparison: 参考图与实机图已在同一比较输入中以原始分辨率并列检查。实机保留右侧共享对话区、点阵画布和选中描边；工具栏没有挤压或遮挡持久控件。 +- Focused-region comparison: 未另做裁切。两张原始图中的工具栏文字、16 px 图标、边框、圆角、间距和阴影均可直接辨认，继续裁切不会增加判断信息。 + +### Findings + +- 没有残留 P0/P1/P2。工具栏以 42 px 高、13 px 圆角、细边框和轻阴影呈现，中心对齐在选区上方；两个操作均使用 Sherlock 现有图标库与字体 token。深色实现与浅色参考的色面差异来自当前用户主题，语义层级和对比度一致。 +- 字体与排版：13 px 强调字重、图文 6 px 间距，两个中文标签完整显示，无截断、异常换行或字重漂移。 +- 间距与布局：工具栏与选择框保持约 8–10 px 间隔；滚动画布后继续跟随选区。选区贴近或越出视口上缘时，工具栏会优先保持可见，这是有意的边界约束，不作为与完整可见参考状态的视觉偏差。 +- 颜色与 token：深色背景、悬浮表面、边框、文本和蓝色选中描边均复用现有 Sherlock token；未引入第二套颜色体系。 +- 图像与资产：本功能没有新增产品图像；两个图标使用 `IconBranchOutline16` 和 `IconListPenOutline16`，没有自绘 SVG、Emoji 或占位资产。 +- 文案与内容：“生成思维导图”“总结提炼”与用户指定文案一致；`aria-label` 与可见文本一致。 + +### Open Questions + +- 无。参考图中的其他通用操作不在本次范围内，未复制到 Sherlock。 + +### Implementation Checklist + +- [x] 单选组件后显示工具栏；点击画布空白处后隐藏。 +- [x] 框选多组件、选择包围盒与工具栏显隐由聚焦 DOM 测试覆盖。 +- [x] 两项操作进入现有会话队列且不替换未发送草稿。 +- [x] 加载、完成、失败、原位重试和重启中断恢复均由聚焦测试覆盖。 +- [x] 思维导图层级节点/连接结构和总结富文本渲染均由聚焦测试覆盖。 +- [x] 本地包校验、Developer ID 签名和真实 Sherlock 主界面检查通过；明确跳过 Apple 公证、上传、版本变化和源码推送。 + +### Comparison History + +- Pass 1: 初次实机捕获时选中组件本身越出画布上缘，工具栏按可见性约束落在组件可见区域内；该状态与参考图的完整可见选区不等价，没有据此提出错误的像素偏差。 +- Normalization: 通过画布滚动让同一组件完整进入视口，再次选择并捕获 `/tmp/sherlock-research-selection-toolbar-final-622d9ccc.jpeg`。 +- Pass 2: 在等价的完整可见选区状态下，未发现可操作 P0/P1/P2；没有因视觉比较而修改实现。 + +### Follow-up Polish + +- 无阻塞项。若以后扩展第三个以上动作，可沿用同一高度和分组节奏，并在窄视口验证水平碰撞策略。 + +final result: passed + +## 思维导图组件顶栏一致性 QA（2026-09-01） + +- 用户问题参考：`/var/folders/rm/jy4dz49s171fl1dxd9qr3hh80000gp/T/codex-clipboard-b348fbd7-bc32-4c0d-a3d5-4cd1f8200a80.png`，其中思维导图使用了白色特殊顶栏，与普通组件的深色顶栏不一致。 +- 真实本地包：`/Users/heyafeng/Documents/ChatGPT/dsh/.worktrees/integration-20260901-04/dist-notarized/mac-arm64/Sherlock.app`，集成提交 `7dd0d3641e981625dd02a756aa40f7fa0f1f923f`；实机图 `/tmp/sherlock-research-mind-map-final-7dd0d364.jpg`。 +- 参考图与实机图已在同一原始分辨率比较输入中检查。思维导图现在直接复用普通组件顶栏变量，顶栏为一致的深色表面；白色背景仅保留在思维导图内容区。 +- 实机中 PDF、简要思维导图和常规思维导图的顶栏视觉层级一致；标题仍可读，图表白底、蓝色节点及灰色连接线不受影响。 +- 聚焦测试 153/153、`npm run typecheck`、干净依赖重放、包内容校验和 Developer ID 签名校验通过；构建明确跳过 Apple 公证、上传、版本变化和源码推送。 + +final result: passed + +## 常规与详细导图根节点连线 QA（2026-09-01） + +- 用户问题参考：`/var/folders/rm/jy4dz49s171fl1dxd9qr3hh80000gp/T/codex-clipboard-f8663a18-0bf4-4e2b-99a5-38200739808d.png`，复杂子树高度超过组件内容区时，根节点与一级主线之间出现断口。 +- 真实本地包：`/Users/heyafeng/Documents/ChatGPT/dsh/.worktrees/integration-20260901-05/dist-notarized/mac-arm64/Sherlock.app`，精确集成提交 `b7cfdf9e33d6c047d6c4ad4f710f7c42d1910d8f`；实机全图 `/tmp/sherlock-research-mind-map-final-b7cfdf9e.jpg`，复杂导图检查图 `/tmp/sherlock-research-mind-map-standard-crop2-b7cfdf9e.jpg`。 +- 根节点连接段现在由根节点自身在垂直中心向右绘制固定 20 px，根层子树不再用整个超高子树的 50% 高度反推连接位置；嵌套层级仍保留原有父节点到子主线的连接规则。 +- 参考问题图与新包实机图已在同一比较输入中检查。常规/详细模式的根节点、连接段与一级纵向主线连续，未再出现参考图中的空白断口；节点样式、白底、深色普通组件顶栏和后续层级线条保持不变。 +- 同一新包实机点击折叠侧栏的“搜索会话”入口后直接输入 `focusprobe`，文本进入搜索框，证明 `92ffca45` 的指定触发路径仍在；测试文本随后清空。 +- 聚焦测试 153/153、类型检查、干净依赖重放、包校验和 Developer ID 签名校验通过；没有执行全功能测试、公证、上传或发布。 + +final result: passed + +## Research canvas visual components QA (2026-08-28) + +- Exact packaged app: `/Users/heyafeng/Documents/ChatGPT/dsh/.worktrees/research-canvas-file-drop/dist-notarized/mac-arm64/Sherlock.app` (`0.7.3`). The app was built and launched with `./script/build_and_run.sh --verify`; Apple notarization, uploads, the public update feed, version changes, tags, and pushes were intentionally skipped. +- Real packaged new-conversation proof: `/tmp/sherlock-new-conversation-qa.jpeg`. The centered composer keeps the established 780 px card width, the Sherlock logo and loading treatment remain present, and the composer stays anchored instead of joining page scroll. +- Real packaged Research proof: `/tmp/sherlock-research-conversation-qa.jpeg`. Research uses the global right sidebar, keeps `对话` pinned first, shows the selected canvas attachment as an inline composer tag, and renders one 102 px composer card without a second attachment area. +- Real packaged Files proof: `/tmp/sherlock-research-files-qa.jpeg`. The global `Files` tab lists the active workspace files and each file row exposes the packaged draggable source contract; the center remains a pure canvas. +- Live production-frontend rich-message proof: `/tmp/sherlock-research-rich-assistant-qa.jpeg`, served by the packaged app at `127.0.0.1:52220`. `添加到画布` created a 360 × 672 assistant component whose body retained the complete Markdown paragraphs, emphasis, path, table, and source affordance instead of truncating to a summary. +- Exact live geometry at a 1280 × 720 viewport: Chat composer card `780 × 102`; Research sidebar composer card `432 × 102`. Both share the same 36 px editable region and the requested 8 px vertical increase, while Chat preserves the established width and Research narrows only with the global sidebar. +- The live production frontend emitted zero warning/error console entries during the Research, Files, composer, and assistant-component pass. +- Electron Computer Use and browser CUA can move the pointer but do not preserve Chromium's custom HTML5 `DataTransfer` payload or the component pointer-capture sequence. The QA therefore does not claim that a visible cursor movement itself proved Files/Finder drop or corner resize. Those exact paths are instead covered by mounted DOM behavior tests for `application/x-sherlock-file`, secure admission, proportional image geometry, free assistant/HTML geometry, aspect-locked image/PDF geometry, PDF wheel ownership, canvas non-movement, selection/group movement, keyboard/context deletion, session switching, restart restoration, and capability cleanup. +- PDF packaging was separately verified from an isolated dependency install: the library and worker are byte-identical to `pdfjs-dist`, 169 CMaps and 16 standard fonts are staged, no staging remnants remain, and the app excludes the raw dependency/native canvas package. HTML preview remains an opaque `sandbox="allow-scripts"` iframe with exact-token CSP and capability-scoped local subresources. +- Focused feature gate: 4 files, 239/239 tests passed. Sidebar/loading/security regression gate: 5 files, 20/20 tests passed. Main/preload trust gate: 3 files, 9/9 tests passed. Typecheck, `git diff --check`, 24/24 dependency patch replay, package verification, and Developer ID signature verification all passed. + +final result: passed + +## Retired memory plugins and new-turn execution QA (2026-08-27) + +- User references: `/var/folders/rm/jy4dz49s171fl1dxd9qr3hh80000gp/T/codex-clipboard-1898d630-d3fd-40c5-97c4-aa09f56979d5.png` and `/var/folders/rm/jy4dz49s171fl1dxd9qr3hh80000gp/T/codex-clipboard-e30df5a3-2c9f-4877-9b3c-80aebd6f0bef.png`. +- Sherlock 0.7.3 now retires both `dsh-memory-evolve` and `@vectorize-io/hindsight-coding-agents`; neither appears in the active plugin manifest, copied profile modules, copied vendor packages, or profile loader rows. +- The bundled upgrade manifest carries both identifiers as retired plugins. Startup removes their exact directories from `harness/custom-plugins`, including when the current profile fingerprint was already installed, so an existing user upgrade does not keep a stale plugin card. +- Real packaged Settings verification returned zero plugin-list matches for both `hindsight` and `memory evolve`. Visual proof: `/tmp/sherlock-0.7.3-memory-plugins-removed.jpg`. +- The latest real Research turn (`0.7.3 最终功能复验，请仅回复“通过”。`) exposed no `memory` tool, performed no tool call, and ended with the standalone reply `通过`. It also stayed at the conversation tail with the fixed composer visible. Visual proof: `/tmp/sherlock-0.7.3-final-research.jpg`. +- Historical `unknown tool "memory"` rows remain only inside old persisted conversation records; the migration intentionally does not rewrite prior message history or erase user-owned memory data. +- Focused tests, typecheck, package verification, Developer ID signature verification, runtime profile assertions, and real-window checks passed. Notarization, upload, public update-source changes, and source/tag push were intentionally skipped for this local test build. + +final result: passed + +## Memory Evolve removal QA (2026-08-27) + +- User references: `/var/folders/rm/jy4dz49s171fl1dxd9qr3hh80000gp/T/codex-clipboard-a415a313-9878-4faf-a31c-461bdb03d745.png` and `/var/folders/rm/jy4dz49s171fl1dxd9qr3hh80000gp/T/codex-clipboard-c1d1bb37-5c52-41b5-859e-d1ba20c8d4aa.png`. +- Root-cause evidence from the affected persisted session showed Memory Evolve forced a complete reply before its maintenance tool calls and then forced a `dtodo list` check. That ordering caused the useful answer to be grouped into `执行过程`, while an empty todo result induced a second low-value closing reply. +- Memory Evolve is now excluded from both the packaged plugin dependencies and bundles. The 0.7.3 upgrade profile therefore removes its code and injected memory/todo instructions instead of attempting another compatibility patch. +- Existing user-owned memory data remains on disk for recoverability, but the plugin package, tools, UI, and prompt injection are no longer loaded by Sherlock. +- Focused profile tests assert that `dsh-memory-evolve` is absent from both plugin lists and exercise an upgrade from an older profile that contains the plugin. The real 0.7.3 package and installed runtime contain no Memory Evolve directory, while the retired profile remains available in the timestamped rollback backup. +- A real packaged 0.7.3 conversation returned only `0.7.3验证通过` after the collapsed `执行过程`; DOM inspection confirmed the reply is outside the execution `section`, and the rendered message contains no empty-todo status. Live proof: `/tmp/sherlock-0.7.3-live-reply-validation.png`; About/version proof: `/tmp/sherlock-0.7.3-memory-evolve-removed.png`. +- Apple notarization, upload, public update-source changes, and source/tag push were intentionally skipped for this local 0.7.3 test build. + +final result: passed + +## Light theme contrast QA (2026-08-27) + +- User references: `/var/folders/rm/jy4dz49s171fl1dxd9qr3hh80000gp/T/codex-clipboard-e623a2b5-b094-4f54-bb16-035b445c73ef.png` and `/var/folders/rm/jy4dz49s171fl1dxd9qr3hh80000gp/T/codex-clipboard-3e22d756-bb3a-4522-9688-d99b2c0addfb.png`. +- Real packaged Research screenshot: `/var/folders/rm/jy4dz49s171fl1dxd9qr3hh80000gp/T/com.openai.sky.CUAService/Sherlock Screenshot 2026-08-27 at 11.56.59 AM.jpeg`. +- Light-theme inline file tags now use the neutral module surface with dark text and a visible outline; filenames and icons remain readable. +- After the latest visual direction, light-theme user messages use the same neutral module surface as the reference with dark text in both Chat and the Research conversation pane. +- The focused style contract expects tag and message backgrounds at `rgb(245, 246, 247)` with text at `rgb(15, 17, 21)`; packaged visual verification is repeated after each rebuild. +- The light-theme selectors are scoped so the existing dark-theme appearance remains unchanged. +- Clean packaged screenshot after a normal theme restore: `/tmp/sherlock-light-neutral-native.png`. +- The transient gray sidebar was reproduced only after a direct DOM theme-attribute toggle during QA; a clean app restart using the persisted `ui-theme.preference: light` restored the normal sidebar without any sidebar code change. + +final result: passed diff --git a/docs/git-version-management.md b/docs/git-version-management.md new file mode 100644 index 000000000..518e3f7d0 --- /dev/null +++ b/docs/git-version-management.md @@ -0,0 +1,65 @@ +# Sherlock 本地 Git 与版本管理规范 + +## 目标 + +保证每个 session 的开发成果都有可追溯提交，并在正式构建前确认所有准备发布的本地分支都已进入 `main`，避免“开发环境已经修改、正式版仍缺少功能”。本地 `main` 是日常集成权威，不会自动同步上游。 + +## 日常修改 + +1. 每个 session 使用独立的 `codex/<主题>` 分支或 worktree。 +2. 修改完成后只运行本次改动直接影响的聚焦测试。 +3. 只暂存本次修改的文件，禁止使用 `git add -A` 混入其他 session 或用户文件。 +4. 测试通过后必须提交，提交信息必须包含中文并清楚说明修改，例如： + + ```bash + git commit -m "修复：确保正式版加载最新内置 PPT Skill" + ``` + +5. 多 session 功能按 `docs/sherlock-multi-session-integration-runbook.md` 交接、预检、集成和用户接受后，才以 fast-forward 推进本地 `main`。不要删除已合并的临时分支或 worktree；保留它们供验收和恢复检查。 + +## 上游同步 + +日常集成禁止自动 `pull`、`fetch` 后合并、rebase、push 或重写历史。本地 `main` 与上游的差异必须在独立的 `codex/upstream-sync/` 分支中审阅、验证和决定；该审阅不与功能集成、用户接受或正式发布混在同一个任务或提交中。 + +## 三个独立门槛 + +- 集成：交接卡、只读 preflight、lease 和集成分支记录完整功能历史。 +- 接受：用户接受精确 integration tip；它只记录 acceptance，不推进 `main`。 +- 正式发布：仅从干净本地 `main` 运行正式发布手册；签名、公证、Cloudflare 和更新器仍为独立门槛。 + +首次使用或重新克隆仓库后执行： + +```bash +npm run git:policy:install +``` + +该命令启用仓库内 `.githooks/commit-msg`，没有中文说明的提交会被拒绝。 + +## 大版本标签 + +- `1.0.0`、`2.0.0` 等大版本必须在对应正式构建提交上创建本地注释标签，格式固定为大写 `V`： + + ```bash + git tag -a V1.0.0 -m "Sherlock V1.0.0" + ``` + +- 补丁版和普通小版本不强制创建标签。 +- 标签默认只保存在本地。没有用户明确授权时，禁止执行 `git push --tags` 或单独推送版本标签。 + +## 正式构建门禁 + +正式构建前执行： + +```bash +npm run git:formal:verify +``` + +以下任一情况都会阻止正式构建： + +- 当前不在 `main`； +- 存在尚未提交的受 Git 跟踪文件； +- 其他 session 的 worktree 仍有尚未提交的修改； +- 其他本地分支存在尚未合并到 `main` 的提交； +- 当前版本是 `Vx.0.0` 大版本，但当前提交缺少对应的本地注释标签。 + +`./script/build_and_run.sh --formal` 会在读取签名身份、打包或上传公证文件之前自动执行同一检查。 diff --git a/docs/sherlock-formal-parity-spec.md b/docs/sherlock-formal-parity-spec.md new file mode 100644 index 000000000..3fc7df3f9 --- /dev/null +++ b/docs/sherlock-formal-parity-spec.md @@ -0,0 +1,9 @@ +# Sherlock 正式客户端一致性规格 + +- “关于”使用此前已开发的版本：Sherlock 标识、当前版本、更新日志列表，不使用居中图标与一句描述的简化版。 +- 普通模式只显示公共设置和公共会话标签；插件、Agent 预设、插件市场、侧边卡片以及内部调试标签只在开发者模式显示。 +- 正式安装包必须离线内置当前正式客户端的插件基线，包括 `dsh-file-drop`，明确排除 `dsh-memory-evolve` 与 `@vectorize-io/hindsight-coding-agents`，不得依赖本机 Dev 目录。 +- 0.7.3 及后续版本启动时必须卸载上述退役记忆插件，且不得向 Agent 注入或暴露 `memory` 工具。 +- 新安装与升级不得复制模型 API、凭据、会话、工作区或其他用户数据；模型 API 由每位用户自行配置。 +- 输入框必须保留附件上传入口。正式构建目录、分发包内 App 与隔离的新用户安装态必须使用同一插件基线。 +- 本次只完成代码、正式包和本地安装验证，不上传或公开发布。 diff --git a/docs/sherlock-formal-release-runbook.md b/docs/sherlock-formal-release-runbook.md new file mode 100644 index 000000000..46e77bb04 --- /dev/null +++ b/docs/sherlock-formal-release-runbook.md @@ -0,0 +1,313 @@ +# Sherlock 正式版升级发布手册 + +## 触发与默认行为 + +只有用户明确说“更新上传发布正式版”“发布 Sherlock 正式版”“发布大版本”，或明确要求对外发布、让现有用户升级时，才授权执行本手册全部步骤。用户只要求“本地启动看看”“构建给我测试”“测试一下最新版本”时，必须改走 `docs/sherlock-local-test-runbook.md`，不得触发 Apple 公证、Cloudflare 上传或公开更新源变更。 + +正式发布若未指定版本，比较 `package.json` 与公开 `latest-mac.yml` 后，将较高正式版本的补丁号加一。Cloudflare 是正式更新主通道；GitHub Fork 是源码备份通道，不以当前上游 PR 是否可合并作为发布阻塞条件。 + +## 不可破坏的发布约束 + +1. 新版本必须高于线上版本，禁止覆盖已发布版本目录。 +2. macOS 必须同时生成两条通道：`legacy-bridge` ZIP 供已安装 0.6.3 的用户升级，Apple 公证的 DMG/ZIP 供新安装和后续正式更新。禁止用 Developer ID 直接覆盖旧更新源，否则 0.6.3 会拒绝签名变化。 +3. 兼容桥外层签名必须使用 `Sherlock Desktop Update Signing`，指纹 `8B8FCCFB659D94D5C9A9CE2B735EB0FAE457CC7B`；其外层 Info.plist 与指定要求都必须为 `io.dsh.desktop`，内嵌的已公证正式 App 才是 `com.evanarts.sherlock`。 +4. 公证通道必须使用 `Developer ID Application: yafeng he (FAV8TLDK73)`，指纹 `DDFBC7F4DA5EC49721E454BB06329C6D1E8A7B9F`，并通过 Apple notarization、stapling 和 Gatekeeper 检查。 +5. 旧自签名身份备份位于 `/Users/heyafeng/Documents/Sherlock Release Backup/Sherlock-Desktop-Update-Signing-8B8FCCFB.p12`；密码存于 macOS 钥匙串，service 为 `Sherlock Update Signing P12 Backup Password`，account 为 `Sherlock Release Backup`。 +6. 先上传不可变版本资源，再更新公证 DMG 稳定下载别名，最后分别提升 `latest/latest-mac.yml` 与 `notarized/latest/latest-mac.yml`。发布脚本已按此顺序执行。 +7. 不丢弃、覆盖或顺手提交用户的无关改动；禁止 `git add -A`、强推和直接推送上游 `origin/main`。正式构建必须从干净的本地 `main` 提交执行，且不得遗漏其他本地分支中准备发布的提交。 +8. 当前正式渠道是 macOS Apple Silicon。没有同时构建 Intel/Windows 时，不宣称这两个平台已发布。 +9. 已安装 0.6.3 的用户长期走旧证书兼容 feed；新下载用户走 Developer ID 公证 feed。每次发布都必须维护两套签名 ZIP，除非未来另行实现并真实验证签名迁移安装器。 +10. R2 采用滚动版本保留：新版本全部公开验证成功后，只删除 `releases/v*` 中版本号最早的一个目录。禁止删除 `latest/`、`notarized/latest/`、`download/`、当前版本或一次删除多个旧版本；发布或公开验证失败时禁止清理旧版本。 + +## 1. 发布前检查 + +在 `/Users/heyafeng/Documents/ChatGPT/dsh` 中： + +```bash +git status --short --branch +git diff --check +npm run git:formal:verify +security find-identity -v -p codesigning +xcrun notarytool history \ + --key /Users/heyafeng/Downloads/AuthKey_KSJ7725349.p8 \ + --key-id KSJ7725349 \ + --issuer 840d0b5c-4924-4f62-8a86-6201e832a4d6 +curl -fsS https://updates.evanarts.com/latest/latest-mac.yml +curl -fsS https://updates.evanarts.com/notarized/latest/latest-mac.yml +``` + +- 记录工作区已有改动并区分当前开发成果与无关文件；打包使用用户确认的当前开发成果，但只提交发布相关文件。 +- 确认两张钥匙串身份名称和指纹均匹配，并验证 App Store Connect API key 可访问公证历史。旧兼容身份缺失时先从加密 P12 恢复，不能生成新证书代替。恢复密码必须捕获到进程变量，禁止输出到日志： + +```bash +sherlock_signing_keychain="$(security default-keychain -d user | tr -d '\"')" +sherlock_p12_password="$(security find-generic-password \ + -a 'Sherlock Release Backup' \ + -s 'Sherlock Update Signing P12 Backup Password' \ + -w)" +security import \ + '/Users/heyafeng/Documents/Sherlock Release Backup/Sherlock-Desktop-Update-Signing-8B8FCCFB.p12' \ + -k "$sherlock_signing_keychain" \ + -P "$sherlock_p12_password" \ + -T /usr/bin/codesign \ + -T /usr/bin/productbuild +unset sherlock_p12_password +``` + +若导入后身份仍未被识别为有效代码签名身份，停止发布并修复证书信任；不能切换到另一张证书。 + +- 保存线上旧元数据、稳定 DMG 别名和本地旧版 App，以便真实升级测试及异常回滚。必须在正式打包覆盖 `dist` 前执行： + +```bash +sherlock_release_tmp="$(mktemp -d /tmp/sherlock-formal-release.XXXXXX)" +./node_modules/.bin/wrangler r2 object get \ + sherlock-releases/latest/latest-mac.yml \ + --remote \ + --file "$sherlock_release_tmp/previous-legacy-latest-mac.yml" +./node_modules/.bin/wrangler r2 object get \ + sherlock-releases/notarized/latest/latest-mac.yml \ + --remote \ + --file "$sherlock_release_tmp/previous-notarized-latest-mac.yml" || true +./node_modules/.bin/wrangler r2 object get \ + sherlock-releases/download/sherlock-mac-arm64.dmg \ + --remote \ + --file "$sherlock_release_tmp/previous-sherlock-mac-arm64.dmg" +ditto /path/to/verified/Sherlock-0.6.3.app "$sherlock_release_tmp/Sherlock-previous.app" +``` + +## 2. 版本与聚焦验证 + +以下以 `0.6.4` 为例，实际使用计算出的版本： + +```bash +npm version 0.6.4 --no-git-tag-version + +npm test -- \ + test/app-identity.test.ts \ + test/update.test.ts \ + test/update-manager.test.ts \ + test/sidebar-update-control.test.ts \ + test/cloudflare-release.test.ts \ + test/release.test.ts \ + test/macos-self-signed-update.test.ts \ + test/macos-package-runtime.test.ts \ + test/brand-migration.test.ts + +npm run typecheck +npm run build +``` + +聚焦验证通过后，先只暂存本次正式版本相关文件并创建中文本地提交，例如： + +```bash +git commit -m "发布：准备 Sherlock 0.6.4 正式版" +``` + +若版本是 `1.0.0`、`2.0.0` 等大版本，还必须在该提交上创建本地注释标签： + +```bash +git tag -a V1.0.0 -m "Sherlock V1.0.0" +``` + +再次执行 `npm run git:formal:verify`，确认当前是干净的 `main`，其他 worktree 没有未提交修改，也没有其他本地分支包含尚未合并的提交。未经用户明确授权，不得把版本标签推送到远端。 + +增加本次源码改动直接涉及的测试，但不运行全功能测试。任何失败都应先定位修复并重跑相关检查，不能带失败继续发布。 + +## 3. 正式打包与签名验证 + +```bash +./script/build_and_run.sh --formal + +bridge_check="$(mktemp -d /tmp/sherlock-bridge-check.XXXXXX)" +ditto -x -k dist-legacy/sherlock-mac-arm64-legacy.zip "$bridge_check" +/usr/libexec/PlistBuddy -c 'Print :CFBundleIdentifier' \ + "$bridge_check/Sherlock.app/Contents/Info.plist" +codesign --verify --deep --strict --verbose=2 "$bridge_check/Sherlock.app" +codesign --verify --strict \ + -R='identifier "io.dsh.desktop" and certificate root = H"8b8fccfb659d94d5c9a9ce2b735eb0fae457cc7b"' \ + "$bridge_check/Sherlock.app" +/usr/libexec/PlistBuddy -c 'Print :CFBundleIdentifier' \ + "$bridge_check/Sherlock.app/Contents/Resources/Sherlock.app/Contents/Info.plist" +xcrun stapler validate \ + "$bridge_check/Sherlock.app/Contents/Resources/Sherlock.app" +test -x \ + "$bridge_check/Sherlock.app/Contents/Frameworks/Squirrel.framework/Versions/A/Resources/ShipIt" +test -d "$bridge_check/Sherlock.app/Contents/Frameworks/Mantle.framework" +test -d "$bridge_check/Sherlock.app/Contents/Frameworks/ReactiveObjC.framework" + +/usr/libexec/PlistBuddy -c 'Print :CFBundleIdentifier' \ + dist-notarized/mac-arm64/Sherlock.app/Contents/Info.plist +codesign --verify --deep --strict --verbose=2 dist-notarized/mac-arm64/Sherlock.app +xcrun stapler validate dist-notarized/mac-arm64/Sherlock.app +xcrun stapler validate dist-notarized/sherlock-mac-arm64.dmg +spctl --assess --type execute --verbose=2 dist-notarized/mac-arm64/Sherlock.app +spctl --assess --type open --context context:primary-signature --verbose=2 \ + dist-notarized/sherlock-mac-arm64.dmg +hdiutil verify dist-notarized/sherlock-mac-arm64.dmg +``` + +必须确认：兼容桥外层 Info.plist 是 `io.dsh.desktop` 并满足 0.6.3 的旧指定要求，内嵌 App 与公证 App 的 Info.plist 是 `com.evanarts.sherlock`；兼容桥含可执行 ShipIt 及 Squirrel/Mantle/ReactiveObjC；公证 App/DMG 均通过 Apple 验证；`dist-release` 同时包含旧桥 ZIP、公证 ZIP/DMG、两个 `latest-mac.yml`。`--formal` 只能用临时 `--sherlock-user-data-dir` 打开公证版，不能提前迁移用户真实数据。 + +## 4. Cloudflare 预演与正式提升 + +先预演，不写远端： + +```bash +node scripts/publish-cloudflare-release.mjs \ + --bucket sherlock-releases \ + --version 0.6.4 \ + --tag v0.6.4 \ + --assets dist-release \ + --prepared "$sherlock_release_tmp/prepared" \ + --dry-run > "$sherlock_release_tmp/cloudflare-upload-plan.json" +cat "$sherlock_release_tmp/cloudflare-upload-plan.json" +``` + +确认计划中 `immutable` 在前、`stable` 居中、`metadata` 最后，再去掉 `--dry-run` 正式发布。不要手工提前上传 `latest-mac.yml`。 + +正式上传前，对预演列出的每个 `releases/v/...` 不可变 key 执行一次远端存在性检查。目标 key 不存在才允许继续；若已存在，禁止覆盖，也禁止复用该版本号。 + +## 5. 公开更新源验证 + +```bash +curl -fsS https://updates.evanarts.com/latest/latest-mac.yml \ + | grep -F 'version: 0.6.4' +curl -fsS https://updates.evanarts.com/notarized/latest/latest-mac.yml \ + | grep -F 'version: 0.6.4' +curl -fsSI https://updates.evanarts.com/latest/latest-mac.yml \ + | grep -Eiq '^cache-control:.*no-cache' +curl -fsS --range 0-0 -o /dev/null \ + https://updates.evanarts.com/releases/v0.6.4/sherlock-mac-arm64-legacy.zip +curl -fsS --range 0-0 -o /dev/null \ + https://updates.evanarts.com/releases/v0.6.4/sherlock-mac-arm64.zip +curl -fsSI \ + https://updates.evanarts.com/releases/v0.6.4/sherlock-mac-arm64.zip \ + | grep -Eiq '^cache-control:.*immutable' +``` + +先独立验证默认目录迁移恢复逻辑；目标目录可预先存在但不能覆盖其中的新值： + +```bash +migration_root="$sherlock_release_tmp/migration-app-data" +mkdir -p "$migration_root/dsh-desktop/harness" \ + "$migration_root/sherlock-desktop/harness" +printf 'legacy-sentinel' > \ + "$migration_root/dsh-desktop/harness/legacy-sentinel.txt" +printf 'new-settings' > \ + "$migration_root/sherlock-desktop/harness/settings.yaml" +open -na dist-legacy/mac-arm64/Sherlock.app --args \ + "--sherlock-app-data-dir=$migration_root" +# 启动完成后确认 legacy-sentinel 已复制、new-settings 未被覆盖、迁移 marker 已生成。 +``` + +再使用打包前保存的旧正式版做真实自动升级验证，并使用隔离用户数据目录，不能拿用户的正式数据做试验： + +```bash +mkdir -p "$sherlock_release_tmp/update-user-data" +open -na "$sherlock_release_tmp/Sherlock-previous.app" --args \ + --sherlock-user-data-dir="$sherlock_release_tmp/update-user-data" +``` + +写入并记录一个数据哨兵，然后完成发现更新、点击下载、下载完成、确认重启、重新打开为新版本，并确认：版本已更新、Info.plist 已切到 `com.evanarts.sherlock`、同一路径数据哨兵未变化、更新按钮恢复隐藏。该步骤验证真实 updater；上一段单独验证默认 `dsh-desktop → sherlock-desktop` 迁移，禁止把两者混为同一证据。 + +DSH 共存必须使用两个不同哨兵：DSH Desktop 保持 `dsh-desktop`，Sherlock 保持 `sherlock-desktop`，两个进程同时存在且互不改写对方哨兵。 + +从公开稳定地址重新下载 DMG 后执行固定 Gatekeeper 验证： + +```bash +public_dmg="$sherlock_release_tmp/public-sherlock-0.6.4.dmg" +curl -fL https://updates.evanarts.com/download/sherlock-mac-arm64.dmg \ + -o "$public_dmg" +xattr -w com.apple.quarantine '0081;00000000;Safari;' "$public_dmg" +xcrun stapler validate "$public_dmg" +spctl --assess --type open --context context:primary-signature --verbose=2 "$public_dmg" +mount_output="$(hdiutil attach -nobrowse "$public_dmg")" +mount_point="$(printf '%s\n' "$mount_output" | awk '/\/Volumes\// { sub(/^.*\/Volumes\//, "/Volumes/"); print; exit }')" +/usr/libexec/PlistBuddy -c 'Print :CFBundleIdentifier' \ + "$mount_point/Sherlock.app/Contents/Info.plist" +/usr/libexec/PlistBuddy -c 'Print :CFBundleShortVersionString' \ + "$mount_point/Sherlock.app/Contents/Info.plist" | grep -Fx '0.6.4' +xcrun stapler validate "$mount_point/Sherlock.app" +spctl --assess --type execute --verbose=2 "$mount_point/Sherlock.app" +open -na "$mount_point/Sherlock.app" --args \ + "--sherlock-user-data-dir=$sherlock_release_tmp/public-smoke-user-data" +# 等到真实窗口可用且进程稳定后，再执行 detach。 +hdiutil detach "$mount_point" +``` + +首次创建公证 feed 时，没有上一版公证 App，`notarized → new` 真实自动升级标记为不适用。从下一个版本开始必须同时保存上一版公证 App，并对 `/notarized/latest/` 再完成一次真实下载、重启安装和版本确认。 + +若没有旧版测试夹具，必须明确报告未完成，不能把网络检查冒充真实升级验证。真实升级或 Gatekeeper 验证失败属于发布失败，必须分别回滚两个公开元数据入口和稳定 DMG。 + +若发布命令在写入稳定 DMG 后的任何阶段报错、提升后的公开元数据异常，或真实升级失败，立即恢复旧元数据和稳定 DMG 下载别名，再验证公开入口已回到旧版本；不可变版本资源可以保留： + +```bash +./node_modules/.bin/wrangler r2 object put \ + sherlock-releases/latest/latest-mac.yml \ + --remote \ + --file "$sherlock_release_tmp/previous-legacy-latest-mac.yml" \ + --content-type application/yaml \ + --cache-control 'no-cache, max-age=0, must-revalidate' +./node_modules/.bin/wrangler r2 object put \ + sherlock-releases/notarized/latest/latest-mac.yml \ + --remote \ + --file "$sherlock_release_tmp/previous-notarized-latest-mac.yml" \ + --content-type application/yaml \ + --cache-control 'no-cache, max-age=0, must-revalidate' +./node_modules/.bin/wrangler r2 object put \ + sherlock-releases/download/sherlock-mac-arm64.dmg \ + --remote \ + --file "$sherlock_release_tmp/previous-sherlock-mac-arm64.dmg" \ + --content-type application/x-apple-diskimage \ + --cache-control 'no-cache, max-age=0, must-revalidate' +``` + +若发布前 `notarized/latest/latest-mac.yml` 为 404，则不要执行上面的 notarized 元数据恢复命令；应精确删除本次新建的 key： + +```bash +./node_modules/.bin/wrangler r2 object delete \ + sherlock-releases/notarized/latest/latest-mac.yml --remote +``` + +全部公开元数据、不可变资源、真实旧版升级、迁移/共存和 Gatekeeper 检查均成功后，才执行滚动清理。先预演并确认 `deletedVersion` 是服务器中最早的版本，`deleteKeys` 全部严格位于同一个 `releases/v/` 下；再执行正式清理： + +```bash +npm run release:cloudflare:prune-oldest -- \ + --bucket sherlock-releases \ + --version 0.6.4 \ + --plan "$sherlock_release_tmp/cloudflare-upload-plan.json" \ + --inventory config/sherlock-r2-release-inventory.json \ + --dry-run + +npm run release:cloudflare:prune-oldest -- \ + --bucket sherlock-releases \ + --version 0.6.4 \ + --plan "$sherlock_release_tmp/cloudflare-upload-plan.json" \ + --inventory config/sherlock-r2-release-inventory.json +``` + +清理脚本只接受上传预演中标记为 `immutable` 且严格属于当前版本的 key；它逐个精确删除清单中最早版本的对象，并且仅在全部删除成功后更新仓库内的版本清单。若预演版本不符合预期、清单缺失或删除失败，停止清理并保留现场，不能改用模糊前缀或批量删除补救。 + +## 6. 源码同步 + +线上验证成功后，检查是否产生发布清单等新的受跟踪改动；若有，只暂存这些发布相关文件并创建中文提交，例如 `发布：记录 Sherlock 0.6.4 正式发布结果`。推送到： + +```bash +git push https://github.com/hyf901111-design/dsh-desktop.git \ + HEAD:refs/heads/codex/sherlock-cloudflare-updates +``` + +大版本的 `V` 注释标签只保存在本地；当前不要推送任何版本标签，因为 Fork 的完整 GitHub Release Secrets/Runner 尚未配置，远端标签可能触发失败的工作流。GitHub 推送失败不回滚已经验证成功的 Cloudflare 版本；修复认证后重试源码同步。 + +若既有 Fork 发布分支发生非快进分歧，禁止强推，也不要为了 Git 同步改写已经验证的发布提交。把当前发布提交推到新的版本化备份分支，例如： + +```bash +git push https://github.com/hyf901111-design/dsh-desktop.git \ + HEAD:refs/heads/codex/sherlock-cloudflare-updates-0.6.4 +``` + +此时 Cloudflare 发布保持有效，在最终报告中把主发布分支同步标记为待处理，并给出新备份分支链接。 + +## 完成标准 + +最终汇报分别列出：版本与提交、聚焦测试和类型检查、应用/DMG 签名、Cloudflare 元数据与 Range/缓存验证、真实旧版升级验证、R2 最早版本精确清理、GitHub Fork 推送。所有发布步骤成功且无待处理故障后才称为“正式版发布完成”。 diff --git a/docs/sherlock-local-test-runbook.md b/docs/sherlock-local-test-runbook.md new file mode 100644 index 000000000..85712cc8f --- /dev/null +++ b/docs/sherlock-local-test-runbook.md @@ -0,0 +1,42 @@ +# Sherlock 本地测试构建手册 + +## 触发与边界 + +用户说“本地启动看看”“构建给我测试”“测试一下最新版本”或同义表达时，执行本手册。目标是把当前开发成果构建成正式 Sherlock 身份的本地应用并直接打开，供少量开发用户现场测试。 + +本流程必须跳过 Apple 公证，并且不得： + +- 上传 Cloudflare R2 或修改任何公开更新源； +- 递增版本号、生成公开 DMG/ZIP 或清理线上历史版本； +- 推送源码、推送标签或触发正式发布自动化； +- 删除、重置或迁移用户现有的工作区、会话、模型配置和凭据。 + +只有用户明确要求“更新上传发布正式版”“发布 Sherlock 正式版”“发布大版本”或对外发布时，才改走 `docs/sherlock-formal-release-runbook.md`。 + +## 执行步骤 + +1. 检查当前分支和工作区，保留并避开与本次测试无关的用户改动。 +2. 只运行本次修改直接涉及的聚焦测试和类型检查，不运行全功能测试。 +3. 构建并启动本地应用： + +```bash +./script/build_and_run.sh --verify +``` + +该命令会停止旧的 Sherlock/Sherlock Dev 进程；仅在工作区内置 Node 缺失时自动执行 `npm rebuild node`；以 `com.evanarts.sherlock` 身份构建 `dist-notarized/mac-arm64/Sherlock.app`；显式禁用 Apple 公证；检查应用主程序、内置 Node 和深度签名后启动应用。 + +4. 对最终产物运行完整的本地包检查： + +```bash +npm run verify:package:mac -- \ + --app "dist-notarized/mac-arm64/Sherlock.app" +``` + +5. 读取真实 Sherlock 窗口，确认看到工作区、会话和输入框等完整主界面，不得把进程存在、HTTP 可访问或恢复页当作启动成功。确认原有用户数据仍可见，并让应用保持打开供用户测试。 + +## 失败处理 + +- 若工作区 Node 自动恢复失败，停止构建并报告具体路径；不得继续生成已知不完整的包。 +- 若最终包缺少内置 Node，启动脚本必须拒绝打开该包。 +- 若出现“Harness 暂时无法启动”，读取恢复页技术详情和 Harness 日志定位真实错误；不得删除用户数据来规避问题。 +- 本地测试通过只证明当前机器上的构建可测试，不代表已完成 Apple 公证、公开发布或老版本自动升级验证。 diff --git a/docs/sherlock-multi-session-integration-runbook.md b/docs/sherlock-multi-session-integration-runbook.md new file mode 100644 index 000000000..be5819313 --- /dev/null +++ b/docs/sherlock-multi-session-integration-runbook.md @@ -0,0 +1,122 @@ +# Sherlock 多会话集成运行手册 + +本手册从功能 worktree 到本地 `main` 的接受与保留，所有 Git 操作仅限本地。Plan A 的交接、预检、批次、租约和集成工具现在生效；Plan B 的共享客户端源码/来源构建器尚未生效，Plan C 的隔离功能预览尚未生效。在 Plan B 落地前，当前 `AGENTS.md` 的本地测试运行手册继续有效；功能 worktree 绝不能构建或替换共享 Sherlock 客户端。 + +不会在本流程中执行 `pull`、`push`、`rebase`、`reset`、强制删除分支或 worktree。`main` 是本地集成权威；上游同步另见 Git 规范。 + +## 1. 功能分支与交接 + +从当前本地 `main` 创建一个独立 worktree，并在功能完成、源码干净且已完成直接相关验证后作中文提交： + +```bash +git worktree add -b codex/feat/- ../sherlock- main +git -C ../sherlock- commit -m "功能：完成 <功能说明>" +``` + +交接卡绑定完整 base SHA、当前 feature tip 和检查证据： + +```bash +npm run git:handoff -- --repo ../sherlock- --base --metadata ./handoff-metadata.json --output ./handoff-.json --format json +``` + +交接卡不是提交的替代品。分支或 tip 变化、worktree 变脏、提交范围不再精确时，重新运行交接，不能修改旧卡片以伪造新状态。 + +## 2. 建立或接管集成批次 + +集成分支固定为 `codex/integration/-`。新建批次由 canonical `main` 创建 worktree；`--dry-run` 只输出计划，不创建 worktree、分支、清单或租约。 + +```bash +npm run git:integration -- create --repo /absolute/path/to/canonical-main --worktree /absolute/path/to/integration-20260831-01 --batch 20260831-01 --handoff /absolute/path/to/handoff-a.json --checks /absolute/path/to/integration-checks.json --dry-run --json +npm run git:integration:preflight -- --repo /absolute/path/to/canonical-main --phase prepare +npm run git:integration -- create --repo /absolute/path/to/canonical-main --worktree /absolute/path/to/integration-20260831-01 --batch 20260831-01 --handoff /absolute/path/to/handoff-a.json --checks /absolute/path/to/integration-checks.json +``` + +仅当 Git 已登记的同名 integration worktree 精确位于当前本地 `main` tip、没有清单且没有冲突租约时才可接管： + +```bash +npm run git:integration:preflight -- --repo /absolute/path/to/integration-20260831-01 --phase prepare +npm run git:integration -- adopt --repo /absolute/path/to/integration-20260831-01 --batch 20260831-01 --handoff /absolute/path/to/handoff-a.json --checks /absolute/path/to/integration-checks.json +``` + +## 3. 预检、合并与继续 + +每次变更前先运行只读预检。预检的 `--json` 只写 stdout；错误诊断只写 stderr。 + +```bash +npm run git:integration:preflight -- --repo /absolute/path/to/integration-20260831-01 --phase merge --manifest /absolute/path/to/integration-20260831-01/config/sherlock-integration-batches/20260831-01.json --feature codex/feat/- --json +npm run git:integration -- merge --repo /absolute/path/to/integration-20260831-01 --manifest /absolute/path/to/integration-20260831-01/config/sherlock-integration-batches/20260831-01.json --feature codex/feat/- +``` + +若合并冲突，执行器保留冲突和租约，并以 `INTEGRATION CONFLICT` 输出两侧提交上下文。解决冲突后先预检、再继续；不要 abort、reset 或删除现场： + +```bash +npm run git:integration:preflight -- --repo /absolute/path/to/integration-20260831-01 --phase continue --manifest /absolute/path/to/integration-20260831-01/config/sherlock-integration-batches/20260831-01.json --feature codex/feat/- +npm run git:integration -- continue --repo /absolute/path/to/integration-20260831-01 --manifest /absolute/path/to/integration-20260831-01/config/sherlock-integration-batches/20260831-01.json --feature codex/feat/- +``` + +## 4. 所有权恢复与 main 同步 + +中断的 owner 只能在确认同一批次和精确集成 tip 后恢复；不要手改 common-dir lease 或 owner token。 + +```bash +npm run git:integration:preflight -- --repo /absolute/path/to/integration-20260831-01 --phase recover-owner --manifest /absolute/path/to/integration-20260831-01/config/sherlock-integration-batches/20260831-01.json --commit +npm run git:integration -- recover-owner --repo /absolute/path/to/integration-20260831-01 --manifest /absolute/path/to/integration-20260831-01/config/sherlock-integration-batches/20260831-01.json --confirm-batch 20260831-01 --confirm-tip +``` + +若 `main` 已前进，必须先把其变更由执行器记录到批次，随后重新验证合并结果： + +```bash +npm run git:integration:preflight -- --repo /absolute/path/to/integration-20260831-01 --phase sync-main --manifest /absolute/path/to/integration-20260831-01/config/sherlock-integration-batches/20260831-01.json --main-worktree /absolute/path/to/canonical-main +npm run git:integration -- sync-main --repo /absolute/path/to/integration-20260831-01 --manifest /absolute/path/to/integration-20260831-01/config/sherlock-integration-batches/20260831-01.json +``` + +## 5. 接受、晋升与取消 + +用户先在批准的共享客户端中接受精确 integration tip；Plan B 到位前不在 feature worktree 构建共享客户端。接受只记录元数据，不推进 `main`： + +```bash +npm run git:integration:preflight -- --repo /absolute/path/to/integration-20260831-01 --phase accept --manifest /absolute/path/to/integration-20260831-01/config/sherlock-integration-batches/20260831-01.json --commit +npm run git:integration -- accept --repo /absolute/path/to/integration-20260831-01 --manifest /absolute/path/to/integration-20260831-01/config/sherlock-integration-batches/20260831-01.json --commit --confirm-batch 20260831-01 +``` + +只有已接受、clean 且可 fast-forward 的 canonical `main` 才可晋升。先使用 dry run，确认后执行真实晋升： + +```bash +npm run git:integration:preflight -- --repo /absolute/path/to/integration-20260831-01 --phase promote --manifest /absolute/path/to/integration-20260831-01/config/sherlock-integration-batches/20260831-01.json --commit --main-worktree /absolute/path/to/canonical-main +npm run git:integration -- promote --repo /absolute/path/to/integration-20260831-01 --manifest /absolute/path/to/integration-20260831-01/config/sherlock-integration-batches/20260831-01.json --main-worktree /absolute/path/to/canonical-main --confirm-batch 20260831-01 --confirm-tip --dry-run +npm run git:integration -- promote --repo /absolute/path/to/integration-20260831-01 --manifest /absolute/path/to/integration-20260831-01/config/sherlock-integration-batches/20260831-01.json --main-worktree /absolute/path/to/canonical-main --confirm-batch 20260831-01 --confirm-tip +``` + +若用户明确放弃该批次，保留 worktree、分支与记录，仅以显式取消归档租约： + +```bash +npm run git:integration:preflight -- --repo /absolute/path/to/integration-20260831-01 --phase cancel --manifest /absolute/path/to/integration-20260831-01/config/sherlock-integration-batches/20260831-01.json +npm run git:integration -- cancel --repo /absolute/path/to/integration-20260831-01 --manifest /absolute/path/to/integration-20260831-01/config/sherlock-integration-batches/20260831-01.json --confirm-batch 20260831-01 --explicit-cancellation +``` + +## 恢复和保留策略 + +- 保留的冲突：保留 `MERGE_HEAD`、分支和 worktree；修复后执行 `continue`，或由用户明确取消。 +- 部分清单记录或 CAS：不要手改 JSON、lease 或 ref；用同一 manifest 和精确 tip 运行相应 `continue`，必要时 `recover-owner`。`INTEGRATION RECOVERY_REQUIRED` 表示现场仍可检查。 +- 中断所有权：仅使用 `recover-owner` 的 batch/tip 双重确认。token 丢失或状态不精确时保留现场并进行人工审阅。 +- 陈旧的未来构建锁：Plan B 的共享构建锁尚未生效；届时只能由其 runner 诊断并释放确认过的陈旧锁，不能从功能 worktree 绕过来源门禁。 +- 已取消批次：保持取消归档、分支和 worktree 可检查；新需求新建新批次，不复用取消批次。 +- 旧治理前 worktree：不得启动共享客户端。保留以检查或完成独立提交；需要继续开发时，从当前本地 `main` 新建合规 feature worktree 并重新交接。 + +## 稳定退出码与输出 + +| 退出码 | 含义 | stdout / stderr 约定 | +| --- | --- | --- | +| 0 | 成功、帮助或已计划的 dry run | `--json` 为单一 JSON stdout；非 JSON 的成功使用稳定 `INTEGRATION ...` / `PREFLIGHT PASSED` token | +| 1 | 只读预检阻止操作，或 lifecycle 的策略/状态拒绝 | preflight 在 stdout 写 `PREFLIGHT BLOCKED` 和 findings；lifecycle 拒绝的诊断写 stderr，stdout 为空 | +| 2 | 无效 CLI 参数、输入或 schema/执行错误 | 诊断仅写 stderr，stdout 为空 | +| 3 | 保留的合并冲突结果 | 非 JSON lifecycle stdout 以 `INTEGRATION CONFLICT` 开始，并提供冲突提交上下文 | +| 4 | 必须显式恢复的结果 | 非 JSON lifecycle stdout 以 `INTEGRATION RECOVERY_REQUIRED` 开始，现场不会被删除 | + +使用 `--help` 获取可执行参数面： + +```bash +npm run git:handoff -- --help +npm run git:integration:preflight -- --help +npm run git:integration -- --help +``` diff --git a/docs/superpowers/plans/2026-08-24-sherlock-brand-migration.md b/docs/superpowers/plans/2026-08-24-sherlock-brand-migration.md new file mode 100644 index 000000000..1f4bcdf64 --- /dev/null +++ b/docs/superpowers/plans/2026-08-24-sherlock-brand-migration.md @@ -0,0 +1,126 @@ +# Sherlock Brand Migration Implementation Plan + +> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking. + +**Goal:** Migrate every user-visible DeepSeek and DSH client-brand reference to Sherlock while preserving required upstream and persisted-data compatibility identifiers. + +**Architecture:** Treat branding as a presentation and packaging contract. Update Electron-owned surfaces directly, patch bundled upstream UI only at its user-visible strings, and keep a narrow allowlisted compatibility layer for package names, protocol fields, runtime environment variables, and existing data paths. + +**Tech Stack:** Electron 43, TypeScript, Vitest, patch-package, electron-builder + +**Spec:** `docs/superpowers/specs/2026-08-24-sherlock-brand-migration.md` + +## Global Constraints + +- User-visible product branding is exactly `Sherlock` or `Sherlock Dev`. +- External `@deepseek-ai/*` packages and DSH protocol/data identifiers remain compatible. +- Existing `dsh-desktop` user-data directories remain in use so sessions and settings survive the migration. +- Verification is focused; the full unit-test suite is out of scope. + +--- + +### Task 1: Brand migration regression contract + +**Files:** +- Create: `test/brand-migration.test.ts` + +**Interfaces:** +- Consumes: package/build configuration, Electron source, HTML assets, installed upstream UI bundles, and reproducible patch files. +- Produces: a focused Vitest contract that rejects known user-visible legacy brand strings while allowing compatibility identifiers. + +- [ ] **Step 1: Write the failing test** + +Add assertions for Sherlock app/package names, Electron-owned UI copy, embedded web metadata, onboarding copy/provider list, preset copy, and plugin-market copy. + +- [ ] **Step 2: Run test to verify it fails** + +Run: `npx vitest run test/brand-migration.test.ts` + +Expected: FAIL on current DSH Desktop/DeepSeek Harness strings. + +### Task 2: Electron and package surfaces + +**Files:** +- Modify: `package.json` +- Modify: `package-lock.json` +- Modify: `electron-builder.dev.cjs` +- Modify: `src/main/index.ts` +- Modify: `src/main/runtime/harness-runtime.ts` +- Modify: `src/main/runtime/profile-plugin-command.ts` +- Modify: `src/main/plugin-recovery-view.ts` +- Modify: `src/preload/index.ts` +- Modify: `src/preload/update-view.ts` +- Modify: `src/preload/windows-titlebar.ts` +- Modify: `src/main/mobile/lan-mobile-pages.ts` +- Modify: `build/splash.html` +- Modify: `build/plugin-recovery.html` +- Modify: `scripts/verify-packaged-macos.mjs` + +**Interfaces:** +- Consumes: existing compatibility app ID and user-data paths. +- Produces: Sherlock application names, artifacts, menus, dialogs, status copy, and fallback pages. + +- [ ] **Step 1: Replace the Electron-owned presentation strings** + +Use `Sherlock`/`Sherlock Dev` for app names and copy, and `sherlock-*` for new artifact filenames while retaining the existing bundle ID and user-data directories. + +- [ ] **Step 2: Run focused Electron tests** + +Run: `npx vitest run test/brand-migration.test.ts test/release.test.ts test/update.test.ts test/windows-titlebar.test.ts test/plugin-recovery-view.test.ts test/lan-mobile-pages.test.ts` + +Expected: PASS with no legacy user-facing names. + +### Task 3: Embedded web and patched UI surfaces + +**Files:** +- Modify: `scripts/install-brand-assets.mjs` +- Modify: `packages/dsh-desktop-market-installer/client.js` +- Modify: relevant `patches/@deepseek-ai+*.patch` files +- Modify mechanically: corresponding installed `node_modules/@deepseek-ai/*/lib/client.js` files +- Modify: tests covering onboarding, presets, directory/workspace messages, and brand assets + +**Interfaces:** +- Consumes: patch-package's pinned upstream bundle layout. +- Produces: Sherlock-branded document metadata and visible UI copy with reproducible patches. + +- [ ] **Step 1: Replace visible legacy copy in the installed UI bundles** + +Remove the DeepSeek row from Sherlock's first-run provider list, make OpenAI the initial route, and change DSH product copy to Sherlock without renaming protocol fields such as `sourceDshVersion`. + +- [ ] **Step 2: Regenerate the affected patch-package files** + +Run patch-package only for changed pinned packages so unrelated dirty patches remain intact. + +- [ ] **Step 3: Re-run the focused brand tests** + +Run: `npx vitest run test/brand-migration.test.ts test/branding-patch.test.ts test/onboarding-patch.test.ts test/preset-transfer-patch.test.ts test/directory-picker.test.ts test/sherlock-composer-workspace-ui.test.ts test/market-installer.test.js` + +Expected: PASS. + +### Task 4: Build, package, and rendered-client verification + +**Files:** +- Verify: generated `out/**` +- Verify: `dist-dev/mac-arm64/Sherlock Dev.app` + +**Interfaces:** +- Consumes: all migrated source and patches. +- Produces: a runnable Sherlock development client. + +- [ ] **Step 1: Verify static correctness** + +Run: `npm run typecheck && npm run build` + +Expected: both commands exit 0. + +- [ ] **Step 2: Build the macOS development app** + +Run: `npm run package:dev:dir -- --mac --arm64` + +Expected: `dist-dev/mac-arm64/Sherlock Dev.app` exists and passes strict code-sign verification. + +- [ ] **Step 3: Launch and inspect the client** + +Close only an existing Sherlock development instance, launch the new bundle, +bring it to the foreground, and verify the window/app name plus visible +Sherlock branding on the real rendered path. diff --git a/docs/superpowers/plans/2026-08-24-sherlock-cloudflare-updates.md b/docs/superpowers/plans/2026-08-24-sherlock-cloudflare-updates.md new file mode 100644 index 000000000..43d23235a --- /dev/null +++ b/docs/superpowers/plans/2026-08-24-sherlock-cloudflare-updates.md @@ -0,0 +1,660 @@ +# Sherlock Cloudflare Updates Implementation Plan + +> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking. + +**Goal:** Publish Sherlock 0.6.0 as the formal desktop build and provide a lower-right sidebar control that discovers, downloads, verifies, and installs later releases from Cloudflare without Apple Developer or notarization services. + +**Architecture:** Keep `electron-updater` and Squirrel.Mac, but switch discovery to explicit download and render update state through a focused sidebar-control adapter. Sign every macOS formal build with one long-lived self-signed Sherlock identity, upload immutable versioned assets to Cloudflare R2, and promote only rewritten metadata that points at those immutable objects. Preserve GitHub Release and ModelScope so 0.5.0 clients using the legacy endpoint can migrate to 0.6.0. + +**Tech Stack:** Electron 43, TypeScript 5.9, electron-updater 6.8, electron-builder 26, Vitest 4, happy-dom, YAML, Cloudflare R2/Wrangler, GitHub Actions, macOS codesign/Squirrel.Mac. + +**Spec:** `docs/superpowers/specs/2026-08-24-sherlock-cloudflare-updates.md` + +## Global Constraints + +- The release must not depend on Apple Developer ID, Apple notarization, or the Mac App Store. +- The formal version is `0.6.0`; the public legacy feed currently advertises `0.5.0`. +- Preserve production ID `io.dsh.desktop`, product name `Sherlock`, and user-data directory `dsh-desktop`. +- Preserve the isolated `Sherlock Dev` identity and `dsh-desktop-dev` data directory. +- Never commit, print, package, or retain signing private keys, Cloudflare tokens, API credentials, sessions, workspaces, or private plugin profiles. +- Preserve every pre-existing working-tree change; exclude `.playwright-cli/`, `artifacts/`, generated packages, and other temporary evidence from the release commit. +- Use focused feature/release tests, typecheck, build, packaged-runtime checks, and real UI/update verification; do not run the full unit-test suite. +- Publish immutable binaries before mutable metadata; a failed release must leave the prior `latest` metadata active. +- The existing working tree is the source to promote, so do not create an isolated worktree that would omit its development changes. + +--- + +### Task 1: Explicit updater state and main-process download action + +**Files:** +- Modify: `src/main/update/update-state.ts` +- Modify: `src/main/update/update-manager.ts` +- Modify: `src/preload/update-view.ts` +- Modify: `src/shared/contracts.ts` +- Modify: `test/update.test.ts` + +**Interfaces:** +- Consumes: existing `UpdateStatus`, `autoUpdater.checkForUpdates()`, and `autoUpdater.quitAndInstall(false, true)`. +- Produces: `UpdateAction`, `updateAction(status)`, exported `downloadAvailableUpdate(): Promise`, and IPC route `updates:download`. + +- [ ] **Step 1: Write failing state/action tests** + +Add literal behavior cases to `test/update.test.ts`: + +```ts +import { initialUpdateStatus, reduceUpdateStatus } from '../src/main/update/update-state' +import { updateAction } from '../src/preload/update-view' + +it('offers download only after discovery and install only after download', () => { + const idle = initialUpdateStatus('0.5.0') + const available = reduceUpdateStatus(idle, { type: 'available', version: '0.6.0' }) + const downloading = reduceUpdateStatus(available, { type: 'progress', percent: 42.6 }) + const downloaded = reduceUpdateStatus(downloading, { + type: 'downloaded', + version: '0.6.0' + }) + + expect(updateAction(idle)).toEqual({ kind: 'hidden' }) + expect(updateAction(available)).toEqual({ kind: 'download', version: '0.6.0' }) + expect(updateAction(downloading)).toEqual({ kind: 'progress', percent: 42.6 }) + expect(updateAction(downloaded)).toEqual({ kind: 'install', version: '0.6.0' }) +}) + +it('keeps automatic failures hidden and makes manual failures retryable', () => { + const idle = initialUpdateStatus('0.5.0') + const automatic = reduceUpdateStatus(idle, { type: 'error', message: 'offline' }) + const checking = reduceUpdateStatus(idle, { type: 'check', manual: true }) + const manual = reduceUpdateStatus(checking, { type: 'error', message: 'offline' }) + + expect(updateAction(automatic)).toEqual({ kind: 'hidden' }) + expect(updateAction(manual)).toEqual({ kind: 'retry', message: 'offline' }) +}) +``` + +- [ ] **Step 2: Run the tests and verify RED** + +Run: `npm test -- test/update.test.ts` + +Expected: FAIL because `updateAction`/`UpdateAction` do not exist and current automatic failures are presented as global cards. + +- [ ] **Step 3: Implement the minimal action model** + +Add a discriminated union to `src/preload/update-view.ts`: + +```ts +export type UpdateAction = + | { kind: 'hidden' } + | { kind: 'download'; version: string } + | { kind: 'progress'; percent: number } + | { kind: 'install'; version: string } + | { kind: 'retry'; message: string } + +export function updateAction(status: UpdateStatus): UpdateAction { + if (status.phase === 'available' && status.availableVersion) { + return { kind: 'download', version: status.availableVersion } + } + if (status.phase === 'downloading') { + return { kind: 'progress', percent: status.percent ?? 0 } + } + if (status.phase === 'downloaded' && status.availableVersion) { + return { kind: 'install', version: status.availableVersion } + } + if (status.manual && status.phase === 'error') { + return { kind: 'retry', message: status.message ?? '' } + } + return { kind: 'hidden' } +} +``` + +Keep the existing reducer clamping and version preservation. Update `shouldShowUpdate` to delegate to this model instead of showing automatic errors. + +- [ ] **Step 4: Add explicit download IPC behavior** + +In `src/main/update/update-manager.ts`: + +```ts +export async function downloadAvailableUpdate(): Promise { + if (status.phase !== 'available') return getUpdateStatus() + try { + await autoUpdater.downloadUpdate() + } catch (error) { + transition({ type: 'error', message: errorMessage(error) }, true) + } + return getUpdateStatus() +} +``` + +Register `updates:download`, set `autoUpdater.autoDownload = false`, and keep `autoInstallOnAppQuit = true`. Do not call `downloadUpdate()` during discovery. + +- [ ] **Step 5: Run focused tests and typecheck GREEN** + +Run: `npm test -- test/update.test.ts && npm run typecheck` + +Expected: all update tests pass and TypeScript exits 0. + +- [ ] **Step 6: Commit the updater state change** + +```bash +git add src/main/update/update-state.ts src/main/update/update-manager.ts src/preload/update-view.ts src/shared/contracts.ts test/update.test.ts +git commit -m "feat: make Sherlock update downloads explicit" +``` + +### Task 2: Sidebar update control at the requested lower-right position + +**Files:** +- Create: `src/preload/sidebar-update-control.ts` +- Modify: `src/preload/index.ts` +- Modify: `package.json` +- Modify: `package-lock.json` +- Create: `test/sidebar-update-control.test.ts` + +**Interfaces:** +- Consumes: `UpdateAction` and `updateMessage(status, locale)` from `src/preload/update-view.ts`, plus footer selector `[data-dsh-sidebar-footer]`. +- Produces: `SidebarUpdateControl` with `mount(): boolean`, `render(status: UpdateStatus): void`, and constructor callbacks `download`, `install`, and `retry`. + +- [ ] **Step 1: Add the DOM test dependency** + +Run: `npm install --save-dev happy-dom` + +This is test scaffolding only; do not add it to production dependencies. + +- [ ] **Step 2: Write failing real-DOM tests** + +Create `test/sidebar-update-control.test.ts` using a real happy-dom document: + +```ts +import { Window } from 'happy-dom' +import { describe, expect, it, vi } from 'vitest' +import { SidebarUpdateControl } from '../src/preload/sidebar-update-control' + +function fixture() { + const window = new Window() + window.document.body.innerHTML = ` + ` + return window.document +} + +it('mounts a hidden control at the end of the sidebar footer', () => { + const document = fixture() + const control = new SidebarUpdateControl(document, 'zh', { + download: vi.fn(), install: vi.fn(), retry: vi.fn() + }) + + expect(control.mount()).toBe(true) + const footer = document.querySelector('[data-dsh-sidebar-footer]')! + const button = footer.lastElementChild as HTMLButtonElement + expect(button.id).toBe('sherlock-sidebar-update-button') + expect(button.hidden).toBe(true) +}) + +it('shows the blue download action only for an available update', () => { + const document = fixture() + const download = vi.fn() + const control = new SidebarUpdateControl(document, 'zh', { + download, install: vi.fn(), retry: vi.fn() + }) + control.mount() + control.render({ + phase: 'available', currentVersion: '0.5.0', availableVersion: '0.6.0', manual: false + }) + + const button = document.querySelector('#sherlock-sidebar-update-button')! + expect(button.hidden).toBe(false) + expect(button.dataset.action).toBe('download') + expect(button.getAttribute('aria-label')).toBe('下载 Sherlock 0.6.0 更新') + button.click() + expect(download).toHaveBeenCalledOnce() +}) +``` + +Add separate cases for determinate `aria-valuenow="43"`, downloaded confirmation, retry after manual error, and remount after the Harness footer is replaced. + +- [ ] **Step 3: Run the DOM test and verify RED** + +Run: `npm test -- test/sidebar-update-control.test.ts` + +Expected: FAIL because `src/preload/sidebar-update-control.ts` does not exist. + +- [ ] **Step 4: Implement the focused control** + +Create `SidebarUpdateControl` so it: + +- inserts one 36×36 blue circular button as the final footer child; +- uses an inline SVG download arrow for `download`, a progress ring for `progress`, and a restart arrow for `install`; +- remains hidden for the `hidden` action; +- renders one compact panel immediately above the footer for progress, errors, and restart confirmation; +- removes/recreates stale nodes when Harness replaces the sidebar DOM; +- never moves or restyles the existing Settings button. + +Use stable IDs `sherlock-sidebar-update-button`, `sherlock-sidebar-update-panel`, and `sherlock-sidebar-update-style`. + +- [ ] **Step 5: Replace the global update card adapter** + +In `src/preload/index.ts`, construct one control: + +```ts +const sidebarUpdateControl = new SidebarUpdateControl(document, locale, { + download: () => void ipcRenderer.invoke('updates:download'), + install: () => void ipcRenderer.invoke('updates:install'), + retry: () => void ipcRenderer.invoke('desktop-menu:execute', 'check-for-updates') +}) +``` + +Call `mount()` from initialization and the existing mutation observer, and call `render(status)` from `applyStatus`. Remove the fixed global lower-right card code and its closed shadow root. + +- [ ] **Step 6: Run focused DOM/update tests and typecheck GREEN** + +Run: `npm test -- test/sidebar-update-control.test.ts test/update.test.ts && npm run typecheck` + +Expected: all focused tests pass and TypeScript exits 0. + +- [ ] **Step 7: Commit the sidebar control** + +```bash +git add src/preload/sidebar-update-control.ts src/preload/index.ts package.json package-lock.json test/sidebar-update-control.test.ts +git commit -m "feat: add sidebar update control" +``` + +### Task 3: Atomic Cloudflare R2 release preparation and publication + +**Files:** +- Create: `scripts/cloudflare-release-plan.mjs` +- Create: `scripts/publish-cloudflare-release.mjs` +- Modify: `package.json` +- Modify: `package-lock.json` +- Modify: `.gitignore` +- Create: `test/cloudflare-release.test.ts` + +**Interfaces:** +- Consumes: electron-builder artifacts in `release-assets/` and a tag formatted `v`. +- Produces: `buildCloudflareReleasePlan({ version, assetDirectory, outputDirectory })`, rewritten `latest-mac.yml`/`latest.yml`, and ordered upload entries `{ phase, source, key, contentType, cacheControl }`. + +- [ ] **Step 1: Write failing atomic-plan tests** + +Create temp metadata/assets in `test/cloudflare-release.test.ts`, then assert literal results: + +```ts +const plan = await buildCloudflareReleasePlan({ + version: '0.6.0', + assetDirectory: fixtureDirectory, + outputDirectory +}) + +expect(plan.filter((item) => item.phase === 'immutable').map((item) => item.key)).toContain( + 'releases/v0.6.0/sherlock-mac-arm64.zip' +) +expect(parse(await readFile(path.join(outputDirectory, 'latest-mac.yml'), 'utf8')).files[0].url) + .toBe('../releases/v0.6.0/sherlock-mac-arm64.zip') +expect(plan.at(-1)?.key).toBe('latest/latest-mac.yml') +expect(plan.at(-1)?.cacheControl).toBe('no-cache, max-age=0, must-revalidate') +``` + +Also assert rejection of a missing file, hashless metadata, tag/version mismatch, path traversal, and metadata scheduled before immutable assets. + +- [ ] **Step 2: Run the release-plan test and verify RED** + +Run: `npm test -- test/cloudflare-release.test.ts` + +Expected: FAIL because the release-plan module does not exist. + +- [ ] **Step 3: Implement release-plan generation** + +`buildCloudflareReleasePlan` must: + +1. parse source YAML without mutating GitHub/ModelScope copies; +2. validate that every referenced file exists and has a non-empty SHA-512; +3. write Cloudflare-specific metadata with `../releases/v0.6.0/...` URLs; +4. return immutable binaries first, stable `/download/` DMGs second, and `latest/*.yml` metadata last; +5. assign long-lived immutable caching only to versioned objects. + +- [ ] **Step 4: Implement the publisher CLI** + +`scripts/publish-cloudflare-release.mjs` accepts: + +```text +--bucket sherlock-releases --version 0.6.0 --assets release-assets --prepared release-cloudflare +``` + +For each plan entry, invoke the locally pinned Wrangler binary with: + +```text +r2 object put sherlock-releases/ --remote --file --content-type --cache-control +``` + +Support `--dry-run` to print only JSON plan data. Never print environment variables or authentication material. + +- [ ] **Step 5: Run focused tests GREEN** + +Run: `npm test -- test/cloudflare-release.test.ts test/update.test.ts` + +Expected: all tests pass. + +- [ ] **Step 6: Commit Cloudflare release tooling** + +```bash +git add scripts/cloudflare-release-plan.mjs scripts/publish-cloudflare-release.mjs test/cloudflare-release.test.ts package.json package-lock.json .gitignore +git commit -m "feat: publish immutable updates to Cloudflare R2" +``` + +### Task 4: Non-Apple self-signed macOS release identity and CI contract + +**Files:** +- Modify: `scripts/prepare-macos-signing-keychain.mjs` +- Create: `scripts/verify-self-signed-update-identity.mjs` +- Modify: `.github/workflows/release.yml` +- Modify: `test/release.test.ts` +- Create: `test/macos-self-signed-update.test.ts` + +**Interfaces:** +- Consumes: secrets `SHERLOCK_MACOS_CSC_LINK`, `SHERLOCK_MACOS_CSC_KEY_PASSWORD`, `CLOUDFLARE_API_TOKEN`, and `CLOUDFLARE_ACCOUNT_ID`. +- Produces: temporary-keychain outputs `keychain`, `certificate`, `keychain_list`, and `identity`; two macOS packages signed with the same non-Apple designated requirement; Cloudflare publish after GitHub/ModelScope copies. + +- [ ] **Step 1: Write a failing real-signature compatibility test** + +Create `test/macos-self-signed-update.test.ts` that runs only on Darwin and executes: + +```ts +const { stdout } = await execFile(process.execPath, [ + path.join(projectRoot, 'scripts', 'verify-self-signed-update-identity.mjs') +]) +expect(stdout).toContain('SELF_SIGNED_UPDATE_IDENTITY_OK') +``` + +The verifier must use a temporary directory/keychain, create a short-lived fixture identity, sign two different binaries with the same identifier, extract the first designated requirement, verify the second against it, restore the original keychain list, delete the temporary keychain/files, and print no private material. + +- [ ] **Step 2: Run and verify RED** + +Run: `npm test -- test/macos-self-signed-update.test.ts` + +Expected: FAIL because the verifier script does not exist. + +- [ ] **Step 3: Implement and pass the signature compatibility probe** + +Implement with `node:child_process`, `node:fs/promises`, OpenSSL, `security`, and `codesign`. Validate the temp path prefix before cleanup. Use certificate extensions `keyUsage=digitalSignature` and `extendedKeyUsage=codeSigning`. + +Run: `npm test -- test/macos-self-signed-update.test.ts` + +Expected: PASS with `SELF_SIGNED_UPDATE_IDENTITY_OK`; afterward, `security list-keychains -d user` must match the pre-test list. + +- [ ] **Step 4: Generalize temporary-keychain preparation** + +Remove the hard-coded Apple Developer ID intermediate download from `prepare-macos-signing-keychain.mjs`. Import the supplied P12, trust it for code signing in the temporary keychain, select the exact `Sherlock Desktop Update Signing` identity, append its hash/name to `GITHUB_OUTPUT`, and retain the current always-cleanup behavior. + +- [ ] **Step 5: Replace Apple CI gates with the self-signed contract** + +In both macOS jobs: + +- map `SHERLOCK_MACOS_CSC_LINK` and password into `CSC_LINK`/`CSC_KEY_PASSWORD`; +- remove Apple API key, team ID, `notarytool`, `stapler`, Developer ID lookup, and `spctl` success requirements; +- pass the temporary keychain and selected identity to electron-builder/codesign; +- keep `codesign --verify --deep --strict` for each app and `codesign --verify` for each DMG; +- run focused release/update/brand/runtime tests instead of `npm test` without a path; +- in the publish job, retain GitHub and ModelScope publication, then run the Cloudflare publisher with secrets; +- verify public metadata headers and one byte-range response before declaring the publish job successful. + +- [ ] **Step 6: Update release-contract tests** + +Replace the notarization assertions with literal contract assertions for the four Sherlock/Cloudflare secret names, zero Apple API/notary/stapler commands, two self-signed keychain preparations, deep/strict app verification, versioned Cloudflare publication, and legacy ModelScope mirroring. + +- [ ] **Step 7: Run focused release tests and YAML parse GREEN** + +Run: + +```bash +npm test -- test/release.test.ts test/update.test.ts test/cloudflare-release.test.ts test/macos-self-signed-update.test.ts +node --input-type=module -e "import {readFileSync} from 'node:fs'; import {parse} from 'yaml'; parse(readFileSync('.github/workflows/release.yml','utf8')); console.log('release workflow YAML OK')" +npm run typecheck +``` + +Expected: focused tests pass, workflow YAML parses, and typecheck exits 0. + +- [ ] **Step 8: Commit signing and workflow changes** + +```bash +git add scripts/prepare-macos-signing-keychain.mjs scripts/verify-self-signed-update-identity.mjs .github/workflows/release.yml test/release.test.ts test/macos-self-signed-update.test.ts +git commit -m "ci: sign and publish Sherlock without Apple services" +``` + +### Task 5: Formal version, stable run entrypoint, and current Dev-source promotion + +**Files:** +- Modify: `package.json` +- Modify: `package-lock.json` +- Create: `src/main/app-identity.ts` +- Modify: `src/main/index.ts` +- Create: `test/app-identity.test.ts` +- Create: `script/build_and_run.sh` +- Create: `.codex/environments/environment.toml` +- Modify: current product/resource/patch/test files already present in the working tree +- Modify: `README.md` +- Modify: `README.zh.md` + +**Interfaces:** +- Consumes: all verified current development source and the production builder configuration. +- Produces: source version `0.6.0`, formal `Sherlock.app`/DMG/ZIP, a Codex Run action for the Dev app, and installation instructions for the non-Apple first launch. + +- [ ] **Step 1: Set and verify the formal semantic version** + +Run: `npm version --no-git-tag-version 0.6.0` + +Then run: `npm test -- test/release.test.ts` + +Expected: package and lockfile root versions are both `0.6.0` and the release contract passes. + +- [ ] **Step 2: Write a failing isolated-user-data resolver test** + +Create `test/app-identity.test.ts`: + +```ts +import { describe, expect, it } from 'vitest' +import { resolveDesktopIdentity } from '../src/main/app-identity' + +describe('desktop app identity', () => { + it('keeps formal and development data isolated', () => { + expect(resolveDesktopIdentity('/Users/test/Library/Application Support', false, '')).toEqual({ + name: 'Sherlock', + userData: '/Users/test/Library/Application Support/dsh-desktop' + }) + expect(resolveDesktopIdentity('/Users/test/Library/Application Support', true, '')).toEqual({ + name: 'Sherlock Dev', + userData: '/Users/test/Library/Application Support/dsh-desktop-dev' + }) + }) + + it('allows only an absolute explicit user-data path for an isolated launch', () => { + expect(resolveDesktopIdentity('/Applications', false, '/tmp/sherlock-update-fixture').userData) + .toBe('/tmp/sherlock-update-fixture') + expect(() => resolveDesktopIdentity('/Applications', false, 'relative/path')) + .toThrow('absolute') + }) +}) +``` + +- [ ] **Step 3: Run the resolver test and verify RED** + +Run: `npm test -- test/app-identity.test.ts` + +Expected: FAIL because `src/main/app-identity.ts` does not exist. + +- [ ] **Step 4: Implement and wire the resolver** + +Create the pure `resolveDesktopIdentity(appDataPath, developmentBuild, explicitUserDataPath)` function. In `configureAppIdentity()`, pass `app.commandLine.getSwitchValue('sherlock-user-data-dir')`; validate it through the resolver before calling `app.setPath`. This enables a disposable end-to-end update fixture without changing normal formal/Dev directories. + +Run: `npm test -- test/app-identity.test.ts test/release.test.ts && npm run typecheck` + +Expected: identity tests pass, existing identity contract passes, and typecheck exits 0. + +- [ ] **Step 5: Create the Electron build/run entrypoint** + +Create executable `script/build_and_run.sh` with these modes: + +- default/run: stop only `Sherlock Dev`, run `npm run package:dev:dir`, and open `dist-dev/mac-arm64/Sherlock Dev.app`; +- `--verify`: do the same and confirm `pgrep -x 'Sherlock Dev'`; +- `--debug`: build then launch the packaged executable through LLDB; +- `--logs`: build/open then stream logs for process `Sherlock Dev`; +- `--telemetry`: build/open then stream logs for subsystem/application ID `io.dsh.desktop.dev`; +- `--formal`: require the prepared release identity, build `npm run package:mac:arm64`, and open `dist/mac-arm64/Sherlock.app`. + +Do not delete user data or kill the production app during the default Dev flow. + +- [ ] **Step 6: Wire the Codex Run action** + +Create `.codex/environments/environment.toml` exactly as: + +```toml +# THIS IS AUTOGENERATED. DO NOT EDIT MANUALLY +version = 1 +name = "Sherlock Desktop" + +[setup] +script = "" + +[[actions]] +name = "Run" +icon = "run" +command = "./script/build_and_run.sh" +``` + +- [ ] **Step 7: Add non-Apple installation guidance** + +Document the Apple Silicon DMG route, the one-time Finder right-click → Open step, the sidebar update behavior, and the fact that no App Store/Apple notarization is involved. Do not expose raw R2 object names as the primary human download link. + +- [ ] **Step 8: Audit and stage the current Dev source deliberately** + +Run: + +```bash +git status --short +git diff --check +git diff --stat +``` + +Inspect every untracked path. Stage product code, patches, bundled skills, scripts, focused tests, and accepted design docs. Explicitly leave `.playwright-cli/`, `artifacts/`, build outputs, logs, caches, and private/local state untracked. Do not discard or overwrite any current change. + +- [ ] **Step 9: Run the lean formal-source gate** + +Run only the affected groups: + +```bash +npm test -- \ + test/update.test.ts \ + test/sidebar-update-control.test.ts \ + test/cloudflare-release.test.ts \ + test/macos-self-signed-update.test.ts \ + test/release.test.ts \ + test/brand-migration.test.ts \ + test/bundled-ppt-skill.test.ts \ + test/harness-bundled-package-resolution.test.ts \ + test/macos-package-runtime.test.ts \ + test/developer-mode.test.ts \ + test/developer-mode-state.test.ts \ + test/desktop-shell-controls.test.ts \ + test/app-identity.test.ts +npm run typecheck +npm run build +git diff --cached --check +``` + +Expected: every selected test passes, typecheck/build exit 0, and the staged diff has no whitespace errors. + +- [ ] **Step 10: Commit the promoted formal source** + +```bash +git add package.json package-lock.json src/main/app-identity.ts src/main/index.ts test/app-identity.test.ts script/build_and_run.sh .codex/environments/environment.toml README.md README.zh.md +git commit -m "release: promote Sherlock development source to 0.6.0" +``` + +Include any remaining deliberately staged current-Dev files in this commit; never use `git add -A` until temporary paths have been explicitly excluded. + +### Task 6: Package, publish, and prove the real update path + +**Files:** +- Generated, not committed: `dist/mac-arm64/Sherlock.app` +- Generated, not committed: `dist/sherlock-mac-arm64.dmg` +- Generated, not committed: `dist/sherlock-mac-arm64.zip` +- Generated, not committed: `release-assets/` +- Generated, not committed: `release-cloudflare/` + +**Interfaces:** +- Consumes: release certificate in secure storage, Cloudflare authentication, GitHub authentication, tag `v0.6.0`, and the committed release workflow. +- Produces: public formal installer, live Cloudflare metadata, legacy migration feed, and end-to-end evidence from an older signed fixture to 0.6.0. + +- [ ] **Step 1: Prepare release secrets without exposing them** + +Create/import the long-lived self-signed `Sherlock Desktop Update Signing` identity. Store its encrypted P12 and password in GitHub Actions secrets, then securely delete transient export files. Authenticate Wrangler through the user's browser only if no existing Cloudflare session/token is available; never ask the user to paste tokens into chat. + +- [ ] **Step 2: Create R2 storage and custom domain** + +Create private bucket `sherlock-releases`, bind the Cloudflare custom domain `updates.evanarts.com`, and confirm DNS/TLS. Configure metadata to revalidate and immutable objects to allow long caching. The user selected the accessible `evanarts.com` zone after the signed-in Cloudflare account was found not to contain `dshdesktop.com`. + +- [ ] **Step 3: Build and validate the local formal Apple Silicon package** + +Run: `./script/build_and_run.sh --formal` + +Then run: + +```bash +npm run verify:package:mac -- --app "dist/mac-arm64/Sherlock.app" +codesign --verify --deep --strict --verbose=2 "dist/mac-arm64/Sherlock.app" +codesign -d -r- "dist/mac-arm64/Sherlock.app" +hdiutil verify "dist/sherlock-mac-arm64.dmg" +``` + +Expected: package/runtime verification passes, nested code signatures are valid, the designated requirement names the Sherlock self-signed identity, and the DMG verifies. + +- [ ] **Step 4: Verify the user-visible formal app** + +Launch `dist/mac-arm64/Sherlock.app`, wait for Harness readiness, confirm the production name/version, confirm existing formal data is preserved, confirm no update button appears while 0.6.0 is current, and confirm Settings remains interactive. Do not infer UI state from source or process existence alone. + +- [ ] **Step 5: Push the release commit and tag** + +Run: + +```bash +git push origin main +git tag -a v0.6.0 -m "Sherlock 0.6.0" +git push origin v0.6.0 +``` + +Wait for the release workflow. If any platform/package job fails, fix the narrow cause, rerun its focused gate, and do not promote Cloudflare metadata manually. + +- [ ] **Step 6: Verify all public release gates** + +Confirm separately: + +- GitHub Release contains the expected formal artifacts and update metadata; +- ModelScope `releases/latest` advertises 0.6.0 for legacy 0.5.0 clients; +- `https://updates.evanarts.com/latest/latest-mac.yml` advertises 0.6.0 and versioned ZIP URLs; +- immutable ZIP/DMG URLs support byte ranges and match local sizes/hashes; +- stable human download returns the formal DMG; +- Cloudflare headers have revalidating metadata and immutable versioned payloads. + +- [ ] **Step 7: Exercise a real signed upgrade** + +Build or retrieve an older writable-location fixture signed with the same Sherlock identity and version lower than 0.6.0. Launch it with isolated disposable user data containing a sentinel workspace/session marker. Verify in the rendered client: + +1. the blue download button appears at the right side of the sidebar footer; +2. clicking it starts download and exposes progress; +3. downloaded state offers restart/install; +4. the app relaunches as 0.6.0; +5. the sentinel data remains; +6. the update button is absent after relaunch. + +If the install directory is not writable, verify the documented DMG fallback instead of claiming automatic replacement. + +- [ ] **Step 8: Run the final evidence gate** + +Run fresh: + +```bash +npm test -- test/update.test.ts test/sidebar-update-control.test.ts test/cloudflare-release.test.ts test/macos-self-signed-update.test.ts test/release.test.ts +npm run typecheck +npm run build +npm run verify:package:mac -- --app "dist/mac-arm64/Sherlock.app" +git diff --check +git status --short --branch +``` + +Report separately: source/tests, local formal package, code signature (not Gatekeeper/notarization), Cloudflare promotion, legacy feed, and real old→0.6.0 update. Do not mark the task complete if any required public or user-visible gate remains unresolved. diff --git a/docs/superpowers/plans/2026-08-25-research-canvas-file-drop.md b/docs/superpowers/plans/2026-08-25-research-canvas-file-drop.md new file mode 100644 index 000000000..11a5ba588 --- /dev/null +++ b/docs/superpowers/plans/2026-08-25-research-canvas-file-drop.md @@ -0,0 +1,1078 @@ +# Research Canvas File Drop Implementation Plan + +> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking. + +**Goal:** Let users drop local files from Finder or Sherlock's right details column onto a session-persistent Research canvas at the pointer's world position. + +**Architecture:** Keep file metadata and placement logic inside the conversation package's Research canvas, with a versioned local-storage record per session and one transformed world-content layer. Add a narrow preload adapter around Electron `webUtils.getPathForFile`, and make file-bearing right-details output publish a validated `application/x-sherlock-file` drag payload through the Tool package. + +**Tech Stack:** Electron 43 preload/contextBridge, React 18, HTML Drag and Drop/DataTransfer, browser localStorage, patch-package 8, Vitest 4, Happy DOM, Electron Builder. + +**Spec:** `docs/superpowers/specs/2026-08-25-research-canvas-file-drop-design.md` + +## Global Constraints + +- The internal MIME type is exactly `application/x-sherlock-file`. +- Persistence uses `sherlock.research.canvas.files.v1:` and stores only JSON-safe metadata. +- Finder path resolution uses `webUtils.getPathForFile`; do not add main-process filesystem IPC or read file contents. +- Accepted canvas drops stop propagation so the document-level composer image intake does not also attach them. +- File cards share the current viewport transform and remain aligned with the dotted grid during wheel pan, Space-drag pan, and Command-wheel zoom. +- The first increment adds and displays file cards only. Do not add opening, deletion, selection, linking, or independent card dragging. +- Persist dependency edits in patch-package files, not only in `node_modules`. +- Preserve unrelated working-tree changes and generated directories. Stage only the files named by each task. +- Run focused tests and packaged UI checks only; do not run the full project test suite. + +--- + +## File Structure + +- `src/preload/research-file-path.ts`: pure exception-safe adapter for Electron's DOM File path resolver. +- `src/preload/index.ts`: exposes `dshDesktop.getPathForFile(file)` through the existing frozen desktop bridge. +- `test/research-file-drop.test.ts`: focused bridge and pure canvas/drop-model contract tests. +- `test/sherlock-composer-workspace-ui.test.ts`: Research rendering, theme, composer isolation, and right-details drag-source integration coverage. +- `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js`: installed Research canvas implementation used to regenerate its existing rc.7 patch. +- `patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch`: durable Research canvas implementation. +- `node_modules/@deepseek-ai/dsh-client-ui-tool/lib/client.js`: installed right-details draggable file chip implementation. +- `patches/@deepseek-ai+dsh-client-ui-tool+0.1.0-rc.7.patch`: durable right-details drag-source implementation. + +--- + +### Task 1: Safe Finder File Path Bridge + +**Files:** +- Create: `src/preload/research-file-path.ts` +- Create: `test/research-file-drop.test.ts` +- Modify: `src/preload/index.ts:1-5,136-148` + +**Interfaces:** +- Consumes: Electron `webUtils.getPathForFile(file: File): string`. +- Produces: `safePathForFile(file: File, resolve: (file: File) => unknown): string` and `window.dshDesktop.getPathForFile(file: File): string`. + +- [ ] **Step 1: Write the failing preload contract test** + +```ts +import { readFile } from 'node:fs/promises' +import { createRequire } from 'node:module' +import { runInNewContext } from 'node:vm' +import { describe, expect, it } from 'vitest' + +type ClientBundle = Record +type BundleDescriptor = { + factory(require: (id: string) => unknown): ClientBundle +} + +const requireModule = createRequire(import.meta.url) + +function fakeModule(): unknown { + let fake: unknown + const target = function () {} + fake = new Proxy(target, { + get: () => fake, + apply: () => fake, + construct: () => ({}) + }) + return fake +} + +async function loadClientBundle( + packageName: string, + modules: Record = {} +): Promise { + const source = await readFile( + `node_modules/@deepseek-ai/${packageName}/lib/client.js`, + 'utf8' + ) + const react = requireModule('react') + const jsxRuntime = requireModule('react/jsx-runtime') + let descriptor: BundleDescriptor | undefined + + runInNewContext(source, { + window: { + __ModuleLoader__: { + load(value: BundleDescriptor) { + descriptor = value + } + } + }, + document: undefined + }) + if (descriptor === undefined) throw new Error(`${packageName} did not register`) + + return descriptor.factory((id) => { + if (modules[id] !== undefined) return modules[id] + if (id === 'react') return react + if (id === 'react/jsx-runtime') return jsxRuntime + return fakeModule() + }) +} + +const loadConversationClient = () => + loadClientBundle('dsh-client-ui-conversation') + +describe('Research canvas file drops', () => { + it('exposes Electron webUtils.getPathForFile through the existing desktop bridge', async () => { + const preload = await readFile('src/preload/index.ts', 'utf8') + + expect(preload).toContain("import { contextBridge, ipcRenderer, webUtils } from 'electron'") + expect(preload).toContain('getPathForFile: (file: File): string =>') + expect(preload).toContain('safePathForFile(file, webUtils.getPathForFile)') + }) +}) +``` + +- [ ] **Step 2: Run the focused test and verify RED** + +Run: `npm test -- --run test/research-file-drop.test.ts` + +Expected: FAIL on the first missing `webUtils`/`getPathForFile` source contract. + +- [ ] **Step 3: Add the smallest bridge implementation that satisfies the contract** + +```ts +export type ElectronFilePathResolver = (file: File) => unknown + +export function safePathForFile(file: File, resolve: ElectronFilePathResolver): string { + return resolve(file) as string +} +``` + +Update the Electron import and existing `dshDesktop` object without adding IPC: + +```ts +import { contextBridge, ipcRenderer, webUtils } from 'electron' +import { safePathForFile } from './research-file-path' + +contextBridge.exposeInMainWorld( + 'dshDesktop', + Object.freeze({ + restartHarness: (): Promise<{ ok: boolean }> => ipcRenderer.invoke('harness:restart'), + showItemInFolder: (path: string): Promise<{ ok: boolean }> => + ipcRenderer.invoke('filesystem:show-item-in-folder', path), + getPathForFile: (file: File): string => safePathForFile(file, webUtils.getPathForFile) + }) +) +``` + +- [ ] **Step 4: Run the contract test and verify GREEN** + +Run: `npm test -- --run test/research-file-drop.test.ts` + +Expected: the preload contract test PASS. + +- [ ] **Step 5: Add the failing exception-safe behavior test** + +Add the static import and behavior case: + +```ts +import { safePathForFile } from '../src/preload/research-file-path' + +it('returns a resolved Electron file path and safely absorbs resolver failures', () => { + const file = { name: 'report.pdf' } as File + + expect(safePathForFile(file, () => '/tmp/report.pdf')).toBe('/tmp/report.pdf') + expect(safePathForFile(file, () => undefined)).toBe('') + expect(safePathForFile(file, () => { throw new Error('unavailable') })).toBe('') +}) +``` + +- [ ] **Step 6: Run the behavior test and verify RED** + +Run: `npm test -- --run test/research-file-drop.test.ts` + +Expected: FAIL because the minimal adapter returns `undefined` and propagates a +resolver exception. + +- [ ] **Step 7: Harden the adapter** + +```ts +export function safePathForFile(file: File, resolve: ElectronFilePathResolver): string { + try { + const value = resolve(file) + return typeof value === 'string' ? value : '' + } catch { + return '' + } +} +``` + +- [ ] **Step 8: Verify GREEN and type safety** + +Run: `npm test -- --run test/research-file-drop.test.ts && npm run typecheck` + +Expected: all Research file-drop tests PASS and TypeScript exits 0. + +- [ ] **Step 9: Commit only the bridge unit** + +```bash +git add src/preload/research-file-path.ts src/preload/index.ts test/research-file-drop.test.ts +git commit -m "feat: expose safe research file paths" +``` + +--- + +### Task 2: Pure Drop Parsing, Placement, and Persistence Model + +**Files:** +- Modify: `test/research-file-drop.test.ts` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js:7450-7560` +- Modify: `patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch` + +**Interfaces:** +- Consumes: file descriptors `{ path?: string; name: string; mediaType?: string; source: 'computer' | 'sherlock' }`, current `{ scale, x, y }` viewport, and drop-local pointer coordinates. +- Produces: `parseSherlockFileDrag(raw)`, `researchCanvasOwnsFileDrag(types)`, `researchCanvasDropFiles(transfer, getPathForFile)`, `researchCanvasWorldPoint(viewport, pointer)`, `placeResearchCanvasFiles(nodes, files, point, createId)`, `parseResearchCanvasFileNodes(raw)`, and `researchCanvasStorageKey(sessionId)`. + +- [ ] **Step 1: Add failing tests for trusted parsing and invalid internal data** + +```ts +it('parses only bounded Sherlock file drag payloads', async () => { + const client = await loadConversationClient() + expect(client.parseSherlockFileDrag).toBeTypeOf('function') + if (typeof client.parseSherlockFileDrag !== 'function') return + + expect(client.parseSherlockFileDrag( + '{"path":"/w/report.pdf","name":"report.pdf"}' + )).toEqual({ path: '/w/report.pdf', name: 'report.pdf', source: 'sherlock' }) + expect(client.parseSherlockFileDrag('not-json')).toBeNull() + expect(client.parseSherlockFileDrag('{"path":42,"name":"x"}')).toBeNull() + expect(client.parseSherlockFileDrag(JSON.stringify({ name: 'x'.repeat(513) }))).toBeNull() +}) +``` + +- [ ] **Step 2: Add failing tests for Finder and internal transfer precedence** + +```ts +it('reads Finder files and gives the Sherlock MIME payload precedence', async () => { + const client = await loadConversationClient() + expect(client.researchCanvasDropFiles).toBeTypeOf('function') + if (typeof client.researchCanvasDropFiles !== 'function') return + const transfer = { + files: [{ name: 'finder.pdf', type: 'application/pdf' }], + getData: (type: string) => type === 'application/x-sherlock-file' + ? '{"path":"/w/internal.md","name":"internal.md"}' + : '', + types: ['Files', 'application/x-sherlock-file'] + } + + expect(client.researchCanvasDropFiles(transfer, () => '/tmp/finder.pdf')).toEqual([ + { path: '/w/internal.md', name: 'internal.md', source: 'sherlock' } + ]) + + const finderTransfer = { + files: [ + { name: 'local.pdf', type: 'application/pdf' }, + { name: 'README', type: '' } + ], + getData: () => '', + types: ['Files'] + } + const paths = ['/tmp/local.pdf', ''] + expect(client.researchCanvasDropFiles( + finderTransfer, + () => paths.shift() ?? '' + )).toEqual([ + { + path: '/tmp/local.pdf', name: 'local.pdf', + mediaType: 'application/pdf', source: 'computer' + }, + { name: 'README', source: 'computer' } + ]) +}) +``` + +The same step adds ownership coverage so arbitrary selected text remains outside +the canvas contract: + +```ts +it('owns only Finder files and the exact Sherlock MIME type', async () => { + const client = await loadConversationClient() + expect(client.researchCanvasOwnsFileDrag).toBeTypeOf('function') + if (typeof client.researchCanvasOwnsFileDrag !== 'function') return + + expect(client.researchCanvasOwnsFileDrag(['Files'])).toBe(true) + expect(client.researchCanvasOwnsFileDrag([ + 'application/x-sherlock-file' + ])).toBe(true) + expect(client.researchCanvasOwnsFileDrag(['text/plain'])).toBe(false) +}) +``` + +- [ ] **Step 3: Add failing tests for world placement, stacking, and same-path repositioning** + +```ts +it('places dropped files in world coordinates and repositions a repeated path', async () => { + const client = await loadConversationClient() + expect(client.researchCanvasWorldPoint).toBeTypeOf('function') + expect(client.placeResearchCanvasFiles).toBeTypeOf('function') + if (typeof client.researchCanvasWorldPoint !== 'function' || + typeof client.placeResearchCanvasFiles !== 'function') return + const point = client.researchCanvasWorldPoint( + { scale: 2, x: 40, y: -20 }, + { x: 240, y: 180 } + ) + expect(point).toEqual({ x: 100, y: 100 }) + + const nodes = client.placeResearchCanvasFiles( + [{ id: 'old', path: '/w/a.pdf', name: 'a.pdf', source: 'computer', x: 1, y: 2 }], + [ + { path: '/w/a.pdf', name: 'a.pdf', source: 'computer' }, + { path: '/w/b.md', name: 'b.md', source: 'computer' } + ], + point, + (() => { let n = 0; return () => `new-${++n}` })() + ) + + expect(nodes).toEqual([ + { id: 'old', path: '/w/a.pdf', name: 'a.pdf', source: 'computer', x: 100, y: 100 }, + { id: 'new-1', path: '/w/b.md', name: 'b.md', source: 'computer', x: 118, y: 118 } + ]) +}) +``` + +- [ ] **Step 4: Add failing tests for versioned storage validation** + +```ts +it('loads only finite, well-shaped persisted file nodes', async () => { + const client = await loadConversationClient() + expect(client.researchCanvasStorageKey).toBeTypeOf('function') + expect(client.parseResearchCanvasFileNodes).toBeTypeOf('function') + if (typeof client.researchCanvasStorageKey !== 'function' || + typeof client.parseResearchCanvasFileNodes !== 'function') return + const valid = [{ id: '1', name: 'a.pdf', source: 'computer', x: 12, y: 24 }] + + expect(client.researchCanvasStorageKey('session-7')).toBe( + 'sherlock.research.canvas.files.v1:session-7' + ) + expect(client.parseResearchCanvasFileNodes(JSON.stringify(valid))).toEqual(valid) + expect(client.parseResearchCanvasFileNodes('[{"id":"1","name":"a","source":"computer","x":null,"y":2}]')).toEqual([]) + expect(client.parseResearchCanvasFileNodes('bad-json')).toEqual([]) +}) +``` + +- [ ] **Step 5: Run the model tests and verify RED** + +Run: `npm test -- --run test/research-file-drop.test.ts` + +Expected: FAIL on the first missing exported conversation helper. + +- [ ] **Step 6: Implement constants, validation, parsing, and placement as pure functions** + +Add near the existing Research viewport helpers: + +```js +const SHERLOCK_FILE_DRAG_TYPE = "application/x-sherlock-file"; +const RESEARCH_CANVAS_STORAGE_PREFIX = "sherlock.research.canvas.files.v1:"; +const RESEARCH_CANVAS_FILE_STACK_OFFSET = 18; +const RESEARCH_CANVAS_TEXT_LIMIT = 512; +let researchCanvasFileSequence = 0; + +function createResearchCanvasFileId() { + researchCanvasFileSequence += 1; + return globalThis.crypto?.randomUUID?.() ?? + `research-file-${Date.now()}-${researchCanvasFileSequence}`; +} + +function boundedString(value, optional = false) { + if (value === void 0 && optional) return void 0; + return typeof value === "string" && value.length > 0 && value.length <= RESEARCH_CANVAS_TEXT_LIMIT ? value : null; +} + +function parseSherlockFileDrag(raw) { + try { + const value = JSON.parse(raw); + if (typeof value !== "object" || value === null) return null; + const name = boundedString(value.name); + const path = boundedString(value.path, true); + if (name === null || path === null) return null; + return { ...(path === void 0 ? {} : { path }), name, source: "sherlock" }; + } catch { + return null; + } +} + +function researchCanvasWorldPoint(viewport, pointer) { + return { + x: (pointer.x - viewport.x) / viewport.scale, + y: (pointer.y - viewport.y) / viewport.scale + }; +} + +function researchCanvasOwnsFileDrag(types) { + return Array.from(types ?? []).includes("Files") || + Array.from(types ?? []).includes(SHERLOCK_FILE_DRAG_TYPE); +} + +function researchCanvasDropFiles(transfer, getPathForFile) { + const internal = parseSherlockFileDrag(transfer.getData?.(SHERLOCK_FILE_DRAG_TYPE) ?? ""); + if (internal !== null) return [internal]; + return Array.from(transfer.files ?? []).flatMap((file) => { + const name = boundedString(file.name); + if (name === null) return []; + let resolved = ""; + try { + resolved = getPathForFile(file); + } catch {} + const path = resolved === "" ? void 0 : boundedString(resolved, true); + if (path === null) return []; + const mediaType = file.type === "" ? void 0 : boundedString(file.type, true); + if (mediaType === null) return []; + return [{ + ...(path === void 0 ? {} : { path }), + ...(mediaType === void 0 ? {} : { mediaType }), + name, + source: "computer" + }]; + }); +} + +function placeResearchCanvasFiles(nodes, files, point, createId) { + const next = nodes.slice(); + for (const [index, file] of files.entries()) { + const position = { + x: point.x + index * RESEARCH_CANVAS_FILE_STACK_OFFSET, + y: point.y + index * RESEARCH_CANVAS_FILE_STACK_OFFSET + }; + const found = file.path === void 0 ? -1 : next.findIndex((node) => node.path === file.path); + if (found >= 0) next[found] = { ...next[found], ...file, ...position }; + else next.push({ id: createId(), ...file, ...position }); + } + return next; +} + +function researchCanvasStorageKey(sessionId) { + return `${RESEARCH_CANVAS_STORAGE_PREFIX}${sessionId}`; +} + +function validResearchCanvasFileNode(value) { + if (typeof value !== "object" || value === null) return false; + const source = value.source === "computer" || value.source === "sherlock"; + const optionalPath = value.path === void 0 || boundedString(value.path, true) !== null; + const optionalMedia = value.mediaType === void 0 || boundedString(value.mediaType, true) !== null; + return boundedString(value.id) !== null && boundedString(value.name) !== null && + source && optionalPath && optionalMedia && Number.isFinite(value.x) && Number.isFinite(value.y); +} + +function parseResearchCanvasFileNodes(raw) { + try { + const value = JSON.parse(raw); + return Array.isArray(value) && value.every(validResearchCanvasFileNode) ? value : []; + } catch { + return []; + } +} +``` + +Export `createResearchCanvasFileId` alongside the other pure helpers so tests +can provide their own deterministic id factory while the component uses the +production factory. + +- [ ] **Step 7: Export the pure helpers and verify GREEN** + +Add the helpers to the bundle's existing exports, then run: + +`npm test -- --run test/research-file-drop.test.ts test/sherlock-composer-workspace-ui.test.ts` + +Expected: both focused files PASS. + +- [ ] **Step 8: Persist the installed dependency change and commit** + +```bash +npx patch-package @deepseek-ai/dsh-client-ui-conversation +git add test/research-file-drop.test.ts \ + patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch +git commit -m "feat: model research canvas file drops" +``` + +--- + +### Task 3: Canvas Drop Surface, File Cards, and Session Persistence + +**Files:** +- Modify: `test/sherlock-composer-workspace-ui.test.ts` +- Modify: `test/research-file-drop.test.ts` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js:7460-7650` +- Modify: `patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch` + +**Interfaces:** +- Consumes: Task 1 `window.dshDesktop.getPathForFile`, Task 2 drop/model helpers, standard session-scoped `sessionId`, and current Research viewport state. +- Produces: `ResearchCanvasFileCard`, one transformed `[data-research-content-layer]`, `[data-research-file-card]` nodes, and root-local accepted file drop handlers. + +- [ ] **Step 1: Add a failing render test for the file card and content transform** + +```ts +it('renders a compact file card inside the transformed Research world layer', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation') + expect(client.ResearchCanvasFileCard).toBeTypeOf('function') + expect(client.researchCanvasContentTransform).toBeTypeOf('function') + if (typeof client.ResearchCanvasFileCard !== 'function' || + typeof client.researchCanvasContentTransform !== 'function') return + const FileCard = client.ResearchCanvasFileCard as ComponentType<{ + node: { id: string; path: string; name: string; mediaType: string; source: string; x: number; y: number } + }> + + const html = renderToStaticMarkup(createElement(FileCard, { + node: { + id: 'file-1', path: '/w/report.pdf', name: 'report.pdf', + mediaType: 'application/pdf', source: 'computer', x: 120, y: 80 + } + })) + + expect(html).toContain('data-research-file-card="file-1"') + expect(html).toContain('report.pdf') + expect(html).not.toContain('/w/report.pdf { + const client = await loadConversationClient() + expect(client.loadResearchCanvasFiles).toBeTypeOf('function') + expect(client.saveResearchCanvasFiles).toBeTypeOf('function') + if (typeof client.loadResearchCanvasFiles !== 'function' || + typeof client.saveResearchCanvasFiles !== 'function') return + const values = new Map() + const memoryStorage = { + getItem: (key: string) => values.get(key) ?? null, + setItem: (key: string, value: string) => { values.set(key, value) } + } + const nodes = [{ + id: '1', name: 'a.pdf', source: 'computer', x: 1, y: 2 + }] + + client.saveResearchCanvasFiles(memoryStorage, 's1', nodes) + expect(client.loadResearchCanvasFiles(memoryStorage, 's1')).toEqual(nodes) + + const storage = { + getItem: () => { throw new Error('denied') }, + setItem: () => { throw new Error('full') } + } + + expect(client.loadResearchCanvasFiles(storage, 's1')).toEqual([]) + expect(() => client.saveResearchCanvasFiles(storage, 's1', [ + { id: '1', name: 'a.pdf', source: 'computer', x: 1, y: 2 } + ])).not.toThrow() +}) +``` + +- [ ] **Step 3: Add failing CSS assertions for theme-aware cards and drop feedback** + +Extend the injected Research CSS test: + +```ts +expect(researchCss).toContain('[data-file-drop-active=true]') +expect(researchCss).toContain('.rScV5Q_fileCard') +expect(researchCss).toContain('body[data-ds-dark-theme] .rScV5Q_fileCard') +``` + +- [ ] **Step 4: Run focused UI/model tests and verify RED** + +Run: `npm test -- --run test/research-file-drop.test.ts test/sherlock-composer-workspace-ui.test.ts` + +Expected: FAIL because the file-card component, content transform, safe storage +helpers, and drop-card CSS are absent. + +- [ ] **Step 5: Implement safe storage and the static file card** + +```js +function researchCanvasContentTransform(viewport) { + return `translate(${viewport.x}px, ${viewport.y}px) scale(${viewport.scale})`; +} + +function loadResearchCanvasFiles(storage, sessionId) { + if (storage === null) return []; + try { + return parseResearchCanvasFileNodes(storage.getItem(researchCanvasStorageKey(sessionId)) ?? "[]"); + } catch { + return []; + } +} + +function saveResearchCanvasFiles(storage, sessionId, nodes) { + if (storage === null) return; + try { + storage.setItem(researchCanvasStorageKey(sessionId), JSON.stringify(nodes)); + } catch {} +} + +function researchCanvasStorage() { + try { + return typeof localStorage === "undefined" ? null : localStorage; + } catch { + return null; + } +} + +function researchCanvasFileCaption(node) { + const extension = /\.([^.]+)$/.exec(node.name)?.[1]; + if (extension !== void 0) return extension.slice(0, 12).toUpperCase(); + const media = node.mediaType?.split("/").at(-1); + if (media !== void 0 && media !== "") return media.slice(0, 12).toUpperCase(); + return node.source === "sherlock" ? "SHERLOCK" : "FILE"; +} + +function ResearchCanvasFileCard({ node }) { + return (0, react_jsx_runtime.jsxs)("div", { + className: "rScV5Q_fileCard", + "data-research-file-card": node.id, + title: node.path ?? node.name, + style: { + left: `${node.x}px`, + top: `${node.y}px`, + transform: "translate(-50%, -50%)" + }, + children: [ + (0, react_jsx_runtime.jsx)("svg", { + className: "rScV5Q_fileIcon", + viewBox: "0 0 20 20", + "aria-hidden": true, + children: (0, react_jsx_runtime.jsx)("path", { + d: "M4.5 2.5h6l5 5v10h-11zM10.5 2.5v5h5", + fill: "none", + stroke: "currentColor", + strokeWidth: "1.4", + strokeLinejoin: "round" + }) + }), + (0, react_jsx_runtime.jsxs)("span", { + className: "rScV5Q_fileText", + children: [ + (0, react_jsx_runtime.jsx)("span", { + className: "rScV5Q_fileName", + children: node.name + }), + (0, react_jsx_runtime.jsx)("span", { + className: "rScV5Q_fileCaption", + children: researchCanvasFileCaption(node) + }) + ] + }) + ] + }); +} +``` + +Append these exact responsibilities to the Research CSS string (keep current +grid, theme, composer, divider, pan, and focus rules intact): + +```css +.rScV5Q_contentLayer{pointer-events:none;transform-origin:0 0;position:absolute;inset:0} +.rScV5Q_fileCard{box-sizing:border-box;pointer-events:auto;width:220px;min-height:64px;color:var(--dsw-alias-label-primary);background:var(--dsw-alias-bg-layer-1);border:1px solid var(--dsw-alias-border-l2);border-radius:10px;align-items:center;gap:10px;padding:11px 12px;display:flex;position:absolute;box-shadow:var(--dsw-shadow-lv1)} +.rScV5Q_fileIcon{color:var(--dsw-alias-state-business-primary);flex:none;width:20px;height:20px} +.rScV5Q_fileText{min-width:0;display:flex;flex-direction:column;gap:2px} +.rScV5Q_fileName{text-overflow:ellipsis;white-space:nowrap;overflow:hidden;font:var(--dsw-font-xs-strong-13)} +.rScV5Q_fileCaption{color:var(--dsw-alias-label-tertiary);font:var(--dsw-font-xxs-12)} +.rScV5Q_root[data-file-drop-active=true]{box-shadow:inset 0 0 0 2px color-mix(in srgb,var(--dsw-alias-state-business-primary) 55%,transparent)} +body[data-ds-dark-theme] .rScV5Q_fileCard{background:var(--dsw-alias-bg-layer-2)} +``` + +- [ ] **Step 6: Add the content layer and session-scoped state** + +Change `ResearchCanvas` to accept the session-scoped `sessionId`, lazily load +nodes, and persist after state changes. The `conversation.view` seat is already +session-scoped, so switching sessions remounts this view and runs the lazy load +against the new key; switching away from and back to Research restores from the +same key: + +```js +function ResearchCanvas({ sessionId, t }) { + const storageRef = react.useRef(researchCanvasStorage()); + const [files, setFiles] = react.useState(() => + loadResearchCanvasFiles(storageRef.current, sessionId) + ); + + react.useEffect(() => { + saveResearchCanvasFiles(storageRef.current, sessionId, files); + }, [files, sessionId]); +``` + +Render a child `[data-research-content-layer]` with +`transform: researchCanvasContentTransform(viewport)` and map file nodes to +`ResearchCanvasFileCard`. Set `transform-origin: 0 0` and keep the layer +absolute over the infinite canvas. + +```js +children: (0, react_jsx_runtime.jsx)("div", { + className: "rScV5Q_contentLayer", + "data-research-content-layer": "", + style: { transform: researchCanvasContentTransform(viewport) }, + children: files.map((node) => (0, react_jsx_runtime.jsx)( + ResearchCanvasFileCard, + { node }, + node.id + )) +}) +``` + +- [ ] **Step 7: Add root-local accepted drop listeners** + +Inside the existing Research effect, add drag-depth tracking and these rules: + +```js +const ownsFileDrag = (event) => + researchCanvasOwnsFileDrag(event.dataTransfer?.types); + +const onDrop = (event) => { + if (!ownsFileDrag(event) || event.dataTransfer === null) return; + const dropped = researchCanvasDropFiles( + event.dataTransfer, + (file) => window.dshDesktop?.getPathForFile?.(file) ?? "" + ); + if (dropped.length === 0) return; + event.preventDefault(); + event.stopPropagation(); + const bounds = root.getBoundingClientRect(); + const point = researchCanvasWorldPoint(viewportRef.current, { + x: event.clientX - bounds.left, + y: event.clientY - bounds.top + }); + setFiles((current) => placeResearchCanvasFiles( + current, dropped, point, createResearchCanvasFileId + )); + resetFileDrag(); +}; +``` + +Use a `viewportRef` synchronized during render so the native listener reads the +latest pan/zoom without re-registering. Add/remove `dragenter`, `dragover`, +`dragleave`, and `drop` listeners on the root, reset the highlight on window +blur/dragend and cleanup, and only call `stopPropagation` after a valid parsed +drop is owned. For accepted `dragenter` and `dragover`, call both +`preventDefault()` and `stopPropagation()`, set `dropEffect = "copy"`, and add +`data-file-drop-active="true"`; this prevents the document-level composer from +showing its attachment overlay while the pointer remains over Research. +Accepted `dragleave` also stops propagation and removes the attribute only when +the root-local drag depth returns to zero. Unrecognized drags do not prevent or +stop anything and continue bubbling normally. + +- [ ] **Step 8: Verify GREEN and composer isolation contracts** + +Run: + +`npm test -- --run test/research-file-drop.test.ts test/sherlock-composer-workspace-ui.test.ts` + +Expected: all focused tests PASS, including existing composer-background, +theme, zoom, Space-pan, and wheel-pan cases. + +- [ ] **Step 9: Regenerate the conversation patch and commit** + +```bash +npx patch-package @deepseek-ai/dsh-client-ui-conversation +git add test/research-file-drop.test.ts test/sherlock-composer-workspace-ui.test.ts \ + patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch +git commit -m "feat: render persistent research file cards" +``` + +--- + +### Task 4: Draggable File Source in the Right Details Column + +**Files:** +- Modify: `test/research-file-drop.test.ts` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-tool/lib/client.js:930-1030` +- Create: `patches/@deepseek-ai+dsh-client-ui-tool+0.1.0-rc.7.patch` + +**Interfaces:** +- Consumes: file-specific `toolRowModel(...).filePath`, details `cwd`, and `resolveWorkspacePath(cwd, path)` already imported by the Tool bundle. +- Produces: `writeSherlockFileDrag(dataTransfer, descriptor)`, `sherlockDetailsFileDescriptor(filePath, cwd)`, and one `[data-sherlock-file-drag-source]` chip in file-bearing Tool details. + +- [ ] **Step 1: Add failing tests for the internal drag payload writer** + +```ts +it('writes the exact Sherlock file MIME payload with copy semantics', async () => { + const client = await loadClientBundle('dsh-client-ui-tool') + expect(client.writeSherlockFileDrag).toBeTypeOf('function') + if (typeof client.writeSherlockFileDrag !== 'function') return + const writes: Array<[string, string]> = [] + const transfer = { + effectAllowed: 'none', + setData(type: string, value: string) { writes.push([type, value]) } + } + + client.writeSherlockFileDrag(transfer, { + path: '/w/report.pdf', + name: 'report.pdf' + }) + + expect(transfer.effectAllowed).toBe('copy') + expect(writes).toEqual([[ + 'application/x-sherlock-file', + '{"path":"/w/report.pdf","name":"report.pdf"}' + ]]) +}) +``` + +- [ ] **Step 2: Add a failing descriptor test for relative workspace paths** + +```ts +it('resolves right-details relative paths before dragging', async () => { + const client = await loadClientBundle('dsh-client-ui-tool', { + '@deepseek-ai/dsh-client-runtime/client': { + resolveWorkspacePath: (cwd: string, path: string) => `${cwd}/${path}`, + shallowEqual: Object.is + } + }) + expect(client.sherlockDetailsFileDescriptor).toBeTypeOf('function') + if (typeof client.sherlockDetailsFileDescriptor !== 'function') return + + expect(client.sherlockDetailsFileDescriptor('outputs/report.pdf', '/w')).toEqual({ + path: '/w/outputs/report.pdf', + name: 'report.pdf' + }) +}) +``` + +- [ ] **Step 3: Add a failing render test for the right-details drag chip** + +```ts +it('renders a draggable file chip for a file-bearing details block', async () => { + const client = await loadClientBundle('dsh-client-ui-tool', { + '@deepseek-ai/dsh-client-runtime/client': { + resolveWorkspacePath: (cwd: string, path: string) => `${cwd}/${path}`, + shallowEqual: Object.is + } + }) + expect(client.ToolDetails).toBeTypeOf('function') + if (typeof client.ToolDetails !== 'function') return + const react = requireModule('react') as typeof import('react') + const { renderToStaticMarkup } = requireModule('react-dom/server') as { + renderToStaticMarkup(node: unknown): string + } + + const html = renderToStaticMarkup(react.createElement(client.ToolDetails, { + block: { + callId: 'call-read', + name: 'read', + argsRaw: '{"path":"outputs/report.pdf"}' + }, + cwd: '/w', + t: (key: string) => key + })) + + expect(html).toContain('draggable="true"') + expect(html).toContain('data-sherlock-file-drag-source="/w/outputs/report.pdf"') + expect(html).toContain('>report.pdf') +}) +``` + +- [ ] **Step 4: Run the focused test and verify RED** + +Run: `npm test -- --run test/research-file-drop.test.ts` + +Expected: FAIL because the Tool drag descriptor, writer, and details component +are not exported and the draggable chip does not exist. + +- [ ] **Step 5: Implement the descriptor, writer, CSS, and details chip** + +Add: + +```js +const SHERLOCK_FILE_DRAG_TYPE = "application/x-sherlock-file"; + +function sherlockDetailsFileDescriptor(filePath, cwd) { + const resolved = cwd === void 0 || cwd === "" || /^(?:[/\\]|[A-Za-z]:[/\\])/.test(filePath) + ? filePath + : (0, _deepseek_ai_dsh_client_runtime_client.resolveWorkspacePath)(cwd, filePath); + return { + path: resolved, + name: filePath.split(/[/\\]/).filter(Boolean).at(-1) ?? filePath + }; +} + +function writeSherlockFileDrag(dataTransfer, descriptor) { + dataTransfer.effectAllowed = "copy"; + dataTransfer.setData(SHERLOCK_FILE_DRAG_TYPE, JSON.stringify(descriptor)); +} +``` + +Rename the current early-return implementation to `ToolDetailsOutput`. Add a +new `ToolDetails` wrapper that derives `filePath` once with +`toolRowModel(callName(block), block, cwd)`, renders the optional chip, and then +renders `ToolDetailsOutput` with the original props. This keeps every existing +terminal/read/diff/search/web/generic output branch unchanged. + +When `filePath` is present, render this compact draggable chip before the +structured output. Keep `ToolDetails` exported with the two helper functions so +the focused bundle test exercises the same component registered into +`conversation.details.tool`: + +```js +const descriptor = filePath === void 0 ? null : sherlockDetailsFileDescriptor(filePath, cwd); + +const fileDragChip = descriptor === null ? null : (0, react_jsx_runtime.jsxs)("div", { + className: ToolDetails_module_css_default.fileDrag, + draggable: true, + "data-sherlock-file-drag-source": descriptor.path, + title: descriptor.path, + onDragStart: (event) => writeSherlockFileDrag(event.dataTransfer, descriptor), + children: [ + (0, react_jsx_runtime.jsx)("svg", { + viewBox: "0 0 16 16", + width: "14", + height: "14", + "aria-hidden": true, + children: (0, react_jsx_runtime.jsx)("path", { + d: "M3.5 1.5h5l4 4v9h-9zM8.5 1.5v4h4", + fill: "none", + stroke: "currentColor", + strokeWidth: "1.2", + strokeLinejoin: "round" + }) + }), + (0, react_jsx_runtime.jsx)("span", { children: descriptor.name }) + ] +}); +``` + +The wrapper body is: + +```js +return (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { + children: [ + fileDragChip, + (0, react_jsx_runtime.jsx)(ToolDetailsOutput, { block, cwd, t }) + ] +}); +``` + +Add `fileDrag: "xDAfVq_fileDrag"` to the Tool details CSS-module map and append: + +```css +.xDAfVq_fileDrag{box-sizing:border-box;width:100%;min-width:0;height:32px;color:var(--dsw-alias-label-secondary);background:var(--dsw-alias-bg-layer-1);border:1px solid var(--dsw-alias-border-l2);border-radius:7px;align-items:center;gap:7px;margin:0 0 10px;padding:0 9px;display:flex;cursor:grab} +.xDAfVq_fileDrag:active{cursor:grabbing} +.xDAfVq_fileDrag:focus{outline:none} +.xDAfVq_fileDrag span{text-overflow:ellipsis;white-space:nowrap;overflow:hidden} +``` + +- [ ] **Step 6: Export the helpers and `ToolDetails`, then verify GREEN** + +Run: + +`npm test -- --run test/research-file-drop.test.ts test/sherlock-composer-workspace-ui.test.ts` + +Expected: both focused files PASS. + +- [ ] **Step 7: Create the Tool patch and commit only this unit** + +```bash +npx patch-package @deepseek-ai/dsh-client-ui-tool +git add test/research-file-drop.test.ts \ + patches/@deepseek-ai+dsh-client-ui-tool+0.1.0-rc.7.patch +git commit -m "feat: drag files from Sherlock details" +``` + +--- + +### Task 5: Patch Integrity, Signed Package, and Real Interaction Verification + +**Files:** +- Verify: `patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch` +- Verify: `patches/@deepseek-ai+dsh-client-ui-tool+0.1.0-rc.7.patch` +- Verify: `dist-dev/mac-arm64/Sherlock Dev.app` + +**Interfaces:** +- Consumes: all previous task outputs. +- Produces: a replayable dependency install, passing focused gates, a signed running Dev app, and user-visible evidence for internal and Finder file drops. + +- [ ] **Step 1: Verify both patches contain the required production contracts** + +Run: + +```bash +rg -n "application/x-sherlock-file|researchCanvasDropFiles|data-research-file-card|getPathForFile|data-sherlock-file-drag-source" \ + patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch \ + patches/@deepseek-ai+dsh-client-ui-tool+0.1.0-rc.7.patch \ + src/preload/index.ts +``` + +Expected: every named contract appears in its durable source/patch. + +- [ ] **Step 2: Run the complete focused verification set** + +Run: + +```bash +npm test -- --run test/research-file-drop.test.ts test/sherlock-composer-workspace-ui.test.ts +npm run typecheck +git diff --check +``` + +Expected: focused tests PASS, typecheck exits 0, and diff check prints nothing. + +- [ ] **Step 3: Verify the installed bundles exactly carry both durable patches** + +Use Git's reverse-check against the currently patched dependency files. This +does not rewrite the shared `node_modules` tree: + +```bash +git apply --check --reverse patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch +git apply --check --reverse patches/@deepseek-ai+dsh-client-ui-tool+0.1.0-rc.7.patch +``` + +Expected: both reverse checks exit 0, proving the installed rc.7 bundles match +the patched state represented by the durable files. Rerun the focused tests +after these checks. + +- [ ] **Step 4: Build, sign, launch, and verify the Dev application** + +Run: `./script/build_and_run.sh --verify` + +Expected: exit 0 and `Sherlock Dev is running.` Verify the running child uses +the newly packaged `dist-dev/mac-arm64/Sherlock Dev.app` resources. + +- [ ] **Step 5: Verify the right-details drag path in the isolated browser** + +Using the newest loopback port from the running packaged app: + +1. Open a disposable session containing a read/write/edit tool result. +2. Open that tool's right details column and confirm the draggable file chip is + present with `data-sherlock-file-drag-source`. +3. Switch to Research and drag the chip to an empty canvas position. +4. Confirm one `[data-research-file-card]` appears at that position. +5. Switch to Chat and back to Research; confirm the same card remains. +6. Wheel-pan and Command-wheel zoom; confirm the card and grid move together. +7. Confirm the composer attachment count and draft are unchanged. + +- [ ] **Step 6: Verify a Finder drop in the packaged Electron window** + +Create a disposable small text fixture outside the repository's tracked files, +drag it from Finder into the Research canvas, and verify a second card appears +at the drop position. Confirm no composer attachment appears. Remove only the +disposable fixture after verification; do not delete any user file or canvas +record. + +- [ ] **Step 7: Verify persistence and theme visuals** + +Reload or restart the Dev app and confirm both cards restore for the same +session. Inspect light and dark themes for readable card border, icon, basename, +caption, drop feedback, no top divider gap, no composer gradient obstruction, +and no orange canvas outline. + +- [ ] **Step 8: Capture final repository evidence without staging unrelated work** + +Run: + +```bash +git status --short +git diff --stat -- \ + src/preload/index.ts src/preload/research-file-path.ts \ + test/research-file-drop.test.ts test/sherlock-composer-workspace-ui.test.ts \ + patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch \ + patches/@deepseek-ai+dsh-client-ui-tool+0.1.0-rc.7.patch +git diff --check +``` + +Expected: only requested implementation files are included in the feature +evidence; existing unrelated modifications and generated directories remain +untouched. + +- [ ] **Step 9: Commit any remaining verification-only tracked changes** + +If no tracked implementation changes remain, skip this commit. Otherwise stage +only the exact feature files listed above and run: + +```bash +git commit -m "test: verify research canvas file drops" +``` diff --git a/docs/superpowers/plans/2026-08-25-sherlock-formal-parity.md b/docs/superpowers/plans/2026-08-25-sherlock-formal-parity.md new file mode 100644 index 000000000..bcca19ddd --- /dev/null +++ b/docs/superpowers/plans/2026-08-25-sherlock-formal-parity.md @@ -0,0 +1,148 @@ +# Sherlock Formal Client Parity Implementation Plan + +> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking. + +**Goal:** Restore the previously approved About page and make the signed Sherlock artifact install the same plugin baseline and attachment capability that is visible in the working formal client. + +**Architecture:** Sherlock owns the About UI through the patched core settings bundle and a narrow preload bridge. Release packaging prepares a portable offline plugin profile from the formal `sherlock-desktop` profile, embeds it as an Electron resource, and installs it before Harness starts while leaving credentials and all non-profile user data untouched. Verification uses an isolated user-data directory and the actual signed artifact. + +**Tech Stack:** Electron, TypeScript, React client bundles, electron-builder, Vitest, pnpm offline profile, macOS codesign/DMG. + +**Spec:** `docs/sherlock-formal-parity-spec.md` + +## Global Constraints + +- Use only the formal `Sherlock.app` identity and `sherlock-desktop` as the release profile source. +- Do not publish, upload, tag, or commit during this task. +- Do not run the full test suite; run only directly affected tests and typecheck. +- Never package `.credentials.yaml`, model settings, sessions, workspaces, `.env`, or user API values. +- Preserve unrelated dirty-worktree changes. + +--- + +### Task 1: Restore the approved About page + +**Files:** +- Create: `src/preload/about-info.ts` +- Modify: `src/preload/index.ts` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-settings-general/lib/client.js` +- Modify: `patches/@deepseek-ai+dsh-client-ui-settings-general+0.1.0-rc.7.patch` +- Test: `test/settings-about.test.ts` + +**Interfaces:** +- Produces: `createSherlockAboutBridge(readUpdateStatus, locale)` exposing `window.sherlockAbout.getInfo()`. +- Produces: settings section id `about`, order `11`, and `SherlockAboutContent({ info, t })`. + +- [ ] **Step 1: Write the failing About regression tests** + +Assert that the bundle registers `id: "about"`, renders `当前版本`, renders `更新日志`, and consumes `window.sherlockAbout.getInfo()`. + +- [ ] **Step 2: Run the About tests and confirm the simplified page fails them** + +Run: `npx vitest run test/settings-about.test.ts test/brand-migration.test.ts` + +- [ ] **Step 3: Restore the prior About bridge and component** + +Use the previously developed implementation already present at `/Users/heyafeng/Documents/ChatGPT/dsh/src/preload/about-info.ts` and `/Users/heyafeng/Documents/ChatGPT/dsh/patches/@deepseek-ai+dsh-client-ui-settings-general+0.1.0-rc.7.patch`, preserving the interfaces above. + +- [ ] **Step 4: Persist and verify the dependency patch** + +Run `npx patch-package @deepseek-ai/dsh-client-ui-settings-general`, then verify reverse applicability with `git apply --check --reverse`. + +### Task 2: Enforce public-mode navigation + +**Files:** +- Modify: `src/preload/index.ts` +- Modify: `src/preload/developer-mode.ts` +- Test: `test/developer-mode.test.ts` +- Test: `test/brand-migration.test.ts` + +**Interfaces:** +- Consumes: `initialDeveloperMode` from the renderer argument. +- Produces: hidden internal settings and internal conversation tabs whenever mode is false. + +- [ ] **Step 1: Add a regression test for initialization order and label fallback** + +Assert developer visibility is mounted before optional shell styling and that both stable ids and localized Memory labels are recognized. + +- [ ] **Step 2: Run the developer-mode tests and confirm the regression** + +Run: `npx vitest run test/developer-mode.test.ts test/brand-migration.test.ts` + +- [ ] **Step 3: Mount developer visibility first and retain id plus label fallback** + +Call `mountDeveloperModeUi()` before theme/shell helpers and hide stable ids; when an internal extension lacks an id, recognize its existing localized labels. + +- [ ] **Step 4: Re-run focused tests** + +Run: `npx vitest run test/developer-mode.test.ts test/developer-mode-state.test.ts test/brand-migration.test.ts`. + +### Task 3: Embed the formal plugin baseline in release artifacts + +**Files:** +- Create: `build/sherlock-bundled-plugins.json` +- Create: `scripts/prepare-bundled-plugin-profile.mjs` +- Create: `src/main/bundled-plugin-profile.ts` +- Modify: `src/main/index.ts` +- Modify: `electron-builder.notarized.cjs` +- Modify: `package.json` +- Test: `test/bundled-plugin-profile.test.ts` +- Test: `test/release.test.ts` + +**Interfaces:** +- Produces: `installBundledPluginProfile({ userDataPath, bundledProfilePath, appVersion })`. +- Produces: `build/sherlock-plugin-profile` containing portable `modules`, manifest, lockfile, and Cordis patch. + +- [ ] **Step 1: Add new-install, upgrade, idempotence, and secret-exclusion tests** + +The tests must prove `dsh-file-drop` is mandatory, `.credentials.yaml` remains untouched, and no model settings enter the packaged profile. + +- [ ] **Step 2: Run bundled-profile tests and confirm the implementation is absent** + +Run: `npx vitest run test/bundled-plugin-profile.test.ts test/release.test.ts`. + +- [ ] **Step 3: Add portable preparation from the formal profile** + +Default `SHERLOCK_PLUGIN_PROFILE_SOURCE` to `~/Library/Application Support/sherlock-desktop/harness/profiles/web`; dereference plugin links, rewrite them as relative `file:vendor/...`, run production pnpm install, reject escaping symlinks and user-owned filenames, then rename `node_modules` to `modules` for electron-builder. + +- [ ] **Step 4: Install the embedded profile before Harness boot** + +Embed `build/sherlock-plugin-profile` as `Contents/Resources/sherlock-plugin-profile`; install it only in packaged builds, back up an older profile, and leave all paths outside `harness/profiles/web` unchanged. + +- [ ] **Step 5: Make every formal package command prepare the profile** + +Prefix both the formal directory build and macOS distribution build with `npm run prepare:bundled-plugin-profile`. + +- [ ] **Step 6: Run focused profile, release, and type checks** + +Run: `npx vitest run test/bundled-plugin-profile.test.ts test/release.test.ts test/plugin-profile-sync.test.js && npm run typecheck`. + +### Task 4: Verify signed artifact and isolated-user parity + +**Files:** +- Verify: `dist-notarized/mac-arm64/Sherlock.app` +- Verify: `dist-notarized/sherlock-mac-arm64.dmg` + +**Interfaces:** +- Consumes: bundled profile resource and packaged app. +- Produces: evidence that formal local and isolated-user installs share the six-plugin baseline while credentials are absent. + +- [ ] **Step 1: Build the signed formal artifact without public upload** + +Run the formal prepare/build command with notarization explicitly disabled for local validation, then run strict `codesign --verify --deep --strict`. + +- [ ] **Step 2: Inspect the artifact contents** + +Verify the embedded manifest lists the policy plugins, includes `dsh-file-drop`, excludes `dsh-memory-evolve` and `dsh-update-checker`, contains no absolute publisher path, and contains no credential/model API file. + +- [ ] **Step 3: Launch with an isolated user-data directory** + +Start the exact signed `Sherlock.app` with a fresh temporary `--user-data-dir`; verify the installed profile and its receipt match the embedded manifest. + +- [ ] **Step 4: Verify the real UI** + +Use Computer Use to confirm public settings, the restored About release-notes page, only public conversation tabs, and the attachment button in the input composer. + +- [ ] **Step 5: Restore the user's formal client and report** + +Stop the isolated instance, relaunch the same signed app against `sherlock-desktop`, and report that no public upload occurred. diff --git a/docs/superpowers/plans/2026-08-26-research-canvas-workspace.md b/docs/superpowers/plans/2026-08-26-research-canvas-workspace.md new file mode 100644 index 000000000..c9d42dc6e --- /dev/null +++ b/docs/superpowers/plans/2026-08-26-research-canvas-workspace.md @@ -0,0 +1,676 @@ +# Sherlock Research Canvas Workspace Implementation Plan + +> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking. + +**Goal:** Build the approved Research workspace in which the center is a persistent selectable canvas, the right panel owns the live conversation, selected files become ordered composer tags, and assistant results reach the canvas only through explicit user actions. + +**Architecture:** Keep the existing patched `@deepseek-ai/dsh-client-ui-conversation` bundle as the integration boundary and add one per-session `ResearchWorkspaceRegistry` as the sole owner of canvas files, artifacts, selection, tag order, and transient viewport state. Reuse the existing Chat view, input machine, queue, approvals, and composer by moving their single mounted presentation into a portal hosted by the layout details column while Research is active. Extend `@deepseek-ai/dsh-client-ui-layout` with reversible Research panel transitions, then persist both dependency changes through `patch-package`. + +**Tech Stack:** Electron 43, React, TypeScript 5.9, Vitest 4, Happy DOM, Cordis slot stores, patch-package. + +**Spec:** `docs/superpowers/specs/2026-08-26-research-canvas-workspace-design.md` + +## Global Constraints + +- The existing `对话` page remains the normal full-width conversation surface; Research reuses the same session and input state rather than creating a second conversation. +- Only one composer is mounted at a time. +- Ordinary user and assistant messages never appear on the canvas automatically. +- Selected file nodes and composer file tags are two views of one ordered per-session selection. +- File and artifact positions survive view switching, session switching, reload, and application restart. +- Right-panel width remains clamped to 300–520 px and defaults to 420 px on first Research use. +- The pinned right-panel label is exactly `对话`; it is leftmost, not closable, and not reorderable. +- Persist files at `sherlock.research.canvas.files.v1:`, selection at `sherlock.research.canvas.selection.v1:`, artifacts at `sherlock.research.canvas.artifacts.v1:`, and the global Research panel width at `sherlock.research.panel.width.v1`. +- Continue to accept Finder files only through `window.dshDesktop.getPathForFile` and Sherlock file drags only through `application/x-sherlock-file`. +- The internal artifact drag MIME type is exactly `application/x-sherlock-research-artifact`; accept only validated, bounded JSON and never HTML. +- File tags display the basename and availability only; absolute paths never appear in visible composer or message chrome. +- A name-only or send-time-unavailable file blocks submission without clearing text, images, selection, or tag order. +- Sending files without text is valid; sending no text, files, or images remains disabled. +- Prompt success clears the sent file selection but preserves canvas nodes; prompt failure restores the exact text, image ids, file selection, and tag order without duplicates. +- Wheel pans, Command-wheel zooms around the pointer, and Space-drag pans with higher priority than selection or movement. +- Do not run the full project test suite. Run only tests directly affected by this feature plus type, patch, package, and real-app checks named below. +- Do not publish, notarize, increment the version, modify public update metadata, push commits, or push tags. +- Each implementation task ends in a local Git commit whose subject is Chinese and stages only files named by that task. + +## File Structure + +- `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js`: runtime implementation for workspace state, canvas interaction, right-side conversation portal, composer tags, prompt serialization, user-message projection, and assistant artifacts. +- `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/contract/views.d.ts`: persisted chat-store additions for the Research right-tab selection and unread state. +- `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/contract/slots.d.ts`: assistant-action owner text and injected Research workspace contracts. +- `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/stores.d.ts`: chat-store action declarations added by the right-panel tab host. +- `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/input/facade.d.ts`: external attachment eligibility added to `SessionInputShell`. +- `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/input/hub.d.ts`: Research registry dependency on the submit sink. +- `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/ConversationRoot.d.ts`: portal-capable root injection surface. +- `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/DetailsPanel.d.ts`: Research-aware details body surface. +- `node_modules/@deepseek-ai/dsh-client-ui-layout/lib/client.js`: details-column portal host and reversible Research-width controller. +- `node_modules/@deepseek-ai/dsh-client-ui-layout/lib/types/client/AppFrame.d.ts`: panel-observation injection. +- `node_modules/@deepseek-ai/dsh-client-ui-layout/lib/types/client/service.d.ts`: `enterResearch`, `leaveResearch`, and panel observation contracts. +- `node_modules/@deepseek-ai/dsh-client-ui-layout/lib/types/client/stores.d.ts`: explicit details-width restore action. +- `src/main/index.ts`: bounded file-availability IPC handler used immediately before a Research send. +- `src/preload/index.ts`: narrow `researchFilesAvailable(paths)` bridge. +- `test/research-file-drop.test.ts`: pure selection, geometry, movement, persistence, serialization, and artifact payload contracts. +- `test/sherlock-composer-workspace-ui.test.ts`: rendered canvas, tag, one-composer, right-tab, message-chip, and artifact interaction contracts. +- `test/desktop-shell-controls.test.ts`: layout Research transition and details portal-host contracts. +- `patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch`: durable conversation-package patch. +- `patches/@deepseek-ai+dsh-client-ui-layout+0.1.0-rc.7.patch`: durable layout-package patch. +- `design-qa.md`: source-vs-packaged-app comparison and manual interaction evidence. + +--- + +### Task 1: Per-session Research workspace model + +**Files:** +- Modify: `test/research-file-drop.test.ts` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js` + +**Interfaces:** +- Consumes: existing `ResearchCanvasFileNode` runtime shape, `parseResearchCanvasFileNodes(raw)`, `researchCanvasStorageKey(sessionId)`, and `researchCanvasWorldPoint(viewport, point)`. +- Produces: `normalizeResearchRect(a, b)`, `researchNodeViewportRect(node, viewport)`, `researchNodesInMarquee(nodes, viewport, rect)`, `updateResearchSelection(selection, nodeIds, mode, files)`, `moveResearchCanvasNodes(files, artifacts, selectedIds, delta, scale)`, `parseResearchCanvasSelection(raw, files, artifacts)`, `researchCanvasSelectionStorageKey(sessionId)`, `parseResearchCanvasArtifactNodes(raw)`, `researchCanvasArtifactsStorageKey(sessionId)`, `parseResearchArtifactDrag(raw)`, and `ResearchWorkspaceRegistry`. + +- [ ] **Step 1: Add failing geometry, selection, persistence, and bounded-payload tests** + +Add tests that independently calculate these concrete outcomes: + +```ts +it('normalizes marquee geometry and intersects cards in viewport coordinates', async () => { + const client = await loadConversationClient() + expect(client.normalizeResearchRect({ x: 180, y: 160 }, { x: 80, y: 60 })) + .toEqual({ left: 80, top: 60, right: 180, bottom: 160, width: 100, height: 100 }) + const nodes = [ + { id: 'a', name: 'a.pdf', source: 'computer', x: 50, y: 50 }, + { id: 'b', name: 'b.pdf', source: 'computer', x: 220, y: 220 } + ] + expect(client.researchNodesInMarquee( + nodes, + { scale: 2, x: 10, y: 20 }, + { left: 0, top: 0, right: 130, bottom: 140, width: 130, height: 140 } + )).toEqual(['a']) +}) + +it('keeps stable selection order and derives ordered files only', async () => { + const client = await loadConversationClient() + const files = [ + { id: 'f1', name: 'one.pdf', path: '/w/one.pdf', source: 'computer', x: 80, y: 20 }, + { id: 'f2', name: 'two.pdf', path: '/w/two.pdf', source: 'computer', x: 20, y: 20 } + ] + const first = client.updateResearchSelection( + { selectedNodeIds: [], orderedFileIds: [] }, + ['f2', 'f1'], + 'replace', + files + ) + expect(first).toEqual({ selectedNodeIds: ['f2', 'f1'], orderedFileIds: ['f2', 'f1'] }) + expect(client.updateResearchSelection(first, ['f2'], 'toggle', files)) + .toEqual({ selectedNodeIds: ['f1'], orderedFileIds: ['f1'] }) +}) + +it('moves selected files and artifacts by screen delta divided by zoom', async () => { + const client = await loadConversationClient() + const moved = client.moveResearchCanvasNodes( + [{ id: 'f1', name: 'a', source: 'computer', x: 10, y: 20 }], + [{ id: 'a1', kind: 'assistant-result', messageId: 'm1', title: 'Answer', excerpt: 'Text', x: 30, y: 40 }], + ['f1', 'a1'], + { x: 20, y: -10 }, + 2 + ) + expect(moved.files[0]).toMatchObject({ x: 20, y: 15 }) + expect(moved.artifacts[0]).toMatchObject({ x: 40, y: 35 }) +}) +``` + +Also assert exact storage keys, malformed/oversized JSON rejection, a 256-node cap, a 16,384-character excerpt cap, a 256-character title cap, duplicate artifact canonicalization, and exact acceptance of `application/x-sherlock-research-artifact` payload fields `{ sessionId, messageId, kind, title, excerpt }`. + +- [ ] **Step 2: Run the focused test and confirm RED** + +Run: `npm test -- --run test/research-file-drop.test.ts` + +Expected: FAIL because `normalizeResearchRect`, `updateResearchSelection`, `moveResearchCanvasNodes`, and the artifact/selection parsers are not exported. + +- [ ] **Step 3: Implement bounded pure functions and the registry** + +Add these exact runtime constants and state shapes beside the existing Research constants: + +```js +const RESEARCH_ARTIFACT_DRAG_TYPE = "application/x-sherlock-research-artifact"; +const RESEARCH_CANVAS_SELECTION_PREFIX = "sherlock.research.canvas.selection.v1:"; +const RESEARCH_CANVAS_ARTIFACTS_PREFIX = "sherlock.research.canvas.artifacts.v1:"; +const RESEARCH_CANVAS_MAX_ARTIFACTS_PER_SESSION = 256; +const RESEARCH_ARTIFACT_MAX_TITLE = 256; +const RESEARCH_ARTIFACT_MAX_EXCERPT = 16384; +const EMPTY_RESEARCH_SELECTION = Object.freeze({ selectedNodeIds: [], orderedFileIds: [] }); +``` + +Use one registry instance created in `apply(ctx)` and one resident store per session: + +```js +class ResearchWorkspaceRegistry { + constructor(storage = researchCanvasStorage()) { + this.storage = storage; + this.sessions = new Map(); + } + for(sessionId) { + let workspace = this.sessions.get(sessionId); + if (workspace === undefined) { + workspace = createResearchWorkspaceSession(this.storage, sessionId); + this.sessions.set(sessionId, workspace); + } + return workspace; + } + release(sessionId) { + this.sessions.get(sessionId)?.cancelTransient(); + } +} +``` + +The per-session snapshot is exactly: + +```js +{ + files: ResearchCanvasFileNode[], + artifacts: ResearchCanvasArtifactNode[], + selection: { selectedNodeIds: string[], orderedFileIds: string[] }, + viewport: { scale: number, x: number, y: number }, + canvasSize: { width: number, height: number }, + pendingMessageJump: null | string +} +``` + +All registry actions publish immutable snapshots. Load files, artifacts, and selection once; canonicalize selection against live node ids; persist only files, artifacts, and selection; absorb storage failures and keep in-memory state. + +- [ ] **Step 4: Run the focused test and confirm GREEN** + +Run: `npm test -- --run test/research-file-drop.test.ts` + +Expected: all Research file-drop and new model tests PASS with pristine output. + +- [ ] **Step 5: Commit the model** + +```bash +git add test/research-file-drop.test.ts \ + node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js +git commit -m "功能：建立研究画布会话状态模型" +``` + +--- + +### Task 2: Canvas selection, marquee, and group movement + +**Files:** +- Modify: `test/research-file-drop.test.ts` +- Modify: `test/sherlock-composer-workspace-ui.test.ts` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js` + +**Interfaces:** +- Consumes: Task 1 `ResearchWorkspaceRegistry`, `updateResearchSelection`, `researchNodesInMarquee`, and `moveResearchCanvasNodes`. +- Produces: accessible `ResearchCanvasFileCard`, `ResearchCanvasArtifactCard`, `[data-research-marquee]`, selected/group-drag pointer behavior, Escape and Command-A keyboard behavior, and unified file/artifact drop placement. + +- [ ] **Step 1: Add failing rendered interaction tests** + +Extend the Happy DOM mount test with two persisted cards and assert: + +```ts +expect(cardA.getAttribute('aria-selected')).toBe('false') +cardA.dispatchEvent(pointer(browserWindow, 'pointerdown', { pointerId: 1, x: 100, y: 100 })) +expect(cardA.getAttribute('aria-selected')).toBe('true') + +canvas.dispatchEvent(pointer(browserWindow, 'pointerdown', { pointerId: 2, x: 20, y: 20 })) +canvas.dispatchEvent(pointer(browserWindow, 'pointermove', { pointerId: 2, x: 360, y: 180 })) +expect(canvas.querySelector('[data-research-marquee]')).not.toBeNull() +canvas.dispatchEvent(pointer(browserWindow, 'pointerup', { pointerId: 2, x: 360, y: 180 })) +expect(canvas.querySelectorAll('[aria-selected="true"]')).toHaveLength(2) +``` + +Add focused tests for Command-click toggle, Shift-click add, plain blank click clear, Escape clear, Command-A selecting files plus artifacts only while canvas owns focus, Space-drag taking priority, unselected-node drag selecting only that node, selected-node drag moving the group, and 2× zoom converting a 20 px screen drag to 10 world units. + +- [ ] **Step 2: Run the two focused files and confirm RED** + +Run: `npm test -- --run test/research-file-drop.test.ts test/sherlock-composer-workspace-ui.test.ts` + +Expected: FAIL because cards are not selectable/focusable, no marquee is rendered, and node drags do not update persisted positions. + +- [ ] **Step 3: Move `ResearchCanvas` to the shared store and add pointer arbitration** + +Replace local `files` state with `useSyncExternalStore(workspace.subscribe, workspace.getSnapshot)`. Keep a single pointer operation ref with these concrete modes: + +```js +{ kind: "pan", pointerId, lastX, lastY } +{ kind: "move", pointerId, lastX, lastY, selectedNodeIds } +{ kind: "marquee", pointerId, startX, startY, currentX, currentY, mode } +``` + +Resolve pointer priority in `onPointerDown` in this order: Space pan; node move; blank marquee. For node hits, use `closest('[data-research-node-id]')`; for a selected node preserve the group; for an unselected node replace selection before movement. On each move call the pure Task 1 helper, and on pointer end/cancel/blur persist the latest snapshot and clear drag visuals. + +Render file and artifact cards with: + +```js +{ + tabIndex: 0, + role: "option", + "data-research-node-id": node.id, + "aria-selected": selected, + "data-selected": selected || void 0 +} +``` + +Render the marquee as an absolutely positioned, dashed, non-color-only rectangle in viewport coordinates. Sort batch marquee hits by `y`, then `x`, then `id` before calling `updateResearchSelection`. + +- [ ] **Step 4: Add selected, unavailable, marquee, artifact, and dragging styles** + +Extend `cssResearchCanvas` with selectors for `[data-selected=true]`, `[data-path-unavailable=true]`, `.rScV5Q_marquee`, `.rScV5Q_artifactCard`, `[data-node-dragging=true]`, visible `:focus-visible`, and dark theme surfaces. Preserve the current 220 px file card and dotted background; do not add decorative imagery or custom SVG artwork beyond the existing file icon. + +- [ ] **Step 5: Run focused tests and confirm GREEN** + +Run: `npm test -- --run test/research-file-drop.test.ts test/sherlock-composer-workspace-ui.test.ts` + +Expected: both files PASS, including non-1× selection geometry and group movement. + +- [ ] **Step 6: Commit canvas interaction** + +```bash +git add test/research-file-drop.test.ts test/sherlock-composer-workspace-ui.test.ts \ + node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js +git commit -m "功能：支持研究画布框选与成组拖动" +``` + +--- + +### Task 3: Research right-panel Conversation and reversible layout + +**Files:** +- Modify: `test/desktop-shell-controls.test.ts` +- Modify: `test/sherlock-composer-workspace-ui.test.ts` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-layout/lib/client.js` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-layout/lib/types/client/AppFrame.d.ts` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-layout/lib/types/client/service.d.ts` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-layout/lib/types/client/stores.d.ts` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/contract/views.d.ts` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/stores.d.ts` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/ConversationRoot.d.ts` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/DetailsPanel.d.ts` + +**Interfaces:** +- Consumes: existing `chatStore`, `ChatView`, `ConversationRoot` composer assembly, `DetailsPanel`, and layout `setDetails` clamp. +- Produces: `LayoutController.observePanels(state)`, `enterResearch()`, `leaveResearch()`, `[data-details-portal-host]`, chat-store `researchRightTab`, `researchFilesTabOpen`, `researchConversationUnread`, `setResearchRightTab(tab)`, `setResearchFilesTabOpen(open)`, `setResearchConversationUnread(unread)`, and a single-mounted `ResearchConversationPanel` portal. + +- [ ] **Step 1: Add failing layout service tests** + +Load the layout bundle with a fake action set and assert this exact sequence: + +```ts +layout.attachPanels(actions) +layout.observePanels({ sidebar: 280, details: 0, narrow: false, narrowExpanded: false }) +layout.enterResearch() +expect(writes).toEqual([['setDetails', 420]]) +layout.observePanels({ sidebar: 280, details: 472, narrow: false, narrowExpanded: false }) +layout.leaveResearch() +expect(writes.at(-1)).toEqual(['closeDetails']) +layout.observePanels({ sidebar: 280, details: 360, narrow: false, narrowExpanded: false }) +layout.enterResearch() +layout.leaveResearch() +expect(writes.at(-1)).toEqual(['setDetails', 360]) +``` + +Also render `AppFrame` and assert the details column contains `data-details-portal-host`, and that its panel snapshot is reported through the injected callback. + +- [ ] **Step 2: Add failing one-composer and pinned-tab UI tests** + +Add source/runtime assertions that Research: + +- renders exactly one `[data-composer-seat]`, inside `[data-research-conversation-panel]`; +- renders no center composer, queue strip, task dock, or stats footer; +- renders `[role="tablist"]` with leftmost `[data-research-right-tab="conversation"]` whose text is `对话` and which has no close button; +- renders Conversation → Files → temporary Details → add-tab control order, lets Files and Details close without removing Conversation, and restores Files through the add control; +- preserves `[data-conversation-scroll]` and the same input snapshot when Chat → Research → Chat is switched; +- preserves the same textarea DOM node, focus, selection range, and IME-safe draft when the composer host moves between center and right; +- shows `data-unread="true"` when `session.chat.order.length` or `session.running` changes while the details tab is active, without selecting Conversation. + +- [ ] **Step 3: Extend the layout controller** + +Add a `setDetails(px)` store action that accepts `0` as closed and otherwise clamps 300–520. Add guarded local-storage helpers for `sherlock.research.panel.width.v1`. `enterResearch()` snapshots the observed pre-Research `details`, restores saved width or 420, and is idempotent. While Research is active, observing a non-zero changed width persists it. `leaveResearch()` restores the exact pre-Research width/open state and is idempotent. + +Add `reportPanels` to the `AppFrame` injected props and call it from an effect when `panels.sidebar`, `panels.details`, `panels.narrow`, or `panels.narrowExpanded` changes. Add `data-details-portal-host` to `DetailsColumn`. + +- [ ] **Step 4: Extract one composer surface and portal it in Research** + +Give the root conversation registration `store: chatStore`, inject `{ enterResearch: layout.enterResearch, leaveResearch: layout.leaveResearch }`, and read `view` from the same store as `ConversationSession`. + +Extract the existing composer construction into a local `ComposerSurface` that receives the existing `zone`, `hero`, `inputBar`, `pending`, and `session`. Create one stable `composerPortalHost` DOM element for the lifetime of `ConversationRoot`, render `ComposerSurface` into it once, and move that host between center and right placeholders without remounting the textarea: + +```js +const research = activeView === "research"; +const composerPortalHost = composerPortalHostRef.current; +useLayoutEffect(() => { + const destination = research ? researchComposerHostRef.current : centerComposerHostRef.current; + if (destination === null || composerPortalHost.parentElement === destination) return; + const active = document.activeElement; + const selection = active instanceof HTMLTextAreaElement + ? { node: active, start: active.selectionStart, end: active.selectionEnd } + : null; + destination.appendChild(composerPortalHost); + selection?.node.focus({ preventScroll: true }); + selection?.node.setSelectionRange(selection.start, selection.end); +}, [research]); +const composerPortal = createPortal(composerSurface, composerPortalHost); +``` + +The right portal panel renders Chat with `renderSlot('conversation.view', { inspect, onInspectDone }, { only: 'chat' })` and provides the right composer placeholder that receives the stable host. It retains the existing queue/input docks, composer bar, permissions, model, stop/send, and stats. It omits the session title and top-level view tabs. Use the same `chatScroll` map so only one presentation owns a session's saved reading position. + +The pinned tab strip order is Conversation, Files when open, selected tool Details when present, then an add control. `ResearchFilesPanel` lists the current workspace files by basename, availability, and source; each resolved row writes the existing `application/x-sherlock-file` payload so it can be repositioned on the canvas. Closing Files sets `researchFilesTabOpen=false`; the add control restores and selects Files. `DetailsPanel` stays mounted below the portal. In Research, hide its own header and reveal its body only while `researchRightTab === 'details'`; the portal tab strip stays visible above both bodies. Tool `openDetails` selects the existing target and switches `researchRightTab` to `details`; outside Research it keeps the prior behavior. + +- [ ] **Step 5: Add responsive right-panel styling and unread/running indicators** + +Add a compact right-panel header, leftmost pinned tab, unread dot, running pulse, independently scrolling message body, and bottom-anchored composer. Set right-panel composer CSS variables so the 300 px minimum still fits: side clearance 8 px, card max width 100%, compact tool gaps, and no horizontal overflow. Preserve existing token colors, radii, and type scale. + +- [ ] **Step 6: Run focused tests and typecheck** + +Run: + +```bash +npm test -- --run test/desktop-shell-controls.test.ts test/sherlock-composer-workspace-ui.test.ts +npm run typecheck +``` + +Expected: focused tests PASS and typecheck exits 0. + +- [ ] **Step 7: Commit the layout and right conversation** + +```bash +git add test/desktop-shell-controls.test.ts test/sherlock-composer-workspace-ui.test.ts \ + node_modules/@deepseek-ai/dsh-client-ui-layout/lib/client.js \ + node_modules/@deepseek-ai/dsh-client-ui-layout/lib/types/client/AppFrame.d.ts \ + node_modules/@deepseek-ai/dsh-client-ui-layout/lib/types/client/service.d.ts \ + node_modules/@deepseek-ai/dsh-client-ui-layout/lib/types/client/stores.d.ts \ + node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js \ + node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/contract/views.d.ts \ + node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/stores.d.ts \ + node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/ConversationRoot.d.ts \ + node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/DetailsPanel.d.ts +git commit -m "功能：将研究对话固定到右侧栏" +``` + +--- + +### Task 4: Ordered file tags and atomic Research submission + +**Files:** +- Modify: `test/research-file-drop.test.ts` +- Modify: `test/sherlock-composer-workspace-ui.test.ts` +- Modify: `src/main/index.ts` +- Modify: `src/preload/index.ts` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/input/facade.d.ts` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/input/hub.d.ts` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/contract/slots.d.ts` + +**Interfaces:** +- Consumes: Task 1 workspace selection/tag order and Task 3 single right-side composer. +- Produces: `serializeResearchPrompt(files, text)`, `parseResearchPrompt(text)`, `ResearchFileTags`, `window.dshDesktop.researchFilesAvailable(paths)`, and a Research-aware immutable submit attempt. + +- [ ] **Step 1: Add failing serialization, message rendering, and tag tests** + +Use this exact owned prefix contract: + +```text +␞SHERLOCK_RESEARCH_FILES_V1 {"files":[{"id":"f1","name":"report.pdf","path":"/w/report.pdf"}]}␟ +``` + +Assert `serializeResearchPrompt` prepends the prefix immediately before visible text, while `parseResearchPrompt` accepts it only at byte zero, validates/caps every descriptor, returns `{ text, files }`, and leaves line-like user prose unchanged. Render a sent user message and assert it contains `data-research-message-file="f1"`, `report.pdf`, and not `/w/report.pdf`. + +Mount `ResearchFileTags` and assert tag order follows `orderedFileIds`, drag/drop and keyboard Move Left/Move Right reorder only tags, Delete/Backspace removes the tag and deselects the file, and a pathless tag has `aria-invalid="true"`. + +- [ ] **Step 2: Add failing send success/failure tests** + +Create a shell with text `compare these`, image ids `['i1']`, and ordered files `['f2', 'f1']`. Assert one prompt attempt receives images followed by one text block whose parsed file order is `['f2', 'f1']`. Before promise settlement, assert draft, image ids, and file selection are cleared. On rejection, assert exact restoration without duplicate ids. Add file-only success and pathless/unavailable blocking cases. + +- [ ] **Step 3: Run focused tests and confirm RED** + +Run: `npm test -- --run test/research-file-drop.test.ts test/sherlock-composer-workspace-ui.test.ts` + +Expected: FAIL because the serialization helpers, file tags, path bridge, and Research submit transaction do not exist. + +- [ ] **Step 4: Add the narrow send-time availability bridge** + +In preload expose: + +```ts +researchFilesAvailable: (paths: string[]): Promise => + ipcRenderer.invoke('research:files-available', paths) +``` + +In main, accept only arrays of at most 64 non-empty strings of at most 512 characters, reject malformed input with an all-false result, and use `Promise.all(paths.map(path => stat(path).then(value => value.isFile()).catch(() => false)))`. Do not reveal directory contents or file bytes. + +- [ ] **Step 5: Render and mutate tags from the workspace source of truth** + +Pass `ResearchFileTags` as the existing InputBar `accessory` only when the active top-level view is Research. The component reads the session workspace through `useSyncExternalStore`; it never owns a second array. Its remove and reorder handlers call registry actions, and accessibility buttons expose exactly `左移`, `右移`, and `删除附件` labels. + +Update InputBar emptiness to include Research selected files. Extend `SessionInputShell.submit()` with `hasExternalAttachments()` so an empty text/image draft can still call the default sink when ordered Research files exist. + +- [ ] **Step 6: Implement one immutable submit attempt** + +At the start of `InputHub.sink`, snapshot: + +```js +const attempt = { + text, + imageIds: [...imageIds], + files: workspace.selectedFiles().map(file => ({ ...file })), + selection: workspace.selectionSnapshot(), + mode +}; +``` + +Block before optimistic clearing if any file lacks `path` or the availability bridge returns false. Otherwise serialize the ordered descriptors, clear the admitted text/images/selection, call the existing `conversation.sendSession`, and on failure restore text only if untouched plus the exact image and Research selection snapshots. On success release only admitted images and leave file/artifact nodes in place. + +- [ ] **Step 7: Parse owned prefixes in user-message projection** + +Call `parseResearchPrompt(content.text)` before `projectUserText`. Render the returned descriptors as compact file chips above the clean text. A malformed prefix remains ordinary visible text so data is never silently discarded. + +- [ ] **Step 8: Run focused tests and typecheck** + +Run: + +```bash +npm test -- --run test/research-file-drop.test.ts test/sherlock-composer-workspace-ui.test.ts +npm run typecheck +``` + +Expected: all focused submission, tag, and projection tests PASS; typecheck exits 0. + +- [ ] **Step 9: Commit the Research attachment flow** + +```bash +git add test/research-file-drop.test.ts test/sherlock-composer-workspace-ui.test.ts \ + src/main/index.ts src/preload/index.ts \ + node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js \ + node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/input/facade.d.ts \ + node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/input/hub.d.ts \ + node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/contract/slots.d.ts +git commit -m "功能：发送研究画布所选文件附件" +``` + +--- + +### Task 5: Explicit assistant-result and excerpt artifacts + +**Files:** +- Modify: `test/research-file-drop.test.ts` +- Modify: `test/sherlock-composer-workspace-ui.test.ts` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/contract/slots.d.ts` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/chat/AssistantNodeView.d.ts` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/chat/TurnTailNodeView.d.ts` + +**Interfaces:** +- Consumes: Task 1 artifact storage/deduplication and Task 3 right Conversation portal. +- Produces: complete-response action `添加到画布`, excerpt action `加入画布`, bounded artifact drag/drop, persisted artifact cards, and source-message navigation. + +- [ ] **Step 1: Add failing artifact action and deduplication tests** + +Render a finalized assistant turn with `{ messageId: 'm1', text: 'Revenue improved.' }` and assert the action strip contains a button labeled `添加到画布`. Clicking it must create one `assistant-result` artifact centered in the current visible canvas. Clicking it again after panning must keep one artifact and move it to the new center. + +Assert `addExcerpt('m1', ' Margin expanded. ')` normalizes whitespace for identity but preserves bounded readable text. The same normalized excerpt repositions; a different excerpt from `m1` creates a second artifact. + +- [ ] **Step 2: Add failing selection-action, drag/drop, and source-jump tests** + +Mount the right Conversation with one finalized assistant message. Select `Margin expanded` inside its `[data-assistant-message-id="m1"]` wrapper and dispatch `mouseup`; assert a visible `加入画布` control. Click it and assert an excerpt card appears. + +Dispatch `dragstart` from the selected passage and assert `application/x-sherlock-research-artifact` contains only `{ sessionId, messageId, kind: 'assistant-excerpt', title, excerpt }`. Drop it at canvas viewport `(250, 180)` under a non-1× transform and assert the artifact world position equals `researchCanvasWorldPoint(viewport, { x: 250, y: 180 })`. + +Activate an artifact and assert the right tab changes to Conversation, the source row receives focus/scroll, and `pendingMessageJump` clears. For a missing source, assert the card remains and reports `来源消息不可用` without throwing. + +- [ ] **Step 3: Run focused tests and confirm RED** + +Run: `npm test -- --run test/research-file-drop.test.ts test/sherlock-composer-workspace-ui.test.ts` + +Expected: FAIL because assistant owner text, selection action, artifact card/drop, and source navigation are absent. + +- [ ] **Step 4: Add complete-response actions** + +Extend `AssistantActionOwnerProps` to `{ messageId: MessageId; text: string }` and pass `assistantText(closing.blocks)` from `TurnTailNodeView`. Register one `conversation.chat.assistant-actions` entry that calls `workspace.addAssistantResult({ messageId, text, at: workspace.visibleCenter() })`. Use the existing action-button visual language and the exact accessible label `添加到画布`. + +- [ ] **Step 5: Add excerpt selection and bounded internal drag** + +Add `data-assistant-message-id` and `data-assistant-message-settled` to the Assistant node wrapper when `node.data.finalNode.messageId` exists. In `ResearchConversationPanel`, a `mouseup` handler accepts a selection only when both range endpoints are within the same settled assistant wrapper, normalizes/caps its plain text, and positions the `加入画布` control beside the selection rectangle. + +The panel's capturing `dragstart` handler serializes the same validated selection to `application/x-sherlock-research-artifact` with `effectAllowed = 'copy'`. The canvas handles this MIME only after `parseResearchArtifactDrag` succeeds; it stops propagation only for a valid owned payload. + +- [ ] **Step 6: Render artifact cards and source navigation** + +Render title, excerpt, kind, and source availability. Artifacts use the same `data-research-node-id`, selection, focus, and group-drag handlers as file cards. Enter/double-click sets `researchRightTab = 'conversation'`, stores `pendingMessageJump`, and after the Chat subtree mounts finds the matching wrapper without interpolating raw selector text, calls `scrollIntoView({ block: 'center' })`, focuses it, and clears the pending request. + +- [ ] **Step 7: Run focused tests and typecheck** + +Run: + +```bash +npm test -- --run test/research-file-drop.test.ts test/sherlock-composer-workspace-ui.test.ts +npm run typecheck +``` + +Expected: artifact creation, excerpt drag/drop, deduplication, persistence, movement, and source navigation tests PASS; typecheck exits 0. + +- [ ] **Step 8: Commit explicit canvas artifacts** + +```bash +git add test/research-file-drop.test.ts test/sherlock-composer-workspace-ui.test.ts \ + node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js \ + node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/contract/slots.d.ts \ + node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/chat/AssistantNodeView.d.ts \ + node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/chat/TurnTailNodeView.d.ts +git commit -m "功能：将助手结果按需加入研究画布" +``` + +--- + +### Task 6: Durable patches, focused integration, packaged-app and visual QA + +**Files:** +- Modify: `test/research-file-drop.test.ts` +- Modify: `test/sherlock-composer-workspace-ui.test.ts` +- Modify: `test/desktop-shell-controls.test.ts` +- Modify: `patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch` +- Modify: `patches/@deepseek-ai+dsh-client-ui-layout+0.1.0-rc.7.patch` +- Create: `design-qa.md` + +**Interfaces:** +- Consumes: all Task 1–5 runtime and declaration surfaces. +- Produces: installed-package parity, end-to-end focused regression evidence, real packaged Sherlock evidence, and `design-qa.md` with exact `final result: passed` or `final result: blocked`. + +- [ ] **Step 1: Add final cross-feature regression assertions** + +Add one mounted lifecycle test that switches Chat → Research → Details tab → Research Conversation → Trajectory → Research and asserts: one composer, unchanged draft and image ids, selected file-tag order retained, no implicit message/artifact nodes, and pre-Research details width/tab restored on exit. Add one isolation test proving valid Research file/artifact drops never reach the global composer drop listener, while unrelated text drags still bubble. + +- [ ] **Step 2: Run the three focused test files and confirm any missing integration is RED** + +Run: + +```bash +npm test -- --run test/research-file-drop.test.ts test/sherlock-composer-workspace-ui.test.ts test/desktop-shell-controls.test.ts +``` + +Expected before final integration fixes: any missing lifecycle or drag-ownership contract FAILS with a behavior-specific assertion. + +- [ ] **Step 3: Make only the minimal integration fixes required by Step 2** + +Keep one `ResearchWorkspaceRegistry` instance per plugin fiber, release transient pointer/jump state on session disposal, preserve persisted files/artifacts/selection, and ensure all Research drag handlers call `preventDefault`/`stopPropagation` only after exact MIME validation succeeds. Do not add automatic layout, connectors, cloud sync, or message-to-canvas behavior. + +Use this guard shape at both canvas drop sites: + +```js +const payload = parseResearchArtifactDrag(event.dataTransfer?.getData(RESEARCH_ARTIFACT_DRAG_TYPE) ?? ""); +if (payload === null || payload.sessionId !== sessionId) return; +event.preventDefault(); +event.stopPropagation(); +workspace.placeArtifact(payload, researchCanvasWorldPoint(viewport, pointer)); +``` + +- [ ] **Step 4: Regenerate both durable dependency patches** + +Run: + +```bash +npx patch-package @deepseek-ai/dsh-client-ui-conversation +npx patch-package @deepseek-ai/dsh-client-ui-layout +``` + +Expected: both rc.7 patch files update and include every changed `client.js` and `.d.ts` hunk. + +- [ ] **Step 5: Verify focused tests, typecheck, diff hygiene, and patch parity** + +Run: + +```bash +npm test -- --run test/research-file-drop.test.ts test/sherlock-composer-workspace-ui.test.ts test/desktop-shell-controls.test.ts +npm run typecheck +git diff --check +git apply --check --reverse patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch +git apply --check --reverse patches/@deepseek-ai+dsh-client-ui-layout+0.1.0-rc.7.patch +``` + +Expected: all focused tests PASS, typecheck exits 0, diff check is silent, and both reverse patch checks exit 0. + +- [ ] **Step 6: Build, sign, open, and package-verify the local app** + +Run: + +```bash +./script/build_and_run.sh --verify +npm run verify:package:mac -- --app "dist-notarized/mac-arm64/Sherlock.app" +``` + +Expected: `Sherlock is running.`, package verification passes, no notarization or upload command runs, and the application remains open. + +- [ ] **Step 7: Exercise the real packaged interface and capture evidence** + +In the open Sherlock window, use a disposable Research session and small disposable files to verify the nine manual cases in the spec: automatic right Conversation, bottom-reaching canvas, Finder/internal drops, marquee/group movement at two zoom levels, tag reorder/removal, send/stream/failure restoration/unread, Chat shared state, explicit-only artifacts, and persistence across session switch plus restart. Capture the packaged Research view at the same 1380 × 900 viewport/state as the supplied dark reference when the host window permits it. + +- [ ] **Step 8: Compare the source and implementation together and write `design-qa.md`** + +Use source visual truth: + +`/var/folders/rm/jy4dz49s171fl1dxd9qr3hh80000gp/T/codex-clipboard-f2975acf-dece-4160-8f9c-00d26c0524c3.png` + +Record source and implementation pixel sizes, viewport, density, state, full-view comparison, focused right-panel/composer comparison, fonts, spacing, colors, assets/icons, copy, interactions, console/runtime errors, and every P0/P1/P2 fix iteration. The last line must be exactly `final result: passed` when no actionable P0/P1/P2 remains; otherwise it must be `final result: blocked` with the blocker named above it. + +- [ ] **Step 9: Commit the durable patches and verification record** + +```bash +git add test/research-file-drop.test.ts test/sherlock-composer-workspace-ui.test.ts \ + test/desktop-shell-controls.test.ts \ + patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch \ + patches/@deepseek-ai+dsh-client-ui-layout+0.1.0-rc.7.patch \ + design-qa.md +git commit -m "验证：完成研究工作区本地构建检查" +``` + +- [ ] **Step 10: Capture final branch evidence** + +Run: + +```bash +git status --short --branch +git log --oneline --decorate -8 +git diff --stat "$(git merge-base main HEAD)"..HEAD +``` + +Expected: the branch is clean, all six task commits are present, and the diff contains only the approved Research workspace work plus its prior file-drop/spec commits. diff --git a/docs/superpowers/plans/2026-08-26-sherlock-harness-preview.md b/docs/superpowers/plans/2026-08-26-sherlock-harness-preview.md new file mode 100644 index 000000000..7a8b9efd5 --- /dev/null +++ b/docs/superpowers/plans/2026-08-26-sherlock-harness-preview.md @@ -0,0 +1,651 @@ +# Sherlock Harness Preview Implementation Plan + +> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking. + +**Goal:** Build and launch an isolated `Sherlock Harness Preview.app` that runs official DeepSeek Harness `0.1.1-rc.2` without changing formal Sherlock, Sherlock Dev, or their data. + +**Architecture:** Work in a dedicated Git worktree. Add a fourth desktop channel with an independent bundle identity, output, updater policy, and user-data path; upgrade the published Harness family coherently; remove rc.7 product-overlay patches; then port only the Electron directory-picker bridge and Sherlock search audit event needed for a usable preview. + +**Tech Stack:** Electron 43, electron-vite 5, electron-builder 26, TypeScript 5.9, Node.js 24, npm/package-lock, patch-package 8, Vitest 4, macOS shell tooling. + +**Spec:** `docs/superpowers/specs/2026-08-26-sherlock-harness-preview-design.md` + +## Global Constraints + +- Harness is exactly `0.1.1-rc.2`, matching tag `dsh-v0.1.1-rc.2` and commit `b150a551b8d465e31e418e1b2eaf5e79bbb7d28e`. +- Product name is `Sherlock Harness Preview`; bundle ID is `io.dsh.desktop.harness-preview`. +- Output is `dist-harness-preview`; user data is `dsh-desktop-harness-preview`. +- Never read, copy, migrate, or modify `dsh-desktop`, `sherlock-desktop`, or `dsh-desktop-dev`. +- The preview has no publish provider and never starts the Sherlock updater. +- Preserve formal and development build/run behavior. +- Do not merge upstream `main`, publish, tag, sign/notarize, or upload. +- Preserve unrelated files in the original checkout. +- Do not run the full test suite; run only the focused files named below. + +## File Map + +- `electron-builder.harness-preview.cjs` — preview identity and disabled publishing. +- `src/main/app-identity.ts` / `src/main/index.ts` — preview channel and updater policy. +- `package.json` / `package-lock.json` — rc.2 graph and packaging commands. +- `scripts/verify-harness-version-family.mjs` — source/lock version gate. +- `scripts/verify-harness-preview.mjs` — packaged-bundle gate. +- `script/build_and_run.sh` — preview-only build/run modes. +- `patches/*+0.1.1-rc.2.patch` — two essential compatibility patches. +- `test/harness-preview-*.test.ts` — version, patch, composition, and package coverage. +- `docs/harness-preview-patch-inventory.md` — disposition of all 20 rc.7 patches. + +--- + +### Task 1: Worktree and Preview Desktop Channel + +**Files:** +- Create: `.worktrees/sherlock-harness-preview/` +- Create: `electron-builder.harness-preview.cjs` +- Modify: `src/main/app-identity.ts` +- Modify: `src/main/index.ts` +- Modify: `package.json` +- Modify: `test/app-identity.test.ts` +- Modify: `test/release.test.ts` + +**Interfaces:** +- Consumes: committed `HEAD` and the base builder config. +- Produces: `DesktopChannel` with `harness-preview`, `desktopChannelUsesUpdates(channel)`, and `npm run package:harness-preview:dir`. + +- [ ] **Step 1: Create the isolated worktree** + +Read `superpowers:using-git-worktrees`, verify `.worktrees` is ignored, then run: + +```bash +git check-ignore -q .worktrees +git branch --list codex/sherlock-harness-preview +git worktree add .worktrees/sherlock-harness-preview -b codex/sherlock-harness-preview +cd .worktrees/sherlock-harness-preview +``` + +Expected: it starts from the design/plan commit; original untracked files remain untouched. + +- [ ] **Step 2: Write failing identity and builder tests** + +Add to `test/app-identity.test.ts`: + +```ts +expect(resolveDesktopIdentity( + '/Users/test/Library/Application Support', 'harness-preview', '' +)).toEqual({ + name: 'Sherlock Harness Preview', + userData: '/Users/test/Library/Application Support/dsh-desktop-harness-preview' +}) +expect(desktopChannelUsesUpdates('harness-preview')).toBe(false) +expect(desktopChannelUsesUpdates('notarized')).toBe(true) +``` + +Add to the isolated-build test in `test/release.test.ts`: + +```ts +const previewConfig = await readFile( + path.join(projectRoot, 'electron-builder.harness-preview.cjs'), 'utf8' +) +expect(packageJson.scripts['package:harness-preview:dir']).toContain('npm run build') +expect(previewConfig).toContain("appId: 'io.dsh.desktop.harness-preview'") +expect(previewConfig).toContain("productName: 'Sherlock Harness Preview'") +expect(previewConfig).toContain("output: 'dist-harness-preview'") +expect(previewConfig).toContain("dshDesktopChannel: 'harness-preview'") +expect(previewConfig).toContain('publish: null') +``` + +- [ ] **Step 3: Verify the tests fail** + +Run: `npx vitest run test/app-identity.test.ts test/release.test.ts` + +Expected: FAIL for the missing channel, helper, config, and script. + +- [ ] **Step 4: Implement the typed identity** + +Use these declarations in `src/main/app-identity.ts`: + +```ts +export type DesktopChannel = + | 'development' + | 'harness-preview' + | 'legacy' + | 'legacy-bridge' + | 'notarized' + +export interface DesktopIdentity { + name: 'Sherlock' | 'Sherlock Dev' | 'Sherlock Harness Preview' + userData: string +} + +export function desktopChannelUsesUpdates(channel: DesktopChannel): boolean { + return channel !== 'development' && channel !== 'harness-preview' +} +``` + +Derive `Sherlock Harness Preview` and `dsh-desktop-harness-preview` in `resolveDesktopIdentity()`. In `src/main/index.ts`, accept `harness-preview` metadata and use: + +```ts +const desktopChannel: DesktopChannel = resolveDesktopChannel() +const updatesEnabled = desktopChannelUsesUpdates(desktopChannel) +``` + +Guard `startUpdateManager()` with `if (updatesEnabled)`. + +- [ ] **Step 5: Create builder config and script** + +Create `electron-builder.harness-preview.cjs`: + +```js +const packageJson = require('./package.json') + +module.exports = { + ...packageJson.build, + appId: 'io.dsh.desktop.harness-preview', + productName: 'Sherlock Harness Preview', + directories: { ...packageJson.build.directories, output: 'dist-harness-preview' }, + extraMetadata: { + name: 'sherlock-harness-preview', + productName: 'Sherlock Harness Preview', + dshDesktopChannel: 'harness-preview' + }, + artifactName: 'sherlock-harness-preview-${os}-${arch}.${ext}', + publish: null +} +``` + +Add `"package:harness-preview:dir": "npm run build && electron-builder --dir --publish never --config electron-builder.harness-preview.cjs"`. + +- [ ] **Step 6: Pass focused tests and commit** + +```bash +npx vitest run test/app-identity.test.ts test/release.test.ts +git diff --check +git add electron-builder.harness-preview.cjs package.json src/main/app-identity.ts src/main/index.ts test/app-identity.test.ts test/release.test.ts +git commit -m "feat: add isolated Harness preview channel" +``` + +--- + +### Task 2: Upgrade the Harness Package Family + +**Files:** +- Create: `scripts/verify-harness-version-family.mjs` +- Create: `test/harness-version-family.test.ts` +- Modify: `package.json`, `package-lock.json` +- Modify: both local `packages/*/package.json` manifests +- Delete: all 20 `patches/*+0.1.0-rc.7.patch` files + +**Interfaces:** +- Consumes: root/local manifests and lockfile. +- Produces: `HARNESS_VERSION = '0.1.1-rc.2'` and `verifyHarnessVersionFamily(projectRoot)`. + +- [ ] **Step 1: Write the failing verifier test** + +Create `test/harness-version-family.test.ts`: + +```ts +import { mkdtemp, mkdir, writeFile } from 'node:fs/promises' +import { tmpdir } from 'node:os' +import { join } from 'node:path' +import { describe, expect, it } from 'vitest' +import { + HARNESS_VERSION, + verifyHarnessVersionFamily +} from '../scripts/verify-harness-version-family.mjs' + +describe('Harness version family', () => { + it('accepts one coherent rc.2 graph', async () => { + const root = await mkdtemp(join(tmpdir(), 'sherlock-family-')) + await mkdir(join(root, 'packages', 'local'), { recursive: true }) + await writeFile(join(root, 'package.json'), JSON.stringify({ + dependencies: { '@deepseek-ai/dsh': HARNESS_VERSION } + })) + await writeFile(join(root, 'package-lock.json'), JSON.stringify({ + packages: { 'node_modules/@deepseek-ai/dsh': { version: HARNESS_VERSION } } + })) + await writeFile(join(root, 'packages/local/package.json'), JSON.stringify({ + dependencies: { '@deepseek-ai/dsh-session': `^${HARNESS_VERSION}` } + })) + await expect(verifyHarnessVersionFamily(root)).resolves.toEqual([ + '@deepseek-ai/dsh' + ]) + }) + + it('rejects an rc.7 lock entry', async () => { + const root = await mkdtemp(join(tmpdir(), 'sherlock-mixed-')) + await mkdir(join(root, 'packages'), { recursive: true }) + await writeFile(join(root, 'package.json'), JSON.stringify({ + dependencies: { '@deepseek-ai/dsh': HARNESS_VERSION } + })) + await writeFile(join(root, 'package-lock.json'), JSON.stringify({ + packages: { 'node_modules/@deepseek-ai/dsh': { version: '0.1.0-rc.7' } } + })) + await expect(verifyHarnessVersionFamily(root)).rejects.toThrow('0.1.0-rc.7') + }) +}) +``` + +- [ ] **Step 2: Verify failure** + +Run: `npx vitest run test/harness-version-family.test.ts` + +Expected: FAIL because the verifier does not exist. + +- [ ] **Step 3: Implement the verifier** + +Create `scripts/verify-harness-version-family.mjs`: + +```js +import { readFile, readdir } from 'node:fs/promises' +import { dirname, join, resolve } from 'node:path' +import { fileURLToPath } from 'node:url' + +export const HARNESS_VERSION = '0.1.1-rc.2' + +const isHarnessPackage = (name) => + name === '@deepseek-ai/dsh' || name.startsWith('@deepseek-ai/dsh-') +const normalizedVersion = (value) => + typeof value === 'string' ? value.replace(/^[~^]/u, '') : '' + +export async function verifyHarnessVersionFamily(projectRoot) { + const source = JSON.parse(await readFile(join(projectRoot, 'package.json'), 'utf8')) + const lock = JSON.parse(await readFile(join(projectRoot, 'package-lock.json'), 'utf8')) + const failures = [] + for (const [name, version] of Object.entries(source.dependencies ?? {})) { + if (isHarnessPackage(name) && normalizedVersion(version) !== HARNESS_VERSION) { + failures.push(`${name} source=${version}`) + } + } + for (const [location, metadata] of Object.entries(lock.packages ?? {})) { + const match = location.match(/node_modules\/(?:.+\/node_modules\/)?(@deepseek-ai\/dsh(?:-[^/]+)?)/u) + if (match && normalizedVersion(metadata?.version) !== HARNESS_VERSION) { + failures.push(`${match[1]} lock=${metadata?.version}`) + } + } + for (const entry of await readdir(join(projectRoot, 'packages'), { withFileTypes: true })) { + if (!entry.isDirectory()) continue + const manifest = JSON.parse(await readFile( + join(projectRoot, 'packages', entry.name, 'package.json'), 'utf8' + )) + for (const group of ['dependencies', 'peerDependencies']) { + for (const [name, version] of Object.entries(manifest[group] ?? {})) { + if (isHarnessPackage(name) && normalizedVersion(version) !== HARNESS_VERSION) { + failures.push(`${entry.name}:${name}=${version}`) + } + } + } + } + if (failures.length > 0) { + throw new Error(`Mixed Harness package family:\n${failures.join('\n')}`) + } + return Object.keys(source.dependencies ?? {}).filter(isHarnessPackage).sort() +} + +if (process.argv[1] === fileURLToPath(import.meta.url)) { + const root = resolve(dirname(fileURLToPath(import.meta.url)), '..') + const packages = await verifyHarnessVersionFamily(root) + process.stdout.write(`Harness ${HARNESS_VERSION}: ${packages.length} direct packages verified\n`) +} +``` + +- [ ] **Step 4: Replace rc.7 and regenerate the lock** + +Set every root direct `@deepseek-ai/dsh*` dependency to exact `0.1.1-rc.2`. Set the local package ranges for credentials, launch-environment, settings, web, and host-webserver to `^0.1.1-rc.2`. Change postinstall to: + +```json +"postinstall": "patch-package && node scripts/install-brand-assets.mjs && install-electron --no" +``` + +Then run: + +```bash +git rm patches/*+0.1.0-rc.7.patch +npm install +``` + +Expected: no rc.7 patch attempt; official loading UI remains; title/icon/manifest branding succeeds. + +- [ ] **Step 5: Pass the family gate and commit** + +```bash +npx vitest run test/harness-version-family.test.ts +node scripts/verify-harness-version-family.mjs +node -p "require('./node_modules/@deepseek-ai/dsh/package.json').version" +git diff --check +git add package.json package-lock.json packages scripts/verify-harness-version-family.mjs test/harness-version-family.test.ts patches +git commit -m "build: upgrade preview to Harness 0.1.1-rc.2" +``` + +Expected version: `0.1.1-rc.2`. + +--- + +### Task 3: Port the Two Essential rc.2 Patches + +**Files:** +- Create: `patches/@deepseek-ai+dsh-client-ui-directory-picker-native+0.1.1-rc.2.patch` +- Create: `patches/@deepseek-ai+dsh-session+0.1.1-rc.2.patch` +- Create: `test/harness-preview-patches.test.ts` +- Modify temporarily, never stage: matching files under `node_modules/` + +**Interfaces:** +- Consumes: `window.dshDesktopDirectoryPicker.pick()` and event `web/session-model-search-llm-request`. +- Produces: two reproducible patch-package files. + +- [ ] **Step 1: Write the failing behavior test** + +Create `test/harness-preview-patches.test.ts`: + +```ts +import { readFile } from 'node:fs/promises' +import { describe, expect, it } from 'vitest' + +describe('Harness preview essential patches', () => { + it('uses the Electron directory picker bridge', async () => { + const source = await readFile( + 'node_modules/@deepseek-ai/dsh-client-ui-directory-picker-native/lib/client.js', + 'utf8' + ) + expect(source).toContain('window.dshDesktopDirectoryPicker') + expect(source).toContain('Sherlock directory picker bridge is unavailable') + expect(source).not.toContain('pick: () => ctx.workspaces.pickDirectory()') + }) + + it('allows the Sherlock search request event', async () => { + const sources = await Promise.all([ + readFile('node_modules/@deepseek-ai/dsh-session/lib/index.js', 'utf8'), + readFile('node_modules/@deepseek-ai/dsh-session/lib/types/known-event-types.js', 'utf8') + ]) + for (const source of sources) { + expect(source).toContain('web/session-model-search-llm-request') + } + }) +}) +``` + +Run `npx vitest run test/harness-preview-patches.test.ts`; expect both tests to FAIL on clean rc.2. + +- [ ] **Step 2: Port the directory picker bridge** + +Replace rc.2's `ctx.workspaces.pickDirectory()` injection with: + +```js +const injected = () => ({ pick: () => { + const bridge = window.dshDesktopDirectoryPicker; + if (!bridge || typeof bridge.pick !== "function") { + return Promise.reject(new Error("Sherlock directory picker bridge is unavailable")); + } + return bridge.pick(); +} }); +``` + +Run `npx patch-package @deepseek-ai/dsh-client-ui-directory-picker-native`. + +- [ ] **Step 3: Port the known search event** + +In both rc.2 session event sets, append `"web/session-model-search-llm-request"` immediately after `web/deepseek-search-llm-request`, preserving each file's quote style. Run: + +```bash +npx patch-package @deepseek-ai/dsh-session +``` + +- [ ] **Step 4: Verify clean patch application and commit** + +```bash +npx vitest run test/harness-preview-patches.test.ts +npx patch-package --error-on-fail +git add patches test/harness-preview-patches.test.ts +git commit -m "fix: port essential desktop bridges to Harness rc.2" +``` + +Do not stage `node_modules`. + +--- + +### Task 4: Prove the Sherlock Overlay Composes on rc.2 + +**Files:** +- Create: `test/harness-preview-composition.test.ts` +- Modify only after a reproduced incompatibility: `build/dsh-desktop.patch.yml` +- Modify only after a reproduced incompatibility: local packages under `packages/` + +**Interfaces:** +- Consumes: rc.2 CLI, `build/dsh-desktop.patch.yml`, and the two bundled resolver entries. +- Produces: a boot-free config composition gate. + +- [ ] **Step 1: Write the composition test** + +Spawn bundled Node with: + +```ts +[ + '--expose-internals', + resolve('build/harness-node-entry.mjs'), + resolve('node_modules/@deepseek-ai/dsh/lib/bin.js'), + 'web', + '--patch', + resolve('build/dsh-desktop.patch.yml'), + '--dump-config' +] +``` + +Use a fresh temporary `DSH_HOME`, set `DSH_DESKTOP_WEB_SEARCH_ENTRY` and `DSH_DESKTOP_MARKET_INSTALLER_ENTRY` to the local package file URLs, and assert exit code zero plus these output fragments: + +```text +@deepseek-ai/dsh-client-ui-directory-picker-native +dsh-web-search-session-model +dsh-desktop-market-installer +id: llm-deepseek +disabled: true +id: web-search-deepseek +disabled: true +``` + +- [ ] **Step 2: Run directly affected integration tests** + +```bash +npx vitest run \ + test/harness-preview-composition.test.ts \ + test/harness-bundled-package-resolution.test.ts \ + test/session-model-web-search.test.js \ + test/market-installer.test.js \ + test/runtime.test.ts \ + test/directory-picker.test.ts +``` + +Expected: PASS. If one exact rc.2 contract fails, invoke `superpowers:systematic-debugging`, preserve the observed failure in its focused test, and change only the affected row, import, or call. + +- [ ] **Step 3: Run an independent config dump** + +```bash +preview_home="$(mktemp -d /tmp/sherlock-harness-preview-compose.XXXXXX)" +DSH_HOME="$preview_home" node_modules/node/bin/node --expose-internals \ + build/harness-node-entry.mjs \ + node_modules/@deepseek-ai/dsh/lib/bin.js \ + web --patch "$(pwd)/build/dsh-desktop.patch.yml" --dump-config \ + > /tmp/sherlock-harness-preview-config.txt +rg -n 'directory-picker-electron-desktop-surface|web-search-session-model|sherlock-market-installer' \ + /tmp/sherlock-harness-preview-config.txt +``` + +- [ ] **Step 4: Commit the compatibility gate** + +```bash +git diff --check +git add test/harness-preview-composition.test.ts build/dsh-desktop.patch.yml packages +git commit -m "test: verify Sherlock overlay on Harness rc.2" +``` + +If no adapter file changed, only the test is committed. + +--- + +### Task 5: Repeatable Preview Packaging and Verification + +**Files:** +- Create: `scripts/verify-harness-preview.mjs` +- Modify: `script/build_and_run.sh` +- Modify: `test/release.test.ts` +- Modify: `package.json` + +**Interfaces:** +- Consumes: preview builder config and packaged app. +- Produces: `--harness-preview`, `--harness-preview-verify`, and `npm run verify:harness-preview`. + +- [ ] **Step 1: Add failing script-contract assertions** + +Add to `test/release.test.ts`: + +```ts +expect(buildAndRun).toContain('--harness-preview') +expect(buildAndRun).toContain('--harness-preview-verify') +expect(buildAndRun).toContain("pkill -x 'Sherlock Harness Preview'") +expect(buildAndRun).toContain( + 'dist-harness-preview/mac-arm64/Sherlock Harness Preview.app' +) +expect(packageJson.scripts['verify:harness-preview']).toContain( + 'scripts/verify-harness-preview.mjs' +) +``` + +Run `npx vitest run test/release.test.ts`; expect FAIL. + +- [ ] **Step 2: Implement the package verifier** + +`scripts/verify-harness-preview.mjs` accepts `--app ` and uses: + +```js +const expected = { + bundleId: 'io.dsh.desktop.harness-preview', + bundleName: 'Sherlock Harness Preview', + channel: 'harness-preview', + harnessVersion: '0.1.1-rc.2' +} +``` + +Read `Contents/Info.plist` with `/usr/bin/plutil -convert json -o -`. Require: + +- `CFBundleIdentifier === expected.bundleId` +- `CFBundleName === expected.bundleName` +- packaged `package.json` has `dshDesktopChannel === expected.channel` +- packaged `@deepseek-ai/dsh/package.json` has `version === expected.harnessVersion` +- `Contents/MacOS/Sherlock Harness Preview` exists +- `Contents/Resources/dsh-desktop.patch.yml` exists +- importing `electron-builder.harness-preview.cjs` returns `publish === null` +- `Contents/Resources/app-update.yml` does not exist + +Add `"verify:harness-preview": "node scripts/verify-harness-preview.mjs"`. + +- [ ] **Step 3: Add preview build/run helpers** + +Resolve the bundle by architecture: + +```bash +if [ "$machine_arch" = "arm64" ]; then + preview_app="$project_root/dist-harness-preview/mac-arm64/Sherlock Harness Preview.app" +else + preview_app="$project_root/dist-harness-preview/mac/Sherlock Harness Preview.app" +fi +preview_executable="$preview_app/Contents/MacOS/Sherlock Harness Preview" +``` + +Add helpers that stop only `Sherlock Harness Preview`, run `npm run package:harness-preview:dir`, call the verifier, and launch with `open -n`. Add modes: + +- `--harness-preview` — build and open. +- `--harness-preview-verify` — build, open, poll `pgrep -x 'Sherlock Harness Preview'` for 45 seconds, then print success or fail nonzero. + +Do not call the existing development stop helper or kill Sherlock/Sherlock Dev. + +- [ ] **Step 4: Run focused checks and commit** + +```bash +npx vitest run test/release.test.ts test/app-identity.test.ts +bash -n script/build_and_run.sh +node --check scripts/verify-harness-preview.mjs +git diff --check +git add package.json package-lock.json scripts/verify-harness-preview.mjs script/build_and_run.sh test/release.test.ts +git commit -m "build: package and verify Harness preview app" +``` + +--- + +### Task 6: Package, Launch, Inspect, and Record + +**Files:** +- Create: `docs/harness-preview-patch-inventory.md` +- Create locally, do not commit: `artifacts/sherlock-harness-preview.png` +- Generate locally, do not commit: `dist-harness-preview/` + +**Interfaces:** +- Consumes: all previous tasks and the real packaged app. +- Produces: running app, focused evidence, screenshot, and patch inventory. + +- [ ] **Step 1: Create the patch inventory** + +Create columns for rc.7 patch, disposition, reason, and evidence. Use these dispositions: + +- **Ported:** `dsh-client-ui-directory-picker-native` and `dsh-session`. +- **Omitted to expose upstream rc.2:** `dsh`, `dsh-agent-presets`, `dsh-client-runtime`, `dsh-client-ui-agent-preset`, `dsh-client-ui-conversation`, `dsh-client-ui-deliverables`, `dsh-client-ui-layout`, `dsh-client-ui-primitives`, `dsh-client-ui-settings-general`, `dsh-client-ui-settings-models`, `dsh-client-ui-settings-plugins`, `dsh-client-ui-sidebar`, `dsh-client-ui-workspace`, `dsh-credentials-local`, `dsh-host-apiproxy`, `dsh-llm-deepseek`, `dsh-llm-pi-ai`, and `dsh-session-log-export`. + +For each row, record the exact rc.2 package file, focused test, or visible surface used as evidence. + +- [ ] **Step 2: Run the complete focused verification set** + +```bash +npx vitest run \ + test/app-identity.test.ts \ + test/release.test.ts \ + test/harness-version-family.test.ts \ + test/harness-preview-patches.test.ts \ + test/harness-preview-composition.test.ts \ + test/harness-bundled-package-resolution.test.ts \ + test/session-model-web-search.test.js \ + test/market-installer.test.js \ + test/runtime.test.ts \ + test/directory-picker.test.ts +npm run typecheck +node scripts/verify-harness-version-family.mjs +``` + +Expected: all named tests and typecheck PASS. Do not run `npm test`. + +- [ ] **Step 3: Build and launch the packaged preview** + +Run: `./script/build_and_run.sh --harness-preview-verify` + +Expected: the verifier reports bundle `io.dsh.desktop.harness-preview` and Harness `0.1.1-rc.2`; the preview process stays running. + +- [ ] **Step 4: Verify runtime isolation and readiness** + +```bash +pgrep -fl 'Sherlock Harness Preview' +test -d "$HOME/Library/Application Support/dsh-desktop-harness-preview/harness" +test -f "$HOME/Library/Logs/Sherlock Harness Preview/harness.log" +rg -n '\[desktop\] endpoint|DSH entry loaded|plugin tree failed|uncaught exception' \ + "$HOME/Library/Logs/Sherlock Harness Preview/harness.log" | tail -n 30 +``` + +Expected: only preview paths are used; the current launch contains a loopback endpoint and successful entry load, with no plugin-tree or uncaught failure. + +- [ ] **Step 5: Inspect the actual UI and capture evidence** + +Inspect the packaged preview window: + +1. Harness Web UI replaces the startup surface. +2. Sidebar/New Session uses current upstream layout. +3. Composer uses current upstream controls. +4. Models and Plugins settings open without loader errors. +5. Workspace add opens the macOS chooser; cancel returns cleanly. +6. Record one visible rc.2 behavior, prioritizing subagent header switching, model-picker bulk selection, file/session references, or the upstream loading state. + +Read the loopback endpoint from the preview log, capture only that UI to `artifacts/sherlock-harness-preview.png`, and visually inspect it before reporting. + +- [ ] **Step 6: Commit inventory and verify before completion** + +```bash +git diff --check +git status --short +git add docs/harness-preview-patch-inventory.md +git commit -m "docs: record Harness preview patch migration" +``` + +Read and apply `superpowers:verification-before-completion`. Report app path, branch/worktree, exact Harness version, focused tests, typecheck/build, readiness, screenshot, and limitations. Leave the preview app running. diff --git a/docs/superpowers/plans/2026-08-26-zero-cost-cross-model-web-search.md b/docs/superpowers/plans/2026-08-26-zero-cost-cross-model-web-search.md new file mode 100644 index 000000000..a6c84a0b9 --- /dev/null +++ b/docs/superpowers/plans/2026-08-26-zero-cost-cross-model-web-search.md @@ -0,0 +1,130 @@ +# Zero-Cost Cross-Model Web Search Implementation Plan + +> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking. + +**Goal:** Make Sherlock web search work for any configured session model by using verified native search when available and an isolated, free local Electron browser fallback otherwise. + +**Architecture:** Refactor `dsh-web-search-session-model` into a native-first router with a loopback fallback client. Start an authenticated 127.0.0.1 service in Electron main, backed by a locked-down, non-persistent BrowserWindow that extracts Bing or DuckDuckGo result pages. Pass only the random endpoint and token to the child Harness and expose an `auto`/`native-only`/`off` setting. + +**Tech Stack:** Electron 43 BrowserWindow/session, Node HTTP and crypto, JavaScript ESM Harness plugin, TypeScript 5.9, Vitest 4, patch-package 8, Electron Builder. + +**Spec:** `docs/superpowers/specs/2026-08-26-zero-cost-cross-model-web-search-design.md` + +## Global Constraints + +- Never call Cloudflare or a paid third-party search API. +- Never send model credentials, browser cookies, or complete search HTML across the local bridge. +- Never infer OpenAI Responses support from generic OpenAI/Anthropic compatibility. +- Bind the bridge only to `127.0.0.1`, authenticate every request, and keep its token out of logs. +- Use a non-persistent, sandboxed browser session with permissions, downloads, popups, and audio disabled. +- Stop on abort; do not convert cancellation into fallback. +- Preserve unrelated worktree files and stage only task-owned paths. +- Run focused tests and the packaged Dev smoke only; do not run the full suite or release formally. + +--- + +### Task 1: Search Engine Extraction Primitives + +**Files:** +- Create: `src/main/search/search-engines.ts` +- Create: `test/search-engines.test.ts` + +- [ ] Write failing tests for query URL construction, allowed hosts, safe HTTP(S) result normalization, URL deduplication, result limits, and CAPTCHA/challenge markers. +- [ ] Run `npm test -- --run test/search-engines.test.ts` and confirm RED. +- [ ] Implement Bing and DuckDuckGo descriptors plus pure normalization and challenge detection. +- [ ] Re-run the focused test and confirm GREEN. + +### Task 2: Isolated Browser Search Controller + +**Files:** +- Create: `src/main/search/browser-search-controller.ts` +- Create: `test/browser-search-controller.test.ts` + +- [ ] Write failing tests with injected BrowserWindow/session fakes for secure web preferences, non-persistent partitioning, permission denial, popup/download blocking, engine fallback, serialized searches, abort, and challenge show/hide behavior. +- [ ] Run `npm test -- --run test/browser-search-controller.test.ts` and confirm RED. +- [ ] Implement the smallest controller that navigates only to engine allowlists, executes extraction JavaScript, shows only for verification, and disposes cleanly. +- [ ] Re-run the focused controller and engine tests and confirm GREEN. + +### Task 3: Authenticated Local Search Bridge + +**Files:** +- Create: `src/main/search/local-search-bridge.ts` +- Create: `test/local-search-bridge.test.ts` + +- [ ] Write failing tests for random loopback binding, bearer authentication, POST/content-type enforcement, bounded bodies and queries, max-results clamping, abort propagation, normalized JSON, and stop behavior. +- [ ] Run `npm test -- --run test/local-search-bridge.test.ts` and confirm RED. +- [ ] Implement the bridge with Node HTTP, `randomBytes`, constant-time token comparison, a single `/search` endpoint, and injected search callback. +- [ ] Re-run the bridge test and confirm GREEN. + +### Task 4: Harness Runtime Wiring + +**Files:** +- Modify: `src/main/runtime/harness-runtime.ts` +- Modify: `src/main/index.ts` +- Modify: `test/runtime.test.ts` +- Create or Modify: `test/local-search-main-wiring.test.ts` + +- [ ] Add failing runtime tests proving the child receives `SHERLOCK_LOCAL_SEARCH_URL` and `SHERLOCK_LOCAL_SEARCH_TOKEN`, while startup diagnostics omit the token. +- [ ] Add failing source/wiring tests proving the bridge starts before Harness, survives a Harness restart, and stops on quit/update install. +- [ ] Run the focused runtime tests and confirm RED. +- [ ] Start `BrowserSearchController` and `LocalSearchBridge` in `bootstrap()`, pass their endpoint through `HarnessRuntimeOptions`, and add orderly cleanup. +- [ ] Re-run the focused runtime/wiring tests and confirm GREEN. + +### Task 5: Native-First Provider Router and Modes + +**Files:** +- Modify: `packages/dsh-web-search-session-model/index.js` +- Modify: `packages/dsh-web-search-session-model/package.json` +- Modify: `test/session-model-web-search.test.js` +- Modify: `build/dsh-desktop.patch.yml` if a base mode must be declared + +- [ ] Replace the existing expected-behavior tests with failing cases for explicit OpenAI Responses native search, Kimi Coding/Anthropic/unknown local fallback, missing profile fallback, recoverable native errors, no-source fallback, abort, `native-only`, and `off`. +- [ ] Run `npm test -- --run test/session-model-web-search.test.js` and confirm RED. +- [ ] Register a `web-search-session-model` settings schema using `installSettingsSection`; read it per request. +- [ ] Separate route discovery from credential resolution so unsupported providers never require a model API key before local fallback. +- [ ] Keep the Responses request/parser as an allowlisted native adapter and add a token-authenticated local client that sends only query/maxResults. +- [ ] Implement recoverable-error classification and stable terminal errors without exposing keys or the local token. +- [ ] Re-run the focused provider tests and confirm GREEN. + +### Task 6: Search Mode Settings UI + +**Files:** +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-settings-plugins/lib/client.js` +- Modify: `patches/@deepseek-ai+dsh-client-ui-settings-plugins+0.1.0-rc.7.patch` +- Modify: `test/model-provider-policy.test.ts` +- Modify: `test/brand-migration.test.ts` +- Create or Modify: `test/web-search-settings-ui.test.ts` + +- [ ] Write failing source/render tests for the `web-search-session-model` namespace, three localized mode choices, and default `auto` selection. +- [ ] Run only the listed settings tests and confirm RED. +- [ ] Repurpose the disabled legacy DeepSeek search card as a compact mode selector bound to the new namespace; remove key/endpoint/max-use fields from this card. +- [ ] Regenerate the patch-package diff so the UI change survives installation. +- [ ] Re-run the focused settings and policy tests and confirm GREEN. + +### Task 7: Focused Integration Verification + +**Files:** +- Modify as needed only files already owned by Tasks 1-6. + +- [ ] Run the focused test set: + + `npm test -- --run test/search-engines.test.ts test/browser-search-controller.test.ts test/local-search-bridge.test.ts test/runtime.test.ts test/local-search-main-wiring.test.ts test/session-model-web-search.test.js test/model-provider-policy.test.ts test/brand-migration.test.ts test/web-search-settings-ui.test.ts test/harness-bundled-package-resolution.test.ts` + +- [ ] Run `npm run typecheck`. +- [ ] Run the repository's patch-package integrity command or focused install/patch verification. +- [ ] Run `git diff --check` and inspect `git status --short` for unrelated changes. +- [ ] Run the superpowers:verification-before-completion skill before making completion claims. + +### Task 8: Packaged Sherlock Dev Smoke + +**Files:** +- Build output only: `dist-dev/mac-arm64/Sherlock Dev.app` + +- [ ] Build the packaged Dev app with `npm run package:dev:dir`. +- [ ] Launch the packaged app with its isolated Dev profile and wait for Harness readiness. +- [ ] Exercise a Kimi Coding search and verify it returns local browser sources without a `/responses` error. +- [ ] Exercise an explicit OpenAI Responses fixture/route to verify native behavior remains intact. +- [ ] Verify cancellation stops browser/native work and a challenge fixture shows `完成搜索验证` before resuming. +- [ ] Inspect the runtime log and captured request hosts: no bearer token/API key leakage and no Cloudflare, Brave, Tavily, Exa, or other paid search request. +- [ ] Leave the packaged Dev app available for the user to test; do not publish a formal release. + diff --git a/docs/superpowers/plans/2026-08-27-research-canvas-visual-components.md b/docs/superpowers/plans/2026-08-27-research-canvas-visual-components.md new file mode 100644 index 000000000..23e520e2a --- /dev/null +++ b/docs/superpowers/plans/2026-08-27-research-canvas-visual-components.md @@ -0,0 +1,308 @@ +# Sherlock Research Canvas Visual Components Implementation Plan + +> **For agentic workers:** REQUIRED SUB-SKILL: Use +> superpowers:subagent-driven-development to implement this plan task-by-task. +> Every production behavior follows strict RED-GREEN-REFACTOR. + +**Goal:** Increase the shared composer height by eight pixels and turn Research +canvas message, image, PDF, and HTML nodes into persistent, resizable, directly +readable visual components. + +**Architecture:** Extend the existing session-scoped `ResearchWorkspaceRegistry` +with normalized node geometry and keep it as the sole renderer-side owner of +canvas state. Add a main-process-owned preview authorization registry and a +read-only `sherlock-preview://` capability protocol for local bytes. Harden +preload and IPC frame boundaries before allowing sandboxed HTML scripts. Render +all rich nodes through a shared titled frame, with PDF.js providing controlled +single-page PDF rendering. + +**Tech Stack:** Electron 43, React, TypeScript 5.9, Vitest 4, Happy DOM, +patch-package, pdfjs-dist. + +**Spec:** +`docs/superpowers/specs/2026-08-27-research-canvas-visual-components-design.md` + +## Global Constraints + +- Chat and Research continue to move one resident composer between portal + hosts; never mount a second composer. +- Increase only shared vertical composer geometry: 8 px bottom padding and + hero mirror 52 px to 60 px. Do not change composer width, max-width, + horizontal padding, anchoring, or right-panel layout. +- Keep `ResearchWorkspaceRegistry` as the sole renderer source of canvas files, + artifacts, selection, positions, and sizes. +- Old persisted file and artifact nodes without size fields must continue to + load with safe defaults. +- Canvas node `x`/`y` remain center-based world coordinates. All screen deltas + are divided by canvas scale. +- Assistant artifacts remain explicitly added and message-id deduplicated. + Preserve complete bounded Markdown text and line breaks. +- Image and PDF content resizes proportionally. Assistant and HTML components + resize freely. +- `sherlock-preview://` is read-only and capability-token based. Its URLs never + contain absolute paths and it is never accepted as a top-level application + URL. +- Do not add any IPC that reads an arbitrary renderer-supplied absolute path. + Finder authorization starts from a real `File`; sidebar authorization is + fenced to the active session workspace. +- Persist preview authorization only in a main-process-owned registry, not in + renderer-writable canvas JSON. Removing a node or session revokes it. +- Resolve roots and targets with `realpath`; reject traversal, symlink escape, + directories, unsupported MIME, and invalid ranges. +- Preload application bridges run only in the main frame. Privileged IPC checks + a trusted main-frame sender. Embedded HTML cannot navigate the top frame, + open windows, submit forms, or reach the network. +- HTML scripts are enabled only after the frame/IPC hardening tests pass. If the + gate cannot be demonstrated, ship static HTML with scripts disabled. +- The canvas owns wheel pan/Command-wheel zoom only outside preview-scroll + regions. PDF and HTML interaction must not move the canvas. +- Rich media mounts only in or near the viewport and releases work on unmount, + node deletion, or session change. +- Persist dependency edits with patch-package. Do not rely on ignored + `node_modules` as the committed source of truth. +- Do not run the full project suite. Run only the focused tests listed by each + task, typecheck, patch checks, packaging, and real-app checks. +- Do not change version 0.7.3, notarize, publish, update public feeds, push + commits, or push tags. +- Each implementation task ends in a local Chinese Git commit containing only + that task's files. + +## Task 1: Shared composer height without horizontal regression + +**Files:** + +- Modify: `test/sherlock-composer-workspace-ui.test.ts` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js` +- Modify: `patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch` + +**Produces:** The textarea, mirror, and backdrop share 8 px bottom padding; the +hero mirror has a 60 px minimum height; portal identity and horizontal geometry +remain unchanged. + +- [ ] Add a rendered regression test that mounts the resident composer, records + its textarea identity and computed width/max-width/horizontal padding, switches + between Chat and Research, and asserts the same textarea has + `paddingBottom === '8px'` in both hosts. Add a tagged multiline case whose + decoration is not clipped. +- [ ] Run + `npm test -- --run test/sherlock-composer-workspace-ui.test.ts` and confirm the + new assertions fail because bottom padding is 0 and hero height is 52 px. +- [ ] Apply the minimal shared InputBar CSS change. Keep the three layers in + sync and do not add a Research-only override. +- [ ] Regenerate the conversation patch with + `npx patch-package @deepseek-ai/dsh-client-ui-conversation`. +- [ ] Re-run the focused test and confirm green. Run `git diff --check` and + reverse patch validation. +- [ ] Commit with `修复输入框标签底部遮挡`. + +## Task 2: Main-frame and embedded-content security boundary + +**Files:** + +- Modify: `src/preload/index.ts` +- Modify: `src/main/security.ts` +- Modify: `src/main/ipc-trust.ts` +- Modify: `src/main/index.ts` +- Modify: `src/main/update/update-manager.ts` +- Modify: focused tests under `test/` for preload exposure, IPC sender trust, + and frame navigation. + +**Produces:** No application bridge or sidebar update controller runs in a child +frame; every affected privileged IPC rejects child/untrusted frames; embedded +frame navigation is constrained without expanding trusted top-level URLs. + +- [ ] Add behavior tests using fake main/child frames and fake web contents. + A child frame must receive no exposed bridge and must be unable to invoke + update, show-log, directory, filesystem, or Research handlers. A preview frame + navigation to `file:`, `http:`, or top-level app routes must be cancelled. +- [ ] Run the focused security/runtime tests and confirm RED against the current + unguarded preload and update handlers. +- [ ] Gate all preload exposure and DOM mounting behind `process.isMainFrame`. + Centralize trusted-main-frame IPC validation and apply it to all touched + privileged handlers. Add `will-frame-navigate` handling while preserving + existing trusted main navigation. +- [ ] Run the same tests and `npm run typecheck`; confirm green. +- [ ] Commit with `加固画布预览的框架权限边界`. + +## Task 3: Capability preview registry and protocol + +**Files:** + +- Create: `src/main/state/research-file-preview.ts` +- Modify: `src/main/index.ts` +- Modify: `src/preload/index.ts` +- Create: `test/research-file-preview.test.ts` +- Modify: `test/research-file-drop.test.ts` + +**Produces:** A main-owned durable authorization registry, ephemeral capability +tokens, protocol responses for image/PDF/HTML bytes, narrow Finder/sidebar +admission APIs, and explicit revocation. + +- [ ] Write pure service tests first. Cover successful Finder admission; + rejection of empty/synthetic paths and arbitrary renderer paths; workspace + fenced sidebar admission; durable authorization reload; opaque token URLs; + unknown/expired/revoked tokens; node deletion; GET/HEAD; 200/206/416 ranges; + MIME and magic-byte mismatch; missing files; directories; `..` and symlink + escape; HTML relative CSS/image/script lookup; and CSP/nosniff/no-store + headers. +- [ ] Run + `npm test -- --run test/research-file-preview.test.ts test/research-file-drop.test.ts` + and confirm RED because the service and bridge contracts do not exist. +- [ ] Implement the registry with injected filesystem/random/storage + dependencies so tests exercise real normalization and response logic without + mocking its behavior. Persist authorizations under app user data with bounded + JSON and restrictive file permissions. +- [ ] Register `sherlock-preview` privileges before ready and install its + `protocol.handle` handler after ready. Never add it to `isTrustedAppUrl`. +- [ ] Expose narrow preload methods that derive Finder paths through + `webUtils.getPathForFile` and request sidebar authorization by active-session + file identity. Return preview descriptors, not raw bytes or permanent tokens. +- [ ] Re-run focused tests and typecheck; confirm green and clean output. +- [ ] Commit with `支持研究文件安全预览协议`. + +## Task 4: Persistent node geometry and corner resize + +**Files:** + +- Modify: `test/research-file-drop.test.ts` +- Modify: `test/sherlock-composer-workspace-ui.test.ts` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js` +- Modify: relevant conversation `.d.ts` files when runtime exports/contracts + change. +- Modify: `patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch` + +**Produces:** Normalized width/height/size mode/aspect ratio, real-size marquee +geometry, four-corner resizing, type-specific constraints, and persisted size. + +- [ ] Add pure RED tests for legacy defaults, invalid size repair, real-size + viewport rectangles at 0.5x/2x zoom, opposite-corner anchoring, delta/scale + conversion, min/max clamps, free resize, aspect-locked resize, and JSON + persistence/reload. +- [ ] Add rendered RED tests for four handles on a selected rich node; resize + precedence over move; live geometry; persist-on-pointer-up/cancel/blur; + iframe shield activation; and existing group move/delete/marquee behavior. +- [ ] Run + `npm test -- --run test/research-file-drop.test.ts test/sherlock-composer-workspace-ui.test.ts` + and confirm the expected missing-size/resize failures. +- [ ] Implement pure normalization and resize helpers, extend workspace actions, + replace fixed 220 x 64 hit geometry, and render a shared titled node frame. + Keep generic unsupported files compact. +- [ ] Regenerate the conversation patch, rerun focused tests, and validate the + reverse patch. +- [ ] Commit with `支持研究画布组件拖角缩放`. + +## Task 5: Complete assistant cards and proportional image previews + +**Files:** + +- Modify: `test/research-file-drop.test.ts` +- Modify: `test/sherlock-composer-workspace-ui.test.ts` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js` +- Modify: relevant conversation `.d.ts` files. +- Modify: `patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch` + +**Produces:** Full structured assistant content with auto height and manual +scrolling, plus titled image previews with natural-ratio sizing and fallback +states. + +- [ ] Add RED tests proving line breaks, lists, and code fences survive artifact + creation/storage/reload; the initial width is 360 px; `ResizeObserver` + publishes full auto height; first manual resize locks size; and a smaller + manual body scrolls without truncating source text. +- [ ] Add RED tests for supported image/SVG detection, preview descriptor use, + filename title, natural ratio capture, proportional total-frame sizing, + offscreen placeholder, and missing/unreadable fallback. +- [ ] Run the two focused files and confirm the failures are caused by the + current collapsed excerpt and generic file card. +- [ ] Render assistant text with the existing Markdown component, retain the + bounded original string, and use `ResizeObserver` only while in auto mode. +- [ ] Render image previews through the capability URL, persist normalized + natural ratio, and revoke/unmount resources with the node lifecycle. +- [ ] Regenerate the conversation patch, rerun focused tests, and validate the + reverse patch. +- [ ] Commit with `完善研究画布消息与图片组件`. + +## Task 6: Single-page PDF and sandboxed HTML components + +**Files:** + +- Modify: `package.json` +- Modify: `package-lock.json` +- Modify: `test/research-file-drop.test.ts` +- Modify: `test/sherlock-composer-workspace-ui.test.ts` +- Modify: `test/research-file-preview.test.ts` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js` +- Modify: relevant conversation `.d.ts` files. +- Modify: `patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch` + +**Produces:** A pinned PDF.js runtime, one-page PDF rendering with component-owned +wheel navigation, and a strict capability-scoped sandbox iframe for HTML. + +- [ ] Install a fixed compatible `pdfjs-dist` version and record both manifest + and lockfile changes. Do not install any browser or unrelated dependency. +- [ ] Add RED tests for PDF page viewport ratio, `current / total` indicator, + accumulated wheel threshold, one-step throttled navigation, old render task + cancellation, component resize, offscreen suspension, and no canvas pan/zoom + from PDF wheel input. +- [ ] Add RED tests for HTML title, initial 480 x 360 geometry, internal scroll, + iframe sandbox/referrer/allow policy, local relative assets, CSP network and + frame blocking, script execution only after Task 2 guards, and iframe shield + during node move/resize. +- [ ] Run the three focused tests and confirm RED. +- [ ] Implement lazy PDF.js loading and a cancel-safe page renderer. Avoid a + global worker that survives unmount; package the worker URL through the + existing Electron/Vite build. +- [ ] Implement the HTML iframe using only capability URLs. Do not use `srcdoc`, + `file://`, `allow-same-origin`, popups, forms, downloads, or top navigation. +- [ ] Regenerate the conversation patch, rerun focused tests and typecheck, and + validate the reverse patch. +- [ ] Commit with `支持画布PDF与HTML内容预览`. + +## Task 7: Integration regression, patch durability, and real-app QA + +**Files:** + +- Modify: `design-qa.md` +- Modify only if a focused failure requires it: the implementation and focused + test files named above. + +**Produces:** Dependency patches that reinstall cleanly, a local packaged app +left open for the user, and recorded evidence for the exact requested flows. + +- [ ] Re-read the spec and check every requirement against the committed diff. + Confirm no width/right-panel/sidebar/loading/version/public-update changes. +- [ ] Run the focused tests only: + + ```bash + npm test -- --run \ + test/research-file-preview.test.ts \ + test/research-file-drop.test.ts \ + test/sherlock-composer-workspace-ui.test.ts \ + test/runtime.test.ts + npm run typecheck + git diff --check + ``` + +- [ ] Verify dependency durability with reverse patch checks and a clean + patch-package replay in an isolated temporary copy/cache-safe environment. +- [ ] Follow `docs/sherlock-local-test-runbook.md` exactly using + `./script/build_and_run.sh --verify`. Skip notarization and publishing. +- [ ] Use the Browser plugin first when it can inspect the renderer; otherwise + record why the Electron window requires Computer Use. Verify page identity, + no blank/error overlay, console health, screenshots, and these interactions: + tagged and multiline composer in Chat and Research; full assistant card add + and resize; Finder and sidebar image drops; multi-page PDF wheel navigation; + HTML internal scroll/interaction; marquee/group move; keyboard/context delete; + session switch and app restart persistence; narrow right-panel layout. +- [ ] Record the source-versus-app mismatch ledger and screenshot paths in + `design-qa.md`; keep temporary screenshots outside the repository. +- [ ] Leave the verified local Sherlock app open for user testing. +- [ ] Commit with `验证研究画布可视组件本地测试版`. + +## Completion Evidence + +Completion requires all seven task commits, clean task reviews, one clean final +whole-branch review, focused tests with zero failures, typecheck exit 0, valid +replayable patches, `build_and_run.sh --verify` exit 0, and real Sherlock window +evidence for the target flows. A compile, running process, or source grep alone +is not completion. diff --git a/docs/superpowers/plans/2026-08-28-research-canvas-preview-expansion.md b/docs/superpowers/plans/2026-08-28-research-canvas-preview-expansion.md new file mode 100644 index 000000000..6a4c4da80 --- /dev/null +++ b/docs/superpowers/plans/2026-08-28-research-canvas-preview-expansion.md @@ -0,0 +1,148 @@ +# Sherlock Research Canvas Preview Expansion Implementation Plan + +> **Execution:** strict RED-GREEN-REFACTOR, focused tests only, one local Chinese +> commit per completed task. + +**Goal:** Expand Research canvas file previews, add component rename, and make +conversation model choices survive client restart without regressing the shared +composer or surrounding shell. + +**Spec:** +`docs/superpowers/specs/2026-08-28-research-canvas-preview-expansion-design.md` + +## Global constraints + +- Preserve the current 0.7.3 composer width, placement, height, shared DOM, + loading indicator, sidebar, right-panel geometry, and source-file safety. +- Keep all local bytes behind the existing capability protocol and realpath + fence. Embedded previews never gain Electron/Node/preload privileges. +- Dependency edits are reproducible through tracked source or patch-package; + ignored `node_modules` changes are not deliverables. +- Do not run the full test suite, publish, notarize, bump the version, push, or + alter public updates. + +## Task 1: Durable per-conversation model choice + +**Files:** focused host/model tests; API proxy/default-model package sources; +tracked package patches or reproducible build inputs. + +- [ ] Add failing restart-matrix tests for blank, previously-requested, and + selected-without-send sessions, plus unavailable providers and invalid base + defaults. +- [ ] Add a bounded durable session-selection store and apply the approved + resolution order. +- [ ] Persist before `selectModel` succeeds; keep sessions isolated and never + silently substitute an unavailable provider. +- [ ] Run focused model/provider tests, typecheck and patch replay checks. +- [ ] Commit `持久保存每个对话的模型选择`. + +## Task 2: Browser-capable HTML authorization + +**Files:** `src/main/state/research-file-preview.ts`, main protocol/security +integration, preview tests, conversation client patch. + +- [ ] Add failing protocol tests for capability origins, local module/JSON/font + resources, network CSP, traversal, symlink escape, and MIME handling. +- [ ] Add failing rendered-contract tests for iframe sandbox, interaction, + external navigation, and no application preload in child frames. +- [ ] Extend the capability response/CSP and iframe policy minimally; preserve + main-frame IPC and filesystem fences. +- [ ] Run preview, security, runtime and composer-focused tests; regenerate and + replay the conversation patch. +- [ ] Commit `完善画布网页组件交互与资源加载`. + +## Task 3: Continuous PDF viewer + +**Files:** Research canvas UI tests; conversation client runtime and patch. + +- [ ] Replace wheel-step assertions with failing continuous-scroll and + visible-page lifecycle tests. +- [ ] Render a page stream with placeholders, viewport-near canvases, + cancellation and cleanup; remove threshold paging. +- [ ] Verify scroll ownership, resize, page progress, offscreen suspension and + existing canvas zoom/pan behavior. +- [ ] Commit `改为连续滚动画布PDF预览`. + +## Task 4: Native image, Markdown, text and code previews + +**Files:** preview registry and tests; Research canvas UI and patch. + +- [ ] Add failing kind/MIME/magic/UTF-8/binary fallback tests for the approved + image set, Markdown and text/code. +- [ ] Authorize bounded content and add viewport-aware read-only renderers. +- [ ] Verify title, resize, scrolling, missing-source fallback and lifecycle. +- [ ] Commit `扩展研究画布常用文件预览`. + +## Task 5: Shared Office preview adapter + +**Files:** bundled Office plugin reproducible preparation/patch source; focused +plugin and canvas routing tests; Research canvas adapter integration. + +- [ ] Add failing adapter tests for DOCX/XLSX/PPTX capability URLs, OOXML + validation/limits, abort/dispose, offscreen mount and unavailable fallback. +- [ ] Extract/reuse the existing Office viewer engines behind a narrow shared + adapter without duplicating their dependency bundle. +- [ ] Connect Research nodes to the adapter and verify sidebar preview remains + unchanged. +- [ ] Commit `复用侧栏引擎预览画布Office文件`. + +## Task 6: Rename component and reconcile composer tag + +**Files:** Research workspace model/UI tests; conversation runtime/types/patch. + +- [ ] Add failing tests for normalized `displayName`, persistence, inline edit + keyboard behavior, and source-name immutability. +- [ ] Add failing tests proving an existing selected tag updates in place while + retaining order, selection, and surrounding text. +- [ ] Implement title-bar context action and reference reconciliation for the + same canvas node id. +- [ ] Verify keyboard/context deletion and drag/resize behavior remain intact. +- [ ] Commit `支持画布组件改名并同步附件标签`. + +## Task 7: Repair canvas zoom and transient viewport frame + +**Files:** Research canvas runtime, CSS and rendered interaction tests. + +- [ ] Add failing regressions proving Command-wheel over an interactive HTML, + PDF, or Office component still performs pointer-anchored canvas zoom while a + plain wheel remains owned by that component. Cover the HTML iframe's own + document rather than assuming its wheel event bubbles into the parent. +- [ ] Show the canvas blue viewport frame only while Space is held for canvas + panning; ordinary focus/click must not paint it. +- [ ] Render that transient frame above canvas nodes and clip node content at + the viewport boundary so an offscreen component cannot cover the frame. +- [ ] Recheck Space-pan, node interaction, resize, marquee, and drop behavior. +- [ ] Commit `修复画布组件上的缩放与边框层级`. + +## Task 8: Keep composer menus above messages without an outer backdrop + +**Files:** Research composer rendered tests; conversation runtime and patch; +input-trigger/model menu tests only if their existing contract needs coverage. + +- [ ] Add a failing rendered regression proving the slash-command menu and at + least one selector popup occupy a stacking layer above message cards at + normal and narrow right-panel widths. +- [ ] Correct the Research composer seat/overlay stacking and clipping boundary; + do not change menu dimensions, copy, composer geometry, or scroll ownership. +- [ ] Remove the opaque/gradient background from the outer Chat and Research + composer seats so only the task panel, composer card, and popup surfaces are + painted; the message page must remain visible through the surrounding gaps. +- [ ] Verify open/close, keyboard selection, scrolling, Chat composer behavior, + transparent outer seats, and no-menu message interaction in both themes. +- [ ] Commit `修复输入菜单层级并移除外围遮罩`. + +## Task 9: Integration and real-client acceptance + +- [ ] Review the spec against the complete diff and run only affected tests, + typecheck, `git diff --check`, patch replay, and package verification. +- [ ] Build and launch through `./script/build_and_run.sh --verify` without + publishing or notarizing. +- [ ] In the real Sherlock window verify HTML resource/network interaction, + continuous PDF scroll, every supported file family, rename/tag sync, and + model restoration after restart/session switching. Open slash-command and + selector menus over a dense right-panel message flow and verify they remain + fully visible and interactive. +- [ ] Explicitly recheck composer width/position, loading, sidebar, selection, + deletion, resize and persistence regressions. +- [ ] Record QA evidence outside the repository, leave Sherlock open, and + commit `验证研究画布预览扩展本地测试版` only if tracked QA notes change. diff --git a/docs/superpowers/plans/2026-08-31-sherlock-agent-brand-and-message-order.md b/docs/superpowers/plans/2026-08-31-sherlock-agent-brand-and-message-order.md new file mode 100644 index 000000000..3fcf277e1 --- /dev/null +++ b/docs/superpowers/plans/2026-08-31-sherlock-agent-brand-and-message-order.md @@ -0,0 +1,135 @@ +# Sherlock Agent 品牌与消息顺序修复实施计划 + +> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking. + +**Goal:** 让模型面向用户只以 Sherlock Agent 自我识别，并保证运行中追加的用户输入按真实提交时序稳定显示在后续回答之前。 + +**Architecture:** 品牌修复落在系统提示词的三个真实注入源，避免依赖输出后处理。顺序修复由 Host 为临时队列行保留插入事件序号，经连接协议和客户端镜像传到对话组件；对话组件以该序号把执行组拆分在待处理输入两侧，待输入转为持久节点后继续使用既有 `steering` 分段逻辑。 + +**Tech Stack:** Electron、Cordis、React、Vitest、patch-package、TypeScript + +**Spec:** 用户在 2026-08-31 提供的 Sherlock 截图与本次请求 + +## Global Constraints + +- 用户可见身份必须为 `Sherlock Agent`，回答不得把产品或自身称为 `DeepSeek Harness`。 +- 保留 `@deepseek-ai/*`、`DSH_*` 等必要兼容性技术标识，不做无关的大规模重命名。 +- 用户输入必须先于其后产生的回答显示；运行中追加输入也要遵守真实日志时序。 +- 只运行本次改动直接影响的聚焦测试，不运行全功能测试。 +- 修改通过聚焦验证后创建一个中文本地 Git 提交，不混入已有未跟踪产物。 + +--- + +### Task 1: 固化 Sherlock Agent 模型身份 + +**Files:** +- Create: `test/sherlock-agent-branding.test.ts` +- Modify: `node_modules/@deepseek-ai/dsh-system-prompt/lib/index.js` +- Modify: `node_modules/@deepseek-ai/dsh-app-boot/lib/index.js` +- Modify: `node_modules/@deepseek-ai/dsh-web-app/lib/index.js` +- Create: `patches/@deepseek-ai+dsh-system-prompt+0.1.0-rc.7.patch` +- Create: `patches/@deepseek-ai+dsh-app-boot+0.1.0-rc.7.patch` +- Create: `patches/@deepseek-ai+dsh-web-app+0.1.0-rc.7.patch` + +**Interfaces:** +- Consumes: `SystemPrompt.assemble()`, `renderPrompt()`, `addHarnessSourceSection()`, Web App `apply()`。 +- Produces: 三个真实模型提示词入口统一使用 `Sherlock Agent`，不再注入旧品牌。 + +- [x] **Step 1: 写失败测试** + + 新测试实例化真实 `SystemPrompt`，调用真实 App Boot/Web App 注入路径，断言合成后的模型可见文本包含 `Sherlock Agent` 且不含 `DeepSeek Harness`。 + +- [x] **Step 2: 运行测试并确认按预期失败** + + Run: `npm test -- --run test/sherlock-agent-branding.test.ts` + + Expected: FAIL，失败值来自当前三个旧品牌提示词。 + +- [x] **Step 3: 写最小实现** + + 将固定身份改为 `You are Sherlock Agent.`；将实现路径和 Web 界面上下文中的产品称谓改为 `Sherlock Agent`/`Sherlock`，保留运行时技术约束。 + +- [x] **Step 4: 固化依赖补丁并复跑测试** + + Run: `npx patch-package @deepseek-ai/dsh-system-prompt @deepseek-ai/dsh-app-boot @deepseek-ai/dsh-web-app` + + Run: `npm test -- --run test/sherlock-agent-branding.test.ts` + + Expected: PASS。 + +### Task 2: 按日志时序合并待处理输入与回答 + +**Files:** +- Modify: `test/subagent-report-queue.test.ts` +- Modify: `test/compact-execution-status.test.ts` +- Modify: `node_modules/@deepseek-ai/dsh-host-apiproxy/lib/index.js` +- Modify: `node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/events.d.ts` +- Modify: `node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/events.schema.js` +- Modify: `node_modules/@deepseek-ai/dsh-client-connection/lib/client.js` +- Modify: `node_modules/@deepseek-ai/dsh-client-runtime/lib/client.js` +- Modify: `node_modules/@deepseek-ai/dsh-client-runtime/lib/types/client/sessions/conversation.d.ts` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js` +- Modify: corresponding `patches/@deepseek-ai+...+0.1.0-rc.7.patch` files + +**Interfaces:** +- Consumes: `agent/inbox/spliced` 的 `event.seq`、`session/queue` 帧、`SessionQueueMirror`、`compactConversationFlow()`。 +- Produces: 队列行的可选 `anchorSeq`；`mergePendingSteeringFlow(flow, pending, nodeStore)` 返回含 `pending-steering` 行和必要执行分段的稳定渲染流。 + +- [x] **Step 1: 写失败测试** + + `subagent-report-queue.test.ts` 断言客户端队列镜像保留 Host 提供的 `anchorSeq`；`compact-execution-status.test.ts` 构造序号为 40 的前置回答、60 的追加输入和 80 的后续回答，断言渲染顺序为回答前段、用户输入、回答后段，且只有后段保持 running。 + +- [x] **Step 2: 运行测试并确认按预期失败** + + Run: `npm test -- --run test/subagent-report-queue.test.ts test/compact-execution-status.test.ts` + + Expected: FAIL，客户端丢失 `anchorSeq` 且对话包尚未导出合并函数。 + +- [x] **Step 3: Host 与连接层传递插入序号** + + Host 在每个会话内记录插入队列消息的事件序号，并随 `session/queue` 行发送可选 `anchorSeq`；协议 schema 接受该字段，客户端镜像原样保留。重连时未知旧队列序号保持可选并回退到末尾，不伪造顺序。 + +- [x] **Step 4: 对话流按序号拆分执行段** + + 新增纯函数按节点 `anchorSeq` 合并待处理输入；若输入落在一个执行组的节点之间，则拆为前后两段，前段 settled、后段继承 running，React 使用合并后的单一流渲染。 + +- [x] **Step 5: 固化依赖补丁并复跑聚焦测试** + + Run: `npx patch-package @deepseek-ai/dsh-host-apiproxy @deepseek-ai/dsh-client-connection @deepseek-ai/dsh-client-runtime @deepseek-ai/dsh-client-ui-conversation` + + Run: `npm test -- --run test/subagent-report-queue.test.ts test/compact-execution-status.test.ts` + + Expected: PASS。 + +### Task 3: 聚焦验证、真实客户端复验与提交 + +**Files:** +- Modify: only files listed above and this plan + +**Interfaces:** +- Consumes: 项目本地测试 runbook `docs/sherlock-local-test-runbook.md`。 +- Produces: 保持打开的 `Sherlock Dev.app` 和一个仅含本次修复的中文本地提交。 + +- [x] **Step 1: 运行聚焦回归与类型检查** + + Run: `npm test -- --run test/sherlock-agent-branding.test.ts test/subagent-report-queue.test.ts test/compact-execution-status.test.ts test/brand-migration.test.ts` + + Run: `npm run typecheck` + + Run: `git diff --check` + +- [x] **Step 2: 按 runbook 构建并启动本地测试版** + + Run: `./script/build_and_run.sh --verify` + + Expected: 明确跳过公证/上传/版本递增，构建签名验证通过并启动 `Sherlock Dev.app`。 + +- [x] **Step 3: 验证真实主界面** + + 在真实 Dev 应用新建/打开会话，检查页面身份、无错误覆盖层、控制台健康；发送 `你好，你是谁？`，确认回答不出现旧品牌；运行中追加一条输入，确认其后产生的回答显示在该输入下方。保存应用截图到仓库外。 + +- [x] **Step 4: 创建本地提交** + + Stage only: 本计划列出的源码测试与补丁文件。 + + Commit: `git commit -m "修复 Sherlock Agent 品牌与消息顺序"` diff --git a/docs/superpowers/plans/2026-08-31-sherlock-feature-preview-isolation.md b/docs/superpowers/plans/2026-08-31-sherlock-feature-preview-isolation.md new file mode 100644 index 000000000..4a06b0803 --- /dev/null +++ b/docs/superpowers/plans/2026-08-31-sherlock-feature-preview-isolation.md @@ -0,0 +1,367 @@ +# Sherlock Feature Preview Isolation Implementation Plan + +> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:using-git-worktrees before implementation, superpowers:test-driven-development for every implementation task, superpowers:systematic-debugging for any unexpected package/runtime behavior, superpowers:verification-before-completion before every task commit, and either superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to execute this plan task-by-task. + +**Goal:** Let a clean committed `codex/feat/*` worktree build and run its own unmistakable Sherlock preview without stopping shared Sherlock, touching formal user data, publishing updates, or hiding which feature commit is on screen. + +**Architecture:** Derive a deterministic identity from the full feature branch and a validated slug. Reuse plans A and B for Git status, provenance parsing, dependency evidence, exact executable lifecycle, launch proof, runtime policy, and About formatting. A dynamic builder embeds the preview identity and feature provenance. The preview runner performs gate → build → package verification → second gate before it stops only the same preview executable and starts the new absolute App path. + +**Tech Stack:** Electron 43, electron-builder 26, Node.js 24 ESM, TypeScript 5.9, macOS process/bundle tooling, Vitest 4, patch-package 8. + +**Spec:** `docs/superpowers/specs/2026-08-31-sherlock-multi-session-integration-workflow-design.md` + +## Global Constraints + +- This is plan C of three. Start only after plans A and B have passed their completion gates and been accepted into local `main`. +- Execute this plan in dedicated worktree branch `codex/feat/feature-preview-isolation-20260831`. The final real preview verification uses slug `feature-preview-isolation` and this exact branch. +- Reuse `scripts/lib/sherlock-git-state.mjs`, `scripts/lib/sherlock-build-provenance.mjs`, `scripts/lib/sherlock-dependency-digest.mjs`, `scripts/lib/exact-executable-lifecycle.mjs`, and the runtime policy introduced by plans A/B. Do not create competing Git/provenance/update/process parsers. +- Historical commits `2f2ae4f4`, `57dce192`, and `94dc970c` are read-only reference material. Do not cherry-pick, merge, or restore the rejected Harness Preview experiment. +- Reusable historical patterns are limited to separate identity, `publish: null`, absence of `app-update.yml`, exact executable-path process matching, and sibling-survival tests. +- Do not reuse the historical “stop preview before build” order, fixed Harness identity, or auto-update-only switch. +- Preview source must be clean and committed on `codex/feat/*`. No dirty-preview escape hatch or `--force` flag is permitted. +- A preview cannot override its user-data path, migrate formal data, synchronize global skills, use a public feed, notarize, publish, or modify version numbers. +- Preview stop/run/status operates only on the absolute executable derived from its identity. Shared `Sherlock` and every other preview remain running. +- Never automatically delete preview data, App bundles, branches, or worktrees. +- Do not run the full test suite. Commit every task that changes tracked files separately with the listed Chinese message. + +## Canonical Preview Identity + +`scripts/lib/feature-preview-identity.d.mts`: + +```ts +export interface FeaturePreviewIdentity { + channel: 'feature-preview' + branch: string + slug: string + displaySlug: string + identityHash: string + productName: string + packageName: string + appId: string + outputDirectory: string + userDataDirectoryName: string + executableName: string + appBundleName: string +} + +export function assertNormalizedFeaturePreviewSlug(value: string): string +export function parseFeatureBranch(branch: string): { + slug: string + date: string +} +export function deriveFeaturePreviewIdentity(options: { + branch: string + requestedSlug: string +}): FeaturePreviewIdentity +``` + +Rules: + +- Slug is lowercase ASCII, at most 40 characters, matches `^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$`, and contains no consecutive `--`. +- Branch is exactly `codex/feat/-` and requested slug equals the branch slug. +- `identityHash` is the first 10 lowercase hex characters of SHA-256 over the full branch name. +- For `codex/feat/research-canvas-20260831`, the hash is `e4213968c9`, App ID is `com.evanarts.sherlock.preview.research-canvas.e4213968c9`, output is `dist-feature-preview/research-canvas-e4213968c9`, and user data is `sherlock-preview-research-canvas-e4213968c9`. + +## Task 1: Derive Preview Identity and Enforce the Feature Source Gate + +**Files:** + +- Create: `scripts/lib/feature-preview-identity.mjs` +- Create: `scripts/lib/feature-preview-identity.d.mts` +- Create: `scripts/lib/feature-preview-source-gate.mjs` +- Create: `scripts/lib/feature-preview-source-gate.d.mts` +- Create: `test/feature-preview-identity.test.ts` +- Create: `test/feature-preview-source-gate.test.ts` + +**Interfaces:** + +```ts +export interface FeaturePreviewSourceSnapshot { + repositoryRoot: string + worktreePath: string + branch: string + head: string + baseCommit: string + sourceClean: true + identity: FeaturePreviewIdentity +} + +export function assertFeaturePreviewSource(options: { + repository: string + requestedSlug: string +}): FeaturePreviewSourceSnapshot + +export function sameFeaturePreviewSource( + left: FeaturePreviewSourceSnapshot, + right: FeaturePreviewSourceSnapshot +): boolean +``` + +- [ ] Write failing identity table tests for valid slugs at length boundaries, title-cased display labels, the exact research-canvas hash, App/package/executable names, Bundle ID, output directory, and user-data directory. +- [ ] Add rejection cases for uppercase, Unicode, underscores, dots, slashes, leading/trailing hyphens, consecutive hyphens, overlength, branch/requested-slug mismatch, invalid dates, path traversal, and two normalized-collision attempts. +- [ ] Write failing source-gate tests for a clean linked feature worktree with one commit ahead of local `main`. +- [ ] Add rejection cases for `main`, integration, detached, untracked source, staged/unstaged changes, branch ref differing from HEAD, no commits ahead, main not ancestral/ambiguous merge-base, and a checked-out branch name that fails the identity parser. +- [ ] Add a second-snapshot case proving HEAD, source status, base, branch, or identity changes cause `sameFeaturePreviewSource` to return false. +- [ ] Run `npx vitest run test/feature-preview-identity.test.ts test/feature-preview-source-gate.test.ts` and confirm failure because the modules are absent. +- [ ] Implement identity derivation with Node `crypto.createHash('sha256')` and explicit path-safe output components. Never derive identity from a display label. +- [ ] Implement the source gate only through `sherlock-git-state.mjs`. Require exact branch ref, source-clean status, one merge-base with local `main`, and at least one feature commit. +- [ ] Run the two focused test files, `npm run typecheck`, and `git diff --check`. +- [ ] Commit with `git commit -m "构建：增加功能预览身份与源码门禁"`. + +## Task 2: Bind Preview Identity to Runtime Data and Policy + +**Files:** + +- Modify: `src/main/app-identity.ts` +- Modify: `src/main/build-context.ts` +- Modify: `src/main/index.ts` +- Modify: `src/main/update/update-manager.ts` +- Modify: `src/preload/sidebar-update-control.ts` +- Modify: `test/app-identity.test.ts` +- Modify: `test/update-manager.test.ts` +- Modify: `test/sidebar-update-control.test.ts` +- Modify: `test/bundled-skill-upgrade.test.ts` + +**Interfaces:** Extend plan B’s `resolveDesktopIdentity(options)` so `feature-preview` requires validated provenance with a `preview` object and returns `Sherlock Preview - ` plus the derived preview user-data directory. + +- [ ] Add failing identity tests that compare provenance-derived name/userData with `deriveFeaturePreviewIdentity` and reject missing/mismatched slug, hash, branch, base, tip, and current commit. +- [ ] Add tests proving every `--sherlock-user-data-dir` value is rejected for feature preview, including an absolute path. +- [ ] Add startup-order tests proving build context/provenance is validated before `app.setName`, `app.setPath`, migration, plugin installation, skill sync, or `requestSingleInstanceLock()`. +- [ ] Add preview skill tests asserting the only target is `/harness/skills` and `~/.agents/skills` is never passed. +- [ ] Add update tests proving automatic checks, IPC, menu, sidebar, and About manual checks remain disabled and never touch `autoUpdater`. +- [ ] Run `npx vitest run test/app-identity.test.ts test/update-manager.test.ts test/sidebar-update-control.test.ts test/bundled-skill-upgrade.test.ts` and confirm failures. +- [ ] Implement preview identity from the same validated provenance resource used by About and launch proof. Do not accept builder metadata alone as identity evidence. +- [ ] Enforce the runtime order: resolve context → derive identity → set name/userData → request single-instance lock → preview-local skill/profile setup → launch. +- [ ] Keep preview migration disabled and use its own plugin profile transaction directory. Preserve plan B behavior for local-integration/formal/development. +- [ ] Run the four focused tests, `npm run typecheck`, and `git diff --check`. +- [ ] Commit with `git commit -m "桌面端：隔离功能预览运行策略"`. + +## Task 3: Build a Dynamic Preview Package and Verify Every Identity Surface + +**Files:** + +- Create: `electron-builder.feature-preview.cjs` +- Create: `scripts/lib/feature-preview-builder.mjs` +- Create: `scripts/lib/feature-preview-builder.d.mts` +- Create: `scripts/verify-feature-preview.mjs` +- Modify: `package.json` +- Modify: `.gitignore` +- Create: `test/feature-preview-builder.test.ts` +- Create: `test/feature-preview-verifier.test.ts` + +**Interfaces:** + +```ts +export interface FeaturePreviewBuildContext { + schemaVersion: 1 + identity: FeaturePreviewIdentity + provenancePath: string + provenanceDigest: Sha256Digest +} + +export function readFeaturePreviewBuildContext( + contextPath: string, + projectRoot: string +): FeaturePreviewBuildContext + +export function createFeaturePreviewBuilderConfig(options: { + packageJson: Record + projectRoot: string + context: FeaturePreviewBuildContext +}): Record + +export function verifyFeaturePreviewBundle(options: { + appPath: string + expectedProvenancePath: string +}): Promise<{ + executablePath: string + identity: FeaturePreviewIdentity + provenanceDigest: Sha256Digest +}> +``` + +- [ ] Write failing context tests requiring one absolute `SHERLOCK_FEATURE_PREVIEW_CONTEXT` below the calling worktree’s ignored `.sherlock-build/`; reject missing, relative, symlink-escaping, malformed, or provenance-digest-mismatched contexts. +- [ ] Write builder tests for dynamic App ID/name/executable/output, `dshDesktopChannel: 'feature-preview'`, embedded identity metadata, `publish: null`, `mac.notarize: false`, bundled plugin profile, and embedded `sherlock-build-provenance.json`. +- [ ] Assert neither builder resources nor the final config include `app-update-notarized.yml` or any update feed. +- [ ] Write verifier fixtures covering `CFBundleIdentifier`, `CFBundleName`, `CFBundleExecutable`, App filename, packaged name/product/channel/identity, user-data directory name, provenance raw digest/mode/base/tip/hash, no sensitive paths, absent `app-update.yml`, bundled Node/profile, and deep-strict signature. +- [ ] Add one negative verifier case for every identity surface so changing only one field fails. +- [ ] Run `npx vitest run test/feature-preview-builder.test.ts test/feature-preview-verifier.test.ts` and confirm failure. +- [ ] Implement the builder config as a fail-closed function reading only `SHERLOCK_FEATURE_PREVIEW_CONTEXT`. Derive every identity/output field from the validated context. +- [ ] Implement `verifyFeaturePreviewBundle` by composing plan B’s packaged verifier with preview-specific Info.plist/metadata/provenance checks. +- [ ] Add `"package:feature-preview:dir": "npm run build && electron-builder --dir --publish never --config electron-builder.feature-preview.cjs"`. +- [ ] Add only `dist-feature-preview/` to the plan-B `.gitignore` entries; keep `.sherlock-build/` ignored and do not ignore manifests, handoffs, or source. +- [ ] Run the two focused tests plus `test/macos-package-provenance.test.ts` and `test/release.test.ts`, then `npm run typecheck` and `git diff --check`. +- [ ] Commit with `git commit -m "构建：增加功能预览动态打包与校验"`. + +## Task 4: Show Persistent Preview Provenance + +**Files:** + +- Create: `src/preload/build-provenance-badge.ts` +- Modify: `src/shared/app-info.ts` +- Modify: `src/preload/about-info.ts` +- Modify: `src/preload/index.ts` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-settings-general/lib/client.js` +- Modify: `patches/@deepseek-ai+dsh-client-ui-settings-general+0.1.0-rc.7.patch` +- Create: `test/build-provenance-badge.test.ts` +- Modify: `test/app-info.test.ts` +- Modify: `test/settings-about.test.ts` + +**Interfaces:** + +```ts +export interface BuildProvenanceDisplay { + mode: SherlockBuildMode + label: string + branch: string + shortCommit: string + builtAt: string + slug?: string +} + +export function buildProvenanceDisplayArgument( + value: BuildProvenanceDisplay +): string +export function buildProvenanceDisplayFromArguments( + args: readonly string[] +): BuildProvenanceDisplay | undefined +export function mountBuildProvenanceBadge( + document: Document, + display: BuildProvenanceDisplay +): HTMLElement | undefined +``` + +- [ ] Write failing argument round-trip tests and reject malformed/oversized/unknown-mode display payloads. +- [ ] Write DOM tests proving feature preview mounts exactly one persistent badge containing `Feature Preview @ ` plus `data-build-mode`, `data-build-branch`, and `data-build-commit`. +- [ ] Add accessibility/interaction tests: badge has readable contrast, does not intercept ordinary canvas clicks, survives route changes without duplication, and exposes full branch/build time through accessible text or tooltip. +- [ ] Add non-preview tests proving formal/local-main/local-integration do not receive the persistent preview badge. +- [ ] Extend About tests to show the same slug/branch/commit/time from plan B’s formatter and to omit the update button. +- [ ] Run `npx vitest run test/build-provenance-badge.test.ts test/app-info.test.ts test/settings-about.test.ts` and confirm failures. +- [ ] Implement display argument parsing from validated provenance only; never trust an arbitrary renderer-provided string. +- [ ] Mount the badge from preload after DOM readiness and remount safely when Harness replaces the document root. +- [ ] Patch the installed settings About view with `apply_patch`, regenerate only its patch-package patch, and verify reinstall parity. +- [ ] Run the three focused tests plus `test/update-manager.test.ts`, `npm run typecheck`, and `git diff --check`. +- [ ] Commit with `git commit -m "界面：持续展示功能预览构建来源"`. + +## Task 5: Add Exact Preview Lifecycle and CLI + +**Files:** + +- Create: `scripts/feature-preview.mjs` +- Modify: `package.json` +- Create: `test/feature-preview-lifecycle.test.ts` +- Create: `test/feature-preview-command.test.ts` + +**CLI:** + +```text +npm run preview:feature -- build --slug feature-preview-isolation [--repo ] +npm run preview:feature -- run --slug feature-preview-isolation [--repo ] +npm run preview:feature -- verify --slug feature-preview-isolation [--repo ] +npm run preview:feature -- status --slug feature-preview-isolation [--repo ] +npm run preview:feature -- stop --slug feature-preview-isolation [--repo ] +``` + +- [ ] Write failing CLI parser tests for the five commands and the only two options. Reject `--force`, user-data, publish, notarize, version, output, and arbitrary environment identity overrides. +- [ ] Write a strict call-order test: + + ```text + source gate + → prepare isolated worktree dependencies and bundled profile + → apply/verify committed patches + → compute dependency evidence + → generate feature-preview provenance and build context + → package + → verify package + → repeat source gate and compare snapshot + → stop exact same preview executable + → open exact App path + → wait for exact executable and matching Harness launch proof + ``` + +- [ ] Inject a failure at every pre-stop stage and prove there is no stop/open call. +- [ ] Add lifecycle tests with shared Sherlock plus two preview identities. `stop` or replacement of one preview must leave shared Sherlock and the sibling preview alive. +- [ ] Add launch-proof failures for wrong path/PID/channel/commit/digest and assert the previous same-identity preview is reopened if it existed; never touch the shared active-generation pointer. +- [ ] Add `status` tests returning branch, commit, App/executable paths, PID list, and provenance match without mutation. +- [ ] Run `npx vitest run test/feature-preview-lifecycle.test.ts test/feature-preview-command.test.ts` and confirm failure. +- [ ] Implement `build` through the second source snapshot but without stopping/opening. Implement `run`/`verify` with the full switch sequence; `verify` requires stable executable samples and a matching real Harness proof. +- [ ] Implement `stop` with `stopExactExecutable` and no data deletion. Implement `status` read-only. +- [ ] Add `"preview:feature": "node scripts/feature-preview.mjs"`. +- [ ] Run: + + ```bash + npx vitest run \ + test/feature-preview-identity.test.ts \ + test/feature-preview-source-gate.test.ts \ + test/feature-preview-builder.test.ts \ + test/feature-preview-verifier.test.ts \ + test/build-provenance-badge.test.ts \ + test/feature-preview-lifecycle.test.ts \ + test/feature-preview-command.test.ts \ + test/app-identity.test.ts \ + test/update-manager.test.ts \ + test/sidebar-update-control.test.ts \ + test/app-info.test.ts \ + test/settings-about.test.ts + npm run typecheck + git diff --check + ``` + +- [ ] Commit command, runner, and tests with `git commit -m "脚本：增加功能预览精确启动与停止"`. + +## Task 6: Document and Verify the Real Feature Preview + +**Files:** + +- Modify: `docs/sherlock-multi-session-integration-runbook.md` +- Modify: `AGENTS.md` +- Create: `test/feature-preview-runbook.test.ts` + +- [ ] Write a failing documentation test requiring the five preview commands, source-clean feature restriction, identity derivation, no-update/no-migration/no-global-skill rules, exact-process behavior, persistent provenance, and explicit no-cleanup rule. +- [ ] Run `npx vitest run test/feature-preview-runbook.test.ts` and confirm it fails before the runbook changes. +- [ ] Update the runbook and `AGENTS.md`: feature worktrees may only use `npm run preview:feature` for pre-merge UI preview; shared `./script/build_and_run.sh` remains forbidden there. +- [ ] Run `npx vitest run test/feature-preview-runbook.test.ts test/feature-preview-command.test.ts`, `npm run typecheck`, and `git diff --check`. +- [ ] Commit with `git commit -m "文档：启用 Sherlock 隔离功能预览流程"`. +- [ ] Confirm the branch is now source-clean. If any real-preview failure requires a tracked fix, return to its owning TDD task, create a separate Chinese fix commit, and restart this task. +- [ ] From clean branch `codex/feat/feature-preview-isolation-20260831`, run `npm run preview:feature -- verify --slug feature-preview-isolation`. +- [ ] Use `computer-use:computer-use` to inspect the real preview window. Confirm the persistent badge and About show the exact branch/tip, the target feature UI works, shared Sherlock is still running, and its About/provenance did not change. +- [ ] Leave both clients open for user comparison. Do not clean preview data, output, branch, or worktree. + +## Task 7: Hand Off, Integrate, and Promote the Accepted Preview Tooling + +**Files:** No direct source edits. The plan-A executor creates and updates the tracked integration manifest and merge commits. + +- [ ] After the user accepts the exact preview tip, generate a handoff card for `codex/feat/feature-preview-isolation-20260831` with the focused command from Task 5 and the real preview verification from Task 6. +- [ ] In a dedicated integration session based on the unchanged plan-B `main` tip, create/adopt a new batch containing that exact handoff, run read-only preflight, and merge the complete feature history. +- [ ] Rerun the manifest-declared focused preview tests and `npm run typecheck` on the staged/merged integration tree. +- [ ] Build the shared integration client with `./script/build_and_run.sh --verify`. Verify its provenance lists the feature tip, its About has no preview badge, and feature-preview/update/runtime regressions are absent. +- [ ] Keep the shared integration client open and pause for explicit user acceptance of the exact integration tip. Do not treat the earlier isolated preview acceptance as approval of a changed integration tip. +- [ ] After acceptance, record the exact tip/manifest digest and promote to canonical `main` with `--ff-only`. +- [ ] Verify `main` contains every plan-C commit, the active lease is archived, and preview/shared worktrees and preview data remain intact until the user explicitly authorizes cleanup. + +## Task 8: Rehearse One Two-Feature Parallel Batch End to End + +**Files:** + +- Create on branch A: `docs/superpowers/rehearsals/2026-08-31-handoff-example.md` +- Create on branch B: `docs/superpowers/rehearsals/2026-08-31-provenance-example.md` + +- [ ] From the same exact final plan-C `main` commit, create two linked worktrees and branches `codex/feat/workflow-handoff-example-20260831` and `codex/feat/workflow-provenance-example-20260831`. +- [ ] In branch A, document one fully concrete handoff card using synthetic SHA values clearly labeled as examples; run `git diff --check` and commit with `git commit -m "文档：增加功能交接卡示例"`. +- [ ] In branch B, document one fully concrete four-mode provenance matrix with no local paths or credentials; run `git diff --check` and commit with `git commit -m "文档：增加构建来源示例"`. +- [ ] Generate independent handoff cards from both clean worktrees. Assert each card contains only its own commit/file and binds its check evidence to its exact tip. +- [ ] In a third integration worktree, create one batch with both handoffs, run preflight/dry-run, merge A then B, and verify two separate no-ff feature boundaries plus a manifest feature list in that order. +- [ ] Run only `npx vitest run test/integration-runbook.test.ts test/local-integration-runbook.test.ts test/feature-preview-runbook.test.ts`, `npm run typecheck`, and `git diff --check`. +- [ ] Run `./script/build_and_run.sh --verify` from the exact leased integration tip. Verify the signed provenance and About feature list include both branches/tips and the real main window remains usable. +- [ ] Leave the client open and pause for explicit user acceptance. After acceptance, record the exact tip/digest and promote with `--ff-only`. +- [ ] Verify canonical `main` contains both example commits. Retain the three rehearsal worktrees/branches until the user explicitly authorizes cleanup; do not push or publish. + +## Plan C Completion Gate + +- Every preview identity is a deterministic function of an exact valid feature branch plus stable hash. +- Preview source, package metadata, Info.plist, userData, launch proof, persistent badge, and About all agree on slug/branch/commit. +- Preview never uses formal user data, global skills, migration, updater, notarization, publish, or shared active-generation state. +- Build/package/post-build failures leave the currently running preview and shared Sherlock untouched. +- Switching/stopping one preview targets one exact absolute executable and preserves every sibling process. +- The real preview Harness window and shared Sherlock can remain open concurrently for user acceptance. +- The final two-feature rehearsal proves independent handoffs, ordered complete merges, multi-feature provenance, real shared-client acceptance, and `--ff-only` promotion without remote or destructive operations. diff --git a/docs/superpowers/plans/2026-08-31-sherlock-session-integration-controls.md b/docs/superpowers/plans/2026-08-31-sherlock-session-integration-controls.md new file mode 100644 index 000000000..a556a82cd --- /dev/null +++ b/docs/superpowers/plans/2026-08-31-sherlock-session-integration-controls.md @@ -0,0 +1,695 @@ +# Sherlock Session Integration Controls Implementation Plan + +> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:test-driven-development for every implementation task, superpowers:verification-before-completion before every task commit, and either superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to execute this plan task-by-task. + +**Goal:** Give every Sherlock feature session a commit-bound handoff, create one durable integration batch at a time, merge complete feature histories without silent loss, and promote only an explicitly accepted integration tip to local `main` with `--ff-only`. + +**Architecture:** Extract repository inspection from the formal-release verifier into one shared Git library. Build validated JSON handoff cards and tracked batch manifests on top of that library. Keep the long-lived active-batch lease in the Git common directory, and expose a preflight-first executor whose mutating operations are explicit, recoverable, local-only, and bound to exact commits. + +**Tech Stack:** Node.js 24 ESM, Git CLI, TypeScript declaration files, Vitest 4, JSON manifests, macOS/Linux filesystem primitives. + +**Spec:** `docs/superpowers/specs/2026-08-31-sherlock-multi-session-integration-workflow-design.md` + +## Global Constraints + +- This is plan A of three. Complete it before `2026-08-31-sherlock-shared-build-provenance.md` and `2026-08-31-sherlock-feature-preview-isolation.md`. +- Execute this plan in a dedicated worktree branch `codex/feat/session-integration-controls-20260831` created from the approved planning commit on local `main`. +- Local `main` is the only daily integration baseline. No command in this plan may run `fetch`, `pull`, `push`, `rebase`, `reset`, force-update a ref, delete a branch, remove a worktree, or delete user files. +- Feature branches must match `codex/feat/-`. Integration branches must match `codex/integration/`. +- Handoffs, manifests, checks, leases, and acceptance all bind to full lowercase 40-character commit IDs. A moved ref invalidates previous evidence. +- Check commands are argv arrays executed with `shell: false`. Never accept a shell command string from JSON. +- Conflicts remain visible for explicit resolution. Never use whole-tree `ours` or `theirs`. +- Only generated outputs on the coded allowlist may be ignored by source-clean checks. Unknown untracked paths fail closed. +- Do not run the full test suite. Run only the focused files named in each task. +- Every task that changes tracked files ends in a local Git commit with a Chinese message and contains no unrelated `dist-internal/` or `output/` files. + +## Shared Interfaces Produced for Later Plans + +`scripts/lib/sherlock-git-state.d.mts`: + +```ts +export interface GitCommandResult { + status: number + stdout: string + stderr: string +} + +export interface RepositoryContext { + worktreeRoot: string + gitDirectory: string + commonDirectory: string + branch: string | null + head: string + linkedWorktree: boolean +} + +export interface RepositoryStatus { + trackedChanges: string[] + untrackedSources: string[] + untrackedOutputs: string[] + sourceClean: boolean +} + +export interface RegisteredWorktree { + path: string + head: string + branch: string | null + locked: boolean + prunable: boolean +} + +export interface RangeCommit { + commit: string + parents: string[] + subject: string +} + +export interface NameStatusChange { + status: string + path: string + previousPath?: string +} + +export function runGit( + repository: string, + args: readonly string[], + options?: { allowFailure?: boolean } +): GitCommandResult +export function resolveRepositoryContext(repository: string): RepositoryContext +export function readRepositoryStatus(repository: string): RepositoryStatus +export function listRegisteredWorktrees(repository: string): RegisteredWorktree[] +export function resolveCommit(repository: string, revision: string): string +export function isAncestor(repository: string, ancestor: string, descendant: string): boolean +export function listRangeCommits(repository: string, base: string, tip: string): RangeCommit[] +export function diffNameStatus(repository: string, base: string, tip: string): NameStatusChange[] +``` + +`scripts/lib/sherlock-shared-source-gate.d.mts`: + +```ts +export type Sha256Digest = string + +export interface SharedSourceSnapshot { + mode: 'local-main' | 'local-integration' + worktreeRoot: string + branch: string + commit: string + mainCommit: string + sourceClean: true + batchId: string | null + manifestPath: string | null + manifestDigest: Sha256Digest | null + features: readonly { branch: string; commit: string }[] + leaseRevision: number | null +} + +export function verifySharedBuildSource(options: { + repository: string + ownerToken?: string +}): SharedSourceSnapshot + +export function assertSharedBuildSourceUnchanged( + before: SharedSourceSnapshot, + after: SharedSourceSnapshot +): void +``` + +## CLI Contracts + +```bash +npm run git:handoff -- \ + --repo \ + --base \ + --metadata \ + [--output ] \ + [--format text|json] + +npm run git:integration:preflight -- \ + --repo \ + --phase prepare|merge|continue|recover-owner|sync-main|accept|promote|cancel \ + [--manifest config/sherlock-integration-batches/.json] \ + [--feature codex/feat/-] \ + [--main-worktree ] \ + [--json] + +npm run git:integration -- create \ + --repo \ + --batch \ + --worktree .worktrees/integration- \ + --handoff \ + [--handoff ] \ + --checks \ + [--dry-run] [--json] + +npm run git:integration -- adopt \ + --repo \ + --batch \ + --handoff \ + [--handoff ] \ + --checks \ + [--dry-run] [--json] + +npm run git:integration -- merge \ + --repo \ + --manifest config/sherlock-integration-batches/.json \ + --feature codex/feat/- \ + [--dry-run] [--json] + +npm run git:integration -- continue \ + --repo \ + --manifest \ + --feature \ + [--dry-run] [--json] + +npm run git:integration -- recover-owner \ + --repo \ + --manifest \ + --confirm-batch \ + --confirm-tip \ + [--json] + +npm run git:integration -- sync-main \ + --repo \ + --manifest \ + [--dry-run] [--json] + +npm run git:integration -- accept \ + --repo \ + --manifest \ + --commit \ + --confirm-batch \ + [--json] + +npm run git:integration -- promote \ + --repo \ + --manifest \ + --main-worktree \ + --confirm-batch \ + --confirm-tip \ + [--dry-run] [--json] + +npm run git:integration -- cancel \ + --repo \ + --manifest \ + --confirm-batch \ + --explicit-cancellation \ + [--dry-run] [--json] +``` + +Exit codes are `0` for success or a clean dry-run, `1` for policy/check failure with state restored, `2` for invalid CLI/schema, `3` for a deliberately retained merge conflict, and `4` for partial success requiring the printed recovery command. With `--json`, stdout contains exactly one report/result and diagnostics go to stderr. + +## Task 1: Extract One Repository-State Library + +**Files:** + +- Create: `scripts/lib/sherlock-git-state.mjs` +- Create: `scripts/lib/sherlock-git-state.d.mts` +- Create: `test/helpers/git-workflow-fixture.ts` +- Create: `test/git-workflow-state.test.ts` +- Create: `vitest.config.ts` +- Modify: `scripts/verify-formal-git-state.mjs` +- Modify: `test/formal-git-state.test.ts` + +**Interfaces:** Implement every export in “Shared Interfaces” above plus `runGit(repository, args, options)`. Preserve `verifyFormalGitState(repository)` and all current Chinese failure text. + +- [ ] Add `createGitWorkflowFixture()` in `test/helpers/git-workflow-fixture.ts`. It must initialize disposable `main`, set local identity, set `commit.gpgSign=false`, isolate `GIT_CONFIG_GLOBAL=/dev/null`, create linked worktrees, commit files, and expose a byte-for-byte snapshot of refs/status/worktrees/common-dir integration files. +- [ ] Add failing cases in `test/git-workflow-state.test.ts` for linked worktree/common-directory resolution, detached HEAD, rename/copy `--name-status -z` parsing, filenames containing spaces, the distinction between `src/new.ts` and allowed `dist-local-integration/...` output, and a Vitest config that excludes `**/.worktrees/**` from default collection. +- [ ] Extend `test/formal-git-state.test.ts` with a regression proving that allowed generated output remains ignored while an unknown untracked root file fails as source. +- [ ] Run `npx vitest run test/git-workflow-state.test.ts test/formal-git-state.test.ts` and confirm failure because the shared module and the stricter unknown-path rule do not exist. +- [ ] Implement `runGit` with a 64 MiB output limit and explicit allowed-failure results. Parse all path-bearing Git output with NUL delimiters; do not line-split paths. +- [ ] Implement `resolveRepositoryContext` using `rev-parse --show-toplevel`, `--git-dir`, `--git-common-dir`, `branch --show-current`, and `rev-parse HEAD`. Return absolute normalized paths. +- [ ] Implement `readRepositoryStatus` with an exact top-level output allowlist: `dist/`, `dist-dev/`, `dist-internal/`, `dist-notarized/`, `dist-legacy/`, `dist-release/`, `dist-local-integration/`, `dist-feature-preview/`, `output/`, and `.sherlock-build/`. Do not use a broad `dist-*` wildcard; treat every other untracked path as source. +- [ ] Add `vitest.config.ts` using Vitest’s default exclusions plus `**/.worktrees/**` so linked checkouts never duplicate test collection. +- [ ] Implement worktree, ancestry, range-log, and name-status helpers; keep them read-only. +- [ ] Refactor `verify-formal-git-state.mjs` to consume the new library without changing existing formal-release behavior or messages. +- [ ] Run `npx vitest run test/git-workflow-state.test.ts test/formal-git-state.test.ts test/git-local-policy.test.ts` and confirm all focused cases pass. +- [ ] Run `npm run typecheck` and `git diff --check`. +- [ ] Commit only these files with `git commit -m "重构：统一 Sherlock Git 仓库状态检查"`. + +## Task 2: Generate Commit-Bound Feature Handoffs + +**Files:** + +- Create: `scripts/lib/sherlock-integration-model.mjs` +- Create: `scripts/lib/sherlock-integration-model.d.mts` +- Create: `scripts/create-sherlock-session-handoff.mjs` +- Create: `test/session-handoff.test.ts` +- Modify: `package.json` + +**Interfaces:** + +```ts +export interface CheckEvidence { + argv: [string, ...string[]] + outcome: 'passed' + summary: string + verifiedCommit: string + completedAt: string + timeoutMs: number +} + +export interface FeatureHandoff { + schemaVersion: 1 + featureName: string + branch: string + baseCommit: string + tipCommit: string + commits: RangeCommit[] + files: NameStatusChange[] + checks: CheckEvidence[] + uiVerification: { outcome: 'passed' | 'not-applicable'; summary: string } + acceptanceCriteria: string[] + risks: string[] + generatedAt: string +} + +export function validateFeatureHandoff(value: unknown): FeatureHandoff +export function buildFeatureHandoff(options: { + repository: string + baseCommit: string + metadata: unknown + generatedAt: string +}): FeatureHandoff +``` + +- [ ] Write `test/session-handoff.test.ts` cases for a two-commit feature, rename records, ordered full SHAs, multiple argv checks, and deterministic regeneration. +- [ ] Add rejection cases for a dirty feature worktree, a non-`codex/feat/*` branch, a base that is not an ancestor, empty commit ranges, check evidence bound to another tip, unsafe relative paths, duplicate commits, absolute paths, NUL bytes, and command strings. +- [ ] Add a CLI case asserting the default output is `/sherlock-integration/handoffs/-.json`, identical regeneration is idempotent, and differing content is never overwritten. +- [ ] Run `npx vitest run test/session-handoff.test.ts` and confirm it fails because the model and CLI are absent. +- [ ] Implement strict validators: full SHA regex, feature-branch regex, normalized repository-relative paths, unique ordered commits, and `verifiedCommit === tipCommit` for every check. +- [ ] Implement `buildFeatureHandoff` from the exact current branch ref, declared base, range log, and three-dot name-status diff. Reject any source-dirty worktree. +- [ ] Implement CLI arguments `--repo`, `--base`, `--metadata`, optional `--output`, and `--format text|json`. JSON stdout must contain only the card; diagnostics go to stderr. +- [ ] Add `"git:handoff": "node scripts/create-sherlock-session-handoff.mjs"` to `package.json`. +- [ ] Run `npx vitest run test/session-handoff.test.ts test/git-workflow-state.test.ts`, `npm run typecheck`, and `git diff --check`. +- [ ] Commit with `git commit -m "工具：增加功能会话提交交接卡"`. + +## Task 3: Validate Tracked Batch Manifests and Read-Only Preflight + +**Files:** + +- Modify: `scripts/lib/sherlock-integration-model.mjs` +- Modify: `scripts/lib/sherlock-integration-model.d.mts` +- Create: `scripts/lib/sherlock-integration-preflight.mjs` +- Create: `scripts/lib/sherlock-integration-preflight.d.mts` +- Create: `scripts/verify-sherlock-integration.mjs` +- Create: `test/integration-batch.test.ts` +- Modify: `package.json` + +**Interfaces:** + +```ts +export interface IntegrationBatchManifest { + schemaVersion: 1 + batchId: string + branch: string + baseMainCommit: string + expectedMainCommit: string + createdAt: string + features: Array<{ + handoff: FeatureHandoff + merged?: { + mergeCommit: string + verificationCommit: string + checks: CheckEvidence[] + recordedAt: string + } + }> + integrationChecks: Array<{ argv: [string, ...string[]]; timeoutMs: number }> + mainSynchronizations: Array<{ + previousMainCommit: string + mainCommit: string + mergeCommit: string + verificationCommit: string + checks: CheckEvidence[] + recordedAt: string + }> +} + +export type IntegrationPhase = + | 'prepare' + | 'merge' + | 'continue' + | 'recover-owner' + | 'sync-main' + | 'accept' + | 'promote' + | 'cancel' + +export interface PreflightReport { + schemaVersion: 1 + ok: boolean + phase: IntegrationPhase + branch: string | null + head: string + batchId?: string + findings: Array<{ + code: string + severity: 'info' | 'warning' | 'error' + message: string + details?: Record + }> + plannedActions: Array<{ kind: string; description: string; argv?: string[] }> +} + +export function validateIntegrationBatchManifest(value: unknown): IntegrationBatchManifest +export function createIntegrationBatchManifest(options: { + batchId: string + branch: string + baseMainCommit: string + handoffs: FeatureHandoff[] + integrationChecks: IntegrationBatchManifest['integrationChecks'] + createdAt: string +}): IntegrationBatchManifest +export function verifyFeatureHandoff(options: { + repository: string + handoff: FeatureHandoff + batchMainCommit: string +}): PreflightReport +export function preflightIntegrationAction(options: { + repository: string + phase: IntegrationPhase + manifestPath?: string + featureBranch?: string + mainWorktree?: string + expectedAcceptedTip?: string +}): PreflightReport +``` + +- [ ] Write failing manifest tests for `YYYYMMDD-NN` batch IDs, exact branch derivation, unique branch/tip pairs, non-empty acceptance criteria, safe paths, argv-only checks, and full SHA fields. +- [ ] Write failing preflight tests for a moved feature ref, dirty registered feature worktree, undeclared history, base not ancestral to both feature tip and batch main, stale check evidence, a partially merged feature, and a feature already fully merged. +- [ ] Assert preflight collects every read-only finding, labels already-merged work as an idempotent info finding, and leaves the fixture snapshot byte-identical. +- [ ] Run `npx vitest run test/integration-batch.test.ts` and confirm failure because manifest and preflight exports are absent. +- [ ] Implement manifest validation and creation. The manifest path must be exactly `config/sherlock-integration-batches/.json` when used by an executor. +- [ ] Implement `verifyFeatureHandoff` by comparing exact ref, exact commit list, exact three-dot name-status list, worktree status, ancestry, patch IDs for partially merged commits, and check-tip bindings. +- [ ] Implement phase-specific preflight reports without mutation. Never stop at the first finding. +- [ ] Implement CLI arguments `--repo`, `--phase`, optional `--manifest`, `--feature`, `--main-worktree`, and `--json`. +- [ ] Add `"git:integration:preflight": "node scripts/verify-sherlock-integration.mjs"`. +- [ ] Run `npx vitest run test/integration-batch.test.ts test/session-handoff.test.ts`, `npm run typecheck`, and `git diff --check`. +- [ ] Commit with `git commit -m "工具：增加集成批次清单与只读预检"`. + +## Task 4: Add the Durable Active-Batch Lease + +**Files:** + +- Create: `scripts/lib/sherlock-active-batch.mjs` +- Create: `scripts/lib/sherlock-active-batch.d.mts` +- Create: `test/active-integration-lease.test.ts` + +**Interfaces:** + +```ts +export interface ActiveBatchLease { + schemaVersion: 1 + revision: number + batchId: string + branch: string + manifestPath: string + baseMainCommit: string + currentTip: string + ownerTokenHash: string + createdAt: string + updatedAt: string + acceptedTip?: string + acceptedManifestDigest?: Sha256Digest + acceptedAt?: string +} + +export function readActiveBatchLease(repository: string): ActiveBatchLease | null +export function acquireActiveBatchLease(options: { + repository: string + lease: Omit + ownerToken: string +}): { lease: ActiveBatchLease; created: boolean } +export function updateActiveBatchTip(options: { + repository: string + ownerToken: string + expectedRevision: number + expectedTip: string + nextTip: string + updatedAt: string +}): ActiveBatchLease +export function markActiveBatchAccepted(options: { + repository: string + ownerToken: string + expectedRevision: number + acceptedTip: string + acceptedManifestDigest: Sha256Digest + acceptedAt: string +}): ActiveBatchLease +export function recoverActiveBatchOwnership(options: { + repository: string + expectedBatchId: string + expectedTip: string + expectedManifestDigest: Sha256Digest +}): { lease: ActiveBatchLease; ownerTokenFile: string } +export function archiveActiveBatchLease(options: { + repository: string + ownerToken?: string + expectedBatchId: string + outcome: 'promoted' | 'cancelled' + archivedAt: string + explicitCancellation?: boolean +}): { lease: ActiveBatchLease; archivePath: string } +``` + +- [ ] Write failing tests where two worktrees race to acquire the same common-dir lease and exactly one succeeds. +- [ ] Add cases for same-owner idempotency, mismatched batch refusal, wrong-token update/archive refusal, stale revision refusal, stale expected tip, acceptance invalidation after a tip change, and cancellation without explicit confirmation. +- [ ] Add explicit owner-recovery cases: the persisted mode-0600 token, batch, exact current tip, and current manifest digest must all match; a missing token file or any mismatch preserves the lease and refuses recovery. +- [ ] Assert the raw random token exists only in `/sherlock-integration-owner.json` with mode `0600`; the common-dir lease stores only its SHA-256 digest. +- [ ] Assert archive creates `/sherlock-integration/history/--/lease.json` and never removes refs, worktrees, manifests, or files. +- [ ] Run `npx vitest run test/active-integration-lease.test.ts` and confirm failure because the lease module is absent. +- [ ] Implement acquisition by populating a staging directory and atomically renaming it to `/sherlock-integration/active`. Never overwrite or auto-delete an existing lease. +- [ ] Implement compare-and-swap revision/tip updates and owner-token digest checks using atomic temporary-file rename. +- [ ] Implement recovery, acceptance, and archival exactly as typed. Recovery validates but does not rotate the token or mutate the lease; only explicit cancellation may archive without the owner token. +- [ ] Run `npx vitest run test/active-integration-lease.test.ts test/git-workflow-state.test.ts`, `npm run typecheck`, and `git diff --check`. +- [ ] Commit with `git commit -m "工具：增加单一集成批次租约"`. + +## Task 5: Create or Adopt an Integration Batch + +**Files:** + +- Create: `scripts/lib/sherlock-integration-executor.mjs` +- Create: `scripts/lib/sherlock-integration-executor.d.mts` +- Create: `scripts/manage-sherlock-integration.mjs` +- Create: `test/integration-executor.test.ts` +- Modify: `package.json` + +**Interfaces:** Add `IntegrationExecutionResult` plus `createIntegrationBatch` and `adoptIntegrationBatch` from the signatures below. + +```ts +export interface IntegrationExecutionResult { + schemaVersion: 1 + status: + | 'planned' + | 'prepared' + | 'merged' + | 'conflict' + | 'ownership-recovered' + | 'main-synchronized' + | 'accepted' + | 'promoted' + | 'cancelled' + | 'recovery-required' + batchId: string + branch: string + beforeCommit: string + afterCommit: string + actions: Array<{ kind: string; description: string; argv?: string[] }> + recoveryCommand?: string +} + +export function createIntegrationBatch(options: { + mainRepository: string + worktreePath: string + batchId: string + handoffPaths: string[] + integrationChecks: IntegrationBatchManifest['integrationChecks'] + dryRun: boolean + now: string +}): IntegrationExecutionResult + +export function adoptIntegrationBatch(options: { + integrationRepository: string + batchId: string + handoffPaths: string[] + integrationChecks: IntegrationBatchManifest['integrationChecks'] + dryRun: boolean + now: string +}): IntegrationExecutionResult +``` + +- [ ] Write failing tests for fallback `create` from a clean canonical `main` and preferred `adopt` after a Codex-created linked worktree. +- [ ] Add rejection cases for a noncanonical main path, dirty main, existing batch ref/path/manifest, wrong branch, nonlinked adopt checkout, HEAD differing from `main`, malformed handoff, and an existing incompatible lease. +- [ ] Add dry-run cases that assert refs, index, worktrees, status, and common-dir integration state stay byte-identical. +- [ ] Capture every Git argv in executor fixtures and assert no phase invokes `fetch`, `pull`, `push`, `rebase`, `reset`, forced ref updates, branch deletion, worktree removal, or garbage collection. +- [ ] Run `npx vitest run test/integration-executor.test.ts` and confirm failure because executor and CLI are absent. +- [ ] Implement `create` with `git worktree add -b` only after checking `.worktrees/` is ignored and every target is absent. Never reset or reuse a preexisting target. +- [ ] Implement `adopt` without moving the worktree or branch. Require a clean linked worktree at the exact local `main` tip. +- [ ] Acquire the active lease before writing the tracked manifest. Write `config/sherlock-integration-batches/.json` and make it the first Chinese commit on the integration branch. +- [ ] If any post-lease step fails, return recovery-required and preserve the lease/worktree for explicit recovery. +- [ ] Implement CLI subcommands `create` and `adopt`, repeated `--handoff`, `--checks`, `--dry-run`, and `--json`. +- [ ] Add `"git:integration": "node scripts/manage-sherlock-integration.mjs"`. +- [ ] Run `npx vitest run test/integration-executor.test.ts test/integration-batch.test.ts test/active-integration-lease.test.ts`, `npm run typecheck`, and `git diff --check`. +- [ ] Commit with `git commit -m "工具：增加集成批次创建与接管"`. + +## Task 6: Merge Complete Feature Histories with Recovery + +**Files:** + +- Modify: `scripts/lib/sherlock-integration-executor.mjs` +- Modify: `scripts/lib/sherlock-integration-executor.d.mts` +- Modify: `scripts/manage-sherlock-integration.mjs` +- Modify: `test/integration-executor.test.ts` + +**Interfaces:** + +```ts +export function mergeIntegrationFeature(options: { + integrationRepository: string + manifestPath: string + featureBranch: string + ownerToken: string + dryRun: boolean + now: string +}): IntegrationExecutionResult + +export function continueIntegrationFeature(options: { + integrationRepository: string + manifestPath: string + featureBranch: string + ownerToken: string + dryRun: boolean + now: string +}): IntegrationExecutionResult +``` + +- [ ] Add a failing successful-merge case that proves all feature commits become ancestors, `--no-ff` creates a boundary merge commit, the declared checks run at the staged merge state, a Chinese merge message is used, and the manifest records exact merge/check commits. +- [ ] Add a check-failure case that asserts `git merge --abort` restores the pre-merge snapshot byte-for-byte. +- [ ] Add a conflict case that expects exit/status `conflict`, preserves `MERGE_HEAD` and unmerged files, prints both-side context, and never changes the manifest or lease tip. +- [ ] Add recovery cases for “merge commit exists but manifest record is missing” and prove `continue` records it without creating a duplicate merge. +- [ ] Add tests that check argv execution uses `shell: false`, timeout is enforced, a moved feature ref invalidates the operation, and a wrong owner token cannot mutate state. +- [ ] Run `npx vitest run test/integration-executor.test.ts` and confirm the new cases fail. +- [ ] Implement `merge` as preflight → `git merge --no-ff --no-commit ` → declared argv checks → Chinese merge commit → manifest record commit → lease tip update after each commit. +- [ ] On check failure call only `git merge --abort`. On conflict retain state and return exit code 3. Never auto-resolve. +- [ ] Implement idempotent `continue` for the exact expected parent/tip and return a printed recovery command when partial success occurs. +- [ ] Ensure CLI exit codes are `0` success/dry-run, `1` policy or restored check failure, `2` invalid CLI/schema, `3` retained conflict, and `4` recovery required. +- [ ] Run `npx vitest run test/integration-executor.test.ts test/integration-batch.test.ts`, `npm run typecheck`, and `git diff --check`. +- [ ] Commit with `git commit -m "集成：按完整功能历史合并并支持恢复"`. + +## Task 7: Synchronize Main, Record Acceptance, and Promote Fast-Forward Only + +**Files:** + +- Modify: `scripts/lib/sherlock-integration-executor.mjs` +- Modify: `scripts/lib/sherlock-integration-executor.d.mts` +- Modify: `scripts/manage-sherlock-integration.mjs` +- Modify: `test/integration-executor.test.ts` + +**Interfaces:** Implement `recoverIntegrationOwnership`, `synchronizeIntegrationMain`, `acceptIntegrationBatch`, `promoteIntegrationBatch`, and `cancelIntegrationBatch` with the exact option shapes documented in `scripts/lib/sherlock-integration-executor.d.mts`. + +```ts +export function recoverIntegrationOwnership(options: { + integrationRepository: string + manifestPath: string + confirmBatchId: string + confirmTip: string +}): IntegrationExecutionResult +``` + +- [ ] Add a failing `recover-owner` case that validates the persisted owner token, exact lease tip, tracked manifest path/digest, and current integration branch without changing Git or lease state. +- [ ] Add failing tests where `main` advances and `sync-main` merges it without rebase, reruns integration checks, records `expectedMainCommit`, advances the lease tip, and invalidates prior acceptance. +- [ ] Add acceptance tests proving only an exact current tip and manifest SHA-256 can be marked accepted and `accept` creates no Git commit. +- [ ] Add promotion rejection tests for a dirty canonical main worktree, stale expected main, stale accepted tip/digest, non-fast-forward history, missing feature ancestor, and the wrong canonical main path. +- [ ] Add the successful promotion case: execute `git -C merge --ff-only `, verify every declared feature tip is now a `main` ancestor, run minimal integration confirmation, and archive the lease as promoted. +- [ ] Add cancellation tests proving `--confirm-batch` plus `--explicit-cancellation` archives only the lease and preserves every branch, worktree, manifest, tracked file, and untracked file. +- [ ] Run `npx vitest run test/integration-executor.test.ts` and confirm failures for missing lifecycle operations. +- [ ] Implement `sync-main`, running only manifest-declared argv checks and recording the exact synchronization commit/check evidence. +- [ ] Implement `accept` as lease metadata only. Bind it to current integration tip and current manifest digest. +- [ ] Implement `promote` from the canonical main worktree with source-clean and exact-HEAD checks, ancestry assertions, and `--ff-only`. Never switch or reset the main worktree. +- [ ] Implement explicit `cancel` archival without any cleanup. +- [ ] Extend the CLI with `recover-owner`, `sync-main`, `accept`, `promote`, and `cancel` arguments exactly as described by `--help`. +- [ ] Run `npx vitest run test/integration-executor.test.ts test/active-integration-lease.test.ts test/formal-git-state.test.ts`, `npm run typecheck`, and `git diff --check`. +- [ ] Commit with `git commit -m "集成：增加验收绑定与主分支安全推进"`. + +## Task 8: Expose the Shared-Build Source Gate + +**Files:** + +- Create: `scripts/lib/sherlock-shared-source-gate.mjs` +- Create: `scripts/lib/sherlock-shared-source-gate.d.mts` +- Create: `test/shared-source-gate.test.ts` +- Modify: `scripts/verify-formal-git-state.mjs` +- Modify: `test/formal-git-state.test.ts` + +**Interfaces:** Implement `SharedSourceSnapshot`, `verifySharedBuildSource`, and `assertSharedBuildSourceUnchanged` exactly as declared near the top of this plan. + +- [ ] Write failing local-main cases requiring canonical `main`, exact `mainCommit === commit`, source cleanliness, no active lease, null batch fields, and no features. +- [ ] Write failing local-integration cases requiring the exact active lease branch/tip, owner-token match, tracked manifest path, manifest digest, reachable feature tips, current `main` ancestry, and a nonempty feature list. +- [ ] Add cases proving a lease blocks `main` builds and every other integration branch even when they run sequentially. +- [ ] Add a local-main case proving a clean unmerged feature worktree does not block daily local builds; keep that stricter “all branches/worktrees landed” rule only in `verifyFormalGitState`. +- [ ] Add snapshot-change cases for HEAD movement, new source dirt, manifest edits, lease revision/tip change, feature ref movement, and `main` advancement. +- [ ] Add formal-gate regression cases proving an active batch blocks formal build before any release mutation. +- [ ] Run `npx vitest run test/shared-source-gate.test.ts test/formal-git-state.test.ts` and confirm failures. +- [ ] Implement the source gate only from shared Git/model/lease helpers. Do not compute dependency state in this module; plan B enriches the immutable snapshot after dependency preparation. +- [ ] Compare all fields in `assertSharedBuildSourceUnchanged` and report the first mismatched field with before/after values. +- [ ] Make `verifyFormalGitState` reject an active integration lease while preserving its existing stricter checks for all dirty worktrees and unmerged branches. +- [ ] Run `npx vitest run test/shared-source-gate.test.ts test/formal-git-state.test.ts test/git-workflow-state.test.ts`, `npm run typecheck`, and `git diff --check`. +- [ ] Commit with `git commit -m "构建：增加共享客户端来源门禁"`. + +## Task 9: Document the Operational Contract + +**Files:** + +- Create: `docs/sherlock-multi-session-integration-runbook.md` +- Modify: `docs/git-version-management.md` +- Modify: `AGENTS.md` +- Create: `test/integration-runbook.test.ts` + +- [ ] Write a failing source-level test requiring the runbook to contain exact `handoff`, `adopt`, `preflight`, `merge`, `continue`, `sync-main`, `accept`, `promote`, and `cancel` examples, plus the stable exit codes. +- [ ] Add assertions that `AGENTS.md` forbids shared builds from feature worktrees and directs local test requests to the future shared-build runner delivered by plan B. +- [ ] Run `npx vitest run test/integration-runbook.test.ts` and confirm it fails before the documentation is updated. +- [ ] Write the runbook from feature creation through post-acceptance retention. State that the integration tooling is effective now, while the shared-client build portion becomes effective only after plan B lands. +- [ ] Document explicit recovery for retained merge conflicts, partial manifest recording, interrupted active-batch ownership, a stale build lock, cancelled batches, and old pre-governance worktrees. Never prescribe forced deletion. +- [ ] Update `docs/git-version-management.md` with local-main authority, no automatic upstream synchronization, the separate `codex/upstream-sync/` review flow, Chinese commit boundaries, and the separation between integration, acceptance, and formal release. +- [ ] Update `AGENTS.md` with concise mandatory triggers and the three-plan transition note. Preserve all existing formal-release rules. +- [ ] Run: + + ```bash + npx vitest run \ + test/git-workflow-state.test.ts \ + test/session-handoff.test.ts \ + test/integration-batch.test.ts \ + test/active-integration-lease.test.ts \ + test/integration-executor.test.ts \ + test/shared-source-gate.test.ts \ + test/integration-runbook.test.ts \ + test/formal-git-state.test.ts \ + test/git-local-policy.test.ts + npm run typecheck + git diff --check + ``` + +- [ ] Inspect `git status --short` and ensure `dist-internal/` and `output/` are not staged. +- [ ] Commit with `git commit -m "文档：落地 Sherlock 多会话集成规范"`. + +## Task 10: Bootstrap This Feature Through Its Own Integration Executor + +**Files:** No direct source edits. The new executor creates the tracked batch manifest and Chinese integration commits. + +- [ ] Confirm `codex/feat/session-integration-controls-20260831` is source-clean and all task commits are descendants of the recorded planning `main` base. +- [ ] Generate a handoff card with `npm run git:handoff` whose checks are the complete focused command from Task 9 and whose UI verification is `not-applicable` with the reason “local Git workflow tooling has no client UI”. +- [ ] Create a clean integration worktree from the unchanged planning `main` tip. Invoke `scripts/manage-sherlock-integration.mjs` by absolute path from the feature worktree to `adopt` that integration worktree; this one-time bootstrap is allowed because the executor code is not yet present on `main`. +- [ ] Run preflight and merge the complete plan-A feature branch. Verify the executor creates the tracked manifest, Chinese merge boundary, verification record, and active lease without reset/rebase/ref deletion. +- [ ] Exercise one read-only handoff/preflight dry-run fixture from the integration worktree and confirm no state changes. +- [ ] Present the exact integration tip, focused results, and manifest to the user for acceptance. Do not promote while acceptance is pending. +- [ ] After explicit acceptance, use the integration worktree’s own executor to record acceptance and `--ff-only` promote to canonical `main`. +- [ ] Verify canonical `main` equals the accepted tip, all plan-A commits are ancestors, the lease is archived as promoted, and both worktrees remain available. + +## Plan A Completion Gate + +- Every mutating CLI has a preceding read-only preflight and deterministic dry-run. +- Handoff, merge, acceptance, and promotion refer to the same exact feature and integration commits. +- One common-dir active lease blocks every competing shared build source until promotion or explicit cancellation. +- Check failure restores the merge state; conflict and recovery-required states remain inspectable. +- Promotion is possible only as a clean canonical-main `--ff-only` update. +- No task performs upstream synchronization, destructive cleanup, formal publishing, or a full test run. diff --git a/docs/superpowers/plans/2026-08-31-sherlock-shared-build-provenance.md b/docs/superpowers/plans/2026-08-31-sherlock-shared-build-provenance.md new file mode 100644 index 000000000..86089918e --- /dev/null +++ b/docs/superpowers/plans/2026-08-31-sherlock-shared-build-provenance.md @@ -0,0 +1,653 @@ +# Sherlock Shared Build Provenance and Rollback Implementation Plan + +> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:test-driven-development for every implementation task, superpowers:systematic-debugging for any unexpected build/runtime failure, superpowers:verification-before-completion before every task commit, and either superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to execute this plan task-by-task. + +**Goal:** Make every shared local Sherlock client provably originate from the exact clean local `main` or active integration tip, prevent concurrent worktrees from replacing it, disable public updating in local acceptance builds, and automatically reopen the previous verified generation if the new client fails to reach the real Harness UI. + +**Architecture:** Consume plan A’s immutable Git source snapshot and active-batch lease. Enrich it with deterministic dependency evidence, emit a signed-in provenance resource, and package into a new immutable generation under the canonical checkout. A common-dir lock protects the full lifecycle. The runner validates twice before stopping anything, launches by exact App/executable path, waits for a main-window proof written only after Harness is visible, then atomically advances the active pointer or rolls back both the App and managed configuration mutations. + +**Tech Stack:** Electron 43, electron-vite 5, electron-builder 26, Node.js 24 ESM, TypeScript 5.9, Bash, macOS `codesign`/`open`/`pgrep`, Vitest 4, patch-package 8. + +**Spec:** `docs/superpowers/specs/2026-08-31-sherlock-multi-session-integration-workflow-design.md` + +## Global Constraints + +- This is plan B of three. Start only after every completion gate in `2026-08-31-sherlock-session-integration-controls.md` passes. +- Execute this plan in a dedicated worktree branch `codex/feat/shared-build-provenance-20260831` created from the accepted plan-A tip on local `main`. +- Preserve the existing `./script/build_and_run.sh --verify` user-facing command. It becomes a thin dispatcher to the new runner. +- `local-main` and `local-integration` use product name `Sherlock`, Bundle ID `com.evanarts.sherlock`, and the existing `sherlock-desktop` user-data directory. They must use channel `local-integration` and must not contact a public updater. +- Formal release remains a separate `formal` mode with channel `notarized` and the existing release gates. This plan does not publish, upload, bump the version, push, or tag. +- Source/provenance/lock/package checks must all pass before any existing Sherlock process is stopped. +- Never identify or stop a client by process name alone. Bind every operation to an absolute executable path and verified provenance. +- New packages live in immutable generations under the canonical checkout. Never overwrite a signed App bundle in place. +- An active pointer changes only after the new App reaches the real Harness main window and its proof matches the expected commit/channel/digest. +- A failed launch must leave the pointer unchanged, roll back managed startup mutations, and reopen the previous verified absolute App path. +- Local integration and feature preview must never synchronize bundled skills to global `~/.agents/skills`. +- Do not run the full test suite. Use only the focused tests in this plan and one real packaged UI verification. +- Commit every task that changes tracked files separately with the listed Chinese message; never stage existing `dist-internal/` or `output/`. + +## Cross-Plan Inputs + +Consume without duplicating: + +- `resolveRepositoryContext()` and `listRegisteredWorktrees()` from `scripts/lib/sherlock-git-state.mjs`. +- `verifySharedBuildSource()` and `assertSharedBuildSourceUnchanged()` from `scripts/lib/sherlock-shared-source-gate.mjs`. +- `readActiveBatchLease()` and owner-token checks from `scripts/lib/sherlock-active-batch.mjs`. + +## Canonical Provenance Interface + +Create `scripts/lib/sherlock-build-provenance.mjs` as the only parser/validator and re-export it through `src/shared/build-provenance.ts`. + +```ts +export type Sha256Digest = string +export type SherlockBuildMode = + | 'local-main' + | 'local-integration' + | 'feature-preview' + | 'formal' + +export interface ProvenanceFeature { + branch: string + commit: string +} + +export interface ProvenanceBase { + schemaVersion: 1 + productVersion: string + mode: SherlockBuildMode + channel: 'local-integration' | 'feature-preview' | 'notarized' + branch: string + commit: string + mainCommit: string + sourceClean: true + dependencyDigest: Sha256Digest + builtAt: string +} + +export type SherlockBuildProvenance = + | (ProvenanceBase & { + mode: 'local-main' + channel: 'local-integration' + batchId: null + manifestDigest: null + features: [] + }) + | (ProvenanceBase & { + mode: 'local-integration' + channel: 'local-integration' + batchId: string + manifestDigest: Sha256Digest + features: [ProvenanceFeature, ...ProvenanceFeature[]] + }) + | (ProvenanceBase & { + mode: 'feature-preview' + channel: 'feature-preview' + batchId: null + manifestDigest: null + features: [ProvenanceFeature] + preview: { + slug: string + identityHash: string + baseCommit: string + tipCommit: string + } + }) + | (ProvenanceBase & { + mode: 'formal' + channel: 'notarized' + batchId: null + manifestDigest: null + features: [] + }) + +export function validateBuildProvenance(value: unknown): SherlockBuildProvenance +export function readBuildProvenance(file: string): SherlockBuildProvenance +export function parseBuildProvenanceJson(text: string): SherlockBuildProvenance +export function buildProvenanceArgument(value: SherlockBuildProvenance): string +export function buildProvenanceFromArguments( + args: readonly string[] +): SherlockBuildProvenance | undefined +``` + +## Task 1: Define Provenance and Dependency Evidence + +**Files:** + +- Create: `scripts/lib/sherlock-build-provenance.mjs` +- Create: `scripts/lib/sherlock-build-provenance.d.mts` +- Create: `scripts/lib/sherlock-dependency-digest.mjs` +- Create: `scripts/lib/sherlock-dependency-digest.d.mts` +- Create: `scripts/create-build-provenance.mjs` +- Create: `src/shared/build-provenance.ts` +- Modify: `scripts/prepare-bundled-plugin-profile.mjs` +- Modify: `.gitignore` +- Create: `test/build-provenance.test.ts` +- Create: `test/dependency-provenance.test.ts` +- Modify: `test/bundled-plugin-profile.test.ts` + +**Interfaces:** + +```ts +export interface DependencyEvidence { + schemaVersion: 1 + lockfileDigest: Sha256Digest + patchSetDigest: Sha256Digest + patchResultDigest: Sha256Digest + bundledProfileManifestDigest: Sha256Digest + workspaceNodeVersion: string + digest: Sha256Digest +} + +export function collectDependencyEvidence(options: { + projectRoot: string + bundledProfileManifest: string + workspaceNodeExecutable: string +}): DependencyEvidence + +export function createBuildProvenance( + source: SharedSourceSnapshot, + dependency: DependencyEvidence, + options: { productVersion: string; builtAt: string } +): SherlockBuildProvenance + +export function writeBuildProvenance( + outputPath: string, + value: SherlockBuildProvenance +): Promise<{ sha256: Sha256Digest }> +``` + +- [ ] Write failing table tests for all four provenance modes, including exact required-null/required-nonempty fields, full SHA values, SemVer product version, ISO-8601 time, SHA-256 digests, `sourceClean === true`, and channel/mode matching. +- [ ] Add rejection cases for unknown modes/channels, unknown top-level fields, absolute paths, usernames/home paths, credential-like keys, duplicate feature branches/tips, mismatched preview tip, and `mainCommit !== commit` in local-main/formal. +- [ ] Add encode/decode tests for the command-line argument and malformed/oversized argument rejection. +- [ ] Write dependency evidence tests with a fixture lockfile, two patches in lexical order, their exact patched target bytes under fixture `node_modules`, a bundled profile manifest, and a fake Node executable reporting a version. +- [ ] Add a repository check proving `.sherlock-build/` and `dist-local-integration/` are Git-ignored while integration manifests, handoffs, and source files are not. +- [ ] Extend bundled-profile tests to require deterministic `build/sherlock-plugin-profile/sherlock-build-manifest.json` containing schema version plus sorted repository-relative file paths and SHA-256 values for the complete portable profile except the manifest itself. +- [ ] Add mutation cases proving that changing the lockfile, patch bytes, patched target bytes, profile manifest, or Node version changes the final digest. +- [ ] Run `npx vitest run test/build-provenance.test.ts test/dependency-provenance.test.ts` and confirm failure because the modules do not exist. +- [ ] Implement canonical JSON validation with exact-key allowlists and deterministic serialization. Prefix every SHA-256 as `sha256:<64 lowercase hex>`. +- [ ] Compute `patchSetDigest` from sorted repository-relative patch paths plus raw bytes. Parse unified-diff target paths and compute `patchResultDigest` from the corresponding current `node_modules` target bytes; reject missing or escaping targets. +- [ ] Generate the bundled profile manifest only after the portable profile is complete, then make `bundledProfileManifestDigest` cover its exact bytes. A profile rebuild after provenance generation must therefore invalidate the package. +- [ ] Add only `.sherlock-build/` and `dist-local-integration/` to `.gitignore` for this plan’s generated provenance/context and canonical generations. +- [ ] Implement provenance creation for plan A’s `SharedSourceSnapshot`. Do not infer batch fields or modify the source snapshot. +- [ ] Re-export the canonical implementation and types from `src/shared/build-provenance.ts` so main/preload code cannot drift from build scripts. +- [ ] Implement CLI `--source-snapshot`, `--dependency-evidence`, `--output`, and test-only `--built-at`. Require the output to remain under ignored `.sherlock-build/`. +- [ ] Run `npx vitest run test/build-provenance.test.ts test/dependency-provenance.test.ts test/bundled-plugin-profile.test.ts`, `npm run typecheck`, and `git diff --check`. +- [ ] Commit with `git commit -m "构建：增加可验证的 Sherlock 构建来源"`. + +## Task 2: Fail Closed on Runtime Channel and Disable Every Update Entry + +**Files:** + +- Create: `src/main/build-context.ts` +- Modify: `src/main/app-identity.ts` +- Modify: `src/main/index.ts` +- Modify: `src/main/update/update-policy.ts` +- Modify: `src/main/update/update-manager.ts` +- Modify: `src/shared/contracts.ts` +- Modify: `src/preload/index.ts` +- Modify: `src/preload/sidebar-update-control.ts` +- Modify: `test/app-identity.test.ts` +- Modify: `test/update.test.ts` +- Modify: `test/update-manager.test.ts` +- Modify: `test/sidebar-update-control.test.ts` + +**Interfaces:** + +```ts +export type DesktopChannel = + | 'development' + | 'legacy' + | 'legacy-bridge' + | 'notarized' + | 'local-integration' + | 'feature-preview' + +export interface DesktopRuntimePolicy { + updates: 'enabled' | 'disabled' + synchronizeGlobalSkills: boolean + migrateLegacyUserData: boolean + allowExplicitUserDataPath: boolean +} + +export interface DesktopBuildContext { + channel: DesktopChannel + provenance?: SherlockBuildProvenance + policy: DesktopRuntimePolicy +} + +export function desktopRuntimePolicy(channel: DesktopChannel): DesktopRuntimePolicy +export function resolveDesktopBuildContext(options: { + packaged: boolean + appPath: string + resourcesPath: string +}): DesktopBuildContext +export function resolveDesktopIdentity(options: { + appDataPath: string + channel: DesktopChannel + explicitUserDataPath: string + provenance?: SherlockBuildProvenance +}): DesktopIdentity +export function bundledSkillOverrideDirectories(options: { + userData: string + agentsHome: string + policy: DesktopRuntimePolicy +}): string[] +``` + +- [ ] Add failing tests proving unknown/missing packaged channel metadata throws before identity selection; a corrupted or mismatched provenance file also throws. +- [ ] Add local-integration identity tests for `Sherlock` plus `sherlock-desktop`, disabled updates, idempotent legacy-to-Sherlock migration, no explicit user-data override, and no global skill destination. +- [ ] Preserve current development/legacy/legacy-bridge/notarized identity expectations; add explicit policy table assertions for every channel. +- [ ] Change update policy tests to `supportsAutoUpdates(isPackaged, platform, channel)` and prove both local-integration and feature-preview return false on macOS/Windows. +- [ ] Add update-manager tests proving disabled channels register safe `unsupported` IPC responses but never call `autoUpdater`, schedule timers, listen for resume, expose download/install actions, or run direct manual checks. +- [ ] Add sidebar/menu tests proving the update control and menu item are absent, not merely disabled, for update-disabled channels. +- [ ] Run `npx vitest run test/app-identity.test.ts test/update.test.ts test/update-manager.test.ts test/sidebar-update-control.test.ts` and confirm the new cases fail. +- [ ] Implement `resolveDesktopBuildContext` and remove `resolveDesktopChannel()`’s silent `legacy` fallback from `src/main/index.ts`. Resolve the context before `app.setName`, `app.setPath`, migration, or skill/profile synchronization. +- [ ] Implement one policy table. `local-integration` disables updates/global skills/explicit userData but retains the same idempotent legacy-to-Sherlock migration as `notarized`; `feature-preview` disables all four; `notarized` retains updates, global skill synchronization, and formal migration. +- [ ] Pass channel/policy through update manager, IPC, menu, preload bridge, and sidebar control. Disabled manual checks must return `phase: 'unsupported'` without touching updater state. +- [ ] Make `stopUpdateManager()` reset timers, listeners, callbacks, started state, and install state for deterministic tests. +- [ ] Run the same four focused test files, `npm run typecheck`, and `git diff --check`. +- [ ] Commit with `git commit -m "桌面端：按构建通道隔离身份与更新策略"`. + +## Task 3: Package and Verify the Local-Integration Channel + +**Files:** + +- Create: `electron-builder.local-integration.cjs` +- Modify: `electron-builder.notarized.cjs` +- Modify: `package.json` +- Modify: `scripts/verify-packaged-macos.mjs` +- Create: `test/local-integration-builder.test.ts` +- Create: `test/macos-package-provenance.test.ts` +- Modify: `test/release.test.ts` + +**Interfaces:** + +```ts +export function verifyPackagedMacApp(options: { + appPath: string + expectedBundleId: string + expectedChannel: DesktopChannel + expectedCommit: string + expectedProvenanceSha256: Sha256Digest + forbidUpdateConfig: boolean +}): void +``` + +- [ ] Write a failing config test requiring `com.evanarts.sherlock`, `Sherlock`, `local-integration`, `publish: null`, `mac.notarize: false`, and an absolute output from `SHERLOCK_PACKAGE_OUTPUT_DIR`. +- [ ] Add a regression requiring the base builder metadata in `package.json` to declare `dshDesktopChannel: 'legacy'` explicitly; missing packaged channel metadata must never regain the old silent fallback. +- [ ] Assert the builder refuses missing/relative output and provenance environment paths, includes `sherlock-build-provenance.json` plus the bundled plugin profile, and never includes `app-update-notarized.yml`. +- [ ] Add verifier fixture tests for Bundle ID/name/executable, packaged `dshDesktopChannel`, provenance raw-byte digest and expected commit, no `app-update.yml`, bundled Node, bundled skill/profile, and deep-strict signature command. +- [ ] Add one negative case per invariant, including a provenance file changed after signing and an updater config hidden in Resources. +- [ ] Extend release tests so `electron-builder.notarized.cjs` also requires a formal provenance path but retains its existing feed/sign/notarize behavior. +- [ ] Run `npx vitest run test/local-integration-builder.test.ts test/macos-package-provenance.test.ts test/release.test.ts` and confirm failures. +- [ ] Implement the local builder config as a function that validates its environment before returning config. Keep `package:local-integration:dir` internal and require the orchestrator to prepare profile/provenance first. +- [ ] Add explicit `legacy` channel metadata to the base builder configuration so every packaged build has a declared channel. +- [ ] Update the formal builder to embed provenance without changing its public feed. Ensure the formal runner will provide the required file before invoking it. +- [ ] Refactor `verify-packaged-macos.mjs` to export `verifyPackagedMacApp` while preserving existing CLI compatibility, then add the six explicit expected-value flags. +- [ ] Run the three focused tests, `npm run typecheck`, and `git diff --check`. +- [ ] Commit with `git commit -m "构建：增加本地集成打包通道与包校验"`. + +## Task 4: Add the Common-Directory Build Lock and Immutable Generations + +**Files:** + +- Create: `scripts/lib/shared-build-lock.mjs` +- Create: `scripts/lib/shared-build-lock.d.mts` +- Create: `scripts/lib/local-integration-generations.mjs` +- Create: `scripts/lib/local-integration-generations.d.mts` +- Create: `scripts/lib/exact-executable-lifecycle.mjs` +- Create: `scripts/lib/exact-executable-lifecycle.d.mts` +- Create: `scripts/recover-sherlock-build-lock.mjs` +- Create: `test/shared-build-lock.test.ts` +- Create: `test/local-integration-generations.test.ts` +- Create: `test/shared-client-lifecycle.test.ts` + +**Interfaces:** + +```ts +export interface SharedBuildLockOwner { + schemaVersion: 1 + pid: number + processStartedAt: string + nonce: string + worktree: string + branch: string + commit: string + batchId: string | null + acquiredAt: string +} + +export function acquireSharedBuildLock(options: { + gitCommonDir: string + owner: SharedBuildLockOwner +}): Promise<{ lockDirectory: string; owner: SharedBuildLockOwner }> +export function releaseSharedBuildLock(lease: { + lockDirectory: string + owner: SharedBuildLockOwner +}): Promise +export function recoverStaleSharedBuildLock(options: { + gitCommonDir: string + expectedNonce: string +}): Promise + +export interface ActiveGeneration { + schemaVersion: 1 + appPath: string + executablePath: string + mode: 'local-main' | 'local-integration' + commit: string + provenanceDigest: Sha256Digest + activatedAt: string +} + +export function promoteVerifiedGeneration(options: { + stagedApp: string + generationApp: string +}): Promise +export function readActiveGeneration(stateRoot: string): Promise +export function writeActiveGenerationAtomic( + stateRoot: string, + generation: ActiveGeneration +): Promise + +export function fullExecutableArgumentPattern(executablePath: string): string +export interface RunningSherlockApp { + pid: number + appPath: string + executablePath: string + bundleId: string +} +export function discoverRunningSherlockApps(): Promise +export function findExactExecutablePids(executablePath: string): number[] +export function stopExactExecutable( + executablePath: string, + options?: { graceMs?: number } +): Promise +export function waitForExactExecutable( + executablePath: string, + options?: { timeoutMs?: number; intervalMs?: number; stableSamples?: number } +): Promise +``` + +- [ ] Write failing lock tests where two processes/worktrees race and one wins, a live owner blocks immediately without queuing, a dead owner still blocks ordinary acquisition, the wrong nonce cannot release, and exit/signal cleanup releases only the caller’s lock. +- [ ] Write explicit recovery tests requiring both a dead recorded PID and the exact nonce. A live PID, reused PID with different start time, or mismatched nonce must refuse recovery. +- [ ] Write generation tests for staging under `/dist-local-integration/staging/`, atomic promotion to `generations/--/Sherlock.app`, no overwrite, absolute-path active pointer, and pointer unchanged on failure. +- [ ] Write lifecycle tests with two executable symlinks containing spaces/regex characters. Stopping one must leave the other and an unrelated `Sherlock`-named process alive. +- [ ] Add discovery tests for an already-running pre-governance Sherlock: resolve its absolute executable/App path and Bundle ID, reject ambiguous multiple shared identities, and never require a process-name-only kill. +- [ ] Run `npx vitest run test/shared-build-lock.test.ts test/local-integration-generations.test.ts test/shared-client-lifecycle.test.ts` and confirm failures. +- [ ] Implement the lock with atomic `mkdir` under `/sherlock-local-integration/build-lock` and owner JSON written before acquisition is reported. +- [ ] Derive the canonical root from the registered `main` worktree; reject ambiguity or absence. Never infer it from the calling feature/integration directory. +- [ ] Implement staging-to-generation atomic rename and active pointer at `/sherlock-local-integration/active.json`. Never automatically prune generations. +- [ ] Implement discovery from absolute process executable paths and bundle metadata, then exact matching using an escaped full-argument pattern with `/usr/bin/pgrep -f -x`. Never call `pkill -x Sherlock`. +- [ ] Add a recovery CLI that only invokes `recoverStaleSharedBuildLock` with `--repo` and `--expected-nonce`. +- [ ] Run the same three focused tests, `npm run typecheck`, and `git diff --check`. +- [ ] Commit with `git commit -m "构建：增加跨工作树锁与不可变客户端代次"`. + +## Task 5: Journal and Roll Back Managed Startup Mutations + +**Files:** + +- Create: `scripts/lib/managed-launch-transaction.mjs` +- Create: `scripts/lib/managed-launch-transaction.d.mts` +- Create: `scripts/rollback-managed-launch.mjs` +- Modify: `src/main/bundled-skill-sync.ts` +- Modify: `src/main/bundled-plugin-profile.ts` +- Modify: `src/main/app-data-migration.ts` +- Modify: `src/main/index.ts` +- Create: `test/managed-launch-transaction.test.ts` +- Modify: `test/bundled-plugin-profile.test.ts` +- Modify: `test/bundled-skill-upgrade.test.ts` +- Modify: `test/app-identity.test.ts` + +**Interfaces:** + +```ts +export interface ManagedLaunchJournal { + schemaVersion: 1 + nonce: string + state: 'open' | 'committed' | 'rolled-back' + userDataPath: string + createdAt: string + operations: Array< + | { kind: 'created'; targetPath: string } + | { kind: 'replaced'; targetPath: string; backupPath: string } + | { kind: 'retired'; targetPath: string; backupPath: string } + > +} + +export function beginManagedLaunchTransaction(options: { + userDataPath: string + nonce: string + journalPath: string + createdAt: string +}): ManagedLaunchJournal +export function recordManagedLaunchOperation( + journalPath: string, + nonce: string, + operation: ManagedLaunchJournal['operations'][number] +): ManagedLaunchJournal +export function commitManagedLaunchTransaction( + journalPath: string, + nonce: string +): ManagedLaunchJournal +export function rollbackManagedLaunchTransaction( + journalPath: string, + nonce: string +): ManagedLaunchJournal +``` + +- [ ] Write failing transaction tests for newly created targets, replaced files/directories, retired plugins, an interrupted open journal, exact reverse-order rollback, idempotent commit/rollback, and wrong nonce/path-escape rejection. +- [ ] Extend bundled-profile tests to prove replaced receipts and retired plugins are moved aside, recorded, and recoverable until commit. +- [ ] Extend migration/skill tests so only changes made by this launch are journaled; existing sessions, settings, caches, and user-created skills are never deleted or reverted. +- [ ] Run `npx vitest run test/managed-launch-transaction.test.ts test/bundled-plugin-profile.test.ts test/bundled-skill-upgrade.test.ts test/app-identity.test.ts` and confirm failures. +- [ ] Implement a write-ahead journal with atomic file replacement and backups below the same user-data filesystem. Validate every target remains below the declared user-data root. +- [ ] Add an optional transaction recorder to bundled skill synchronization, bundled profile installation, and legacy migration. Local integration passes it; ordinary development/formal behavior remains compatible. +- [ ] Defer permanent backup cleanup until commit. Rollback restores only journaled managed mutations in exact reverse order. +- [ ] Add `rollback-managed-launch.mjs --journal --nonce ` for the orchestrator’s crash path. Do not expose a broad directory target. +- [ ] Run the same four focused tests, `npm run typecheck`, and `git diff --check`. +- [ ] Commit with `git commit -m "运行时：增加启动配置事务与失败回滚"`. + +## Task 6: Prove the Real Harness Window Is Ready + +**Files:** + +- Create: `src/main/local-launch-proof.ts` +- Modify: `src/main/index.ts` +- Create: `test/local-launch-proof.test.ts` +- Modify: `test/runtime.test.ts` + +**Interfaces:** + +```ts +export interface LocalLaunchProof { + schemaVersion: 1 + nonce: string + pid: number + executablePath: string + appPath: string + channel: DesktopChannel + commit: string + provenanceDigest: Sha256Digest + readyAt: string +} + +export function resolveLaunchProofRequest( + commandLine: Electron.CommandLine +): { path: string; nonce: string } | undefined +export function writeLaunchProofOnce( + request: { path: string; nonce: string }, + proof: LocalLaunchProof +): void +``` + +- [ ] Write failing tests for absent args, relative proof path, missing nonce, duplicate writes, symlink/path escape, wrong provenance, and a proof file already owned by another launch. +- [ ] Add a runtime test proving no proof is written at process creation, splash display, backend `ready`, or failed navigation. +- [ ] Add the positive case only after `openHarness()` has loaded the expected Harness URL, synchronized theme, shown/focused the real main window, and confirmed the window is not destroyed. +- [ ] Run `npx vitest run test/local-launch-proof.test.ts test/runtime.test.ts` and confirm failures. +- [ ] Implement exclusive `wx` proof creation with mode `0600` and exact nonce, PID, `process.execPath`, App path, channel, commit, provenance digest, and timestamp. +- [ ] Place the write after the real-window checks in `openHarness()`. Leave the managed launch transaction open after proof creation; the orchestrator commits it only after independently validating the proof. On handled startup failure, roll it back. +- [ ] Run the two focused tests, `npm run typecheck`, and `git diff --check`. +- [ ] Commit with `git commit -m "运行时：以真实主界面生成本地启动证明"`. + +## Task 7: Orchestrate Gate, Build, Switch, and Rollback + +**Files:** + +- Create: `scripts/run-local-integration.mjs` +- Create: `scripts/run-formal-with-lock.mjs` +- Modify: `script/build_and_run.sh` +- Modify: `package.json` +- Create: `test/local-integration-runner.test.ts` +- Modify: `test/build-and-run.test.ts` +- Modify: `test/release.test.ts` + +**CLI:** + +```text +node scripts/run-local-integration.mjs + --repo + --mode run|verify|debug|logs|telemetry + [--batch-manifest ] + [--lease-owner-token-file ] + +node scripts/run-formal-with-lock.mjs --repo -- +``` + +- [ ] Write a failing call-order test asserting `verifySharedBuildSource` occurs before lock acquisition and both occur before dependency preparation, packaging, stopping, or opening. +- [ ] Add failures at gate, lock, dependency preparation, provenance generation, build, staging verification, and post-build source recheck; assert none invokes stop/open or changes the active pointer. +- [ ] Assert every gate failure reports the calling worktree, branch, full commit, and the concrete failed invariant. +- [ ] Add a success case proving the runner prepares the bundled profile before dependency evidence, builds a unique staging path, verifies it, rechecks the source snapshot, promotes and re-verifies the generation, then stops the exact old executable and opens the exact new App. +- [ ] Add dependency-isolation cases proving the runner uses the calling integration/main worktree’s own `node_modules` and bundled-profile preparation; reject a dependency tree symlinked to or resolved inside another registered worktree. +- [ ] Add launch-failure cases for timeout, wrong PID/path, wrong commit/channel/digest, destroyed window, and crash. Assert the new executable is stopped, managed configuration is rolled back, the pointer remains old, and the old absolute App path is reopened and reverified. +- [ ] Add a rollback-failure case that reports both old/new absolute App and executable paths plus verification diagnostics and never claims a usable client remains. +- [ ] Add first-run behavior with no old generation: report failure honestly and leave the pointer absent. +- [ ] Add `debug`, `logs`, and `telemetry` cases proving they activate normally first, then use the exact PID rather than a process-name predicate. +- [ ] Extend shell tests to prove all five local modes dispatch to this runner, the old `pkill -x` functions are gone, and `--formal` checks formal Git state plus active-batch conflict and acquires the shared lock before stopping an App. +- [ ] Run `npx vitest run test/local-integration-runner.test.ts test/build-and-run.test.ts test/release.test.ts` and confirm failures. +- [ ] Implement the exact 14-stage lifecycle from the spec. Before stopping, discover and verify the current absolute shared App even when no active pointer exists. Hold the lock across build, launch proof, managed-transaction commit, pointer update/rollback, and cleanup using nonce-checked `finally`. +- [ ] After validating the launch proof, commit the managed transaction, atomically update the active pointer, and reverify the generation’s signature/provenance/executable path. Any failure before pointer success follows the same rollback path. +- [ ] Pass provenance to the App through both the signed resource and command-line display argument. Require byte-for-byte digest agreement among expected file, packaged file, and launch proof. +- [ ] Make `script/build_and_run.sh` a strict mode/argument dispatcher. Keep the existing `--formal` release commands behind `run-formal-with-lock.mjs` without changing signing/notarization/upload semantics. +- [ ] Make `--formal` prepare dependency evidence and a `formal` provenance file for the exact clean `main` commit before invoking the notarized builder; keep the public feed and all later release gates unchanged. +- [ ] Add `package:local-integration:dir` and any internal runner scripts to `package.json`. Do not add a user-facing command that bypasses the orchestrator. +- [ ] Run the same three focused tests plus `test/shared-source-gate.test.ts`, `test/shared-build-lock.test.ts`, `test/local-integration-generations.test.ts`, and `test/local-launch-proof.test.ts`; then run `npm run typecheck` and `git diff --check`. +- [ ] Commit with `git commit -m "构建：安全切换并回滚本地 Sherlock 客户端"`. + +## Task 8: Display the Exact Build Source in About + +**Files:** + +- Modify: `src/shared/app-info.ts` +- Modify: `src/preload/about-info.ts` +- Modify: `src/preload/index.ts` +- Modify: `src/main/index.ts` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-settings-general/lib/client.js` +- Modify: `patches/@deepseek-ai+dsh-client-ui-settings-general+0.1.0-rc.7.patch` +- Modify: `test/app-info.test.ts` +- Modify: `test/settings-about.test.ts` + +**Interfaces:** + +```ts +export interface SherlockAboutBuildInfo { + mode: SherlockBuildMode + label: string + branch: string + shortCommit: string + batchId: string | null + builtAt: string + features: readonly { branch: string; shortCommit: string }[] +} + +export interface SherlockAboutInfo { + productName: 'Sherlock' + version: string + build: SherlockAboutBuildInfo + updatesEnabled: boolean + releaseNotes: SherlockReleaseNote[] +} + +export function formatSherlockBuildInfo( + provenance: SherlockBuildProvenance, + locale: SherlockAboutLocale +): SherlockAboutBuildInfo +``` + +- [ ] Write failing formatter cases for `Local Main`, `Integration `, `Feature Preview `, and `Formal ` with short SHA and localized build time. +- [ ] Extend About bridge tests to accept `{ readUpdateStatus, checkForUpdates, locale, provenance, updatesEnabled }` and return exactly the same provenance fields embedded in the App. +- [ ] Extend patched UI tests to assert `data-about-build-provenance`, batch/mode label, `branch @ shortSHA`, build time, feature list, and complete absence of the check-update button when `updatesEnabled === false`. +- [ ] Add native About/menu tests using the same formatter; do not construct a second source string in `src/main/index.ts`. +- [ ] Run `npx vitest run test/app-info.test.ts test/settings-about.test.ts` and confirm failures. +- [ ] Implement the formatter and bridge, then patch the installed settings bundle using `apply_patch`. +- [ ] Regenerate only `patches/@deepseek-ai+dsh-client-ui-settings-general+0.1.0-rc.7.patch` with patch-package and verify a clean dependency reinstall reapplies it. +- [ ] Run `npx vitest run test/app-info.test.ts test/settings-about.test.ts test/update-manager.test.ts test/sidebar-update-control.test.ts`, `npm run typecheck`, and `git diff --check`. +- [ ] Commit with `git commit -m "界面：在关于页展示精确构建来源"`. + +## Task 9: Document, Verify, and Hand Off the Feature Branch + +**Files:** + +- Modify: `docs/sherlock-local-test-runbook.md` +- Modify: `docs/sherlock-multi-session-integration-runbook.md` +- Modify: `AGENTS.md` +- Create: `test/local-integration-runbook.test.ts` + +- [ ] Write a failing documentation test requiring the exact local `--verify` flow, shared-source gate, active lease behavior, lock recovery command, generation path, rollback semantics, About provenance checks, and “leave App open” instruction. +- [ ] Update both runbooks and `AGENTS.md` so the transition note from plan A becomes fully effective. Explicitly ban direct `npm run package:formal:dir` as a local-test shortcut. +- [ ] Run `npx vitest run test/local-integration-runbook.test.ts test/build-and-run.test.ts`, `npm run typecheck`, and `git diff --check`. +- [ ] Inspect `git status --short`, stage only documentation/test changes, and commit with `git commit -m "文档：启用 Sherlock 共享客户端安全构建流程"`. +- [ ] Run the focused regression set: + + ```bash + npx vitest run \ + test/build-provenance.test.ts \ + test/dependency-provenance.test.ts \ + test/app-identity.test.ts \ + test/update.test.ts \ + test/update-manager.test.ts \ + test/sidebar-update-control.test.ts \ + test/local-integration-builder.test.ts \ + test/macos-package-provenance.test.ts \ + test/shared-build-lock.test.ts \ + test/local-integration-generations.test.ts \ + test/shared-client-lifecycle.test.ts \ + test/managed-launch-transaction.test.ts \ + test/local-launch-proof.test.ts \ + test/local-integration-runner.test.ts \ + test/build-and-run.test.ts \ + test/app-info.test.ts \ + test/settings-about.test.ts \ + test/local-integration-runbook.test.ts \ + test/shared-source-gate.test.ts \ + test/formal-git-state.test.ts + npm run typecheck + git diff --check + ``` + +- [ ] If the regression requires a tracked fix, return to its owning TDD task, create a separate Chinese fix commit, and rerun the entire focused set. +- [ ] Confirm `codex/feat/shared-build-provenance-20260831` is source-clean and generate its commit-bound handoff with `npm run git:handoff`, using the plan-A-accepted `main` commit as `--base`. + +## Task 10: Integrate and Accept the Real Shared Client + +**Files:** No direct source edits. The plan-A executor creates and updates the tracked batch manifest and merge commits. + +- [ ] In the dedicated integration session, create or adopt `codex/integration/` from the unchanged plan-A `main` tip and include the exact plan-B handoff card. +- [ ] Run read-only preflight, merge the complete feature branch with `npm run git:integration -- merge`, and let the manifest-declared focused regression command run before the Chinese merge commit. +- [ ] Confirm the integration worktree is source-clean, its exact tip matches the active-batch lease, and the canonical `main` checkout remains at `expectedMainCommit`. +- [ ] From the integration worktree, run `./script/build_and_run.sh --verify` with the lease owner token. This is a local build only: no version bump, notarization, upload, update-feed change, push, or tag. +- [ ] Run the packaged verifier against the exact active generation and compare its commit/channel/provenance digest with the active pointer. +- [ ] Use `computer-use:computer-use` to read the real Sherlock main window, open About, and verify product version, `Integration `, exact integration branch/tip, build time, feature list, absent update controls, and a usable Harness conversation view. +- [ ] Leave the verified Sherlock generation open for the user. +- [ ] Pause for explicit user acceptance bound to this exact tip. Do not promote or clean anything while acceptance is pending. +- [ ] After acceptance, record it with `npm run git:integration -- accept` and promote from the canonical main worktree with `npm run git:integration -- promote`. Verify `main` now equals the accepted integration tip and every plan-B feature commit is an ancestor. +- [ ] Run the minimal post-promotion source/provenance check without rebuilding. Keep feature and integration worktrees until the user no longer needs iteration; do not auto-delete them. + +## Plan B Completion Gate + +- Every shared local App contains signed provenance matching the exact source/dependency snapshot and visible About information. +- All local update paths are disabled in main process, IPC, menus, sidebar, About, builder metadata, and packaged resources. +- One common-dir lock covers the entire build/switch/rollback lifecycle across all worktrees. +- A bad source, dependency, package, signature, or post-build snapshot never stops the currently running client. +- A failed new launch restores managed startup state, leaves the active pointer unchanged, and reopens the previous exact generation. +- `./script/build_and_run.sh --verify` proves the real Harness main window and leaves it open. +- Formal release behavior stays separate and unchanged except for the shared lock, active-batch conflict, and formal provenance resource. diff --git a/docs/superpowers/plans/2026-09-01-research-canvas-downloads.md b/docs/superpowers/plans/2026-09-01-research-canvas-downloads.md new file mode 100644 index 000000000..ecab3b131 --- /dev/null +++ b/docs/superpowers/plans/2026-09-01-research-canvas-downloads.md @@ -0,0 +1,379 @@ +# Research Canvas Downloads Implementation Plan + +> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking. + +**Goal:** Add a download action to every Research canvas component, preserve original files where available, and export mind maps as PPT-ready SVG, PNG, or JPG. + +**Architecture:** Introduce a narrow main-process save service that validates format-specific payloads and resolves original files through the existing preview authorization registry. Build deterministic, testable export descriptors in the Research UI patch; generate mind-map vector output from the parsed tree and rasterize that controlled SVG at 2× only when PNG or JPG is selected. + +**Tech Stack:** Electron 43 native dialogs, Node.js filesystem APIs, TypeScript 5.9, React bundle patch, browser SVG/Canvas APIs, Vitest, Happy DOM, patch-package. + +**Spec:** `docs/superpowers/specs/2026-09-01-research-canvas-title-resize-download-design.md` + +## Global Constraints + +- Every node context menu contains download; the action targets only the right-clicked node. +- Local file exports resolve through `authorizationId`, `sessionId`, and `nodeId`; the renderer never supplies an arbitrary source path. +- Mind-map SVG, PNG, and JPG contain only the final map content on a white background, exclude component chrome, use safe padding, and preserve the approved blue/cyan palette and company PPT typography. +- PNG and JPG render at exactly 2× logical dimensions; JPG quality is `0.92`. +- Link and web-container exports are `.webloc`; summaries and other text are Markdown; charts are SVG; tables are CSV; KPI is Markdown; unfinished containers are TXT. +- Do not build or replace the shared Sherlock client from the feature worktree. Run only focused tests, type checking, build verification, and patch replay checks. + +--- + +### Task 1: Resolve original files and save validated export payloads + +**Files:** +- Modify: `src/main/state/research-file-preview.ts` +- Create: `src/main/state/research-canvas-export.ts` +- Create: `src/preload/research-canvas-export.ts` +- Modify: `src/preload/index.ts` +- Modify: `src/main/index.ts` +- Modify: `test/research-file-preview.test.ts` +- Create: `test/research-canvas-export.test.ts` + +**Interfaces:** +- Consumes: persisted preview authorization records from `ResearchFilePreviewRegistry`. +- Produces: `resolveExportSource(value): Promise<{ path: string; name: string } | null>`, `registerResearchCanvasExportHandlers(options): void`, and `window.dshDesktop.researchCanvasExport.save(request)`. + +- [ ] **Step 1: Write failing authorization-resolution tests** + +Add cases proving only the exact active authorization can be exported: + +```ts +await expect(registry.resolveExportSource({ + sessionId: 'session-1', nodeId: 'node-1', authorizationId: descriptor.authorizationId +})).resolves.toEqual({ path: await realpath(filePath), name: 'report.pdf' }) + +await expect(registry.resolveExportSource({ + sessionId: 'session-1', nodeId: 'other-node', authorizationId: descriptor.authorizationId +})).resolves.toBeNull() +``` + +Cover revoked authorization, missing file, path moved outside its authorized root, and a directory replacing the file. + +- [ ] **Step 2: Write failing save-service tests** + +Define exact request variants: + +```ts +export type ResearchCanvasExportRequest = + | { kind: 'original'; sessionId: string; nodeId: string; authorizationId: string; suggestedName: string } + | { kind: 'text'; format: 'md' | 'csv' | 'txt' | 'svg'; suggestedName: string; content: string } + | { kind: 'binary'; format: 'png' | 'jpg'; suggestedName: string; base64: string } + | { kind: 'webloc'; suggestedName: string; url: string } +``` + +Test exact-key validation, extension enforcement, filename cleaning, URL protocol rejection, text and binary size limits, save cancellation, write failure, original-file copying, and a trusted-main-frame-only IPC handler. + +- [ ] **Step 3: Run tests and verify RED** + +Run: + +```bash +npx vitest run test/research-file-preview.test.ts test/research-canvas-export.test.ts +``` + +Expected: FAIL because export resolution and the save service do not exist. + +- [ ] **Step 4: Implement secure original-file resolution** + +Add this public registry method without exposing the record map: + +```ts +async resolveExportSource(value: unknown): Promise<{ path: string; name: string } | null> { + const request = validExportResolution(value) + if (request === null) return null + const record = this.authorizations.get(request.authorizationId) + if (!record || record.sessionId !== request.sessionId || record.nodeId !== request.nodeId) return null + if (!await this.verifyRecord(record)) return null + return { path: await this.fileSystem.realpath(record.path), name: record.name } +} +``` + +Keep validation exact and bounded like the existing restore request. + +- [ ] **Step 5: Implement the native save service and preload bridge** + +Validate payloads before opening `dialog.showSaveDialog`. Enforce format-to-extension mapping in main, create `.webloc` content in main from the normalized HTTP(S) URL, decode raster base64 only after checking its encoded length, and write with `node:fs/promises`. + +Return only: + +```ts +type ResearchCanvasExportResult = + | { status: 'saved' } + | { status: 'cancelled' } + | { status: 'error'; message: string } +``` + +Register `research:canvas-export:save` through `registerTrustedMainWindowHandler`. Expose a frozen `researchCanvasExport.save` preload method; do not expose `dialog`, `writeFile`, `copyFile`, or saved paths. + +- [ ] **Step 6: Run focused service tests and commit** + +Run: + +```bash +npx vitest run test/research-file-preview.test.ts test/research-canvas-export.test.ts test/ipc-trust.test.ts +npm run typecheck +git add src/main/state/research-file-preview.ts src/main/state/research-canvas-export.ts src/preload/research-canvas-export.ts src/preload/index.ts src/main/index.ts test/research-file-preview.test.ts test/research-canvas-export.test.ts +git commit -m '功能：新增研究组件安全下载服务' +``` + +Expected: focused tests and type checking PASS. + +--- + +### Task 2: Build type-aware export descriptors + +**Files:** +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js` +- Modify: `test/sherlock-composer-workspace-ui.test.ts` + +**Interfaces:** +- Consumes: file nodes, artifact nodes, session identity, and Task 1 preload bridge. +- Produces: pure helpers `researchCanvasExportDescriptor(node, sessionId)`, `researchCanvasExportFileName(title, extension)`, and `buildResearchContainerChartSvg(spec)`. + +- [ ] **Step 1: Write failing format-mapping tests** + +Export the helper from the client bundle and assert exact mappings: + +```ts +expect(researchCanvasExportDescriptor(pdfNode, 's1')).toMatchObject({ kind: 'original', authorizationId: 'authorization_1' }) +expect(researchCanvasExportDescriptor(webLinkNode, 's1')).toMatchObject({ kind: 'webloc', url: 'https://example.com/' }) +expect(researchCanvasExportDescriptor(summaryNode, 's1')).toMatchObject({ kind: 'text', format: 'md' }) +expect(researchCanvasExportDescriptor(tableContainer, 's1')).toMatchObject({ kind: 'text', format: 'csv' }) +expect(researchCanvasExportDescriptor(failedContainer, 's1')).toMatchObject({ kind: 'text', format: 'txt' }) +``` + +Cover assistant result/excerpt, generated summary, completed and unfinished mind maps, chart, KPI, Markdown, web container, and file nodes without authorization. Assert CSV escaping for commas, quotes, CRLF, and embedded newlines. A completed mind map returns a format-choice descriptor; an unfinished or failed mind map returns TXT with its current state rather than attempting to rasterize nonexistent content. + +Add a chart SVG assertion: + +```ts +const chartSvg = buildResearchContainerChartSvg({ + version: 1, type: 'chart', title: '收入趋势', variant: 'line', + labels: ['一月', '二月'], series: [{ name: '收入', values: [10, 12] }] +}) +expect(chartSvg).toContain('|`, trimming trailing spaces/dots, bounding the stem to 120 characters, and using the component type when empty. + +Build `.webloc` in main, but pass only normalized URL and title from the renderer. Generate Markdown with a single `# title` heading followed by content. Generate table CSV with RFC-style doubled quotes and CRLF rows. Generate KPI Markdown as a heading and one bullet per label/value/change. Generate failed/draft task TXT with status, saved prompt, and available error text. + +Build chart SVG from the validated chart spec rather than serializing browser DOM. Use the same fixed view box, axes, labels, palette, and line/bar geometry as `ResearchContainerChart`; resolve all colors and fonts to literal SVG attributes, add a white background, escape title/labels/series names, and omit scripts, CSS variables, external references, and `foreignObject`. + +- [ ] **Step 4: Run descriptor tests and commit** + +Run: + +```bash +npx vitest run test/sherlock-composer-workspace-ui.test.ts -t 'export descriptor|download format|CSV' +npx patch-package @deepseek-ai/dsh-client-ui-conversation +git add patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch test/sherlock-composer-workspace-ui.test.ts +git commit -m '功能：按组件类型生成下载描述' +``` + +Expected: descriptor and chart SVG tests PASS and the implementation is reproducible through the canonical patch. + +--- + +### Task 3: Generate PPT-ready mind-map SVG, PNG, and JPG + +**Files:** +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js` +- Modify: `test/sherlock-composer-workspace-ui.test.ts` + +**Interfaces:** +- Consumes: existing `parseResearchMindMap(text, detail)` tree. +- Produces: `buildResearchMindMapSvg(text, detail, measureText)` and `rasterizeResearchMindMapSvg(svg, width, height, format)`. + +- [ ] **Step 1: Write failing vector-layout tests** + +Use an injected deterministic `measureText` function and assert: + +```ts +const result = buildResearchMindMapSvg('# 中心主题\n- 分支一\n - 结论一\n- 分支二', 'brief', (text) => text.length * 14) +expect(result).toMatchObject({ width: expect.any(Number), height: expect.any(Number) }) +expect(result.svg).toContain(' **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking. + +**Goal:** 在研究画布底部增加长驻“链接 / 容器”功能栏，并实现安全网页节点与五类安全原生智能容器。 + +**Architecture:** 桌面主进程增加按研究会话和节点绑定的外部子 frame URL 授权，preload 仅暴露有界 authorize/release 接口；画布把 `web-link` 与 `generated-container` 纳入现有 artifact、几何和持久化模型。容器生成扩展现有隔离任务运行时，最终只接收并渲染严格校验的版本化 JSON schema，刷新通过 iframe reload 或保存需求的隔离任务重跑完成。 + +**Tech Stack:** Electron 43、contextBridge/IPC、React、sandbox iframe、受控 SVG、Node.js ESM、Vitest、TypeScript、patch-package。 + +**Spec:** `docs/superpowers/specs/2026-09-01-research-canvas-global-toolbar-design.md` + +## Global Constraints + +- 全局功能栏固定在研究画布底部中央，不随画布缩放、平移或节点选择移动。 +- 链接只接受 `http:` 与 `https:`；禁止 `file:`、`javascript:`、`data:`、凭据 URL 与超长 URL。 +- 外部网页只在 sandbox iframe 中运行，不获得 Node.js、本地文件或敏感权限；网站禁止嵌入时只降级，不绕过限制。 +- 容器只支持 `web`、`chart`、`table`、`kpi`、`markdown` 五类版本 1 schema，不执行任意 HTML 或 JavaScript。 +- 容器任务沿用每个父 Research Session 四槽 FIFO，并与右侧对话和输入草稿隔离。 +- 定时刷新只在文档可见、研究画布活跃且节点无运行任务时发生；刷新失败保留上次成功内容。 +- 运行态随主题变化，成功后移除全部过程；失败态中央展示提示和重试。 +- 不运行全量测试；不公证、不发布、不上传、不递增版本，不在用户验收前 promote。 +- 每个可独立验证的实现任务创建中文本地提交，不混入其他 session 改动。 + +## File Map + +- Create `src/main/state/research-link-frame.ts`: URL 规范化、会话/节点授权、撤销和 frame 导航判定。 +- Create `src/preload/research-link-frame.ts`: preload bridge 的严格请求形状与 IPC 调用。 +- Modify `src/main/security.ts`: 非主 frame 只允许已授权研究链接或现有 `sherlock-preview:`。 +- Modify `src/main/index.ts`: 初始化 registry，向 `secureWindow` 注入判定并注册 IPC handlers。 +- Modify `src/preload/index.ts`: 暴露 `dshDesktop.researchLinkFrame`。 +- Create `test/research-link-frame.test.ts`: registry、bridge、IPC 所有权和撤销测试。 +- Modify `test/security.test.ts`: 已授权与未授权子 frame 导航测试。 +- Modify `packages/dsh-research-task-runtime/index.js`: 新增 container 请求、固定提示词与持久化字段。 +- Modify `test/research-task-runtime.test.js`: container contract、prompt、调度复用和恢复测试。 +- Modify `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js`: artifact schema、toolbar、link/container cards、任务生命周期、刷新和 CSS。 +- Modify `patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch`: 持久化 client bundle 修改。 +- Modify `test/research-file-drop.test.ts`: 两种新 artifact 的有界持久化、布局和内容校验。 +- Modify `test/sherlock-composer-workspace-ui.test.ts`: 工具栏、链接、五类容器、刷新和隔离的 DOM 行为测试。 + +--- + +### Task 1: External Link Frame Authorization Boundary + +**Files:** +- Create: `src/main/state/research-link-frame.ts` +- Create: `src/preload/research-link-frame.ts` +- Create: `test/research-link-frame.test.ts` +- Modify: `src/main/security.ts` +- Modify: `src/main/index.ts` +- Modify: `src/preload/index.ts` +- Modify: `test/security.test.ts` + +**Interfaces:** +- Produces: `normalizeResearchLinkUrl(value: unknown): string | null`. +- Produces: `ResearchLinkFrameRegistry.authorize({ sessionId, nodeId, url })`, `.release({ sessionId, nodeId })`, `.releaseSession(sessionId)`, `.allows(url)`. +- Produces: `createResearchLinkFrameBridge(invoke)` with `authorize`, `release`, `releaseSession`. +- Changes: `secureWindow(window, { allowsResearchFrameUrl })`. + +- [ ] **Step 1: Write failing registry and bridge tests** + +```ts +expect(normalizeResearchLinkUrl(' HTTPS://Example.com:443/report#part ')) + .toBe('https://example.com/report#part') +expect(normalizeResearchLinkUrl('javascript:alert(1)')).toBeNull() +expect(normalizeResearchLinkUrl('https://user:pass@example.com')).toBeNull() + +const registry = new ResearchLinkFrameRegistry() +registry.authorize({ sessionId: 's1', nodeId: 'n1', url: 'https://example.com/report' }) +expect(registry.allows('https://example.com/report')).toBe(true) +registry.release({ sessionId: 's1', nodeId: 'n1' }) +expect(registry.allows('https://example.com/report')).toBe(false) +``` + +- [ ] **Step 2: Run focused tests and verify the expected red state** + +Run: `npx vitest run test/research-link-frame.test.ts test/security.test.ts` + +Expected: FAIL because the registry, bridge and authorized-frame security option do not exist. + +- [ ] **Step 3: Implement bounded authorization and security injection** + +```ts +export function normalizeResearchLinkUrl(value: unknown): string | null { + if (typeof value !== 'string' || value.trim().length === 0 || value.length > 8192) return null + try { + const parsed = new URL(value.trim()) + if (!['http:', 'https:'].includes(parsed.protocol) || parsed.username || parsed.password) return null + parsed.hostname = parsed.hostname.toLowerCase() + if ((parsed.protocol === 'https:' && parsed.port === '443') || + (parsed.protocol === 'http:' && parsed.port === '80')) parsed.port = '' + return parsed.href + } catch { + return null + } +} + +export class ResearchLinkFrameRegistry { + private readonly nodes = new Map() + authorize(value: unknown): { url: string } { + const request = researchLinkIdentity(value) + const url = normalizeResearchLinkUrl(request.url) + if (url === null) throw new TypeError('Research link URL is invalid.') + this.nodes.set(`${request.sessionId}\u0000${request.nodeId}`, { + sessionId: request.sessionId, + url + }) + return { url } + } + release(value: unknown): boolean { + const request = researchLinkIdentity(value) + return this.nodes.delete(`${request.sessionId}\u0000${request.nodeId}`) + } + releaseSession(sessionId: unknown): number { + if (typeof sessionId !== 'string' || sessionId.length === 0 || sessionId.length > 256) { + throw new TypeError('Research session id is invalid.') + } + let removed = 0 + for (const [key, node] of this.nodes) { + if (node.sessionId === sessionId && this.nodes.delete(key)) removed += 1 + } + return removed + } + allows(rawUrl: string): boolean { + const url = normalizeResearchLinkUrl(rawUrl) + if (url === null) return false + const origin = new URL(url).origin + return [...this.nodes.values()].some((node) => + node.url === url || new URL(node.url).origin === origin + ) + } +} +``` + +`researchLinkIdentity` accepts only an exact object with `sessionId` and `nodeId` strings of 1–256 characters; `authorize` additionally accepts the exact `url` key. + +`secureWindow` must continue blocking every unapproved child-frame HTTP navigation and must not open blocked frames in the system browser. IPC handlers must call `assertTrustedMainWindowEvent` before the registry. + +- [ ] **Step 4: Run focused security tests and typecheck** + +Run: `npx vitest run test/research-link-frame.test.ts test/security.test.ts` + +Run: `npm run typecheck` + +Expected: PASS. + +- [ ] **Step 5: Commit Task 1** + +```bash +git add src/main/state/research-link-frame.ts src/preload/research-link-frame.ts src/main/security.ts src/main/index.ts src/preload/index.ts test/research-link-frame.test.ts test/security.test.ts +git commit -m "功能：建立研究网页组件安全边界" +``` + +### Task 2: Link and Container Artifact Contracts + +**Files:** +- Modify: `test/research-file-drop.test.ts` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js` + +**Interfaces:** +- Produces: artifact kinds `web-link` and `generated-container`. +- Produces: `normalizeResearchWebUrl`, `parseResearchContainerSpec`, `researchCanvasViewportPlacement`. +- Produces: workspace methods `createWebLink`, `createContainerDraft`, `updateWebLink`, `updateContainerDraft`, `setContainerRefresh`. + +- [ ] **Step 1: Write failing persistence, URL and schema tests** + +```ts +expect(client.normalizeResearchWebUrl('https://Example.com/dashboard')).toBe( + 'https://example.com/dashboard' +) +expect(client.normalizeResearchWebUrl('file:///tmp/a.html')).toBeNull() +expect(client.parseResearchContainerSpec(JSON.stringify({ + version: 1, + type: 'chart', + title: '收入趋势', + variant: 'bar', + labels: ['一月', '二月'], + series: [{ name: '收入', values: [10, 12] }] +}))).toMatchObject({ version: 1, type: 'chart', title: '收入趋势' }) +expect(client.parseResearchContainerSpec('{"version":1,"type":"script"}')).toBeNull() +``` + +- [ ] **Step 2: Run contract tests and verify red state** + +Run: `npx vitest run test/research-file-drop.test.ts -t "web link|container schema|container artifact|viewport placement"` + +Expected: FAIL because the new artifact kinds and helpers do not exist. + +- [ ] **Step 3: Implement strict artifact canonicalization and workspace actions** + +```js +const RESEARCH_CONTAINER_TYPES = new Set(['web', 'chart', 'table', 'kpi', 'markdown']) +const RESEARCH_REFRESH_MINUTES = new Set([0, 1, 5, 15, 30]) + +function parseResearchContainerSpec(raw) { + const value = typeof raw === 'string' ? JSON.parse(stripSingleJsonFence(raw)) : raw + if (value?.version !== 1 || !RESEARCH_CONTAINER_TYPES.has(value.type)) return null + if (value.type === 'web') return canonicalResearchContainerWeb(value) + if (value.type === 'chart') return canonicalResearchContainerChart(value) + if (value.type === 'table') return canonicalResearchContainerTable(value) + if (value.type === 'kpi') return canonicalResearchContainerKpi(value) + return canonicalResearchContainerMarkdown(value) +} +``` + +The canonicalizers accept exact key sets only: titles and labels are 1–256 characters; Markdown is at most 32,000 characters; charts have at most 24 labels and 6 series with finite values; tables have at most 12 columns and 100 rows; KPI cards have at most 12 items; web URLs use `normalizeResearchWebUrl`. + +`web-link` persists normalized `url`; `generated-container` persists `containerPrompt`, optional validated `containerSpec`, `refreshMinutes`, `lastSuccessfulAt`, optional refresh error and existing generation task fields. Draft containers use `generationStatus: 'draft'`; queued/running/failed/completed continue using the existing lifecycle. + +- [ ] **Step 4: Run contract tests and commit Task 2** + +Run: `npx vitest run test/research-file-drop.test.ts -t "web link|container schema|container artifact|viewport placement"` + +Expected: PASS. + +```bash +git add test/research-file-drop.test.ts node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js +git commit -m "功能：定义链接与智能容器画布模型" +``` + +### Task 3: Isolated Container Generation Contract + +**Files:** +- Modify: `packages/dsh-research-task-runtime/index.js` +- Modify: `test/research-task-runtime.test.js` +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js` +- Modify: `test/sherlock-composer-workspace-ui.test.ts` + +**Interfaces:** +- Extends: `validateResearchTaskStart` with `{ kind: 'container', prompt }` and no source requirement. +- Extends: `buildResearchTaskPrompt` with the exact version 1 schema instructions. +- Produces: InputHub `generateResearchContainer(session, request)` and canvas `selectionGeneration.generateContainer(request)`. +- Extends: existing inspect/cancel/retry lifecycle for `generated-container`. + +- [ ] **Step 1: Write failing runtime contract and prompt tests** + +```js +const request = validateResearchTaskStart({ + parentSessionId: 'parent-1', + canvasNodeId: 'container-1', + kind: 'container', + prompt: '制作一个展示月度收入的柱状图' +}) +expect(request).toMatchObject({ kind: 'container', prompt: '制作一个展示月度收入的柱状图' }) +expect(buildResearchTaskPrompt(request)).toContain('"version": 1') +expect(buildResearchTaskPrompt(request)).toContain('不要输出 HTML 或 JavaScript') +``` + +- [ ] **Step 2: Run runtime and UI generation tests and verify red state** + +Run: `npx vitest run test/research-task-runtime.test.js -t "container"` + +Run: `npx vitest run test/sherlock-composer-workspace-ui.test.ts -t "container generation|container retry|container conversation isolation"` + +Expected: FAIL because `container` is rejected and no container generation action exists. + +- [ ] **Step 3: Implement container request, fixed prompt and client lifecycle** + +```js +const CONTAINER_INSTRUCTION = `请把用户需求转换为 Sherlock 安全原生组件。只输出一个 JSON 对象，不要输出 Markdown 围栏、HTML、JavaScript、解释或前言。JSON 必须包含 "version": 1、"type" 和 "title"；type 只能是 web、chart、table、kpi、markdown。所有网页地址必须使用 http 或 https。` +``` + +The task adapter keeps `toolFilter: { allow: [] }`. Completion is accepted only when `parseResearchContainerSpec(finalOutput)` succeeds; invalid output becomes the visible retry state and preserves `containerPrompt` plus the last successful spec when the operation was a refresh. + +- [ ] **Step 4: Run Task 3 tests and commit** + +Run: `npx vitest run test/research-task-runtime.test.js -t "container|four tasks|out-of-order|without external tools"` + +Run: `npx vitest run test/sherlock-composer-workspace-ui.test.ts -t "container generation|container retry|container conversation isolation"` + +Expected: PASS. + +```bash +git add packages/dsh-research-task-runtime/index.js test/research-task-runtime.test.js node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js test/sherlock-composer-workspace-ui.test.ts +git commit -m "功能：接入智能容器隔离生成任务" +``` + +### Task 4: Persistent Bottom Toolbar and Link Node UI + +**Files:** +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js` +- Modify: `test/sherlock-composer-workspace-ui.test.ts` + +**Interfaces:** +- Produces: `ResearchCanvasGlobalToolbar` and `ResearchCanvasWebFrame`. +- Consumes: workspace link/container creation from Task 2 and `window.dshDesktop.researchLinkFrame` from Task 1. + +- [ ] **Step 1: Write failing toolbar and link behavior tests** + +```ts +expect(host.querySelector('[data-research-global-toolbar]')).not.toBeNull() +expect(host.querySelector('[data-research-global-link]')?.textContent).toContain('链接') +expect(host.querySelector('[data-research-global-container]')?.textContent).toContain('容器') + +await click('[data-research-global-link]') +await typeAndEnter('[data-research-link-input]', 'https://example.com/dashboard') +expect(workspace.getSnapshot().artifacts.at(-1)).toMatchObject({ + kind: 'web-link', url: 'https://example.com/dashboard' +}) +``` + +- [ ] **Step 2: Run toolbar tests and verify red state** + +Run: `npx vitest run test/sherlock-composer-workspace-ui.test.ts -t "global toolbar|creates a web link|link fallback|revokes link frame"` + +Expected: FAIL because the toolbar and link card are absent. + +- [ ] **Step 3: Implement fixed viewport toolbar, popover and sandbox frame** + +```js +function ResearchCanvasWebFrame({ sessionId, node, active }) { + const [revision, setRevision] = useState(0) + const [status, setStatus] = useState('authorizing') + useEffect(() => { + if (!active) return + let live = true + window.dshDesktop?.researchLinkFrame?.authorize({ sessionId, nodeId: node.id, url: node.url }) + .then(() => live && setStatus('loading')) + .catch(() => live && setStatus('blocked')) + return () => { + live = false + void window.dshDesktop?.researchLinkFrame?.release({ sessionId, nodeId: node.id }) + } + }, [sessionId, node.id, node.url, revision, active]) + return
+ {status === 'blocked' ?

此网页不允许在组件中显示

: +
`)) + + expect(result).toMatchObject({ status: 'ready', title: '英伟达豪掷70亿，下场做开放大模型了' }) + expect(result.status === 'ready' && result.bodyHtml).toContain('https://mmbiz.qpic.cn/a.png') + expect(result.status === 'ready' && result.bodyHtml).not.toMatch(/script|iframe|onclick|onerror/i) +}) +``` + +Add separate cases for redirects leaving `mp.weixin.qq.com`, non-HTML content, missing `#js_content`, response size above 6 MiB, abort timeout, and HTTP failure. + +- [ ] **Step 3: Run the tests and verify RED** + +Run: + +```bash +npx vitest run test/research-web-reader.test.ts +``` + +Expected: FAIL because `src/main/state/research-web-reader.ts` does not exist. + +- [ ] **Step 4: Implement allowlisted fetch and sanitized extraction** + +Define exact result types and dependency injection: + +```ts +export type ResearchWebReaderResult = + | { status: 'ready'; url: string; title: string; description?: string; author?: string; publishTime?: string; bodyHtml: string } + | { status: 'unavailable'; reason: 'unsupported' | 'network' | 'response' | 'content' | 'too-large' | 'timeout' } + +export type ResearchWebReaderDependencies = { + fetch(input: string, init: RequestInit): Promise + createTimeoutSignal(milliseconds: number): AbortSignal +} +``` + +Implement manual redirects and byte-limited streaming. Parse with Cheerio, convert `img[data-src]` to `src`, select only `#js_content`, and pass the fragment through `sanitizeHtml` with this explicit policy: + +```ts +const allowedTags = [ + 'p', 'br', 'strong', 'b', 'em', 'i', 'u', 's', 'blockquote', 'pre', 'code', + 'ul', 'ol', 'li', 'h1', 'h2', 'h3', 'h4', 'table', 'thead', 'tbody', 'tr', + 'th', 'td', 'a', 'img', 'hr', 'div', 'span' +] +const bodyHtml = sanitizeHtml(fragment, { + allowedTags, + allowedAttributes: { a: ['href', 'title'], img: ['src', 'alt', 'width', 'height'] }, + allowedSchemes: ['http', 'https'], + allowedSchemesByTag: { img: ['https'] }, + allowProtocolRelative: false, + disallowedTagsMode: 'discard' +}) +``` + +Reject an empty sanitized body. Normalize whitespace and cap title at 160 characters, description at 500, author at 120, publish time at 80, and sanitized body at 4 MiB. + +- [ ] **Step 5: Run the reader tests and commit** + +Run: + +```bash +npx vitest run test/research-web-reader.test.ts +git add package.json package-lock.json src/main/state/research-web-reader.ts test/research-web-reader.test.ts +git commit -m '功能：新增微信文章安全阅读服务' +``` + +Expected: focused tests PASS and the commit contains only the reader service, dependencies, and tests. + +--- + +### Task 2: Extend the authorized frame bridge with inspection and reader IPC + +**Files:** +- Modify: `src/main/state/research-link-frame.ts` +- Modify: `src/preload/research-link-frame.ts` +- Create: `src/preload/research-web-reader.ts` +- Modify: `src/preload/index.ts` +- Modify: `src/main/index.ts` +- Modify: `test/research-link-frame.test.ts` +- Modify: `test/research-web-reader.test.ts` + +**Interfaces:** +- Consumes: `ResearchWebReaderResult` and `registerResearchWebReaderHandlers` from Task 1. +- Produces: `researchLinkFrame.authorize(...) -> { url, frameName }`, `researchLinkFrame.inspect(...) -> ResearchLinkFrameInspection`, and `researchWebReader.read(...) -> ResearchWebReaderResult` on `window.dshDesktop`. + +- [ ] **Step 1: Write failing registry and trusted IPC tests** + +Extend `test/research-link-frame.test.ts`: + +```ts +const authorized = registry.authorize({ sessionId: 's1', nodeId: 'n1', url: 'https://example.com/a' }) +expect(authorized.url).toBe('https://example.com/a') +expect(authorized.frameName).toMatch(/^sherlock-research-link-[a-f0-9]{32}$/) +expect(registry.resolve({ sessionId: 's1', nodeId: 'n1' })).toEqual(authorized) +``` + +Add an inspection fixture whose `mainFrame.framesInSubtree` contains a matching `name` and URL. Assert that the handler executes one fixed script and returns only bounded `{ title, scrollWidth, clientWidth }`. Add rejection cases for a stale node, mismatched frame URL, missing frame, destroyed frame, oversized title, and non-finite metrics. + +Extend the reader handler test to prove a child frame cannot call it and an authorization mismatch returns `unavailable` without invoking fetch. + +- [ ] **Step 2: Run the bridge tests and verify RED** + +Run: + +```bash +npx vitest run test/research-link-frame.test.ts test/research-web-reader.test.ts +``` + +Expected: FAIL because `frameName`, `resolve`, `inspect`, and the reader preload bridge are absent. + +- [ ] **Step 3: Implement opaque frame identity and fixed inspection** + +Store an opaque frame name with each authorization. Generate it in the registry using an injected `randomId` or `randomBytes(16).toString('hex')`; never derive a DOM frame name from raw session or node IDs. + +Expose: + +```ts +export type ResearchLinkFrameInspection = { + url: string + title: string + scrollWidth: number + clientWidth: number +} + +resolve(value: unknown): ResearchLinkAuthorization | null +async inspect(value: unknown, frames: readonly WebFrameMain[]): Promise +``` + +Find the frame by exact opaque name and an allowed current URL. Execute only this static script: + +```js +(() => ({ + title: document.title, + scrollWidth: Math.max(document.documentElement?.scrollWidth ?? 0, document.body?.scrollWidth ?? 0), + clientWidth: Math.max(document.documentElement?.clientWidth ?? 0, window.innerWidth ?? 0) +}))() +``` + +Validate the structured result in main before returning it. Register `research:link-frame:inspect` through `registerTrustedMainWindowHandler`. + +- [ ] **Step 4: Register the cookie-free reader bridge** + +Create a frozen preload bridge: + +```ts +export function createResearchWebReaderBridge(invoke: ResearchWebReaderInvoke) { + return Object.freeze({ + read(value: { sessionId: string; nodeId: string; url: string }) { + return invoke('research:web-reader:read', value) as Promise + } + }) +} +``` + +Register the handler in `src/main/index.ts` with the active main window, shared `ResearchLinkFrameRegistry`, and `globalThis.fetch`. Expose it in `src/preload/index.ts` next to `researchLinkFrame`. Do not expose cookies, headers, raw filesystem paths, or arbitrary fetch options. + +- [ ] **Step 5: Run bridge/security tests and commit** + +Run: + +```bash +npx vitest run test/research-link-frame.test.ts test/research-web-reader.test.ts test/ipc-trust.test.ts test/security.test.ts +npm run typecheck +git add src/main/state/research-link-frame.ts src/preload/research-link-frame.ts src/preload/research-web-reader.ts src/preload/index.ts src/main/index.ts test/research-link-frame.test.ts test/research-web-reader.test.ts +git commit -m '功能：扩展研究网页检查与阅读桥' +``` + +Expected: all focused tests and type checking PASS. + +--- + +### Task 3: Persist automatic titles and compute responsive frame layout + +**Files:** +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js` +- Modify: `test/sherlock-composer-workspace-ui.test.ts` + +**Interfaces:** +- Consumes: `researchLinkFrame.authorize`, `researchLinkFrame.inspect`, and `researchWebReader.read` from Task 2. +- Produces: workspace methods `applyWebLinkInspection(nodeId, expectedUrl, inspection)` and pure helper `researchWebFrameLayout(containerWidth, scrollWidth)`. + +- [ ] **Step 1: Write failing migration, stale-response, rename, and layout tests** + +Add workspace tests proving: + +```ts +expect(workspace.createWebLink('https://example.com/a')).toMatchObject({ + title: 'example.com', titleMode: 'auto' +}) +expect(workspace.applyWebLinkInspection(node.id, node.url, { title: '真实标题' })).toBe(true) +expect(workspace.getSnapshot().artifacts[0]).toMatchObject({ title: '真实标题', titleMode: 'auto' }) +workspace.renameNode(node.id, '我的标题') +expect(workspace.applyWebLinkInspection(node.id, node.url, { title: '第二个标题' })).toBe(false) +expect(workspace.getSnapshot().artifacts[0]).toMatchObject({ title: '我的标题', titleMode: 'custom' }) +``` + +Cover legacy empty, URL-like, hostname, and `%20` titles migrating to `auto`, a descriptive legacy title migrating to `custom`, and an inspection response whose `expectedUrl` no longer matches. + +Test the pure layout helper: + +```ts +expect(researchWebFrameLayout(720, 720)).toEqual({ logicalWidth: 720, scale: 1 }) +expect(researchWebFrameLayout(720, 1200)).toEqual({ logicalWidth: 1108, scale: .65 }) +expect(researchWebFrameLayout(400, 4000)).toEqual({ logicalWidth: 615, scale: .65 }) +``` + +Use exact assertions matching the implementation rule: logical width is at most 1440 and scale is clamped to `.65` through `1`. + +- [ ] **Step 2: Run the workspace tests and verify RED** + +Run: + +```bash +npx vitest run test/sherlock-composer-workspace-ui.test.ts -t 'web link|automatic title|responsive frame' +``` + +Expected: FAIL because `titleMode`, `applyWebLinkInspection`, and the layout helper are absent. + +- [ ] **Step 3: Implement title persistence and migration** + +Extend canonical web-link artifacts with `titleMode: 'auto' | 'custom'`. Infer old values with a pure helper that treats empty, normalized URL, hostname, and `%20`-prefixed titles as automatic. Set `auto` in `createWebLink` and `updateWebLink`; set `custom` when `renameNode` changes a web link. + +Implement stale-safe application: + +```js +applyWebLinkInspection(nodeId, expectedUrl, inspection) { + const index = snapshot.artifacts.findIndex((node) => + node.id === nodeId && node.kind === 'web-link' && node.url === expectedUrl && node.titleMode === 'auto' + ) + const title = normalizeResearchWebTitle(inspection?.title, expectedUrl) + if (index === -1 || title === snapshot.artifacts[index].title) return false + const artifacts = snapshot.artifacts.slice() + artifacts[index] = { ...artifacts[index], title } + update({ artifacts }, true) + return true +} +``` + +- [ ] **Step 4: Implement bounded responsive layout calculation** + +Use: + +```js +function researchWebFrameLayout(containerWidth, scrollWidth) { + const width = Math.max(1, Number(containerWidth) || 1) + const content = Math.max(width, Number(scrollWidth) || width) + const logicalWidth = Math.min(1440, content) + const scale = Math.max(.65, Math.min(1, width / logicalWidth)) + return { logicalWidth: Math.round(width / scale), scale } +} +``` + +Keep this helper exported for focused tests. + +- [ ] **Step 5: Run workspace tests and commit** + +Run: + +```bash +npx vitest run test/sherlock-composer-workspace-ui.test.ts -t 'web link|automatic title|responsive frame' +npx patch-package @deepseek-ai/dsh-client-ui-conversation +git add patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch test/sherlock-composer-workspace-ui.test.ts +git commit -m '功能：持久化网页标题并计算自适应布局' +``` + +Expected: focused tests PASS and the workspace/model change is already reproducible through the canonical patch. + +--- + +### Task 4: Render inspected websites and the WeChat reader in the component + +**Files:** +- Modify: `node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js` +- Modify: `test/sherlock-composer-workspace-ui.test.ts` + +**Interfaces:** +- Consumes: Task 2 preload bridges and Task 3 workspace helpers. +- Produces: `ResearchCanvasWebFrame` states `authorizing`, `loading`, `ready`, `reader-loading`, `reader-ready`, and `unavailable` with explicit retry UI. + +- [ ] **Step 1: Write failing rendered UI tests** + +Add a normal-page test whose authorize bridge returns `{ url, frameName }`, dispatch iframe `load`, and assert `inspect` is called with the current identity. Resolve it with `{ title: '真实页面', scrollWidth: 1200, clientWidth: 720 }`; assert the workspace title changes and the iframe wrapper contains scale/layout data attributes. + +Add a resize test with a controllable `ResizeObserver`: change the component content width, fire the observer, and assert a debounced re-inspection and updated logical width. + +Add a WeChat test: + +```ts +const read = vi.fn(async () => ({ + status: 'ready', + url: 'https://mp.weixin.qq.com/s/abc', + title: '英伟达豪掷70亿，下场做开放大模型了', + bodyHtml: '

文章正文

' +})) +// create link, await reader, then assert: +expect(host.querySelector('[data-research-wechat-reader]')).not.toBeNull() +expect(host.querySelector('[data-research-web-frame]')).toBeNull() +expect(readerFrame?.getAttribute('sandbox')).toBe('') +expect(readerFrame?.getAttribute('srcdoc')).toContain("script-src 'none'") +``` + +Add failure and retry assertions with “暂时无法读取文章”, “重试”, and “浏览器打开”. + +- [ ] **Step 2: Run rendered tests and verify RED** + +Run: + +```bash +npx vitest run test/sherlock-composer-workspace-ui.test.ts -t 'web frame|WeChat|微信|responsive' +``` + +Expected: FAIL because inspection, reader rendering, and retry states are absent. + +- [ ] **Step 3: Implement normal iframe inspection and resize adaptation** + +Set the iframe `name` to the opaque value from authorization. On `load`, call `inspect`; pass the title to `workspace.applyWebLinkInspection`. Observe the frame shell with `ResizeObserver`, debounce through `requestAnimationFrame`, and recompute inspection only after width changes. Apply styles to an inner scale layer rather than the component chrome: + +```js +style: { + width: `${layout.logicalWidth}px`, + height: `${100 / layout.scale}%`, + transform: `scale(${layout.scale})`, + transformOrigin: 'top left' +} +``` + +Keep wrapper overflow contained and preserve internal iframe scrolling when the `.65` floor cannot fully fit a fixed-width page. + +- [ ] **Step 4: Implement scriptless WeChat reader rendering** + +Detect the strict WeChat article URL before rendering the remote iframe. Call `researchWebReader.read` after authorization and render a dedicated iframe with `sandbox=""`, `referrerPolicy="no-referrer"`, and an app-generated `srcDoc` containing: + +```html + + +``` + +Escape metadata inserted into the document shell. Insert only the already-sanitized `bodyHtml`. Apply the returned title through the stale-safe workspace method. Failed reads render an explicit central fallback instead of an empty white viewport. + +- [ ] **Step 5: Run rendered tests and commit** + +Run: + +```bash +npx vitest run test/sherlock-composer-workspace-ui.test.ts -t 'web frame|WeChat|微信|responsive' +npx patch-package @deepseek-ai/dsh-client-ui-conversation +git add patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch test/sherlock-composer-workspace-ui.test.ts +git commit -m '功能：网页组件支持自适应和微信阅读视图' +``` + +Expected: focused UI tests PASS and the rendered implementation is reproducible through the canonical patch. + +--- + +### Task 5: Replay the canonical dependency patch and verify the web-link feature + +**Files:** +- Verify: `patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch` +- Verify: all files changed in Tasks 1–4 + +**Interfaces:** +- Consumes: the completed web-link implementation. +- Produces: a reproducible patch that survives `npm install` and is ready for multi-session integration. + +- [ ] **Step 1: Confirm the canonical patch contains every UI change** + +Run: + +```bash +rg -n 'titleMode|applyWebLinkInspection|researchWebFrameLayout|researchWebReader|reader-ready' patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch +``` + +Expected: the conversation patch contains `titleMode`, frame inspection, responsive layout, WeChat reader states, and their CSS. + +- [ ] **Step 2: Verify patch replay in an isolated temporary dependency tree** + +Run: + +```bash +patch_replay_dir="$(mktemp -d)" +cp package.json package-lock.json "$patch_replay_dir/" +cp -R patches "$patch_replay_dir/patches" +npm ci --prefix "$patch_replay_dir" --ignore-scripts +(cd "$patch_replay_dir" && npx patch-package --error-on-fail) +``` + +Expected: patch-package exits 0 without offsets or rejected hunks. The temporary directory may be removed after its absolute path printed by `mktemp -d` has been checked. + +- [ ] **Step 3: Run the complete focused web-link gate** + +Run: + +```bash +npx vitest run test/research-link-frame.test.ts test/research-web-reader.test.ts test/security.test.ts test/ipc-trust.test.ts test/sherlock-composer-workspace-ui.test.ts +npm run typecheck +npm run build +git diff --check +``` + +Expected: focused tests, type checking, build, and whitespace check PASS. Do not run the full test suite. + +- [ ] **Step 4: Confirm the feature tip is clean** + +Run: + +```bash +git status --short +``` + +Expected: the worktree is clean and the web-link feature is independently integratable. diff --git a/docs/superpowers/specs/2026-08-24-sherlock-brand-migration.md b/docs/superpowers/specs/2026-08-24-sherlock-brand-migration.md new file mode 100644 index 000000000..2b3f85e0b --- /dev/null +++ b/docs/superpowers/specs/2026-08-24-sherlock-brand-migration.md @@ -0,0 +1,30 @@ +# Sherlock Brand Migration Specification + +## Goal + +Present the desktop client consistently as **Sherlock**, with no user-visible +DeepSeek or DSH product branding. + +## Requirements + +- Rename production and development application display names to `Sherlock` + and `Sherlock Dev`. +- Rename installer and update artifact filenames from the DSH brand to the + Sherlock brand. +- Replace legacy brand copy in startup, update, recovery, model onboarding, + preset transfer, directory/workspace errors, mobile companion pages, and the + optional plugin-market UI. +- Brand the embedded web document title and manifest as Sherlock. +- Do not present DeepSeek as a Sherlock-owned model provider in first-run UI. +- Preserve external `@deepseek-ai/*` package names, DSH protocol keys, preset + MIME/format identifiers, plugin package IDs, update endpoints, bundle ID, and + existing `dsh-desktop` user-data directories where changing them would break + upstream compatibility, updates, plugins, or existing user data. +- Add a focused regression test that distinguishes user-visible branding from + the retained compatibility layer. +- Build the development macOS app, launch it, and verify the rendered client. + +## Verification Boundary + +Run only brand-focused tests plus typecheck/build/package-and-launch checks; do +not run the full unit-test suite. diff --git a/docs/superpowers/specs/2026-08-24-sherlock-cloudflare-updates.md b/docs/superpowers/specs/2026-08-24-sherlock-cloudflare-updates.md new file mode 100644 index 000000000..3d93d6e47 --- /dev/null +++ b/docs/superpowers/specs/2026-08-24-sherlock-cloudflare-updates.md @@ -0,0 +1,118 @@ +# Sherlock Cloudflare Updates Specification + +## Goal + +Ship the current Sherlock development source as a production desktop application +and let installed copies discover, download, and install future releases from a +small update control in the lower-right corner of the left sidebar. + +The release must not depend on Apple Developer ID, Apple notarization, or the +Mac App Store. + +## Product Behavior + +- Keep the production identity `io.dsh.desktop`, product name `Sherlock`, and + historical `dsh-desktop` user-data directory so an update preserves existing + workspaces, sessions, settings, credentials, and installed plugins. +- Keep `Sherlock Dev` isolated under its existing development application ID and + user-data directory. +- Check for a new stable version shortly after startup, every six hours while + running, after resume when the interval has elapsed, and through the existing + manual menu command. +- Show no sidebar update control while the app is current, while a background + check is idle, or after a transient check failure. +- When a newer version is available, mount a blue circular button at the right + side of `[data-dsh-sidebar-footer]`. Its initial icon is a download arrow. +- Clicking the available button starts the download. While downloading, keep the + control visible and render determinate progress. When ready, change the action + to restart and install, with a compact confirmation surface before quitting. +- Keep error details user-readable and retryable without blocking normal app use. +- Do not bundle any development user data, local workspaces, conversations, API + credentials, or private plugin profiles into the production artifact. Only + source-controlled application code and declared bundled resources are shipped. + +## Update Architecture + +- Continue using `electron-updater` with its generic provider and the existing + Electron/Squirrel.Mac installation path. +- Configure `autoDownload = false`. Automatic checks only discover a release; + the visible sidebar button is the user's explicit download action. +- Add an `updates:download` IPC handler and represent download/install phases in + the existing shared `UpdateStatus` state machine. +- Move the update presentation from the current global lower-right notification + card into a sidebar control plus a compact anchored status/confirmation panel. +- Treat the preload as an adapter to the embedded Harness DOM. Pure decisions + about visibility, labels, icons, and actions remain testable outside Electron. + +## Non-Apple Signing + +Electron's macOS updater requires the running and replacement applications to be +code-signed. To satisfy that requirement without Apple services, production +builds use one long-lived self-signed Sherlock code-signing identity. + +- The certificate public identity may be inspected in built artifacts; its + private key must never enter the repository, logs, release assets, or app. +- Store the encrypted signing material only in the release environment's secret + store and import it into a temporary keychain for packaging. +- Sign every production macOS build with the same identity so Squirrel.Mac can + validate the replacement against the installed application's designated + requirement. +- Verify the app and every nested executable with `codesign --verify --deep + --strict`. Do not claim Gatekeeper or notarization approval. +- Because the identity is not rooted in Apple's trust chain, the initial install + documentation must tell the user to right-click Sherlock and choose Open once. + Subsequent in-app updates use the same application identity and signature. + +## Cloudflare Distribution + +- Use a private Cloudflare R2 bucket as the primary release store and serve it + through the existing `dshdesktop.com` Cloudflare zone. +- Store immutable artifacts under `releases/v/`. +- Expose the active updater payloads under `updates/latest/`, including + `latest-mac.yml`, ZIP payloads, and blockmaps. +- Expose the human installer through a stable `/download/` route. +- Upload and verify all immutable binaries before promoting the `latest` + metadata. A failed upload must leave the prior release active. +- Serve metadata with revalidation/no-cache behavior and immutable binaries with + long-lived cache headers. Support byte ranges and correct content types. +- Keep the GitHub Release and current ModelScope mirror as recovery copies, but + installed applications use Cloudflare as their primary provider. +- The first Sherlock-branded production release is `0.6.0`, because the public + update feed currently advertises `0.5.0` and updaters reject lower versions. + +## Release Workflow + +1. Capture the current development source in a release commit while excluding + generated artifacts, screenshots, temporary browser state, and private data. +2. Run focused updater, release-contract, branding, bundled-resource, typecheck, + build, and packaged-runtime checks. Do not run the full unit-test suite. +3. Build production artifacts with the production identity and self-signed + release certificate. +4. Verify bundle structure, nested signatures, artifact hashes, and update + metadata before upload. +5. Upload versioned artifacts to R2, verify them from the public Cloudflare URL, + and only then promote the `latest` metadata and stable download route. +6. Launch the installed production app and verify the actual sidebar state. +7. Exercise an update from an older signed fixture to `0.6.0`: detect, show the + button, download, restart/install, confirm the displayed version, and confirm + the fixture's user data remains present. + +## Failure Handling + +- Network or metadata failure: leave the button hidden for automatic checks; + show a retryable message only after an explicit manual check/action. +- Hash, signature, or ZIP validation failure: abort installation, retain the + running version, and show an error. Never replace the app with an unverified + payload. +- Cloudflare promotion failure: retain the previous `latest` manifest. +- Non-writable installation location or Squirrel replacement failure: preserve + the downloaded DMG and offer to open it for manual replacement. +- Missing release or Cloudflare credentials: finish and verify all local work, + then stop only at the external authentication gate without requesting or + printing secret material. + +## Verification Boundary + +Completion requires evidence from the source, focused automated tests, the +production package, public Cloudflare responses, and the installed user-visible +update path. A successful build or HTTP 200 alone is insufficient. diff --git a/docs/superpowers/specs/2026-08-25-research-canvas-file-drop-design.md b/docs/superpowers/specs/2026-08-25-research-canvas-file-drop-design.md new file mode 100644 index 000000000..9e75b7adb --- /dev/null +++ b/docs/superpowers/specs/2026-08-25-research-canvas-file-drop-design.md @@ -0,0 +1,149 @@ +# Sherlock Research Canvas File Drop Design + +## Goal + +Let a user place local files onto a session's Research canvas by dragging them +from Finder or from a file-bearing surface in Sherlock's right details column. +Each successful drop creates a durable file card at the pointer's canvas +position without changing the resident conversation composer or triggering its +global image-attachment drop flow. + +## Product Behavior + +- Accept one or more files dragged from Finder anywhere inside the Research + canvas. +- Accept Sherlock-internal file drags that carry the shared + `application/x-sherlock-file` payload. +- Place the first card at the drop point and offset additional cards in a small + diagonal stack so every dropped file remains visible. +- Display a compact card with a file icon, basename, and file-type or source + caption. The absolute path stays out of visible UI and is available only as a + local title for identification. +- Keep cards attached to world coordinates. Canvas pan, wheel pan, and + Command-wheel zoom move and scale the cards together with the dot grid. +- Persist cards per session in local storage. Switching tabs, changing sessions, + reloading, or restarting Sherlock restores that session's cards. +- Treat a repeated drop of the same resolved path as a reposition operation, + not a duplicate card. Files without a resolvable path use a generated + identity and may appear more than once. +- Keep this increment focused on adding and displaying files. Opening, deleting, + selecting, connecting, or independently repositioning cards is outside scope. + +## Data Model + +Each persisted node contains only JSON-safe local metadata: + +```ts +type ResearchCanvasFileNode = { + id: string + path?: string + name: string + mediaType?: string + source: 'computer' | 'sherlock' + x: number + y: number +} +``` + +The storage key is versioned and session-scoped: +`sherlock.research.canvas.files.v1:`. Invalid, malformed, or older +entries are ignored rather than breaking the canvas. A write failure such as a +full or disabled local-storage area leaves the in-memory canvas usable. + +## Coordinate Model + +File cards live in the same infinite world as future Research content. The +content layer uses the existing viewport transform: + +`screen = world * scale + viewportOffset` + +The drop point is converted back to world coordinates before the node is +created. Cards render inside a single transformed content layer, while the dot +grid continues to use its current background size and position. This keeps +wheel pan, Space-drag pan, and Command-wheel zoom consistent without updating +every node on each viewport change. + +## Finder Path Bridge + +Modern Electron does not expose a stable filesystem `path` property on a DOM +`File`. The preload therefore exposes a narrow +`dshDesktop.getPathForFile(file)` adapter backed by Electron's +`webUtils.getPathForFile`. It returns an empty string when Electron cannot +resolve the path. No file contents cross IPC and no new main-process filesystem +authority is introduced. + +The canvas reads `DataTransfer.files`, asks the bridge for each path, and falls +back to the browser-provided filename and media type when a path is unavailable. + +## Sherlock Internal Drag Contract + +The shared internal MIME value is JSON with a required display name and an +optional resolved local path: + +```json +{"path":"/workspace/output/report.pdf","name":"report.pdf"} +``` + +File-bearing content in the current right details column exposes a small +draggable file chip and writes this payload on `dragstart`. Relative tool paths +are resolved against the active session workspace before being placed in the +payload. The same MIME contract is reusable by a future dedicated right-side +file browser without coupling that browser to the Research component. + +Internal drag data is treated as untrusted input: JSON shape, string lengths, +and finite coordinates are validated before a node is created. Plain text is +not accepted as a file, preventing session rows and arbitrary selected text +from becoming cards. + +## Drop Ownership and Feedback + +Research owns `dragenter`, `dragover`, `dragleave`, and `drop` only on its canvas +root. Accepted drags use a copy cursor and a subtle theme-aware canvas highlight. +The canvas prevents default handling and stops propagation for accepted drops, +so the document-level composer image intake does not also attach those files. +Unrecognized drags continue to bubble normally. + +The highlight is removed on drop, drag leave, drag end, component cleanup, and +window blur. It does not use the browser's orange focus outline. + +## Files and Persistence Boundaries + +- Persist the Research implementation through + `patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch`. +- Persist right-details drag-source changes through the relevant rc.7 package + patch rather than only editing `node_modules`. +- Add the narrow Electron file-path bridge in `src/preload/index.ts` and extend + its existing focused contract tests. +- Keep unrelated dirty worktree files untouched. + +## Testing and Verification + +Use test-driven development and run only focused checks: + +- Pure tests for external and internal drop parsing, invalid payload rejection, + world-coordinate conversion, stacking, same-path repositioning, and storage + validation. +- Render tests for file cards, the transformed content layer, drop semantics, + and the right-details draggable file chip. +- Preload contract coverage for `webUtils.getPathForFile`. +- The existing Sherlock composer/workspace UI test, TypeScript check, patch + integrity check, and `git diff --check`. +- Rebuild and sign `Sherlock Dev`, then verify in the packaged UI that a file + dragged from the right details column lands at the pointer position, survives + tab/session switching, follows pan and zoom, and does not become a composer + attachment. + +Do not run the full project test suite. + +## Failure Handling + +- Missing or malformed internal payload: ignore the drop and do not create a + card. +- Finder file with no resolvable path: create a name-only card so the visible + user action still succeeds, but do not claim it can be reopened later. +- Stale persisted path: keep the card visible; existence checks and opening are + outside this increment. +- Storage read/write failure: keep the current in-memory nodes and avoid a + canvas crash. +- Multiple global drop consumers: stop propagation only after Research confirms + that it owns a valid file drop. diff --git a/docs/superpowers/specs/2026-08-26-research-canvas-workspace-design.md b/docs/superpowers/specs/2026-08-26-research-canvas-workspace-design.md new file mode 100644 index 000000000..01e16acff --- /dev/null +++ b/docs/superpowers/specs/2026-08-26-research-canvas-workspace-design.md @@ -0,0 +1,447 @@ +# Sherlock Research Canvas Workspace Design + +## Status + +Approved for implementation. This +document combines the existing Research canvas file-drop work with the agreed +canvas-selection, right-side conversation, and message-to-canvas behavior. It +supersedes the earlier interaction scope in +`2026-08-25-research-canvas-file-drop-design.md` while retaining that document's +validated file-path, persistence, drop-ownership, and safety contracts. + +## Goal + +Turn Research into a desktop research workspace instead of a chat page with a +canvas background: + +- the center column is a pure, full-height canvas for files and deliberately + saved research artifacts; +- the right panel contains the complete conversation experience for the active + session; +- canvas file selection becomes the ordered file context of the right-side + composer; +- conversation messages never appear on the canvas automatically; +- users decide which assistant outputs or excerpts are worth placing on the + canvas. + +The existing `对话` page remains the normal full-width conversation surface. +Research reuses the same session and input state rather than creating a second +conversation. + +## Product Principles + +1. **One session, two presentations.** The main Chat view and the Research + right-side conversation render the same session log, draft, queue, running + turn, permissions, model, attachments, and errors. +2. **Only one composer is mounted at a time.** Research moves the resident + composer into the right panel; it does not duplicate it in the center. +3. **The canvas is curated, not chronological.** Files and deliberately added + research artifacts belong on the canvas. Ordinary user and assistant + messages stay in the conversation. +4. **Selection is input context.** Selected file nodes and composer file tags + are two views of one ordered per-session selection. +5. **Spatial state is durable.** File and research-artifact positions survive + view switching, session switching, reload, and application restart. + +## Research Layout + +### Entering Research + +Selecting the top-level `研究` tab must: + +1. open the right panel if it is closed; +2. install a pinned `对话` tab at the far left of the right-panel tab strip; +3. select that pinned tab when entering Research from another top-level view; +4. restore the last user-adjusted right-panel width, using 420 px on first use; +5. remove the center-column composer, composer docks, queue/task strip, and + statistics footer so the canvas reaches the bottom edge of the center + column. + +The existing resizable right-panel contract remains in force. The panel may be +resized within its supported 300–520 px range and may be collapsed as a whole. +Collapsing the panel does not close the pinned Conversation tab or lose its +state. Leaving Research and entering it again opens the panel and selects +Conversation again. + +### Right-Panel Tabs + +The right-panel tab order is: + +1. `对话` — pinned, leftmost, not closable, and not reorderable; +2. file surfaces such as `Files`; +3. tool-call or other temporary detail tabs; +4. the existing add-tab control. + +Switching away from Conversation inside Research is allowed. If a new assistant +update arrives while another right-panel tab is active, Conversation receives +an unread indicator but does not steal focus. + +Clicking a tool call in the conversation opens or selects a closable detail tab +to the right of Conversation. Tool details never replace the pinned +Conversation tab. + +### Leaving Research + +When the user selects the top-level `对话` or `轨迹` view: + +- the Research-only pinned Conversation tab is removed from the right panel; +- the center view resumes its normal composer placement; +- the pre-Research right-panel tab, width, and open/closed state are restored; +- no draft, attachment, scroll, running-turn, or queue state is copied because + both presentations already share the same session state. + +This prevents the full-width Chat page and the right-side Conversation page +from appearing at the same time. + +## Right-Side Conversation + +The pinned Conversation page is the existing Chat experience adapted to the +right-panel width. It includes: + +- the complete message history and streaming assistant response; +- compact execution progress and approval surfaces; +- queued or steering messages; +- the task/queue dock; +- the composer, permission selector, model selector, stop/send controls, and + statistics footer; +- draft images and the new ordered Research file tags; +- prompt errors, attachment errors, and retry behavior. + +It omits the duplicated session title row and the top-level `对话 / 研究 / 轨迹` +navigation. The message history scrolls independently, while the composer stays +anchored at the bottom of the right panel. + +Switching between the full-width Chat view and Research must preserve the live +draft, caret-relevant text state, file-tag order, image attachments, pending +queue, running response, and message scroll position. A view switch must never +submit, cancel, or duplicate a message. + +## Canvas Navigation + +The current infinite-canvas behavior remains: + +- wheel gestures pan the canvas; +- Command-wheel zooms around the pointer; +- holding Space and dragging pans the canvas; +- the dotted background, file nodes, and research-artifact nodes share one + world-coordinate transform; +- light and dark themes use the existing theme-aware canvas styling; +- no browser focus outline or global file-drop overlay obscures the canvas. + +Interaction priority is: + +1. Space-drag pans, regardless of the pointer target; +2. primary-button drag on a selected node moves the selected group; +3. primary-button drag on an unselected node selects and moves that node; +4. primary-button drag on blank canvas creates a marquee selection; +5. wheel and Command-wheel keep their existing pan/zoom behavior. + +## Files on the Canvas + +### Adding Files + +Research accepts one or more files from: + +- Finder through the narrow Electron `webUtils.getPathForFile` preload bridge; +- Sherlock right-side file/detail surfaces through the validated + `application/x-sherlock-file` payload. + +The first card is placed at the pointer's world coordinate. Additional files +use a small diagonal offset. Re-dropping the same resolved path repositions the +existing node rather than creating a duplicate. + +Each file node persists the validated JSON-safe metadata already established by +the file-drop design: + +```ts +type ResearchCanvasFileNode = { + id: string + path?: string + name: string + mediaType?: string + source: 'computer' | 'sherlock' + x: number + y: number +} +``` + +The existing session-scoped storage key remains +`sherlock.research.canvas.files.v1:` until a schema change requires a +new version. + +### Selecting Files + +File cards support direct and marquee selection: + +- clicking a file selects only that file; +- Command-click toggles that file without changing the other selections; +- Shift-click adds the file to the current selection; +- dragging on blank canvas creates a visible marquee rectangle; +- a plain marquee replaces the current selection; +- Shift-marquee adds every intersecting file; +- Command-marquee toggles every intersecting file; +- clicking blank canvas without dragging or pressing Escape clears the + selection. + +A file counts as intersecting when its rendered card rectangle overlaps the +marquee rectangle. Selection geometry is evaluated in viewport coordinates so +it remains visually correct at every canvas zoom level. + +Selected cards use a clear theme-aware border and selected-state background. +Keyboard focus remains visually distinct from selection. File cards are +focusable; Enter selects the focused card and Command-A selects all file and +artifact nodes when focus is inside the canvas rather than the composer. + +### Moving Files + +Dragging an unselected card selects it and moves only that card. Dragging any +already-selected card moves the complete selected group while preserving the +relative spacing between nodes. + +Pointer movement is converted from screen delta to world delta by dividing by +the active canvas scale. Positions update during the drag and are persisted +when it ends. Pointer cancellation, window blur, or component cleanup commits +the last valid in-memory position and removes all dragging visuals. + +Files and research-artifact nodes participate in the same group-movement +contract. + +## File Selection and Composer Tags + +The canvas selection and right-side composer file tags share one +session-scoped draft state: + +```ts +type ResearchCanvasSelection = { + selectedNodeIds: string[] + orderedFileIds: string[] +} +``` + +`selectedNodeIds` contains the selected file and artifact node ids in their +most-recent selection order. `orderedFileIds` is the unique, ordered subset of +selected nodes whose nodes are files, and is the model-facing tag order. The +canvas may derive a `Set` from `selectedNodeIds` for hit-testing, but neither +the set nor the tag UI becomes a second source of truth. Selecting artifacts +never adds composer attachments. + +Behavior: + +- newly selected files append to the tag row; +- files selected together by a marquee append in stable top-to-bottom, + left-to-right canvas order; +- tags display the file icon and basename, never the absolute path; +- tags sit above the text editor inside the right-side composer; +- dragging a tag reorders `orderedFileIds` without moving canvas nodes; +- removing a tag also deselects its canvas file; +- deselecting a canvas file removes its tag; +- duplicate selections never create duplicate tags; +- selection and tag order survive top-level view switches, session switches, + reload, and restart until the draft is sent or the user removes them. + +This draft selection is persisted under +`sherlock.research.canvas.selection.v1:`. + +A node without a resolved local path still remains movable and selectable. Its +composer tag shows an unavailable state, and submission is blocked until the +user removes or re-imports that file. Sherlock must not pretend that a +name-only card can be read by the agent. + +## Sending a Research Message + +The send operation captures one immutable attempt containing: + +- the visible draft text; +- the ordered Research file descriptors; +- any existing image attachments; +- the active session, model, permission, queue/steer mode, and running-turn + state. + +The visible text area contains only the user's text and file tags. For the host +prompt, ordered file descriptors are serialized through the existing Sherlock +file-reference contract immediately before the user's text. The user message +renderer recognizes that owned prefix and displays the same file tags instead +of raw path lines. Other user-authored text that resembles a file line is not +silently reinterpreted. + +Submitting files without text is valid. Submitting neither text nor files nor +images remains disabled. + +Submission first snapshots the complete attempt, then follows the existing +optimistic behavior by clearing the composer when `session.prompt` is +dispatched, before remote settlement. On success, the corresponding canvas +files become unselected while their nodes and positions remain. If the host +rejects the prompt or sending fails, the exact draft text, images, file +selection, and tag order are restored without duplication. + +While a turn is running, additional messages continue to use the existing +queue/steer policy. The right-side Conversation page is the only place that +renders the user message, execution progress, streaming response, and final +assistant message. + +## Receiving Messages + +Assistant output streams into the pinned Conversation page using the same +rendering and state as the full-width Chat page. The center canvas does not +create a request card, response card, or tool node automatically. + +If Conversation is not the active right-panel tab: + +- streaming continues normally; +- the Conversation tab shows a running or unread indicator; +- the current Files/detail tab remains selected; +- selecting Conversation returns to the last reading position or follows the + existing scroll-to-bottom policy for new output. + +Errors, cancellation, retry, approvals, and queued messages behave exactly as +they do in the main Chat view. Research must not introduce a second execution +state machine. + +## Deliberately Adding Conversation Output to the Canvas + +Assistant messages provide two explicit ways to create canvas research +artifacts: + +1. **Add the complete response.** The message action `添加到画布` creates a + compact result card in the center of the visible canvas viewport. +2. **Add an excerpt.** When the user selects text inside one assistant message, + the selection action `加入画布` creates an excerpt card. Dragging that + selected passage from the right panel and dropping it on the canvas creates + the same artifact at the drop point. + +The internal drag payload is bounded and validated. It carries only the owning +session/message identity, artifact kind, a bounded title, and a bounded text +excerpt; arbitrary HTML is never accepted. + +```ts +type ResearchCanvasArtifactNode = { + id: string + kind: 'assistant-result' | 'assistant-excerpt' + messageId: string + title: string + excerpt: string + x: number + y: number +} +``` + +Artifact nodes are persisted per session under +`sherlock.research.canvas.artifacts.v1:`. A complete-response +artifact is unique by message id: adding it again repositions the existing +card. Excerpt identity is derived from the owning message id and normalized, +bounded excerpt text, so different excerpts from one message may coexist while +an exact duplicate repositions its existing card. + +Artifact cards are compact, movable, selectable, and group-draggable like file +cards. Activating an artifact opens the pinned Conversation tab and scrolls to +its source message. If the source message cannot be loaded, the persisted title +and excerpt remain visible and the card shows that its source is unavailable. + +No automatic connectors, automatic layout, or automatic extraction of every +heading is included in this increment. + +## Persistence and Ownership + +Persist separately per session: + +- file nodes and positions; +- artifact nodes and positions; +- ordered Research file selection used by the current draft; +- right-panel Research preferences such as last width. + +Conversation messages, drafts, images, queue state, and execution state remain +owned by the existing conversation/session services. Research consumes those +services and must not mirror their payloads into local storage. + +All persisted JSON is bounded before parsing, validated field by field, capped +by per-session node counts, and ignored safely when malformed. Storage write +failure leaves the current in-memory workspace usable. + +## Failure and Edge Cases + +- **Unresolved file path:** show an unavailable tag and block send until it is + removed or re-imported. +- **File moved after selection:** keep the canvas card; when send-time path + validation reports it unavailable, block that attempt and preserve the + draft. +- **Right panel cannot open:** keep Research visible, show a non-blocking retry + affordance, and do not remount a center composer as an untracked fallback. +- **Session changes during a drag:** cancel the pointer operation and load the + new session's independent canvas state. +- **Prompt failure:** restore the exact draft, images, file tags, and order. +- **Artifact source unavailable:** retain its snapshot title/excerpt and disable + only the jump-to-message action. +- **Malformed internal drag data:** ignore it and allow unrelated drag consumers + to continue. +- **Narrow window:** the existing layout may collapse the right panel according + to its responsive policy; reopening it must still show the pinned + Conversation page without duplicating the composer. + +## Accessibility and Input Safety + +- The pinned Conversation tab exposes standard tab semantics and has no close + control in the accessibility tree. +- Marquee selection has a non-color visual boundary; selected cards expose + `aria-selected`. +- File tags are keyboard focusable, reorderable through accessible move + actions, and removable by keyboard. +- Space-pan never inserts a space while canvas focus owns the gesture. +- Composer focus, IME composition, undo/redo, queue/steer shortcuts, and image + attachment behavior remain unchanged in the right-side presentation. +- Research drag handlers stop propagation only after validating that they own + the drag. + +## Focused Testing and Real-App Verification + +Do not run the full project test suite. The implementation must use +test-driven development and add focused coverage for: + +- marquee rectangle normalization and node intersection at non-1.0 zoom; +- click, modifier-click, marquee, Escape, and Command-A selection semantics; +- single-node and selected-group movement in world coordinates; +- selection/tag synchronization, deduplication, reorder, removal, persistence, + success clearing, and failure restoration; +- path validation and unavailable-file submission blocking; +- automatic right-panel opening and pinned leftmost Conversation-tab behavior; +- one-composer-only behavior while switching Chat, Research, and Trajectory; +- shared draft, message, streaming, queue, and error state across both + conversation presentations; +- unread/running indication while another right-panel tab is active; +- complete-response and excerpt artifact creation, drop placement, + deduplication, persistence, movement, and source-message navigation; +- Finder and Sherlock internal file drops remaining isolated from global + composer drop intake; +- patch-package regeneration and installed-package parity. + +After focused tests and type/patch checks pass, follow +`docs/sherlock-local-test-runbook.md`: run `./script/build_and_run.sh --verify`, +skip notarization and all publishing, and verify the real Sherlock interface. +The application must remain open for user testing. + +The manual pass must confirm: + +1. entering Research opens the right-side Conversation tab and removes the + center composer; +2. the canvas reaches the bottom edge and preserves pan/zoom; +3. Finder and right-side files drop correctly; +4. marquee multi-selection and group dragging work at different zoom levels; +5. selected files appear as reorderable/removable tags in the right composer; +6. send, streaming response, failure restoration, and tab unread state work in + the right panel; +7. switching to full-width Chat shows the same message and draft state without + duplication; +8. assistant responses appear on the canvas only after an explicit add or drag; +9. file and artifact positions survive tab/session switching and app restart. + +## Non-Goals for This Increment + +- automatic graph edges between files, messages, and artifacts; +- automatic spatial layout or collision avoidance; +- automatic insertion of every assistant response onto the canvas; +- arbitrary free-positioning of tags inside the text itself (tags reorder only + within the attachment row); +- collaborative multi-user canvas editing; +- cloud upload or synchronization of local canvas files; +- replacing the existing Chat or Trajectory views; +- changing the financial research tool policy or building the full structured + `ResearchContext` workflow in the same implementation increment. diff --git a/docs/superpowers/specs/2026-08-26-sherlock-harness-preview-design.md b/docs/superpowers/specs/2026-08-26-sherlock-harness-preview-design.md new file mode 100644 index 000000000..7028a390a --- /dev/null +++ b/docs/superpowers/specs/2026-08-26-sherlock-harness-preview-design.md @@ -0,0 +1,117 @@ +# Sherlock Harness Preview Design + +**Date:** 2026-08-26 + +**Status:** Approved in chat; pending written-spec review + +## Objective + +Create a side-by-side macOS application named `Sherlock Harness Preview.app` that runs the latest official DeepSeek Harness release, `0.1.1-rc.2`, without changing the installed Sherlock application, the existing `Sherlock Dev.app`, their data, or Sherlock's formal update channel. The preview should make upstream Harness changes visible while retaining the minimum Sherlock desktop integration required for a usable packaged app. + +## Success Criteria + +- `Sherlock Harness Preview.app` can be installed and launched alongside `Sherlock.app` and `Sherlock Dev.app`. +- The preview bundle uses Harness `0.1.1-rc.2`, matching the official npm release and Git tag `dsh-v0.1.1-rc.2`. +- The preview has its own bundle identifier, process name, logs, Electron user-data directory, Harness home, sessions, settings, and plugin profile. +- Existing Sherlock, Sherlock Dev, and their user-owned credentials, settings, sessions, workspaces, plugins, and caches are neither read for migration nor modified. +- The packaged preview reaches the real Harness Web UI and exposes the visible upstream changes rather than masking them with every rc.7-era Sherlock UI patch. +- Essential Sherlock desktop behavior remains usable: application launch, child-process lifecycle, native directory selection, local loopback loading, window controls, recovery/log access, bundled runtime entries, and packaged resource resolution. +- Focused tests, type checking/building required by the changed surfaces, packaged process verification, and a user-visible UI inspection pass. +- No formal signing, notarization, Cloudflare upload, updater publication, Git tag, or upstream-main merge is performed. + +## Upstream Baseline + +The current Sherlock checkout declares `@deepseek-ai/dsh` and its directly pinned Harness packages at `0.1.0-rc.7`. The official `deepseek-ai/deepseek-harness` repository's `master` branch, tag `dsh-v0.1.1-rc.2`, and npm `latest` distribution tag currently resolve to `0.1.1-rc.2` at commit `b150a551b8d465e31e418e1b2eaf5e79bbb7d28e`. + +The rc.7-to-rc.2 range contains 743 commits and changes thousands of files, including the conversation UI, model settings, plugin settings, workspace browser, credentials, API proxy, session projection, subagents, image handling, and client bootstrap. Sherlock also carries 20 `patch-package` patches against rc.7. The upgrade is therefore treated as a compatibility migration, not a dependency-only bump. + +## Isolation Architecture + +Implementation work happens in an isolated Git worktree and branch derived from the current Sherlock `HEAD`. The working branch is named `codex/sherlock-harness-preview` unless that name already exists, in which case the existing branch is inspected and reused only if it belongs to this task. + +The preview receives a dedicated electron-builder configuration: + +- Product name: `Sherlock Harness Preview` +- macOS bundle identifier: `io.dsh.desktop.harness-preview` +- Build output: `dist-harness-preview` +- Desktop channel metadata: `harness-preview` +- Update publishing: disabled +- Default user-data directory: `dsh-desktop-harness-preview` + +The `DesktopChannel` and identity resolver gain the preview channel so the process name and data directory are derived from packaged metadata, rather than depending on an ad hoc launch argument. Explicit absolute `--sherlock-user-data-dir` remains supported for disposable smoke tests. + +No current Sherlock profile is copied automatically. This avoids leaking credentials into an experimental build and ensures the observed behavior comes from the latest Harness defaults. The preview initializes its own Harness home and profile on first launch. + +## Harness Upgrade Strategy + +All top-level `@deepseek-ai/dsh*` dependencies explicitly pinned by Sherlock are upgraded as a coherent family to `0.1.1-rc.2`, and the npm lockfile is regenerated from those declarations. The build continues to use published Harness packages rather than embedding a Git checkout because the desktop host expects the built CLI, package manifests, native dependency closure, and compiled web frontend shipped by the release. + +The existing rc.7 patches are classified before migration: + +1. **Required desktop bridges.** Native directory picking, Electron IPC hooks, packaged resource resolution, desktop recovery, and other capabilities without which the preview cannot run correctly are ported to rc.2. +2. **Required Sherlock runtime integrations.** Bundled skills, plugin profile bootstrap, market installer resolution, and the session-model web-search entry are retained when their current contracts remain compatible. If an upstream contract changed, the smallest compatible adapter is implemented and covered by a focused test. +3. **Brand-only changes.** Product name, logo, and clearly user-visible host wording are reapplied where doing so does not hide upstream behavior. +4. **Product overlays that obscure the preview.** Large rc.7 UI modifications such as research canvas additions, customized model onboarding, preset-editor redesigns, or other overlapping feature surfaces are not automatically reapplied. They are omitted from the preview unless required for boot or basic navigation, and every omission is reported. +5. **Obsolete fixes.** A patch whose behavior is demonstrably present upstream or whose target no longer exists is retired for the preview instead of force-applying stale generated JavaScript. + +Patch migration is evidence-based. Each old patch is mapped to its intended behavior, checked against rc.2 source/build output, and then marked ported, upstreamed, omitted for preview visibility, or incompatible. Silent patch loss is not acceptable. + +## Build and Launch Flow + +A preview packaging script or an explicit preview mode in `script/build_and_run.sh` owns the repeatable flow: + +1. Stop only the `Sherlock Harness Preview` process. +2. Build the Electron application. +3. Package the preview with its dedicated builder configuration. +4. Confirm the expected executable and bundle metadata. +5. Launch the packaged app with `open -n`. +6. Verify that the preview process stays alive and that its Harness child reaches the ready state. + +The script must not stop Sherlock or Sherlock Dev. The existing default development and formal release modes retain their current behavior. + +## Compatibility and Failure Handling + +Dependency installation is first attempted with the rc.7 patch files disabled from automatic application so the new package tree can be inspected. Patches are regenerated only after their compatible changes exist in rc.2. If a native module is incompatible with the current architecture or Electron ABI, the failure is classified separately from patch conflicts. + +The preview fails loudly on these conditions: + +- Harness package versions are mixed across the explicitly pinned family. +- An essential desktop bridge cannot be located in the rc.2 package layout. +- The packaged Harness entry or web frontend cannot resolve from the app bundle. +- The runtime accidentally resolves the Sherlock or Sherlock Dev user-data directory. +- The preview bundle contains a live formal update feed. + +Runtime errors remain in the preview's own `harness.log`, with recovery and log-opening actions available from the desktop shell. + +## Verification + +Verification is deliberately focused rather than a full test-suite run: + +- Identity tests for the new channel, process name, bundle identifier, and isolated user-data directory. +- Configuration tests asserting that preview packaging disables publishing and uses its own output directory. +- Harness runtime and bundled-package-resolution tests affected by rc.2 package changes. +- Focused tests for every essential bridge or integration that must be ported. +- `npm run typecheck` and the build step required by preview packaging. +- Package inspection of `Info.plist`, packaged `package.json`, Harness package version, executable name, and absence of a formal publish configuration. +- Process and readiness verification after launching the packaged app. +- Real UI inspection of startup, sidebar, conversation composer, model/settings entry, workspace selection, and at least one visible rc.2 behavior. Visual evidence is captured when practical. + +No full functional unit-test suite, notarization, Gatekeeper assessment, updater test, or public-distribution check is part of this preview. + +## Deliverables + +- An isolated `codex/sherlock-harness-preview` implementation branch/worktree. +- A runnable `Sherlock Harness Preview.app` under `dist-harness-preview`. +- Repeatable preview build/run tooling. +- Focused tests for identity, packaging, and migrated essential integrations. +- A patch-migration inventory showing what was ported, already upstream, intentionally omitted, or incompatible. +- A final report with the app path, exact Harness version/commit, build and launch evidence, visible differences, and known preview limitations. + +## Non-Goals + +- Replacing or upgrading the installed formal Sherlock application. +- Publishing a new Sherlock release. +- Copying live credentials or session data into the preview. +- Preserving every current Sherlock UI customization in the first preview. +- Merging `dataelement/dsh-desktop` upstream `main`. +- Editing the DeepSeek Harness upstream repository or publishing Harness packages. diff --git a/docs/superpowers/specs/2026-08-26-zero-cost-cross-model-web-search-design.md b/docs/superpowers/specs/2026-08-26-zero-cost-cross-model-web-search-design.md new file mode 100644 index 000000000..3987b336e --- /dev/null +++ b/docs/superpowers/specs/2026-08-26-zero-cost-cross-model-web-search-design.md @@ -0,0 +1,194 @@ +# Zero-Cost Cross-Model Web Search Design + +## Goal + +Give every Sherlock desktop user usable web search regardless of which model +provider they configure, without requiring a Sherlock-operated search API or a +paid Cloudflare/search service. The current session model remains the preferred +search route when its provider exposes a known native search protocol; all +other routes automatically fall back to an isolated local Electron browser. + +The first visible regression this design must remove is Kimi Coding being sent +to an OpenAI `/responses` endpoint and failing with: + +`The selected model provider "kimi-coding" has no valid Responses API base URL.` + +## Product Behavior + +- Search mode defaults to `auto`; ordinary users do not configure a search + vendor, endpoint, or key. +- In `auto`, Sherlock first tries a provider-native adapter only when the + selected route is explicitly known to support that protocol. +- An unsupported route, missing native route, provider rejection, unreadable + native result, or native result without citeable sources falls back to the + local browser search. +- Kimi Coding and other Anthropic/OpenAI-compatible chat routes are not assumed + to expose OpenAI Responses. They use local search unless a dedicated, + verified adapter is registered. +- A cancelled search stops immediately and never starts the next fallback. +- Users can choose `native-only` to forbid browser fallback or `off` to disable + search. These are advanced preferences; `auto` is the shipped default. +- Search results keep Sherlock's existing normalized contract: optional concise + content plus a list of `url`, `title`, and `snippet` sources. + +## Cost Boundary + +The local fallback uses the user's own Mac, network, and public search result +pages. It does not call Cloudflare Workers, R2, Brave Search, Tavily, Exa, or +another Sherlock-funded search service. Therefore Sherlock introduces no +search-service or Cloudflare request bill. + +A provider-native search can still be part of the user's own model-provider +usage. `auto` prefers it because it is usually higher quality and structured; +`native-only` makes that policy explicit. Sherlock must never label a provider +charge as free. + +## Architecture + +```text +Harness web-search tool + | + v +SessionModelSearchProvider + | + +-- known native adapter ------> user's configured model API + | | unsupported/error/no sources + | v + +-- LocalSearchClient ---------> 127.0.0.1 random port + bearer token + | + v + LocalBrowserSearchService + | + v + isolated hidden BrowserWindow + Bing / DuckDuckGo HTML +``` + +The provider package owns routing and result normalization. The Electron main +process owns browser automation. The child Harness receives only the loopback +URL and an ephemeral bearer token through its process environment; model API +credentials never cross the local bridge. + +## Native Adapter Policy + +Native requests are allowlisted by provider/protocol capability, not inferred +from a model's conversational API compatibility. + +- Keep the existing OpenAI Responses `web_search` adapter for routes explicitly + identified as `openai-responses`, plus the official OpenAI route. +- Do not append `/responses` for `anthropic-messages`, `openai-completions`, + Kimi Coding, or an unknown custom provider. +- The router is an adapter registry so verified Anthropic, Gemini, or Kimi + managed-search implementations can be added without changing the fallback. +- A native adapter error is classified as either abort, recoverable fallback, + or terminal policy error. Abort and `off` are terminal; unsupported routes, + missing credentials/routes, 403/404/405/429/5xx, timeouts, invalid bodies, + and empty source sets are recoverable in `auto`. + +This increment deliberately avoids inventing provider protocols. Kimi Coding's +chat tool interface requires the host to implement web search, so its reliable +path in Sherlock is the local browser fallback. + +## Local Loopback Service + +`LocalBrowserSearchService` starts before the Harness and binds only to +`127.0.0.1` on an operating-system-selected port. It generates a cryptographically +random token for that app run and exposes one operation: + +`POST /search` with `Authorization: Bearer ` + +The JSON body contains only `query` and `maxResults`. The service enforces a +small request body, a bounded query, a result cap, JSON content type, POST-only +routing, loopback clients, constant-time token comparison, and one active +browser search at a time. Responses contain only normalized public result +metadata. Tokens, cookies, model credentials, and full page HTML are not +logged or returned. + +Closing or updating Sherlock stops the HTTP server before destroying its +browser session. Restarting only the Harness keeps the same main-process bridge +alive and reuses the current ephemeral endpoint. + +## Isolated Browser + +Search runs in a dedicated non-persistent Electron session and a BrowserWindow +configured with: + +- `nodeIntegration: false` +- `contextIsolation: true` +- `sandbox: true` +- `webSecurity: true` +- no preload script +- all permission requests denied +- downloads and popups blocked +- audio muted + +The window is hidden during normal searches. It navigates only to allowlisted +search hosts and extracts the visible result page with engine-specific, +side-effect-free JavaScript. It does not open result links. + +Bing is the primary engine for Chinese queries and DuckDuckGo is the secondary +engine; the order can be reversed for other locales. If extraction produces no +usable sources, the controller tries the other engine once. Redirects outside +the engine allowlist fail that attempt. + +## Verification Challenge + +Public search pages may change markup or present a CAPTCHA. The controller +detects common challenge URLs, titles, and page markers. Only then does it show +the isolated window with the title `完成搜索验证`. After the user completes the +challenge, the same request resumes extraction and the window hides again. + +This is the only non-transparent edge case. Sherlock cannot bypass CAPTCHA or +guarantee the stability of a third-party public page, so the two-engine fallback +and clear verification window are contractual resilience measures. + +## Settings + +The Host registers a `web-search-session-model` settings namespace with: + +```ts +type SearchMode = 'auto' | 'native-only' | 'off' +``` + +The existing Plugins settings page exposes a compact selector: + +- `自动（推荐）`: native first, then the free local browser. +- `仅模型原生`: never use the local browser. +- `关闭`: web search reports that it is disabled. + +The selector stores no credential and takes effect on the next search without +restarting Sherlock. + +## Failure Semantics + +- `WEB_ABORTED`: terminal; preserve the caller's cancellation reason. +- `WEB_SEARCH_DISABLED`: terminal; explain that the user disabled search. +- `WEB_NATIVE_SEARCH_REQUIRED`: terminal in `native-only` when no native + adapter succeeds. +- Local bridge unavailable/unauthorized: report a stable local-search error + without exposing endpoint or token. +- Both public engines fail: report that local search could not obtain results + and suggest retrying or completing verification; do not fall back to a paid + remote service. + +## Testing and Delivery + +Use test-driven development and run focused checks only: + +- Router tests for native selection, Kimi/unknown fallback, error + classification, empty-source fallback, modes, and abort behavior. +- Loopback tests for authentication, method/content-type/body/query/result + limits, serialization, queueing, and shutdown. +- Pure engine tests for URL construction, host allowlists, result + normalization, duplicate/unsafe URL rejection, and challenge detection. +- Browser-controller tests with injected fake windows/web contents for secure + preferences, permissions, engine retry, and challenge visibility. +- Runtime tests for endpoint/token injection without logging the token. +- Focused settings UI/patch and model-provider policy tests. +- TypeScript, patch-package integrity, and `git diff --check`. +- Build and launch the packaged `Sherlock Dev.app`, then verify a real Kimi + Coding search reaches local results without `/responses`, abort works, and + logs/network show no Cloudflare or paid search-service request. + +Do not run the full project test suite and do not publish a formal release. + diff --git a/docs/superpowers/specs/2026-08-27-research-canvas-visual-components-design.md b/docs/superpowers/specs/2026-08-27-research-canvas-visual-components-design.md new file mode 100644 index 000000000..40ff4c68d --- /dev/null +++ b/docs/superpowers/specs/2026-08-27-research-canvas-visual-components-design.md @@ -0,0 +1,271 @@ +# Sherlock Research Canvas Visual Components Design + +## Status + +Approved for implementation on 2026-08-27. This design extends +`2026-08-26-research-canvas-workspace-design.md`; that document remains the +authority for shared conversation ownership, file selection, composer tags, +session-scoped persistence, deletion, and right-panel layout. + +## Goal + +Make Research canvas nodes useful as directly readable research material: + +- both the normal Chat composer and the Research right-panel composer gain + eight pixels of vertical breathing room without changing width or placement; +- assistant messages added to the canvas display their complete structured + content and choose an initial height from that content; +- canvas nodes can be resized from their corners and keep their size across + view changes and application restarts; +- image, PDF, and HTML files render inside titled canvas components rather than + remaining generic file chips; +- PDF and HTML interaction stays inside the component instead of panning the + canvas; +- local file previews do not expose arbitrary filesystem access or Electron + application privileges to canvas content. + +## Non-goals + +- This work does not change the Research right-panel width, the pinned + Conversation tab, the composer horizontal layout, or the global sidebar. +- This work does not automatically place all chat messages on the canvas. +- This work does not turn the canvas into a general unrestricted web browser. +- This work does not add editing for image, PDF, or HTML file contents. +- This work does not change the public release version or publish an update. + +## Composer Height + +Chat and Research move the same resident composer between two portal hosts. +The height change therefore belongs to the shared InputBar styles: + +- the textarea, mirror, and decoration backdrop receive `padding-bottom: 8px`; +- the hero mirror minimum height changes from 52 px to 60 px; +- width, max-width, horizontal padding, portal placement, bottom anchoring, and + responsive rules are unchanged; +- the three text layers keep identical padding so the caret, text, and inline + file tags remain aligned. + +The existing composer height observer remains the source of the surrounding +layout's bottom inset. No separate Research height constant is introduced. + +## Unified Visual Node Model + +File nodes and assistant-artifact nodes gain compatible optional sizing data: + +```ts +type ResearchCanvasNodeSize = { + width?: number + height?: number + sizeMode?: 'auto' | 'manual' + aspectRatio?: number +} +``` + +Existing stored nodes without these fields remain valid. Normalization derives +type-specific defaults and rejects non-finite, negative, or unreasonably large +values. The persisted fields remain JSON-safe and subject to the existing +session-scoped storage limits. + +The canvas keeps `x` and `y` as the node center in world coordinates. Selection +geometry, marquee intersection, group movement, and drop placement use each +node's normalized width and height instead of the former fixed 220 x 64 box. + +## Component Frame and Resize Interaction + +Every rich node uses a shared frame: + +1. a title bar displaying the filename or assistant-artifact title; +2. a content body appropriate to the node type; +3. four corner resize handles visible for the active selection; +4. the existing theme-aware selected, focused, and drag states. + +Interaction priority becomes: + +1. Space-drag pans the canvas; +2. a corner handle resizes its node; +3. the title bar or non-interactive card surface moves the selected node group; +4. a blank-canvas drag creates a marquee; +5. interactive preview content owns its click and wheel events. + +Pointer deltas are divided by the current canvas scale. The opposite corner is +kept fixed while resizing. Width and height are clamped by node-type minimums +and a generous canvas maximum. The in-memory size updates while dragging and is +persisted once on pointer-up, cancellation, window blur, or component cleanup. + +Image and PDF frames preserve their content aspect ratio. Assistant and HTML +frames resize freely in both axes. An iframe interaction shield appears while a +canvas move or resize is active so embedded content cannot steal the pointer. + +## Assistant Message Components + +The one-click `添加到画布` action remains explicit and message-id deduplicated. +The saved artifact preserves line breaks and the complete bounded message text; +it is no longer normalized into a single-line excerpt. + +Initial behavior: + +- default width is 360 px; +- `sizeMode: auto` renders the existing Markdown presentation and measures the + complete body with `ResizeObserver`; +- the frame grows to the measured content height, so the entire response is + visible on first placement; +- the measured width and height participate immediately in marquee selection. + +The first user resize changes the node to `sizeMode: manual`. If the user makes +the component smaller than its content, only the body scrolls; the title bar +and handles remain visible and the complete text remains accessible. + +## Image Components + +Files identified as supported raster images or SVG render as: + +- a fixed-height filename title bar; +- an image body using `object-fit: contain`; +- an initial width of 320 px and a height derived from the natural image ratio; +- aspect-ratio-preserving corner resizing, with the title bar added outside the + image body's ratio calculation; +- a loading placeholder and a compact unavailable state for moved, deleted, or + unreadable files. + +The natural ratio is normalized into `aspectRatio` after a successful load so +the component retains its geometry across restarts without loading the whole +file just to lay out the canvas. + +## PDF Components + +PDF nodes initialize as a titled single-page frame. A pinned `pdfjs-dist` +dependency renders one page at a time to canvas so Sherlock controls the page +ratio and wheel behavior consistently rather than relying on Chromium's full +PDF toolbar. + +- the first page supplies the initial content aspect ratio; +- the title bar includes a compact `current / total` page indicator; +- vertical wheel gestures inside the PDF body switch one page per threshold, + with throttling to prevent trackpad bursts; +- the PDF handler stops propagation so the same wheel does not pan or zoom the + Research canvas; +- page rendering is cancelled and restarted when the visible page or component + size changes; +- only visible or near-visible PDF nodes keep an active renderer. + +The component remains proportionally resizable. Missing, malformed, encrypted, +or unsupported PDFs show a local error state without affecting the canvas. + +## HTML Components + +HTML nodes render in a titled sandboxed iframe. The frame is freely resizable +and internally scrollable. Its initial size is 480 x 360 px. + +The iframe may execute scripts only after the following application hardening is +in place: + +- preload bridges and sidebar update controls are exposed only when + `process.isMainFrame` is true; +- every privileged IPC used by those bridges validates that its sender is the + main frame of a trusted application window; +- frame navigation is checked with `will-frame-navigate` as well as existing + main-frame navigation controls; +- the iframe omits `allow-same-origin`, forms, popups, downloads, and top-level + navigation permissions; +- the preview response sets a strict CSP that blocks network connections, + embedding, forms, base-URL replacement, and access outside the preview + capability. + +If the hardening gate cannot be proven by focused tests, scripts remain disabled +with `script-src 'none'`; static HTML rendering is never blocked on unsafe +script execution. + +## Local Preview Capability + +The main process registers a standard, secure, fetch-compatible read-only +`sherlock-preview://` protocol before application ready. It is intentionally not +added to the set of trusted top-level application URLs. + +Preview URLs contain a random opaque capability token, never an absolute path. +The main process issues a token only while admitting a real Finder `File` or a +workspace-fenced Sherlock sidebar file to the active Research canvas session. +It stores durable authorization metadata in a main-process-owned preview +registry, separate from the renderer-writable canvas JSON. Restart recovery +reissues ephemeral tokens from that registry, never from a renderer-supplied +absolute path. + +For every request the preview service: + +- resolves both the allowed root and requested target with `realpath`; +- rejects traversal and symlink escape; +- confirms the target is a regular file; +- applies a supported MIME allowlist and `X-Content-Type-Options: nosniff`; +- supports byte ranges for PDF and other streamed media; +- confines HTML relative assets to the token's real directory; +- applies the HTML sandbox CSP to the root document and local subresources; +- returns 403/404 for invalid, expired, missing, or unauthorized targets. + +The preload API exposes two narrow admission paths: one accepts a real `File` +and resolves it internally with `webUtils.getPathForFile`; the other accepts a +sidebar file identity that the main process resolves within the active session +workspace. It does not expose `read(path)`, arbitrary file contents, or +permanent tokens. Removing a node or its session revokes associated preview +capabilities. + +## Wheel and Pointer Ownership + +The existing canvas wheel handler continues to pan the background and to zoom on +Command-wheel. It ignores wheel events owned by marked preview-scroll regions. +PDF page switching, assistant-body scrolling, and HTML iframe scrolling do not +move the canvas. Space-pan remains available by activating the iframe shield +before the pointer operation begins. + +## Performance and Lifecycle + +- Rich media mounts only for nodes intersecting an expanded viewport margin; + offscreen nodes keep a lightweight titled placeholder. +- Object URLs, PDF render tasks, iframe loads, and protocol tokens are released + when a node is removed, a session changes, or the workspace unmounts. +- File bytes are never copied into Research canvas JSON. +- Preview loading never blocks pointer movement, marquee selection, or canvas + persistence. + +## Failure Behavior + +- Generic and unsupported files keep the existing compact file card. +- A missing preview source keeps the node, title, selection, resize, and delete + behavior, while its body shows an unavailable message. +- Preview errors do not remove composer attachments or mutate the source file. +- Old sessions with invalid size fields fall back to defaults and are repaired + on the next successful persistence write. + +## Focused Verification + +Automated tests must cover: + +- the shared composer gains exactly eight vertical pixels without a width or + portal-ownership change; +- old and new node shapes normalize safely and persist their sizes; +- marquee geometry uses actual node dimensions at non-1.0 zoom; +- resize math, min/max clamping, opposite-corner anchoring, persistence, and + image/PDF aspect locks; +- full assistant Markdown and line breaks survive add, reload, auto height, and + manual resizing; +- image natural ratio and title rendering; +- PDF page ratio, page count, wheel threshold, cancellation, and canvas-wheel + isolation; +- HTML iframe sandbox and CSP, main-frame-only preload exposure, privileged IPC + sender checks, navigation blocking, traversal, and symlink escape; +- capability expiry, missing files, MIME rejection, range responses, and node + deletion; +- existing Finder and right-panel drag sources, selection/tag ordering, keyboard + and context-menu deletion, view switching, and session persistence. + +Final validation follows `docs/sherlock-local-test-runbook.md` via +`./script/build_and_run.sh --verify`. The real locally built Sherlock window must +remain open and be exercised at desktop and narrow right-panel widths with: + +1. a tagged single-line and multiline composer in Chat and Research; +2. a long assistant response added to the canvas and resized; +3. Finder and right-panel image drops with proportional resize; +4. a multi-page PDF changed by wheel without canvas movement; +5. a local HTML file scrolled and interacted with inside the sandbox; +6. selection, multi-move, deletion, session switching, and application restart. + +No full test suite, version bump, notarization, upload, source push, or public +update-feed change belongs to this local development task. diff --git a/docs/superpowers/specs/2026-08-28-research-canvas-preview-expansion-design.md b/docs/superpowers/specs/2026-08-28-research-canvas-preview-expansion-design.md new file mode 100644 index 000000000..28d8c23e9 --- /dev/null +++ b/docs/superpowers/specs/2026-08-28-research-canvas-preview-expansion-design.md @@ -0,0 +1,189 @@ +# Sherlock Research Canvas Preview Expansion Design + +## Status + +Approved for implementation on 2026-08-28. This document extends and, where +explicitly stated, supersedes +`2026-08-27-research-canvas-visual-components-design.md`. Existing contracts +for the shared Chat/Research composer, session-scoped canvas state, selection, +dragging, resizing, deletion, and capability-based local-file authorization +remain authoritative. + +## Goals + +- Make an HTML component behave like an isolated browser view: its authorized + local project resources load, its controls work, and its normal web API + requests can run. +- Replace PDF wheel-to-page stepping with continuous, freely scrollable pages. +- Preview the same user-facing file families advertised by the Files sidebar: + images, PDF, Markdown, HTML, DOCX, XLSX, PPTX, and text/code. +- Let users rename a canvas component without renaming the source file and keep + selected composer references in sync with the display name. +- Persist each conversation's selected model across app restarts and session + switching. +- Keep every right-panel composer menu above the conversation flow so message + cards cannot cover slash-command or model/permission popups. + +## Non-goals and Regression Shields + +- Do not change composer width, horizontal padding, portal ownership, bottom + anchoring, loading animation, global sidebar, or right-panel width. +- Do not rename or mutate source files. +- Do not add legacy binary Office preview for `.doc`, `.xls`, or `.ppt`. +- Do not expose Node, Electron, preload bridges, arbitrary local paths, or + top-level Sherlock navigation to embedded documents. +- Do not silently substitute a different model when a conversation's saved + provider is genuinely unavailable. +- Do not publish, notarize, change version 0.7.3, or update public feeds. + +## HTML Browser Component + +The existing `sherlock-preview://` capability remains the only way a local HTML +document and its sibling files reach the renderer. A capability token is the +host part of a dedicated origin, so separate authorized roots do not share an +origin. Relative paths are resolved through the authorization's realpath-fenced +root; absolute filesystem paths and symlink escape remain rejected. + +The iframe uses an isolated renderer with `contextIsolation`, Chromium sandbox, +and no preload or Node integration. It gains only the browser capabilities that +the content needs: scripts, same-origin access inside its capability root, and +forms. Popups, downloads, top-level navigation, Electron schemes, `file:`, and +unapproved local paths stay blocked. + +The preview CSP allows: + +- authorized same-origin CSS, classic/module JavaScript, JSON, images, fonts, + media, source maps, and WebAssembly with correct MIME types; +- browser-governed `http:`, `https:`, `ws:`, and `wss:` connections and assets; +- inline styles required by ordinary exported HTML, while keeping application + privileges unavailable. + +Remote requests remain subject to normal Chromium CORS and mixed-content rules. +Network access does not grant filesystem access. External top-level links open +through the existing safe external-navigation path rather than replacing the +Sherlock window. + +The canvas move/resize shield stays inactive during normal preview use and is +enabled only while the user pans or transforms the canvas. Pointer, keyboard, +form, scroll, and script interaction therefore work inside the component. + +## Continuous PDF Viewer + +PDF.js renders a vertical page stream inside the component body. The body owns +normal wheel and trackpad scrolling and uses `overscroll-behavior: contain` so +the same gesture does not move the Research canvas. + +Pages near the viewport render to independent canvases; distant pages keep +aspect-ratio placeholders. Intersection-driven rendering, cancellation, pixel +limits, and document cleanup prevent large PDFs from retaining every bitmap. +Resizing changes the page width and schedules visible pages again. The title bar +shows filename and compact document/page progress, but no wheel threshold or +one-page stepping remains. + +## File Preview Families + +Lightweight previews remain native to the Research canvas bundle: + +- image: PNG, JPEG, GIF, WebP, SVG, BMP, ICO, and AVIF; +- PDF: continuous PDF.js viewer; +- Markdown: read-only rendered Markdown with source-safe links; +- HTML: sandboxed browser component; +- text/code: bounded UTF-8 read-only viewer with filename-derived language and + a binary/unavailable fallback. + +Office previews reuse the installed Better Sidebar Office plugin engines rather +than duplicating their large dependencies: + +- DOCX through `docx-preview`; +- XLSX through SheetJS and Univer; +- PPTX through the existing PPT renderer. + +The Office plugin exposes a narrow shared preview adapter that accepts a +capability URL, media kind, mount target, and abort signal. It never accepts an +absolute renderer-supplied path. OOXML inputs are checked as ZIP containers and +bounded by source size, entry count, and expanded-size limits. Viewers mount +only near the canvas viewport and dispose their runtime on unmount. + +Unsupported or malformed content keeps the titled component with a compact +unavailable state; it never removes the node or changes the source file. + +## Component Display Names + +File nodes gain optional `displayName`; the immutable `name` remains the source +basename. Artifact nodes continue to use their title. Normalization trims the +display name, applies a bounded length, rejects control characters, and removes +the override when the value equals the source name or is empty. + +Right-clicking the title bar offers `修改名称` and the existing canvas-only +delete command. Rename uses an inline title editor with Enter to save, Escape to +cancel, and blur to save. It persists through the existing session-scoped +Research workspace state. + +Composer references use `displayName ?? name`. Reference reconciliation updates +the label, clipboard text, and outgoing reference metadata of an already +inserted occurrence with the same canvas node id while preserving its position, +selection state, and surrounding typed text. Renaming never adds a duplicate +tag and never renames the source file. + +## Durable Conversation Model Selection + +The current host keeps an explicit selection only in a process-local map, so a +restart can fall through to a historical request or to a disabled base default. +Add a durable, bounded session-selection store in the Host model-routing layer. + +Resolution order becomes: + +1. live selection made in the current Host process; +2. durable selection for this conversation/session; +3. the latest actual request header for the conversation; +4. a configured and currently routable user default. + +`selectModel` writes the session selection durably before reporting success. +Selections are isolated by session and provider/model/reasoning tuple. A global +default change must not overwrite an existing session selection. If the saved +provider is no longer registered, the model directory remains explicitly +blocked and guides the user to configure or choose a model; Sherlock must not +guess or silently switch providers. The disabled DeepSeek base default is not +treated as a valid fallback. + +The formal and development app identities continue using their separate data +roots; this change guarantees persistence within one identity and does not +merge those roots. + +## Right-panel Composer Overlay Stacking + +The shared composer continues moving as one resident DOM subtree between Chat +and Research. In the Research right panel, its overlay anchor and sticky seat +must form a stacking layer above the message viewport. Slash-command, +model/reasoning, access-mode, and other composer menus therefore paint above +message bubbles and message action tooltips. + +The fix belongs to the Research host stacking and clipping boundary, not to an +individual menu's size or copy. The menu remains constrained to the right-panel +width and scrollable at its existing maximum height. The change must not move +the composer, change its width/height, cover the tab bar, or allow the message +flow to paint over the input while no menu is open. + +## Focused Verification + +Automated coverage must prove: + +- HTML local CSS/JS/module/JSON/font/media loading, remote fetch, form/control + interaction, iframe pointer ownership, origin isolation, traversal and IPC + rejection; +- continuous multi-page PDF scrolling, visible-page rendering, cancellation, + resizing, cleanup, and canvas-wheel isolation; +- image/Markdown/text and DOCX/XLSX/PPTX routing, lifecycle, OOXML limits, and + unsupported fallbacks; +- rename persistence and exact in-place composer reference reconciliation; +- per-session model selection across simulated Host restart, independent + sessions, last-request fallback, unavailable-provider behavior, and invalid + default rejection; +- right-panel slash-command and model/access menus covering message cards at + narrow and normal widths without clipping or changing composer geometry; +- unchanged composer width/position, shared DOM ownership, loading animation, + global sidebar, and existing drag/select/delete behavior. + +Final acceptance follows `docs/sherlock-local-test-runbook.md` with +`./script/build_and_run.sh --verify`, package verification, and interaction in +the real Sherlock window. The app remains open for user testing. diff --git a/docs/superpowers/specs/2026-08-31-sherlock-multi-session-integration-workflow-design.md b/docs/superpowers/specs/2026-08-31-sherlock-multi-session-integration-workflow-design.md new file mode 100644 index 000000000..fdca9a58b --- /dev/null +++ b/docs/superpowers/specs/2026-08-31-sherlock-multi-session-integration-workflow-design.md @@ -0,0 +1,457 @@ +# Sherlock 多 Session 功能集成与版本治理设计 + +## 状态 + +本设计已于 2026-08-31 在对话中获得方向批准，等待用户完成书面审阅后进入实现计划。 + +## 背景与问题 + +Sherlock 的多个 Codex session 可能运行在根目录 checkout、不同 Git worktree，或同一 +目录的不同时间点。每个目录都能独立生成 `dist-notarized/.../Sherlock.app`，而现有 +`script/build_and_run.sh --verify` 会先停止所有名为 `Sherlock` 或 `Sherlock Dev` 的 +进程，再从脚本所在目录构建并启动同一正式身份 `com.evanarts.sherlock`。因此，从旧 +worktree 启动测试版会替换另一个 session 刚构建的客户端；用户看到的功能回退不一定 +表示 Git 合并丢失，也可能只是运行了不同提交的产物。 + +当前未执行新 fetch 的本地状态显示 `main` 与上游 `origin/main` 双向分叉，所以本流程 +把本地 `main` 定义为日常功能集成的唯一基线。不得在功能集成过程中自动 `pull`、 +rebase 到远端或 force-push；上游同步和远端历史整理属于独立任务。 + +## 目标 + +- 每个功能 session 都有隔离、可追溯、可完整合并的 Git 边界。 +- 未提交修改不得成为 session 之间的交接载体。 +- 共享身份的 Sherlock 客户端始终来自一个明确的集成入口。 +- 两个 session 不能同时构建或替换共享客户端。 +- 用户能在真实客户端中确认当前分支、提交、构建时间和集成功能清单。 +- 功能合并、客户端验收、正式版本发布保持为相互独立的门槛。 +- 合并失败或验收失败时保留功能分支和 worktree，不丢失可恢复状态。 + +## 非目标 + +- 本设计不整理当前 `origin/main` 与本地 `main` 的分叉历史。 +- 不改变正式版本号递增、Apple 公证、Cloudflare 发布或更新器协议。 +- 不要求日常功能开发运行全量测试。 +- 不自动推送分支、标签或创建远端 Pull Request。 +- 不自动删除分支、worktree、未跟踪文件或构建产物。 +- 不允许多个预览客户端共享可写的正式用户数据目录。 + +## 核心角色与状态 + +### 本地 `main` + +`main` 只包含已经完成本地集成和用户验收的提交。功能 session 不直接修改 `main`， +正式发布仍只能从干净的本地 `main` 执行。 + +### 功能 worktree + +每个功能使用独立分支和 worktree，分支名采用 +`codex/feat/-`。分支从创建时的本地 `main` 提交派生，一个 +worktree 只服务一个功能。Codex 原生 worktree 能力优先于手写 `git worktree add`。 + +### 集成批次 + +需要同时验收一个或多个功能时，由唯一的“Sherlock 集成 session”从当前本地 `main` +创建短期分支 `codex/integration/-`。它完整合并功能分支、构建共享 +客户端，并在验收通过后以 fast-forward 方式推进 `main`。 + +### 共享客户端 + +进程名 `Sherlock`、Bundle ID `com.evanarts.sherlock`、正式用户数据目录和本地集成 +输出共同组成共享测试身份。只有 `main` 或 `codex/integration/*` 的干净工作区可以 +构建和启动这个身份。共享本地包使用独立 `local-integration` channel，关闭自动和手动 +在线更新，避免公开 feed 把正在验收的本地提交替换掉；正式发布仍使用既有 +`notarized` channel。 + +### 功能预览客户端 + +功能 session 如确需在合并前做独立 UI 预览，必须使用与功能 slug 绑定的进程名、 +Bundle ID、输出目录和用户数据目录。预览客户端不能停止共享 `Sherlock`，不能读取或 +写入正式用户数据，也不能被描述为集成测试版或正式发布候选。 + +### 源码清洁 + +“源码干净”不是简单要求 `git status` 完全无输出。它要求：没有 staged 或 unstaged 的 +tracked 改动，没有位于源码、配置、测试、文档和脚本目录中的未跟踪文件；只允许 +`dist-*`、`output/` 等被明确列入代码化白名单的生成物。未跟踪路径若类型不明则按源码 +处理并拒绝。被 Git 忽略的依赖和补丁应用状态由独立 dependency digest 约束。 + +## 不可破坏的约束 + +1. 一个功能 session 对应一个功能分支和一个 worktree。 +2. 交接必须指向 Git 提交；存在未提交源码或仅存在于未跟踪文件中的功能不可交接。 +3. 功能分支合并前不得删除；合并后也要保留到真实客户端验收通过。 +4. 共享客户端只由集成 session 从允许的分支启动。 +5. 每个共享或预览产物必须携带可见、可机读的构建来源。 +6. 合并冲突必须停止并显式解决，不自动选择 `ours` 或 `theirs`。 +7. 正式版本号只在正式发布流程中改变；本地批次使用构建来源标识，不伪造新版本号。 +8. 本设计新增的 preflight、集成和本地预览脚本只操作本地 Git 状态，不 pull、不 push、 + 不 force、不删除；既有正式发布脚本继续遵守正式发布手册的明确授权。 +9. 共享构建必须持有覆盖全部 worktree 的互斥锁，且来源门禁失败时不能停止当前客户端。 + +## 功能 Session 生命周期 + +### 1. 创建 + +功能 session 开始前记录本地 `main` 的完整提交哈希，并从该提交创建 worktree。若 +现有 worktree 早于本治理规则，必须先完成合并、重建或明确放弃；不得继续用缺少保护 +脚本的旧 worktree 启动共享客户端。 + +创建后的首个检查包括： + +- 当前目录确实是 linked worktree； +- 当前分支符合 `codex/feat/*`； +- 基准提交是当时的本地 `main`； +- 没有 staged/unstaged 源码或未跟踪源码；允许的构建输出不参与源码清洁判断； +- 只运行与功能直接相关的基线检查。 + +### 2. 开发 + +每个功能 session 只能修改自身范围内的文件。每个可独立解释并完成聚焦验证的修改都 +创建中文本地提交；不得把其他 session 的未确认改动混入提交。功能实现完成后，session +再次运行直接相关的测试、类型检查和必要的真实 UI 验证，但不运行全量测试。 + +### 3. 交接 + +完成的 session 输出结构化“待合并卡片”，至少包含： + +```text +功能：<用户可理解的功能名> +分支：codex/feat/- +基准提交： +最终提交： +提交范围：.. +提交列表： +涉及文件： +聚焦检查：<命令、结果和绑定的 tip SHA> +真实界面验证：<结果或不适用原因> +已知风险或冲突：<无或具体说明> +``` + +交接前置条件为功能 worktree 源码干净，且 `基准提交..最终提交` 中没有未声明的其他 +功能提交。分支 ref 必须仍精确指向卡片声明的最终提交；若 ref 后续前进，原卡片失效并 +重新生成。卡片可以由只读 preflight 脚本生成，但不能替代 Git 提交。 + +## 集成生命周期 + +### 1. 建立批次 + +集成 session 从当前本地 `main` 创建一个新的短期集成分支和独立 worktree，并记录： + +- 批次 ID； +- `main` 基准提交； +- 计划集成的功能分支与最终提交； +- 每项功能的用户验收要点。 + +同一时间只能有一个拥有共享客户端启动权的集成批次。 + +批次清单保存为 +`config/sherlock-integration-batches/-.json`，并作为集成分支的首个 +提交进入 Git。清单包含 schema、批次 ID、`main` 基准、功能分支、声明的最终提交和 +验收要点；合并完成后追加实际合并提交和验证摘要。清单不得在构建时临时推断或静默 +更新。`main` 直接构建时批次可以为空，只记录当前 `main` 提交。 + +批次建立时还要在 Git common directory 中创建持久的 active-batch lease。lease 包含 +批次 ID、分支、`main` 基准、当前集成 tip 和随机 owner token，从建立批次持续到用户 +验收后推进 `main`，或用户明确取消批次。lease 存在时： + +- 只有 owner token 匹配的集成执行器可以随着新提交追加更新当前 tip； +- 只有该 lease 声明的精确分支和 tip 可以构建共享客户端； +- `main` 和其他集成分支不能顺序替换正在验收的客户端； +- 普通构建互斥锁仍只保护一次构建过程，不能替代 active-batch lease； +- 同名批次或分支已存在但 base、manifest 或 lease 不完全一致时必须拒绝，不能 reset、 + rebase、复用或移动已有 ref。 + +### 2. 功能分支预检 + +对每个功能分支执行只读检查： + +- 分支存在且最终提交仍可达； +- 分支 ref 精确等于卡片与批次清单声明的最终提交； +- 对应 worktree 没有未提交源码； +- 声明的 base 同时是 feature tip 和批次 `main` 基准的祖先； +- `git log ..` 与交接卡片的精确提交列表一致； +- `git diff --name-status ...` 与卡片的机器可读文件列表一致； +- 分支尚未被完整合并，或明确报告为幂等跳过； +- 相关聚焦检查记录绑定同一个 declared tip SHA。 + +若功能分支包含未声明历史、找不到提交、工作区脏或基准关系异常，预检停止，不修改 +集成分支。 + +### 3. 合并 + +功能分支按依赖顺序使用 `git merge --no-ff --no-commit` 完整合并，保留功能边界和 +来源。每个功能进入索引和工作树后先运行其聚焦检查，通过才创建中文合并提交。检查 +失败且尚未提交时使用 `git merge --abort` 恢复批次原状态。发生冲突时停止在当前集成 +分支，列出冲突文件和两侧语义；禁止整体采用 `ours` 或 `theirs`。解决后重新运行受 +影响检查，再创建明确的中文合并提交。 + +如果集成期间 `main` 前进，先把新的 `main` 合入集成分支并重新执行受影响检查，确保 +最新 `main` 仍是集成分支的祖先；不得把旧批次直接覆盖到新的 `main`。 + +### 4. 共享客户端验收 + +所有计划功能合并后，集成 session： + +1. 检查分支类型、工作区清洁度和批次清单； +2. 运行本次功能覆盖的聚焦测试及 `npm run typecheck`； +3. 使用 `./script/build_and_run.sh --verify` 构建共享客户端； +4. 使用包校验脚本验证最终 App、签名和内置 Node； +5. 读取真实 Sherlock 窗口，按批次清单逐项确认功能和回归护栏； +6. 保持客户端打开供用户测试。 + +用户明确验收前，集成分支不能推进 `main`，功能分支和 worktree 不能清理。 +用户验收绑定客户端 provenance 中的精确 integration tip。验收后只要集成分支、批次 +清单、依赖摘要或 `main` 发生任何变化，原验收立即失效；必须重新生成来源、构建、读取 +真实界面并再次获得验收。 + +### 5. 推进 `main` + +验收通过后，集成执行器转到仓库根目录的 canonical `main` worktree，确认该 worktree +没有未提交源码、分支确实为 `main`，且 HEAD 仍等于批次记录的预期 `main` SHA。随后 +确认当前 `main` 是集成分支的祖先，并确认每个声明的功能最终提交都是集成分支祖先， +再执行 `git merge --ff-only codex/integration/`。推进后逐个确认功能最终提交已经 +成为 `main` 祖先，在 `main` 上运行最小必要的集成确认，并记录批次 ID、集成提交、功能 +提交和验证结果，最后释放 active-batch lease。 + +只有当 `main` 已包含全部功能最终提交、相应 worktree 干净且用户不再需要迭代时，才 +允许普通删除功能分支和移除 worktree。任何包含未提交或未跟踪文件的 worktree 都必须 +保留并报告，禁止强制移除。 + +## 构建来源与客户端可见性 + +### 来源文件 + +构建前生成一个只包含非敏感来源信息的 JSON 文件，并在签名前纳入 App 资源： + +```json +{ + "schemaVersion": 1, + "productVersion": "0.7.3", + "mode": "local-integration", + "channel": "local-integration", + "branch": "codex/integration/20260831-01", + "commit": "", + "mainCommit": "", + "sourceClean": true, + "dependencyDigest": "sha256:", + "batchId": "20260831-01", + "manifestDigest": "sha256:", + "features": [ + { "branch": "codex/feat/example-20260831", "commit": "" } + ], + "builtAt": "" +} +``` + +`mode` 决定必填字段并采用失败关闭策略： + +- `local-main`：channel 为 `local-integration`，`mainCommit == commit`，`batchId` 和 + `manifestDigest` 为 null，`features` 为空； +- `local-integration`：channel 为 `local-integration`，批次、manifest 摘要、main 基准 + 和非空功能列表必须与 active-batch lease 一致； +- `feature-preview`：channel 为 `feature-preview`，必须记录规范化 slug、稳定身份哈希、 + feature base/tip，不接受脏源码； +- `formal`：channel 为既有 `notarized`，必须从干净 `main` 在正式公证构建签名前生成， + 记录正式版本和 source commit，不携带本地 active-batch lease。 + +缺失或未知 mode/channel 必须在选择 App 身份、用户数据目录、迁移和更新策略之前拒绝 +启动，不能回退到 legacy 或正式身份。 + +文件不得包含用户名、绝对路径、凭据、工作区内容或会话数据。来源文件先生成在明确 +忽略的临时目录，再通过 builder `extraResources` 在签名前纳入 App；不得写入未忽略的 +源码目录。`dependencyDigest` 至少覆盖 lockfile、`patches/` 内容、补丁应用结果、Bundled +Plugin Profile manifest 和工作区 Node 版本；同一 Git 提交不能因为不同 worktree 的 +忽略依赖状态而获得相同来源声明。签名后修改会破坏包签名。 + +集成 worktree 使用自己的依赖目录，并按已提交 lockfile 和补丁重新准备或验证依赖；不 +通过共享另一个 worktree 的 `node_modules` 来缩短构建。依赖准备结果不匹配时停止，不 +通过修改 provenance 摘要来接受未知运行时。 + +### 用户可见信息 + +Sherlock 的“关于”或开发信息区域显示： + +```text +Sherlock 0.7.3 +Integration 20260831-01 +codex/integration/20260831-01 @ +构建时间 +``` + +正式版本显示 `Formal @ `；功能预览显式显示 +`Feature Preview @ `。窗口可见信息与 App 内 JSON 必须一致。 + +### 共享构建门禁 + +`./script/build_and_run.sh` 的 `--run`、`--verify`、`--debug`、`--logs` 和 +`--telemetry` 都会操作共享身份，因此必须在停止现有客户端前经过同一本地来源门禁； +`--formal` 也使用同一互斥锁和 active-batch 冲突检查，但继续采用更严格的正式 Git +门禁： + +- 当前分支只能是 `main` 或 `codex/integration/*`； +- 不能处于 detached HEAD； +- tracked 文件必须干净； +- 只允许明确列出的构建输出目录为未跟踪状态，其他未跟踪源码必须拒绝； +- 集成分支必须提供有效批次清单，且列出的提交都可从当前 HEAD 到达； +- active-batch lease 存在时只能由 lease 声明的精确 integration branch/tip 构建； +- 依赖摘要必须由当前 lockfile、补丁和已准备运行时重新计算并匹配； +- 构建来源文件与当前 Git 状态一致。 + +门禁失败时不得停止当前 Sherlock，不得覆盖现有 App，并输出当前目录、分支、提交和 +具体失败条件。 + +### 共享构建锁与替换顺序 + +所有 worktree 共享同一个 Git common directory。共享构建在该目录下用原子目录创建 +获取互斥锁，锁中记录持有进程、worktree、分支、提交和开始时间。已有活锁时新构建 +停止并报告持有者；陈旧锁只能在确认记录进程不存在后由显式恢复命令处理，普通构建不 +自动删除锁。 + +构建脚本必须通过退出 trap 在成功、普通失败和信号中释放自己持有的锁；不能释放 PID +或来源信息不匹配的其他构建锁。 + +共享构建严格按以下顺序执行： + +1. 来源门禁通过； +2. 获取全仓共享构建锁； +3. 固定 HEAD、`main` 和批次清单； +4. 在 canonical 根目录下构建新的不可变 generation，并执行包校验； +5. 再次确认 HEAD、源码状态和批次清单未变化； +6. 记录当前 active generation 的绝对 App 路径，只在以上检查全部通过后停止旧客户端； +7. 用新 generation 的绝对 App 路径启动，等待 Harness 正常主界面就绪并核对 provenance； +8. 新 App 就绪后更新 active pointer，再次验证移动/切换后的签名和完整可执行路径； +9. 若启动、Harness 或来源验证失败，停止新 App，保持 active pointer 不变并重新打开旧 + generation； +10. 释放构建锁。 + +generation 固定存放在由 Git common directory 推导出的 canonical 根目录 +`dist-local-integration/generations/--/Sherlock.app`，不位于 +可被删除的功能或集成 worktree 中。active pointer 只记录已经成功启动并验证的不可变 +generation，不通过复制覆盖修改已签名 App。切换、回滚和重启后都重新执行签名、来源和 +精确路径检查。 + +停止旧客户端之前的失败直接保留旧客户端；停止后的失败必须完成上述自动回滚，若旧 App +也无法重启则报告两个绝对路径和诊断，不得声称仍保留可测试状态。正式发布门禁与本地 +共享门禁保持为两个入口：本地门禁不能因为其他干净的并行功能 worktree 尚未合并而 +阻止日常集成，正式发布仍必须阻止任何未合入分支或脏 worktree。 + +`local-integration` channel 在主进程更新策略、IPC、菜单、侧栏和“关于”页的自动及 +手动入口中都返回禁用状态，不能只依赖 builder 的 `publish: null`。它使用独立 builder +配置、`publish: null`，且包校验断言不存在 `app-update.yml`。 + +`local-integration` 为了真实验收继续使用正式 Sherlock 用户数据目录，但不得向全局 +`~/.agents/skills` 发布技能。Bundled Plugin Profile 和启动迁移必须幂等、版本化，并在 +Harness 就绪前保留可恢复备份；启动失败回滚 generation 时同时恢复本次启动产生的托管 +配置变更。Harness 就绪后的用户会话、设置或内容修改属于正常用户数据，不随 App 回滚。 + +## 功能预览隔离 + +功能预览采用独立命令和配置，不复用共享 `--verify`： + +- 输出目录：`dist-feature-preview/-/`； +- App 名称与进程名：`Sherlock Preview - `； +- Bundle ID：`com.evanarts.sherlock.preview..`； +- 用户数据目录： + `Application Support/sherlock-preview--`； +- channel：`feature-preview`，自动和手动更新、公证、公开 feed、正式数据迁移全部禁用； +- 包内不得生成 `app-update.yml`； +- 启动和停止只针对该预览进程； +- 界面持续显示 Feature Preview 来源信息。 + +预览来源门禁只接受源码干净、已提交的 `codex/feat/*` checkpoint；脏预览不受支持， +也不能用来生成交接卡片。slug 必须经过小写 ASCII、长度和字符白名单校验，避免无效 +Bundle ID 或路径逃逸，并追加原始分支名的稳定短哈希，避免两个原始 slug 归一化后发生 +身份、输出或 userData 碰撞。预览数据删除只发生在用户明确授权时；脚本本身不自动清理。 +预览 channel 还必须跳过向全局 `~/.agents/skills` 同步技能，只写入自己的 user data， +避免不同预览或共享客户端在 Git 之外继续相互覆盖。 + +## 上游与远端边界 + +`origin` 当前指向上游项目，不是日常功能集成的同步基线。普通功能与集成脚本不得执行 +`git pull`。上游同步必须使用独立的 `codex/upstream-sync/` 分支和批次， +先显式 fetch、审查分叉、解决冲突并完成本地验收，再决定是否进入 `main`。如需远端 +备份，应配置独立 fork remote 并只推送命名分支；未经用户明确授权不得 force-push。 + +## 自动化组件 + +实现阶段把职责拆成四个小组件： + +1. **Session/集成规则文档**：更新 `AGENTS.md`，新增面向开发者的集成 runbook。 +2. **Git preflight**：只读分析分支、worktree、提交范围、清洁度和集成批次，不执行 + pull、push、merge、删除。 +3. **集成执行器**：在 preflight 通过且用户已选择功能分支后，只创建全新的唯一集成 + 分支并逐项追加合并；不 reset、rebase、复用同名分支或移动既有 ref，冲突时停止， + 绝不自动清理。 +4. **构建来源与启动门禁**：生成来源文件、嵌入客户端、在 UI 展示，管理跨 worktree + 构建锁，并区分共享构建与独立预览构建。 + +Git preflight 和集成执行器分离，便于任何 session 先安全查看将要发生的动作。执行器 +必须支持 dry-run，并在真实合并前打印基准、目标、提交列表和预计改动文件。 + +## 失败处理 + +- **功能 worktree 脏**：停止交接，列出文件；返回原 session 提交或明确排除。 +- **功能已部分合并**：比较 patch-id 和可达性，不重复 cherry-pick；报告缺少的提交。 +- **提交范围包含其他功能**：停止，要求拆分分支或明确把它们加入同一批次。 +- **合并冲突**：保留集成 worktree 和冲突状态，禁止自动选边或删除。 +- **`main` 在批次中前进**：把最新 `main` 合入批次，重新验证后才能 fast-forward。 +- **active-batch owner 中断**：保留 lease、集成分支和 worktree；显式恢复命令核对 + owner token、manifest 和当前 tip 后才能接管，普通构建不能清除 lease。 +- **批次被拒绝或取消**：先释放共享启动权并保留所有功能分支；随后由用户在合并、保留 + 或明确丢弃集成分支之间作决定。正式门禁继续把未合入分支视为阻塞，不按分支名静默 + 豁免。 +- **共享构建来源不合法**：在杀进程和打包之前失败，保留当前可测试客户端。 +- **另一 session 正在构建**：报告共享锁持有者并停止，不排队、不抢锁、不杀进程。 +- **构建期间 HEAD 或源码变化**：废弃暂存产物，保留旧客户端并报告前后来源。 +- **新 generation 启动失败**：恢复 active pointer 并重新启动旧 generation，分别报告 + 新旧绝对 App 路径和签名/来源结果。 +- **客户端显示来源与 JSON 不一致**：包校验失败，不允许进入用户验收。 +- **真实界面缺少某项功能**：先核对当前 App 完整路径和来源提交，再判断为代码回归。 +- **远端分叉或 push 被拒绝**：停止并单独处理；集成脚本不得 force-push。 +- **清理时发现未知文件**：保留 worktree 并列出文件；不得 `--force`、`branch -D`、 + 手工删目录或运行 `git gc --prune=now`。 + +## 聚焦验证 + +自动测试必须覆盖： + +- 临时 Git 仓库中的正常功能分支、脏 worktree、未跟踪源码、已合并分支、异常基准、 + 部分合并和 `main` 前进； +- dry-run 不修改 refs、索引、工作区、远端或进程； +- 合并冲突保留可恢复状态，且不删除功能 worktree； +- active-batch lease 的创建、tip 追加更新、owner 恢复、main/其他批次阻塞和显式释放； +- 所有共享启动模式在非法分支、detached HEAD、脏源码和无效清单下，在停止旧客户端前 + 退出；正式模式仍使用更严格门禁； +- 两个 worktree 并发构建时只有一个获得锁，失败者不停止或替换客户端； +- 构建中 HEAD/源码变化时拒绝切换产物；不可变 generation、active pointer、启动失败 + 回滚、签名复验和完整可执行路径确认； +- 四种 provenance mode 的必填/空值规则、未知 channel 失败关闭、提交可达性、无敏感 + 路径、manifest/依赖摘要、签名前嵌入和包内/UI 一致性； +- 相同 Git commit 但 lockfile、补丁或运行时依赖状态不同会产生不同依赖摘要并触发检查； +- 功能预览的 App 名、Bundle ID、输出和用户数据隔离，以及不停止共享 Sherlock； +- `local-integration` 与 `feature-preview` 的自动和手动更新都被禁用，预览包不包含 + `app-update.yml`，两种本地 channel 都不向全局技能目录同步； +- 正式构建仍遵循既有干净 `main`、签名、公证和发布门槛； +- 默认测试收集继续排除 `.worktrees/**`，避免重复依赖和测试污染。 + +真实验收按 `docs/sherlock-local-test-runbook.md` 执行，但只能由集成 session 从合法 +来源启动共享客户端。验收必须读取真实窗口，并同时确认本批功能、既有工作区/会话、 +输入框和构建来源信息。 + +## 推行顺序 + +1. 先清点现有 worktree 和仍在使用它们的 Codex session。已合并且源码干净的在用户 + 确认无人继续使用后清理；未合并或有未提交源码的先完成交接。必须保留的旧 worktree + 要合入治理提交或从更新后的 `main` 重建；在全部旧入口升级前明确禁止它们启动共享 + Sherlock，因为新门禁不会自动出现在旧 checkout 中。 +2. 更新 `AGENTS.md` 和 runbook，明确从下一批功能开始执行新规则。 +3. 增加只读 Git preflight、交接卡片生成和对应临时仓库测试。 +4. 增加 active-batch lease、共享构建门禁、跨 worktree 锁、不可变 generation、 + `local-integration` channel、来源 JSON、包校验和客户端来源显示。 +5. 增加短期集成分支执行器及 dry-run，验证 fast-forward 推进边界。 +6. 最后增加独立功能预览构建，避免它影响共享客户端或正式数据。 + +每一阶段独立提交并运行直接相关的聚焦测试。全部机制完成后，从两个并行功能分支做一 +次演练：分别提交、生成交接卡片、合入一个短期批次、构建共享客户端、核对来源与功能， +用户验收后 fast-forward 到 `main`。演练不触发远端推送、正式发布或公证。 diff --git a/docs/superpowers/specs/2026-09-01-research-canvas-global-toolbar-design.md b/docs/superpowers/specs/2026-09-01-research-canvas-global-toolbar-design.md new file mode 100644 index 000000000..22fabf1e0 --- /dev/null +++ b/docs/superpowers/specs/2026-09-01-research-canvas-global-toolbar-design.md @@ -0,0 +1,49 @@ +# 研究画布全局功能栏设计 + +## 目标 + +在 Sherlock 研究画布底部中央增加不随缩放和平移移动的全局功能栏，首期提供“链接”和“容器”两个入口。链接节点在画布中加载用户指定网页；容器节点使用隔离的画布任务生成安全、原生、可持久化的网页监控卡、图表、表格、KPI 指标卡或 Markdown 信息卡。 + +## 交互设计 + +全局功能栏固定在研究画布可视区域底部中央，使用当前主题下普通组件工具栏的颜色、描边和阴影。它始终位于画布缩放层之外，选中组件后出现的上方功能栏继续独立显示。 + +“链接”按钮打开贴近功能栏的网址浮层。浮层自动聚焦输入框，回车创建，Escape 关闭；仅接受 `http:` 和 `https:`。创建后的节点位于当前视口中央附近，并以错位方式避让刚创建的节点。节点保留正常组件顶栏、拖动、缩放、删除、全选和整理画布能力。 + +“容器”按钮立即在当前视口中央附近创建一个带正常顶栏的草稿节点。草稿节点显示需求输入框和网页监控、图表、表格等示例。提交后，任务在节点内展示排队、执行和流式文字；成功后过程完全移除，只显示最终原生内容；失败时中央显示提示与重试按钮。完成态提供“编辑需求”“刷新”和刷新频率入口。 + +## 链接节点 + +链接节点保存规范化 URL、显示标题、域名和刷新版本。网页在 sandbox iframe 中加载，不提供 Node.js、本地文件、摄像头、麦克风、定位、支付、USB 或剪贴板权限。主进程只允许用户已创建且仍存在的链接节点在子 frame 导航到对应 `http(s)` 来源；删除节点或会话时撤销许可。 + +若网页因 `X-Frame-Options`、CSP、网络错误或超时无法嵌入，节点显示域名、URL、重新加载、修改链接和“在浏览器打开”。不尝试绕过网站限制。外部打开继续由桌面安全层转交系统浏览器。 + +## 安全原生容器 + +容器任务沿用现有研究画布隔离任务服务和每个父研究会话四槽 FIFO 调度，不写入右侧对话，也不读取或修改对话输入草稿。任务不启用外部工具或任意代码执行。 + +任务请求新增 `kind: "container"` 与有界 `prompt`。模型必须只输出一个 JSON 对象，浏览器端再次进行严格解析、字段白名单、数量上限、文本长度和有限数值校验。允许的版本 1 结构如下： + +- `web`: `title`、`url`、可选 `description`。 +- `chart`: `title`、`variant`（`bar` 或 `line`）、`labels` 和有限长度 `series`。 +- `table`: `title`、`columns` 和有限行列二维数据。 +- `kpi`: `title` 和有限数量的 `items`，每项包含 `label`、`value` 与可选 `change`。 +- `markdown`: `title` 和有界 `content`。 + +任何未知字段、非法 URL、非有限数字、越界数组或无法解析的输出都使任务进入失败态，保留原需求供重试。渲染只使用 React、HTML、CSS 和受控 SVG，不使用 `dangerouslySetInnerHTML`，不执行生成的 JavaScript。 + +## 刷新与生命周期 + +链接节点的刷新会重建 iframe。容器的手动刷新或定时刷新会使用保存的原始需求重新运行隔离任务；网页型容器同时刷新其 iframe。可选刷新频率为关闭、1、5、15、30 分钟。 + +定时刷新仅在 Sherlock 文档可见、研究画布未处于 `inert` 状态且节点没有正在执行的任务时启动。刷新失败保留上一次成功的容器 JSON，显示错误与上次成功时间；用户可以重试。切换会话、离开研究视图或卸载组件会清理定时器。 + +## 持久化与布局 + +新增 `web-link` 和 `generated-container` 两种研究 artifact 类型，继续使用会话级画布存储。链接保存 URL；容器保存原始需求、最终 JSON、刷新频率、上次成功时间以及现有生成任务关联字段。所有输入继续受单节点和聚合存储上限约束。 + +两种节点加入“整理画布”的类型排序，参与全选、框选、拖动、缩放和删除。新节点使用当前视口中心换算得到画布坐标，并在连续创建时按 24 px 级联偏移；默认尺寸为链接 720×480、容器草稿 520×300，最终容器根据类型落到合适尺寸，用户手动缩放后不再自动覆盖。 + +## 验证范围 + +采用 TDD 添加聚焦测试：URL 规范化与拒绝、frame 授权和撤销、持久化、全局工具栏交互、视口内放置、链接降级、容器任务契约、JSON schema 解析与五类渲染、刷新定时器清理、右侧对话隔离以及 patch-package 可重放。只运行本次直接影响的 Vitest、类型检查和构建检查，不运行全功能测试，不发布、不上传、不递增版本。 diff --git a/docs/superpowers/specs/2026-09-01-research-canvas-isolated-generation-tasks-design.md b/docs/superpowers/specs/2026-09-01-research-canvas-isolated-generation-tasks-design.md new file mode 100644 index 000000000..9e24e1e73 --- /dev/null +++ b/docs/superpowers/specs/2026-09-01-research-canvas-isolated-generation-tasks-design.md @@ -0,0 +1,307 @@ +# Sherlock Research Canvas Isolated Generation Tasks Design + +## Status + +Approved on 2026-09-01. This design extends the existing Research canvas +selection actions and the shared-conversation ownership defined by +`2026-08-26-research-canvas-workspace-design.md`. It replaces only the execution +path used by the canvas actions currently labelled `生成思维导图` and +`总结提炼`. + +## Goal + +Move Research canvas generation work into its destination component so that a +user can: + +- watch each canvas task's public execution events and streamed assistant reply + inside the component that will receive the result; +- start several canvas tasks without serializing them through the main + conversation; +- continue an unrelated conversation in the right panel while canvas work is + running; +- cancel, retry, reload, and recover a task without losing the component-to-task + association; +- receive the same PPT-ready mind-map result and the same focused summary result + as the existing actions. + +The toolbar label changes from `生成思维导图` to `思维导图`. Its dropdown keeps +the `简要`, `常规`, and `详细` choices. `总结提炼` keeps its current label. + +## Non-goals + +- This work does not turn the right conversation into a task manager. +- It does not hide canvas messages after first inserting them into the main + conversation. Canvas tasks must never enter that conversation or its queue. +- It does not expose private model reasoning or chain-of-thought. The component + shows only public lifecycle states, tool-call summaries, tool results already + intended for the user, and streamed assistant output. +- It does not keep an execution transcript in a completed component. +- It does not add a general-purpose background-agent UI for other features. +- It does not change public release metadata, publish an update, or modify the + right-panel width and composer ownership. + +## Chosen Architecture + +Each canvas generation is an isolated, host-owned Research task backed by a +one-shot child Agent. The child inherits the selected parent session's +workspace, model configuration, and applicable read capabilities, but owns a +separate Session and execution loop. Starting a Research task directly through +the host service does not append a prompt, tool call, progress row, report, or +assistant message to the parent Session. + +This approach was selected over two alternatives: + +1. Sending hidden messages through the main Session would still share its FIFO + turn queue and could not provide real concurrency. +2. Calling the LLM directly would stream text concurrently but would lose the + existing Agent's ability to resolve selected files and produce meaningful + tool execution events. + +The host owns admission, cancellation, lifecycle, and event ordering. The +renderer owns placement, component presentation, and durable canvas geometry. +No renderer-only promise or FIFO assistant-message heuristic may decide which +component receives a result. + +## Task Service Contract + +A Sherlock Research task service exposes browser-safe operations equivalent to: + +```ts +type ResearchTaskKind = 'mind-map' | 'summary' +type ResearchTaskDetail = 'brief' | 'standard' | 'detailed' + +type ResearchTaskStart = { + parentSessionId: string + canvasNodeId: string + kind: ResearchTaskKind + detail?: ResearchTaskDetail + sources: ResearchTaskSourceSnapshot[] +} + +type ResearchTaskReceipt = { + taskId: string + childSessionId?: string + state: 'queued' | 'running' +} +``` + +`childSessionId` is absent while a task is waiting for one of the four active +slots and becomes available in the first running or later inspection snapshot. + +The service also supports task inspection/reconnection and cancellation. Every +streamed event carries `taskId`, a monotonically increasing task-local sequence, +and one of these public event classes: + +- `queued` and `started` lifecycle events; +- bounded phase/status copy such as reading selected material, using a named + tool, or generating the result; +- sanitized tool-call and user-facing tool-result summaries; +- assistant text deltas; +- `completed`, `failed`, or `cancelled` terminal events. + +The task service validates the parent Session, source limits, task kind, mind-map +detail, and payload lengths before admission. It applies the existing generation +prompts and output bounds. It never accepts an arbitrary system prompt from the +renderer. + +## Concurrency and Isolation + +At most four canvas tasks run concurrently for one parent Research Session. +Additional tasks are admitted durably in FIFO order and render immediately in +their destination components as `排队中`. Completion, failure, cancellation, +or deletion of a running component releases one slot and starts the next +admitted task. + +Concurrency is scoped per parent Session so work in one Research Session does +not block another. Results may complete in any order. `taskId` and +`canvasNodeId`, never completion order, route every event and terminal result. + +The existing right composer continues to call the main Session input path. A +canvas task never calls the main Session's `prompt(..., 'queue')` or +`prompt(..., 'steer')`, and the right conversation therefore remains usable +while all four canvas slots are active. + +## Source Snapshot Semantics + +Clicking an action creates a bounded immutable snapshot of the selected canvas +sources before the task is admitted. The snapshot preserves the canonical file +descriptor or assistant-artifact text needed by the existing Research prompt, +plus stable source identifiers for provenance. + +Moving, editing, or deleting a source component after admission does not mutate +the task. Deleting the generated destination component cancels its queued or +running task and discards later events. Retrying a failed or interrupted task +uses the saved source snapshot and the same mind-map detail; it does not silently +read a different current selection. + +## Component State Model + +Generated components use these states: + +```ts +type ResearchGenerationState = + | 'queued' + | 'running' + | 'completed' + | 'failed' + | 'cancelled' + | 'interrupted' +``` + +The persisted component record keeps: + +- destination node id, generation kind, and mind-map detail; +- `taskId` and hidden child Session id after admission; +- saved source snapshot and source ids; +- current state and bounded error copy; +- final normalized output after completion; +- created, started, and completed timestamps when available; +- existing position, size, and manual/automatic sizing fields. + +Transient execution events and assistant deltas may be retained in memory while +the task is active. They are removed from the component when the final result is +committed and are not persisted as a completed execution transcript. + +## Running Component Presentation + +The component title bar always uses the ordinary theme-aware component-frame +color and remains the drag surface. The title is `思维导图` or `总结提炼`. + +Queued and running bodies also use the normal theme-aware component background; +they are not forced to white. The process layout uses restrained typography and +spacing appropriate to a canvas component: + +- 16–20 px body padding; +- 13–14 px primary copy with a compact line height; +- 12 px secondary status and metadata; +- clear spacing between the current phase, public tool rows, and streamed + assistant text; +- an unobtrusive stop action while the task is queued or running. + +No right-conversation bubble chrome is copied into the component. + +## Adaptive Size Behavior + +An untouched task component starts at approximately 480 x 280 px. While it is +queued or running, measured public content can expand it within an automatic +range of approximately 480–640 px wide and 280–560 px tall. The top-left world +coordinate stays anchored so growth does not move the component away from its +source placement. Content beyond the maximum scrolls inside the body while the +title bar stays visible. + +If the user manually resizes the component, it enters manual size mode and +stops automatic process growth. Its body scrolls as needed. + +On successful completion, an untouched component switches to the normal final +content size: + +- mind maps use the existing detail-specific PPT-ready sizes, each targeting an + overall ratio near 1.2:1; +- summaries use a readable fixed width near 520 px and a measured height clamped + to roughly 280–640 px. + +A manually resized component preserves the user's size at completion. The final +mind-map body becomes white as required for direct PPT screenshots; the running +body does not. Summary results continue to use the normal theme-aware artifact +presentation. + +## Completion, Failure, and Retry + +On completion, the component atomically replaces its process presentation with +the final mind map or summary. It does not show an `执行过程` row, collapsed +trace, tool history, or streamed draft after completion. + +A failed, cancelled, or unrecoverably interrupted component keeps its normal +frame and uses a centered body. A short explanatory message appears above a +centered `重试` button. Retry starts a new isolated task for the same destination +component from the saved source snapshot. + +Cancellation is idempotent. Deleting a destination component issues +cancellation and immediately removes the local node; a late terminal event is +ignored by node id and task id. Cancelling without deletion keeps the component +in a retryable state. + +## Reload and Recovery + +On application or renderer restart, a component with a non-terminal task id asks +the host for the authoritative task state and the event cursor after its last +seen sequence: + +- a queued or running task reconnects and resumes component-local updates; +- a task that completed while the renderer was absent commits its final output; +- a known failed or cancelled task renders the centered retry state; +- an unknown or no-longer-recoverable task becomes `interrupted` and remains + retryable. + +Recovery never replays task content into the main conversation. Duplicate or +out-of-order stream events are ignored using the task-local sequence. + +## Security and Resource Bounds + +- The child Agent receives only the source snapshot and product-owned generation + instruction, not the main conversation transcript. +- The task composition prefers read-only material-resolution tools. It must not + mutate workspace files or invoke external side effects for a mind map or + summary. +- Source, event, error, and output sizes are bounded before persistence or + rendering. +- Task ownership is checked against the parent Session for inspect and cancel + operations. +- Four active tasks per parent and a bounded pending queue prevent unbounded + local Agent and memory growth. +- Private reasoning content is neither emitted by the host nor reconstructed in + the component. + +## Implementation Boundaries + +The implementation requires three isolated units: + +1. A host-side Research task runtime that owns child-Agent startup, the + four-slot scheduler, event sanitization, cancellation, and recovery. +2. A browser-safe task transport that exposes start/inspect/cancel and task + event frames without inserting Session messages. +3. A Research canvas controller and component view that persist task identity, + route events by id, render transient process UI, and commit final output. + +The existing `ResearchWorkspace` generation helpers remain responsible for +placement and durable canvas nodes, but their current pending-generation FIFO +and `observeAssistantResult` association must no longer handle isolated canvas +tasks. The main `InputHub.generateResearchSelection` path must stop calling the +parent Session queue. + +Dependency changes must be persisted through the appropriate `patch-package` +files or product-owned package sources, not left only in `node_modules`. Any new +host plugin must be included in Sherlock's bundled offline plugin profile and +verified for source/package parity. + +## Focused Verification + +Automated coverage must prove: + +- the toolbar label is `思维导图` and its three detail choices are unchanged; +- a canvas task never calls the main Session prompt or adds a right-conversation + message; +- four tasks run together and a fifth remains queued until a slot is released; +- out-of-order deltas and completions update only the matching component; +- the right composer can submit and complete an unrelated turn while canvas + tasks run; +- queued/running cancellation, destination deletion, late-event rejection, and + centered retry behavior; +- immutable source snapshots and retry using the saved snapshot; +- reload reconnection, completion while absent, and interrupted fallback; +- automatic process sizing, manual-size preservation, maximum-body scrolling, + final mind-map ratio, and final summary height; +- theme-aware queued/running surfaces, white final mind-map background, and no + execution-process UI after completion; +- the existing brief/standard/detailed parsing, PPT styling, connector geometry, + and summary rendering remain intact. + +Final validation follows `docs/sherlock-local-test-runbook.md` with +`./script/build_and_run.sh --verify`. In the real locally built Sherlock window, +verify at least two simultaneous mind maps, one summary, one queued fifth task, +and an unrelated right-panel conversation. Exercise cancellation, retry, +component deletion, session switching, and application restart. Keep the app +open for user testing. + +Do not run the full test suite. Do not notarize, upload, publish, bump the +version, push source, or promote the integration batch without user acceptance. diff --git a/docs/superpowers/specs/2026-09-01-research-canvas-title-resize-download-design.md b/docs/superpowers/specs/2026-09-01-research-canvas-title-resize-download-design.md new file mode 100644 index 000000000..f010949fa --- /dev/null +++ b/docs/superpowers/specs/2026-09-01-research-canvas-title-resize-download-design.md @@ -0,0 +1,87 @@ +# 研究画布网页标题、自适应与组件下载设计 + +## 目标 + +完善研究画布组件的交付能力：链接组件优先显示网页真实标题，网页内容随组件尺寸自适应；所有组件的右键菜单提供与内容类型匹配的下载能力。思维导图同时支持 SVG、PNG 和 JPG，导出结果可直接用于公司 PPT。 + +本次修改复用现有链接 frame 授权、研究 artifact 和原生文件预览能力，不绕过网站的嵌入限制，不引入通用网页脚本执行接口，也不改变右侧对话与画布隔离任务的关系。 + +## 网页真实标题 + +跨域 iframe 中的 `document.title` 不能由渲染进程直接读取。现有链接 frame 授权桥扩展一个只读检查接口：iframe 加载完成后，渲染进程携带会话、节点和规范化 URL 请求检查；主进程先验证该 frame 仍属于当前授权节点，再通过固定脚本读取有界的页面标题和布局宽度。接口不接受调用方提供的脚本。 + +标题去除首尾空白、控制字符和异常 URL 编码，限制最大长度。非空网页标题作为自动标题；读取失败或网页没有标题时，回退到清理后的主机名或规范化 URL，禁止显示 `%20www.example.com` 一类结果。 + +链接节点新增自动标题与自定义标题的区分。用户未重命名时，网页重新加载可更新自动标题；用户通过右键重命名后进入自定义标题状态，后续加载不得覆盖。旧节点标题为空、等于 URL、等于主机名或以异常 `%20` 开头时按自动标题迁移，其他旧标题按自定义标题保留。 + +## 网页随组件尺寸自适应 + +iframe 外框始终占满组件内容区域，组件标题栏、选择框和拖动区域不参与缩放。组件尺寸变化由 `ResizeObserver` 合并后处理，避免拖动缩放过程中频繁重排。 + +自适应分两级： + +1. 对支持响应式布局的网站，iframe 直接使用组件当前内容区宽高，让网站自身完成响应式排版。 +2. 对存在固定最小宽度、实际内容宽度大于 iframe 视口的网站，使用主进程只读检查返回的 `scrollWidth` 计算逻辑视口宽度，并只缩放网页内容。逻辑宽度上限为 1440 px，缩放比例限制在 65% 到 100%；仍无法容纳的内容保留网页内部滚动，不裁切组件顶栏或画布交互。 + +iframe 首次加载、地址更新和组件宽度稳定后重新测量。测量失败时退回第一级原生响应式，不影响网页继续使用。网页因 CSP、`X-Frame-Options`、网络错误或超时无法嵌入时，继续显示现有降级界面，不尝试绕过限制。 + +## 微信文章安全阅读视图 + +公开微信文章会通过响应头中的 CSP `frame-ancestors` 拒绝 Sherlock iframe，Chromium 对这类拦截通常不会触发 iframe 的 `onError`，当前组件因而停在白屏。Sherlock 不关闭 Chromium 安全策略、不删除远端 CSP，也不使用带登录态的隐藏浏览器绕过限制。 + +对于规范化后严格匹配 `https://mp.weixin.qq.com/s/…` 的公开文章链接，链接组件改用安全阅读视图。主进程使用无 Cookie、无认证信息的请求读取公开 HTML，并限制协议、主机、重定向目标、响应大小和总耗时；不允许调用方指定请求头，不访问其他主机或内网地址。读取结果只提取 `og:title`、描述、作者、发布时间、`#js_content` 正文以及正文图片的公开 HTTPS 地址。 + +正文经过结构化解析和白名单净化：保留标题、段落、列表、引用、代码、表格、链接和图片，删除脚本、样式表、表单、iframe、音视频、事件属性、跟踪元素以及非 HTTP(S) URL。微信图片的惰性 `data-src` 转换为受控 `src`，图片和正文使用响应式宽度。净化后的内容在不授予脚本、表单、弹窗或同源权限的独立 sandbox iframe 中渲染；组件缩放时正文自然重排，标题栏保持不变。 + +安全阅读视图优先使用 `og:title` 作为链接组件自动标题。本示例应显示“英伟达豪掷70亿，下场做开放大模型了”。读取失败、文章被删除、需要登录、不是公开文章或内容超限时，组件显示“暂时无法读取文章”、重试和“浏览器打开”，不得继续显示无反馈白屏。普通网站仍使用原始 iframe 与前述自适应逻辑。 + +## 右键下载交互 + +所有研究画布组件的节点右键菜单增加“下载”。下载只作用于当前右键点击的组件，不隐式下载其他已选组件。思维导图显示二级格式菜单： + +- `SVG`：保留矢量文字、线条、节点颜色和白色背景。 +- `PNG`：白色背景，按导图最终内容尺寸以 2 倍分辨率导出。 +- `JPG`：白色背景，按导图最终内容尺寸以 2 倍分辨率、约 92% 质量导出。 + +三种思维导图格式都只包含最终导图内容，不包含组件顶栏、选择框、执行过程或画布背景。导出范围根据实际节点边界计算，保留适合 PPT 的安全留白，避免用户编辑后出现裁切。 + +其他组件使用单一步骤的类型化下载： + +- 本地 PDF、Office、图片、文本等文件组件：保存原文件并保留原扩展名。 +- 链接组件与网页型容器：保存 `.webloc`，名称使用网页标题，内容使用规范化 URL。 +- 总结提炼、助手回复、Markdown 容器和其他文本组件：保存 `.md`。 +- 图表容器：保存 `.svg`。 +- 表格容器：保存 `.csv`，按标准 CSV 规则转义逗号、引号和换行。 +- KPI 容器：保存 `.md`。 +- 草稿、排队、执行中或失败的生成容器：保存当前需求和状态为 `.txt`。 + +文件名由组件标题生成，移除路径分隔符、控制字符、异常编码和尾部句点；为空时使用组件类型名称。保存统一走主进程原生保存对话框，用户取消不提示错误。 + +## 下载架构与安全边界 + +新增聚焦的画布导出服务与 preload 桥。渲染进程只提交经过白名单验证的导出类型、建议文件名和有界文本或图形内容；主进程负责原生保存对话框、扩展名约束和写入。 + +本地文件下载不得接受渲染进程传入的任意绝对路径，而是使用现有文件预览授权标识解析原文件。链接只允许 `http:` 和 `https:`。SVG 仅由本地受控思维导图或图表结构生成，不拼接任意 HTML，也不保留脚本、事件属性或外部资源引用。 + +思维导图的 PNG/JPG 栅格化在渲染进程中使用受控 SVG 和离屏 canvas 完成，再把有大小上限的二进制数据交给保存桥。栅格化失败时不生成空文件，组件附近显示简短错误并允许用户重新下载。 + +## 数据流与错误处理 + +网页加载成功后，标题和布局检查更新节点的自动标题与自适应参数，并通过现有会话级画布存储持久化。检查响应必须再次核对节点和 URL，过期响应不得覆盖地址已变更的组件。 + +下载时先在渲染进程构造类型化导出内容，再打开原生保存对话框。写入成功后保持画布状态不变；标题检查失败、自适应测量失败和用户取消保存均不产生阻断式弹窗。无原文件授权、内容转换失败或磁盘写入失败时显示明确但简短的错误，不删除组件、不修改原内容。 + +## 聚焦验证 + +采用测试驱动方式添加本次直接影响的聚焦测试： + +- 网页标题清理、无标题回退、旧 `%20` 标题迁移以及用户自定义标题不被覆盖。 +- frame 检查接口的节点、会话、URL 授权校验，以及过期响应丢弃。 +- 响应式网页保持 100% 尺寸；固定宽度网页计算 65% 到 100% 缩放；组件缩放后的重新测量和失败回退。 +- 微信文章 CSP 拦截识别、安全阅读视图域名与路径限制、重定向限制、响应上限、正文净化、惰性图片转换、无脚本 sandbox、响应式排版和明确失败态。 +- 所有 artifact 类型的右键菜单均包含下载，且思维导图显示 SVG、PNG、JPG 三种格式。 +- 思维导图三种格式的白底、实际内容边界、安全留白和 2 倍栅格尺寸。 +- 本地文件授权解析、`.webloc`、Markdown、SVG、CSV、TXT 的类型映射、文件名清理、取消保存和写入失败。 +- patch-package 可重放、受影响 TypeScript 类型检查与构建检查。 + +不运行全功能测试，不从功能 worktree 构建或替换共享客户端。实现提交完成后，按多 session 集成流程进入新的集成批次，再从集成候选构建本地测试版并核验真实 Sherlock 主界面。 diff --git a/electron-builder.dev.cjs b/electron-builder.dev.cjs index 4ec5151f9..b7a1041c8 100644 --- a/electron-builder.dev.cjs +++ b/electron-builder.dev.cjs @@ -3,19 +3,19 @@ const packageJson = require('./package.json') module.exports = { ...packageJson.build, appId: 'io.dsh.desktop.dev', - productName: 'DSH Desktop Dev', + productName: 'Sherlock Dev', directories: { ...packageJson.build.directories, output: 'dist-dev' }, extraMetadata: { - name: 'dsh-desktop-dev', - productName: 'DSH Desktop Dev', + name: 'sherlock-dev', + productName: 'Sherlock Dev', dshDesktopChannel: 'development' }, nsis: { ...packageJson.build.nsis, - artifactName: 'dsh-desktop-dev-windows-${arch}-setup.${ext}' + artifactName: 'sherlock-dev-windows-${arch}-setup.${ext}' }, publish: null } diff --git a/electron-builder.notarized.cjs b/electron-builder.notarized.cjs new file mode 100644 index 000000000..54f140f7c --- /dev/null +++ b/electron-builder.notarized.cjs @@ -0,0 +1,43 @@ +const packageJson = require('./package.json') + +module.exports = { + ...packageJson.build, + appId: 'com.evanarts.sherlock', + productName: 'Sherlock', + artifactName: 'sherlock-${os}-${arch}.${ext}', + directories: { + ...packageJson.build.directories, + output: 'dist-notarized' + }, + extraResources: [ + ...(packageJson.build.extraResources || []), + { + from: 'build/sherlock-plugin-profile', + to: 'sherlock-plugin-profile' + }, + { + from: 'build/app-update-notarized.yml', + to: 'app-update.yml' + } + ], + extraMetadata: { + name: 'sherlock', + productName: 'Sherlock', + dshDesktopChannel: 'notarized' + }, + mac: { + ...packageJson.build.mac, + notarize: true, + target: ['dmg', 'zip'] + }, + dmg: { + ...packageJson.build.dmg, + sign: true + }, + publish: [ + { + provider: 'generic', + url: 'https://updates.evanarts.com/notarized/latest/' + } + ] +} diff --git a/package-lock.json b/package-lock.json index fc2f5face..3734b7974 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { - "name": "dsh-desktop", - "version": "0.1.1", + "name": "sherlock", + "version": "0.7.6", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "dsh-desktop", - "version": "0.1.1", + "name": "sherlock", + "version": "0.7.6", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -30,21 +30,30 @@ "@deepseek-ai/dsh-subprocess": "0.1.0-rc.7", "@deepseek-ai/dsh-timeout": "0.1.0-rc.7", "@deepseek-ai/dsh-workflow": "0.1.0-rc.7", + "apache-arrow": "18.1.0", + "cheerio": "^1.2.0", "dsh-desktop-market-installer": "file:packages/dsh-desktop-market-installer", + "dsh-research-task-runtime": "file:packages/dsh-research-task-runtime", + "dsh-web-search-session-model": "file:packages/dsh-web-search-session-model", "electron-updater": "^6.8.9", "node": "24.9.0", "pnpm": "10.34.5", - "qrcode": "^1.5.4" + "qrcode": "^1.5.4", + "sanitize-html": "^2.17.7" }, "devDependencies": { "@types/node": "24.10.1", "@types/qrcode": "^1.5.6", + "@types/sanitize-html": "^2.16.1", "electron": "43.4.0", "electron-builder": "26.15.3", "electron-vite": "5.0.0", + "happy-dom": "^20.11.6", "patch-package": "^8.0.1", + "pdfjs-dist": "4.10.38", "typescript": "5.9.3", "vitest": "^4.1.10", + "wrangler": "4.125.0", "yaml": "^2.8.3" } }, @@ -793,6 +802,141 @@ "node": ">=6.9.0" } }, + "node_modules/@cloudflare/kv-asset-handler": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@cloudflare/kv-asset-handler/-/kv-asset-handler-0.5.0.tgz", + "integrity": "sha512-jxQYkj8dSIzc0cD6cMMNdOc1UVjqSqu8BZdor5s8cGjW2I8BjODt/kWPVdY+u9zj3ms75Q5qaZgnxUad83+eAg==", + "dev": true, + "license": "MIT OR Apache-2.0", + "engines": { + "node": ">=22.0.0" + } + }, + "node_modules/@cloudflare/unenv-preset": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/@cloudflare/unenv-preset/-/unenv-preset-2.16.1.tgz", + "integrity": "sha512-ECxObrMfyTl5bhQf/lZCXwo5G6xX9IAUo+nDMKK4SZ8m4Jvvxp52vilxyySSWh2YTZz8+HQ07qGH/2rEom1vDw==", + "dev": true, + "license": "MIT OR Apache-2.0", + "peerDependencies": { + "unenv": "2.0.0-rc.24", + "workerd": ">1.20260305.0 <2.0.0-0" + }, + "peerDependenciesMeta": { + "workerd": { + "optional": true + } + } + }, + "node_modules/@cloudflare/workerd-darwin-64": { + "version": "1.20260820.1", + "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-1.20260820.1.tgz", + "integrity": "sha512-5F2/t7SVnugG3rscSe9da1LoHst+GiuVGPaE9BP6j5AonlFpiYi0eoJrl3wof9zDBIIgJZ87NjRj9TKjbbYgHg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=16" + } + }, + "node_modules/@cloudflare/workerd-darwin-arm64": { + "version": "1.20260820.1", + "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-1.20260820.1.tgz", + "integrity": "sha512-jFnG7715+r9FXRZPpuWWe5Ayd9v/IJKDODARg56ffFJWWtte6bFNi5VY3GazBM04hEmxny6OjXQBh3j2E/wNZw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=16" + } + }, + "node_modules/@cloudflare/workerd-linux-64": { + "version": "1.20260820.1", + "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20260820.1.tgz", + "integrity": "sha512-TbTYaCBht0OaOWmnVpg43hXVYtIti/Kg6lvO819H2DwbxPpK1BH0z2C+Y7ySrVJLlxZQeic5eN7/noqbP80hJg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=16" + } + }, + "node_modules/@cloudflare/workerd-linux-arm64": { + "version": "1.20260820.1", + "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-1.20260820.1.tgz", + "integrity": "sha512-FQmri1UF7hBnnpeyC5SZJCAnsSRs3+Ykn9wlO5zxmE2qIgKfbJZ+toJ6qrQyugWlxE65juT33HU6aYLtutLJHw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=16" + } + }, + "node_modules/@cloudflare/workerd-windows-64": { + "version": "1.20260820.1", + "resolved": "https://registry.npmjs.org/@cloudflare/workerd-windows-64/-/workerd-windows-64-1.20260820.1.tgz", + "integrity": "sha512-BPvCuMxIQfA47wtYsGbBG6Bcar57Qs7yHqU2jWkT1+sRnL/741/ZbQGP9kVRMQ5fwBMuqNFmQRzAu8gSm7ri/w==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=16" + } + }, + "node_modules/@cspotcode/source-map-support": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", + "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/trace-mapping": "0.3.9" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", + "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + }, "node_modules/@deepseek-ai/cordis": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/@deepseek-ai/cordis/-/cordis-4.0.1.tgz", @@ -6077,6 +6221,256 @@ } } }, + "node_modules/@napi-rs/canvas": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas/-/canvas-0.1.100.tgz", + "integrity": "sha512-xglYA6q3XO5P3BNJYxVZ1IV7DLVjp1Py6nwag88YntrS+3vKHyYcMqXVS4ZztJmwz2uGvz1FWhI/4LgbR5uQDA==", + "license": "MIT", + "optional": true, + "workspaces": [ + "e2e/*" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + }, + "optionalDependencies": { + "@napi-rs/canvas-android-arm64": "0.1.100", + "@napi-rs/canvas-darwin-arm64": "0.1.100", + "@napi-rs/canvas-darwin-x64": "0.1.100", + "@napi-rs/canvas-linux-arm-gnueabihf": "0.1.100", + "@napi-rs/canvas-linux-arm64-gnu": "0.1.100", + "@napi-rs/canvas-linux-arm64-musl": "0.1.100", + "@napi-rs/canvas-linux-riscv64-gnu": "0.1.100", + "@napi-rs/canvas-linux-x64-gnu": "0.1.100", + "@napi-rs/canvas-linux-x64-musl": "0.1.100", + "@napi-rs/canvas-win32-arm64-msvc": "0.1.100", + "@napi-rs/canvas-win32-x64-msvc": "0.1.100" + } + }, + "node_modules/@napi-rs/canvas-android-arm64": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-android-arm64/-/canvas-android-arm64-0.1.100.tgz", + "integrity": "sha512-hjhCKhntPv9+t4ckHymdx0phYNcVW+GKQR6Lzw2zE+pOVjOplSmtx9nNNknTjbEDLcuLZqA1y8ufKg1XfgftzQ==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, + "node_modules/@napi-rs/canvas-darwin-arm64": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-darwin-arm64/-/canvas-darwin-arm64-0.1.100.tgz", + "integrity": "sha512-2PcswRaC7Ly645DGt88///zuFDhJxJYdKAs1uU3mfk1atYkXufgcgLfBpk6Tm12nCQBaNt1wpybuPZ4qOhTo8A==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, + "node_modules/@napi-rs/canvas-darwin-x64": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-darwin-x64/-/canvas-darwin-x64-0.1.100.tgz", + "integrity": "sha512-ePNZtj7pNIva/siZMg+HmbeozkIjqUIYdoymH8HaA3qK7LfzFN4WMBM8G6HQ9ZC+H3+Dnn5pqtiXpgLykaPOhw==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, + "node_modules/@napi-rs/canvas-linux-arm-gnueabihf": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-arm-gnueabihf/-/canvas-linux-arm-gnueabihf-0.1.100.tgz", + "integrity": "sha512-d5cDB48oWFGU8/XPhUOFAlySgb/VAu7D+s8fi55K1Pcfg8aPplHWqMgibhVLU8ky7Pyg/fuiVLz4Nf3JrSTuUA==", + "cpu": [ + "arm" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, + "node_modules/@napi-rs/canvas-linux-arm64-gnu": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-arm64-gnu/-/canvas-linux-arm64-gnu-0.1.100.tgz", + "integrity": "sha512-rDxgxRu69RvDlX/bh9o22DxLsGr8EqsNgotL9+RwQE1S0b0cqeatqsw6aW45mukm0B42DIAaAacKaYQ8cqS1nw==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, + "node_modules/@napi-rs/canvas-linux-arm64-musl": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-arm64-musl/-/canvas-linux-arm64-musl-0.1.100.tgz", + "integrity": "sha512-K3mDW66N+xT2/V439u1alFANiBUjdEx2gLiNYnCmUsva5jZMxWTjafBYwTzYK+EMFMHrUoabuU+T1BIP5CgbYQ==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, + "node_modules/@napi-rs/canvas-linux-riscv64-gnu": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-riscv64-gnu/-/canvas-linux-riscv64-gnu-0.1.100.tgz", + "integrity": "sha512-mooqUBTIsccZpnoQC4NgrC1v6C1vof39etLNMnBwCY+p0gajWJvAHLGQ6g/gGyS5YrpDW+GefSN4+Cvcr08UWw==", + "cpu": [ + "riscv64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, + "node_modules/@napi-rs/canvas-linux-x64-gnu": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-x64-gnu/-/canvas-linux-x64-gnu-0.1.100.tgz", + "integrity": "sha512-1eCvkDCazm7FFhsT7DfGOdSaHgZVK3bt/dSBl5EWHOWmnz+I7j8tPseJqqD81NF+MH21jKUK4wQSDjN0mdhnTg==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, + "node_modules/@napi-rs/canvas-linux-x64-musl": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-x64-musl/-/canvas-linux-x64-musl-0.1.100.tgz", + "integrity": "sha512-20arT6lnI19S68qNlii73TSEDbECNgzMz2EpldC1V3mZFuRkeujXkcebRk0LRJe9SEUAooYiLokfMViY8IX7yA==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, + "node_modules/@napi-rs/canvas-win32-arm64-msvc": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-win32-arm64-msvc/-/canvas-win32-arm64-msvc-0.1.100.tgz", + "integrity": "sha512-DZFFT1wIAg37LJw37yhMRFfjATd3vTQzjZ1Yki8u2vhO6Hi5VE6BVaGQ1aaDu7xb4iMErz+9EOwjpS7xcxFeBw==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, + "node_modules/@napi-rs/canvas-win32-x64-msvc": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-win32-x64-msvc/-/canvas-win32-x64-msvc-0.1.100.tgz", + "integrity": "sha512-MyT1j3mHC2+Lu4pBi9mKyMJhtP6U7k7EldY7sj/uS5gJA65gTXt8MefJQXLJo5d/vZbuWmfxzkEUNc/urV3pHA==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, "node_modules/@napi-rs/lzma-linux-x64-gnu": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/@napi-rs/lzma-linux-x64-gnu/-/lzma-linux-x64-gnu-1.5.1.tgz", @@ -6405,8 +6799,63 @@ "node": ">=14.18.0" } }, - "node_modules/@protobufjs/aspromise": { - "version": "1.1.2", + "node_modules/@poppinss/colors": { + "version": "4.1.6", + "resolved": "https://registry.npmjs.org/@poppinss/colors/-/colors-4.1.6.tgz", + "integrity": "sha512-H9xkIdFswbS8n1d6vmRd8+c10t2Qe+rZITbbDHHkQixH5+2x1FDGmi/0K+WgWiqQFKPSlIYB7jlH6Kpfn6Fleg==", + "dev": true, + "license": "MIT", + "dependencies": { + "kleur": "^4.1.5" + } + }, + "node_modules/@poppinss/dumper": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/@poppinss/dumper/-/dumper-0.6.5.tgz", + "integrity": "sha512-NBdYIb90J7LfOI32dOewKI1r7wnkiH6m920puQ3qHUeZkxNkQiFnXVWoE6YtFSv6QOiPPf7ys6i+HWWecDz7sw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@poppinss/colors": "^4.1.5", + "@sindresorhus/is": "^7.0.2", + "supports-color": "^10.0.0" + } + }, + "node_modules/@poppinss/dumper/node_modules/@sindresorhus/is": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-7.2.0.tgz", + "integrity": "sha512-P1Cz1dWaFfR4IR+U13mqqiGsLFf1KbayybWwdd2vfctdV6hDpUkgCY0nKOLLTMSoRd/jJNjtbqzf13K8DCCXQw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sindresorhus/is?sponsor=1" + } + }, + "node_modules/@poppinss/dumper/node_modules/supports-color": { + "version": "10.2.2", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-10.2.2.tgz", + "integrity": "sha512-SS+jx45GF1QjgEXQx4NJZV9ImqmO2NPz5FNsIHrsDjh2YsHnawpan7SNQ1o8NuhrbHZy9AZhIoCUiCeaW/C80g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/@poppinss/exception": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@poppinss/exception/-/exception-1.2.3.tgz", + "integrity": "sha512-dCED+QRChTVatE9ibtoaxc+WkdzOSjYTKi/+uacHWIsfodVfpsueo3+DKpgU5Px8qXjgmXkSvhXvSCz3fnP9lw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@protobufjs/aspromise": { + "version": "1.1.2", "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==", "license": "BSD-3-Clause" @@ -7044,12 +7493,28 @@ "node": ">=14.0.0" } }, + "node_modules/@speed-highlight/core": { + "version": "1.2.24", + "resolved": "https://registry.npmjs.org/@speed-highlight/core/-/core-1.2.24.tgz", + "integrity": "sha512-qeW2e1l78afw8VhRPfPQ1Gjj+KU5XFQ/OFV5ti6eTa9bruO7mJyZtA4vw0ofqmA3tKCkROE9xLk3VZoeRc98nw==", + "dev": true, + "license": "CC0-1.0" + }, "node_modules/@standard-schema/spec": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz", "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==", "license": "MIT" }, + "node_modules/@swc/helpers": { + "version": "0.5.23", + "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.23.tgz", + "integrity": "sha512-5lSsMOTXURePglDfvuAQUqkGek9Hg2kksOYay2m0+XR++b2NWYL/4sWyuvVBIs8oKnJaxkdi9whaL/sqN13afw==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.8.0" + } + }, "node_modules/@szmarczak/http-timer": { "version": "4.0.6", "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz", @@ -7114,6 +7579,18 @@ "assertion-error": "^2.0.1" } }, + "node_modules/@types/command-line-args": { + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/@types/command-line-args/-/command-line-args-5.2.3.tgz", + "integrity": "sha512-uv0aG6R0Y8WHZLTamZwtfsDLVRnOa+n+n5rEvFWL5Na5gZ8V2Teab/duDPFzIIIhs9qizDpcavCusCLJZu62Kw==", + "license": "MIT" + }, + "node_modules/@types/command-line-usage": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/@types/command-line-usage/-/command-line-usage-5.0.4.tgz", + "integrity": "sha512-BwR5KP3Es/CSht0xqBcUXS3qCAUVXwpRKsV2+arxeb65atasuXG9LykC9Ab10Cw3s2raH92ZqOeILaQbsB2ACg==", + "license": "MIT" + }, "node_modules/@types/debug": { "version": "4.1.13", "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.13.tgz", @@ -7229,12 +7706,39 @@ "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==", "license": "MIT" }, + "node_modules/@types/sanitize-html": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/@types/sanitize-html/-/sanitize-html-2.16.1.tgz", + "integrity": "sha512-n9wjs8bCOTyN/ynwD8s/nTcTreIHB1vf31vhLMGqUPNHaweKC4/fAl4Dj+hUlCTKYgm4P3k83fmiFfzkZ6sgMA==", + "dev": true, + "license": "MIT", + "dependencies": { + "htmlparser2": "^10.1" + } + }, "node_modules/@types/unist": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", "license": "MIT" }, + "node_modules/@types/whatwg-mimetype": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@types/whatwg-mimetype/-/whatwg-mimetype-3.0.2.tgz", + "integrity": "sha512-c2AKvDT8ToxLIOUlN51gTiHXflsfIFisS4pO7pDPoKouJCESkhZnEy623gwP9laCy5lnLDAw1vAzu2vM2YLOrA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/ws": { + "version": "8.18.1", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz", + "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@ungap/structured-clone": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.3.tgz", @@ -7642,6 +8146,41 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, + "node_modules/apache-arrow": { + "version": "18.1.0", + "resolved": "https://registry.npmjs.org/apache-arrow/-/apache-arrow-18.1.0.tgz", + "integrity": "sha512-v/ShMp57iBnBp4lDgV8Jx3d3Q5/Hac25FWmQ98eMahUiHPXcvwIMKJD0hBIgclm/FCG+LwPkAKtkRO1O/W0YGg==", + "license": "Apache-2.0", + "dependencies": { + "@swc/helpers": "^0.5.11", + "@types/command-line-args": "^5.2.3", + "@types/command-line-usage": "^5.0.4", + "@types/node": "^20.13.0", + "command-line-args": "^5.2.1", + "command-line-usage": "^7.0.1", + "flatbuffers": "^24.3.25", + "json-bignum": "^0.0.3", + "tslib": "^2.6.2" + }, + "bin": { + "arrow2csv": "bin/arrow2csv.js" + } + }, + "node_modules/apache-arrow/node_modules/@types/node": { + "version": "20.19.43", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.43.tgz", + "integrity": "sha512-6oYBAi5ikg4Pl+kGsoYtawUMBT2zZMCvPNF7pVLnHZfd1zf38DRiWn/gT01RYCdUqkv7Fhr+C9ot4/tb+2sVvA==", + "license": "MIT", + "dependencies": { + "undici-types": "~6.21.0" + } + }, + "node_modules/apache-arrow/node_modules/undici-types": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", + "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", + "license": "MIT" + }, "node_modules/app-builder-lib": { "version": "26.15.3", "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-26.15.3.tgz", @@ -7837,6 +8376,15 @@ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "license": "Python-2.0" }, + "node_modules/array-back": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz", + "integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/asn1js": { "version": "3.0.10", "resolved": "https://registry.npmjs.org/asn1js/-/asn1js-3.0.10.tgz", @@ -7955,6 +8503,13 @@ "node": "*" } }, + "node_modules/blake3-wasm": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/blake3-wasm/-/blake3-wasm-2.1.5.tgz", + "integrity": "sha512-F1+K8EbfOZE49dtoPtmxUQrpXaBIl3ICvasLh+nJta0xkz+9kF/7uet9fLnwKqhDrmj6g+6K3Tw9yQPUg2ka5g==", + "dev": true, + "license": "MIT" + }, "node_modules/bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", @@ -7999,6 +8554,12 @@ "url": "https://opencollective.com/express" } }, + "node_modules/boolbase": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", + "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", + "license": "ISC" + }, "node_modules/boolean": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz", @@ -8087,6 +8648,19 @@ "dev": true, "license": "MIT" }, + "node_modules/buffer-image-size": { + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/buffer-image-size/-/buffer-image-size-0.6.4.tgz", + "integrity": "sha512-nEh+kZOPY1w+gcCMobZ6ETUp9WfibndnosbpwB1iJk/8Gt5ZF2bhS6+B6bPYz424KtwsR6Rflc3tCz1/ghX2dQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + }, + "engines": { + "node": ">=4.0" + } + }, "node_modules/builder-util": { "version": "26.15.3", "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-26.15.3.tgz", @@ -8286,7 +8860,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -8299,6 +8872,21 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, + "node_modules/chalk-template": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/chalk-template/-/chalk-template-0.4.0.tgz", + "integrity": "sha512-/ghrgmhfY8RaSdeo43hNXxpoHAtxdbskUHjPpfqUWGttFgycUhYPGx3YZBCnUCvOa7Doivn1IZec3DEGFoMgLg==", + "license": "MIT", + "dependencies": { + "chalk": "^4.1.2" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/chalk-template?sponsor=1" + } + }, "node_modules/character-entities": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-2.0.2.tgz", @@ -8329,6 +8917,57 @@ "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/cheerio": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.2.0.tgz", + "integrity": "sha512-WDrybc/gKFpTYQutKIK6UvfcuxijIZfMfXaYm8NMsPQxSYvf+13fXUJ4rztGGbJcBQ/GF55gvrZ0Bc0bj/mqvg==", + "license": "MIT", + "dependencies": { + "cheerio-select": "^2.1.0", + "dom-serializer": "^2.0.0", + "domhandler": "^5.0.3", + "domutils": "^3.2.2", + "encoding-sniffer": "^0.2.1", + "htmlparser2": "^10.1.0", + "parse5": "^7.3.0", + "parse5-htmlparser2-tree-adapter": "^7.1.0", + "parse5-parser-stream": "^7.1.2", + "undici": "^7.19.0", + "whatwg-mimetype": "^4.0.0" + }, + "engines": { + "node": ">=20.18.1" + }, + "funding": { + "url": "https://github.com/cheeriojs/cheerio?sponsor=1" + } + }, + "node_modules/cheerio-select": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-2.1.0.tgz", + "integrity": "sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==", + "license": "BSD-2-Clause", + "dependencies": { + "boolbase": "^1.0.0", + "css-select": "^5.1.0", + "css-what": "^6.1.0", + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3", + "domutils": "^3.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, + "node_modules/cheerio/node_modules/whatwg-mimetype": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz", + "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==", + "license": "MIT", + "engines": { + "node": ">=18" + } + }, "node_modules/chokidar": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", @@ -8455,6 +9094,54 @@ "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/command-line-args": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-5.2.1.tgz", + "integrity": "sha512-H4UfQhZyakIjC74I9d34fGYDwk3XpSr17QhEd0Q3I9Xq1CETHo4Hcuo87WyWHpAF1aSLjLRf5lD9ZGX2qStUvg==", + "license": "MIT", + "dependencies": { + "array-back": "^3.1.0", + "find-replace": "^3.0.0", + "lodash.camelcase": "^4.3.0", + "typical": "^4.0.0" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/command-line-usage": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/command-line-usage/-/command-line-usage-7.0.4.tgz", + "integrity": "sha512-85UdvzTNx/+s5CkSgBm/0hzP80RFHAa7PsfeADE5ezZF3uHz3/Tqj9gIKGT9PTtpycc3Ua64T0oVulGfKxzfqg==", + "license": "MIT", + "dependencies": { + "array-back": "^6.2.2", + "chalk-template": "^0.4.0", + "table-layout": "^4.1.1", + "typical": "^7.3.0" + }, + "engines": { + "node": ">=12.20.0" + } + }, + "node_modules/command-line-usage/node_modules/array-back": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/array-back/-/array-back-6.2.3.tgz", + "integrity": "sha512-SGDvmg6QTYiTxCBkYVmThcoa67uLl35pyzRHdpCGBOcqFy6BtwnphoFPk7LhJshD+Yk1Kt35WGWeZPTgwR4Fhw==", + "license": "MIT", + "engines": { + "node": ">=12.17" + } + }, + "node_modules/command-line-usage/node_modules/typical": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/typical/-/typical-7.3.0.tgz", + "integrity": "sha512-ya4mg/30vm+DOWfBg4YK3j2WD6TWtRkCbasOJr40CseYENzCUby/7rIvXA99JGsQHeNxLbnXdyLLxKSv3tauFw==", + "license": "MIT", + "engines": { + "node": ">=12.17" + } + }, "node_modules/commander": { "version": "15.0.0", "resolved": "https://registry.npmjs.org/commander/-/commander-15.0.0.tgz", @@ -8566,6 +9253,34 @@ "node": ">= 8" } }, + "node_modules/css-select": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.2.2.tgz", + "integrity": "sha512-TizTzUddG/xYLA3NXodFM0fSbNizXjOKhqiQQwvhlspadZokn1KDy0NZFS0wuEubIYAV5/c1/lAr0TaaFXEXzw==", + "license": "BSD-2-Clause", + "dependencies": { + "boolbase": "^1.0.0", + "css-what": "^6.1.0", + "domhandler": "^5.0.2", + "domutils": "^3.0.1", + "nth-check": "^2.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, + "node_modules/css-what": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.2.2.tgz", + "integrity": "sha512-u/O3vwbptzhMs3L1fQE82ZSLHQQfto5gyZzwteVIEyeaY5Fc7R4dapF/BvRoSYFeqfBk4m0V1Vafq5Pjv25wvA==", + "license": "BSD-2-Clause", + "engines": { + "node": ">= 6" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, "node_modules/data-uri-to-buffer": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz", @@ -8575,6 +9290,12 @@ "node": ">= 12" } }, + "node_modules/dayjs": { + "version": "1.11.23", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.23.tgz", + "integrity": "sha512-QDTCU0M0MxR3hQfnlDJfwekQiaanm1ubOD231u73WBckQ/fsamwRLiE2GBz6D3a/xF1NgfiDLJjXBa1hYOYTtQ==", + "license": "MIT" + }, "node_modules/debug": { "version": "4.4.3", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", @@ -8643,6 +9364,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/deepmerge": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", + "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/defer-to-connect": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", @@ -8818,6 +9548,73 @@ "js-yaml": "^4.1.0" } }, + "node_modules/dom-serializer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", + "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", + "license": "MIT", + "dependencies": { + "domelementtype": "^2.3.0", + "domhandler": "^5.0.2", + "entities": "^4.2.0" + }, + "funding": { + "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" + } + }, + "node_modules/dom-serializer/node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/domelementtype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", + "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "license": "BSD-2-Clause" + }, + "node_modules/domhandler": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", + "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", + "license": "BSD-2-Clause", + "dependencies": { + "domelementtype": "^2.3.0" + }, + "engines": { + "node": ">= 4" + }, + "funding": { + "url": "https://github.com/fb55/domhandler?sponsor=1" + } + }, + "node_modules/domutils": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz", + "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==", + "license": "BSD-2-Clause", + "dependencies": { + "dom-serializer": "^2.0.0", + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3" + }, + "funding": { + "url": "https://github.com/fb55/domutils?sponsor=1" + } + }, "node_modules/dotenv": { "version": "16.6.1", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz", @@ -8851,6 +9648,14 @@ "resolved": "packages/dsh-desktop-market-installer", "link": true }, + "node_modules/dsh-research-task-runtime": { + "resolved": "packages/dsh-research-task-runtime", + "link": true + }, + "node_modules/dsh-web-search-session-model": { + "resolved": "packages/dsh-web-search-session-model", + "link": true + }, "node_modules/dunder-proto": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", @@ -9122,6 +9927,31 @@ "node": ">= 0.8" } }, + "node_modules/encoding-sniffer": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/encoding-sniffer/-/encoding-sniffer-0.2.1.tgz", + "integrity": "sha512-5gvq20T6vfpekVtqrYQsSCFZ1wEg5+wW0/QaZMWkFr6BqD3NfKs0rLCx4rrVlSWJeZb5NBJgVLswK/w2MWU+Gw==", + "license": "MIT", + "dependencies": { + "iconv-lite": "^0.6.3", + "whatwg-encoding": "^3.1.1" + }, + "funding": { + "url": "https://github.com/fb55/encoding-sniffer?sponsor=1" + } + }, + "node_modules/encoding-sniffer/node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/end-of-stream": { "version": "1.4.5", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz", @@ -9132,6 +9962,18 @@ "once": "^1.4.0" } }, + "node_modules/entities": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz", + "integrity": "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, "node_modules/env-paths": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-3.0.0.tgz", @@ -9152,6 +9994,16 @@ "dev": true, "license": "MIT" }, + "node_modules/error-stack-parser-es": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/error-stack-parser-es/-/error-stack-parser-es-1.0.5.tgz", + "integrity": "sha512-5qucVt2XcuGMcEGgWI7i+yZpmpByQ8J1lHhcL7PwqCwu9FPP3VUXzT4ltHe5i2z9dePwEHcDVOAfSnHsOlCXRA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/antfu" + } + }, "node_modules/es-define-property": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", @@ -9551,6 +10403,18 @@ "url": "https://opencollective.com/express" } }, + "node_modules/find-replace": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz", + "integrity": "sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==", + "license": "MIT", + "dependencies": { + "array-back": "^3.0.1" + }, + "engines": { + "node": ">=4.0.0" + } + }, "node_modules/find-up": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", @@ -9574,6 +10438,12 @@ "micromatch": "^4.0.2" } }, + "node_modules/flatbuffers": { + "version": "24.12.23", + "resolved": "https://registry.npmjs.org/flatbuffers/-/flatbuffers-24.12.23.tgz", + "integrity": "sha512-dLVCAISd5mhls514keQzmEG6QHmUUsNuWsb4tFafIUwvvgDjXhtfAYSKOzt5SWOy+qByV5pbsDZ+Vb7HUOBEdA==", + "license": "Apache-2.0" + }, "node_modules/form-data": { "version": "4.0.6", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.6.tgz", @@ -9949,12 +10819,30 @@ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "license": "ISC" }, - "node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "node_modules/happy-dom": { + "version": "20.11.6", + "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-20.11.6.tgz", + "integrity": "sha512-Hldbg8AdAa5a5oDcZpjqnGitp7JB0hqWmfv/8qr+kft4vzSD8BHsbdRfzYvL/0QcbKcURC/yyoygbeDQarPvYg==", "dev": true, "license": "MIT", + "dependencies": { + "@types/node": ">=20.0.0", + "@types/whatwg-mimetype": "^3.0.2", + "@types/ws": "^8.18.1", + "buffer-image-size": "^0.6.4", + "entities": "^7.0.1", + "whatwg-mimetype": "^3.0.0", + "ws": "^8.21.0" + }, + "engines": { + "node": ">=20.0.0" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "license": "MIT", "engines": { "node": ">=8" } @@ -10100,6 +10988,25 @@ "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/htmlparser2": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-10.1.0.tgz", + "integrity": "sha512-VTZkM9GWRAtEpveh7MSF6SjjrpNVNNVJfFup7xTY3UpFtm67foy9HDVXneLtFVt4pMz5kZtgNcvCniNFb1hlEQ==", + "funding": [ + "https://github.com/fb55/htmlparser2?sponsor=1", + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "license": "MIT", + "dependencies": { + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3", + "domutils": "^3.2.2", + "entities": "^7.0.1" + } + }, "node_modules/http-cache-semantics": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz", @@ -10264,6 +11171,15 @@ "node": ">=0.12.0" } }, + "node_modules/is-plain-object": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.1.0.tgz", + "integrity": "sha512-bUi/yjmtKYcRVUtWRGr0UA6xEFh2I6zWUwMrUXB3s7bmYCaZ8a+0ZsTRkrawh/mzlSD1Y0Ph8bp/U+TvBpWDNw==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/is-promise": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz", @@ -10396,6 +11312,14 @@ "bignumber.js": "^9.0.0" } }, + "node_modules/json-bignum": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/json-bignum/-/json-bignum-0.0.3.tgz", + "integrity": "sha512-2WHyXj3OfHSgNyuzDbSxI1w2jgw5gkWSWhS7Qg4bWXx1nLk3jnbwfUeS0PSba3IzpTUWdHxBieELUzXRjQB2zg==", + "engines": { + "node": ">=0.8" + } + }, "node_modules/json-buffer": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", @@ -10564,6 +11488,16 @@ "graceful-fs": "^4.1.11" } }, + "node_modules/kleur": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz", + "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/koffi": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/koffi/-/koffi-3.1.5.tgz", @@ -10591,6 +11525,15 @@ "@koromix/koffi-win32-x64": "3.1.5" } }, + "node_modules/launder": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/launder/-/launder-1.7.1.tgz", + "integrity": "sha512-mU6WRz5EusL9ZZuiZ5SO4Y6C0P9PAUR9iwdb6bzj4KDihm28DiHFw+/yk9DBH4f+Pv1wuzQ4e2jV3oQ7mkIqvw==", + "license": "MIT", + "dependencies": { + "dayjs": "^1.11.7" + } + }, "node_modules/lazy-val": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.5.tgz", @@ -10616,6 +11559,12 @@ "dev": true, "license": "MIT" }, + "node_modules/lodash.camelcase": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", + "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==", + "license": "MIT" + }, "node_modules/lodash.escaperegexp": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz", @@ -11645,1181 +12594,1235 @@ "node": ">=4" } }, - "node_modules/minimatch": { - "version": "10.2.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.6.tgz", - "integrity": "sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==", + "node_modules/miniflare": { + "version": "5.20260820.0-alpha", + "resolved": "https://registry.npmjs.org/miniflare/-/miniflare-5.20260820.0-alpha.tgz", + "integrity": "sha512-Bv1j2kcKKNwXLWuCx+j0xGt7z318mqQkJmEN6ellM9sCESbPBDTM9ofZMbKqx47jSnoGA3CiaUkAmzGVXUa/wQ==", "dev": true, - "license": "BlueOak-1.0.0", + "license": "MIT", "dependencies": { - "brace-expansion": "^5.0.8" + "@cspotcode/source-map-support": "0.8.1", + "sharp": "0.35.2", + "undici": "7.29.0", + "workerd": "1.20260820.1", + "ws": "8.21.0", + "youch": "4.1.0-beta.10" }, "engines": { - "node": "18 || 20 || >=22" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "dev": true, - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/ljharb" + "node": ">=22.0.0" } }, - "node_modules/minipass": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz", - "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==", + "node_modules/miniflare/node_modules/@img/sharp-darwin-arm64": { + "version": "0.35.2", + "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.35.2.tgz", + "integrity": "sha512-eEieHsMksAW4IiO5NzauESRl2D2qz3J/kwUxUrSfV06A93eEaRfMpHXyUb1mAqrR7i8U9A0GRqE9pjn6u1Jjpg==", + "cpu": [ + "arm64" + ], "dev": true, - "license": "BlueOak-1.0.0", + "license": "Apache-2.0", + "optional": true, + "os": [ + "darwin" + ], "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/minizlib": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz", - "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==", - "dev": true, - "license": "MIT", - "dependencies": { - "minipass": "^7.1.2" + "node": ">=20.9.0" }, - "engines": { - "node": ">= 18" - } - }, - "node_modules/mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "minimist": "^1.2.6" + "funding": { + "url": "https://opencollective.com/libvips" }, - "bin": { - "mkdirp": "bin/cmd.js" + "optionalDependencies": { + "@img/sharp-libvips-darwin-arm64": "1.3.1" } }, - "node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "license": "MIT" - }, - "node_modules/nanoid": { - "version": "3.3.18", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.18.tgz", - "integrity": "sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w==", + "node_modules/miniflare/node_modules/@img/sharp-darwin-x64": { + "version": "0.35.2", + "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.35.2.tgz", + "integrity": "sha512-BaktuGPCeHJMARpodR8jK4uKiZrPAy9WrfQW0sdI37clracq8Bp01AYS3SZgi5FS/y5twa9t4+LIuuxQjqRrWw==", + "cpu": [ + "x64" + ], "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } + "license": "Apache-2.0", + "optional": true, + "os": [ + "darwin" ], - "license": "MIT", - "bin": { - "nanoid": "bin/nanoid.cjs" - }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" - } - }, - "node_modules/negotiator": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz", - "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==", - "license": "MIT", "engines": { - "node": ">= 0.6" - } - }, - "node_modules/node": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/node/-/node-24.9.0.tgz", - "integrity": "sha512-cczSuf6uJejZ+dR+BAUEd6t2TxW31GvSexzEEvUKKRT59E/oYxUk3fixnUUqMG4tCtjg2wpZp3hfPdGuSg4pgw==", - "hasInstallScript": true, - "license": "ISC", - "dependencies": { - "node-bin-setup": "^1.0.0" + "node": ">=20.9.0" }, - "bin": { - "node": "bin/node" + "funding": { + "url": "https://opencollective.com/libvips" }, - "engines": { - "npm": ">=5.0.0" + "optionalDependencies": { + "@img/sharp-libvips-darwin-x64": "1.3.1" } }, - "node_modules/node-abi": { - "version": "4.33.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-4.33.0.tgz", - "integrity": "sha512-vLBWCKb+7LWsX+TbfzWOkw0W81m377tyx3hOweBTjO43CXZnRGS1/JPWs20fr0PgZyDXk6ROYrylsEycK8raDA==", + "node_modules/miniflare/node_modules/@img/sharp-freebsd-wasm32": { + "version": "0.35.2", + "resolved": "https://registry.npmjs.org/@img/sharp-freebsd-wasm32/-/sharp-freebsd-wasm32-0.35.2.tgz", + "integrity": "sha512-YoAxdnd8hPUkvLHd3bWY+YA8nw3xM/RyRopYucNsWHVSan8NLVM3X2volsfoRDcXdUJPg6tXahSd7HXPK7lRnw==", "dev": true, - "license": "MIT", - "dependencies": { - "semver": "^7.6.3" - }, - "engines": { - "node": ">=22.12.0" - } - }, - "node_modules/node-addon-api": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz", - "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==", - "license": "MIT" - }, - "node_modules/node-addon-native-custom-loader": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/node-addon-native-custom-loader/-/node-addon-native-custom-loader-0.1.4.tgz", - "integrity": "sha512-DreegO6EoC1JHWYBv3j8Miwp2Zl/CyBeNyoeyCbnEdjyYFEulR4Gcb3wj9fXF7KMDY0ZJ5MWwHcXP8GVNyScnA==", - "license": "MIT", - "engines": { - "node": ">=20" - } - }, - "node_modules/node-addon-require-builtin": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/node-addon-require-builtin/-/node-addon-require-builtin-0.1.4.tgz", - "integrity": "sha512-yuXz43GmtQyMrO75u2Z8KZAafMhnMH8RTOZBJWGDU9HoD2QxT6q4PF28iLNm/OS9BkS8MHwCKpgTk3d6qW584A==", - "license": "MIT", + "license": "Apache-2.0", + "optional": true, + "os": [ + "freebsd" + ], "dependencies": { - "node-addon-native-custom-loader": "0.1.4" + "@img/sharp-wasm32": "0.35.2" }, "engines": { - "node": ">=20" + "node": ">=20.9.0" }, - "optionalDependencies": { - "node-addon-require-builtin-darwin-arm64": "0.1.4", - "node-addon-require-builtin-darwin-x64": "0.1.4", - "node-addon-require-builtin-linux-arm64-gnu": "0.1.4", - "node-addon-require-builtin-linux-x64-gnu": "0.1.4", - "node-addon-require-builtin-win32-arm64-msvc": "0.1.4", - "node-addon-require-builtin-win32-ia32-msvc": "0.1.4", - "node-addon-require-builtin-win32-x64-msvc": "0.1.4" + "funding": { + "url": "https://opencollective.com/libvips" } }, - "node_modules/node-addon-require-builtin-darwin-arm64": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/node-addon-require-builtin-darwin-arm64/-/node-addon-require-builtin-darwin-arm64-0.1.4.tgz", - "integrity": "sha512-pqiTPbqlDKRIo8YKoWMjuFge4kyHbsdYkAcGW5MAVcJSCyU0M1hhpiLdWlvX753XKL3xlGeuPmv2NqTNRV0/hw==", + "node_modules/miniflare/node_modules/@img/sharp-libvips-darwin-arm64": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.3.1.tgz", + "integrity": "sha512-4V/M3roRMTYjiwZY9IOVQOE8OyeCxFAkYmyZDrZl51uOKjibm3oeEJ4WAmLxutAfzFbC9jqUiPs2gbnGflH+7g==", "cpu": [ "arm64" ], - "license": "MIT", + "dev": true, + "license": "LGPL-3.0-or-later", "optional": true, "os": [ "darwin" ], - "dependencies": { - "node-addon-native-custom-loader": "0.1.4" - }, - "engines": { - "node": ">=20" + "funding": { + "url": "https://opencollective.com/libvips" } }, - "node_modules/node-addon-require-builtin-darwin-x64": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/node-addon-require-builtin-darwin-x64/-/node-addon-require-builtin-darwin-x64-0.1.4.tgz", - "integrity": "sha512-i9oThh+w6d+H79YQuc3d3MZCx4YZ6aMWlQ0HYMgOTWvSRzppXmksa/xPV8O20G1gjpq5do/9/hgImixj3XIcjQ==", + "node_modules/miniflare/node_modules/@img/sharp-libvips-darwin-x64": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.3.1.tgz", + "integrity": "sha512-c0/DxItpJv2+dGhgycJBBgotdqruGYDvA79drdh0MD1dFpy7JzJ/PlXwi1H4rFf0eTy8tgbI91aHDnZIceY3jQ==", "cpu": [ "x64" ], - "license": "MIT", + "dev": true, + "license": "LGPL-3.0-or-later", "optional": true, "os": [ "darwin" ], - "dependencies": { - "node-addon-native-custom-loader": "0.1.4" - }, - "engines": { - "node": ">=20" + "funding": { + "url": "https://opencollective.com/libvips" } }, - "node_modules/node-addon-require-builtin-linux-arm64-gnu": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/node-addon-require-builtin-linux-arm64-gnu/-/node-addon-require-builtin-linux-arm64-gnu-0.1.4.tgz", - "integrity": "sha512-qbmYtkiIFp7h1ZvYYHH0MGFQbc03OyvplkeS90j+t3VMomkRc/YwZ140WzVM3eYJYZ7XHq+s1GL5ZdFQFPUXBQ==", + "node_modules/miniflare/node_modules/@img/sharp-libvips-linux-arm": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.3.1.tgz", + "integrity": "sha512-aGGy9aWzXgHBG7HNyQPWorZthlp7+x6fDRoPAQbGO3ThcttuTyKIx3NuSHb6zb4gBNq6/yNn9f1cy9nFKS/Vmg==", "cpu": [ - "arm64" + "arm" ], - "license": "MIT", + "dev": true, + "license": "LGPL-3.0-or-later", "optional": true, "os": [ "linux" ], - "dependencies": { - "node-addon-native-custom-loader": "0.1.4" - }, - "engines": { - "node": ">=20" + "funding": { + "url": "https://opencollective.com/libvips" } }, - "node_modules/node-addon-require-builtin-linux-x64-gnu": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/node-addon-require-builtin-linux-x64-gnu/-/node-addon-require-builtin-linux-x64-gnu-0.1.4.tgz", - "integrity": "sha512-4jC617+yOrYYuKgNmN2KMD722G6BICpjEzAcmzA3j5tt+zmey5M/c/z9JxqdjnNmU9CQWseBaJu/fGdbHZXSOg==", + "node_modules/miniflare/node_modules/@img/sharp-libvips-linux-arm64": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.3.1.tgz", + "integrity": "sha512-JznefmcK9j1JKPz8AkQDh89kjojubyfOasWBPKfzMIhPwsgDy9evpE/naJTXXXmghS1iFwR8u/kTwh/I2/+GCw==", "cpu": [ - "x64" + "arm64" ], - "license": "MIT", + "dev": true, + "license": "LGPL-3.0-or-later", "optional": true, "os": [ "linux" ], - "dependencies": { - "node-addon-native-custom-loader": "0.1.4" - }, - "engines": { - "node": ">=20" + "funding": { + "url": "https://opencollective.com/libvips" } }, - "node_modules/node-addon-require-builtin-win32-arm64-msvc": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/node-addon-require-builtin-win32-arm64-msvc/-/node-addon-require-builtin-win32-arm64-msvc-0.1.4.tgz", - "integrity": "sha512-4TW96aPR108R3RxJbUNLXU6FLTZ7n8fWtSpPbPtvYWXa9cXojvCMdH4BvrHM6W2M+Iu42nqMxRyylP3PeTjOmA==", + "node_modules/miniflare/node_modules/@img/sharp-libvips-linux-ppc64": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.3.1.tgz", + "integrity": "sha512-1EkwGNCZk6iWNCMWqrvdJ+r1j0PT1zIz60CNPhYnJlK/zyeWqlsPZIe+ocBVqPF8k/Ssee/NCk+tE9Ryrko6ng==", "cpu": [ - "arm64" + "ppc64" ], - "license": "MIT", + "dev": true, + "license": "LGPL-3.0-or-later", "optional": true, "os": [ - "win32" + "linux" ], - "dependencies": { - "node-addon-native-custom-loader": "0.1.4" - }, - "engines": { - "node": ">=20" + "funding": { + "url": "https://opencollective.com/libvips" } }, - "node_modules/node-addon-require-builtin-win32-ia32-msvc": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/node-addon-require-builtin-win32-ia32-msvc/-/node-addon-require-builtin-win32-ia32-msvc-0.1.4.tgz", - "integrity": "sha512-a3ZRkiMKaE7uRjI+H+Ic7dvhPIk0rW9mHV47IEiqJzoRZqnDp5JPjQfAnngu979HR59Ghy+mfexJ/kStBlP3eQ==", + "node_modules/miniflare/node_modules/@img/sharp-libvips-linux-riscv64": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-riscv64/-/sharp-libvips-linux-riscv64-1.3.1.tgz", + "integrity": "sha512-Ilays+w2bXdnxzxtQdmXR62u8o8GYa3eL4+Gr+1KiE4xperMZUslRaVPJwwPkzlHEjGfXAfRVAa/7CYCtSqsBw==", "cpu": [ - "ia32" + "riscv64" ], - "license": "MIT", + "dev": true, + "license": "LGPL-3.0-or-later", "optional": true, "os": [ - "win32" + "linux" ], - "dependencies": { - "node-addon-native-custom-loader": "0.1.4" - }, - "engines": { - "node": ">=20 <23" + "funding": { + "url": "https://opencollective.com/libvips" } }, - "node_modules/node-addon-require-builtin-win32-x64-msvc": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/node-addon-require-builtin-win32-x64-msvc/-/node-addon-require-builtin-win32-x64-msvc-0.1.4.tgz", - "integrity": "sha512-EGx7AcJKB7fNxo/YHV32JTUg1Hetbdnh6uPaqPhklhyRSMM13/7hZK1pTACqMS9dwnR3Lakxl9HKG9/eAoIyyg==", + "node_modules/miniflare/node_modules/@img/sharp-libvips-linux-s390x": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.3.1.tgz", + "integrity": "sha512-VfBwVHQTbRoj4XlpA/KLZ7ltgMpz+4WSejFzQ+GnoImjo1PtEJ59QB2qR1xQEeRPYIkNrPIm2L4cICMvz4C2ew==", "cpu": [ - "x64" + "s390x" ], - "license": "MIT", + "dev": true, + "license": "LGPL-3.0-or-later", "optional": true, "os": [ - "win32" + "linux" ], - "dependencies": { - "node-addon-native-custom-loader": "0.1.4" - }, - "engines": { - "node": ">=20" + "funding": { + "url": "https://opencollective.com/libvips" } }, - "node_modules/node-api-version": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/node-api-version/-/node-api-version-0.2.1.tgz", - "integrity": "sha512-2xP/IGGMmmSQpI1+O/k72jF/ykvZ89JeuKX3TLJAYPDVLUalrshrLHkeVcCCZqG/eEa635cr8IBYzgnDvM2O8Q==", + "node_modules/miniflare/node_modules/@img/sharp-libvips-linux-x64": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.3.1.tgz", + "integrity": "sha512-+c8ukgwU62DS54nCAjw7keOfHUkmr0B5QHEdcOqRnodF/MNXJbVI8Eopoj4B/0H8Asr65I+A4Amrn7a85/md6A==", + "cpu": [ + "x64" + ], "dev": true, - "license": "MIT", - "dependencies": { - "semver": "^7.3.5" + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" } }, - "node_modules/node-bin-setup": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/node-bin-setup/-/node-bin-setup-1.1.4.tgz", - "integrity": "sha512-vWNHOne0ZUavArqPP5LJta50+S8R261Fr5SvGul37HbEDcowvLjwdvd0ZeSr0r2lTSrPxl6okq9QUw8BFGiAxA==", - "license": "ISC" - }, - "node_modules/node-domexception": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz", - "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==", - "deprecated": "Use your platform's native DOMException instead", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/jimmywarting" - }, - { - "type": "github", - "url": "https://paypal.me/jimmywarting" - } + "node_modules/miniflare/node_modules/@img/sharp-libvips-linuxmusl-arm64": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.3.1.tgz", + "integrity": "sha512-qlKb/pwbkAi1WMsJrYHk7CuDrd12s27U2QnRhFYUoJNrRCmkosMTttuRFat/DDB3IlDm5qE1TJgZ4JDnHX8Ldw==", + "cpu": [ + "arm64" ], - "license": "MIT", - "engines": { - "node": ">=10.5.0" + "dev": true, + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" } }, - "node_modules/node-fetch": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz", - "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==", - "license": "MIT", - "dependencies": { - "data-uri-to-buffer": "^4.0.0", - "fetch-blob": "^3.1.4", - "formdata-polyfill": "^4.0.10" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, + "node_modules/miniflare/node_modules/@img/sharp-libvips-linuxmusl-x64": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.3.1.tgz", + "integrity": "sha512-yO21HwoUVLN8Qa+/SBjQLMYwBWAVJjeGPNe+hc0OUeMeifEtJqu5a1c4HayE1nNpDih9y3/KkoltfkDodmKAlg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], "funding": { - "type": "opencollective", - "url": "https://opencollective.com/node-fetch" + "url": "https://opencollective.com/libvips" } }, - "node_modules/node-gyp": { - "version": "12.4.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-12.4.0.tgz", - "integrity": "sha512-OMcPNvqTCFUnNaBlmdgq+lfNqY7gTiSmNRDjY3uAXRyudeKZEZxu3CLtjMQrx4zZxCX2b/mpNqTtwuCJgXhHkw==", + "node_modules/miniflare/node_modules/@img/sharp-linux-arm": { + "version": "0.35.2", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.35.2.tgz", + "integrity": "sha512-SE4kzF2mepn6z+6E7L6lsV8FzuLL6IPQdyX8ZiwROAG/G8td+hP/m7FsFPwidtrF19gvajuC9l6TxAVcsA4S7A==", + "cpu": [ + "arm" + ], "dev": true, - "license": "MIT", - "dependencies": { - "env-paths": "^2.2.0", - "exponential-backoff": "^3.1.1", - "graceful-fs": "^4.2.6", - "nopt": "^9.0.0", - "proc-log": "^6.0.0", - "semver": "^7.3.5", - "tar": "^7.5.4", - "tinyglobby": "^0.2.12", - "undici": "^6.25.0", - "which": "^6.0.0" + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=20.9.0" }, - "bin": { - "node-gyp": "bin/node-gyp.js" + "funding": { + "url": "https://opencollective.com/libvips" }, - "engines": { - "node": "^20.17.0 || >=22.9.0" + "optionalDependencies": { + "@img/sharp-libvips-linux-arm": "1.3.1" } }, - "node_modules/node-gyp/node_modules/env-paths": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", - "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", + "node_modules/miniflare/node_modules/@img/sharp-linux-arm64": { + "version": "0.35.2", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.35.2.tgz", + "integrity": "sha512-af12Pnd0ZGu2HfP8NayB0kk6eC/lrfbQE6HlR4jD+34wdJ1Vw9TF6TMn6ZvffT+WgqVsl0hRbmNvz2u/23VmwA==", + "cpu": [ + "arm64" + ], "dev": true, - "license": "MIT", + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">=6" + "node": ">=20.9.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-arm64": "1.3.1" } }, - "node_modules/node-gyp/node_modules/isexe": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-4.0.0.tgz", - "integrity": "sha512-FFUtZMpoZ8RqHS3XeXEmHWLA4thH+ZxCv2lOiPIn1Xc7CxrqhWzNSDzD+/chS/zbYezmiwWLdQC09JdQKmthOw==", + "node_modules/miniflare/node_modules/@img/sharp-linux-ppc64": { + "version": "0.35.2", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-ppc64/-/sharp-linux-ppc64-0.35.2.tgz", + "integrity": "sha512-hYSBm7zcNtDCozCxQHYZJiu63b/bXsgRZuOxCIBZsStMM9Vap47iFHdbX4kCvQsblPB/k+clhELpdQJHQLSHvg==", + "cpu": [ + "ppc64" + ], "dev": true, - "license": "BlueOak-1.0.0", + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">=20" + "node": ">=20.9.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-ppc64": "1.3.1" } }, - "node_modules/node-gyp/node_modules/undici": { - "version": "6.28.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-6.28.0.tgz", - "integrity": "sha512-LIY910g9TI13YS95lrMFrs8Rm/u/irgHeTWoKCoteeJ04CUJ92eEfj0rVn+7VKMPBpUPiUoBKfhNyLI23EE/KA==", + "node_modules/miniflare/node_modules/@img/sharp-linux-riscv64": { + "version": "0.35.2", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-riscv64/-/sharp-linux-riscv64-0.35.2.tgz", + "integrity": "sha512-qQt0Kc13+Hoan/Awq/qMSQw3L+RI1NCRPgD5cUJ/1WSSmIoysLOc72jlRM3E0OHN9Yr313jgeQ2T+zW+F03QFA==", + "cpu": [ + "riscv64" + ], "dev": true, - "license": "MIT", + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">=18.17" + "node": ">=20.9.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-riscv64": "1.3.1" } }, - "node_modules/node-gyp/node_modules/which": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/which/-/which-6.0.1.tgz", - "integrity": "sha512-oGLe46MIrCRqX7ytPUf66EAYvdeMIZYn3WaocqqKZAxrBpkqHfL/qvTyJ/bTk5+AqHCjXmrv3CEWgy368zhRUg==", + "node_modules/miniflare/node_modules/@img/sharp-linux-s390x": { + "version": "0.35.2", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.35.2.tgz", + "integrity": "sha512-E4fLLfRPzDLlEeDaTzI98OFLcv++WL5ChLLMwPoVd0CIoZQqupBSNbOisPL5am9XsbQ9T84+iiMpUvbFtkunbA==", + "cpu": [ + "s390x" + ], "dev": true, - "license": "ISC", - "dependencies": { - "isexe": "^4.0.0" + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=20.9.0" }, - "bin": { - "node-which": "bin/which.js" + "funding": { + "url": "https://opencollective.com/libvips" }, - "engines": { - "node": "^20.17.0 || >=22.9.0" + "optionalDependencies": { + "@img/sharp-libvips-linux-s390x": "1.3.1" } }, - "node_modules/node-int64": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", - "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", + "node_modules/miniflare/node_modules/@img/sharp-linux-x64": { + "version": "0.35.2", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.35.2.tgz", + "integrity": "sha512-gi0zFJJRLswfCZmHtJdikXPOc5u7qamSOS3NHedLqLd4W8Q0NqjdBr6TTRIgsfFjqfTsHFgdfvJ9LwqSgcHiAA==", + "cpu": [ + "x64" + ], "dev": true, - "license": "MIT" - }, - "node_modules/node-pty": { - "version": "1.2.0-beta.15", - "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.2.0-beta.15.tgz", - "integrity": "sha512-vORSzHXi4Ofl7HemVWpuudLqCPdaQb4LfpRCUpE5HPxhp4JYscl8zZwxh11p26v2wvW24WMwnMfLjhRLixrfxA==", - "hasInstallScript": true, - "license": "MIT", - "dependencies": { - "node-addon-api": "^7.1.0" + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=20.9.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-x64": "1.3.1" } }, - "node_modules/node-releases": { - "version": "2.0.53", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.53.tgz", - "integrity": "sha512-D9UOmYG3UH1V+ENW56t5QXBwJw1YEY18ruVeus89Rw+SyIgjPkCO84bRzO3uNIYosJbNwiabWVn48o3uJLjxFQ==", + "node_modules/miniflare/node_modules/@img/sharp-linuxmusl-arm64": { + "version": "0.35.2", + "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.35.2.tgz", + "integrity": "sha512-siWbOW1u6HFnFLrp0waKyW7VEf7jYvcDWdrXEFa8AkdAQgEvuu5Fz8/Y70w9EeqAdwDtfU012BhEHHaDqvQNzg==", + "cpu": [ + "arm64" + ], "dev": true, - "license": "MIT", + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">=18" + "node": ">=20.9.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linuxmusl-arm64": "1.3.1" } }, - "node_modules/nopt": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-9.0.0.tgz", - "integrity": "sha512-Zhq3a+yFKrYwSBluL4H9XP3m3y5uvQkB/09CwDruCiRmR/UJYnn9W4R48ry0uGC70aeTPKLynBtscP9efFFcPw==", + "node_modules/miniflare/node_modules/@img/sharp-linuxmusl-x64": { + "version": "0.35.2", + "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.35.2.tgz", + "integrity": "sha512-YBqMMcjDi4QGYiSn4vNOYBhmlC4z5AXqkOUUqI2e0AFA4urNv4ESgOgwNl3K+4etQhha0twXlzeF20bbULm9Yg==", + "cpu": [ + "x64" + ], "dev": true, - "license": "ISC", - "dependencies": { - "abbrev": "^4.0.0" + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=20.9.0" }, - "bin": { - "nopt": "bin/nopt.js" + "funding": { + "url": "https://opencollective.com/libvips" }, - "engines": { - "node": "^20.17.0 || >=22.9.0" + "optionalDependencies": { + "@img/sharp-libvips-linuxmusl-x64": "1.3.1" } }, - "node_modules/normalize-url": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", - "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", + "node_modules/miniflare/node_modules/@img/sharp-wasm32": { + "version": "0.35.2", + "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.35.2.tgz", + "integrity": "sha512-Mrv4JQNYVQ94xH+jzZ9r+gowleN8mv2FTgKT+PI6bx5C0G8TdNYndu161pg2i7uoBwxy2ImPMHrJOM2LZef7Bw==", "dev": true, - "license": "MIT", + "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT", + "optional": true, + "dependencies": { + "@emnapi/runtime": "^1.11.1" + }, "engines": { - "node": ">=10" + "node": ">=20.9.0" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://opencollective.com/libvips" } }, - "node_modules/object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "license": "MIT", + "node_modules/miniflare/node_modules/@img/sharp-webcontainers-wasm32": { + "version": "0.35.2", + "resolved": "https://registry.npmjs.org/@img/sharp-webcontainers-wasm32/-/sharp-webcontainers-wasm32-0.35.2.tgz", + "integrity": "sha512-QNV27pxs9wpApEiCfvHM1RDoP1w1+2KrUWWDPEhEwg+latvOrfuhWrHWZKwdSFwU6jh3myjw/yOCRsUIuOft3g==", + "cpu": [ + "wasm32" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "@img/sharp-wasm32": "0.35.2" + }, "engines": { - "node": ">=0.10.0" + "node": ">=20.9.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" } }, - "node_modules/object-inspect": { - "version": "1.13.4", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", - "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", - "license": "MIT", + "node_modules/miniflare/node_modules/@img/sharp-win32-arm64": { + "version": "0.35.2", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.35.2.tgz", + "integrity": "sha512-BiVRYc/t6/Vl3e1hBx0hugG4oN9Pydf4fgMSpxTQJmwGUg/YoXTWHiFeRymHfCZzifxu4F4rpk/I67D0LQ20wQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0 AND LGPL-3.0-or-later", + "optional": true, + "os": [ + "win32" + ], "engines": { - "node": ">= 0.4" + "node": ">=20.9.0" }, "funding": { - "url": "https://github.com/sponsors/ljharb" + "url": "https://opencollective.com/libvips" } }, - "node_modules/object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "node_modules/miniflare/node_modules/@img/sharp-win32-ia32": { + "version": "0.35.2", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.35.2.tgz", + "integrity": "sha512-YYEhx9PImCC7T0tI8JDMi4DB9LwLCXCU5OWNYEXAxh5Q1ShKkyC6byxzoBJ3gEFDnH2lQckWuDe70G7mB2XJog==", + "cpu": [ + "ia32" + ], "dev": true, - "license": "MIT", + "license": "Apache-2.0 AND LGPL-3.0-or-later", + "optional": true, + "os": [ + "win32" + ], "engines": { - "node": ">= 0.4" + "node": "^20.9.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" } }, - "node_modules/obug": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.4.tgz", - "integrity": "sha512-4a+OsYv9UktOJKE+l1A4OufDgdRF9PifWj+tJnHURo/P+WOxpG4GzUFL9qCalmWauao6ogiG+QvnCovwPoyAWA==", + "node_modules/miniflare/node_modules/@img/sharp-win32-x64": { + "version": "0.35.2", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.35.2.tgz", + "integrity": "sha512-imoOyBcoM/iiUr4J6VPpCNjPnjvP/Gks95898yB8YqoGGYmHYbOyCuNv9FMhFgtaiHFGbHW8bxKqRV6VjtXThQ==", + "cpu": [ + "x64" + ], "dev": true, - "funding": [ - "https://github.com/sponsors/sxzz", - "https://opencollective.com/debug" + "license": "Apache-2.0 AND LGPL-3.0-or-later", + "optional": true, + "os": [ + "win32" ], - "license": "MIT", "engines": { - "node": ">=12.20.0" - } - }, - "node_modules/on-finished": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "license": "MIT", - "dependencies": { - "ee-first": "1.1.1" + "node": ">=20.9.0" }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "license": "ISC", - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/oniguruma-parser": { - "version": "0.12.2", - "resolved": "https://registry.npmjs.org/oniguruma-parser/-/oniguruma-parser-0.12.2.tgz", - "integrity": "sha512-6HVa5oIrgMC6aA6WF6XyyqbhRPJrKR02L20+2+zpDtO5QAzGHAUGw5TKQvwi5vctNnRHkJYmjAhRVQF2EKdTQw==", - "license": "MIT" - }, - "node_modules/oniguruma-to-es": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/oniguruma-to-es/-/oniguruma-to-es-4.3.6.tgz", - "integrity": "sha512-csuQ9x3Yr0cEIs/Zgx/OEt9iBw9vqIunAPQkx19R/fiMq2oGVTgcMqO/V3Ybqefr1TBvosI6jU539ksaBULJyA==", - "license": "MIT", - "dependencies": { - "oniguruma-parser": "^0.12.2", - "regex": "^6.1.0", - "regex-recursion": "^6.0.2" + "funding": { + "url": "https://opencollective.com/libvips" } }, - "node_modules/open": { - "version": "7.4.2", - "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz", - "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==", + "node_modules/miniflare/node_modules/sharp": { + "version": "0.35.2", + "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.35.2.tgz", + "integrity": "sha512-FVtFjtBCMiJS6yb5CX7Sop45WFMpeGw6oRKuJnXYgf/f1ms/D7LE/ZUSNxnW7rZ/dbslQWYkoqFHGPaDBtaK4w==", "dev": true, - "license": "MIT", + "license": "Apache-2.0", "dependencies": { - "is-docker": "^2.0.0", - "is-wsl": "^2.1.1" + "@img/colour": "^1.1.0", + "detect-libc": "^2.1.2", + "semver": "^7.8.4" }, "engines": { - "node": ">=8" + "node": ">=20.9.0" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/openai": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/openai/-/openai-6.26.0.tgz", - "integrity": "sha512-zd23dbWTjiJ6sSAX6s0HrCZi41JwTA1bQVs0wLQPZ2/5o2gxOJA5wh7yOAUgwYybfhDXyhwlpeQf7Mlgx8EOCA==", - "license": "Apache-2.0", - "bin": { - "openai": "bin/cli" + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-darwin-arm64": "0.35.2", + "@img/sharp-darwin-x64": "0.35.2", + "@img/sharp-freebsd-wasm32": "0.35.2", + "@img/sharp-libvips-darwin-arm64": "1.3.1", + "@img/sharp-libvips-darwin-x64": "1.3.1", + "@img/sharp-libvips-linux-arm": "1.3.1", + "@img/sharp-libvips-linux-arm64": "1.3.1", + "@img/sharp-libvips-linux-ppc64": "1.3.1", + "@img/sharp-libvips-linux-riscv64": "1.3.1", + "@img/sharp-libvips-linux-s390x": "1.3.1", + "@img/sharp-libvips-linux-x64": "1.3.1", + "@img/sharp-libvips-linuxmusl-arm64": "1.3.1", + "@img/sharp-libvips-linuxmusl-x64": "1.3.1", + "@img/sharp-linux-arm": "0.35.2", + "@img/sharp-linux-arm64": "0.35.2", + "@img/sharp-linux-ppc64": "0.35.2", + "@img/sharp-linux-riscv64": "0.35.2", + "@img/sharp-linux-s390x": "0.35.2", + "@img/sharp-linux-x64": "0.35.2", + "@img/sharp-linuxmusl-arm64": "0.35.2", + "@img/sharp-linuxmusl-x64": "0.35.2", + "@img/sharp-webcontainers-wasm32": "0.35.2", + "@img/sharp-win32-arm64": "0.35.2", + "@img/sharp-win32-ia32": "0.35.2", + "@img/sharp-win32-x64": "0.35.2" + } + }, + "node_modules/miniflare/node_modules/ws": { + "version": "8.21.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.0.tgz", + "integrity": "sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.0.0" }, "peerDependencies": { - "ws": "^8.18.0", - "zod": "^3.25 || ^4.0" + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" }, "peerDependenciesMeta": { - "ws": { + "bufferutil": { "optional": true }, - "zod": { + "utf-8-validate": { "optional": true } } }, - "node_modules/p-cancelable": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz", - "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "node_modules/minimatch": { + "version": "10.2.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.6.tgz", + "integrity": "sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==", "dev": true, - "license": "MIT", + "license": "BlueOak-1.0.0", "dependencies": { - "yocto-queue": "^0.1.0" + "brace-expansion": "^5.0.8" }, "engines": { - "node": ">=10" + "node": "18 || 20 || >=22" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, "license": "MIT", - "dependencies": { - "p-limit": "^2.2.0" - }, - "engines": { - "node": ">=8" + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/p-locate/node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "license": "MIT", - "dependencies": { - "p-try": "^2.0.0" - }, + "node_modules/minipass": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz", + "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==", + "dev": true, + "license": "BlueOak-1.0.0", "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=16 || 14 >=14.17" } }, - "node_modules/p-retry": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz", - "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==", + "node_modules/minizlib": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz", + "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==", + "dev": true, "license": "MIT", "dependencies": { - "@types/retry": "0.12.0", - "retry": "^0.13.1" + "minipass": "^7.1.2" }, "engines": { - "node": ">=8" - } - }, - "node_modules/p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/parseurl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "license": "MIT", - "engines": { - "node": ">= 0.8" + "node": ">= 18" } }, - "node_modules/partial-json": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/partial-json/-/partial-json-0.1.7.tgz", - "integrity": "sha512-Njv/59hHaokb/hRUjce3Hdv12wd60MtM9Z5Olmn+nehe0QDAsRtRbJPvJ0Z91TusF0SuZRIvnM+S4l6EIP8leA==", - "license": "MIT" - }, - "node_modules/patch-package": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-8.0.1.tgz", - "integrity": "sha512-VsKRIA8f5uqHQ7NGhwIna6Bx6D9s/1iXlA1hthBVBEbkq+t4kXD0HHt+rJhf/Z+Ci0F/HCB2hvn0qLdLG+Qxlw==", + "node_modules/mkdirp": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", + "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { - "@yarnpkg/lockfile": "^1.1.0", - "chalk": "^4.1.2", - "ci-info": "^3.7.0", - "cross-spawn": "^7.0.3", - "find-yarn-workspace-root": "^2.0.0", - "fs-extra": "^10.0.0", - "json-stable-stringify": "^1.0.2", - "klaw-sync": "^6.0.0", - "minimist": "^1.2.6", - "open": "^7.4.2", - "semver": "^7.5.3", - "slash": "^2.0.0", - "tmp": "^0.2.4", - "yaml": "^2.2.2" + "minimist": "^1.2.6" }, "bin": { - "patch-package": "index.js" - }, - "engines": { - "node": ">=14", - "npm": ">5" + "mkdirp": "bin/cmd.js" } }, - "node_modules/patch-package/node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, + "node_modules/nanoid": { + "version": "3.3.18", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.18.tgz", + "integrity": "sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w==", "funding": [ { "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" + "url": "https://github.com/sponsors/ai" } ], "license": "MIT", + "bin": { + "nanoid": "bin/nanoid.cjs" + }, "engines": { - "node": ">=8" + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" } }, - "node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "node_modules/negotiator": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz", + "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==", "license": "MIT", "engines": { - "node": ">=8" + "node": ">= 0.6" } }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true, - "license": "MIT", + "node_modules/node": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/node/-/node-24.9.0.tgz", + "integrity": "sha512-cczSuf6uJejZ+dR+BAUEd6t2TxW31GvSexzEEvUKKRT59E/oYxUk3fixnUUqMG4tCtjg2wpZp3hfPdGuSg4pgw==", + "hasInstallScript": true, + "license": "ISC", + "dependencies": { + "node-bin-setup": "^1.0.0" + }, + "bin": { + "node": "bin/node" + }, "engines": { - "node": ">=0.10.0" + "npm": ">=5.0.0" } }, - "node_modules/path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "node_modules/node-abi": { + "version": "4.33.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-4.33.0.tgz", + "integrity": "sha512-vLBWCKb+7LWsX+TbfzWOkw0W81m377tyx3hOweBTjO43CXZnRGS1/JPWs20fr0PgZyDXk6ROYrylsEycK8raDA==", + "dev": true, "license": "MIT", + "dependencies": { + "semver": "^7.6.3" + }, "engines": { - "node": ">=8" - } - }, - "node_modules/path-to-regexp": { - "version": "8.4.2", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.4.2.tgz", - "integrity": "sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA==", - "license": "MIT", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" + "node": ">=22.12.0" } }, - "node_modules/pathe": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz", - "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==", - "dev": true, + "node_modules/node-addon-api": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz", + "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==", "license": "MIT" }, - "node_modules/pe-library": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/pe-library/-/pe-library-0.4.1.tgz", - "integrity": "sha512-eRWB5LBz7PpDu4PUlwT0PhnQfTQJlDDdPa35urV4Osrm0t0AqQFGn+UIkU3klZvwJ8KPO3VbBFsXquA6p6kqZw==", - "dev": true, + "node_modules/node-addon-native-custom-loader": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/node-addon-native-custom-loader/-/node-addon-native-custom-loader-0.1.4.tgz", + "integrity": "sha512-DreegO6EoC1JHWYBv3j8Miwp2Zl/CyBeNyoeyCbnEdjyYFEulR4Gcb3wj9fXF7KMDY0ZJ5MWwHcXP8GVNyScnA==", "license": "MIT", "engines": { - "node": ">=12", - "npm": ">=6" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/jet2jet" + "node": ">=20" } }, - "node_modules/picocolors": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", - "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", - "license": "ISC" - }, - "node_modules/picomatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz", - "integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==", + "node_modules/node-addon-require-builtin": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/node-addon-require-builtin/-/node-addon-require-builtin-0.1.4.tgz", + "integrity": "sha512-yuXz43GmtQyMrO75u2Z8KZAafMhnMH8RTOZBJWGDU9HoD2QxT6q4PF28iLNm/OS9BkS8MHwCKpgTk3d6qW584A==", "license": "MIT", + "dependencies": { + "node-addon-native-custom-loader": "0.1.4" + }, "engines": { - "node": ">=12" + "node": ">=20" }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" + "optionalDependencies": { + "node-addon-require-builtin-darwin-arm64": "0.1.4", + "node-addon-require-builtin-darwin-x64": "0.1.4", + "node-addon-require-builtin-linux-arm64-gnu": "0.1.4", + "node-addon-require-builtin-linux-x64-gnu": "0.1.4", + "node-addon-require-builtin-win32-arm64-msvc": "0.1.4", + "node-addon-require-builtin-win32-ia32-msvc": "0.1.4", + "node-addon-require-builtin-win32-x64-msvc": "0.1.4" } }, - "node_modules/pkce-challenge": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/pkce-challenge/-/pkce-challenge-5.0.1.tgz", - "integrity": "sha512-wQ0b/W4Fr01qtpHlqSqspcj3EhBvimsdh0KlHhH8HRZnMsEa0ea2fTULOXOS9ccQr3om+GcGRk4e+isrZWV8qQ==", + "node_modules/node-addon-require-builtin-darwin-arm64": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/node-addon-require-builtin-darwin-arm64/-/node-addon-require-builtin-darwin-arm64-0.1.4.tgz", + "integrity": "sha512-pqiTPbqlDKRIo8YKoWMjuFge4kyHbsdYkAcGW5MAVcJSCyU0M1hhpiLdWlvX753XKL3xlGeuPmv2NqTNRV0/hw==", + "cpu": [ + "arm64" + ], "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "dependencies": { + "node-addon-native-custom-loader": "0.1.4" + }, "engines": { - "node": ">=16.20.0" + "node": ">=20" } }, - "node_modules/pkijs": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/pkijs/-/pkijs-3.4.0.tgz", - "integrity": "sha512-emEcLuomt2j03vxD54giVB4SxTjnsqkU692xZOZXHDVoYyypEm+b3jpiTcc+Cf+myooc+/Ly0z01jqeNHVgJGw==", - "dev": true, - "license": "BSD-3-Clause", + "node_modules/node-addon-require-builtin-darwin-x64": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/node-addon-require-builtin-darwin-x64/-/node-addon-require-builtin-darwin-x64-0.1.4.tgz", + "integrity": "sha512-i9oThh+w6d+H79YQuc3d3MZCx4YZ6aMWlQ0HYMgOTWvSRzppXmksa/xPV8O20G1gjpq5do/9/hgImixj3XIcjQ==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], "dependencies": { - "@noble/hashes": "1.4.0", - "asn1js": "^3.0.6", - "bytestreamjs": "^2.0.1", - "pvtsutils": "^1.3.6", - "pvutils": "^1.1.3", - "tslib": "^2.8.1" + "node-addon-native-custom-loader": "0.1.4" }, "engines": { - "node": ">=16.0.0" + "node": ">=20" } }, - "node_modules/pkijs/node_modules/@noble/hashes": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz", - "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==", - "dev": true, + "node_modules/node-addon-require-builtin-linux-arm64-gnu": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/node-addon-require-builtin-linux-arm64-gnu/-/node-addon-require-builtin-linux-arm64-gnu-0.1.4.tgz", + "integrity": "sha512-qbmYtkiIFp7h1ZvYYHH0MGFQbc03OyvplkeS90j+t3VMomkRc/YwZ140WzVM3eYJYZ7XHq+s1GL5ZdFQFPUXBQ==", + "cpu": [ + "arm64" + ], "license": "MIT", - "engines": { - "node": ">= 16" + "optional": true, + "os": [ + "linux" + ], + "dependencies": { + "node-addon-native-custom-loader": "0.1.4" }, - "funding": { - "url": "https://paulmillr.com/funding/" + "engines": { + "node": ">=20" } }, - "node_modules/plist": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz", - "integrity": "sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==", - "dev": true, + "node_modules/node-addon-require-builtin-linux-x64-gnu": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/node-addon-require-builtin-linux-x64-gnu/-/node-addon-require-builtin-linux-x64-gnu-0.1.4.tgz", + "integrity": "sha512-4jC617+yOrYYuKgNmN2KMD722G6BICpjEzAcmzA3j5tt+zmey5M/c/z9JxqdjnNmU9CQWseBaJu/fGdbHZXSOg==", + "cpu": [ + "x64" + ], "license": "MIT", + "optional": true, + "os": [ + "linux" + ], "dependencies": { - "@xmldom/xmldom": "^0.8.8", - "base64-js": "^1.5.1", - "xmlbuilder": "^15.1.1" + "node-addon-native-custom-loader": "0.1.4" }, "engines": { - "node": ">=10.4.0" + "node": ">=20" } }, - "node_modules/pngjs": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz", - "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==", + "node_modules/node-addon-require-builtin-win32-arm64-msvc": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/node-addon-require-builtin-win32-arm64-msvc/-/node-addon-require-builtin-win32-arm64-msvc-0.1.4.tgz", + "integrity": "sha512-4TW96aPR108R3RxJbUNLXU6FLTZ7n8fWtSpPbPtvYWXa9cXojvCMdH4BvrHM6W2M+Iu42nqMxRyylP3PeTjOmA==", + "cpu": [ + "arm64" + ], "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "dependencies": { + "node-addon-native-custom-loader": "0.1.4" + }, "engines": { - "node": ">=10.13.0" + "node": ">=20" } }, - "node_modules/pnpm": { - "version": "10.34.5", - "resolved": "https://registry.npmjs.org/pnpm/-/pnpm-10.34.5.tgz", - "integrity": "sha512-pO4F8vc2WCVb1qiYWcBlpFwopX2u+uLIk6Fo7itzFow3uR6D5X6mdlStA/AwMXRkMOi84442LgQmBfuKvIAZLg==", + "node_modules/node-addon-require-builtin-win32-ia32-msvc": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/node-addon-require-builtin-win32-ia32-msvc/-/node-addon-require-builtin-win32-ia32-msvc-0.1.4.tgz", + "integrity": "sha512-a3ZRkiMKaE7uRjI+H+Ic7dvhPIk0rW9mHV47IEiqJzoRZqnDp5JPjQfAnngu979HR59Ghy+mfexJ/kStBlP3eQ==", + "cpu": [ + "ia32" + ], "license": "MIT", - "bin": { - "pnpm": "bin/pnpm.cjs", - "pnpx": "bin/pnpx.cjs" + "optional": true, + "os": [ + "win32" + ], + "dependencies": { + "node-addon-native-custom-loader": "0.1.4" }, "engines": { - "node": ">=18.12" + "node": ">=20 <23" + } + }, + "node_modules/node-addon-require-builtin-win32-x64-msvc": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/node-addon-require-builtin-win32-x64-msvc/-/node-addon-require-builtin-win32-x64-msvc-0.1.4.tgz", + "integrity": "sha512-EGx7AcJKB7fNxo/YHV32JTUg1Hetbdnh6uPaqPhklhyRSMM13/7hZK1pTACqMS9dwnR3Lakxl9HKG9/eAoIyyg==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "dependencies": { + "node-addon-native-custom-loader": "0.1.4" }, - "funding": { - "url": "https://opencollective.com/pnpm" + "engines": { + "node": ">=20" } }, - "node_modules/postcss": { - "version": "8.5.26", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.26.tgz", - "integrity": "sha512-u82N74LFzG8ca+dD8puPnplTXoGH4fTPpVGuIbt36G3qvNlkvfD0lEAZSxaly3KX8TS/L1A1gsCEmvKmBcVbkQ==", + "node_modules/node-api-version": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/node-api-version/-/node-api-version-0.2.1.tgz", + "integrity": "sha512-2xP/IGGMmmSQpI1+O/k72jF/ykvZ89JeuKX3TLJAYPDVLUalrshrLHkeVcCCZqG/eEa635cr8IBYzgnDvM2O8Q==", "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^7.3.5" + } + }, + "node_modules/node-bin-setup": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/node-bin-setup/-/node-bin-setup-1.1.4.tgz", + "integrity": "sha512-vWNHOne0ZUavArqPP5LJta50+S8R261Fr5SvGul37HbEDcowvLjwdvd0ZeSr0r2lTSrPxl6okq9QUw8BFGiAxA==", + "license": "ISC" + }, + "node_modules/node-domexception": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz", + "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==", + "deprecated": "Use your platform's native DOMException instead", "funding": [ { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/postcss" + "type": "github", + "url": "https://github.com/sponsors/jimmywarting" }, { "type": "github", - "url": "https://github.com/sponsors/ai" + "url": "https://paypal.me/jimmywarting" } ], "license": "MIT", + "engines": { + "node": ">=10.5.0" + } + }, + "node_modules/node-fetch": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz", + "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==", + "license": "MIT", "dependencies": { - "nanoid": "^3.3.17", - "picocolors": "^1.1.1", - "source-map-js": "^1.2.1" + "data-uri-to-buffer": "^4.0.0", + "fetch-blob": "^3.1.4", + "formdata-polyfill": "^4.0.10" }, "engines": { - "node": "^10 || ^12 || >=14" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/node-fetch" } }, - "node_modules/proc-log": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-6.1.0.tgz", - "integrity": "sha512-iG+GYldRf2BQ0UDUAd6JQ/RwzaQy6mXmsk/IzlYyal4A4SNFw54MeH4/tLkF4I5WoWG9SQwuqWzS99jaFQHBuQ==", + "node_modules/node-gyp": { + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-12.4.0.tgz", + "integrity": "sha512-OMcPNvqTCFUnNaBlmdgq+lfNqY7gTiSmNRDjY3uAXRyudeKZEZxu3CLtjMQrx4zZxCX2b/mpNqTtwuCJgXhHkw==", "dev": true, - "license": "ISC", + "license": "MIT", + "dependencies": { + "env-paths": "^2.2.0", + "exponential-backoff": "^3.1.1", + "graceful-fs": "^4.2.6", + "nopt": "^9.0.0", + "proc-log": "^6.0.0", + "semver": "^7.3.5", + "tar": "^7.5.4", + "tinyglobby": "^0.2.12", + "undici": "^6.25.0", + "which": "^6.0.0" + }, + "bin": { + "node-gyp": "bin/node-gyp.js" + }, "engines": { "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true, - "license": "MIT" - }, - "node_modules/progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "node_modules/node-gyp/node_modules/env-paths": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", "dev": true, "license": "MIT", "engines": { - "node": ">=0.4.0" + "node": ">=6" } }, - "node_modules/promise-retry": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", - "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", - "dev": true, - "license": "MIT", - "dependencies": { - "err-code": "^2.0.2", - "retry": "^0.12.0" - }, + "node_modules/node-gyp/node_modules/isexe": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-4.0.0.tgz", + "integrity": "sha512-FFUtZMpoZ8RqHS3XeXEmHWLA4thH+ZxCv2lOiPIn1Xc7CxrqhWzNSDzD+/chS/zbYezmiwWLdQC09JdQKmthOw==", + "dev": true, + "license": "BlueOak-1.0.0", "engines": { - "node": ">=10" + "node": ">=20" } }, - "node_modules/promise-retry/node_modules/retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", + "node_modules/node-gyp/node_modules/undici": { + "version": "6.28.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.28.0.tgz", + "integrity": "sha512-LIY910g9TI13YS95lrMFrs8Rm/u/irgHeTWoKCoteeJ04CUJ92eEfj0rVn+7VKMPBpUPiUoBKfhNyLI23EE/KA==", "dev": true, "license": "MIT", "engines": { - "node": ">= 4" + "node": ">=18.17" } }, - "node_modules/proper-lockfile": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-4.1.2.tgz", - "integrity": "sha512-TjNPblN4BwAWMXU8s9AEz4JmQxnD1NNL7bNOY/AKUzyamc379FWASUhc/K1pL2noVb+XmZKLL68cjzLsiOAMaA==", + "node_modules/node-gyp/node_modules/which": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/which/-/which-6.0.1.tgz", + "integrity": "sha512-oGLe46MIrCRqX7ytPUf66EAYvdeMIZYn3WaocqqKZAxrBpkqHfL/qvTyJ/bTk5+AqHCjXmrv3CEWgy368zhRUg==", "dev": true, - "license": "MIT", + "license": "ISC", "dependencies": { - "graceful-fs": "^4.2.4", - "retry": "^0.12.0", - "signal-exit": "^3.0.2" + "isexe": "^4.0.0" + }, + "bin": { + "node-which": "bin/which.js" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/proper-lockfile/node_modules/retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", + "node_modules/node-int64": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", + "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", "dev": true, + "license": "MIT" + }, + "node_modules/node-pty": { + "version": "1.2.0-beta.15", + "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.2.0-beta.15.tgz", + "integrity": "sha512-vORSzHXi4Ofl7HemVWpuudLqCPdaQb4LfpRCUpE5HPxhp4JYscl8zZwxh11p26v2wvW24WMwnMfLjhRLixrfxA==", + "hasInstallScript": true, "license": "MIT", - "engines": { - "node": ">= 4" + "dependencies": { + "node-addon-api": "^7.1.0" } }, - "node_modules/property-information": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/property-information/-/property-information-7.2.0.tgz", - "integrity": "sha512-IAtzIB6sUiWaJYrX9smp3V46pBGbBeLFRGdh25kg1334VcBlD8HzhPeNIWQH9zhGmo2itIe25EHt9dQP7G5hmg==", + "node_modules/node-releases": { + "version": "2.0.53", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.53.tgz", + "integrity": "sha512-D9UOmYG3UH1V+ENW56t5QXBwJw1YEY18ruVeus89Rw+SyIgjPkCO84bRzO3uNIYosJbNwiabWVn48o3uJLjxFQ==", + "dev": true, "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" + "engines": { + "node": ">=18" } }, - "node_modules/protobufjs": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.6.5.tgz", - "integrity": "sha512-/FPD0nUc9jH6rfFjji9IBqOz4pcSE3CsT1m7Ep6Mdb0LxSUMj8hgl6GomOvZzpNpAqqGaXA0P3VSrZLFzIhQrw==", - "hasInstallScript": true, - "license": "BSD-3-Clause", + "node_modules/nopt": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-9.0.0.tgz", + "integrity": "sha512-Zhq3a+yFKrYwSBluL4H9XP3m3y5uvQkB/09CwDruCiRmR/UJYnn9W4R48ry0uGC70aeTPKLynBtscP9efFFcPw==", + "dev": true, + "license": "ISC", "dependencies": { - "@protobufjs/aspromise": "^1.1.2", - "@protobufjs/base64": "^1.1.2", - "@protobufjs/codegen": "^2.0.5", - "@protobufjs/eventemitter": "^1.1.1", - "@protobufjs/fetch": "^1.1.1", - "@protobufjs/float": "^1.0.2", - "@protobufjs/path": "^1.1.2", - "@protobufjs/pool": "^1.1.0", - "@protobufjs/utf8": "^1.1.1", - "@types/node": ">=13.7.0", - "long": "^5.3.2" + "abbrev": "^4.0.0" + }, + "bin": { + "nopt": "bin/nopt.js" }, "engines": { - "node": ">=12.0.0" + "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/proxy-addr": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", - "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", + "node_modules/normalize-url": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", + "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", + "dev": true, "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/nth-check": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", + "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", + "license": "BSD-2-Clause", "dependencies": { - "forwarded": "0.2.0", - "ipaddr.js": "1.9.1" + "boolbase": "^1.0.0" }, + "funding": { + "url": "https://github.com/fb55/nth-check?sponsor=1" + } + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "license": "MIT", "engines": { - "node": ">= 0.10" + "node": ">=0.10.0" } }, - "node_modules/pump": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.4.tgz", - "integrity": "sha512-VS7sjc6KR7e1ukRFhQSY5LM2uBWAUPiOPa/A3mkKmiMwSmRFUITt0xuj+/lesgnCv+dPIEYlkzrcyXgquIHMcA==", - "dev": true, + "node_modules/object-inspect": { + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", + "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", "license": "MIT", - "dependencies": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/pvtsutils": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/pvtsutils/-/pvtsutils-1.3.6.tgz", - "integrity": "sha512-PLgQXQ6H2FWCaeRak8vvk1GW462lMxB5s3Jm673N82zI4vqtVUPuZdffdZbPDFRoU8kAhItWFtPCWiPpp4/EDg==", + "node_modules/object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", "dev": true, "license": "MIT", - "dependencies": { - "tslib": "^2.8.1" + "engines": { + "node": ">= 0.4" } }, - "node_modules/pvutils": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/pvutils/-/pvutils-1.2.0.tgz", - "integrity": "sha512-BbubeCEyTuQjVMakvJQ/Sxbc93F2pwmbsxONT/ZRrwU7Ua38d8unYTwXpTVLAKJ4BDuH9IGztCjQcd/N/39Dvg==", + "node_modules/obug": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.4.tgz", + "integrity": "sha512-4a+OsYv9UktOJKE+l1A4OufDgdRF9PifWj+tJnHURo/P+WOxpG4GzUFL9qCalmWauao6ogiG+QvnCovwPoyAWA==", "dev": true, + "funding": [ + "https://github.com/sponsors/sxzz", + "https://opencollective.com/debug" + ], "license": "MIT", "engines": { - "node": ">=16.0.0" + "node": ">=12.20.0" } }, - "node_modules/qrcode": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.5.4.tgz", - "integrity": "sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg==", + "node_modules/on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", "license": "MIT", "dependencies": { - "dijkstrajs": "^1.0.1", - "pngjs": "^5.0.0", - "yargs": "^15.3.1" - }, - "bin": { - "qrcode": "bin/qrcode" + "ee-first": "1.1.1" }, "engines": { - "node": ">=10.13.0" + "node": ">= 0.8" } }, - "node_modules/qrcode/node_modules/cliui": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", - "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "license": "ISC", "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^6.2.0" + "wrappy": "1" } }, - "node_modules/qrcode/node_modules/wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "node_modules/oniguruma-parser": { + "version": "0.12.2", + "resolved": "https://registry.npmjs.org/oniguruma-parser/-/oniguruma-parser-0.12.2.tgz", + "integrity": "sha512-6HVa5oIrgMC6aA6WF6XyyqbhRPJrKR02L20+2+zpDtO5QAzGHAUGw5TKQvwi5vctNnRHkJYmjAhRVQF2EKdTQw==", + "license": "MIT" + }, + "node_modules/oniguruma-to-es": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/oniguruma-to-es/-/oniguruma-to-es-4.3.6.tgz", + "integrity": "sha512-csuQ9x3Yr0cEIs/Zgx/OEt9iBw9vqIunAPQkx19R/fiMq2oGVTgcMqO/V3Ybqefr1TBvosI6jU539ksaBULJyA==", "license": "MIT", "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" + "oniguruma-parser": "^0.12.2", + "regex": "^6.1.0", + "regex-recursion": "^6.0.2" + } + }, + "node_modules/open": { + "version": "7.4.2", + "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz", + "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-docker": "^2.0.0", + "is-wsl": "^2.1.1" }, "engines": { "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/qrcode/node_modules/y18n": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", - "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", - "license": "ISC" - }, - "node_modules/qrcode/node_modules/yargs": { - "version": "15.4.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", - "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", - "license": "MIT", - "dependencies": { - "cliui": "^6.0.0", - "decamelize": "^1.2.0", - "find-up": "^4.1.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^4.2.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^18.1.2" + "node_modules/openai": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/openai/-/openai-6.26.0.tgz", + "integrity": "sha512-zd23dbWTjiJ6sSAX6s0HrCZi41JwTA1bQVs0wLQPZ2/5o2gxOJA5wh7yOAUgwYybfhDXyhwlpeQf7Mlgx8EOCA==", + "license": "Apache-2.0", + "bin": { + "openai": "bin/cli" }, - "engines": { - "node": ">=8" - } - }, - "node_modules/qrcode/node_modules/yargs-parser": { - "version": "18.1.3", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", - "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", - "license": "ISC", - "dependencies": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" + "peerDependencies": { + "ws": "^8.18.0", + "zod": "^3.25 || ^4.0" }, - "engines": { - "node": ">=6" + "peerDependenciesMeta": { + "ws": { + "optional": true + }, + "zod": { + "optional": true + } } }, - "node_modules/qs": { - "version": "6.15.3", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.3.tgz", - "integrity": "sha512-O9gl3zCl5h5blw1KGUzQKhA5oUXSl8rwUIM5o0S3nCXMliSvy5Dzx7/DJcI+SwgICv+IneSZwhBh1oSyEHA71A==", - "license": "BSD-3-Clause", - "dependencies": { - "es-define-property": "^1.0.1", - "side-channel": "^1.1.1" - }, + "node_modules/p-cancelable": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz", + "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==", + "dev": true, + "license": "MIT", "engines": { - "node": ">=0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "node": ">=8" } }, - "node_modules/quick-lru": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", - "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, "license": "MIT", + "dependencies": { + "yocto-queue": "^0.1.0" + }, "engines": { "node": ">=10" }, @@ -12827,1419 +13830,2948 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/range-parser": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.3.0.tgz", - "integrity": "sha512-hek2mFQpPuI4E1BBKrSto+BU3e3x4xuarsbiwr3+lf7p44juvFMV0XFWQAP3xUyqXA4RrXLIoaSUGbSt056ZMw==", - "license": "MIT", - "engines": { - "node": ">= 0.6" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" - } - }, - "node_modules/raw-body": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.2.tgz", - "integrity": "sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA==", + "node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "license": "MIT", "dependencies": { - "bytes": "~3.1.2", - "http-errors": "~2.0.1", - "iconv-lite": "~0.7.0", - "unpipe": "~1.0.0" + "p-limit": "^2.2.0" }, "engines": { - "node": ">= 0.10" + "node": ">=8" } }, - "node_modules/react": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz", - "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==", + "node_modules/p-locate/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "license": "MIT", "dependencies": { - "loose-envify": "^1.1.0" + "p-try": "^2.0.0" }, "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/react-dom": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz", - "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==", - "license": "MIT", - "dependencies": { - "loose-envify": "^1.1.0", - "scheduler": "^0.23.2" + "node": ">=6" }, - "peerDependencies": { - "react": "^18.3.1" + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/read-binary-file-arch": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/read-binary-file-arch/-/read-binary-file-arch-1.0.6.tgz", - "integrity": "sha512-BNg9EN3DD3GsDXX7Aa8O4p92sryjkmzYYgmgTAc6CA4uGLEDzFfxOxugu21akOxpcXHiEgsYkC6nPsQvLLLmEg==", - "dev": true, + "node_modules/p-retry": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz", + "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==", "license": "MIT", "dependencies": { - "debug": "^4.3.4" + "@types/retry": "0.12.0", + "retry": "^0.13.1" }, - "bin": { - "read-binary-file-arch": "cli.js" + "engines": { + "node": ">=8" } }, - "node_modules/readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", - "dev": true, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "license": "MIT", - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "engines": { + "node": ">=6" } }, - "node_modules/readable-stream/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true, + "node_modules/parse-srcset": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz", + "integrity": "sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==", "license": "MIT" }, - "node_modules/readdirp": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", - "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==", + "node_modules/parse5": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz", + "integrity": "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==", "license": "MIT", - "engines": { - "node": ">= 14.18.0" + "dependencies": { + "entities": "^6.0.0" }, "funding": { - "type": "individual", - "url": "https://paulmillr.com/funding/" + "url": "https://github.com/inikulin/parse5?sponsor=1" } }, - "node_modules/regex": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/regex/-/regex-6.1.0.tgz", - "integrity": "sha512-6VwtthbV4o/7+OaAF9I5L5V3llLEsoPyq9P1JVXkedTP33c7MfCG0/5NOPcSJn0TzXcG9YUrR0gQSWioew3LDg==", + "node_modules/parse5-htmlparser2-tree-adapter": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.1.0.tgz", + "integrity": "sha512-ruw5xyKs6lrpo9x9rCZqZZnIUntICjQAd0Wsmp396Ul9lN/h+ifgVV1x1gZHi8euej6wTfpqX8j+BFQxF0NS/g==", "license": "MIT", "dependencies": { - "regex-utilities": "^2.3.0" + "domhandler": "^5.0.3", + "parse5": "^7.0.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" } }, - "node_modules/regex-recursion": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/regex-recursion/-/regex-recursion-6.0.2.tgz", - "integrity": "sha512-0YCaSCq2VRIebiaUviZNs0cBz1kg5kVS2UKUfNIx8YVs1cN3AV7NTctO5FOKBA+UT2BPJIWZauYHPqJODG50cg==", + "node_modules/parse5-parser-stream": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/parse5-parser-stream/-/parse5-parser-stream-7.1.2.tgz", + "integrity": "sha512-JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow==", "license": "MIT", "dependencies": { - "regex-utilities": "^2.3.0" + "parse5": "^7.0.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" } }, - "node_modules/regex-utilities": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/regex-utilities/-/regex-utilities-2.3.0.tgz", - "integrity": "sha512-8VhliFJAWRaUiVvREIiW2NXXTmHs4vMNnSzuJVhscgmGav3g9VDxLrQndI3dZZVVdp0ZO/5v0xmX516/7M9cng==", - "license": "MIT" - }, - "node_modules/require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "license": "MIT", + "node_modules/parse5/node_modules/entities": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz", + "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==", + "license": "BSD-2-Clause", "engines": { - "node": ">=0.10.0" + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" } }, - "node_modules/require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "node_modules/parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", "license": "MIT", "engines": { - "node": ">=0.10.0" + "node": ">= 0.8" } }, - "node_modules/require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "license": "ISC" + "node_modules/partial-json": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/partial-json/-/partial-json-0.1.7.tgz", + "integrity": "sha512-Njv/59hHaokb/hRUjce3Hdv12wd60MtM9Z5Olmn+nehe0QDAsRtRbJPvJ0Z91TusF0SuZRIvnM+S4l6EIP8leA==", + "license": "MIT" }, - "node_modules/resedit": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/resedit/-/resedit-1.7.2.tgz", - "integrity": "sha512-vHjcY2MlAITJhC0eRD/Vv8Vlgmu9Sd3LX9zZvtGzU5ZImdTN3+d6e/4mnTyV8vEbyf1sgNIrWxhWlrys52OkEA==", + "node_modules/patch-package": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-8.0.1.tgz", + "integrity": "sha512-VsKRIA8f5uqHQ7NGhwIna6Bx6D9s/1iXlA1hthBVBEbkq+t4kXD0HHt+rJhf/Z+Ci0F/HCB2hvn0qLdLG+Qxlw==", "dev": true, "license": "MIT", "dependencies": { - "pe-library": "^0.4.1" + "@yarnpkg/lockfile": "^1.1.0", + "chalk": "^4.1.2", + "ci-info": "^3.7.0", + "cross-spawn": "^7.0.3", + "find-yarn-workspace-root": "^2.0.0", + "fs-extra": "^10.0.0", + "json-stable-stringify": "^1.0.2", + "klaw-sync": "^6.0.0", + "minimist": "^1.2.6", + "open": "^7.4.2", + "semver": "^7.5.3", + "slash": "^2.0.0", + "tmp": "^0.2.4", + "yaml": "^2.2.2" }, - "engines": { - "node": ">=12", - "npm": ">=6" + "bin": { + "patch-package": "index.js" }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/jet2jet" - } - }, - "node_modules/resolve-alpn": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz", - "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==", + "engines": { + "node": ">=14", + "npm": ">5" + } + }, + "node_modules/patch-package/node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-to-regexp": { + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.4.2.tgz", + "integrity": "sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA==", + "license": "MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/pathe": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz", + "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==", "dev": true, "license": "MIT" }, - "node_modules/responselike": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz", - "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==", + "node_modules/pdfjs-dist": { + "version": "4.10.38", + "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-4.10.38.tgz", + "integrity": "sha512-/Y3fcFrXEAsMjJXeL9J8+ZG9U01LbuWaYypvDW2ycW1jL269L3js3DVBjDJ0Up9Np1uqDXsDrRihHANhZOlwdQ==", + "license": "Apache-2.0", + "engines": { + "node": ">=20" + }, + "optionalDependencies": { + "@napi-rs/canvas": "^0.1.65" + } + }, + "node_modules/pe-library": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/pe-library/-/pe-library-0.4.1.tgz", + "integrity": "sha512-eRWB5LBz7PpDu4PUlwT0PhnQfTQJlDDdPa35urV4Osrm0t0AqQFGn+UIkU3klZvwJ8KPO3VbBFsXquA6p6kqZw==", "dev": true, "license": "MIT", - "dependencies": { - "lowercase-keys": "^2.0.0" + "engines": { + "node": ">=12", + "npm": ">=6" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "type": "github", + "url": "https://github.com/sponsors/jet2jet" } }, - "node_modules/retry": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz", - "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==", + "node_modules/picocolors": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "license": "ISC" + }, + "node_modules/picomatch": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz", + "integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==", "license": "MIT", "engines": { - "node": ">= 4" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/rimraf": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", - "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", - "deprecated": "Rimraf versions prior to v4 are no longer supported", - "dev": true, - "license": "ISC", - "peer": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" + "node_modules/pkce-challenge": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/pkce-challenge/-/pkce-challenge-5.0.1.tgz", + "integrity": "sha512-wQ0b/W4Fr01qtpHlqSqspcj3EhBvimsdh0KlHhH8HRZnMsEa0ea2fTULOXOS9ccQr3om+GcGRk4e+isrZWV8qQ==", + "license": "MIT", + "engines": { + "node": ">=16.20.0" } }, - "node_modules/roarr": { - "version": "2.15.4", - "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz", - "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==", + "node_modules/pkijs": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/pkijs/-/pkijs-3.4.0.tgz", + "integrity": "sha512-emEcLuomt2j03vxD54giVB4SxTjnsqkU692xZOZXHDVoYyypEm+b3jpiTcc+Cf+myooc+/Ly0z01jqeNHVgJGw==", "dev": true, "license": "BSD-3-Clause", - "optional": true, "dependencies": { - "boolean": "^3.0.1", - "detect-node": "^2.0.4", - "globalthis": "^1.0.1", - "json-stringify-safe": "^5.0.1", - "semver-compare": "^1.0.0", - "sprintf-js": "^1.1.2" + "@noble/hashes": "1.4.0", + "asn1js": "^3.0.6", + "bytestreamjs": "^2.0.1", + "pvtsutils": "^1.3.6", + "pvutils": "^1.1.3", + "tslib": "^2.8.1" }, "engines": { - "node": ">=8.0" + "node": ">=16.0.0" } }, - "node_modules/rollup": { - "version": "4.62.4", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.62.4.tgz", - "integrity": "sha512-RXOqwaPsBGjMNMa4sQjDjHieHEZDFoj/Rdr46l2MU5DfEs16wHJPC2RPTPHWhNl+M3aI472LLqFkFKut4SblOg==", + "node_modules/pkijs/node_modules/@noble/hashes": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz", + "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==", "dev": true, "license": "MIT", - "dependencies": { - "@types/estree": "1.0.9" - }, - "bin": { - "rollup": "dist/bin/rollup" - }, "engines": { - "node": ">=18.0.0", - "npm": ">=8.0.0" + "node": ">= 16" }, - "optionalDependencies": { - "@napi-rs/lzma-linux-x64-gnu": "1.5.1", - "@rollup/rollup-android-arm-eabi": "4.62.4", - "@rollup/rollup-android-arm64": "4.62.4", - "@rollup/rollup-darwin-arm64": "4.62.4", - "@rollup/rollup-darwin-x64": "4.62.4", - "@rollup/rollup-freebsd-arm64": "4.62.4", - "@rollup/rollup-freebsd-x64": "4.62.4", - "@rollup/rollup-linux-arm-gnueabihf": "4.62.4", - "@rollup/rollup-linux-arm-musleabihf": "4.62.4", - "@rollup/rollup-linux-arm64-gnu": "4.62.4", - "@rollup/rollup-linux-arm64-musl": "4.62.4", - "@rollup/rollup-linux-loong64-gnu": "4.62.4", - "@rollup/rollup-linux-loong64-musl": "4.62.4", - "@rollup/rollup-linux-ppc64-gnu": "4.62.4", - "@rollup/rollup-linux-ppc64-musl": "4.62.4", - "@rollup/rollup-linux-riscv64-gnu": "4.62.4", - "@rollup/rollup-linux-riscv64-musl": "4.62.4", - "@rollup/rollup-linux-s390x-gnu": "4.62.4", - "@rollup/rollup-linux-x64-gnu": "4.62.4", - "@rollup/rollup-linux-x64-musl": "4.62.4", - "@rollup/rollup-openbsd-x64": "4.62.4", - "@rollup/rollup-openharmony-arm64": "4.62.4", - "@rollup/rollup-win32-arm64-msvc": "4.62.4", - "@rollup/rollup-win32-ia32-msvc": "4.62.4", - "@rollup/rollup-win32-x64-gnu": "4.62.4", - "@rollup/rollup-win32-x64-msvc": "4.62.4", - "fsevents": "~2.3.2" + "funding": { + "url": "https://paulmillr.com/funding/" } }, - "node_modules/router": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz", - "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==", + "node_modules/plist": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz", + "integrity": "sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==", + "dev": true, "license": "MIT", "dependencies": { - "debug": "^4.4.0", - "depd": "^2.0.0", - "is-promise": "^4.0.0", - "parseurl": "^1.3.3", - "path-to-regexp": "^8.0.0" + "@xmldom/xmldom": "^0.8.8", + "base64-js": "^1.5.1", + "xmlbuilder": "^15.1.1" }, "engines": { - "node": ">= 18" + "node": ">=10.4.0" } }, - "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "node_modules/pngjs": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz", + "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==", + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/pnpm": { + "version": "10.34.5", + "resolved": "https://registry.npmjs.org/pnpm/-/pnpm-10.34.5.tgz", + "integrity": "sha512-pO4F8vc2WCVb1qiYWcBlpFwopX2u+uLIk6Fo7itzFow3uR6D5X6mdlStA/AwMXRkMOi84442LgQmBfuKvIAZLg==", + "license": "MIT", + "bin": { + "pnpm": "bin/pnpm.cjs", + "pnpx": "bin/pnpx.cjs" + }, + "engines": { + "node": ">=18.12" + }, + "funding": { + "url": "https://opencollective.com/pnpm" + } + }, + "node_modules/postcss": { + "version": "8.5.26", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.26.tgz", + "integrity": "sha512-u82N74LFzG8ca+dD8puPnplTXoGH4fTPpVGuIbt36G3qvNlkvfD0lEAZSxaly3KX8TS/L1A1gsCEmvKmBcVbkQ==", "funding": [ { - "type": "github", - "url": "https://github.com/sponsors/feross" + "type": "opencollective", + "url": "https://opencollective.com/postcss/" }, { - "type": "patreon", - "url": "https://www.patreon.com/feross" + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" }, { - "type": "consulting", - "url": "https://feross.org/support" + "type": "github", + "url": "https://github.com/sponsors/ai" } ], - "license": "MIT" - }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "license": "MIT" - }, - "node_modules/sanitize-filename": { - "version": "1.6.4", - "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.4.tgz", - "integrity": "sha512-9ZyI08PsvdQl2r/bBIGubpVdR3RR9sY6RDiWFPreA21C/EFlQhmgo20UZlNjZMMZNubusLhAQozkA0Od5J21Eg==", - "dev": true, - "license": "WTFPL OR ISC", + "license": "MIT", "dependencies": { - "truncate-utf8-bytes": "^1.0.0" + "nanoid": "^3.3.17", + "picocolors": "^1.1.1", + "source-map-js": "^1.2.1" + }, + "engines": { + "node": "^10 || ^12 || >=14" } }, - "node_modules/sax": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.6.1.tgz", - "integrity": "sha512-42tBVwLWnaQvW5zc4HbZrTuWccECCZfBi92FDuwtqxasH+JbPB3/FOKb1m222K42R4WxuxzzMsTswfzgtSu64Q==", - "license": "BlueOak-1.0.0", + "node_modules/proc-log": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-6.1.0.tgz", + "integrity": "sha512-iG+GYldRf2BQ0UDUAd6JQ/RwzaQy6mXmsk/IzlYyal4A4SNFw54MeH4/tLkF4I5WoWG9SQwuqWzS99jaFQHBuQ==", + "dev": true, + "license": "ISC", "engines": { - "node": ">=11.0.0" + "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/scheduler": { - "version": "0.23.2", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz", - "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==", + "node_modules/process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", + "dev": true, + "license": "MIT" + }, + "node_modules/progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "dev": true, "license": "MIT", - "dependencies": { - "loose-envify": "^1.1.0" + "engines": { + "node": ">=0.4.0" } }, - "node_modules/semver": { - "version": "7.8.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", - "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", - "license": "ISC", - "bin": { - "semver": "bin/semver.js" + "node_modules/promise-retry": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", + "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", + "dev": true, + "license": "MIT", + "dependencies": { + "err-code": "^2.0.2", + "retry": "^0.12.0" }, "engines": { "node": ">=10" } }, - "node_modules/semver-compare": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", - "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==", + "node_modules/promise-retry/node_modules/retry": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", + "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", "dev": true, "license": "MIT", - "optional": true + "engines": { + "node": ">= 4" + } }, - "node_modules/send": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/send/-/send-1.2.1.tgz", - "integrity": "sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ==", + "node_modules/proper-lockfile": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-4.1.2.tgz", + "integrity": "sha512-TjNPblN4BwAWMXU8s9AEz4JmQxnD1NNL7bNOY/AKUzyamc379FWASUhc/K1pL2noVb+XmZKLL68cjzLsiOAMaA==", + "dev": true, "license": "MIT", "dependencies": { - "debug": "^4.4.3", - "encodeurl": "^2.0.0", - "escape-html": "^1.0.3", - "etag": "^1.8.1", - "fresh": "^2.0.0", - "http-errors": "^2.0.1", - "mime-types": "^3.0.2", - "ms": "^2.1.3", - "on-finished": "^2.4.1", - "range-parser": "^1.2.1", - "statuses": "^2.0.2" - }, - "engines": { - "node": ">= 18" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" + "graceful-fs": "^4.2.4", + "retry": "^0.12.0", + "signal-exit": "^3.0.2" } }, - "node_modules/serialize-error": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz", - "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==", + "node_modules/proper-lockfile/node_modules/retry": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", + "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", "dev": true, "license": "MIT", - "optional": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/property-information": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/property-information/-/property-information-7.2.0.tgz", + "integrity": "sha512-IAtzIB6sUiWaJYrX9smp3V46pBGbBeLFRGdh25kg1334VcBlD8HzhPeNIWQH9zhGmo2itIe25EHt9dQP7G5hmg==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/protobufjs": { + "version": "7.6.5", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.6.5.tgz", + "integrity": "sha512-/FPD0nUc9jH6rfFjji9IBqOz4pcSE3CsT1m7Ep6Mdb0LxSUMj8hgl6GomOvZzpNpAqqGaXA0P3VSrZLFzIhQrw==", + "hasInstallScript": true, + "license": "BSD-3-Clause", "dependencies": { - "type-fest": "^0.13.1" + "@protobufjs/aspromise": "^1.1.2", + "@protobufjs/base64": "^1.1.2", + "@protobufjs/codegen": "^2.0.5", + "@protobufjs/eventemitter": "^1.1.1", + "@protobufjs/fetch": "^1.1.1", + "@protobufjs/float": "^1.0.2", + "@protobufjs/path": "^1.1.2", + "@protobufjs/pool": "^1.1.0", + "@protobufjs/utf8": "^1.1.1", + "@types/node": ">=13.7.0", + "long": "^5.3.2" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=12.0.0" } }, - "node_modules/serve-static": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.1.tgz", - "integrity": "sha512-xRXBn0pPqQTVQiC8wyQrKs2MOlX24zQ0POGaj0kultvoOCstBQM5yvOhAVSUwOMjQtTvsPWoNCHfPGwaaQJhTw==", + "node_modules/proxy-addr": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", "license": "MIT", "dependencies": { - "encodeurl": "^2.0.0", - "escape-html": "^1.0.3", - "parseurl": "^1.3.3", - "send": "^1.2.0" + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" }, "engines": { - "node": ">= 18" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" + "node": ">= 0.10" } }, - "node_modules/set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", - "license": "ISC" + "node_modules/pump": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.4.tgz", + "integrity": "sha512-VS7sjc6KR7e1ukRFhQSY5LM2uBWAUPiOPa/A3mkKmiMwSmRFUITt0xuj+/lesgnCv+dPIEYlkzrcyXgquIHMcA==", + "dev": true, + "license": "MIT", + "dependencies": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } }, - "node_modules/set-function-length": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", - "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "node_modules/pvtsutils": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/pvtsutils/-/pvtsutils-1.3.6.tgz", + "integrity": "sha512-PLgQXQ6H2FWCaeRak8vvk1GW462lMxB5s3Jm673N82zI4vqtVUPuZdffdZbPDFRoU8kAhItWFtPCWiPpp4/EDg==", "dev": true, "license": "MIT", "dependencies": { - "define-data-property": "^1.1.4", - "es-errors": "^1.3.0", - "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.4", - "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" + "tslib": "^2.8.1" } }, - "node_modules/setprototypeof": { + "node_modules/pvutils": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", - "license": "ISC" + "resolved": "https://registry.npmjs.org/pvutils/-/pvutils-1.2.0.tgz", + "integrity": "sha512-BbubeCEyTuQjVMakvJQ/Sxbc93F2pwmbsxONT/ZRrwU7Ua38d8unYTwXpTVLAKJ4BDuH9IGztCjQcd/N/39Dvg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=16.0.0" + } }, - "node_modules/sharp": { - "version": "0.35.3", - "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.35.3.tgz", - "integrity": "sha512-ej0zVHuZGHCiABXcNxeYhpRnPNPAcvbG8RMdBAhDAxLKkCRVSpK3Iyu7qbqw3JMzoj0REeM6f3tJLtVwl0023Q==", - "license": "Apache-2.0", + "node_modules/qrcode": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.5.4.tgz", + "integrity": "sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg==", + "license": "MIT", "dependencies": { - "@img/colour": "^1.1.0", - "detect-libc": "^2.1.2", - "semver": "^7.8.5" - }, - "engines": { - "node": ">=20.9.0" + "dijkstrajs": "^1.0.1", + "pngjs": "^5.0.0", + "yargs": "^15.3.1" }, - "funding": { - "url": "https://opencollective.com/libvips" + "bin": { + "qrcode": "bin/qrcode" }, - "optionalDependencies": { - "@img/sharp-darwin-arm64": "0.35.3", - "@img/sharp-darwin-x64": "0.35.3", - "@img/sharp-freebsd-wasm32": "0.35.3", - "@img/sharp-libvips-darwin-arm64": "1.3.2", - "@img/sharp-libvips-darwin-x64": "1.3.2", - "@img/sharp-libvips-linux-arm": "1.3.2", - "@img/sharp-libvips-linux-arm64": "1.3.2", - "@img/sharp-libvips-linux-ppc64": "1.3.2", - "@img/sharp-libvips-linux-riscv64": "1.3.2", - "@img/sharp-libvips-linux-s390x": "1.3.2", - "@img/sharp-libvips-linux-x64": "1.3.2", - "@img/sharp-libvips-linuxmusl-arm64": "1.3.2", - "@img/sharp-libvips-linuxmusl-x64": "1.3.2", - "@img/sharp-linux-arm": "0.35.3", - "@img/sharp-linux-arm64": "0.35.3", - "@img/sharp-linux-ppc64": "0.35.3", - "@img/sharp-linux-riscv64": "0.35.3", - "@img/sharp-linux-s390x": "0.35.3", - "@img/sharp-linux-x64": "0.35.3", - "@img/sharp-linuxmusl-arm64": "0.35.3", - "@img/sharp-linuxmusl-x64": "0.35.3", - "@img/sharp-webcontainers-wasm32": "0.35.3", - "@img/sharp-win32-arm64": "0.35.3", - "@img/sharp-win32-ia32": "0.35.3", - "@img/sharp-win32-x64": "0.35.3" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - } + "engines": { + "node": ">=10.13.0" } }, - "node_modules/shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "node_modules/qrcode/node_modules/cliui": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" + } + }, + "node_modules/qrcode/node_modules/wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", "license": "MIT", "dependencies": { - "shebang-regex": "^3.0.0" + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" }, "engines": { "node": ">=8" } }, - "node_modules/shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "node_modules/qrcode/node_modules/y18n": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", + "license": "ISC" + }, + "node_modules/qrcode/node_modules/yargs": { + "version": "15.4.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", + "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", "license": "MIT", + "dependencies": { + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^4.2.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^18.1.2" + }, "engines": { "node": ">=8" } }, - "node_modules/shiki": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/shiki/-/shiki-4.4.3.tgz", - "integrity": "sha512-Mb/GvXPHBAXdgGIcnfU5L3ldpn1XcxrGkPHwqgRx17/I2XRfqlFKk2vGkHWINn1kdXvzJZeuO3is6I9KLPFm0g==", - "license": "MIT", + "node_modules/qrcode/node_modules/yargs-parser": { + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", + "license": "ISC", "dependencies": { - "@shikijs/core": "4.4.3", - "@shikijs/engine-javascript": "4.4.3", - "@shikijs/engine-oniguruma": "4.4.3", - "@shikijs/langs": "4.4.3", - "@shikijs/themes": "4.4.3", - "@shikijs/types": "4.4.3", - "@shikijs/vscode-textmate": "^10.0.2", - "@types/hast": "^3.0.5" + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" }, "engines": { - "node": ">=20" + "node": ">=6" } }, - "node_modules/side-channel": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.1.tgz", - "integrity": "sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ==", - "license": "MIT", + "node_modules/qs": { + "version": "6.15.3", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.3.tgz", + "integrity": "sha512-O9gl3zCl5h5blw1KGUzQKhA5oUXSl8rwUIM5o0S3nCXMliSvy5Dzx7/DJcI+SwgICv+IneSZwhBh1oSyEHA71A==", + "license": "BSD-3-Clause", "dependencies": { - "es-errors": "^1.3.0", - "object-inspect": "^1.13.4", - "side-channel-list": "^1.0.1", - "side-channel-map": "^1.0.1", - "side-channel-weakmap": "^1.0.2" + "es-define-property": "^1.0.1", + "side-channel": "^1.1.1" }, "engines": { - "node": ">= 0.4" + "node": ">=0.6" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/side-channel-list": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.1.tgz", - "integrity": "sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w==", + "node_modules/quick-lru": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", + "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", + "dev": true, "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0", - "object-inspect": "^1.13.4" - }, "engines": { - "node": ">= 0.4" + "node": ">=10" }, "funding": { - "url": "https://github.com/sponsors/ljharb" + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/side-channel-map": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", - "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "node_modules/range-parser": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.3.0.tgz", + "integrity": "sha512-hek2mFQpPuI4E1BBKrSto+BU3e3x4xuarsbiwr3+lf7p44juvFMV0XFWQAP3xUyqXA4RrXLIoaSUGbSt056ZMw==", "license": "MIT", - "dependencies": { - "call-bound": "^1.0.2", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.5", - "object-inspect": "^1.13.3" - }, "engines": { - "node": ">= 0.4" + "node": ">= 0.6" }, "funding": { - "url": "https://github.com/sponsors/ljharb" + "type": "opencollective", + "url": "https://opencollective.com/express" } }, - "node_modules/side-channel-weakmap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", - "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "node_modules/raw-body": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.2.tgz", + "integrity": "sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA==", "license": "MIT", "dependencies": { - "call-bound": "^1.0.2", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.5", - "object-inspect": "^1.13.3", - "side-channel-map": "^1.0.1" + "bytes": "~3.1.2", + "http-errors": "~2.0.1", + "iconv-lite": "~0.7.0", + "unpipe": "~1.0.0" }, "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "node": ">= 0.10" } }, - "node_modules/siginfo": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz", - "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==", - "dev": true, - "license": "ISC" - }, - "node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/simple-update-notifier": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz", - "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==", - "dev": true, + "node_modules/react": { + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz", + "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==", "license": "MIT", "dependencies": { - "semver": "^7.5.3" + "loose-envify": "^1.1.0" }, "engines": { - "node": ">=10" + "node": ">=0.10.0" } }, - "node_modules/slash": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz", - "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==", - "dev": true, + "node_modules/react-dom": { + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz", + "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==", "license": "MIT", - "engines": { - "node": ">=6" + "dependencies": { + "loose-envify": "^1.1.0", + "scheduler": "^0.23.2" + }, + "peerDependencies": { + "react": "^18.3.1" } }, - "node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "node_modules/read-binary-file-arch": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/read-binary-file-arch/-/read-binary-file-arch-1.0.6.tgz", + "integrity": "sha512-BNg9EN3DD3GsDXX7Aa8O4p92sryjkmzYYgmgTAc6CA4uGLEDzFfxOxugu21akOxpcXHiEgsYkC6nPsQvLLLmEg==", "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" + "license": "MIT", + "dependencies": { + "debug": "^4.3.4" + }, + "bin": { + "read-binary-file-arch": "cli.js" } }, - "node_modules/source-map-js": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", - "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "node_modules/readable-stream": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "dev": true, "license": "MIT", "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "node_modules/space-separated-tokens": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz", - "integrity": "sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, - "node_modules/sprintf-js": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", - "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", - "dev": true, - "license": "BSD-3-Clause", - "optional": true - }, - "node_modules/stackback": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz", - "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==", + "node_modules/readable-stream/node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true, "license": "MIT" }, - "node_modules/stat-mode": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-1.0.0.tgz", - "integrity": "sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg==", - "dev": true, + "node_modules/readdirp": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", + "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==", "license": "MIT", "engines": { - "node": ">= 6" + "node": ">= 14.18.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" } }, - "node_modules/statuses": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", - "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", + "node_modules/regex": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/regex/-/regex-6.1.0.tgz", + "integrity": "sha512-6VwtthbV4o/7+OaAF9I5L5V3llLEsoPyq9P1JVXkedTP33c7MfCG0/5NOPcSJn0TzXcG9YUrR0gQSWioew3LDg==", "license": "MIT", - "engines": { - "node": ">= 0.8" + "dependencies": { + "regex-utilities": "^2.3.0" } }, - "node_modules/std-env": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/std-env/-/std-env-4.2.0.tgz", - "integrity": "sha512-oCUKSupKTHX53EyjDtuZQ64pjLJ6yYCtpmEw0goYxtjG9KpbRe8KAsl2tBUGU9DyMcJ0RwJ8GqJAFzMXcXW1Rw==", - "dev": true, - "license": "MIT" - }, - "node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, + "node_modules/regex-recursion": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/regex-recursion/-/regex-recursion-6.0.2.tgz", + "integrity": "sha512-0YCaSCq2VRIebiaUviZNs0cBz1kg5kVS2UKUfNIx8YVs1cN3AV7NTctO5FOKBA+UT2BPJIWZauYHPqJODG50cg==", "license": "MIT", "dependencies": { - "safe-buffer": "~5.1.0" + "regex-utilities": "^2.3.0" } }, - "node_modules/string_decoder/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true, + "node_modules/regex-utilities": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/regex-utilities/-/regex-utilities-2.3.0.tgz", + "integrity": "sha512-8VhliFJAWRaUiVvREIiW2NXXTmHs4vMNnSzuJVhscgmGav3g9VDxLrQndI3dZZVVdp0ZO/5v0xmX516/7M9cng==", "license": "MIT" }, - "node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, "engines": { - "node": ">=8" - } - }, - "node_modules/stringify-entities": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.4.tgz", - "integrity": "sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==", - "license": "MIT", - "dependencies": { - "character-entities-html4": "^2.0.0", - "character-entities-legacy": "^3.0.0" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" + "node": ">=0.10.0" } }, - "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "node_modules/require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, "engines": { - "node": ">=8" + "node": ">=0.10.0" } }, - "node_modules/sumchecker": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz", - "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "debug": "^4.1.0" - }, - "engines": { - "node": ">= 8.0" - } + "node_modules/require-main-filename": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", + "license": "ISC" }, - "node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "node_modules/resedit": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/resedit/-/resedit-1.7.2.tgz", + "integrity": "sha512-vHjcY2MlAITJhC0eRD/Vv8Vlgmu9Sd3LX9zZvtGzU5ZImdTN3+d6e/4mnTyV8vEbyf1sgNIrWxhWlrys52OkEA==", "dev": true, "license": "MIT", "dependencies": { - "has-flag": "^4.0.0" + "pe-library": "^0.4.1" }, "engines": { - "node": ">=8" + "node": ">=12", + "npm": ">=6" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/jet2jet" } }, - "node_modules/tar": { - "version": "7.5.22", - "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.22.tgz", - "integrity": "sha512-MFO/QzvtAOmJbkhOaCTvbGcFN9L9b+JunIsDwaKljSOdcLMea3NJ1k9Usz/rjdfSXTq4dfzfeS7W4p4YOAAHeA==", + "node_modules/resolve-alpn": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz", + "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==", "dev": true, - "license": "BlueOak-1.0.0", + "license": "MIT" + }, + "node_modules/responselike": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz", + "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==", + "dev": true, + "license": "MIT", "dependencies": { - "@isaacs/fs-minipass": "^4.0.0", - "chownr": "^3.0.0", - "minipass": "^7.1.2", - "minizlib": "^3.1.0", - "yallist": "^5.0.0" + "lowercase-keys": "^2.0.0" }, - "engines": { - "node": ">=18" + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/tar/node_modules/yallist": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", - "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==", - "dev": true, - "license": "BlueOak-1.0.0", + "node_modules/retry": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz", + "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==", + "license": "MIT", "engines": { - "node": ">=18" + "node": ">= 4" } }, - "node_modules/temp": { - "version": "0.9.4", - "resolved": "https://registry.npmjs.org/temp/-/temp-0.9.4.tgz", - "integrity": "sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==", + "node_modules/rimraf": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", "dev": true, - "license": "MIT", + "license": "ISC", "peer": true, "dependencies": { - "mkdirp": "^0.5.1", - "rimraf": "~2.6.2" + "glob": "^7.1.3" }, - "engines": { - "node": ">=6.0.0" + "bin": { + "rimraf": "bin.js" } }, - "node_modules/temp-file": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/temp-file/-/temp-file-3.4.0.tgz", - "integrity": "sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg==", + "node_modules/roarr": { + "version": "2.15.4", + "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz", + "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==", "dev": true, - "license": "MIT", + "license": "BSD-3-Clause", + "optional": true, "dependencies": { - "async-exit-hook": "^2.0.1", - "fs-extra": "^10.0.0" + "boolean": "^3.0.1", + "detect-node": "^2.0.4", + "globalthis": "^1.0.1", + "json-stringify-safe": "^5.0.1", + "semver-compare": "^1.0.0", + "sprintf-js": "^1.1.2" + }, + "engines": { + "node": ">=8.0" } }, - "node_modules/tiny-async-pool": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/tiny-async-pool/-/tiny-async-pool-1.3.0.tgz", - "integrity": "sha512-01EAw5EDrcVrdgyCLgoSPvqznC0sVxDSVeiOz09FUpjh71G79VCqneOr+xvt7T1r76CF6ZZfPjHorN2+d+3mqA==", + "node_modules/rollup": { + "version": "4.62.4", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.62.4.tgz", + "integrity": "sha512-RXOqwaPsBGjMNMa4sQjDjHieHEZDFoj/Rdr46l2MU5DfEs16wHJPC2RPTPHWhNl+M3aI472LLqFkFKut4SblOg==", "dev": true, "license": "MIT", "dependencies": { - "semver": "^5.5.0" - } - }, - "node_modules/tiny-async-pool/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", - "dev": true, - "license": "ISC", + "@types/estree": "1.0.9" + }, "bin": { - "semver": "bin/semver" - } - }, - "node_modules/tiny-typed-emitter": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz", - "integrity": "sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA==", - "license": "MIT" - }, - "node_modules/tinybench": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz", - "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==", - "dev": true, - "license": "MIT" - }, - "node_modules/tinyexec": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.3.0.tgz", - "integrity": "sha512-QKAl9m8gWWGHV8jZcPeym6j+XULi6tOf1mT83WYJ4Lk2ytW/uwAWkrP0uFsdoYMdueVJ0qs26wZ+23xeB4ibNQ==", - "dev": true, - "license": "MIT", + "rollup": "dist/bin/rollup" + }, "engines": { - "node": ">=18" + "node": ">=18.0.0", + "npm": ">=8.0.0" + }, + "optionalDependencies": { + "@napi-rs/lzma-linux-x64-gnu": "1.5.1", + "@rollup/rollup-android-arm-eabi": "4.62.4", + "@rollup/rollup-android-arm64": "4.62.4", + "@rollup/rollup-darwin-arm64": "4.62.4", + "@rollup/rollup-darwin-x64": "4.62.4", + "@rollup/rollup-freebsd-arm64": "4.62.4", + "@rollup/rollup-freebsd-x64": "4.62.4", + "@rollup/rollup-linux-arm-gnueabihf": "4.62.4", + "@rollup/rollup-linux-arm-musleabihf": "4.62.4", + "@rollup/rollup-linux-arm64-gnu": "4.62.4", + "@rollup/rollup-linux-arm64-musl": "4.62.4", + "@rollup/rollup-linux-loong64-gnu": "4.62.4", + "@rollup/rollup-linux-loong64-musl": "4.62.4", + "@rollup/rollup-linux-ppc64-gnu": "4.62.4", + "@rollup/rollup-linux-ppc64-musl": "4.62.4", + "@rollup/rollup-linux-riscv64-gnu": "4.62.4", + "@rollup/rollup-linux-riscv64-musl": "4.62.4", + "@rollup/rollup-linux-s390x-gnu": "4.62.4", + "@rollup/rollup-linux-x64-gnu": "4.62.4", + "@rollup/rollup-linux-x64-musl": "4.62.4", + "@rollup/rollup-openbsd-x64": "4.62.4", + "@rollup/rollup-openharmony-arm64": "4.62.4", + "@rollup/rollup-win32-arm64-msvc": "4.62.4", + "@rollup/rollup-win32-ia32-msvc": "4.62.4", + "@rollup/rollup-win32-x64-gnu": "4.62.4", + "@rollup/rollup-win32-x64-msvc": "4.62.4", + "fsevents": "~2.3.2" } }, - "node_modules/tinyglobby": { - "version": "0.2.17", - "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.17.tgz", - "integrity": "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==", - "dev": true, + "node_modules/router": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz", + "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==", "license": "MIT", "dependencies": { - "fdir": "^6.5.0", - "picomatch": "^4.0.4" + "debug": "^4.4.0", + "depd": "^2.0.0", + "is-promise": "^4.0.0", + "parseurl": "^1.3.3", + "path-to-regexp": "^8.0.0" }, "engines": { - "node": ">=12.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/SuperchupuDev" + "node": ">= 18" } }, - "node_modules/tinyrainbow": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.1.1.tgz", - "integrity": "sha512-yau8yJdTt989Mm0Bd/236QnzEiPf2xLLTqUZRUJOo/3CB078LSwzei343DgtJVmfJKJE3TMINY1u42SQsP6mXw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=14.0.0" - } + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" }, - "node_modules/tmp": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.7.tgz", - "integrity": "sha512-e0votIpp4Uo2AJYSzVHV6xCcawuiez3DzqDAbrTc3YxBkplN6e+dM13ZeIcZnDg/QpSuU2zfZ3rzwY8ukEnaXw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=14.14" - } + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "license": "MIT" }, - "node_modules/tmp-promise": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.3.tgz", - "integrity": "sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==", + "node_modules/sanitize-filename": { + "version": "1.6.4", + "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.4.tgz", + "integrity": "sha512-9ZyI08PsvdQl2r/bBIGubpVdR3RR9sY6RDiWFPreA21C/EFlQhmgo20UZlNjZMMZNubusLhAQozkA0Od5J21Eg==", "dev": true, - "license": "MIT", + "license": "WTFPL OR ISC", "dependencies": { - "tmp": "^0.2.0" + "truncate-utf8-bytes": "^1.0.0" } }, - "node_modules/to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, + "node_modules/sanitize-html": { + "version": "2.17.7", + "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.17.7.tgz", + "integrity": "sha512-PGtEkc9cbnedU3s9TmzDbpsZ8w086g/0Q8k8/oIO1NLNU3i5k9yn835CrjJSajp1KMmkisbO1qPXxNKO3welAg==", "license": "MIT", "dependencies": { - "is-number": "^7.0.0" + "deepmerge": "^4.2.2", + "escape-string-regexp": "^4.0.0", + "htmlparser2": "^12.0.0", + "is-plain-object": "^5.0.0", + "launder": "^1.7.1", + "parse-srcset": "^1.0.2", + "postcss": "^8.3.11" }, "engines": { - "node": ">=8.0" + "node": ">=22.12.0" } }, - "node_modules/toidentifier": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", - "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "node_modules/sanitize-html/node_modules/dom-serializer": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-3.1.1.tgz", + "integrity": "sha512-4MEa38/QexBob6gFNwu+EGdWvhJ1OKuNwdYY3Y3NyeWDQfnGeDYQUDfIRzWu5B5gsv03so2Uxd28YC6zrsx3Lw==", "license": "MIT", + "dependencies": { + "domelementtype": "^3.0.0", + "domhandler": "^6.0.0", + "entities": "^8.0.0" + }, "engines": { - "node": ">=0.6" - } - }, - "node_modules/trim-lines": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz", - "integrity": "sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==", - "license": "MIT", + "node": ">=20.19.0" + }, "funding": { "type": "github", - "url": "https://github.com/sponsors/wooorm" + "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, - "node_modules/truncate-utf8-bytes": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz", - "integrity": "sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ==", - "dev": true, - "license": "WTFPL", - "dependencies": { - "utf8-byte-length": "^1.0.1" + "node_modules/sanitize-html/node_modules/domelementtype": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-3.0.0.tgz", + "integrity": "sha512-umCQid3jKbDmVjx8jGaW7uUykm4DEUeyV21hPxNMo2nV955DhUThwqyOIDtreepP31hl84X7G5U9ZfsWvIB3Pg==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "license": "BSD-2-Clause", + "engines": { + "node": ">=20.19.0" } }, - "node_modules/ts-algebra": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ts-algebra/-/ts-algebra-2.0.0.tgz", - "integrity": "sha512-FPAhNPFMrkwz76P7cdjdmiShwMynZYN6SgOujD1urY4oNm80Ou9oMdmbR45LotcKOXoy7wSmHkRFE6Mxbrhefw==", - "license": "MIT" - }, - "node_modules/tslib": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", - "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", - "license": "0BSD" - }, - "node_modules/turndown": { - "version": "7.2.4", - "resolved": "https://registry.npmjs.org/turndown/-/turndown-7.2.4.tgz", - "integrity": "sha512-I8yFsfRzmzK0WV1pNNOA4A7y4RDfFxPRxb3t+e3ui14qSGOxGtiSP6GjeX+Y6CHb7HYaFj7ECUD7VE5kQMZWGQ==", - "license": "MIT", + "node_modules/sanitize-html/node_modules/domhandler": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-6.0.1.tgz", + "integrity": "sha512-gYzvtM72ZtxQO0T048kd6HWSbbGCNOUwcnfQ01cqIJ4X2IYKFFHZ5mKvrQETcFXxsRObZulDaKmy//R7TPtsBg==", + "license": "BSD-2-Clause", "dependencies": { - "@mixmark-io/domino": "^2.2.0" + "domelementtype": "^3.0.0" }, "engines": { - "node": ">=18", - "npm": ">=9" + "node": ">=20.19.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/fb55/domhandler?sponsor=1" } }, - "node_modules/type-fest": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", - "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", - "dev": true, - "license": "(MIT OR CC0-1.0)", - "optional": true, + "node_modules/sanitize-html/node_modules/domutils": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-4.0.2.tgz", + "integrity": "sha512-qI4JLRKnSzqFqr7hAlS5xQDusBCjKSEG4t4+7aNrIQMHBcsC2TGEhuyABJdYkgSewL57PNLYEiibY2iPKhKpaA==", + "license": "BSD-2-Clause", + "dependencies": { + "dom-serializer": "^3.0.0", + "domelementtype": "^3.0.0", + "domhandler": "^6.0.0" + }, "engines": { - "node": ">=10" + "node": ">=20.19.0" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "type": "github", + "url": "https://github.com/fb55/domutils?sponsor=1" } }, - "node_modules/type-is": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.1.0.tgz", - "integrity": "sha512-faYHw0anBbc/kWF3zFTEnxSFOAGUX9GFbOBthvDdLsIlEoWOFOtS0zgCiQYwIskL9iGXZL3kAXD8OoZ4GmMATA==", - "license": "MIT", - "dependencies": { - "content-type": "^2.0.0", - "media-typer": "^1.1.0", - "mime-types": "^3.0.0" - }, + "node_modules/sanitize-html/node_modules/entities": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-8.0.0.tgz", + "integrity": "sha512-zwfzJecQ/Uej6tusMqwAqU/6KL2XaB2VZ2Jg54Je6ahNBGNH6Ek6g3jjNCF0fG9EWQKGZNddNjU5F1ZQn/sBnA==", + "license": "BSD-2-Clause", "engines": { - "node": ">= 18" + "node": ">=20.19.0" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" + "url": "https://github.com/fb55/entities?sponsor=1" } }, - "node_modules/type-is/node_modules/content-type": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-2.1.0.tgz", - "integrity": "sha512-mj7UPXE0jaqaOsukNZRUEfEi2AcL7C/vwmwcHV0O97eO1E1pxBZuyjlZrx5seTaNBg1U6+o35wpa35Qfcc+7ag==", + "node_modules/sanitize-html/node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "license": "MIT", "engines": { - "node": ">=18" + "node": ">=10" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/typebox": { - "version": "1.1.38", - "resolved": "https://registry.npmjs.org/typebox/-/typebox-1.1.38.tgz", - "integrity": "sha512-pZ0aQPmMmXoUvSbeuWf/Hzsc+avNw/Zd6VeE8CFgkVGWyuHPJvqeJJDeJqLve+K70LvjYIoleGcoJHPT17cWoA==", - "license": "MIT" - }, - "node_modules/typescript": { - "version": "5.9.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", - "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", - "dev": true, - "license": "Apache-2.0", - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" + "node_modules/sanitize-html/node_modules/htmlparser2": { + "version": "12.0.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-12.0.0.tgz", + "integrity": "sha512-Tz7u1i95/g2x2jz81+x0FBVhBhY5aRTvD3tXXdFaljuNdzDLJ8UGNRrTcj2cgQvAg3iW/h77Fz15nLW0L0CrZw==", + "funding": [ + "https://github.com/fb55/htmlparser2?sponsor=1", + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "license": "MIT", + "dependencies": { + "domelementtype": "^3.0.0", + "domhandler": "^6.0.0", + "domutils": "^4.0.2", + "entities": "^8.0.0" }, "engines": { - "node": ">=14.17" + "node": ">=20.19.0" } }, - "node_modules/undici": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-7.29.0.tgz", - "integrity": "sha512-IDxfleLmmbSskfWSUATiN1nfn2rDuvnMOqb5CWR92iIfojA0Ud+ulOAAEQ57LPr9rWmsreUyf5lwyao+7GNNVw==", - "dev": true, - "license": "MIT", - "optional": true, + "node_modules/sax": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.6.1.tgz", + "integrity": "sha512-42tBVwLWnaQvW5zc4HbZrTuWccECCZfBi92FDuwtqxasH+JbPB3/FOKb1m222K42R4WxuxzzMsTswfzgtSu64Q==", + "license": "BlueOak-1.0.0", "engines": { - "node": ">=20.18.1" + "node": ">=11.0.0" } }, - "node_modules/undici-types": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz", - "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==", - "license": "MIT" - }, - "node_modules/unist-util-is": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.1.tgz", - "integrity": "sha512-LsiILbtBETkDz8I9p1dQ0uyRUWuaQzd/cuEeS1hoRSyW5E5XGmTzlwY1OrNzzakGowI9Dr/I8HVaw4hTtnxy8g==", + "node_modules/scheduler": { + "version": "0.23.2", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz", + "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==", "license": "MIT", "dependencies": { - "@types/unist": "^3.0.0" + "loose-envify": "^1.1.0" + } + }, + "node_modules/semver": { + "version": "7.8.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", + "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" + "engines": { + "node": ">=10" } }, - "node_modules/unist-util-position": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-5.0.0.tgz", - "integrity": "sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==", + "node_modules/semver-compare": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", + "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==", + "dev": true, + "license": "MIT", + "optional": true + }, + "node_modules/send": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/send/-/send-1.2.1.tgz", + "integrity": "sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ==", "license": "MIT", "dependencies": { - "@types/unist": "^3.0.0" + "debug": "^4.4.3", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "etag": "^1.8.1", + "fresh": "^2.0.0", + "http-errors": "^2.0.1", + "mime-types": "^3.0.2", + "ms": "^2.1.3", + "on-finished": "^2.4.1", + "range-parser": "^1.2.1", + "statuses": "^2.0.2" + }, + "engines": { + "node": ">= 18" }, "funding": { "type": "opencollective", - "url": "https://opencollective.com/unified" + "url": "https://opencollective.com/express" } }, - "node_modules/unist-util-remove-position": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-5.0.0.tgz", - "integrity": "sha512-Hp5Kh3wLxv0PHj9m2yZhhLt58KzPtEYKQQ4yxfYFEO7EvHwzyDYnduhHnY1mDxoqr7VUwVuHXk9RXKIiYS1N8Q==", + "node_modules/serialize-error": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz", + "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==", + "dev": true, "license": "MIT", + "optional": true, "dependencies": { - "@types/unist": "^3.0.0", - "unist-util-visit": "^5.0.0" + "type-fest": "^0.13.1" + }, + "engines": { + "node": ">=10" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/unist-util-stringify-position": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz", - "integrity": "sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==", + "node_modules/serve-static": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.1.tgz", + "integrity": "sha512-xRXBn0pPqQTVQiC8wyQrKs2MOlX24zQ0POGaj0kultvoOCstBQM5yvOhAVSUwOMjQtTvsPWoNCHfPGwaaQJhTw==", "license": "MIT", "dependencies": { - "@types/unist": "^3.0.0" + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "parseurl": "^1.3.3", + "send": "^1.2.0" + }, + "engines": { + "node": ">= 18" }, "funding": { "type": "opencollective", - "url": "https://opencollective.com/unified" + "url": "https://opencollective.com/express" } }, - "node_modules/unist-util-visit": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.1.0.tgz", - "integrity": "sha512-m+vIdyeCOpdr/QeQCu2EzxX/ohgS8KbnPDgFni4dQsfSCtpz8UqDyY5GjRru8PDKuYn7Fq19j1CQ+nJSsGKOzg==", + "node_modules/set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", + "license": "ISC" + }, + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "dev": true, "license": "MIT", "dependencies": { - "@types/unist": "^3.0.0", - "unist-util-is": "^6.0.0", - "unist-util-visit-parents": "^6.0.0" + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" + "engines": { + "node": ">= 0.4" } }, - "node_modules/unist-util-visit-parents": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.2.tgz", - "integrity": "sha512-goh1s1TBrqSqukSc8wrjwWhL0hiJxgA8m4kFxGlQ+8FYQ3C/m11FcTs4YYem7V664AhHVvgoQLk890Ssdsr2IQ==", - "license": "MIT", + "node_modules/setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", + "license": "ISC" + }, + "node_modules/sharp": { + "version": "0.35.3", + "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.35.3.tgz", + "integrity": "sha512-ej0zVHuZGHCiABXcNxeYhpRnPNPAcvbG8RMdBAhDAxLKkCRVSpK3Iyu7qbqw3JMzoj0REeM6f3tJLtVwl0023Q==", + "license": "Apache-2.0", "dependencies": { - "@types/unist": "^3.0.0", - "unist-util-is": "^6.0.0" + "@img/colour": "^1.1.0", + "detect-libc": "^2.1.2", + "semver": "^7.8.5" + }, + "engines": { + "node": ">=20.9.0" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-darwin-arm64": "0.35.3", + "@img/sharp-darwin-x64": "0.35.3", + "@img/sharp-freebsd-wasm32": "0.35.3", + "@img/sharp-libvips-darwin-arm64": "1.3.2", + "@img/sharp-libvips-darwin-x64": "1.3.2", + "@img/sharp-libvips-linux-arm": "1.3.2", + "@img/sharp-libvips-linux-arm64": "1.3.2", + "@img/sharp-libvips-linux-ppc64": "1.3.2", + "@img/sharp-libvips-linux-riscv64": "1.3.2", + "@img/sharp-libvips-linux-s390x": "1.3.2", + "@img/sharp-libvips-linux-x64": "1.3.2", + "@img/sharp-libvips-linuxmusl-arm64": "1.3.2", + "@img/sharp-libvips-linuxmusl-x64": "1.3.2", + "@img/sharp-linux-arm": "0.35.3", + "@img/sharp-linux-arm64": "0.35.3", + "@img/sharp-linux-ppc64": "0.35.3", + "@img/sharp-linux-riscv64": "0.35.3", + "@img/sharp-linux-s390x": "0.35.3", + "@img/sharp-linux-x64": "0.35.3", + "@img/sharp-linuxmusl-arm64": "0.35.3", + "@img/sharp-linuxmusl-x64": "0.35.3", + "@img/sharp-webcontainers-wasm32": "0.35.3", + "@img/sharp-win32-arm64": "0.35.3", + "@img/sharp-win32-ia32": "0.35.3", + "@img/sharp-win32-x64": "0.35.3" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, - "node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, "engines": { - "node": ">= 10.0.0" + "node": ">=8" } }, - "node_modules/unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "license": "MIT", "engines": { - "node": ">= 0.8" + "node": ">=8" } }, - "node_modules/unzipper": { - "version": "0.12.5", - "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.12.5.tgz", - "integrity": "sha512-tXYOi9R57Uj/2Z25SOs5RRSzq886MBQj2gY8dPL+xl/kv6s6SvByoKfAtvfVeEuhntWDgjd2o9p2lb4TVPAz0A==", - "dev": true, + "node_modules/shiki": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/shiki/-/shiki-4.4.3.tgz", + "integrity": "sha512-Mb/GvXPHBAXdgGIcnfU5L3ldpn1XcxrGkPHwqgRx17/I2XRfqlFKk2vGkHWINn1kdXvzJZeuO3is6I9KLPFm0g==", "license": "MIT", "dependencies": { - "bluebird": "~3.7.2", - "duplexer2": "~0.1.4", - "fs-extra": "11.3.1", - "graceful-fs": "^4.2.2", - "node-int64": "^0.4.0" + "@shikijs/core": "4.4.3", + "@shikijs/engine-javascript": "4.4.3", + "@shikijs/engine-oniguruma": "4.4.3", + "@shikijs/langs": "4.4.3", + "@shikijs/themes": "4.4.3", + "@shikijs/types": "4.4.3", + "@shikijs/vscode-textmate": "^10.0.2", + "@types/hast": "^3.0.5" + }, + "engines": { + "node": ">=20" + } + }, + "node_modules/side-channel": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.1.tgz", + "integrity": "sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.4", + "side-channel-list": "^1.0.1", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-list": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.1.tgz", + "integrity": "sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/siginfo": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz", + "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==", + "dev": true, + "license": "ISC" + }, + "node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/simple-update-notifier": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz", + "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^7.5.3" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/slash": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz", + "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-js": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-support": { + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "dev": true, + "license": "MIT", + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/space-separated-tokens": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz", + "integrity": "sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/sprintf-js": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", + "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", + "dev": true, + "license": "BSD-3-Clause", + "optional": true + }, + "node_modules/stackback": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz", + "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==", + "dev": true, + "license": "MIT" + }, + "node_modules/stat-mode": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-1.0.0.tgz", + "integrity": "sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 6" + } + }, + "node_modules/statuses": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", + "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/std-env": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/std-env/-/std-env-4.2.0.tgz", + "integrity": "sha512-oCUKSupKTHX53EyjDtuZQ64pjLJ6yYCtpmEw0goYxtjG9KpbRe8KAsl2tBUGU9DyMcJ0RwJ8GqJAFzMXcXW1Rw==", + "dev": true, + "license": "MIT" + }, + "node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/string_decoder/node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true, + "license": "MIT" + }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/stringify-entities": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.4.tgz", + "integrity": "sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==", + "license": "MIT", + "dependencies": { + "character-entities-html4": "^2.0.0", + "character-entities-legacy": "^3.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/sumchecker": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz", + "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "debug": "^4.1.0" + }, + "engines": { + "node": ">= 8.0" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/table-layout": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/table-layout/-/table-layout-4.1.1.tgz", + "integrity": "sha512-iK5/YhZxq5GO5z8wb0bY1317uDF3Zjpha0QFFLA8/trAoiLbQD0HUbMesEaxyzUgDxi2QlcbM8IvqOlEjgoXBA==", + "license": "MIT", + "dependencies": { + "array-back": "^6.2.2", + "wordwrapjs": "^5.1.0" + }, + "engines": { + "node": ">=12.17" + } + }, + "node_modules/table-layout/node_modules/array-back": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/array-back/-/array-back-6.2.3.tgz", + "integrity": "sha512-SGDvmg6QTYiTxCBkYVmThcoa67uLl35pyzRHdpCGBOcqFy6BtwnphoFPk7LhJshD+Yk1Kt35WGWeZPTgwR4Fhw==", + "license": "MIT", + "engines": { + "node": ">=12.17" + } + }, + "node_modules/tar": { + "version": "7.5.22", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.22.tgz", + "integrity": "sha512-MFO/QzvtAOmJbkhOaCTvbGcFN9L9b+JunIsDwaKljSOdcLMea3NJ1k9Usz/rjdfSXTq4dfzfeS7W4p4YOAAHeA==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "@isaacs/fs-minipass": "^4.0.0", + "chownr": "^3.0.0", + "minipass": "^7.1.2", + "minizlib": "^3.1.0", + "yallist": "^5.0.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/tar/node_modules/yallist": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", + "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==", + "dev": true, + "license": "BlueOak-1.0.0", + "engines": { + "node": ">=18" + } + }, + "node_modules/temp": { + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/temp/-/temp-0.9.4.tgz", + "integrity": "sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "mkdirp": "^0.5.1", + "rimraf": "~2.6.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/temp-file": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/temp-file/-/temp-file-3.4.0.tgz", + "integrity": "sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg==", + "dev": true, + "license": "MIT", + "dependencies": { + "async-exit-hook": "^2.0.1", + "fs-extra": "^10.0.0" + } + }, + "node_modules/tiny-async-pool": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/tiny-async-pool/-/tiny-async-pool-1.3.0.tgz", + "integrity": "sha512-01EAw5EDrcVrdgyCLgoSPvqznC0sVxDSVeiOz09FUpjh71G79VCqneOr+xvt7T1r76CF6ZZfPjHorN2+d+3mqA==", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^5.5.0" + } + }, + "node_modules/tiny-async-pool/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/tiny-typed-emitter": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz", + "integrity": "sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA==", + "license": "MIT" + }, + "node_modules/tinybench": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz", + "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==", + "dev": true, + "license": "MIT" + }, + "node_modules/tinyexec": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.3.0.tgz", + "integrity": "sha512-QKAl9m8gWWGHV8jZcPeym6j+XULi6tOf1mT83WYJ4Lk2ytW/uwAWkrP0uFsdoYMdueVJ0qs26wZ+23xeB4ibNQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + } + }, + "node_modules/tinyglobby": { + "version": "0.2.17", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.17.tgz", + "integrity": "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fdir": "^6.5.0", + "picomatch": "^4.0.4" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/SuperchupuDev" + } + }, + "node_modules/tinyrainbow": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.1.1.tgz", + "integrity": "sha512-yau8yJdTt989Mm0Bd/236QnzEiPf2xLLTqUZRUJOo/3CB078LSwzei343DgtJVmfJKJE3TMINY1u42SQsP6mXw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/tmp": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.7.tgz", + "integrity": "sha512-e0votIpp4Uo2AJYSzVHV6xCcawuiez3DzqDAbrTc3YxBkplN6e+dM13ZeIcZnDg/QpSuU2zfZ3rzwY8ukEnaXw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.14" + } + }, + "node_modules/tmp-promise": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.3.tgz", + "integrity": "sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "tmp": "^0.2.0" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "license": "MIT", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/trim-lines": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz", + "integrity": "sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/truncate-utf8-bytes": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz", + "integrity": "sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ==", + "dev": true, + "license": "WTFPL", + "dependencies": { + "utf8-byte-length": "^1.0.1" + } + }, + "node_modules/ts-algebra": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ts-algebra/-/ts-algebra-2.0.0.tgz", + "integrity": "sha512-FPAhNPFMrkwz76P7cdjdmiShwMynZYN6SgOujD1urY4oNm80Ou9oMdmbR45LotcKOXoy7wSmHkRFE6Mxbrhefw==", + "license": "MIT" + }, + "node_modules/tslib": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "license": "0BSD" + }, + "node_modules/turndown": { + "version": "7.2.4", + "resolved": "https://registry.npmjs.org/turndown/-/turndown-7.2.4.tgz", + "integrity": "sha512-I8yFsfRzmzK0WV1pNNOA4A7y4RDfFxPRxb3t+e3ui14qSGOxGtiSP6GjeX+Y6CHb7HYaFj7ECUD7VE5kQMZWGQ==", + "license": "MIT", + "dependencies": { + "@mixmark-io/domino": "^2.2.0" + }, + "engines": { + "node": ">=18", + "npm": ">=9" + } + }, + "node_modules/type-fest": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", + "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "optional": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/type-is": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.1.0.tgz", + "integrity": "sha512-faYHw0anBbc/kWF3zFTEnxSFOAGUX9GFbOBthvDdLsIlEoWOFOtS0zgCiQYwIskL9iGXZL3kAXD8OoZ4GmMATA==", + "license": "MIT", + "dependencies": { + "content-type": "^2.0.0", + "media-typer": "^1.1.0", + "mime-types": "^3.0.0" + }, + "engines": { + "node": ">= 18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/type-is/node_modules/content-type": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-2.1.0.tgz", + "integrity": "sha512-mj7UPXE0jaqaOsukNZRUEfEi2AcL7C/vwmwcHV0O97eO1E1pxBZuyjlZrx5seTaNBg1U6+o35wpa35Qfcc+7ag==", + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/typebox": { + "version": "1.1.38", + "resolved": "https://registry.npmjs.org/typebox/-/typebox-1.1.38.tgz", + "integrity": "sha512-pZ0aQPmMmXoUvSbeuWf/Hzsc+avNw/Zd6VeE8CFgkVGWyuHPJvqeJJDeJqLve+K70LvjYIoleGcoJHPT17cWoA==", + "license": "MIT" + }, + "node_modules/typescript": { + "version": "5.9.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", + "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/typical": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz", + "integrity": "sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/undici": { + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-7.29.0.tgz", + "integrity": "sha512-IDxfleLmmbSskfWSUATiN1nfn2rDuvnMOqb5CWR92iIfojA0Ud+ulOAAEQ57LPr9rWmsreUyf5lwyao+7GNNVw==", + "license": "MIT", + "engines": { + "node": ">=20.18.1" + } + }, + "node_modules/undici-types": { + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz", + "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==", + "license": "MIT" + }, + "node_modules/unenv": { + "version": "2.0.0-rc.24", + "resolved": "https://registry.npmjs.org/unenv/-/unenv-2.0.0-rc.24.tgz", + "integrity": "sha512-i7qRCmY42zmCwnYlh9H2SvLEypEFGye5iRmEMKjcGi7zk9UquigRjFtTLz0TYqr0ZGLZhaMHl/foy1bZR+Cwlw==", + "dev": true, + "license": "MIT", + "dependencies": { + "pathe": "^2.0.3" + } + }, + "node_modules/unist-util-is": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.1.tgz", + "integrity": "sha512-LsiILbtBETkDz8I9p1dQ0uyRUWuaQzd/cuEeS1hoRSyW5E5XGmTzlwY1OrNzzakGowI9Dr/I8HVaw4hTtnxy8g==", + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-position": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-5.0.0.tgz", + "integrity": "sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==", + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-remove-position": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-5.0.0.tgz", + "integrity": "sha512-Hp5Kh3wLxv0PHj9m2yZhhLt58KzPtEYKQQ4yxfYFEO7EvHwzyDYnduhHnY1mDxoqr7VUwVuHXk9RXKIiYS1N8Q==", + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-visit": "^5.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-stringify-position": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz", + "integrity": "sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==", + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-visit": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.1.0.tgz", + "integrity": "sha512-m+vIdyeCOpdr/QeQCu2EzxX/ohgS8KbnPDgFni4dQsfSCtpz8UqDyY5GjRru8PDKuYn7Fq19j1CQ+nJSsGKOzg==", + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-is": "^6.0.0", + "unist-util-visit-parents": "^6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-visit-parents": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.2.tgz", + "integrity": "sha512-goh1s1TBrqSqukSc8wrjwWhL0hiJxgA8m4kFxGlQ+8FYQ3C/m11FcTs4YYem7V664AhHVvgoQLk890Ssdsr2IQ==", + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-is": "^6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "license": "MIT", + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/unzipper": { + "version": "0.12.5", + "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.12.5.tgz", + "integrity": "sha512-tXYOi9R57Uj/2Z25SOs5RRSzq886MBQj2gY8dPL+xl/kv6s6SvByoKfAtvfVeEuhntWDgjd2o9p2lb4TVPAz0A==", + "dev": true, + "license": "MIT", + "dependencies": { + "bluebird": "~3.7.2", + "duplexer2": "~0.1.4", + "fs-extra": "11.3.1", + "graceful-fs": "^4.2.2", + "node-int64": "^0.4.0" + } + }, + "node_modules/unzipper/node_modules/fs-extra": { + "version": "11.3.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.1.tgz", + "integrity": "sha512-eXvGGwZ5CL17ZSwHWd3bbgk7UUpF6IFHtP57NYYakPvHOs8GDgDe5KJI36jIJzDkJ6eJjuzRA8eBQb6SkKue0g==", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=14.14" + } + }, + "node_modules/update-browserslist-db": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.3.1.tgz", + "integrity": "sha512-ZZ61DsRsOnakl74HAmp3oSN4aXUmEWXf+i/yv0h7tIBfICc3VdrFErQKUUKPgu3AMsTUMbcongALEN4l6GSUrQ==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "escalade": "^3.2.0", + "picocolors": "^1.1.1" + }, + "bin": { + "update-browserslist-db": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, + "node_modules/use-sync-external-store": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz", + "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==", + "license": "MIT", + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + } + }, + "node_modules/utf8-byte-length": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.5.tgz", + "integrity": "sha512-Xn0w3MtiQ6zoz2vFyUVruaCL53O/DwUvkEeOvj+uulMm0BkUGYWmBYVyElqZaSLhY6ZD0ulfU3aBra2aVT4xfA==", + "dev": true, + "license": "(WTFPL OR MIT)" + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "dev": true, + "license": "MIT" + }, + "node_modules/vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/vfile": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.3.tgz", + "integrity": "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==", + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0", + "vfile-message": "^4.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/vfile-message": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.3.tgz", + "integrity": "sha512-QTHzsGd1EhbZs4AsQ20JX1rC3cOlt/IWJruk893DfLRr57lcnOeMaWG4K0JrRta4mIJZKth2Au3mM3u03/JWKw==", + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-stringify-position": "^4.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/vite": { + "version": "7.3.6", + "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.6.tgz", + "integrity": "sha512-4XP60spRGjSZFf1qYH+dJIkK2znL3zQfl9KkOV9MkkRR/3Dls0dxaBsQPTloEc5BLXWPL9vsOxopxyKoMmDueg==", + "dev": true, + "license": "MIT", + "dependencies": { + "esbuild": "^0.27.0 || ^0.28.0", + "fdir": "^6.5.0", + "picomatch": "^4.0.3", + "postcss": "^8.5.6", + "rollup": "^4.43.0", + "tinyglobby": "^0.2.15" + }, + "bin": { + "vite": "bin/vite.js" + }, + "engines": { + "node": "^20.19.0 || >=22.12.0" + }, + "funding": { + "url": "https://github.com/vitejs/vite?sponsor=1" + }, + "optionalDependencies": { + "fsevents": "~2.3.3" + }, + "peerDependencies": { + "@types/node": "^20.19.0 || >=22.12.0", + "jiti": ">=1.21.0", + "less": "^4.0.0", + "lightningcss": "^1.21.0", + "sass": "^1.70.0", + "sass-embedded": "^1.70.0", + "stylus": ">=0.54.8", + "sugarss": "^5.0.0", + "terser": "^5.16.0", + "tsx": "^4.8.1", + "yaml": "^2.4.2" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + }, + "jiti": { + "optional": true + }, + "less": { + "optional": true + }, + "lightningcss": { + "optional": true + }, + "sass": { + "optional": true + }, + "sass-embedded": { + "optional": true + }, + "stylus": { + "optional": true + }, + "sugarss": { + "optional": true + }, + "terser": { + "optional": true + }, + "tsx": { + "optional": true + }, + "yaml": { + "optional": true + } + } + }, + "node_modules/vite/node_modules/@esbuild/aix-ppc64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.2.tgz", + "integrity": "sha512-XExcO+dvLKvVtNTibSTBej1NCAbaGhWn9Ww1ZPx80qsahhPFe/8jgWP0IchNe0F3HwkU7n8ejhH8bjonqht8mQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/android-arm": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.2.tgz", + "integrity": "sha512-kXXoiPVVGQcnIYGOeaovwOURpniDBpSq4A03qkQ+BMQqtGG6HYap3xne9C1O1yo4TR3qxlCX5IqqmX6fFo2Lqg==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/android-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.2.tgz", + "integrity": "sha512-5YfKeeI8qWfBZIX+u2xZC3Zlb3Os/gLS2sbEKM+I4ZOcsWmHS2WLysCcQZDAFRslDUU5Oiq44gf6PYN1vGwG5A==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/android-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.2.tgz", + "integrity": "sha512-O387ite7SzUyCcy3JQX4P4bLtEA7bLLkx+esve5JHnyYfNTxcVpXZo9jhdB0lTKN44gztELTdU7nS8Nr16Fs1Q==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/darwin-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.2.tgz", + "integrity": "sha512-n4KqkOQrraxHJcgjM1RvwbigfQKIKJVpM7xp+KsxiyUSrRdIXnt73VhrPAx0fV44hgfmIVKjxMN9J1t5jySVkw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/darwin-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.2.tgz", + "integrity": "sha512-uq6suIWYP37qzGddBKPw5QEQPi6HiLGsO7UmkpfyaYNQ3D+rN6w6WfwH+nuqcGXWvawGwxOEroO4YGnFh95azw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/freebsd-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.2.tgz", + "integrity": "sha512-n+I0BTSRIoy+d6RPKnEVwql5UwBJolytvY4mAOIEJorKlqgPII8ix6slVVrfZ5Tnj7glIZvloylbB/EJPMWEXw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/freebsd-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.2.tgz", + "integrity": "sha512-78XJTJkvPs0kz2w61301PJjXl4g7q3JqiYMZ/M/yVI73EHBrCRTgkhu9oqG7vPqq+a/yadEW8aD+agKlk5xrmg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-arm": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.2.tgz", + "integrity": "sha512-XlDnu2q5yoqems+xay6wSAcg9DDD7K9RLKZEBOMZm3ckNpJBvOX20tSfby8KfrrhINDyv9V2YVZKY/SpoGJI8w==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.2.tgz", + "integrity": "sha512-pW4AC0P3it8c7do9MVM4p51FzHzdM/TZrerurgRcHJ2WTa1VQ1CIq18xncfpBJw4ojkiZZrKW2yIBWBP92j6Ug==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-ia32": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.2.tgz", + "integrity": "sha512-CYbnj78HsIeA+DhgUKgFCfvNsTHFhMMrinUrMZpDXJXKN8T3XViTZ/+wtHeVxEWY8ewSzTFN+nRmSwO2tZaLUQ==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-loong64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.2.tgz", + "integrity": "sha512-buwkd8nsph4R+ajRvw0qM5Hja/TXQow3ptzWO2EbG/cqcIkHloRrdlBtQlshyYGTNFvfkfJ5tpPLVkY4DtsPfQ==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-mips64el": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.2.tgz", + "integrity": "sha512-ZVykbDyk7519VwiNb9Lcj9m8XM6v5V9uKPvrEMkkEedVewf+0itkhahp4HDpgERXhwLRpWFypsGbG/J8s0QjJA==", + "cpu": [ + "mips64el" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-ppc64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.2.tgz", + "integrity": "sha512-CAXl+Dtd9UUuJd8pKKdwh6MLm3MUMiqMPmhZ3tTSXPqfyQ3vDl6R5hZdZ/kYojK4ofXtdfSv1tFq8XzWx3heNQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-riscv64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.2.tgz", + "integrity": "sha512-GeXCej4IQtU1B+QlDV8W/RRvbzI3O/Stss+/bCXv4lZls5WGRtu2a+3JkA3i4qIUlMXpcHebWpF8AkJhATowuA==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-s390x": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.2.tgz", + "integrity": "sha512-3H1weTYZPxt/WOhByszQZybS9w5lKzUn1FDMsgEChbHWQwHYQQRfBxgCcZvPhjHfKyJjIievvMmEUawJrdY9Dg==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.2.tgz", + "integrity": "sha512-4xTZr1FUmSoQW4XIWmit3tzQrUTZM+N3P0XV8xROKYF50XfI7xeO90+1bZvNwxIufQ9hDQVRJH5YhgPVF8A/HQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/netbsd-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.2.tgz", + "integrity": "sha512-sSATRjPeDBg3pdgHoQfoYBob11Kk1FGa9lui5RIHZCoCkJa9QKlvl3/vKz2usCmYYjs7ymJR/2Nnsqe+Hjt5nw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/netbsd-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.2.tgz", + "integrity": "sha512-lqnzCV+mM0gIADaKihiCg6ifgfU2L3h5E33rNQBN1Y4MaVGnzryzmvvf7UHxprpQdE8hpqLolJ9Rl+SkIRDpyw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/openbsd-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.2.tgz", + "integrity": "sha512-AL2qJILH7lNjrDmCQDvdxMfAUIv8KMNZOvrwAQ8i8//ntL9FflhOyMJ8OZSMBb8/AWXe3/5v5S20y3zCoZWKoQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/openbsd-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.2.tgz", + "integrity": "sha512-QtiuPytchRyC4rwUKhexJdQKvDuZ6hWloi3igqPQNUJCS1/v9EiO3UTOXR6A3FoMo4fnAKbWJdqaIwhOzh8qEw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/openharmony-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.2.tgz", + "integrity": "sha512-WkhYDmpTjLvGlScA1rwjRUmhl4k8oXR3cIbtqWmELgU/dFeHHlEllxDvdWcNJV9rbzCexB5vz8gtNewWLgCT7Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openharmony" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/sunos-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.2.tgz", + "integrity": "sha512-GPMSkTOtMnv2U2F8gxe4Io6qmVs+YKyp832Etqqxr0hFngmXQ3rzwytelm3GIn7T4VviRUlf3sOgBOiTdvaf7g==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/win32-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.2.tgz", + "integrity": "sha512-PIhhEkE9uPBleRBrQEJpUn7MBnibZzbGzYWPmY3x+YoVg/95zbjB4CxPPOQ8l5tYYM4mMaCthF8/1DIfBQQyWQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/win32-ia32": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.2.tgz", + "integrity": "sha512-YmJbfTlvU7Sdn9BB+4PRES4oB6pxgS37MAONj+hBr/cpXS1aBPKXxNnDbu+QCWPj0o9dgyxeq79g6c5P8KeuYA==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/win32-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.2.tgz", + "integrity": "sha512-5ebpxr3nWMzrL/rnUI755Jkuee0bHL/Gq0WTF9lvcpv73wAp5eu8MfBUgWK9bhWvZjj7yX8etf/8tI8Ney695g==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/esbuild": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.2.tgz", + "integrity": "sha512-HKVLS8dvII+xoKW9kmqxbRKrnWEXfJJr/FZhhJmiqIB0e053QNYFqOBouTMO/k5sID4MvCiUCvv8b9M4h32wIA==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=18" + }, + "optionalDependencies": { + "@esbuild/aix-ppc64": "0.28.2", + "@esbuild/android-arm": "0.28.2", + "@esbuild/android-arm64": "0.28.2", + "@esbuild/android-x64": "0.28.2", + "@esbuild/darwin-arm64": "0.28.2", + "@esbuild/darwin-x64": "0.28.2", + "@esbuild/freebsd-arm64": "0.28.2", + "@esbuild/freebsd-x64": "0.28.2", + "@esbuild/linux-arm": "0.28.2", + "@esbuild/linux-arm64": "0.28.2", + "@esbuild/linux-ia32": "0.28.2", + "@esbuild/linux-loong64": "0.28.2", + "@esbuild/linux-mips64el": "0.28.2", + "@esbuild/linux-ppc64": "0.28.2", + "@esbuild/linux-riscv64": "0.28.2", + "@esbuild/linux-s390x": "0.28.2", + "@esbuild/linux-x64": "0.28.2", + "@esbuild/netbsd-arm64": "0.28.2", + "@esbuild/netbsd-x64": "0.28.2", + "@esbuild/openbsd-arm64": "0.28.2", + "@esbuild/openbsd-x64": "0.28.2", + "@esbuild/openharmony-arm64": "0.28.2", + "@esbuild/sunos-x64": "0.28.2", + "@esbuild/win32-arm64": "0.28.2", + "@esbuild/win32-ia32": "0.28.2", + "@esbuild/win32-x64": "0.28.2" + } + }, + "node_modules/vitest": { + "version": "4.1.10", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.10.tgz", + "integrity": "sha512-R9jUTe5S4Qb0HCd4TNqpC7oGcrMssMRGXLW80ubjWsW9VH5GF8y1Y0SFLY9AbqSk6nt0PnOx4H4WNJYZ13GUPw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vitest/expect": "4.1.10", + "@vitest/mocker": "4.1.10", + "@vitest/pretty-format": "4.1.10", + "@vitest/runner": "4.1.10", + "@vitest/snapshot": "4.1.10", + "@vitest/spy": "4.1.10", + "@vitest/utils": "4.1.10", + "es-module-lexer": "^2.0.0", + "expect-type": "^1.3.0", + "magic-string": "^0.30.21", + "obug": "^2.1.1", + "pathe": "^2.0.3", + "picomatch": "^4.0.3", + "std-env": "^4.0.0-rc.1", + "tinybench": "^2.9.0", + "tinyexec": "^1.0.2", + "tinyglobby": "^0.2.15", + "tinyrainbow": "^3.1.0", + "vite": "^6.0.0 || ^7.0.0 || ^8.0.0", + "why-is-node-running": "^2.3.0" + }, + "bin": { + "vitest": "vitest.mjs" + }, + "engines": { + "node": "^20.0.0 || ^22.0.0 || >=24.0.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + }, + "peerDependencies": { + "@edge-runtime/vm": "*", + "@opentelemetry/api": "^1.9.0", + "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0", + "@vitest/browser-playwright": "4.1.10", + "@vitest/browser-preview": "4.1.10", + "@vitest/browser-webdriverio": "4.1.10", + "@vitest/coverage-istanbul": "4.1.10", + "@vitest/coverage-v8": "4.1.10", + "@vitest/ui": "4.1.10", + "happy-dom": "*", + "jsdom": "*", + "vite": "^6.0.0 || ^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "@edge-runtime/vm": { + "optional": true + }, + "@opentelemetry/api": { + "optional": true + }, + "@types/node": { + "optional": true + }, + "@vitest/browser-playwright": { + "optional": true + }, + "@vitest/browser-preview": { + "optional": true + }, + "@vitest/browser-webdriverio": { + "optional": true + }, + "@vitest/coverage-istanbul": { + "optional": true + }, + "@vitest/coverage-v8": { + "optional": true + }, + "@vitest/ui": { + "optional": true + }, + "happy-dom": { + "optional": true + }, + "jsdom": { + "optional": true + }, + "vite": { + "optional": false + } + } + }, + "node_modules/web-streams-polyfill": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz", + "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==", + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/webcrypto-core": { + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/webcrypto-core/-/webcrypto-core-1.9.2.tgz", + "integrity": "sha512-gsXecm82UQNlTBURJGuqOWy1Ww08S3kZUcr3aOJS02Pk0xLtkfeUAVC0u0xhgdonFme80edSJUIJyuvL/7250Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@peculiar/asn1-schema": "^2.7.0", + "@peculiar/json-schema": "^1.1.12", + "@peculiar/utils": "^2.0.2", + "asn1js": "^3.0.10", + "tslib": "^2.8.1" + } + }, + "node_modules/whatwg-encoding": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz", + "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==", + "deprecated": "Use @exodus/bytes instead for a more spec-conformant and faster implementation", + "license": "MIT", + "dependencies": { + "iconv-lite": "0.6.3" + }, + "engines": { + "node": ">=18" } }, - "node_modules/unzipper/node_modules/fs-extra": { - "version": "11.3.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.1.tgz", - "integrity": "sha512-eXvGGwZ5CL17ZSwHWd3bbgk7UUpF6IFHtP57NYYakPvHOs8GDgDe5KJI36jIJzDkJ6eJjuzRA8eBQb6SkKue0g==", - "dev": true, + "node_modules/whatwg-encoding/node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "license": "MIT", "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" + "safer-buffer": ">= 2.1.2 < 3.0.0" }, "engines": { - "node": ">=14.14" + "node": ">=0.10.0" } }, - "node_modules/update-browserslist-db": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.3.1.tgz", - "integrity": "sha512-ZZ61DsRsOnakl74HAmp3oSN4aXUmEWXf+i/yv0h7tIBfICc3VdrFErQKUUKPgu3AMsTUMbcongALEN4l6GSUrQ==", + "node_modules/whatwg-mimetype": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz", + "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==", "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], "license": "MIT", + "engines": { + "node": ">=12" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "license": "ISC", "dependencies": { - "escalade": "^3.2.0", - "picocolors": "^1.1.1" + "isexe": "^2.0.0" }, "bin": { - "update-browserslist-db": "cli.js" + "node-which": "bin/node-which" }, - "peerDependencies": { - "browserslist": ">= 4.21.0" - } - }, - "node_modules/use-sync-external-store": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz", - "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==", - "license": "MIT", - "peerDependencies": { - "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + "engines": { + "node": ">= 8" } }, - "node_modules/utf8-byte-length": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.5.tgz", - "integrity": "sha512-Xn0w3MtiQ6zoz2vFyUVruaCL53O/DwUvkEeOvj+uulMm0BkUGYWmBYVyElqZaSLhY6ZD0ulfU3aBra2aVT4xfA==", - "dev": true, - "license": "(WTFPL OR MIT)" + "node_modules/which-module": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz", + "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==", + "license": "ISC" }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "node_modules/why-is-node-running": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz", + "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==", "dev": true, - "license": "MIT" - }, - "node_modules/vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", "license": "MIT", + "dependencies": { + "siginfo": "^2.0.0", + "stackback": "0.0.2" + }, + "bin": { + "why-is-node-running": "cli.js" + }, "engines": { - "node": ">= 0.8" + "node": ">=8" } }, - "node_modules/vfile": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.3.tgz", - "integrity": "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==", + "node_modules/wordwrapjs": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-5.1.1.tgz", + "integrity": "sha512-0yweIbkINJodk27gX9LBGMzyQdBDan3s/dEAiwBOj+Mf0PPyWL6/rikalkv8EeD0E8jm4o5RXEOrFTP3NXbhJg==", "license": "MIT", - "dependencies": { - "@types/unist": "^3.0.0", - "vfile-message": "^4.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" + "engines": { + "node": ">=12.17" } }, - "node_modules/vfile-message": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.3.tgz", - "integrity": "sha512-QTHzsGd1EhbZs4AsQ20JX1rC3cOlt/IWJruk893DfLRr57lcnOeMaWG4K0JrRta4mIJZKth2Au3mM3u03/JWKw==", - "license": "MIT", - "dependencies": { - "@types/unist": "^3.0.0", - "unist-util-stringify-position": "^4.0.0" + "node_modules/workerd": { + "version": "1.20260820.1", + "resolved": "https://registry.npmjs.org/workerd/-/workerd-1.20260820.1.tgz", + "integrity": "sha512-/wk4rFNHH6IVMXFe6aPEZsT5YWpWtfKTUMt7+rFkyeGbXcGCy4yxODmJatbqYj0jmqHETdz0+m2mT+vNjXnF7w==", + "dev": true, + "hasInstallScript": true, + "license": "Apache-2.0", + "bin": { + "workerd": "bin/workerd" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" + "engines": { + "node": ">=16" + }, + "optionalDependencies": { + "@cloudflare/workerd-darwin-64": "1.20260820.1", + "@cloudflare/workerd-darwin-arm64": "1.20260820.1", + "@cloudflare/workerd-linux-64": "1.20260820.1", + "@cloudflare/workerd-linux-arm64": "1.20260820.1", + "@cloudflare/workerd-windows-64": "1.20260820.1" } }, - "node_modules/vite": { - "version": "7.3.6", - "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.6.tgz", - "integrity": "sha512-4XP60spRGjSZFf1qYH+dJIkK2znL3zQfl9KkOV9MkkRR/3Dls0dxaBsQPTloEc5BLXWPL9vsOxopxyKoMmDueg==", + "node_modules/wrangler": { + "version": "4.125.0", + "resolved": "https://registry.npmjs.org/wrangler/-/wrangler-4.125.0.tgz", + "integrity": "sha512-yFpvggu+xk1Hdm/Uxwaqa19bb7GArME4CrCS3Vov68a2TZq2MPO+wLocKbbnIC9K0oLowcdau7/ycxbbNHKCEg==", "dev": true, - "license": "MIT", + "license": "MIT OR Apache-2.0", "dependencies": { - "esbuild": "^0.27.0 || ^0.28.0", - "fdir": "^6.5.0", - "picomatch": "^4.0.3", - "postcss": "^8.5.6", - "rollup": "^4.43.0", - "tinyglobby": "^0.2.15" + "@cloudflare/kv-asset-handler": "0.5.0", + "@cloudflare/unenv-preset": "2.16.1", + "blake3-wasm": "2.1.5", + "esbuild": "0.28.1", + "miniflare": "5.20260820.0-alpha", + "path-to-regexp": "6.3.0", + "unenv": "2.0.0-rc.24", + "workerd": "1.20260820.1" }, "bin": { - "vite": "bin/vite.js" + "cf-wrangler": "bin/cf-wrangler.js", + "wrangler": "bin/wrangler.js", + "wrangler2": "bin/wrangler.js" }, "engines": { - "node": "^20.19.0 || >=22.12.0" - }, - "funding": { - "url": "https://github.com/vitejs/vite?sponsor=1" + "node": ">=22.0.0" }, "optionalDependencies": { - "fsevents": "~2.3.3" + "fsevents": "2.3.3" }, "peerDependencies": { - "@types/node": "^20.19.0 || >=22.12.0", - "jiti": ">=1.21.0", - "less": "^4.0.0", - "lightningcss": "^1.21.0", - "sass": "^1.70.0", - "sass-embedded": "^1.70.0", - "stylus": ">=0.54.8", - "sugarss": "^5.0.0", - "terser": "^5.16.0", - "tsx": "^4.8.1", - "yaml": "^2.4.2" + "@cloudflare/workers-types": "^5.20260820.1" }, "peerDependenciesMeta": { - "@types/node": { - "optional": true - }, - "jiti": { - "optional": true - }, - "less": { - "optional": true - }, - "lightningcss": { - "optional": true - }, - "sass": { - "optional": true - }, - "sass-embedded": { - "optional": true - }, - "stylus": { - "optional": true - }, - "sugarss": { - "optional": true - }, - "terser": { - "optional": true - }, - "tsx": { - "optional": true - }, - "yaml": { + "@cloudflare/workers-types": { "optional": true } } }, - "node_modules/vite/node_modules/@esbuild/aix-ppc64": { - "version": "0.28.2", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.2.tgz", - "integrity": "sha512-XExcO+dvLKvVtNTibSTBej1NCAbaGhWn9Ww1ZPx80qsahhPFe/8jgWP0IchNe0F3HwkU7n8ejhH8bjonqht8mQ==", + "node_modules/wrangler/node_modules/@esbuild/aix-ppc64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.1.tgz", + "integrity": "sha512-Svl7tq8k/08+p6CXPpRjQ1fKX+1odH/BQbb48fV6fj3CWHhsoIOoY87w1oHXm0qEpkIK3ZfVgp0hed3XBXzXMQ==", "cpu": [ "ppc64" ], @@ -14253,10 +16785,10 @@ "node": ">=18" } }, - "node_modules/vite/node_modules/@esbuild/android-arm": { - "version": "0.28.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.2.tgz", - "integrity": "sha512-kXXoiPVVGQcnIYGOeaovwOURpniDBpSq4A03qkQ+BMQqtGG6HYap3xne9C1O1yo4TR3qxlCX5IqqmX6fFo2Lqg==", + "node_modules/wrangler/node_modules/@esbuild/android-arm": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.1.tgz", + "integrity": "sha512-0k2F129Xdio1TdJfzJ8sy1Q47vUD2NnwdhiAf7drUN1EBTfPf4hsFCtmMgu/6m8JSzsBrlmVjudMBQqOfG8usQ==", "cpu": [ "arm" ], @@ -14270,10 +16802,10 @@ "node": ">=18" } }, - "node_modules/vite/node_modules/@esbuild/android-arm64": { - "version": "0.28.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.2.tgz", - "integrity": "sha512-5YfKeeI8qWfBZIX+u2xZC3Zlb3Os/gLS2sbEKM+I4ZOcsWmHS2WLysCcQZDAFRslDUU5Oiq44gf6PYN1vGwG5A==", + "node_modules/wrangler/node_modules/@esbuild/android-arm64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.1.tgz", + "integrity": "sha512-34EGEbCIAgosYz6goLcopX6Mo7NyGv9tfwEM2/7Ce2VcVRk568iSvniGWcUXIy7wEDR1wzolcxcriFVrWYcwBg==", "cpu": [ "arm64" ], @@ -14287,10 +16819,10 @@ "node": ">=18" } }, - "node_modules/vite/node_modules/@esbuild/android-x64": { - "version": "0.28.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.2.tgz", - "integrity": "sha512-O387ite7SzUyCcy3JQX4P4bLtEA7bLLkx+esve5JHnyYfNTxcVpXZo9jhdB0lTKN44gztELTdU7nS8Nr16Fs1Q==", + "node_modules/wrangler/node_modules/@esbuild/android-x64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.1.tgz", + "integrity": "sha512-dbwY7ltSMDWsRatcRpCnES4F+im88OCUgGZjy52shC7GqHRE/cYlxNbB4Z4UpJswpcc4Qxd2oE/ufM0p61IKng==", "cpu": [ "x64" ], @@ -14304,10 +16836,10 @@ "node": ">=18" } }, - "node_modules/vite/node_modules/@esbuild/darwin-arm64": { - "version": "0.28.2", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.2.tgz", - "integrity": "sha512-n4KqkOQrraxHJcgjM1RvwbigfQKIKJVpM7xp+KsxiyUSrRdIXnt73VhrPAx0fV44hgfmIVKjxMN9J1t5jySVkw==", + "node_modules/wrangler/node_modules/@esbuild/darwin-arm64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.1.tgz", + "integrity": "sha512-TZbWkQY7kvTAXbXUT7uVACR5cMHsDiSz9z7ZKAX/RTq/WJEk3QyRr0wZpNhBDX+/0CtdqUIJlOiodQcta6tY3Q==", "cpu": [ "arm64" ], @@ -14321,10 +16853,10 @@ "node": ">=18" } }, - "node_modules/vite/node_modules/@esbuild/darwin-x64": { - "version": "0.28.2", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.2.tgz", - "integrity": "sha512-uq6suIWYP37qzGddBKPw5QEQPi6HiLGsO7UmkpfyaYNQ3D+rN6w6WfwH+nuqcGXWvawGwxOEroO4YGnFh95azw==", + "node_modules/wrangler/node_modules/@esbuild/darwin-x64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.1.tgz", + "integrity": "sha512-zfdzgK9ACBNZLI/CyHTOx81SyNbM6YXn7rxSgX97VjyiPl9W1i4Ka4fgKECEoFCKGpvBj5qArWIGgQjOwkgskQ==", "cpu": [ "x64" ], @@ -14338,10 +16870,10 @@ "node": ">=18" } }, - "node_modules/vite/node_modules/@esbuild/freebsd-arm64": { - "version": "0.28.2", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.2.tgz", - "integrity": "sha512-n+I0BTSRIoy+d6RPKnEVwql5UwBJolytvY4mAOIEJorKlqgPII8ix6slVVrfZ5Tnj7glIZvloylbB/EJPMWEXw==", + "node_modules/wrangler/node_modules/@esbuild/freebsd-arm64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.1.tgz", + "integrity": "sha512-wG2EA8ENdEI0qhkSZMjfqrdY+ziCYCPMmtZjjIwOmXFjmyzEHn+UUxk5of+SYsjtfs3VpnlC7QLzSI5hY/rOAw==", "cpu": [ "arm64" ], @@ -14355,10 +16887,10 @@ "node": ">=18" } }, - "node_modules/vite/node_modules/@esbuild/freebsd-x64": { - "version": "0.28.2", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.2.tgz", - "integrity": "sha512-78XJTJkvPs0kz2w61301PJjXl4g7q3JqiYMZ/M/yVI73EHBrCRTgkhu9oqG7vPqq+a/yadEW8aD+agKlk5xrmg==", + "node_modules/wrangler/node_modules/@esbuild/freebsd-x64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.1.tgz", + "integrity": "sha512-i7dZ9vQgnvSCzi/rYCXNgtF/U+eKZNJBzu3eTQbRgHnM7tNSizLOkRFAl3qzVc/Op/u5YkHHa4pf/3DOYHthLQ==", "cpu": [ "x64" ], @@ -14372,10 +16904,10 @@ "node": ">=18" } }, - "node_modules/vite/node_modules/@esbuild/linux-arm": { - "version": "0.28.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.2.tgz", - "integrity": "sha512-XlDnu2q5yoqems+xay6wSAcg9DDD7K9RLKZEBOMZm3ckNpJBvOX20tSfby8KfrrhINDyv9V2YVZKY/SpoGJI8w==", + "node_modules/wrangler/node_modules/@esbuild/linux-arm": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.1.tgz", + "integrity": "sha512-qVXBOHQS+d5Y722GwJzJUtOLlX7km3CraOaGormF1pDtPd2C/l1SHRPgjLunLGe51Sh5YYWKMFDyV4SxgMQYTQ==", "cpu": [ "arm" ], @@ -14389,10 +16921,10 @@ "node": ">=18" } }, - "node_modules/vite/node_modules/@esbuild/linux-arm64": { - "version": "0.28.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.2.tgz", - "integrity": "sha512-pW4AC0P3it8c7do9MVM4p51FzHzdM/TZrerurgRcHJ2WTa1VQ1CIq18xncfpBJw4ojkiZZrKW2yIBWBP92j6Ug==", + "node_modules/wrangler/node_modules/@esbuild/linux-arm64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.1.tgz", + "integrity": "sha512-yHs+0uc8+nvEAfAfxrWQKK5peSNzBc4PegcMO0EJ2hT71uA7vB8Ihg2e77R2P7SG5uYjPbHlLLmve4LLLRCf0g==", "cpu": [ "arm64" ], @@ -14406,10 +16938,10 @@ "node": ">=18" } }, - "node_modules/vite/node_modules/@esbuild/linux-ia32": { - "version": "0.28.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.2.tgz", - "integrity": "sha512-CYbnj78HsIeA+DhgUKgFCfvNsTHFhMMrinUrMZpDXJXKN8T3XViTZ/+wtHeVxEWY8ewSzTFN+nRmSwO2tZaLUQ==", + "node_modules/wrangler/node_modules/@esbuild/linux-ia32": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.1.tgz", + "integrity": "sha512-d1z4ZuP0ajrfz/FhGT4vv278rX8KnPPJx8i5+AtK7TYbx9Le9F1hyzurZpkEyjkGa9dUGhQow4C1NmeGvqxN2w==", "cpu": [ "ia32" ], @@ -14423,10 +16955,10 @@ "node": ">=18" } }, - "node_modules/vite/node_modules/@esbuild/linux-loong64": { - "version": "0.28.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.2.tgz", - "integrity": "sha512-buwkd8nsph4R+ajRvw0qM5Hja/TXQow3ptzWO2EbG/cqcIkHloRrdlBtQlshyYGTNFvfkfJ5tpPLVkY4DtsPfQ==", + "node_modules/wrangler/node_modules/@esbuild/linux-loong64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.1.tgz", + "integrity": "sha512-M5sRjUVZrkm1OAPR3dlOYzNmN+loZKGVi1VUQGrwuqLcbR6qeAz+famMhjASeH3YVKvZz+zT1jlh/keC3Rj/lg==", "cpu": [ "loong64" ], @@ -14440,10 +16972,10 @@ "node": ">=18" } }, - "node_modules/vite/node_modules/@esbuild/linux-mips64el": { - "version": "0.28.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.2.tgz", - "integrity": "sha512-ZVykbDyk7519VwiNb9Lcj9m8XM6v5V9uKPvrEMkkEedVewf+0itkhahp4HDpgERXhwLRpWFypsGbG/J8s0QjJA==", + "node_modules/wrangler/node_modules/@esbuild/linux-mips64el": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.1.tgz", + "integrity": "sha512-mRObBZeHh2OxcBFPWE/FjylkRgZdYuiTR3vaTozquCGOH14iP9oN4x4Ge81CoIDYQrXmIxpFumJBu5MtZpnQJQ==", "cpu": [ "mips64el" ], @@ -14457,10 +16989,10 @@ "node": ">=18" } }, - "node_modules/vite/node_modules/@esbuild/linux-ppc64": { - "version": "0.28.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.2.tgz", - "integrity": "sha512-CAXl+Dtd9UUuJd8pKKdwh6MLm3MUMiqMPmhZ3tTSXPqfyQ3vDl6R5hZdZ/kYojK4ofXtdfSv1tFq8XzWx3heNQ==", + "node_modules/wrangler/node_modules/@esbuild/linux-ppc64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.1.tgz", + "integrity": "sha512-slScBsMAb3GFDcdrCgLwZtPYRoH2H/youv10QiZyRjmsP48fznoveWytSgCI/R0ZcUgpc0ZhIUEx6LHts8yrfQ==", "cpu": [ "ppc64" ], @@ -14474,10 +17006,10 @@ "node": ">=18" } }, - "node_modules/vite/node_modules/@esbuild/linux-riscv64": { - "version": "0.28.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.2.tgz", - "integrity": "sha512-GeXCej4IQtU1B+QlDV8W/RRvbzI3O/Stss+/bCXv4lZls5WGRtu2a+3JkA3i4qIUlMXpcHebWpF8AkJhATowuA==", + "node_modules/wrangler/node_modules/@esbuild/linux-riscv64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.1.tgz", + "integrity": "sha512-kw0owk1o0GFETUJyW0jc0G4Yzs0BHZn0JDZ8JRT088vjJYX777BAs1fDGxAC+q831qOs2DTC96mNsG2opdfyyQ==", "cpu": [ "riscv64" ], @@ -14491,10 +17023,10 @@ "node": ">=18" } }, - "node_modules/vite/node_modules/@esbuild/linux-s390x": { - "version": "0.28.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.2.tgz", - "integrity": "sha512-3H1weTYZPxt/WOhByszQZybS9w5lKzUn1FDMsgEChbHWQwHYQQRfBxgCcZvPhjHfKyJjIievvMmEUawJrdY9Dg==", + "node_modules/wrangler/node_modules/@esbuild/linux-s390x": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.1.tgz", + "integrity": "sha512-/lAIjX8aYFRByhh6L5rYtPEDRqa9de/4V/juOXcta5frjvzXO4/sqEtyytse0g3zZFuWu5cDN0MkLz2qRDD2Ag==", "cpu": [ "s390x" ], @@ -14506,12 +17038,12 @@ ], "engines": { "node": ">=18" - } - }, - "node_modules/vite/node_modules/@esbuild/linux-x64": { - "version": "0.28.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.2.tgz", - "integrity": "sha512-4xTZr1FUmSoQW4XIWmit3tzQrUTZM+N3P0XV8xROKYF50XfI7xeO90+1bZvNwxIufQ9hDQVRJH5YhgPVF8A/HQ==", + } + }, + "node_modules/wrangler/node_modules/@esbuild/linux-x64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.1.tgz", + "integrity": "sha512-u/anNYF2mmVOEDwLtnQ1wOr3EZ9sTNGLWrsYGYwHWzGA3Si84IOkHXlbWTD1NB+9/1lcnweYKO54uhxZydNzfA==", "cpu": [ "x64" ], @@ -14525,10 +17057,10 @@ "node": ">=18" } }, - "node_modules/vite/node_modules/@esbuild/netbsd-arm64": { - "version": "0.28.2", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.2.tgz", - "integrity": "sha512-sSATRjPeDBg3pdgHoQfoYBob11Kk1FGa9lui5RIHZCoCkJa9QKlvl3/vKz2usCmYYjs7ymJR/2Nnsqe+Hjt5nw==", + "node_modules/wrangler/node_modules/@esbuild/netbsd-arm64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.1.tgz", + "integrity": "sha512-oks0DYbLwWMmaakTsCb+zL4E+aHRVLom9IJZOAthMQEPiQmydXHkziYEsGYRx0uNV/IjEKGAV941JzH02pflqw==", "cpu": [ "arm64" ], @@ -14542,10 +17074,10 @@ "node": ">=18" } }, - "node_modules/vite/node_modules/@esbuild/netbsd-x64": { - "version": "0.28.2", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.2.tgz", - "integrity": "sha512-lqnzCV+mM0gIADaKihiCg6ifgfU2L3h5E33rNQBN1Y4MaVGnzryzmvvf7UHxprpQdE8hpqLolJ9Rl+SkIRDpyw==", + "node_modules/wrangler/node_modules/@esbuild/netbsd-x64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.1.tgz", + "integrity": "sha512-aeL6lAnN89Hz43Mlh1G8ARasbuoYvSITDEx0tHh5b7jJnHcssqgjy9Yx430GDpmCa6OyrKoS0aNRjKundRizGg==", "cpu": [ "x64" ], @@ -14559,10 +17091,10 @@ "node": ">=18" } }, - "node_modules/vite/node_modules/@esbuild/openbsd-arm64": { - "version": "0.28.2", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.2.tgz", - "integrity": "sha512-AL2qJILH7lNjrDmCQDvdxMfAUIv8KMNZOvrwAQ8i8//ntL9FflhOyMJ8OZSMBb8/AWXe3/5v5S20y3zCoZWKoQ==", + "node_modules/wrangler/node_modules/@esbuild/openbsd-arm64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.1.tgz", + "integrity": "sha512-MEFJe5C3R8pwXdZ5Y21oo6m7ePiS0d9pWucn99O/wvyJZChoIQKrQDxKrGeW8F5+T0okTHesAmDeiHDTIq0V/Q==", "cpu": [ "arm64" ], @@ -14576,10 +17108,10 @@ "node": ">=18" } }, - "node_modules/vite/node_modules/@esbuild/openbsd-x64": { - "version": "0.28.2", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.2.tgz", - "integrity": "sha512-QtiuPytchRyC4rwUKhexJdQKvDuZ6hWloi3igqPQNUJCS1/v9EiO3UTOXR6A3FoMo4fnAKbWJdqaIwhOzh8qEw==", + "node_modules/wrangler/node_modules/@esbuild/openbsd-x64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.1.tgz", + "integrity": "sha512-i/ZLIOafE0Z8cI/XANJAixoJL/uRAoS2xOA3rb0xN+KK0K177cMAsQYkzHtBrtMXAKuAc7HGgcWiZ/sRC1Nxgw==", "cpu": [ "x64" ], @@ -14593,10 +17125,10 @@ "node": ">=18" } }, - "node_modules/vite/node_modules/@esbuild/openharmony-arm64": { - "version": "0.28.2", - "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.2.tgz", - "integrity": "sha512-WkhYDmpTjLvGlScA1rwjRUmhl4k8oXR3cIbtqWmELgU/dFeHHlEllxDvdWcNJV9rbzCexB5vz8gtNewWLgCT7Q==", + "node_modules/wrangler/node_modules/@esbuild/openharmony-arm64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.1.tgz", + "integrity": "sha512-ge+Z7EXFNt2BO1oAMsVpiQ8EwndV9i1xXerAeTIK7AtPs3bKFXQM7nlRxDSIUIMeueR1CNXxqztLzdNeReKBJg==", "cpu": [ "arm64" ], @@ -14610,10 +17142,10 @@ "node": ">=18" } }, - "node_modules/vite/node_modules/@esbuild/sunos-x64": { - "version": "0.28.2", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.2.tgz", - "integrity": "sha512-GPMSkTOtMnv2U2F8gxe4Io6qmVs+YKyp832Etqqxr0hFngmXQ3rzwytelm3GIn7T4VviRUlf3sOgBOiTdvaf7g==", + "node_modules/wrangler/node_modules/@esbuild/sunos-x64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.1.tgz", + "integrity": "sha512-BEjgtECkL3vY+SaSQ6nzVfiALUeFxpawyp8Jmf5PtYhf1Ug40N1h/hxlhts+f1FvSvarEigdxS3BlSMI2PJLcQ==", "cpu": [ "x64" ], @@ -14627,10 +17159,10 @@ "node": ">=18" } }, - "node_modules/vite/node_modules/@esbuild/win32-arm64": { - "version": "0.28.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.2.tgz", - "integrity": "sha512-PIhhEkE9uPBleRBrQEJpUn7MBnibZzbGzYWPmY3x+YoVg/95zbjB4CxPPOQ8l5tYYM4mMaCthF8/1DIfBQQyWQ==", + "node_modules/wrangler/node_modules/@esbuild/win32-arm64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.1.tgz", + "integrity": "sha512-lCv9eK/H6ZJWbE7bh2nw54CZ9M2nupBxJcTsdk/QQnWkdSjKGuxmmH8/GWrlT1eMmZfn4dGcCjRte397WqfQXA==", "cpu": [ "arm64" ], @@ -14644,10 +17176,10 @@ "node": ">=18" } }, - "node_modules/vite/node_modules/@esbuild/win32-ia32": { - "version": "0.28.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.2.tgz", - "integrity": "sha512-YmJbfTlvU7Sdn9BB+4PRES4oB6pxgS37MAONj+hBr/cpXS1aBPKXxNnDbu+QCWPj0o9dgyxeq79g6c5P8KeuYA==", + "node_modules/wrangler/node_modules/@esbuild/win32-ia32": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.1.tgz", + "integrity": "sha512-zvb/mB2bSCoJOpoCBgYKKpX6YM6mJBlBUVUtVj41DlZJVEB6/0CKlRYxP5wWl1C1ILiCoAU5wZZ4q1P3qeS6Eg==", "cpu": [ "ia32" ], @@ -14661,10 +17193,10 @@ "node": ">=18" } }, - "node_modules/vite/node_modules/@esbuild/win32-x64": { - "version": "0.28.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.2.tgz", - "integrity": "sha512-5ebpxr3nWMzrL/rnUI755Jkuee0bHL/Gq0WTF9lvcpv73wAp5eu8MfBUgWK9bhWvZjj7yX8etf/8tI8Ney695g==", + "node_modules/wrangler/node_modules/@esbuild/win32-x64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.1.tgz", + "integrity": "sha512-bm4Mowrv+GXMlpWX++EcXw/iLyd1o3+bJkC2DkWXYVvgZCqD/bSj9ctZeAMC3cIxgjRVR2Dufaiu4YPxr5gW1A==", "cpu": [ "x64" ], @@ -14678,10 +17210,10 @@ "node": ">=18" } }, - "node_modules/vite/node_modules/esbuild": { - "version": "0.28.2", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.2.tgz", - "integrity": "sha512-HKVLS8dvII+xoKW9kmqxbRKrnWEXfJJr/FZhhJmiqIB0e053QNYFqOBouTMO/k5sID4MvCiUCvv8b9M4h32wIA==", + "node_modules/wrangler/node_modules/esbuild": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.1.tgz", + "integrity": "sha512-HrJrvZv5ayxBzPfwphOoNzkzOIIlifzk0KJrGK2c8R4+LKpMtpYLQeUdjnwjWv/LZlkH2laZk+4w78pi99D4Vw==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -14692,184 +17224,40 @@ "node": ">=18" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.28.2", - "@esbuild/android-arm": "0.28.2", - "@esbuild/android-arm64": "0.28.2", - "@esbuild/android-x64": "0.28.2", - "@esbuild/darwin-arm64": "0.28.2", - "@esbuild/darwin-x64": "0.28.2", - "@esbuild/freebsd-arm64": "0.28.2", - "@esbuild/freebsd-x64": "0.28.2", - "@esbuild/linux-arm": "0.28.2", - "@esbuild/linux-arm64": "0.28.2", - "@esbuild/linux-ia32": "0.28.2", - "@esbuild/linux-loong64": "0.28.2", - "@esbuild/linux-mips64el": "0.28.2", - "@esbuild/linux-ppc64": "0.28.2", - "@esbuild/linux-riscv64": "0.28.2", - "@esbuild/linux-s390x": "0.28.2", - "@esbuild/linux-x64": "0.28.2", - "@esbuild/netbsd-arm64": "0.28.2", - "@esbuild/netbsd-x64": "0.28.2", - "@esbuild/openbsd-arm64": "0.28.2", - "@esbuild/openbsd-x64": "0.28.2", - "@esbuild/openharmony-arm64": "0.28.2", - "@esbuild/sunos-x64": "0.28.2", - "@esbuild/win32-arm64": "0.28.2", - "@esbuild/win32-ia32": "0.28.2", - "@esbuild/win32-x64": "0.28.2" - } - }, - "node_modules/vitest": { - "version": "4.1.10", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.10.tgz", - "integrity": "sha512-R9jUTe5S4Qb0HCd4TNqpC7oGcrMssMRGXLW80ubjWsW9VH5GF8y1Y0SFLY9AbqSk6nt0PnOx4H4WNJYZ13GUPw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@vitest/expect": "4.1.10", - "@vitest/mocker": "4.1.10", - "@vitest/pretty-format": "4.1.10", - "@vitest/runner": "4.1.10", - "@vitest/snapshot": "4.1.10", - "@vitest/spy": "4.1.10", - "@vitest/utils": "4.1.10", - "es-module-lexer": "^2.0.0", - "expect-type": "^1.3.0", - "magic-string": "^0.30.21", - "obug": "^2.1.1", - "pathe": "^2.0.3", - "picomatch": "^4.0.3", - "std-env": "^4.0.0-rc.1", - "tinybench": "^2.9.0", - "tinyexec": "^1.0.2", - "tinyglobby": "^0.2.15", - "tinyrainbow": "^3.1.0", - "vite": "^6.0.0 || ^7.0.0 || ^8.0.0", - "why-is-node-running": "^2.3.0" - }, - "bin": { - "vitest": "vitest.mjs" - }, - "engines": { - "node": "^20.0.0 || ^22.0.0 || >=24.0.0" - }, - "funding": { - "url": "https://opencollective.com/vitest" - }, - "peerDependencies": { - "@edge-runtime/vm": "*", - "@opentelemetry/api": "^1.9.0", - "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0", - "@vitest/browser-playwright": "4.1.10", - "@vitest/browser-preview": "4.1.10", - "@vitest/browser-webdriverio": "4.1.10", - "@vitest/coverage-istanbul": "4.1.10", - "@vitest/coverage-v8": "4.1.10", - "@vitest/ui": "4.1.10", - "happy-dom": "*", - "jsdom": "*", - "vite": "^6.0.0 || ^7.0.0 || ^8.0.0" - }, - "peerDependenciesMeta": { - "@edge-runtime/vm": { - "optional": true - }, - "@opentelemetry/api": { - "optional": true - }, - "@types/node": { - "optional": true - }, - "@vitest/browser-playwright": { - "optional": true - }, - "@vitest/browser-preview": { - "optional": true - }, - "@vitest/browser-webdriverio": { - "optional": true - }, - "@vitest/coverage-istanbul": { - "optional": true - }, - "@vitest/coverage-v8": { - "optional": true - }, - "@vitest/ui": { - "optional": true - }, - "happy-dom": { - "optional": true - }, - "jsdom": { - "optional": true - }, - "vite": { - "optional": false - } - } - }, - "node_modules/web-streams-polyfill": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz", - "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==", - "license": "MIT", - "engines": { - "node": ">= 8" - } - }, - "node_modules/webcrypto-core": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/webcrypto-core/-/webcrypto-core-1.9.2.tgz", - "integrity": "sha512-gsXecm82UQNlTBURJGuqOWy1Ww08S3kZUcr3aOJS02Pk0xLtkfeUAVC0u0xhgdonFme80edSJUIJyuvL/7250Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@peculiar/asn1-schema": "^2.7.0", - "@peculiar/json-schema": "^1.1.12", - "@peculiar/utils": "^2.0.2", - "asn1js": "^3.0.10", - "tslib": "^2.8.1" - } - }, - "node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "license": "ISC", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/which-module": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz", - "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==", - "license": "ISC" - }, - "node_modules/why-is-node-running": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz", - "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==", + "@esbuild/aix-ppc64": "0.28.1", + "@esbuild/android-arm": "0.28.1", + "@esbuild/android-arm64": "0.28.1", + "@esbuild/android-x64": "0.28.1", + "@esbuild/darwin-arm64": "0.28.1", + "@esbuild/darwin-x64": "0.28.1", + "@esbuild/freebsd-arm64": "0.28.1", + "@esbuild/freebsd-x64": "0.28.1", + "@esbuild/linux-arm": "0.28.1", + "@esbuild/linux-arm64": "0.28.1", + "@esbuild/linux-ia32": "0.28.1", + "@esbuild/linux-loong64": "0.28.1", + "@esbuild/linux-mips64el": "0.28.1", + "@esbuild/linux-ppc64": "0.28.1", + "@esbuild/linux-riscv64": "0.28.1", + "@esbuild/linux-s390x": "0.28.1", + "@esbuild/linux-x64": "0.28.1", + "@esbuild/netbsd-arm64": "0.28.1", + "@esbuild/netbsd-x64": "0.28.1", + "@esbuild/openbsd-arm64": "0.28.1", + "@esbuild/openbsd-x64": "0.28.1", + "@esbuild/openharmony-arm64": "0.28.1", + "@esbuild/sunos-x64": "0.28.1", + "@esbuild/win32-arm64": "0.28.1", + "@esbuild/win32-ia32": "0.28.1", + "@esbuild/win32-x64": "0.28.1" + } + }, + "node_modules/wrangler/node_modules/path-to-regexp": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz", + "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==", "dev": true, - "license": "MIT", - "dependencies": { - "siginfo": "^2.0.0", - "stackback": "0.0.2" - }, - "bin": { - "why-is-node-running": "cli.js" - }, - "engines": { - "node": ">=8" - } + "license": "MIT" }, "node_modules/wrap-ansi": { "version": "7.0.0", @@ -15000,6 +17388,45 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/youch": { + "version": "4.1.0-beta.10", + "resolved": "https://registry.npmjs.org/youch/-/youch-4.1.0-beta.10.tgz", + "integrity": "sha512-rLfVLB4FgQneDr0dv1oddCVZmKjcJ6yX6mS4pU82Mq/Dt9a3cLZQ62pDBL4AUO+uVrCvtWz3ZFUL2HFAFJ/BXQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@poppinss/colors": "^4.1.5", + "@poppinss/dumper": "^0.6.4", + "@speed-highlight/core": "^1.2.7", + "cookie": "^1.0.2", + "youch-core": "^0.3.3" + } + }, + "node_modules/youch-core": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/youch-core/-/youch-core-0.3.3.tgz", + "integrity": "sha512-ho7XuGjLaJ2hWHoK8yFnsUGy2Y5uDpqSTq1FkHLK4/oqKtyUU1AFbOOxY4IpC9f0fTLjwYbslUz0Po5BpD1wrA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@poppinss/exception": "^1.2.2", + "error-stack-parser-es": "^1.0.5" + } + }, + "node_modules/youch/node_modules/cookie": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.1.1.tgz", + "integrity": "sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, "node_modules/zod": { "version": "4.4.3", "resolved": "https://registry.npmjs.org/zod/-/zod-4.4.3.tgz", @@ -15066,6 +17493,25 @@ "@deepseek-ai/cordis": "^4.0.1", "@deepseek-ai/dsh-host-webserver": "^0.1.0-rc.7" } + }, + "packages/dsh-research-task-runtime": { + "version": "0.1.0", + "license": "MIT", + "dependencies": { + "fflate": "0.8.3", + "pdfjs-dist": "4.10.38" + } + }, + "packages/dsh-web-search-session-model": { + "version": "0.1.0", + "license": "MIT", + "dependencies": { + "@deepseek-ai/dsh-credentials": "^0.1.0-rc.7", + "@deepseek-ai/dsh-launch-environment": "^0.1.0-rc.7", + "@deepseek-ai/dsh-settings": "^0.1.0-rc.7", + "@deepseek-ai/dsh-web": "^0.1.0-rc.7", + "@deepseek-ai/schemastery": "^3.18.1" + } } } } diff --git a/package.json b/package.json index df71e5136..a39c523be 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "dsh-desktop", - "version": "0.1.1", - "description": "A cross-platform desktop shell for DeepSeek Harness.", + "name": "sherlock", + "version": "0.7.6", + "description": "Sherlock local-first desktop knowledge assistant.", "private": true, "type": "module", "main": "./out/main/index.js", @@ -16,28 +16,43 @@ }, "homepage": "https://github.com/dataelement/dsh-desktop#readme", "keywords": [ - "deepseek", + "sherlock", + "local-first", + "knowledge-assistant", "harness", "electron", "desktop", "agent" ], "scripts": { - "postinstall": "patch-package && node scripts/install-brand-assets.mjs && install-electron --no", + "postinstall": "patch-package && node scripts/patch-web-frontend-loading.mjs && node scripts/install-brand-assets.mjs && node scripts/install-pdfjs-assets.mjs && install-electron --no", "dev": "electron-vite dev", - "build": "electron-vite build", + "build": "node scripts/patch-web-frontend-loading.mjs && node scripts/install-brand-assets.mjs && node scripts/install-pdfjs-assets.mjs && electron-vite build", "icons:generate": "node scripts/generate-app-icons.mjs", "preview": "electron-vite preview", "typecheck": "tsc --noEmit -p tsconfig.node.json", + "git:policy:install": "node scripts/install-local-git-policy.mjs", + "git:formal:verify": "node scripts/verify-formal-git-state.mjs", + "git:handoff": "node scripts/create-sherlock-session-handoff.mjs", + "git:integration:preflight": "node scripts/verify-sherlock-integration.mjs", + "git:integration": "node scripts/manage-sherlock-integration.mjs", "test": "vitest run", "test:watch": "vitest", "package:dir": "npm run build && electron-builder --dir", + "prepare:bundled-plugin-profile": "node scripts/prepare-bundled-plugin-profile.mjs", + "package:formal:dir": "npm run prepare:bundled-plugin-profile && npm run build && electron-builder --dir --publish never --config electron-builder.notarized.cjs --config.mac.notarize=false", "package:dev:dir": "npm run build && electron-builder --dir --config electron-builder.dev.cjs", "package:dev:win": "node scripts/verify-target.mjs win32 x64 && npm run build && electron-builder --win --x64 --publish never --config electron-builder.dev.cjs", - "package:mac": "npm run build && electron-builder --mac --publish never", - "package:mac:arm64": "node scripts/verify-target.mjs darwin arm64 && npm run build && electron-builder --mac --arm64 --publish never", - "package:mac:x64": "node scripts/verify-target.mjs darwin x64 && npm run build && electron-builder --mac --x64 --publish never", - "package:win": "node scripts/verify-target.mjs win32 x64 && npm run build && electron-builder --win --x64 --publish never" + "package:mac": "npm run build && electron-builder --mac --publish never && npm run verify:package:mac -- --app auto", + "package:mac:arm64": "node scripts/verify-target.mjs darwin arm64 && npm run build && electron-builder --mac --arm64 --publish never && npm run verify:package:mac -- --app \"dist/mac-arm64/Sherlock.app\"", + "package:mac:x64": "node scripts/verify-target.mjs darwin x64 && npm run build && electron-builder --mac --x64 --publish never && npm run verify:package:mac -- --app \"dist/mac/Sherlock.app\"", + "package:mac:notarized:arm64": "node scripts/verify-target.mjs darwin arm64 && npm run prepare:bundled-plugin-profile && npm run build && electron-builder --mac --arm64 --publish never --config electron-builder.notarized.cjs && npm run verify:package:mac -- --app \"dist-notarized/mac-arm64/Sherlock.app\"", + "verify:package:mac": "node scripts/verify-packaged-macos.mjs", + "release:cloudflare": "node scripts/publish-cloudflare-release.mjs", + "release:cloudflare:prune-oldest": "node scripts/prune-oldest-cloudflare-release.mjs", + "package:win": "node scripts/verify-target.mjs win32 x64 && npm run build && electron-builder --win --x64 --publish never", + "sync:plugins:to-dev": "node scripts/sync-plugin-profile.mjs formal-to-dev", + "sync:plugins:to-formal": "node scripts/sync-plugin-profile.mjs dev-to-formal" }, "dependencies": { "@deepseek-ai/cordis-plugin-group": "1.0.1", @@ -60,21 +75,30 @@ "@deepseek-ai/dsh-subprocess": "0.1.0-rc.7", "@deepseek-ai/dsh-timeout": "0.1.0-rc.7", "@deepseek-ai/dsh-workflow": "0.1.0-rc.7", + "apache-arrow": "18.1.0", + "cheerio": "^1.2.0", "dsh-desktop-market-installer": "file:packages/dsh-desktop-market-installer", + "dsh-research-task-runtime": "file:packages/dsh-research-task-runtime", + "dsh-web-search-session-model": "file:packages/dsh-web-search-session-model", "electron-updater": "^6.8.9", "node": "24.9.0", "pnpm": "10.34.5", - "qrcode": "^1.5.4" + "qrcode": "^1.5.4", + "sanitize-html": "^2.17.7" }, "devDependencies": { "@types/node": "24.10.1", "@types/qrcode": "^1.5.6", + "@types/sanitize-html": "^2.16.1", "electron": "43.4.0", "electron-builder": "26.15.3", "electron-vite": "5.0.0", + "happy-dom": "^20.11.6", "patch-package": "^8.0.1", + "pdfjs-dist": "4.10.38", "typescript": "5.9.3", "vitest": "^4.1.10", + "wrangler": "4.125.0", "yaml": "^2.8.3" }, "overrides": { @@ -82,7 +106,7 @@ }, "build": { "appId": "io.dsh.desktop", - "productName": "DSH Desktop", + "productName": "Sherlock", "asar": false, "npmRebuild": false, "compression": "maximum", @@ -100,6 +124,9 @@ "files": [ "out/**/*", "node_modules/**/*", + "!node_modules/pdfjs-dist/**", + "!node_modules/@napi-rs/canvas/**", + "!node_modules/@napi-rs/canvas-*/**", "package.json", "!**/*.map", "!**/node_modules/@mistralai/mistralai/src/**" @@ -122,21 +149,25 @@ "to": "splash.html" }, { - "from": "build/dsh-loader.gif", - "to": "dsh-loader.gif" + "from": "build/sherlock-logo.svg", + "to": "sherlock-logo.svg" }, { "from": "build/plugin-recovery.html", "to": "plugin-recovery.html" + }, + { + "from": "skills", + "to": "sherlock-skills" } ], "publish": [ { "provider": "generic", - "url": "https://dshdesktop.com/updates/latest/" + "url": "https://updates.evanarts.com/latest/" } ], - "artifactName": "dsh-desktop-${os}-${arch}.${ext}", + "artifactName": "sherlock-${os}-${arch}.${ext}", "mac": { "category": "public.app-category.developer-tools", "icon": "build/icon.icns", @@ -163,7 +194,7 @@ ] }, "nsis": { - "artifactName": "dsh-desktop-windows-${arch}-setup.${ext}", + "artifactName": "sherlock-windows-${arch}-setup.${ext}", "include": "build/installer.nsh", "oneClick": false, "allowToChangeInstallationDirectory": true, diff --git a/packages/dsh-desktop-market-installer/client.js b/packages/dsh-desktop-market-installer/client.js index 6391f752c..cc0f63bcb 100644 --- a/packages/dsh-desktop-market-installer/client.js +++ b/packages/dsh-desktop-market-installer/client.js @@ -1,4 +1,5 @@ window.__ModuleLoader__.load({ + // Compatibility: the client-module id must match the upstream package name. id: 'dsh-desktop-market-installer', factory: (require) => { const module = { exports: {} } @@ -7,20 +8,20 @@ window.__ModuleLoader__.load({ const React = require('react') const NS = 'settings.desktopMarketInstaller' - const STATUS_PATH = '/dsh-desktop/market-installer/status' - const INSTALL_PATH = '/dsh-desktop/market-installer/install' - const UNINSTALL_PATH = '/dsh-desktop/market-installer/uninstall' + const STATUS_PATH = '/sherlock/market-installer/status' + const INSTALL_PATH = '/sherlock/market-installer/install' + const UNINSTALL_PATH = '/sherlock/market-installer/uninstall' const MARKET_REPOSITORY = 'https://github.com/dsh-market/dsh-market' const en = { nav: 'Plugin market', title: 'Plugin market', - intro: 'Install dsh-market to browse, search, install, and manage community plugins inside DSH Desktop.', - community: 'dsh-market is maintained by its community. Installing and using community plugins requires network access, and those plugins are not reviewed by DSH Desktop.', + intro: 'Install dsh-market to browse, search, install, and manage community plugins inside Sherlock.', + community: 'dsh-market is maintained by its community. Installing and using community plugins requires network access, and those plugins are not reviewed by Sherlock.', version: 'Recommended version', install: 'Install plugin market', installing: 'Installing plugin market…', - installingHint: 'This can take a few minutes. Keep DSH Desktop open while pnpm downloads and configures the plugin.', + installingHint: 'This can take a few minutes. Keep Sherlock open while pnpm downloads and configures the plugin.', installed: 'Plugin market installed', installedHint: 'Restart Harness once to load the complete market interface.', restart: 'Restart Harness', @@ -32,7 +33,7 @@ window.__ModuleLoader__.load({ repository: 'View dsh-market on GitHub', futureUpdates: 'After installation, dsh-market will notify you when its own updates are available.', managementTab: 'Plugin market', - managementIntro: 'Manage the optional dsh-market integration installed by DSH Desktop.', + managementIntro: 'Manage the optional dsh-market integration installed by Sherlock.', installedVersion: 'Installed version', uninstall: 'Uninstall plugin market', uninstalling: 'Uninstalling plugin market…', @@ -49,12 +50,12 @@ window.__ModuleLoader__.load({ const zh = { nav: '插件市场', title: '插件市场', - intro: '安装 dsh-market，在 DSH Desktop 内浏览、搜索、安装并管理社区插件。', - community: 'dsh-market 由社区维护。安装和使用社区插件需要联网，这些插件不由 DSH Desktop 审核。', + intro: '安装 dsh-market，在 Sherlock 内浏览、搜索、安装并管理社区插件。', + community: 'dsh-market 由社区维护。安装和使用社区插件需要联网，这些插件不由 Sherlock 审核。', version: '推荐版本', install: '安装插件市场', installing: '正在安装插件市场…', - installingHint: '下载和配置可能需要几分钟，请保持 DSH Desktop 处于打开状态。', + installingHint: '下载和配置可能需要几分钟，请保持 Sherlock 处于打开状态。', installed: '插件市场已安装', installedHint: '重启一次 Harness，即可加载完整的插件市场界面。', restart: '重启 Harness', @@ -66,7 +67,7 @@ window.__ModuleLoader__.load({ repository: '在 GitHub 查看 dsh-market', futureUpdates: '安装后，dsh-market 会在有新版本时提示并提供升级。', managementTab: '插件市场', - managementIntro: '管理由 DSH Desktop 安装的可选 dsh-market 集成。', + managementIntro: '管理由 Sherlock 安装的可选 dsh-market 集成。', installedVersion: '当前版本', uninstall: '卸载插件市场', uninstalling: '正在卸载插件市场…', @@ -120,10 +121,10 @@ window.__ModuleLoader__.load({ ` function installStyles() { - if (document.querySelector('style[data-plugin-css="dsh-desktop-market-installer"]')) return + if (document.querySelector('style[data-plugin-css="sherlock-market-installer"]')) return const style = document.createElement('style') - style.dataset.plugin = 'dsh-desktop-market-installer' - style.dataset.pluginCss = 'dsh-desktop-market-installer' + style.dataset.plugin = 'sherlock-market-installer' + style.dataset.pluginCss = 'sherlock-market-installer' style.textContent = css document.head.appendChild(style) } @@ -673,7 +674,7 @@ window.__ModuleLoader__.load({ installStyles() ctx.effect( () => ctx.locale.register(NS, { zh, en }), - 'dsh-desktop-market-installer: copy dictionaries' + 'sherlock-market-installer: copy dictionaries' ) const t = ctx.locale.bind(NS) if (marketAlreadyComposed()) { diff --git a/packages/dsh-desktop-market-installer/index.js b/packages/dsh-desktop-market-installer/index.js index 9e12e2f33..c09dab2c6 100644 --- a/packages/dsh-desktop-market-installer/index.js +++ b/packages/dsh-desktop-market-installer/index.js @@ -8,14 +8,14 @@ import { delimiter, dirname, join, resolve } from 'node:path' export const RECOMMENDED_MARKET_VERSION = '1.9.0' export const MARKET_PACKAGE = 'dshmarket' export const MARKET_PROFILE = 'web' -export const STATUS_PATH = '/dsh-desktop/market-installer/status' -export const INSTALL_PATH = '/dsh-desktop/market-installer/install' -export const UNINSTALL_PATH = '/dsh-desktop/market-installer/uninstall' +export const STATUS_PATH = '/sherlock/market-installer/status' +export const INSTALL_PATH = '/sherlock/market-installer/install' +export const UNINSTALL_PATH = '/sherlock/market-installer/uninstall' const OPERATION_TIMEOUT_MS = 15 * 60 * 1000 const MAX_LOG_BYTES = 32 * 1024 -export const name = 'dsh-desktop-market-installer' +export const name = 'sherlock-market-installer' export const inject = ['webServer'] function dshHome() { @@ -167,7 +167,7 @@ export async function ensurePnpmShim(home = dshHome()) { export function resolveDshEntry(argv = process.argv) { const entry = argv[1] if (!entry || !/[/\\]bin\.js$/u.test(entry)) { - throw new Error('The running DSH entry could not be identified.') + throw new Error('The bundled runtime entry could not be identified.') } return resolve(entry) } @@ -189,7 +189,7 @@ export function buildUninstallArguments(dshEntry = resolveDshEntry()) { } async function atomicWrite(path, contents) { - const temporary = `${path}.dsh-desktop-${process.pid}-${Date.now()}.tmp` + const temporary = `${path}.sherlock-${process.pid}-${Date.now()}.tmp` await writeFile(temporary, contents, 'utf8') await rename(temporary, path) } @@ -524,11 +524,11 @@ export function apply(ctx) { killProcessTree(activeChild) await operationPromise?.catch(() => undefined) } - }, 'dsh-desktop-market-installer: fixed package routes') + }, 'sherlock-market-installer: fixed package routes') ctx.effect(() => { void ensurePnpmShim(home).catch((error) => { ctx.logger.warn(error instanceof Error ? error : new Error(String(error))) }) - }, 'dsh-desktop-market-installer: packaged pnpm shim') + }, 'sherlock-market-installer: packaged pnpm shim') } diff --git a/packages/dsh-desktop-market-installer/package.json b/packages/dsh-desktop-market-installer/package.json index 7c8f2715f..2ad615ae3 100644 --- a/packages/dsh-desktop-market-installer/package.json +++ b/packages/dsh-desktop-market-installer/package.json @@ -1,7 +1,7 @@ { "name": "dsh-desktop-market-installer", "version": "0.1.0", - "description": "DSH Desktop's fixed-target installer entry for the optional dsh-market community plugin.", + "description": "Sherlock's fixed-target installer entry for the optional dsh-market community plugin.", "private": true, "type": "module", "main": "./index.js", diff --git a/packages/dsh-research-task-runtime/index.js b/packages/dsh-research-task-runtime/index.js new file mode 100644 index 000000000..151442495 --- /dev/null +++ b/packages/dsh-research-task-runtime/index.js @@ -0,0 +1,1093 @@ +import { randomUUID } from 'node:crypto' +import { mkdir, readFile, rename, stat, unlink, writeFile } from 'node:fs/promises' +import { homedir } from 'node:os' +import { dirname, extname, isAbsolute, join } from 'node:path' + +export const name = 'sherlock-research-task-runtime' +export const inject = ['agents', 'subagents', 'typert', 'webServer'] + +export const MAX_ACTIVE_PER_PARENT = 4 +export const MAX_SOURCES = 24 +export const MAX_SOURCE_TEXT = 120_000 +export const MAX_TOTAL_SOURCE_BYTES = 320_000 +export const START_PATH = '/sherlock/research-tasks/start' +export const INSPECT_PATH = '/sherlock/research-tasks/inspect' +export const CANCEL_PATH = '/sherlock/research-tasks/cancel' +export const MAX_BODY_BYTES = 384 * 1024 + +const MAX_ID_LENGTH = 256 +const MAX_TITLE_LENGTH = 512 +const MAX_PATH_LENGTH = 8_192 +const MAX_CONTAINER_PROMPT = 8_000 +const MAX_EVENT_TEXT = 8_192 +const MAX_PUBLIC_EVENTS = 160 +const MAX_FINAL_OUTPUT = 240_000 +const MAX_TERMINAL_TASKS = 200 +const MAX_SOURCE_FILE_BYTES = 64 * 1024 * 1024 +const MAX_EXTRACTED_SOURCE_BYTES = 100_000 +const MAX_PPTX_SLIDES = 500 +const MAX_PPTX_SLIDE_XML_BYTES = 2 * 1024 * 1024 +const MAX_PPTX_TOTAL_XML_BYTES = 16 * 1024 * 1024 +const TERMINAL_STATES = new Set(['completed', 'failed', 'cancelled', 'interrupted']) +const NATIVE_TEXT_EXTENSIONS = new Set([ + '.c', '.cc', '.cpp', '.css', '.csv', '.go', '.h', '.hpp', '.html', '.java', + '.js', '.json', '.jsx', '.kt', '.log', '.md', '.mjs', '.py', '.rb', '.rs', + '.sh', '.sql', '.swift', '.toml', '.ts', '.tsx', '.txt', '.xml', '.yaml', '.yml' +]) +const RESEARCH_TASK_PERSONA = '你是 Sherlock 研究画布的内容生成助手。只处理给定的画布任务和资料，不与用户展开对话，不泄露私有推理、工具参数或内部错误；最终只输出产品提示词要求的内容。' +const DETAILS = new Set(['brief', 'standard', 'detailed']) +const REQUEST_KEYS = new Set([ + 'parentSessionId', + 'canvasNodeId', + 'kind', + 'detail', + 'sources', + 'prompt' +]) +const FILE_SOURCE_KEYS = new Set(['id', 'type', 'title', 'path']) +const ARTIFACT_SOURCE_KEYS = new Set(['id', 'type', 'title', 'text']) +const TOOL_LABELS = new Map([ + ['read', '读取资料'], + ['grep', '检索资料'], + ['glob', '查找文件'], + ['web_search', '搜索资料'], + ['web_fetch', '读取网页'] +]) + +export class ResearchTaskError extends Error { + constructor(code, message) { + super(message) + this.name = 'ResearchTaskError' + this.code = code + } +} + +function record(value, code = 'INVALID_REQUEST', message = '任务参数无效') { + if (typeof value !== 'object' || value === null || Array.isArray(value)) { + throw new ResearchTaskError(code, message) + } + return value +} + +function exactKeys(value, expected, message = '任务包含未知参数') { + if (Object.keys(value).some((key) => !expected.has(key))) { + throw new ResearchTaskError('INVALID_REQUEST', message) + } +} + +function requiredString(value, limit, message) { + if (typeof value !== 'string') throw new ResearchTaskError('INVALID_REQUEST', message) + const result = value.trim() + if (result.length === 0 || result.length > limit) { + throw new ResearchTaskError('INVALID_REQUEST', message) + } + return result +} + +function validateSource(value) { + const source = record(value) + if (source.type === 'file') { + exactKeys(source, FILE_SOURCE_KEYS, '文件来源包含未知参数') + const path = requiredString(source.path, MAX_PATH_LENGTH, '文件路径无效') + if (!isAbsolute(path)) throw new ResearchTaskError('INVALID_REQUEST', '文件路径必须是绝对路径') + return Object.freeze({ + id: requiredString(source.id, MAX_ID_LENGTH, '来源标识无效'), + type: 'file', + title: requiredString(source.title, MAX_TITLE_LENGTH, '来源标题无效'), + path + }) + } + if (source.type === 'artifact') { + exactKeys(source, ARTIFACT_SOURCE_KEYS, '组件来源包含未知参数') + return Object.freeze({ + id: requiredString(source.id, MAX_ID_LENGTH, '来源标识无效'), + type: 'artifact', + title: requiredString(source.title, MAX_TITLE_LENGTH, '来源标题无效'), + text: requiredString(source.text, MAX_SOURCE_TEXT, '组件内容无效') + }) + } + throw new ResearchTaskError('INVALID_REQUEST', '不支持的来源类型') +} + +export function validateResearchTaskStart(value) { + const request = record(value) + exactKeys(request, REQUEST_KEYS) + const parentSessionId = requiredString( + request.parentSessionId, + MAX_ID_LENGTH, + '研究会话标识无效' + ) + const canvasNodeId = requiredString( + request.canvasNodeId, + MAX_ID_LENGTH, + '组件标识无效' + ) + if (request.kind !== 'mind-map' && request.kind !== 'summary' && request.kind !== 'container') { + throw new ResearchTaskError('INVALID_REQUEST', '不支持的任务类型') + } + if (request.kind === 'container') { + if (Object.hasOwn(request, 'detail') || Object.hasOwn(request, 'sources')) { + throw new ResearchTaskError('INVALID_REQUEST', '容器任务只接受内容提示') + } + return Object.freeze({ + parentSessionId, + canvasNodeId, + kind: 'container', + prompt: requiredString(request.prompt, MAX_CONTAINER_PROMPT, '容器内容提示无效') + }) + } + if (Object.hasOwn(request, 'prompt')) { + throw new ResearchTaskError('INVALID_REQUEST', '所选内容任务不接受容器提示') + } + let detail + if (request.kind === 'mind-map') { + if (!DETAILS.has(request.detail)) { + throw new ResearchTaskError('INVALID_REQUEST', '思维导图详细度无效') + } + detail = request.detail + } else if (request.detail !== undefined) { + throw new ResearchTaskError('INVALID_REQUEST', '总结任务不接受详细度参数') + } + if ( + !Array.isArray(request.sources) || + request.sources.length === 0 || + request.sources.length > MAX_SOURCES + ) { + throw new ResearchTaskError('INVALID_REQUEST', '选中内容数量无效') + } + const sources = Object.freeze(request.sources.map(validateSource)) + if (Buffer.byteLength(JSON.stringify(sources), 'utf8') > MAX_TOTAL_SOURCE_BYTES) { + throw new ResearchTaskError('INVALID_REQUEST', '选中内容过长') + } + return Object.freeze({ + parentSessionId, + canvasNodeId, + kind: request.kind, + ...(detail === undefined ? {} : { detail }), + sources + }) +} + +function sourceSection(source, index) { + if (source.type === 'file') { + return `来源 ${index + 1}（文件）\n标题：${source.title}\n路径：${source.path}` + } + return `来源 ${index + 1}（画布组件）\n标题：${source.title}\n内容：\n${source.text}` +} + +function mindMapDetailInstruction(detail) { + if (detail === 'brief') { + return '这是简要模式：内容必须高度概括，总层级不得超过 3 层（中心主题计为第 1 层）；只保留 2–3 个一级主题，每个一级主题保留 1–2 个二级要点，节点总数不超过 10 个，只保留最关键的主题、结论与关系。' + } + if (detail === 'detailed') { + return '这是详细模式：不设置固定层级上限，根据材料充分展开因果、并列、从属和递进关系，使用户能够详细理解内容关系细节。' + } + return '这是常规模式：不设置固定层级上限，根据材料保留理解主题所需的关系层次，在阅读时间与内容理解之间取得平衡。' +} + +function containerPromptHasExplicitWebUrl(prompt) { + return /https?:\/\/[^\s<>"'`]+/iu.test(prompt) +} + +export function buildResearchTaskPrompt(request) { + const validated = validateResearchTaskStart(request) + if (validated.kind === 'container') { + const allowsWeb = containerPromptHasExplicitWebUrl(validated.prompt) + return [ + '请把用户的画布容器需求转换为一个安全、可由 Sherlock 原生组件直接渲染的 JSON 对象。', + `只允许输出以下${allowsWeb ? '五' : '四'}种 schema 之一，字段必须完全一致，不得增加任何字段：`, + ...(allowsWeb ? [ + '{"version": 1, "type": "web", "title": "标题", "url": "https://example.com", "description": "可选说明"}' + ] : []), + '{"version": 1, "type": "chart", "title": "标题", "variant": "bar 或 line", "labels": ["标签"], "series": [{"name": "系列名", "values": [1]}]}', + '{"version": 1, "type": "table", "title": "标题", "columns": ["列名"], "rows": [["单元格"]]}', + '{"version": 1, "type": "kpi", "title": "标题", "items": [{"label": "指标", "value": "数值", "change": "可选变化"}]}', + '{"version": 1, "type": "markdown", "title": "标题", "content": "Markdown 内容"}', + allowsWeb + ? '只有用户明确提供的 http 或 https 网址才能用于 web；不得把用户没有提供的网址替换成自行猜测的网站。' + : '用户未提供明确网址时，不得生成 web，也不得自行猜测或推荐外部网站；请使用 chart、table、kpi 或 markdown 原生呈现。', + '当需求涉及实时、监控或最新数据时，先使用只读网页搜索或网页读取工具取得当前信息，再优先输出原生 kpi、chart 或 table，并在标题或标签中标明数据时点；不得用网站首页代替监控内容。', + '不要输出 HTML 或 JavaScript，不要输出代码围栏、解释、前言或 JSON 之外的文字。', + '图表最多 24 个标签和 6 个系列；表格最多 12 列和 100 行；KPI 最多 12 项。', + '', + `用户需求：${validated.prompt}` + ].join('\n') + } + const sources = validated.sources.map(sourceSection).join('\n\n') + const instruction = validated.kind === 'mind-map' + ? `请基于下方选中的研究材料生成思维导图。${mindMapDetailInstruction(validated.detail)}请用 Markdown 层级列表输出：第一行以“# ”开头写中心主题，后续使用“- ”和两个空格缩进表达分支；每个节点使用简洁中文短语并尽量控制在 18 个中文字符以内，避免末行仅剩单个汉字；完整句子左对齐，短语或词语居中。不要输出说明、前言或代码围栏。结构应采用横向展开、适合直接截图粘贴到公司 PPT。` + : '请基于下方选中的研究材料进行总结提炼。请输出一段结构紧凑、信息密度高的中文总结，保留关键结论、依据、风险和待验证事项，不要复述任务说明。' + return `${instruction}\n\n${sources}` +} + +function truncateUtf8(value, maxBytes) { + const bytes = Buffer.from(value, 'utf8') + if (bytes.byteLength <= maxBytes) return value + let end = maxBytes + while (end > 0 && (bytes[end] & 0xc0) === 0x80) end -= 1 + return bytes.subarray(0, end).toString('utf8') +} + +function boundedExtractedText(value) { + const text = typeof value === 'string' ? value.trim() : '' + if (text.length === 0) { + throw new ResearchTaskError('SOURCE_EMPTY', '选中的文件没有可提取文字') + } + return truncateUtf8(text, MAX_EXTRACTED_SOURCE_BYTES).trim() +} + +async function boundedSourceBytes(path) { + const info = await stat(path) + if (!info.isFile() || info.size <= 0) { + throw new ResearchTaskError('SOURCE_UNREADABLE', '选中的文件无法读取') + } + if (info.size > MAX_SOURCE_FILE_BYTES) { + throw new ResearchTaskError('SOURCE_TOO_LARGE', '选中的文件过大') + } + return new Uint8Array(await readFile(path)) +} + +async function extractPdfText(path) { + const data = await boundedSourceBytes(path) + const { getDocument } = await import('pdfjs-dist/legacy/build/pdf.mjs') + const loadingTask = getDocument({ + data, + isEvalSupported: false, + useSystemFonts: true, + useWorkerFetch: false + }) + let document + try { + document = await loadingTask.promise + if (!Number.isSafeInteger(document?.numPages) || document.numPages < 1) { + throw new ResearchTaskError('SOURCE_UNREADABLE', '选中的 PDF 无法读取') + } + const pages = [] + let totalBytes = 0 + for (let pageNumber = 1; pageNumber <= document.numPages; pageNumber += 1) { + const page = await document.getPage(pageNumber) + try { + const content = await page.getTextContent() + const text = content.items + .map((item) => `${typeof item?.str === 'string' ? item.str : ''}${item?.hasEOL ? '\n' : ''}`) + .join('') + .trim() + if (text.length === 0) continue + const pageBytes = Buffer.byteLength(text, 'utf8') + if (totalBytes + pageBytes > MAX_EXTRACTED_SOURCE_BYTES) { + const remaining = MAX_EXTRACTED_SOURCE_BYTES - totalBytes + if (remaining > 0) pages.push(truncateUtf8(text, remaining).trim()) + break + } + pages.push(text) + totalBytes += pageBytes + } finally { + page.cleanup?.() + } + } + return boundedExtractedText(pages.join('\n\n')) + } finally { + await (document?.destroy?.() ?? loadingTask.destroy?.()) + } +} + +function decodeXmlText(value) { + return value.replace(/&(#x[\da-f]+|#\d+|amp|apos|gt|lt|quot);/giu, (entity, code) => { + if (code === 'amp') return '&' + if (code === 'apos') return "'" + if (code === 'gt') return '>' + if (code === 'lt') return '<' + if (code === 'quot') return '"' + const numeric = code[1]?.toLowerCase() === 'x' + ? Number.parseInt(code.slice(2), 16) + : Number.parseInt(code.slice(1), 10) + try { + return Number.isSafeInteger(numeric) ? String.fromCodePoint(numeric) : entity + } catch { + return entity + } + }) +} + +function extractPptxSlideXmlText(xml) { + const parts = [] + const tokenPattern = /]*)?>([\s\S]*?)<\/a:t>|]*\/?\s*>|]*\/?\s*>|<\/a:p\s*>/giu + for (const match of xml.matchAll(tokenPattern)) { + if (match[1] !== undefined) { + parts.push(decodeXmlText(match[1])) + } else if (/^ MAX_PPTX_SLIDES || + file.originalSize > MAX_PPTX_SLIDE_XML_BYTES || + totalXmlBytes > MAX_PPTX_TOTAL_XML_BYTES + ) { + throw new ResearchTaskError('SOURCE_TOO_LARGE', '所选 PPT 内容过大') + } + return true + } + }) + } catch (error) { + if (error instanceof ResearchTaskError) throw error + throw new ResearchTaskError('SOURCE_UNREADABLE', '所选 PPT 无法读取') + } + const slides = Object.entries(archive) + .map(([name, bytes]) => { + const number = Number.parseInt(name.match(/^ppt\/slides\/slide(\d+)\.xml$/u)?.[1] ?? '', 10) + return { number, text: extractPptxSlideXmlText(strFromU8(bytes)) } + }) + .filter((slide) => Number.isSafeInteger(slide.number) && slide.text.length > 0) + .sort((left, right) => left.number - right.number) + .map((slide) => `第 ${slide.number} 页\n${slide.text}`) + return boundedExtractedText(slides.join('\n\n')) +} + +export async function loadResearchFileText(source) { + const extension = extname(source.path).toLowerCase() + if (extension === '.pdf') return extractPdfText(source.path) + if (extension === '.pptx') return extractPptxText(source.path) + if (!NATIVE_TEXT_EXTENSIONS.has(extension)) { + throw new ResearchTaskError('SOURCE_UNSUPPORTED', '暂不支持读取所选文件类型') + } + return boundedExtractedText(Buffer.from(await boundedSourceBytes(source.path)).toString('utf8')) +} + +export async function buildResearchTaskExecutionPrompt( + request, + { loadFileText = loadResearchFileText } = {} +) { + const validated = validateResearchTaskStart(request) + if (validated.kind === 'container') return buildResearchTaskPrompt(validated) + const sources = await Promise.all(validated.sources.map(async (source) => { + if (source.type !== 'file') return source + return { + id: source.id, + type: 'artifact', + title: source.title, + text: boundedExtractedText(await loadFileText(source)) + } + })) + return buildResearchTaskPrompt({ + parentSessionId: validated.parentSessionId, + canvasNodeId: validated.canvasNodeId, + kind: validated.kind, + ...(validated.detail === undefined ? {} : { detail: validated.detail }), + sources + }) +} + +function eventText(value) { + if (typeof value !== 'string' || value.length === 0) return undefined + return value.slice(0, MAX_EVENT_TEXT) +} + +export function publicEventFromSessionEvent(event) { + if (event?.type === 'assistant/chunk' && event.data?.chunk?.type === 'text-delta') { + const text = eventText(event.data.chunk.text) + return text === undefined ? null : { type: 'assistant-delta', text } + } + if (event?.type === 'tool/call') { + const tool = TOOL_LABELS.get(event.data?.name) ?? '处理资料' + return { type: 'tool-started', tool } + } + if (event?.type === 'tool/result') { + return { type: 'tool-finished', failed: event.data?.error !== undefined } + } + return null +} + +function terminalState(state) { + return TERMINAL_STATES.has(state) +} + +function taskDocument(task) { + return { + taskId: task.taskId, + parentSessionId: task.parentSessionId, + canvasNodeId: task.canvasNodeId, + kind: task.kind, + ...(task.detail === undefined ? {} : { detail: task.detail }), + ...(task.sources === undefined ? {} : { sources: task.sources }), + ...(task.prompt === undefined ? {} : { prompt: task.prompt }), + state: task.state, + ...(task.childSessionId === undefined ? {} : { childSessionId: task.childSessionId }), + ...(task.finalOutput === undefined ? {} : { finalOutput: task.finalOutput }), + ...(task.error === undefined ? {} : { error: task.error }), + lastSeq: task.lastSeq, + createdAt: task.createdAt, + ...(task.startedAt === undefined ? {} : { startedAt: task.startedAt }), + ...(task.completedAt === undefined ? {} : { completedAt: task.completedAt }) + } +} + +function finalText(output) { + if (!Array.isArray(output)) return undefined + const text = output + .filter((block) => block?.type === 'text' && typeof block.text === 'string') + .map((block) => block.text) + .join('\n') + .trim() + return text.length === 0 ? undefined : text.slice(0, MAX_FINAL_OUTPUT) +} + +function taskRequest(task) { + return { + parentSessionId: task.parentSessionId, + canvasNodeId: task.canvasNodeId, + kind: task.kind, + ...(task.detail === undefined ? {} : { detail: task.detail }), + ...(task.sources === undefined ? {} : { sources: task.sources }), + ...(task.prompt === undefined ? {} : { prompt: task.prompt }) + } +} + +function publicTask(task, afterSeq = 0) { + return { + taskId: task.taskId, + canvasNodeId: task.canvasNodeId, + state: task.state, + ...(task.childSessionId === undefined ? {} : { childSessionId: task.childSessionId }), + ...(task.finalOutput === undefined ? {} : { finalOutput: task.finalOutput }), + ...(task.error === undefined ? {} : { error: task.error }), + createdAt: task.createdAt, + ...(task.startedAt === undefined ? {} : { startedAt: task.startedAt }), + ...(task.completedAt === undefined ? {} : { completedAt: task.completedAt }), + lastSeq: task.lastSeq, + events: task.events + .filter((event) => event.seq > afterSeq) + .map((event) => ({ ...event })) + } +} + +function timestamp(value, fallback) { + return Number.isFinite(value) && value >= 0 ? value : fallback +} + +function restoredTask(raw, now) { + const stored = record(raw, 'INVALID_STORAGE', '任务存储无效') + const request = validateResearchTaskStart({ + parentSessionId: stored.parentSessionId, + canvasNodeId: stored.canvasNodeId, + kind: stored.kind, + ...(stored.detail === undefined ? {} : { detail: stored.detail }), + ...(stored.sources === undefined ? {} : { sources: stored.sources }), + ...(stored.prompt === undefined ? {} : { prompt: stored.prompt }) + }) + const originalState = stored.state + if (!TERMINAL_STATES.has(originalState) && originalState !== 'queued' && originalState !== 'running') { + throw new ResearchTaskError('INVALID_STORAGE', '任务状态无效') + } + const interrupted = originalState === 'queued' || originalState === 'running' + const task = { + taskId: requiredString(stored.taskId, MAX_ID_LENGTH, '任务标识无效'), + ...request, + state: interrupted ? 'interrupted' : originalState, + createdAt: timestamp(stored.createdAt, now), + lastSeq: interrupted + ? Number.MAX_SAFE_INTEGER + : Number.isSafeInteger(stored.lastSeq) && stored.lastSeq >= 0 + ? stored.lastSeq + : 0, + events: [], + cancelRequested: false, + controller: undefined, + runPromise: undefined + } + if (typeof stored.finalOutput === 'string' && stored.finalOutput.trim().length > 0) { + task.finalOutput = stored.finalOutput.slice(0, MAX_FINAL_OUTPUT) + } + if (interrupted) { + task.error = '任务因应用重启而中断，请重试。' + task.completedAt = now + } else { + if (typeof stored.error === 'string' && stored.error.trim().length > 0) { + task.error = stored.error.slice(0, MAX_EVENT_TEXT) + } + if (typeof stored.childSessionId === 'string' && stored.childSessionId.trim().length > 0) { + task.childSessionId = stored.childSessionId.slice(0, MAX_ID_LENGTH) + } + if (Number.isFinite(stored.startedAt)) task.startedAt = stored.startedAt + if (Number.isFinite(stored.completedAt)) task.completedAt = stored.completedAt + } + return { task, interrupted } +} + +export class ResearchTaskRuntime { + constructor({ adapter, storage, now = Date.now, createId = randomUUID }) { + if (typeof adapter?.start !== 'function') { + throw new TypeError('ResearchTaskRuntime requires an adapter.') + } + if (typeof storage?.save !== 'function') { + throw new TypeError('ResearchTaskRuntime requires storage.') + } + this.adapter = adapter + this.storage = storage + this.now = now + this.createId = createId + this.tasks = new Map() + this.parents = new Map() + this.persistChain = Promise.resolve() + this.disposed = false + this.restored = false + } + + async restore() { + if (this.restored) return + if (this.tasks.size > 0) { + throw new ResearchTaskError('RUNTIME_ACTIVE', '任务服务已开始运行') + } + const document = await this.storage.load() + if (document === undefined) { + this.restored = true + return + } + if (document?.version !== 1 || !Array.isArray(document.tasks)) { + throw new ResearchTaskError('INVALID_STORAGE', '任务存储无效') + } + let changed = false + for (const raw of document.tasks) { + const restored = restoredTask(raw, this.now()) + if (this.tasks.has(restored.task.taskId)) { + throw new ResearchTaskError('INVALID_STORAGE', '任务标识重复') + } + this.tasks.set(restored.task.taskId, restored.task) + changed ||= restored.interrupted + } + this.restored = true + if (changed) await this.persist() + } + + parentQueue(parentSessionId) { + let queue = this.parents.get(parentSessionId) + if (queue === undefined) { + queue = { active: new Set(), pending: [] } + this.parents.set(parentSessionId, queue) + } + return queue + } + + appendEvent(task, value) { + if (terminalState(task.state)) return + task.lastSeq += 1 + task.events.push({ + taskId: task.taskId, + canvasNodeId: task.canvasNodeId, + seq: task.lastSeq, + time: this.now(), + ...value + }) + if (task.events.length > MAX_PUBLIC_EVENTS) { + task.events.splice(0, task.events.length - MAX_PUBLIC_EVENTS) + } + } + + persistedDocument() { + return { + version: 1, + tasks: [...this.tasks.values()].map(taskDocument) + } + } + + persist() { + const document = this.persistedDocument() + this.persistChain = this.persistChain + .catch(() => undefined) + .then(() => this.storage.save(document)) + return this.persistChain + } + + ownedTask(parentSessionId, taskId) { + const task = this.tasks.get(taskId) + if (task === undefined || task.parentSessionId !== parentSessionId) { + throw new ResearchTaskError('TASK_NOT_FOUND', '任务不存在') + } + return task + } + + async start(raw) { + if (this.disposed) throw new ResearchTaskError('RUNTIME_DISPOSED', '任务服务已停止') + const request = validateResearchTaskStart(raw) + const taskId = requiredString(this.createId(), MAX_ID_LENGTH, '任务标识无效') + if (this.tasks.has(taskId)) throw new ResearchTaskError('TASK_EXISTS', '任务标识重复') + const createdAt = this.now() + const task = { + taskId, + ...request, + state: 'queued', + createdAt, + lastSeq: 0, + events: [], + cancelRequested: false, + controller: new AbortController(), + runPromise: undefined + } + this.appendEvent(task, { type: 'queued' }) + this.tasks.set(taskId, task) + this.parentQueue(task.parentSessionId).pending.push(taskId) + await this.persist() + this.pump(task.parentSessionId) + return publicTask(task, 0) + } + + inspect({ parentSessionId, taskId, afterSeq = 0 }) { + const parent = requiredString(parentSessionId, MAX_ID_LENGTH, '研究会话标识无效') + const id = requiredString(taskId, MAX_ID_LENGTH, '任务标识无效') + if (!Number.isSafeInteger(afterSeq) || afterSeq < 0) { + throw new ResearchTaskError('INVALID_REQUEST', '任务游标无效') + } + return publicTask(this.ownedTask(parent, id), afterSeq) + } + + async cancel({ parentSessionId, taskId }) { + const parent = requiredString(parentSessionId, MAX_ID_LENGTH, '研究会话标识无效') + const id = requiredString(taskId, MAX_ID_LENGTH, '任务标识无效') + const task = this.ownedTask(parent, id) + if (terminalState(task.state)) return publicTask(task, 0) + if (task.cancelRequested) return publicTask(task, 0) + task.cancelRequested = true + const queue = this.parentQueue(task.parentSessionId) + const pendingIndex = queue.pending.indexOf(task.taskId) + if (pendingIndex !== -1) queue.pending.splice(pendingIndex, 1) + task.controller.abort('canvas-task-cancelled') + await this.finish(task, 'cancelled', { error: '任务已取消，可重试。' }) + if (!queue.active.has(task.taskId)) this.pump(task.parentSessionId) + return publicTask(task, 0) + } + + pump(parentSessionId) { + if (this.disposed) return + const queue = this.parentQueue(parentSessionId) + while (queue.active.size < MAX_ACTIVE_PER_PARENT && queue.pending.length > 0) { + const taskId = queue.pending.shift() + const task = this.tasks.get(taskId) + if (task === undefined || task.state !== 'queued' || task.cancelRequested) continue + queue.active.add(taskId) + task.runPromise = this.run(task) + } + } + + onSessionEvent(task, sessionEvent) { + if (task.state !== 'running') return + const value = publicEventFromSessionEvent(sessionEvent) + if (value === null) return + this.appendEvent(task, value) + } + + async run(task) { + let handle + const startingEvents = [] + try { + handle = await this.adapter.start({ + taskId: task.taskId, + parentSessionId: task.parentSessionId, + kind: task.kind, + prompt: await buildResearchTaskExecutionPrompt(taskRequest(task)), + signal: task.controller.signal, + onSessionEvent: (event) => { + if (task.state === 'running') this.onSessionEvent(task, event) + else if (!terminalState(task.state)) startingEvents.push(event) + } + }) + if (task.cancelRequested || terminalState(task.state)) return + task.childSessionId = requiredString( + handle.childSessionId, + MAX_ID_LENGTH, + '子会话标识无效' + ) + task.state = 'running' + task.startedAt = this.now() + this.appendEvent(task, { type: 'started' }) + for (const event of startingEvents) this.onSessionEvent(task, event) + await this.persist() + const result = await handle.result + if (task.cancelRequested || terminalState(task.state)) return + const output = finalText(result?.output) + if (result?.stopReason === 'completed' && output !== undefined) { + await this.finish(task, 'completed', { finalOutput: output }) + } else { + const message = result?.stopReason === 'max-tokens' + ? '生成内容达到长度上限，请重试。' + : result?.stopReason === 'refusal' + ? '任务未能生成内容，请重试。' + : result?.stopReason === 'aborted' + ? '任务已取消，可重试。' + : '生成失败，请重试。' + await this.finish( + task, + result?.stopReason === 'aborted' ? 'cancelled' : 'failed', + { error: message } + ) + } + } catch (error) { + if (!terminalState(task.state)) { + await this.finish( + task, + task.cancelRequested ? 'cancelled' : 'failed', + { + error: task.cancelRequested + ? '任务已取消，可重试。' + : error instanceof ResearchTaskError + ? error.message + : '生成失败，请重试。' + } + ) + } + } finally { + if (handle !== undefined) await handle.dispose().catch(() => undefined) + const queue = this.parentQueue(task.parentSessionId) + queue.active.delete(task.taskId) + task.controller = undefined + task.runPromise = undefined + this.pump(task.parentSessionId) + } + } + + async finish(task, state, value) { + if (terminalState(task.state)) return + task.lastSeq = Math.min(Number.MAX_SAFE_INTEGER, task.lastSeq + 1) + task.state = state + task.completedAt = this.now() + task.events = [] + if (value.finalOutput !== undefined) task.finalOutput = value.finalOutput + if (value.error !== undefined) task.error = value.error + await this.persist() + } + + async dispose() { + if (this.disposed) return + this.disposed = true + const running = [] + for (const task of this.tasks.values()) { + if (terminalState(task.state)) continue + task.controller?.abort('research-task-runtime-disposed') + await this.finish(task, 'interrupted', { + error: '任务因应用关闭而中断，请重试。' + }) + if (task.runPromise !== undefined) running.push(task.runPromise) + } + await Promise.allSettled(running) + await this.persistChain.catch(() => undefined) + if (typeof this.adapter.dispose === 'function') { + await this.adapter.dispose() + } + } +} + +export function createSubagentAdapter(ctx) { + let disposed = false + + const availableTools = (parent, kind) => { + if (kind !== 'container') return [] + const getTool = parent?.ctx?.tools?.get + if (typeof getTool !== 'function') return [] + try { + return ['web_search', 'web_fetch'].filter((tool) => ( + getTool.call(parent.ctx.tools, tool) !== undefined + )) + } catch { + return [] + } + } + + const resolveParent = async (parentSessionId) => { + const live = ctx.agents.get(parentSessionId) + if (live?.id === parentSessionId) return live + const provider = ctx.typert?.lookups?.get('agent') + if (disposed || typeof provider?.resolve !== 'function') { + throw new ResearchTaskError('PARENT_NOT_LIVE', '研究会话当前不可用') + } + try { + const parent = await provider.resolve(parentSessionId) + if (parent?.id === parentSessionId && ctx.agents.get(parentSessionId) === parent) { + return parent + } + } catch { + const racedParent = ctx.agents.get(parentSessionId) + if (racedParent?.id === parentSessionId) return racedParent + } + throw new ResearchTaskError('PARENT_NOT_LIVE', '研究会话当前不可用') + } + + return { + async start({ parentSessionId, kind, prompt, signal, onSessionEvent }) { + const parent = await resolveParent(parentSessionId) + const allowedTools = availableTools(parent, kind) + const effectivePrompt = kind === 'container' && allowedTools.length === 0 + ? `${prompt}\n\n当前任务未提供网页检索工具。不要声称已经获取实时或最新数据；遇到实时、监控类需求时，请生成可直接展示的原生 KPI、图表或表格结构，并把尚未取得的数值明确写为“待更新”或“待接入数据源”。` + : prompt + const run = await ctx.subagents.start('spawn', { + label: '画布生成任务', + parent, + signal, + prompt: [{ type: 'text', text: effectivePrompt }], + maxDepth: 1, + toolFilter: { + allow: allowedTools + }, + persona: RESEARCH_TASK_PERSONA + }) + const child = run.localAgent + if (child === undefined || child.id !== run.id) { + await run.dispose().catch(() => undefined) + throw new ResearchTaskError('LOCAL_CHILD_REQUIRED', '画布任务无法在本地运行') + } + + const seen = new Set() + const deliver = (event) => { + const seq = event?.seq + if (Number.isSafeInteger(seq)) { + if (seen.has(seq)) return + seen.add(seq) + } + onSessionEvent(event) + } + const off = ctx.on('session/event', (session, event) => { + if (session?.id === child.id) deliver(event) + }) + try { + for (const event of [...child.session.events]) deliver(event) + } catch (error) { + off() + await run.dispose().catch(() => undefined) + throw error + } + + let disposed = false + return { + childSessionId: child.id, + result: run.result, + async dispose() { + if (disposed) return + disposed = true + off() + await run.dispose() + } + } + }, + async dispose() { + if (disposed) return + disposed = true + } + } +} + +function dshHome() { + return process.env.DSH_HOME || join(homedir(), '.dsh') +} + +function boundedTaskDocument(document) { + const source = record(document, 'INVALID_STORAGE', '任务存储无效') + if (source.version !== 1 || !Array.isArray(source.tasks)) { + throw new ResearchTaskError('INVALID_STORAGE', '任务存储无效') + } + const terminal = source.tasks + .map((task, index) => ({ task, index })) + .filter(({ task }) => terminalState(task?.state)) + .sort((a, b) => { + const aTime = timestamp(a.task.completedAt, timestamp(a.task.createdAt, 0)) + const bTime = timestamp(b.task.completedAt, timestamp(b.task.createdAt, 0)) + return bTime - aTime || b.index - a.index + }) + .slice(0, MAX_TERMINAL_TASKS) + const retainedTerminal = new Set(terminal.map(({ index }) => index)) + return { + version: 1, + tasks: source.tasks.filter((task, index) => ( + !terminalState(task?.state) || retainedTerminal.has(index) + )) + } +} + +export class JsonResearchTaskStorage { + constructor(filePath = join(dshHome(), 'sherlock-research-tasks.json')) { + this.filePath = filePath + } + + async load() { + try { + const document = JSON.parse(await readFile(this.filePath, 'utf8')) + return boundedTaskDocument(document) + } catch (error) { + if (error?.code === 'ENOENT') return { version: 1, tasks: [] } + if (error instanceof SyntaxError) { + throw new ResearchTaskError('INVALID_STORAGE', '任务存储无效') + } + throw error + } + } + + async save(document) { + const bounded = boundedTaskDocument(document) + await mkdir(dirname(this.filePath), { recursive: true }) + const temporary = `${this.filePath}.${process.pid}.${randomUUID()}.tmp` + try { + await writeFile(temporary, `${JSON.stringify(bounded)}\n`, 'utf8') + await rename(temporary, this.filePath) + } catch (error) { + await unlink(temporary).catch(() => undefined) + throw error + } + } +} + +function isLoopback(address) { + return address === '127.0.0.1' || + address === '::1' || + address === '[::1]' || + address === '::ffff:127.0.0.1' +} + +function hasForwardedAddress(req) { + return Boolean( + req.headers?.forwarded || + req.headers?.['x-forwarded-for'] || + req.headers?.['x-real-ip'] || + req.headers?.['x-forwarded-host'] + ) +} + +export function isTrustedRequest(req, mutation = false) { + if (!isLoopback(req.socket?.remoteAddress) || hasForwardedAddress(req)) return false + if (!mutation) return true + const origin = req.headers?.origin + const host = req.headers?.host + if (typeof origin !== 'string' || typeof host !== 'string') return false + try { + const parsed = new URL(origin) + return parsed.protocol === 'http:' && parsed.host === host && isLoopback(parsed.hostname) + } catch { + return false + } +} + +export async function readJsonBody(req) { + const declared = Number(req.headers?.['content-length']) + if (Number.isFinite(declared) && declared > MAX_BODY_BYTES) { + throw new ResearchTaskError('BODY_TOO_LARGE', '请求内容过长') + } + const chunks = [] + let bytes = 0 + for await (const chunk of req) { + const buffer = Buffer.from(chunk) + bytes += buffer.length + if (bytes > MAX_BODY_BYTES) { + throw new ResearchTaskError('BODY_TOO_LARGE', '请求内容过长') + } + chunks.push(buffer) + } + try { + return JSON.parse(Buffer.concat(chunks).toString('utf8')) + } catch { + throw new ResearchTaskError('INVALID_REQUEST', '请求内容无效') + } +} + +const ROUTE_METHODS = new Map([ + [START_PATH, 'POST'], + [INSPECT_PATH, 'POST'], + [CANCEL_PATH, 'POST'] +]) + +export function routeMethodStatus(path, method) { + const expected = ROUTE_METHODS.get(path) + if (expected === undefined) return 404 + return method === expected ? 200 : 405 +} + +function sendJson(res, status, payload) { + const body = JSON.stringify(payload) + res.writeHead(status, { + 'content-type': 'application/json; charset=utf-8', + 'cache-control': 'no-store', + 'content-length': Buffer.byteLength(body) + }) + res.end(body) +} + +function errorResponse(error) { + if (error instanceof ResearchTaskError) { + if (error.code === 'TASK_NOT_FOUND') return [404, { error: '任务不存在。' }] + if (error.code === 'PARENT_NOT_LIVE' || error.code === 'LOCAL_CHILD_REQUIRED') { + return [409, { error: error.message }] + } + if (error.code === 'RUNTIME_DISPOSED') return [409, { error: '任务服务已停止。' }] + if (error.code === 'BODY_TOO_LARGE' || error.code === 'INVALID_REQUEST') { + return [400, { error: error.message }] + } + } + return [500, { error: '画布任务服务暂时不可用。' }] +} + +function researchTaskHandler(path, runtime) { + return async (req, res) => { + if (routeMethodStatus(path, req.method) !== 200) { + sendJson(res, 405, { error: 'Method not allowed.' }) + return + } + const mutation = path === START_PATH || path === CANCEL_PATH + if (!isTrustedRequest(req, mutation)) { + sendJson(res, 403, { error: 'Request rejected.' }) + return + } + try { + const body = await readJsonBody(req) + const result = path === START_PATH + ? await runtime.start(body) + : path === INSPECT_PATH + ? await runtime.inspect(body) + : await runtime.cancel(body) + sendJson(res, path === START_PATH ? 202 : 200, result) + } catch (error) { + const [status, payload] = errorResponse(error) + sendJson(res, status, payload) + } + } +} + +export function registerResearchTaskRoutes(webServer, runtime) { + const disposers = [...ROUTE_METHODS.keys()].map((path) => webServer.register({ + kind: 'exact', + path, + handler: researchTaskHandler(path, runtime) + })) + let disposed = false + return () => { + if (disposed) return + disposed = true + for (const dispose of disposers.reverse()) dispose() + } +} + +export async function apply(ctx) { + const runtime = new ResearchTaskRuntime({ + adapter: createSubagentAdapter(ctx), + storage: new JsonResearchTaskStorage() + }) + await runtime.restore() + ctx.effect(() => { + const disposeRoutes = registerResearchTaskRoutes(ctx.webServer, runtime) + return async () => { + disposeRoutes() + await runtime.dispose() + } + }) +} diff --git a/packages/dsh-research-task-runtime/package.json b/packages/dsh-research-task-runtime/package.json new file mode 100644 index 000000000..5b4a469bd --- /dev/null +++ b/packages/dsh-research-task-runtime/package.json @@ -0,0 +1,17 @@ +{ + "name": "dsh-research-task-runtime", + "version": "0.1.0", + "description": "Sherlock host runtime for isolated Research canvas generation tasks.", + "private": true, + "type": "module", + "main": "./index.js", + "exports": { + ".": "./index.js", + "./package.json": "./package.json" + }, + "dependencies": { + "fflate": "0.8.3", + "pdfjs-dist": "4.10.38" + }, + "license": "MIT" +} diff --git a/packages/dsh-web-search-session-model/index.js b/packages/dsh-web-search-session-model/index.js new file mode 100644 index 000000000..fcbfc818a --- /dev/null +++ b/packages/dsh-web-search-session-model/index.js @@ -0,0 +1,518 @@ +import z from '@deepseek-ai/schemastery' +import { credentialRef } from '@deepseek-ai/dsh-credentials' +import { launchEnvironmentOf } from '@deepseek-ai/dsh-launch-environment' +import { + installSettingsSection, + settingsNamespace +} from '@deepseek-ai/dsh-settings' +import { WebError } from '@deepseek-ai/dsh-web' + +export const name = 'web-search-session-model' +export const inject = ['agents', 'credentials', 'settings', 'web'] +export const SESSION_MODEL_SEARCH_PROVIDER_ID = 'sherlock-session-model' +export const SESSION_MODEL_SEARCH_SETTINGS_NAMESPACE = settingsNamespace( + 'web-search-session-model' +) +export const SEARCH_MODES = ['auto', 'native-only', 'off'] +export const Config = z.object({ mode: z.union(SEARCH_MODES).default('auto') }) + +const LLM_PI_AI_SETTINGS_NAMESPACE = settingsNamespace('llm-pi-ai') +const DEFAULT_MAX_OUTPUT_TOKENS = 4096 +const DEFAULT_OPENAI_BASE_URL = 'https://api.openai.com/v1' +const LOCAL_SEARCH_URL_ENV = 'SHERLOCK_LOCAL_SEARCH_URL' +const LOCAL_SEARCH_TOKEN_ENV = 'SHERLOCK_LOCAL_SEARCH_TOKEN' + +function isRecord(value) { + return typeof value === 'object' && value !== null && !Array.isArray(value) +} + +function nonEmptyString(value) { + return typeof value === 'string' && value.length > 0 ? value : undefined +} + +function selectedModel(ctx) { + const agent = ctx.get('agents')?.currentInitiator() + const config = agent?.session.requestHeader()?.config + const provider = nonEmptyString(config?.provider) + const model = nonEmptyString(config?.model) + if (!provider || !model) { + throw new WebError( + 'Web search needs an active session model selection.', + 'WEB_MODEL_SELECTION_MISSING' + ) + } + return { agent, provider, model } +} + +function providerProfile(ctx, provider) { + const settings = ctx.get('settings')?.get(LLM_PI_AI_SETTINGS_NAMESPACE) + const providers = isRecord(settings) && isRecord(settings.providers) + ? settings.providers + : undefined + return providers && isRecord(providers[provider]) ? providers[provider] : undefined +} + +function supportsResponses(provider, profile) { + const protocol = nonEmptyString(profile?.api) + return protocol === 'openai-responses' || (provider === 'openai' && protocol === undefined) +} + +export function resolveSessionSearchRoute(ctx) { + const { provider, model } = selectedModel(ctx) + const profile = providerProfile(ctx, provider) + return { + provider, + model, + ...(supportsResponses(provider, profile) + ? { nativeKind: 'openai-responses' } + : {}), + ...(profile ? { profile } : {}) + } +} + +function responsesBaseURL(provider, profile) { + const baseURL = + nonEmptyString(profile?.baseURL) ?? + (provider === 'openai' ? DEFAULT_OPENAI_BASE_URL : undefined) + if (!baseURL || !URL.canParse(baseURL)) { + throw new WebError( + `The selected model provider "${provider}" has no valid Responses API base URL.`, + 'WEB_MODEL_ROUTE_UNAVAILABLE' + ) + } + const parsed = new URL(baseURL) + if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') { + throw new WebError( + `The selected model provider "${provider}" must use an HTTP(S) API endpoint.`, + 'WEB_MODEL_ROUTE_UNAVAILABLE' + ) + } + return baseURL.replace(/\/+$/u, '') +} + +async function resolveApiKey(ctx, provider, profile) { + const configuredRef = nonEmptyString(profile?.apiKeyEnv) + const fallbackRef = provider === 'openai' ? 'OPENAI_API_KEY' : undefined + const ref = credentialRef(configuredRef ?? fallbackRef ?? `${provider.toUpperCase()}_API_KEY`) + const credentials = ctx.get('credentials') + const hit = credentials + ? await credentials.resolve(ref) + : launchEnvironmentOf(ctx).get(ref) + const value = nonEmptyString(hit?.value) + if (!value) { + throw new WebError( + `The selected model provider "${provider}" has no API key for "${ref}".`, + 'WEB_PROVIDER_CREDENTIAL_MISSING' + ) + } + return { apiKey: value, apiKeyRef: ref } +} + +/** Resolve native Responses options only after the route is allowlisted. */ +export async function resolveSessionSearchOptions(ctx) { + const { agent, provider, model } = selectedModel(ctx) + const profile = providerProfile(ctx, provider) + if (!supportsResponses(provider, profile)) { + throw new WebError( + `The selected model provider "${provider}" does not expose a verified Responses web_search route.`, + 'WEB_MODEL_SEARCH_UNSUPPORTED' + ) + } + const { apiKey, apiKeyRef } = await resolveApiKey(ctx, provider, profile) + const headers = isRecord(profile?.headers) + ? Object.fromEntries( + Object.entries(profile.headers).filter( + ([key, value]) => + typeof value === 'string' && key.toLowerCase() !== 'authorization' + ) + ) + : {} + return { + provider, + model, + apiKey, + apiKeyRef, + baseURL: responsesBaseURL(provider, profile), + headers, + recordRequest: (request) => { + agent?.session.append('web/session-model-search-llm-request', request) + } + } +} + +function responseSources(body) { + const sources = [] + const seen = new Set() + const add = (candidate) => { + if (!isRecord(candidate)) return + const url = nonEmptyString(candidate.url) + if (!url || seen.has(url) || !URL.canParse(url)) return + const parsed = new URL(url) + if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') return + seen.add(url) + sources.push({ + url, + ...(nonEmptyString(candidate.title) ? { title: candidate.title } : {}), + ...(nonEmptyString(candidate.snippet) ? { snippet: candidate.snippet } : {}) + }) + } + for (const item of Array.isArray(body.output) ? body.output : []) { + if (!isRecord(item)) continue + if (item.type === 'web_search_call' && isRecord(item.action)) { + for (const source of Array.isArray(item.action.sources) ? item.action.sources : []) { + add(source) + } + } + for (const part of Array.isArray(item.content) ? item.content : []) { + if (!isRecord(part)) continue + for (const annotation of Array.isArray(part.annotations) ? part.annotations : []) { + if (isRecord(annotation) && annotation.type === 'url_citation') add(annotation) + } + } + } + return sources +} + +function responseText(body) { + const pieces = [] + for (const item of Array.isArray(body.output) ? body.output : []) { + if (!isRecord(item)) continue + for (const part of Array.isArray(item.content) ? item.content : []) { + if (isRecord(part) && part.type === 'output_text' && nonEmptyString(part.text)) { + pieces.push(part.text) + } + } + } + return pieces.join('\n').trim() +} + +function usedWebSearch(body) { + return (Array.isArray(body.output) ? body.output : []).some( + (item) => isRecord(item) && item.type === 'web_search_call' + ) +} + +function apiErrorMessage(body, status) { + if (isRecord(body?.error) && nonEmptyString(body.error.message)) return body.error.message + if (nonEmptyString(body?.message)) return body.message + return `HTTP ${status}` +} + +function unsupportedSearch(status, message) { + return ( + status === 404 || + status === 405 || + (status >= 400 && + status < 500 && + /(?:web.?search|responses|unknown tool|unsupported)/iu.test(message)) + ) +} + +function aborted(signal, error) { + return ( + signal?.aborted === true || + (error instanceof DOMException && error.name === 'AbortError') || + (isRecord(error) && error.code === 'WEB_ABORTED') + ) +} + +function abortWebError(signal, cause) { + return new WebError('Web search was aborted.', 'WEB_ABORTED', { + cause: signal?.aborted === true ? signal.reason : cause + }) +} + +async function searchResponses(options, request, signal) { + if (signal?.aborted) throw abortWebError(signal) + const endpoint = `${options.baseURL}/responses` + const body = { + model: options.model, + input: `Search the web for this query and return a concise factual answer with citations: ${request.query}`, + tools: [{ type: 'web_search' }], + tool_choice: 'required', + include: ['web_search_call.action.sources'], + max_output_tokens: DEFAULT_MAX_OUTPUT_TOKENS + } + options.recordRequest?.({ + endpoint, + provider: options.provider, + model: options.model, + apiKeyRef: options.apiKeyRef, + body + }) + let response + try { + response = await fetch(endpoint, { + method: 'POST', + redirect: 'error', + headers: { + ...options.headers, + authorization: `Bearer ${options.apiKey}`, + 'content-type': 'application/json', + accept: 'application/json', + 'user-agent': 'sherlock/0.6.8' + }, + body: JSON.stringify(body), + ...(signal ? { signal } : {}) + }) + } catch (error) { + if (aborted(signal, error)) throw abortWebError(signal, error) + throw new WebError( + `Selected model web search request failed: ${ + error instanceof Error ? error.message : String(error) + }`, + 'WEB_PROVIDER_ERROR', + { cause: error } + ) + } + let parsed + try { + parsed = await response.json() + } catch (error) { + if (aborted(signal, error)) throw abortWebError(signal, error) + throw new WebError( + `Selected model returned an unreadable web search response (HTTP ${response.status}).`, + 'WEB_PROVIDER_ERROR', + { cause: error } + ) + } + if (!response.ok) { + const detail = apiErrorMessage(parsed, response.status) + const code = unsupportedSearch(response.status, detail) + ? 'WEB_MODEL_SEARCH_UNSUPPORTED' + : 'WEB_PROVIDER_ERROR' + throw new WebError(`Selected model web search failed: ${detail}`, code, { + status: response.status + }) + } + if (!isRecord(parsed) || !usedWebSearch(parsed)) { + throw new WebError( + 'The selected model API returned no web_search call.', + 'WEB_MODEL_SEARCH_UNSUPPORTED' + ) + } + const content = responseText(parsed) + const sources = responseSources(parsed) + if (sources.length === 0) { + throw new WebError( + 'The selected model API returned no citeable web sources.', + 'WEB_MODEL_SEARCH_UNSUPPORTED' + ) + } + return { + ...(content ? { content } : {}), + sources, + truncated: false + } +} + +function validateLocalEndpoint(endpoint) { + const url = nonEmptyString(endpoint?.url) + const token = nonEmptyString(endpoint?.token) + if (!url || !token || !URL.canParse(url)) { + throw new WebError( + 'Sherlock local browser search is unavailable.', + 'WEB_LOCAL_SEARCH_UNAVAILABLE' + ) + } + const parsed = new URL(url) + if (parsed.protocol !== 'http:' || parsed.hostname !== '127.0.0.1') { + throw new WebError( + 'Sherlock local browser search endpoint is invalid.', + 'WEB_LOCAL_SEARCH_UNAVAILABLE' + ) + } + return { url: parsed.origin, token } +} + +function localEndpointFromEnvironment() { + return validateLocalEndpoint({ + url: process.env[LOCAL_SEARCH_URL_ENV], + token: process.env[LOCAL_SEARCH_TOKEN_ENV] + }) +} + +function localSources(body) { + if (!isRecord(body) || !Array.isArray(body.sources)) return [] + const seen = new Set() + return body.sources.flatMap((candidate) => { + if (!isRecord(candidate)) return [] + const url = nonEmptyString(candidate.url) + if (!url || seen.has(url) || !URL.canParse(url)) return [] + const parsed = new URL(url) + if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') return [] + seen.add(url) + return [{ + url, + ...(nonEmptyString(candidate.title) ? { title: candidate.title } : {}), + ...(nonEmptyString(candidate.snippet) ? { snippet: candidate.snippet } : {}) + }] + }) +} + +export async function searchLocalBrowser( + request, + signal, + endpoint = localEndpointFromEnvironment() +) { + if (signal?.aborted) throw abortWebError(signal) + const local = validateLocalEndpoint(endpoint) + let response + try { + response = await fetch(`${local.url}/search`, { + method: 'POST', + headers: { + authorization: `Bearer ${local.token}`, + 'content-type': 'application/json', + accept: 'application/json' + }, + body: JSON.stringify({ + query: request.query, + maxResults: request.maxResults + }), + ...(signal ? { signal } : {}) + }) + } catch (error) { + if (aborted(signal, error)) throw abortWebError(signal, error) + throw new WebError( + 'Sherlock local browser search could not be reached.', + 'WEB_LOCAL_SEARCH_UNAVAILABLE', + { cause: error } + ) + } + let parsed + try { + parsed = await response.json() + } catch (error) { + if (aborted(signal, error)) throw abortWebError(signal, error) + throw new WebError( + 'Sherlock local browser search returned an unreadable response.', + 'WEB_LOCAL_SEARCH_FAILED', + { cause: error } + ) + } + if (!response.ok) { + throw new WebError( + isRecord(parsed) && nonEmptyString(parsed.error) + ? parsed.error + : 'Sherlock local browser search failed.', + 'WEB_LOCAL_SEARCH_FAILED', + { status: response.status } + ) + } + const sources = localSources(parsed) + if (sources.length === 0) { + throw new WebError( + 'Sherlock local browser search returned no usable sources.', + 'WEB_LOCAL_SEARCH_FAILED' + ) + } + return { + ...(nonEmptyString(parsed.content) ? { content: parsed.content } : {}), + sources, + truncated: parsed.truncated === true + } +} + +function boundedResult(result, maxResults) { + const limit = Number.isInteger(maxResults) && maxResults > 0 ? maxResults : 5 + return { + ...(nonEmptyString(result.content) ? { content: result.content } : {}), + sources: result.sources.slice(0, limit), + truncated: result.truncated === true || result.sources.length > limit + } +} + +export class SessionModelSearchProvider { + id = SESSION_MODEL_SEARCH_PROVIDER_ID + + constructor(dependencies) { + this.dependencies = + typeof dependencies === 'function' + ? { + mode: () => 'auto', + resolveRoute: async () => ({ nativeKind: 'openai-responses' }), + resolveNativeOptions: dependencies, + searchLocal: searchLocalBrowser + } + : dependencies + } + + available() { + return true + } + + async search(request, signal) { + const mode = this.dependencies.mode() + if (mode === 'off') { + throw new WebError('Web search is disabled in Sherlock settings.', 'WEB_SEARCH_DISABLED') + } + if (signal?.aborted) throw abortWebError(signal) + + let route + let nativeFailure + try { + route = await this.dependencies.resolveRoute() + } catch (error) { + if (aborted(signal, error)) throw abortWebError(signal, error) + nativeFailure = error + } + + if (route?.nativeKind === 'openai-responses') { + try { + const options = await this.dependencies.resolveNativeOptions(route) + const result = await searchResponses(options, request, signal) + return boundedResult(result, request.maxResults) + } catch (error) { + if (aborted(signal, error)) throw abortWebError(signal, error) + nativeFailure = error + } + } else if (!nativeFailure) { + nativeFailure = new WebError( + `The selected model provider "${route?.provider ?? 'unknown'}" has no verified native web search adapter.`, + 'WEB_MODEL_SEARCH_UNSUPPORTED' + ) + } + + if (mode === 'native-only') { + throw new WebError( + 'The selected model does not provide a usable native web search route.', + 'WEB_NATIVE_SEARCH_REQUIRED', + { cause: nativeFailure } + ) + } + + try { + const result = await this.dependencies.searchLocal(request, signal) + return boundedResult(result, request.maxResults) + } catch (error) { + if (aborted(signal, error)) throw abortWebError(signal, error) + throw error + } + } +} + +export function apply(ctx, config = { mode: 'auto' }) { + const entry = { mode: config.mode ?? 'auto' } + let current = () => entry + installSettingsSection( + ctx, + SESSION_MODEL_SEARCH_SETTINGS_NAMESPACE, + Config, + entry, + { + setSource: (source) => { + current = source + }, + onChange: () => {} + } + ) + ctx.web.registerSearchProvider( + new SessionModelSearchProvider({ + mode: () => current().mode, + resolveRoute: () => resolveSessionSearchRoute(ctx), + resolveNativeOptions: () => resolveSessionSearchOptions(ctx), + searchLocal: searchLocalBrowser + }) + ) +} diff --git a/packages/dsh-web-search-session-model/package.json b/packages/dsh-web-search-session-model/package.json new file mode 100644 index 000000000..c1dba5cc9 --- /dev/null +++ b/packages/dsh-web-search-session-model/package.json @@ -0,0 +1,20 @@ +{ + "name": "dsh-web-search-session-model", + "version": "0.1.0", + "description": "Sherlock web search provider that follows the current session model route.", + "private": true, + "type": "module", + "main": "./index.js", + "exports": { + ".": "./index.js", + "./package.json": "./package.json" + }, + "license": "MIT", + "dependencies": { + "@deepseek-ai/dsh-credentials": "^0.1.0-rc.7", + "@deepseek-ai/dsh-launch-environment": "^0.1.0-rc.7", + "@deepseek-ai/dsh-settings": "^0.1.0-rc.7", + "@deepseek-ai/dsh-web": "^0.1.0-rc.7", + "@deepseek-ai/schemastery": "^3.18.1" + } +} diff --git a/patches/@deepseek-ai+dsh+0.1.0-rc.7.patch b/patches/@deepseek-ai+dsh+0.1.0-rc.7.patch index ee3e7ef80..721d573df 100644 --- a/patches/@deepseek-ai+dsh+0.1.0-rc.7.patch +++ b/patches/@deepseek-ai+dsh+0.1.0-rc.7.patch @@ -1,11 +1,327 @@ -diff --git a/node_modules/@deepseek-ai/dsh/package.json b/node_modules/@deepseek-ai/dsh/package.json ---- a/node_modules/@deepseek-ai/dsh/package.json -+++ b/node_modules/@deepseek-ai/dsh/package.json -@@ -20,6 +20,7 @@ - ], - "license": "MIT", - "dependencies": { -+ "dsh-desktop-market-installer": "0.1.0", - "commander": "^15.0.0", - "js-yaml": "^4.2.0", - "node-addon-require-builtin": "^0.1.4", +diff --git a/node_modules/@deepseek-ai/dsh/config/sherlock-agent-presets/standard/agent.cordis.yml b/node_modules/@deepseek-ai/dsh/config/sherlock-agent-presets/standard/agent.cordis.yml +new file mode 100644 +index 0000000..03dd895 +--- /dev/null ++++ b/node_modules/@deepseek-ai/dsh/config/sherlock-agent-presets/standard/agent.cordis.yml +@@ -0,0 +1,251 @@ ++# The `standard` agent preset: the full coding agent, mounted once per process. ++# ++# This file is an AGENT-PLANE composition. The roster mounts it ONCE under a ++# standing scope; every session naming it joins by scope parentage, so the ++# tools and prompt sections registered here cover each joined agent while a ++# session's own state stays keyed per Session/Agent inside the plugins. The ++# host composition (`base.cordis.yml` + `web.cordis.yml`) keeps everything a ++# preset must not own: the registries themselves, the sandbox and approval ++# stack, persistence, and the model route. ++# ++# A service row here MUST sit inside a group carrying an `isolate` realm. ++# Without one it publishes into the root realm, where it is process-global — ++# another preset publishing the same name collides, and a host reader would ++# resolve one preset's instance for every session; `dsh-agent-presets` rejects ++# that at mount. `true` means an entry-local realm: this standing mount's own ++# private instance, apart from every other preset's. (A shared label does NOT ++# pool instances — `provide()` throws on the second registration under the ++# same realm symbol; labels join REALMS, and are not what this file needs.) ++ ++# ── identity ──────────────────────────────────────────────────────────────── ++ ++# The preset's own persona, shadowing the deployment default for this agent. ++# `{{model}}` and `{{cwd}}` resolve from the agent's own route and workspace. ++- id: persona ++ name: '@deepseek-ai/dsh-persona' ++ config: ++ text: >- ++ You are a coding agent powered by the {{model}} model. Your working directory is {{cwd}}. During multi-step work, provide concise user-facing progress updates in the user's language before substantial new work and after meaningful milestones. Each update should briefly state what has been established and what comes next, then continue the task without waiting for acknowledgment. Do not reveal private reasoning, raw commands, local paths, credentials, or repetitive tool logs. For long-running work, provide a useful update whenever you regain control after a meaningful phase instead of leaving the user with only a loading indicator. Keep the final answer focused on the outcome and do not repeat the entire progress transcript. ++ ++- id: agent-instructions ++ name: '@deepseek-ai/dsh-agent-instructions' ++ config: ++ maxBytes: 65536 ++ ++# ── shell ─────────────────────────────────────────────────────────────────── ++ ++# `shell-env` stays in the HOST composition: `apps/cli/src/web.ts` injects it to ++# publish `DSH_WEB_URL`/`DSH_WEB_MODE`, and a host row that injects a service is ++# the criterion for host-plane ownership — injection resolves before any session ++# exists, so there is no agent to key by. Behind a preset realm those variables ++# never reached the model's shell at all. Both shell tools consume the host ++# registry from here; their executors (`bash-sandbox`/`pwsh-sandbox`) are ++# host-plane too. ++- id: tool-bash ++ name: '@deepseek-ai/dsh-tool-bash' ++ disabled: !!js process.platform === 'win32' ++ ++- id: tool-pwsh ++ name: '@deepseek-ai/dsh-tool-pwsh' ++ disabled: !!js process.platform !== 'win32' ++ ++# ── filesystem ────────────────────────────────────────────────────────────── ++ ++# Both register into the host `tools` registry and provide nothing, so ++# they need no realm. The `fs` service and its policy stay in the host. ++- id: tool-fs ++ name: '@deepseek-ai/dsh-tool-fs' ++ ++- id: tool-fs-search ++ name: '@deepseek-ai/dsh-tool-fs-search' ++ config: ++ sampleOverCapGlobResults: false ++ ++# ── background jobs ──────────────────────────────────────────────────────── ++ ++# Only the model-facing controls. The task REGISTRY stays on the host plane: ++# its producers sit outside any realm this file could put it in — `tool-bash` ++# above resolves it with `ctx.get`, and an entry-local realm here is invisible ++# to every sibling row, so `run_in_background` would answer "background jobs ++# unavailable" while these controls sat in the catalog. The registry is keyed by ++# owning agent anyway, so one host instance serves every session. What a preset ++# chooses is whether its agent can collect and stop background work at all. ++- id: tool-jobs ++ name: '@deepseek-ai/dsh-tool-jobs' ++ ++# ── skills ────────────────────────────────────────────────────────────────── ++ ++# The skill REGISTRY lives in the host composition and is layered per scope: ++# these rows register into THIS preset's layer of it, so they need no realm. ++# `skill-filesystem` contributes local-root discovery for agents on this preset, and ++# `tool-skill` gives them the catalog and loader; the merged catalog also ++# carries whatever the deployment registered globally (repository plugins). ++- id: skill-filesystem ++ name: '@deepseek-ai/dsh-skill-filesystem' ++ ++- id: tool-skill ++ name: '@deepseek-ai/dsh-tool-skill' ++ ++# ── goals ─────────────────────────────────────────────────────────────────── ++ ++# Only the model-facing tool. The goal SERVICE, its session driver, and the ++# `/goal` command stay on the host plane: the Gateway serves the goal domain as ++# Remote endpoints whose receiver comes from a generated descriptor, so it ++# resolves `goals` on the host and an entry-local realm here would hide it. The ++# registry is keyed by session anyway, so one host instance serves every ++# session. What a preset chooses is whether its agent can call the goal tool. ++- id: tool-goal ++ name: '@deepseek-ai/dsh-tool-goal' ++ ++# ── plan mode ─────────────────────────────────────────────────────────────── ++ ++# Plan state is per-agent by nature, so an entry-local realm is not a ++# workaround here — it is the correct lifetime. ++- id: planning ++ name: cordis:group ++ group: true ++ isolate: ++ planMode: true ++ config: ++ - id: plan-mode ++ name: '@deepseek-ai/dsh-plan-mode' ++ config: ++ section: | ++ You are in plan mode. Stay in plan mode until exit_plan_mode succeeds or the user switches the session mode. Imperative language to implement changes means plan the implementation, not execute it. A user's conversational agreement — including an answer confirming something you asked — approves nothing and does not end plan mode; fold the confirmed decision into the plan and submit it through exit_plan_mode. ++ ++ Explore first. Use non-mutating reads, searches, static analysis, and checks to ground the plan in the actual repository. Do not edit or write files, change configuration, run formatters or code generation that rewrites tracked files, commit, or otherwise carry out the plan. Prefer existing functions and patterns over new machinery. ++ ++ The tool catalog stays the same across modes for request-cache stability. These plan-mode rules override any later tool description or guidance that suggests using mutation tools; those tools remain listed to keep the tool catalog unchanged. Do not use todo_write to track this planning phase: it tracks implementation after an approved plan, while the plan itself belongs in exit_plan_mode. ++ ++ Resolve discoverable facts by inspection. Use ask_user_question only for user-owned choices or material ambiguity that inspection cannot answer. Do not ask the user where code lives or how current behavior works when you can find out. ++ ++ Make the plan decision-complete: state the goal and success criteria; group implementation changes by subsystem; identify public API, schema, and data-flow changes; cover edge cases, failure modes, tests, acceptance criteria, and explicit assumptions. Keep it concise enough to review but detailed enough that another engineer can implement it without making design decisions. ++ ++ When ready, call exit_plan_mode with the complete plan markdown, starting with a # title. Make exit_plan_mode the only and final tool call in that assistant response: it presents the plan for approval, and implementation begins only in a later step after approval. Do not paste the final plan as a plain reply or ask "should I proceed?" through prose or ask_user_question. If review rejects it, incorporate the feedback and present again. If the review channel is unavailable or aborted, stay in plan mode and ask the user to switch modes manually; do not proceed with implementation. ++ ++# ── compaction ────────────────────────────────────────────────────────────── ++ ++# `compaction-basic` reads `toolResultPrune` through `ctx.get`, so the pruner must ++# share this realm rather than sit outside it. ++# ++# `tokenMeter` is deliberately NOT in this realm: the meter stays on the HOST ++# plane, and the rows here resolve that one instance. It takes no configuration, ++# keys every fold by Session, and owns the context-meter projection units the ++# browser reads for every session — behind a realm those units would come and go ++# with whichever presets happen to be mounted. What a preset chooses is whether ++# its agent compacts at all, which is `compaction-basic` below. ++- id: compaction ++ name: cordis:group ++ group: true ++ isolate: ++ compaction: true ++ toolResultPruner: true ++ config: ++ - id: compaction-basic ++ name: '@deepseek-ai/dsh-compaction-basic' ++ ++ - id: command-compact ++ name: '@deepseek-ai/dsh-command-compact' ++ ++ - id: tool-result-pruner ++ name: '@deepseek-ai/dsh-compaction-tool-result-pruner' ++ config: ++ thresholdChars: 8192 ++ headChars: 4096 ++ tailChars: 1024 ++ ++# ── delegation and workflows ──────────────────────────────────────────────── ++ ++# The `subagents` registry and its spawn/fork backends live in the HOST ++# composition: the registry is a process singleton whose cross-session queries ++# the api-proxy serves to the browser, and a provider name may only be ++# registered once. This preset contributes the delegation TOOLS, which resolve ++# that host registry. ++# ++# `workflows` is different — nothing outside an agent reads it — so every row ++# that reaches it shares one entry-local realm here, and a consumer left ++# outside would resolve a host registry this preset does not populate. ++# ++# `tool-subagent-report` is host-plane for the same reason as the registry, ++# not because a preset may not want it: it registers a CONTINUABLE SETUP on ++# that singleton rather than a tool this agent calls, and the setup list is ++# not scope-aware — one copy per mounted preset means every child gets ++# `report` registered once per live session, which throws on the second. ++- id: delegation ++ name: cordis:group ++ group: true ++ isolate: ++ workflowEngine: true ++ config: ++ - id: tool-subagent-control ++ name: '@deepseek-ai/dsh-tool-subagent-control' ++ ++ - id: tool-subagent-list-agents ++ name: '@deepseek-ai/dsh-tool-subagent-control/list-agents' ++ ++ - id: tool-subagent ++ name: '@deepseek-ai/dsh-tool-subagent' ++ config: ++ provider: spawn ++ toolName: subagent ++ backgroundMode: continuable ++ ++ - id: tool-subagent-fork ++ name: '@deepseek-ai/dsh-tool-subagent' ++ config: ++ provider: fork ++ toolName: subagent_fork ++ backgroundMode: continuable ++ ++ # Production dsh does not install these optional providers. An opting-in ++ # Profile mounts each provider once on the host plane; copy this preset, ++ # then remove `disabled` from the matching tool row. ++ - id: tool-subagent-codex ++ name: '@deepseek-ai/dsh-tool-subagent' ++ disabled: true ++ config: ++ provider: codex ++ toolName: subagent_codex ++ backgroundMode: one-shot ++ maxDepth: provider-managed ++ ++ - id: tool-subagent-claude-code ++ name: '@deepseek-ai/dsh-tool-subagent' ++ disabled: true ++ config: ++ provider: claude-code ++ toolName: subagent_claude_code ++ backgroundMode: one-shot ++ maxDepth: provider-managed ++ ++ - id: workflow-worker-thread ++ name: '@deepseek-ai/dsh-workflow-worker-thread' ++ config: ++ provider: spawn ++ ++ - id: tool-workflow ++ name: '@deepseek-ai/dsh-tool-workflow' ++ ++ - id: tool-ralph ++ name: '@deepseek-ai/dsh-tool-ralph' ++ config: ++ subagentProvider: spawn ++ maxRounds: 64 ++ ++# ── remaining model-facing rows ───────────────────────────────────────────── ++ ++- id: tool-ask-user ++ name: '@deepseek-ai/dsh-tool-ask-user' ++ ++- id: tool-todo ++ name: '@deepseek-ai/dsh-tool-todo' ++ config: ++ allowParallelInProgress: true ++ ++# The `web` service and its search provider stay in the host composition; only ++# the model-facing tool is per-session. ++- id: tool-web ++ name: '@deepseek-ai/dsh-tool-web' ++ config: ++ fetch: false ++ searchTimeoutMs: 60000 +diff --git a/node_modules/@deepseek-ai/dsh/config/sherlock-agent-presets/standard/preset.yml b/node_modules/@deepseek-ai/dsh/config/sherlock-agent-presets/standard/preset.yml +new file mode 100644 +index 0000000..caeacd1 +--- /dev/null ++++ b/node_modules/@deepseek-ai/dsh/config/sherlock-agent-presets/standard/preset.yml +@@ -0,0 +1,3 @@ ++name: 标准模式 ++description: 功能完整的编码 Agent，支持文件编辑、Shell、文件与网页检索、Skills、计划、目标、子代理和工作流。 ++order: 1 +diff --git a/node_modules/@deepseek-ai/dsh/lib/dump-config-D-jtgwY3.js b/node_modules/@deepseek-ai/dsh/lib/dump-config-D-jtgwY3.js +index bc28439..d3c86e3 100644 +--- a/node_modules/@deepseek-ai/dsh/lib/dump-config-D-jtgwY3.js ++++ b/node_modules/@deepseek-ai/dsh/lib/dump-config-D-jtgwY3.js +@@ -1,6 +1,7 @@ + import { i as prepareProfile, n as PROFILE_ROOT_FILENAME, r as homePatchPath } from "./profile-boot-DG5t9aNs.js"; + import { existsSync } from "node:fs"; +-import { loadOptionalPatches, loadOverlayPatches, renderConfigDump } from "@deepseek-ai/dsh-app-boot"; ++import { fileURLToPath } from "node:url"; ++import { composeEntries, loadOptionalPatches, loadOverlayPatches, renderConfigDump } from "@deepseek-ai/dsh-app-boot"; + import { join, resolve } from "node:path"; + //#region lib/types/dump-config.js + /** +@@ -11,6 +12,7 @@ import { join, resolve } from "node:path"; + * @module @deepseek-ai/dsh/dump-config + */ + const NAME = "dsh"; ++const SHIPPED_PRESET_ROOT = fileURLToPath(new URL("../config/agent-presets/", import.meta.url)); + /* v8 ignore start -- built-bin acceptance drives this boot-free dispatch */ + /** + * Print a profile composition with comments naming each source file and patch layer. +@@ -44,6 +46,22 @@ function runDumpConfig(profile, defaultOnly, patches) { + patches: loadOverlayPatches(NAME, absolute) + }); + } ++ const composed = composeEntries(layers.map((layer) => layer.patches)); ++ const presets = composed.find((entry) => entry.id === "agent-presets"); ++ if (presets !== void 0) layers.push({ ++ label: "Sherlock standard preset policy", ++ patches: [{ ++ id: "agent-presets", ++ config: { ++ ...presets.config ?? {}, ++ roots: [{ ++ path: join(SHIPPED_PRESET_ROOT, "..", "sherlock-agent-presets"), ++ trust: "system" ++ }], ++ includeUserRoot: false ++ } ++ }] ++ }); + } + process.stdout.write(renderConfigDump(NAME, join(loaded.dir, PROFILE_ROOT_FILENAME), layers)); + } +diff --git a/node_modules/@deepseek-ai/dsh/lib/profile-boot-DG5t9aNs.js b/node_modules/@deepseek-ai/dsh/lib/profile-boot-DG5t9aNs.js +index e63d193..28aafff 100644 +--- a/node_modules/@deepseek-ai/dsh/lib/profile-boot-DG5t9aNs.js ++++ b/node_modules/@deepseek-ai/dsh/lib/profile-boot-DG5t9aNs.js +@@ -181,9 +181,10 @@ function composeProfile(name, patchFiles) { + config: { + ...rows.get("agent-presets")?.config ?? {}, + roots: [{ +- path: SHIPPED_PRESET_ROOT, ++ path: join(SHIPPED_PRESET_ROOT, "..", "sherlock-agent-presets"), + trust: "system" +- }] ++ }], ++ includeUserRoot: false + } + }); + const telemetryPatch = resolveTelemetryPatch(process.env.DSH_TELEMETRY_DISABLED, rows.has(TELEMETRY_ROW_ID)); diff --git a/patches/@deepseek-ai+dsh-agent-presets+0.1.0-rc.7.patch b/patches/@deepseek-ai+dsh-agent-presets+0.1.0-rc.7.patch new file mode 100644 index 000000000..41cdf6330 --- /dev/null +++ b/patches/@deepseek-ai+dsh-agent-presets+0.1.0-rc.7.patch @@ -0,0 +1,28 @@ +diff --git a/node_modules/@deepseek-ai/dsh-agent-presets/lib/index.js b/node_modules/@deepseek-ai/dsh-agent-presets/lib/index.js +--- a/node_modules/@deepseek-ai/dsh-agent-presets/lib/index.js ++++ b/node_modules/@deepseek-ai/dsh-agent-presets/lib/index.js +@@ -762,8 +762,8 @@ function resolveSessionPreset(session) { + for (let index = session.events.length - 1; index >= 0; index -= 1) { + const event = session.events[index]; +- if (event?.type === "agent-preset/selected") return event.data.agentPreset; ++ if (event?.type === "agent-preset/selected") return event.data.agentPreset === void 0 ? void 0 : "standard"; + } +- return session.header.agentPreset; ++ return session.header.agentPreset === void 0 ? void 0 : "standard"; + } + //#endregion + //#region lib/types/index.js +diff --git a/node_modules/@deepseek-ai/dsh-agent-presets/lib/types/session.js b/node_modules/@deepseek-ai/dsh-agent-presets/lib/types/session.js +--- a/node_modules/@deepseek-ai/dsh-agent-presets/lib/types/session.js ++++ b/node_modules/@deepseek-ai/dsh-agent-presets/lib/types/session.js +@@ -26,8 +26,8 @@ export function resolveSessionPreset(session) { + for (let index = session.events.length - 1; index >= 0; index -= 1) { + const event = session.events[index]; + if (event?.type === 'agent-preset/selected') +- return event.data.agentPreset; ++ return event.data.agentPreset === undefined ? undefined : 'standard'; + } +- return session.header.agentPreset; ++ return session.header.agentPreset === undefined ? undefined : 'standard'; + } + //# sourceMappingURL=session.js.map diff --git a/patches/@deepseek-ai+dsh-app-boot+0.1.0-rc.7.patch b/patches/@deepseek-ai+dsh-app-boot+0.1.0-rc.7.patch new file mode 100644 index 000000000..63bce9a99 --- /dev/null +++ b/patches/@deepseek-ai+dsh-app-boot+0.1.0-rc.7.patch @@ -0,0 +1,13 @@ +diff --git a/node_modules/@deepseek-ai/dsh-app-boot/lib/index.js b/node_modules/@deepseek-ai/dsh-app-boot/lib/index.js +index 3a53e81..55da9e4 100644 +--- a/node_modules/@deepseek-ai/dsh-app-boot/lib/index.js ++++ b/node_modules/@deepseek-ai/dsh-app-boot/lib/index.js +@@ -1208,7 +1208,7 @@ function addHarnessSourceSection(ctx, sourceRoot) { + return systemPrompt.section({ + name: HARNESS_SOURCE_SECTION, + order: -99, +- text: `The DeepSeek Harness implementation checkout is at ${sourceRoot}. The checkout location and current working directory are separate values and may differ; never infer the working directory from this path. Use pwd to determine the current working directory. Use this checkout only to inspect or extend DSH itself.` ++ text: `The Sherlock Agent implementation checkout is at ${sourceRoot}. The checkout location and current working directory are separate values and may differ; never infer the working directory from this path. Use pwd to determine the current working directory. Use this checkout only to inspect or extend Sherlock Agent itself.` + }); + } + //#endregion diff --git a/patches/@deepseek-ai+dsh-client-connection+0.1.0-rc.7.patch b/patches/@deepseek-ai+dsh-client-connection+0.1.0-rc.7.patch new file mode 100644 index 000000000..aa313ab07 --- /dev/null +++ b/patches/@deepseek-ai+dsh-client-connection+0.1.0-rc.7.patch @@ -0,0 +1,12 @@ +diff --git a/node_modules/@deepseek-ai/dsh-client-connection/lib/client.js b/node_modules/@deepseek-ai/dsh-client-connection/lib/client.js +index 81240d6..f6afd54 100644 +--- a/node_modules/@deepseek-ai/dsh-client-connection/lib/client.js ++++ b/node_modules/@deepseek-ai/dsh-client-connection/lib/client.js +@@ -5623,6 +5623,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs. + sessionId: sessionIdSchema, + items: array(object({ + id: messageIdSchema$1, ++ anchorSeq: number().int().nonnegative().optional(), + placement: union([ + literal("queued"), + literal("steering"), diff --git a/patches/@deepseek-ai+dsh-client-runtime+0.1.0-rc.7.patch b/patches/@deepseek-ai+dsh-client-runtime+0.1.0-rc.7.patch index 37462402e..65f817754 100644 --- a/patches/@deepseek-ai+dsh-client-runtime+0.1.0-rc.7.patch +++ b/patches/@deepseek-ai+dsh-client-runtime+0.1.0-rc.7.patch @@ -1,8 +1,33 @@ diff --git a/node_modules/@deepseek-ai/dsh-client-runtime/lib/client.js b/node_modules/@deepseek-ai/dsh-client-runtime/lib/client.js -index 37b931e..ed1f7fd 100644 +index 37b931e..5e6ed1f 100644 --- a/node_modules/@deepseek-ai/dsh-client-runtime/lib/client.js +++ b/node_modules/@deepseek-ai/dsh-client-runtime/lib/client.js -@@ -10448,6 +10448,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs. +@@ -7051,6 +7051,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs. + id: item.id, + messageId: item.message.id, + placement: item.placement, ++ source: item.message.source, + content: item.message.content, + preview: previewOf(item.message.content), + text: textOf(item.message.content) +@@ -9922,7 +9923,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs. + * stays usable). + * @param workspaceId - explicit target Workspace for scoped actions. + */ +- startSession(workspaceId) { ++ startSession(workspaceId, beforeOpen) { + const workspace = this.list.getSnapshot(); + const current = this.sessions.list.getSnapshot().current; + const currentWorkspaceId = current === void 0 ? void 0 : workspace.items.find((item) => item.sessionIds.includes(current))?.workspaceId; +@@ -9932,6 +9933,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs. + return; + } + this.connectWorkspace(target).then((sessionId) => { ++ beforeOpen?.(sessionId); + this.sessions.open(sessionId); + }, (reason) => { + console.warn("new session failed:", reason); +@@ -10448,6 +10450,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs. function displayFailureMessage(failure) { if (failure === null || typeof failure !== "object") return String(failure); const record = failure; @@ -11,3 +36,40 @@ index 37b931e..ed1f7fd 100644 if (record.code === "AUTH") return "API key is invalid"; return typeof record.message === "string" ? record.message : JSON.stringify(failure); } +@@ -10508,6 +10512,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs. + exports.PendingWait = PendingWait; + exports.SessionCreateError = SessionCreateError; + exports.SessionProvideChannel = SessionProvideChannel; ++ exports.SessionQueueMirror = SessionQueueMirror; + exports.SessionRuntime = SessionRuntime; + exports.SlotRegistry = SlotRegistry; + exports.WorkspaceCreateError = WorkspaceCreateError; +diff --git a/node_modules/@deepseek-ai/dsh-client-runtime/lib/types/client/contract/workspaces.d.ts b/node_modules/@deepseek-ai/dsh-client-runtime/lib/types/client/contract/workspaces.d.ts +index fe9180d..828fc8c 100644 +--- a/node_modules/@deepseek-ai/dsh-client-runtime/lib/types/client/contract/workspaces.d.ts ++++ b/node_modules/@deepseek-ai/dsh-client-runtime/lib/types/client/contract/workspaces.d.ts +@@ -25,8 +25,10 @@ export interface IWorkspaces { + * list state. + * @param workspaceId - explicit target; omitted inherits the current + * Session's Workspace before falling back to the recency projection. ++ * @param beforeOpen - optional preparation hook invoked with the resolved ++ * session id immediately before navigation. + */ +- startSession(workspaceId?: WorkspaceId): void; ++ startSession(workspaceId?: WorkspaceId, beforeOpen?: (sessionId: SessionId) => void): void; + /** + * Register an existing path as a Workspace. + * @param input - the Host create payload. +diff --git a/node_modules/@deepseek-ai/dsh-client-runtime/lib/types/client/workspaces/service.d.ts b/node_modules/@deepseek-ai/dsh-client-runtime/lib/types/client/workspaces/service.d.ts +index bd8d3b6..ac22003 100644 +--- a/node_modules/@deepseek-ai/dsh-client-runtime/lib/types/client/workspaces/service.d.ts ++++ b/node_modules/@deepseek-ai/dsh-client-runtime/lib/types/client/workspaces/service.d.ts +@@ -84,7 +84,7 @@ export declare class WorkspaceRuntime implements IWorkspaces { + * stays usable). + * @param workspaceId - explicit target Workspace for scoped actions. + */ +- startSession(workspaceId?: WorkspaceId): void; ++ startSession(workspaceId?: WorkspaceId, beforeOpen?: (sessionId: SessionId) => void): void; + /** + * Register an existing path as a Workspace. + * @param input - the Host create payload. diff --git a/patches/@deepseek-ai+dsh-client-ui-agent-preset+0.1.0-rc.7.patch b/patches/@deepseek-ai+dsh-client-ui-agent-preset+0.1.0-rc.7.patch index e08a9ba0a..7fa6d028e 100644 --- a/patches/@deepseek-ai+dsh-client-ui-agent-preset+0.1.0-rc.7.patch +++ b/patches/@deepseek-ai+dsh-client-ui-agent-preset+0.1.0-rc.7.patch @@ -1,7 +1,16 @@ diff --git a/node_modules/@deepseek-ai/dsh-client-ui-agent-preset/lib/client.js b/node_modules/@deepseek-ai/dsh-client-ui-agent-preset/lib/client.js -index 259765c..ca9dd68 100644 +index 259765c..26703b2 100644 --- a/node_modules/@deepseek-ai/dsh-client-ui-agent-preset/lib/client.js +++ b/node_modules/@deepseek-ai/dsh-client-ui-agent-preset/lib/client.js +@@ -20,7 +20,7 @@ window.__ModuleLoader__.load({ + seatHint: "Agent preset for the session you are about to start", + headerHint: "The agent preset this session runs, fixed when it started", + nav: "Agent presets", +- sectionIntro: "A preset is the plugin composition one session's agent runs — its tools, prompt, and capabilities. Duplicate an existing one and make it yours, or let the agent draft one for you in Creator mode.", ++ sectionIntro: "Standard mode is the fixed Agent preset used by Sherlock for every new session.", + builtIn: "Built-in", + setDefault: "Set as default", + view: "View", @@ -64,7 +64,32 @@ window.__ModuleLoader__.load({ deleteTitle: "Delete this preset?", deleteDescription: "The preset directory is deleted. Sessions already running on it keep working; new sessions cannot select it.", @@ -23,10 +32,10 @@ index 259765c..ca9dd68 100644 + packageFile: "Package", + packageContents: "Contents", + packageContentsValue: "{count} files", -+ packageVersion: "Created with DSH {version}", ++ packageVersion: "Created with Sherlock {version}", + importWarningAbsolutePaths: "Some files contain absolute paths and may need editing on this computer.", + importWarningPossibleSecrets: "Some files may contain API keys, tokens, or other secrets. Review them after importing.", -+ importWarningVersionMismatch: "This package was created with another DSH version and may need changes.", ++ importWarningVersionMismatch: "This package was created with another Sherlock version and may need changes.", + importConfirm: "Import", + importing: "Importing…", + readingPackage: "Reading package…", @@ -36,6 +45,15 @@ index 259765c..ca9dd68 100644 }; /** Simplified Chinese copy. */ const zh = { +@@ -76,7 +101,7 @@ window.__ModuleLoader__.load({ + seatHint: "即将开始的这个会话所用的 Agent 预设", + headerHint: "本会话运行的 Agent 预设，开始时即固定", + nav: "Agent 预设", +- sectionIntro: "预设即一个会话的 Agent 所运行的插件组装 —— 它的工具、提示词与能力。复制一份既有预设改成自己的，或用「创造模式」让 Agent 帮你创建。", ++ sectionIntro: "Sherlock 的所有新会话固定使用标准模式。", + builtIn: "内置", + setDefault: "设为默认", + view: "查看", @@ -120,7 +145,32 @@ window.__ModuleLoader__.load({ deleteTitle: "删除该预设？", deleteDescription: "预设目录将被删除。已在其上运行的会话不受影响；新会话将无法再选择它。", @@ -57,10 +75,10 @@ index 259765c..ca9dd68 100644 + packageFile: "压缩包", + packageContents: "内容", + packageContentsValue: "{count} 个文件", -+ packageVersion: "由 DSH {version} 创建", ++ packageVersion: "由 Sherlock {version} 创建", + importWarningAbsolutePaths: "部分文件包含绝对路径，换到这台电脑后可能需要调整。", + importWarningPossibleSecrets: "部分文件可能包含 API Key、Token 或其他密钥，请在导入后检查。", -+ importWarningVersionMismatch: "该压缩包由另一个 DSH 版本创建，可能需要调整。", ++ importWarningVersionMismatch: "该压缩包由另一个 Sherlock 版本创建，可能需要调整。", + importConfirm: "导入", + importing: "正在导入…", + readingPackage: "正在读取压缩包…", @@ -75,7 +93,7 @@ index 259765c..ca9dd68 100644 //#endregion //#region \0dsh-css:/home/runner/work/deepseek-harness/deepseek-harness/packages/client/ui-agent-preset/src/client/AgentPresetSeat.module.css.mjs - const css$1 = ".cubgiG_seat{max-width:min(100%,240px);min-height:28px;color:var(--dsw-alias-label-primary);white-space:nowrap;text-overflow:ellipsis;cursor:pointer;background:0 0;border:none;border-radius:16px;align-items:center;gap:4px;padding:0 8px;font-size:13px;font-weight:500;line-height:20px;display:inline-flex;overflow:hidden}.cubgiG_seat:not(:disabled):hover,.cubgiG_seat[aria-expanded=true]{background:var(--dsw-alias-interactive-bg-hover)}.cubgiG_seat:disabled{cursor:default;color:var(--dsw-alias-label-quaternary)}.cubgiG_seatIcon{color:var(--dsw-alias-label-primary);flex:none}.cubgiG_introIcon{animation:.15s cubic-bezier(.16,1,.3,1) both cubgiG_seat-icon-in}@keyframes cubgiG_seat-icon-in{0%{opacity:0;transform:scale(.5)}to{opacity:1;transform:scale(1)}}.cubgiG_introText{white-space:pre;display:inline-block}.cubgiG_introChar{white-space:pre;opacity:0;animation:.4s ease-out forwards cubgiG_seat-char-in;display:inline-block}@keyframes cubgiG_seat-char-in{0%{opacity:0;transform:translateY(4px)}to{opacity:1;transform:none}}@media (prefers-reduced-motion:reduce){.cubgiG_introIcon,.cubgiG_introChar{opacity:1;animation:none}}.cubgiG_chevron{color:var(--dsw-alias-label-caption);flex:none}.cubgiG_item{flex-direction:column;gap:2px;max-width:280px;display:flex}.cubgiG_itemName{color:var(--dsw-alias-label-primary);font-size:13px;line-height:20px}.cubgiG_itemDesc{color:var(--dsw-alias-label-caption);white-space:normal;font-size:12px;line-height:16px}"; -+ const css$1 = ".cubgiG_seat{max-width:min(100%,240px);min-height:28px;color:var(--dsw-alias-label-primary);white-space:nowrap;text-overflow:ellipsis;cursor:pointer;background:0 0;border:none;border-radius:16px;align-items:center;gap:4px;padding:0 8px;font-size:13px;font-weight:500;line-height:20px;display:inline-flex;overflow:hidden}.cubgiG_seat:not(:disabled):hover,.cubgiG_seat[aria-expanded=true]{background:var(--dsw-alias-interactive-bg-hover)}.cubgiG_seat:disabled{cursor:default;color:var(--dsw-alias-label-quaternary)}.cubgiG_seatIcon{color:var(--dsw-alias-label-primary);flex:none}.cubgiG_introIcon{animation:.15s cubic-bezier(.16,1,.3,1) both cubgiG_seat-icon-in}@keyframes cubgiG_seat-icon-in{0%{opacity:0;transform:scale(.5)}to{opacity:1;transform:scale(1)}}.cubgiG_introText{white-space:pre;display:inline-block}.cubgiG_introChar{white-space:pre;opacity:0;animation:.4s ease-out forwards cubgiG_seat-char-in;display:inline-block}@keyframes cubgiG_seat-char-in{0%{opacity:0;transform:translateY(4px)}to{opacity:1;transform:none}}@media (prefers-reduced-motion:reduce){.cubgiG_introIcon,.cubgiG_introChar{opacity:1;animation:none}}.cubgiG_chevron{color:var(--dsw-alias-label-caption);flex:none}.cubgiG_picker{min-width:360px}.cubgiG_searchShell{box-sizing:border-box;width:100%;height:36px;color:var(--dsw-alias-label-caption);background:var(--dsw-alias-bg-module-platform);border:1px solid var(--dsw-alias-border-l2);border-radius:10px;align-items:center;gap:8px;padding:0 10px;display:flex;transition:border-color .15s ease,box-shadow .15s ease,background .15s ease}.cubgiG_searchShell:focus-within{background:var(--dsw-alias-bg-base);border-color:#4d6bfe;box-shadow:0 0 0 3px #4d6bfe1f}.cubgiG_searchIcon{flex:none}.cubgiG_search{min-width:0;width:100%;height:100%;color:var(--dsw-alias-label-primary);background:0 0;border:0;outline:0;padding:0;font:inherit}.cubgiG_search::-webkit-search-cancel-button{opacity:.55}.cubgiG_groupLabel{width:100%;color:var(--dsw-alias-label-caption);text-transform:none;letter-spacing:.02em;border-top:1px solid var(--dsw-alias-border-l3);padding-top:10px;font-size:11px;font-weight:500;line-height:16px;display:block}.cubgiG_item{box-sizing:border-box;flex-direction:column;gap:1px;width:336px;min-width:0;border-radius:9px;padding:7px 10px;display:flex;transition:background .12s ease,transform .12s ease}.cubgiG_item:hover{background:var(--dsw-alias-interactive-bg-hover)}.cubgiG_selectedItem{background:#4d6bfe12}.cubgiG_selectedItem:hover{background:#4d6bfe1c}.cubgiG_itemName{color:var(--dsw-alias-label-primary);white-space:nowrap;text-overflow:ellipsis;overflow:hidden;font-size:13px;font-weight:500;line-height:19px}.cubgiG_itemDesc{color:var(--dsw-alias-label-tertiary);white-space:nowrap;text-overflow:ellipsis;overflow:hidden;font-size:12px;line-height:17px}.cubgiG_empty{color:var(--dsw-alias-label-caption);text-align:center;padding:20px 8px;display:block}.cubgiG_awesome{box-sizing:border-box;width:336px;color:#3154df;background:#4d6bfe0d;border-radius:9px;align-items:center;gap:8px;padding:9px 10px;font-weight:500;display:flex;transition:background .12s ease}.cubgiG_awesome:hover{background:#4d6bfe18}.cubgiG_awesomeIcon{flex:none}.cubgiG_awesomeText{flex:1}.cubgiG_awesomeArrow{opacity:.6;font-size:15px}[role=menu]:has(.cubgiG_searchShell){width:376px!important;max-width:calc(100vw - 24px);max-height:min(360px,calc(100vh - 24px))!important;border-radius:14px!important;box-shadow:0 18px 46px #0000001f,0 3px 10px #00000012!important;overflow:hidden}[role=menu]:has(.cubgiG_searchShell)>[role=presentation]:first-child{min-height:0;padding:8px!important;overflow-y:auto!important}[role=menu]:has(.cubgiG_searchShell) [role=menuitem]{border-radius:9px!important;margin:1px 0!important;padding:0!important}[role=menu]:has(.cubgiG_searchShell)>[role=presentation]:last-child{flex:none;padding:8px!important}@media (prefers-reduced-motion:reduce){.cubgiG_searchShell,.cubgiG_item,.cubgiG_awesome{transition:none}}"; ++ const css$1 = ".cubgiG_seat{max-width:min(100%,240px);min-height:28px;color:var(--dsw-alias-label-primary);white-space:nowrap;text-overflow:ellipsis;cursor:pointer;background:0 0;border:none;border-radius:16px;align-items:center;gap:4px;padding:0 8px;font-size:13px;font-weight:500;line-height:20px;display:inline-flex;overflow:hidden}.cubgiG_seat:not(:disabled):hover,.cubgiG_seat[aria-expanded=true]{background:var(--dsw-alias-interactive-bg-hover)}.cubgiG_seat:disabled{cursor:default;color:var(--dsw-alias-label-quaternary)}.cubgiG_seatIcon{color:var(--dsw-alias-label-primary);flex:none}.cubgiG_introIcon{animation:.15s cubic-bezier(.16,1,.3,1) both cubgiG_seat-icon-in}@keyframes cubgiG_seat-icon-in{0%{opacity:0;transform:scale(.5)}to{opacity:1;transform:scale(1)}}.cubgiG_introText{white-space:pre;display:inline-block}.cubgiG_introChar{white-space:pre;opacity:0;animation:.4s ease-out forwards cubgiG_seat-char-in;display:inline-block}@keyframes cubgiG_seat-char-in{0%{opacity:0;transform:translateY(4px)}to{opacity:1;transform:none}}@media (prefers-reduced-motion:reduce){.cubgiG_introIcon,.cubgiG_introChar{opacity:1;animation:none}}.cubgiG_chevron{color:var(--dsw-alias-label-caption);flex:none}.cubgiG_picker{min-width:420px}.cubgiG_searchShell{box-sizing:border-box;width:100%;height:36px;color:var(--dsw-alias-label-caption);background:var(--dsw-alias-bg-module-platform);border:1px solid var(--dsw-alias-border-l2);border-radius:10px;align-items:center;gap:8px;padding:0 10px;display:flex;transition:border-color .15s ease,box-shadow .15s ease,background .15s ease}.cubgiG_searchShell:focus-within{background:var(--dsw-alias-bg-base);border-color:#4d6bfe;box-shadow:0 0 0 3px #4d6bfe1f}.cubgiG_searchIcon{flex:none}.cubgiG_search{min-width:0;width:100%;height:100%;color:var(--dsw-alias-label-primary);background:0 0;border:0;outline:0;padding:0;font:inherit}.cubgiG_search::-webkit-search-cancel-button{opacity:.55}.cubgiG_groupLabel{width:100%;color:var(--dsw-alias-label-caption);text-transform:none;letter-spacing:.02em;border-top:1px solid var(--dsw-alias-border-l3);padding-top:10px;font-size:11px;font-weight:500;line-height:16px;display:block}.cubgiG_item{box-sizing:border-box;flex-direction:column;gap:1px;width:376px;min-width:0;border-radius:9px;padding:7px 10px;display:flex;transition:background .12s ease,transform .12s ease}.cubgiG_item:hover{background:var(--dsw-alias-interactive-bg-hover)}.cubgiG_selectedItem{background:#4d6bfe12}.cubgiG_selectedItem:hover{background:#4d6bfe1c}.cubgiG_itemName{color:var(--dsw-alias-label-primary);white-space:nowrap;text-overflow:ellipsis;overflow:hidden;font-size:13px;font-weight:500;line-height:19px}.cubgiG_itemDesc{color:var(--dsw-alias-label-tertiary);white-space:normal;overflow-wrap:anywhere;font-size:12px;line-height:17px}.cubgiG_empty{color:var(--dsw-alias-label-caption);text-align:center;padding:20px 8px;display:block}.cubgiG_awesome{box-sizing:border-box;width:336px;color:#3154df;background:#4d6bfe0d;border-radius:9px;align-items:center;gap:8px;padding:9px 10px;font-weight:500;display:flex;transition:background .12s ease}.cubgiG_awesome:hover{background:#4d6bfe18}.cubgiG_awesomeIcon{flex:none}.cubgiG_awesomeText{flex:1}.cubgiG_awesomeArrow{opacity:.6;font-size:15px}[role=menu]:has(.cubgiG_item){width:420px!important;max-width:calc(100vw - 24px)}[role=menu]:has(.cubgiG_searchShell){width:376px!important;max-width:calc(100vw - 24px);max-height:min(360px,calc(100vh - 24px))!important;border-radius:14px!important;box-shadow:0 18px 46px #0000001f,0 3px 10px #00000012!important;overflow:hidden}[role=menu]:has(.cubgiG_searchShell)>[role=presentation]:first-child{min-height:0;padding:8px!important;overflow-y:auto!important}[role=menu]:has(.cubgiG_searchShell) [role=menuitem]{border-radius:9px!important;margin:1px 0!important;padding:0!important}[role=menu]:has(.cubgiG_searchShell)>[role=presentation]:last-child{flex:none;padding:8px!important}@media (prefers-reduced-motion:reduce){.cubgiG_searchShell,.cubgiG_item,.cubgiG_awesome{transition:none}}"; const tagId$1 = "@deepseek-ai/dsh-client-ui-agent-preset/AgentPresetSeat.module.css"; if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId$1) + "]") === null) { const tag = document.createElement("style"); @@ -101,41 +119,33 @@ index 259765c..ca9dd68 100644 "itemName": "cubgiG_itemName", "introIcon": "cubgiG_introIcon", "itemDesc": "cubgiG_itemDesc", -@@ -374,6 +439,8 @@ window.__ModuleLoader__.load({ - const INTRO_CHAR_STAGGER_MS = 40; - const INTRO_TEXT_REVEAL_MS = 200; - const INTRO_CHAR_FADE_MS = 400; -+ const RECENT_PRESETS_KEY = "dsh-agent-preset-recent"; -+ const AWESOME_PRESETS_ID = "__awesome_presets__"; - /** - * Per-character start offset for the introduce reveal. - * @param count - character count of the shown preset name. -@@ -391,6 +458,15 @@ window.__ModuleLoader__.load({ - function AgentPresetSeat({ load, select, introduced, useAgentPresetSeat, t }) { - const state = useAgentPresetSeat((snapshot) => snapshot); - const [open, setOpen] = (0, react.useState)(false); -+ const [query, setQuery] = (0, react.useState)(""); -+ const [recentIds, setRecentIds] = (0, react.useState)(() => { -+ try { -+ const value = JSON.parse(window.localStorage.getItem(RECENT_PRESETS_KEY) ?? "[]"); -+ return Array.isArray(value) ? value.filter((id) => typeof id === "string").slice(0, 4) : []; -+ } catch { -+ return []; -+ } +@@ -419,7 +484,21 @@ window.__ModuleLoader__.load({ + label, + introduced + ]); +- if (!ready) return null; ++ if (!ready) return (0, react_jsx_runtime.jsxs)("button", { ++ type: "button", ++ className: AgentPresetSeat_module_css_default.seat, ++ "data-agent-preset-fallback": "", ++ title: state.error ?? t("seatHint"), ++ disabled: state.busy, ++ onClick: () => { ++ load(); ++ }, ++ children: [ ++ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconAgentPresetOutline16, { className: AgentPresetSeat_module_css_default.seatIcon }), ++ (0, react_jsx_runtime.jsx)("span", { children: t("presetStandardName") }), ++ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronDownOutline14, { className: AgentPresetSeat_module_css_default.chevron }) ++ ] + }); - (0, react.useEffect)(() => { - load(); - }, [load]); -@@ -430,34 +506,114 @@ window.__ModuleLoader__.load({ + const characters = Array.from(label); + const stagger = introStaggerMs(characters.length); + const shownLabel = introducing ? (0, react_jsx_runtime.jsx)("span", { +@@ -430,34 +509,38 @@ window.__ModuleLoader__.load({ children: character }, index)) }) : label; -+ const normalizedQuery = query.trim().toLocaleLowerCase(); -+ const matching = state.options.filter((option) => { -+ if (normalizedQuery === "") return true; -+ const text = presetDisplayText(option, t); -+ return `${text.name} ${text.description ?? ""} ${option.id}`.toLocaleLowerCase().includes(normalizedQuery); -+ }); + const itemOf = (option) => { + const text = presetDisplayText(option, t); + return { @@ -152,54 +162,10 @@ index 259765c..ca9dd68 100644 + }) + }; + }; -+ const searchField = (0, react_jsx_runtime.jsxs)("span", { -+ className: AgentPresetSeat_module_css_default.searchShell, -+ children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconSearchOutline16, { -+ size: 16, -+ className: AgentPresetSeat_module_css_default.searchIcon -+ }), (0, react_jsx_runtime.jsx)("input", { -+ className: AgentPresetSeat_module_css_default.search, -+ type: "search", -+ value: query, -+ autoFocus: true, -+ placeholder: t("searchPresets"), -+ "aria-label": t("searchPresets"), -+ onChange: (event) => { -+ setQuery(event.currentTarget.value); -+ }, -+ onKeyDown: (event) => { -+ event.stopPropagation(); -+ } -+ })] -+ }); -+ const entries = [{ -+ type: "label", -+ id: "preset-search", -+ text: searchField -+ }]; -+ const addGroup = (id, title, options) => { -+ if (options.length === 0) return; -+ entries.push({ -+ type: "label", -+ id: `${id}-label`, -+ text: (0, react_jsx_runtime.jsx)("span", { className: AgentPresetSeat_module_css_default.groupLabel, children: title }) -+ }, ...options.map(itemOf)); -+ }; -+ const recentOptions = normalizedQuery === "" ? recentIds.map((id) => matching.find((option) => option.id === id)).filter((option) => option !== void 0) : []; -+ const recentSet = new Set(recentOptions.map((option) => option.id)); -+ addGroup("recent", t("recentPresets"), recentOptions); -+ addGroup("built-in", t("builtInGroup"), matching.filter((option) => option.trust === "system" && !recentSet.has(option.id))); -+ addGroup("custom", t("customGroup"), matching.filter((option) => option.trust === "user" && !recentSet.has(option.id))); -+ if (matching.length === 0) entries.push({ -+ type: "label", -+ id: "preset-empty", -+ text: (0, react_jsx_runtime.jsx)("span", { className: AgentPresetSeat_module_css_default.empty, children: t("noMatchingPresets") }) -+ }); return (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Menu, { open, onClose: () => { setOpen(false); -+ setQuery(""); }, - items: state.options.map((option) => { - const text = presetDisplayText(option, t); @@ -217,36 +183,10 @@ index 259765c..ca9dd68 100644 - }) - }; - }), -+ items: entries, -+ footer: [{ -+ id: AWESOME_PRESETS_ID, -+ label: (0, react_jsx_runtime.jsxs)("span", { -+ className: AgentPresetSeat_module_css_default.awesome, -+ children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconSparkle16, { -+ size: 16, -+ className: AgentPresetSeat_module_css_default.awesomeIcon -+ }), (0, react_jsx_runtime.jsx)("span", { -+ className: AgentPresetSeat_module_css_default.awesomeText, -+ children: t("browseAwesomePresets") -+ }), (0, react_jsx_runtime.jsx)("span", { -+ className: AgentPresetSeat_module_css_default.awesomeArrow, -+ children: "→" -+ })] -+ }) -+ }], ++ items: state.options.map(itemOf), selectedId: state.current, onSelect: (id) => { setOpen(false); -+ setQuery(""); -+ if (id === AWESOME_PRESETS_ID) { -+ window.open("https://www.dshdesktop.com/preset/", "_blank", "noopener,noreferrer"); -+ return; -+ } -+ const nextRecent = [id, ...recentIds.filter((recentId) => recentId !== id)].slice(0, 4); -+ setRecentIds(nextRecent); -+ try { -+ window.localStorage.setItem(RECENT_PRESETS_KEY, JSON.stringify(nextRecent)); -+ } catch {} select(id); }, align: "start", @@ -257,7 +197,71 @@ index 259765c..ca9dd68 100644 anchor: (0, react_jsx_runtime.jsxs)("button", { type: "button", className: AgentPresetSeat_module_css_default.seat, -@@ -707,6 +863,8 @@ window.__ModuleLoader__.load({ +@@ -488,6 +571,7 @@ window.__ModuleLoader__.load({ + */ + /** The agent-preset settings namespace on the host wire. */ + const AGENT_PRESET_SETTINGS_NS = "agent-presets"; ++ const STANDARD_AGENT_PRESET_ID = "standard"; + /** + * Human text for a rejected wire call. A transport failure rejects with an + * Error; a host or a runtime can reject with anything, and the surface still +@@ -520,6 +604,32 @@ window.__ModuleLoader__.load({ + } + return response.result.ok ? void 0 : response.result.error.message; + } ++ /** Reduce every roster-backed surface to Sherlock's single standard mode. */ ++ async function normalizeStandardPresetRoster(api, roster) { ++ const standard = roster.presets.find((preset) => preset.id === STANDARD_AGENT_PRESET_ID); ++ if (standard === void 0) return { ++ roster: { ++ ...roster, ++ presets: [], ++ authorable: false, ++ hasDocument: false ++ }, ++ error: null ++ }; ++ const error = standard.isDefault ? void 0 : await writeDefaultPreset(api, STANDARD_AGENT_PRESET_ID); ++ return { ++ roster: { ++ ...roster, ++ presets: [{ ++ ...standard, ++ isDefault: true ++ }], ++ authorable: false, ++ hasDocument: false ++ }, ++ error: error ?? null ++ }; ++ } + /** + * Read the roster, folding both refusal shapes into one message. + * +@@ -625,9 +735,10 @@ window.__ModuleLoader__.load({ + * @returns once the snapshot reflects the host. + */ + async load() { +- const roster = await beginRosterRead(this.api, this.store); +- if (roster === void 0) return; +- const { presets } = roster; ++ const loaded = await beginRosterRead(this.api, this.store); ++ if (loaded === void 0) return; ++ const normalized = await normalizeStandardPresetRoster(this.api, loaded); ++ const { presets } = normalized.roster; + const [first] = presets; + if (first === void 0) { + this.set({ +@@ -641,7 +752,7 @@ window.__ModuleLoader__.load({ + const described = await this.api.settings.describe({}); + this.set({ + status: "ready", +- error: null, ++ error: normalized.error, + writable: described.result.ok && described.result.value.writable, + options: presetOptions(presets), + currentValue: presets.find((preset) => preset.isDefault)?.id ?? first.id +@@ -707,6 +818,8 @@ window.__ModuleLoader__.load({ rows: [], copy: null, view: null, @@ -266,7 +270,7 @@ index 259765c..ca9dd68 100644 pendingDelete: null, deleting: false, revealedPaths: {} -@@ -724,6 +882,13 @@ window.__ModuleLoader__.load({ +@@ -724,6 +837,13 @@ window.__ModuleLoader__.load({ if (!PRESET_ID.test(draft.id)) return "idInvalid"; if (rows.some((row) => row.id === draft.id)) return "idTaken"; } @@ -280,7 +284,30 @@ index 259765c..ca9dd68 100644 /** Reads the roster and drives the copy dialog, viewer, and location reveals. */ var AgentPresetSectionController = class { api; -@@ -911,6 +1076,143 @@ window.__ModuleLoader__.load({ +@@ -755,9 +875,10 @@ window.__ModuleLoader__.load({ + * @returns once the snapshot reflects the host. + */ + async load() { +- const roster = await beginRosterRead(this.api, this.store); +- if (roster === void 0) return; +- const { presets, authorable, hasDocument } = roster; ++ const loaded = await beginRosterRead(this.api, this.store); ++ if (loaded === void 0) return; ++ const normalized = await normalizeStandardPresetRoster(this.api, loaded); ++ const { presets, authorable, hasDocument } = normalized.roster; + if (presets.length === 0) { + this.set({ + status: "unavailable", +@@ -773,7 +894,7 @@ window.__ModuleLoader__.load({ + const kept = Object.fromEntries(Object.entries(revealed).filter(([id]) => presets.some((preset) => preset.id === id))); + this.set({ + status: "ready", +- error: null, ++ error: normalized.error, + authorable, + hasDocument, + rows: presets.map((preset) => ({ ...preset })), +@@ -911,6 +1032,143 @@ window.__ModuleLoader__.load({ this.set({ error: messageOf(error) }); } } @@ -424,7 +451,7 @@ index 259765c..ca9dd68 100644 /** * Ask for confirmation before deleting one preset. * @param id - the preset to delete, or null to dismiss the confirmation. -@@ -974,16 +1276,25 @@ window.__ModuleLoader__.load({ +@@ -974,16 +1232,25 @@ window.__ModuleLoader__.load({ }; //#endregion //#region \0dsh-css:/home/runner/work/deepseek-harness/deepseek-harness/packages/client/ui-agent-preset/src/client/AgentPresetSection.module.css.mjs @@ -452,7 +479,7 @@ index 259765c..ca9dd68 100644 "brokenBadge": "rtSEdW_brokenBadge", "inUse": "rtSEdW_inUse", "cards": "rtSEdW_cards", -@@ -1104,6 +1415,84 @@ window.__ModuleLoader__.load({ +@@ -1104,6 +1371,84 @@ window.__ModuleLoader__.load({ }) }); } @@ -501,7 +528,7 @@ index 259765c..ca9dd68 100644 + (0, react_jsx_runtime.jsx)("dd", { children: draft.fileName }), + (0, react_jsx_runtime.jsx)("dt", { children: t("packageContents") }), + (0, react_jsx_runtime.jsx)("dd", { children: t("packageContentsValue", { count: draft.fileCount }) }), -+ draft.sourceDshVersion === void 0 ? null : (0, react_jsx_runtime.jsx)("dt", { children: "DSH" }), ++ draft.sourceDshVersion === void 0 ? null : (0, react_jsx_runtime.jsx)("dt", { children: "Sherlock" }), + draft.sourceDshVersion === void 0 ? null : (0, react_jsx_runtime.jsx)("dd", { children: t("packageVersion", { version: draft.sourceDshVersion }) }) + ] + }), @@ -537,92 +564,77 @@ index 259765c..ca9dd68 100644 /** * Render one card's description, clamped by CSS and offered in full on hover. * The tooltip is attached only while the text is actually cut off, so a short -@@ -1151,6 +1540,7 @@ window.__ModuleLoader__.load({ - function AgentPresetSection(props) { - const { useAgentPresetSection, t, load } = props; - const state = useAgentPresetSection((snapshot) => snapshot); -+ const importInput = (0, react.useRef)(null); - const viewedId = state.view?.id; - const viewedRow = viewedId === void 0 ? void 0 : state.rows.find((row) => row.id === viewedId); - const viewedTitle = state.view === null ? "" : viewedRow === void 0 ? state.view.title : presetDisplayText(viewedRow, t).name; -@@ -1191,9 +1581,40 @@ window.__ModuleLoader__.load({ +@@ -1191,9 +1536,12 @@ window.__ModuleLoader__.load({ return (0, react_jsx_runtime.jsxs)("div", { className: AgentPresetSection_module_css_default.section, children: [ - (0, react_jsx_runtime.jsx)("h2", { - className: AgentPresetSection_module_css_default.title, - children: t("nav") -+ (0, react_jsx_runtime.jsxs)("div", { ++ (0, react_jsx_runtime.jsx)("div", { + className: AgentPresetSection_module_css_default.sectionHead, -+ children: [(0, react_jsx_runtime.jsx)("h2", { ++ children: (0, react_jsx_runtime.jsx)("h2", { + className: AgentPresetSection_module_css_default.title, + children: t("nav") -+ }), (0, react_jsx_runtime.jsxs)("div", { -+ className: AgentPresetSection_module_css_default.sectionActions, -+ children: [(0, react_jsx_runtime.jsx)("input", { -+ ref: importInput, -+ type: "file", -+ accept: ".dshpreset,application/vnd.dsh.preset+zip,application/zip", -+ className: AgentPresetSection_module_css_default.hiddenInput, -+ onChange: (event) => { -+ const file = event.target.files?.[0]; -+ event.target.value = ""; -+ if (file !== void 0) props.previewImport(file); -+ } -+ }), (0, react_jsx_runtime.jsxs)(_deepseek_ai_dsh_client_ui_primitives.Button, { -+ variant: "outline", -+ className: AgentPresetSection_module_css_default.importButton, -+ disabled: !state.authorable, -+ title: state.authorable ? void 0 : t("duplicateUnavailable"), -+ onClick: () => { -+ importInput.current?.click(); -+ }, -+ children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconArchiveOutline20, { size: 16 }), t("importPreset")] -+ }), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, { -+ variant: "outline", -+ onClick: () => { -+ window.open("https://www.dshdesktop.com/preset/", "_blank", "noopener,noreferrer"); -+ }, -+ children: t("awesomePreset") -+ })] -+ })] ++ }) }), (0, react_jsx_runtime.jsx)("p", { className: AgentPresetSection_module_css_default.intro, -@@ -1289,7 +1710,7 @@ window.__ModuleLoader__.load({ - }, - children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconFolderOpenOutline16, {}) - }), +@@ -1267,52 +1615,7 @@ window.__ModuleLoader__.load({ + }) + ] + }), +- (0, react_jsx_runtime.jsxs)("div", { +- className: AgentPresetSection_module_css_default.cardFoot, +- children: [ +- row.trust === "system" ? row.broken === void 0 ? (0, react_jsx_runtime.jsx)("button", { +- type: "button", +- className: AgentPresetSection_module_css_default.iconButton, +- "data-tip": t("view"), +- "aria-label": `${t("view")}: ${text.name}`, +- onClick: () => { +- props.view(row.id); +- }, +- children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconBrowseOutline16, {}) +- }) : null : (0, react_jsx_runtime.jsx)("button", { +- type: "button", +- className: AgentPresetSection_module_css_default.iconButton, +- "data-tip": state.hasDocument ? t("openLocation") : t("showLocation"), +- "aria-label": `${state.hasDocument ? t("openLocation") : t("showLocation")}: ${text.name}`, +- onClick: () => { +- props.openLocation(row.id); +- }, +- children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconFolderOpenOutline16, {}) +- }), - (0, react_jsx_runtime.jsx)("button", { -+ (0, react_jsx_runtime.jsx)("button", { - type: "button", - className: AgentPresetSection_module_css_default.iconButton, - disabled: !state.authorable || row.broken !== void 0, -@@ -1298,9 +1719,20 @@ window.__ModuleLoader__.load({ - onClick: () => { - props.beginCopy(row.id); - }, +- type: "button", +- className: AgentPresetSection_module_css_default.iconButton, +- disabled: !state.authorable || row.broken !== void 0, +- "data-tip": row.broken !== void 0 ? t("brokenNoCopy") : state.authorable ? t("duplicate") : t("duplicateUnavailable"), +- "aria-label": `${t("duplicate")}: ${text.name}`, +- onClick: () => { +- props.beginCopy(row.id); +- }, - children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCopyOutline16, {}) - }), - row.trust === "user" ? (0, react_jsx_runtime.jsx)("button", { -+ children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCopyOutline16, {}) -+ }), -+ row.trust === "user" ? (0, react_jsx_runtime.jsx)("button", { -+ type: "button", -+ className: AgentPresetSection_module_css_default.iconButton, -+ disabled: state.exporting !== null || row.broken !== void 0, -+ "data-tip": state.exporting === row.id ? t("exporting") : t("exportPreset"), -+ "aria-label": `${t("exportPreset")}: ${text.name}`, -+ onClick: () => { -+ props.exportPreset(row.id); -+ }, -+ children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconDownloadOutline16, {}) -+ }) : null, -+ row.trust === "user" ? (0, react_jsx_runtime.jsx)("button", { - type: "button", - className: `${AgentPresetSection_module_css_default.iconButton} ${AgentPresetSection_module_css_default.iconDanger}`, - "data-tip": t("delete"), -@@ -1329,13 +1761,22 @@ window.__ModuleLoader__.load({ +- type: "button", +- className: `${AgentPresetSection_module_css_default.iconButton} ${AgentPresetSection_module_css_default.iconDanger}`, +- "data-tip": t("delete"), +- "aria-label": `${t("delete")}: ${text.name}`, +- onClick: () => { +- props.confirmDelete(row.id); +- }, +- children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconTrashOutline16, {}) +- }) : null +- ] +- }), +- state.revealedPaths[row.id] === void 0 ? null : (0, react_jsx_runtime.jsxs)("p", { ++ state.revealedPaths[row.id] === void 0 ? null : (0, react_jsx_runtime.jsxs)("p", { + className: AgentPresetSection_module_css_default.revealedPath, + children: [(0, react_jsx_runtime.jsx)("span", { + className: AgentPresetSection_module_css_default.revealedPathLabel, +@@ -1329,13 +1632,22 @@ window.__ModuleLoader__.load({ (0, react_jsx_runtime.jsx)(CopyDialog, { state, t, @@ -648,7 +660,24 @@ index 259765c..ca9dd68 100644 (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Modal, { open: state.view !== null, onClose: () => { -@@ -1689,6 +2130,15 @@ window.__ModuleLoader__.load({ +@@ -1444,12 +1756,13 @@ window.__ModuleLoader__.load({ + this.set({ error: response.result.error.message }); + return; + } +- const { presets } = response.result.value; ++ const normalized = await normalizeStandardPresetRoster(this.api, response.result.value); ++ const { presets } = normalized.roster; + this.fallback = presets.find((preset) => preset.isDefault)?.id ?? presets[0]?.id ?? ""; + this.set({ + options: presetOptions(presets), +- current: this.staged ?? this.currentSession()?.agentPreset ?? this.fallback, +- error: null ++ current: this.fallback, ++ error: normalized.error + }); + } catch (error) { + this.set({ error: messageOf(error) }); +@@ -1689,6 +2002,15 @@ window.__ModuleLoader__.load({ }, confirmCopy: () => section.confirmCopy(), openLocation: (id) => section.openLocation(id), @@ -664,3 +693,13 @@ index 259765c..ca9dd68 100644 ...creatorDraft === void 0 ? {} : { startCreatorDraft: creatorDraft }, confirmDelete: (id) => { section.confirmDelete(id); +@@ -1714,6 +2036,9 @@ window.__ModuleLoader__.load({ + } + //#endregion + exports.AGENT_PRESET_SETTINGS_NS = AGENT_PRESET_SETTINGS_NS; ++ exports.AgentPresetSectionController = AgentPresetSectionController; ++ exports.AgentPresetSeatController = AgentPresetSeatController; ++ exports.AgentPresetSettingsController = AgentPresetSettingsController; + exports.apply = apply; + exports.draftBlocker = draftBlocker; + exports.inject = inject; diff --git a/patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch b/patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch index 3cfeac026..f793e279b 100644 --- a/patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch +++ b/patches/@deepseek-ai+dsh-client-ui-conversation+0.1.0-rc.7.patch @@ -1,8 +1,1386 @@ diff --git a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js -index 1dd0e89..dd1c233 100644 +index 1dd0e89..c2430f1 100644 --- a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js +++ b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js -@@ -5233,6 +5233,15 @@ window.__ModuleLoader__.load({ +@@ -9,6 +9,7 @@ window.__ModuleLoader__.load({ + let _deepseek_ai_cordis = require("@deepseek-ai/cordis"); + let react_jsx_runtime = require("react/jsx-runtime"); + let react = require("react"); ++ let react_dom = require("react-dom"); + let _deepseek_ai_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives"); + let _deepseek_ai_dsh_client_ui_attachment = require("@deepseek-ai/dsh-client-ui-attachment"); + //#region lib/types/client/stores.js +@@ -26,7 +27,10 @@ window.__ModuleLoader__.load({ + selection: null, + draft: "", + view: null, +- inspect: null ++ inspect: null, ++ researchRightTab: "conversation", ++ researchFilesTabOpen: true, ++ researchConversationUnread: false + }), + persist: "dsh.conversation.chat", + actions: { +@@ -41,6 +45,15 @@ window.__ModuleLoader__.load({ + }, + setInspect: (d, target) => { + d.inspect = target; ++ }, ++ setResearchRightTab: (d, tab) => { ++ d.researchRightTab = tab; ++ }, ++ setResearchFilesTabOpen: (d, open) => { ++ d.researchFilesTabOpen = open; ++ }, ++ setResearchConversationUnread: (d, unread) => { ++ d.researchConversationUnread = unread; + } + } + }); +@@ -348,6 +361,17 @@ window.__ModuleLoader__.load({ + subscribe: (fn) => session.subscribe(fn) + }; + } ++ const INTERNAL_SUBAGENT_QUEUE_SOURCES = /* @__PURE__ */ new Set([ ++ "subagent-report", ++ "subagent-settled" ++ ]); ++ /** Only user-controlled next-turn messages belong in queue controls. */ ++ function isUserQueuedMessage(item) { ++ return item.placement === "queued" && !INTERNAL_SUBAGENT_QUEUE_SOURCES.has(item.source?.kind); ++ } ++ function userQueuedMessages(items) { ++ return items.filter(isUserQueuedMessage); ++ } + /** The machine never writes the queue; the wiring layer overlays the queue store's projection. */ + const EMPTY_QUEUE$1 = []; + /** Undo ring depth (bounded self-managed transaction log). */ +@@ -444,6 +468,9 @@ window.__ModuleLoader__.load({ + dispatch(ev) { + switch (ev.type) { + case "draft-changed": return this.onDraftChanged(ev.draft, ev.editRange); ++ case "move-ref": return this.onMoveRef(ev.occurrenceId, ev.targetOffset); ++ case "update-ref": return this.onUpdateRef(ev.occurrenceId, ev.reference); ++ case "update-research-ref": return this.onUpdateResearchRef(ev.referenceId ?? ev.fileId, ev.reference); + case "begin-command": return this.onBeginCommand(ev.claim, ev.span); + case "insert-ref": return this.onInsertRef(ev.reference, ev.span); + case "consume-token": return this.onConsumeToken(ev.guard); +@@ -455,6 +482,7 @@ window.__ModuleLoader__.load({ + case "invalidate-paste": + this.paste = void 0; + return []; ++ case "restore-draft": return this.onRestoreDraft(ev.draft, ev.occurrences); + case "enter": return this.onEnter(ev.mode); + case "adjudicated": return this.onAdjudicated(ev.attempt, ev.outcome); + case "adjudication-failed": return this.onAdjudicationFailed(ev.attempt, ev.message); +@@ -539,6 +567,55 @@ window.__ModuleLoader__.load({ + this.paste = void 0; + return []; + } ++ onMoveRef(occurrenceId, rawTargetOffset) { ++ if (this.phase !== "plain" && this.phase !== "claimed") return []; ++ const occurrence = this.occurrences.find((candidate) => candidate.occurrenceId === occurrenceId); ++ if (occurrence === void 0 || !Number.isInteger(rawTargetOffset)) return []; ++ const targetOffset = Math.max(0, Math.min(rawTargetOffset, this.draft.length)); ++ if (targetOffset === occurrence.offset || targetOffset === occurrence.offset + 1) return []; ++ const without = this.draft.slice(0, occurrence.offset) + this.draft.slice(occurrence.offset + 1); ++ const adjustedTarget = Math.max(0, Math.min(targetOffset > occurrence.offset ? targetOffset - 1 : targetOffset, without.length)); ++ this.pushTxn(); ++ this.typingRun = void 0; ++ const shifted = this.occurrences.filter((candidate) => candidate.occurrenceId !== occurrenceId).map((candidate) => { ++ const afterRemoval = candidate.offset > occurrence.offset ? candidate.offset - 1 : candidate.offset; ++ return afterRemoval >= adjustedTarget ? { ...candidate, offset: afterRemoval + 1 } : { ...candidate, offset: afterRemoval }; ++ }); ++ this.occurrences = [...shifted, { ...occurrence, offset: adjustedTarget }].sort((a, b) => a.offset - b.offset || a.occurrenceId - b.occurrenceId); ++ this.adopt(without.slice(0, adjustedTarget) + "" + without.slice(adjustedTarget)); ++ this.watchClaim(); ++ this.paste = void 0; ++ return []; ++ } ++ onUpdateRef(occurrenceId, reference) { ++ const occurrence = this.occurrences.find((candidate) => candidate.occurrenceId === occurrenceId); ++ if (occurrence === void 0 || typeof reference !== "object" || reference === null || reference.source !== occurrence.source || typeof reference.ref !== "string" || typeof reference.label !== "string" || typeof reference.clipboardText !== "string") return []; ++ const update = (candidate) => candidate.occurrenceId !== occurrenceId ? candidate : candidate.ref === reference.ref && candidate.label === reference.label && candidate.clipboardText === reference.clipboardText ? candidate : { ++ ...candidate, ++ ref: reference.ref, ++ label: reference.label, ++ clipboardText: reference.clipboardText ++ }; ++ const next = this.occurrences.map(update); ++ if (next.every((candidate, index) => candidate === this.occurrences[index])) return []; ++ this.occurrences = next; ++ for (const history of [this.log, this.redoStack]) for (const entry of history) entry.occurrencesBefore = entry.occurrencesBefore.map(update); ++ return []; ++ } ++ onUpdateResearchRef(referenceId, reference) { ++ if (typeof referenceId !== "string" || typeof reference !== "object" || reference === null || typeof reference.ref !== "string" || typeof reference.label !== "string" || typeof reference.clipboardText !== "string") return []; ++ const parse = reference.source === RESEARCH_FILE_REFERENCE_SOURCE ? parseResearchFileReference : reference.source === RESEARCH_ARTIFACT_REFERENCE_SOURCE ? parseResearchArtifactReference : null; ++ if (parse === null || parse(reference.ref)?.id !== referenceId) return []; ++ const update = (candidate) => candidate.source !== reference.source || parse(candidate.ref)?.id !== referenceId ? candidate : candidate.ref === reference.ref && candidate.label === reference.label && candidate.clipboardText === reference.clipboardText ? candidate : { ++ ...candidate, ++ ref: reference.ref, ++ label: reference.label, ++ clipboardText: reference.clipboardText ++ }; ++ this.occurrences = this.occurrences.map(update); ++ for (const history of [this.log, this.redoStack]) for (const entry of history) entry.occurrencesBefore = entry.occurrencesBefore.map(update); ++ return []; ++ } + /** Span CAS: revision equality (content identity follows) plus bounds sanity. */ + casOk(span) { + return span.draftRev === this.draftRev && span.start >= 0 && span.start <= span.end && span.end <= this.draft.length; +@@ -670,6 +747,19 @@ window.__ModuleLoader__.load({ + this.paste = void 0; + return []; + } ++ /** Restore one failed optimistic send, including native reference occurrences. */ ++ onRestoreDraft(draft, occurrences) { ++ this.phase = "plain"; ++ this.claim = void 0; ++ this.occurrences = occurrences.map((occurrence) => ({ ...occurrence })); ++ this.occurrenceSeq = Math.max(this.occurrenceSeq, ...this.occurrences.map((occurrence) => occurrence.occurrenceId), 0); ++ this.adopt(draft); ++ this.log = []; ++ this.redoStack = []; ++ this.typingRun = void 0; ++ this.paste = void 0; ++ return []; ++ } + /** + * Paste as one transaction: the text (U+FFFC-sanitized) replaces the + * selection; hot-snapshot sync matches componentize inside the SAME +@@ -900,6 +990,9 @@ window.__ModuleLoader__.load({ + setDraft: (text) => { + this.setDraft(text); + }, ++ insertFilePaths: (paths) => { ++ this.insertFilePaths(paths); ++ }, + addImages: (ids) => this.addImages(ids), + removeImage: (id) => { + this.removeImage(id); +@@ -909,6 +1002,18 @@ window.__ModuleLoader__.load({ + }, + submit: () => { + this.submit("queue"); ++ }, ++ generateResearchSelection: (request) => { ++ if (typeof this.deps.generationSink !== 'function') return Promise.resolve({ ok: false, error: '研究生成服务不可用' }); ++ return this.deps.generationSink(request); ++ }, ++ inspectResearchGeneration: (request) => { ++ if (typeof this.deps.generationInspectSink !== 'function') return Promise.reject(new Error('研究生成服务不可用')); ++ return this.deps.generationInspectSink(request); ++ }, ++ cancelResearchGeneration: (request) => { ++ if (typeof this.deps.generationCancelSink !== 'function') return Promise.reject(new Error('研究生成服务不可用')); ++ return this.deps.generationCancelSink(request); + } + }; + core = new InputMachine({ now: () => Date.now() }); +@@ -938,6 +1043,63 @@ window.__ModuleLoader__.load({ + ...editRange !== void 0 ? { editRange } : {} + })); + } ++ moveReferenceOccurrence(occurrenceId, targetOffset) { ++ const before = this.core.state.draftRev; ++ this.run(this.core.dispatch({ ++ type: "move-ref", ++ occurrenceId, ++ targetOffset ++ })); ++ return this.core.state.draftRev !== before; ++ } ++ updateReferenceOccurrence(occurrenceId, reference) { ++ const before = this.core.state.occurrences.find((occurrence) => occurrence.occurrenceId === occurrenceId); ++ if (before === void 0 || reference?.source !== before.source || reference.ref === before.ref && reference.label === before.label && reference.clipboardText === before.clipboardText) return false; ++ this.run(this.core.dispatch({ ++ type: "update-ref", ++ occurrenceId, ++ reference ++ })); ++ const after = this.core.state.occurrences.find((occurrence) => occurrence.occurrenceId === occurrenceId); ++ return before !== void 0 && after !== before; ++ } ++ updateResearchReferenceOccurrences(referenceId, reference) { ++ const before = this.core.state.occurrences; ++ const effects = this.core.dispatch({ ++ type: "update-research-ref", ++ referenceId, ++ reference ++ }); ++ const changed = this.core.state.occurrences.some((occurrence, index) => occurrence !== before[index]); ++ if (changed || effects.length > 0) this.run(effects); ++ return changed; ++ } ++ /** Append ordinary Chat uploads as native inline file references. */ ++ insertFilePaths(paths) { ++ if (!Array.isArray(paths) || paths.length === 0) return; ++ const references = paths.flatMap((path) => { ++ try { ++ return [chatFileReference(path)]; ++ } catch { ++ return []; ++ } ++ }); ++ if (references.length === 0) return; ++ const initial = this.snapshot.draft; ++ if (initial !== "" && !/\s$/.test(initial)) this.setDraft(`${initial} `, { ++ start: initial.length, ++ end: initial.length, ++ insertedLength: 1 ++ }); ++ for (const reference of references) { ++ const before = this.snapshot; ++ this.insertReference(reference, { ++ start: before.draft.length, ++ end: before.draft.length, ++ draftRev: before.draftRev ++ }); ++ } ++ } + /** Append ordered image ids unless an admission transaction is locked. */ + addImages(ids) { + if (this.snapshot.phase === "adjudicating" || this.snapshot.phase === "submitting") return false; +@@ -969,20 +1131,30 @@ window.__ModuleLoader__.load({ + * @param ids - failed attempt image ids. + */ + restoreImages(ids) { +- const current = new Set(this.imageIds); +- this.imageIds = [...ids.filter((id) => !current.has(id)), ...this.imageIds]; ++ const admitted = [...new Set(ids)]; ++ const admittedSet = new Set(admitted); ++ this.imageIds = [...admitted, ...this.imageIds.filter((id, index, current) => !admittedSet.has(id) && current.indexOf(id) === index)]; + this.publish(); + } ++ /** Restore the exact native draft state after an optimistic send fails. */ ++ restoreDraftState(snapshot) { ++ this.run(this.core.dispatch({ ++ type: "restore-draft", ++ draft: snapshot.draft, ++ occurrences: snapshot.occurrences ++ })); ++ } + /** + * Clear the draft as a successful-send commit: no undo unit is recorded and + * the undo history is cut, so Ctrl/Cmd-Z cannot resurrect sent content + * (the command path gets the same discipline from submit-settled success). + * @param imageIds - admitted image ids to remove from this draft. + */ +- commitSend(imageIds) { ++ commitSend(imageIds, admittedDraft = this.snapshot.draft) { + const submitted = new Set(imageIds); + this.imageIds = this.imageIds.filter((id) => !submitted.has(id)); +- this.run(this.core.dispatch({ type: "send-committed" })); ++ if (this.snapshot.draft === admittedDraft) this.run(this.core.dispatch({ type: "send-committed" })); ++ else this.publish(); + } + /** Undo the latest transaction (InputBar intercepts the platform chord). */ + undo() { +@@ -1334,14 +1506,21 @@ window.__ModuleLoader__.load({ + var InputHub = class { + rootCtx; + t; ++ researchWorkspaces; ++ researchActiveSessions = /* @__PURE__ */ new Set(); + shells = /* @__PURE__ */ new Map(); + /** + * @param ctx - client root context (services resolved lazily per call — boot order stays free). + * @param t - conversation-namespace translate thunk (reads the active locale at call time). + */ +- constructor(rootCtx, t) { ++ constructor(rootCtx, t, researchWorkspaces = defaultResearchWorkspaces) { + this.rootCtx = rootCtx; + this.t = t; ++ this.researchWorkspaces = researchWorkspaces; ++ } ++ setResearchActive(sessionId, active) { ++ if (active) this.researchActiveSessions.add(sessionId); ++ else this.researchActiveSessions.delete(sessionId); + } + /** + * Resolve the facade for one session-scope ctx (SessionInputResolver face). +@@ -1373,6 +1552,9 @@ window.__ModuleLoader__.load({ + defaultSink: (text, imageIds, mode) => { + this.sink(session, text, imageIds, mode); + }, ++ generationSink: (request) => this.generateResearchSelection(session, request), ++ generationInspectSink: (request) => this.inspectResearchGeneration(session, request), ++ generationCancelSink: (request) => this.cancelResearchGeneration(session, request), + steerQueue: () => { + this.steerQueue(session, shell); + } +@@ -1390,6 +1572,7 @@ window.__ModuleLoader__.load({ + const drafts = shell.snapshot.imageIds; + shell.dispose(); + this.shells.delete(id); ++ this.researchActiveSessions.delete(id); + const conversation = this.rootCtx.get("conversation"); + for (const imageId of drafts) conversation?.releaseDraftImage(imageId); + }; +@@ -1435,19 +1618,139 @@ window.__ModuleLoader__.load({ + * exactly one path; a failed first prompt is an ordinary prompt failure + * (error strip via promptError, draft restored only while untouched). + */ +- sink(session, text, imageIds, mode) { +- if (text === "" && imageIds.length === 0) return; ++ async sink(session, text, imageIds, mode) { + const shell = this.shells.get(session.sessionId); +- shell?.commitSend(imageIds); +- this.conversation().sendSession(session, text, imageIds, mode).catch(() => { ++ const workspace = this.researchWorkspaces.for(session.sessionId); ++ const researchActive = this.researchActiveSessions.has(session.sessionId); ++ const inline = extractResearchReferences(text); ++ const files = researchActive ? inline.files : []; ++ const artifacts = researchActive ? inline.artifacts : []; ++ const referencedIds = /* @__PURE__ */ new Set([...files.map((file) => file.id), ...artifacts.map((artifact) => artifact.id)]); ++ const currentSelection = researchActive ? workspace.selectionSnapshot() : { selectedNodeIds: [], orderedFileIds: [] }; ++ const selection = { ++ selectedNodeIds: currentSelection.selectedNodeIds.filter((id) => referencedIds.has(id)), ++ orderedFileIds: currentSelection.orderedFileIds.filter((id) => referencedIds.has(id)) ++ }; ++ const shellSnapshot = shell?.snapshot; ++ const attempt = { ++ text: inline.text, ++ draftState: { ++ draft: shellSnapshot?.draft ?? inline.text, ++ occurrences: shellSnapshot?.occurrences?.map((occurrence) => ({ ...occurrence })) ?? [] ++ }, ++ imageIds: [...imageIds], ++ files, ++ occurrences: researchActive ? inline.occurrences : [], ++ artifacts, ++ artifactOccurrences: researchActive ? inline.artifactOccurrences : [], ++ selection, ++ session, ++ mode ++ }; ++ if (attempt.text === "" && attempt.imageIds.length === 0 && attempt.files.length === 0 && attempt.artifacts.length === 0) return; ++ if (attempt.files.length > RESEARCH_PROMPT_MAX_FILES || attempt.files.some((file) => typeof file.path !== "string" || file.path.length === 0 || file.path.length > RESEARCH_CANVAS_TEXT_LIMIT)) { ++ shell?.notify("error", this.t("research.files.unavailable")); ++ return; ++ } ++ if (attempt.files.length > 0) { ++ let available = []; ++ try { ++ available = await window.dshDesktop?.researchFilesAvailable?.(attempt.files.map((file) => file.path)) ?? []; ++ } catch {} ++ if (!Array.isArray(available) || available.length !== attempt.files.length || Array.from(available).some((value) => value !== true)) { ++ shell?.notify("error", this.t("research.files.unavailable")); ++ return; ++ } ++ } ++ if (shell !== void 0 && this.shells.get(session.sessionId) !== shell) return; ++ let prompt; ++ try { ++ prompt = serializeResearchPrompt(attempt.files.map((file) => ({ ++ id: file.id, ++ name: researchPromptBasename(file.name), ++ path: file.path ++ })), attempt.text, attempt.occurrences, attempt.artifacts, attempt.artifactOccurrences); ++ } catch { ++ shell?.notify("error", this.t("research.references.unavailable")); ++ return; ++ } ++ shell?.commitSend(attempt.imageIds, attempt.draftState.draft); ++ const committedDraftRev = shell?.snapshot.draftRev; ++ if (researchActive && attempt.selection.selectedNodeIds.length > 0) workspace.commitSelection(attempt.selection); ++ try { ++ await this.conversation().sendSession(attempt.session, prompt, attempt.imageIds, attempt.mode); ++ } catch { ++ if (researchActive && attempt.selection.selectedNodeIds.length > 0) workspace.restoreSelection(attempt.selection); + if (this.shells.get(session.sessionId) === shell) { +- shell?.restoreImages(imageIds); +- if (shell?.snapshot.draft === "") shell.setDraft(text); ++ shell?.restoreImages(attempt.imageIds); ++ if (shell?.snapshot.draft === "" && shell.snapshot.draftRev === committedDraftRev) shell.restoreDraftState(attempt.draftState); + return; + } + const conversation = this.rootCtx.get("conversation"); +- for (const id of imageIds) conversation?.releaseDraftImage(id); +- }); ++ for (const id of attempt.imageIds) conversation?.releaseDraftImage(id); ++ } ++ } ++ /** ++ * Submit one generated Research canvas artifact through the resident ++ * session queue without reading from or mutating the composer draft. ++ */ ++ async generateResearchSelection(session, request) { ++ const workspace = this.researchWorkspaces.for(session.sessionId); ++ const requestSessionId = boundedString(request?.sessionId); ++ const targetNodeId = boundedString(request?.targetNodeId); ++ const kind = request?.kind; ++ if (kind === 'container') { ++ const prompt = typeof request?.prompt === 'string' && request.prompt.trim() !== '' && request.prompt.length <= RESEARCH_CONTAINER_MAX_PROMPT ? request.prompt.trim() : null; ++ if (requestSessionId !== session.sessionId || targetNodeId === null || prompt === null || request?.selectedNodeIds !== void 0 || request?.detail !== void 0) return { ok: false, error: '无法读取容器需求' }; ++ const target = workspace.getSnapshot().artifacts.find((node) => node.id === targetNodeId && node.kind === 'generated-container' && node.generationStatus === 'queued'); ++ if (target === void 0 || target.containerPrompt !== prompt) return { ok: false, error: '生成组件已失效' }; ++ try { ++ const result = await startResearchTask({ ++ parentSessionId: session.sessionId, ++ canvasNodeId: targetNodeId, ++ kind: 'container', ++ prompt ++ }); ++ if (!workspace.attachGenerationTask(targetNodeId, result)) return { ok: false, error: '生成组件已失效' }; ++ return { ok: true, taskId: result.taskId }; ++ } catch (error) { ++ const message = normalizeResearchArtifactText(error instanceof Error ? error.message : error, 512) ?? '生成请求未能启动'; ++ workspace.failGeneration(targetNodeId, message); ++ return { ok: false, error: message }; ++ } ++ } ++ const selectedNodeIds = researchSelectionIds(request?.selectedNodeIds); ++ const detail = kind === 'mind-map' && RESEARCH_MIND_MAP_DETAILS.has(request?.detail) ? request.detail : kind === 'mind-map' ? null : void 0; ++ if (requestSessionId !== session.sessionId || targetNodeId === null || !['mind-map', 'summary'].includes(kind) || selectedNodeIds.length === 0 || kind === 'mind-map' && detail === null) return { ok: false, error: '无法读取选中的组件' }; ++ const target = workspace.getSnapshot().artifacts.find((node) => node.id === targetNodeId && node.generationStatus === 'queued'); ++ if (target === void 0 || kind === 'mind-map' && researchMindMapDetail(target.generationDetail) !== detail) return { ok: false, error: '生成组件已失效' }; ++ if (!Array.isArray(target.generationSources) || target.generationSources.length === 0 || selectedNodeIds.some((id, index) => target.sourceNodeIds[index] !== id)) { ++ workspace.failGeneration(targetNodeId, '选中的组件内容不可用'); ++ return { ok: false, error: '选中的组件内容不可用' }; ++ } ++ try { ++ const result = await startResearchTask({ ++ parentSessionId: session.sessionId, ++ canvasNodeId: targetNodeId, ++ kind, ++ ...(kind === 'mind-map' ? { detail } : {}), ++ sources: target.generationSources ++ }); ++ if (!workspace.attachGenerationTask(targetNodeId, result)) return { ok: false, error: '生成组件已失效' }; ++ return { ok: true, taskId: result.taskId }; ++ } catch (error) { ++ const message = normalizeResearchArtifactText(error instanceof Error ? error.message : error, 512) ?? '生成请求未能启动'; ++ workspace.failGeneration(targetNodeId, message); ++ return { ok: false, error: message }; ++ } ++ } ++ inspectResearchGeneration(session, request) { ++ if (boundedString(request?.parentSessionId) !== session.sessionId) return Promise.reject(new Error('研究会话已失效')); ++ return inspectResearchTask(request); ++ } ++ cancelResearchGeneration(session, request) { ++ if (boundedString(request?.parentSessionId) !== session.sessionId) return Promise.reject(new Error('研究会话已失效')); ++ return cancelResearchTask(request); + } + /** + * Steer every still-pending queued message into the running turn, in FIFO +@@ -1462,7 +1765,7 @@ window.__ModuleLoader__.load({ + * @param shell - the resident shell (notice outlet). + */ + async steerQueue(session, shell) { +- const queued = session.getSnapshot().queue.filter((item) => item.placement === "queued"); ++ const queued = userQueuedMessages(session.getSnapshot().queue); + if (queued.length === 0) return; + for (const item of queued) { + const result = await session.updateQueue(item.id, { kind: "steer" }); +@@ -2422,6 +2725,8 @@ window.__ModuleLoader__.load({ + const chips = occurrences.map((o) => ({ + occurrenceId: o.occurrenceId, + offset: o.offset, ++ source: o.source, ++ ref: o.ref, + label: o.label, + invalid: o.invalid === true + })); +@@ -2433,6 +2738,82 @@ window.__ModuleLoader__.load({ + hint + }; + } ++ const INPUT_REFERENCE_CLIPBOARD_TYPE = "application/x-sherlock-input-references"; ++ const INPUT_REFERENCE_CLIPBOARD_LIMIT = 262144; ++ function serializeInputReferenceClipboard(draft, occurrences, selection) { ++ const start = Math.max(0, Math.min(selection.start, draft.length)); ++ const end = Math.max(start, Math.min(selection.end, draft.length)); ++ const touched = occurrences.filter((occurrence) => occurrence.offset >= start && occurrence.offset < end).sort((a, b) => a.offset - b.offset); ++ let text = ""; ++ let cursor = start; ++ const components = []; ++ for (const occurrence of touched) { ++ text += draft.slice(cursor, occurrence.offset); ++ const componentStart = text.length; ++ text += occurrence.clipboardText; ++ components.push({ ++ start: componentStart, ++ end: text.length, ++ reference: { ++ source: occurrence.source, ++ ref: occurrence.ref, ++ label: occurrence.label, ++ clipboardText: occurrence.clipboardText ++ } ++ }); ++ cursor = occurrence.offset + 1; ++ } ++ text += draft.slice(cursor, end); ++ return { ++ text, ++ payload: components.length === 0 ? null : JSON.stringify({ text, components }) ++ }; ++ } ++ function parseInputReferenceClipboard(raw, text) { ++ if (typeof raw !== "string" || raw.length === 0 || raw.length > INPUT_REFERENCE_CLIPBOARD_LIMIT) return void 0; ++ try { ++ const value = JSON.parse(raw); ++ if (typeof value !== "object" || value === null || value.text !== text || !Array.isArray(value.components) || value.components.length === 0 || value.components.length > 256) return void 0; ++ let previousEnd = 0; ++ const components = []; ++ for (const item of value.components) { ++ if (typeof item !== "object" || item === null || !Number.isInteger(item.start) || !Number.isInteger(item.end) || item.start < previousEnd || item.end <= item.start || item.end > text.length) return void 0; ++ const reference = item.reference; ++ if (typeof reference !== "object" || reference === null || typeof reference.source !== "string" || reference.source.length === 0 || reference.source.length > 128 || typeof reference.ref !== "string" || reference.ref.length > 4096 || typeof reference.label !== "string" || reference.label.length > 512 || typeof reference.clipboardText !== "string" || reference.clipboardText.length > 512 || text.slice(item.start, item.end) !== reference.clipboardText) return void 0; ++ components.push({ ++ start: item.start, ++ end: item.end, ++ reference: { ++ source: reference.source, ++ ref: reference.ref, ++ label: reference.label, ++ clipboardText: reference.clipboardText ++ } ++ }); ++ previousEnd = item.end; ++ } ++ return components; ++ } catch { ++ return void 0; ++ } ++ } ++ function filterResearchFileClipboardComponents(components, researchFileReferences) { ++ if (components === void 0) return void 0; ++ const allowed = (researchFileReferences ?? []).flatMap((file) => { ++ try { ++ const canonical = parseResearchFileReference(researchFileReference(file).ref); ++ return canonical === null ? [] : [canonical]; ++ } catch { ++ return []; ++ } ++ }); ++ const filtered = components.filter((component) => { ++ if (component.reference.source !== RESEARCH_FILE_REFERENCE_SOURCE) return true; ++ const candidate = parseResearchFileReference(component.reference.ref); ++ return candidate !== null && allowed.some((file) => file.id === candidate.id && file.name === candidate.name && file.path === candidate.path); ++ }); ++ return filtered.length === 0 ? void 0 : filtered; ++ } + //#endregion + //#region lib/types/client/image-labels.js + /** Bridges the `conversation` locale namespace to the zero-cordis attachment +@@ -3164,8 +3545,11 @@ window.__ModuleLoader__.load({ + if (!/^[a-z0-9]+(-[a-z0-9]+)*$/.test(name)) return name; + return name.split("-").map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(" "); + } +- function optionLabel(option) { +- return option.value === FULL_ACCESS ? "Full access" : displayName(option.name); ++ function permissionOptionLabel(option, t) { ++ if (option.value === "read-only") return t("access.mode.readOnly"); ++ if (option.value === "workspace-write") return t("access.mode.workspaceWrite"); ++ if (option.value === FULL_ACCESS) return t("access.mode.fullAccess"); ++ return displayName(option.name); + } + function PermissionSelect({ value, locked, command, t }) { + const [pick, setPick] = (0, react.useState)(null); +@@ -3186,7 +3570,7 @@ window.__ModuleLoader__.load({ + const icon = permissionGlyph(option.value); + return { + id: option.value, +- label: optionLabel(option), ++ label: permissionOptionLabel(option, t), + ...icon === void 0 ? {} : { icon } + }; + }); +@@ -3225,10 +3609,11 @@ window.__ModuleLoader__.load({ + setOpen(false); + }, + side: "top", ++ portal: true, + anchor: (0, react_jsx_runtime.jsxs)("button", { + type: "button", + className: PermissionSelect_module_css_default.trigger, +- "aria-label": t("input.accessMode", { name: current === void 0 ? displayName(currentValue) : optionLabel(current) }), ++ "aria-label": t("input.accessMode", { name: current === void 0 ? displayName(currentValue) : permissionOptionLabel(current, t) }), + title: current?.description, + disabled: locked || busy, + onClick: () => { +@@ -3242,7 +3627,7 @@ window.__ModuleLoader__.load({ + }), + (0, react_jsx_runtime.jsx)("span", { + className: PermissionSelect_module_css_default.triggerLabel, +- children: current === void 0 ? displayName(currentValue) : optionLabel(current) ++ children: current === void 0 ? displayName(currentValue) : permissionOptionLabel(current, t) + }), + (0, react_jsx_runtime.jsx)("span", { + className: clsx(PermissionSelect_module_css_default.chevron, open && PermissionSelect_module_css_default.chevronOpen), +@@ -3298,13 +3683,21 @@ window.__ModuleLoader__.load({ + } + //#endregion + //#region \0dsh-css:/home/runner/work/deepseek-harness/deepseek-harness/packages/client/ui-conversation/src/client/skeleton/InputBar.module.css.mjs +- const css$17 = "@font-face{font-family:DshChipCell;src:url(data:font/ttf;base64,AAEAAAAKAIAAAwAgT1MvMkT8SmIAAAEoAAAAYGNtYXAADQBPAAABkAAAADRnbHlmAAAAAAAAAcwAAAABaGVhZCwtPGoAAACsAAAANmhoZWEDIg7bAAAA5AAAACRobXR4EZQAAAAAAYgAAAAIbG9jYQAAAAAAAAHEAAAABm1heHAAAwACAAABCAAAACBuYW1lvljk2gAAAdAAAABscG9zdNNweNQAAAI8AAAALQABAAAAAQAAdia1tV8PPPUAAwPoAAAAAOaLfcUAAAAA5ot9xQAAAAAAAAAAAAAAAwACAAAAAAAAAAEAAAMg/zgAAA+gAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAACAAEAAAACAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAwjKAZAABQAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAPz8/PwAA//z//AMg/zgAAAMgAMgAAAAAAAAAAAAAAAAAAAAgAAAB9AAAD6AAAAAAAAIAAAADAAAAFAADAAEAAAAUAAQAIAAAAAQABAABAAD//P//AAD//P//AAUAAQAAAAAAAAAAAAAAAAAAAAAAAAAEADYAAQAAAAAAAQALAAAAAQAAAAAAAgAHAAsAAwABBAkAAQAWABIAAwABBAkAAgAOAChEc2hDaGlwQ2VsbFJlZ3VsYXIARABzAGgAQwBoAGkAcABDAGUAbABsAFIAZQBnAHUAbABhAHIAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAABAgZvYmpyZXAAAAA=)format(\"truetype\")}.uV2eYG_root{padding:0 var(--dsh-composer-side-clearance) 8px;flex-direction:column;align-items:center;display:flex}.uV2eYG_hero{padding:0 var(--dsh-composer-side-clearance)}.uV2eYG_notice{width:100%;max-width:var(--dsh-composer-card-max-width);background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-secondary);border-radius:8px;margin-bottom:6px;padding:4px 8px;font-size:12px;line-height:18px}.uV2eYG_noticeError{background:var(--dsw-alias-interactive-bg-hover-danger);color:var(--dsw-alias-state-error-primary)}.uV2eYG_card{box-sizing:border-box;width:100%;max-width:var(--dsh-composer-card-max-width);border:1px solid var(--dsw-alias-border-l2-darkmode-thin);background:var(--dsw-specific-input-major);box-shadow:var(--dsw-shadow-lv2);--dsh-scrollbar-thumb:var(--dsw-alias-scrollbar-bg-l2);--dsh-scrollbar-thumb-hover:var(--dsw-alias-scrollbar-hover-l2);border-radius:22px;flex-direction:column;gap:12px;padding-top:10px;font-size:16px;line-height:24px;display:flex;position:relative}.uV2eYG_cardWorkspaceTrigger{cursor:pointer;border-color:#0000}.uV2eYG_cardWorkspaceTrigger:after{content:\"\";background:var(--dsw-alias-border-l4);pointer-events:none;border-radius:22px;transition:background-color .1s;position:absolute;inset:-1px;-webkit-mask:url(\"data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg'%3E%3Crect width='100%25' height='100%25' fill='none' rx='22' ry='22' stroke='black' stroke-width='2' stroke-dasharray='4 4'/%3E%3C/svg%3E\");mask:url(\"data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg'%3E%3Crect width='100%25' height='100%25' fill='none' rx='22' ry='22' stroke='black' stroke-width='2' stroke-dasharray='4 4'/%3E%3C/svg%3E\")}.uV2eYG_cardWorkspaceTrigger :disabled{pointer-events:none}.uV2eYG_cardWorkspaceTrigger:hover:after{background:var(--dsw-alias-state-business-primary)}.uV2eYG_accessory{align-items:center;gap:8px;padding:10px 12px 0;display:flex}.uV2eYG_attachments{min-width:0;padding:4px 12px 0}.uV2eYG_overlayAnchor{height:0;position:absolute;inset:0 0 auto}.uV2eYG_scroll{max-height:var(--dsh-composer-text-max-height);overflow-y:auto}.uV2eYG_grow{position:relative}.uV2eYG_backdrop{color:var(--dsw-alias-label-primary);pointer-events:none;position:absolute;inset:0;overflow:hidden}.uV2eYG_hlToken{color:var(--dsw-alias-state-warn-label);background-color:#0000}.uV2eYG_hlSegment{color:#0000;background-color:#0000;border-radius:4px}.uV2eYG_hint{color:var(--dsw-alias-label-caption)}.uV2eYG_pending{background:var(--dsw-alias-state-business-primary);border-radius:50%;width:8px;height:8px;animation:1s ease-in-out infinite alternate uV2eYG_input-pending}@keyframes uV2eYG_input-pending{0%{opacity:.35}to{opacity:1}}.uV2eYG_input{resize:none;color:#0000;width:100%;height:100%;caret-color:var(--dsw-alias-state-business-primary);background:0 0;border:none;outline:none;position:absolute;inset:0;overflow:hidden}.uV2eYG_input,.uV2eYG_mirror,.uV2eYG_backdrop{box-sizing:border-box;font-family:\"DshChipCell\", var(--dsw-font-family);font-size:inherit;line-height:inherit;white-space:pre-wrap;word-break:break-word;overflow-wrap:anywhere;padding:4px 12px 0 16px}.uV2eYG_input::placeholder{color:var(--dsw-alias-label-caption);user-select:none}.uV2eYG_input:disabled{color:var(--dsw-alias-label-tertiary);cursor:not-allowed}.uV2eYG_input[aria-haspopup=menu]{cursor:pointer}.uV2eYG_mirror{visibility:hidden;pointer-events:none}.uV2eYG_hero .uV2eYG_mirror{min-height:52px}.uV2eYG_row{justify-content:space-between;align-items:center;gap:12px;min-width:0;padding:2px 8px 6px;display:flex;container-type:inline-size}.uV2eYG_tools,.uV2eYG_modes,.uV2eYG_trailing{align-items:center;min-width:0;display:flex}.uV2eYG_tools{gap:16px}.uV2eYG_modes{gap:12px}.uV2eYG_trailing{flex:none;gap:12px}.uV2eYG_add{background:var(--dsw-specific-selector);width:28px;height:28px;color:var(--dsw-alias-label-primary);cursor:pointer;border:none;border-radius:999px;flex:none;place-items:center;display:grid}.uV2eYG_add:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover-solid)}.uV2eYG_add:disabled{opacity:.5;cursor:default}.uV2eYG_select{max-width:220px;height:28px;color:var(--dsw-alias-label-secondary);white-space:nowrap;cursor:pointer;appearance:none;background-color:#0000;background-image:url(\"data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='0 0 12 12' fill='none'%3E%3Cpath d='M3 4.5L6 7.5L9 4.5' stroke='%2381858C' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E\");background-position:right 4px center;background-repeat:no-repeat;background-size:12px 12px;border:none;border-radius:8px;outline:none;padding:0 20px 0 8px;font-size:13px;font-weight:500;line-height:20px}.uV2eYG_select:hover:not(:disabled){background-color:var(--dsw-alias-interactive-bg-hover)}.uV2eYG_select:disabled{opacity:.5;cursor:default}.uV2eYG_primary{background:var(--dsw-alias-button-info-fill);color:#fff;cursor:pointer;border:none;border-radius:999px;flex:none;place-items:center;width:34px;height:34px;transition:background-color .1s;display:grid;transform:translateY(-2px)}.uV2eYG_primary:hover:not(:disabled){background:var(--dsw-alias-button-info-hover)}.uV2eYG_primary:disabled{opacity:.4;cursor:default}.uV2eYG_retry{color:inherit;cursor:pointer;background:0 0;border:1px solid;border-radius:4px;margin-left:8px;padding:1px 8px;font-size:12px}.uV2eYG_textRef{color:var(--dsw-alias-state-business-primary);-webkit-box-decoration-break:clone;box-decoration-break:clone;background-color:#0000}.uV2eYG_textRef:after{display:none}.uV2eYG_chip{background:#6187d838;border-radius:6px;position:relative}.uV2eYG_chip:before{content:\"\";color:#0000}.uV2eYG_chipLabel{width:calc(138.889% - 10px);color:var(--dsw-alias-label-primary);white-space:nowrap;justify-content:center;align-items:center;display:flex;position:absolute;top:50%;left:50%;overflow:hidden;transform:translate(-50%,-50%)scale(.72)}.uV2eYG_chipInvalid{opacity:.7;background:#d8616133;text-decoration:line-through}"; ++ const css$17 = "@font-face{font-family:DshChipCell;src:url(data:font/ttf;base64,AAEAAAAKAIAAAwAgT1MvMkT8SmIAAAEoAAAAYGNtYXAADQBPAAABkAAAADRnbHlmAAAAAAAAAcwAAAABaGVhZCwtPGoAAACsAAAANmhoZWEDIg7bAAAA5AAAACRobXR4EZQAAAAAAYgAAAAIbG9jYQAAAAAAAAHEAAAABm1heHAAAwACAAABCAAAACBuYW1lvljk2gAAAdAAAABscG9zdNNweNQAAAI8AAAALQABAAAAAQAAdia1tV8PPPUAAwPoAAAAAOaLfcUAAAAA5ot9xQAAAAAAAAAAAAAAAwACAAAAAAAAAAEAAAMg/zgAAA+gAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAACAAEAAAACAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAwjKAZAABQAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAPz8/PwAA//z//AMg/zgAAAMgAMgAAAAAAAAAAAAAAAAAAAAgAAAB9AAAD6AAAAAAAAIAAAADAAAAFAADAAEAAAAUAAQAIAAAAAQABAABAAD//P//AAD//P//AAUAAQAAAAAAAAAAAAAAAAAAAAAAAAAEADYAAQAAAAAAAQALAAAAAQAAAAAAAgAHAAsAAwABBAkAAQAWABIAAwABBAkAAgAOAChEc2hDaGlwQ2VsbFJlZ3VsYXIARABzAGgAQwBoAGkAcABDAGUAbABsAFIAZQBnAHUAbABhAHIAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAABAgZvYmpyZXAAAAA=)format(\"truetype\")}.uV2eYG_root{padding:0 var(--dsh-composer-side-clearance) 8px;flex-direction:column;align-items:center;display:flex}.uV2eYG_hero{padding:0 var(--dsh-composer-side-clearance)}.uV2eYG_notice{width:100%;max-width:var(--dsh-composer-card-max-width);background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-secondary);border-radius:8px;margin-bottom:6px;padding:4px 8px;font-size:12px;line-height:18px}.uV2eYG_noticeError{background:var(--dsw-alias-interactive-bg-hover-danger);color:var(--dsw-alias-state-error-primary)}.uV2eYG_card{box-sizing:border-box;width:100%;max-width:var(--dsh-composer-card-max-width);border:1px solid var(--dsw-alias-border-l2-darkmode-thin);background:var(--dsw-specific-input-major);box-shadow:var(--dsw-shadow-lv2);--dsh-scrollbar-thumb:var(--dsw-alias-scrollbar-bg-l2);--dsh-scrollbar-thumb-hover:var(--dsw-alias-scrollbar-hover-l2);border-radius:22px;flex-direction:column;gap:12px;padding-top:10px;font-size:16px;line-height:24px;display:flex;position:relative}.uV2eYG_cardWorkspaceTrigger{cursor:pointer;border-color:#0000}.uV2eYG_cardWorkspaceTrigger:after{content:\"\";background:var(--dsw-alias-border-l4);pointer-events:none;border-radius:22px;transition:background-color .1s;position:absolute;inset:-1px;-webkit-mask:url(\"data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg'%3E%3Crect width='100%25' height='100%25' fill='none' rx='22' ry='22' stroke='black' stroke-width='2' stroke-dasharray='4 4'/%3E%3C/svg%3E\");mask:url(\"data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg'%3E%3Crect width='100%25' height='100%25' fill='none' rx='22' ry='22' stroke='black' stroke-width='2' stroke-dasharray='4 4'/%3E%3C/svg%3E\")}.uV2eYG_cardWorkspaceTrigger :disabled{pointer-events:none}.uV2eYG_cardWorkspaceTrigger:hover:after{background:var(--dsw-alias-state-business-primary)}.uV2eYG_accessory{align-items:center;gap:8px;padding:10px 12px 0;display:flex}.uV2eYG_attachments{min-width:0;padding:4px 12px 0}.uV2eYG_overlayAnchor{height:0;position:absolute;inset:0 0 auto}.uV2eYG_scroll{max-height:var(--dsh-composer-text-max-height);overflow-y:auto}.uV2eYG_grow{position:relative}.uV2eYG_backdrop{z-index:1;color:var(--dsw-alias-label-primary);pointer-events:none;position:absolute;inset:0;overflow:hidden}.uV2eYG_hlToken{color:var(--dsw-alias-state-warn-label);background-color:#0000}.uV2eYG_hlSegment{color:#0000;background-color:#0000;border-radius:4px}.uV2eYG_hint{color:var(--dsw-alias-label-caption)}.uV2eYG_pending{background:var(--dsw-alias-state-business-primary);border-radius:50%;width:8px;height:8px;animation:1s ease-in-out infinite alternate uV2eYG_input-pending}@keyframes uV2eYG_input-pending{0%{opacity:.35}to{opacity:1}}.uV2eYG_input{resize:none;color:#0000;width:100%;height:100%;caret-color:var(--dsw-alias-state-business-primary);background:0 0;border:none;outline:none;position:absolute;inset:0;overflow:hidden}.uV2eYG_input,.uV2eYG_mirror,.uV2eYG_backdrop{box-sizing:border-box;font-family:\"DshChipCell\", var(--dsw-font-family);font-size:inherit;line-height:inherit;white-space:pre-wrap;word-break:break-word;overflow-wrap:anywhere;padding:4px 12px 0 16px}.uV2eYG_input::placeholder{color:var(--dsw-alias-label-caption);user-select:none}.uV2eYG_input:disabled{color:var(--dsw-alias-label-tertiary);cursor:not-allowed}.uV2eYG_input[aria-haspopup=menu]{cursor:pointer}.uV2eYG_mirror{visibility:hidden;pointer-events:none}.uV2eYG_hero .uV2eYG_mirror{min-height:52px}.uV2eYG_row{justify-content:space-between;align-items:center;gap:12px;min-width:0;padding:2px 8px 6px;display:flex;container-type:inline-size}.uV2eYG_tools,.uV2eYG_modes,.uV2eYG_trailing{align-items:center;min-width:0;display:flex}.uV2eYG_tools{gap:16px}.uV2eYG_modes{gap:12px}.uV2eYG_trailing{flex:none;gap:12px}.uV2eYG_add{background:var(--dsw-specific-selector);width:28px;height:28px;color:var(--dsw-alias-label-primary);cursor:pointer;border:none;border-radius:999px;flex:none;place-items:center;display:grid}.uV2eYG_add:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover-solid)}.uV2eYG_add:disabled{opacity:.5;cursor:default}.uV2eYG_select{max-width:220px;height:28px;color:var(--dsw-alias-label-secondary);white-space:nowrap;cursor:pointer;appearance:none;background-color:#0000;background-image:url(\"data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='0 0 12 12' fill='none'%3E%3Cpath d='M3 4.5L6 7.5L9 4.5' stroke='%2381858C' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E\");background-position:right 4px center;background-repeat:no-repeat;background-size:12px 12px;border:none;border-radius:8px;outline:none;padding:0 20px 0 8px;font-size:13px;font-weight:500;line-height:20px}.uV2eYG_select:hover:not(:disabled){background-color:var(--dsw-alias-interactive-bg-hover)}.uV2eYG_select:disabled{opacity:.5;cursor:default}.uV2eYG_primary{background:var(--dsw-alias-button-info-fill);color:#fff;cursor:pointer;border:none;border-radius:999px;flex:none;place-items:center;width:34px;height:34px;transition:background-color .1s;display:grid;transform:translateY(-2px)}.uV2eYG_primary:hover:not(:disabled){background:var(--dsw-alias-button-info-hover)}.uV2eYG_primary:disabled{opacity:.4;cursor:default}.uV2eYG_retry{color:inherit;cursor:pointer;background:0 0;border:1px solid;border-radius:4px;margin-left:8px;padding:1px 8px;font-size:12px}.uV2eYG_textRef{color:var(--dsw-alias-state-business-primary);-webkit-box-decoration-break:clone;box-decoration-break:clone;background-color:#0000}.uV2eYG_textRef:after{display:none}.uV2eYG_chip{background:#15171a;border:1px solid var(--dsw-alias-border-l3);border-radius:7px;box-sizing:border-box;position:relative}.uV2eYG_chip[data-reference-source=research-file]{pointer-events:auto;cursor:grab;z-index:2}.uV2eYG_chip[data-reference-source=research-file]:active{cursor:grabbing}.uV2eYG_chip:before{content:\"\";color:#0000}.uV2eYG_chipLabel{width:calc(100% - 8px);height:20px;color:var(--dsw-alias-label-primary);white-space:nowrap;justify-content:center;align-items:center;display:flex;position:absolute;top:50%;left:50%;overflow:hidden;font-family:var(--dsw-font-family);font-size:13px;line-height:20px;transform:translate(-50%,-50%)}.uV2eYG_chipInvalid{opacity:.7;background:#d8616133;text-decoration:line-through}"; + const tagId$17 = "@deepseek-ai/dsh-client-ui-conversation/InputBar.module.css"; ++ const sherlockInputChipCss = "@font-face{font-family:DshChipCellLarge;src:url(data:font/ttf;base64,AAEAAAAKAIAAAwAgT1MvMkT8SmIAAAEoAAAAYGNtYXAADQBPAAABkAAAADRnbHlmAAAAAAAAAcwAAAABaGVhZCwtPGoAAACsAAAANmhoZWEDIg7bAAAA5AAAACRobXR4IygAAAAAAYgAAAAIbG9jYQAAAAAAAAHEAAAABm1heHAAAwACAAABCAAAACBuYW1lvljk2gAAAdAAAABscG9zdNNweNQAAAI8AAAALQABAAAAAQAAUv61tV8PPPUAAwPoAAAAAOaLfcUAAAAA5ot9xQAAAAAAAAAAAAAAAwACAAAAAAAAAAEAAAMg/zgAAA+gAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAACAAEAAAACAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAwjKAZAABQAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAPz8/PwAA//z//AMg/zgAAAMgAMgAAAAAAAAAAAAAAAAAAAAgAAAB9AAAITQAAAAAAAIAAAADAAAAFAADAAEAAAAUAAQAIAAAAAQABAABAAD//P//AAD//P//AAUAAQAAAAAAAAAAAAAAAAAAAAAAAAAEADYAAQAAAAAAAQALAAAAAQAAAAAAAgAHAAsAwABBAkAAQAWABIAAwABBAkAAgAOAChEc2hDaGlwQ2VsbFJlZ3VsYXIARABzAGgAQwBoAGkAcABDAGUAbABsAFIAZQBnAHUAbABhAHIAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAABAgZvYmpyZXAAAAA=)format(\"truetype\")}.uV2eYG_input,.uV2eYG_mirror,.uV2eYG_backdrop{font-family:\"DshChipCellLarge\",var(--dsw-font-family)}.uV2eYG_chip{box-sizing:border-box;display:inline-block;width:136px;min-width:136px;max-width:136px;height:24px;line-height:24px;vertical-align:middle}.uV2eYG_chip[data-reference-source=research-file][data-selected=true]{outline:2px solid var(--dsw-alias-state-business-primary);outline-offset:-1px}.uV2eYG_chip[data-reference-source=research-artifact][data-selected=true]{outline:2px solid var(--dsw-alias-state-business-primary);outline-offset:-1px}.uV2eYG_chipLabel{width:calc(100% - 12px);height:22px;gap:6px;justify-content:flex-start;font-size:14px;line-height:22px}.uV2eYG_chipLabel>svg{flex:none;width:14px;height:14px}.uV2eYG_chipLabelText{min-width:0;text-overflow:ellipsis;overflow:hidden}"; ++ const sherlockFileReferenceChipCss = ".uV2eYG_chip[data-reference-source=chat-file]{pointer-events:auto;cursor:grab;z-index:2}.uV2eYG_chip[data-reference-source=chat-file]:active{cursor:grabbing}.uV2eYG_chip[data-reference-source=chat-file][data-selected=true]{outline:2px solid var(--dsw-alias-state-business-primary);outline-offset:-1px}.uV2eYG_fileReferenceIcon{box-sizing:border-box;min-width:18px;height:16px;padding:0 2px;border-radius:4px;display:inline-flex;align-items:center;justify-content:center;font-size:8px;font-weight:700;line-height:16px;letter-spacing:-.2px;color:#fff;background:#69717d}.uV2eYG_fileReferenceIcon[data-file-kind=pdf]{background:#d94b4b}.uV2eYG_fileReferenceIcon[data-file-kind=word]{background:#377bd3}.uV2eYG_fileReferenceIcon[data-file-kind=presentation]{background:#d96732}.uV2eYG_fileReferenceIcon[data-file-kind=spreadsheet]{background:#2d9860}.uV2eYG_fileReferenceIcon[data-file-kind=image]{background:#8a5bd1;font-size:11px}.uV2eYG_fileReferenceIcon[data-file-kind=text],.uV2eYG_fileReferenceIcon[data-file-kind=code]{background:#66717f}.uV2eYG_fileReferenceIcon[data-file-kind=archive]{background:#a1782e}.uV2eYG_researchReferenceIcon{box-sizing:border-box;width:16px;height:16px;color:var(--dsw-alias-label-secondary);display:inline-flex;align-items:center;justify-content:center;flex:none}.uV2eYG_researchReferenceIcon svg{width:16px;height:16px;display:block;stroke:currentColor;stroke-width:1.35;stroke-linecap:round;stroke-linejoin:round}"; ++ const sherlockInputChipThemeCss = ".uV2eYG_chip{background:var(--dsw-alias-bg-module-platform)}"; ++ const sherlockResearchArtifactChipCss = ".uV2eYG_chip[data-reference-source=research-artifact]{pointer-events:auto;cursor:grab;z-index:2}.uV2eYG_chip[data-reference-source=research-artifact]:active{cursor:grabbing}.uV2eYG_chip[data-provisional=true]{opacity:.52;transition:opacity .12s ease}"; ++ const sherlockInputCaretCss = ".uV2eYG_visibleCaret{display:inline-block;position:relative;z-index:5;width:0;height:24px;vertical-align:middle;pointer-events:none}.uV2eYG_visibleCaret:after{content:\"\";position:absolute;left:-1px;top:2px;width:2px;height:20px;border-radius:1px;background:var(--dsw-alias-state-business-primary)}"; + if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId$17) + "]") === null) { + const tag = document.createElement("style"); + tag.dataset.plugin = "@deepseek-ai/dsh-client-ui-conversation"; + tag.dataset.pluginCss = tagId$17; +- tag.textContent = css$17; ++ tag.textContent = css$17 + sherlockInputChipCss + sherlockFileReferenceChipCss + sherlockInputChipThemeCss + sherlockResearchArtifactChipCss + sherlockInputCaretCss + ".uV2eYG_primary{background:#0f1115}.uV2eYG_primary:hover:not(:disabled){background:#23262b}body[data-ds-dark-theme] .uV2eYG_primary{background:#f5f5f5;color:#202124}body[data-ds-dark-theme] .uV2eYG_primary:hover:not(:disabled){background:#fff}"; ++ tag.textContent = tag.textContent ++ .replace('padding:4px 12px 0 16px', 'padding:4px 12px 8px 16px') ++ .replace('.uV2eYG_hero .uV2eYG_mirror{min-height:52px}', '.uV2eYG_hero .uV2eYG_mirror{min-height:60px}'); + document.head.appendChild(tag); + } + var InputBar_module_css_default = { +@@ -3335,6 +3728,7 @@ window.__ModuleLoader__.load({ + "chip": "uV2eYG_chip", + "cardWorkspaceTrigger": "uV2eYG_cardWorkspaceTrigger", + "grow": "uV2eYG_grow", ++ "visibleCaret": "uV2eYG_visibleCaret", + "primary": "uV2eYG_primary", + "root": "uV2eYG_root", + "tools": "uV2eYG_tools", +@@ -3356,7 +3750,103 @@ window.__ModuleLoader__.load({ + textRefs: [], + hint: null + }; +- function InputBar({ useSession, useInput, inputActions, keyboard, addImages, removeImage, draftImages, resolveSubmitMode, toggleCommandMenu, stop, command, t, renderSlot, useNotices, useLexicon, useMenuLauncher, useProjection, sessionId, variant, disabled: inert = false, blocked, workspacePickerOpen = false, onRequestWorkspace, placeholder, accessory, overlay, leftItems, rightItems, footer }) { ++ function draftOffsetFromBackdropPoint(backdrop, input, clientX, clientY, fallback) { ++ const readOffset = (node, nodeOffset) => { ++ const element = node?.nodeType === 3 ? node.parentElement : node; ++ const segment = element?.closest?.("[data-draft-start]"); ++ if (segment === null || segment === void 0 || !backdrop.contains(segment)) return null; ++ const start = Number.parseInt(segment.getAttribute("data-draft-start") ?? "", 10); ++ const end = Number.parseInt(segment.getAttribute("data-draft-end") ?? "", 10); ++ if (!Number.isInteger(start) || !Number.isInteger(end)) return null; ++ if (segment.hasAttribute("data-occurrence")) { ++ const rect = segment.getBoundingClientRect(); ++ return clientX >= rect.left + rect.width / 2 ? end : start; ++ } ++ const within = node?.nodeType === 3 ? nodeOffset : 0; ++ return Math.max(start, Math.min(start + within, end)); ++ }; ++ const backdropPointerEvents = backdrop.style.pointerEvents; ++ const inputPointerEvents = input.style.pointerEvents; ++ backdrop.style.pointerEvents = "auto"; ++ input.style.pointerEvents = "none"; ++ try { ++ const point = document.caretPositionFromPoint?.(clientX, clientY); ++ const pointOffset = point === void 0 || point === null ? null : readOffset(point.offsetNode, point.offset); ++ if (pointOffset !== null) return pointOffset; ++ const range = document.caretRangeFromPoint?.(clientX, clientY); ++ const rangeOffset = range === void 0 || range === null ? null : readOffset(range.startContainer, range.startOffset); ++ if (rangeOffset !== null) return rangeOffset; ++ } finally { ++ backdrop.style.pointerEvents = backdropPointerEvents; ++ input.style.pointerEvents = inputPointerEvents; ++ } ++ return fallback; ++ } ++ function selectedResearchReferenceOccurrenceId(occurrences, selection) { ++ if (selection.end !== selection.start + 1) return null; ++ const occurrence = occurrences.find((candidate) => (candidate.source === CHAT_FILE_REFERENCE_SOURCE || candidate.source === RESEARCH_FILE_REFERENCE_SOURCE || candidate.source === RESEARCH_ARTIFACT_REFERENCE_SOURCE) && candidate.offset === selection.start); ++ return occurrence?.occurrenceId ?? null; ++ } ++ function deleteResearchReferenceOccurrence(keyboard, occurrenceId) { ++ const snapshot = keyboard.snapshot; ++ const occurrence = snapshot.occurrences.find((candidate) => candidate.occurrenceId === occurrenceId && (candidate.source === CHAT_FILE_REFERENCE_SOURCE || candidate.source === RESEARCH_FILE_REFERENCE_SOURCE || candidate.source === RESEARCH_ARTIFACT_REFERENCE_SOURCE)); ++ if (occurrence === void 0) return null; ++ const start = occurrence.offset; ++ keyboard.setDraft(snapshot.draft.slice(0, start) + snapshot.draft.slice(start + 1), { ++ start, ++ end: start + 1, ++ insertedLength: 0 ++ }); ++ return start; ++ } ++ function researchReferenceKey(source, referenceId) { ++ return `${source}:${referenceId}`; ++ } ++ function deleteProvisionalResearchReferenceOccurrence(keyboard, occurrenceId, trailingSpace) { ++ const snapshot = keyboard.snapshot; ++ const occurrence = snapshot.occurrences.find((candidate) => candidate.occurrenceId === occurrenceId && (candidate.source === RESEARCH_FILE_REFERENCE_SOURCE || candidate.source === RESEARCH_ARTIFACT_REFERENCE_SOURCE)); ++ if (occurrence === void 0) return null; ++ const start = occurrence.offset; ++ const removeTrailingSpace = trailingSpace === true && snapshot.draft[start + 1] === " "; ++ const end = start + 1 + (removeTrailingSpace ? 1 : 0); ++ keyboard.setDraft(snapshot.draft.slice(0, start) + snapshot.draft.slice(end), { ++ start, ++ end, ++ insertedLength: 0 ++ }); ++ return { caret: start, removedLength: end - start }; ++ } ++ /** Command-menu trigger branded as Sherlock's slash key. */ ++ function CommandLauncherButton({ label, expanded, disabled, onMouseDown, onClick }) { ++ return (0, react_jsx_runtime.jsx)("button", { ++ type: "button", ++ className: InputBar_module_css_default.add, ++ style: { ++ width: 32, ++ height: 32, ++ borderRadius: 9 ++ }, ++ "aria-label": label, ++ "aria-haspopup": "listbox", ++ "aria-expanded": expanded, ++ disabled, ++ onMouseDown, ++ onClick, ++ children: (0, react_jsx_runtime.jsx)("span", { ++ "aria-hidden": true, ++ children: "/" ++ }) ++ }); ++ } ++ /** Stable leading-control order: command, attachment extensions, permissions. */ ++ function ComposerLeadingControls({ command, attachments, permissions }) { ++ return (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [ ++ command, ++ attachments, ++ permissions ++ ] }); ++ } ++ function InputBar({ useSession, useInput, inputActions, keyboard, addImages, removeImage, draftImages, resolveSubmitMode, toggleCommandMenu, stop, command, t, renderSlot, useNotices, useLexicon, useMenuLauncher, useProjection, sessionId, variant, disabled: inert = false, blocked, workspacePickerOpen = false, onRequestWorkspace, placeholder, accessory, researchFileReferences, researchArtifactReferences, overlay, leftItems, rightItems, footer }) { + const input = useInput((s) => s); + const notice = useNotices((s) => s); + const lexicon = useLexicon((s) => s); +@@ -3374,6 +3864,9 @@ window.__ModuleLoader__.load({ + const [preview, setPreview] = (0, react.useState)(null); + const [dragActive, setDragActive] = (0, react.useState)(false); + const [toast, setToast] = (0, react.useState)(null); ++ const [selectedResearchOccurrenceId, setSelectedResearchOccurrenceId] = (0, react.useState)(null); ++ const [inputCaretOffset, setInputCaretOffset] = (0, react.useState)(null); ++ const [provisionalResearchReferences, setProvisionalResearchReferences] = (0, react.useState)(() => /* @__PURE__ */ new Map()); + const toastSeq = (0, react.useRef)(0); + const showToast = (0, react.useCallback)((text) => { + toastSeq.current += 1; +@@ -3397,9 +3890,24 @@ window.__ModuleLoader__.load({ + ]); + const inputRef = (0, react.useRef)(null); + const cardRef = (0, react.useRef)(null); ++ const backdropRef = (0, react.useRef)(null); ++ const draggedResearchOccurrenceRef = (0, react.useRef)(null); + const dragDepthRef = (0, react.useRef)(0); + const scrollRef = (0, react.useRef)(null); + const mirrorRef = (0, react.useRef)(null); ++ const researchFileReferenceSeenRef = (0, react.useRef)(/* @__PURE__ */ new Set()); ++ const researchArtifactReferenceSeenRef = (0, react.useRef)(/* @__PURE__ */ new Set()); ++ const researchFileReferenceSessionRef = (0, react.useRef)(sessionId); ++ const provisionalResearchReferencesRef = (0, react.useRef)(provisionalResearchReferences); ++ const publishProvisionalResearchReferences = (0, react.useCallback)((next) => { ++ const current = provisionalResearchReferencesRef.current; ++ if (current.size === next.size && [...current].every(([occurrenceId, value]) => { ++ const candidate = next.get(occurrenceId); ++ return candidate?.key === value.key && candidate.trailingSpace === value.trailingSpace; ++ })) return; ++ provisionalResearchReferencesRef.current = next; ++ setProvisionalResearchReferences(next); ++ }, []); + const safari = (0, react.useMemo)(() => isSafariBrowser(navigator), []); + const safariNativeShrinkRef = (0, react.useRef)(false); + const composingRef = (0, react.useRef)(false); +@@ -3420,7 +3928,15 @@ window.__ModuleLoader__.load({ + const machineBusy = input?.phase === "adjudicating" || input?.phase === "submitting"; + const workspaceTrigger = inert && !removed && onRequestWorkspace !== void 0; + const textareaDisabled = removed || locked && !workspaceTrigger; +- const canSteerQueue = !locked && !machineBusy && !commandMenuOpen && empty && running && subagent === null && input.queue.some((row) => row.placement === "queued"); ++ const canSteerQueue = !locked && !machineBusy && !commandMenuOpen && empty && running && subagent === null && input.queue.some(isUserQueuedMessage); ++ (0, react.useEffect)(() => { ++ setSelectedResearchOccurrenceId(null); ++ setInputCaretOffset(null); ++ }, [sessionId, researchFileReferences === void 0, researchArtifactReferences === void 0]); ++ (0, react.useEffect)(() => { ++ if (selectedResearchOccurrenceId === null) return; ++ if (!input?.occurrences.some((occurrence) => occurrence.occurrenceId === selectedResearchOccurrenceId && (occurrence.source === CHAT_FILE_REFERENCE_SOURCE || occurrence.source === RESEARCH_FILE_REFERENCE_SOURCE || occurrence.source === RESEARCH_ARTIFACT_REFERENCE_SOURCE))) setSelectedResearchOccurrenceId(null); ++ }, [input?.occurrences, selectedResearchOccurrenceId]); + (0, react.useEffect)(() => { + if (input === void 0 || inputActions === void 0) return; + if (attachments.length !== input.imageIds.length) inputActions.pruneImages(attachments.map((attachment) => attachment.id)); +@@ -3472,6 +3988,7 @@ window.__ModuleLoader__.load({ + const restoreCaret = (el, caret) => { + requestAnimationFrame(() => { + el.setSelectionRange(caret, caret); ++ setInputCaretOffset(caret); + revealCaret(caret); + }); + }; +@@ -3503,6 +4020,24 @@ window.__ModuleLoader__.load({ + if (keyboard === void 0 || inputActions === void 0) return; + if (e.key === "Enter" && e.shiftKey) return; + const composing = composingRef.current || e.nativeEvent.isComposing || e.nativeEvent.keyCode === 229; ++ if ((e.key === "Backspace" || e.key === "Delete") && selectedResearchOccurrenceId !== null) { ++ if (composing || machineBusy || locked) return; ++ e.preventDefault(); ++ const provisional = provisionalResearchReferencesRef.current.get(selectedResearchOccurrenceId); ++ const provisionalDeletion = provisional === void 0 ? null : deleteProvisionalResearchReferenceOccurrence(keyboard, selectedResearchOccurrenceId, provisional.trailingSpace); ++ const caret = provisional === void 0 ? deleteResearchReferenceOccurrence(keyboard, selectedResearchOccurrenceId) : provisionalDeletion?.caret ?? null; ++ if (provisional !== void 0) { ++ const next = /* @__PURE__ */ new Map(provisionalResearchReferencesRef.current); ++ next.delete(selectedResearchOccurrenceId); ++ publishProvisionalResearchReferences(next); ++ } ++ setSelectedResearchOccurrenceId(null); ++ if (caret !== null) { ++ restoreCaret(e.currentTarget, caret); ++ keyboard.track(keyboard.snapshot.draft, caret); ++ } ++ return; ++ } + if (e.key === "ArrowUp" || e.key === "ArrowDown") { + if (keyboard.arbitrate(e.key === "ArrowUp" ? "up" : "down", composing) === "consumed") e.preventDefault(); + return; +@@ -3545,6 +4080,8 @@ window.__ModuleLoader__.load({ + if (machineBusy) return; + const next = e.target.value; + safariNativeShrinkRef.current = safari && next.length < draft.length; ++ setSelectedResearchOccurrenceId(null); ++ setInputCaretOffset(e.target.selectionStart === e.target.selectionEnd ? e.target.selectionStart ?? next.length : null); + keyboard.setDraft(next); + keyboard.track(next, e.target.selectionStart ?? next.length); + }; +@@ -3552,23 +4089,84 @@ window.__ModuleLoader__.load({ + start: el.selectionStart ?? 0, + end: el.selectionEnd ?? el.selectionStart ?? 0 + }); ++ const onResearchReferenceDragOver = (event) => { ++ if (draggedResearchOccurrenceRef.current === null) return; ++ event.preventDefault(); ++ event.stopPropagation(); ++ if (event.dataTransfer !== null) event.dataTransfer.dropEffect = "move"; ++ }; ++ const onResearchReferenceDrop = (event) => { ++ const occurrenceId = draggedResearchOccurrenceRef.current; ++ const el = inputRef.current; ++ const backdropEl = backdropRef.current; ++ if (occurrenceId === null || keyboard === void 0 || el === null || backdropEl === null) return; ++ event.preventDefault(); ++ event.stopPropagation(); ++ const targetOffset = draftOffsetFromBackdropPoint(backdropEl, el, event.clientX, event.clientY, el.selectionStart ?? draft.length); ++ const moved = keyboard.moveReferenceOccurrence(occurrenceId, targetOffset); ++ draggedResearchOccurrenceRef.current = null; ++ if (!moved) return; ++ const movedOccurrence = keyboard.snapshot.occurrences.find((occurrence) => occurrence.occurrenceId === occurrenceId); ++ const caret = movedOccurrence === void 0 ? targetOffset : movedOccurrence.offset + 1; ++ restoreCaret(el, caret); ++ keyboard.track(keyboard.snapshot.draft, caret); ++ }; ++ (0, react.useLayoutEffect)(() => { ++ if (researchFileReferenceSessionRef.current !== sessionId) { ++ researchFileReferenceSessionRef.current = sessionId; ++ researchFileReferenceSeenRef.current.clear(); ++ researchArtifactReferenceSeenRef.current.clear(); ++ publishProvisionalResearchReferences(/* @__PURE__ */ new Map()); ++ } ++ if (keyboard === void 0) return; ++ const el = inputRef.current; ++ let selection = el === null ? { ++ start: keyboard.snapshot.draft.length, ++ end: keyboard.snapshot.draft.length ++ } : selectionOf(el); ++ const beforeDraft = keyboard.snapshot.draft; ++ const activeProvisionalKeys = /* @__PURE__ */ new Set([ ++ ...(researchFileReferences ?? []).map((file) => researchReferenceKey(RESEARCH_FILE_REFERENCE_SOURCE, file.id)), ++ ...(researchArtifactReferences ?? []).map((artifact) => researchReferenceKey(RESEARCH_ARTIFACT_REFERENCE_SOURCE, artifact.id)) ++ ]); ++ const previousProvisionalReferences = provisionalResearchReferencesRef.current; ++ const nextProvisionalReferences = /* @__PURE__ */ new Map([...previousProvisionalReferences].filter(([, value]) => activeProvisionalKeys.has(value.key))); ++ const provisionalOccurrencesToRemove = keyboard.snapshot.occurrences.flatMap((occurrence) => { ++ const provisional = previousProvisionalReferences.get(occurrence.occurrenceId); ++ return provisional === void 0 || activeProvisionalKeys.has(provisional.key) ? [] : [{ occurrence, provisional }]; ++ }).sort((a, b) => b.occurrence.offset - a.occurrence.offset); ++ for (const { occurrence, provisional } of provisionalOccurrencesToRemove) { ++ const removed = deleteProvisionalResearchReferenceOccurrence(keyboard, occurrence.occurrenceId, provisional.trailingSpace); ++ if (removed === null) continue; ++ if (occurrence.offset < selection.start) selection.start -= Math.min(removed.removedLength, selection.start - occurrence.offset); ++ if (occurrence.offset < selection.end) selection.end -= Math.min(removed.removedLength, selection.end - occurrence.offset); ++ } ++ const fileResult = syncResearchFileReferences(keyboard, researchFileReferences ?? [], researchFileReferenceSeenRef.current, selection, researchFileReferences !== void 0); ++ for (const insertion of fileResult.insertions) nextProvisionalReferences.set(insertion.occurrenceId, { ++ key: researchReferenceKey(RESEARCH_FILE_REFERENCE_SOURCE, insertion.id), ++ trailingSpace: insertion.trailingSpace ++ }); ++ selection = { start: fileResult.caret, end: fileResult.caret }; ++ const artifactResult = syncResearchArtifactReferences(keyboard, researchArtifactReferences ?? [], researchArtifactReferenceSeenRef.current, selection, researchArtifactReferences !== void 0); ++ for (const insertion of artifactResult.insertions) nextProvisionalReferences.set(insertion.occurrenceId, { ++ key: researchReferenceKey(RESEARCH_ARTIFACT_REFERENCE_SOURCE, insertion.id), ++ trailingSpace: insertion.trailingSpace ++ }); ++ publishProvisionalResearchReferences(nextProvisionalReferences); ++ if (el === null || keyboard.snapshot.draft === beforeDraft) return; ++ restoreCaret(el, artifactResult.caret); ++ keyboard.track(keyboard.snapshot.draft, artifactResult.caret); ++ }, [keyboard, researchFileReferences, researchArtifactReferences, sessionId, publishProvisionalResearchReferences]); + const onCopyOrCut = (e, cut) => { + if (input === void 0 || keyboard === void 0) return; + const el = e.currentTarget; + const { start, end } = selectionOf(el); + if (start === end) return; +- draft.slice(start, end); +- const touched = input.occurrences.filter((o) => o.offset >= start && o.offset < end); +- if (touched.length === 0 && !cut) return; ++ const copied = serializeInputReferenceClipboard(draft, input.occurrences, { start, end }); ++ if (copied.payload === null) return; + e.preventDefault(); +- let text = ""; +- let cursor = start; +- for (const o of touched) { +- text += draft.slice(cursor, o.offset) + o.clipboardText; +- cursor = o.offset + 1; +- } +- text += draft.slice(cursor, end); +- e.clipboardData.setData("text/plain", text); ++ e.clipboardData.setData("text/plain", copied.text); ++ e.clipboardData.setData(INPUT_REFERENCE_CLIPBOARD_TYPE, copied.payload); + if (cut && !machineBusy && !locked) { + keyboard.setDraft(draft.slice(0, start) + draft.slice(end), { + start, +@@ -3591,7 +4189,8 @@ window.__ModuleLoader__.load({ + e.preventDefault(); + const el = e.currentTarget; + const sel = selectionOf(el); +- keyboard.pasteBegin(text, sel); ++ const components = filterResearchFileClipboardComponents(parseInputReferenceClipboard(e.clipboardData.getData(INPUT_REFERENCE_CLIPBOARD_TYPE), text), researchFileReferences); ++ keyboard.pasteBegin(text, sel, components); + const caret = sel.start + text.length; + restoreCaret(el, caret); + keyboard.track(keyboard.snapshot.draft, caret); +@@ -3672,6 +4271,23 @@ window.__ModuleLoader__.load({ + })), [attachments, t]); + const onSelect = (e) => { + if (keyboard !== void 0 && keyboard.snapshot.paste !== void 0) keyboard.invalidatePaste(); ++ const selection = selectionOf(e.currentTarget); ++ const selectedOccurrenceId = selectedResearchReferenceOccurrenceId(input?.occurrences ?? [], selection); ++ setSelectedResearchOccurrenceId(selectedOccurrenceId); ++ setInputCaretOffset(selectedOccurrenceId === null ? selection.start === selection.end ? selection.end : null : selection.start); ++ }; ++ const onInputClick = (event) => { ++ const el = event.currentTarget; ++ const backdropEl = backdropRef.current; ++ if (locked || machineBusy || event.detail !== 1 || backdropEl === null) return; ++ publishProvisionalResearchReferences(/* @__PURE__ */ new Map()); ++ const selection = selectionOf(el); ++ if (selection.start !== selection.end) return; ++ const caret = draftOffsetFromBackdropPoint(backdropEl, el, event.clientX, event.clientY, selection.end); ++ el.setSelectionRange(caret, caret); ++ setSelectedResearchOccurrenceId(null); ++ setInputCaretOffset(caret); ++ revealSelectionFocus(el); + }; + const keepFocus = (e) => { + e.preventDefault(); +@@ -3700,17 +4316,40 @@ window.__ModuleLoader__.load({ + t + }, sessionId); + const deco = input === void 0 ? INERT_DECORATIONS : deriveDecorations(input, lexicon); ++ const visibleCaretOffset = !locked && !machineBusy && inputCaretOffset !== null ? Math.max(0, Math.min(inputCaretOffset, draft.length)) : null; + const backdrop = []; + { + let cursor = 0; ++ let segmentSeq = 0; ++ let caretRendered = false; ++ const pushPlainSegment = (from, to) => { ++ if (to <= from) return; ++ backdrop.push((0, react_jsx_runtime.jsx)("span", { ++ "data-draft-start": from, ++ "data-draft-end": to, ++ children: draft.slice(from, to) ++ }, `plain-${segmentSeq++}`)); ++ }; + const pushPlain = (upTo) => { +- if (upTo > cursor) backdrop.push(draft.slice(cursor, upTo)); ++ if (!caretRendered && visibleCaretOffset !== null && visibleCaretOffset >= cursor && visibleCaretOffset <= upTo) { ++ pushPlainSegment(cursor, visibleCaretOffset); ++ cursor = visibleCaretOffset; ++ backdrop.push((0, react_jsx_runtime.jsx)("span", { ++ className: InputBar_module_css_default.visibleCaret, ++ "data-input-visible-caret": "", ++ "aria-hidden": true ++ }, "visible-caret")); ++ caretRendered = true; ++ } ++ pushPlainSegment(cursor, upTo); + cursor = upTo; + }; + if (deco.token !== null) { + backdrop.push((0, react_jsx_runtime.jsx)("mark", { + className: InputBar_module_css_default.hlToken, + "data-decoration": "token", ++ "data-draft-start": deco.token.start, ++ "data-draft-end": deco.token.end, + children: draft.slice(deco.token.start, deco.token.end) + }, "token")); + cursor = deco.token.end; +@@ -3729,15 +4368,60 @@ window.__ModuleLoader__.load({ + pushPlain(b.at); + if (b.kind === "chip") { + const chip = b.chip; ++ const chatFile = chip.source === CHAT_FILE_REFERENCE_SOURCE ? parseChatFileReference(chip.ref) : null; ++ const researchFile = chip.source === RESEARCH_FILE_REFERENCE_SOURCE ? parseResearchFileReference(chip.ref) : null; ++ const researchArtifact = chip.source === RESEARCH_ARTIFACT_REFERENCE_SOURCE ? parseResearchArtifactReference(chip.ref) : null; ++ const fileReference = chatFile ?? researchFile; ++ const researchReference = fileReference ?? researchArtifact; ++ const invalid = chip.invalid || researchFile !== null && researchFile.path === void 0 || chip.source === CHAT_FILE_REFERENCE_SOURCE && chatFile === null; ++ const label = (0, react_jsx_runtime.jsxs)("span", { ++ className: InputBar_module_css_default.chipLabel, ++ children: [fileReference !== null && (0, react_jsx_runtime.jsx)(FileReferenceIcon, { ++ name: fileReferenceTooltipName(fileReference) ++ }), researchArtifact !== null && (0, react_jsx_runtime.jsx)(ResearchArtifactReferenceIcon, { ++ artifact: researchArtifact ++ }), (0, react_jsx_runtime.jsx)("span", { ++ className: "uV2eYG_chipLabelText", ++ children: chip.label ++ })] ++ }); + backdrop.push((0, react_jsx_runtime.jsx)("span", { +- className: clsx(InputBar_module_css_default.chip, chip.invalid && InputBar_module_css_default.chipInvalid), ++ className: clsx(InputBar_module_css_default.chip, invalid && InputBar_module_css_default.chipInvalid), + "data-decoration": "chip", + "data-occurrence": chip.occurrenceId, +- "data-invalid": chip.invalid || void 0, +- title: chip.label, +- children: (0, react_jsx_runtime.jsx)("span", { +- className: InputBar_module_css_default.chipLabel, +- children: chip.label ++ "data-reference-source": chip.source, ++ "data-chat-file-tag": chatFile?.path, ++ "data-research-file-tag": researchFile?.id, ++ "data-research-artifact-tag": researchArtifact?.id, ++ "data-research-reference-node-id": researchFile?.id ?? researchArtifact?.id, ++ "data-provisional": provisionalResearchReferences.has(chip.occurrenceId) || void 0, ++ "data-selected": selectedResearchOccurrenceId === chip.occurrenceId || void 0, ++ "data-draft-start": chip.offset, ++ "data-draft-end": chip.offset + 1, ++ "data-invalid": invalid || void 0, ++ draggable: researchReference !== null && !provisionalResearchReferences.has(chip.occurrenceId) && !locked && !machineBusy, ++ onDragStart: researchReference === null ? void 0 : (event) => { ++ draggedResearchOccurrenceRef.current = chip.occurrenceId; ++ event.dataTransfer.effectAllowed = "move"; ++ event.dataTransfer.setData("text/plain", chip.label); ++ }, ++ onDragEnd: researchReference === null ? void 0 : () => { ++ draggedResearchOccurrenceRef.current = null; ++ }, ++ onClick: researchReference === null ? void 0 : () => { ++ const el = inputRef.current; ++ if (el === null || locked || machineBusy) return; ++ el.focus({ preventScroll: true }); ++ el.setSelectionRange(chip.offset, chip.offset + 1); ++ setSelectedResearchOccurrenceId(chip.occurrenceId); ++ setInputCaretOffset(chip.offset); ++ revealSelectionFocus(el); ++ }, ++ children: fileReference === null ? label : (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, { ++ label: fileReferenceTooltipName(fileReference), ++ side: "top", ++ delayMs: 500, ++ children: label + }) + }, `chip-${chip.occurrenceId}`)); + cursor = chip.offset + 1; +@@ -3745,6 +4429,8 @@ window.__ModuleLoader__.load({ + backdrop.push((0, react_jsx_runtime.jsx)("mark", { + className: InputBar_module_css_default.textRef, + "data-decoration": "text-ref", ++ "data-draft-start": b.ref.start, ++ "data-draft-end": b.ref.end, + children: draft.slice(b.ref.start, b.ref.end) + }, `ref-${b.ref.start}`)); + cursor = b.ref.end; +@@ -3763,6 +4449,20 @@ window.__ModuleLoader__.load({ + }, "hint")); + } + } ++ const measurement = []; ++ { ++ let cursor = 0; ++ for (const chip of [...deco.chips].sort((a, b) => a.offset - b.offset)) { ++ if (chip.offset < cursor) continue; ++ if (chip.offset > cursor) measurement.push(draft.slice(cursor, chip.offset)); ++ measurement.push((0, react_jsx_runtime.jsx)("span", { ++ className: InputBar_module_css_default.chip, ++ "data-input-measure-chip": "" ++ }, `measure-${chip.occurrenceId}`)); ++ cursor = chip.offset + 1; ++ } ++ measurement.push(`${draft.slice(cursor)}\n`); ++ } + return (0, react_jsx_runtime.jsxs)("div", { + className: clsx(InputBar_module_css_default.root, variant === "hero" && InputBar_module_css_default.hero), + children: [ +@@ -3820,8 +4520,11 @@ window.__ModuleLoader__.load({ + "data-input-scroll": true, + children: (0, react_jsx_runtime.jsxs)("div", { + className: InputBar_module_css_default.grow, ++ onDragOver: onResearchReferenceDragOver, ++ onDrop: onResearchReferenceDrop, + children: [ + (0, react_jsx_runtime.jsx)("div", { ++ ref: backdropRef, + "aria-hidden": true, + className: InputBar_module_css_default.backdrop, + "data-input-backdrop": true, +@@ -3842,6 +4545,7 @@ window.__ModuleLoader__.load({ + onChange, + onKeyDown, + onSelect, ++ onClick: onInputClick, + onCopy: (e) => { + onCopyOrCut(e, false); + }, +@@ -3850,14 +4554,16 @@ window.__ModuleLoader__.load({ + }, + onPaste, + onCompositionStart, +- onCompositionEnd ++ onCompositionEnd, ++ onFocus: onSelect, ++ onBlur: () => setInputCaretOffset(null) + }), + (0, react_jsx_runtime.jsx)("div", { + ref: mirrorRef, + "aria-hidden": true, + className: InputBar_module_css_default.mirror, + "data-input-mirror": true, +- children: `${draft}\n` ++ children: measurement + }) + ] + }) +@@ -3866,29 +4572,25 @@ window.__ModuleLoader__.load({ + className: InputBar_module_css_default.row, + children: [(0, react_jsx_runtime.jsxs)("div", { + className: InputBar_module_css_default.tools, +- children: [ +- (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, { ++ children: (0, react_jsx_runtime.jsx)(ComposerLeadingControls, { ++ command: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, { + label: t("input.commands"), + side: "top", + delayMs: 500, +- children: (0, react_jsx_runtime.jsx)("button", { +- type: "button", +- className: InputBar_module_css_default.add, +- "aria-label": t("input.commands"), +- "aria-haspopup": "listbox", +- "aria-expanded": commandMenuOpen, ++ children: (0, react_jsx_runtime.jsx)(CommandLauncherButton, { ++ label: t("input.commands"), ++ expanded: commandMenuOpen, + disabled: locked || toggleCommandMenu === void 0, + onMouseDown: keepFocus, +- onClick: onToggleCommandMenu, +- children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconPlusOutline16, { size: 14 }) ++ onClick: onToggleCommandMenu + }) + }), +- (0, react_jsx_runtime.jsxs)("div", { ++ attachments: leftItems, ++ permissions: (0, react_jsx_runtime.jsxs)("div", { + className: InputBar_module_css_default.modes, + children: [accessSelect, renderSlot("conversation.input.plan", { locked })] +- }), +- leftItems +- ] ++ }) ++ }) + }), (0, react_jsx_runtime.jsxs)("div", { + className: InputBar_module_css_default.trailing, + children: [ +@@ -4058,11 +4760,13 @@ window.__ModuleLoader__.load({ + //#region \0dsh-css:/home/runner/work/deepseek-harness/deepseek-harness/packages/client/ui-conversation/src/client/chat/MessageItem.module.css.mjs + const css$15 = ".gdEzaW_userRow{flex-direction:column;align-items:flex-end;gap:6px;display:flex}.gdEzaW_userStack{flex-direction:column;align-items:flex-end;gap:8px;min-width:0;max-width:min(525px,82%);display:flex}.gdEzaW_bubble{background:var(--dsw-specific-bubble);max-width:100%;color:var(--dsw-alias-label-primary);border-radius:22px;padding:10px 16px;font-size:16px;line-height:24px}.gdEzaW_contextRow,.gdEzaW_compactionRow{padding:2px 0}.gdEzaW_compactionButton{width:100%;min-width:0;height:24px;color:inherit;font:inherit;text-align:left;background:0 0;border:none;border-radius:6px;align-items:center;padding:0;display:flex}.gdEzaW_compactionButton:not(:disabled){cursor:pointer}.gdEzaW_compactionButton:not(:disabled):hover{background:var(--dsw-alias-interactive-bg-hover)}.gdEzaW_compactionLeading{width:16px;height:16px;color:var(--dsw-alias-label-secondary);flex:none;place-items:center;margin-right:6px;display:inline-grid}.gdEzaW_compactionContextIcon,.gdEzaW_compactionDisclosureIcon{grid-area:1/1;justify-content:center;align-items:center;display:inline-flex}.gdEzaW_compactionDisclosureIcon,.gdEzaW_compactionButton:not(:disabled):hover .gdEzaW_compactionContextIcon,.gdEzaW_compactionButton:not(:disabled):focus-visible .gdEzaW_compactionContextIcon{opacity:0}.gdEzaW_compactionButton:not(:disabled):hover .gdEzaW_compactionDisclosureIcon,.gdEzaW_compactionButton:not(:disabled):focus-visible .gdEzaW_compactionDisclosureIcon{opacity:1}.gdEzaW_compactionTitle{color:var(--dsw-alias-label-primary-dimmed);flex:none;font-size:14px;line-height:24px}.gdEzaW_compactionSep{background:var(--dsw-alias-label-caption);border-radius:1px;flex:none;width:2px;height:2px;margin:0 8px}.gdEzaW_compactionSummary{min-width:0;color:var(--dsw-alias-label-tertiary);text-overflow:ellipsis;white-space:nowrap;flex:auto;font-size:14px;line-height:24px;overflow:hidden}.gdEzaW_compactionBody{color:var(--dsw-alias-label-tertiary);padding:4px 0 4px 22px;font-size:14px;line-height:24px}.gdEzaW_retryRow{color:var(--dsw-alias-label-tertiary);font-size:13px;line-height:20px}.gdEzaW_retrySummary{width:fit-content;color:inherit;cursor:pointer;user-select:none;border-radius:3px;align-items:center;gap:7px;padding:2px 0;list-style:none;display:inline-flex}.gdEzaW_retrySummary::-webkit-details-marker{display:none}.gdEzaW_retrySummary:after{content:\"\";opacity:.8;border-bottom:1.5px solid;border-right:1.5px solid;width:6px;height:6px;transition:transform .12s;transform:rotate(-45deg)}.gdEzaW_retrySummary:hover{color:var(--dsw-alias-label-secondary)}.gdEzaW_retrySummary:focus-visible{outline:1.5px solid var(--dsw-alias-button-info-fill);outline-offset:2px}.gdEzaW_retryText{color:inherit}.gdEzaW_retryRow[data-active] .gdEzaW_retryText{background:linear-gradient(90deg, var(--dsw-alias-label-tertiary) 0%, var(--dsw-alias-label-tertiary) 40%, var(--dsw-alias-label-secondary) 50%, var(--dsw-alias-label-tertiary) 60%, var(--dsw-alias-label-tertiary) 100%);color:#0000;background-position:100%;background-size:200% 100%;background-clip:text;animation:1.6s ease-in-out infinite gdEzaW_retry-shimmer}.gdEzaW_retryRow[open] .gdEzaW_retrySummary:after{transform:rotate(45deg)}.gdEzaW_retryDetails{overflow-wrap:anywhere;gap:2px;margin-top:3px;padding-left:14px;font-size:12px;line-height:18px;display:grid}.gdEzaW_retryDetailLabel{color:var(--dsw-alias-label-secondary)}.gdEzaW_turnErrorRow{grid-template-columns:10px minmax(0,1fr) auto;align-items:start;gap:8px;padding:2px 0;font-size:13px;line-height:20px;display:grid}.gdEzaW_turnErrorDot{margin-top:5px}.gdEzaW_turnErrorCopy{overflow-wrap:anywhere;min-width:0}.gdEzaW_turnErrorTitle{color:var(--dsw-alias-state-error-primary);margin-right:6px;font-weight:600}.gdEzaW_turnErrorMessage{color:var(--dsw-alias-label-secondary)}.gdEzaW_turnErrorCode{color:var(--dsw-alias-label-tertiary);font:var(--dsw-font-markdown-code-block-small)}.gdEzaW_maxTokensTitle{color:var(--dsw-alias-state-warn-primary);margin-right:6px;font-weight:600}@keyframes gdEzaW_retry-shimmer{0%{background-position:100%}to{background-position:0}}@media (prefers-reduced-motion:reduce){.gdEzaW_retryRow[data-active] .gdEzaW_retryText{color:inherit;background:0 0;animation:none}}.gdEzaW_refChip{color:var(--dsw-alias-label-primary);white-space:nowrap;vertical-align:baseline;background:#6187d838;border-radius:6px;margin:0 2px;padding:0 8px;font-size:.85em;line-height:1.6;display:inline-block}"; + const tagId$15 = "@deepseek-ai/dsh-client-ui-conversation/MessageItem.module.css"; ++ const sherlockLightUserBubbleCss = "body:not([data-ds-dark-theme]) .gdEzaW_bubble{background:var(--dsw-alias-bg-module-platform);color:var(--dsw-alias-label-primary)}"; ++ const sherlockCompactSentReferenceCss = ".gdEzaW_userStack{max-width:min(640px,92%)}.gdEzaW_userStack[data-research-inline]{width:92%;max-width:640px}.gdEzaW_bubble{padding:8px 12px}.gdEzaW_bubble[data-research-inline]{box-sizing:border-box;width:max-content}.gdEzaW_bubble [data-research-message-files=\"inline\"]{max-width:100%;display:inline-flex;align-items:center;flex-wrap:wrap;gap:4px}.gdEzaW_refChip{box-sizing:border-box;width:136px;min-width:136px;max-width:136px;height:24px;color:var(--dsw-alias-label-primary);background:var(--dsw-alias-bg-module-platform);border:1px solid var(--dsw-alias-border-l3);border-radius:7px;margin:0;padding:0 8px;font:inherit;font-size:14px;line-height:22px;text-align:left;vertical-align:middle;appearance:none;cursor:pointer;display:inline-flex;align-items:center;justify-content:flex-start;gap:6px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.gdEzaW_refChip:focus-visible{outline:2px solid var(--dsw-alias-state-business-primary);outline-offset:1px}.gdEzaW_refChip>.uV2eYG_fileReferenceIcon{flex:none}.gdEzaW_refChipLabel{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}"; + if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId$15) + "]") === null) { + const tag = document.createElement("style"); + tag.dataset.plugin = "@deepseek-ai/dsh-client-ui-conversation"; + tag.dataset.pluginCss = tagId$15; +- tag.textContent = css$15; ++ tag.textContent = css$15 + sherlockLightUserBubbleCss + sherlockCompactSentReferenceCss; + document.head.appendChild(tag); + } + var MessageItem_module_css_default = { +@@ -4103,7 +4807,8 @@ window.__ModuleLoader__.load({ + */ + const CompactionItem = (0, react.memo)(function CompactionItem({ node, title, fallbackSummary, t }) { + const [expanded, setExpanded] = (0, react.useState)(false); +- const expandable = node.summary !== null; ++ const running = node.running === true; ++ const expandable = !running && node.summary !== null; + const open = expandable && expanded; + const summary = node.shadowedItemCount !== null && node.shadowedTokenCount !== null ? t("message.compaction.completed", { + items: node.shadowedItemCount, +@@ -4135,13 +4840,13 @@ window.__ModuleLoader__.load({ + }), + (0, react_jsx_runtime.jsx)("span", { + className: MessageItem_module_css_default.compactionTitle, +- children: title ?? t("message.compaction") ++ children: running ? t("execution.status.compacting") : title ?? t("message.compaction") + }), +- (0, react_jsx_runtime.jsx)("span", { ++ !running && (0, react_jsx_runtime.jsx)("span", { + className: MessageItem_module_css_default.compactionSep, + "aria-hidden": true + }), +- (0, react_jsx_runtime.jsx)("span", { ++ !running && (0, react_jsx_runtime.jsx)("span", { + className: MessageItem_module_css_default.compactionSummary, + children: summary + }) +@@ -5094,17 +5799,82 @@ window.__ModuleLoader__.load({ + if (cursor < text.length) parts.push((0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.MessageText, { text: text.slice(cursor) }, cursor)); + return (0, react_jsx_runtime.jsx)(react_jsx_runtime.Fragment, { children: parts }); + } ++ function ResearchMessageFileChip({ file }) { ++ return (0, react_jsx_runtime.jsxs)("button", { ++ type: "button", ++ className: MessageItem_module_css_default.refChip, ++ "data-ref-chip": "research-file", ++ "data-research-message-file": file.id, ++ "data-research-reference-node-id": file.id, ++ title: file.name, ++ children: [(0, react_jsx_runtime.jsx)(FileReferenceIcon, { ++ name: file.name ++ }), (0, react_jsx_runtime.jsx)("span", { ++ className: "gdEzaW_refChipLabel", ++ children: researchPromptBasename(file.name) ++ })] ++ }); ++ } ++ function ResearchMessageArtifactChip({ artifact }) { ++ const label = researchArtifactReferenceLabel(artifact); ++ return (0, react_jsx_runtime.jsxs)("button", { ++ type: "button", ++ className: MessageItem_module_css_default.refChip, ++ "data-ref-chip": "research-artifact", ++ "data-research-message-artifact": artifact.id, ++ "data-research-reference-node-id": artifact.id, ++ title: label, ++ children: [(0, react_jsx_runtime.jsx)(ResearchArtifactReferenceIcon, { artifact }), (0, react_jsx_runtime.jsx)("span", { ++ className: "gdEzaW_refChipLabel", ++ children: label ++ })] ++ }); ++ } ++ function projectResearchUserText(research) { ++ const artifacts = Array.isArray(research.artifacts) ? research.artifacts : []; ++ const fileOccurrences = Array.isArray(research.occurrences) ? research.occurrences : []; ++ const artifactOccurrences = Array.isArray(research.artifactOccurrences) ? research.artifactOccurrences : []; ++ if (fileOccurrences.length === 0 && artifactOccurrences.length === 0) return (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [(research.files.length > 0 || artifacts.length > 0) && (0, react_jsx_runtime.jsxs)("div", { ++ "data-research-message-files": "", ++ style: { display: "flex", flexWrap: "wrap", gap: 6, marginBottom: research.text === "" ? 0 : 8 }, ++ children: [research.files.map((file) => (0, react_jsx_runtime.jsx)(ResearchMessageFileChip, { file }, file.id)), artifacts.map((artifact) => (0, react_jsx_runtime.jsx)(ResearchMessageArtifactChip, { artifact }, artifact.id))] ++ }), research.text !== "" && projectUserText(research.text)] }); ++ const fileById = /* @__PURE__ */ new Map(research.files.map((file) => [file.id, file])); ++ const artifactById = /* @__PURE__ */ new Map(artifacts.map((artifact) => [artifact.id, artifact])); ++ const references = [ ++ ...fileOccurrences.map((occurrence, index) => ({ type: "file", occurrence, index })), ++ ...artifactOccurrences.map((occurrence, index) => ({ type: "artifact", occurrence, index })) ++ ].sort((a, b) => a.occurrence.offset - b.occurrence.offset || (a.occurrence.order ?? a.index) - (b.occurrence.order ?? b.index) || (a.type === "file" ? -1 : 1)); ++ const parts = []; ++ let cursor = 0; ++ for (let index = 0; index < references.length; index += 1) { ++ const { type, occurrence } = references[index]; ++ const reference = type === "file" ? fileById.get(occurrence.fileId) : artifactById.get(occurrence.artifactId); ++ if (reference === void 0) continue; ++ if (occurrence.offset > cursor) parts.push((0, react_jsx_runtime.jsx)(react_jsx_runtime.Fragment, { children: projectUserText(research.text.slice(cursor, occurrence.offset)) }, `text-${cursor}`)); ++ parts.push(type === "file" ? (0, react_jsx_runtime.jsx)(ResearchMessageFileChip, { file: reference }, `file-${reference.id}-${index}`) : (0, react_jsx_runtime.jsx)(ResearchMessageArtifactChip, { artifact: reference }, `artifact-${reference.id}-${index}`)); ++ cursor = occurrence.offset; ++ } ++ if (cursor < research.text.length) parts.push((0, react_jsx_runtime.jsx)(react_jsx_runtime.Fragment, { children: projectUserText(research.text.slice(cursor)) }, `text-${cursor}`)); ++ return (0, react_jsx_runtime.jsx)("span", { ++ "data-research-message-files": "inline", ++ children: parts ++ }); ++ } + /** Right-aligned bubble shared by user and steering rows. */ + function UserStyleBubble({ content, imageLoader, actions, pending = false, t }) { + const { text, images, rest } = contentParts(content); ++ const research = parseResearchPrompt(text); ++ const inlineResearch = (research.occurrences?.length ?? 0) > 0 || (research.artifactOccurrences?.length ?? 0) > 0; + const truncated = (total) => t("json.truncated", { total }); +- const showBubble = text !== "" || rest.length > 0; ++ const showBubble = research.text !== "" || research.files.length > 0 || (research.artifacts?.length ?? 0) > 0 || rest.length > 0; + return (0, react_jsx_runtime.jsxs)("div", { + className: MessageItem_module_css_default.userRow, + "data-pending-steering": pending || void 0, + "data-time-hover-root": true, + children: [(0, react_jsx_runtime.jsxs)("div", { + className: MessageItem_module_css_default.userStack, ++ "data-research-inline": inlineResearch || void 0, + children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_attachment.ImageGallery, { + images, + load: imageLoader, +@@ -5112,13 +5882,14 @@ window.__ModuleLoader__.load({ + labels: messageImageLabels(t) + }), showBubble && (0, react_jsx_runtime.jsxs)("div", { + className: MessageItem_module_css_default.bubble, +- children: [projectUserText(text), rest.map((block, i) => (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.JsonBlock, { ++ "data-research-inline": inlineResearch || void 0, ++ children: [projectResearchUserText(research), rest.map((block, i) => (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.JsonBlock, { + label: t("message.extraBlock"), + payload: block, + truncatedLabel: truncated + }, i))] + })] +- }), actions?.(text)] ++ }), actions?.(research.text)] + }); + } + /** +@@ -5209,7 +5980,7 @@ window.__ModuleLoader__.load({ + }); + //#endregion + //#region \0dsh-css:/home/runner/work/deepseek-harness/deepseek-harness/packages/client/ui-conversation/src/client/chat/ChatView.module.css.mjs +- const css$11 = ".Md3f7G_root{flex-direction:column;flex:auto;min-height:0;display:flex;position:relative}.Md3f7G_scroll{min-height:0;padding:16px calc(var(--dsh-composer-side-clearance) + 16px);flex:auto;overflow-y:auto}[data-conversation-scroll] .Md3f7G_root{flex:none;height:auto;min-height:auto}[data-conversation-scroll] .Md3f7G_scroll{flex:none;min-height:auto;overflow:visible}.Md3f7G_column{max-width:var(--dsh-chat-content-width);flex-direction:column;gap:16px;width:100%;margin:0 auto;display:flex}.Md3f7G_flowItem{min-width:0}.Md3f7G_flowItem:empty{display:none}.Md3f7G_callRow{border-radius:6px}.Md3f7G_turnStatus{height:26px;font:var(--dsw-font-s-strong-14);white-space:nowrap;background:linear-gradient(90deg, var(--dsw-static-deepseek-500) 0%, var(--dsw-static-deepseek-500) 40%, var(--dsw-static-deepseek-200) 50%, var(--dsw-static-deepseek-500) 60%, var(--dsw-static-deepseek-500) 100%);color:#0000;-webkit-text-fill-color:transparent;background-position:100% 0;background-size:250% 100%;-webkit-background-clip:text;background-clip:text;flex:none;align-self:flex-start;align-items:center;animation:1.8s linear infinite Md3f7G_dsh-turn-status-shimmer;display:inline-flex}.Md3f7G_turnStatusClock{font:var(--dsw-font-xs-13);font-variant-numeric:tabular-nums;color:var(--dsw-alias-label-caption);-webkit-text-fill-color:var(--dsw-alias-label-caption);margin-left:8px;font-weight:400}@keyframes Md3f7G_dsh-turn-status-shimmer{to{background-position:0 0}}@media (prefers-reduced-motion:reduce){.Md3f7G_turnStatus{background-position:0 0;background-size:100% 100%;animation:none}}.Md3f7G_hint{color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:18px}.Md3f7G_openError{color:var(--dsw-alias-state-error-primary);font-size:12px;line-height:18px}.Md3f7G_older{justify-content:center;display:flex}.Md3f7G_older button{color:var(--dsw-alias-label-secondary);background:var(--dsw-alias-interactive-bg-hover-solid);cursor:pointer;border:none;border-radius:14px;padding:4px 12px;font-size:12px}.Md3f7G_older button:disabled{cursor:default;opacity:.6}.Md3f7G_toBottomSlot{z-index:8;height:0;padding-right:max(0px, calc((100% - var(--dsh-chat-content-width)) / 2));pointer-events:none;justify-content:flex-end;display:flex;position:sticky;bottom:16px}[data-conversation-scroll] .Md3f7G_toBottomSlot{bottom:calc(var(--dsh-composer-height,152px) + 16px)}.Md3f7G_toBottom{border:1px solid var(--dsw-alias-border-l2);width:34px;height:34px;color:var(--dsw-alias-label-primary);background:var(--dsw-alias-button-floating-fill);box-shadow:var(--dsw-shadow-lv2);cursor:pointer;pointer-events:auto;border-radius:100px;justify-content:center;align-items:center;margin-top:-34px;padding:0;display:flex}.Md3f7G_toBottom:hover{background:var(--dsw-alias-button-floating-hover)}"; ++ const css$11 = ".Md3f7G_root{flex-direction:column;flex:auto;min-height:0;display:flex;position:relative}.Md3f7G_scroll{min-height:0;padding:16px calc(var(--dsh-composer-side-clearance) + 16px);flex:auto;overflow-y:auto}[data-conversation-scroll] .Md3f7G_root{flex:none;height:auto;min-height:auto}[data-conversation-scroll] .Md3f7G_scroll{flex:none;min-height:auto;overflow:visible}.Md3f7G_column{max-width:var(--dsh-chat-content-width);flex-direction:column;gap:16px;width:100%;margin:0 auto;display:flex}.Md3f7G_flowItem{min-width:0}.Md3f7G_flowItem:empty{display:none}.Md3f7G_callRow{border-radius:6px}.Md3f7G_executionGroup{min-width:0;flex-direction:column;display:flex}.Md3f7G_executionProgress{max-width:100%;flex-direction:column;gap:14px;margin:0 0 8px;padding-left:23px;display:flex}.Md3f7G_executionProgressItem{min-width:0;animation:.2s ease-out Md3f7G_dsh-execution-progress-enter}.Md3f7G_executionProgressItem p{margin-top:0}.Md3f7G_executionProgressItem p:last-child{margin-bottom:0}.Md3f7G_executionTrigger{font:inherit;color:inherit;cursor:pointer;background:0 0;border:0;border-radius:7px;align-self:flex-start;align-items:center;min-width:0;max-width:100%;height:28px;margin:0;padding:0 6px 0 0;display:flex}.Md3f7G_executionTrigger:not(:disabled):hover{background:var(--dsw-alias-interactive-bg-hover)}.Md3f7G_executionTrigger:disabled{cursor:default}.Md3f7G_executionLeading{width:18px;height:18px;color:var(--dsw-alias-label-tertiary);flex:none;place-items:center;margin-right:5px;display:grid}.Md3f7G_executionChevron{transition:transform .16s ease;display:inline-flex}.Md3f7G_executionGroup[data-expanded=true] .Md3f7G_executionChevron{transform:rotate(90deg)}.Md3f7G_executionText{color:var(--dsw-alias-label-secondary);text-overflow:ellipsis;white-space:nowrap;min-width:0;font-size:14px;line-height:24px;overflow:hidden}.Md3f7G_executionGroup[data-state=running] .Md3f7G_executionText{background:linear-gradient(90deg,var(--dsw-alias-label-tertiary) 0%,var(--dsw-alias-label-tertiary) 38%,var(--dsw-alias-label-primary) 50%,var(--dsw-alias-label-tertiary) 62%,var(--dsw-alias-label-tertiary) 100%);color:#0000;-webkit-text-fill-color:transparent;background-position:100% 0;background-size:250% 100%;-webkit-background-clip:text;background-clip:text;animation:1.8s linear infinite Md3f7G_dsh-execution-status-shimmer}.Md3f7G_executionMeta{font-variant-numeric:tabular-nums;color:var(--dsw-alias-label-caption);white-space:nowrap;flex:none;margin-left:8px;font-size:12px;line-height:20px}.Md3f7G_executionDetails{border-left:1px solid var(--dsw-alias-border-l2);flex-direction:column;gap:6px;margin:4px 0 2px 8px;padding:2px 0 2px 14px;display:flex}.Md3f7G_executionDetailsLabel{color:var(--dsw-alias-label-caption);letter-spacing:.02em;margin-bottom:2px;font-size:11px;line-height:18px}@keyframes Md3f7G_dsh-execution-status-shimmer{to{background-position:0 0}}@keyframes Md3f7G_dsh-execution-progress-enter{0%{opacity:0;transform:translateY(4px)}to{opacity:1;transform:translateY(0)}}@media (prefers-reduced-motion:reduce){.Md3f7G_executionGroup[data-state=running] .Md3f7G_executionText{color:var(--dsw-alias-label-secondary);-webkit-text-fill-color:currentColor;background:0 0;animation:none}.Md3f7G_executionChevron{transition:none}.Md3f7G_executionProgressItem{animation:none}}.Md3f7G_hint{color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:18px}.Md3f7G_openError{color:var(--dsw-alias-state-error-primary);font-size:12px;line-height:18px}.Md3f7G_older{justify-content:center;display:flex}.Md3f7G_older button{color:var(--dsw-alias-label-secondary);background:var(--dsw-alias-interactive-bg-hover-solid);cursor:pointer;border:none;border-radius:14px;padding:4px 12px;font-size:12px}.Md3f7G_older button:disabled{cursor:default;opacity:.6}.Md3f7G_toBottomSlot{z-index:8;height:0;padding-right:max(0px, calc((100% - var(--dsh-chat-content-width)) / 2));pointer-events:none;justify-content:flex-end;display:flex;position:sticky;bottom:16px}[data-conversation-scroll] .Md3f7G_toBottomSlot{bottom:calc(var(--dsh-composer-height,152px) + 16px)}.Md3f7G_toBottom{border:1px solid var(--dsw-alias-border-l2);width:34px;height:34px;color:var(--dsw-alias-label-primary);background:var(--dsw-alias-button-floating-fill);box-shadow:var(--dsw-shadow-lv2);cursor:pointer;pointer-events:auto;border-radius:100px;justify-content:center;align-items:center;margin-top:-34px;padding:0;display:flex}.Md3f7G_toBottom:hover{background:var(--dsw-alias-button-floating-hover)}"; + const tagId$11 = "@deepseek-ai/dsh-client-ui-conversation/ChatView.module.css"; + if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId$11) + "]") === null) { + const tag = document.createElement("style"); +@@ -5218,9 +5989,28 @@ window.__ModuleLoader__.load({ + tag.textContent = css$11; + document.head.appendChild(tag); + } ++ const executionDetailGroupsCss = ".dshExecutionDetailGroup{min-width:0}.dshExecutionDetailSummary{font:inherit;color:inherit;cursor:pointer;list-style:none;border-radius:6px;align-items:center;min-width:0;height:28px;padding:0 6px 0 0;display:flex}.dshExecutionDetailSummary::-webkit-details-marker{display:none}.dshExecutionDetailSummary:hover{background:var(--dsw-alias-interactive-bg-hover)}.dshExecutionDetailIcon{width:18px;height:18px;color:var(--dsw-alias-label-tertiary);flex:none;place-items:center;margin-right:5px;display:grid}.dshExecutionDetailTitle{color:var(--dsw-alias-label-secondary);text-overflow:ellipsis;white-space:nowrap;min-width:0;font-size:13px;line-height:20px;overflow:hidden}.dshExecutionDetailMeta{font-variant-numeric:tabular-nums;color:var(--dsw-alias-label-caption);white-space:nowrap;flex:none;margin-left:8px;font-size:12px;line-height:20px}.dshExecutionDetailError{color:var(--dsw-alias-state-error-primary)}.dshExecutionDetailChevron{color:var(--dsw-alias-label-caption);flex:none;margin-left:auto;transition:transform .16s ease;display:inline-flex}.dshExecutionDetailGroup[open]>.dshExecutionDetailSummary .dshExecutionDetailChevron{transform:rotate(90deg)}.dshExecutionDetailItems{flex-direction:column;gap:6px;padding:3px 0 4px 23px;display:flex}@media(prefers-reduced-motion:reduce){.dshExecutionDetailChevron{transition:none}}"; ++ const executionDetailGroupsTagId = "@deepseek-ai/dsh-client-ui-conversation/ExecutionDetailGroups.css"; ++ if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(executionDetailGroupsTagId) + "]") === null) { ++ const tag = document.createElement("style"); ++ tag.dataset.plugin = "@deepseek-ai/dsh-client-ui-conversation"; ++ tag.dataset.pluginCss = executionDetailGroupsTagId; ++ tag.textContent = executionDetailGroupsCss; ++ document.head.appendChild(tag); ++ } + var ChatView_module_css_default = { +- "dsh-turn-status-shimmer": "Md3f7G_dsh-turn-status-shimmer", +- "turnStatusClock": "Md3f7G_turnStatusClock", ++ "dsh-execution-status-shimmer": "Md3f7G_dsh-execution-status-shimmer", ++ "dsh-execution-progress-enter": "Md3f7G_dsh-execution-progress-enter", ++ "executionGroup": "Md3f7G_executionGroup", ++ "executionProgress": "Md3f7G_executionProgress", ++ "executionProgressItem": "Md3f7G_executionProgressItem", ++ "executionTrigger": "Md3f7G_executionTrigger", ++ "executionLeading": "Md3f7G_executionLeading", ++ "executionChevron": "Md3f7G_executionChevron", ++ "executionText": "Md3f7G_executionText", ++ "executionMeta": "Md3f7G_executionMeta", ++ "executionDetails": "Md3f7G_executionDetails", ++ "executionDetailsLabel": "Md3f7G_executionDetailsLabel", + "callRow": "Md3f7G_callRow", + "hint": "Md3f7G_hint", + "root": "Md3f7G_root", +@@ -5228,11 +6018,19 @@ window.__ModuleLoader__.load({ + "older": "Md3f7G_older", + "flowItem": "Md3f7G_flowItem", + "toBottomSlot": "Md3f7G_toBottomSlot", +- "turnStatus": "Md3f7G_turnStatus", + "column": "Md3f7G_column", "toBottom": "Md3f7G_toBottom", "scroll": "Md3f7G_scroll" }; @@ -18,7 +1396,139 @@ index 1dd0e89..dd1c233 100644 //#endregion //#region lib/types/client/chat/ChatNodeSeat.js /** Subscribe and dispatch one stable Context key without observing sibling Nodes. */ -@@ -5289,6 +5298,21 @@ window.__ModuleLoader__.load({ +@@ -5278,6 +6076,131 @@ window.__ModuleLoader__.load({ + }) + }); + }); ++ function ExecutionDetailGroupIcon({ id }) { ++ if (id === "read-search") return (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconBrowseOutline16, { size: 14 }); ++ if (id === "tools-skills") return (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconApiOutline14, { size: 14 }); ++ if (id === "run-change") return (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconEditOutline16, { size: 14 }); ++ if (id === "task-verify") return (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChecklistOutline14, { size: 14 }); ++ return (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconThinkOutline14, { size: 14 }); ++ } ++ /** One turn-level status row whose disclosure owns all process detail. */ ++ const ExecutionStatusGroup = (0, react.memo)(function ExecutionStatusGroup({ entry, activityNodes, startTime, endTime, seatProps, t }) { ++ const [expanded, setExpanded] = (0, react.useState)(false); ++ const wasRunning = (0, react.useRef)(entry.running); ++ const [mountedAt] = (0, react.useState)(() => Date.now()); ++ const anchor = startTime ?? mountedAt; ++ const [now, setNow] = (0, react.useState)(() => Date.now()); ++ (0, react.useEffect)(() => { ++ if (!entry.running) return; ++ const tick = () => setNow(Date.now()); ++ tick(); ++ const id = setInterval(tick, 1e3); ++ return () => clearInterval(id); ++ }, [entry.running]); ++ (0, react.useEffect)(() => { ++ if (wasRunning.current && !entry.running) setExpanded(false); ++ wasRunning.current = entry.running; ++ }, [entry.running]); ++ const detailGroups = (0, react.useMemo)(() => executionDetailGroups(activityNodes), [activityNodes]); ++ const expandable = detailGroups.length > 0; ++ const open = expandable && expanded; ++ const progressSurface = (0, react.useMemo)(() => executionProgressSurface(activityNodes, entry.running, open, { ++ t, ++ detailGroups, ++ preserveProgress: entry.preserveProgress === true ++ }), [ ++ activityNodes, ++ detailGroups, ++ entry.running, ++ entry.preserveProgress, ++ open, ++ t ++ ]); ++ const elapsedMs = endTime !== null && startTime !== null ? Math.max(0, endTime - startTime) : Math.max(0, now - anchor); ++ const showElapsed = entry.running ? elapsedMs >= 15e3 : elapsedMs >= 1e3; ++ const status = executionSummaryStatus(activityNodes, entry.running, t); ++ const toggleLabel = open ? t("execution.details.collapse") : t("execution.details.expand"); ++ return (0, react_jsx_runtime.jsxs)("section", { ++ className: `${ChatView_module_css_default.flowItem} ${ChatView_module_css_default.executionGroup}`, ++ "data-chat-anchor-key": entry.key, ++ "data-chat-flow-key": entry.key, ++ "data-chat-flow-kind": "execution", ++ "data-state": entry.running ? "running" : "complete", ++ "data-expanded": open, ++ children: [progressSurface.showProgress && (0, react_jsx_runtime.jsx)("div", { ++ className: ChatView_module_css_default.executionProgress, ++ role: "log", ++ "aria-live": "polite", ++ "aria-relevant": "additions", ++ children: progressSurface.updates.map((update) => (0, react_jsx_runtime.jsx)("div", { ++ className: ChatView_module_css_default.executionProgressItem, ++ children: (0, react_jsx_runtime.jsx)(AssistantMarkdown, { ++ blocks: update.blocks, ++ streaming: update.streaming, ++ interrupted: false, ++ loadImage: seatProps.loadImage, ++ t ++ }) ++ }, update.key)) ++ }), (0, react_jsx_runtime.jsxs)("button", { ++ type: "button", ++ className: ChatView_module_css_default.executionTrigger, ++ disabled: !expandable, ++ "aria-expanded": expandable ? open : void 0, ++ "aria-label": expandable ? toggleLabel : status, ++ onClick: () => setExpanded((value) => !value), ++ children: [(0, react_jsx_runtime.jsx)("span", { ++ className: ChatView_module_css_default.executionLeading, ++ "aria-hidden": true, ++ children: expandable ? (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronRightOutline14, { className: ChatView_module_css_default.executionChevron }) : (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconThinkOutline14, { size: 14 }) ++ }), (0, react_jsx_runtime.jsx)("span", { ++ className: ChatView_module_css_default.executionText, ++ role: "status", ++ "aria-live": "polite", ++ children: status ++ }), showElapsed && (0, react_jsx_runtime.jsx)("span", { ++ className: ChatView_module_css_default.executionMeta, ++ "aria-hidden": true, ++ children: t("execution.status.elapsed", { duration: formatRunDuration(elapsedMs, t) }) ++ })] ++ }), open && progressSurface.detailGroups.length > 0 && (0, react_jsx_runtime.jsx)("div", { ++ className: ChatView_module_css_default.executionDetails, ++ role: "group", ++ "aria-label": t("execution.details.title"), ++ children: progressSurface.detailGroups.map((group) => (0, react_jsx_runtime.jsxs)("details", { ++ className: "dshExecutionDetailGroup", ++ "data-execution-detail-group": group.id, ++ "data-error-count": group.errorCount || void 0, ++ children: [(0, react_jsx_runtime.jsxs)("summary", { ++ className: "dshExecutionDetailSummary", ++ children: [(0, react_jsx_runtime.jsx)("span", { ++ className: "dshExecutionDetailIcon", ++ "aria-hidden": true, ++ children: (0, react_jsx_runtime.jsx)(ExecutionDetailGroupIcon, { id: group.id }) ++ }), (0, react_jsx_runtime.jsx)("span", { ++ className: "dshExecutionDetailTitle", ++ children: t(group.titleKey) ++ }), (0, react_jsx_runtime.jsx)("span", { ++ className: "dshExecutionDetailMeta", ++ children: t("execution.details.group.count", { count: group.nodeKeys.length }) ++ }), group.errorCount > 0 && (0, react_jsx_runtime.jsx)("span", { ++ className: "dshExecutionDetailMeta dshExecutionDetailError", ++ children: t("execution.details.group.errors", { count: group.errorCount }) ++ }), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronRightOutline14, { ++ className: "dshExecutionDetailChevron", ++ "aria-hidden": true ++ })] ++ }), (0, react_jsx_runtime.jsx)("div", { ++ className: "dshExecutionDetailItems", ++ children: group.nodeKeys.map((nodeKey) => (0, react_jsx_runtime.jsx)(ChatNodeSeat, { ++ nodeKey, ++ ...seatProps ++ }, nodeKey)) ++ })] ++ }, group.id)) ++ })] ++ }); ++ }); + //#endregion + //#region lib/types/client/chat/ChatView.js + /** Active column host when present; otherwise the view-local scroller. */ +@@ -5289,6 +6212,21 @@ window.__ModuleLoader__.load({ for (const row of list.querySelectorAll("[data-chat-anchor-key]")) if (row.dataset.chatAnchorKey === key) return row; return null; } @@ -40,10 +1550,458 @@ index 1dd0e89..dd1c233 100644 /** Row position in scrollport coordinates (viewport-independent). */ function flowTop(row, scrollport) { return row.getBoundingClientRect().top - scrollport.getBoundingClientRect().top; -@@ -5364,6 +5388,106 @@ window.__ModuleLoader__.load({ - })] - }); +@@ -5332,35 +6270,537 @@ window.__ModuleLoader__.load({ + scrollTop: scrollport.scrollTop + }; + } +- function runningTurnStartTime(timeline) { ++ /** The currently open Turn, used by the compact activity projection. */ ++ function runningTurnInfo(timeline) { + let latest = null; +- for (const turn of timeline.turns.values()) if (turn.status === "open" && turn.start !== void 0) latest = turn.start.time; +- return latest; ++ for (const turn of timeline.turns.values()) { ++ if (turn.status !== "open") continue; ++ if (latest === null || (turn.start?.time ?? 0) >= (latest.start?.time ?? 0)) latest = turn; ++ } ++ return latest === null ? null : { ++ turn: latest.turn, ++ startTime: latest.start?.time ?? null ++ }; } +- /** Turn-level model activity label retained across first-token, tool, and streaming phases. */ +- function TurnStatus({ startTime, t }) { +- const [mountedAt] = (0, react.useState)(() => Date.now()); +- const anchor = startTime ?? mountedAt; +- const [elapsedMs, setElapsedMs] = (0, react.useState)(() => Math.max(0, Date.now() - anchor)); +- (0, react.useEffect)(() => { +- const tick = () => { +- setElapsedMs(Math.max(0, Date.now() - anchor)); +- }; +- tick(); +- const id = setInterval(tick, 1e3); ++ /** Stable Turn identity for every Chat node shape. */ ++ function conversationNodeTurn(node) { ++ const location = node?.location; ++ if (location?.kind === "turn" || location?.kind === "step") { ++ const turn = location.turn?.turn; ++ if (typeof turn === "number") return turn; ++ } ++ return typeof node?.data?.turn === "number" ? node.data.turn : null; ++ } ++ /** Keep model reasoning and wire calls out of the completed answer surface. */ ++ function finalAnswerBlocks(blocks) { ++ return blocks.filter((block) => block.kind === "text" || block.kind === "image"); ++ } ++ /** Keep the latest distinct model-authored commentary paragraphs, never reasoning or Tool payloads. */ ++ function executionProgressUpdates(nodes, options = {}) { ++ const limit = options.limit ?? 6; ++ const t = typeof options.t === "function" ? options.t : null; ++ const byText = /* @__PURE__ */ new Map(); ++ const push = (key, blocks, streaming = false) => { ++ const text = blocks.map((block) => block.text).join("\n").replace(/\s+/gu, " ").trim(); ++ if (text.length < 4) return; ++ if (byText.has(text)) byText.delete(text); ++ byText.set(text, { ++ key, ++ blocks, ++ streaming ++ }); ++ }; ++ for (const node of nodes) { ++ if (node?.kind !== "assistant-step") continue; ++ const source = Array.isArray(node.data?.blocks) ? node.data.blocks : []; ++ const blocks = source.filter((block) => block?.kind === "text" && typeof block.text === "string" && block.text.trim().length > 0); ++ const key = typeof node.key === "string" ? node.key : `execution-progress:${byText.size}`; ++ push(key, blocks, node.data?.status === "running"); ++ } ++ if (byText.size === 0 && t !== null) for (const node of nodes) { ++ if (node?.kind !== "tool-call") continue; ++ const root = node.data?.root; ++ if (root === null || typeof root !== "object" || !("kind" in root)) continue; ++ const { name, args } = executionToolArgs(root); ++ const key = typeof node.key === "string" ? node.key : `execution-milestone:${byText.size}`; ++ if (/todo|plan/.test(name) && Array.isArray(args?.todos)) { ++ for (const [index, todo] of args.todos.entries()) { ++ if (todo === null || typeof todo !== "object" || todo.status !== "completed") continue; ++ const task = safeExecutionTask(todo.content); ++ if (task !== null && hasHanText(task)) push(`${key}:todo:${index}`, [{ ++ kind: "text", ++ text: t("execution.progress.completed", { task }) ++ }]); ++ } ++ continue; ++ } ++ if (name === "web_search") { ++ const task = safeExecutionTask(args?.query); ++ if (task !== null && hasHanText(task)) push(`${key}:search`, [{ ++ kind: "text", ++ text: t("execution.progress.researched", { task }) ++ }]); ++ continue; ++ } ++ const task = safeExecutionTask(args?.description); ++ if (task !== null && hasHanText(task)) push(`${key}:description`, [{ ++ kind: "text", ++ text: t("execution.progress.completed", { task }) ++ }]); ++ } ++ if (byText.size === 0 && t !== null) { ++ const stages = /* @__PURE__ */ new Map(); ++ for (const node of nodes) { ++ if (node?.kind !== "tool-call") continue; ++ const root = node.data?.root; ++ if (root === null || typeof root !== "object" || !("kind" in root)) continue; ++ const { name, args } = executionToolArgs(root); ++ const stage = executionProgressStage(name, args); ++ if (stage === null) continue; ++ if (stages.has(stage)) stages.delete(stage); ++ stages.set(stage, typeof node.key === "string" ? node.key : `execution-stage:${stages.size}`); ++ } ++ for (const [stage, key] of stages) push(`${key}:${stage}`, [{ ++ kind: "text", ++ text: t(stage) ++ }]); ++ } ++ return [...byText.values()].slice(-Math.max(0, limit)); ++ } ++ /** Derive the visible progress feed and keep assistant commentary out of raw execution detail. */ ++ function executionProgressSurface(nodes, running, expanded, options = {}) { ++ const updates = executionProgressUpdates(nodes, options); ++ const detailGroups = options.detailGroups ?? executionDetailGroups(nodes); ++ const detailNodeKeys = detailGroups.flatMap((group) => group.nodeKeys); ++ return { ++ updates, ++ showProgress: updates.length > 0 && (running || expanded || options.preserveProgress === true), ++ detailNodeKeys, ++ detailGroups ++ }; ++ } ++ const EXECUTION_DETAIL_GROUP_DEFINITIONS = [ ++ { ++ id: "tools-skills", ++ titleKey: "execution.details.group.toolsSkills" ++ }, ++ { ++ id: "read-search", ++ titleKey: "execution.details.group.readSearch" ++ }, ++ { ++ id: "run-change", ++ titleKey: "execution.details.group.runChange" ++ }, ++ { ++ id: "task-verify", ++ titleKey: "execution.details.group.taskVerify" ++ }, ++ { ++ id: "other", ++ titleKey: "execution.details.group.other" ++ } ++ ]; ++ /** Assign one visible detail node to a stable, user-facing activity category. */ ++ function executionDetailCategory(node) { ++ if (node?.kind === "command") return "run-change"; ++ if (node?.kind !== "tool-call") return "other"; ++ const { name } = executionToolArgs(node.data?.root); ++ if (/skill|subagent/.test(name)) return "tools-skills"; ++ if (/todo|plan|playwright|browser|screenshot|simulator|test|verify|validation/.test(name)) return "task-verify"; ++ if (/read|grep|glob|search|find|web|fetch|http|image/.test(name)) return "read-search"; ++ if (/bash|shell|exec|terminal|command|pwsh|write|edit|patch|replace|mutation/.test(name)) return "run-change"; ++ return "other"; ++ } ++ /** Whether a root or nested Tool result reports a failure. */ ++ function executionToolFailed(root) { ++ if (root === null || typeof root !== "object") return false; ++ const pending = [root]; ++ const visited = /* @__PURE__ */ new Set(); ++ while (pending.length > 0 && visited.size < 256) { ++ const block = pending.pop(); ++ if (block === null || typeof block !== "object" || visited.has(block)) continue; ++ visited.add(block); ++ if (block.isError === true) return true; ++ if (Array.isArray(block.subCalls)) pending.push(...block.subCalls); ++ } ++ return false; ++ } ++ /** Hide injected context and organize the remaining raw execution rows into concise categories. */ ++ function executionDetailGroups(nodes) { ++ const groups = /* @__PURE__ */ new Map(); ++ for (const node of nodes) { ++ if (node?.kind === "assistant-step" || node?.kind === "context" || typeof node?.key !== "string") continue; ++ const id = executionDetailCategory(node); ++ let group = groups.get(id); ++ if (group === void 0) { ++ const definition = EXECUTION_DETAIL_GROUP_DEFINITIONS.find((candidate) => candidate.id === id); ++ if (definition === void 0) continue; ++ group = { ++ ...definition, ++ nodeKeys: [], ++ errorCount: 0 ++ }; ++ groups.set(id, group); ++ } ++ group.nodeKeys.push(node.key); ++ if (node.kind === "tool-call" && executionToolFailed(node.data?.root)) group.errorCount += 1; ++ } ++ return EXECUTION_DETAIL_GROUP_DEFINITIONS.flatMap((definition) => { ++ const group = groups.get(definition.id); ++ return group === void 0 ? [] : [group]; ++ }); ++ } ++ /** Read only the structured arguments owned by a Tool call. Malformed or non-object input has no intent value. */ ++ function executionToolArgs(root) { ++ const call = root !== null && typeof root === "object" && "kind" in root ? root.call : root; ++ const raw = call?.argsRaw; ++ if (typeof raw !== "string") return { name: String(call?.name ?? "").toLowerCase(), args: null }; ++ try { ++ const args = JSON.parse(raw); ++ return { ++ name: String(call?.name ?? "").toLowerCase(), ++ args: typeof args === "object" && args !== null && !Array.isArray(args) ? args : null ++ }; ++ } catch { ++ return { name: String(call?.name ?? "").toLowerCase(), args: null }; ++ } ++ } ++ /** Convert settled Tool metadata into a localized, privacy-safe milestone for older transcripts. */ ++ function executionProgressStage(name, args) { ++ const description = typeof args?.description === "string" ? args.description : ""; ++ const path = typeof args?.path === "string" ? args.path : typeof args?.file_path === "string" ? args.file_path : ""; ++ const semantic = `${name} ${description} ${path}`.toLowerCase(); ++ if (/(?:verify|validate|check|inspect|audit|review|test|lint|qa|compare|sanitize|\u6821\u9a8c|\u9a8c\u8bc1|\u68c0\u67e5|\u5ba1\u67e5|\u6d4b\u8bd5)/iu.test(semantic)) return "execution.progress.verificationReady"; ++ if (/(?:read_image|render|preview|screenshot|raster|contact.?sheet|\u6e32\u67d3|\u9884\u89c8|\u622a\u56fe)/iu.test(semantic)) return "execution.progress.previewReady"; ++ if (/(?:web_search|web_fetch|browse|search|glob|grep|find|(?:^|[\s_-])read(?:[\s_-]|$)|\u68c0\u7d22|\u641c\u7d22|\u8bfb\u53d6)/iu.test(semantic)) return "execution.progress.researchReady"; ++ if (/(?:write|edit|patch|replace|mutation|build|create|generate|author|compose|export|save|\u64b0\u5199|\u521b\u5efa|\u751f\u6210|\u5236\u4f5c|\u7f16\u8f91|\u66f4\u65b0|\u5bfc\u51fa)/iu.test(semantic)) return "execution.progress.draftReady"; ++ return null; ++ } ++ /** A model-authored intent may be shown only when it is short and contains no path, command, URL, or credential marker. */ ++ function safeExecutionTask(value) { ++ if (typeof value !== "string") return null; ++ const task = value.split(/\r?\n/, 1)[0]?.trim().replace(/^\u6b63\u5728/u, "").replace(/[\s\u3002.!\uff01?\uff1f\u2026\uff1a:;\uff1b]+$/u, "").replace(/\s+/g, " ") ?? ""; ++ if (task.length < 2 || task.length > 48) return null; ++ if (/[\u0000-\u001f\u007f]/u.test(task)) return null; ++ if (/(?:https?|file):\/\/|(?:^|\s)(?:\/{1,2}|~\/)[\w.@+-]+(?:[\\/][^\s]+)*|[a-z]:\\|(?:api[ _-]?key|access[ _-]?token|authorization|bearer|cookie|credential|password|secret|token|\u5bc6\u7801|\u5bc6\u94a5|\u53e3\u4ee4|\u4ee4\u724c|\u51ed\u8bc1)/iu.test(task)) return null; ++ if (/&&|\|\||[;`$<>]/u.test(task)) return null; ++ return task; ++ } ++ function hasHanText(value) { ++ return /\p{Script=Han}/u.test(value); ++ } ++ function pptCommandStatusKey(args) { ++ const description = typeof args?.description === "string" ? args.description : ""; ++ const command = typeof args?.command === "string" ? args.command : ""; ++ const semantic = `${description} ${command}`.toLowerCase(); ++ if (!/(?:pptx?|powerpoint|presentation|slide|deck|\u6f14\u793a\u6587\u7a3f|\u5e7b\u706f\u7247)/iu.test(semantic)) return null; ++ if (/(?:render|preview|screenshot|export.*image|\u6e32\u67d3|\u9884\u89c8|\u622a\u56fe)/iu.test(semantic)) return "execution.status.pptRendering"; ++ if (/(?:verify|validate|check|inspect|audit|review|test|lint|qa|\u6821\u9a8c|\u9a8c\u8bc1|\u68c0\u67e5|\u5ba1\u67e5|\u5ba1\u6838)/iu.test(semantic)) return "execution.status.pptVerifying"; ++ if (/(?:write|create|generate|build|author|compose|edit|update|\u64b0\u5199|\u521b\u5efa|\u751f\u6210|\u5236\u4f5c|\u7f16\u8f91|\u66f4\u65b0)/iu.test(semantic)) return "execution.status.pptWriting"; ++ return null; ++ } ++ /** Privacy-safe current activity copy, derived from the Tool that is actually running. */ ++ function executionActivityLabel(node, t, context = {}) { ++ if (node === void 0 || node === null) return t("execution.status.analyzing"); ++ if (node.kind === "context") return t("execution.status.context"); ++ if (node.kind === "assistant-step") return t("execution.status.analyzing"); ++ if (node.kind === "command") return t("execution.status.command"); ++ if (node.kind === "compaction") return node.data?.running === true ? t("execution.status.compacting") : t("execution.status.working"); ++ if (node.kind === "manual-compaction") return node.data?.command?.outcome === null ? t("execution.status.manualCompacting") : t("execution.status.working"); ++ if (node.kind === "model-retry") return t("execution.status.retrying"); ++ if (node.kind !== "tool-call") return t("execution.status.working"); ++ const root = node.data?.root; ++ const { name, args } = executionToolArgs(root); ++ if (/todo|plan/.test(name)) { ++ const settled = root !== null && typeof root === "object" && "kind" in root; ++ if (!settled) return t("execution.status.planning"); ++ const activeTask = safeExecutionTask(context.activeTask); ++ return activeTask === null ? t("execution.status.working") : t("execution.status.currentTask", { task: activeTask }); ++ } ++ if (name === "web_search") { ++ const topic = safeExecutionTask(args?.query); ++ return topic === null ? t("execution.status.researching") : t("execution.status.webSearchTopic", { topic }); ++ } ++ if (name === "web_fetch") return t("execution.status.researching"); ++ if (/skill/.test(name) && /(?:ppt|slide|presentation)/iu.test(String(args?.name ?? ""))) return t("execution.status.pptSkill"); ++ if (/bash|shell|exec|terminal|command|pwsh/.test(name)) { ++ const describedTask = safeExecutionTask(args?.description); ++ if (describedTask !== null && hasHanText(describedTask)) return t("execution.status.currentTask", { task: describedTask }); ++ const pptStatusKey = pptCommandStatusKey(args); ++ if (pptStatusKey === "execution.status.pptRendering" || pptStatusKey === "execution.status.pptVerifying") return t(pptStatusKey); ++ const activeTask = safeExecutionTask(context.activeTask); ++ if (activeTask !== null) return t("execution.status.currentTask", { task: activeTask }); ++ if (pptStatusKey !== null) return t(pptStatusKey); ++ return t("execution.status.executing"); ++ } ++ if (/read|browse|file_read/.test(name)) return t("execution.status.reading"); ++ if (/grep|glob|search|find/.test(name)) return t("execution.status.searching"); ++ if (/write|edit|patch|replace|mutation/.test(name)) { ++ const path = typeof args?.path === "string" ? args.path : typeof args?.file_path === "string" ? args.file_path : ""; ++ if (/\.pptx?$/iu.test(path)) return t("execution.status.pptWriting"); ++ return t("execution.status.updating"); ++ } ++ if (/playwright|browser|screenshot|simulator|test|verify/.test(name)) return t("execution.status.verifying"); ++ if (/web|fetch|http/.test(name)) return t("execution.status.researching"); ++ if (/skill/.test(name)) return t("execution.status.skill"); ++ return t("execution.status.working"); ++ } ++ /** Combine the latest Tool with the current plan item so vague commands still explain their real purpose. */ ++ function executionStatusForNodes(nodes, t) { ++ let activeTask = null; ++ for (const node of nodes) { ++ if (node?.kind !== "tool-call") continue; ++ const { name, args } = executionToolArgs(node.data?.root); ++ if (!/todo|plan/.test(name) || !Array.isArray(args?.todos)) continue; ++ const active = args.todos.find((todo) => todo !== null && typeof todo === "object" && todo.status === "in_progress"); ++ activeTask = safeExecutionTask(active?.content); ++ } ++ return executionActivityLabel(nodes.at(-1), t, { activeTask }); ++ } ++ /** Running work names its current intent; settled work is a neutral process record, not a task-completion claim. */ ++ function executionSummaryStatus(nodes, running, t) { ++ return running ? executionStatusForNodes(nodes, t) : t("execution.status.history"); ++ } ++ /** Collect normalized user-facing text from one Assistant step. */ ++ function assistantStepText(node) { ++ if (node?.kind !== "assistant-step" || !Array.isArray(node.data?.blocks)) return ""; ++ return node.data.blocks.flatMap((block) => block?.kind === "text" && typeof block.text === "string" ? [block.text] : []).join("\n").trim(); ++ } ++ /** Pick one substantial pre-closing answer that would otherwise be hidden behind execution details. */ ++ function substantialAssistantReplies(order, nodeStore, closingSeqByTurn, closingTextByTurn) { ++ const candidates = /* @__PURE__ */ new Map(); ++ for (const key of order) { ++ const node = nodeStore.get(key); ++ if (node?.kind !== "assistant-step") continue; ++ const turn = conversationNodeTurn(node); ++ if (turn === null || node.data?.finalNode?.seq === closingSeqByTurn.get(turn)) continue; ++ const text = assistantStepText(node); ++ const length = text.replace(/\s+/gu, " ").trim().length; ++ if (length < 120) continue; ++ const current = candidates.get(turn); ++ if (current === void 0 || length > current.length) candidates.set(turn, { key, text, length }); ++ } ++ const promoted = /* @__PURE__ */ new Set(); ++ for (const [turn, candidate] of candidates) { ++ const closingText = closingTextByTurn.get(turn) ?? ""; ++ const closingLength = closingText.replace(/\s+/gu, " ").trim().length; ++ const referencesEarlierReply = /(?:\u89c1|\u53c2\u8003|\u5982|\u8be6\u89c1).{0,8}(?:\u4e0a\u65b9|\u524d\u6587|\u524d\u9762|\u4e0a\u8ff0|\u4ee5\u4e0a)|(?:see|shown|described|provided).{0,24}(?:above|earlier|previous)/iu.test(closingText); ++ const clearlyMoreComplete = candidate.length >= Math.max(120, closingLength * 1.5); ++ if (referencesEarlierReply || clearlyMoreComplete) promoted.add(candidate.key); ++ } ++ return promoted; ++ } ++ /** Whether a node belongs inside the turn's private-by-default activity disclosure. */ ++ function isExecutionDetailNode(node, closingSeqByTurn, promotedAssistantKeys) { ++ if (node === void 0) return false; ++ if (node.kind === "user" || node.kind === "steering" || node.kind === "turn-tail" || node.kind === "turn-error" || node.kind === "turn-max-tokens") return false; ++ if (node.kind !== "assistant-step") return true; ++ if (promotedAssistantKeys.has(node.key)) return false; ++ const turn = conversationNodeTurn(node); ++ const closingSeq = turn === null ? void 0 : closingSeqByTurn.get(turn); ++ return closingSeq === void 0 || node.data?.finalNode?.seq !== closingSeq; ++ } ++ /** Collapse every Turn's internal nodes into one stable flow entry. */ ++ function compactConversationFlow(order, nodeStore, runningTurn) { ++ const closingSeqByTurn = /* @__PURE__ */ new Map(); ++ const closingTextByTurn = /* @__PURE__ */ new Map(); ++ for (const key of order) { ++ const node = nodeStore.get(key); ++ if (node?.kind !== "turn-tail") continue; ++ const turn = conversationNodeTurn(node); ++ const seq = node.data?.closing?.finalNode?.seq; ++ if (turn !== null && typeof seq === "number") { ++ closingSeqByTurn.set(turn, seq); ++ const blocks = node.data?.closing?.blocks; ++ if (Array.isArray(blocks)) closingTextByTurn.set(turn, blocks.flatMap((block) => block?.kind === "text" && typeof block.text === "string" ? [block.text] : []).join("\n").trim()); ++ } ++ } ++ for (const key of order) { ++ const node = nodeStore.get(key); ++ if (node?.kind !== "assistant-step") continue; ++ const turn = conversationNodeTurn(node); ++ if (turn !== null && node.data?.finalNode?.seq === closingSeqByTurn.get(turn) && !closingTextByTurn.has(turn)) closingTextByTurn.set(turn, assistantStepText(node)); ++ } ++ const promotedAssistantKeys = substantialAssistantReplies(order, nodeStore, closingSeqByTurn, closingTextByTurn); ++ const entries = []; ++ const activeGroups = /* @__PURE__ */ new Map(); ++ const segmentCounts = /* @__PURE__ */ new Map(); ++ const preserveProgressTurns = /* @__PURE__ */ new Set(); ++ for (const key of order) { ++ const node = nodeStore.get(key); ++ if (!isExecutionDetailNode(node, closingSeqByTurn, promotedAssistantKeys)) { ++ entries.push({ kind: "node", key }); ++ if (node?.kind === "steering") { ++ const turn = conversationNodeTurn(node); ++ if (turn !== null) { ++ preserveProgressTurns.add(String(turn)); ++ activeGroups.delete(String(turn)); ++ } ++ } else if (node?.kind === "assistant-step" && promotedAssistantKeys.has(key)) { ++ const turn = conversationNodeTurn(node); ++ if (turn !== null) activeGroups.delete(String(turn)); ++ } ++ continue; ++ } ++ const turn = conversationNodeTurn(node); ++ const identity = turn === null ? "session" : String(turn); ++ let group = activeGroups.get(identity); ++ if (group === void 0) { ++ const segment = segmentCounts.get(identity) ?? 0; ++ group = { ++ kind: "execution", ++ key: segment === 0 ? `execution:${identity}` : `execution:${identity}:${segment}`, ++ turn, ++ nodeKeys: [], ++ running: false ++ }; ++ segmentCounts.set(identity, segment + 1); ++ activeGroups.set(identity, group); ++ entries.push(group); ++ } ++ group.nodeKeys.push(key); ++ if (node?.kind === "compaction" && node.data?.running === true) group.running = true; ++ } ++ if (runningTurn !== null) { ++ const identity = String(runningTurn); ++ let group = activeGroups.get(identity); ++ if (group === void 0) { ++ const segment = segmentCounts.get(identity) ?? 0; ++ group = { ++ kind: "execution", ++ key: segment === 0 ? `execution:${identity}` : `execution:${identity}:${segment}`, ++ turn: runningTurn, ++ nodeKeys: [], ++ running: true ++ }; ++ segmentCounts.set(identity, segment + 1); ++ entries.push(group); ++ } else group.running = true; ++ } ++ for (const entry of entries) { ++ if (entry.kind !== "execution" || entry.turn === null) continue; ++ if (preserveProgressTurns.has(String(entry.turn))) entry.preserveProgress = true; ++ } ++ return entries; ++ } ++ /** Latest durable user message, independent of internal nodes appended in the same render. */ ++ function latestDirectUserKey(order, nodeStore) { ++ for (let index = order.length - 1; index >= 0; index--) { ++ const key = order[index]; ++ if (nodeStore.get(key)?.kind === "user") return key; ++ } ++ return null; ++ } ++ /** Re-apply the bottom position after portaled rows finish their next layout. */ ++ function settleConversationScrollBottom(el, schedule, onSettled = () => {}) { ++ const settle = () => { ++ el.scrollTop = el.scrollHeight; ++ onSettled(); ++ }; ++ settle(); ++ schedule(settle); ++ } ++ function shouldFollowConversationBottom({ appendedUser, appendedSteering, runningStarted, tipMoved, atBottom }) { ++ return appendedUser || appendedSteering || runningStarted || tipMoved && atBottom; ++ } + /** Compact, independently scrollable navigation for durable user queries. */ + function QueryRail({ queries, activeKey, listRef, columnRef, onNavigate }) { + const railRef = (0, react.useRef)(null); @@ -77,10 +2035,21 @@ index 1dd0e89..dd1c233 100644 + observer?.observe(scrollport); + observer?.observe(column); + if (composer !== null) observer?.observe(composer); -+ return () => { + return () => { +- clearInterval(id); + window.removeEventListener("resize", update); + observer?.disconnect(); -+ }; + }; +- }, [anchor]); +- const showClock = elapsedMs >= 15e3; +- return (0, react_jsx_runtime.jsxs)("div", { +- className: ChatView_module_css_default.turnStatus, +- role: "status", +- "aria-live": "polite", +- children: ["Deep diving...", showClock && (0, react_jsx_runtime.jsx)("span", { +- className: ChatView_module_css_default.turnStatusClock, +- "aria-hidden": true, +- children: formatRunDuration(elapsedMs, t) + }, [queries.length, listRef, columnRef]); + (0, react.useLayoutEffect)(() => { + const scroller = scrollerRef.current; @@ -141,16 +2110,14 @@ index 1dd0e89..dd1c233 100644 + className: "dshQueryRail_tooltipText", + children: hovered.query.preview + })] -+ })] -+ }); -+ } - /** - * The chat view slot entry: pure component over the composed props; each - * ordered business Node crosses the keyed renderer seat. -@@ -5381,11 +5505,25 @@ window.__ModuleLoader__.load({ + })] + }); + } +@@ -5381,11 +6821,58 @@ window.__ModuleLoader__.load({ const loadingOlder = useSession((s) => s.loadingOlder); const selectedCallId = useStore((s) => s.selection?.callId); const pendingSteering = (0, react.useMemo)(() => inbox.filter((item) => item.placement === "steering"), [inbox]); +- const runningTurnStart = (0, react.useMemo)(() => runningTurnStartTime(timeline), [timeline]); + const queries = (0, react.useMemo)(() => order.flatMap((key) => { + const node = nodeStore.get(key); + if (node?.kind !== "user" && node?.kind !== "steering") return []; @@ -163,7 +2130,40 @@ index 1dd0e89..dd1c233 100644 + const preview = (text || (content.images.length > 0 ? document.documentElement.lang.startsWith("zh") ? "图片 Query" : "Image query" : document.documentElement.lang.startsWith("zh") ? "无文本 Query" : "Query without text")).slice(0, 240); + return [{ key, preview }]; + }), [order, nodeStore]); - const runningTurnStart = (0, react.useMemo)(() => runningTurnStartTime(timeline), [timeline]); ++ const runningTurn = (0, react.useMemo)(() => running ? runningTurnInfo(timeline) : null, [running, timeline]); ++ const runningTurnNumber = (0, react.useMemo)(() => { ++ if (!running) return null; ++ if (runningTurn !== null && typeof runningTurn.turn === "number") return runningTurn.turn; ++ for (let index = order.length - 1; index >= 0; index--) { ++ const turn = conversationNodeTurn(nodeStore.get(order[index])); ++ if (turn !== null) return turn; ++ } ++ return null; ++ }, [running, runningTurn, order, nodeStore]); ++ const compactFlow = (0, react.useMemo)(() => compactConversationFlow(order, nodeStore, runningTurnNumber), [order, nodeStore, runningTurnNumber]); ++ const seatProps = (0, react.useMemo)(() => ({ ++ useSession, ++ selectedCallId, ++ cwd, ++ openFile, ++ inspectCall, ++ forkAt, ++ loadImage, ++ fileMentions, ++ renderSlot, ++ t ++ }), [ ++ useSession, ++ selectedCallId, ++ cwd, ++ openFile, ++ inspectCall, ++ forkAt, ++ loadImage, ++ fileMentions, ++ renderSlot, ++ t ++ ]); const listRef = (0, react.useRef)(null); const columnRef = (0, react.useRef)(null); const atBottomRef = (0, react.useRef)(true); @@ -173,8 +2173,22 @@ index 1dd0e89..dd1c233 100644 /** Last position delivered or written on the main thread. */ const observedTopRef = (0, react.useRef)(0); /** Paging anchor: semantic row/position at click, updated by reader scrolls -@@ -5405,6 +5543,12 @@ window.__ModuleLoader__.load({ - const lastNode = lastKey === null ? void 0 : nodeStore.get(lastKey); +@@ -5394,7 +6881,9 @@ window.__ModuleLoader__.load({ + const firstSeqRef = (0, react.useRef)(null); + const openedRef = (0, react.useRef)(false); + const lastKeyRef = (0, react.useRef)(null); ++ const lastUserKeyRef = (0, react.useRef)(null); + const lastSteeringIdRef = (0, react.useRef)(null); ++ const runningRef = (0, react.useRef)(false); + /** Flow tip signature — follow-scroll only when this moves, never on a + * scroll-driven at-bottom chrome re-render (which would snap inertial + * scrolls the rest of the way to the floor). */ +@@ -5402,26 +6891,37 @@ window.__ModuleLoader__.load({ + const firstKey = order[0]; + const firstSeq = firstKey === void 0 ? null : nodeStore.get(firstKey)?.anchorSeq ?? null; + const lastKey = order.at(-1) ?? null; +- const lastNode = lastKey === null ? void 0 : nodeStore.get(lastKey); ++ const lastUserKey = latestDirectUserKey(order, nodeStore); const lastSteeringId = pendingSteering[pendingSteering.length - 1]?.id ?? null; const followSig = `${openState}:${firstSeq}:${lastKey}:${order.length}:${running ? 1 : 0}:${lastSteeringId ?? ""}`; + const syncActiveQuery = (local, el) => { @@ -185,17 +2199,70 @@ index 1dd0e89..dd1c233 100644 + }; const toBottom = (el) => { anchorRef.current = null; - el.scrollTop = el.scrollHeight; -@@ -5412,6 +5556,8 @@ window.__ModuleLoader__.load({ +- el.scrollTop = el.scrollHeight; +- observedTopRef.current = el.scrollTop; atBottomRef.current = true; setAtBottom(true); chatScroll.save(null); -+ const local = listRef.current; -+ if (local !== null) syncActiveQuery(local, el); ++ settleConversationScrollBottom(el, requestAnimationFrame, () => { ++ observedTopRef.current = el.scrollTop; ++ const local = listRef.current; ++ if (local !== null) syncActiveQuery(local, el); ++ }); }; (0, react.useLayoutEffect)(() => { const local = listRef.current; -@@ -5468,6 +5614,7 @@ window.__ModuleLoader__.load({ + /* v8 ignore next -- ref-null guard: React attaches the ref before layout effects run. */ + if (local === null) return; + const el = scrollerOf(local); ++ const runningStarted = running && !runningRef.current; ++ runningRef.current = running; + if (openState === "open" && !openedRef.current) { + openedRef.current = true; + const saved = chatScroll.read(); +- if (saved === null) toBottom(el); ++ if (saved === null || runningStarted) toBottom(el); + else { + el.scrollTop = saved.scrollTop; + const row = anchorElement(local, saved.anchorKey); +@@ -5436,6 +6936,7 @@ window.__ModuleLoader__.load({ + } + firstSeqRef.current = firstSeq; + lastKeyRef.current = lastKey; ++ lastUserKeyRef.current = lastUserKey; + lastSteeringIdRef.current = lastSteeringId; + followSigRef.current = followSig; + return; +@@ -5449,18 +6950,26 @@ window.__ModuleLoader__.load({ + firstSeqRef.current = firstSeq; + /* v8 ignore next -- ?? arm: a prepend adds nodes, so the flow list here is never empty. */ + lastKeyRef.current = lastKey; ++ lastUserKeyRef.current = lastUserKey; + lastSteeringIdRef.current = lastSteeringId; + followSigRef.current = followSig; + return; + } + firstSeqRef.current = firstSeq; +- const appendedUser = lastKey !== lastKeyRef.current && lastNode?.kind === "user"; ++ const appendedUser = lastUserKey !== null && lastUserKey !== lastUserKeyRef.current; + const appendedSteering = lastSteeringId !== null && lastSteeringId !== lastSteeringIdRef.current; + const tipMoved = followSigRef.current !== followSig; + lastKeyRef.current = lastKey; ++ lastUserKeyRef.current = lastUserKey; + lastSteeringIdRef.current = lastSteeringId; + followSigRef.current = followSig; +- if (appendedUser || appendedSteering || tipMoved && atBottomRef.current) toBottom(el); ++ if (shouldFollowConversationBottom({ ++ appendedUser, ++ appendedSteering, ++ runningStarted, ++ tipMoved, ++ atBottom: atBottomRef.current ++ })) toBottom(el); + }); + const onScrollRef = (0, react.useRef)(() => {}); + onScrollRef.current = () => { +@@ -5468,6 +6977,7 @@ window.__ModuleLoader__.load({ /* v8 ignore next -- ref-null guard: the handler only fires while mounted. */ if (local === null) return; const el = scrollerOf(local); @@ -203,7 +2270,7 @@ index 1dd0e89..dd1c233 100644 const floor = Math.max(0, el.scrollHeight - el.clientHeight); const movedByReader = Math.abs(el.scrollTop - Math.min(observedTopRef.current, floor)) > .5; const isAtBottom = movedByReader ? floor - el.scrollTop <= 25 : atBottomRef.current; -@@ -5487,6 +5634,10 @@ window.__ModuleLoader__.load({ +@@ -5487,6 +6997,10 @@ window.__ModuleLoader__.load({ else if (position !== null) chatScroll.save(position); observedTopRef.current = el.scrollTop; }; @@ -214,7 +2281,22 @@ index 1dd0e89..dd1c233 100644 (0, react.useEffect)(() => { const local = listRef.current; /* v8 ignore next -- ref-null guard: effect runs after the list node commits. */ -@@ -5540,9 +5691,29 @@ window.__ModuleLoader__.load({ +@@ -5514,11 +7028,13 @@ window.__ModuleLoader__.load({ + const column = columnRef.current; + const local = listRef.current; + if (column === null || local === null || typeof ResizeObserver === "undefined") return; +- const composer = scrollerOf(local).querySelector("[data-composer-seat]"); ++ const el = scrollerOf(local); ++ const composer = el.querySelector("[data-composer-seat]"); + const observer = new ResizeObserver(() => { + followRef.current?.(); + }); + observer.observe(column); ++ observer.observe(el); + if (composer !== null) observer.observe(composer); + return () => { + observer.disconnect(); +@@ -5540,9 +7056,29 @@ window.__ModuleLoader__.load({ } loadOlder(); }; @@ -245,7 +2327,45 @@ index 1dd0e89..dd1c233 100644 ref: listRef, className: ChatView_module_css_default.scroll, children: [(0, react_jsx_runtime.jsxs)("div", { -@@ -5607,7 +5778,7 @@ window.__ModuleLoader__.load({ +@@ -5570,22 +7106,21 @@ window.__ModuleLoader__.load({ + children: loadingOlder ? t("loading") : t("chat.loadOlder") + }) + }), +- order.map((nodeKey) => (0, react_jsx_runtime.jsx)(ChatNodeSeat, { +- nodeKey, +- useSession, +- selectedCallId, +- cwd, +- openFile, +- inspectCall, +- forkAt, +- loadImage, +- fileMentions, +- renderSlot, +- t +- }, nodeKey)), +- running && (0, react_jsx_runtime.jsx)(TurnStatus, { +- startTime: runningTurnStart, +- t ++ compactFlow.map((entry) => { ++ if (entry.kind === "node") return (0, react_jsx_runtime.jsx)(ChatNodeSeat, { ++ nodeKey: entry.key, ++ ...seatProps ++ }, entry.key); ++ const turn = entry.turn === null ? void 0 : timeline.turns.get(entry.turn); ++ const activityNodes = entry.nodeKeys.map((key) => nodeStore.get(key)).filter((node) => node !== void 0); ++ return (0, react_jsx_runtime.jsx)(ExecutionStatusGroup, { ++ entry, ++ activityNodes, ++ startTime: turn?.start?.time ?? (entry.running ? runningTurn?.startTime ?? null : null), ++ endTime: turn?.end?.time ?? null, ++ seatProps, ++ t ++ }, entry.key); + }), + pendingSteering.map((item) => (0, react_jsx_runtime.jsx)(PendingSteeringBubble, { + content: item.content, +@@ -5607,7 +7142,7 @@ window.__ModuleLoader__.load({ children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronDownOutline14, {}) }) })] @@ -254,3 +2374,7466 @@ index 1dd0e89..dd1c233 100644 }); } //#endregion +@@ -5816,6 +7351,18 @@ window.__ModuleLoader__.load({ + /** Simplified Chinese dictionary (the key-set source of truth). */ + const zh = { + "view.chat": "对话", ++ "view.research": "研究", ++ "research.right.conversation": "对话", ++ "research.right.files": "文件", ++ "research.right.add": "添加标签页", ++ "research.right.closeFiles": "关闭文件", ++ "research.right.closeDetails": "关闭详情", ++ "research.right.pathUnavailable": "路径不可用", ++ "research.right.source.computer": "本地电脑", ++ "research.right.source.sherlock": "Sherlock", ++ "research.files.unavailable": "所选文件不可用，请重新选择", ++ "research.references.unavailable": "所选重点引用过多或不可用，请减少后重试", ++ "research.canvas": "研究画布", + "hint.plan": PLAN_NEXT_ACTION_ZH, + "hint.goal": "输入目标，智能体将持续执行", + "hint.goal.active": "当前目标进行中。可输入 edit 修改 / pause 暂停 / resume 继续 / clear 清除", +@@ -5870,12 +7417,15 @@ window.__ModuleLoader__.load({ + "settings.enter.description": "仅在智能体运行时生效；Cmd/Ctrl+Enter 使用另一行为", + "settings.enter.queue": "排队发送", + "settings.enter.steer": "插话发送", +- "access.confirm.title": "确认启用 Full access？", +- "access.confirm.description": "启用 Full access 后，agent 将减少确认步骤，并且可以直接执行更多操作，包括敏感操作、文件修改或外部命令。仅建议在你信任当前任务时使用。", ++ "access.mode.readOnly": "只读", ++ "access.mode.workspaceWrite": "工作区写入", ++ "access.mode.fullAccess": "完全访问", ++ "access.confirm.title": "确认启用完全访问？", ++ "access.confirm.description": "启用完全访问后，agent 将减少确认步骤，并且可以直接执行更多操作，包括敏感操作、文件修改或外部命令。仅建议在你信任当前任务时使用。", + "access.confirm.acknowledge": "我已了解风险，并愿意继续", + "access.confirm.cancel": "取消", +- "access.confirm.enable": "启用 Full access", +- "hero.headline": "探索未至之境", ++ "access.confirm.enable": "启用完全访问", ++ "hero.headline": "迷雾之中，洞见真相", + "hero.preview": "预览版", + "hero.chooseWorkspace": "选择工作区", + "session.hierarchy": "会话层级", +@@ -5896,6 +7446,46 @@ window.__ModuleLoader__.load({ + "chat.loadError": "历史加载失败：{message}（{code}）", + "chat.loadOlder": "加载更早", + "chat.toBottom": "回到底部", ++ "execution.status.analyzing": "正在分析任务…", ++ "execution.status.context": "正在准备任务上下文…", ++ "execution.status.planning": "正在制定任务计划…", ++ "execution.status.reading": "正在读取相关内容…", ++ "execution.status.searching": "正在检索项目内容…", ++ "execution.status.updating": "正在更新文件…", ++ "execution.status.verifying": "正在验证运行结果…", ++ "execution.status.researching": "正在使用互联网搜索…", ++ "execution.status.webSearchTopic": "正在使用互联网搜索“{topic}”…", ++ "execution.status.currentTask": "正在{task}…", ++ "execution.status.pptSkill": "正在加载 PPT 制作能力…", ++ "execution.status.pptWriting": "正在撰写 PPT 文件…", ++ "execution.status.pptRendering": "正在渲染 PPT 预览…", ++ "execution.status.pptVerifying": "正在校验 PPT 文件…", ++ "execution.status.skill": "正在加载专业能力…", ++ "execution.status.executing": "正在执行检查…", ++ "execution.status.command": "正在处理指令…", ++ "execution.status.compacting": "正在自动压缩上下文…", ++ "execution.status.manualCompacting": "正在压缩上下文…", ++ "execution.status.retrying": "正在重试任务…", ++ "execution.status.working": "正在执行任务…", ++ "execution.status.completed": "已完成", ++ "execution.status.history": "执行过程", ++ "execution.status.elapsed": "· 用时 {duration}", ++ "execution.progress.completed": "阶段进展：{task}。", ++ "execution.progress.researched": "资料检索进展：{task}。", ++ "execution.progress.researchReady": "资料检索与信息整理取得阶段进展。", ++ "execution.progress.draftReady": "内容编写与文件更新取得阶段进展。", ++ "execution.progress.previewReady": "预览渲染与视觉检查取得阶段进展。", ++ "execution.progress.verificationReady": "方案检查与结果校验取得阶段进展。", ++ "execution.details.title": "执行详情", ++ "execution.details.expand": "展开执行详情", ++ "execution.details.collapse": "收起执行详情", ++ "execution.details.group.readSearch": "读取与检索", ++ "execution.details.group.toolsSkills": "工具与技能", ++ "execution.details.group.runChange": "执行与修改", ++ "execution.details.group.taskVerify": "任务与校验", ++ "execution.details.group.other": "其他记录", ++ "execution.details.group.count": "{count} 项", ++ "execution.details.group.errors": "{count} 个错误", + "message.extraBlock": "附加内容块", + "message.contextInjection": "上下文注入", + "message.contextRecall": "跨会话召回", +@@ -5981,6 +7571,18 @@ window.__ModuleLoader__.load({ + /** English dictionary, checked complete against the zh key set. */ + const en = { + "view.chat": "Chat", ++ "view.research": "Research", ++ "research.right.conversation": "Conversation", ++ "research.right.files": "Files", ++ "research.right.add": "Add tab", ++ "research.right.closeFiles": "Close Files", ++ "research.right.closeDetails": "Close Details", ++ "research.right.pathUnavailable": "Path unavailable", ++ "research.right.source.computer": "Computer", ++ "research.right.source.sherlock": "Sherlock", ++ "research.files.unavailable": "One or more selected files are unavailable. Please select them again.", ++ "research.references.unavailable": "One or more selected references are unavailable or too large. Remove some and try again.", ++ "research.canvas": "Research canvas", + "hint.plan": PLAN_NEXT_ACTION_EN, + "hint.goal": "describe the objective for a long-running task", + "hint.goal.active": "goal active — edit / pause / resume / clear", +@@ -6035,12 +7637,15 @@ window.__ModuleLoader__.load({ + "settings.enter.description": "Busy only; Cmd/Ctrl+Enter uses the other behavior", + "settings.enter.queue": "Queue", + "settings.enter.steer": "Steer", ++ "access.mode.readOnly": "Read Only", ++ "access.mode.workspaceWrite": "Workspace Write", ++ "access.mode.fullAccess": "Full access", + "access.confirm.title": "Enable Full access?", + "access.confirm.description": "Full access reduces confirmation steps and lets the agent perform more actions directly, including sensitive operations, file changes, or external commands. Only use it when you trust the current task.", + "access.confirm.acknowledge": "I understand the risks and want to continue", + "access.confirm.cancel": "Cancel", + "access.confirm.enable": "Enable Full access", +- "hero.headline": "Into the Unknown", ++ "hero.headline": "Through the Mist, See the Truth", + "hero.preview": "Preview", + "hero.chooseWorkspace": "Choose workspace", + "session.hierarchy": "Session hierarchy", +@@ -6061,6 +7666,46 @@ window.__ModuleLoader__.load({ + "chat.loadError": "Failed to load history: {message} ({code})", + "chat.loadOlder": "Load earlier", + "chat.toBottom": "Back to bottom", ++ "execution.status.analyzing": "Analyzing the task…", ++ "execution.status.context": "Preparing task context…", ++ "execution.status.planning": "Planning the task…", ++ "execution.status.reading": "Reading relevant content…", ++ "execution.status.searching": "Searching the project…", ++ "execution.status.updating": "Updating files…", ++ "execution.status.verifying": "Verifying the result…", ++ "execution.status.researching": "Searching the internet…", ++ "execution.status.webSearchTopic": "Searching the internet for “{topic}”…", ++ "execution.status.currentTask": "Working on {task}…", ++ "execution.status.pptSkill": "Loading PPT authoring capabilities…", ++ "execution.status.pptWriting": "Writing the PPT file…", ++ "execution.status.pptRendering": "Rendering the PPT preview…", ++ "execution.status.pptVerifying": "Validating the PPT file…", ++ "execution.status.skill": "Loading specialist capabilities…", ++ "execution.status.executing": "Running checks…", ++ "execution.status.command": "Processing the command…", ++ "execution.status.compacting": "Automatically compacting context…", ++ "execution.status.manualCompacting": "Compacting context…", ++ "execution.status.retrying": "Retrying the task…", ++ "execution.status.working": "Working on the task…", ++ "execution.status.completed": "Completed", ++ "execution.status.history": "Process", ++ "execution.status.elapsed": "· {duration}", ++ "execution.progress.completed": "Milestone update: {task}.", ++ "execution.progress.researched": "Research update: {task}.", ++ "execution.progress.researchReady": "Research and source review made progress.", ++ "execution.progress.draftReady": "Content authoring and file updates made progress.", ++ "execution.progress.previewReady": "Preview rendering and visual review made progress.", ++ "execution.progress.verificationReady": "Validation and result checks made progress.", ++ "execution.details.title": "Execution details", ++ "execution.details.expand": "Expand execution details", ++ "execution.details.collapse": "Collapse execution details", ++ "execution.details.group.readSearch": "Read and search", ++ "execution.details.group.toolsSkills": "Tools and skills", ++ "execution.details.group.runChange": "Run and change", ++ "execution.details.group.taskVerify": "Tasks and verification", ++ "execution.details.group.other": "Other activity", ++ "execution.details.group.count": "{count} items", ++ "execution.details.group.errors": "{count} errors", + "message.extraBlock": "Extra content block", + "message.contextInjection": "Context injection", + "message.contextRecall": "Session recall", +@@ -6383,7 +8028,7 @@ window.__ModuleLoader__.load({ + */ + function QueueDock({ useSession, updateQueue, notify, t }) { + const inbox = useSession((s) => s.queue); +- const queue = (0, react.useMemo)(() => inbox.filter((row) => row.placement === "queued"), [inbox]); ++ const queue = (0, react.useMemo)(() => userQueuedMessages(inbox), [inbox]); + const running = useSession((s) => s.running); + const queueMutable = useSession((s) => s.subagent === null); + const [editing, setEditing] = (0, react.useState)(null); +@@ -6627,7 +8272,7 @@ window.__ModuleLoader__.load({ + const tag = document.createElement("style"); + tag.dataset.plugin = "@deepseek-ai/dsh-client-ui-conversation"; + tag.dataset.pluginCss = tagId$7; +- tag.textContent = css$7; ++ tag.textContent = css$7 + ".pXSMma_headline{grid-template-columns:auto auto}.pXSMma_headlineText{grid-area:1/1}.pXSMma_previewBadge{grid-area:1/2}"; + document.head.appendChild(tag); + } + var HeroShell_module_css_default = { +@@ -6751,40 +8396,5472 @@ window.__ModuleLoader__.load({ + })] + }); + } +- /** +- * Render the hero chrome (headline only; no glow, no composer, no workspace +- * row — the glow is the owner's {@link HeroGlow}). +- * @param props - see {@link HeroShellProps}. +- * @returns the centered hero element tree. +- */ +- function HeroShell({ t, children }) { +- return (0, react_jsx_runtime.jsxs)("div", { +- className: HeroShell_module_css_default.root, +- children: [(0, react_jsx_runtime.jsxs)("div", { +- className: HeroShell_module_css_default.stack, +- children: [(0, react_jsx_runtime.jsxs)("div", { +- className: HeroShell_module_css_default.headline, +- children: [ +- (0, react_jsx_runtime.jsx)("span", { +- className: HeroShell_module_css_default.fishHitbox, +- children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.FishLogo, { +- size: 34, +- className: HeroShell_module_css_default.fish +- }) +- }), +- (0, react_jsx_runtime.jsx)("span", { +- className: HeroShell_module_css_default.headlineText, +- children: t("hero.headline") +- }), +- (0, react_jsx_runtime.jsx)("span", { +- className: HeroShell_module_css_default.previewBadge, +- children: t("hero.preview") +- }) +- ] +- }), (0, react_jsx_runtime.jsx)("div", { className: HeroShell_module_css_default.body })] +- }), children] ++ /** ++ * Render the hero chrome (headline only; no glow, no composer, no workspace ++ * row — the glow is the owner's {@link HeroGlow}). ++ * @param props - see {@link HeroShellProps}. ++ * @returns the centered hero element tree. ++ */ ++ function HeroShell({ t, children }) { ++ return (0, react_jsx_runtime.jsxs)("div", { ++ className: HeroShell_module_css_default.root, ++ children: [(0, react_jsx_runtime.jsxs)("div", { ++ className: HeroShell_module_css_default.stack, ++ children: [(0, react_jsx_runtime.jsxs)("div", { ++ className: HeroShell_module_css_default.headline, ++ children: [ ++ (0, react_jsx_runtime.jsx)("span", { ++ className: HeroShell_module_css_default.headlineText, ++ children: t("hero.headline") ++ }), ++ (0, react_jsx_runtime.jsx)("span", { ++ className: HeroShell_module_css_default.previewBadge, ++ children: t("hero.preview") ++ }) ++ ] ++ }), (0, react_jsx_runtime.jsx)("div", { className: HeroShell_module_css_default.body })] ++ }), children] ++ }); ++ } ++ //#endregion ++ //#region lib/types/client/skeleton/ResearchCanvas.js ++ const RESEARCH_CANVAS_MIN_SCALE = .1; ++ const RESEARCH_CANVAS_MAX_SCALE = 4; ++ const RESEARCH_CANVAS_RETURN_MAX_SCALE = .8; ++ const RESEARCH_CANVAS_RETURN_PADDING = 96; ++ const RESEARCH_CANVAS_ORGANIZE_PADDING = 48; ++ const RESEARCH_CANVAS_ORGANIZE_NODE_GAP = 32; ++ const RESEARCH_CANVAS_ORGANIZE_GROUP_GAP = 56; ++ const RESEARCH_CANVAS_GRID_SIZE = 22; ++ const SHERLOCK_FILE_DRAG_TYPE = "application/x-sherlock-file"; ++ const RESEARCH_CANVAS_STORAGE_PREFIX = "sherlock.research.canvas.files.v1:"; ++ const RESEARCH_ARTIFACT_DRAG_TYPE = "application/x-sherlock-research-artifact"; ++ const RESEARCH_CANVAS_SELECTION_PREFIX = "sherlock.research.canvas.selection.v1:"; ++ const RESEARCH_CANVAS_ARTIFACTS_PREFIX = "sherlock.research.canvas.artifacts.v1:"; ++ const RESEARCH_CANVAS_REVOCATION_OUTBOX_PREFIX = "sherlock.research.canvas.preview-revocations.v1:"; ++ const RESEARCH_CANVAS_FILE_STACK_OFFSET = 18; ++ const RESEARCH_CANVAS_TEXT_LIMIT = 512; ++ const SHERLOCK_FILE_DRAG_RAW_LIMIT = 2048; ++ const RESEARCH_CANVAS_PERSISTED_FILES_RAW_LIMIT = 8388608; ++ const RESEARCH_CANVAS_PERSISTED_ARTIFACTS_RAW_LIMIT = 8388608; ++ const RESEARCH_CANVAS_MAX_FILES_PER_DROP = 64; ++ const RESEARCH_CANVAS_MAX_FILES_PER_SESSION = 256; ++ const RESEARCH_CANVAS_MAX_ARTIFACTS_PER_SESSION = 256; ++ const RESEARCH_CANVAS_MAX_REVOCATION_OUTBOX = 256; ++ const RESEARCH_CANVAS_REVOCATION_OUTBOX_RAW_LIMIT = RESEARCH_CANVAS_MAX_REVOCATION_OUTBOX * (RESEARCH_CANVAS_TEXT_LIMIT * 6 + 4); ++ const RESEARCH_CANVAS_TITLE_HEIGHT = 32; ++ const RESEARCH_CANVAS_MAX_NODE_SIZE = 2400; ++ const RESEARCH_CANVAS_NODE_POLICIES = Object.freeze({ ++ generic: Object.freeze({ width: 220, height: 64, minWidth: 220, minHeight: 64, resizable: false }), ++ assistant: Object.freeze({ width: 520, height: 300, minWidth: 360, minHeight: 120, resizable: true }), ++ image: Object.freeze({ width: 320, height: 272, minWidth: 160, minHeight: 152, aspectRatio: 4 / 3, resizable: true }), ++ pdf: Object.freeze({ width: 320, height: 320 / (17 / 22) + RESEARCH_CANVAS_TITLE_HEIGHT, minWidth: 240, minHeight: 240 / (17 / 22) + RESEARCH_CANVAS_TITLE_HEIGHT, aspectRatio: 17 / 22, resizable: true }), ++ html: Object.freeze({ width: 480, height: 360, minWidth: 320, minHeight: 240, resizable: true }), ++ markdown: Object.freeze({ width: 420, height: 320, minWidth: 280, minHeight: 180, resizable: true }), ++ text: Object.freeze({ width: 420, height: 320, minWidth: 280, minHeight: 180, resizable: true }), ++ docx: Object.freeze({ width: 480, height: 360, minWidth: 320, minHeight: 240, resizable: true }), ++ xlsx: Object.freeze({ width: 480, height: 360, minWidth: 320, minHeight: 240, resizable: true }), ++ pptx: Object.freeze({ width: 480, height: 360, minWidth: 320, minHeight: 240, resizable: true }) ++ }); ++ const RESEARCH_NATIVE_TEXT_MAX_BYTES = 2 * 1024 * 1024; ++ const RESEARCH_PDF_RENDER_OVERSCAN_PX = 240; ++ const RESEARCH_PDF_PAGE_GAP_PX = 12; ++ const RESEARCH_PDF_MAX_DPR = 2; ++ const RESEARCH_PDF_MAX_BACKING_PIXELS = 8e6; ++ const RESEARCH_PDF_MAX_IMAGE_PIXELS = 8e6; ++ const RESEARCH_PDF_MAX_PAGES = 2e3; ++ const RESEARCH_PDF_METADATA_CONCURRENCY = 4; ++ const RESEARCH_PDF_LOADER_URL = "/sherlock-pdfjs/loader.js"; ++ const RESEARCH_PDF_CMAP_URL = "/sherlock-pdfjs/cmaps/"; ++ const RESEARCH_PDF_STANDARD_FONT_URL = "/sherlock-pdfjs/standard_fonts/"; ++ const RESEARCH_NATIVE_WHEEL_MAX_DELTA = 4096; ++ const RESEARCH_NATIVE_WHEEL_MAX_FRAME_SIZE = 32768; ++ let researchCanvasWheelGeneration = 0; ++ let researchCanvasWheelOwnerSequence = 0; ++ function nextResearchCanvasWheelGeneration() { ++ researchCanvasWheelGeneration += 1; ++ return researchCanvasWheelGeneration; ++ } ++ function nextResearchCanvasWheelOwnerId() { ++ researchCanvasWheelOwnerSequence += 1; ++ return `research-canvas-${researchCanvasWheelOwnerSequence}`; ++ } ++ let researchPdfLibraryPromise = null; ++ const RESEARCH_ARTIFACT_MAX_TITLE = 256; ++ const RESEARCH_ARTIFACT_MAX_EXCERPT = 16384; ++ const RESEARCH_GENERATION_MAX_OUTPUT = 24e4; ++ const RESEARCH_GENERATION_MAX_SOURCES = 24; ++ const RESEARCH_GENERATION_MAX_EVENTS = 80; ++ const RESEARCH_GENERATION_MAX_PARTIAL_TEXT = 16384; ++ const RESEARCH_ARTIFACT_KINDS = /* @__PURE__ */ new Set(["assistant-result", "assistant-excerpt", "generated-summary", "generated-mind-map", "web-link", "generated-container"]); ++ const RESEARCH_GENERATION_STATUSES = /* @__PURE__ */ new Set(["draft", "queued", "running", "completed", "failed", "cancelled", "interrupted"]); ++ const RESEARCH_ACTIVE_GENERATION_STATUSES = /* @__PURE__ */ new Set(["queued", "running"]); ++ const RESEARCH_CONTAINER_TYPES = /* @__PURE__ */ new Set(["web", "chart", "table", "kpi", "markdown"]); ++ const RESEARCH_CONTAINER_REFRESH_MINUTES = /* @__PURE__ */ new Set([0, 1, 5, 15, 30]); ++ const RESEARCH_CONTAINER_MAX_PROMPT = 8e3; ++ const RESEARCH_CONTAINER_MAX_MARKDOWN = 32e3; ++ const RESEARCH_TASK_START_PATH = "/sherlock/research-tasks/start"; ++ const RESEARCH_TASK_INSPECT_PATH = "/sherlock/research-tasks/inspect"; ++ const RESEARCH_TASK_CANCEL_PATH = "/sherlock/research-tasks/cancel"; ++ const RESEARCH_MIND_MAP_DETAILS = /* @__PURE__ */ new Set(["brief", "standard", "detailed"]); ++ const RESEARCH_MIND_MAP_DETAIL_OPTIONS = [ ++ { value: "brief", label: "简要", description: "不超过 3 层，高度概括" }, ++ { value: "standard", label: "常规", description: "平衡阅读效率与内容理解" }, ++ { value: "detailed", label: "详细", description: "充分展开内容关系细节" } ++ ]; ++ const RESEARCH_ARTIFACT_DRAG_KEYS = ["sessionId", "messageId", "kind", "title", "excerpt"]; ++ const RESEARCH_ARTIFACT_DRAG_RAW_LIMIT = JSON.stringify({ sessionId: "", messageId: "", kind: "", title: "", excerpt: "" }).length + 6 * (RESEARCH_CANVAS_TEXT_LIMIT * 2 + "assistant-excerpt".length + RESEARCH_ARTIFACT_MAX_TITLE + RESEARCH_ARTIFACT_MAX_EXCERPT); ++ const RESEARCH_PROMPT_PREFIX = "␞SHERLOCK_RESEARCH_FILES_V1 "; ++ const RESEARCH_PROMPT_SUFFIX = "␟"; ++ const RESEARCH_FILE_REFERENCE_PREFIX = "␞SHERLOCK_RESEARCH_FILE_REFERENCE_V1 "; ++ const RESEARCH_ARTIFACT_REFERENCE_PREFIX = "␞SHERLOCK_RESEARCH_ARTIFACT_REFERENCE_V1 "; ++ const CHAT_FILE_REFERENCE_SOURCE = "chat-file"; ++ const RESEARCH_FILE_REFERENCE_SOURCE = "research-file"; ++ const RESEARCH_ARTIFACT_REFERENCE_SOURCE = "research-artifact"; ++ const RESEARCH_PROMPT_MAX_FILES = 64; ++ const RESEARCH_PROMPT_MAX_ARTIFACTS = 64; ++ const RESEARCH_PROMPT_MAX_HEADER = 131072; ++ const RESEARCH_ARTIFACT_REFERENCE_RAW_LIMIT = 6 * (RESEARCH_CANVAS_TEXT_LIMIT * 2 + RESEARCH_ARTIFACT_MAX_TITLE + RESEARCH_ARTIFACT_MAX_EXCERPT + 128); ++ const EMPTY_RESEARCH_SELECTION = Object.freeze({ selectedNodeIds: [], orderedFileIds: [] }); ++ let researchCanvasFileSequence = 0; ++ let researchCanvasArtifactSequence = 0; ++ function createResearchCanvasFileId() { ++ researchCanvasFileSequence += 1; ++ return globalThis.crypto?.randomUUID?.() ?? `research-file-${Date.now()}-${researchCanvasFileSequence}`; ++ } ++ function createResearchCanvasArtifactId() { ++ researchCanvasArtifactSequence += 1; ++ return globalThis.crypto?.randomUUID?.() ?? `research-artifact-${Date.now()}-${researchCanvasArtifactSequence}`; ++ } ++ function boundedString(value, optional = false) { ++ if (value === void 0 && optional) return void 0; ++ return typeof value === "string" && value.length > 0 && value.length <= RESEARCH_CANVAS_TEXT_LIMIT ? value : null; ++ } ++ function normalizeResearchWebUrl(value) { ++ if (typeof value !== "string") return null; ++ const source = value.trim().replace(/^(https?:\/\/)(?:(?:%0[9a-d])|%20|[\u0009-\u000d\u0020])+/i, "$1"); ++ if (source.length === 0 || source.length > 8192) return null; ++ try { ++ const Url = typeof globalThis.URL === "function" ? globalThis.URL : globalThis.window?.URL; ++ if (typeof Url !== "function") return null; ++ const url = new Url(source); ++ if (url.protocol !== "http:" && url.protocol !== "https:" || url.username !== "" || url.password !== "") return null; ++ url.hostname = url.hostname.toLowerCase(); ++ if (url.protocol === "https:" && url.port === "443" || url.protocol === "http:" && url.port === "80") url.port = ""; ++ return url.href; ++ } catch { ++ return null; ++ } ++ } ++ function researchWebUrlHostname(value) { ++ try { ++ const Url = typeof globalThis.URL === "function" ? globalThis.URL : globalThis.window?.URL; ++ return typeof Url === "function" ? new Url(value).hostname : "网页"; ++ } catch { ++ return "网页"; ++ } ++ } ++ function cleanResearchWebTitle(value) { ++ if (typeof value !== "string") return ""; ++ return value.replace(/^(?:(?:%0[9a-d])|%20|[\u0009-\u000d\u0020])+/gi, "").replace(/[\u0000-\u001f\u007f]+/g, " ").replace(/\s+/g, " ").trim().slice(0, RESEARCH_ARTIFACT_MAX_TITLE); ++ } ++ function normalizeResearchWebTitle(value, url) { ++ const hostname = researchWebUrlHostname(url); ++ const title = cleanResearchWebTitle(value); ++ if (title === "") return hostname; ++ const normalizedTitleUrl = normalizeResearchWebUrl(title); ++ if (normalizedTitleUrl === url || title.toLowerCase() === hostname.toLowerCase()) return hostname; ++ return title; ++ } ++ function researchWebTitleMode(value, title, url) { ++ if (value === "auto" || value === "custom") return value; ++ const cleaned = cleanResearchWebTitle(title); ++ if (cleaned === "") return "auto"; ++ const hostname = researchWebUrlHostname(url); ++ return normalizeResearchWebUrl(cleaned) === url || cleaned.toLowerCase() === hostname.toLowerCase() ? "auto" : "custom"; ++ } ++ function researchWebFrameLayout(containerWidth, scrollWidth) { ++ const width = Number.isFinite(containerWidth) && containerWidth > 0 ? containerWidth : 1; ++ const contentWidth = Number.isFinite(scrollWidth) && scrollWidth > 0 ? Math.max(width, scrollWidth) : width; ++ const scale = Math.round(Math.max(.65, Math.min(1, width / contentWidth)) * 1e4) / 1e4; ++ return { logicalWidth: Math.round(width / scale), scale }; ++ } ++ function researchContainerExactKeys(value, required, optional = []) { ++ if (typeof value !== "object" || value === null || Array.isArray(value)) return false; ++ const keys = Object.keys(value); ++ if (required.some((key) => !keys.includes(key))) return false; ++ return keys.every((key) => required.includes(key) || optional.includes(key)); ++ } ++ function researchContainerText(value, limit, allowEmpty = false) { ++ if (typeof value !== "string" || value.length > limit) return null; ++ const text = value.trim(); ++ return text === "" && !allowEmpty ? null : value; ++ } ++ function researchContainerScalar(value) { ++ if (typeof value === "number") return Number.isFinite(value) && Math.abs(value) <= 1e15 ? value : null; ++ return researchContainerText(value, 512); ++ } ++ function stripResearchContainerFence(value) { ++ const source = value.trim(); ++ const match = source.match(/^```(?:json)?\s*\n([\s\S]*?)\n```$/i); ++ return match?.[1]?.trim() ?? source; ++ } ++ function parseResearchContainerSpec(raw) { ++ let value = raw; ++ try { ++ if (typeof raw === "string") value = JSON.parse(stripResearchContainerFence(raw)); ++ } catch { ++ return null; ++ } ++ if (typeof value !== "object" || value === null || Array.isArray(value) || value.version !== 1 || !RESEARCH_CONTAINER_TYPES.has(value.type)) return null; ++ const title = researchContainerText(value.title, 256); ++ if (title === null) return null; ++ if (value.type === "web") { ++ if (!researchContainerExactKeys(value, ["version", "type", "title", "url"], ["description"])) return null; ++ const url = normalizeResearchWebUrl(value.url); ++ const description = value.description === void 0 ? void 0 : researchContainerText(value.description, 1024); ++ return url === null || value.description !== void 0 && description === null ? null : Object.freeze({ version: 1, type: "web", title, url, ...(description === void 0 ? {} : { description }) }); ++ } ++ if (value.type === "chart") { ++ if (!researchContainerExactKeys(value, ["version", "type", "title", "variant", "labels", "series"]) || value.variant !== "bar" && value.variant !== "line" || !Array.isArray(value.labels) || value.labels.length < 1 || value.labels.length > 24 || !Array.isArray(value.series) || value.series.length < 1 || value.series.length > 6) return null; ++ const labels = value.labels.map((label) => researchContainerText(label, 128)); ++ if (labels.some((label) => label === null)) return null; ++ const series = []; ++ for (const item of value.series) { ++ if (!researchContainerExactKeys(item, ["name", "values"]) || !Array.isArray(item.values) || item.values.length !== labels.length) return null; ++ const name = researchContainerText(item.name, 128); ++ const values = item.values.map((entry) => typeof entry === "number" && Number.isFinite(entry) && Math.abs(entry) <= 1e15 ? entry : null); ++ if (name === null || values.some((entry) => entry === null)) return null; ++ series.push(Object.freeze({ name, values: Object.freeze(values) })); ++ } ++ return Object.freeze({ version: 1, type: "chart", title, variant: value.variant, labels: Object.freeze(labels), series: Object.freeze(series) }); ++ } ++ if (value.type === "table") { ++ if (!researchContainerExactKeys(value, ["version", "type", "title", "columns", "rows"]) || !Array.isArray(value.columns) || value.columns.length < 1 || value.columns.length > 12 || !Array.isArray(value.rows) || value.rows.length > 100) return null; ++ const columns = value.columns.map((column) => researchContainerText(column, 128)); ++ if (columns.some((column) => column === null)) return null; ++ const rows = []; ++ for (const row of value.rows) { ++ if (!Array.isArray(row) || row.length !== columns.length) return null; ++ const cells = row.map(researchContainerScalar); ++ if (cells.some((cell) => cell === null)) return null; ++ rows.push(Object.freeze(cells)); ++ } ++ return Object.freeze({ version: 1, type: "table", title, columns: Object.freeze(columns), rows: Object.freeze(rows) }); ++ } ++ if (value.type === "kpi") { ++ if (!researchContainerExactKeys(value, ["version", "type", "title", "items"]) || !Array.isArray(value.items) || value.items.length < 1 || value.items.length > 12) return null; ++ const items = []; ++ for (const item of value.items) { ++ if (!researchContainerExactKeys(item, ["label", "value"], ["change"])) return null; ++ const label = researchContainerText(item.label, 128); ++ const result = researchContainerScalar(item.value); ++ const change = item.change === void 0 ? void 0 : researchContainerScalar(item.change); ++ if (label === null || result === null || item.change !== void 0 && change === null) return null; ++ items.push(Object.freeze({ label, value: result, ...(change === void 0 ? {} : { change }) })); ++ } ++ return Object.freeze({ version: 1, type: "kpi", title, items: Object.freeze(items) }); ++ } ++ if (!researchContainerExactKeys(value, ["version", "type", "title", "content"])) return null; ++ const content = researchContainerText(value.content, RESEARCH_CONTAINER_MAX_MARKDOWN); ++ return content === null ? null : Object.freeze({ version: 1, type: "markdown", title, content }); ++ } ++ function normalizeResearchCanvasTitle(value) { ++ if (typeof value !== "string") return null; ++ const title = value.trim(); ++ if (title.length > RESEARCH_ARTIFACT_MAX_TITLE || /[\u0000-\u001f\u007f-\u009f]/.test(title)) return null; ++ return title; ++ } ++ function normalizeResearchCanvasDisplayName(value, sourceName) { ++ const title = normalizeResearchCanvasTitle(value); ++ if (title === null) return null; ++ return title === "" || title === sourceName ? void 0 : title; ++ } ++ function researchPromptBasename(value) { ++ const parts = String(value ?? "").split(/[\\/]/).filter(Boolean); ++ return parts.at(-1) ?? String(value ?? ""); ++ } ++ function canonicalResearchPromptFile(value) { ++ if (typeof value !== "object" || value === null) return null; ++ const id = boundedString(value.id); ++ const name = boundedString(researchPromptBasename(value.name)); ++ const path = boundedString(value.path); ++ return id === null || name === null || path === null ? null : { id, name, path }; ++ } ++ function canonicalResearchFileReference(value) { ++ if (typeof value !== "object" || value === null) return null; ++ const id = boundedString(value.id); ++ const name = boundedString(value.name); ++ const path = boundedString(value.path, true); ++ return id === null || name === null || path === null ? null : { ++ id, ++ name, ++ ...(path === void 0 ? {} : { path }) ++ }; ++ } ++ function canonicalResearchArtifactReference(value) { ++ if (typeof value !== "object" || value === null) return null; ++ const id = boundedResearchArtifactString(value.id, RESEARCH_CANVAS_TEXT_LIMIT); ++ const kind = RESEARCH_ARTIFACT_KINDS.has(value.kind) ? value.kind : void 0; ++ const messageId = boundedResearchArtifactString(value.messageId, RESEARCH_CANVAS_TEXT_LIMIT); ++ const title = boundedResearchArtifactString(value.title, RESEARCH_ARTIFACT_MAX_TITLE); ++ const excerpt = preserveResearchArtifactText(value.excerpt); ++ return id === null || messageId === null || title === null || excerpt === null ? null : { id, ...(kind === void 0 ? {} : { kind }), messageId, title, excerpt }; ++ } ++ function researchPromptFiles(value, allowEmpty = false) { ++ if (!Array.isArray(value) || !allowEmpty && value.length === 0 || value.length > RESEARCH_PROMPT_MAX_FILES) return null; ++ const files = []; ++ const ids = /* @__PURE__ */ new Set(); ++ for (const item of value) { ++ const file = canonicalResearchPromptFile(item); ++ if (file === null || ids.has(file.id)) return null; ++ ids.add(file.id); ++ files.push(file); ++ } ++ return files; ++ } ++ function researchPromptArtifacts(value) { ++ if (value === void 0) return []; ++ if (!Array.isArray(value) || value.length > RESEARCH_PROMPT_MAX_ARTIFACTS) return null; ++ const artifacts = []; ++ const ids = /* @__PURE__ */ new Set(); ++ for (const item of value) { ++ const artifact = canonicalResearchArtifactReference(item); ++ if (artifact === null || ids.has(artifact.id)) return null; ++ ids.add(artifact.id); ++ artifacts.push(artifact); ++ } ++ return artifacts; ++ } ++ function researchPromptOccurrences(value, descriptors, text, idKey) { ++ if (value === void 0) return []; ++ if (!Array.isArray(value) || value.length > Math.max(RESEARCH_PROMPT_MAX_FILES, RESEARCH_PROMPT_MAX_ARTIFACTS)) return null; ++ if (value.length === 0) return []; ++ const ids = /* @__PURE__ */ new Set(descriptors.map((descriptor) => descriptor.id)); ++ let previousOffset = -1; ++ const occurrences = []; ++ for (const item of value) { ++ if (typeof item !== "object" || item === null) return null; ++ const id = boundedString(item[idKey]); ++ const offset = item.offset; ++ const order = item.order; ++ if (id === null || !ids.has(id) || !Number.isInteger(offset) || offset < previousOffset || offset < 0 || offset > text.length || order !== void 0 && (!Number.isInteger(order) || order < 0)) return null; ++ previousOffset = offset; ++ occurrences.push({ [idKey]: id, offset, ...(order === void 0 ? {} : { order }) }); ++ } ++ return occurrences; ++ } ++ function serializeResearchPrompt(files, text, occurrences = [], artifacts = [], artifactOccurrences = []) { ++ if ((!Array.isArray(files) || files.length === 0) && (!Array.isArray(artifacts) || artifacts.length === 0)) return String(text ?? ""); ++ const descriptors = researchPromptFiles(files, true); ++ if (descriptors === null) throw new TypeError("Invalid Sherlock Research file descriptors"); ++ const quotedArtifacts = researchPromptArtifacts(artifacts); ++ if (quotedArtifacts === null || descriptors.length === 0 && quotedArtifacts.length === 0) throw new TypeError("Invalid Sherlock Research assistant references"); ++ const body = String(text ?? ""); ++ const positions = researchPromptOccurrences(occurrences, descriptors, body, "fileId"); ++ if (positions === null) throw new TypeError("Invalid Sherlock Research file occurrences"); ++ const quotePositions = researchPromptOccurrences(artifactOccurrences, quotedArtifacts, body, "artifactId"); ++ if (quotePositions === null) throw new TypeError("Invalid Sherlock Research assistant occurrences"); ++ const payload = JSON.stringify({ ++ files: descriptors, ++ ...(positions.length === 0 ? {} : { occurrences: positions }), ++ ...(quotedArtifacts.length === 0 ? {} : { artifacts: quotedArtifacts }), ++ ...(quotePositions.length === 0 ? {} : { artifactOccurrences: quotePositions }) ++ }).replaceAll(RESEARCH_PROMPT_SUFFIX, "\\u241f"); ++ if (payload.length + RESEARCH_PROMPT_PREFIX.length + RESEARCH_PROMPT_SUFFIX.length > RESEARCH_PROMPT_MAX_HEADER) throw new TypeError("Sherlock Research references exceed the prompt header limit"); ++ return `${RESEARCH_PROMPT_PREFIX}${payload}${RESEARCH_PROMPT_SUFFIX}${body}`; ++ } ++ function boundedResearchTaskError(value) { ++ return normalizeResearchArtifactText(value, 512) ?? "画布任务服务暂时不可用"; ++ } ++ async function postResearchTask(path, payload) { ++ const response = await window.fetch(path, { ++ method: "POST", ++ credentials: "same-origin", ++ cache: "no-store", ++ headers: { "content-type": "application/json", accept: "application/json" }, ++ body: JSON.stringify(payload) ++ }); ++ let body = {}; ++ try { ++ body = await response.json(); ++ } catch {} ++ if (response?.ok !== true) { ++ const error = new Error(boundedResearchTaskError(body?.error)); ++ error.status = Number.isSafeInteger(response?.status) ? response.status : 500; ++ throw error; ++ } ++ return body; ++ } ++ function startResearchTask(request) { ++ return postResearchTask(RESEARCH_TASK_START_PATH, request); ++ } ++ function inspectResearchTask(request) { ++ return postResearchTask(RESEARCH_TASK_INSPECT_PATH, request); ++ } ++ function cancelResearchTask(request) { ++ return postResearchTask(RESEARCH_TASK_CANCEL_PATH, request); ++ } ++ function researchMindMapDetail(value) { ++ return RESEARCH_MIND_MAP_DETAILS.has(value) ? value : "standard"; ++ } ++ function researchSelectionGenerationPrompt(snapshot, selectedIds, kind, requestedDetail = "standard") { ++ if (!['mind-map', 'summary'].includes(kind)) return null; ++ const ids = researchSelectionIds(selectedIds); ++ if (ids.length === 0) return null; ++ const fileById = new Map((snapshot?.files ?? []).map((file) => [file.id, file])); ++ const artifactById = new Map((snapshot?.artifacts ?? []).map((artifact) => [artifact.id, artifact])); ++ const files = []; ++ const artifacts = []; ++ for (const id of ids) { ++ const file = fileById.get(id); ++ if (file !== void 0) { ++ const descriptor = canonicalResearchPromptFile(file); ++ if (descriptor === null) return null; ++ files.push(descriptor); ++ continue; ++ } ++ const artifact = canonicalResearchArtifactReference(artifactById.get(id)); ++ if (artifact === null) return null; ++ artifacts.push(artifact); ++ } ++ if (files.length === 0 && artifacts.length === 0) return null; ++ const detail = researchMindMapDetail(requestedDetail); ++ const detailInstruction = detail === 'brief' ? '这是简要模式：内容必须高度概括，总层级不得超过 3 层（中心主题计为第 1 层）；只保留 2–3 个一级主题，每个一级主题保留 1–2 个二级要点，节点总数不超过 10 个，只保留最关键的主题、结论与关系。' : detail === 'detailed' ? '这是详细模式：不设置固定层级上限，根据材料充分展开因果、并列、从属和递进关系，使用户能够详细理解内容关系细节。' : '这是常规模式：不设置固定层级上限，根据材料保留理解主题所需的关系层次，在阅读时间与内容理解之间取得平衡。'; ++ const text = kind === 'mind-map' ? `请基于选中的研究材料生成思维导图。${detailInstruction}请用 Markdown 层级列表输出：第一行以“# ”开头写中心主题，后续使用“- ”和两个空格缩进表达分支；每个节点使用简洁中文短语并尽量控制在 18 个中文字符以内，避免末行仅剩单个汉字；完整句子左对齐，短语或词语居中。不要输出说明、前言或代码围栏。结构应采用横向展开、适合直接截图粘贴到公司 PPT。` : '请基于选中的研究材料进行总结提炼。请输出一段结构紧凑、信息密度高的中文总结，保留关键结论、依据、风险和待验证事项，不要复述任务说明。'; ++ try { ++ return serializeResearchPrompt(files, text, [], artifacts, []); ++ } catch { ++ return null; ++ } ++ } ++ function parseResearchPrompt(text) { ++ const source = String(text ?? ""); ++ if (!source.startsWith(RESEARCH_PROMPT_PREFIX)) return { text: source, files: [] }; ++ const suffix = source.slice(0, RESEARCH_PROMPT_MAX_HEADER).indexOf(RESEARCH_PROMPT_SUFFIX, RESEARCH_PROMPT_PREFIX.length); ++ if (suffix === -1) return { text: source, files: [] }; ++ try { ++ const value = JSON.parse(source.slice(RESEARCH_PROMPT_PREFIX.length, suffix)); ++ if (typeof value !== "object" || value === null) return { text: source, files: [] }; ++ const artifacts = researchPromptArtifacts(value.artifacts); ++ const files = researchPromptFiles(value.files, artifacts !== null && artifacts.length > 0); ++ if (files === null || artifacts === null || files.length === 0 && artifacts.length === 0) return { text: source, files: [] }; ++ const body = source.slice(suffix + 1); ++ const occurrences = researchPromptOccurrences(value.occurrences, files, body, "fileId"); ++ const artifactOccurrences = researchPromptOccurrences(value.artifactOccurrences, artifacts, body, "artifactId"); ++ return occurrences === null || artifactOccurrences === null ? { text: source, files: [] } : { ++ text: body, ++ files, ++ ...(occurrences.length === 0 ? {} : { occurrences }), ++ ...(artifacts.length === 0 ? {} : { artifacts }), ++ ...(artifactOccurrences.length === 0 ? {} : { artifactOccurrences }) ++ }; ++ } catch { ++ return { text: source, files: [] }; ++ } ++ } ++ function chatFileReference(path) { ++ const canonicalPath = boundedString(path); ++ const name = canonicalPath === null ? null : boundedString(researchPromptBasename(canonicalPath)); ++ if (canonicalPath === null || name === null) throw new TypeError("Invalid Sherlock Chat file reference"); ++ const descriptor = { path: canonicalPath, name }; ++ return { ++ source: CHAT_FILE_REFERENCE_SOURCE, ++ ref: JSON.stringify(descriptor), ++ label: name, ++ clipboardText: name ++ }; ++ } ++ function parseChatFileReference(ref) { ++ if (typeof ref !== "string" || ref.length > SHERLOCK_FILE_DRAG_RAW_LIMIT) return null; ++ try { ++ const value = JSON.parse(ref); ++ if (typeof value !== "object" || value === null) return null; ++ const path = boundedString(value.path); ++ const name = boundedString(researchPromptBasename(value.name)); ++ return path === null || name === null || researchPromptBasename(path) !== name ? null : { path, name }; ++ } catch { ++ return null; ++ } ++ } ++ function fileReferenceTooltipName(file) { ++ return researchPromptBasename(file?.path ?? file?.name ?? ""); ++ } ++ function fileReferenceKind(name) { ++ const extension = researchPromptBasename(name).toLowerCase().split(".").at(-1) ?? ""; ++ if (extension === "pdf") return "pdf"; ++ if (["doc", "docx", "odt", "rtf", "pages"].includes(extension)) return "word"; ++ if (["ppt", "pptx", "odp", "key"].includes(extension)) return "presentation"; ++ if (["xls", "xlsx", "xlsm", "csv", "ods", "numbers"].includes(extension)) return "spreadsheet"; ++ if (["png", "jpg", "jpeg", "gif", "webp", "heic", "heif", "svg", "bmp", "tif", "tiff"].includes(extension)) return "image"; ++ if (["txt", "md", "markdown", "log"].includes(extension)) return "text"; ++ if (["js", "jsx", "ts", "tsx", "json", "html", "css", "py", "java", "c", "cc", "cpp", "h", "hpp", "swift", "kt", "go", "rs", "sh", "sql", "xml", "yaml", "yml"].includes(extension)) return "code"; ++ if (["zip", "rar", "7z", "tar", "gz", "bz2", "xz"].includes(extension)) return "archive"; ++ return "file"; ++ } ++ function FileReferenceIcon({ name }) { ++ const kind = fileReferenceKind(name); ++ const labels = { ++ pdf: "PDF", ++ word: "W", ++ presentation: "P", ++ spreadsheet: "X", ++ image: "▧", ++ text: "TXT", ++ code: "", ++ archive: "ZIP", ++ file: "F" ++ }; ++ return (0, react_jsx_runtime.jsx)("span", { ++ className: "uV2eYG_fileReferenceIcon", ++ "data-file-reference-icon": "", ++ "data-research-reference-type-icon": "", ++ "data-file-kind": kind, ++ "aria-hidden": true, ++ children: labels[kind] ++ }); ++ } ++ function researchArtifactReferenceKind(artifact) { ++ if (artifact?.kind === "assistant-result") return "assistant-reply"; ++ if (artifact?.kind === "assistant-excerpt") return "assistant-excerpt"; ++ if (artifact?.kind === "generated-summary") return "summary"; ++ if (artifact?.kind === "generated-mind-map") return "mind-map"; ++ const title = String(artifact?.title ?? "").trim(); ++ if (title === "助手回复") return "assistant-reply"; ++ if (title === "助手摘录") return "assistant-excerpt"; ++ if (title === "总结提炼") return "summary"; ++ if (title === "思维导图") return "mind-map"; ++ return "artifact"; ++ } ++ function ResearchArtifactReferenceIcon({ artifact }) { ++ const kind = researchArtifactReferenceKind(artifact); ++ let drawing; ++ if (kind === "assistant-reply") drawing = (0, react_jsx_runtime.jsx)("path", { d: "M3.25 3.5h9.5v6.4H7.2L4.1 12v-2.1h-.85z" }); ++ else if (kind === "assistant-excerpt") drawing = (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [(0, react_jsx_runtime.jsx)("path", { d: "M3.1 4.2h3.6v3.4H4.8c0 1.1-.5 1.9-1.5 2.5" }), (0, react_jsx_runtime.jsx)("path", { d: "M9.1 4.2h3.6v3.4h-1.9c0 1.1-.5 1.9-1.5 2.5" })] }); ++ else if (kind === "summary") drawing = (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [(0, react_jsx_runtime.jsx)("path", { d: "M3.2 2.7h9.6v10.6H3.2z" }), (0, react_jsx_runtime.jsx)("path", { d: "M5.2 5.4h5.6M5.2 8h5.6M5.2 10.6h3.7" })] }); ++ else if (kind === "mind-map") drawing = (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [(0, react_jsx_runtime.jsx)("path", { d: "M4.2 8h3.1M8.7 8h1.1M9.8 8V4.2M9.8 8v3.8" }), (0, react_jsx_runtime.jsx)("rect", { x: "1.8", y: "6.2", width: "2.4", height: "3.6" }), (0, react_jsx_runtime.jsx)("rect", { x: "9.8", y: "2.5", width: "4", height: "3.2" }), (0, react_jsx_runtime.jsx)("rect", { x: "9.8", y: "10.3", width: "4", height: "3.2" })] }); ++ else drawing = (0, react_jsx_runtime.jsx)("path", { d: "M3 3h10v10H3zM5.4 5.4h5.2v5.2H5.4z" }); ++ return (0, react_jsx_runtime.jsx)("span", { ++ className: "uV2eYG_researchReferenceIcon", ++ "data-research-artifact-icon": "", ++ "data-research-reference-type-icon": "", ++ "data-artifact-kind": kind, ++ "aria-hidden": true, ++ children: (0, react_jsx_runtime.jsx)("svg", { ++ viewBox: "0 0 16 16", ++ fill: "none", ++ children: drawing ++ }) ++ }); ++ } ++ const chatFileReferenceCodec = { ++ clipboardText(ref) { ++ return parseChatFileReference(ref)?.name ?? ""; ++ }, ++ async serialize(ref, signal) { ++ if (signal.aborted) throw signal.reason instanceof Error ? signal.reason : new Error("Chat file serialization aborted"); ++ const file = parseChatFileReference(ref); ++ if (file === null) throw new Error("Invalid Sherlock Chat file reference"); ++ return `📎 文件：\`${file.path.replaceAll("`", "\\`")}\``; ++ } ++ }; ++ const chatFileInputSource = { ++ trigger: "@", ++ name: CHAT_FILE_REFERENCE_SOURCE, ++ order: 9999, ++ async candidates() { return []; }, ++ onPick() { return void 0; }, ++ codec: chatFileReferenceCodec ++ }; ++ function researchFileReference(file) { ++ const sourceDescriptor = canonicalResearchFileReference({ ++ ...file, ++ name: researchPromptBasename(file?.name) ++ }); ++ const displayName = file?.displayName === void 0 ? void 0 : normalizeResearchCanvasDisplayName(file.displayName, file.name); ++ if (sourceDescriptor === null || displayName === null) throw new TypeError("Invalid Sherlock Research file reference"); ++ const descriptor = displayName === void 0 ? sourceDescriptor : { ...sourceDescriptor, name: displayName }; ++ return { ++ source: RESEARCH_FILE_REFERENCE_SOURCE, ++ ref: JSON.stringify(descriptor), ++ label: descriptor.name, ++ clipboardText: descriptor.name ++ }; ++ } ++ function parseResearchFileReference(ref) { ++ if (typeof ref !== "string" || ref.length > SHERLOCK_FILE_DRAG_RAW_LIMIT) return null; ++ try { ++ return canonicalResearchFileReference(JSON.parse(ref)); ++ } catch { ++ return null; ++ } ++ } ++ function researchArtifactReferenceLabel(artifact) { ++ if (artifact.title !== "助手回复") return artifact.title; ++ const firstLine = artifact.excerpt.split(/\r?\n/).map((line) => line.replace(/\s+/g, " ").trim()).find((line) => line !== "") ?? ""; ++ const clipped = firstLine.length > 48 ? `${firstLine.slice(0, 47)}…` : firstLine; ++ return clipped === "" ? artifact.title : `${artifact.title} · ${clipped}`; ++ } ++ function researchArtifactReference(artifact) { ++ const descriptor = canonicalResearchArtifactReference(artifact); ++ if (descriptor === null) throw new TypeError("Invalid Sherlock Research assistant reference"); ++ const label = researchArtifactReferenceLabel(descriptor); ++ return { ++ source: RESEARCH_ARTIFACT_REFERENCE_SOURCE, ++ ref: JSON.stringify(descriptor), ++ label, ++ clipboardText: label ++ }; ++ } ++ function parseResearchArtifactReference(ref) { ++ if (typeof ref !== "string" || ref.length > RESEARCH_ARTIFACT_REFERENCE_RAW_LIMIT) return null; ++ try { ++ return canonicalResearchArtifactReference(JSON.parse(ref)); ++ } catch { ++ return null; ++ } ++ } ++ const researchFileReferenceCodec = { ++ clipboardText(ref) { ++ return parseResearchFileReference(ref)?.name ?? ""; ++ }, ++ async serialize(ref, signal) { ++ if (signal.aborted) throw signal.reason instanceof Error ? signal.reason : new Error("Research file serialization aborted"); ++ const file = parseResearchFileReference(ref); ++ if (file === null) throw new Error("Invalid Sherlock Research file reference"); ++ const payload = JSON.stringify(file).replaceAll(RESEARCH_PROMPT_SUFFIX, "\\u241f"); ++ return `${RESEARCH_FILE_REFERENCE_PREFIX}${payload}${RESEARCH_PROMPT_SUFFIX}`; ++ } ++ }; ++ const researchFileInputSource = { ++ trigger: "@", ++ name: RESEARCH_FILE_REFERENCE_SOURCE, ++ order: 1e4, ++ async candidates() { return []; }, ++ onPick() { return void 0; }, ++ codec: researchFileReferenceCodec ++ }; ++ const researchArtifactReferenceCodec = { ++ clipboardText(ref) { ++ const artifact = parseResearchArtifactReference(ref); ++ return artifact === null ? "" : researchArtifactReferenceLabel(artifact); ++ }, ++ async serialize(ref, signal) { ++ if (signal.aborted) throw signal.reason instanceof Error ? signal.reason : new Error("Research assistant serialization aborted"); ++ const artifact = parseResearchArtifactReference(ref); ++ if (artifact === null) throw new Error("Invalid Sherlock Research assistant reference"); ++ const payload = JSON.stringify(artifact).replaceAll(RESEARCH_PROMPT_SUFFIX, "\\u241f"); ++ return `${RESEARCH_ARTIFACT_REFERENCE_PREFIX}${payload}${RESEARCH_PROMPT_SUFFIX}`; ++ } ++ }; ++ const researchArtifactInputSource = { ++ trigger: "@", ++ name: RESEARCH_ARTIFACT_REFERENCE_SOURCE, ++ order: 10001, ++ async candidates() { return []; }, ++ onPick() { return void 0; }, ++ codec: researchArtifactReferenceCodec ++ }; ++ function extractResearchReferences(text) { ++ const source = String(text ?? ""); ++ const files = []; ++ const fileById = /* @__PURE__ */ new Map(); ++ const occurrences = []; ++ const artifacts = []; ++ const artifactById = /* @__PURE__ */ new Map(); ++ const artifactOccurrences = []; ++ let output = ""; ++ let cursor = 0; ++ let order = 0; ++ while (cursor < source.length) { ++ const fileStart = source.indexOf(RESEARCH_FILE_REFERENCE_PREFIX, cursor); ++ const artifactStart = source.indexOf(RESEARCH_ARTIFACT_REFERENCE_PREFIX, cursor); ++ const start = fileStart === -1 ? artifactStart : artifactStart === -1 ? fileStart : Math.min(fileStart, artifactStart); ++ if (start === -1) break; ++ output += source.slice(cursor, start); ++ const artifactReference = start === artifactStart; ++ const prefix = artifactReference ? RESEARCH_ARTIFACT_REFERENCE_PREFIX : RESEARCH_FILE_REFERENCE_PREFIX; ++ const rawLimit = artifactReference ? RESEARCH_ARTIFACT_REFERENCE_RAW_LIMIT : SHERLOCK_FILE_DRAG_RAW_LIMIT; ++ const payloadStart = start + prefix.length; ++ const suffix = source.slice(payloadStart, payloadStart + rawLimit).indexOf(RESEARCH_PROMPT_SUFFIX); ++ if (suffix === -1) { ++ output += source.slice(start, payloadStart); ++ cursor = payloadStart; ++ continue; ++ } ++ const end = payloadStart + suffix; ++ const descriptor = artifactReference ? parseResearchArtifactReference(source.slice(payloadStart, end)) : parseResearchFileReference(source.slice(payloadStart, end)); ++ if (descriptor === null) { ++ output += source.slice(start, end + RESEARCH_PROMPT_SUFFIX.length); ++ cursor = end + RESEARCH_PROMPT_SUFFIX.length; ++ continue; ++ } ++ const byId = artifactReference ? artifactById : fileById; ++ const existing = byId.get(descriptor.id); ++ if (existing === void 0) { ++ byId.set(descriptor.id, descriptor); ++ if (artifactReference) artifacts.push(descriptor); ++ else files.push(descriptor); ++ } else if (JSON.stringify(existing) !== JSON.stringify(descriptor)) { ++ output += source.slice(start, end + RESEARCH_PROMPT_SUFFIX.length); ++ cursor = end + RESEARCH_PROMPT_SUFFIX.length; ++ continue; ++ } ++ if (artifactReference) artifactOccurrences.push({ artifactId: descriptor.id, offset: output.length, order }); ++ else occurrences.push({ fileId: descriptor.id, offset: output.length, order }); ++ order += 1; ++ cursor = end + RESEARCH_PROMPT_SUFFIX.length; ++ } ++ output += source.slice(cursor); ++ return { text: output, files, occurrences, artifacts, artifactOccurrences }; ++ } ++ function extractResearchFileReferences(text) { ++ const extracted = extractResearchReferences(text); ++ return { ++ text: extracted.text, ++ files: extracted.files, ++ occurrences: extracted.occurrences.map(({ fileId, offset }) => ({ fileId, offset })) ++ }; ++ } ++ function syncResearchFileReferences(shell, files, seenIds, selection, active) { ++ const inserted = []; ++ const insertions = []; ++ if (!active) { ++ let changed = false; ++ const researchOccurrences = shell.snapshot.occurrences.filter((occurrence) => occurrence.source === RESEARCH_FILE_REFERENCE_SOURCE).sort((a, b) => b.offset - a.offset); ++ for (const occurrence of researchOccurrences) { ++ const draft = shell.snapshot.draft; ++ shell.setDraft(draft.slice(0, occurrence.offset) + draft.slice(occurrence.offset + 1), { ++ start: occurrence.offset, ++ end: occurrence.offset + 1, ++ insertedLength: 0 ++ }); ++ changed = true; ++ } ++ seenIds.clear(); ++ return { ++ caret: Math.min(selection.start, shell.snapshot.draft.length), ++ inserted, ++ insertions, ++ changed ++ }; ++ } ++ const selectedIds = /* @__PURE__ */ new Set(files.map((file) => file.id)); ++ for (const id of [...seenIds]) if (!selectedIds.has(id)) seenIds.delete(id); ++ const currentById = /* @__PURE__ */ new Map(); ++ for (const occurrence of shell.snapshot.occurrences) { ++ if (occurrence.source !== RESEARCH_FILE_REFERENCE_SOURCE) continue; ++ const file = parseResearchFileReference(occurrence.ref); ++ if (file === null) continue; ++ const matches = currentById.get(file.id) ?? []; ++ matches.push(occurrence); ++ currentById.set(file.id, matches); ++ } ++ let start = Math.max(0, Math.min(selection.start, shell.snapshot.draft.length)); ++ let end = Math.max(start, Math.min(selection.end, shell.snapshot.draft.length)); ++ let updated = false; ++ for (const file of files) { ++ let reference; ++ try { ++ reference = researchFileReference(file); ++ } catch { ++ continue; ++ } ++ const current = currentById.get(file.id) ?? []; ++ if (shell.updateResearchReferenceOccurrences(file.id, reference)) updated = true; ++ if (current.length > 0) { ++ seenIds.add(file.id); ++ continue; ++ } ++ if (seenIds.has(file.id)) continue; ++ seenIds.add(file.id); ++ const before = shell.snapshot; ++ const accepted = shell.insertReference(reference, { start, end, draftRev: before.draftRev }); ++ if (!accepted) { ++ seenIds.delete(file.id); ++ continue; ++ } ++ const insertedLength = shell.snapshot.draft.length - before.draft.length + (end - start); ++ const insertedOccurrence = shell.snapshot.occurrences.find((occurrence) => occurrence.source === RESEARCH_FILE_REFERENCE_SOURCE && occurrence.offset === start && parseResearchFileReference(occurrence.ref)?.id === file.id); ++ if (insertedOccurrence !== void 0) insertions.push({ ++ id: file.id, ++ occurrenceId: insertedOccurrence.occurrenceId, ++ trailingSpace: insertedLength > 1 ++ }); ++ start += insertedLength; ++ end = start; ++ inserted.push(file.id); ++ } ++ return { caret: start, inserted, insertions, changed: updated || inserted.length > 0 }; ++ } ++ function syncResearchArtifactReferences(shell, artifacts, seenIds, selection, active) { ++ const inserted = []; ++ const insertions = []; ++ if (!active) { ++ let changed = false; ++ const researchOccurrences = shell.snapshot.occurrences.filter((occurrence) => occurrence.source === RESEARCH_ARTIFACT_REFERENCE_SOURCE).sort((a, b) => b.offset - a.offset); ++ for (const occurrence of researchOccurrences) { ++ const draft = shell.snapshot.draft; ++ shell.setDraft(draft.slice(0, occurrence.offset) + draft.slice(occurrence.offset + 1), { ++ start: occurrence.offset, ++ end: occurrence.offset + 1, ++ insertedLength: 0 ++ }); ++ changed = true; ++ } ++ seenIds.clear(); ++ return { ++ caret: Math.min(selection.start, shell.snapshot.draft.length), ++ inserted, ++ insertions, ++ changed ++ }; ++ } ++ const selectedIds = /* @__PURE__ */ new Set(artifacts.map((artifact) => artifact.id)); ++ for (const id of [...seenIds]) if (!selectedIds.has(id)) seenIds.delete(id); ++ const currentById = /* @__PURE__ */ new Map(); ++ for (const occurrence of shell.snapshot.occurrences) { ++ if (occurrence.source !== RESEARCH_ARTIFACT_REFERENCE_SOURCE) continue; ++ const artifact = parseResearchArtifactReference(occurrence.ref); ++ if (artifact === null) continue; ++ const matches = currentById.get(artifact.id) ?? []; ++ matches.push(occurrence); ++ currentById.set(artifact.id, matches); ++ } ++ let start = Math.max(0, Math.min(selection.start, shell.snapshot.draft.length)); ++ let end = Math.max(start, Math.min(selection.end, shell.snapshot.draft.length)); ++ let updated = false; ++ for (const artifact of artifacts) { ++ let reference; ++ try { ++ reference = researchArtifactReference(artifact); ++ } catch { ++ continue; ++ } ++ const current = currentById.get(artifact.id) ?? []; ++ if (shell.updateResearchReferenceOccurrences(artifact.id, reference)) updated = true; ++ if (current.length > 0) { ++ seenIds.add(artifact.id); ++ continue; ++ } ++ if (seenIds.has(artifact.id)) continue; ++ seenIds.add(artifact.id); ++ const before = shell.snapshot; ++ const accepted = shell.insertReference(reference, { start, end, draftRev: before.draftRev }); ++ if (!accepted) { ++ seenIds.delete(artifact.id); ++ continue; ++ } ++ const insertedLength = shell.snapshot.draft.length - before.draft.length + (end - start); ++ const insertedOccurrence = shell.snapshot.occurrences.find((occurrence) => occurrence.source === RESEARCH_ARTIFACT_REFERENCE_SOURCE && occurrence.offset === start && parseResearchArtifactReference(occurrence.ref)?.id === artifact.id); ++ if (insertedOccurrence !== void 0) insertions.push({ ++ id: artifact.id, ++ occurrenceId: insertedOccurrence.occurrenceId, ++ trailingSpace: insertedLength > 1 ++ }); ++ start += insertedLength; ++ end = start; ++ inserted.push(artifact.id); ++ } ++ return { caret: start, inserted, insertions, changed: updated || inserted.length > 0 }; ++ } ++ function parseSherlockFileDrag(raw) { ++ if (typeof raw !== "string" || raw.length > SHERLOCK_FILE_DRAG_RAW_LIMIT) return null; ++ try { ++ const value = JSON.parse(raw); ++ if (typeof value !== "object" || value === null) return null; ++ const name = boundedString(value.name); ++ const path = boundedString(value.path, true); ++ const sessionId = boundedString(value.sessionId, true); ++ const relativePath = boundedString(value.relativePath, true); ++ const hasPreviewIdentity = sessionId !== void 0 || relativePath !== void 0; ++ const safeRelativePath = typeof relativePath === "string" && !/^(?:[\\/]|[A-Za-z]:[\\/])/.test(relativePath) && relativePath.split(/[\\/]/).every((segment) => segment !== "" && segment !== "." && segment !== ".."); ++ if (name === null || path === null || sessionId === null || relativePath === null || hasPreviewIdentity && (sessionId === void 0 || relativePath === void 0 || !safeRelativePath)) return null; ++ return { ++ ...(path === void 0 ? {} : { path }), ++ name, ++ ...(hasPreviewIdentity ? { sessionId, relativePath: relativePath.replaceAll("\\", "/") } : {}), ++ source: "sherlock" ++ }; ++ } catch { ++ return null; ++ } ++ } ++ function researchCanvasWorldPoint(viewport, pointer) { ++ return { ++ x: (pointer.x - viewport.x) / viewport.scale, ++ y: (pointer.y - viewport.y) / viewport.scale ++ }; ++ } ++ function researchCanvasOwnsFileDrag(types) { ++ return Array.from(types ?? []).includes("Files") || Array.from(types ?? []).includes(SHERLOCK_FILE_DRAG_TYPE); ++ } ++ function researchCanvasDropFiles(transfer, getPathForFile) { ++ const internal = parseSherlockFileDrag(transfer.getData?.(SHERLOCK_FILE_DRAG_TYPE) ?? ""); ++ if (internal !== null) return [internal]; ++ const fileList = transfer.files; ++ const fileCount = typeof fileList?.length === "number" && Number.isFinite(fileList.length) ? Math.min(Math.max(0, Math.floor(fileList.length)), RESEARCH_CANVAS_MAX_FILES_PER_DROP) : 0; ++ const files = []; ++ for (let index = 0; index < fileCount; index += 1) { ++ const file = typeof fileList.item === "function" ? fileList.item(index) : fileList[index]; ++ if (file === null || file === void 0) continue; ++ const name = boundedString(file.name); ++ if (name === null) continue; ++ let resolved = ""; ++ try { ++ resolved = getPathForFile(file); ++ } catch {} ++ const path = resolved === "" ? void 0 : boundedString(resolved, true); ++ const mediaType = file.type === "" ? void 0 : boundedString(file.type, true); ++ if (path === null || mediaType === null) { ++ files.push({ name, source: "computer" }); ++ continue; ++ } ++ files.push({ ++ ...(path === void 0 ? {} : { path }), ++ ...(mediaType === void 0 ? {} : { mediaType }), ++ name, ++ source: "computer" ++ }); ++ } ++ return files; ++ } ++ async function admitResearchCanvasDrop(transfer, sessionId, existing, preview, createId, getPathForFile, maxNewNodes = RESEARCH_CANVAS_MAX_FILES_PER_SESSION, journalAdmission = () => true) { ++ const internal = parseSherlockFileDrag(transfer.getData?.(SHERLOCK_FILE_DRAG_TYPE) ?? ""); ++ if (internal !== null) { ++ const previous = existing.find((node) => node.path === internal.path); ++ if (previous !== void 0 && typeof previous.authorizationId === "string" && typeof previous.contentType === "string") return [previous]; ++ if (internal.sessionId !== sessionId || typeof internal.relativePath !== "string" || typeof preview?.admitSidebarFile !== "function") return [{ ...internal, previewEligible: false }]; ++ if (previous === void 0 && maxNewNodes <= 0) return []; ++ const nodeId = previous?.id ?? createId(); ++ if (journalAdmission(nodeId) !== true) return [{ id: nodeId, ...internal, previewEligible: false }]; ++ const descriptor = await preview.admitSidebarFile({ sessionId, nodeId, relativePath: internal.relativePath }).catch(() => null); ++ if (descriptor === null) return [{ id: nodeId, ...internal, previewEligible: false }]; ++ await preview.release?.({ sessionId, nodeId, authorizationId: descriptor.authorizationId, capabilityToken: descriptor.capabilityToken }).catch(() => void 0); ++ return [{ id: nodeId, ...internal, authorizationId: descriptor.authorizationId, contentType: descriptor.contentType }]; ++ } ++ const fileList = transfer.files; ++ const count = typeof fileList?.length === "number" && Number.isFinite(fileList.length) ? Math.min(Math.max(0, Math.floor(fileList.length)), RESEARCH_CANVAS_MAX_FILES_PER_DROP) : 0; ++ const admitted = []; ++ const reservedByPath = /* @__PURE__ */ new Map(existing.flatMap((node) => typeof node.path === "string" && node.path.length > 0 ? [[node.path, node]] : [])); ++ let newNodes = 0; ++ for (let index = 0; index < count; index += 1) { ++ const file = typeof fileList.item === "function" ? fileList.item(index) : fileList[index]; ++ const name = boundedString(file?.name); ++ if (file === null || file === void 0 || name === null) continue; ++ const mediaType = boundedString(file.type, true); ++ let resolvedPath = ""; ++ try { ++ resolvedPath = typeof getPathForFile === "function" ? getPathForFile(file) : ""; ++ } catch {} ++ const legacyPath = resolvedPath === "" ? void 0 : boundedString(resolvedPath, true); ++ const previous = typeof legacyPath === "string" ? reservedByPath.get(legacyPath) : void 0; ++ if (previous !== void 0 && typeof previous.authorizationId === "string" && typeof previous.contentType === "string") { ++ admitted.push(previous); ++ continue; ++ } ++ if (previous === void 0 && newNodes >= maxNewNodes) continue; ++ const nodeId = previous?.id ?? createId(); ++ const canAdmit = typeof preview?.admitFinderFile === "function" && journalAdmission(nodeId) === true; ++ const descriptor = canAdmit ? await preview.admitFinderFile(file, { sessionId, nodeId }).catch(() => null) : null; ++ if (descriptor !== null) { ++ await preview.release?.({ sessionId, nodeId, authorizationId: descriptor.authorizationId, capabilityToken: descriptor.capabilityToken }).catch(() => void 0); ++ admitted.push({ id: nodeId, ...(typeof legacyPath === "string" ? { path: legacyPath } : {}), name: descriptor.name, source: "computer", authorizationId: descriptor.authorizationId, contentType: descriptor.contentType }); ++ } else admitted.push({ id: nodeId, ...(typeof legacyPath === "string" ? { path: legacyPath } : {}), name, ...(mediaType === void 0 || mediaType === null ? {} : { mediaType }), source: "computer", previewEligible: false }); ++ const accepted = admitted[admitted.length - 1]; ++ if (previous === void 0) newNodes += 1; ++ if (typeof legacyPath === "string" && accepted !== void 0) reservedByPath.set(legacyPath, accepted); ++ } ++ return admitted; ++ } ++ function placeResearchCanvasFiles(nodes, files, point, createId) { ++ const next = nodes.slice(0, RESEARCH_CANVAS_MAX_FILES_PER_SESSION); ++ const pathIndexes = /* @__PURE__ */ new Map(); ++ for (const [index, node] of next.entries()) if (typeof node.path === "string" && node.path.length > 0 && !pathIndexes.has(node.path)) pathIndexes.set(node.path, index); ++ for (const [index, file] of files.slice(0, RESEARCH_CANVAS_MAX_FILES_PER_DROP).entries()) { ++ const position = { ++ x: point.x + index * RESEARCH_CANVAS_FILE_STACK_OFFSET, ++ y: point.y + index * RESEARCH_CANVAS_FILE_STACK_OFFSET ++ }; ++ const found = typeof file.path === "string" && file.path.length > 0 ? pathIndexes.get(file.path) : void 0; ++ if (found !== void 0) { ++ const previous = next[found]; ++ const preserveAuthorized = typeof previous.authorizationId === "string" && typeof previous.contentType === "string" && file.previewEligible === false; ++ next[found] = preserveAuthorized ? { ...previous, ...position } : { ...previous, ...file, ...position }; ++ } ++ else if (next.length < RESEARCH_CANVAS_MAX_FILES_PER_SESSION) { ++ next.push({ id: boundedString(file.id) ?? createId(), ...file, ...position }); ++ if (typeof file.path === "string" && file.path.length > 0) pathIndexes.set(file.path, next.length - 1); ++ } ++ } ++ return next; ++ } ++ function researchCanvasStorageKey(sessionId) { ++ return `${RESEARCH_CANVAS_STORAGE_PREFIX}${sessionId}`; ++ } ++ function researchCanvasNodeKind(node) { ++ if (typeof node?.kind === "string" && RESEARCH_ARTIFACT_KINDS.has(node.kind)) return "assistant"; ++ if (node?.previewEligible === false) return "generic"; ++ const mediaType = typeof node?.contentType === "string" ? node.contentType.toLowerCase() : typeof node?.mediaType === "string" ? node.mediaType.toLowerCase() : ""; ++ const name = typeof node?.name === "string" ? node.name.toLowerCase() : ""; ++ if (mediaType.startsWith("image/") || /\.(?:avif|bmp|gif|heic|heif|ico|jpe?g|png|svg|webp)$/.test(name)) return "image"; ++ if (mediaType === "application/pdf" || /\.pdf$/.test(name)) return "pdf"; ++ if (mediaType === "text/html" || mediaType === "application/xhtml+xml" || /\.x?html?$/.test(name)) return "html"; ++ if (mediaType === "application/vnd.openxmlformats-officedocument.wordprocessingml.document" || /\.docx$/.test(name)) return "docx"; ++ if (mediaType === "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" || /\.xlsx$/.test(name)) return "xlsx"; ++ if (mediaType === "application/vnd.openxmlformats-officedocument.presentationml.presentation" || /\.pptx$/.test(name)) return "pptx"; ++ if (mediaType.startsWith("text/markdown") || /\.(?:md|markdown)$/.test(name)) return "markdown"; ++ if (mediaType.startsWith("text/") || mediaType.startsWith("application/json") || mediaType.startsWith("application/javascript")) return "text"; ++ return "generic"; ++ } ++ function researchPdfPageLayout(input) { ++ const cssWidth = Number.isFinite(input?.cssWidth) && input.cssWidth > 0 ? input.cssWidth : 0; ++ const gap = Number.isFinite(input?.gap) && input.gap >= 0 ? input.gap : 0; ++ if (!Array.isArray(input?.pages) || cssWidth === 0) return []; ++ let top = 0; ++ return input.pages.map((page, index) => { ++ const width = Number.isFinite(page?.width) && page.width > 0 ? page.width : 1; ++ const height = Number.isFinite(page?.height) && page.height > 0 ? page.height : 1; ++ const pageHeight = cssWidth * height / width; ++ const entry = { page: index + 1, top, height: pageHeight, bottom: top + pageHeight }; ++ top = entry.bottom + gap; ++ return entry; ++ }); ++ } ++ function researchPdfRenderWindow(input) { ++ const layout = Array.isArray(input?.layout) ? input.layout.filter((page) => Number.isSafeInteger(page?.page) && page.page > 0 && Number.isFinite(page.top) && Number.isFinite(page.bottom) && page.bottom > page.top) : []; ++ const scrollTop = Number.isFinite(input?.scrollTop) && input.scrollTop >= 0 ? input.scrollTop : 0; ++ const viewportHeight = Number.isFinite(input?.viewportHeight) && input.viewportHeight > 0 ? input.viewportHeight : 0; ++ const overscan = Number.isFinite(input?.overscan) && input.overscan >= 0 ? input.overscan : 0; ++ if (layout.length === 0 || viewportHeight === 0) return [1]; ++ const start = Math.max(0, scrollTop - overscan); ++ const end = scrollTop + viewportHeight + overscan; ++ const pages = layout.filter((page) => page.bottom > start && page.top < end).map((page) => page.page); ++ return pages.length > 0 ? pages : [Math.min(layout.at(-1).page, Math.max(1, Math.floor(scrollTop / Math.max(1, layout[0].height)) + 1))]; ++ } ++ function researchPdfBackingStore(input) { ++ const pageWidth = Number.isFinite(input?.pageWidth) && input.pageWidth > 0 ? input.pageWidth : 1; ++ const pageHeight = Number.isFinite(input?.pageHeight) && input.pageHeight > 0 ? input.pageHeight : 1; ++ const cssWidth = Number.isFinite(input?.cssWidth) && input.cssWidth > 0 ? Math.min(1e7, input.cssWidth) : 1; ++ const ratio = Math.min(1e4, Math.max(1e-4, pageHeight / pageWidth)); ++ const cssHeight = cssWidth * ratio; ++ const maxPixels = Number.isFinite(input?.maxPixels) && input.maxPixels >= 1 ? Math.floor(input.maxPixels) : RESEARCH_PDF_MAX_BACKING_PIXELS; ++ const requestedDpr = Number.isFinite(input?.devicePixelRatio) && input.devicePixelRatio > 0 ? input.devicePixelRatio : 1; ++ const pixelScale = Math.sqrt(maxPixels / (cssWidth * cssHeight)); ++ const outputScale = Math.min(RESEARCH_PDF_MAX_DPR, requestedDpr, pixelScale); ++ let backingWidth = Math.max(1, Math.floor(cssWidth * outputScale)); ++ let backingHeight = Math.max(1, Math.floor(cssHeight * outputScale)); ++ if (backingWidth * backingHeight > maxPixels) { ++ if (backingWidth >= backingHeight) backingWidth = Math.max(1, Math.floor(maxPixels / backingHeight)); ++ else backingHeight = Math.max(1, Math.floor(maxPixels / backingWidth)); ++ } ++ return { cssWidth, cssHeight, outputScale, backingWidth, backingHeight }; ++ } ++ function researchCanvasAspectConstraints(policy, value) { ++ const minimumRatio = Math.max(.25, policy.minWidth / (RESEARCH_CANVAS_MAX_NODE_SIZE - RESEARCH_CANVAS_TITLE_HEIGHT)); ++ const maximumRatio = Math.min(8, RESEARCH_CANVAS_MAX_NODE_SIZE / (policy.minHeight - RESEARCH_CANVAS_TITLE_HEIGHT)); ++ const candidate = Number.isFinite(value) && value >= .25 && value <= 8 ? value : policy.aspectRatio; ++ const aspectRatio = Math.min(maximumRatio, Math.max(minimumRatio, candidate)); ++ return { ++ aspectRatio, ++ minWidth: Math.max(policy.minWidth, (policy.minHeight - RESEARCH_CANVAS_TITLE_HEIGHT) * aspectRatio), ++ maxWidth: Math.min(RESEARCH_CANVAS_MAX_NODE_SIZE, (RESEARCH_CANVAS_MAX_NODE_SIZE - RESEARCH_CANVAS_TITLE_HEIGHT) * aspectRatio) ++ }; ++ } ++ function normalizeResearchCanvasNodeGeometry(node) { ++ const kind = researchCanvasNodeKind(node); ++ const policy = RESEARCH_CANVAS_NODE_POLICIES[kind]; ++ if (!policy.resizable) return { width: policy.width, height: policy.height, sizeMode: "auto", resizable: false }; ++ const sizeMode = node?.sizeMode === "manual" ? "manual" : "auto"; ++ const finiteWidth = Number.isFinite(node?.width) && node.width >= 0 ? node.width : policy.width; ++ let width = Math.min(RESEARCH_CANVAS_MAX_NODE_SIZE, Math.max(policy.minWidth, finiteWidth)); ++ if (policy.aspectRatio !== void 0) { ++ const constraints = researchCanvasAspectConstraints(policy, node?.aspectRatio); ++ const { aspectRatio } = constraints; ++ width = Math.min(constraints.maxWidth, Math.max(constraints.minWidth, finiteWidth)); ++ return { width, height: width / aspectRatio + RESEARCH_CANVAS_TITLE_HEIGHT, sizeMode, aspectRatio, resizable: true }; ++ } ++ const finiteHeight = Number.isFinite(node?.height) && node.height >= 0 ? node.height : policy.height; ++ const height = Math.min(RESEARCH_CANVAS_MAX_NODE_SIZE, Math.max(policy.minHeight, finiteHeight)); ++ return { width, height, sizeMode, resizable: true }; ++ } ++ function researchCanvasPersistedGeometry(node) { ++ const geometry = normalizeResearchCanvasNodeGeometry(node); ++ return { ++ width: geometry.width, ++ height: geometry.height, ++ sizeMode: geometry.sizeMode, ++ ...(geometry.aspectRatio === void 0 ? {} : { aspectRatio: geometry.aspectRatio }) ++ }; ++ } ++ function researchImageGeometryForNaturalSize(node, naturalWidth, naturalHeight) { ++ if (!Number.isFinite(naturalWidth) || !Number.isFinite(naturalHeight) || naturalWidth <= 0 || naturalHeight <= 0 || researchCanvasNodeKind(node) !== "image") return null; ++ const aspectRatio = naturalWidth / naturalHeight; ++ const current = normalizeResearchCanvasNodeGeometry(node); ++ return researchCanvasPersistedGeometry({ ...node, width: current.width, aspectRatio }); ++ } ++ function researchPdfGeometryForPage(node, pageWidth, pageHeight) { ++ if (!Number.isFinite(pageWidth) || !Number.isFinite(pageHeight) || pageWidth <= 0 || pageHeight <= 0 || researchCanvasNodeKind(node) !== "pdf" || node?.sizeMode === "manual") return null; ++ const defaultRatio = RESEARCH_CANVAS_NODE_POLICIES.pdf.aspectRatio; ++ if (Number.isFinite(node?.aspectRatio) && Math.abs(node.aspectRatio - defaultRatio) > 1e-6) return null; ++ const current = normalizeResearchCanvasNodeGeometry(node); ++ return researchCanvasPersistedGeometry({ ...node, width: current.width, aspectRatio: pageWidth / pageHeight }); ++ } ++ function resizeResearchCanvasNode(node, corner, delta, scale) { ++ const geometry = normalizeResearchCanvasNodeGeometry(node); ++ if (!geometry.resizable || !["nw", "ne", "sw", "se"].includes(corner)) return { ...node, ...researchCanvasPersistedGeometry(node) }; ++ const divisor = Number.isFinite(scale) && scale > 0 ? scale : 1; ++ const dx = Number.isFinite(delta?.x) ? delta.x / divisor : 0; ++ const dy = Number.isFinite(delta?.y) ? delta.y / divisor : 0; ++ const sx = corner.endsWith("e") ? 1 : -1; ++ const sy = corner.startsWith("s") ? 1 : -1; ++ const policy = RESEARCH_CANVAS_NODE_POLICIES[researchCanvasNodeKind(node)]; ++ let width; ++ let height; ++ if (geometry.aspectRatio !== void 0) { ++ const horizontalWidth = geometry.width + sx * dx; ++ const verticalWidth = (geometry.height - RESEARCH_CANVAS_TITLE_HEIGHT + sy * dy) * geometry.aspectRatio; ++ const candidate = Math.abs(horizontalWidth - geometry.width) >= Math.abs(verticalWidth - geometry.width) ? horizontalWidth : verticalWidth; ++ const constraints = researchCanvasAspectConstraints(policy, geometry.aspectRatio); ++ width = Math.min(constraints.maxWidth, Math.max(constraints.minWidth, candidate)); ++ height = width / geometry.aspectRatio + RESEARCH_CANVAS_TITLE_HEIGHT; ++ } else { ++ width = Math.min(RESEARCH_CANVAS_MAX_NODE_SIZE, Math.max(policy.minWidth, geometry.width + sx * dx)); ++ height = Math.min(RESEARCH_CANVAS_MAX_NODE_SIZE, Math.max(policy.minHeight, geometry.height + sy * dy)); ++ } ++ return { ++ ...node, ++ x: node.x + sx * (width - geometry.width) / 2, ++ y: node.y + sy * (height - geometry.height) / 2, ++ width, ++ height, ++ sizeMode: "manual", ++ ...(geometry.aspectRatio === void 0 ? {} : { aspectRatio: geometry.aspectRatio }) ++ }; ++ } ++ function canonicalResearchCanvasFileNode(value) { ++ if (typeof value !== "object" || value === null) return null; ++ const id = boundedString(value.id); ++ const name = boundedString(value.name); ++ const displayName = name === null || value.displayName === void 0 ? void 0 : normalizeResearchCanvasDisplayName(value.displayName, name); ++ const source = value.source === "computer" || value.source === "sherlock"; ++ const path = boundedString(value.path, true); ++ const mediaType = boundedString(value.mediaType, true); ++ const authorizationId = boundedString(value.authorizationId, true); ++ const contentType = boundedString(value.contentType, true); ++ const previewEligible = value.previewEligible === false ? false : void 0; ++ if (id === null || name === null || !source || path === null || mediaType === null || authorizationId === null || contentType === null || (authorizationId === void 0) !== (contentType === void 0) || !Number.isFinite(value.x) || !Number.isFinite(value.y)) return null; ++ return { ++ id, ++ ...(path === void 0 ? {} : { path }), ++ name, ++ ...(displayName === null || displayName === void 0 ? {} : { displayName }), ++ ...(mediaType === void 0 ? {} : { mediaType }), ++ ...(authorizationId === void 0 ? {} : { authorizationId, contentType }), ++ ...(previewEligible === void 0 ? {} : { previewEligible }), ++ source: value.source, ++ x: value.x, ++ y: value.y, ++ ...researchCanvasPersistedGeometry(value) ++ }; ++ } ++ function parseResearchCanvasFileNodes(raw) { ++ if (typeof raw !== "string" || raw.length > RESEARCH_CANVAS_PERSISTED_FILES_RAW_LIMIT) return []; ++ try { ++ const value = JSON.parse(raw); ++ if (!Array.isArray(value)) return []; ++ const nodes = []; ++ const ids = /* @__PURE__ */ new Set(); ++ const paths = /* @__PURE__ */ new Set(); ++ for (const item of value) { ++ if (nodes.length >= RESEARCH_CANVAS_MAX_FILES_PER_SESSION) break; ++ const node = canonicalResearchCanvasFileNode(item); ++ if (node === null || ids.has(node.id) || node.path !== void 0 && paths.has(node.path)) continue; ++ ids.add(node.id); ++ if (node.path !== void 0) paths.add(node.path); ++ nodes.push(node); ++ } ++ return nodes; ++ } catch { ++ return []; ++ } ++ } ++ function researchCanvasSelectionStorageKey(sessionId) { ++ return `${RESEARCH_CANVAS_SELECTION_PREFIX}${sessionId}`; ++ } ++ function researchCanvasArtifactsStorageKey(sessionId) { ++ return `${RESEARCH_CANVAS_ARTIFACTS_PREFIX}${sessionId}`; ++ } ++ function researchCanvasRevocationOutboxStorageKey(sessionId) { ++ return `${RESEARCH_CANVAS_REVOCATION_OUTBOX_PREFIX}${sessionId}`; ++ } ++ function parseResearchCanvasRevocationOutbox(raw) { ++ if (typeof raw !== "string" || raw.length > RESEARCH_CANVAS_REVOCATION_OUTBOX_RAW_LIMIT) return []; ++ try { ++ const value = JSON.parse(raw); ++ if (!Array.isArray(value)) return []; ++ const nodeIds = []; ++ const seen = /* @__PURE__ */ new Set(); ++ for (let index = 0; index < value.length && nodeIds.length < RESEARCH_CANVAS_MAX_REVOCATION_OUTBOX; index += 1) { ++ const item = value[index]; ++ const nodeId = boundedString(item); ++ if (nodeId === null || seen.has(nodeId)) continue; ++ seen.add(nodeId); ++ nodeIds.push(nodeId); ++ } ++ return nodeIds; ++ } catch { ++ return []; ++ } ++ } ++ function loadResearchCanvasRevocationOutbox(storage, sessionId) { ++ if (storage === null) return []; ++ try { ++ return parseResearchCanvasRevocationOutbox(storage.getItem(researchCanvasRevocationOutboxStorageKey(sessionId)) ?? "[]"); ++ } catch { ++ return []; ++ } ++ } ++ function saveResearchCanvasRevocationOutbox(storage, sessionId, nodeIds) { ++ if (storage === null) return false; ++ try { ++ return storage.setItem(researchCanvasRevocationOutboxStorageKey(sessionId), JSON.stringify(nodeIds)) !== false; ++ } catch { ++ return false; ++ } ++ } ++ function boundedResearchArtifactString(value, limit) { ++ return typeof value === "string" && value.length > 0 && value.length <= limit ? value : null; ++ } ++ function normalizeResearchArtifactText(value, limit = RESEARCH_ARTIFACT_MAX_EXCERPT) { ++ if (typeof value !== "string") return null; ++ const normalized = value.replace(/\s+/g, " ").trim(); ++ if (normalized === "") return null; ++ return normalized.slice(0, limit); ++ } ++ function preserveResearchArtifactText(value, limit = RESEARCH_ARTIFACT_MAX_EXCERPT) { ++ return typeof value === "string" && value.length <= limit && value.trim().length > 0 ? value : null; ++ } ++ function researchCanvasArtifactContentEditable(node) { ++ return node?.kind === "assistant-result" || node?.kind === "generated-summary" && node?.generationStatus === "completed"; ++ } ++ function canonicalResearchGenerationSource(value) { ++ if (typeof value !== "object" || value === null) return null; ++ const id = boundedResearchArtifactString(value.id, RESEARCH_CANVAS_TEXT_LIMIT); ++ const title = boundedResearchArtifactString(value.title, RESEARCH_ARTIFACT_MAX_TITLE); ++ if (id === null || title === null) return null; ++ if (value.type === "file") { ++ const path = boundedResearchArtifactString(value.path, 8192); ++ return path === null || !/^(?:\/|[A-Za-z]:[\\/])/.test(path) ? null : Object.freeze({ id, type: "file", title, path }); ++ } ++ if (value.type === "artifact") { ++ const text = preserveResearchArtifactText(value.text, 12e4); ++ return text === null ? null : Object.freeze({ id, type: "artifact", title, text }); ++ } ++ return null; ++ } ++ function canonicalResearchGenerationSources(value) { ++ if (!Array.isArray(value) || value.length === 0 || value.length > RESEARCH_GENERATION_MAX_SOURCES) return null; ++ const sources = []; ++ const ids = /* @__PURE__ */ new Set(); ++ for (const raw of value) { ++ const source = canonicalResearchGenerationSource(raw); ++ if (source === null || ids.has(source.id)) return null; ++ ids.add(source.id); ++ sources.push(source); ++ } ++ return Object.freeze(sources); ++ } ++ function researchGenerationSources(snapshot, selectedIds) { ++ const ids = researchSelectionIds(selectedIds); ++ if (ids.length === 0 || ids.length > RESEARCH_GENERATION_MAX_SOURCES) return null; ++ const files = new Map((snapshot?.files ?? []).map((node) => [node.id, node])); ++ const artifacts = new Map((snapshot?.artifacts ?? []).map((node) => [node.id, node])); ++ const sources = []; ++ for (const id of ids) { ++ const file = files.get(id); ++ if (file !== void 0) { ++ const source = canonicalResearchGenerationSource({ ++ id, ++ type: "file", ++ title: file.displayName ?? file.name, ++ path: file.path ++ }); ++ if (source === null) return null; ++ sources.push(source); ++ continue; ++ } ++ const artifact = artifacts.get(id); ++ const source = canonicalResearchGenerationSource({ ++ id, ++ type: "artifact", ++ title: artifact?.title, ++ text: artifact?.excerpt ++ }); ++ if (source === null) return null; ++ sources.push(source); ++ } ++ return Object.freeze(sources); ++ } ++ function researchMindMapLabel(value) { ++ if (typeof value !== 'string') return null; ++ const label = value.replace(//gi, '\n').replace(/^[#>]+\s*/, '').replace(/\*\*|__|`/g, '').split('\n').map((line) => line.replace(/\s+/g, ' ').trim()).filter((line) => line !== '').join('\n').trim(); ++ return label === '' ? null : label.slice(0, 160); ++ } ++ function setResearchMindMapSourceLine(node, sourceLineIndex) { ++ Object.defineProperty(node, "sourceLineIndex", { ++ configurable: false, ++ enumerable: false, ++ writable: false, ++ value: sourceLineIndex ++ }); ++ return node; ++ } ++ function replaceResearchMindMapLabel(value, sourceLineIndex, rawLabel) { ++ if (typeof value !== "string" || !Number.isSafeInteger(sourceLineIndex) || sourceLineIndex < 0) return null; ++ const label = researchMindMapLabel(rawLabel); ++ if (label === null) return null; ++ const newline = value.includes("\r\n") ? "\r\n" : "\n"; ++ const lines = value.split(/\r?\n/); ++ const source = lines[sourceLineIndex]; ++ if (source === void 0) return null; ++ const heading = source.match(/^(\s*#{1,6}\s+).*/); ++ const bullet = source.match(/^(\s*(?:[-*+] |\d+[.)]\s+)).*/); ++ const prefix = heading?.[1] ?? bullet?.[1] ?? source.match(/^\s*/)?.[0] ?? ""; ++ const nextLine = `${prefix}${label.replace(/\n/g, "
")}`; ++ if (nextLine === source) return value; ++ lines[sourceLineIndex] = nextLine; ++ return lines.join(newline); ++ } ++ function parseResearchMindMap(value, requestedDetail = "standard") { ++ if (typeof value !== 'string' || value.trim() === '') return null; ++ const detail = researchMindMapDetail(requestedDetail); ++ const lines = value.split(/\r?\n/).map((line, sourceLineIndex) => ({ line, sourceLineIndex })).filter(({ line }) => line.trim() !== '' && !/^\s*```/.test(line)); ++ const headingIndex = lines.findIndex(({ line }) => /^\s*#{1,6}\s+/.test(line)); ++ const fallbackIndex = lines.findIndex(({ line }) => !/^\s*(?:[-*+] |\d+[.)]\s+)/.test(line)); ++ const rootIndex = headingIndex !== -1 ? headingIndex : fallbackIndex; ++ const rootSource = lines[rootIndex === -1 ? 0 : rootIndex]; ++ const rootLabel = researchMindMapLabel(rootSource?.line); ++ if (rootLabel === null) return null; ++ const root = setResearchMindMapSourceLine({ label: rootLabel, children: [] }, rootSource.sourceLineIndex); ++ const stack = [{ depth: -1, node: root }]; ++ let count = 1; ++ for (let index = 0; index < lines.length && count < 48; index += 1) { ++ if (index === rootIndex) continue; ++ const { line, sourceLineIndex } = lines[index]; ++ const bullet = line.match(/^(\s*)(?:[-*+] |\d+[.)]\s+)(.+)$/); ++ const heading = line.match(/^\s*(#{2,6})\s+(.+)$/); ++ if (bullet === null && heading === null) continue; ++ const sourceDepth = bullet === null ? heading[1].length - 2 : Math.floor(bullet[1].replaceAll('\t', ' ').length / 2); ++ const depth = detail === 'brief' ? Math.min(1, sourceDepth) : sourceDepth; ++ const label = researchMindMapLabel(bullet === null ? heading[2] : bullet[2]); ++ if (label === null) continue; ++ while (stack.length > 1 && stack.at(-1).depth >= depth) stack.pop(); ++ const node = setResearchMindMapSourceLine({ label, children: [] }, sourceLineIndex); ++ stack.at(-1).node.children.push(node); ++ stack.push({ depth, node }); ++ count += 1; ++ } ++ if (detail === 'brief') { ++ root.children = root.children.slice(0, 3).map((child) => { ++ child.children = child.children.slice(0, 2); ++ return child; ++ }); ++ } ++ return root; ++ } ++ function researchArtifactIdentity(value) { ++ if (value.kind === "assistant-excerpt") { ++ const excerpt = normalizeResearchArtifactText(value.excerpt); ++ return excerpt === null ? null : JSON.stringify([value.kind, value.messageId, excerpt]); ++ } ++ return JSON.stringify([value.kind, value.messageId]); ++ } ++ function researchGenerationStatus(value) { ++ if (RESEARCH_GENERATION_STATUSES.has(value)) return value; ++ if (value === "settled") return "completed"; ++ if (value === "error") return "failed"; ++ if (value === "pending") return "interrupted"; ++ return null; ++ } ++ function canonicalResearchCanvasArtifactNode(value) { ++ if (typeof value !== "object" || value === null) return null; ++ const id = boundedResearchArtifactString(value.id, RESEARCH_CANVAS_TEXT_LIMIT); ++ const kind = boundedResearchArtifactString(value.kind, RESEARCH_CANVAS_TEXT_LIMIT); ++ const messageId = boundedResearchArtifactString(value.messageId, RESEARCH_CANVAS_TEXT_LIMIT); ++ const selectionGenerated = kind === "generated-summary" || kind === "generated-mind-map"; ++ const container = kind === "generated-container"; ++ const webLink = kind === "web-link"; ++ const generated = selectionGenerated || container; ++ const rawExcerpt = kind === "assistant-result" ? preserveResearchArtifactText(value.excerpt) : generated ? preserveResearchArtifactText(value.excerpt, RESEARCH_GENERATION_MAX_OUTPUT) : boundedResearchArtifactString(value.excerpt, RESEARCH_ARTIFACT_MAX_EXCERPT); ++ const excerpt = kind === "assistant-excerpt" ? normalizeResearchArtifactText(rawExcerpt) : rawExcerpt; ++ const generationStatus = generated ? researchGenerationStatus(value.generationStatus) : null; ++ const sourceNodeIds = selectionGenerated ? researchSelectionIds(value.sourceNodeIds) : []; ++ const generationSources = selectionGenerated && value.generationSources !== void 0 ? canonicalResearchGenerationSources(value.generationSources) : null; ++ const generationDetail = kind === "generated-mind-map" ? researchMindMapDetail(value.generationDetail) : null; ++ const legacyInterrupted = generated && value.generationStatus === "pending"; ++ const generationError = generated && (value.generationError !== void 0 || legacyInterrupted) ? normalizeResearchArtifactText(value.generationError ?? "任务已中断，请重试。", 512) : null; ++ const generationTaskId = generated && value.generationTaskId !== void 0 ? boundedResearchArtifactString(value.generationTaskId, RESEARCH_CANVAS_TEXT_LIMIT) : null; ++ const generationChildSessionId = generated && value.generationChildSessionId !== void 0 ? boundedResearchArtifactString(value.generationChildSessionId, RESEARCH_CANVAS_TEXT_LIMIT) : null; ++ const generationLastSeq = generated && Number.isSafeInteger(value.generationLastSeq) && value.generationLastSeq >= 0 ? value.generationLastSeq : 0; ++ const url = webLink ? normalizeResearchWebUrl(value.url) : null; ++ const rawTitle = webLink ? typeof value.title === "string" && value.title.length <= RESEARCH_ARTIFACT_MAX_TITLE ? value.title : "" : boundedResearchArtifactString(value.title, RESEARCH_ARTIFACT_MAX_TITLE); ++ const title = webLink && url !== null ? normalizeResearchWebTitle(rawTitle, url) : rawTitle; ++ const titleMode = webLink && url !== null ? researchWebTitleMode(value.titleMode, value.title, url) : null; ++ const containerPrompt = container && typeof value.containerPrompt === "string" && value.containerPrompt.length <= RESEARCH_CONTAINER_MAX_PROMPT ? value.containerPrompt : null; ++ const containerSpec = container && value.containerSpec !== void 0 ? parseResearchContainerSpec(value.containerSpec) : null; ++ const refreshMinutes = container && RESEARCH_CONTAINER_REFRESH_MINUTES.has(value.refreshMinutes) ? value.refreshMinutes : container ? null : 0; ++ const refreshError = container && value.refreshError !== void 0 ? normalizeResearchArtifactText(value.refreshError, 512) : null; ++ const lastSuccessfulAt = container && Number.isFinite(value.lastSuccessfulAt) && value.lastSuccessfulAt >= 0 ? value.lastSuccessfulAt : null; ++ if (id === null || kind === null || !RESEARCH_ARTIFACT_KINDS.has(kind) || messageId === null || title === null || excerpt === null || !Number.isFinite(value.x) || !Number.isFinite(value.y) || webLink && url === null || selectionGenerated && (generationStatus === null || generationStatus === "draft" || sourceNodeIds.length === 0 || value.generationSources !== void 0 && generationSources === null) || container && (generationStatus === null || containerPrompt === null || refreshMinutes === null || generationStatus === "completed" && containerSpec === null || value.containerSpec !== void 0 && containerSpec === null || value.refreshError !== void 0 && refreshError === null) || generated && (value.generationError !== void 0 && generationError === null || value.generationTaskId !== void 0 && generationTaskId === null || value.generationChildSessionId !== void 0 && generationChildSessionId === null)) return null; ++ return { ++ id, ++ kind, ++ messageId, ++ title, ++ excerpt, ++ ...(webLink ? { url, titleMode } : {}), ++ x: value.x, ++ y: value.y, ++ ...(generated ? { ++ generationStatus, ++ sourceNodeIds, ++ ...(generationSources === null ? {} : { generationSources }), ++ ...(generationDetail === null ? {} : { generationDetail }), ++ ...(generationTaskId === null ? {} : { generationTaskId }), ++ ...(generationChildSessionId === null ? {} : { generationChildSessionId }), ++ generationLastSeq, ++ ...(generationError === null ? {} : { generationError }), ++ ...(Number.isFinite(value.generationStartedAt) ? { generationStartedAt: value.generationStartedAt } : {}), ++ ...(Number.isFinite(value.generationCompletedAt) ? { generationCompletedAt: value.generationCompletedAt } : {}) ++ } : {}), ++ ...(container ? { ++ containerPrompt, ++ refreshMinutes, ++ ...(containerSpec === null ? {} : { containerSpec }), ++ ...(refreshError === null ? {} : { refreshError }), ++ ...(lastSuccessfulAt === null ? {} : { lastSuccessfulAt }) ++ } : {}), ++ ...researchCanvasPersistedGeometry(value) ++ }; ++ } ++ function boundedResearchCanvasArtifactNodes(value) { ++ if (!Array.isArray(value)) return []; ++ const nodes = []; ++ const ids = /* @__PURE__ */ new Set(); ++ const sources = /* @__PURE__ */ new Set(); ++ let serializedLength = 2; ++ for (const item of value) { ++ if (nodes.length >= RESEARCH_CANVAS_MAX_ARTIFACTS_PER_SESSION) break; ++ const node = canonicalResearchCanvasArtifactNode(item); ++ const source = node === null ? null : researchArtifactIdentity(node); ++ if (node === null || ids.has(node.id) || sources.has(source)) continue; ++ const nodeLength = JSON.stringify(node).length + (nodes.length === 0 ? 0 : 1); ++ if (serializedLength + nodeLength > RESEARCH_CANVAS_PERSISTED_ARTIFACTS_RAW_LIMIT) continue; ++ ids.add(node.id); ++ sources.add(source); ++ nodes.push(node); ++ serializedLength += nodeLength; ++ } ++ return nodes; ++ } ++ function parseResearchCanvasArtifactNodes(raw) { ++ if (typeof raw !== "string" || raw.length > RESEARCH_CANVAS_PERSISTED_ARTIFACTS_RAW_LIMIT) return []; ++ try { ++ return boundedResearchCanvasArtifactNodes(JSON.parse(raw)); ++ } catch { ++ return []; ++ } ++ } ++ function parseResearchArtifactDrag(raw) { ++ if (typeof raw !== "string" || raw.length > RESEARCH_ARTIFACT_DRAG_RAW_LIMIT) return null; ++ try { ++ const value = JSON.parse(raw); ++ if (typeof value !== "object" || value === null || Array.isArray(value)) return null; ++ const keys = Object.keys(value); ++ if (keys.length !== RESEARCH_ARTIFACT_DRAG_KEYS.length || keys.some((key) => !RESEARCH_ARTIFACT_DRAG_KEYS.includes(key))) return null; ++ const sessionId = boundedResearchArtifactString(value.sessionId, RESEARCH_CANVAS_TEXT_LIMIT); ++ const messageId = boundedResearchArtifactString(value.messageId, RESEARCH_CANVAS_TEXT_LIMIT); ++ const kind = boundedResearchArtifactString(value.kind, RESEARCH_CANVAS_TEXT_LIMIT); ++ const title = boundedResearchArtifactString(value.title, RESEARCH_ARTIFACT_MAX_TITLE); ++ const excerpt = kind === "assistant-result" ? preserveResearchArtifactText(value.excerpt) : boundedResearchArtifactString(value.excerpt, RESEARCH_ARTIFACT_MAX_EXCERPT); ++ return sessionId === null || messageId === null || kind === null || !RESEARCH_ARTIFACT_KINDS.has(kind) || title === null || excerpt === null ? null : { sessionId, messageId, kind, title, excerpt }; ++ } catch { ++ return null; ++ } ++ } ++ function placeResearchCanvasArtifact(nodes, artifact, point, createId) { ++ const current = boundedResearchCanvasArtifactNodes(nodes); ++ const next = current.slice(); ++ const identity = researchArtifactIdentity(artifact); ++ if (identity === null) return current; ++ const found = next.findIndex((node) => researchArtifactIdentity(node) === identity); ++ const excerpt = artifact.kind === "assistant-excerpt" ? normalizeResearchArtifactText(artifact.excerpt) : artifact.excerpt; ++ if (excerpt === null) return current; ++ const node = { ++ id: found === -1 ? createId() : next[found].id, ++ kind: artifact.kind, ++ messageId: artifact.messageId, ++ title: found === -1 ? artifact.title : next[found].title, ++ excerpt, ++ x: point.x, ++ y: point.y, ++ ...(found === -1 ? {} : researchCanvasPersistedGeometry(next[found])) ++ }; ++ if (found !== -1) { ++ next[found] = node; ++ const bounded = boundedResearchCanvasArtifactNodes(next); ++ const boundedIds = /* @__PURE__ */ new Set(bounded.map((item) => item.id)); ++ return current.every((item) => boundedIds.has(item.id)) ? bounded : current; ++ } ++ if (next.length < RESEARCH_CANVAS_MAX_ARTIFACTS_PER_SESSION) next.push(node); ++ return boundedResearchCanvasArtifactNodes(next); ++ } ++ function normalizeResearchRect(a, b) { ++ const left = Math.min(a.x, b.x); ++ const top = Math.min(a.y, b.y); ++ const right = Math.max(a.x, b.x); ++ const bottom = Math.max(a.y, b.y); ++ return { left, top, right, bottom, width: right - left, height: bottom - top }; ++ } ++ function researchNodeViewportRect(node, viewport) { ++ const scale = Number.isFinite(viewport.scale) && viewport.scale > 0 ? viewport.scale : 1; ++ const geometry = normalizeResearchCanvasNodeGeometry(node); ++ const width = geometry.width * scale; ++ const height = geometry.height * scale; ++ const centerX = node.x * scale + viewport.x; ++ const centerY = node.y * scale + viewport.y; ++ return { left: centerX - width / 2, top: centerY - height / 2, right: centerX + width / 2, bottom: centerY + height / 2, width, height }; ++ } ++ function researchCanvasSelectionBounds(nodes, selectedIds) { ++ const selected = new Set(researchSelectionIds(selectedIds)); ++ const rects = Array.isArray(nodes) ? nodes.filter((node) => selected.has(node?.id) && Number.isFinite(node?.x) && Number.isFinite(node?.y)).map((node) => { ++ const geometry = normalizeResearchCanvasNodeGeometry(node); ++ return { ++ left: node.x - geometry.width / 2, ++ top: node.y - geometry.height / 2, ++ right: node.x + geometry.width / 2, ++ bottom: node.y + geometry.height / 2 ++ }; ++ }) : []; ++ if (rects.length === 0) return null; ++ const left = Math.min(...rects.map((rect) => rect.left)); ++ const top = Math.min(...rects.map((rect) => rect.top)); ++ const right = Math.max(...rects.map((rect) => rect.right)); ++ const bottom = Math.max(...rects.map((rect) => rect.bottom)); ++ return { left, top, right, bottom, width: right - left, height: bottom - top }; ++ } ++ const RESEARCH_CANVAS_ORGANIZE_TYPE_ORDER = Object.freeze([ ++ "file:pdf", ++ "file:pptx", ++ "file:docx", ++ "file:xlsx", ++ "file:image", ++ "file:html", ++ "file:markdown", ++ "file:text", ++ "file:generic", ++ "artifact:assistant-result", ++ "artifact:assistant-excerpt", ++ "artifact:generated-summary", ++ "artifact:generated-mind-map", ++ "artifact:web-link", ++ "artifact:generated-container" ++ ]); ++ function researchCanvasAllNodeIds(snapshot) { ++ return [...snapshot.files, ...snapshot.artifacts].filter((node) => typeof node?.id === "string").sort((a, b) => a.y - b.y || a.x - b.x || a.id.localeCompare(b.id)).map((node) => node.id); ++ } ++ function researchCanvasOrganizeType(node) { ++ return typeof node?.kind === "string" && RESEARCH_ARTIFACT_KINDS.has(node.kind) ? `artifact:${node.kind}` : `file:${researchCanvasNodeKind(node)}`; ++ } ++ function researchCanvasOrganizeTextLength(node) { ++ const title = typeof node?.title === "string" ? node.title : typeof node?.displayName === "string" ? node.displayName : typeof node?.name === "string" ? node.name : ""; ++ const excerpt = typeof node?.excerpt === "string" ? node.excerpt : ""; ++ return Math.min(RESEARCH_GENERATION_MAX_OUTPUT, title.length + excerpt.length); ++ } ++ function researchCanvasOrganizeTextGeometry(node, options) { ++ const length = researchCanvasOrganizeTextLength(node); ++ const width = length >= options.wideAt ? options.wideWidth : options.width; ++ const charactersPerLine = Math.max(18, Math.floor((width - 48) / 14)); ++ const estimatedLines = Math.ceil(length / charactersPerLine); ++ return { ++ width, ++ height: Math.min(options.maxHeight, Math.max(options.minHeight, options.baseHeight + estimatedLines * options.lineHeight)), ++ sizeMode: "manual", ++ resizable: true ++ }; ++ } ++ function researchCanvasOrganizeGeometry(node) { ++ const current = normalizeResearchCanvasNodeGeometry(node); ++ if (typeof node?.kind === "string" && RESEARCH_ARTIFACT_KINDS.has(node.kind)) { ++ if (node.kind === "generated-mind-map" && node.generationStatus === "completed") { ++ const detail = researchMindMapDetail(node.generationDetail); ++ return { ++ ...(detail === "brief" ? { width: 720, height: 600 } : detail === "detailed" ? { width: 960, height: 800 } : { width: 840, height: 700 }), ++ sizeMode: "manual", ++ resizable: true ++ }; ++ } ++ if (node.kind === "generated-summary" && node.generationStatus === "completed") return researchCanvasOrganizeTextGeometry(node, { ++ width: 480, ++ wideWidth: 560, ++ wideAt: 900, ++ minHeight: 240, ++ maxHeight: 620, ++ baseHeight: 132, ++ lineHeight: 20 ++ }); ++ if (node.kind === "assistant-result" || node.kind === "assistant-excerpt") return researchCanvasOrganizeTextGeometry(node, { ++ width: 440, ++ wideWidth: 540, ++ wideAt: 720, ++ minHeight: 220, ++ maxHeight: 560, ++ baseHeight: 112, ++ lineHeight: 20 ++ }); ++ if (node.kind === "web-link") return { width: 600, height: 400, sizeMode: "manual", resizable: true }; ++ if (node.kind === "generated-container") { ++ const type = node?.containerSpec?.type; ++ if (type === "kpi") return { width: 520, height: 340, sizeMode: "manual", resizable: true }; ++ if (type === "markdown") return researchCanvasOrganizeTextGeometry(node, { ++ width: 500, ++ wideWidth: 560, ++ wideAt: 900, ++ minHeight: 300, ++ maxHeight: 560, ++ baseHeight: 180, ++ lineHeight: 18 ++ }); ++ return { width: 640, height: type === "chart" || type === "table" ? 440 : 420, sizeMode: "manual", resizable: true }; ++ } ++ return { width: 440, height: 260, sizeMode: "manual", resizable: true }; ++ } ++ const kind = researchCanvasNodeKind(node); ++ if (!current.resizable) return current; ++ if (current.aspectRatio !== void 0) { ++ const width = kind === "pdf" ? 300 : 320; ++ return { width, height: width / current.aspectRatio + RESEARCH_CANVAS_TITLE_HEIGHT, sizeMode: "manual", aspectRatio: current.aspectRatio, resizable: true }; ++ } ++ if (kind === "markdown" || kind === "text") return { width: 380, height: 280, sizeMode: "manual", resizable: true }; ++ if (["pptx", "docx", "xlsx", "html"].includes(kind)) return { width: 420, height: 315, sizeMode: "manual", resizable: true }; ++ return { ...current, sizeMode: "manual" }; ++ } ++ function researchCanvasOrganizedLayout(files, artifacts, canvasSize) { ++ const nodes = [...files, ...artifacts].filter((node) => typeof node?.id === "string" && Number.isFinite(node.x) && Number.isFinite(node.y)); ++ const canvasWidth = Number.isFinite(canvasSize?.width) && canvasSize.width > RESEARCH_CANVAS_ORGANIZE_PADDING * 2 ? canvasSize.width : 1200; ++ const canvasHeight = Number.isFinite(canvasSize?.height) && canvasSize.height > RESEARCH_CANVAS_ORGANIZE_PADDING * 2 ? canvasSize.height : 800; ++ if (nodes.length === 0) return null; ++ const order = new Map(RESEARCH_CANVAS_ORGANIZE_TYPE_ORDER.map((type, index) => [type, index])); ++ const entries = nodes.map((node) => ({ node, type: researchCanvasOrganizeType(node), geometry: researchCanvasOrganizeGeometry(node) })).sort((a, b) => (order.get(a.type) ?? Number.MAX_SAFE_INTEGER) - (order.get(b.type) ?? Number.MAX_SAFE_INTEGER) || a.node.y - b.node.y || a.node.x - b.node.x || a.node.id.localeCompare(b.node.id)); ++ const totalArea = entries.reduce((sum, entry) => sum + entry.geometry.width * entry.geometry.height, 0); ++ const viewportAspect = canvasWidth / canvasHeight; ++ const maximumNodeWidth = Math.max(...entries.map((entry) => entry.geometry.width)); ++ const candidates = /* @__PURE__ */ new Set([maximumNodeWidth]); ++ let rowWidth = 0; ++ for (const entry of entries) { ++ rowWidth += (rowWidth === 0 ? 0 : RESEARCH_CANVAS_ORGANIZE_NODE_GAP) + entry.geometry.width; ++ candidates.add(rowWidth); ++ } ++ const areaWidth = Math.sqrt(Math.max(1, totalArea) * viewportAspect); ++ for (const factor of [.7, .85, 1, 1.2, 1.45, 1.75]) candidates.add(Math.max(maximumNodeWidth, areaWidth * factor)); ++ const layoutAtWidth = (targetWidth) => { ++ const positions = /* @__PURE__ */ new Map(); ++ const rows = []; ++ let row = []; ++ let rowWidth2 = 0; ++ for (const entry of entries) { ++ const nextWidth = rowWidth2 + (row.length === 0 ? 0 : RESEARCH_CANVAS_ORGANIZE_NODE_GAP) + entry.geometry.width; ++ if (row.length > 0 && nextWidth > targetWidth) { ++ rows.push(row); ++ row = []; ++ rowWidth2 = 0; ++ } ++ row.push(entry); ++ rowWidth2 += (row.length === 1 ? 0 : RESEARCH_CANVAS_ORGANIZE_NODE_GAP) + entry.geometry.width; ++ } ++ if (row.length > 0) rows.push(row); ++ let top = 0; ++ let layoutWidth = 0; ++ for (const packedRow of rows) { ++ let left = 0; ++ const rowHeight = Math.max(...packedRow.map((entry) => entry.geometry.height)); ++ for (const entry of packedRow) { ++ const { width, height } = entry.geometry; ++ positions.set(entry.node.id, { x: left + width / 2, y: top + rowHeight / 2 }); ++ left += width + RESEARCH_CANVAS_ORGANIZE_NODE_GAP; ++ layoutWidth = Math.max(layoutWidth, left - RESEARCH_CANVAS_ORGANIZE_NODE_GAP); ++ } ++ top += rowHeight + RESEARCH_CANVAS_ORGANIZE_NODE_GAP; ++ } ++ const layoutHeight = Math.max(1, top - RESEARCH_CANVAS_ORGANIZE_NODE_GAP); ++ return { positions, width: Math.max(1, layoutWidth), height: layoutHeight }; ++ }; ++ let best = null; ++ for (const targetWidth of [...candidates].filter((value) => Number.isFinite(value) && value >= maximumNodeWidth).sort((a, b) => a - b)) { ++ const candidate = layoutAtWidth(targetWidth); ++ const ratioCost = Math.abs(Math.log(candidate.width / candidate.height / viewportAspect)); ++ const whitespaceCost = Math.max(0, candidate.width * candidate.height / Math.max(1, totalArea) - 1) * .015; ++ const score = ratioCost + whitespaceCost; ++ if (best === null || score < best.score) best = { ...candidate, score }; ++ } ++ if (best === null) return null; ++ const fitScale = Math.min((canvasWidth - RESEARCH_CANVAS_ORGANIZE_PADDING * 2) / best.width, (canvasHeight - RESEARCH_CANVAS_ORGANIZE_PADDING * 2) / best.height); ++ const scale = Math.max(RESEARCH_CANVAS_MIN_SCALE, Math.min(1, fitScale)); ++ const viewport = { ++ scale, ++ x: canvasWidth / 2 - best.width / 2 * scale, ++ y: canvasHeight / 2 - best.height / 2 * scale ++ }; ++ const geometryById = new Map(entries.map((entry) => [entry.node.id, entry.geometry])); ++ const positioned = (node) => { ++ const position = best.positions.get(node.id); ++ const geometry = geometryById.get(node.id); ++ return position === void 0 || geometry === void 0 ? node : { ++ ...node, ++ ...position, ++ width: geometry.width, ++ height: geometry.height, ++ sizeMode: geometry.sizeMode, ++ ...(geometry.aspectRatio === void 0 ? {} : { aspectRatio: geometry.aspectRatio }) ++ }; ++ }; ++ return { files: files.map(positioned), artifacts: artifacts.map(positioned), viewport }; ++ } ++ function researchCanvasViewportPlacement(snapshot, kind, cascadeIndex = 0) { ++ const dimensions = kind === "web-link" ? { width: 720, height: 480 } : kind === "generated-container" ? { width: 520, height: 300 } : null; ++ if (dimensions === null) return null; ++ const viewport = snapshot?.viewport ?? { scale: 1, x: 0, y: 0 }; ++ const canvasSize = snapshot?.canvasSize ?? { width: 0, height: 0 }; ++ const scale = Number.isFinite(viewport.scale) && viewport.scale > 0 ? viewport.scale : 1; ++ const width = Number.isFinite(canvasSize.width) && canvasSize.width > 0 ? canvasSize.width : 1200; ++ const height = Number.isFinite(canvasSize.height) && canvasSize.height > 0 ? canvasSize.height : 800; ++ const center = researchCanvasWorldPoint(viewport, { x: width / 2, y: height / 2 }); ++ const cascade = Math.min(3, Math.max(0, Number.isFinite(cascadeIndex) ? Math.floor(cascadeIndex) : 0)); ++ const offset = cascade * 24 / scale; ++ return { x: center.x + offset, y: center.y + offset, ...dimensions, sizeMode: "auto" }; ++ } ++ function researchCanvasGeneratedPlacement(nodes, selectedIds, kind, requestedDetail = "standard") { ++ const bounds = researchCanvasSelectionBounds(nodes, selectedIds); ++ if (bounds === null) return null; ++ if (kind !== "mind-map" && kind !== "summary") return null; ++ const width = 520; ++ const height = 300; ++ return { ++ x: bounds.right + 32 + width / 2, ++ y: bounds.top + bounds.height / 2, ++ width, ++ height, ++ sizeMode: "auto" ++ }; ++ } ++ function researchGenerationAutoGeometry(node, process = node) { ++ if (node?.sizeMode === "manual") return null; ++ const events = Array.isArray(process?.generationEvents) ? process.generationEvents : Array.isArray(process?.events) ? process.events : []; ++ const partial = typeof process?.generationPartialText === "string" ? process.generationPartialText : typeof process?.partialText === "string" ? process.partialText : ""; ++ const rows = Math.min(8, events.filter((event) => event?.type === "tool-started" || event?.type === "tool-finished").length); ++ const visibleLength = Math.min(RESEARCH_GENERATION_MAX_PARTIAL_TEXT, partial.length); ++ const width = Math.min(640, Math.max(480, 480 + Math.ceil(Math.max(0, visibleLength - 320) / 20))); ++ const estimatedLines = Math.min(14, Math.ceil(visibleLength / Math.max(24, Math.floor((width - 40) / 14)))); ++ const height = Math.min(560, Math.max(280, 280 + rows * 24 + estimatedLines * 20)); ++ return { width, height }; ++ } ++ function researchGenerationFinalGeometry(node, text) { ++ if (node?.sizeMode === "manual") return null; ++ if (node?.kind === "generated-mind-map") { ++ const detail = researchMindMapDetail(node.generationDetail); ++ return detail === "brief" ? { width: 840, height: 700 } : detail === "detailed" ? { width: 1080, height: 900 } : { width: 960, height: 800 }; ++ } ++ const length = typeof text === "string" ? text.length : 0; ++ return { width: 520, height: Math.min(640, Math.max(280, 220 + Math.ceil(length / 34) * 22)) }; ++ } ++ function researchContainerFinalGeometry(node, spec) { ++ if (node?.sizeMode === "manual" || spec === null) return null; ++ if (spec.type === "web") return { width: 720, height: 480 }; ++ if (spec.type === "chart") return { width: 720, height: 500 }; ++ if (spec.type === "table") return { width: 720, height: 480 }; ++ if (spec.type === "kpi") return { width: 640, height: 420 }; ++ return { width: 560, height: 400 }; ++ } ++ function researchContainerRefreshDue(node, state) { ++ if (node?.kind !== "generated-container" || node.generationStatus !== "completed" || node.containerSpec === void 0 || !RESEARCH_CONTAINER_REFRESH_MINUTES.has(node.refreshMinutes) || node.refreshMinutes === 0) return false; ++ if (state?.visible !== true || state.documentVisible !== true || state.inert === true || !Number.isFinite(state.now)) return false; ++ const lastSuccessfulAt = Number.isFinite(node.lastSuccessfulAt) ? node.lastSuccessfulAt : Number.isFinite(node.generationCompletedAt) ? node.generationCompletedAt : null; ++ return lastSuccessfulAt !== null && state.now >= lastSuccessfulAt + node.refreshMinutes * 6e4; ++ } ++ function activeResearchGenerationNodes(snapshot) { ++ return Array.isArray(snapshot?.artifacts) ? snapshot.artifacts.filter((node) => RESEARCH_ACTIVE_GENERATION_STATUSES.has(node?.generationStatus) && typeof node?.generationTaskId === "string") : []; ++ } ++ function researchNodeNearViewport(node, viewport, canvasSize, margin = 240) { ++ const rect = researchNodeViewportRect(node, viewport); ++ const safeMargin = Number.isFinite(margin) && margin >= 0 ? margin : 240; ++ const width = Number.isFinite(canvasSize?.width) && canvasSize.width >= 0 ? canvasSize.width : 0; ++ const height = Number.isFinite(canvasSize?.height) && canvasSize.height >= 0 ? canvasSize.height : 0; ++ return rect.right >= -safeMargin && rect.left <= width + safeMargin && rect.bottom >= -safeMargin && rect.top <= height + safeMargin; ++ } ++ function researchCanvasHasVisibleNodes(nodes, viewport, canvasSize) { ++ const width = Number.isFinite(canvasSize?.width) && canvasSize.width > 0 ? canvasSize.width : 0; ++ const height = Number.isFinite(canvasSize?.height) && canvasSize.height > 0 ? canvasSize.height : 0; ++ if (!Array.isArray(nodes) || nodes.length === 0 || width === 0 || height === 0) return false; ++ return nodes.some((node) => { ++ const rect = researchNodeViewportRect(node, viewport); ++ return rect.right >= 0 && rect.left <= width && rect.bottom >= 0 && rect.top <= height; ++ }); ++ } ++ function researchCanvasFocusViewport(node, viewport, canvasSize) { ++ const width = Number.isFinite(canvasSize?.width) && canvasSize.width > 0 ? canvasSize.width : 0; ++ const height = Number.isFinite(canvasSize?.height) && canvasSize.height > 0 ? canvasSize.height : 0; ++ if (node === void 0 || !Number.isFinite(node?.x) || !Number.isFinite(node?.y) || width === 0 || height === 0) return viewport; ++ const scale = Number.isFinite(viewport?.scale) && viewport.scale > 0 ? viewport.scale : 1; ++ return { ++ scale, ++ x: width / 2 - node.x * scale, ++ y: height / 2 - node.y * scale ++ }; ++ } ++ function researchCanvasReturnViewport(nodes, viewport, canvasSize) { ++ const width = Number.isFinite(canvasSize?.width) && canvasSize.width > 0 ? canvasSize.width : 0; ++ const height = Number.isFinite(canvasSize?.height) && canvasSize.height > 0 ? canvasSize.height : 0; ++ const availableNodes = Array.isArray(nodes) ? nodes.filter((node) => Number.isFinite(node?.x) && Number.isFinite(node?.y)) : []; ++ if (availableNodes.length === 0 || width === 0 || height === 0) return viewport; ++ const currentScale = Number.isFinite(viewport?.scale) && viewport.scale > 0 ? viewport.scale : 1; ++ const worldCenterX = (width / 2 - viewport.x) / currentScale; ++ const worldCenterY = (height / 2 - viewport.y) / currentScale; ++ const nearest = availableNodes.reduce((best, node) => { ++ const bestDistance = (best.x - worldCenterX) ** 2 + (best.y - worldCenterY) ** 2; ++ const distance = (node.x - worldCenterX) ** 2 + (node.y - worldCenterY) ** 2; ++ return distance < bestDistance ? node : best; ++ }); ++ const geometry = normalizeResearchCanvasNodeGeometry(nearest); ++ const fitScale = Math.min( ++ Math.max(1, width - RESEARCH_CANVAS_RETURN_PADDING * 2) / geometry.width, ++ Math.max(1, height - RESEARCH_CANVAS_RETURN_PADDING * 2) / geometry.height ++ ); ++ const scale = Math.max(RESEARCH_CANVAS_MIN_SCALE, Math.min(currentScale, RESEARCH_CANVAS_RETURN_MAX_SCALE, fitScale)); ++ return { ++ scale, ++ x: width / 2 - nearest.x * scale, ++ y: height / 2 - nearest.y * scale ++ }; ++ } ++ function researchNodesInMarquee(nodes, viewport, rect) { ++ return nodes.filter((node) => { ++ const nodeRect = researchNodeViewportRect(node, viewport); ++ return nodeRect.left <= rect.right && nodeRect.right >= rect.left && nodeRect.top <= rect.bottom && nodeRect.bottom >= rect.top; ++ }).map((node) => node.id); ++ } ++ function researchSelectionIds(value) { ++ return Array.isArray(value) ? value.filter((id, index, ids) => boundedString(id) !== null && ids.indexOf(id) === index) : []; ++ } ++ function updateResearchSelection(selection, nodeIds, mode, files) { ++ const current = researchSelectionIds(selection?.selectedNodeIds); ++ const incoming = researchSelectionIds(nodeIds); ++ let selectedNodeIds; ++ if (mode === "add") selectedNodeIds = [...current, ...incoming.filter((id) => !current.includes(id))]; ++ else if (mode === "toggle") selectedNodeIds = current.filter((id) => !incoming.includes(id)).concat(incoming.filter((id) => !current.includes(id))); ++ else selectedNodeIds = incoming; ++ const fileIds = /* @__PURE__ */ new Set(files.map((file) => file.id)); ++ const previousOrder = researchSelectionIds(selection?.orderedFileIds).filter((id) => selectedNodeIds.includes(id) && fileIds.has(id)); ++ const orderedFileIds = [...previousOrder]; ++ for (const id of selectedNodeIds) if (fileIds.has(id) && !orderedFileIds.includes(id)) orderedFileIds.push(id); ++ return { selectedNodeIds, orderedFileIds }; ++ } ++ function parseResearchCanvasSelection(raw, files, artifacts) { ++ if (typeof raw !== "string" || raw.length > RESEARCH_CANVAS_PERSISTED_FILES_RAW_LIMIT) return { ...EMPTY_RESEARCH_SELECTION, selectedNodeIds: [], orderedFileIds: [] }; ++ try { ++ const value = JSON.parse(raw); ++ if (typeof value !== "object" || value === null) return { selectedNodeIds: [], orderedFileIds: [] }; ++ const liveNodeIds = /* @__PURE__ */ new Set([...files, ...artifacts].map((node) => node.id)); ++ const selectedNodeIds = researchSelectionIds(value.selectedNodeIds).filter((id) => liveNodeIds.has(id)); ++ const fileIds = /* @__PURE__ */ new Set(files.map((file) => file.id)); ++ const orderedFileIds = researchSelectionIds(value.orderedFileIds).filter((id) => selectedNodeIds.includes(id) && fileIds.has(id)); ++ for (const id of selectedNodeIds) if (fileIds.has(id) && !orderedFileIds.includes(id)) orderedFileIds.push(id); ++ return { selectedNodeIds, orderedFileIds }; ++ } catch { ++ return { selectedNodeIds: [], orderedFileIds: [] }; ++ } ++ } ++ function moveResearchCanvasNodes(files, artifacts, selectedIds, delta, scale) { ++ const selected = /* @__PURE__ */ new Set(researchSelectionIds(selectedIds)); ++ const divisor = Number.isFinite(scale) && scale > 0 ? scale : 1; ++ const x = Number.isFinite(delta?.x) ? delta.x / divisor : 0; ++ const y = Number.isFinite(delta?.y) ? delta.y / divisor : 0; ++ const move = (node) => selected.has(node.id) ? { ...node, x: node.x + x, y: node.y + y } : node; ++ return { files: files.map(move), artifacts: artifacts.map(move) }; ++ } ++ function removeResearchCanvasNodes(files, artifacts, nodeIds) { ++ const removed = /* @__PURE__ */ new Set(researchSelectionIds(nodeIds)); ++ return { ++ files: files.filter((node) => !removed.has(node.id)), ++ artifacts: artifacts.filter((node) => !removed.has(node.id)) ++ }; ++ } ++ function loadResearchCanvasArtifacts(storage, sessionId) { ++ if (storage === null) return []; ++ try { ++ return parseResearchCanvasArtifactNodes(storage.getItem(researchCanvasArtifactsStorageKey(sessionId)) ?? "[]"); ++ } catch { ++ return []; ++ } ++ } ++ function saveResearchCanvasArtifacts(storage, sessionId, nodes) { ++ if (storage === null) return; ++ try { ++ storage.setItem(researchCanvasArtifactsStorageKey(sessionId), JSON.stringify(boundedResearchCanvasArtifactNodes(nodes))); ++ } catch {} ++ } ++ function loadResearchCanvasSelection(storage, sessionId, files, artifacts) { ++ if (storage === null) return { selectedNodeIds: [], orderedFileIds: [] }; ++ try { ++ return parseResearchCanvasSelection(storage.getItem(researchCanvasSelectionStorageKey(sessionId)) ?? "{}", files, artifacts); ++ } catch { ++ return { selectedNodeIds: [], orderedFileIds: [] }; ++ } ++ } ++ function saveResearchCanvasSelection(storage, sessionId, selection) { ++ if (storage === null) return; ++ try { ++ storage.setItem(researchCanvasSelectionStorageKey(sessionId), JSON.stringify(selection)); ++ } catch {} ++ } ++ function researchWorkspaceSnapshot(snapshot) { ++ return Object.freeze({ ++ files: Object.freeze(snapshot.files.map((node) => Object.freeze({ ...node }))), ++ artifacts: Object.freeze(snapshot.artifacts.map((node) => Object.freeze({ ...node }))), ++ selection: Object.freeze({ selectedNodeIds: Object.freeze([...snapshot.selection.selectedNodeIds]), orderedFileIds: Object.freeze([...snapshot.selection.orderedFileIds]) }), ++ viewport: Object.freeze({ ...snapshot.viewport }), ++ canvasSize: Object.freeze({ ...snapshot.canvasSize }), ++ pendingMessageJump: snapshot.pendingMessageJump, ++ unavailableSourceMessageIds: Object.freeze([...(snapshot.unavailableSourceMessageIds ?? [])]) ++ }); ++ } ++ function canonicalResearchGenerationEvent(value, taskId, canvasNodeId) { ++ if (typeof value !== "object" || value === null || value.taskId !== taskId || value.canvasNodeId !== canvasNodeId || !Number.isSafeInteger(value.seq) || value.seq < 1) return null; ++ const base = { taskId, canvasNodeId, seq: value.seq, ...(Number.isFinite(value.time) ? { time: value.time } : {}) }; ++ if (value.type === "queued" || value.type === "started") return { ...base, type: value.type }; ++ if (value.type === "assistant-delta") { ++ const text = preserveResearchArtifactText(value.text, 8192); ++ return text === null ? null : { ...base, type: value.type, text }; ++ } ++ if (value.type === "tool-started") { ++ const tool = normalizeResearchArtifactText(value.tool, 64); ++ return tool === null ? null : { ...base, type: value.type, tool }; ++ } ++ if (value.type === "tool-finished" && typeof value.failed === "boolean") return { ...base, type: value.type, failed: value.failed }; ++ return null; ++ } ++ function researchGenerationInspectionEvents(value, taskId, canvasNodeId, afterSeq) { ++ if (!Array.isArray(value)) return []; ++ const events = []; ++ const seen = /* @__PURE__ */ new Set(); ++ for (const raw of value) { ++ const event = canonicalResearchGenerationEvent(raw, taskId, canvasNodeId); ++ if (event === null || event.seq <= afterSeq || seen.has(event.seq)) continue; ++ seen.add(event.seq); ++ events.push(event); ++ } ++ return events.sort((a, b) => a.seq - b.seq).slice(-RESEARCH_GENERATION_MAX_EVENTS); ++ } ++ function createResearchWorkspaceSession(storage, sessionId) { ++ const files = loadResearchCanvasFiles(storage, sessionId); ++ const artifacts = loadResearchCanvasArtifacts(storage, sessionId); ++ let orphanRevocationIds = loadResearchCanvasRevocationOutbox(storage, sessionId); ++ let orphanRevocationsDurable = orphanRevocationIds.length === 0 || saveResearchCanvasRevocationOutbox(storage, sessionId, orphanRevocationIds); ++ let snapshot = researchWorkspaceSnapshot({ files, artifacts, selection: loadResearchCanvasSelection(storage, sessionId, files, artifacts), viewport: { scale: 1, x: 0, y: 0 }, canvasSize: { width: 0, height: 0 }, pendingMessageJump: null, unavailableSourceMessageIds: [] }); ++ const listeners = /* @__PURE__ */ new Set(); ++ const pendingNodeRevocations = /* @__PURE__ */ new Set(); ++ let assistantActionsActive = false; ++ const assistantActionListeners = /* @__PURE__ */ new Set(); ++ let generationCancelSink; ++ const persistSnapshot = () => { ++ const filesDurable = saveResearchCanvasFiles(storage, sessionId, snapshot.files); ++ saveResearchCanvasArtifacts(storage, sessionId, snapshot.artifacts); ++ saveResearchCanvasSelection(storage, sessionId, snapshot.selection); ++ return filesDurable; ++ }; ++ const publish = (next, persist = false) => { ++ snapshot = researchWorkspaceSnapshot(next); ++ const filesDurable = persist ? persistSnapshot() : true; ++ listeners.forEach((listener) => listener()); ++ return filesDurable; ++ }; ++ const update = (patch, persist) => publish({ ...snapshot, ...patch }, persist); ++ const removePersistedNodes = (nodeIds) => { ++ const removed = /* @__PURE__ */ new Set(researchSelectionIds(nodeIds)); ++ if (removed.size === 0) return; ++ const next = removeResearchCanvasNodes(snapshot.files, snapshot.artifacts, [...removed]); ++ if (next.files.length === snapshot.files.length && next.artifacts.length === snapshot.artifacts.length) return; ++ update({ ++ ...next, ++ selection: { ++ selectedNodeIds: snapshot.selection.selectedNodeIds.filter((id) => !removed.has(id)), ++ orderedFileIds: snapshot.selection.orderedFileIds.filter((id) => !removed.has(id)) ++ } ++ }, true); ++ }; ++ const visibleCenter = () => researchCanvasWorldPoint(snapshot.viewport, { ++ x: snapshot.canvasSize.width / 2, ++ y: snapshot.canvasSize.height / 2 ++ }); ++ const addAssistantArtifact = (kind, messageId, text, title, at) => { ++ const normalizedMessageId = boundedResearchArtifactString(messageId, RESEARCH_CANVAS_TEXT_LIMIT); ++ const excerpt = kind === "assistant-result" ? preserveResearchArtifactText(text) : normalizeResearchArtifactText(text); ++ if (normalizedMessageId === null || excerpt === null) return; ++ const point = Number.isFinite(at?.x) && Number.isFinite(at?.y) ? at : visibleCenter(); ++ update({ ++ artifacts: placeResearchCanvasArtifact(snapshot.artifacts, { ++ sessionId, ++ messageId: normalizedMessageId, ++ kind, ++ title, ++ excerpt ++ }, point, createResearchCanvasArtifactId) ++ }, true); ++ }; ++ return { ++ subscribe(listener) { listeners.add(listener); return () => listeners.delete(listener); }, ++ getSnapshot() { return snapshot; }, ++ subscribeAssistantActions(listener) { assistantActionListeners.add(listener); return () => assistantActionListeners.delete(listener); }, ++ assistantActionsActive() { return assistantActionsActive; }, ++ setAssistantActionsActive(active) { ++ const next = active === true; ++ if (assistantActionsActive === next) return; ++ assistantActionsActive = next; ++ assistantActionListeners.forEach((listener) => listener()); ++ }, ++ selectionSnapshot() { return { selectedNodeIds: [...snapshot.selection.selectedNodeIds], orderedFileIds: [...snapshot.selection.orderedFileIds] }; }, ++ selectedFiles() { const byId = /* @__PURE__ */ new Map(snapshot.files.map((file) => [file.id, file])); return snapshot.selection.orderedFileIds.flatMap((id) => byId.has(id) ? [byId.get(id)] : []); }, ++ pendingOrphanRevocations() { return [...orphanRevocationIds]; }, ++ queueOrphanRevocations(nodeIds) { ++ const next = researchSelectionIds([...orphanRevocationIds, ...nodeIds]).slice(0, RESEARCH_CANVAS_MAX_REVOCATION_OUTBOX); ++ const changed = next.length !== orphanRevocationIds.length || next.some((id, index) => id !== orphanRevocationIds[index]); ++ if (changed) { ++ orphanRevocationIds = next; ++ orphanRevocationsDurable = false; ++ } ++ if (!orphanRevocationsDurable) orphanRevocationsDurable = saveResearchCanvasRevocationOutbox(storage, sessionId, orphanRevocationIds); ++ return orphanRevocationsDurable; ++ }, ++ completeOrphanRevocation(nodeId) { ++ const next = orphanRevocationIds.filter((id) => id !== nodeId); ++ if (next.length !== orphanRevocationIds.length) { ++ orphanRevocationIds = next; ++ orphanRevocationsDurable = false; ++ } ++ if (!orphanRevocationsDurable) orphanRevocationsDurable = saveResearchCanvasRevocationOutbox(storage, sessionId, orphanRevocationIds); ++ return orphanRevocationsDurable; ++ }, ++ setFiles(files2) { const nextFiles = parseResearchCanvasFileNodes(JSON.stringify(files2)); return update({ files: nextFiles, selection: parseResearchCanvasSelection(JSON.stringify(snapshot.selection), nextFiles, snapshot.artifacts) }, true); }, ++ setArtifacts(artifacts2) { const nextArtifacts = boundedResearchCanvasArtifactNodes(artifacts2); update({ artifacts: nextArtifacts, selection: parseResearchCanvasSelection(JSON.stringify(snapshot.selection), snapshot.files, nextArtifacts) }, true); }, ++ createWebLink(rawUrl, placement = null) { ++ const url = normalizeResearchWebUrl(rawUrl); ++ if (url === null) return null; ++ const id = createResearchCanvasArtifactId(); ++ const cascade = snapshot.artifacts.filter((node) => node.kind === "web-link" || node.kind === "generated-container").length; ++ const point = placement ?? researchCanvasViewportPlacement(snapshot, "web-link", cascade); ++ if (point === null) return null; ++ const artifact = canonicalResearchCanvasArtifactNode({ ++ id, ++ kind: "web-link", ++ messageId: id, ++ title: researchWebUrlHostname(url), ++ titleMode: "auto", ++ excerpt: url, ++ url, ++ ...point ++ }); ++ if (artifact === null) return null; ++ const artifacts2 = boundedResearchCanvasArtifactNodes([...snapshot.artifacts, artifact]); ++ if (!artifacts2.some((node) => node.id === id)) return null; ++ update({ artifacts: artifacts2, selection: { selectedNodeIds: [id], orderedFileIds: [] } }, true); ++ return artifact; ++ }, ++ createContainerDraft(placement = null) { ++ const id = createResearchCanvasArtifactId(); ++ const cascade = snapshot.artifacts.filter((node) => node.kind === "web-link" || node.kind === "generated-container").length; ++ const point = placement ?? researchCanvasViewportPlacement(snapshot, "generated-container", cascade); ++ if (point === null) return null; ++ const artifact = canonicalResearchCanvasArtifactNode({ ++ id, ++ kind: "generated-container", ++ messageId: id, ++ title: "智能容器", ++ excerpt: "描述想创建的内容", ++ generationStatus: "draft", ++ generationLastSeq: 0, ++ containerPrompt: "", ++ refreshMinutes: 0, ++ ...point ++ }); ++ if (artifact === null) return null; ++ const artifacts2 = boundedResearchCanvasArtifactNodes([...snapshot.artifacts, artifact]); ++ if (!artifacts2.some((node) => node.id === id)) return null; ++ update({ artifacts: artifacts2, selection: { selectedNodeIds: [id], orderedFileIds: [] } }, true); ++ return artifact; ++ }, ++ updateWebLink(nodeId, rawUrl) { ++ const index = snapshot.artifacts.findIndex((node) => node.id === nodeId && node.kind === "web-link"); ++ const url = normalizeResearchWebUrl(rawUrl); ++ if (index === -1 || url === null || snapshot.artifacts[index].url === url) return false; ++ const artifacts2 = snapshot.artifacts.slice(); ++ artifacts2[index] = { ...artifacts2[index], url, excerpt: url, title: researchWebUrlHostname(url), titleMode: "auto" }; ++ update({ artifacts: artifacts2 }, true); ++ return true; ++ }, ++ applyWebLinkInspection(nodeId, expectedUrl, inspection) { ++ const index = snapshot.artifacts.findIndex((node) => node.id === nodeId && node.kind === "web-link"); ++ if (index === -1) return false; ++ const current = snapshot.artifacts[index]; ++ const url = normalizeResearchWebUrl(expectedUrl); ++ if (url === null || current.url !== url || current.titleMode !== "auto") return false; ++ const title = normalizeResearchWebTitle(inspection?.title, url); ++ if (title === current.title) return false; ++ const artifacts2 = snapshot.artifacts.slice(); ++ artifacts2[index] = { ...current, title }; ++ update({ artifacts: artifacts2 }, true); ++ return true; ++ }, ++ updateContainerDraft(nodeId, rawPrompt) { ++ const index = snapshot.artifacts.findIndex((node) => node.id === nodeId && node.kind === "generated-container" && !RESEARCH_ACTIVE_GENERATION_STATUSES.has(node.generationStatus)); ++ const prompt = typeof rawPrompt === "string" && rawPrompt.trim() !== "" && rawPrompt.length <= RESEARCH_CONTAINER_MAX_PROMPT ? rawPrompt.trim() : null; ++ if (index === -1 || prompt === null) return false; ++ const current = snapshot.artifacts[index]; ++ const { generationError: _generationError, refreshError: _refreshError, generationTaskId: _taskId, generationChildSessionId: _childId, generationStartedAt: _startedAt, generationCompletedAt: _completedAt, generationEvents: _events, generationPartialText: _partial, ...editable } = current; ++ const artifacts2 = snapshot.artifacts.slice(); ++ artifacts2[index] = { ...editable, containerPrompt: prompt, generationStatus: "draft", generationLastSeq: 0, excerpt: prompt }; ++ update({ artifacts: artifacts2 }, true); ++ return true; ++ }, ++ beginContainerGeneration(nodeId, rawPrompt) { ++ const index = snapshot.artifacts.findIndex((node) => node.id === nodeId && node.kind === "generated-container" && !RESEARCH_ACTIVE_GENERATION_STATUSES.has(node.generationStatus)); ++ const prompt = typeof rawPrompt === "string" && rawPrompt.trim() !== "" && rawPrompt.length <= RESEARCH_CONTAINER_MAX_PROMPT ? rawPrompt.trim() : null; ++ if (index === -1 || prompt === null) return null; ++ const current = snapshot.artifacts[index]; ++ const { generationError: _generationError, refreshError: _refreshError, generationTaskId: _taskId, generationChildSessionId: _childId, generationStartedAt: _startedAt, generationCompletedAt: _completedAt, generationEvents: _events, generationPartialText: _partial, ...queued } = current; ++ const artifacts2 = snapshot.artifacts.slice(); ++ artifacts2[index] = { ++ ...queued, ++ containerPrompt: prompt, ++ generationStatus: "queued", ++ generationLastSeq: 0, ++ excerpt: "正在准备任务…" ++ }; ++ update({ artifacts: artifacts2, selection: { selectedNodeIds: [nodeId], orderedFileIds: [] } }, true); ++ return { id: nodeId, kind: "container", prompt }; ++ }, ++ setContainerRefresh(nodeId, value) { ++ const index = snapshot.artifacts.findIndex((node) => node.id === nodeId && node.kind === "generated-container"); ++ if (index === -1 || !RESEARCH_CONTAINER_REFRESH_MINUTES.has(value) || snapshot.artifacts[index].refreshMinutes === value) return false; ++ const artifacts2 = snapshot.artifacts.slice(); ++ artifacts2[index] = { ...artifacts2[index], refreshMinutes: value }; ++ update({ artifacts: artifacts2 }, true); ++ return true; ++ }, ++ beginGeneration(kind, sourceNodeIds, placement, requestedDetail = "standard") { ++ const selectedNodeIds = researchSelectionIds(sourceNodeIds); ++ const liveIds = new Set([...snapshot.files, ...snapshot.artifacts].map((node) => node.id)); ++ if (!['mind-map', 'summary'].includes(kind) || selectedNodeIds.length === 0 || selectedNodeIds.some((id) => !liveIds.has(id)) || placement === null) return null; ++ const generationSources = researchGenerationSources(snapshot, selectedNodeIds); ++ if (generationSources === null) return null; ++ const generationDetail = kind === 'mind-map' ? researchMindMapDetail(requestedDetail) : null; ++ const id = createResearchCanvasArtifactId(); ++ const artifact = canonicalResearchCanvasArtifactNode({ ++ id, ++ kind: kind === 'mind-map' ? 'generated-mind-map' : 'generated-summary', ++ messageId: id, ++ title: kind === 'mind-map' ? '思维导图' : '总结提炼', ++ excerpt: '正在准备任务…', ++ generationStatus: 'queued', ++ sourceNodeIds: selectedNodeIds, ++ generationSources, ++ generationLastSeq: 0, ++ ...(generationDetail === null ? {} : { generationDetail }), ++ ...placement ++ }); ++ if (artifact === null) return null; ++ const artifacts2 = boundedResearchCanvasArtifactNodes([...snapshot.artifacts, artifact]); ++ if (!artifacts2.some((node) => node.id === id)) return null; ++ update({ ++ artifacts: artifacts2, ++ selection: { selectedNodeIds: [id], orderedFileIds: [] } ++ }, true); ++ return artifact; ++ }, ++ attachGenerationTask(nodeId, receipt) { ++ const index = snapshot.artifacts.findIndex((node) => node.id === nodeId && node.generationStatus === 'queued' && node.generationTaskId === void 0); ++ const taskId = boundedResearchArtifactString(receipt?.taskId, RESEARCH_CANVAS_TEXT_LIMIT); ++ const childSessionId = receipt?.childSessionId === void 0 ? null : boundedResearchArtifactString(receipt.childSessionId, RESEARCH_CANVAS_TEXT_LIMIT); ++ const state = researchGenerationStatus(receipt?.state); ++ const lastSeq = Number.isSafeInteger(receipt?.lastSeq) && receipt.lastSeq >= 0 ? receipt.lastSeq : 0; ++ if (index === -1 || taskId === null || receipt?.canvasNodeId !== nodeId || !RESEARCH_ACTIVE_GENERATION_STATUSES.has(state) || receipt?.childSessionId !== void 0 && childSessionId === null) return false; ++ const current = snapshot.artifacts[index]; ++ const events = researchGenerationInspectionEvents(receipt.events, taskId, nodeId, 0); ++ const partialText = events.filter((event) => event.type === 'assistant-delta').map((event) => event.text).join('').slice(0, RESEARCH_GENERATION_MAX_PARTIAL_TEXT); ++ const next = { ++ ...current, ++ generationStatus: state, ++ generationTaskId: taskId, ++ ...(childSessionId === null ? {} : { generationChildSessionId: childSessionId }), ++ generationLastSeq: lastSeq, ++ generationEvents: events, ++ ...(partialText === '' ? {} : { generationPartialText: partialText }), ++ ...(Number.isFinite(receipt.startedAt) ? { generationStartedAt: receipt.startedAt } : {}) ++ }; ++ const geometry = researchGenerationAutoGeometry(next); ++ const artifacts2 = snapshot.artifacts.slice(); ++ artifacts2[index] = geometry === null ? next : { ...next, ...geometry }; ++ update({ artifacts: artifacts2 }, true); ++ return true; ++ }, ++ applyGenerationInspection(nodeId, inspection) { ++ const index = snapshot.artifacts.findIndex((node) => node.id === nodeId); ++ if (index === -1) return false; ++ const current = snapshot.artifacts[index]; ++ const taskId = boundedResearchArtifactString(inspection?.taskId, RESEARCH_CANVAS_TEXT_LIMIT); ++ const state = researchGenerationStatus(inspection?.state); ++ const lastSeq = Number.isSafeInteger(inspection?.lastSeq) && inspection.lastSeq >= 0 ? inspection.lastSeq : null; ++ if (taskId === null || current.generationTaskId !== taskId || inspection?.canvasNodeId !== nodeId || state === null || lastSeq === null || lastSeq <= (current.generationLastSeq ?? 0) || !RESEARCH_ACTIVE_GENERATION_STATUSES.has(current.generationStatus)) return false; ++ const events = researchGenerationInspectionEvents(inspection.events, taskId, nodeId, current.generationLastSeq ?? 0); ++ const childSessionId = inspection?.childSessionId === void 0 ? current.generationChildSessionId : boundedResearchArtifactString(inspection.childSessionId, RESEARCH_CANVAS_TEXT_LIMIT); ++ if (inspection?.childSessionId !== void 0 && childSessionId === null) return false; ++ let next; ++ if (RESEARCH_ACTIVE_GENERATION_STATUSES.has(state)) { ++ const combinedEvents = [...(Array.isArray(current.generationEvents) ? current.generationEvents : []), ...events].slice(-RESEARCH_GENERATION_MAX_EVENTS); ++ const delta = events.filter((event) => event.type === 'assistant-delta').map((event) => event.text).join(''); ++ const partialText = `${current.generationPartialText ?? ''}${delta}`.slice(-RESEARCH_GENERATION_MAX_PARTIAL_TEXT); ++ const { generationError: _error, ...active } = current; ++ next = { ++ ...active, ++ generationStatus: state, ++ ...(childSessionId === null || childSessionId === void 0 ? {} : { generationChildSessionId: childSessionId }), ++ generationLastSeq: lastSeq, ++ generationEvents: combinedEvents, ++ ...(partialText === '' ? {} : { generationPartialText: partialText }), ++ ...(Number.isFinite(inspection.startedAt) ? { generationStartedAt: inspection.startedAt } : {}) ++ }; ++ const geometry = researchGenerationAutoGeometry(next); ++ if (geometry !== null) next = { ...next, ...geometry }; ++ } else if (state === 'completed' && current.kind === 'generated-container') { ++ const spec = parseResearchContainerSpec(inspection.finalOutput); ++ const completedAt = Number.isFinite(inspection.completedAt) ? inspection.completedAt : Date.now(); ++ const { generationEvents: _events, generationPartialText: _partial, generationError: _error, refreshError: _refreshError, ...completed } = current; ++ if (spec === null) { ++ const error = '生成内容格式无效，请重试。'; ++ next = { ++ ...completed, ++ excerpt: completed.containerSpec === void 0 ? error : completed.excerpt, ++ generationStatus: 'failed', ++ generationError: error, ++ ...(completed.containerSpec === void 0 ? {} : { refreshError: error }), ++ generationLastSeq: lastSeq, ++ generationCompletedAt: completedAt ++ }; ++ } else { ++ next = { ++ ...completed, ++ title: spec.title, ++ excerpt: JSON.stringify(spec), ++ containerSpec: spec, ++ generationStatus: 'completed', ++ generationLastSeq: lastSeq, ++ generationCompletedAt: completedAt, ++ lastSuccessfulAt: completedAt ++ }; ++ const geometry = researchContainerFinalGeometry(next, spec); ++ if (geometry !== null) next = { ...next, ...geometry }; ++ } ++ } else if (state === 'completed') { ++ const output = preserveResearchArtifactText(inspection.finalOutput, RESEARCH_GENERATION_MAX_OUTPUT); ++ if (output === null) return false; ++ const { generationEvents: _events, generationPartialText: _partial, generationError: _error, ...completed } = current; ++ next = { ++ ...completed, ++ excerpt: output, ++ generationStatus: 'completed', ++ generationLastSeq: lastSeq, ++ generationCompletedAt: Number.isFinite(inspection.completedAt) ? inspection.completedAt : Date.now() ++ }; ++ const geometry = researchGenerationFinalGeometry(next, output); ++ if (geometry !== null) next = { ...next, ...geometry }; ++ } else { ++ const error = normalizeResearchArtifactText(inspection.error, 512) ?? (state === 'cancelled' ? '任务已取消，可重试。' : state === 'interrupted' ? '任务已中断，请重试。' : '生成失败，请重试。'); ++ const { generationEvents: _events, generationPartialText: _partial, ...terminal } = current; ++ next = { ++ ...terminal, ++ excerpt: error, ++ generationStatus: state, ++ generationError: error, ++ generationLastSeq: lastSeq, ++ generationCompletedAt: Number.isFinite(inspection.completedAt) ? inspection.completedAt : Date.now() ++ }; ++ } ++ const artifacts2 = snapshot.artifacts.slice(); ++ artifacts2[index] = next; ++ update({ artifacts: artifacts2 }, true); ++ return true; ++ }, ++ failGeneration(nodeId, message) { ++ const index = snapshot.artifacts.findIndex((node) => node.id === nodeId && RESEARCH_ACTIVE_GENERATION_STATUSES.has(node.generationStatus)); ++ const error = normalizeResearchArtifactText(message, 512); ++ if (index === -1 || error === null) return false; ++ const { generationEvents: _events, generationPartialText: _partial, ...failed } = snapshot.artifacts[index]; ++ const artifacts2 = snapshot.artifacts.slice(); ++ const hasContainerSpec = failed.kind === 'generated-container' && failed.containerSpec !== void 0; ++ artifacts2[index] = { ++ ...failed, ++ generationStatus: 'failed', ++ generationError: error, ++ ...(hasContainerSpec ? { refreshError: error } : {}), ++ excerpt: hasContainerSpec ? failed.excerpt : error, ++ generationCompletedAt: Date.now() ++ }; ++ update({ artifacts: artifacts2 }, true); ++ return true; ++ }, ++ retryGeneration(nodeId) { ++ const index = snapshot.artifacts.findIndex((node) => node.id === nodeId && ['failed', 'cancelled', 'interrupted'].includes(node.generationStatus)); ++ if (index === -1) return null; ++ const current = snapshot.artifacts[index]; ++ const kind = current.kind === 'generated-mind-map' ? 'mind-map' : current.kind === 'generated-summary' ? 'summary' : current.kind === 'generated-container' ? 'container' : null; ++ if (kind === null) return null; ++ if (kind === 'container' && (typeof current.containerPrompt !== 'string' || current.containerPrompt.trim() === '')) return null; ++ if (kind !== 'container' && (!Array.isArray(current.generationSources) || current.generationSources.length === 0)) return null; ++ const artifacts2 = snapshot.artifacts.slice(); ++ const { generationError: _error, generationTaskId: _task, generationChildSessionId: _child, generationStartedAt: _started, generationCompletedAt: _completed, generationEvents: _events, generationPartialText: _partial, ...retrying } = current; ++ artifacts2[index] = { ++ ...retrying, ++ generationStatus: 'queued', ++ generationLastSeq: 0, ++ excerpt: '正在准备任务…' ++ }; ++ update({ artifacts: artifacts2 }, true); ++ return kind === 'container' ? { id: nodeId, kind, prompt: current.containerPrompt } : { id: nodeId, kind, sourceNodeIds: [...current.sourceNodeIds], generationSources: current.generationSources, ...(kind === 'mind-map' ? { detail: researchMindMapDetail(current.generationDetail) } : {}) }; ++ }, ++ setGenerationCancelSink(sink) { ++ generationCancelSink = typeof sink === 'function' ? sink : void 0; ++ }, ++ cancelGeneration(nodeId) { ++ const node = snapshot.artifacts.find((artifact) => artifact.id === nodeId && RESEARCH_ACTIVE_GENERATION_STATUSES.has(artifact.generationStatus) && typeof artifact.generationTaskId === 'string'); ++ if (node === void 0 || generationCancelSink === void 0) return false; ++ Promise.resolve(generationCancelSink({ parentSessionId: sessionId, taskId: node.generationTaskId })).catch(() => void 0); ++ return true; ++ }, ++ renameNode(nodeId, rawTitle) { ++ const fileIndex = snapshot.files.findIndex((node) => node.id === nodeId); ++ if (fileIndex !== -1) { ++ const file = snapshot.files[fileIndex]; ++ const displayName = normalizeResearchCanvasDisplayName(rawTitle, file.name); ++ if (displayName === null || displayName === file.displayName || displayName === void 0 && file.displayName === void 0) return false; ++ const files2 = snapshot.files.slice(); ++ if (displayName === void 0) { ++ const { displayName: _drop, ...sourceFile } = file; ++ files2[fileIndex] = sourceFile; ++ } else files2[fileIndex] = { ...file, displayName }; ++ update({ files: files2 }, true); ++ return true; ++ } ++ const artifactIndex = snapshot.artifacts.findIndex((node) => node.id === nodeId); ++ if (artifactIndex === -1) return false; ++ const title = normalizeResearchCanvasTitle(rawTitle); ++ if (title === null || title === "" || title === snapshot.artifacts[artifactIndex].title) return false; ++ const artifacts2 = snapshot.artifacts.slice(); ++ artifacts2[artifactIndex] = { ++ ...artifacts2[artifactIndex], ++ title, ++ ...(artifacts2[artifactIndex].kind === "web-link" ? { titleMode: "custom" } : {}) ++ }; ++ update({ artifacts: artifacts2 }, true); ++ return true; ++ }, ++ updateArtifactContent(nodeId, rawContent) { ++ const artifactIndex = snapshot.artifacts.findIndex((node) => node.id === nodeId && researchCanvasArtifactContentEditable(node)); ++ if (artifactIndex === -1) return false; ++ const current = snapshot.artifacts[artifactIndex]; ++ const excerpt = preserveResearchArtifactText(rawContent, current.kind === "generated-summary" ? RESEARCH_GENERATION_MAX_OUTPUT : RESEARCH_ARTIFACT_MAX_EXCERPT); ++ if (excerpt === null || excerpt === snapshot.artifacts[artifactIndex].excerpt) return false; ++ const artifacts2 = snapshot.artifacts.slice(); ++ artifacts2[artifactIndex] = { ...artifacts2[artifactIndex], excerpt }; ++ update({ artifacts: artifacts2 }, true); ++ return true; ++ }, ++ updateMindMapNodeLabel(nodeId, sourceLineIndex, rawLabel) { ++ const artifactIndex = snapshot.artifacts.findIndex((node) => node.id === nodeId && node.kind === "generated-mind-map" && node.generationStatus === "completed"); ++ if (artifactIndex === -1) return false; ++ const excerpt = replaceResearchMindMapLabel(snapshot.artifacts[artifactIndex].excerpt, sourceLineIndex, rawLabel); ++ if (excerpt === null || excerpt === snapshot.artifacts[artifactIndex].excerpt) return false; ++ const artifacts2 = snapshot.artifacts.slice(); ++ artifacts2[artifactIndex] = { ...artifacts2[artifactIndex], excerpt }; ++ update({ artifacts: artifacts2 }, true); ++ return true; ++ }, ++ organizeCanvas() { ++ const organized = researchCanvasOrganizedLayout(snapshot.files, snapshot.artifacts, snapshot.canvasSize); ++ if (organized === null) return false; ++ update(organized, true); ++ return true; ++ }, ++ setSelection(selection) { update({ selection: parseResearchCanvasSelection(JSON.stringify(selection), snapshot.files, snapshot.artifacts) }, true); }, ++ updateSelection(nodeIds, mode) { this.setSelection(updateResearchSelection(snapshot.selection, nodeIds, mode, snapshot.files)); }, ++ focusNode(nodeId) { ++ const node = [...snapshot.files, ...snapshot.artifacts].find((candidate) => candidate.id === nodeId); ++ if (node === void 0) return false; ++ update({ ++ selection: updateResearchSelection(snapshot.selection, [node.id], "replace", snapshot.files), ++ viewport: researchCanvasFocusViewport(node, snapshot.viewport, snapshot.canvasSize) ++ }, true); ++ return true; ++ }, ++ moveSelectedFile(id, delta) { ++ const order = [...snapshot.selection.orderedFileIds]; ++ const from = order.indexOf(id); ++ const to = Math.max(0, Math.min(order.length - 1, from + delta)); ++ if (from === -1 || from === to) return; ++ order.splice(from, 1); ++ order.splice(to, 0, id); ++ this.setSelection({ ...snapshot.selection, orderedFileIds: order }); ++ }, ++ placeSelectedFile(id, beforeId) { ++ const order = [...snapshot.selection.orderedFileIds]; ++ const from = order.indexOf(id); ++ if (from === -1 || id === beforeId || !order.includes(beforeId)) return; ++ order.splice(from, 1); ++ order.splice(order.indexOf(beforeId), 0, id); ++ this.setSelection({ ...snapshot.selection, orderedFileIds: order }); ++ }, ++ removeSelectedFile(id) { this.updateSelection([id], "toggle"); }, ++ removeNodes(nodeIds) { ++ const removed = /* @__PURE__ */ new Set(researchSelectionIds(nodeIds)); ++ if (removed.size === 0) return; ++ for (const node of snapshot.artifacts) { ++ if (!removed.has(node.id) || node.kind !== 'web-link') continue; ++ Promise.resolve(window.dshDesktop?.researchLinkFrame?.release?.({ sessionId, nodeId: node.id })).catch(() => void 0); ++ } ++ for (const node of snapshot.artifacts) { ++ if (!removed.has(node.id) || !RESEARCH_ACTIVE_GENERATION_STATUSES.has(node.generationStatus) || typeof node.generationTaskId !== 'string' || generationCancelSink === void 0) continue; ++ Promise.resolve(generationCancelSink({ parentSessionId: sessionId, taskId: node.generationTaskId })).catch(() => void 0); ++ } ++ const previewNodes = snapshot.files.filter((node) => removed.has(node.id) && typeof node.authorizationId === "string"); ++ const durableIds = /* @__PURE__ */ new Set(previewNodes.map((node) => node.id)); ++ removePersistedNodes([...removed].filter((id) => !durableIds.has(id))); ++ const revokeNode = window.dshDesktop?.researchPreview?.revokeNode; ++ if (typeof revokeNode !== "function") return; ++ for (const node of previewNodes) { ++ if (pendingNodeRevocations.has(node.id)) continue; ++ pendingNodeRevocations.add(node.id); ++ Promise.resolve().then(() => revokeNode({ sessionId, nodeId: node.id })).then((result) => { ++ if (result?.ok === true) removePersistedNodes([node.id]); ++ }).catch(() => void 0).finally(() => pendingNodeRevocations.delete(node.id)); ++ } ++ }, ++ commitSelection(selection) { ++ const admitted = /* @__PURE__ */ new Set(selection.selectedNodeIds); ++ this.setSelection({ ++ selectedNodeIds: snapshot.selection.selectedNodeIds.filter((id) => !admitted.has(id)), ++ orderedFileIds: snapshot.selection.orderedFileIds.filter((id) => !admitted.has(id)) ++ }); ++ }, ++ restoreSelection(selection) { ++ this.setSelection({ ++ selectedNodeIds: [...selection.selectedNodeIds, ...snapshot.selection.selectedNodeIds.filter((id) => !selection.selectedNodeIds.includes(id))], ++ orderedFileIds: [...selection.orderedFileIds, ...snapshot.selection.orderedFileIds.filter((id) => !selection.orderedFileIds.includes(id))] ++ }); ++ }, ++ moveNodes(selectedIds, delta, scale, persist = true) { const moved = moveResearchCanvasNodes(snapshot.files, snapshot.artifacts, selectedIds, delta, scale); update(moved, persist); }, ++ resizeNode(nodeId, corner, delta, scale, persist = true) { ++ let changed = false; ++ const resize = (node) => { ++ if (node.id !== nodeId) return node; ++ const next = resizeResearchCanvasNode(node, corner, delta, scale); ++ changed = next.x !== node.x || next.y !== node.y || next.width !== node.width || next.height !== node.height || next.sizeMode !== node.sizeMode; ++ return next; ++ }; ++ const files2 = snapshot.files.map(resize); ++ const artifacts2 = snapshot.artifacts.map(resize); ++ if (changed) update({ files: files2, artifacts: artifacts2 }, persist); ++ }, ++ updateNodeGeometry(nodeId, geometry, persist = true) { ++ let changed = false; ++ const apply = (node) => { ++ if (node.id !== nodeId) return node; ++ const next = { ...node, ...geometry }; ++ const canonical = { ...next, ...researchCanvasPersistedGeometry(next) }; ++ changed = canonical.width !== node.width || canonical.height !== node.height || canonical.sizeMode !== node.sizeMode || canonical.aspectRatio !== node.aspectRatio; ++ return canonical; ++ }; ++ const files2 = snapshot.files.map(apply); ++ const artifacts2 = snapshot.artifacts.map(apply); ++ if (changed) update({ files: files2, artifacts: artifacts2 }, persist); ++ }, ++ persist() { persistSnapshot(); }, ++ setViewport(viewport) { update({ viewport: { ...snapshot.viewport, ...viewport } }, false); }, ++ setCanvasSize(canvasSize) { update({ canvasSize: { ...snapshot.canvasSize, ...canvasSize } }, false); }, ++ visibleCenter, ++ addAssistantResult({ messageId, text, at }) { addAssistantArtifact("assistant-result", messageId, text, "助手回复", at); }, ++ addExcerpt(messageId, excerpt, at) { addAssistantArtifact("assistant-excerpt", messageId, excerpt, "助手摘录", at); }, ++ setPendingMessageJump(messageId) { update({ pendingMessageJump: typeof messageId === "string" ? messageId : null }, false); }, ++ clearPendingMessageJump() { update({ pendingMessageJump: null }, false); }, ++ setSourceAvailability(messageId, available) { ++ const unavailable = new Set(snapshot.unavailableSourceMessageIds); ++ if (available) unavailable.delete(messageId); ++ else unavailable.add(messageId); ++ update({ unavailableSourceMessageIds: [...unavailable] }, false); ++ }, ++ cancelTransient() { ++ this.setAssistantActionsActive(false); ++ generationCancelSink = void 0; ++ Promise.resolve(window.dshDesktop?.researchLinkFrame?.releaseSession?.(sessionId)).catch(() => void 0); ++ update({ pendingMessageJump: null, unavailableSourceMessageIds: [] }, false); ++ } ++ }; ++ } ++ class ResearchWorkspaceRegistry { ++ constructor(storage = researchCanvasStorage()) { ++ this.storage = storage; ++ this.sessions = /* @__PURE__ */ new Map(); ++ } ++ for(sessionId) { ++ let workspace = this.sessions.get(sessionId); ++ if (workspace === void 0) { ++ workspace = createResearchWorkspaceSession(this.storage, sessionId); ++ this.sessions.set(sessionId, workspace); ++ } ++ return workspace; ++ } ++ release(sessionId) { ++ this.sessions.get(sessionId)?.cancelTransient(); ++ } ++ } ++ function researchCanvasContentTransform(viewport) { ++ return `translate(${viewport.x}px, ${viewport.y}px) scale(${viewport.scale})`; ++ } ++ function loadResearchCanvasFiles(storage, sessionId) { ++ if (storage === null) return []; ++ try { ++ return parseResearchCanvasFileNodes(storage.getItem(researchCanvasStorageKey(sessionId)) ?? "[]"); ++ } catch { ++ return []; ++ } ++ } ++ function saveResearchCanvasFiles(storage, sessionId, nodes) { ++ if (storage === null) return false; ++ try { ++ return storage.setItem(researchCanvasStorageKey(sessionId), JSON.stringify(nodes)) !== false; ++ } catch { ++ return false; ++ } ++ } ++ function researchCanvasStorage() { ++ let originStorage = null; ++ try { ++ originStorage = typeof localStorage === "undefined" ? null : localStorage; ++ } catch { ++ originStorage = null; ++ } ++ let desktopStorage; ++ try { ++ desktopStorage = typeof window === "undefined" ? void 0 : window.dshDesktop?.researchCanvasStorage; ++ } catch {} ++ if (typeof desktopStorage?.getItem !== "function" || typeof desktopStorage?.setItem !== "function") return originStorage; ++ return { ++ getItem(key) { ++ try { ++ const stable = desktopStorage.getItem(key); ++ if (typeof stable === "string") return stable; ++ } catch {} ++ let legacy = null; ++ try { ++ legacy = originStorage?.getItem(key) ?? null; ++ } catch {} ++ if (typeof legacy === "string") try { ++ if (desktopStorage.setItem(key, legacy) !== true) return legacy; ++ } catch {} ++ return legacy; ++ }, ++ setItem(key, value) { ++ let accepted = false; ++ try { ++ accepted = desktopStorage.setItem(key, value) === true; ++ } catch {} ++ if (!accepted) throw new Error("Research canvas desktop storage rejected the write."); ++ try { ++ originStorage?.setItem(key, value); ++ } catch {} ++ return true; ++ } ++ }; ++ } ++ function researchCanvasFileCaption(node) { ++ const extension = /\.([^.]+)$/.exec(node.name)?.[1]; ++ if (extension !== void 0) return extension.slice(0, 12).toUpperCase(); ++ const media = node.mediaType?.split("/").at(-1); ++ if (media !== void 0 && media !== "") return media.slice(0, 12).toUpperCase(); ++ return node.source === "sherlock" ? "SHERLOCK" : "FILE"; ++ } ++ function ResearchCanvasInlineTitleEditor({ nodeId, value, onCommit, onCancel, className = "" }) { ++ const inputRef = (0, react.useRef)(null); ++ const settledRef = (0, react.useRef)(false); ++ (0, react.useLayoutEffect)(() => { ++ inputRef.current?.focus({ preventScroll: true }); ++ inputRef.current?.select(); ++ }, []); ++ const stop = (event) => event.stopPropagation(); ++ const settle = (commit) => { ++ if (settledRef.current) return; ++ settledRef.current = true; ++ if (commit) onCommit(inputRef.current?.value ?? value); ++ else onCancel(); ++ }; ++ return (0, react_jsx_runtime.jsx)("input", { ++ ref: inputRef, ++ type: "text", ++ className: `rScV5Q_titleEditor ${className}`.trim(), ++ "data-research-title-input": nodeId, ++ "aria-label": "修改组件名称", ++ defaultValue: value, ++ onBlur: () => settle(true), ++ onPointerDown: stop, ++ onClick: stop, ++ onDoubleClick: stop, ++ onContextMenu: stop, ++ onKeyDown: (event) => { ++ event.stopPropagation(); ++ if (event.key === "Enter") { ++ event.preventDefault(); ++ settle(true); ++ } else if (event.key === "Escape") { ++ event.preventDefault(); ++ settle(false); ++ } ++ } ++ }); ++ } ++ function ResearchCanvasInlineContentEditor({ nodeId, value, onCommit, onCancel }) { ++ const inputRef = (0, react.useRef)(null); ++ const settledRef = (0, react.useRef)(false); ++ (0, react.useLayoutEffect)(() => { ++ const input = inputRef.current; ++ input?.focus({ preventScroll: true }); ++ input?.setSelectionRange(value.length, value.length); ++ }, [value.length]); ++ const stop = (event) => event.stopPropagation(); ++ const settle = (commit) => { ++ if (settledRef.current) return; ++ settledRef.current = true; ++ if (commit) onCommit(inputRef.current?.value ?? value); ++ else onCancel(); ++ }; ++ return (0, react_jsx_runtime.jsx)("textarea", { ++ ref: inputRef, ++ className: "rScV5Q_contentEditor", ++ "data-research-content-input": nodeId, ++ "aria-label": "编辑组件内容", ++ defaultValue: value, ++ onBlur: () => settle(true), ++ onPointerDown: stop, ++ onClick: stop, ++ onDoubleClick: stop, ++ onContextMenu: stop, ++ onKeyDown: (event) => { ++ event.stopPropagation(); ++ if (event.key === "Enter" && (event.metaKey || event.ctrlKey)) { ++ event.preventDefault(); ++ settle(true); ++ } else if (event.key === "Escape") { ++ event.preventDefault(); ++ settle(false); ++ } ++ } ++ }); ++ } ++ function ResearchCanvasResizeHandles({ nodeId }) { ++ return ["nw", "ne", "sw", "se"].map((corner) => (0, react_jsx_runtime.jsx)("button", { ++ type: "button", ++ className: "rScV5Q_resizeHandle", ++ "data-research-resize-handle": corner, ++ "data-research-resize-node-id": nodeId, ++ "aria-label": `调整组件${corner.toUpperCase()}角大小` ++ }, corner)); ++ } ++ function ResearchCanvasRichNodeFrame({ node, selected, dragging, resizing, title, titleText, children, ...props }) { ++ const geometry = normalizeResearchCanvasNodeGeometry(node); ++ return (0, react_jsx_runtime.jsxs)("div", { ++ ...props, ++ className: `rScV5Q_richNode ${props.className ?? ""}`.trim(), ++ "data-research-node-id": node.id, ++ "data-selected": selected || void 0, ++ "data-node-dragging": dragging || void 0, ++ "data-node-resizing": resizing || void 0, ++ role: "option", ++ tabIndex: 0, ++ "aria-selected": selected, ++ title: titleText, ++ style: { ++ left: `${node.x}px`, ++ top: `${node.y}px`, ++ width: `${geometry.width}px`, ++ height: `${geometry.height}px`, ++ transform: "translate(-50%, -50%)" ++ }, ++ children: [(0, react_jsx_runtime.jsx)("div", { ++ className: "rScV5Q_nodeTitle", ++ "data-research-node-title": "", ++ "data-research-node-move-handle": "", ++ children: title ++ }), (0, react_jsx_runtime.jsxs)("div", { ++ className: "rScV5Q_previewBody", ++ style: { overflowY: node.sizeMode === "manual" ? "auto" : void 0 }, ++ "data-research-preview-body": "", ++ "data-research-preview-interactive": "", ++ children: [children, (0, react_jsx_runtime.jsx)("div", { ++ className: "rScV5Q_previewShield", ++ "data-research-preview-shield": "", ++ "aria-hidden": true ++ })] ++ }), selected ? (0, react_jsx_runtime.jsx)(ResearchCanvasResizeHandles, { nodeId: node.id }) : null] ++ }); ++ } ++ function ResearchCanvasImagePreview({ node, sessionId, visible, onNaturalSize }) { ++ const [preview, setPreview] = (0, react.useState)({ status: visible ? "loading" : "offscreen", descriptor: null }); ++ const descriptorRef = (0, react.useRef)(null); ++ const releaseCurrentDescriptor = (0, react.useCallback)(() => { ++ const descriptor = descriptorRef.current; ++ if (descriptor === null) return; ++ descriptorRef.current = null; ++ window.dshDesktop?.researchPreview?.release?.({ sessionId, nodeId: node.id, authorizationId: descriptor.authorizationId, capabilityToken: descriptor.capabilityToken }); ++ }, [sessionId, node.id]); ++ (0, react.useEffect)(() => { ++ if (!visible) { ++ setPreview({ status: "offscreen", descriptor: null }); ++ return; ++ } ++ if (typeof node.authorizationId !== "string" || typeof window.dshDesktop?.researchPreview?.restore !== "function") { ++ setPreview({ status: "unavailable", descriptor: null }); ++ return; ++ } ++ let active = true; ++ setPreview({ status: "loading", descriptor: null }); ++ window.dshDesktop.researchPreview.restore({ sessionId, nodeId: node.id, authorizationId: node.authorizationId }).then((value) => { ++ if (!active) { ++ if (value !== null) window.dshDesktop?.researchPreview?.release?.({ sessionId, nodeId: node.id, authorizationId: value.authorizationId, capabilityToken: value.capabilityToken }); ++ return; ++ } ++ descriptorRef.current = value; ++ setPreview(value === null ? { status: "unavailable", descriptor: null } : { status: "ready", descriptor: value }); ++ }).catch(() => { ++ if (active) setPreview({ status: "unavailable", descriptor: null }); ++ }); ++ return () => { ++ active = false; ++ releaseCurrentDescriptor(); ++ }; ++ }, [sessionId, node.id, node.authorizationId, visible, releaseCurrentDescriptor]); ++ if (preview.status === "offscreen") return (0, react_jsx_runtime.jsx)("div", { ++ className: "rScV5Q_previewPlaceholder", ++ "data-research-offscreen-placeholder": "", ++ children: "预览已暂停" ++ }); ++ if (preview.status === "loading") return (0, react_jsx_runtime.jsx)("div", { ++ className: "rScV5Q_previewPlaceholder", ++ "data-research-preview-loading": "", ++ children: "正在载入预览…" ++ }); ++ if (preview.status !== "ready" || preview.descriptor === null) return (0, react_jsx_runtime.jsx)("div", { ++ className: "rScV5Q_previewPlaceholder", ++ "data-research-preview-unavailable": "", ++ children: "预览不可用" ++ }); ++ return (0, react_jsx_runtime.jsx)("img", { ++ "data-research-image-preview": "", ++ src: preview.descriptor.url, ++ alt: node.name, ++ draggable: false, ++ onLoad: (event) => onNaturalSize?.(event.currentTarget.naturalWidth, event.currentTarget.naturalHeight), ++ onError: () => { ++ releaseCurrentDescriptor(); ++ setPreview({ status: "unavailable", descriptor: null }); ++ } ++ }); ++ } ++ function researchTextLanguage(name) { ++ const extension = /\.([a-z0-9][a-z0-9+-]{0,15})$/i.exec(String(name ?? ""))?.[1]?.toLowerCase(); ++ if (extension === void 0) return ""; ++ const aliases = { cjs: "js", mjs: "js", mts: "ts", cts: "ts", yml: "yaml", bash: "sh", zsh: "sh", kts: "kt" }; ++ return aliases[extension] ?? extension; ++ } ++ async function readResearchNativeText(url, signal) { ++ const response = await window.fetch(url, { signal, cache: "no-store" }); ++ if (response?.ok !== true) throw new Error("Native preview request failed."); ++ const declaredLength = Number(response.headers?.get?.("content-length")); ++ if (Number.isFinite(declaredLength) && declaredLength > RESEARCH_NATIVE_TEXT_MAX_BYTES) throw new Error("Native preview is too large."); ++ const chunks = []; ++ let total = 0; ++ const reader = response.body?.getReader?.(); ++ if (reader !== void 0) { ++ let cancelPromise = null; ++ const cancelReader = () => { ++ if (cancelPromise !== null) return cancelPromise; ++ try { ++ cancelPromise = Promise.resolve(reader.cancel?.()).catch(() => void 0); ++ } catch { ++ cancelPromise = Promise.resolve(); ++ } ++ return cancelPromise; ++ }; ++ const cancelForAbort = () => { ++ void cancelReader(); ++ }; ++ if (signal.aborted) { ++ await cancelReader(); ++ throw new Error("Native preview request aborted."); ++ } ++ signal.addEventListener("abort", cancelForAbort, { once: true }); ++ try { ++ while (true) { ++ if (signal.aborted) throw new Error("Native preview request aborted."); ++ const result = await reader.read(); ++ if (signal.aborted) throw new Error("Native preview request aborted."); ++ if (result.done) break; ++ const chunk = result.value instanceof Uint8Array ? result.value : new Uint8Array(result.value ?? []); ++ total += chunk.byteLength; ++ if (total > RESEARCH_NATIVE_TEXT_MAX_BYTES) throw new Error("Native preview is too large."); ++ chunks.push(chunk); ++ } ++ } catch (error) { ++ await cancelReader(); ++ throw error; ++ } finally { ++ signal.removeEventListener("abort", cancelForAbort); ++ } ++ } else { ++ const value = new Uint8Array(await response.arrayBuffer()); ++ total = value.byteLength; ++ if (total > RESEARCH_NATIVE_TEXT_MAX_BYTES) throw new Error("Native preview is too large."); ++ chunks.push(value); ++ } ++ const bytes = new Uint8Array(total); ++ let offset = 0; ++ for (const chunk of chunks) { ++ bytes.set(chunk, offset); ++ offset += chunk.byteLength; ++ } ++ if (bytes.includes(0)) throw new Error("Native preview is binary."); ++ return new TextDecoder("utf-8", { fatal: true }).decode(bytes).replace(/^\uFEFF/, ""); ++ } ++ function ResearchCanvasNativeTextPreview({ node, sessionId, visible, markdown }) { ++ const [preview, setPreview] = (0, react.useState)({ status: visible ? "loading" : "offscreen", text: "" }); ++ const descriptorRef = (0, react.useRef)(null); ++ const releaseCurrentDescriptor = (0, react.useCallback)(() => { ++ const descriptor = descriptorRef.current; ++ if (descriptor === null) return; ++ descriptorRef.current = null; ++ window.dshDesktop?.researchPreview?.release?.({ sessionId, nodeId: node.id, authorizationId: descriptor.authorizationId, capabilityToken: descriptor.capabilityToken }); ++ }, [sessionId, node.id]); ++ (0, react.useEffect)(() => { ++ if (!visible) { ++ setPreview({ status: "offscreen", text: "" }); ++ return; ++ } ++ if (typeof node.authorizationId !== "string" || typeof window.dshDesktop?.researchPreview?.restore !== "function" || typeof window.fetch !== "function") { ++ setPreview({ status: "unavailable", text: "" }); ++ return; ++ } ++ let active = true; ++ const controller = new AbortController(); ++ setPreview({ status: "loading", text: "" }); ++ (async () => { ++ try { ++ const descriptor = await window.dshDesktop.researchPreview.restore({ sessionId, nodeId: node.id, authorizationId: node.authorizationId }); ++ if (!active) { ++ if (descriptor !== null) window.dshDesktop?.researchPreview?.release?.({ sessionId, nodeId: node.id, authorizationId: descriptor.authorizationId, capabilityToken: descriptor.capabilityToken }); ++ return; ++ } ++ if (descriptor === null) throw new Error("Native preview authorization is unavailable."); ++ descriptorRef.current = descriptor; ++ const text = await readResearchNativeText(descriptor.url, controller.signal); ++ if (active) setPreview({ status: "ready", text }); ++ } catch { ++ if (!active) return; ++ releaseCurrentDescriptor(); ++ setPreview({ status: "unavailable", text: "" }); ++ } ++ })(); ++ return () => { ++ active = false; ++ controller.abort(); ++ releaseCurrentDescriptor(); ++ }; ++ }, [sessionId, node.id, node.authorizationId, visible, releaseCurrentDescriptor]); ++ if (preview.status === "offscreen") return (0, react_jsx_runtime.jsx)("div", { ++ className: "rScV5Q_previewPlaceholder", ++ "data-research-offscreen-placeholder": "", ++ children: "预览已暂停" ++ }); ++ if (preview.status === "loading") return (0, react_jsx_runtime.jsx)("div", { ++ className: "rScV5Q_previewPlaceholder", ++ "data-research-preview-loading": "", ++ children: markdown ? "正在载入 Markdown…" : "正在载入文本…" ++ }); ++ if (preview.status !== "ready") return (0, react_jsx_runtime.jsx)("div", { ++ className: "rScV5Q_previewPlaceholder", ++ "data-research-preview-unavailable": "", ++ children: markdown ? "Markdown 预览不可用" : "文本预览不可用" ++ }); ++ if (markdown) return (0, react_jsx_runtime.jsx)("div", { ++ className: "rScV5Q_markdownScroll", ++ "data-research-markdown-scroll": "", ++ "data-research-preview-interactive": "", ++ onWheel: (event) => { ++ if (!event.metaKey) event.stopPropagation(); ++ }, ++ children: (0, react_jsx_runtime.jsx)("div", { ++ "data-research-markdown-preview": "", ++ children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.MarkdownText, { text: preview.text }) ++ }) ++ }); ++ const language = researchTextLanguage(node.name); ++ return (0, react_jsx_runtime.jsx)("pre", { ++ className: "rScV5Q_textScroll", ++ "data-research-text-preview": "", ++ "data-research-preview-interactive": "", ++ onWheel: (event) => { ++ if (!event.metaKey) event.stopPropagation(); ++ }, ++ children: (0, react_jsx_runtime.jsx)("code", { ++ className: language === "" ? void 0 : `language-${language}`, ++ children: preview.text ++ }) ++ }); ++ } ++ function loadResearchPdfLibrary() { ++ if (typeof window.__sherlockPdfjs?.getDocument === "function") return Promise.resolve(window.__sherlockPdfjs); ++ if (researchPdfLibraryPromise !== null) return researchPdfLibraryPromise; ++ researchPdfLibraryPromise = new Promise((resolve, reject) => { ++ if (typeof document === "undefined") { ++ reject(new Error("PDF.js document is unavailable.")); ++ return; ++ } ++ let script = document.querySelector("script[data-sherlock-pdfjs-loader]"); ++ const fail = (message) => { ++ script?.remove(); ++ reject(new Error(message)); ++ }; ++ const settle = () => { ++ if (typeof window.__sherlockPdfjs?.getDocument === "function") resolve(window.__sherlockPdfjs); ++ else fail("PDF.js failed to initialize."); ++ }; ++ if (script === null) { ++ script = document.createElement("script"); ++ script.type = "module"; ++ script.src = RESEARCH_PDF_LOADER_URL; ++ script.dataset.sherlockPdfjsLoader = ""; ++ document.head.appendChild(script); ++ } ++ script.addEventListener("load", settle, { once: true }); ++ script.addEventListener("error", () => fail("PDF.js failed to load."), { once: true }); ++ }); ++ researchPdfLibraryPromise = researchPdfLibraryPromise.catch((error) => { ++ researchPdfLibraryPromise = null; ++ throw error; ++ }); ++ return researchPdfLibraryPromise; ++ } ++ function ResearchCanvasPdfPreview({ node, sessionId, visible, onNaturalSize, onPageStatus }) { ++ const [preview, setPreview] = (0, react.useState)({ status: visible ? "loading" : "offscreen", pageCount: 0 }); ++ const [bodySize, setBodySize] = (0, react.useState)({ width: 0, height: 0 }); ++ const [scrollTop, setScrollTop] = (0, react.useState)(0); ++ const [renderedPages, setRenderedPages] = (0, react.useState)(/* @__PURE__ */ new Set()); ++ const [pageMetrics, setPageMetrics] = (0, react.useState)([]); ++ const [observedPages, setObservedPages] = (0, react.useState)(null); ++ const bodyRef = (0, react.useRef)(null); ++ const canvasRefs = (0, react.useRef)(/* @__PURE__ */ new Map()); ++ const pageElementRefs = (0, react.useRef)(/* @__PURE__ */ new Map()); ++ const descriptorRef = (0, react.useRef)(null); ++ const loadingTaskRef = (0, react.useRef)(null); ++ const documentRef = (0, react.useRef)(null); ++ const renderTasksRef = (0, react.useRef)(/* @__PURE__ */ new Map()); ++ const pdfPagesRef = (0, react.useRef)(/* @__PURE__ */ new Map()); ++ const pageGenerationsRef = (0, react.useRef)(/* @__PURE__ */ new Map()); ++ const renderedWidthsRef = (0, react.useRef)(/* @__PURE__ */ new Map()); ++ const canvasRefCallbacks = (0, react.useRef)(/* @__PURE__ */ new Map()); ++ const metadataCallbackRef = (0, react.useRef)(onNaturalSize); ++ metadataCallbackRef.current = onNaturalSize; ++ const releaseCurrentDescriptor = (0, react.useCallback)(() => { ++ const descriptor = descriptorRef.current; ++ if (descriptor === null) return; ++ descriptorRef.current = null; ++ window.dshDesktop?.researchPreview?.release?.({ sessionId, nodeId: node.id, authorizationId: descriptor.authorizationId, capabilityToken: descriptor.capabilityToken }); ++ }, [sessionId, node.id]); ++ const clearPage = (0, react.useCallback)((pageNumber, clearCanvas = true) => { ++ pageGenerationsRef.current.set(pageNumber, (pageGenerationsRef.current.get(pageNumber) ?? 0) + 1); ++ try { ++ renderTasksRef.current.get(pageNumber)?.cancel?.(); ++ } catch {} ++ renderTasksRef.current.delete(pageNumber); ++ try { ++ pdfPagesRef.current.get(pageNumber)?.cleanup?.(); ++ } catch {} ++ pdfPagesRef.current.delete(pageNumber); ++ renderedWidthsRef.current.delete(pageNumber); ++ if (clearCanvas) { ++ const canvas = canvasRefs.current.get(pageNumber); ++ if (canvas !== void 0) { ++ canvas.width = 0; ++ canvas.height = 0; ++ } ++ } ++ setRenderedPages((previous) => previous.has(pageNumber) ? new Set([...previous].filter((page) => page !== pageNumber)) : previous); ++ }, []); ++ const clearPages = (0, react.useCallback)((clearCanvas = true) => { ++ const pages = /* @__PURE__ */ new Set([...canvasRefs.current.keys(), ...renderTasksRef.current.keys(), ...pdfPagesRef.current.keys(), ...renderedWidthsRef.current.keys()]); ++ for (const pageNumber of pages) clearPage(pageNumber, clearCanvas); ++ }, [clearPage]); ++ const canvasRefForPage = (pageNumber) => { ++ let callback = canvasRefCallbacks.current.get(pageNumber); ++ if (callback !== void 0) return callback; ++ callback = (canvas) => { ++ if (canvas === null) { ++ const previous = canvasRefs.current.get(pageNumber); ++ if (previous !== void 0) { ++ previous.width = 0; ++ previous.height = 0; ++ } ++ canvasRefs.current.delete(pageNumber); ++ } ++ else canvasRefs.current.set(pageNumber, canvas); ++ }; ++ canvasRefCallbacks.current.set(pageNumber, callback); ++ return callback; ++ }; ++ const destroyDocument = (0, react.useCallback)(() => { ++ clearPages(true); ++ const document2 = documentRef.current; ++ documentRef.current = null; ++ const loadingTask = loadingTaskRef.current; ++ loadingTaskRef.current = null; ++ try { ++ const teardown = typeof loadingTask?.destroy === "function" ? loadingTask.destroy() : document2?.destroy?.(); ++ Promise.resolve(teardown).catch(() => void 0); ++ } catch {} ++ }, [clearPages]); ++ const pageRatio = Number.isFinite(node.aspectRatio) && node.aspectRatio > 0 ? node.aspectRatio : 17 / 22; ++ const renderWidth = bodySize.width > 0 ? preview.pageCount === 1 ? Math.min(bodySize.width, bodySize.height * pageRatio) : bodySize.width : 0; ++ const pageLayout = pageMetrics.length === preview.pageCount ? researchPdfPageLayout({ cssWidth: renderWidth, gap: RESEARCH_PDF_PAGE_GAP_PX, pages: pageMetrics }) : []; ++ const fallbackRenderWindow = preview.status === "ready" ? researchPdfRenderWindow({ layout: pageLayout, scrollTop, viewportHeight: bodySize.height, overscan: RESEARCH_PDF_RENDER_OVERSCAN_PX }) : []; ++ const renderWindow = observedPages !== null && observedPages.size > 0 ? [...observedPages].sort((a, b) => a - b) : fallbackRenderWindow; ++ const visiblePage = pageLayout.find((page) => page.bottom > scrollTop)?.page ?? 1; ++ (0, react.useEffect)(() => { ++ onPageStatus?.({ page: visiblePage, total: preview.pageCount }); ++ }, [visiblePage, preview.pageCount, onPageStatus]); ++ (0, react.useLayoutEffect)(() => { ++ if (!visible || preview.status !== "ready" || bodyRef.current === null) { ++ setBodySize((previous) => previous.width === 0 && previous.height === 0 ? previous : { width: 0, height: 0 }); ++ return; ++ } ++ const body = bodyRef.current; ++ const updateSize = () => { ++ const width = Math.floor(body.clientWidth); ++ const height = Math.floor(body.clientHeight); ++ const next = { width: width > 0 ? width : 0, height: height > 0 ? height : 0 }; ++ setBodySize((previous) => previous.width === next.width && previous.height === next.height ? previous : next); ++ }; ++ updateSize(); ++ if (typeof window.ResizeObserver !== "function") return; ++ const observer = new window.ResizeObserver(updateSize); ++ observer.observe(body); ++ return () => observer.disconnect(); ++ }, [visible, preview.status]); ++ (0, react.useLayoutEffect)(() => { ++ if (preview.status !== "ready" || pageLayout.length !== preview.pageCount || bodyRef.current === null || typeof window.IntersectionObserver !== "function") return; ++ const observer = new window.IntersectionObserver((entries) => { ++ setObservedPages((previous) => { ++ const next = new Set(previous ?? []); ++ for (const entry of entries) { ++ const pageNumber = Number.parseInt(entry.target?.getAttribute?.("data-research-pdf-page") ?? "", 10); ++ if (!Number.isSafeInteger(pageNumber) || pageNumber < 1 || pageNumber > preview.pageCount) continue; ++ if (entry.isIntersecting) next.add(pageNumber); ++ else next.delete(pageNumber); ++ } ++ return next; ++ }); ++ }, { root: bodyRef.current, rootMargin: `${RESEARCH_PDF_RENDER_OVERSCAN_PX}px 0px` }); ++ for (const element of pageElementRefs.current.values()) observer.observe(element); ++ return () => observer.disconnect(); ++ }, [preview.status, preview.pageCount, pageLayout.map((page) => `${page.top}:${page.height}`).join(",")]); ++ (0, react.useEffect)(() => { ++ if (!visible) { ++ setPreview({ status: "offscreen", pageCount: 0 }); ++ return; ++ } ++ if (typeof node.authorizationId !== "string" || typeof window.dshDesktop?.researchPreview?.restore !== "function") { ++ setPreview({ status: "error", pageCount: 0 }); ++ return; ++ } ++ let active = true; ++ let metadataFailed = false; ++ setPreview({ status: "loading", pageCount: 0 }); ++ setScrollTop(0); ++ setRenderedPages(/* @__PURE__ */ new Set()); ++ setPageMetrics([]); ++ setObservedPages(null); ++ (async () => { ++ try { ++ const descriptor = await window.dshDesktop.researchPreview.restore({ sessionId, nodeId: node.id, authorizationId: node.authorizationId }); ++ if (!active) { ++ if (descriptor !== null) window.dshDesktop?.researchPreview?.release?.({ sessionId, nodeId: node.id, authorizationId: descriptor.authorizationId, capabilityToken: descriptor.capabilityToken }); ++ return; ++ } ++ if (descriptor === null) throw new Error("PDF preview authorization is unavailable."); ++ descriptorRef.current = descriptor; ++ const pdfjs = await loadResearchPdfLibrary(); ++ if (!active) return; ++ const loadingTask = pdfjs.getDocument({ url: descriptor.url, cMapUrl: RESEARCH_PDF_CMAP_URL, cMapPacked: true, standardFontDataUrl: RESEARCH_PDF_STANDARD_FONT_URL, isEvalSupported: false, useWasm: false, maxImageSize: RESEARCH_PDF_MAX_IMAGE_PIXELS }); ++ loadingTaskRef.current = loadingTask; ++ const document2 = await loadingTask.promise; ++ if (!active) return; ++ if (!Number.isSafeInteger(document2?.numPages) || document2.numPages < 1) throw new Error("PDF has no pages."); ++ if (document2.numPages > RESEARCH_PDF_MAX_PAGES) throw new Error("PDF exceeds the supported page limit."); ++ documentRef.current = document2; ++ const firstPage = await document2.getPage(1); ++ let firstMetric; ++ try { ++ const viewport2 = firstPage.getViewport({ scale: 1 }); ++ if (!Number.isFinite(viewport2?.width) || !Number.isFinite(viewport2?.height) || viewport2.width <= 0 || viewport2.height <= 0) throw new Error("PDF page has invalid dimensions."); ++ firstMetric = { width: viewport2.width, height: viewport2.height }; ++ } finally { ++ try { ++ firstPage.cleanup?.(); ++ } catch {} ++ } ++ if (!active) return; ++ const metrics = new Array(document2.numPages).fill(firstMetric); ++ metadataCallbackRef.current?.(firstMetric.width, firstMetric.height); ++ setPageMetrics(metrics); ++ setPreview({ status: "ready", pageCount: document2.numPages }); ++ let nextPageNumber = 2; ++ const measureNextPage = async () => { ++ while (active && !metadataFailed) { ++ const pageNumber = nextPageNumber; ++ nextPageNumber += 1; ++ if (pageNumber > document2.numPages) return; ++ const page = await document2.getPage(pageNumber); ++ try { ++ if (!active || metadataFailed) return; ++ const viewport2 = page.getViewport({ scale: 1 }); ++ if (!Number.isFinite(viewport2?.width) || !Number.isFinite(viewport2?.height) || viewport2.width <= 0 || viewport2.height <= 0) throw new Error("PDF page has invalid dimensions."); ++ const metric = { width: viewport2.width, height: viewport2.height }; ++ setPageMetrics((previous) => { ++ if (!active || metadataFailed || previous.length !== document2.numPages) return previous; ++ const next = previous.slice(); ++ next[pageNumber - 1] = metric; ++ return next; ++ }); ++ } finally { ++ try { ++ page.cleanup?.(); ++ } catch {} ++ } ++ } ++ }; ++ const workerCount = Math.min(RESEARCH_PDF_METADATA_CONCURRENCY, Math.max(0, document2.numPages - 1)); ++ const workers = []; ++ for (let index = 0; index < workerCount; index += 1) workers.push(measureNextPage()); ++ Promise.all(workers).catch(() => { ++ if (!active || metadataFailed) return; ++ metadataFailed = true; ++ destroyDocument(); ++ releaseCurrentDescriptor(); ++ setPageMetrics([]); ++ setPreview({ status: "error", pageCount: 0 }); ++ }); ++ } catch { ++ if (!active) return; ++ destroyDocument(); ++ releaseCurrentDescriptor(); ++ setPreview({ status: "error", pageCount: 0 }); ++ } ++ })(); ++ return () => { ++ active = false; ++ destroyDocument(); ++ releaseCurrentDescriptor(); ++ }; ++ }, [sessionId, node.id, node.authorizationId, visible, destroyDocument, releaseCurrentDescriptor]); ++ (0, react.useEffect)(() => { ++ if (preview.status !== "ready" || documentRef.current === null || pageLayout.length !== preview.pageCount || renderWidth <= 0 || bodySize.height <= 0) return; ++ const desired = new Set(renderWindow); ++ for (const pageNumber of new Set([...renderTasksRef.current.keys(), ...renderedWidthsRef.current.keys()])) if (!desired.has(pageNumber) || renderedWidthsRef.current.has(pageNumber) && renderedWidthsRef.current.get(pageNumber) !== renderWidth) clearPage(pageNumber, true); ++ for (const pageNumber of renderWindow) { ++ if (renderTasksRef.current.has(pageNumber) || renderedWidthsRef.current.get(pageNumber) === renderWidth) continue; ++ const generation = (pageGenerationsRef.current.get(pageNumber) ?? 0) + 1; ++ pageGenerationsRef.current.set(pageNumber, generation); ++ renderedWidthsRef.current.set(pageNumber, renderWidth); ++ (async () => { ++ let page = null; ++ try { ++ page = await documentRef.current.getPage(pageNumber); ++ if (pageGenerationsRef.current.get(pageNumber) !== generation) { ++ page.cleanup?.(); ++ return; ++ } ++ const natural = page.getViewport({ scale: 1 }); ++ pdfPagesRef.current.set(pageNumber, page); ++ const canvas = canvasRefs.current.get(pageNumber); ++ if (canvas === void 0) { ++ page.cleanup?.(); ++ pdfPagesRef.current.delete(pageNumber); ++ return; ++ } ++ const backing = researchPdfBackingStore({ pageWidth: natural.width, pageHeight: natural.height, cssWidth: renderWidth, devicePixelRatio: window.devicePixelRatio, maxPixels: RESEARCH_PDF_MAX_BACKING_PIXELS }); ++ canvas.width = backing.backingWidth; ++ canvas.height = backing.backingHeight; ++ canvas.style.width = `${backing.cssWidth}px`; ++ canvas.style.height = `${backing.cssHeight}px`; ++ const context = canvas.getContext("2d"); ++ if (context === null) throw new Error("PDF canvas is unavailable."); ++ const renderTask = page.render({ canvasContext: context, viewport: page.getViewport({ scale: backing.cssWidth / natural.width }), transform: backing.outputScale === 1 ? void 0 : [backing.outputScale, 0, 0, backing.outputScale, 0, 0] }); ++ renderTasksRef.current.set(pageNumber, renderTask); ++ await renderTask.promise; ++ if (pageGenerationsRef.current.get(pageNumber) !== generation) return; ++ renderTasksRef.current.delete(pageNumber); ++ renderedWidthsRef.current.set(pageNumber, renderWidth); ++ page.cleanup?.(); ++ pdfPagesRef.current.delete(pageNumber); ++ setRenderedPages((previous) => new Set([...previous, pageNumber])); ++ } catch (error) { ++ if (pageGenerationsRef.current.get(pageNumber) !== generation || error?.name === "RenderingCancelledException") return; ++ destroyDocument(); ++ releaseCurrentDescriptor(); ++ setPreview({ status: "error", pageCount: 0 }); ++ } ++ })(); ++ } ++ return void 0; ++ }, [preview.status, preview.pageCount, pageLayout.map((page) => `${page.top}:${page.height}`).join(","), renderWindow.join(","), renderWidth, bodySize.height, clearPage, destroyDocument, releaseCurrentDescriptor]); ++ if (preview.status === "offscreen") return (0, react_jsx_runtime.jsx)("div", { className: "rScV5Q_previewPlaceholder", "data-research-offscreen-placeholder": "", children: "预览已暂停" }); ++ if (preview.status === "loading") return (0, react_jsx_runtime.jsx)("div", { className: "rScV5Q_previewPlaceholder", "data-research-preview-loading": "", children: "正在载入 PDF…" }); ++ if (preview.status !== "ready") return (0, react_jsx_runtime.jsx)("div", { className: "rScV5Q_previewPlaceholder", "data-research-pdf-error": "", children: "PDF 预览不可用" }); ++ return (0, react_jsx_runtime.jsx)("div", { ++ ref: bodyRef, ++ className: "rScV5Q_pdfScroll", ++ "data-research-pdf-scroll": "", ++ "data-research-preview-interactive": "", ++ onWheel: (event) => { ++ if (!event.metaKey) event.stopPropagation(); ++ }, ++ onScroll: (event) => setScrollTop(Math.max(0, event.currentTarget.scrollTop || 0)), ++ children: Array.from({ length: preview.pageCount }, (_, index) => { ++ const pageNumber = index + 1; ++ const layout = pageLayout[index]; ++ const shouldRender = renderWindow.includes(pageNumber); ++ return (0, react_jsx_runtime.jsx)("div", { ++ className: "rScV5Q_pdfPage", ++ "data-research-pdf-page": pageNumber, ++ ref: (element) => { ++ if (element === null) pageElementRefs.current.delete(pageNumber); ++ else pageElementRefs.current.set(pageNumber, element); ++ }, ++ style: { height: layout === void 0 ? void 0 : `${layout.height}px`, minHeight: layout === void 0 ? void 0 : `${layout.height}px`, marginBottom: pageNumber === preview.pageCount ? 0 : `${RESEARCH_PDF_PAGE_GAP_PX}px` }, ++ children: shouldRender ? (0, react_jsx_runtime.jsx)("canvas", { ref: canvasRefForPage(pageNumber), "data-research-pdf-preview": "", "data-research-pdf-rendered-page": renderedPages.has(pageNumber) ? pageNumber : void 0, "aria-label": `${node.name} 第 ${pageNumber} 页` }) : (0, react_jsx_runtime.jsx)("div", { className: "rScV5Q_pdfPagePlaceholder", "data-research-pdf-page-placeholder": "", children: `第 ${pageNumber} 页` }) ++ }, pageNumber); ++ }) ++ }); ++ } ++ function ResearchCanvasHtmlPreview({ node, sessionId, visible }) { ++ const [preview, setPreview] = (0, react.useState)({ status: visible ? "loading" : "offscreen", descriptor: null }); ++ const descriptorRef = (0, react.useRef)(null); ++ const releaseCurrentDescriptor = (0, react.useCallback)(() => { ++ const descriptor = descriptorRef.current; ++ if (descriptor === null) return; ++ descriptorRef.current = null; ++ window.dshDesktop?.researchPreview?.release?.({ sessionId, nodeId: node.id, authorizationId: descriptor.authorizationId, capabilityToken: descriptor.capabilityToken }); ++ }, [sessionId, node.id]); ++ (0, react.useEffect)(() => { ++ if (!visible) { ++ setPreview({ status: "offscreen", descriptor: null }); ++ return; ++ } ++ if (typeof node.authorizationId !== "string" || typeof window.dshDesktop?.researchPreview?.restore !== "function") { ++ setPreview({ status: "unavailable", descriptor: null }); ++ return; ++ } ++ let active = true; ++ setPreview({ status: "loading", descriptor: null }); ++ window.dshDesktop.researchPreview.restore({ sessionId, nodeId: node.id, authorizationId: node.authorizationId }).then((value) => { ++ if (!active) { ++ if (value !== null) window.dshDesktop?.researchPreview?.release?.({ sessionId, nodeId: node.id, authorizationId: value.authorizationId, capabilityToken: value.capabilityToken }); ++ return; ++ } ++ descriptorRef.current = value; ++ setPreview(value === null ? { status: "unavailable", descriptor: null } : { status: "ready", descriptor: value }); ++ }).catch(() => { ++ if (active) setPreview({ status: "unavailable", descriptor: null }); ++ }); ++ return () => { ++ active = false; ++ releaseCurrentDescriptor(); ++ }; ++ }, [sessionId, node.id, node.authorizationId, visible, releaseCurrentDescriptor]); ++ if (preview.status === "offscreen") return (0, react_jsx_runtime.jsx)("div", { ++ className: "rScV5Q_previewPlaceholder", ++ "data-research-offscreen-placeholder": "", ++ children: "预览已暂停" ++ }); ++ if (preview.status === "loading") return (0, react_jsx_runtime.jsx)("div", { ++ className: "rScV5Q_previewPlaceholder", ++ "data-research-preview-loading": "", ++ children: "正在载入 HTML…" ++ }); ++ if (preview.status !== "ready" || preview.descriptor === null) return (0, react_jsx_runtime.jsx)("div", { ++ className: "rScV5Q_previewPlaceholder", ++ "data-research-preview-unavailable": "", ++ children: "HTML 预览不可用" ++ }); ++ return (0, react_jsx_runtime.jsx)("iframe", { ++ className: "rScV5Q_htmlPreview", ++ "data-research-html-preview": "", ++ "data-research-preview-interactive": "", ++ src: preview.descriptor.url, ++ title: node.displayName ?? node.name, ++ sandbox: "allow-scripts allow-same-origin allow-forms", ++ referrerPolicy: "no-referrer", ++ loading: "lazy", ++ allow: "camera 'none'; microphone 'none'; geolocation 'none'; clipboard-read 'none'; clipboard-write 'none'; fullscreen 'none'; autoplay 'none'; payment 'none'; usb 'none'; serial 'none'; hid 'none'", ++ onError: () => { ++ releaseCurrentDescriptor(); ++ setPreview({ status: "unavailable", descriptor: null }); ++ } ++ }); ++ } ++ class ResearchOfficePreviewCoordinator { ++ service = null; ++ listeners = /* @__PURE__ */ new Set(); ++ subscribe = (listener) => { ++ this.listeners.add(listener); ++ return () => this.listeners.delete(listener); ++ }; ++ getSnapshot = () => this.service; ++ attach(service) { ++ const usable = typeof service?.Component === "function" && typeof service?.supports === "function" ? service : null; ++ this.service = usable; ++ this.listeners.forEach((listener) => listener()); ++ return () => { ++ if (this.service !== usable) return; ++ this.service = null; ++ this.listeners.forEach((listener) => listener()); ++ }; ++ } ++ } ++ const defaultResearchOfficePreview = new ResearchOfficePreviewCoordinator(); ++ function supportsResearchOfficePreview(service, kind) { ++ try { ++ return service !== null && service.supports(kind) === true; ++ } catch { ++ return false; ++ } ++ } ++ class ResearchOfficePreviewErrorBoundary extends react.Component { ++ state = { failed: false }; ++ static getDerivedStateFromError() { return { failed: true }; } ++ render() { ++ if (this.state.failed) return (0, react_jsx_runtime.jsx)("div", { className: "rScV5Q_previewPlaceholder", "data-research-preview-unavailable": "", children: "Office 预览不可用" }); ++ return this.props.children; ++ } ++ } ++ function ResearchCanvasOfficePreview({ node, sessionId, kind, visible, service }) { ++ const supported = supportsResearchOfficePreview(service, kind); ++ const [preview, setPreview] = (0, react.useState)({ status: visible ? "loading" : "offscreen", descriptor: null }); ++ const descriptorRef = (0, react.useRef)(null); ++ const releaseCurrentDescriptor = (0, react.useCallback)(() => { ++ const descriptor = descriptorRef.current; ++ if (descriptor === null) return; ++ descriptorRef.current = null; ++ window.dshDesktop?.researchPreview?.release?.({ sessionId, nodeId: node.id, authorizationId: descriptor.authorizationId, capabilityToken: descriptor.capabilityToken }); ++ }, [sessionId, node.id]); ++ (0, react.useEffect)(() => { ++ if (!visible) { ++ setPreview({ status: "offscreen", descriptor: null }); ++ return; ++ } ++ if (!supported || typeof node.authorizationId !== "string" || typeof window.dshDesktop?.researchPreview?.restore !== "function") { ++ setPreview({ status: "unavailable", descriptor: null }); ++ return; ++ } ++ let active = true; ++ setPreview({ status: "loading", descriptor: null }); ++ window.dshDesktop.researchPreview.restore({ sessionId, nodeId: node.id, authorizationId: node.authorizationId }).then((value) => { ++ if (!active) { ++ if (value !== null) window.dshDesktop?.researchPreview?.release?.({ sessionId, nodeId: node.id, authorizationId: value.authorizationId, capabilityToken: value.capabilityToken }); ++ return; ++ } ++ descriptorRef.current = value; ++ setPreview(value === null ? { status: "unavailable", descriptor: null } : { status: "ready", descriptor: value }); ++ }).catch(() => { ++ if (active) setPreview({ status: "unavailable", descriptor: null }); ++ }); ++ return () => { ++ active = false; ++ releaseCurrentDescriptor(); ++ }; ++ }, [sessionId, node.id, node.authorizationId, kind, visible, supported, service, releaseCurrentDescriptor]); ++ if (preview.status === "offscreen") return (0, react_jsx_runtime.jsx)("div", { className: "rScV5Q_previewPlaceholder", "data-research-offscreen-placeholder": "", children: "预览已暂停" }); ++ if (preview.status === "loading") return (0, react_jsx_runtime.jsx)("div", { className: "rScV5Q_previewPlaceholder", "data-research-preview-loading": "", children: "正在载入 Office…" }); ++ if (preview.status !== "ready" || preview.descriptor === null || !supported) return (0, react_jsx_runtime.jsx)("div", { className: "rScV5Q_previewPlaceholder", "data-research-preview-unavailable": "", children: "Office 预览不可用" }); ++ const Component = service.Component; ++ return (0, react_jsx_runtime.jsx)("div", { ++ className: "rScV5Q_officePreview", ++ "data-research-office-preview": kind, ++ "data-research-preview-interactive": "", ++ onWheel: (event) => { ++ if (!event.metaKey) event.stopPropagation(); ++ }, ++ children: (0, react_jsx_runtime.jsx)(ResearchOfficePreviewErrorBoundary, { ++ children: (0, react_jsx_runtime.jsx)(Component, { ++ sourceUrl: preview.descriptor.url, ++ kind, ++ title: node.displayName ?? node.name ++ }) ++ }, preview.descriptor.url) ++ }); ++ } ++ function ResearchCanvasFileCard({ node, sessionId, officePreview = null, visible = true, selected = false, dragging = false, resizing = false, editing = false, onRenameCommit, onRenameCancel, onSelect, onNaturalSize }) { ++ const kind = researchCanvasNodeKind(node); ++ const displayName = node.displayName ?? node.name; ++ const [pdfStatus, setPdfStatus] = (0, react.useState)({ page: 1, total: 0 }); ++ (0, react.useEffect)(() => setPdfStatus({ page: 1, total: 0 }), [node.id]); ++ const geometry = normalizeResearchCanvasNodeGeometry(node); ++ if (geometry.resizable) return (0, react_jsx_runtime.jsx)(ResearchCanvasRichNodeFrame, { ++ node, ++ selected, ++ dragging, ++ resizing, ++ className: "rScV5Q_fileRichNode", ++ "data-research-file-card": node.id, ++ "data-path-unavailable": node.authorizationId === void 0 ? true : void 0, ++ titleText: node.path ?? displayName, ++ title: editing ? (0, react_jsx_runtime.jsx)(ResearchCanvasInlineTitleEditor, { ++ nodeId: node.id, ++ value: displayName, ++ onCommit: onRenameCommit, ++ onCancel: onRenameCancel ++ }) : kind === "pdf" ? (0, react_jsx_runtime.jsxs)(react.Fragment, { ++ children: [(0, react_jsx_runtime.jsx)("span", { className: "rScV5Q_titleName", children: displayName }), (0, react_jsx_runtime.jsx)("span", { className: "rScV5Q_pageIndicator", children: pdfStatus.total > 0 ? `${pdfStatus.page} / ${pdfStatus.total}` : "1 / …" })] ++ }) : displayName, ++ onKeyDown: (event) => { ++ if (event.key !== "Enter") return; ++ event.preventDefault(); ++ event.stopPropagation(); ++ onSelect?.(node); ++ }, ++ children: kind === "image" ? (0, react_jsx_runtime.jsx)(ResearchCanvasImagePreview, { ++ node, ++ sessionId, ++ visible, ++ onNaturalSize ++ }) : kind === "pdf" ? (0, react_jsx_runtime.jsx)(ResearchCanvasPdfPreview, { ++ node, ++ sessionId, ++ visible, ++ onNaturalSize, ++ onPageStatus: setPdfStatus ++ }) : kind === "html" ? (0, react_jsx_runtime.jsx)(ResearchCanvasHtmlPreview, { ++ node, ++ sessionId, ++ visible ++ }) : kind === "markdown" || kind === "text" ? (0, react_jsx_runtime.jsx)(ResearchCanvasNativeTextPreview, { ++ node, ++ sessionId, ++ visible, ++ markdown: kind === "markdown" ++ }) : kind === "docx" || kind === "xlsx" || kind === "pptx" ? (0, react_jsx_runtime.jsx)(ResearchCanvasOfficePreview, { ++ node, ++ sessionId, ++ kind, ++ visible, ++ service: officePreview ++ }) : (0, react_jsx_runtime.jsxs)("div", { ++ className: "rScV5Q_previewPlaceholder", ++ children: [(0, react_jsx_runtime.jsx)("span", { children: researchCanvasFileCaption(node) }), (0, react_jsx_runtime.jsx)("span", { children: node.authorizationId === void 0 ? "预览不可用" : "本地预览" })] ++ }) ++ }); ++ return (0, react_jsx_runtime.jsxs)("div", { ++ className: "rScV5Q_fileCard", ++ "data-research-file-card": node.id, ++ "data-research-node-id": node.id, ++ "data-selected": selected || void 0, ++ "data-node-dragging": dragging || void 0, ++ "data-path-unavailable": node.path === void 0 ? true : void 0, ++ role: "option", ++ tabIndex: 0, ++ "aria-selected": selected, ++ title: node.path ?? displayName, ++ onKeyDown: (event) => { ++ if (event.key !== "Enter") return; ++ event.preventDefault(); ++ event.stopPropagation(); ++ onSelect?.(node); ++ }, ++ style: { ++ left: `${node.x}px`, ++ top: `${node.y}px`, ++ width: `${geometry.width}px`, ++ height: `${geometry.height}px`, ++ transform: "translate(-50%, -50%)" ++ }, ++ children: [(0, react_jsx_runtime.jsx)("svg", { ++ className: "rScV5Q_fileIcon", ++ viewBox: "0 0 20 20", ++ "aria-hidden": true, ++ children: (0, react_jsx_runtime.jsx)("path", { ++ d: "M4.5 2.5h6l5 5v10h-11zM10.5 2.5v5h5", ++ fill: "none", ++ stroke: "currentColor", ++ strokeWidth: "1.4", ++ strokeLinejoin: "round" ++ }) ++ }), (0, react_jsx_runtime.jsxs)("span", { ++ className: "rScV5Q_fileText", ++ children: [(0, react_jsx_runtime.jsx)("span", { ++ className: "rScV5Q_fileName", ++ children: editing ? (0, react_jsx_runtime.jsx)(ResearchCanvasInlineTitleEditor, { ++ nodeId: node.id, ++ value: displayName, ++ onCommit: onRenameCommit, ++ onCancel: onRenameCancel, ++ className: "rScV5Q_fileTitleEditor" ++ }) : displayName ++ }), (0, react_jsx_runtime.jsx)("span", { ++ className: "rScV5Q_fileCaption", ++ children: researchCanvasFileCaption(node) ++ })] ++ })] ++ }); ++ } ++ function ResearchMindMapNodeEditor({ artifactId, node, depth, root = false, onCommit, onCancel }) { ++ const inputRef = (0, react.useRef)(null); ++ const settledRef = (0, react.useRef)(false); ++ const resize = () => { ++ const input = inputRef.current; ++ if (input === null) return; ++ input.style.height = "0px"; ++ input.style.height = `${Math.max(root ? 60 : 54, input.scrollHeight)}px`; ++ }; ++ (0, react.useLayoutEffect)(() => { ++ const input = inputRef.current; ++ input?.focus({ preventScroll: true }); ++ input?.select(); ++ resize(); ++ }, []); ++ const stop = (event) => event.stopPropagation(); ++ const settle = (commit) => { ++ if (settledRef.current) return; ++ settledRef.current = true; ++ if (commit) onCommit(inputRef.current?.value ?? node.label); ++ else onCancel(); ++ }; ++ return (0, react_jsx_runtime.jsx)("textarea", { ++ ref: inputRef, ++ className: `rScV5Q_mindMapNode${root ? " rScV5Q_mindMapRoot" : ""} rScV5Q_mindMapNodeEditor`, ++ "data-research-mind-map-node-input": `${artifactId}:${node.sourceLineIndex}`, ++ "data-research-mind-map-depth": depth, ++ "data-research-mind-map-copy": researchMindMapCopyKind(node.label), ++ "aria-label": "编辑思维导图节点", ++ defaultValue: node.label, ++ rows: 1, ++ onBlur: () => settle(true), ++ onInput: resize, ++ onPointerDown: stop, ++ onClick: stop, ++ onDoubleClick: stop, ++ onContextMenu: stop, ++ onKeyDown: (event) => { ++ event.stopPropagation(); ++ if (event.key === "Enter" && !event.shiftKey && !event.nativeEvent?.isComposing) { ++ event.preventDefault(); ++ settle(true); ++ } else if (event.key === "Escape") { ++ event.preventDefault(); ++ settle(false); ++ } ++ } ++ }); ++ } ++ function ResearchMindMapDisplayNode({ artifactId, node, depth, root = false, editingLineIndex, onBeginEdit, onCommit, onCancel }) { ++ if (editingLineIndex === node.sourceLineIndex) return (0, react_jsx_runtime.jsx)(ResearchMindMapNodeEditor, { ++ artifactId, ++ node, ++ depth, ++ root, ++ onCommit: (label) => onCommit(node.sourceLineIndex, label), ++ onCancel ++ }); ++ return (0, react_jsx_runtime.jsx)("span", { ++ className: `rScV5Q_mindMapNode${root ? " rScV5Q_mindMapRoot" : ""}`, ++ "data-research-mind-map-node": "", ++ "data-research-mind-map-depth": depth, ++ "data-research-mind-map-copy": researchMindMapCopyKind(node.label), ++ onDoubleClick: (event) => { ++ event.preventDefault(); ++ event.stopPropagation(); ++ onBeginEdit(node.sourceLineIndex); ++ }, ++ children: node.label ++ }); ++ } ++ function ResearchMindMapBranches({ artifactId, nodes, depth = 1, editingLineIndex, onBeginEdit, onCommit, onCancel }) { ++ return (0, react_jsx_runtime.jsx)("div", { ++ className: "rScV5Q_mindMapChildren", ++ children: nodes.map((node, index) => (0, react_jsx_runtime.jsxs)("div", { ++ className: "rScV5Q_mindMapBranch", ++ "data-research-mind-map-branch": "", ++ children: [(0, react_jsx_runtime.jsx)(ResearchMindMapDisplayNode, { ++ artifactId, ++ node, ++ depth, ++ editingLineIndex, ++ onBeginEdit, ++ onCommit, ++ onCancel ++ }), node.children.length === 0 ? null : (0, react_jsx_runtime.jsx)(ResearchMindMapBranches, { ++ artifactId, ++ nodes: node.children, ++ depth: depth + 1, ++ editingLineIndex, ++ onBeginEdit, ++ onCommit, ++ onCancel ++ })] ++ }, `${depth}:${index}:${node.label}`)) ++ }); ++ } ++ function researchMindMapCopyKind(value) { ++ const label = String(value ?? "").replace(/\s+/g, " ").trim(); ++ return /[，,；;]/u.test(label) || /[。！？.!?]\s*$/u.test(label) || Array.from(label.replace(/\s/g, "")).length > 18 ? "sentence" : "phrase"; ++ } ++ function ResearchMindMap({ nodeId, text, detail = "standard", onNodeLabelCommit }) { ++ const [editingLineIndex, setEditingLineIndex] = (0, react.useState)(null); ++ const normalizedDetail = researchMindMapDetail(detail); ++ const tree = parseResearchMindMap(text, normalizedDetail); ++ if (tree === null) return (0, react_jsx_runtime.jsx)("span", { className: "rScV5Q_artifactExcerpt", children: text }); ++ const cancel = () => setEditingLineIndex(null); ++ const commit = (sourceLineIndex, label) => { ++ setEditingLineIndex(null); ++ onNodeLabelCommit?.(sourceLineIndex, label); ++ }; ++ return (0, react_jsx_runtime.jsxs)("div", { ++ className: "rScV5Q_mindMap", ++ "data-research-mind-map": "", ++ "data-research-mind-map-detail": normalizedDetail, ++ lang: "zh-CN", ++ children: [(0, react_jsx_runtime.jsx)(ResearchMindMapDisplayNode, { ++ artifactId: nodeId, ++ node: tree, ++ depth: 0, ++ root: true, ++ editingLineIndex, ++ onBeginEdit: setEditingLineIndex, ++ onCommit: commit, ++ onCancel: cancel ++ }), tree.children.length === 0 ? null : (0, react_jsx_runtime.jsx)(ResearchMindMapBranches, { ++ artifactId: nodeId, ++ nodes: tree.children, ++ editingLineIndex, ++ onBeginEdit: setEditingLineIndex, ++ onCommit: commit, ++ onCancel: cancel ++ })] ++ }); ++ } ++ function ResearchGenerationProcess({ node, onCancel }) { ++ const events = Array.isArray(node.generationEvents) ? node.generationEvents : []; ++ const toolRows = events.filter((event) => event.type === 'tool-started').slice(-4); ++ const latestTool = toolRows.at(-1)?.tool; ++ const phase = node.generationStatus === 'queued' ? '排队中' : latestTool === void 0 ? '正在生成内容' : `正在${latestTool}`; ++ return (0, react_jsx_runtime.jsxs)("div", { ++ className: "rScV5Q_generationProcess", ++ "data-research-generation-process": "", ++ children: [(0, react_jsx_runtime.jsx)("div", { ++ className: "rScV5Q_generationPhase", ++ children: phase ++ }), toolRows.length === 0 ? null : (0, react_jsx_runtime.jsx)("div", { ++ className: "rScV5Q_generationTools", ++ children: toolRows.map((event) => (0, react_jsx_runtime.jsx)("span", { children: event.tool }, event.seq)) ++ }), typeof node.generationPartialText !== 'string' || node.generationPartialText === '' ? null : (0, react_jsx_runtime.jsx)("div", { ++ className: "rScV5Q_generationDraft", ++ children: node.generationPartialText ++ }), typeof onCancel !== 'function' || typeof node.generationTaskId !== 'string' ? null : (0, react_jsx_runtime.jsx)("button", { ++ type: "button", ++ "data-research-generation-cancel": "", ++ onPointerDown: (event) => event.stopPropagation(), ++ onClick: (event) => { ++ event.preventDefault(); ++ event.stopPropagation(); ++ onCancel(node); ++ }, ++ children: "停止" ++ })] ++ }); ++ } ++ function isResearchWechatArticleUrl(value) { ++ const url = normalizeResearchWebUrl(value); ++ if (url === null) return false; ++ try { ++ const Url = typeof globalThis.URL === "function" ? globalThis.URL : globalThis.window?.URL; ++ if (typeof Url !== "function") return false; ++ const parsed = new Url(url); ++ return parsed.protocol === "https:" && parsed.hostname === "mp.weixin.qq.com" && (parsed.pathname === "/s" || parsed.pathname.startsWith("/s/")); ++ } catch { ++ return false; ++ } ++ } ++ function escapeResearchReaderText(value) { ++ return String(value ?? "").replace(/&/g, "&").replace(//g, ">").replace(/"/g, """).replace(/'/g, "'"); ++ } ++ function researchWechatReaderDocument(article) { ++ const title = escapeResearchReaderText(article.title); ++ const author = escapeResearchReaderText(article.author); ++ const publishTime = escapeResearchReaderText(article.publishTime); ++ const baseUrl = escapeResearchReaderText(article.url); ++ return `${title}

${title}

${author === "" && publishTime === "" ? "" : `

${author}${author !== "" && publishTime !== "" ? " · " : ""}${publishTime}

`}
${article.bodyHtml}
`; ++ } ++ function ResearchCanvasWechatReader({ node, sessionId, visible, onInspection }) { ++ const [attempt, setAttempt] = (0, react.useState)(0); ++ const [reader, setReader] = (0, react.useState)({ status: visible ? "loading" : "offscreen", article: null }); ++ const onInspectionRef = (0, react.useRef)(onInspection); ++ onInspectionRef.current = onInspection; ++ (0, react.useEffect)(() => { ++ if (!visible) { ++ setReader({ status: "offscreen", article: null }); ++ return; ++ } ++ const read = window.dshDesktop?.researchWebReader?.read; ++ const linkFrame = window.dshDesktop?.researchLinkFrame; ++ if (typeof read !== "function" || typeof linkFrame?.authorize !== "function") { ++ setReader({ status: "unavailable", article: null }); ++ return; ++ } ++ let active = true; ++ setReader({ status: "loading", article: null }); ++ linkFrame.authorize({ sessionId, nodeId: node.id, url: node.url }).then((authorization) => { ++ const authorizedUrl = normalizeResearchWebUrl(authorization?.url); ++ if (!active || authorizedUrl === null || authorizedUrl !== normalizeResearchWebUrl(node.url)) return null; ++ return read({ sessionId, nodeId: node.id, url: authorizedUrl }); ++ }).then((result) => { ++ if (!active) return; ++ if (result === null) { ++ setReader({ status: "unavailable", article: null }); ++ return; ++ } ++ const url = normalizeResearchWebUrl(result?.url); ++ const ready = result?.status === "ready" && url !== null && isResearchWechatArticleUrl(url) && typeof result?.title === "string" && typeof result?.bodyHtml === "string"; ++ if (!ready) { ++ setReader({ status: "unavailable", article: null }); ++ return; ++ } ++ const article = { ...result, url }; ++ setReader({ status: "ready", article }); ++ onInspectionRef.current?.(node.url, { title: article.title }); ++ }).catch(() => { ++ if (active) setReader({ status: "unavailable", article: null }); ++ }); ++ return () => { ++ active = false; ++ Promise.resolve(linkFrame.release?.({ sessionId, nodeId: node.id })).catch(() => void 0); ++ }; ++ }, [sessionId, node.id, node.url, visible, attempt]); ++ if (reader.status === "offscreen") return (0, react_jsx_runtime.jsx)("div", { className: "rScV5Q_previewPlaceholder", "data-research-offscreen-placeholder": "", children: "网页已暂停" }); ++ if (reader.status === "loading") return (0, react_jsx_runtime.jsx)("div", { className: "rScV5Q_previewPlaceholder", "data-research-preview-loading": "", children: "正在安全读取文章…" }); ++ if (reader.status !== "ready" || reader.article === null) return (0, react_jsx_runtime.jsxs)("div", { ++ className: "rScV5Q_previewPlaceholder", ++ "data-research-web-error": "", ++ children: [(0, react_jsx_runtime.jsx)("span", { children: "文章暂时无法读取" }), (0, react_jsx_runtime.jsx)("button", { type: "button", onClick: () => setAttempt((value) => value + 1), children: "重试" }), (0, react_jsx_runtime.jsx)("a", { href: node.url, target: "_blank", rel: "noreferrer noopener", children: "浏览器打开" })] ++ }); ++ return (0, react_jsx_runtime.jsxs)("div", { ++ className: "rScV5Q_webFrameShell", ++ children: [(0, react_jsx_runtime.jsxs)("div", { ++ className: "rScV5Q_webFrameControls", ++ children: [(0, react_jsx_runtime.jsx)("span", { title: reader.article.title, children: reader.article.author ?? "微信公众号" }), (0, react_jsx_runtime.jsx)("button", { type: "button", onClick: () => setAttempt((value) => value + 1), children: "刷新" }), (0, react_jsx_runtime.jsx)("a", { href: reader.article.url, target: "_blank", rel: "noreferrer noopener", children: "浏览器打开" })] ++ }), (0, react_jsx_runtime.jsx)("iframe", { ++ className: "rScV5Q_webFrame", ++ "data-research-wechat-reader": "", ++ "data-research-preview-interactive": "", ++ srcDoc: researchWechatReaderDocument(reader.article), ++ title: reader.article.title, ++ sandbox: "", ++ referrerPolicy: "no-referrer" ++ })] ++ }); ++ } ++ function ResearchCanvasStandardWebFrame({ node, sessionId, visible = true, onInspection }) { ++ const [attempt, setAttempt] = (0, react.useState)(0); ++ const [frame, setFrame] = (0, react.useState)({ status: visible ? "authorizing" : "offscreen", url: null, frameName: "" }); ++ const [layout, setLayout] = (0, react.useState)({ logicalWidth: null, scale: 1 }); ++ const viewportRef = (0, react.useRef)(null); ++ const inspectedScrollWidthRef = (0, react.useRef)(0); ++ const syncLayout = (0, react.useCallback)((fallbackWidth = 0) => { ++ const containerWidth = viewportRef.current?.clientWidth || fallbackWidth; ++ if (!(containerWidth > 0)) return; ++ setLayout(researchWebFrameLayout(containerWidth, inspectedScrollWidthRef.current || containerWidth)); ++ }, []); ++ (0, react.useEffect)(() => { ++ if (!visible) { ++ setFrame({ status: "offscreen", url: null, frameName: "" }); ++ return; ++ } ++ const bridge = window.dshDesktop?.researchLinkFrame; ++ if (typeof bridge?.authorize !== "function") { ++ setFrame({ status: "unavailable", url: null, frameName: "" }); ++ return; ++ } ++ let active = true; ++ setFrame({ status: "authorizing", url: null, frameName: "" }); ++ setLayout({ logicalWidth: null, scale: 1 }); ++ inspectedScrollWidthRef.current = 0; ++ bridge.authorize({ sessionId, nodeId: node.id, url: node.url }).then((result) => { ++ if (!active) return; ++ const url = normalizeResearchWebUrl(result?.url); ++ const frameName = typeof result?.frameName === "string" && /^sherlock-research-link-[a-f0-9]{32}$/i.test(result.frameName) ? result.frameName : ""; ++ setFrame(url === null ? { status: "unavailable", url: null, frameName: "" } : { status: "ready", url, frameName }); ++ }).catch(() => { ++ if (active) setFrame({ status: "unavailable", url: null, frameName: "" }); ++ }); ++ return () => { ++ active = false; ++ Promise.resolve(bridge.release?.({ sessionId, nodeId: node.id })).catch(() => void 0); ++ }; ++ }, [sessionId, node.id, node.url, visible, attempt]); ++ (0, react.useEffect)(() => { ++ const viewport = viewportRef.current; ++ if (frame.status !== "ready" || viewport === null || typeof ResizeObserver === "undefined") return; ++ const observer = new ResizeObserver(() => syncLayout()); ++ observer.observe(viewport); ++ syncLayout(); ++ return () => observer.disconnect(); ++ }, [frame.status, syncLayout]); ++ if (frame.status === "offscreen") return (0, react_jsx_runtime.jsx)("div", { className: "rScV5Q_previewPlaceholder", "data-research-offscreen-placeholder": "", children: "网页已暂停" }); ++ if (frame.status === "authorizing") return (0, react_jsx_runtime.jsx)("div", { className: "rScV5Q_previewPlaceholder", "data-research-preview-loading": "", children: "正在安全载入网页…" }); ++ if (frame.status !== "ready" || frame.url === null) return (0, react_jsx_runtime.jsxs)("div", { ++ className: "rScV5Q_previewPlaceholder", ++ "data-research-web-error": "", ++ children: [(0, react_jsx_runtime.jsx)("span", { children: "网页无法在组件中载入" }), (0, react_jsx_runtime.jsx)("button", { ++ type: "button", ++ onClick: () => setAttempt((value) => value + 1), ++ children: "重新载入" ++ })] ++ }); ++ return (0, react_jsx_runtime.jsxs)("div", { ++ className: "rScV5Q_webFrameShell", ++ children: [(0, react_jsx_runtime.jsxs)("div", { ++ className: "rScV5Q_webFrameControls", ++ children: [(0, react_jsx_runtime.jsx)("span", { title: frame.url, children: researchWebUrlHostname(frame.url) }), (0, react_jsx_runtime.jsx)("button", { ++ type: "button", ++ "aria-label": "重新载入网页", ++ onClick: () => setAttempt((value) => value + 1), ++ children: "刷新" ++ }), (0, react_jsx_runtime.jsx)("a", { ++ href: frame.url, ++ target: "_blank", ++ rel: "noreferrer noopener", ++ children: "浏览器打开" ++ })] ++ }), (0, react_jsx_runtime.jsx)("div", { ++ ref: viewportRef, ++ className: "rScV5Q_webFrameViewport", ++ "data-research-web-frame-viewport": "", ++ children: (0, react_jsx_runtime.jsx)("iframe", { ++ className: "rScV5Q_webFrame", ++ "data-research-web-frame": "", ++ "data-research-preview-interactive": "", ++ name: frame.frameName, ++ src: frame.url, ++ title: node.title, ++ sandbox: "allow-scripts allow-forms allow-popups allow-popups-to-escape-sandbox", ++ referrerPolicy: "no-referrer", ++ allow: "camera 'none'; microphone 'none'; geolocation 'none'; clipboard-read 'none'; clipboard-write 'none'; fullscreen 'none'; autoplay 'none'; payment 'none'; usb 'none'; serial 'none'; hid 'none'", ++ style: layout.logicalWidth === null ? void 0 : { width: `${layout.logicalWidth}px`, height: `${100 / layout.scale}%`, transform: `scale(${layout.scale})`, transformOrigin: "0 0" }, ++ onLoad: async () => { ++ const inspect = window.dshDesktop?.researchLinkFrame?.inspect; ++ if (typeof inspect !== "function" || frame.frameName === "") return; ++ try { ++ const inspection = await inspect({ sessionId, nodeId: node.id }); ++ if (inspection === null) return; ++ if (Number.isFinite(inspection.scrollWidth) && inspection.scrollWidth > 0) inspectedScrollWidthRef.current = inspection.scrollWidth; ++ onInspection?.(node.url, inspection); ++ syncLayout(Number.isFinite(inspection.clientWidth) ? inspection.clientWidth : 0); ++ } catch {} ++ }, ++ onError: () => setFrame({ status: "unavailable", url: null, frameName: "" }) ++ }) ++ })] ++ }); ++ } ++ function ResearchCanvasWebFrame(props) { ++ return isResearchWechatArticleUrl(props.node.url) ? (0, react_jsx_runtime.jsx)(ResearchCanvasWechatReader, props) : (0, react_jsx_runtime.jsx)(ResearchCanvasStandardWebFrame, props); ++ } ++ function ResearchContainerDraft({ node, onSubmit }) { ++ const inputRef = (0, react.useRef)(null); ++ const [prompt, setPrompt] = (0, react.useState)(node.containerPrompt ?? ""); ++ (0, react.useLayoutEffect)(() => { ++ inputRef.current?.focus({ preventScroll: true }); ++ }, [node.id]); ++ const submit = () => { ++ const value = prompt.trim(); ++ if (value !== "") onSubmit?.(node, value); ++ }; ++ return (0, react_jsx_runtime.jsxs)("div", { ++ className: "rScV5Q_containerDraft", ++ "data-research-container-draft": "", ++ children: [(0, react_jsx_runtime.jsx)("textarea", { ++ ref: inputRef, ++ "data-research-container-prompt": "", ++ "aria-label": "描述要创建的组件内容", ++ placeholder: "描述想创建的内容，例如：制作一张月度收入趋势图、一个数据监控网页或一张对比表格…", ++ value: prompt, ++ maxLength: RESEARCH_CONTAINER_MAX_PROMPT, ++ onInput: (event) => setPrompt(event.currentTarget.value), ++ onKeyDown: (event) => { ++ event.stopPropagation(); ++ if ((event.metaKey || event.ctrlKey) && event.key === "Enter") { ++ event.preventDefault(); ++ submit(); ++ } ++ } ++ }), (0, react_jsx_runtime.jsxs)("div", { ++ className: "rScV5Q_containerDraftFooter", ++ children: [(0, react_jsx_runtime.jsx)("span", { children: "可生成网页、图表、表格、KPI 或文字内容" }), (0, react_jsx_runtime.jsx)("button", { ++ type: "button", ++ "data-research-container-submit": "", ++ disabled: prompt.trim() === "", ++ onClick: submit, ++ children: "创建" ++ })] ++ })] ++ }); ++ } ++ const RESEARCH_CONTAINER_CHART_COLORS = ["rgb(0,80,150)", "rgb(0,120,180)", "rgb(30,185,225)", "rgb(255,200,25)", "rgb(150,150,150)", "rgb(60,60,60)"]; ++ function researchCanvasExportFileName(value, extension) { ++ let decoded = String(value ?? "组件"); ++ try { ++ decoded = decodeURIComponent(decoded); ++ } catch {} ++ const cleaned = decoded.replace(/[\u0000-\u001f\u007f/\\:*?"<>|]+/g, "").replace(/\s+/g, " ").trim().replace(/[ .]+$/g, ""); ++ const escapedExtension = String(extension ?? "txt").replace(/[^a-z0-9]/gi, "").toLowerCase() || "txt"; ++ const currentExtension = cleaned.match(/\.[^.]{1,12}$/)?.[0] ?? ""; ++ const stem = (currentExtension === "" ? cleaned : cleaned.slice(0, -currentExtension.length)).replace(/[ .]+$/g, "").slice(0, 120) || "组件"; ++ return `${stem}.${escapedExtension}`; ++ } ++ function escapeResearchExportXml(value) { ++ return String(value ?? "").replace(/&/g, "&").replace(//g, ">").replace(/"/g, """).replace(/'/g, "'"); ++ } ++ function researchCsvCell(value) { ++ const text = String(value ?? ""); ++ return /[",\r\n]/.test(text) ? `"${text.replace(/"/g, '""')}"` : text; ++ } ++ function researchContainerTableCsv(spec) { ++ return [...spec.columns, ...spec.rows.flat()].length === 0 ? "" : `${[spec.columns, ...spec.rows].map((row) => row.map(researchCsvCell).join(",")).join("\r\n")}\r\n`; ++ } ++ function researchArtifactMarkdown(node) { ++ return `# ${String(node.title ?? "研究内容").trim() || "研究内容"}\n\n${String(node.excerpt ?? "").trim()}\n`; ++ } ++ function researchGenerationText(node) { ++ const lines = [`组件：${node.title ?? "研究组件"}`, `状态：${node.generationStatus ?? "未知"}`]; ++ if (typeof node.containerPrompt === "string" && node.containerPrompt.trim() !== "") lines.push(`需求：${node.containerPrompt.trim()}`); ++ if (typeof node.generationError === "string" && node.generationError.trim() !== "") lines.push(`错误：${node.generationError.trim()}`); ++ if (typeof node.excerpt === "string" && node.excerpt.trim() !== "") lines.push("", node.excerpt.trim()); ++ return `${lines.join("\n")}\n`; ++ } ++ function buildResearchContainerChartSvg(rawSpec) { ++ const spec = parseResearchContainerSpec(rawSpec); ++ if (spec === null || spec.type !== "chart") return null; ++ const values = spec.series.flatMap((series) => series.values); ++ const minimum = Math.min(0, ...values); ++ const maximum = Math.max(0, ...values); ++ const range = maximum - minimum || 1; ++ const left = 54; ++ const top = 54; ++ const width = 540; ++ const height = 230; ++ const y = (value) => top + (maximum - value) / range * height; ++ const baseline = y(0); ++ const step = width / spec.labels.length; ++ const grid = Array.from({ length: 5 }, (_, index) => { ++ const lineY = top + index * height / 4; ++ return ``; ++ }).join(""); ++ const marks = spec.variant === "bar" ? spec.series.flatMap((series, seriesIndex) => series.values.map((value, index) => { ++ const groupWidth = Math.max(4, step * .7); ++ const barWidth = Math.max(3, groupWidth / spec.series.length - 3); ++ const valueY = y(value); ++ return ``; ++ })).join("") : spec.series.flatMap((series, seriesIndex) => { ++ const color = RESEARCH_CONTAINER_CHART_COLORS[seriesIndex % RESEARCH_CONTAINER_CHART_COLORS.length]; ++ const points = series.values.map((value, index) => `${left + (index + .5) * step},${y(value)}`).join(" "); ++ return [``, ...series.values.map((value, index) => ``)]; ++ }).join(""); ++ const labels = spec.labels.map((label, index) => `${escapeResearchExportXml(label)}`).join(""); ++ const legend = spec.series.map((series, index) => `${escapeResearchExportXml(series.name)}`).join(""); ++ return `${escapeResearchExportXml(spec.title)}${grid}${marks}${labels}${legend}`; ++ } ++ function researchCanvasExportDescriptor(node, sessionId) { ++ if (typeof node !== "object" || node === null || typeof node.id !== "string") return null; ++ const title = typeof node.title === "string" && node.title.trim() !== "" ? node.title.trim() : typeof node.displayName === "string" ? node.displayName : typeof node.name === "string" ? node.name : "研究组件"; ++ if (typeof node.name === "string" && (node.source === "computer" || node.source === "sherlock")) { ++ if (typeof node.authorizationId === "string") return { kind: "original", sessionId, nodeId: node.id, authorizationId: node.authorizationId, suggestedName: node.displayName ?? node.name }; ++ return { kind: "text", format: "txt", suggestedName: researchCanvasExportFileName(title, "txt"), content: `文件：${title}\n原始文件当前不可用。\n` }; ++ } ++ if (node.kind === "web-link") { ++ const url = normalizeResearchWebUrl(node.url); ++ return url === null ? null : { kind: "webloc", suggestedName: researchCanvasExportFileName(title, "webloc"), url }; ++ } ++ if (node.kind === "generated-mind-map") { ++ if (node.generationStatus === "completed") return { kind: "mind-map", suggestedName: title, text: String(node.excerpt ?? ""), detail: researchMindMapDetail(node.generationDetail) }; ++ return { kind: "text", format: "txt", suggestedName: researchCanvasExportFileName(title, "txt"), content: researchGenerationText(node) }; ++ } ++ if (node.kind === "generated-container") { ++ const spec = node.generationStatus === "completed" ? parseResearchContainerSpec(node.containerSpec) : null; ++ if (spec === null) return { kind: "text", format: "txt", suggestedName: researchCanvasExportFileName(title, "txt"), content: researchGenerationText(node) }; ++ if (spec.type === "web") return { kind: "webloc", suggestedName: researchCanvasExportFileName(spec.title, "webloc"), url: spec.url }; ++ if (spec.type === "chart") return { kind: "text", format: "svg", suggestedName: researchCanvasExportFileName(spec.title, "svg"), content: buildResearchContainerChartSvg(spec) }; ++ if (spec.type === "table") return { kind: "text", format: "csv", suggestedName: researchCanvasExportFileName(spec.title, "csv"), content: researchContainerTableCsv(spec) }; ++ if (spec.type === "kpi") return { kind: "text", format: "md", suggestedName: researchCanvasExportFileName(spec.title, "md"), content: `# ${spec.title}\n\n${spec.items.map((item) => `- ${item.label}：${item.value}${item.change === void 0 ? "" : `（${item.change}）`}`).join("\n")}\n` }; ++ return { kind: "text", format: "md", suggestedName: researchCanvasExportFileName(spec.title, "md"), content: `# ${spec.title}\n\n${spec.content.trim()}\n` }; ++ } ++ if (["assistant-result", "assistant-excerpt", "generated-summary"].includes(node.kind)) return { kind: "text", format: "md", suggestedName: researchCanvasExportFileName(title, "md"), content: researchArtifactMarkdown(node) }; ++ return { kind: "text", format: "txt", suggestedName: researchCanvasExportFileName(title, "txt"), content: `${String(node.excerpt ?? "").trim()}\n` }; ++ } ++ const RESEARCH_MIND_MAP_EXPORT_COLORS = ["rgb(0,80,150)", "rgb(0,120,180)", "rgb(30,185,225)", "rgb(179,235,255)", "rgb(193,198,200)", "rgb(255,200,25)"]; ++ function researchMindMapExportLines(label, maximumWidth, measureText) { ++ const paragraphs = String(label ?? "").split(/\n+/).map((value) => value.trim()).filter(Boolean); ++ const lines = []; ++ for (const paragraph of paragraphs.length === 0 ? [""] : paragraphs) { ++ if (measureText(paragraph) <= maximumWidth) { ++ lines.push(paragraph); ++ continue; ++ } ++ let line = ""; ++ for (const character of Array.from(paragraph)) { ++ if (line !== "" && measureText(`${line}${character}`) > maximumWidth) { ++ lines.push(line.trim()); ++ line = character; ++ } else line += character; ++ } ++ if (line.trim() !== "") lines.push(line.trim()); ++ } ++ if (lines.length > 1 && Array.from(lines.at(-1)).length === 1 && Array.from(lines.at(-2)).length > 2) { ++ const previous = Array.from(lines.at(-2)); ++ lines[lines.length - 1] = `${previous.pop()}${lines.at(-1)}`; ++ lines[lines.length - 2] = previous.join(""); ++ } ++ return lines; ++ } ++ function researchMindMapExportTree(node, depth, measureText) { ++ const width = depth === 0 ? 236 : 220; ++ const lines = researchMindMapExportLines(node.label, width - 28, measureText); ++ const height = Math.max(depth === 0 ? 60 : 54, lines.length * 19 + 18); ++ const children = node.children.map((child) => researchMindMapExportTree(child, depth + 1, measureText)); ++ const childrenHeight = children.reduce((sum, child) => sum + child.subtreeHeight, 0) + Math.max(0, children.length - 1) * 18; ++ return { label: node.label, depth, width, height, lines, children, subtreeHeight: Math.max(height, childrenHeight), x: 0, y: 0 }; ++ } ++ function researchMindMapExportDepth(node) { ++ return node.children.reduce((maximum, child) => Math.max(maximum, researchMindMapExportDepth(child)), node.depth); ++ } ++ function placeResearchMindMapExportNode(node, top) { ++ node.x = node.depth === 0 ? 0 : 236 + 52 + (node.depth - 1) * (220 + 52); ++ node.y = top + (node.subtreeHeight - node.height) / 2; ++ if (node.children.length === 0) return; ++ const childBlockHeight = node.children.reduce((sum, child) => sum + child.subtreeHeight, 0) + (node.children.length - 1) * 18; ++ let childTop = top + (node.subtreeHeight - childBlockHeight) / 2; ++ for (const child of node.children) { ++ placeResearchMindMapExportNode(child, childTop); ++ childTop += child.subtreeHeight + 18; ++ } ++ } ++ function flattenResearchMindMapExport(node, result = []) { ++ result.push(node); ++ for (const child of node.children) flattenResearchMindMapExport(child, result); ++ return result; ++ } ++ function buildResearchMindMapSvg(value, detail = "standard", measureText = (text) => Array.from(text).length * 14) { ++ const tree = parseResearchMindMap(value, detail); ++ if (tree === null || typeof measureText !== "function") return null; ++ const root = researchMindMapExportTree(tree, 0, (text) => { ++ const measured = Number(measureText(text)); ++ return Number.isFinite(measured) && measured >= 0 ? measured : Array.from(text).length * 14; ++ }); ++ placeResearchMindMapExportNode(root, 0); ++ const maximumDepth = researchMindMapExportDepth(root); ++ const contentWidth = maximumDepth === 0 ? 236 : 236 + maximumDepth * 52 + maximumDepth * 220; ++ const contentHeight = root.subtreeHeight; ++ const safePadding = 24; ++ const baseWidth = contentWidth + safePadding * 2; ++ const baseHeight = contentHeight + safePadding * 2; ++ const normalizedDetail = researchMindMapDetail(detail); ++ let width = baseWidth; ++ let height = baseHeight; ++ if (normalizedDetail === "brief") { ++ width = Math.ceil(Math.max(baseWidth, baseHeight * 1.2)); ++ height = Math.ceil(width / 1.2); ++ if (height < baseHeight) { ++ height = baseHeight; ++ width = Math.ceil(height * 1.2); ++ } ++ } else if (width / height > 1.8) height = Math.ceil(width / 1.8); ++ else if (width / height < 1.2) width = Math.ceil(height * 1.2); ++ const offsetX = safePadding + (width - baseWidth) / 2; ++ const offsetY = safePadding + (height - baseHeight) / 2; ++ const nodes = flattenResearchMindMapExport(root); ++ const connectors = nodes.flatMap((node) => node.children.map((child) => { ++ const fromX = offsetX + node.x + node.width; ++ const fromY = offsetY + node.y + node.height / 2; ++ const toX = offsetX + child.x; ++ const toY = offsetY + child.y + child.height / 2; ++ const middleX = (fromX + toX) / 2; ++ return ``; ++ })).join(""); ++ const boxes = nodes.map((node) => { ++ const x = offsetX + node.x; ++ const y = offsetY + node.y; ++ const color = RESEARCH_MIND_MAP_EXPORT_COLORS[node.depth % RESEARCH_MIND_MAP_EXPORT_COLORS.length]; ++ const light = node.depth === 3 || node.depth === 4 || node.depth === 5; ++ const sentence = researchMindMapCopyKind(node.label) === "sentence"; ++ const textX = sentence ? x + 14 : x + node.width / 2; ++ const firstY = y + node.height / 2 - (node.lines.length - 1) * 19 / 2 + 5; ++ const text = node.lines.map((line, index) => `${escapeResearchExportXml(line)}`).join(""); ++ return `${text}`; ++ }).join(""); ++ const svg = `${connectors}${boxes}`; ++ return { svg, width, height }; ++ } ++ async function rasterizeResearchMindMapSvg(svg, width, height, format, environment = {}) { ++ if (typeof svg !== "string" || !/^)/.test(svg) || !Number.isFinite(width) || !Number.isFinite(height) || width <= 0 || height <= 0 || format !== "png" && format !== "jpg") throw new TypeError("Invalid mind map raster export"); ++ const outputWidth = Math.round(width * 2); ++ const outputHeight = Math.round(height * 2); ++ const browser = globalThis.window ?? globalThis; ++ const createCanvas = environment.createCanvas ?? ((canvasWidth, canvasHeight) => { ++ const canvas = browser.document.createElement("canvas"); ++ canvas.width = canvasWidth; ++ canvas.height = canvasHeight; ++ return canvas; ++ }); ++ const createImage = environment.createImage ?? (() => new browser.Image()); ++ const createSvgUrl = environment.createSvgUrl ?? ((source) => browser.URL.createObjectURL(new browser.Blob([source], { type: "image/svg+xml;charset=utf-8" }))); ++ const revokeSvgUrl = environment.revokeSvgUrl ?? ((url) => browser.URL.revokeObjectURL(url)); ++ const blobToBase64 = environment.blobToBase64 ?? ((blob) => new Promise((resolve, reject) => { ++ const reader = new browser.FileReader(); ++ reader.onload = () => resolve(String(reader.result ?? "").split(",").at(-1) ?? ""); ++ reader.onerror = () => reject(reader.error ?? new Error("Unable to encode image")); ++ reader.readAsDataURL(blob); ++ })); ++ const canvas = createCanvas(outputWidth, outputHeight); ++ const context = canvas?.getContext?.("2d"); ++ if (context === null || context === void 0) throw new Error("Canvas is unavailable"); ++ const url = createSvgUrl(svg); ++ try { ++ const image = createImage(); ++ await new Promise((resolve, reject) => { ++ image.onload = resolve; ++ image.onerror = () => reject(new Error("Unable to load mind map SVG")); ++ image.src = url; ++ }); ++ context.fillStyle = "#ffffff"; ++ context.fillRect(0, 0, outputWidth, outputHeight); ++ context.drawImage(image, 0, 0, outputWidth, outputHeight); ++ const mimeType = format === "png" ? "image/png" : "image/jpeg"; ++ const quality = format === "jpg" ? .92 : void 0; ++ const blob = await new Promise((resolve, reject) => canvas.toBlob((value) => value === null ? reject(new Error("Unable to encode mind map image")) : resolve(value), mimeType, quality)); ++ const base64 = await blobToBase64(blob); ++ return { base64, width: outputWidth, height: outputHeight }; ++ } finally { ++ revokeSvgUrl(url); ++ } ++ } ++ function ResearchContainerChart({ spec }) { ++ const values = spec.series.flatMap((series) => series.values); ++ const minimum = Math.min(0, ...values); ++ const maximum = Math.max(0, ...values); ++ const range = maximum - minimum || 1; ++ const left = 54; ++ const top = 18; ++ const width = 540; ++ const height = 230; ++ const y = (value) => top + (maximum - value) / range * height; ++ const baseline = y(0); ++ const step = width / spec.labels.length; ++ return (0, react_jsx_runtime.jsxs)("div", { ++ className: "rScV5Q_containerChart", ++ "data-research-container-chart": spec.variant, ++ children: [(0, react_jsx_runtime.jsxs)("svg", { ++ viewBox: "0 0 640 290", ++ role: "img", ++ "aria-label": spec.title, ++ children: [Array.from({ length: 5 }, (_, index) => { ++ const lineY = top + index * height / 4; ++ return (0, react_jsx_runtime.jsx)("line", { x1: left, x2: left + width, y1: lineY, y2: lineY, className: "rScV5Q_chartGrid" }, `grid-${index}`); ++ }), (0, react_jsx_runtime.jsx)("line", { x1: left, x2: left + width, y1: baseline, y2: baseline, className: "rScV5Q_chartAxis" }), spec.variant === "bar" ? spec.series.flatMap((series, seriesIndex) => series.values.map((value, index) => { ++ const groupWidth = Math.max(4, step * .7); ++ const barWidth = Math.max(3, groupWidth / spec.series.length - 3); ++ const valueY = y(value); ++ return (0, react_jsx_runtime.jsx)("rect", { ++ x: left + index * step + (step - groupWidth) / 2 + seriesIndex * (groupWidth / spec.series.length), ++ y: Math.min(baseline, valueY), ++ width: barWidth, ++ height: Math.max(1, Math.abs(baseline - valueY)), ++ fill: RESEARCH_CONTAINER_CHART_COLORS[seriesIndex % RESEARCH_CONTAINER_CHART_COLORS.length] ++ }, `${seriesIndex}-${index}`); ++ })) : spec.series.flatMap((series, seriesIndex) => { ++ const points = series.values.map((value, index) => `${left + (index + .5) * step},${y(value)}`).join(" "); ++ const color = RESEARCH_CONTAINER_CHART_COLORS[seriesIndex % RESEARCH_CONTAINER_CHART_COLORS.length]; ++ return [(0, react_jsx_runtime.jsx)("polyline", { points, fill: "none", stroke: color, strokeWidth: 3, strokeLinejoin: "round", strokeLinecap: "round" }, `line-${seriesIndex}`), ...series.values.map((value, index) => (0, react_jsx_runtime.jsx)("circle", { cx: left + (index + .5) * step, cy: y(value), r: 3.5, fill: color }, `point-${seriesIndex}-${index}`))]; ++ }), spec.labels.map((label, index) => (0, react_jsx_runtime.jsx)("text", { x: left + (index + .5) * step, y: 274, textAnchor: "middle", className: "rScV5Q_chartLabel", children: label }, `label-${index}`))] ++ }), (0, react_jsx_runtime.jsx)("div", { ++ className: "rScV5Q_chartLegend", ++ children: spec.series.map((series, index) => (0, react_jsx_runtime.jsxs)("span", { children: [(0, react_jsx_runtime.jsx)("i", { style: { background: RESEARCH_CONTAINER_CHART_COLORS[index % RESEARCH_CONTAINER_CHART_COLORS.length] } }), series.name] }, series.name)) ++ })] ++ }); ++ } ++ function ResearchContainerContent({ node, sessionId, visible }) { ++ const spec = node.containerSpec; ++ if (spec.type === "web") return (0, react_jsx_runtime.jsx)(ResearchCanvasWebFrame, { node: { ...node, url: spec.url }, sessionId, visible }); ++ if (spec.type === "chart") return (0, react_jsx_runtime.jsx)(ResearchContainerChart, { spec }); ++ if (spec.type === "table") return (0, react_jsx_runtime.jsx)("div", { className: "rScV5Q_containerTableScroll", children: (0, react_jsx_runtime.jsxs)("table", { "data-research-container-table": "", children: [(0, react_jsx_runtime.jsx)("thead", { children: (0, react_jsx_runtime.jsx)("tr", { children: spec.columns.map((column, index) => (0, react_jsx_runtime.jsx)("th", { children: column }, index)) }) }), (0, react_jsx_runtime.jsx)("tbody", { children: spec.rows.map((row, rowIndex) => (0, react_jsx_runtime.jsx)("tr", { children: row.map((cell, cellIndex) => (0, react_jsx_runtime.jsx)("td", { children: String(cell) }, cellIndex)) }, rowIndex)) })] }) }); ++ if (spec.type === "kpi") return (0, react_jsx_runtime.jsx)("div", { className: "rScV5Q_containerKpis", "data-research-container-kpi": "", children: spec.items.map((item, index) => (0, react_jsx_runtime.jsxs)("div", { children: [(0, react_jsx_runtime.jsx)("span", { children: item.label }), (0, react_jsx_runtime.jsx)("strong", { children: String(item.value) }), item.change === void 0 ? null : (0, react_jsx_runtime.jsx)("em", { children: String(item.change) })] }, index)) }); ++ return (0, react_jsx_runtime.jsx)("div", { className: "rScV5Q_containerMarkdown", "data-research-container-markdown": "", children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.MarkdownText, { text: spec.content, streaming: false }) }); ++ } ++ function ResearchGeneratedContainer({ node, sessionId, visible, onGenerate, onSetRefresh }) { ++ const rootRef = (0, react.useRef)(null); ++ const refreshRef = (0, react.useRef)(onGenerate); ++ const [editingPrompt, setEditingPrompt] = (0, react.useState)(false); ++ refreshRef.current = onGenerate; ++ (0, react.useEffect)(() => { ++ if (node.refreshMinutes === 0 || node.generationStatus !== "completed") return; ++ let timer; ++ let active = true; ++ const schedule = () => { ++ if (!active) return; ++ const now = Date.now(); ++ const inert = rootRef.current?.closest?.("[inert]") !== null && rootRef.current?.closest?.("[inert]") !== void 0; ++ if (researchContainerRefreshDue(node, { visible, documentVisible: document.visibilityState !== "hidden", inert, now })) { ++ refreshRef.current?.(node, node.containerPrompt); ++ return; ++ } ++ const dueAt = (Number.isFinite(node.lastSuccessfulAt) ? node.lastSuccessfulAt : now) + node.refreshMinutes * 6e4; ++ timer = setTimeout(schedule, Math.min(3e4, Math.max(1e3, dueAt - now))); ++ }; ++ const onVisibility = () => { ++ if (timer !== void 0) clearTimeout(timer); ++ schedule(); ++ }; ++ schedule(); ++ document.addEventListener("visibilitychange", onVisibility); ++ return () => { ++ active = false; ++ if (timer !== void 0) clearTimeout(timer); ++ document.removeEventListener("visibilitychange", onVisibility); ++ }; ++ }, [node.id, node.generationStatus, node.refreshMinutes, node.lastSuccessfulAt, visible]); ++ if (editingPrompt) return (0, react_jsx_runtime.jsx)(ResearchContainerDraft, { node, onSubmit: (target, prompt) => { setEditingPrompt(false); onGenerate?.(target, prompt); } }); ++ const activeGeneration = RESEARCH_ACTIVE_GENERATION_STATUSES.has(node.generationStatus); ++ return (0, react_jsx_runtime.jsxs)("div", { ++ ref: rootRef, ++ className: "rScV5Q_generatedContainer", ++ "data-research-container-type": node.containerSpec.type, ++ children: [(0, react_jsx_runtime.jsxs)("div", { ++ className: "rScV5Q_containerControls", ++ children: [(0, react_jsx_runtime.jsx)("span", { children: node.containerSpec.type === "web" ? "网页" : node.containerSpec.type === "chart" ? "图表" : node.containerSpec.type === "table" ? "表格" : node.containerSpec.type === "kpi" ? "指标" : "内容" }), (0, react_jsx_runtime.jsx)("button", { type: "button", onClick: () => setEditingPrompt(true), disabled: activeGeneration, children: "编辑需求" }), (0, react_jsx_runtime.jsx)("button", { type: "button", "data-research-container-refresh": "", onClick: () => onGenerate?.(node, node.containerPrompt), disabled: activeGeneration, children: "刷新" }), (0, react_jsx_runtime.jsxs)("select", { ++ "data-research-container-refresh-interval": "", ++ "aria-label": "自动刷新间隔", ++ value: node.refreshMinutes, ++ disabled: activeGeneration, ++ onChange: (event) => onSetRefresh?.(node, Number(event.currentTarget.value)), ++ children: [(0, react_jsx_runtime.jsx)("option", { value: 0, children: "不自动刷新" }), (0, react_jsx_runtime.jsx)("option", { value: 1, children: "每 1 分钟" }), (0, react_jsx_runtime.jsx)("option", { value: 5, children: "每 5 分钟" }), (0, react_jsx_runtime.jsx)("option", { value: 15, children: "每 15 分钟" }), (0, react_jsx_runtime.jsx)("option", { value: 30, children: "每 30 分钟" })] ++ })] ++ }), activeGeneration ? (0, react_jsx_runtime.jsx)("div", { className: "rScV5Q_containerNotice", "data-research-container-refreshing": "", children: "正在刷新，当前内容继续可用" }) : node.refreshError === void 0 ? null : (0, react_jsx_runtime.jsx)("div", { className: "rScV5Q_containerNotice", "data-state": "error", children: node.refreshError }), (0, react_jsx_runtime.jsx)("div", { className: "rScV5Q_containerContent", children: (0, react_jsx_runtime.jsx)(ResearchContainerContent, { node, sessionId, visible }) })] ++ }); ++ } ++ function ResearchCanvasArtifactCard({ node, sessionId, visible = true, selected = false, dragging = false, resizing = false, editing = false, editingContent = false, sourceUnavailable = false, onRenameCommit, onRenameCancel, onContentEdit, onContentCommit, onContentCancel, onMindMapNodeCommit, onOpenContextMenu, onActivate, onAutoHeight, onWebInspection, onRetryGeneration, onCancelGeneration, onSubmitContainer, onSetContainerRefresh, retryDisabled = false }) { ++ const activate = () => onActivate?.(node); ++ const contentRef = (0, react.useRef)(null); ++ (0, react.useLayoutEffect)(() => { ++ if (node.sizeMode === "manual" || node.kind === "web-link" || node.kind === "generated-container" || RESEARCH_ACTIVE_GENERATION_STATUSES.has(node.generationStatus) || node.kind === 'generated-mind-map' && node.generationStatus === 'completed' || contentRef.current === null || typeof ResizeObserver === "undefined") return; ++ const measure = () => { ++ if (!(contentRef.current.scrollHeight > 0)) return; ++ const minimum = node.kind === 'generated-summary' && node.generationStatus === 'completed' ? 280 : RESEARCH_CANVAS_NODE_POLICIES.assistant.minHeight; ++ const maximum = node.kind === 'generated-summary' && node.generationStatus === 'completed' ? 640 : RESEARCH_CANVAS_MAX_NODE_SIZE; ++ const height = Math.min(maximum, Math.max(minimum, Math.round(contentRef.current.scrollHeight + RESEARCH_CANVAS_TITLE_HEIGHT))); ++ if (Math.round(node.height ?? RESEARCH_CANVAS_NODE_POLICIES.assistant.height) !== height) onAutoHeight?.(node, height); ++ }; ++ const observer = new ResizeObserver(measure); ++ observer.observe(contentRef.current); ++ measure(); ++ return () => observer.disconnect(); ++ }, [node.id, node.sizeMode, node.height, onAutoHeight]); ++ return (0, react_jsx_runtime.jsx)(ResearchCanvasRichNodeFrame, { ++ node, ++ selected, ++ dragging, ++ resizing, ++ className: "rScV5Q_artifactCard", ++ "data-research-artifact-card": node.id, ++ "data-research-generation-state": node.generationStatus, ++ "data-research-generated-mind-map": node.kind === "generated-mind-map" && node.generationStatus === 'completed' ? "" : void 0, ++ "data-research-web-link": node.kind === "web-link" ? "" : void 0, ++ "data-research-generated-container": node.kind === "generated-container" ? "" : void 0, ++ titleText: node.title, ++ title: editing ? (0, react_jsx_runtime.jsx)(ResearchCanvasInlineTitleEditor, { ++ nodeId: node.id, ++ value: node.title, ++ onCommit: onRenameCommit, ++ onCancel: onRenameCancel ++ }) : node.title, ++ onDoubleClick: activate, ++ onKeyDown: (event) => { ++ if (event.key !== "Enter") return; ++ event.preventDefault(); ++ event.stopPropagation(); ++ activate(); ++ }, ++ children: (0, react_jsx_runtime.jsxs)("div", { ++ ref: contentRef, ++ className: "rScV5Q_artifactBody", ++ "data-research-artifact-content": "", ++ onDoubleClick: researchCanvasArtifactContentEditable(node) ? (event) => { ++ event.preventDefault(); ++ event.stopPropagation(); ++ onContentEdit?.(node); ++ } : void 0, ++ onContextMenu: (event) => { ++ event.preventDefault(); ++ event.stopPropagation(); ++ onOpenContextMenu?.(event, node); ++ }, ++ children: [editingContent ? (0, react_jsx_runtime.jsx)(ResearchCanvasInlineContentEditor, { ++ nodeId: node.id, ++ value: node.excerpt, ++ onCommit: onContentCommit, ++ onCancel: onContentCancel ++ }) : node.kind === "web-link" ? (0, react_jsx_runtime.jsx)(ResearchCanvasWebFrame, { ++ node, ++ sessionId, ++ visible, ++ onInspection: onWebInspection ++ }) : node.kind === "generated-container" && node.generationStatus === "draft" ? (0, react_jsx_runtime.jsx)(ResearchContainerDraft, { ++ node, ++ onSubmit: onSubmitContainer ++ }) : node.kind === "generated-container" && node.containerSpec !== void 0 ? (0, react_jsx_runtime.jsx)(ResearchGeneratedContainer, { ++ node, ++ sessionId, ++ visible, ++ onGenerate: onSubmitContainer, ++ onSetRefresh: onSetContainerRefresh ++ }) : RESEARCH_ACTIVE_GENERATION_STATUSES.has(node.generationStatus) ? (0, react_jsx_runtime.jsx)(ResearchGenerationProcess, { ++ node, ++ onCancel: onCancelGeneration ++ }) : node.kind === "generated-mind-map" && node.generationStatus === 'completed' ? (0, react_jsx_runtime.jsx)(ResearchMindMap, { ++ nodeId: node.id, ++ text: node.excerpt, ++ detail: node.generationDetail, ++ onNodeLabelCommit: onMindMapNodeCommit ++ }) : node.kind === "assistant-result" || node.kind === "generated-summary" && node.generationStatus === 'completed' ? (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.MarkdownText, { ++ text: node.excerpt, ++ streaming: false ++ }) : ['failed', 'cancelled', 'interrupted'].includes(node.generationStatus) ? (0, react_jsx_runtime.jsxs)("div", { ++ className: "rScV5Q_generationFailure", ++ "data-research-generation-failure": "", ++ children: [(0, react_jsx_runtime.jsx)("span", { children: node.generationError ?? '生成失败，请重试。' }), (0, react_jsx_runtime.jsxs)("button", { ++ type: "button", ++ "aria-label": "重试生成", ++ disabled: retryDisabled, ++ onPointerDown: (event) => event.stopPropagation(), ++ onClick: (event) => { ++ event.preventDefault(); ++ event.stopPropagation(); ++ onRetryGeneration?.(node); ++ }, ++ children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconRefreshOutline16, { size: 14 }), "重试"] ++ })] ++ }) : (0, react_jsx_runtime.jsx)("span", { ++ className: "rScV5Q_artifactExcerpt", ++ children: node.excerpt ++ }), (0, react_jsx_runtime.jsxs)("span", { ++ className: "rScV5Q_artifactMeta", ++ children: [node.kind === "assistant-excerpt" ? "助手摘录" : node.kind === "generated-mind-map" ? "思维导图" : node.kind === "generated-summary" ? "总结提炼" : node.kind === "web-link" ? "链接" : node.kind === "generated-container" ? "智能容器" : "助手回复", sourceUnavailable ? " · 来源消息不可用" : RESEARCH_ACTIVE_GENERATION_STATUSES.has(node.generationStatus) ? " · 处理中" : ['failed', 'cancelled', 'interrupted'].includes(node.generationStatus) ? " · 可重试" : node.kind === "web-link" || node.kind === "generated-container" ? "" : " · 来源消息"] ++ })] ++ }) ++ }); ++ } ++ /** Resolve one Command-wheel gesture into a pointer-anchored infinite-canvas viewport. */ ++ function nextResearchCanvasViewport(viewport, gesture) { ++ if (!gesture.metaKey) return viewport; ++ const scale = Math.min(RESEARCH_CANVAS_MAX_SCALE, Math.max(RESEARCH_CANVAS_MIN_SCALE, viewport.scale * Math.exp(-gesture.deltaY * .001))); ++ if (scale === viewport.scale) return viewport; ++ const ratio = scale / viewport.scale; ++ return { ++ scale, ++ x: gesture.pointerX - (gesture.pointerX - viewport.x) * ratio, ++ y: gesture.pointerY - (gesture.pointerY - viewport.y) * ratio ++ }; ++ } ++ /** Resolve one pointer movement into an infinite-canvas pan without changing zoom. */ ++ function nextResearchCanvasPan(viewport, movement) { ++ if (movement.deltaX === 0 && movement.deltaY === 0) return viewport; ++ return { ++ scale: viewport.scale, ++ x: viewport.x + movement.deltaX, ++ y: viewport.y + movement.deltaY ++ }; ++ } ++ /** Route a wheel gesture to canvas pan, reserving Command-wheel for pointer-anchored zoom. */ ++ function nextResearchCanvasWheel(viewport, gesture) { ++ if (gesture.metaKey) return nextResearchCanvasViewport(viewport, gesture); ++ return nextResearchCanvasPan(viewport, { ++ deltaX: -gesture.deltaX, ++ deltaY: -gesture.deltaY ++ }); ++ } ++ const cssResearchCanvas = ".rScV5Q_root{--sherlock-research-dot:rgba(82,88,98,.22);background-color:rgb(247,248,250);background-image:radial-gradient(circle,var(--sherlock-research-dot) 1px,transparent 1.2px);background-repeat:repeat;overscroll-behavior:none;touch-action:none;user-select:none;cursor:default;flex:1;min-width:0;min-height:0;height:100%;position:relative;overflow:clip;contain:paint;isolation:isolate}.rScV5Q_root:focus{outline:none}.rScV5Q_root[data-space-pressed=true]{cursor:grab}.rScV5Q_root[data-space-pressed=true]:after{content:\"\";box-sizing:border-box;z-index:100;pointer-events:none;border:2px solid var(--dsw-alias-state-business-primary);position:absolute;inset:0}.rScV5Q_root[data-dragging=true]{cursor:grabbing}body[data-ds-dark-theme] .rScV5Q_root{--sherlock-research-dot:rgba(151,157,168,.18);background-color:rgb(23,25,29)}.rScV5Q_contentLayer{z-index:0;pointer-events:none;transform-origin:0 0;position:absolute;inset:0}.rScV5Q_fileCard,.rScV5Q_artifactCard{box-sizing:border-box;pointer-events:auto;width:220px;min-height:64px;color:var(--dsw-alias-label-primary);background:var(--dsw-alias-bg-layer-1);border:1px solid var(--dsw-alias-border-l2);border-radius:10px;position:absolute;box-shadow:var(--dsw-shadow-lv1)}.rScV5Q_fileCard{align-items:center;gap:10px;padding:11px 12px;display:flex}.rScV5Q_fileCard[data-selected=true],.rScV5Q_artifactCard[data-selected=true]{border-color:var(--dsw-alias-state-business-primary);box-shadow:0 0 0 2px color-mix(in srgb,var(--dsw-alias-state-business-primary) 20%,transparent),var(--dsw-shadow-lv1)}.rScV5Q_fileCard[data-path-unavailable=true]{border-style:dashed;opacity:.72}.rScV5Q_fileCard[data-node-dragging=true],.rScV5Q_artifactCard[data-node-dragging=true]{cursor:grabbing;opacity:.88}.rScV5Q_fileCard:focus-visible,.rScV5Q_artifactCard:focus-visible{outline:2px solid var(--dsw-alias-state-business-primary);outline-offset:2px}.rScV5Q_fileIcon{color:var(--dsw-alias-state-business-primary);flex:none;width:20px;height:20px}.rScV5Q_fileText{min-width:0;display:flex;flex-direction:column;gap:2px}.rScV5Q_fileName{text-overflow:ellipsis;white-space:nowrap;overflow:hidden;font:var(--dsw-font-xs-strong-13)}.rScV5Q_fileCaption{color:var(--dsw-alias-label-tertiary);font:var(--dsw-font-xxs-12)}.rScV5Q_artifactCard{display:flex;flex-direction:column;justify-content:center;gap:3px;padding:10px 12px}.rScV5Q_artifactTitle{text-overflow:ellipsis;white-space:nowrap;overflow:hidden;font:var(--dsw-font-xs-strong-13)}.rScV5Q_artifactExcerpt{color:var(--dsw-alias-label-tertiary);text-overflow:ellipsis;white-space:nowrap;overflow:hidden;font:var(--dsw-font-xxs-12)}.rScV5Q_artifactMeta{color:var(--dsw-alias-label-caption);font:var(--dsw-font-xxs-12)}.rScV5Q_marquee{pointer-events:none;box-sizing:border-box;border:1.5px dashed var(--dsw-alias-state-business-primary);background:color-mix(in srgb,var(--dsw-alias-state-business-primary) 12%,transparent);position:absolute}body[data-ds-dark-theme] .rScV5Q_fileCard,body[data-ds-dark-theme] .rScV5Q_artifactCard{background:var(--dsw-alias-bg-layer-2)}body[data-ds-dark-theme] .rScV5Q_marquee{background:color-mix(in srgb,var(--dsw-alias-state-business-primary) 18%,transparent)}.wSkVaW_root[data-phase=active] .wSkVaW_scrollBody:has(.rScV5Q_root)>.wSkVaW_composerSeat{background:none}.wSkVaW_root:has(.rScV5Q_root) .wSkVaW_header:after{bottom:0}.wSkVaW_root:has(.rScV5Q_root) .wSkVaW_tab:after{bottom:0}"; ++ const tagIdResearchCanvas = "@deepseek-ai/dsh-client-ui-conversation/ResearchCanvas.module.css"; ++ if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagIdResearchCanvas) + "]") === null) { ++ const tag = document.createElement("style"); ++ tag.dataset.plugin = "@deepseek-ai/dsh-client-ui-conversation"; ++ tag.dataset.pluginCss = tagIdResearchCanvas; ++ tag.textContent = cssResearchCanvas + ".rScV5Q_contextMenu{z-index:30;min-width:136px;padding:4px;background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l2);border-radius:9px;box-shadow:var(--dsw-shadow-lv2);position:absolute}.rScV5Q_contextMenu button{box-sizing:border-box;width:100%;height:30px;padding:0 9px;border:0;border-radius:6px;background:transparent;color:var(--dsw-alias-label-primary);text-align:left;font:inherit;font-size:12px;cursor:pointer;display:flex;align-items:center;gap:20px}.rScV5Q_contextMenu button:hover{background:var(--dsw-alias-interactive-bg-hover)}.rScV5Q_contextMenu button:disabled{opacity:.45;cursor:default}.rScV5Q_contextMenuShortcut{margin-left:auto;color:var(--dsw-alias-label-tertiary)}.rScV5Q_richNode{box-sizing:border-box;pointer-events:auto;color:var(--dsw-alias-label-primary);background:var(--dsw-alias-bg-layer-1);border:1px solid var(--dsw-alias-border-l2);border-radius:10px;position:absolute;display:flex;flex-direction:column;overflow:visible;box-shadow:var(--dsw-shadow-lv1)}.rScV5Q_richNode[data-selected=true]{border-color:var(--dsw-alias-state-business-primary);box-shadow:0 0 0 2px color-mix(in srgb,var(--dsw-alias-state-business-primary) 20%,transparent),var(--dsw-shadow-lv1)}.rScV5Q_richNode[data-node-dragging=true],.rScV5Q_richNode[data-node-resizing=true]{opacity:.88}.rScV5Q_richNode:focus-visible{outline:2px solid var(--dsw-alias-state-business-primary);outline-offset:2px}.rScV5Q_nodeTitle{box-sizing:border-box;height:32px;min-height:32px;padding:0 12px;border-bottom:1px solid var(--dsw-alias-border-l2);display:flex;align-items:center;text-overflow:ellipsis;white-space:nowrap;overflow:hidden;font:var(--dsw-font-xs-strong-13);cursor:grab}.rScV5Q_titleName{min-width:0;text-overflow:ellipsis;white-space:nowrap;overflow:hidden}.rScV5Q_pageIndicator{flex:none;margin-left:auto;padding-left:10px;color:var(--dsw-alias-label-tertiary);font-variant-numeric:tabular-nums}.rScV5Q_previewBody{min-width:0;min-height:0;position:relative;flex:1;overflow:auto;overscroll-behavior:contain;user-select:text}.rScV5Q_previewPlaceholder{box-sizing:border-box;width:100%;height:100%;padding:16px;color:var(--dsw-alias-label-tertiary);display:flex;flex-direction:column;align-items:center;justify-content:center;gap:4px;font:var(--dsw-font-xxs-12)}.rScV5Q_artifactCard{padding:0;gap:0;justify-content:stretch}.rScV5Q_artifactBody{box-sizing:border-box;min-height:100%;padding:12px;display:flex;flex-direction:column;gap:6px}.rScV5Q_artifactExcerpt{white-space:pre-wrap;overflow-wrap:anywhere}.rScV5Q_previewBody img[data-research-image-preview]{display:block;width:100%;height:100%;object-fit:contain}.rScV5Q_pdfScroll{width:100%;height:100%;overflow:auto;overscroll-behavior:contain}.rScV5Q_pdfScroll canvas{display:block;max-width:none;background:#fff}.rScV5Q_htmlPreview{box-sizing:border-box;display:block;width:100%;height:100%;border:0;background:#fff}.rScV5Q_markdownScroll,.rScV5Q_textScroll{box-sizing:border-box;width:100%;height:100%;margin:0;padding:14px;overflow:auto;overflow-y:auto;overscroll-behavior:contain}.rScV5Q_markdownScroll{color:var(--dsw-alias-label-primary)}.rScV5Q_textScroll{white-space:pre;tab-size:2;color:var(--dsw-alias-label-primary);background:var(--dsw-alias-markdown-code-block);font:400 12px/1.6 var(--ds-font-family-code)}.rScV5Q_previewShield{z-index:4;pointer-events:none;position:absolute;inset:0}.rScV5Q_root[data-dragging=true] .rScV5Q_previewShield,.rScV5Q_root[data-space-pressed=true] .rScV5Q_previewShield{pointer-events:auto}.rScV5Q_resizeHandle{box-sizing:border-box;z-index:6;pointer-events:auto;width:14px;height:14px;padding:0;border:2px solid var(--dsw-alias-bg-layer-1);border-radius:50%;background:var(--dsw-alias-state-business-primary);position:absolute}.rScV5Q_resizeHandle[data-research-resize-handle=nw]{left:-7px;top:-7px;cursor:nwse-resize}.rScV5Q_resizeHandle[data-research-resize-handle=ne]{right:-7px;top:-7px;cursor:nesw-resize}.rScV5Q_resizeHandle[data-research-resize-handle=sw]{left:-7px;bottom:-7px;cursor:nesw-resize}.rScV5Q_resizeHandle[data-research-resize-handle=se]{right:-7px;bottom:-7px;cursor:nwse-resize}.rScV5Q_fileRichNode[data-path-unavailable=true]{border-style:dashed;opacity:.72}body[data-ds-dark-theme] .rScV5Q_richNode{background:var(--dsw-alias-bg-layer-2)}"; ++ tag.textContent += ".rScV5Q_fileText{flex:1}.rScV5Q_titleEditor{box-sizing:border-box;min-width:0;width:100%;height:24px;padding:0 6px;border:1px solid var(--dsw-alias-state-business-primary);border-radius:5px;outline:0;color:inherit;background:var(--dsw-alias-bg-layer-1);font:inherit;user-select:text}.rScV5Q_fileTitleEditor{height:22px;font:var(--dsw-font-xs-strong-13)}.rScV5Q_contentEditor{box-sizing:border-box;width:100%;min-height:120px;flex:1;resize:none;padding:8px 10px;border:1px solid var(--dsw-alias-state-business-primary);border-radius:7px;outline:0;color:var(--dsw-alias-label-primary);background:var(--dsw-alias-bg-layer-1);font:400 12px/1.55 var(--ds-font-family-code);white-space:pre-wrap;overflow:auto;user-select:text}body[data-ds-dark-theme] .rScV5Q_titleEditor,body[data-ds-dark-theme] .rScV5Q_contentEditor{background:var(--dsw-alias-bg-layer-2)}"; ++ tag.textContent += ".rScV5Q_officePreview{box-sizing:border-box;width:100%;height:100%;min-width:0;min-height:0;display:flex;overflow:hidden}.rScV5Q_officePreview>*{flex:1;min-width:0;min-height:0}"; ++ tag.textContent += ".rScV5Q_emptyViewport{box-sizing:border-box;z-index:20;pointer-events:auto;position:absolute;left:50%;bottom:90px;transform:translateX(-50%);min-height:44px;padding:6px 7px 6px 14px;display:flex;align-items:center;gap:12px;white-space:nowrap;color:var(--dsw-alias-label-primary);background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l2);border-radius:12px;box-shadow:var(--dsw-shadow-lv2);font:var(--dsw-font-xs-13)}.rScV5Q_emptyViewport button{height:32px;padding:0 12px;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;color:var(--dsw-alias-label-primary);background:var(--dsw-alias-bg-layer-1);font:inherit;cursor:pointer}.rScV5Q_emptyViewport button:hover{background:var(--dsw-alias-interactive-bg-hover)}.rScV5Q_emptyViewport button:focus-visible{outline:2px solid var(--dsw-alias-state-business-primary);outline-offset:2px}.rScV5Q_root[data-dragging=true] .rScV5Q_emptyViewport{display:none}"; ++ tag.textContent += ".rScV5Q_selectionActions{box-sizing:border-box;z-index:24;pointer-events:auto;position:absolute;transform:translate(-50%,-100%);height:42px;padding:5px;display:flex;align-items:center;gap:2px;overflow:visible;white-space:nowrap;color:var(--dsw-alias-label-primary);background:color-mix(in srgb,var(--dsw-alias-bg-layer-1) 96%,transparent);border:1px solid var(--dsw-alias-border-l2);border-radius:13px;box-shadow:var(--dsw-shadow-lv2);backdrop-filter:blur(14px)}.rScV5Q_selectionActions button{height:30px;padding:0 10px;border:0;border-radius:8px;color:inherit;background:transparent;font:var(--dsw-font-xs-strong-13);cursor:pointer;display:inline-flex;align-items:center;gap:6px}.rScV5Q_selectionActions button:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover)}.rScV5Q_selectionActions button:focus-visible{outline:2px solid var(--dsw-alias-state-business-primary);outline-offset:1px}.rScV5Q_selectionActions button:disabled{opacity:.45;cursor:default}.rScV5Q_mindMapControl{position:relative}.rScV5Q_mindMapMenu{z-index:32;box-sizing:border-box;width:258px;padding:5px;position:absolute;left:0;top:35px;background:var(--dsw-alias-bg-layer-1);border:1px solid var(--dsw-alias-border-l2);border-radius:10px;box-shadow:var(--dsw-shadow-lv2)}.rScV5Q_mindMapMenu button{box-sizing:border-box;width:100%;height:auto;min-height:46px;padding:7px 9px;display:flex;align-items:flex-start;flex-direction:column;gap:2px;text-align:left}.rScV5Q_mindMapMenu strong{font:var(--dsw-font-xs-strong-13)}.rScV5Q_mindMapMenu span{color:var(--dsw-alias-label-tertiary);font:var(--dsw-font-xxs-12)}body[data-ds-dark-theme] .rScV5Q_selectionActions,body[data-ds-dark-theme] .rScV5Q_mindMapMenu{background:color-mix(in srgb,var(--dsw-alias-bg-layer-2) 96%,transparent)}"; ++ tag.textContent += "[data-research-generated-mind-map][data-selected=true]{border-color:rgb(0,80,150);outline:2px solid rgba(0,80,150,.24);outline-offset:1px}[data-research-generated-mind-map]>.rScV5Q_previewBody{background:#fff}[data-research-generated-mind-map] .rScV5Q_artifactBody{height:100%;min-height:100%;padding:0;background:#fff}[data-research-generated-mind-map] .rScV5Q_artifactMeta{display:none}.rScV5Q_mindMap{box-sizing:border-box;width:100%;height:100%;min-width:0;min-height:0;padding:32px 40px;display:flex;align-items:safe center;justify-content:safe center;gap:40px;overflow:auto;background:#fff;font-family:STHeiti_YFD,\"STHeiti SC\",\"PingFang SC\",sans-serif}.rScV5Q_mindMapNode{box-sizing:border-box;flex:none;display:flex;align-items:center;justify-content:center;width:200px;min-height:54px;max-width:200px;padding:9px 14px;border:0;border-radius:0;box-shadow:none;background:rgb(30,185,225);color:#fff;text-align:center;font-family:STHeiti_YFD,\"STHeiti SC\",\"PingFang SC\",sans-serif;font-size:14px;font-weight:700;line-height:1.35;white-space:normal;word-break:normal;overflow-wrap:break-word}.rScV5Q_mindMapNode[data-research-mind-map-copy=\"phrase\"]{text-align:center;text-wrap:balance}.rScV5Q_mindMapNode[data-research-mind-map-copy=\"sentence\"]{justify-content:flex-start;text-align:left;text-wrap:pretty}.rScV5Q_mindMapRoot{width:224px;min-height:60px;max-width:224px}.rScV5Q_mindMapNode[data-research-mind-map-depth=\"0\"]{background:rgb(0,80,150)}.rScV5Q_mindMapNode[data-research-mind-map-depth=\"1\"]{background:rgb(0,120,180)}.rScV5Q_mindMapNode[data-research-mind-map-depth=\"2\"]{background:rgb(30,185,225)}.rScV5Q_mindMapNode[data-research-mind-map-depth=\"3\"]{background:rgb(179,235,255);color:rgb(60,60,60)}.rScV5Q_mindMapNode[data-research-mind-map-depth=\"4\"]{background:rgb(60,60,60)}.rScV5Q_mindMapNode[data-research-mind-map-depth=\"5\"]{background:rgb(150,150,150)}.rScV5Q_mindMapNode[data-research-mind-map-depth=\"6\"]{background:rgb(193,198,200);color:rgb(60,60,60)}.rScV5Q_mindMapNode[data-research-mind-map-depth=\"7\"]{background:rgb(204,204,204);color:rgb(60,60,60)}.rScV5Q_mindMapNode[data-research-mind-map-depth=\"8\"]{background:rgb(255,200,25);color:rgb(60,60,60)}.rScV5Q_mindMapNode[data-research-mind-map-depth=\"9\"]{background:rgb(255,215,30);color:rgb(60,60,60)}.rScV5Q_mindMapNode[data-research-mind-map-depth=\"10\"],.rScV5Q_mindMapNode[data-research-mind-map-depth=\"11\"],.rScV5Q_mindMapNode[data-research-mind-map-depth=\"12\"]{background:rgb(255,230,30);color:rgb(60,60,60)}.rScV5Q_mindMapChildren{flex:none;position:relative;display:flex;flex-direction:column;justify-content:center;gap:16px}.rScV5Q_mindMapChildren:after{content:\"\";position:absolute;left:-40px;top:50%;width:20px;height:1px;background:rgb(150,150,150)}.rScV5Q_mindMapBranch{flex:none;position:relative;display:flex;align-items:center;gap:40px}.rScV5Q_mindMapBranch:before{content:\"\";position:absolute;left:-20px;top:50%;width:20px;height:1px;background:rgb(150,150,150)}.rScV5Q_mindMapBranch:after{content:\"\";position:absolute;left:-20px;top:-8px;bottom:-8px;width:1px;background:rgb(150,150,150)}.rScV5Q_mindMapBranch:first-child:after{top:50%}.rScV5Q_mindMapBranch:last-child:after{bottom:50%}.rScV5Q_mindMapBranch:only-child:after{display:none}"; ++ tag.textContent += ".rScV5Q_mindMapNodeEditor{margin:0;resize:none;overflow:hidden;outline:2px solid rgba(255,255,255,.9);outline-offset:-3px;white-space:pre-wrap;user-select:text;cursor:text;caret-color:currentColor}.rScV5Q_mindMapNodeEditor[data-research-mind-map-depth=\"3\"],.rScV5Q_mindMapNodeEditor[data-research-mind-map-depth=\"6\"],.rScV5Q_mindMapNodeEditor[data-research-mind-map-depth=\"7\"],.rScV5Q_mindMapNodeEditor[data-research-mind-map-depth=\"8\"],.rScV5Q_mindMapNodeEditor[data-research-mind-map-depth=\"9\"],.rScV5Q_mindMapNodeEditor[data-research-mind-map-depth=\"10\"],.rScV5Q_mindMapNodeEditor[data-research-mind-map-depth=\"11\"],.rScV5Q_mindMapNodeEditor[data-research-mind-map-depth=\"12\"]{outline-color:rgba(0,80,150,.72)}"; ++ tag.textContent += ".rScV5Q_generationProcess{box-sizing:border-box;min-height:100%;padding:18px 20px;display:flex;flex-direction:column;gap:12px;color:var(--dsw-alias-label-primary);background:var(--dsw-alias-bg-layer-1)}body[data-ds-dark-theme] .rScV5Q_generationProcess{background:var(--dsw-alias-bg-layer-2)}.rScV5Q_generationPhase{font:var(--dsw-font-sm-strong-14)}.rScV5Q_generationTools{display:flex;flex-direction:column;gap:5px;color:var(--dsw-alias-label-secondary);font:var(--dsw-font-xxs-12)}.rScV5Q_generationTools span:before{content:\"✓\";margin-right:6px;color:var(--dsw-alias-state-business-primary)}.rScV5Q_generationDraft{max-height:300px;padding:10px 12px;overflow:auto;border-radius:8px;background:var(--dsw-alias-bg-base);color:var(--dsw-alias-label-secondary);white-space:pre-wrap;overflow-wrap:anywhere;font:var(--dsw-font-xs-13);line-height:1.55}.rScV5Q_generationProcess>button{align-self:flex-start;height:28px;padding:0 11px;border:1px solid var(--dsw-alias-border-l2);border-radius:7px;background:transparent;color:var(--dsw-alias-label-secondary);font:var(--dsw-font-xxs-12);cursor:pointer}.rScV5Q_generationFailure{box-sizing:border-box;min-height:100%;padding:24px;display:flex;flex:1;flex-direction:column;align-items:center;justify-content:center;gap:14px;text-align:center;color:var(--dsw-alias-label-secondary);font:var(--dsw-font-xs-13)}.rScV5Q_generationFailure button{height:30px;padding:0 13px;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;background:var(--dsw-alias-bg-layer-1);color:var(--dsw-alias-label-primary);font:var(--dsw-font-xs-strong-13);cursor:pointer;display:inline-flex;align-items:center;gap:6px}.rScV5Q_generationFailure button:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover)}.rScV5Q_generationFailure button:disabled{opacity:.45;cursor:default}"; ++ tag.textContent += ".rScV5Q_globalToolbar{z-index:40;pointer-events:auto;position:absolute;left:50%;bottom:20px;transform:translateX(-50%);height:38px;padding:3px;display:flex;align-items:center;gap:2px;background:color-mix(in srgb,var(--dsw-alias-bg-layer-2) 94%,transparent);border:1px solid var(--dsw-alias-border-l2);border-radius:11px;box-shadow:var(--dsw-shadow-lv2);backdrop-filter:blur(14px)}.rScV5Q_globalToolbar>button,.rScV5Q_globalToolSlot>button{height:32px;padding:0 11px;border:0;border-radius:7px;background:transparent;color:var(--dsw-alias-label-primary);font:var(--dsw-font-xs-strong-13);cursor:pointer;display:inline-flex;align-items:center;gap:6px}.rScV5Q_globalToolbar button:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover)}.rScV5Q_globalToolbar button:disabled{opacity:.45;cursor:default}.rScV5Q_globalToolbar svg{width:16px;height:16px;flex:none}.rScV5Q_globalToolSlot{position:relative}.rScV5Q_linkPopover{box-sizing:border-box;position:absolute;left:0;bottom:calc(100% + 10px);width:360px;padding:12px;display:flex;flex-direction:column;gap:8px;background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l2);border-radius:11px;box-shadow:var(--dsw-shadow-lv2)}.rScV5Q_linkPopover>label{color:var(--dsw-alias-label-secondary);font:var(--dsw-font-xxs-strong-12)}.rScV5Q_linkPopover>div{display:flex;gap:8px}.rScV5Q_linkPopover input{box-sizing:border-box;min-width:0;flex:1;height:34px;padding:0 10px;border:1px solid var(--dsw-alias-border-l2);border-radius:7px;outline:0;color:var(--dsw-alias-label-primary);background:var(--dsw-alias-bg-layer-1);font:var(--dsw-font-xs-13)}.rScV5Q_linkPopover input:focus{border-color:var(--dsw-alias-state-business-primary);box-shadow:0 0 0 2px color-mix(in srgb,var(--dsw-alias-state-business-primary) 18%,transparent)}.rScV5Q_linkPopover button{height:34px;padding:0 12px;border:0;border-radius:7px;color:var(--dsw-alias-button-label-primary);background:var(--dsw-alias-state-business-primary);font:var(--dsw-font-xs-strong-13);cursor:pointer}.rScV5Q_linkError{color:var(--dsw-alias-state-danger-primary);font:var(--dsw-font-xxs-12)}.rScV5Q_root[data-dragging=true] .rScV5Q_globalToolbar{display:none}"; ++ tag.textContent += "[data-research-web-link] .rScV5Q_artifactBody,[data-research-generated-container] .rScV5Q_artifactBody{padding:0;gap:0;height:100%}[data-research-web-link] .rScV5Q_artifactMeta,[data-research-generated-container] .rScV5Q_artifactMeta{box-sizing:border-box;flex:none;min-height:24px;padding:5px 10px;color:var(--dsw-alias-label-caption);border-top:1px solid var(--dsw-alias-border-l2)}.rScV5Q_webFrameShell{min-width:0;min-height:0;flex:1;display:flex;flex-direction:column}.rScV5Q_webFrameControls{box-sizing:border-box;flex:none;height:32px;padding:0 9px;display:flex;align-items:center;gap:8px;color:var(--dsw-alias-label-tertiary);border-bottom:1px solid var(--dsw-alias-border-l2);font:var(--dsw-font-xxs-12)}.rScV5Q_webFrameControls>span{min-width:0;margin-right:auto;text-overflow:ellipsis;white-space:nowrap;overflow:hidden}.rScV5Q_webFrameControls button,.rScV5Q_webFrameControls a{padding:3px 6px;border:0;border-radius:5px;background:transparent;color:var(--dsw-alias-label-secondary);font:inherit;text-decoration:none;cursor:pointer}.rScV5Q_webFrameControls button:hover,.rScV5Q_webFrameControls a:hover{background:var(--dsw-alias-interactive-bg-hover)}.rScV5Q_webFrameViewport{box-sizing:border-box;min-width:0;min-height:0;flex:1;overflow:hidden;background:#fff}.rScV5Q_webFrame{box-sizing:border-box;display:block;width:100%;height:100%;min-height:0;border:0;background:#fff}.rScV5Q_previewPlaceholder button,.rScV5Q_previewPlaceholder a{height:30px;padding:0 11px;display:inline-flex;align-items:center;border:1px solid var(--dsw-alias-border-l2);border-radius:7px;color:var(--dsw-alias-label-primary);background:var(--dsw-alias-bg-layer-1);font:inherit;text-decoration:none;cursor:pointer}.rScV5Q_containerDraft{box-sizing:border-box;min-height:0;flex:1;padding:18px 20px;display:flex;flex-direction:column;gap:12px;background:var(--dsw-alias-bg-layer-1)}body[data-ds-dark-theme] .rScV5Q_containerDraft{background:var(--dsw-alias-bg-layer-2)}.rScV5Q_containerDraft textarea{box-sizing:border-box;min-height:120px;flex:1;resize:none;padding:12px 13px;border:1px solid var(--dsw-alias-border-l2);border-radius:9px;outline:0;color:var(--dsw-alias-label-primary);background:var(--dsw-alias-bg-base);font:var(--dsw-font-xs-13);line-height:1.55}.rScV5Q_containerDraft textarea:focus{border-color:var(--dsw-alias-state-business-primary);box-shadow:0 0 0 2px color-mix(in srgb,var(--dsw-alias-state-business-primary) 16%,transparent)}.rScV5Q_containerDraftFooter{display:flex;align-items:center;gap:12px;color:var(--dsw-alias-label-tertiary);font:var(--dsw-font-xxs-12)}.rScV5Q_containerDraftFooter span{min-width:0;margin-right:auto}.rScV5Q_containerDraftFooter button{height:30px;padding:0 13px;border:0;border-radius:7px;color:var(--dsw-alias-button-label-primary);background:var(--dsw-alias-state-business-primary);font:var(--dsw-font-xs-strong-13);cursor:pointer}.rScV5Q_containerDraftFooter button:disabled{opacity:.45;cursor:default}"; ++ tag.textContent += ".rScV5Q_generatedContainer{box-sizing:border-box;min-width:0;min-height:0;flex:1;display:flex;flex-direction:column;background:var(--dsw-alias-bg-layer-1)}body[data-ds-dark-theme] .rScV5Q_generatedContainer{background:var(--dsw-alias-bg-layer-2)}.rScV5Q_containerControls{box-sizing:border-box;flex:none;min-height:36px;padding:4px 8px;display:flex;align-items:center;gap:4px;border-bottom:1px solid var(--dsw-alias-border-l2);font:var(--dsw-font-xxs-12)}.rScV5Q_containerControls>span{margin-right:auto;padding-left:3px;color:var(--dsw-alias-label-tertiary)}.rScV5Q_containerControls button,.rScV5Q_containerControls select{height:26px;padding:0 7px;border:1px solid transparent;border-radius:6px;color:var(--dsw-alias-label-secondary);background:transparent;font:inherit;cursor:pointer}.rScV5Q_containerControls button:hover:not(:disabled),.rScV5Q_containerControls select:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover)}.rScV5Q_containerControls button:disabled,.rScV5Q_containerControls select:disabled{opacity:.45;cursor:default}.rScV5Q_containerControls select{border-color:var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-1)}body[data-ds-dark-theme] .rScV5Q_containerControls select{background:var(--dsw-alias-bg-layer-2)}.rScV5Q_containerNotice{box-sizing:border-box;flex:none;min-height:28px;padding:6px 11px;color:var(--dsw-alias-state-business-primary);background:color-mix(in srgb,var(--dsw-alias-state-business-primary) 8%,transparent);border-bottom:1px solid color-mix(in srgb,var(--dsw-alias-state-business-primary) 18%,transparent);font:var(--dsw-font-xxs-12)}.rScV5Q_containerNotice[data-state=error]{color:var(--dsw-alias-state-error-primary);background:color-mix(in srgb,var(--dsw-alias-state-error-primary) 8%,transparent);border-bottom-color:color-mix(in srgb,var(--dsw-alias-state-error-primary) 18%,transparent)}.rScV5Q_containerContent{min-width:0;min-height:0;flex:1;display:flex;overflow:auto}.rScV5Q_containerContent>.rScV5Q_webFrameShell{flex:1}.rScV5Q_containerChart{box-sizing:border-box;min-width:0;min-height:0;width:100%;padding:14px 16px 10px;display:flex;flex-direction:column;justify-content:center}.rScV5Q_containerChart svg{display:block;width:100%;min-height:0;max-height:320px;overflow:visible}.rScV5Q_chartGrid{stroke:var(--dsw-alias-border-l2);stroke-width:1}.rScV5Q_chartAxis{stroke:var(--dsw-alias-label-tertiary);stroke-width:1.2}.rScV5Q_chartLabel{fill:var(--dsw-alias-label-secondary);font:12px STHeiti_YFD,\"STHeiti SC\",\"PingFang SC\",sans-serif}.rScV5Q_chartLegend{display:flex;flex-wrap:wrap;justify-content:center;gap:8px 16px;color:var(--dsw-alias-label-secondary);font:var(--dsw-font-xxs-12)}.rScV5Q_chartLegend span{display:inline-flex;align-items:center;gap:5px}.rScV5Q_chartLegend i{width:9px;height:9px}.rScV5Q_containerTableScroll{box-sizing:border-box;width:100%;padding:14px;overflow:auto}.rScV5Q_containerTableScroll table{width:100%;border-collapse:collapse;color:var(--dsw-alias-label-primary);font:var(--dsw-font-xs-13)}.rScV5Q_containerTableScroll th,.rScV5Q_containerTableScroll td{padding:9px 10px;border:1px solid var(--dsw-alias-border-l2);text-align:left;vertical-align:top}.rScV5Q_containerTableScroll th{white-space:nowrap;background:var(--dsw-alias-bg-base);font:var(--dsw-font-xs-strong-13)}.rScV5Q_containerTableScroll tr:nth-child(even) td{background:color-mix(in srgb,var(--dsw-alias-bg-base) 65%,transparent)}.rScV5Q_containerKpis{box-sizing:border-box;width:100%;padding:18px;display:grid;grid-template-columns:repeat(auto-fit,minmax(150px,1fr));gap:12px;align-content:center}.rScV5Q_containerKpis>div{box-sizing:border-box;min-height:96px;padding:14px;display:flex;flex-direction:column;justify-content:center;gap:5px;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-base)}.rScV5Q_containerKpis span{color:var(--dsw-alias-label-secondary);font:var(--dsw-font-xxs-12)}.rScV5Q_containerKpis strong{color:var(--dsw-alias-label-primary);font:var(--dsw-font-xl-strong-24);font-variant-numeric:tabular-nums}.rScV5Q_containerKpis em{color:var(--dsw-alias-state-business-primary);font:var(--dsw-font-xs-strong-13);font-style:normal}.rScV5Q_containerMarkdown{box-sizing:border-box;width:100%;padding:18px 20px;overflow:auto;color:var(--dsw-alias-label-primary);user-select:text}"; ++ tag.textContent += ".rScV5Q_mindMapRoot{position:relative}.rScV5Q_mindMapRoot:after{content:\"\";position:absolute;left:100%;top:50%;width:20px;height:1px;background:rgb(150,150,150)}.rScV5Q_mindMapRoot+.rScV5Q_mindMapChildren:after{display:none}"; ++ tag.textContent += ".rScV5Q_contextDownloadGroup{position:relative}.rScV5Q_contextDownloadFormats{box-sizing:border-box;z-index:32;min-width:92px;padding:4px;position:absolute;left:calc(100% + 6px);top:-4px;background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l2);border-radius:9px;box-shadow:var(--dsw-shadow-lv2)}.rScV5Q_contextDownloadFormats button{justify-content:flex-start;gap:6px}.rScV5Q_downloadFeedback{box-sizing:border-box;z-index:28;pointer-events:auto;min-height:32px;max-width:240px;padding:7px 9px;display:flex;align-items:center;gap:8px;position:absolute;transform:translate(-50%,0);color:var(--dsw-alias-label-primary);background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l2);border-radius:8px;box-shadow:var(--dsw-shadow-lv2);font:var(--dsw-font-xxs-12)}.rScV5Q_downloadFeedback[data-state=error]{color:var(--dsw-alias-state-error-primary);border-color:color-mix(in srgb,var(--dsw-alias-state-error-primary) 45%,var(--dsw-alias-border-l2))}.rScV5Q_downloadFeedback span{min-width:0;overflow-wrap:anywhere}.rScV5Q_downloadFeedback button{flex:none;height:24px;padding:0 8px;border:1px solid var(--dsw-alias-border-l2);border-radius:6px;color:var(--dsw-alias-label-primary);background:var(--dsw-alias-bg-layer-1);font:inherit;cursor:pointer}.rScV5Q_downloadFeedback button:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover)}.rScV5Q_downloadFeedback button:disabled{opacity:.45;cursor:default}"; ++ document.head.appendChild(tag); ++ } ++ const ResearchCanvas_module_css_default = { root: "rScV5Q_root" }; ++ const defaultResearchWorkspaces = new ResearchWorkspaceRegistry(); ++ /** Theme-aware infinite dotted canvas. The resident conversation shell continues to own the composer. */ ++ function ResearchCanvas({ sessionId, t, researchWorkspaces = defaultResearchWorkspaces, researchOfficePreview = defaultResearchOfficePreview, actions, selectionGeneration }) { ++ const rootRef = (0, react.useRef)(null); ++ const nativeWheelOwnerRef = (0, react.useRef)(null); ++ if (nativeWheelOwnerRef.current === null) nativeWheelOwnerRef.current = nextResearchCanvasWheelOwnerId(); ++ const nativeWheelGenerationRef = (0, react.useRef)(0); ++ const spacePressedRef = (0, react.useRef)(false); ++ const operationRef = (0, react.useRef)(null); ++ const dropQueueRef = (0, react.useRef)(Promise.resolve()); ++ const orphanRevocationsInFlightRef = (0, react.useRef)(/* @__PURE__ */ new Set()); ++ const workspace = (0, react.useMemo)(() => researchWorkspaces.for(sessionId), [researchWorkspaces, sessionId]); ++ const dropLifecycle = (0, react.useMemo)(() => ({ active: true }), [workspace]); ++ const snapshot = (0, react.useSyncExternalStore)(workspace.subscribe, workspace.getSnapshot, workspace.getSnapshot); ++ const officePreview = (0, react.useSyncExternalStore)(researchOfficePreview.subscribe, researchOfficePreview.getSnapshot, researchOfficePreview.getSnapshot); ++ const [marquee, setMarquee] = (0, react.useState)(null); ++ const [draggingNodeIds, setDraggingNodeIds] = (0, react.useState)([]); ++ const [resizingNodeId, setResizingNodeId] = (0, react.useState)(null); ++ const [contextMenu, setContextMenu] = (0, react.useState)(null); ++ const [mindMapMenuOpen, setMindMapMenuOpen] = (0, react.useState)(false); ++ const [editingNodeId, setEditingNodeId] = (0, react.useState)(null); ++ const [editingContentNodeId, setEditingContentNodeId] = (0, react.useState)(null); ++ const [downloadMenuNodeId, setDownloadMenuNodeId] = (0, react.useState)(null); ++ const [downloadBusyNodeId, setDownloadBusyNodeId] = (0, react.useState)(null); ++ const [downloadFeedback, setDownloadFeedback] = (0, react.useState)(null); ++ const [linkPopoverOpen, setLinkPopoverOpen] = (0, react.useState)(false); ++ const [linkDraft, setLinkDraft] = (0, react.useState)(""); ++ const [linkError, setLinkError] = (0, react.useState)(null); ++ const linkInputRef = (0, react.useRef)(null); ++ (0, react.useLayoutEffect)(() => { ++ if (linkPopoverOpen) linkInputRef.current?.focus({ preventScroll: true }); ++ }, [linkPopoverOpen]); ++ (0, react.useEffect)(() => { ++ if (downloadFeedback?.type !== "success") return; ++ const timer = setTimeout(() => setDownloadFeedback((current) => current === downloadFeedback ? null : current), 2400); ++ return () => clearTimeout(timer); ++ }, [downloadFeedback]); ++ (0, react.useEffect)(() => { ++ workspace.setGenerationCancelSink(selectionGeneration?.cancel); ++ return () => workspace.setGenerationCancelSink(void 0); ++ }, [workspace, selectionGeneration?.cancel]); ++ (0, react.useEffect)(() => { ++ if (typeof selectionGeneration?.inspect !== 'function') return; ++ let active = true; ++ let timer; ++ let polling = false; ++ const schedule = (delay = 0) => { ++ if (!active || polling || timer !== void 0 || activeResearchGenerationNodes(workspace.getSnapshot()).length === 0) return; ++ timer = setTimeout(() => { ++ timer = void 0; ++ void poll(); ++ }, delay); ++ }; ++ const poll = async () => { ++ if (!active || polling) return; ++ polling = true; ++ const nodes = activeResearchGenerationNodes(workspace.getSnapshot()); ++ try { ++ await Promise.all(nodes.map(async (node) => { ++ try { ++ const inspection = await selectionGeneration.inspect({ ++ parentSessionId: sessionId, ++ taskId: node.generationTaskId, ++ afterSeq: node.generationLastSeq ?? 0 ++ }); ++ if (active) workspace.applyGenerationInspection(node.id, inspection); ++ } catch (error) { ++ if (active && error?.status === 404) workspace.applyGenerationInspection(node.id, { ++ taskId: node.generationTaskId, ++ canvasNodeId: node.id, ++ state: 'interrupted', ++ lastSeq: (node.generationLastSeq ?? 0) + 1, ++ error: '任务已中断，请重试。', ++ events: [] ++ }); ++ } ++ })); ++ } finally { ++ polling = false; ++ } ++ schedule(350); ++ }; ++ const unsubscribe = workspace.subscribe(() => schedule()); ++ if (activeResearchGenerationNodes(workspace.getSnapshot()).length > 0) void poll(); ++ return () => { ++ active = false; ++ unsubscribe(); ++ if (timer !== void 0) clearTimeout(timer); ++ }; ++ }, [sessionId, workspace, selectionGeneration?.inspect]); ++ const revokeOrphanNode = (0, react.useCallback)(async (nodeId) => { ++ workspace.queueOrphanRevocations([nodeId]); ++ if (orphanRevocationsInFlightRef.current.has(nodeId)) return; ++ const revokeNode = window.dshDesktop?.researchPreview?.revokeNode; ++ if (typeof revokeNode !== "function") return; ++ orphanRevocationsInFlightRef.current.add(nodeId); ++ try { ++ const result = await revokeNode({ sessionId, nodeId }); ++ if (result?.ok === true) workspace.completeOrphanRevocation(nodeId); ++ } catch {} finally { ++ orphanRevocationsInFlightRef.current.delete(nodeId); ++ } ++ }, [sessionId, workspace]); ++ (0, react.useEffect)(() => { ++ dropLifecycle.active = true; ++ return () => { ++ dropLifecycle.active = false; ++ }; ++ }, [dropLifecycle]); ++ (0, react.useEffect)(() => { ++ const durableRichIds = new Set(workspace.getSnapshot().files.filter((node) => typeof node.authorizationId === "string").map((node) => node.id)); ++ for (const nodeId of workspace.pendingOrphanRevocations()) { ++ if (durableRichIds.has(nodeId)) workspace.completeOrphanRevocation(nodeId); ++ else revokeOrphanNode(nodeId); ++ } ++ }, [workspace, revokeOrphanNode]); ++ (0, react.useLayoutEffect)(() => { ++ const root = rootRef.current; ++ if (root === null) return; ++ let active = true; ++ let scheduledFrame = null; ++ let lastPublishedRegion = null; ++ const nativeWheel = window.dshDesktop?.researchCanvasWheel; ++ const publishRegion = (bounds, regionActive, force = false) => { ++ if (typeof nativeWheel?.setRegion !== "function") return; ++ const ownerId = nativeWheelOwnerRef.current; ++ const validActive = regionActive && ownerId !== null && [bounds.left, bounds.top, bounds.width, bounds.height].every(Number.isFinite) && bounds.width > 0 && bounds.height > 0 && bounds.width <= RESEARCH_NATIVE_WHEEL_MAX_FRAME_SIZE && bounds.height <= RESEARCH_NATIVE_WHEEL_MAX_FRAME_SIZE; ++ const comparable = validActive ? { active: true, left: bounds.left, top: bounds.top, width: bounds.width, height: bounds.height } : { active: false }; ++ const unchanged = lastPublishedRegion !== null && lastPublishedRegion.active === comparable.active && (!comparable.active || lastPublishedRegion.left === comparable.left && lastPublishedRegion.top === comparable.top && lastPublishedRegion.width === comparable.width && lastPublishedRegion.height === comparable.height); ++ if (!force && unchanged) return; ++ const generation = nextResearchCanvasWheelGeneration(); ++ nativeWheelGenerationRef.current = generation; ++ try { ++ if (!validActive) { ++ if (nativeWheel.setRegion({ active: false, generation, ownerId }) === true) lastPublishedRegion = comparable; ++ return; ++ } ++ if (nativeWheel.setRegion({ ++ active: true, ++ generation, ++ ownerId, ++ left: bounds.left, ++ top: bounds.top, ++ width: bounds.width, ++ height: bounds.height ++ }) === true) lastPublishedRegion = comparable; ++ } catch { ++ lastPublishedRegion = null; ++ } ++ }; ++ const syncSize = () => { ++ if (!active) return; ++ const bounds = root.getBoundingClientRect(); ++ workspace.setCanvasSize({ width: bounds.width, height: bounds.height }); ++ publishRegion(bounds, document.visibilityState !== "hidden"); ++ }; ++ const cancelScheduledSync = () => { ++ if (scheduledFrame === null) return; ++ window.cancelAnimationFrame(scheduledFrame); ++ scheduledFrame = null; ++ }; ++ const scheduleSync = () => { ++ if (!active || scheduledFrame !== null) return; ++ scheduledFrame = window.requestAnimationFrame(() => { ++ scheduledFrame = null; ++ syncSize(); ++ }); ++ }; ++ const onVisibilityChange = () => { ++ if (document.visibilityState === "hidden") { ++ cancelScheduledSync(); ++ publishRegion(root.getBoundingClientRect(), false, true); ++ return; ++ } ++ scheduleSync(); ++ }; ++ syncSize(); ++ const observer = typeof ResizeObserver === "undefined" ? null : new ResizeObserver(scheduleSync); ++ observer?.observe(root); ++ window.addEventListener("resize", scheduleSync); ++ document.addEventListener("visibilitychange", onVisibilityChange); ++ return () => { ++ active = false; ++ cancelScheduledSync(); ++ observer?.disconnect(); ++ window.removeEventListener("resize", scheduleSync); ++ document.removeEventListener("visibilitychange", onVisibilityChange); ++ publishRegion(root.getBoundingClientRect(), false, true); ++ }; ++ }, [workspace]); ++ (0, react.useEffect)(() => { ++ const nativeWheel = window.dshDesktop?.researchCanvasWheel; ++ if (typeof nativeWheel?.subscribe !== "function") return; ++ const onNativeWheel = (value) => { ++ if (typeof value !== "object" || value === null || Array.isArray(value)) return; ++ const expectedKeys = ["clientX", "clientY", "deltaMode", "deltaX", "deltaY", "generation", "ownerId"]; ++ const keys = Object.keys(value).sort(); ++ if (keys.length !== expectedKeys.length || keys.some((key, index) => key !== expectedKeys[index])) return; ++ const { generation, ownerId, clientX, clientY, deltaX, deltaY, deltaMode } = value; ++ if (generation !== nativeWheelGenerationRef.current || ownerId !== nativeWheelOwnerRef.current || deltaMode !== 0 || ![clientX, clientY, deltaX, deltaY].every(Number.isFinite) || Math.abs(deltaX) > RESEARCH_NATIVE_WHEEL_MAX_DELTA || Math.abs(deltaY) > RESEARCH_NATIVE_WHEEL_MAX_DELTA || deltaX === 0 && deltaY === 0) return; ++ const root = rootRef.current; ++ if (root === null || document.visibilityState === "hidden") return; ++ const bounds = root.getBoundingClientRect(); ++ if (![bounds.left, bounds.top, bounds.width, bounds.height].every(Number.isFinite) || bounds.width <= 0 || bounds.height <= 0 || bounds.width > RESEARCH_NATIVE_WHEEL_MAX_FRAME_SIZE || bounds.height > RESEARCH_NATIVE_WHEEL_MAX_FRAME_SIZE || clientX < bounds.left || clientX >= bounds.left + bounds.width || clientY < bounds.top || clientY >= bounds.top + bounds.height) return; ++ workspace.setViewport(nextResearchCanvasWheel(workspace.getSnapshot().viewport, { ++ metaKey: true, ++ deltaX, ++ deltaY, ++ pointerX: clientX - bounds.left, ++ pointerY: clientY - bounds.top ++ })); ++ }; ++ let unsubscribe; ++ try { ++ unsubscribe = nativeWheel.subscribe(onNativeWheel); ++ } catch { ++ return; ++ } ++ return () => { ++ try { ++ if (typeof unsubscribe === "function") unsubscribe(); ++ } catch {} ++ }; ++ }, [workspace]); ++ const activateArtifact = (node) => { ++ actions?.setResearchRightTab?.("conversation"); ++ workspace.setPendingMessageJump(node.messageId); ++ }; ++ (0, react.useEffect)(() => { ++ const root = rootRef.current; ++ if (root === null) return; ++ let fileDragDepth = 0; ++ const resetFileDrag = () => { ++ fileDragDepth = 0; ++ root.removeAttribute("data-file-drop-active"); ++ }; ++ const ownsResearchDrop = (event) => { ++ const transfer = event.dataTransfer; ++ if (transfer === null) return false; ++ const types = Array.from(transfer.types ?? []); ++ return types.includes(RESEARCH_ARTIFACT_DRAG_TYPE) || researchCanvasOwnsFileDrag(types); ++ }; ++ const onDragEnter = (event) => { ++ if (!ownsResearchDrop(event) || event.dataTransfer === null) return; ++ event.preventDefault(); ++ event.stopPropagation(); ++ event.dataTransfer.dropEffect = "copy"; ++ fileDragDepth += 1; ++ root.setAttribute("data-file-drop-active", "true"); ++ }; ++ const onDragOver = (event) => { ++ if (!ownsResearchDrop(event) || event.dataTransfer === null) return; ++ event.preventDefault(); ++ event.stopPropagation(); ++ event.dataTransfer.dropEffect = "copy"; ++ root.setAttribute("data-file-drop-active", "true"); ++ }; ++ const onDragLeave = (event) => { ++ if (!ownsResearchDrop(event) || event.dataTransfer === null) return; ++ event.stopPropagation(); ++ fileDragDepth = Math.max(0, fileDragDepth - 1); ++ if (fileDragDepth === 0) resetFileDrag(); ++ }; ++ const onDrop = (event) => { ++ resetFileDrag(); ++ if (!ownsResearchDrop(event) || event.dataTransfer === null) return; ++ const bounds = root.getBoundingClientRect(); ++ const types = Array.from(event.dataTransfer.types ?? []); ++ const rawArtifact = event.dataTransfer.getData?.(RESEARCH_ARTIFACT_DRAG_TYPE) ?? ""; ++ const rawFile = event.dataTransfer.getData?.(SHERLOCK_FILE_DRAG_TYPE) ?? ""; ++ const transfer = { ++ types, ++ files: Array.from(event.dataTransfer.files ?? []), ++ getData(type) { ++ if (type === RESEARCH_ARTIFACT_DRAG_TYPE) return rawArtifact; ++ if (type === SHERLOCK_FILE_DRAG_TYPE) return rawFile; ++ return ""; ++ } ++ }; ++ const proprietaryDrop = types.includes(RESEARCH_ARTIFACT_DRAG_TYPE) || types.includes(SHERLOCK_FILE_DRAG_TYPE); ++ const finderCandidates = proprietaryDrop ? [] : researchCanvasDropFiles(transfer, () => ""); ++ if (!proprietaryDrop && finderCandidates.length === 0) return; ++ if (proprietaryDrop) { ++ event.preventDefault(); ++ event.stopPropagation(); ++ } ++ if (types.includes(RESEARCH_ARTIFACT_DRAG_TYPE)) { ++ const artifact = parseResearchArtifactDrag(rawArtifact); ++ if (artifact === null || artifact.sessionId !== sessionId) return; ++ const current = workspace.getSnapshot(); ++ const point = researchCanvasWorldPoint(current.viewport, { ++ x: event.clientX - bounds.left, ++ y: event.clientY - bounds.top ++ }); ++ workspace.setArtifacts(placeResearchCanvasArtifact(current.artifacts, artifact, point, createResearchCanvasArtifactId)); ++ return; ++ } ++ if (types.includes(SHERLOCK_FILE_DRAG_TYPE) && parseSherlockFileDrag(rawFile) === null) return; ++ if (!proprietaryDrop) { ++ event.preventDefault(); ++ event.stopPropagation(); ++ } ++ const localPoint = { x: event.clientX - bounds.left, y: event.clientY - bounds.top }; ++ const runDrop = async () => { ++ const current = workspace.getSnapshot(); ++ const point = researchCanvasWorldPoint(current.viewport, localPoint); ++ const remaining = Math.max(0, RESEARCH_CANVAS_MAX_FILES_PER_SESSION - current.files.length); ++ const preview = workspace.pendingOrphanRevocations().length === 0 ? window.dshDesktop?.researchPreview : void 0; ++ const journalAdmission = (nodeId) => { ++ const durable = workspace.queueOrphanRevocations([nodeId]); ++ if (!durable) workspace.completeOrphanRevocation(nodeId); ++ return durable; ++ }; ++ const dropped = await admitResearchCanvasDrop(transfer, sessionId, current.files, preview, createResearchCanvasFileId, (file) => window.dshDesktop?.getPathForFile?.(file) ?? "", remaining, journalAdmission); ++ if (dropped.length === 0) return; ++ const pending = new Set(workspace.pendingOrphanRevocations()); ++ const journaledIds = [...new Set(dropped.filter((node) => pending.has(node.id)).map((node) => node.id))]; ++ if (!dropLifecycle.active) { ++ await Promise.all(journaledIds.map((nodeId) => revokeOrphanNode(nodeId))); ++ return; ++ } ++ const filesDurable = workspace.setFiles(placeResearchCanvasFiles(workspace.getSnapshot().files, dropped, point, createResearchCanvasFileId)); ++ const persisted = workspace.getSnapshot().files; ++ await Promise.all(journaledIds.map(async (nodeId) => { ++ const persistedNode = persisted.find((candidate) => candidate.id === nodeId); ++ const committed = filesDurable === true && typeof persistedNode?.authorizationId === "string" && dropped.some((candidate) => candidate.id === nodeId && candidate.authorizationId === persistedNode.authorizationId); ++ if (committed) workspace.completeOrphanRevocation(nodeId); ++ else await revokeOrphanNode(nodeId); ++ })); ++ }; ++ dropQueueRef.current = dropQueueRef.current.catch(() => void 0).then(runDrop); ++ }; ++ const onWheel = (event) => { ++ const interactivePreview = event.target?.closest?.("[data-research-preview-interactive]"); ++ if (!event.metaKey && interactivePreview !== null && interactivePreview !== void 0) return; ++ event.preventDefault(); ++ const bounds = root.getBoundingClientRect(); ++ workspace.setViewport(nextResearchCanvasWheel(workspace.getSnapshot().viewport, { ++ metaKey: event.metaKey, ++ deltaX: event.deltaX, ++ deltaY: event.deltaY, ++ pointerX: event.clientX - bounds.left, ++ pointerY: event.clientY - bounds.top ++ })); ++ }; ++ const isInteractiveTarget = (target) => typeof target?.closest === "function" && target.closest("input,textarea,button,select,a,[contenteditable=true],[data-research-preview-interactive]") !== null; ++ const canvasOwnsFocus = () => document.activeElement === root || root.contains(document.activeElement); ++ const setSpaceVisual = (active) => { ++ if (active) root.setAttribute("data-space-pressed", "true"); ++ else root.removeAttribute("data-space-pressed"); ++ }; ++ const finishOperation = (event, commitMarquee = true, updateVisuals = true) => { ++ const operation = operationRef.current; ++ if (operation === null || event && event.pointerId !== operation.pointerId) return; ++ if (operation.kind === "move" || operation.kind === "resize") workspace.persist(); ++ if (commitMarquee && operation.kind === "marquee") { ++ const rect = normalizeResearchRect({ x: operation.startX, y: operation.startY }, { x: operation.currentX, y: operation.currentY }); ++ const current = workspace.getSnapshot(); ++ const nodes = [...current.files, ...current.artifacts].sort((a, b) => a.y - b.y || a.x - b.x || a.id.localeCompare(b.id)); ++ workspace.updateSelection(researchNodesInMarquee(nodes, current.viewport, rect), operation.mode); ++ } ++ if (root.hasPointerCapture?.(operation.pointerId)) root.releasePointerCapture(operation.pointerId); ++ operationRef.current = null; ++ root.removeAttribute("data-dragging"); ++ root.removeAttribute("data-research-operation"); ++ if (updateVisuals) { ++ setDraggingNodeIds([]); ++ setResizingNodeId(null); ++ setMarquee(null); ++ setSpaceVisual(spacePressedRef.current && root.matches(":hover")); ++ } ++ }; ++ const onKeyDown = (event) => { ++ if (event.code === "Escape" && canvasOwnsFocus()) { ++ event.preventDefault(); ++ setContextMenu(null); ++ setMindMapMenuOpen(false); ++ workspace.updateSelection([], "replace"); ++ return; ++ } ++ if ((event.key === "Delete" || event.key === "Backspace") && canvasOwnsFocus() && !isInteractiveTarget(event.target)) { ++ const selected = workspace.getSnapshot().selection.selectedNodeIds; ++ if (selected.length === 0) return; ++ event.preventDefault(); ++ setContextMenu(null); ++ workspace.removeNodes(selected); ++ return; ++ } ++ if (event.metaKey && event.code === "KeyA" && canvasOwnsFocus() && !isInteractiveTarget(event.target)) { ++ event.preventDefault(); ++ const current = workspace.getSnapshot(); ++ const ids = researchCanvasAllNodeIds(current); ++ const fileIds = new Set(current.files.map((file) => file.id)); ++ workspace.setSelection({ selectedNodeIds: ids, orderedFileIds: ids.filter((id) => fileIds.has(id)) }); ++ return; ++ } ++ if (event.code !== "Space" || isInteractiveTarget(event.target)) return; ++ spacePressedRef.current = true; ++ if (canvasOwnsFocus() || root.matches(":hover")) { ++ event.preventDefault(); ++ setSpaceVisual(true); ++ } ++ }; ++ const onKeyUp = (event) => { ++ if (event.code !== "Space") return; ++ spacePressedRef.current = false; ++ setSpaceVisual(false); ++ }; ++ const onPointerEnter = () => { ++ if (spacePressedRef.current) setSpaceVisual(true); ++ }; ++ const onPointerLeave = () => { ++ setSpaceVisual(false); ++ }; ++ const onPointerDown = (event) => { ++ if (event.button !== 0) return; ++ if (spacePressedRef.current) { ++ setContextMenu(null); ++ setMindMapMenuOpen(false); ++ event.preventDefault(); ++ root.focus({ preventScroll: true }); ++ root.setPointerCapture?.(event.pointerId); ++ operationRef.current = { kind: "pan", pointerId: event.pointerId, lastX: event.clientX, lastY: event.clientY }; ++ setSpaceVisual(true); ++ root.setAttribute("data-dragging", "true"); ++ root.setAttribute("data-research-operation", "pan"); ++ return; ++ } ++ const resizeHandle = event.target?.closest?.("[data-research-resize-handle]"); ++ const resizeNodeId = resizeHandle?.getAttribute("data-research-resize-node-id"); ++ const resizeCorner = resizeHandle?.getAttribute("data-research-resize-handle"); ++ if (resizeNodeId !== null && resizeNodeId !== void 0 && ["nw", "ne", "sw", "se"].includes(resizeCorner)) { ++ setContextMenu(null); ++ setMindMapMenuOpen(false); ++ event.preventDefault(); ++ root.focus({ preventScroll: true }); ++ root.setPointerCapture?.(event.pointerId); ++ operationRef.current = { kind: "resize", pointerId: event.pointerId, lastX: event.clientX, lastY: event.clientY, nodeId: resizeNodeId, corner: resizeCorner }; ++ setResizingNodeId(resizeNodeId); ++ root.setAttribute("data-dragging", "true"); ++ root.setAttribute("data-research-operation", "resize"); ++ return; ++ } ++ const nodeElement = event.target?.closest?.("[data-research-node-id]"); ++ const nodeId = nodeElement?.getAttribute("data-research-node-id"); ++ let nextSelection = null; ++ if (nodeId !== null && nodeId !== void 0) { ++ const currentSnapshot = workspace.getSnapshot(); ++ const current = currentSnapshot.selection; ++ const alreadySelected = current.selectedNodeIds.includes(nodeId); ++ const mode = event.metaKey ? "toggle" : event.shiftKey ? "add" : "replace"; ++ nextSelection = alreadySelected && !event.metaKey && !event.shiftKey ? current : updateResearchSelection(current, [nodeId], mode, currentSnapshot.files); ++ if (nextSelection !== current) workspace.setSelection(nextSelection); ++ } ++ if (isInteractiveTarget(event.target)) return; ++ setContextMenu(null); ++ setMindMapMenuOpen(false); ++ setDownloadMenuNodeId(null); ++ event.preventDefault(); ++ root.focus({ preventScroll: true }); ++ root.setPointerCapture?.(event.pointerId); ++ if (nodeId !== null && nodeId !== void 0) { ++ operationRef.current = { kind: "move", pointerId: event.pointerId, lastX: event.clientX, lastY: event.clientY, selectedNodeIds: [...nextSelection.selectedNodeIds] }; ++ setDraggingNodeIds([...nextSelection.selectedNodeIds]); ++ root.setAttribute("data-dragging", "true"); ++ root.setAttribute("data-research-operation", "move"); ++ return; ++ } ++ const bounds = root.getBoundingClientRect(); ++ const x = event.clientX - bounds.left; ++ const y = event.clientY - bounds.top; ++ const mode = event.metaKey ? "toggle" : event.shiftKey ? "add" : "replace"; ++ if (mode === "replace") workspace.updateSelection([], "replace"); ++ operationRef.current = { kind: "marquee", pointerId: event.pointerId, startX: x, startY: y, currentX: x, currentY: y, mode }; ++ root.setAttribute("data-research-operation", "marquee"); ++ setMarquee(normalizeResearchRect({ x, y }, { x, y })); ++ }; ++ const onContextMenu = (event) => { ++ if (isInteractiveTarget(event.target)) return; ++ const nodeElement = event.target?.closest?.("[data-research-node-id]"); ++ const nodeId = nodeElement?.getAttribute("data-research-node-id"); ++ event.preventDefault(); ++ setMindMapMenuOpen(false); ++ setDownloadMenuNodeId(null); ++ root.focus({ preventScroll: true }); ++ const bounds = root.getBoundingClientRect(); ++ if (nodeId === null || nodeId === void 0) { ++ setContextMenu({ nodeId: null, left: event.clientX - bounds.left, top: event.clientY - bounds.top }); ++ return; ++ } ++ const current = workspace.getSnapshot(); ++ if (!current.selection.selectedNodeIds.includes(nodeId)) workspace.updateSelection([nodeId], "replace"); ++ setContextMenu({ nodeId, left: event.clientX - bounds.left, top: event.clientY - bounds.top }); ++ }; ++ const onPointerMove = (event) => { ++ const operation = operationRef.current; ++ if (operation === null || event.pointerId !== operation.pointerId) return; ++ if (operation.kind === "marquee") { ++ const bounds = root.getBoundingClientRect(); ++ operation.currentX = event.clientX - bounds.left; ++ operation.currentY = event.clientY - bounds.top; ++ setMarquee(normalizeResearchRect({ x: operation.startX, y: operation.startY }, { x: operation.currentX, y: operation.currentY })); ++ return; ++ } ++ const deltaX = event.clientX - operation.lastX; ++ const deltaY = event.clientY - operation.lastY; ++ operation.lastX = event.clientX; ++ operation.lastY = event.clientY; ++ const current = workspace.getSnapshot(); ++ if (operation.kind === "pan") workspace.setViewport(nextResearchCanvasPan(current.viewport, { deltaX, deltaY })); ++ else if (operation.kind === "resize") workspace.resizeNode(operation.nodeId, operation.corner, { x: deltaX, y: deltaY }, current.viewport.scale, false); ++ else workspace.moveNodes(operation.selectedNodeIds, { x: deltaX, y: deltaY }, current.viewport.scale, false); ++ }; ++ const onWindowBlur = () => { ++ spacePressedRef.current = false; ++ finishOperation(void 0, false); ++ setSpaceVisual(false); ++ resetFileDrag(); ++ }; ++ const onPointerCancel = (event) => finishOperation(event, false); ++ root.addEventListener("dragenter", onDragEnter); ++ root.addEventListener("dragover", onDragOver); ++ root.addEventListener("dragleave", onDragLeave); ++ root.addEventListener("drop", onDrop); ++ root.addEventListener("wheel", onWheel, { passive: false }); ++ root.addEventListener("pointerenter", onPointerEnter); ++ root.addEventListener("pointerleave", onPointerLeave); ++ root.addEventListener("pointerdown", onPointerDown); ++ root.addEventListener("contextmenu", onContextMenu); ++ root.addEventListener("pointermove", onPointerMove); ++ root.addEventListener("pointerup", finishOperation); ++ root.addEventListener("pointercancel", onPointerCancel); ++ window.addEventListener("keydown", onKeyDown); ++ window.addEventListener("keyup", onKeyUp); ++ window.addEventListener("blur", onWindowBlur); ++ window.addEventListener("dragend", resetFileDrag); ++ return () => { ++ root.removeEventListener("dragenter", onDragEnter); ++ root.removeEventListener("dragover", onDragOver); ++ root.removeEventListener("dragleave", onDragLeave); ++ root.removeEventListener("drop", onDrop); ++ root.removeEventListener("wheel", onWheel); ++ root.removeEventListener("pointerenter", onPointerEnter); ++ root.removeEventListener("pointerleave", onPointerLeave); ++ root.removeEventListener("pointerdown", onPointerDown); ++ root.removeEventListener("contextmenu", onContextMenu); ++ root.removeEventListener("pointermove", onPointerMove); ++ root.removeEventListener("pointerup", finishOperation); ++ root.removeEventListener("pointercancel", onPointerCancel); ++ window.removeEventListener("keydown", onKeyDown); ++ window.removeEventListener("keyup", onKeyUp); ++ window.removeEventListener("blur", onWindowBlur); ++ window.removeEventListener("dragend", resetFileDrag); ++ spacePressedRef.current = false; ++ finishOperation(void 0, false, false); ++ resetFileDrag(); ++ }; ++ }, [sessionId, workspace, revokeOrphanNode, dropLifecycle]); ++ const { files, artifacts, selection, viewport } = snapshot; ++ const selectedIds = new Set(selection.selectedNodeIds); ++ const draggingIds = new Set(draggingNodeIds); ++ const gridSize = RESEARCH_CANVAS_GRID_SIZE * viewport.scale; ++ const canvasNodes = [...files, ...artifacts]; ++ const selectedNodes = canvasNodes.filter((node) => selectedIds.has(node.id)); ++ const selectionBounds = researchCanvasSelectionBounds(canvasNodes, selection.selectedNodeIds); ++ const selectionActionsVisible = selectionGeneration !== void 0 && selectionBounds !== null && selectedNodes.length > 0 && selectedNodes.every((node) => !RESEARCH_ACTIVE_GENERATION_STATUSES.has(node.generationStatus)) && draggingNodeIds.length === 0 && resizingNodeId === null && marquee === null; ++ const selectionActionPosition = !selectionActionsVisible ? null : { ++ left: Math.max(126, Math.min(Math.max(126, snapshot.canvasSize.width - 126), (selectionBounds.left + selectionBounds.width / 2) * viewport.scale + viewport.x)), ++ top: Math.max(54, selectionBounds.top * viewport.scale + viewport.y - 10) ++ }; ++ const startSelectionGeneration = async (kind, requestedDetail = "standard") => { ++ if (selectionGeneration === void 0 || selectionGeneration.disabled === true) return; ++ const detail = kind === 'mind-map' ? researchMindMapDetail(requestedDetail) : void 0; ++ setMindMapMenuOpen(false); ++ setContextMenu(null); ++ const current = workspace.getSnapshot(); ++ const sourceNodes = [...current.files, ...current.artifacts]; ++ const selectedNodeIds = [...current.selection.selectedNodeIds]; ++ const placement = researchCanvasGeneratedPlacement(sourceNodes, selectedNodeIds, kind, detail); ++ const target = workspace.beginGeneration(kind, selectedNodeIds, placement, detail); ++ if (target === null) return; ++ try { ++ const result = await selectionGeneration.generate({ ++ sessionId, ++ kind, ++ ...(kind === 'mind-map' ? { detail } : {}), ++ selectedNodeIds, ++ targetNodeId: target.id ++ }); ++ if (result?.ok !== true) workspace.failGeneration(target.id, result?.error ?? '生成请求未能启动'); ++ } catch (error) { ++ workspace.failGeneration(target.id, error instanceof Error ? error.message : '生成请求未能启动'); ++ } ++ }; ++ const retrySelectionGeneration = async (node) => { ++ if (selectionGeneration === void 0 || selectionGeneration.disabled === true) return; ++ const target = workspace.retryGeneration(node.id); ++ if (target === null) return; ++ try { ++ const result = await selectionGeneration.generate(target.kind === 'container' ? { ++ sessionId, ++ kind: 'container', ++ targetNodeId: target.id, ++ prompt: target.prompt ++ } : { ++ sessionId, ++ kind: target.kind, ++ ...(target.kind === 'mind-map' ? { detail: target.detail } : {}), ++ selectedNodeIds: target.sourceNodeIds, ++ targetNodeId: target.id ++ }); ++ if (result?.ok !== true) workspace.failGeneration(target.id, result?.error ?? '生成请求未能启动'); ++ } catch (error) { ++ workspace.failGeneration(target.id, error instanceof Error ? error.message : '生成请求未能启动'); ++ } ++ }; ++ const startContainerGeneration = async (node, prompt) => { ++ if (selectionGeneration === void 0 || selectionGeneration.disabled === true) return; ++ const target = workspace.beginContainerGeneration(node.id, prompt); ++ if (target === null) return; ++ try { ++ const result = await selectionGeneration.generate({ ++ sessionId, ++ kind: 'container', ++ targetNodeId: target.id, ++ prompt: target.prompt ++ }); ++ if (result?.ok !== true) workspace.failGeneration(target.id, result?.error ?? '生成请求未能启动'); ++ } catch (error) { ++ workspace.failGeneration(target.id, error instanceof Error ? error.message : '生成请求未能启动'); ++ } ++ }; ++ const submitLink = () => { ++ const node = workspace.createWebLink(linkInputRef.current?.value ?? linkDraft); ++ if (node === null) { ++ setLinkError("请输入有效的 http 或 https 地址"); ++ return; ++ } ++ setLinkDraft(""); ++ if (linkInputRef.current !== null) linkInputRef.current.value = ""; ++ setLinkError(null); ++ setLinkPopoverOpen(false); ++ }; ++ const emptyViewport = canvasNodes.length > 0 && snapshot.canvasSize.width > 0 && snapshot.canvasSize.height > 0 && !researchCanvasHasVisibleNodes(canvasNodes, viewport, snapshot.canvasSize); ++ const contextNode = contextMenu === null || contextMenu.nodeId === null ? null : canvasNodes.find((node) => node.id === contextMenu.nodeId) ?? null; ++ const contextArtifact = contextMenu === null || contextMenu.nodeId === null ? null : artifacts.find((node) => node.id === contextMenu.nodeId && node.kind === "assistant-result") ?? null; ++ const downloadFeedbackNode = downloadFeedback === null ? null : canvasNodes.find((node) => node.id === downloadFeedback.nodeId) ?? null; ++ const downloadCanvasNode = async (node, format) => { ++ if (downloadBusyNodeId !== null || node === null) return; ++ const save = window.dshDesktop?.researchCanvasExport?.save; ++ if (typeof save !== "function") { ++ setDownloadFeedback({ nodeId: node.id, type: "error", message: "下载服务暂时不可用。", format }); ++ setContextMenu(null); ++ return; ++ } ++ const descriptor = researchCanvasExportDescriptor(node, sessionId); ++ if (descriptor === null) { ++ setDownloadFeedback({ nodeId: node.id, type: "error", message: "当前组件无法下载。", format }); ++ setContextMenu(null); ++ return; ++ } ++ setDownloadBusyNodeId(node.id); ++ setDownloadMenuNodeId(null); ++ setContextMenu(null); ++ try { ++ let request = descriptor; ++ if (descriptor.kind === "mind-map") { ++ const selectedFormat = format === "png" || format === "jpg" ? format : "svg"; ++ let context; ++ try { ++ const canvas = document.createElement("canvas"); ++ context = canvas.getContext?.("2d"); ++ if (context !== null && context !== void 0) context.font = '700 14px STHeiti_YFD,"STHeiti SC","PingFang SC",sans-serif'; ++ } catch {} ++ const vector = buildResearchMindMapSvg(descriptor.text, descriptor.detail, (text) => typeof context?.measureText === "function" ? context.measureText(text).width : Array.from(text).length * 14); ++ if (vector === null) throw new Error("思维导图内容无法导出。"); ++ if (selectedFormat === "svg") request = { kind: "text", format: "svg", suggestedName: researchCanvasExportFileName(descriptor.suggestedName, "svg"), content: vector.svg }; ++ else { ++ const raster = await rasterizeResearchMindMapSvg(vector.svg, vector.width, vector.height, selectedFormat); ++ request = { kind: "binary", format: selectedFormat, suggestedName: researchCanvasExportFileName(descriptor.suggestedName, selectedFormat), base64: raster.base64 }; ++ } ++ } ++ const result = await save(request); ++ if (result?.status === "saved") setDownloadFeedback({ nodeId: node.id, type: "success", message: "已下载", format }); ++ else if (result?.status === "error") setDownloadFeedback({ nodeId: node.id, type: "error", message: typeof result.message === "string" ? result.message : "保存失败，请重试。", format }); ++ else setDownloadFeedback(null); ++ } catch (error) { ++ setDownloadFeedback({ nodeId: node.id, type: "error", message: error instanceof Error ? error.message : "保存失败，请重试。", format }); ++ } finally { ++ setDownloadBusyNodeId(null); ++ } ++ }; ++ return (0, react_jsx_runtime.jsxs)("div", { ++ ref: rootRef, ++ className: ResearchCanvas_module_css_default.root, ++ role: "region", ++ "aria-label": t("research.canvas"), ++ tabIndex: 0, ++ "data-research-canvas": "", ++ "data-conversation-composer-overlay": "", ++ "data-canvas-scale": viewport.scale.toFixed(3), ++ style: { ++ backgroundPosition: `${viewport.x - gridSize / 2 + 1}px ${viewport.y - gridSize / 2 + 1}px`, ++ backgroundSize: `${gridSize}px ${gridSize}px` ++ }, ++ children: [(0, react_jsx_runtime.jsxs)("div", { ++ className: "rScV5Q_contentLayer", ++ "data-research-content-layer": "", ++ style: { transform: researchCanvasContentTransform(viewport) }, ++ children: [files.map((node) => (0, react_jsx_runtime.jsx)(ResearchCanvasFileCard, { ++ node, ++ sessionId, ++ officePreview, ++ visible: researchNodeNearViewport(node, viewport, snapshot.canvasSize), ++ selected: selectedIds.has(node.id), ++ dragging: draggingIds.has(node.id), ++ resizing: resizingNodeId === node.id, ++ editing: editingNodeId === node.id, ++ onRenameCommit: (title) => { ++ workspace.renameNode(node.id, title); ++ setEditingNodeId(null); ++ }, ++ onRenameCancel: () => setEditingNodeId(null), ++ onSelect: (file) => workspace.updateSelection([file.id], "replace"), ++ onNaturalSize: (naturalWidth, naturalHeight) => { ++ const geometry = researchCanvasNodeKind(node) === "pdf" ? researchPdfGeometryForPage(node, naturalWidth, naturalHeight) : researchImageGeometryForNaturalSize(node, naturalWidth, naturalHeight); ++ if (geometry !== null) workspace.updateNodeGeometry(node.id, geometry); ++ } ++ }, node.id)), artifacts.map((node) => (0, react_jsx_runtime.jsx)(ResearchCanvasArtifactCard, { ++ node, ++ sessionId, ++ visible: researchNodeNearViewport(node, viewport, snapshot.canvasSize), ++ selected: selectedIds.has(node.id), ++ dragging: draggingIds.has(node.id), ++ resizing: resizingNodeId === node.id, ++ editing: editingNodeId === node.id, ++ editingContent: editingContentNodeId === node.id, ++ sourceUnavailable: snapshot.unavailableSourceMessageIds.includes(node.messageId), ++ onRenameCommit: (title) => { ++ workspace.renameNode(node.id, title); ++ setEditingNodeId(null); ++ }, ++ onRenameCancel: () => setEditingNodeId(null), ++ onContentEdit: () => { ++ setEditingNodeId(null); ++ setEditingContentNodeId(node.id); ++ }, ++ onContentCommit: (content) => { ++ workspace.updateArtifactContent(node.id, content); ++ setEditingContentNodeId(null); ++ }, ++ onContentCancel: () => setEditingContentNodeId(null), ++ onMindMapNodeCommit: (sourceLineIndex, label) => workspace.updateMindMapNodeLabel(node.id, sourceLineIndex, label), ++ onOpenContextMenu: (event) => { ++ const root = rootRef.current; ++ if (root === null) return; ++ setMindMapMenuOpen(false); ++ setDownloadMenuNodeId(null); ++ root.focus({ preventScroll: true }); ++ const current = workspace.getSnapshot(); ++ if (!current.selection.selectedNodeIds.includes(node.id)) workspace.updateSelection([node.id], "replace"); ++ const bounds = root.getBoundingClientRect(); ++ setContextMenu({ nodeId: node.id, left: event.clientX - bounds.left, top: event.clientY - bounds.top }); ++ }, ++ onAutoHeight: (_artifact, height) => workspace.updateNodeGeometry(node.id, { height, sizeMode: "auto" }), ++ onWebInspection: (expectedUrl, inspection) => workspace.applyWebLinkInspection(node.id, expectedUrl, inspection), ++ onActivate: activateArtifact, ++ onCancelGeneration: () => workspace.cancelGeneration(node.id), ++ onSubmitContainer: startContainerGeneration, ++ onSetContainerRefresh: (artifact, minutes) => workspace.setContainerRefresh(artifact.id, minutes), ++ onRetryGeneration: retrySelectionGeneration, ++ retryDisabled: selectionGeneration === void 0 || selectionGeneration.disabled === true ++ }, node.id))] ++ }), selectionActionPosition === null ? null : (0, react_jsx_runtime.jsxs)("div", { ++ className: "rScV5Q_selectionActions", ++ "data-research-selection-actions": "", ++ role: "toolbar", ++ "aria-label": "选中组件操作", ++ style: { left: `${selectionActionPosition.left}px`, top: `${selectionActionPosition.top}px` }, ++ children: [(0, react_jsx_runtime.jsxs)("div", { ++ className: "rScV5Q_mindMapControl", ++ children: [(0, react_jsx_runtime.jsxs)("button", { ++ type: "button", ++ "aria-label": "思维导图", ++ "aria-haspopup": "menu", ++ "aria-expanded": mindMapMenuOpen, ++ disabled: selectionGeneration.disabled === true, ++ onClick: () => { ++ setContextMenu(null); ++ setMindMapMenuOpen((open) => !open); ++ }, ++ children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconBranchOutline16, { size: 16 }), "思维导图", (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronDownOutline14, { size: 14 })] ++ }), !mindMapMenuOpen ? null : (0, react_jsx_runtime.jsx)("div", { ++ className: "rScV5Q_mindMapMenu", ++ "data-research-mind-map-menu": "", ++ role: "menu", ++ "aria-label": "思维导图详细度", ++ children: RESEARCH_MIND_MAP_DETAIL_OPTIONS.map((option) => (0, react_jsx_runtime.jsxs)("button", { ++ type: "button", ++ role: "menuitem", ++ "data-research-mind-map-detail": option.value, ++ onClick: () => startSelectionGeneration('mind-map', option.value), ++ children: [(0, react_jsx_runtime.jsx)("strong", { children: option.label }), (0, react_jsx_runtime.jsx)("span", { children: option.description })] ++ }, option.value)) ++ })] ++ }), (0, react_jsx_runtime.jsxs)("button", { ++ type: "button", ++ "aria-label": "总结提炼", ++ disabled: selectionGeneration.disabled === true, ++ onClick: () => startSelectionGeneration('summary'), ++ children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconListPenOutline16, { size: 16 }), "总结提炼"] ++ })] ++ }), marquee === null ? null : (0, react_jsx_runtime.jsx)("div", { ++ className: "rScV5Q_marquee", ++ "data-research-marquee": "", ++ "aria-hidden": true, ++ style: { left: `${marquee.left}px`, top: `${marquee.top}px`, width: `${marquee.width}px`, height: `${marquee.height}px` } ++ }), emptyViewport ? (0, react_jsx_runtime.jsxs)("div", { ++ className: "rScV5Q_emptyViewport", ++ "data-research-empty-viewport": "", ++ role: "status", ++ children: [(0, react_jsx_runtime.jsx)("span", { children: "视口内无内容" }), (0, react_jsx_runtime.jsx)("button", { ++ type: "button", ++ "data-research-return-to-content": "", ++ onClick: () => workspace.setViewport(researchCanvasReturnViewport(canvasNodes, viewport, snapshot.canvasSize)), ++ children: "回到内容" ++ })] ++ }) : null, (0, react_jsx_runtime.jsxs)("div", { ++ className: "rScV5Q_globalToolbar", ++ "data-research-global-toolbar": "", ++ role: "toolbar", ++ "aria-label": "画布全局功能", ++ children: [(0, react_jsx_runtime.jsxs)("div", { ++ className: "rScV5Q_globalToolSlot", ++ children: [(0, react_jsx_runtime.jsxs)("button", { ++ type: "button", ++ "data-research-global-link": "", ++ "aria-expanded": linkPopoverOpen, ++ onClick: () => { ++ setLinkError(null); ++ setLinkPopoverOpen((open) => !open); ++ }, ++ children: [(0, react_jsx_runtime.jsx)("svg", { viewBox: "0 0 18 18", "aria-hidden": true, children: (0, react_jsx_runtime.jsx)("path", { d: "M7.2 10.8 10.8 7.2M6.1 12.9l-1 .9a2.7 2.7 0 0 1-3.8-3.8l2.5-2.5a2.7 2.7 0 0 1 3.8 0M11.9 5.1l1-.9a2.7 2.7 0 1 1 3.8 3.8l-2.5 2.5a2.7 2.7 0 0 1-3.8 0", fill: "none", stroke: "currentColor", strokeWidth: "1.5", strokeLinecap: "round" }) }), (0, react_jsx_runtime.jsx)("span", { children: "链接" })] ++ }), !linkPopoverOpen ? null : (0, react_jsx_runtime.jsxs)("div", { ++ className: "rScV5Q_linkPopover", ++ "data-research-link-popover": "", ++ children: [(0, react_jsx_runtime.jsx)("label", { htmlFor: `research-link-${sessionId}`, children: "输入网页地址" }), (0, react_jsx_runtime.jsxs)("div", { ++ children: [(0, react_jsx_runtime.jsx)("input", { ++ ref: linkInputRef, ++ id: `research-link-${sessionId}`, ++ "data-research-link-input": "", ++ type: "url", ++ placeholder: "https://example.com", ++ defaultValue: linkDraft, ++ onInput: (event) => { ++ setLinkDraft(event.currentTarget.value); ++ setLinkError(null); ++ }, ++ onKeyDown: (event) => { ++ event.stopPropagation(); ++ if (event.key === "Enter") { ++ event.preventDefault(); ++ submitLink(); ++ } else if (event.key === "Escape") { ++ event.preventDefault(); ++ setLinkPopoverOpen(false); ++ } ++ } ++ }), (0, react_jsx_runtime.jsx)("button", { type: "button", "data-research-link-submit": "", onClick: submitLink, children: "添加" })] ++ }), linkError === null ? null : (0, react_jsx_runtime.jsx)("span", { className: "rScV5Q_linkError", role: "alert", children: linkError })] ++ })] ++ }), (0, react_jsx_runtime.jsxs)("button", { ++ type: "button", ++ "data-research-global-container": "", ++ disabled: selectionGeneration === void 0 || selectionGeneration.disabled === true, ++ onClick: () => { ++ setLinkPopoverOpen(false); ++ workspace.createContainerDraft(); ++ }, ++ children: [(0, react_jsx_runtime.jsx)("svg", { viewBox: "0 0 18 18", "aria-hidden": true, children: (0, react_jsx_runtime.jsx)("path", { d: "M3 3h12v12H3zM6 7.5h6M6 10.5h4", fill: "none", stroke: "currentColor", strokeWidth: "1.5", strokeLinecap: "round", strokeLinejoin: "round" }) }), (0, react_jsx_runtime.jsx)("span", { children: "容器" })] ++ })] ++ }), downloadFeedback === null || downloadFeedbackNode === null ? null : (0, react_jsx_runtime.jsxs)("div", { ++ className: "rScV5Q_downloadFeedback", ++ "data-research-download-feedback": downloadFeedback.nodeId, ++ "data-state": downloadFeedback.type, ++ role: downloadFeedback.type === "error" ? "alert" : "status", ++ style: { ++ left: `${downloadFeedbackNode.x * viewport.scale + viewport.x}px`, ++ top: `${(downloadFeedbackNode.y + normalizeResearchCanvasNodeGeometry(downloadFeedbackNode).height / 2) * viewport.scale + viewport.y + 9}px` ++ }, ++ children: [(0, react_jsx_runtime.jsx)("span", { children: downloadFeedback.message }), downloadFeedback.type !== "error" ? null : (0, react_jsx_runtime.jsx)("button", { ++ type: "button", ++ "data-research-download-retry": "", ++ disabled: downloadBusyNodeId !== null, ++ onClick: () => downloadCanvasNode(downloadFeedbackNode, downloadFeedback.format), ++ children: "重试" ++ })] ++ }), contextMenu === null ? null : (0, react_jsx_runtime.jsx)("div", { ++ className: "rScV5Q_contextMenu", ++ role: "menu", ++ style: { left: contextMenu.left, top: contextMenu.top }, ++ children: contextMenu.nodeId === null ? [(0, react_jsx_runtime.jsx)("button", { ++ type: "button", ++ role: "menuitem", ++ "data-research-context-arrange": "", ++ disabled: canvasNodes.length === 0, ++ onClick: () => { ++ workspace.organizeCanvas(); ++ setContextMenu(null); ++ }, ++ children: "整理画布" ++ }, "arrange"), (0, react_jsx_runtime.jsxs)("button", { ++ type: "button", ++ role: "menuitem", ++ "data-research-context-select-all": "", ++ disabled: canvasNodes.length === 0, ++ onClick: () => { ++ const current = workspace.getSnapshot(); ++ const ids = researchCanvasAllNodeIds(current); ++ const fileIds = new Set(current.files.map((file) => file.id)); ++ workspace.setSelection({ selectedNodeIds: ids, orderedFileIds: ids.filter((id) => fileIds.has(id)) }); ++ setContextMenu(null); ++ }, ++ children: [(0, react_jsx_runtime.jsx)("span", { children: "全选" }), (0, react_jsx_runtime.jsx)("span", { className: "rScV5Q_contextMenuShortcut", children: "⌘A" })] ++ }, "select-all")] : [(0, react_jsx_runtime.jsx)("button", { ++ type: "button", ++ role: "menuitem", ++ "data-research-context-rename": "", ++ onClick: () => { ++ setEditingContentNodeId(null); ++ setEditingNodeId(contextMenu.nodeId); ++ setContextMenu(null); ++ }, ++ children: "修改名称" ++ }, "rename"), contextArtifact === null ? null : (0, react_jsx_runtime.jsx)("button", { ++ type: "button", ++ role: "menuitem", ++ "data-research-context-edit-content": "", ++ onClick: () => { ++ setEditingNodeId(null); ++ setEditingContentNodeId(contextArtifact.id); ++ setContextMenu(null); ++ }, ++ children: "编辑内容" ++ }, "edit-content"), contextNode === null ? null : (0, react_jsx_runtime.jsxs)("div", { ++ className: "rScV5Q_contextDownloadGroup", ++ children: [(0, react_jsx_runtime.jsxs)("button", { ++ type: "button", ++ role: "menuitem", ++ "data-research-context-download": "", ++ disabled: downloadBusyNodeId !== null, ++ onClick: () => { ++ const descriptor = researchCanvasExportDescriptor(contextNode, sessionId); ++ if (descriptor?.kind === "mind-map") setDownloadMenuNodeId((current) => current === contextNode.id ? null : contextNode.id); ++ else void downloadCanvasNode(contextNode); ++ }, ++ children: [(0, react_jsx_runtime.jsx)("span", { children: "下载" }), researchCanvasExportDescriptor(contextNode, sessionId)?.kind === "mind-map" ? (0, react_jsx_runtime.jsx)("span", { className: "rScV5Q_contextMenuShortcut", children: "›" }) : null] ++ }), downloadMenuNodeId !== contextNode.id ? null : (0, react_jsx_runtime.jsx)("div", { ++ className: "rScV5Q_contextDownloadFormats", ++ role: "menu", ++ "aria-label": "思维导图下载格式", ++ children: ["svg", "png", "jpg"].map((format) => (0, react_jsx_runtime.jsx)("button", { ++ type: "button", ++ role: "menuitem", ++ "data-research-download-format": format, ++ disabled: downloadBusyNodeId !== null, ++ onClick: () => void downloadCanvasNode(contextNode, format), ++ children: format.toUpperCase() ++ }, format)) ++ })] ++ }, "download"), (0, react_jsx_runtime.jsx)("button", { ++ type: "button", ++ role: "menuitem", ++ "data-research-context-remove": "", ++ onClick: () => { ++ workspace.removeNodes(workspace.getSnapshot().selection.selectedNodeIds); ++ setContextMenu(null); ++ }, ++ children: "从画布删除" ++ }, "remove")] ++ })] ++ }); ++ } ++ /** Register the Research tab between Chat (0) and Trajectory (10). */ ++ function registerResearchCanvasView(slots, t, researchWorkspaces, researchOfficePreview = defaultResearchOfficePreview) { ++ return slots.register({ ++ name: "conversation.view", ++ id: "research", ++ order: 5, ++ label: () => t("view.research"), ++ locale: NS, ++ inject: () => ({ researchWorkspaces, researchOfficePreview }) ++ }, ResearchCanvas); ++ } ++ function ResearchAssistantCanvasAction({ messageId, text, workspace }) { ++ const active = (0, react.useSyncExternalStore)(workspace.subscribeAssistantActions, workspace.assistantActionsActive, workspace.assistantActionsActive); ++ if (!active) return null; ++ return (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, { ++ label: "添加到画布", ++ side: "bottom", ++ children: (0, react_jsx_runtime.jsx)("button", { ++ type: "button", ++ className: MessageIconActions_module_css_default.action, ++ "aria-label": "添加到画布", ++ onClick: () => workspace.addAssistantResult({ messageId, text, at: workspace.visibleCenter() }), ++ children: (0, react_jsx_runtime.jsxs)("svg", { ++ viewBox: "0 0 16 16", ++ width: "16", ++ height: "16", ++ "aria-hidden": true, ++ children: [(0, react_jsx_runtime.jsx)("path", { d: "M3 3.5h10v9H3z", fill: "none", stroke: "currentColor", strokeWidth: "1.3" }), (0, react_jsx_runtime.jsx)("path", { d: "M8 5.5v5M5.5 8h5", stroke: "currentColor", strokeWidth: "1.3", strokeLinecap: "round" })] ++ }) ++ }) + }); + } ++ function registerResearchAssistantActions(slots, researchWorkspaces) { ++ return slots.register({ ++ name: "conversation.chat.assistant-actions", ++ id: "research-add-to-canvas", ++ order: 10, ++ inject: (sessionId) => ({ workspace: researchWorkspaces.for(sessionId) }) ++ }, ResearchAssistantCanvasAction); ++ } + //#endregion + //#region \0dsh-css:/home/runner/work/deepseek-harness/deepseek-harness/packages/client/ui-conversation/src/client/skeleton/ConversationRoot.module.css.mjs + const css$6 = ".wSkVaW_root{background:var(--dsw-alias-bg-base);--dsh-chat-content-width:748px;--dsh-composer-card-max-width:calc(var(--dsh-chat-content-width) + 32px);--dsh-composer-side-clearance:16px;--dsh-composer-dock-inset:8px;flex-direction:column;min-width:0;height:100%;display:flex}.wSkVaW_header{border-bottom:1px solid #0000;flex:none;padding:12px 28px 0 20px;position:relative}.wSkVaW_header:after{content:\"\";z-index:0;background:var(--dsw-alias-border-l2);pointer-events:none;height:1px;position:absolute;bottom:1px;left:0;right:0}.wSkVaW_headerHidden{display:none}.wSkVaW_titleRow{align-items:center;gap:0;min-height:32px;display:flex}.wSkVaW_titleCluster{flex:1;align-items:center;gap:10px;min-width:0;display:flex}.wSkVaW_crumbs{white-space:nowrap;align-items:center;gap:4px;min-width:0;display:flex;overflow:hidden}.wSkVaW_crumbSeg{align-items:center;gap:4px;min-width:0;display:inline-flex}.wSkVaW_crumbSep{color:var(--dsw-alias-label-caption);font-size:14px;line-height:20px}.wSkVaW_crumb{max-width:220px;color:var(--dsw-alias-label-tertiary);text-overflow:ellipsis;white-space:nowrap;cursor:pointer;background:0 0;border:none;border-radius:12px;padding:4px 8px;font-size:14px;line-height:20px;overflow:hidden}.wSkVaW_crumb:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover)}.wSkVaW_crumbCurrent{color:var(--dsw-alias-label-primary);cursor:default;font-weight:500}.wSkVaW_headerActions{flex:none;align-items:center;gap:8px;display:flex}.wSkVaW_headerUtilities{flex:none;align-items:center;gap:8px;margin-left:20px;display:flex}.wSkVaW_headerUtilities:empty{display:none}.wSkVaW_tabs{z-index:1;gap:36px;margin-top:4px;padding-left:8px;display:flex;position:relative}.wSkVaW_tab{color:var(--dsw-alias-label-tertiary);cursor:pointer;background:0 0;border:none;padding:0 0 11px;font-size:13px;font-weight:500;line-height:16px;position:relative}.wSkVaW_tab:after{content:\"\";background:0 0;border-radius:2px;height:2px;position:absolute;bottom:1px;left:0;right:0}.wSkVaW_tabActive{color:var(--dsw-alias-state-business-primary)}.wSkVaW_tabActive:after{background:var(--dsw-alias-state-business-primary)}.wSkVaW_viewArea{flex-direction:column;flex:1;min-height:0;display:flex}.wSkVaW_composerStack{--dsh-composer-stack-gap:6px;gap:var(--dsh-composer-stack-gap);flex-direction:column;display:flex}.wSkVaW_composerSeat{--dsh-composer-text-max-height:336px;flex-direction:column;flex:none;display:flex}.wSkVaW_root[data-phase=active]{overflow:hidden}.wSkVaW_root[data-phase=active] .wSkVaW_header{flex:none}.wSkVaW_scrollBody{scrollbar-gutter:stable;flex-direction:column;flex:1;min-height:0;display:flex;overflow:hidden auto}.wSkVaW_root[data-phase=active] .wSkVaW_viewArea{flex:1 0 auto;min-height:auto}.wSkVaW_root[data-phase=active] .wSkVaW_composerSeat{z-index:7;background:linear-gradient(180deg, color-mix(in srgb, var(--dsw-alias-bg-base) 0%, transparent) 0px, var(--dsw-alias-bg-base) 36px);position:sticky;bottom:0}.wSkVaW_scrollBody:has([data-conversation-composer-overlay]){scrollbar-gutter:auto;position:relative;overflow:hidden auto}.wSkVaW_scrollBody:has([data-conversation-composer-overlay])>[data-slot=conversation\\.session]>.wSkVaW_viewArea{flex:1 1 0;min-height:0;overflow:hidden}.wSkVaW_scrollBody:has([data-conversation-composer-overlay])>.wSkVaW_composerSeat{right:var(--dsh-scrollbar-width);position:absolute;bottom:0;left:0}.wSkVaW_composerHero{width:min(calc(var(--dsh-composer-card-max-width) + 2 * var(--dsh-composer-side-clearance)), 100%);z-index:1;align-self:center;gap:8px;padding-bottom:32px;position:relative}.wSkVaW_heroGlow{z-index:-1;aspect-ratio:1051/468;pointer-events:none;width:135.438%;position:absolute;bottom:92px;left:50%;transform:translate(-50%,50%)}.wSkVaW_heroWorkspaceRow{align-items:center;gap:2px;min-width:0;margin-top:4px;padding-left:20px;display:flex}.wSkVaW_root[data-phase=hero] .wSkVaW_scrollBody{justify-content:center;overflow-y:auto}.wSkVaW_root[data-phase=settling] .wSkVaW_composerSeat{visibility:hidden}"; +@@ -6793,7 +13870,17 @@ window.__ModuleLoader__.load({ + const tag = document.createElement("style"); + tag.dataset.plugin = "@deepseek-ai/dsh-client-ui-conversation"; + tag.dataset.pluginCss = tagId$6; +- tag.textContent = css$6; ++ tag.textContent = css$6 + ".wSkVaW_root{position:relative}.wSkVaW_root[data-phase=hero]>[data-center-composer-host]{position:absolute;inset:0;display:flex;align-items:center;justify-content:center}.sRp_root{--dsh-chat-content-width:100%;--dsh-composer-card-max-width:100%;--dsh-composer-side-clearance:8px;--dsh-composer-dock-inset:4px;position:absolute;inset:0;z-index:2;min-width:0;height:100%;background:transparent;display:flex;flex-direction:column;pointer-events:none;overflow:hidden}.sRp_root[data-research-active=false]{opacity:0;pointer-events:none}.sRp_root[data-research-active=false] *{pointer-events:none!important}.sRp_tabs{pointer-events:auto;flex:none;min-width:0;height:44px;padding:7px 8px 6px;border-bottom:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-base);display:flex;align-items:center;gap:4px;overflow:hidden}.sRp_tab{min-width:0;height:30px;padding:0 9px;border:0;border-radius:8px;background:transparent;color:var(--dsw-alias-label-tertiary);font:inherit;font-size:12px;line-height:20px;white-space:nowrap;cursor:pointer;position:relative;display:inline-flex;align-items:center;gap:5px}.sRp_tab[aria-selected=true]{background:var(--dsw-alias-interactive-bg-hover-solid);color:var(--dsw-alias-label-primary)}.sRp_tab[data-unread=true]:after{content:\"\";width:6px;height:6px;border-radius:50%;background:var(--dsw-alias-state-business-primary);flex:none}.sRp_tab[data-running=true]:before{content:\"\";width:6px;height:6px;border-radius:50%;background:var(--dsw-alias-state-business-primary);animation:sRp_running 1s ease-in-out infinite alternate;flex:none}@keyframes sRp_running{from{opacity:.3}to{opacity:1}}.sRp_close,.sRp_add{width:26px;height:26px;border:0;border-radius:7px;background:transparent;color:var(--dsw-alias-label-caption);cursor:pointer;display:grid;place-items:center;flex:none}.sRp_close:hover,.sRp_add:hover{background:var(--dsw-alias-interactive-bg-hover)}.sRp_close{margin-left:-6px}.sRp_add{margin-left:auto;font-size:18px}.sRp_body{pointer-events:auto;min-width:0;min-height:0;flex:1;background:var(--dsw-alias-bg-base);overflow:hidden}.sRp_body[hidden]{display:none}.sRp_conversation{min-height:0;height:100%;display:flex;flex-direction:column;overflow-y:auto;overflow-x:hidden}.sRp_messages{min-height:0;flex:1}.sRp_composer{position:sticky;bottom:0;flex:none;min-width:0;background:linear-gradient(180deg,color-mix(in srgb,var(--dsw-alias-bg-base) 0%,transparent),var(--dsw-alias-bg-base) 24px);overflow:hidden}.sRp_composer .uV2eYG_tools{gap:8px}.sRp_composer .uV2eYG_modes,.sRp_composer .uV2eYG_trailing{gap:6px}.sRp_files{height:100%;padding:8px;overflow:auto}.sRp_file{width:100%;min-width:0;padding:8px;border:0;border-radius:9px;background:transparent;color:var(--dsw-alias-label-primary);text-align:left;display:grid;grid-template-columns:minmax(0,1fr) auto;gap:2px 8px}.sRp_file[draggable=true]{cursor:grab}.sRp_file:hover{background:var(--dsw-alias-interactive-bg-hover)}.sRp_fileName{min-width:0;text-overflow:ellipsis;white-space:nowrap;overflow:hidden;font-size:13px}.sRp_fileMeta{grid-column:1/-1;color:var(--dsw-alias-label-caption);font-size:11px}.sRp_fileUnavailable{color:var(--dsw-alias-state-warn-label)}.sRp_selectionAction{z-index:20;position:fixed;pointer-events:auto;border:0;border-radius:8px;background:var(--dsw-alias-state-business-primary);color:#fff;padding:5px 9px;font-size:12px;box-shadow:var(--dsw-shadow-lv2);cursor:pointer}.sRp_sourceStatus{z-index:19;position:absolute;right:10px;bottom:72px;pointer-events:none;border-radius:8px;background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-state-warn-label);padding:7px 10px;font-size:12px;box-shadow:var(--dsw-shadow-lv1)}@media (prefers-reduced-motion:reduce){.sRp_tab[data-running=true]:before{animation:none}}"; ++ tag.textContent += ".sRp_root{position:relative;inset:auto;z-index:auto;box-sizing:border-box;width:100%;height:100%;container-type:inline-size;background:var(--dsw-alias-bg-base);pointer-events:auto}.sRp_tabs,.sRp_files{display:none!important}.sRp_body{width:100%;height:100%}.sRp_conversation{min-width:0;max-width:100%;overflow-x:hidden}.sRp_messages{min-width:0;max-width:100%;overflow-x:hidden}.sRp_emptyState{box-sizing:border-box;width:100%;height:100%;min-height:260px}.sRp_composer [data-research-empty-workspace-row]{box-sizing:border-box;margin:0 8px 2px;padding-left:12px}.sRp_root .Md3f7G_scroll{box-sizing:border-box;max-width:100%;padding-inline:16px}.sRp_root .Md3f7G_column,.sRp_root .Md3f7G_flowItem{min-width:0;max-width:100%}.sRp_root .p-xYUq_actions{min-width:0;max-width:100%;height:auto;flex-wrap:wrap}.sRp_root .p-xYUq_timeEnd,.sRp_root .p-xYUq_timeStart{min-width:0;max-width:100%;overflow:hidden;text-overflow:ellipsis}.sRp_root .FJxK0a_root{max-width:100%;padding-inline:12px}.sRp_root pre{box-sizing:border-box;max-width:100%;overflow-x:auto}.sRp_root code{max-width:100%;overflow-wrap:anywhere}.sRp_composer{box-sizing:border-box;width:100%;max-width:100%;overflow:hidden}.sRp_composer .uV2eYG_root,.sRp_composer .uV2eYG_card,.sRp_composer .uV2eYG_row{box-sizing:border-box;min-width:0;max-width:100%}.sRp_composer .uV2eYG_row{gap:6px}.sRp_composer .uV2eYG_tools,.sRp_composer .uV2eYG_modes{min-width:0}.sRp_composer .uV2eYG_select{min-width:0;max-width:min(180px,40cqw)}@container (max-width:360px){.sRp_root{--dsh-composer-side-clearance:6px}.sRp_root .Md3f7G_scroll{padding-inline:12px}.sRp_root .p-xYUq_actions{gap:4px}.sRp_root .p-xYUq_timeEnd,.sRp_root .p-xYUq_timeStart{flex:1 1 100%;padding-inline:0}.sRp_composer .uV2eYG_row{align-items:center;gap:4px;flex-wrap:wrap}.sRp_composer .uV2eYG_tools{flex:1 1 100%;gap:4px;overflow:hidden}.sRp_composer .uV2eYG_modes{gap:3px}.sRp_composer .uV2eYG_trailing{gap:4px;margin-left:auto}.sRp_composer .uV2eYG_select{max-width:min(150px,48cqw)}.sRp_root .FJxK0a_root{padding-inline:8px}}"; ++ document.head.appendChild(tag); ++ } ++ const researchConversationChromeTagId = "@deepseek-ai/dsh-client-ui-conversation/ResearchConversationChromeOverrides"; ++ if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(researchConversationChromeTagId) + "]") === null) { ++ const tag = document.createElement("style"); ++ tag.dataset.plugin = "@deepseek-ai/dsh-client-ui-conversation"; ++ tag.dataset.pluginCss = researchConversationChromeTagId; ++ tag.textContent = ".wSkVaW_root{position:relative}.wSkVaW_root[data-phase=hero]>[data-center-composer-host]{position:absolute;inset:0;display:flex;align-items:center;justify-content:center}.wSkVaW_root[data-phase=hero]>[data-center-composer-host]>[data-composer-seat]{width:100%}.wSkVaW_root[data-phase=active]>[data-center-composer-host]{position:absolute;left:0;right:0;bottom:0;z-index:7;background:none;pointer-events:none}.wSkVaW_root[data-phase=active]>[data-center-composer-host]>[data-composer-portal-host]{pointer-events:none}.wSkVaW_root[data-phase=active] .uV2eYG_card,.wSkVaW_root[data-phase=active] [data-slot=conversation\\.input\\.dock]>*,.wSkVaW_root[data-phase=active] .FJxK0a_root,.wSkVaW_root[data-phase=active] .Mbwy4a_frame,.wSkVaW_root[data-phase=active] .LVzXQa_frame,.wSkVaW_root[data-phase=active] .bqrRRG_root{pointer-events:auto}.wSkVaW_root[data-phase=active] .wSkVaW_composerSeat{background:none}.wSkVaW_root[data-phase=active]>.wSkVaW_scrollBody:not([data-research-center]):not(:has([data-conversation-composer-overlay])){scroll-padding-bottom:var(--dsh-composer-height,152px)}.wSkVaW_root[data-phase=active]>.wSkVaW_scrollBody:not([data-research-center]):not(:has([data-conversation-composer-overlay]))::after{content:\"\";display:block;flex:0 0 var(--dsh-composer-height,152px);width:min(var(--dsh-composer-card-max-width),100%);max-width:100%;margin:0 auto;pointer-events:none}.sRp_root .p-xYUq_actions{min-width:0;max-width:100%;height:auto;flex-wrap:nowrap;gap:4px}.sRp_root .p-xYUq_timeEnd{flex:1 1 auto;padding-left:2px;min-width:0;overflow:hidden;text-overflow:ellipsis}.sRp_root .p-xYUq_timeStart{min-width:0;overflow:hidden;text-overflow:ellipsis}@container (max-width:360px){.sRp_root .p-xYUq_timeEnd,.sRp_root .p-xYUq_timeStart{flex:1 1 auto;padding-inline:0}}.sRp_composer{z-index:21;background:none;overflow:visible}.sRp_composer .uV2eYG_overlayAnchor{z-index:2}.sRp_composer .dsh-paperclip-wrap{position:static}.sRp_composer .dsh-paperclip-wrap .dsh-paperclip-tip{bottom:calc(100% + 8px);left:12px;transform:none}"; ++ tag.textContent += ".wSkVaW_root[data-phase=hero]>[data-center-composer-host]>[data-composer-portal-host]{width:100%}.wSkVaW_root[data-phase=hero] .wSkVaW_composerHero{box-sizing:border-box;width:100%;max-width:812px}"; + document.head.appendChild(tag); + } + var ConversationRoot_module_css_default = { +@@ -6822,7 +13909,355 @@ window.__ModuleLoader__.load({ + }; + //#endregion + //#region lib/types/client/skeleton/ConversationRoot.js +- function ConversationRoot({ sessionId, useSession, useSessions, useWorkspaces, useInput, useComposerBlock, renderSlot, renderSlotChain, selectWorkspace, t }) { ++ function isComposerSubmitKey(event) { ++ return event?.key === "Enter" && event.shiftKey !== true && event.isComposing !== true && event.nativeEvent?.isComposing !== true; ++ } ++ function isComposerSendButton(target) { ++ const button = target?.closest?.("button"); ++ if (button === null || button === void 0) return false; ++ if (String(button.type ?? "").toLowerCase() === "submit") return true; ++ const label = String(button.getAttribute?.("aria-label") ?? "").trim().toLowerCase(); ++ return label === "发送消息" || label === "send message"; ++ } ++ function composerScrollTargets(target) { ++ const host = target?.closest?.("[data-conversation-scroll]") ?? null; ++ if (host === null) return []; ++ const flowScrollport = host.querySelector?.("[data-chat-flow]")?.parentElement ?? null; ++ return flowScrollport === null || flowScrollport === host ? [host] : [host, flowScrollport]; ++ } ++ function scheduleComposerBottomSettles(settle, scheduleFrame, scheduleDelay) { ++ settle(); ++ scheduleFrame(() => { ++ settle(); ++ scheduleFrame(settle); ++ }); ++ scheduleDelay(settle, 120); ++ scheduleDelay(settle, 360); ++ scheduleDelay(settle, 720); ++ scheduleDelay(settle, 1200); ++ } ++ function followComposerSubmission(target) { ++ const scrollports = composerScrollTargets(target).filter((candidate) => candidate instanceof HTMLElement); ++ if (scrollports.length === 0) return; ++ const host = scrollports[0]; ++ const settle = () => { ++ const tail = host.querySelector?.("[data-chat-flow]")?.lastElementChild ?? null; ++ tail?.scrollIntoView?.({ block: "end" }); ++ for (const scrollport of scrollports) scrollport.scrollTop = scrollport.scrollHeight; ++ }; ++ scheduleComposerBottomSettles(settle, requestAnimationFrame, setTimeout); ++ } ++ function ComposerSurface({ zone, hero, researchEmpty, inputBar, pending, session, heroWorkspaceRow, renderSlot, renderSlotChain, seatResizeRef, t }) { ++ const composerBar = (0, react_jsx_runtime.jsxs)("div", { ++ className: clsx(ConversationRoot_module_css_default.composerStack, hero && ConversationRoot_module_css_default.composerHero), ++ children: [ ++ hero && (0, react_jsx_runtime.jsx)(HeroGlow, { className: ConversationRoot_module_css_default.heroGlow }), ++ hero && (0, react_jsx_runtime.jsx)(HeroShell, { t }), ++ (hero || researchEmpty) && heroWorkspaceRow, ++ zone !== void 0 && renderSlot("conversation.input.dock", zone), ++ inputBar ++ ] ++ }); ++ const composer = renderSlotChain("conversation.composer", { ++ interactions: pending, ++ session ++ }, { ++ fallback: composerBar, ++ overlay: true ++ }); ++ return (0, react_jsx_runtime.jsx)("div", { ++ ref: seatResizeRef, ++ className: ConversationRoot_module_css_default.composerSeat, ++ "data-composer-seat": "", ++ onKeyDownCapture: (event) => { ++ if (isComposerSubmitKey(event)) followComposerSubmission(event.currentTarget); ++ }, ++ onClickCapture: (event) => { ++ if (isComposerSendButton(event.target)) followComposerSubmission(event.currentTarget); ++ }, ++ children: composer ++ }); ++ } ++ function researchFileBasename(value) { ++ const parts = String(value ?? "").split(/[\\/]/).filter(Boolean); ++ return parts.at(-1) ?? String(value ?? ""); ++ } ++ function closeGlyph() { ++ return (0, react_jsx_runtime.jsx)("svg", { ++ viewBox: "0 0 16 16", ++ width: "12", ++ height: "12", ++ "aria-hidden": true, ++ children: (0, react_jsx_runtime.jsx)("path", { ++ d: "M4 4l8 8M12 4l-8 8", ++ stroke: "currentColor", ++ strokeWidth: "1.5", ++ strokeLinecap: "round" ++ }) ++ }); ++ } ++ function settledAssistantWrapper(node, root) { ++ const element = node?.nodeType === 1 ? node : node?.parentElement; ++ const wrapper = element?.closest?.("[data-assistant-message-id]") ?? null; ++ return wrapper !== null && root.contains(wrapper) && wrapper.hasAttribute("data-assistant-message-settled") ? wrapper : null; ++ } ++ function researchAssistantSelection(selection, root, sessionId) { ++ if (selection === null || selection.rangeCount !== 1 || selection.isCollapsed) return null; ++ const range = selection.getRangeAt(0); ++ const start = settledAssistantWrapper(range.startContainer, root); ++ const end = settledAssistantWrapper(range.endContainer, root); ++ if (start === null || start !== end) return null; ++ const boundedSessionId = boundedResearchArtifactString(sessionId, RESEARCH_CANVAS_TEXT_LIMIT); ++ const messageId = boundedResearchArtifactString(start.getAttribute("data-assistant-message-id"), RESEARCH_CANVAS_TEXT_LIMIT); ++ const excerpt = normalizeResearchArtifactText(range.toString()); ++ if (boundedSessionId === null || messageId === null || excerpt === null) return null; ++ const rect = range.getBoundingClientRect(); ++ return { ++ wrapper: start, ++ payload: { sessionId: boundedSessionId, messageId, kind: "assistant-excerpt", title: "助手摘录", excerpt }, ++ position: { left: rect.right + 6, top: rect.bottom + 6 } ++ }; ++ } ++ function ResearchConversationPanel({ active, sessionId, presentation, researchWorkspaces, conversationHostRef, composerHostRef }) { ++ const panelRef = (0, react.useRef)(null); ++ const [selectionAction, setSelectionAction] = (0, react.useState)(null); ++ const [sourceStatus, setSourceStatus] = (0, react.useState)(null); ++ const workspace = (0, react.useMemo)(() => researchWorkspaces.for(sessionId), [researchWorkspaces, sessionId]); ++ const workspaceSnapshot = (0, react.useSyncExternalStore)(workspace.subscribe, workspace.getSnapshot, workspace.getSnapshot); ++ (0, react.useEffect)(() => { ++ setSelectionAction(null); ++ }, [sessionId]); ++ (0, react.useLayoutEffect)(() => { ++ setSourceStatus(null); ++ }, [active, sessionId]); ++ (0, react.useEffect)(() => { ++ if (!active) setSelectionAction(null); ++ }, [active]); ++ (0, react.useLayoutEffect)(() => { ++ workspace.setAssistantActionsActive(active); ++ return () => workspace.setAssistantActionsActive(false); ++ }, [active, workspace]); ++ (0, react.useLayoutEffect)(() => { ++ const messageId = workspaceSnapshot.pendingMessageJump; ++ const panel = panelRef.current; ++ if (!active || messageId === null || panel === null) return; ++ const source = Array.from(panel.querySelectorAll("[data-assistant-message-id]")).find((candidate) => candidate.getAttribute("data-assistant-message-id") === messageId) ?? null; ++ workspace.clearPendingMessageJump(); ++ if (source === null) { ++ workspace.setSourceAvailability(messageId, false); ++ setSourceStatus("来源消息不可用"); ++ return; ++ } ++ workspace.setSourceAvailability(messageId, true); ++ setSourceStatus(null); ++ if (!source.hasAttribute("tabindex")) source.setAttribute("tabindex", "-1"); ++ source.scrollIntoView?.({ block: "center" }); ++ source.focus({ preventScroll: true }); ++ }, [active, workspace, workspaceSnapshot.pendingMessageJump]); ++ const validateSelection = () => { ++ const panel = panelRef.current; ++ return panel === null ? null : researchAssistantSelection(window.getSelection?.() ?? null, panel, sessionId); ++ }; ++ const onSelectionEnd = () => setSelectionAction(validateSelection()); ++ const onSelectionDragStart = (event) => { ++ const selected = validateSelection(); ++ const panel = panelRef.current; ++ const targetWrapper = panel === null ? null : settledAssistantWrapper(event.target, panel); ++ if (selected === null || selected.wrapper !== targetWrapper || event.dataTransfer === null) return; ++ event.dataTransfer.effectAllowed = "copy"; ++ event.dataTransfer.setData(RESEARCH_ARTIFACT_DRAG_TYPE, JSON.stringify(selected.payload)); ++ }; ++ return (0, react_jsx_runtime.jsxs)("section", { ++ ref: panelRef, ++ className: "sRp_root", ++ "data-research-conversation-panel": "", ++ "data-research-active": active, ++ inert: active ? void 0 : "", ++ "aria-hidden": !active || void 0, ++ onMouseUp: onSelectionEnd, ++ onDragStartCapture: onSelectionDragStart, ++ children: [(0, react_jsx_runtime.jsxs)("div", { ++ className: "sRp_body sRp_conversation", ++ "data-conversation-scroll": "", ++ hidden: !active, ++ children: [(0, react_jsx_runtime.jsx)("div", { ++ ref: conversationHostRef, ++ className: "sRp_messages", ++ "data-research-conversation-host": "" ++ }), (0, react_jsx_runtime.jsx)("div", { ++ ref: composerHostRef, ++ className: "sRp_composer", ++ "data-research-composer-host": "" ++ })] ++ }), !active || selectionAction === null ? null : (0, react_jsx_runtime.jsx)("button", { ++ type: "button", ++ className: "sRp_selectionAction", ++ "aria-label": "加入画布", ++ style: selectionAction.position, ++ onClick: () => workspace.addExcerpt(selectionAction.payload.messageId, selectionAction.payload.excerpt, workspace.visibleCenter()), ++ children: "加入画布" ++ }), !active || sourceStatus === null ? null : (0, react_jsx_runtime.jsx)("div", { ++ className: "sRp_sourceStatus", ++ role: "status", ++ "aria-live": "polite", ++ children: sourceStatus ++ })] ++ }); ++ } ++ function activeSidebarTabId(state) { ++ if (state === void 0) return null; ++ let fallback = null; ++ const visit = (node) => { ++ if (node?.kind === "leaf") { ++ if (fallback === null && typeof node.active === "string") fallback = node.active; ++ return node.id === state.activePane && typeof node.active === "string" ? node.active : null; ++ } ++ for (const child of node?.children ?? []) { ++ const found = visit(child); ++ if (found !== null) return found; ++ } ++ return null; ++ }; ++ return visit(state.splits) ?? fallback; ++ } ++ function createResearchSidebarStore() { ++ let snapshot = Object.freeze({ binding: null, conversationHost: null, composerHost: null }); ++ const listeners = /* @__PURE__ */ new Set(); ++ return { ++ subscribe(listener) { listeners.add(listener); return () => listeners.delete(listener); }, ++ getSnapshot() { return snapshot; }, ++ update(patch) { ++ snapshot = Object.freeze({ ...snapshot, ...patch }); ++ listeners.forEach((listener) => listener()); ++ } ++ }; ++ } ++ class ResearchSidebarCoordinator { ++ service = null; ++ title = "对话"; ++ stores = /* @__PURE__ */ new Map(); ++ previous = /* @__PURE__ */ new Map(); ++ storeFor(sessionId) { ++ let store = this.stores.get(sessionId); ++ if (store === void 0) { ++ store = createResearchSidebarStore(); ++ this.stores.set(sessionId, store); ++ } ++ return store; ++ } ++ attach(service, t) { ++ this.service = service; ++ this.title = t("research.right.conversation"); ++ const coordinator = this; ++ const unregister = service.registerTab({ ++ id: "sherlock-research-conversation", ++ title: () => t("research.right.conversation"), ++ hidden: true, ++ single: true, ++ component: (props) => (0, react_jsx_runtime.jsx)(ResearchSidebarConversationTab, { ...props, coordinator }) ++ }); ++ return () => { ++ unregister?.(); ++ if (this.service === service) this.service = null; ++ }; ++ } ++ publish(sessionId, binding) { ++ this.storeFor(sessionId).update({ binding }); ++ } ++ setComposerHost(sessionId, composerHost) { ++ const store = this.storeFor(sessionId); ++ if (store.getSnapshot().composerHost === composerHost) return; ++ store.update({ composerHost }); ++ } ++ setConversationHost(sessionId, conversationHost) { ++ const store = this.storeFor(sessionId); ++ if (store.getSnapshot().conversationHost === conversationHost) return; ++ store.update({ conversationHost }); ++ } ++ enter(sessionId) { ++ const service = this.service; ++ if (service === null) return; ++ if (!this.previous.has(sessionId)) { ++ const state = service.getSnapshot?.().state; ++ this.previous.set(sessionId, { ++ activeTabId: activeSidebarTabId(state), ++ open: state?.panelOpen === true, ++ width: state?.width ++ }); ++ } ++ const scope = { sessionId }; ++ service.openTab({ ++ id: "sherlock-research-conversation", ++ type: "sherlock-research-conversation", ++ title: this.title, ++ path: "sherlock://research/conversation", ++ meta: { sherlockPinned: true, sherlockClosable: false } ++ }, scope); ++ service.setPanelState?.({ open: true }, scope); ++ } ++ leave(sessionId) { ++ const service = this.service; ++ const previous = this.previous.get(sessionId); ++ this.previous.delete(sessionId); ++ if (service === null) return; ++ const scope = { sessionId }; ++ service.updateTab("sherlock-research-conversation", { ++ meta: { sherlockPinned: false, sherlockClosable: true } ++ }, scope); ++ service.closeTab("sherlock-research-conversation", scope); ++ if (previous?.activeTabId !== null && previous?.activeTabId !== void 0) service.activateTab(previous.activeTabId, scope); ++ if (previous !== void 0) service.setPanelState?.({ open: previous.open, ...previous.width === void 0 ? {} : { width: previous.width } }, scope); ++ } ++ } ++ function ResearchSidebarConversationTab({ scope, visible, coordinator }) { ++ const sessionId = scope.sessionId; ++ const store = (0, react.useMemo)(() => coordinator.storeFor(sessionId), [coordinator, sessionId]); ++ const snapshot = (0, react.useSyncExternalStore)(store.subscribe, store.getSnapshot, store.getSnapshot); ++ const conversationHostRef = (0, react.useCallback)((host) => coordinator.setConversationHost(sessionId, host), [coordinator, sessionId]); ++ const composerHostRef = (0, react.useCallback)((host) => coordinator.setComposerHost(sessionId, host), [coordinator, sessionId]); ++ const binding = snapshot.binding; ++ if (binding === null) return (0, react_jsx_runtime.jsx)("div", { "data-research-conversation-empty": "" }); ++ return (0, react_jsx_runtime.jsx)(ResearchConversationPanel, { ++ active: binding.active && visible, ++ sessionId, ++ presentation: binding.presentation, ++ researchWorkspaces: binding.researchWorkspaces, ++ conversationHostRef, ++ composerHostRef ++ }); ++ } ++ const defaultResearchSidebar = new ResearchSidebarCoordinator(); ++ const ABSENT_RESEARCH_SIDEBAR_SNAPSHOT = Object.freeze({ binding: null, conversationHost: null, composerHost: null }); ++ const ABSENT_RESEARCH_SIDEBAR_STORE = { ++ subscribe: () => () => {}, ++ getSnapshot: () => ABSENT_RESEARCH_SIDEBAR_SNAPSHOT ++ }; ++ const ABSENT_RESEARCH_WORKSPACE_SNAPSHOT = Object.freeze({ files: Object.freeze([]), selection: EMPTY_RESEARCH_SELECTION }); ++ const ABSENT_RESEARCH_WORKSPACE = { ++ subscribe: () => () => {}, ++ getSnapshot: () => ABSENT_RESEARCH_WORKSPACE_SNAPSHOT, ++ focusNode: () => false ++ }; ++ const ABSENT_RESEARCH_PRESENTATION = Object.freeze({ ++ view: "chat", ++ selection: null, ++ inspect: null, ++ conversationView: null, ++ researchRightTab: "conversation", ++ researchFilesTabOpen: true, ++ researchConversationUnread: false, ++ actions: null ++ }); ++ const ABSENT_CHAT_ACTIONS = Object.freeze({ ++ select: () => {}, ++ setDraft: () => {}, ++ setView: () => {}, ++ setInspect: () => {}, ++ setResearchRightTab: () => {}, ++ setResearchFilesTabOpen: () => {}, ++ setResearchConversationUnread: () => {} ++ }); ++ function ConversationRoot({ sessionId, useSession, useSessions, useWorkspaces, useInput, useComposerBlock, useStore, actions, renderSlot, renderSlotChain, selectWorkspace, setResearchActive = () => {}, researchWorkspaces, researchSidebar = defaultResearchSidebar, t }) { + const openState = useSession((s) => s.openState); + const composerPhase = useSession((s) => s.composerPhase); + const pending = useSession((s) => s.pending) ?? []; +@@ -6832,22 +14267,167 @@ window.__ModuleLoader__.load({ + const summaryBlank = useSessions((s) => sessionId === void 0 ? void 0 : s.byId[sessionId]?.blank); + const workspaces = useWorkspaces((s) => s); + const composerBlock = useComposerBlock((block) => block); ++ const [sessionPresentationState, setSessionPresentationState] = (0, react.useState)({ sessionId, presentation: ABSENT_RESEARCH_PRESENTATION }); ++ const sessionPresentation = sessionPresentationState.sessionId === sessionId ? sessionPresentationState.presentation : ABSENT_RESEARCH_PRESENTATION; ++ const directActiveView = useStore?.((s) => s.view ?? "chat"); ++ const directDetailsSelection = useStore?.((s) => s.selection); ++ const directInspect = useStore?.((s) => s.inspect ?? null); ++ const directResearchRightTab = useStore?.((s) => s.researchRightTab ?? "conversation"); ++ const directResearchFilesTabOpen = useStore?.((s) => s.researchFilesTabOpen ?? true); ++ const directResearchConversationUnread = useStore?.((s) => s.researchConversationUnread ?? false); ++ const activeView = directActiveView ?? sessionPresentation.view; ++ const detailsSelection = directDetailsSelection ?? sessionPresentation.selection; ++ const resolvedActions = actions ?? sessionPresentation.actions ?? ABSENT_CHAT_ACTIONS; ++ const researchPresentation = (0, react.useMemo)(() => ({ ++ view: activeView, ++ selection: detailsSelection, ++ inspect: directInspect ?? sessionPresentation.inspect, ++ conversationView: sessionPresentation.conversationView, ++ researchRightTab: directResearchRightTab ?? sessionPresentation.researchRightTab, ++ researchFilesTabOpen: directResearchFilesTabOpen ?? sessionPresentation.researchFilesTabOpen, ++ researchConversationUnread: directResearchConversationUnread ?? sessionPresentation.researchConversationUnread ++ }), [ ++ activeView, ++ detailsSelection, ++ directInspect, ++ directResearchConversationUnread, ++ directResearchFilesTabOpen, ++ directResearchRightTab, ++ sessionPresentation ++ ]); ++ const research = activeView === "research"; ++ const researchWorkspace = (0, react.useMemo)(() => sessionId === void 0 ? ABSENT_RESEARCH_WORKSPACE : researchWorkspaces.for(sessionId), [researchWorkspaces, sessionId]); ++ const researchWorkspaceSnapshot2 = (0, react.useSyncExternalStore)(researchWorkspace.subscribe, researchWorkspace.getSnapshot, researchWorkspace.getSnapshot); ++ const [researchReferenceStatus, setResearchReferenceStatus] = (0, react.useState)(null); ++ (0, react.useLayoutEffect)(() => { ++ setResearchReferenceStatus(null); ++ }, [research, sessionId]); ++ (0, react.useEffect)(() => { ++ if (researchReferenceStatus === null) return; ++ const timeout = setTimeout(() => setResearchReferenceStatus(null), 2400); ++ return () => clearTimeout(timeout); ++ }, [researchReferenceStatus]); ++ const onResearchReferenceClickCapture = (0, react.useCallback)((event) => { ++ if (!research) return; ++ const target = event.target; ++ const element = target?.nodeType === 1 ? target : target?.parentElement; ++ const reference = element?.closest?.("[data-research-reference-node-id]"); ++ const nodeId = reference?.getAttribute?.("data-research-reference-node-id"); ++ if (nodeId === null || nodeId === void 0 || nodeId === "") return; ++ if (!researchWorkspace.focusNode(nodeId)) { ++ setResearchReferenceStatus("组件已删除或不可用"); ++ return; ++ } ++ setResearchReferenceStatus(null); ++ }, [research, researchWorkspace]); ++ const researchFileReferences = (0, react.useMemo)(() => { ++ if (!research || sessionId === void 0) return void 0; ++ const byId = /* @__PURE__ */ new Map(researchWorkspaceSnapshot2.files.map((file) => [file.id, file])); ++ return researchWorkspaceSnapshot2.selection.orderedFileIds.flatMap((id) => { ++ const file = byId.get(id); ++ return file === void 0 ? [] : [file]; ++ }); ++ }, [research, researchWorkspaceSnapshot2.files, researchWorkspaceSnapshot2.selection.orderedFileIds, sessionId]); ++ const researchArtifactReferences = (0, react.useMemo)(() => { ++ if (!research || sessionId === void 0) return void 0; ++ const byId = /* @__PURE__ */ new Map(researchWorkspaceSnapshot2.artifacts.map((artifact) => [artifact.id, artifact])); ++ return researchWorkspaceSnapshot2.selection.selectedNodeIds.flatMap((id) => { ++ const artifact = byId.get(id); ++ const descriptor = canonicalResearchArtifactReference(artifact); ++ return descriptor === null ? [] : [{ ...descriptor, label: researchArtifactReferenceLabel(descriptor) }]; ++ }); ++ }, [research, researchWorkspaceSnapshot2.artifacts, researchWorkspaceSnapshot2.selection.selectedNodeIds, sessionId]); + const [pickerOpen, setPickerOpen] = (0, react.useState)(false); + const [pendingWorkspaceId, setPendingWorkspaceId] = (0, react.useState)(); + const pickerAnchor = (0, react.useRef)(null); + const seatObserver = (0, react.useRef)(null); ++ const composerPortalHostRef = (0, react.useRef)(null); ++ if (composerPortalHostRef.current === null) { ++ composerPortalHostRef.current = document.createElement("div"); ++ composerPortalHostRef.current.setAttribute("data-composer-portal-host", ""); ++ } ++ const centerComposerHostRef = (0, react.useRef)(null); ++ const composerHeightRef = (0, react.useRef)(0); ++ const composerSelectionRef = (0, react.useRef)(null); ++ const researchStateRef = (0, react.useRef)({ sessionId: void 0, active: false }); ++ const preResearchSelections = (0, react.useRef)(/* @__PURE__ */ new Map()); ++ const researchActions = (0, react.useRef)(/* @__PURE__ */ new Map()); ++ const researchSidebarStore = (0, react.useMemo)(() => sessionId === void 0 ? ABSENT_RESEARCH_SIDEBAR_STORE : researchSidebar.storeFor(sessionId), [researchSidebar, sessionId]); ++ const researchSidebarSnapshot = (0, react.useSyncExternalStore)(researchSidebarStore.subscribe, researchSidebarStore.getSnapshot, researchSidebarStore.getSnapshot); ++ const publishResearchPresentation = (0, react.useCallback)((presentation) => { ++ setSessionPresentationState({ sessionId, presentation: presentation ?? ABSENT_RESEARCH_PRESENTATION }); ++ }, [sessionId]); ++ const publishComposerHeight = (0, react.useCallback)((height) => { ++ if (!(height > 0)) return; ++ composerHeightRef.current = height; ++ const portalHost = composerPortalHostRef.current; ++ const centerScroll = centerComposerHostRef.current?.previousElementSibling; ++ const activeScroll = portalHost?.closest?.("[data-conversation-scroll]") ?? null; ++ for (const target of /* @__PURE__ */ new Set([ ++ portalHost, ++ centerScroll?.hasAttribute?.("data-conversation-scroll") ? centerScroll : null, ++ activeScroll ++ ])) target?.style?.setProperty("--dsh-composer-height", `${height}px`); ++ }, []); + const seatResizeRef = (0, react.useCallback)((seat) => { + seatObserver.current?.disconnect(); + seatObserver.current = null; +- const scroller = seat?.parentElement ?? null; +- if (seat === null || scroller === null) return; ++ if (seat === null) return; + seatObserver.current = new ResizeObserver(() => { +- scroller.style.setProperty("--dsh-composer-height", `${seat.offsetHeight}px`); ++ publishComposerHeight(seat.offsetHeight); + }); + seatObserver.current.observe(seat); +- }, []); ++ }, [publishComposerHeight]); + const sessionWorkspace = sessionId === void 0 ? void 0 : workspaces.items.find((workspace) => workspace.sessionIds.includes(sessionId)); + const pendingWorkspace = workspaces.items.find((workspace) => workspace.workspaceId === pendingWorkspaceId); ++ (0, react.useLayoutEffect)(() => { ++ if (sessionId === void 0) return; ++ researchSidebar.publish(sessionId, { ++ active: research, ++ presentation: researchPresentation, ++ researchWorkspaces ++ }); ++ }, [research, researchPresentation, researchSidebar, researchWorkspaces, sessionId]); ++ (0, react.useEffect)(() => () => { ++ if (sessionId !== void 0) researchSidebar.publish(sessionId, null); ++ }, [researchSidebar, sessionId]); ++ (0, react.useEffect)(() => { ++ if (sessionId === void 0) return; ++ setResearchActive(sessionId, research); ++ return () => { ++ setResearchActive(sessionId, false); ++ }; ++ }, [research, sessionId, setResearchActive]); ++ (0, react.useEffect)(() => { ++ if (sessionId === void 0) return; ++ const previous = researchStateRef.current; ++ const sessionChanged = previous.sessionId !== sessionId; ++ researchActions.current.set(sessionId, resolvedActions); ++ if (research) { ++ if (sessionChanged && previous.active && previous.sessionId !== void 0) researchSidebar.leave(previous.sessionId); ++ if (!preResearchSelections.current.has(sessionId)) preResearchSelections.current.set(sessionId, detailsSelection); ++ if (sessionChanged || !previous.active) researchSidebar.enter(sessionId); ++ if (sessionChanged || !previous.active) { ++ resolvedActions.setResearchRightTab("conversation"); ++ resolvedActions.setResearchConversationUnread(false); ++ } ++ } else { ++ if (preResearchSelections.current.has(sessionId)) { ++ resolvedActions.select(preResearchSelections.current.get(sessionId)); ++ preResearchSelections.current.delete(sessionId); ++ researchActions.current.delete(sessionId); ++ } ++ if (previous.active && previous.sessionId !== void 0) researchSidebar.leave(previous.sessionId); ++ } ++ researchStateRef.current = { sessionId, active: research }; ++ }, [resolvedActions, detailsSelection, research, researchSidebar, sessionId]); ++ (0, react.useEffect)(() => () => { ++ const current = researchStateRef.current; ++ if (!current.active || current.sessionId === void 0) return; ++ const currentActions = researchActions.current.get(current.sessionId); ++ if (preResearchSelections.current.has(current.sessionId)) currentActions?.select(preResearchSelections.current.get(current.sessionId)); ++ researchSidebar.leave(current.sessionId); ++ }, []); + (0, react.useEffect)(() => { + if (pendingWorkspaceId === void 0) return; + if (sessionWorkspace?.workspaceId === pendingWorkspaceId || workspaces.phase === "ready" && pendingWorkspace === void 0) setPendingWorkspaceId(void 0); +@@ -6857,8 +14437,9 @@ window.__ModuleLoader__.load({ + workspaces.phase, + pendingWorkspace + ]); +- const settling = sessionId !== void 0 && composerPhase === "blank" && openState === "loading" && summaryBlank !== true; +- const hero = sessionId === void 0 || composerPhase === "blank" && (openState === "open" || summaryBlank === true); ++ const settling = !research && sessionId !== void 0 && composerPhase === "blank" && openState === "loading" && summaryBlank !== true; ++ const hero = !research && (sessionId === void 0 || composerPhase === "blank" && (openState === "open" || summaryBlank === true)); ++ const researchEmpty = research && sessionId !== void 0 && composerPhase === "blank" && (session?.blank === true || summaryBlank === true) && (session?.chat?.order?.length ?? 0) === 0; + const zone = session === void 0 || inputState === void 0 ? void 0 : { + session, + input: inputState +@@ -6866,6 +14447,7 @@ window.__ModuleLoader__.load({ + const chipTitle = pendingWorkspace?.title ?? (sessionId === void 0 ? void 0 : sessionWorkspace?.title ?? (workspaces.phase === "ready" || cwd === void 0 || cwd === "" ? void 0 : workspaceLabel(cwd))); + const heroWorkspaceRow = (0, react_jsx_runtime.jsxs)("div", { + className: ConversationRoot_module_css_default.heroWorkspaceRow, ++ "data-research-empty-workspace-row": researchEmpty || void 0, + children: [ + (0, react_jsx_runtime.jsx)(WorkspaceChip, { + buttonRef: pickerAnchor, +@@ -6897,6 +14479,8 @@ window.__ModuleLoader__.load({ + const inert = sessionId === void 0 || hero && chipTitle === void 0; + const inputBar = renderSlot("conversation.composer.bar", { + variant: hero ? "hero" : "composer", ++ researchFileReferences, ++ researchArtifactReferences, + ...inert ? { + disabled: true, + placeholder: t("placeholder.workspace"), +@@ -6913,37 +14497,81 @@ window.__ModuleLoader__.load({ + rightItems: zone === void 0 ? null : renderSlot("conversation.input.right", zone), + footer: !hero && zone !== void 0 ? renderSlot("conversation.composer.dock", zone) : null + }); +- const composerBar = (0, react_jsx_runtime.jsxs)("div", { +- className: clsx(ConversationRoot_module_css_default.composerStack, hero && ConversationRoot_module_css_default.composerHero), +- children: [ +- hero && (0, react_jsx_runtime.jsx)(HeroGlow, { className: ConversationRoot_module_css_default.heroGlow }), +- hero && (0, react_jsx_runtime.jsx)(HeroShell, { t }), +- hero && heroWorkspaceRow, +- zone !== void 0 && renderSlot("conversation.input.dock", zone), +- inputBar +- ] +- }); + const phase = settling ? "settling" : hero ? "hero" : "active"; +- const composer = renderSlotChain("conversation.composer", { +- interactions: pending, +- session +- }, { +- fallback: composerBar, +- overlay: true +- }); +- const composerSeat = (0, react_jsx_runtime.jsx)("div", { +- ref: seatResizeRef, +- className: ConversationRoot_module_css_default.composerSeat, +- "data-composer-seat": "", +- children: composer ++ const composerSurface = (0, react_jsx_runtime.jsx)(ComposerSurface, { ++ zone, ++ hero, ++ researchEmpty, ++ inputBar, ++ pending, ++ session, ++ heroWorkspaceRow, ++ renderSlot, ++ renderSlotChain, ++ seatResizeRef, ++ t + }); ++ const composerPortalHost = composerPortalHostRef.current; ++ const activeComposerControl = document.activeElement; ++ if (activeComposerControl?.tagName === "TEXTAREA" && composerPortalHost.contains(activeComposerControl)) composerSelectionRef.current = { ++ node: activeComposerControl, ++ start: activeComposerControl.selectionStart, ++ end: activeComposerControl.selectionEnd ++ }; ++ (0, react.useLayoutEffect)(() => { ++ const destination = research ? researchSidebarSnapshot.composerHost : centerComposerHostRef.current; ++ if (destination === null || composerPortalHost.parentElement === destination) return; ++ const active = document.activeElement; ++ const selection = active?.tagName === "TEXTAREA" && composerPortalHost.contains(active) ? { ++ node: active, ++ start: active.selectionStart, ++ end: active.selectionEnd ++ } : composerSelectionRef.current; ++ destination.appendChild(composerPortalHost); ++ publishComposerHeight(composerHeightRef.current); ++ const restoreSelection = () => { ++ selection?.node.focus({ preventScroll: true }); ++ selection?.node.setSelectionRange(selection.start, selection.end); ++ }; ++ restoreSelection(); ++ Promise.resolve().then(() => { ++ if (document.activeElement === document.body || composerPortalHost.contains(document.activeElement)) restoreSelection(); ++ }); ++ composerSelectionRef.current = null; ++ return () => { ++ const focused = document.activeElement; ++ if (focused?.tagName === "TEXTAREA" && composerPortalHost.contains(focused)) composerSelectionRef.current = { ++ node: focused, ++ start: focused.selectionStart, ++ end: focused.selectionEnd ++ }; ++ }; ++ }, [composerPortalHost, publishComposerHeight, research, researchSidebarSnapshot.composerHost]); ++ const composerPortal = (0, react_dom.createPortal)(composerSurface, composerPortalHost); ++ const researchConversationView = researchEmpty ? (0, react_jsx_runtime.jsx)("div", { ++ className: "sRp_emptyState", ++ "data-research-empty-state": "", ++ children: (0, react_jsx_runtime.jsx)(HeroShell, { t }) ++ }) : sessionPresentation.conversationView; ++ const researchConversationPortal = research && researchSidebarSnapshot.conversationHost !== null ? (0, react_dom.createPortal)(researchConversationView, researchSidebarSnapshot.conversationHost) : null; + return (0, react_jsx_runtime.jsxs)("div", { + className: ConversationRoot_module_css_default.root, + "data-phase": phase, ++ onClickCapture: onResearchReferenceClickCapture, + children: [renderSlot("conversation.session.header", {}), (0, react_jsx_runtime.jsxs)("div", { + className: ConversationRoot_module_css_default.scrollBody, + "data-conversation-scroll": "", +- children: [renderSlot("conversation.session", {}), composerSeat] ++ "data-research-center": research || void 0, ++ children: [renderSlot("conversation.session", { onResearchPresentation: publishResearchPresentation })] ++ }), (0, react_jsx_runtime.jsx)("div", { ++ ref: centerComposerHostRef, ++ "data-center-composer-host": "" ++ }), composerPortal, researchConversationPortal, !research || researchReferenceStatus === null ? null : (0, react_jsx_runtime.jsx)("div", { ++ className: "sRp_sourceStatus", ++ "data-research-reference-status": "", ++ role: "status", ++ "aria-live": "polite", ++ children: researchReferenceStatus + })] + }); + } +@@ -6951,6 +14579,21 @@ window.__ModuleLoader__.load({ + //#region lib/types/client/skeleton/ConversationSession.js + /** Strict per-session header/body content inserted into the resident conversation layout. */ + const DEFAULT_VIEW_ID = "chat"; ++ const INITIAL_RESEARCH_SESSION_KEY = "sherlock.conversation.initial-research-session.v1"; ++ const INITIAL_RESEARCH_SESSION_EVENT = "sherlock:conversation-initial-research"; ++ const INITIAL_CHAT_SESSION_EVENT = "sherlock:conversation-initial-chat"; ++ function isInitialResearchSession(sessionId) { ++ try { ++ return window.sessionStorage.getItem(INITIAL_RESEARCH_SESSION_KEY) === sessionId; ++ } catch { ++ return false; ++ } ++ } ++ function clearInitialResearchSession(sessionId) { ++ try { ++ if (window.sessionStorage.getItem(INITIAL_RESEARCH_SESSION_KEY) === sessionId) window.sessionStorage.removeItem(INITIAL_RESEARCH_SESSION_KEY); ++ } catch {} ++ } + /** Resolve by id and keep stale persisted selections on the stable Chat fallback. */ + function resolveActiveView(tabs, selectedId) { + const requestedId = selectedId ?? DEFAULT_VIEW_ID; +@@ -6980,6 +14623,20 @@ window.__ModuleLoader__.load({ + return other !== void 0 && item.id === other.id && item.displayTitle === other.displayTitle; + }); + } ++ function conversationViewTabProps(viewTab, activeId, select) { ++ const selected = viewTab.id === activeId; ++ return { ++ type: "button", ++ role: "tab", ++ "data-conversation-view-id": viewTab.id, ++ "aria-selected": selected, ++ className: clsx(ConversationRoot_module_css_default.tab, selected && ConversationRoot_module_css_default.tabActive), ++ onClick: () => { ++ select(viewTab.id); ++ }, ++ children: viewTab.label ++ }; ++ } + /** + * Renders Session header chrome above the resident conversation scrollport. + * @param props - Strict Session store, view ledger, navigation, render, and locale shares. +@@ -6988,10 +14645,12 @@ window.__ModuleLoader__.load({ + function ConversationSessionHeader({ sessionId, useSession, useSessions, useStore, actions, renderSlot, views, open, t }) { + (0, react.useSyncExternalStore)(views.subscribe, views.version); + const tabs = views.list(); +- const active = resolveActiveView(tabs, useStore((s) => s.view)); ++ const storedView = useStore((s) => s.view); ++ const initialResearchRequested = isInitialResearchSession(sessionId); ++ const active = resolveActiveView(tabs, initialResearchRequested ? "research" : storedView); + const ancestry = useSessions((s) => deriveAncestry(s, sessionId), equalBreadcrumbs); + const composerPhase = useSession((s) => s.composerPhase); +- const hideChrome = useSession((s) => s.blank) && composerPhase === "blank"; ++ const hideChrome = useSession((s) => s.blank) && composerPhase === "blank" && active?.id !== "research"; + return (0, react_jsx_runtime.jsx)("header", { + className: clsx(ConversationRoot_module_css_default.header, hideChrome && ConversationRoot_module_css_default.headerHidden), + "aria-hidden": hideChrome || void 0, +@@ -7034,16 +14693,7 @@ window.__ModuleLoader__.load({ + }), tabs.length > 1 && (0, react_jsx_runtime.jsx)("div", { + className: ConversationRoot_module_css_default.tabs, + role: "tablist", +- children: tabs.map((viewTab) => (0, react_jsx_runtime.jsx)("button", { +- type: "button", +- role: "tab", +- "aria-selected": viewTab.id === active?.id, +- className: clsx(ConversationRoot_module_css_default.tab, viewTab.id === active?.id && ConversationRoot_module_css_default.tabActive), +- onClick: () => { +- actions.setView(viewTab.id); +- }, +- children: viewTab.label +- }, viewTab.id)) ++ children: tabs.map((viewTab) => (0, react_jsx_runtime.jsx)("button", conversationViewTabProps(viewTab, active?.id, actions.setView), viewTab.id)) + })] }) + }); + } +@@ -7053,14 +14703,72 @@ window.__ModuleLoader__.load({ + * @param props - Strict Session input/store, view ledger, and render shares. + * @returns the active view area, or null while the Session remains blank. + */ +- function ConversationSession({ sessionId, useSession, useInput, inputActions, useStore, actions, renderSlot, views, bindDraftMirror, releaseSessionImages }) { ++ function ConversationSession({ sessionId, useSession, useInput, inputActions, useStore, actions, renderSlot, views, bindDraftMirror, releaseSessionImages, releaseResearchWorkspace, onResearchPresentation }) { + (0, react.useSyncExternalStore)(views.subscribe, views.version); +- const active = resolveActiveView(views.list(), useStore((s) => s.view)); ++ const storedView = useStore((s) => s.view ?? "chat"); ++ const initialResearchRequested = isInitialResearchSession(sessionId); ++ const view = initialResearchRequested ? "research" : storedView; ++ const active = resolveActiveView(views.list(), view); + const composerPhase = useSession((s) => s.composerPhase); + const blank = useSession((s) => s.blank); + const inputState = useInput((s) => s); + const storedDraft = useStore((s) => s.draft); ++ const selection = useStore((s) => s.selection); + const inspect = useStore((s) => s.inspect ?? null); ++ const researchRightTab = useStore((s) => s.researchRightTab ?? "conversation"); ++ const researchFilesTabOpen = useStore((s) => s.researchFilesTabOpen ?? true); ++ const researchConversationUnread = useStore((s) => s.researchConversationUnread ?? false); ++ const selectionGeneration = (0, react.useMemo)(() => typeof inputActions.generateResearchSelection !== 'function' ? void 0 : { ++ disabled: false, ++ generate: inputActions.generateResearchSelection, ++ inspect: inputActions.inspectResearchGeneration, ++ cancel: inputActions.cancelResearchGeneration ++ }, [inputActions.generateResearchSelection, inputActions.inspectResearchGeneration, inputActions.cancelResearchGeneration]); ++ (0, react.useLayoutEffect)(() => { ++ const activateResearch = (event) => { ++ if (event.detail?.sessionId !== sessionId) return; ++ clearInitialResearchSession(sessionId); ++ actions.setView("research"); ++ }; ++ const activateChat = (event) => { ++ if (event.detail?.sessionId !== sessionId) return; ++ clearInitialResearchSession(sessionId); ++ actions.setView("chat"); ++ }; ++ window.addEventListener(INITIAL_RESEARCH_SESSION_EVENT, activateResearch); ++ window.addEventListener(INITIAL_CHAT_SESSION_EVENT, activateChat); ++ if (initialResearchRequested) { ++ clearInitialResearchSession(sessionId); ++ actions.setView("research"); ++ } ++ return () => { ++ window.removeEventListener(INITIAL_RESEARCH_SESSION_EVENT, activateResearch); ++ window.removeEventListener(INITIAL_CHAT_SESSION_EVENT, activateChat); ++ }; ++ }, [actions, initialResearchRequested, sessionId]); ++ const onInspectDone = (0, react.useCallback)(() => { ++ actions.setInspect(null); ++ }, [actions]); ++ const researchConversationView = (0, react.useMemo)(() => renderSlot("conversation.view", { ++ inspect, ++ onInspectDone ++ }, { only: "chat" }), [inspect, onInspectDone, renderSlot]); ++ (0, react.useLayoutEffect)(() => { ++ if (onResearchPresentation === void 0) return; ++ onResearchPresentation({ ++ view, ++ selection, ++ inspect, ++ conversationView: researchConversationView, ++ researchRightTab, ++ researchFilesTabOpen, ++ researchConversationUnread, ++ actions ++ }); ++ return () => { ++ onResearchPresentation(null); ++ }; ++ }, [actions, inspect, onResearchPresentation, researchConversationUnread, researchConversationView, researchFilesTabOpen, researchRightTab, selection, view]); + (0, react.useEffect)(() => { + if (inputState.draft === "" && storedDraft !== "") inputActions.setDraft(storedDraft); + const unmirror = bindDraftMirror(actions.setDraft); +@@ -7071,11 +14779,15 @@ window.__ModuleLoader__.load({ + (0, react.useEffect)(() => () => { + releaseSessionImages(sessionId); + }, [releaseSessionImages, sessionId]); +- if (blank && composerPhase === "blank") return null; ++ (0, react.useEffect)(() => () => { ++ releaseResearchWorkspace(sessionId); ++ }, [releaseResearchWorkspace, sessionId]); ++ if (blank && composerPhase === "blank" && active?.id !== "research") return null; + return (0, react_jsx_runtime.jsx)("div", { + className: ConversationRoot_module_css_default.viewArea, + children: active !== void 0 && renderSlot("conversation.view", { + inspect, ++ selectionGeneration, + onInspectDone: () => { + actions.setInspect(null); + } +@@ -7090,7 +14802,7 @@ window.__ModuleLoader__.load({ + const tag = document.createElement("style"); + tag.dataset.plugin = "@deepseek-ai/dsh-client-ui-conversation"; + tag.dataset.pluginCss = tagId$5; +- tag.textContent = css$5; ++ tag.textContent = css$5 + ".ydkMvW_root[data-research-managed=true]{box-sizing:border-box;padding-top:44px}.ydkMvW_root[data-research-managed=true]>.ydkMvW_header{display:none}.ydkMvW_root[data-research-managed=true]>.ydkMvW_body[hidden]{display:none}"; + document.head.appendChild(tag); + } + var DetailsPanel_module_css_default = { +@@ -7143,13 +14855,17 @@ window.__ModuleLoader__.load({ + } + function DetailsPanel({ useSession, useSessions, sessionId, useStore, renderSlot, closeDetails, t }) { + const selection = useStore((s) => s.selection); ++ const research = useStore((s) => s.view === "research"); ++ const researchRightTab = useStore((s) => s.researchRightTab ?? "conversation"); + const sessionCwd = useSessions((list) => list.byId[sessionId]?.cwd); + const callId = selection?.callId; + const material = useSession((s) => callId === void 0 ? null : materialFor(s, callId), (a, b) => (0, _deepseek_ai_dsh_client_runtime_client.shallowEqual)(a, b)); + return (0, react_jsx_runtime.jsxs)("div", { + className: DetailsPanel_module_css_default.root, ++ "data-research-managed": research || void 0, + children: [(0, react_jsx_runtime.jsxs)("div", { + className: DetailsPanel_module_css_default.header, ++ hidden: research, + children: [(0, react_jsx_runtime.jsx)("div", { + className: DetailsPanel_module_css_default.title, + children: selection === null ? t("details.title") : material?.name ?? selection.toolName ?? t("details.title") +@@ -7175,6 +14891,7 @@ window.__ModuleLoader__.load({ + })] + }), (0, react_jsx_runtime.jsx)("div", { + className: DetailsPanel_module_css_default.body, ++ hidden: research && researchRightTab !== "details", + children: selection === null || callId === void 0 ? (0, react_jsx_runtime.jsx)("div", { + className: DetailsPanel_module_css_default.empty, + children: t("details.empty") +@@ -8066,13 +15783,30 @@ window.__ModuleLoader__.load({ + //#endregion + //#region lib/types/client/conversation-nodes/compaction.js + function fallbackState$2(context) { ++ const start = context.matches.find((match) => match.event.type === "compaction/start"); ++ const end = context.matches.find((match) => match.event.type === "compaction/end"); + const summary = context.matches.find((match) => match.event.type === "compaction/summary"); + const checkpoint = context.matches.find((match) => compactSource(match.event) !== void 0); + return { ++ ...start === void 0 ? {} : { start }, ++ ...end === void 0 ? {} : { end }, + ...summary === void 0 ? {} : { summary }, + ...checkpoint === void 0 ? {} : { checkpoint } + }; + } ++ /** Build a temporary visible marker while an automatic compaction transaction is open. */ ++ function runningCompaction(start) { ++ return { ++ kind: "compaction", ++ seq: start.event.seq, ++ time: start.event.time, ++ summary: null, ++ summaryEventSeq: null, ++ shadowedItemCount: null, ++ shadowedTokenCount: null, ++ running: true ++ }; ++ } + /** Automatic compaction lifecycle and landed checkpoint Definition. */ + const compactionDefinition = { + kind: "compaction", +@@ -8094,11 +15828,21 @@ window.__ModuleLoader__.load({ + } + return null; + }, +- start: () => ({}), +- update: (context, match) => updateCompactionState(context.state, match), ++ start: (_context, match) => ({ start: match }), ++ update: (context, match) => { ++ if (match.event.type === "compaction/end") return { ++ ...context.state, ++ end: match ++ }; ++ return updateCompactionState(context.state, match); ++ }, + buildViewNode: (context) => { + const state = context.state ?? fallbackState$2(context); +- if (state.checkpoint === void 0) return null; ++ if (state.checkpoint === void 0) { ++ if (state.start === void 0 || state.end !== void 0) return null; ++ const marker = runningCompaction(state.start); ++ return chatNode(context, "compaction", marker.seq, marker); ++ } + const marker = compactSummary(state.summary, state.checkpoint); + return chatNode(context, "compaction", marker.seq, marker); + } +@@ -9038,7 +16782,7 @@ window.__ModuleLoader__.load({ + } + //#endregion + //#region \0dsh-css:/home/runner/work/deepseek-harness/deepseek-harness/packages/client/ui-conversation/src/client/chat/AssistantMarkdown.module.css.mjs +- const css$2 = ".Sxvs8a_root{color:var(--dsw-alias-label-primary);flex-direction:column;font-size:16px;line-height:28px;display:flex}.Sxvs8a_body{flex-direction:column;gap:16px;display:flex}.Sxvs8a_stopped{background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-tertiary);border-radius:6px;align-self:flex-start;padding:0 6px;font-size:11px;line-height:18px}.Sxvs8a_actions{margin-top:16px;margin-left:-6px}"; ++ const css$2 = ".Sxvs8a_root{text-align:left;color:var(--dsw-alias-label-primary);flex-direction:column;font-size:16px;line-height:28px;display:flex}.Sxvs8a_body{flex-direction:column;gap:16px;display:flex}.Sxvs8a_body code>button{text-align:left}.Sxvs8a_stopped{background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-tertiary);border-radius:6px;align-self:flex-start;padding:0 6px;font-size:11px;line-height:18px}.Sxvs8a_actions{margin-top:16px;margin-left:-6px}"; + const tagId$2 = "@deepseek-ai/dsh-client-ui-conversation/AssistantMarkdown.module.css"; + if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId$2) + "]") === null) { + const tag = document.createElement("style"); +@@ -9128,29 +16872,36 @@ window.__ModuleLoader__.load({ + const data = node.data; + const turn = node.location.kind === "turn" || node.location.kind === "step" ? node.location.turn : void 0; + const tail = useTurnData("turn-tail"); ++ const completedFinal = turn?.status === "closed" && data.finalNode !== void 0 && tail?.closing?.finalNode.seq === data.finalNode.seq; + const owner = (0, react.useMemo)(() => { +- if (turn?.status !== "closed" || data.finalNode === void 0) return void 0; +- if (tail?.closing?.finalNode.seq !== data.finalNode.seq) return void 0; ++ if (!completedFinal || data.finalNode === void 0) return void 0; + return { + turn, + seq: data.finalNode.seq, + openFile + }; + }, [ ++ completedFinal, + data.finalNode, + openFile, +- tail, + turn + ]); + const mentions = (0, react.useMemo)(() => owner === void 0 ? void 0 : fileMentions(owner), [fileMentions, owner]); +- return (0, react_jsx_runtime.jsx)(AssistantMarkdown, { +- blocks: data.blocks, ++ const visibleBlocks = (0, react.useMemo)(() => completedFinal ? finalAnswerBlocks(data.blocks) : data.blocks, [completedFinal, data.blocks]); ++ const content = (0, react_jsx_runtime.jsx)(AssistantMarkdown, { ++ blocks: visibleBlocks, + streaming: data.status === "running", + interrupted: data.status === "interrupted", + loadImage, + mentions, + t + }); ++ const messageId = data.finalNode?.messageId; ++ return messageId === void 0 ? content : (0, react_jsx_runtime.jsx)("div", { ++ "data-assistant-message-id": messageId, ++ "data-assistant-message-settled": data.status === "running" ? void 0 : "", ++ children: content ++ }); + }); + //#endregion + //#region \0dsh-css:/home/runner/work/deepseek-harness/deepseek-harness/packages/client/ui-conversation/src/client/chat/GenericCommandCard.module.css.mjs +@@ -9330,13 +17081,14 @@ window.__ModuleLoader__.load({ + }); + const runMs = turn.start === void 0 || turn.end === void 0 ? void 0 : Math.max(0, turn.end.time - turn.start.time); + const messageId = closing.finalNode.messageId; +- const assistantActions = messageId === void 0 ? null : renderSlot("conversation.chat.assistant-actions", { messageId }); ++ const text = assistantText(closing.blocks); ++ const assistantActions = messageId === void 0 ? null : renderSlot("conversation.chat.assistant-actions", { messageId, text }); + return (0, react_jsx_runtime.jsxs)("div", { + className: TurnTailNodeView_module_css_default.root, + "data-turn-tail": data.turn, + "data-time-hover-root": true, + children: [tail, (0, react_jsx_runtime.jsx)(MessageIconActions, { +- text: assistantText(closing.blocks), ++ text, + time: closing.time, + runMs, + ttftMs: data.ttftMs, +@@ -9499,6 +17251,9 @@ window.__ModuleLoader__.load({ + const workspaces = ctx.workspaces; + const layout = ctx.layout; + const slots = ctx.slots; ++ const researchWorkspaces = new ResearchWorkspaceRegistry(); ++ const researchSidebar = new ResearchSidebarCoordinator(); ++ const researchOfficePreview = new ResearchOfficePreviewCoordinator(); + registerConversationNodes(ctx); + registerChatNodeRenderers(ctx); + ctx.effect(() => ctx.locale.register(NS, { +@@ -9538,8 +17293,13 @@ window.__ModuleLoader__.load({ + subscribe: (fn) => slots.subscribe("conversation.view", fn), + version: () => slots.getVersion("conversation.view") + }; +- const inputHub = new InputHub(ctx, t); ++ const inputHub = new InputHub(ctx, t, researchWorkspaces); + const composerBlocks = new ComposerBlockRegistry(); ++ ctx.inject(["inputTriggers"], (inputScope) => { ++ inputScope.effect(() => inputScope.inputTriggers.registerSource(chatFileInputSource), "ui-conversation: Chat inline file references"); ++ inputScope.effect(() => inputScope.inputTriggers.registerSource(researchFileInputSource), "ui-conversation: Research inline file references"); ++ inputScope.effect(() => inputScope.inputTriggers.registerSource(researchArtifactInputSource), "ui-conversation: Research inline assistant references"); ++ }); + ctx.effect(() => sessions.provide({ + hooks: ["input"], + props: ["inputActions"], +@@ -9551,9 +17311,9 @@ window.__ModuleLoader__.load({ + }; + } + }), "ui-conversation: input standard-kit provider"); +- slots.register({ +- name: "conversation", +- locale: NS, ++ slots.register({ ++ name: "conversation", ++ locale: NS, + children: { + "conversation.session": { + kind: "single", +@@ -9600,8 +17360,11 @@ window.__ModuleLoader__.load({ + scope: "root" + } + }, +- inject: (sessionId) => ({ +- hooks: { composerBlock: sessionId === void 0 ? ABSENT_BLOCK : composerBlocks.storeFor(sessionId) }, ++ inject: (sessionId) => ({ ++ hooks: { composerBlock: sessionId === void 0 ? ABSENT_BLOCK : composerBlocks.storeFor(sessionId) }, ++ setResearchActive: (id, active) => inputHub.setResearchActive(id, active), ++ researchWorkspaces, ++ researchSidebar, + selectWorkspace: async (workspaceId) => { + const nextId = await workspaces.connectWorkspace(workspaceId); + if (sessionId !== void 0 && nextId !== sessionId) { +@@ -9635,6 +17398,9 @@ window.__ModuleLoader__.load({ + releaseSessionImages: (id) => { + conversation.releaseSessionImages(id); + }, ++ releaseResearchWorkspace: (id) => { ++ researchWorkspaces.release(id); ++ }, + bindDraftMirror: (write) => inputHub.shell(sessionId).bindMirror(write) + }; + } +@@ -9764,9 +17530,13 @@ window.__ModuleLoader__.load({ + return { + openDetails: (target) => { + actions.select(target); ++ actions.setResearchRightTab("details"); + layout.openDetails(); + }, +- fileMentions: (owner) => ctx.get("chatFileMentions")?.forClosing(owner), ++ fileMentions: (owner) => ctx.get("chatFileMentions")?.forClosing({ ++ ...owner, ++ cwd: sessions.list.getSnapshot().byId[sessionId]?.cwd ++ }), + openFile: (path) => { + const cwd = sessions.list.getSnapshot().byId[sessionId]?.cwd; + workspaces.openPath((0, _deepseek_ai_dsh_client_runtime_client.resolveWorkspacePath)(cwd, path)).catch(() => {}); +@@ -9776,6 +17546,8 @@ window.__ModuleLoader__.load({ + }, + loadImage: (attachment) => conversation.resolveImage(sessionId, attachment), + inspectCall: (callId) => { ++ actions.select({ callId }); ++ layout.openDetails(); + actions.setInspect({ callId }); + actions.setView("trajectory"); + }, +@@ -9798,6 +17570,8 @@ window.__ModuleLoader__.load({ + }; + } + }, ChatView); ++ registerResearchCanvasView(slots, t, researchWorkspaces, researchOfficePreview); ++ registerResearchAssistantActions(slots, researchWorkspaces); + slots.register({ + name: "conversation.composer.dock", + id: "stats", +@@ -9822,9 +17596,143 @@ window.__ModuleLoader__.load({ + layout.closeDetails(); + } }) + }, DetailsPanel); ++ ctx.inject(["betterSidebar"], (sidebarCtx) => { ++ sidebarCtx.effect(() => researchSidebar.attach(sidebarCtx.betterSidebar, t), "ui-conversation: Research global sidebar tab"); ++ }); ++ ctx.inject(["officePreview"], (officeCtx) => { ++ officeCtx.effect(() => researchOfficePreview.attach(officeCtx.officePreview), "ui-conversation: Research Office preview adapter"); ++ }); + } + //#endregion + exports.ConversationController = ConversationController; ++ exports.AssistantNodeView = AssistantNodeView; ++ exports.InputHub = InputHub; ++ exports.SessionInputShell = SessionInputShell; ++ exports.CommandLauncherButton = CommandLauncherButton; ++ exports.ComposerLeadingControls = ComposerLeadingControls; ++ exports.ComposerSurface = ComposerSurface; ++ exports.ConversationRoot = ConversationRoot; ++ exports.ConversationSession = ConversationSession; ++ exports.ResearchConversationPanel = ResearchConversationPanel; ++ exports.ResearchSidebarCoordinator = ResearchSidebarCoordinator; ++ exports.ResearchOfficePreviewCoordinator = ResearchOfficePreviewCoordinator; ++ exports.ResearchSidebarConversationTab = ResearchSidebarConversationTab; ++ exports.ResearchAssistantCanvasAction = ResearchAssistantCanvasAction; ++ exports.conversationViewTabProps = conversationViewTabProps; ++ exports.ResearchCanvas = ResearchCanvas; ++ exports.ResearchCanvasArtifactCard = ResearchCanvasArtifactCard; ++ exports.ResearchCanvasFileCard = ResearchCanvasFileCard; ++ exports.TurnTailNodeView = TurnTailNodeView; ++ exports.UserStyleBubble = UserStyleBubble; ++ exports.compactionDefinition = compactionDefinition; ++ exports.compactConversationFlow = compactConversationFlow; ++ exports.latestDirectUserKey = latestDirectUserKey; ++ exports.settleConversationScrollBottom = settleConversationScrollBottom; ++ exports.shouldFollowConversationBottom = shouldFollowConversationBottom; ++ exports.isComposerSubmitKey = isComposerSubmitKey; ++ exports.isComposerSendButton = isComposerSendButton; ++ exports.composerScrollTargets = composerScrollTargets; ++ exports.scheduleComposerBottomSettles = scheduleComposerBottomSettles; ++ exports.executionActivityLabel = executionActivityLabel; ++ exports.executionDetailGroups = executionDetailGroups; ++ exports.executionProgressSurface = executionProgressSurface; ++ exports.executionProgressUpdates = executionProgressUpdates; ++ exports.executionSummaryStatus = executionSummaryStatus; ++ exports.executionStatusForNodes = executionStatusForNodes; ++ exports.permissionOptionLabel = permissionOptionLabel; ++ exports.finalAnswerBlocks = finalAnswerBlocks; ++ exports.RESEARCH_CANVAS_MAX_FILES_PER_DROP = RESEARCH_CANVAS_MAX_FILES_PER_DROP; ++ exports.RESEARCH_CANVAS_MAX_FILES_PER_SESSION = RESEARCH_CANVAS_MAX_FILES_PER_SESSION; ++ exports.RESEARCH_CANVAS_MAX_ARTIFACTS_PER_SESSION = RESEARCH_CANVAS_MAX_ARTIFACTS_PER_SESSION; ++ exports.RESEARCH_ARTIFACT_DRAG_TYPE = RESEARCH_ARTIFACT_DRAG_TYPE; ++ exports.RESEARCH_ARTIFACT_MAX_EXCERPT = RESEARCH_ARTIFACT_MAX_EXCERPT; ++ exports.RESEARCH_ARTIFACT_MAX_TITLE = RESEARCH_ARTIFACT_MAX_TITLE; ++ exports.ResearchWorkspaceRegistry = ResearchWorkspaceRegistry; ++ exports.createResearchCanvasFileId = createResearchCanvasFileId; ++ exports.createResearchWorkspaceSession = createResearchWorkspaceSession; ++ exports.loadResearchCanvasArtifacts = loadResearchCanvasArtifacts; ++ exports.loadResearchCanvasFiles = loadResearchCanvasFiles; ++ exports.loadResearchCanvasSelection = loadResearchCanvasSelection; ++ exports.moveResearchCanvasNodes = moveResearchCanvasNodes; ++ exports.normalizeResearchCanvasNodeGeometry = normalizeResearchCanvasNodeGeometry; ++ exports.normalizeResearchWebUrl = normalizeResearchWebUrl; ++ exports.researchWebFrameLayout = researchWebFrameLayout; ++ exports.researchImageGeometryForNaturalSize = researchImageGeometryForNaturalSize; ++ exports.researchPdfGeometryForPage = researchPdfGeometryForPage; ++ exports.researchPdfPageLayout = researchPdfPageLayout; ++ exports.researchPdfRenderWindow = researchPdfRenderWindow; ++ exports.researchPdfBackingStore = researchPdfBackingStore; ++ exports.removeResearchCanvasNodes = removeResearchCanvasNodes; ++ exports.resizeResearchCanvasNode = resizeResearchCanvasNode; ++ exports.nextResearchCanvasPan = nextResearchCanvasPan; ++ exports.nextResearchCanvasViewport = nextResearchCanvasViewport; ++ exports.nextResearchCanvasWheel = nextResearchCanvasWheel; ++ exports.normalizeResearchRect = normalizeResearchRect; ++ exports.parseResearchArtifactDrag = parseResearchArtifactDrag; ++ exports.parseResearchCanvasArtifactNodes = parseResearchCanvasArtifactNodes; ++ exports.parseResearchCanvasFileNodes = parseResearchCanvasFileNodes; ++ exports.parseResearchCanvasSelection = parseResearchCanvasSelection; ++ exports.parseResearchMindMap = parseResearchMindMap; ++ exports.parseResearchContainerSpec = parseResearchContainerSpec; ++ exports.researchCanvasExportDescriptor = researchCanvasExportDescriptor; ++ exports.researchCanvasExportFileName = researchCanvasExportFileName; ++ exports.buildResearchContainerChartSvg = buildResearchContainerChartSvg; ++ exports.buildResearchMindMapSvg = buildResearchMindMapSvg; ++ exports.rasterizeResearchMindMapSvg = rasterizeResearchMindMapSvg; ++ exports.researchContainerRefreshDue = researchContainerRefreshDue; ++ exports.parseResearchPrompt = parseResearchPrompt; ++ exports.chatFileReference = chatFileReference; ++ exports.parseChatFileReference = parseChatFileReference; ++ exports.chatFileReferenceCodec = chatFileReferenceCodec; ++ exports.fileReferenceKind = fileReferenceKind; ++ exports.fileReferenceTooltipName = fileReferenceTooltipName; ++ exports.parseResearchFileReference = parseResearchFileReference; ++ exports.parseSherlockFileDrag = parseSherlockFileDrag; ++ exports.placeResearchCanvasArtifact = placeResearchCanvasArtifact; ++ exports.placeResearchCanvasFiles = placeResearchCanvasFiles; ++ exports.researchCanvasContentTransform = researchCanvasContentTransform; ++ exports.researchCanvasHasVisibleNodes = researchCanvasHasVisibleNodes; ++ exports.researchCanvasGeneratedPlacement = researchCanvasGeneratedPlacement; ++ exports.researchCanvasViewportPlacement = researchCanvasViewportPlacement; ++ exports.researchGenerationAutoGeometry = researchGenerationAutoGeometry; ++ exports.researchGenerationFinalGeometry = researchGenerationFinalGeometry; ++ exports.activeResearchGenerationNodes = activeResearchGenerationNodes; ++ exports.researchGenerationSources = researchGenerationSources; ++ exports.researchCanvasReturnViewport = researchCanvasReturnViewport; ++ exports.researchCanvasSelectionBounds = researchCanvasSelectionBounds; ++ exports.researchCanvasArtifactsStorageKey = researchCanvasArtifactsStorageKey; ++ exports.researchCanvasDropFiles = researchCanvasDropFiles; ++ exports.researchCanvasOwnsFileDrag = researchCanvasOwnsFileDrag; ++ exports.researchCanvasSelectionStorageKey = researchCanvasSelectionStorageKey; ++ exports.researchCanvasStorageKey = researchCanvasStorageKey; ++ exports.researchCanvasWorldPoint = researchCanvasWorldPoint; ++ exports.researchSelectionGenerationPrompt = researchSelectionGenerationPrompt; ++ exports.startResearchTask = startResearchTask; ++ exports.inspectResearchTask = inspectResearchTask; ++ exports.cancelResearchTask = cancelResearchTask; ++ exports.researchNodeViewportRect = researchNodeViewportRect; ++ exports.researchNodeNearViewport = researchNodeNearViewport; ++ exports.researchNodesInMarquee = researchNodesInMarquee; ++ exports.registerResearchCanvasView = registerResearchCanvasView; ++ exports.registerResearchAssistantActions = registerResearchAssistantActions; ++ exports.saveResearchCanvasArtifacts = saveResearchCanvasArtifacts; ++ exports.saveResearchCanvasFiles = saveResearchCanvasFiles; ++ exports.saveResearchCanvasSelection = saveResearchCanvasSelection; ++ exports.extractResearchFileReferences = extractResearchFileReferences; ++ exports.extractResearchReferences = extractResearchReferences; ++ exports.selectedResearchReferenceOccurrenceId = selectedResearchReferenceOccurrenceId; ++ exports.deleteResearchReferenceOccurrence = deleteResearchReferenceOccurrence; ++ exports.researchFileReference = researchFileReference; ++ exports.researchFileReferenceCodec = researchFileReferenceCodec; ++ exports.researchArtifactReference = researchArtifactReference; ++ exports.researchArtifactReferenceCodec = researchArtifactReferenceCodec; ++ exports.serializeInputReferenceClipboard = serializeInputReferenceClipboard; ++ exports.parseInputReferenceClipboard = parseInputReferenceClipboard; ++ exports.serializeResearchPrompt = serializeResearchPrompt; ++ exports.syncResearchFileReferences = syncResearchFileReferences; ++ exports.syncResearchArtifactReferences = syncResearchArtifactReferences; ++ exports.updateResearchSelection = updateResearchSelection; ++ exports.userQueuedMessages = userQueuedMessages; + exports.apply = apply; + exports.inject = inject; + return module.exports; +diff --git a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/chat/AssistantNodeView.d.ts b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/chat/AssistantNodeView.d.ts +index 7b2ae76..58a5495 100644 +--- a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/chat/AssistantNodeView.d.ts ++++ b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/chat/AssistantNodeView.d.ts +@@ -1,4 +1,4 @@ + import type { ChatNodeViewProps } from '../contract/slots.ts'; +-/** Streaming, settled, and interrupted Assistant states share one keyed renderer instance. */ ++/** Streaming, settled, and interrupted Assistant states share one keyed renderer instance and expose settled message identity for Research selection. */ + export declare const AssistantNodeView: import("react").MemoExoticComponent<({ node, useTurnData, openFile, loadImage, fileMentions, t, }: ChatNodeViewProps<"assistant-step">) => import("react").JSX.Element>; + //# sourceMappingURL=AssistantNodeView.d.ts.map +\ No newline at end of file +diff --git a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/chat/AssistantNodeView.d.ts.orig b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/chat/AssistantNodeView.d.ts.orig +new file mode 100644 +index 0000000..7b2ae76 +--- /dev/null ++++ b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/chat/AssistantNodeView.d.ts.orig +@@ -0,0 +1,4 @@ ++import type { ChatNodeViewProps } from '../contract/slots.ts'; ++/** Streaming, settled, and interrupted Assistant states share one keyed renderer instance. */ ++export declare const AssistantNodeView: import("react").MemoExoticComponent<({ node, useTurnData, openFile, loadImage, fileMentions, t, }: ChatNodeViewProps<"assistant-step">) => import("react").JSX.Element>; ++//# sourceMappingURL=AssistantNodeView.d.ts.map +\ No newline at end of file +diff --git a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/chat/TurnTailNodeView.d.ts b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/chat/TurnTailNodeView.d.ts +index b485863..f890829 100644 +--- a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/chat/TurnTailNodeView.d.ts ++++ b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/chat/TurnTailNodeView.d.ts +@@ -1,7 +1,7 @@ + import type { PropsRenderSlots } from '@deepseek-ai/dsh-client-ui-slots'; + import type { ChatNodeViewProps } from '../contract/slots.ts'; + type TurnTailNodeViewProps = ChatNodeViewProps<'turn-tail'> & PropsRenderSlots<'conversation.chat.turnTail' | 'conversation.chat.assistant-actions'>; +-/** Turn-local actions and feature tail over the Location index, independent of Assistant placement. */ ++/** Turn-local actions and feature tail over the Location index, including finalized assistant text for contributed actions. */ + export declare const TurnTailNodeView: import("react").MemoExoticComponent<({ node, openFile, forkAt, renderSlot, renderSlotChain, t, useSession, }: TurnTailNodeViewProps) => import("react").JSX.Element | null>; + export {}; + //# sourceMappingURL=TurnTailNodeView.d.ts.map +\ No newline at end of file +diff --git a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/chat/TurnTailNodeView.d.ts.orig b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/chat/TurnTailNodeView.d.ts.orig +new file mode 100644 +index 0000000..b485863 +--- /dev/null ++++ b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/chat/TurnTailNodeView.d.ts.orig +@@ -0,0 +1,7 @@ ++import type { PropsRenderSlots } from '@deepseek-ai/dsh-client-ui-slots'; ++import type { ChatNodeViewProps } from '../contract/slots.ts'; ++type TurnTailNodeViewProps = ChatNodeViewProps<'turn-tail'> & PropsRenderSlots<'conversation.chat.turnTail' | 'conversation.chat.assistant-actions'>; ++/** Turn-local actions and feature tail over the Location index, independent of Assistant placement. */ ++export declare const TurnTailNodeView: import("react").MemoExoticComponent<({ node, openFile, forkAt, renderSlot, renderSlotChain, t, useSession, }: TurnTailNodeViewProps) => import("react").JSX.Element | null>; ++export {}; ++//# sourceMappingURL=TurnTailNodeView.d.ts.map +\ No newline at end of file +diff --git a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/contract/slots.d.ts b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/contract/slots.d.ts +index 50939b2..7649406 100644 +--- a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/contract/slots.d.ts ++++ b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/contract/slots.d.ts +@@ -1,7 +1,7 @@ + /** Conversation slot declarations and their composed component props. */ + import type { ReactNode, RefObject } from 'react'; + import type { ImageAttachmentRef } from '@deepseek-ai/dsh-attachment'; +-import type { InjectFace, MaybeSnapshotSelectorHook, PropsLocale, PropsRenderSlots, PropsRuntime, PropsStore, SlotHookFactory, SnapshotSelectorHook } from '@deepseek-ai/dsh-client-ui-slots'; ++import type { BoundActions, InjectFace, MaybeSnapshotSelectorHook, PropsLocale, PropsRenderSlots, PropsRuntime, PropsStore, SlotHookFactory, SnapshotSelectorHook } from '@deepseek-ai/dsh-client-ui-slots'; + import type { CommandNode, CompactionSummaryNode, ConversationSnapshot, ConversationTurnDataMap, ObservableSnapshot, PendingInteraction, PendingWait, SessionId, ToolCallBlock, TurnLocation, WorkspaceId } from '@deepseek-ai/dsh-client-runtime/client'; + import type { MarkdownFileMentions } from '@deepseek-ai/dsh-client-ui-primitives'; + import type { MessageId } from '@deepseek-ai/dsh-client-connection/client'; +@@ -10,7 +10,7 @@ import type { ComposerKeyboard, DraftAttachmentId, EditSelection, InputActions, + import type { createChatStore } from '../stores.ts'; + import type { ComposerSubmitGesture, InputSubmitMode } from './composer-submission.ts'; + import type { ChatNode, ChatNodeKind } from './chat-nodes.ts'; +-import type { CallId, SelectionTarget, ViewTab } from './views.ts'; ++import type { CallId, ResearchRightTab, SelectionTarget, ViewTab } from './views.ts'; + /** Browser-owned image that has not crossed the durable host boundary. */ + export interface ComposerAttachment { + kind: 'image'; +@@ -313,6 +313,24 @@ export interface ConversationSessionOwnerProps { + * @returns the scrollport containing `view` and the sticky composer seat. + */ + wrapActiveBody?: (view: ReactNode) => ReactNode; ++ /** ++ * Publish the strict session store fields needed by the optional resident ++ * conversation root. The root cannot mount the same store handle at its ++ * broader `session-maybe` scope, so the session-scoped child bridges this ++ * presentation upward instead. ++ */ ++ onResearchPresentation?: (presentation: { ++ view: string; ++ selection: SelectionTarget | null; ++ inspect: { ++ callId: CallId; ++ } | null; ++ conversationView: ReactNode; ++ researchRightTab: ResearchRightTab; ++ researchFilesTabOpen: boolean; ++ researchConversationUnread: boolean; ++ actions: BoundActions; ++ } | null) => void; + } + /** Header actions derive their state from the standard session/global kit. */ + export interface ConversationHeaderActionOwnerProps { +@@ -387,6 +405,8 @@ export interface TurnTailOwnerProps { + export interface AssistantActionOwnerProps { + /** Stable identity carried from the `assistant/message` event. */ + messageId: MessageId; ++ /** Plain text of the finalized assistant response. */ ++ text: string; + } + /** Hook constrained to business data published on the current Chat Node's Turn. */ + export type UseChatNodeTurnData = >(key: Key) => Readonly | undefined; +@@ -471,6 +491,8 @@ export interface ConversationSessionInjected { + }; + /** Release historical image URLs when this rendered session scope unmounts. */ + releaseSessionImages: (sessionId: SessionId) => void; ++ /** Release transient Research workspace state when this session scope unmounts. */ ++ releaseResearchWorkspace: (sessionId: SessionId) => void; + /** Bind the input machine's draft persistence mirror to the session store. */ + bindDraftMirror: (write: (text: string) => void) => () => void; + } +@@ -516,6 +538,13 @@ export interface ComposerBarOwnerProps { + placeholder?: string; + /** Optional content rendered above the textarea. */ + accessory?: ReactNode; ++ /** Research canvas files inserted into the native composer text flow. Undefined outside Research. */ ++ researchFileReferences?: readonly { ++ readonly id: string; ++ readonly name: string; ++ readonly displayName?: string; ++ readonly path?: string; ++ }[]; + /** Floating overlay anchor content (menu / popup shell entries), rendered inside the card. */ + overlay?: ReactNode; + /** input.left slot entries (tool row, beside the resident chrome). */ +diff --git a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/contract/views.d.ts b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/contract/views.d.ts +index cbce2bd..5d34eec 100644 +--- a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/contract/views.d.ts ++++ b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/contract/views.d.ts +@@ -16,6 +16,8 @@ export interface ViewTab { + id: string; + label: string; + } ++/** Tabs owned by the reversible Research right panel. */ ++export type ResearchRightTab = 'conversation' | 'files' | 'details'; + /** + * Per-session state shared by conversation, chat-view, and details slots. + * Unknown persisted view ids fall back to the stable Chat view. +@@ -35,5 +37,11 @@ export interface ChatStoreState { + inspect: { + callId: CallId; + } | null; ++ /** Selected Research right-panel tab; Conversation is pinned and cannot close. */ ++ researchRightTab: ResearchRightTab; ++ /** Whether the optional Files tab is present. */ ++ researchFilesTabOpen: boolean; ++ /** Background activity accumulated while another Research right tab was active. */ ++ researchConversationUnread: boolean; + } + //# sourceMappingURL=views.d.ts.map +\ No newline at end of file +diff --git a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/contract/views.d.ts.orig b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/contract/views.d.ts.orig +new file mode 100644 +index 0000000..cbce2bd +--- /dev/null ++++ b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/contract/views.d.ts.orig +@@ -0,0 +1,39 @@ ++/** Shared conversation view, selection, and store-state contracts. */ ++/** Tool call identity as carried on the wire (branded upstream in connection). */ ++export type CallId = string; ++/** Selection target for the details linkage channel (toolcall is the step special case). */ ++export interface SelectionTarget { ++ turnSeq: number; ++ stepSeq?: number; ++ callId?: CallId; ++ toolName?: string; ++} ++/** ++ * One conversation view tab, projected from a 'conversation.view' slot ++ * entry's registration options (label falls back to the entry id). ++ */ ++export interface ViewTab { ++ id: string; ++ label: string; ++} ++/** ++ * Per-session state shared by conversation, chat-view, and details slots. ++ * Unknown persisted view ids fall back to the stable Chat view. ++ */ ++export interface ChatStoreState { ++ /** Details-linkage channel (conversation writes, details reads). */ ++ selection: SelectionTarget | null; ++ /** Composer draft (persisted; survives session switches and reloads). */ ++ draft: string; ++ /** Active conversation view id ('conversation.view' entry id); null falls back to Chat. */ ++ view: string | null; ++ /** ++ * One-shot inspect handoff: chat writes the call to reveal, the trajectory ++ * view consumes it and acknowledges by clearing. Read with `?? null` — ++ * persisted snapshots from before this field rehydrate without it. ++ */ ++ inspect: { ++ callId: CallId; ++ } | null; ++} ++//# sourceMappingURL=views.d.ts.map +\ No newline at end of file +diff --git a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/input/contract.d.ts b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/input/contract.d.ts +index b8ebfaf..0bc8548 100644 +--- a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/input/contract.d.ts ++++ b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/input/contract.d.ts +@@ -65,6 +65,8 @@ export interface SessionInputResolver { + export interface InputActions { + /** Single public draft write path (full next draft; occurrence math via diff scan). */ + setDraft(text: string): void; ++ /** Append ordinary uploaded file paths as native inline references. */ ++ insertFilePaths(paths: readonly string[]): void; + /** Append ordered browser-owned image ids; busy admission phases refuse. */ + addImages(ids: readonly DraftAttachmentId[]): boolean; + /** Remove one browser-owned image id. */ +@@ -92,6 +94,12 @@ export interface ComposerKeyboard { + readonly snapshot: InputState; + /** Draft write with the DOM-observed edit shape (narrows occurrence math). */ + setDraft(text: string, editRange?: EditRange): void; ++ /** Move one reference occurrence without changing its stable identity. */ ++ moveReferenceOccurrence(occurrenceId: number, targetOffset: number): boolean; ++ /** Reconcile one occurrence's owner metadata without creating an undo transaction. */ ++ updateReferenceOccurrence(occurrenceId: number, reference: ReferenceInsert): boolean; ++ /** Reconcile existing Research file occurrences and history by stable file/node id. */ ++ updateResearchReferenceOccurrences(fileId: string, reference: ReferenceInsert): boolean; + /** Submit with an explicit delivery mode resolved by the keyboard policy. */ + submit(mode: InputSubmitMode): void; + /** +@@ -232,6 +240,18 @@ export type InputEvent = + readonly type: 'draft-changed'; + readonly draft: string; + readonly editRange?: EditRange; ++} | { ++ readonly type: 'move-ref'; ++ readonly occurrenceId: number; ++ readonly targetOffset: number; ++} | { ++ readonly type: 'update-ref'; ++ readonly occurrenceId: number; ++ readonly reference: ReferenceInsert; ++} | { ++ readonly type: 'update-research-ref'; ++ readonly fileId: string; ++ readonly reference: ReferenceInsert; + } | { + readonly type: 'begin-command'; + readonly claim: CommandClaim; +@@ -256,6 +276,11 @@ export type InputEvent = + readonly type: 'undo'; + } | { + readonly type: 'redo'; ++} | { ++ /** Restore an optimistically cleared draft after a failed send. */ ++ readonly type: 'restore-draft'; ++ readonly draft: string; ++ readonly occurrences: readonly Occurrence[]; + } + /** + * Paste text replacing the selection, one transaction. Hot-snapshot sync +diff --git a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/input/decorations.d.ts b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/input/decorations.d.ts +index 34909b7..e1c0000 100644 +--- a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/input/decorations.d.ts ++++ b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/input/decorations.d.ts +@@ -16,6 +16,10 @@ export interface ChipRender { + readonly occurrenceId: number; + /** Placeholder offset in the draft (the chip occupies [offset, offset+1)). */ + readonly offset: number; ++ /** Reference owner used for source-specific DOM metadata. */ ++ readonly source: string; ++ /** Owner-scoped reference id. */ ++ readonly ref: string; + readonly label: string; + /** Owner-resolution failure styling bit. */ + readonly invalid: boolean; +diff --git a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/input/facade.d.ts b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/input/facade.d.ts +index 339e1ba..6d946f4 100644 +--- a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/input/facade.d.ts ++++ b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/input/facade.d.ts +@@ -64,6 +64,14 @@ export declare class SessionInputShell implements SessionInput { + * (narrows the machine's occurrence math; absent → diff scan). + */ + setDraft(text: string, editRange?: EditRange): void; ++ /** Append ordinary uploaded file paths as native inline references. */ ++ insertFilePaths(paths: readonly string[]): void; ++ /** Move one reference occurrence without changing its stable identity. */ ++ moveReferenceOccurrence(occurrenceId: number, targetOffset: number): boolean; ++ /** Reconcile one occurrence's owner metadata without creating an undo transaction. */ ++ updateReferenceOccurrence(occurrenceId: number, reference: ReferenceInsert): boolean; ++ /** Reconcile existing Research file occurrences and history by stable file/node id. */ ++ updateResearchReferenceOccurrences(fileId: string, reference: ReferenceInsert): boolean; + /** Append ordered image ids unless an admission transaction is locked. */ + addImages(ids: readonly DraftAttachmentId[]): boolean; + /** Remove one image id from this draft. */ +@@ -78,13 +86,15 @@ export declare class SessionInputShell implements SessionInput { + * @param ids - failed attempt image ids. + */ + restoreImages(ids: readonly DraftAttachmentId[]): void; ++ /** Restore the exact native draft and reference table after a failed optimistic send. */ ++ restoreDraftState(snapshot: Pick): void; + /** + * Clear the draft as a successful-send commit: no undo unit is recorded and + * the undo history is cut, so Ctrl/Cmd-Z cannot resurrect sent content + * (the command path gets the same discipline from submit-settled success). + * @param imageIds - admitted image ids to remove from this draft. + */ +- commitSend(imageIds: readonly DraftAttachmentId[]): void; ++ commitSend(imageIds: readonly DraftAttachmentId[], admittedDraft?: string): void; + /** Undo the latest transaction (InputBar intercepts the platform chord). */ + undo(): void; + /** Redo the latest undone transaction. */ +diff --git a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/input/hub.d.ts b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/input/hub.d.ts +index 00f283c..4ad026f 100644 +--- a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/input/hub.d.ts ++++ b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/input/hub.d.ts +@@ -13,6 +13,28 @@ import type { InputTriggerController } from '@deepseek-ai/dsh-client-ui-input-tr + import type { TranslateNS } from '@deepseek-ai/dsh-client-locale/client'; + import type { ComposerKeyboard, SessionInputResolver, SessionInput } from './contract.ts'; + import { SessionInputShell } from './facade.ts'; ++interface ResearchSubmissionWorkspaceRegistry { ++ for(sessionId: SessionId): { ++ selectedFiles(): readonly { ++ id: string; ++ name: string; ++ displayName?: string; ++ path?: string; ++ }[]; ++ selectionSnapshot(): { ++ selectedNodeIds: string[]; ++ orderedFileIds: string[]; ++ }; ++ commitSelection(selection: { ++ selectedNodeIds: readonly string[]; ++ orderedFileIds: readonly string[]; ++ }): void; ++ restoreSelection(selection: { ++ selectedNodeIds: readonly string[]; ++ orderedFileIds: readonly string[]; ++ }): void; ++ }; ++} + /** Session-addressed input facade registry (SessionInputResolver face + composer-layer extras). */ + export declare class InputHub implements SessionInputResolver { + private readonly rootCtx; +@@ -22,7 +44,9 @@ export declare class InputHub implements SessionInputResolver { + * @param ctx - client root context (services resolved lazily per call — boot order stays free). + * @param t - conversation-namespace translate thunk (reads the active locale at call time). + */ +- constructor(rootCtx: ClientContext, t: TranslateNS<'conversation'>); ++ constructor(rootCtx: ClientContext, t: TranslateNS<'conversation'>, researchWorkspaces?: ResearchSubmissionWorkspaceRegistry); ++ /** Mark whether one session's composer currently belongs to Research. */ ++ setResearchActive(sessionId: SessionId, active: boolean): void; + /** + * Resolve the facade for one session-scope ctx (SessionInputResolver face). + * @param actx - session-scope context. +diff --git a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/input/machine.d.ts b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/input/machine.d.ts +index 0d55f64..3570ad7 100644 +--- a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/input/machine.d.ts ++++ b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/input/machine.d.ts +@@ -62,6 +62,8 @@ export declare class InputMachine { + /** Splice minted entries into the offset-sorted table. */ + private withMinted; + private onDraftChanged; ++ private onMoveRef; ++ private onUpdateRef; + /** Span CAS: revision equality (content identity follows) plus bounds sanity. */ + private casOk; + private onBeginCommand; +diff --git a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/ConversationRoot.d.ts b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/ConversationRoot.d.ts +index 627a46d..f9e5cff 100644 +--- a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/ConversationRoot.d.ts ++++ b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/ConversationRoot.d.ts +@@ -1,5 +1,39 @@ + import type { ConversationSlotProps } from '../contract/slots.ts'; ++import type { PropsStore } from '@deepseek-ai/dsh-client-ui-slots'; ++import type { createChatStore } from '../stores.ts'; ++export interface ResearchWorkspaceRegistryLike { ++ for(sessionId: string): { ++ subscribe(listener: () => void): () => void; ++ getSnapshot(): { ++ files: readonly { ++ id: string; ++ name: string; ++ displayName?: string; ++ path?: string; ++ mediaType?: string; ++ source: 'computer' | 'sherlock'; ++ }[]; ++ }; ++ }; ++} ++export interface ResearchSidebarCoordinatorLike { ++ storeFor(sessionId: string): { ++ subscribe(listener: () => void): () => void; ++ getSnapshot(): { ++ binding: unknown; ++ conversationHost: HTMLElement | null; ++ composerHost: HTMLElement | null; ++ }; ++ }; ++ publish(sessionId: string, binding: unknown): void; ++ enter(sessionId: string): void; ++ leave(sessionId: string): void; ++} + /** Full props composed from the slot contract. */ +-export type ConversationRootProps = ConversationSlotProps; +-export declare function ConversationRoot({ sessionId, useSession, useSessions, useWorkspaces, useInput, useComposerBlock, renderSlot, renderSlotChain, selectWorkspace, t, }: ConversationRootProps): import("react").JSX.Element; ++export type ConversationRootProps = ConversationSlotProps & Partial>> & { ++ setResearchActive?: (sessionId: string, active: boolean) => void; ++ researchWorkspaces: ResearchWorkspaceRegistryLike; ++ researchSidebar?: ResearchSidebarCoordinatorLike; ++}; ++export declare function ConversationRoot({ sessionId, useSession, useSessions, useWorkspaces, useInput, useComposerBlock, useStore, actions, renderSlot, renderSlotChain, selectWorkspace, setResearchActive, researchWorkspaces, researchSidebar, t, }: ConversationRootProps): import("react").JSX.Element; + //# sourceMappingURL=ConversationRoot.d.ts.map +\ No newline at end of file +diff --git a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/ConversationRoot.d.ts.orig b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/ConversationRoot.d.ts.orig +new file mode 100644 +index 0000000..627a46d +--- /dev/null ++++ b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/ConversationRoot.d.ts.orig +@@ -0,0 +1,5 @@ ++import type { ConversationSlotProps } from '../contract/slots.ts'; ++/** Full props composed from the slot contract. */ ++export type ConversationRootProps = ConversationSlotProps; ++export declare function ConversationRoot({ sessionId, useSession, useSessions, useWorkspaces, useInput, useComposerBlock, renderSlot, renderSlotChain, selectWorkspace, t, }: ConversationRootProps): import("react").JSX.Element; ++//# sourceMappingURL=ConversationRoot.d.ts.map +\ No newline at end of file +diff --git a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/ConversationSession.d.ts b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/ConversationSession.d.ts +index b5dcdb9..ef78b42 100644 +--- a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/ConversationSession.d.ts ++++ b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/ConversationSession.d.ts +@@ -16,5 +16,5 @@ export declare function ConversationSessionHeader({ sessionId, useSession, useSe + * @param props - Strict Session input/store, view ledger, and render shares. + * @returns the active view area, or null while the Session remains blank. + */ +-export declare function ConversationSession({ sessionId, useSession, useInput, inputActions, useStore, actions, renderSlot, views, bindDraftMirror, releaseSessionImages, }: ConversationSessionProps): import("react").JSX.Element | null; ++export declare function ConversationSession({ sessionId, useSession, useInput, inputActions, useStore, actions, renderSlot, views, bindDraftMirror, releaseSessionImages, releaseResearchWorkspace, }: ConversationSessionProps): import("react").JSX.Element | null; + //# sourceMappingURL=ConversationSession.d.ts.map +\ No newline at end of file +diff --git a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/ConversationSession.d.ts.orig b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/ConversationSession.d.ts.orig +new file mode 100644 +index 0000000..b5dcdb9 +--- /dev/null ++++ b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/ConversationSession.d.ts.orig +@@ -0,0 +1,20 @@ ++/** Strict per-session header/body content inserted into the resident conversation layout. */ ++import type { ConversationSessionHeaderSlotProps, ConversationSessionSlotProps } from '../contract/slots.ts'; ++/** Full props composed from the strict session body contract. */ ++export type ConversationSessionProps = ConversationSessionSlotProps; ++/** Full props composed from the strict session header contract. */ ++export type ConversationSessionHeaderProps = ConversationSessionHeaderSlotProps; ++/** ++ * Renders Session header chrome above the resident conversation scrollport. ++ * @param props - Strict Session store, view ledger, navigation, render, and locale shares. ++ * @returns the hidden blank-session header or visible title and tabs. ++ */ ++export declare function ConversationSessionHeader({ sessionId, useSession, useSessions, useStore, actions, renderSlot, views, open, t, }: ConversationSessionHeaderProps): import("react").JSX.Element; ++/** ++ * Renders the active Session view inside the resident scrollport and keeps ++ * the input draft mirrored while blank Hero chrome is visible. ++ * @param props - Strict Session input/store, view ledger, and render shares. ++ * @returns the active view area, or null while the Session remains blank. ++ */ ++export declare function ConversationSession({ sessionId, useSession, useInput, inputActions, useStore, actions, renderSlot, views, bindDraftMirror, releaseSessionImages, }: ConversationSessionProps): import("react").JSX.Element | null; ++//# sourceMappingURL=ConversationSession.d.ts.map +\ No newline at end of file +diff --git a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/DetailsPanel.d.ts b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/DetailsPanel.d.ts +index e988aa0..7784704 100644 +--- a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/DetailsPanel.d.ts ++++ b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/DetailsPanel.d.ts +@@ -1,5 +1,5 @@ + import type { DetailsSlotProps } from '../contract/slots.ts'; +-/** Full props composed by reference from the contract (automatic shares & injected share). */ ++/** Full props composed by reference from the contract; Research visibility reads the shared store. */ + export type DetailsPanelProps = DetailsSlotProps; + export declare function DetailsPanel({ useSession, useSessions, sessionId, useStore, renderSlot, closeDetails, t }: DetailsPanelProps): import("react").JSX.Element; + //# sourceMappingURL=DetailsPanel.d.ts.map +\ No newline at end of file +diff --git a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/DetailsPanel.d.ts.orig b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/DetailsPanel.d.ts.orig +new file mode 100644 +index 0000000..e988aa0 +--- /dev/null ++++ b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/DetailsPanel.d.ts.orig +@@ -0,0 +1,5 @@ ++import type { DetailsSlotProps } from '../contract/slots.ts'; ++/** Full props composed by reference from the contract (automatic shares & injected share). */ ++export type DetailsPanelProps = DetailsSlotProps; ++export declare function DetailsPanel({ useSession, useSessions, sessionId, useStore, renderSlot, closeDetails, t }: DetailsPanelProps): import("react").JSX.Element; ++//# sourceMappingURL=DetailsPanel.d.ts.map +\ No newline at end of file +diff --git a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/InputBar.d.ts b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/InputBar.d.ts +index 395a266..1005545 100644 +--- a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/InputBar.d.ts ++++ b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/skeleton/InputBar.d.ts +@@ -7,5 +7,5 @@ + * (running/removed/promptError) are self-selected via useSession. */ + import type { ComposerBarProps } from '../contract/slots.ts'; + export type InputBarProps = ComposerBarProps; +-export declare function InputBar({ useSession, useInput, inputActions, keyboard, addImages, removeImage, draftImages, resolveSubmitMode, toggleCommandMenu, stop, command, t, renderSlot, useNotices, useLexicon, useMenuLauncher, useProjection, sessionId, variant, disabled: inert, blocked, workspacePickerOpen, onRequestWorkspace, placeholder, accessory, overlay, leftItems, rightItems, footer, }: InputBarProps): import("react").JSX.Element; ++export declare function InputBar({ useSession, useInput, inputActions, keyboard, addImages, removeImage, draftImages, resolveSubmitMode, toggleCommandMenu, stop, command, t, renderSlot, useNotices, useLexicon, useMenuLauncher, useProjection, sessionId, variant, disabled: inert, blocked, workspacePickerOpen, onRequestWorkspace, placeholder, accessory, researchFileReferences, overlay, leftItems, rightItems, footer, }: InputBarProps): import("react").JSX.Element; + //# sourceMappingURL=InputBar.d.ts.map +\ No newline at end of file +diff --git a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/stores.d.ts b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/stores.d.ts +index fc54eca..cf016ad 100644 +--- a/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/stores.d.ts ++++ b/node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/stores.d.ts +@@ -3,7 +3,7 @@ + * The plugin creates its handle at apply time so identity follows the fiber. + */ + import { type EngineStoreHandle } from '@deepseek-ai/dsh-client-runtime/client'; +-import type { CallId, ChatStoreState, SelectionTarget } from './contract/views.ts'; ++import type { CallId, ChatStoreState, ResearchRightTab, SelectionTarget } from './contract/views.ts'; + /** Declared action shape used to give the exported factory a stable return type. */ + type ChatActions = { + select: (draft: ChatStoreState, target: SelectionTarget | null) => void; +@@ -12,6 +12,9 @@ type ChatActions = { + setInspect: (draft: ChatStoreState, target: { + callId: CallId; + } | null) => void; ++ setResearchRightTab: (draft: ChatStoreState, tab: ResearchRightTab) => void; ++ setResearchFilesTabOpen: (draft: ChatStoreState, open: boolean) => void; ++ setResearchConversationUnread: (draft: ChatStoreState, unread: boolean) => void; + }; + /** + * Declares the per-session chat state and write surface. diff --git a/patches/@deepseek-ai+dsh-client-ui-deliverables+0.1.0-rc.7.patch b/patches/@deepseek-ai+dsh-client-ui-deliverables+0.1.0-rc.7.patch index 8d8e5eaf1..358b294ea 100644 --- a/patches/@deepseek-ai+dsh-client-ui-deliverables+0.1.0-rc.7.patch +++ b/patches/@deepseek-ai+dsh-client-ui-deliverables+0.1.0-rc.7.patch @@ -1,20 +1,32 @@ diff --git a/node_modules/@deepseek-ai/dsh-client-ui-deliverables/lib/client.js b/node_modules/@deepseek-ai/dsh-client-ui-deliverables/lib/client.js -index 83590ee..fa47077 100644 +index 83590ee..79511b4 100644 --- a/node_modules/@deepseek-ai/dsh-client-ui-deliverables/lib/client.js +++ b/node_modules/@deepseek-ai/dsh-client-ui-deliverables/lib/client.js -@@ -139,7 +139,7 @@ window.__ModuleLoader__.load({ +@@ -137,19 +137,39 @@ window.__ModuleLoader__.load({ + * @returns The resolver MarkdownText consumes; the full path rides `title`, + * the same disambiguator the row's chips carry. */ - function producedFileMentions(paths, openFile, label) { +- function producedFileMentions(paths, openFile, label) { ++ function producedFileMentions(paths, cwd, openFile, label) { return { resolve(value) { - const path = paths.includes(value) ? value : onlyPathWithBasename(paths, value); + const path = paths.includes(value) ? value : onlyPathWithBasename(paths, value) ?? localPathReference(value); if (path === void 0) return void 0; return { open: () => { -@@ -150,6 +150,21 @@ window.__ModuleLoader__.load({ + openFile(path); + }, + label: label(path), +- title: path ++ title: absoluteMentionPath(cwd, path) }; } }; } ++ /** Resolve a mention's display path against the active session workspace. */ ++ function absoluteMentionPath(cwd, path) { ++ if (/^(?:\/|[A-Za-z]:[\\/]|\\\\)/.test(path) || cwd === void 0 || cwd === "") return path; ++ return `${cwd.replace(/[\\/]+$/, "")}/${path.replace(/^\.?[\\/]+/, "")}`; ++ } + /** + * Resolve Codex-style local path references that were not produced by a tool + * in the current turn. Keep bare identifiers inert: without a slash, an @@ -33,13 +45,13 @@ index 83590ee..fa47077 100644 /** The single produced path whose basename is exactly `value`, else undefined. */ function onlyPathWithBasename(paths, value) { const matches = paths.filter((path) => basename(path) === value); -@@ -357,8 +372,7 @@ window.__ModuleLoader__.load({ +@@ -357,8 +377,7 @@ window.__ModuleLoader__.load({ const t = ctx.locale.bind(NS); ctx.provide("chatFileMentions", { forClosing(owner) { const paths = selectProducedFiles(owner); - if (paths === null) return void 0; - return producedFileMentions(paths, owner.openFile, (path) => t("produced.open", { name: path })); -+ return producedFileMentions(paths ?? [], owner.openFile, (path) => t("produced.open", { name: path })); ++ return producedFileMentions(paths ?? [], owner.cwd, owner.openFile, (path) => t("produced.open", { name: path })); } }); } //#endregion diff --git a/patches/@deepseek-ai+dsh-client-ui-directory-picker-native+0.1.0-rc.7.patch b/patches/@deepseek-ai+dsh-client-ui-directory-picker-native+0.1.0-rc.7.patch index 5de901e5b..4a578db6e 100644 --- a/patches/@deepseek-ai+dsh-client-ui-directory-picker-native+0.1.0-rc.7.patch +++ b/patches/@deepseek-ai+dsh-client-ui-directory-picker-native+0.1.0-rc.7.patch @@ -1,5 +1,5 @@ diff --git a/node_modules/@deepseek-ai/dsh-client-ui-directory-picker-native/lib/client.js b/node_modules/@deepseek-ai/dsh-client-ui-directory-picker-native/lib/client.js -index ec4b6fa..380e876 100644 +index ec4b6fa..a900fc3 100644 --- a/node_modules/@deepseek-ai/dsh-client-ui-directory-picker-native/lib/client.js +++ b/node_modules/@deepseek-ai/dsh-client-ui-directory-picker-native/lib/client.js @@ -60,7 +60,11 @@ window.__ModuleLoader__.load({ @@ -9,7 +9,7 @@ index ec4b6fa..380e876 100644 - const injected = () => ({ pick: () => ctx.workspaces.pickDirectory() }); + const injected = () => ({ pick: () => { + const bridge = window.dshDesktopDirectoryPicker; -+ if (!bridge || typeof bridge.pick !== "function") return Promise.reject(new Error("DSH Desktop directory picker bridge is unavailable")); ++ if (!bridge || typeof bridge.pick !== "function") return Promise.reject(new Error("Sherlock directory picker bridge is unavailable")); + return bridge.pick(); + } }); ctx.slots.inject("conversation.hero.workspace.directoryFlow", () => ctx.slots.inject("sidebar.workspaces.directoryFlow", function* () { diff --git a/patches/@deepseek-ai+dsh-client-ui-layout+0.1.0-rc.7.patch b/patches/@deepseek-ai+dsh-client-ui-layout+0.1.0-rc.7.patch index e5758a1b3..bad48e4a5 100644 --- a/patches/@deepseek-ai+dsh-client-ui-layout+0.1.0-rc.7.patch +++ b/patches/@deepseek-ai+dsh-client-ui-layout+0.1.0-rc.7.patch @@ -1,5 +1,5 @@ diff --git a/node_modules/@deepseek-ai/dsh-client-ui-layout/lib/client.js b/node_modules/@deepseek-ai/dsh-client-ui-layout/lib/client.js -index 74e58cb..97f112b 100644 +index 74e58cb..039b304 100644 --- a/node_modules/@deepseek-ai/dsh-client-ui-layout/lib/client.js +++ b/node_modules/@deepseek-ai/dsh-client-ui-layout/lib/client.js @@ -11,6 +11,7 @@ window.__ModuleLoader__.load({ @@ -19,3 +19,46 @@ index 74e58cb..97f112b 100644 const d0 = details === 0 ? 0 : clampWidth(details, 300, 520); if (s + d0 + 640 <= viewport) return { sidebar: s, +@@ -59,7 +60,7 @@ window.__ModuleLoader__.load({ + const tag = document.createElement("style"); + tag.dataset.plugin = "@deepseek-ai/dsh-client-ui-layout"; + tag.dataset.pluginCss = tagId; +- tag.textContent = css; ++ tag.textContent = css + (navigator.userAgent.includes("Macintosh") ? "html,body,#root{background-color:transparent!important}.pI_x6G_frame,.pI_x6G_sidebarCol{background:transparent}.pI_x6G_sidebarCol{border-right:0}.pI_x6G_centerCol,.pI_x6G_detailsCol{background:var(--dsw-alias-bg-base)}" : ""); + document.head.appendChild(tag); + } + var AppFrame_module_css_default = { +@@ -88,6 +89,7 @@ window.__ModuleLoader__.load({ + function CenterColumn(props) { + return (0, react_jsx_runtime.jsx)("div", { + className: AppFrame_module_css_default.centerCol, ++ "data-pane": "conversation", + children: props.children + }); + } +@@ -218,6 +220,7 @@ window.__ModuleLoader__.load({ + return (0, react_jsx_runtime.jsxs)("div", { + ref: frameRef, + className: AppFrame_module_css_default.frame, ++ "data-dsh-frame": true, + style: { gridTemplateColumns: `${cols.sidebar}px minmax(0, 1fr) ${cols.details}px` }, + "data-sidebar-collapsed": sidebarCollapsed || void 0, + "data-details-collapsed": cols.details === 0 || void 0, +@@ -287,7 +290,7 @@ window.__ModuleLoader__.load({ + d.sidebar = clampWidth(px, 264, 420); + }, + setDetails: (d, px) => { +- d.details = clampWidth(px, 300, 520); ++ d.details = px === 0 ? 0 : clampWidth(px, 300, 520); + }, + toggleSidebar: (d) => { + if (d.narrow) d.narrowExpanded = !d.narrowExpanded; +@@ -447,6 +450,8 @@ window.__ModuleLoader__.load({ + } + //#endregion + exports.LayoutController = LayoutController; ++ exports.AppFrame = AppFrame; ++ exports.createLayoutStore = createLayoutStore; + exports.apply = apply; + exports.inject = inject; + return module.exports; diff --git a/patches/@deepseek-ai+dsh-client-ui-permission-presets+0.1.0-rc.7.patch b/patches/@deepseek-ai+dsh-client-ui-permission-presets+0.1.0-rc.7.patch new file mode 100644 index 000000000..040df7648 --- /dev/null +++ b/patches/@deepseek-ai+dsh-client-ui-permission-presets+0.1.0-rc.7.patch @@ -0,0 +1,55 @@ +diff --git a/node_modules/@deepseek-ai/dsh-client-ui-permission-presets/lib/client.js b/node_modules/@deepseek-ai/dsh-client-ui-permission-presets/lib/client.js +index f85bd5d..ba0ab2b 100644 +--- a/node_modules/@deepseek-ai/dsh-client-ui-permission-presets/lib/client.js ++++ b/node_modules/@deepseek-ai/dsh-client-ui-permission-presets/lib/client.js +@@ -30,6 +30,12 @@ window.__ModuleLoader__.load({ + function displayPermissionPreset(value, name) { + return value === "danger-full-access" ? "Full access" : displayPresetName(name); + } ++ function settingsPermissionPresetLabel(option, t) { ++ if (option.id === "read-only") return t("mode.readOnly"); ++ if (option.id === "workspace-write") return t("mode.workspaceWrite"); ++ if (option.id === "danger-full-access") return t("mode.fullAccess"); ++ return option.label; ++ } + //#endregion + //#region \0dsh-css:/home/runner/work/deepseek-harness/deepseek-harness/packages/client/ui-permission-presets/src/client/PermissionRow.module.css.mjs + const css = ".oY77xG_row{border-bottom:1px solid var(--dsw-alias-border-l2);align-items:center;gap:8px;padding:16px 0;display:flex}.oY77xG_rowText{flex-direction:column;flex:1;gap:4px;min-width:0;padding-right:48px;display:flex}.oY77xG_title{color:var(--dsw-alias-label-primary);font-size:14px;font-weight:400;line-height:22px}.oY77xG_desc{color:var(--dsw-alias-label-tertiary);font-size:12px;font-weight:400;line-height:18px}.oY77xG_selector{background:var(--dsw-alias-bg-module-platform);height:36px;font:inherit;color:var(--dsw-alias-label-primary);cursor:pointer;border:none;border-radius:18px;align-items:center;gap:12px;padding:0 14px;font-size:14px;line-height:22px;display:inline-flex}.oY77xG_selector:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover)}.oY77xG_selector:disabled{cursor:default}.oY77xG_chevron{flex:none}"; +@@ -78,7 +84,7 @@ window.__ModuleLoader__.load({ + if (state.status === "unavailable") return null; + const selected = state.options.find((option) => option.id === state.currentValue); + const busy = state.status === "loading" || state.status === "saving" || confirmingFullAccess; +- const label = selected?.label ?? (busy ? t("loading") : t("unavailable")); ++ const label = selected !== void 0 ? settingsPermissionPresetLabel(selected, t) : busy ? t("loading") : t("unavailable"); + const description = state.error ?? t("description"); + return (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [(0, react_jsx_runtime.jsxs)("div", { + className: PermissionRow_module_css_default.row, +@@ -99,7 +105,7 @@ window.__ModuleLoader__.load({ + }, + items: state.options.map((option) => ({ + id: option.id, +- label: option.label ++ label: settingsPermissionPresetLabel(option, t) + })), + selectedId: state.currentValue, + onSelect: (id) => { +@@ -156,6 +162,9 @@ window.__ModuleLoader__.load({ + "description": "选择新会话的默认权限模式", + "loading": "加载中", + "unavailable": "不可用", ++ "mode.readOnly": "只读", ++ "mode.workspaceWrite": "工作区写入", ++ "mode.fullAccess": "完全访问", + "confirm.title": "确认启用 Full access？", + "confirm.description": "启用 Full access 后，新会话将减少确认步骤，并且可以直接执行更多操作，包括敏感操作、文件修改或外部命令。仅建议在你信任后续任务时使用。", + "confirm.acknowledge": "我已了解风险，并愿意继续", +@@ -168,6 +177,9 @@ window.__ModuleLoader__.load({ + "description": "Choose the default permission mode for new sessions", + "loading": "Loading", + "unavailable": "Unavailable", ++ "mode.readOnly": "Read Only", ++ "mode.workspaceWrite": "Workspace Write", ++ "mode.fullAccess": "Full access", + "confirm.title": "Enable Full access?", + "confirm.description": "Full access lets new sessions reduce confirmation steps and perform more actions directly, including sensitive operations, file changes, or external commands. Only use it when you trust subsequent tasks.", + "confirm.acknowledge": "I understand the risks and want to continue", diff --git a/patches/@deepseek-ai+dsh-client-ui-primitives+0.1.0-rc.7.patch b/patches/@deepseek-ai+dsh-client-ui-primitives+0.1.0-rc.7.patch new file mode 100644 index 000000000..d0a7f9a89 --- /dev/null +++ b/patches/@deepseek-ai+dsh-client-ui-primitives+0.1.0-rc.7.patch @@ -0,0 +1,26 @@ +diff --git a/node_modules/@deepseek-ai/dsh-client-ui-primitives/lib/index.js b/node_modules/@deepseek-ai/dsh-client-ui-primitives/lib/index.js +index 0d58268..6ca50e3 100644 +--- a/node_modules/@deepseek-ai/dsh-client-ui-primitives/lib/index.js ++++ b/node_modules/@deepseek-ai/dsh-client-ui-primitives/lib/index.js +@@ -2442,18 +2442,19 @@ function Tooltip({ label, side = "right", delayMs = 0, disabled = false, maxWidt + triggers.current.focus = false; + hide(); + } +- }), pos !== null && jsx("span", { ++ }), pos !== null && createPortal(jsx("span", { + ref: bubble, + className: Tooltip_module_css_default.bubble, + "data-side": placement, + style: { ++ position: "fixed", + left: pos.x, + top: y, + ...maxWidth === void 0 ? {} : { maxWidth } + }, + role: "tooltip", + children: resolvedLabel +- })] }); ++ }), document.body)] }); + } + //#endregion + //#region \0dsh-css-stub:./Toast.module.css.mjs diff --git a/patches/@deepseek-ai+dsh-client-ui-settings-general+0.1.0-rc.7.patch b/patches/@deepseek-ai+dsh-client-ui-settings-general+0.1.0-rc.7.patch new file mode 100644 index 000000000..163f02b76 --- /dev/null +++ b/patches/@deepseek-ai+dsh-client-ui-settings-general+0.1.0-rc.7.patch @@ -0,0 +1,232 @@ +diff --git a/node_modules/@deepseek-ai/dsh-client-ui-settings-general/lib/client.js b/node_modules/@deepseek-ai/dsh-client-ui-settings-general/lib/client.js +index 6797c5c..9aa022e 100644 +--- a/node_modules/@deepseek-ai/dsh-client-ui-settings-general/lib/client.js ++++ b/node_modules/@deepseek-ai/dsh-client-ui-settings-general/lib/client.js +@@ -76,6 +76,10 @@ window.__ModuleLoader__.load({ + className: SettingsRoot_module_css_default.navIcon, + size: 16 + }); ++ if (id === "about") return (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconQuestionOutline14, { ++ className: SettingsRoot_module_css_default.navIcon, ++ size: 16 ++ }); + if (id === "agent-presets") return (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconAgentPresetOutline16, { + className: SettingsRoot_module_css_default.navIcon, + size: 16 +@@ -133,6 +137,7 @@ window.__ModuleLoader__.load({ + children: rows.map((row) => (0, react_jsx_runtime.jsxs)("button", { + type: "button", + className: clsx(SettingsRoot_module_css_default.navCell, row.id === active && SettingsRoot_module_css_default.active), ++ "data-settings-section-id": row.id, + "aria-current": row.id === active ? "true" : void 0, + onClick: () => { + onSelect(row.id); +@@ -299,6 +304,132 @@ window.__ModuleLoader__.load({ + children: renderSlot("settings.general.item", {}) + }); + } ++ const sherlockAboutCss = ".sherlock-about{box-sizing:border-box;color:var(--dsw-alias-label-primary);flex-direction:column;width:100%;display:flex}.sherlock-about-hero{border-bottom:1px solid var(--dsw-alias-border-l2);align-items:center;gap:16px;padding:16px 0 28px;display:flex}.sherlock-about-mark{color:#fff;letter-spacing:.08em;background:linear-gradient(145deg,#34363b,#111216);border:1px solid rgba(255,255,255,.12);border-radius:14px;justify-content:center;align-items:center;width:52px;height:52px;font-size:21px;font-weight:700;display:flex;box-shadow:0 8px 24px rgba(0,0,0,.18)}.sherlock-about-product-info{flex:1;min-width:0}.sherlock-about-product{letter-spacing:.02em;margin:0;font-size:24px;font-weight:650;line-height:32px}.sherlock-about-version-row{align-items:center;gap:10px;display:flex}.sherlock-about-version{color:var(--dsw-alias-label-secondary);margin:4px 0 0;font-size:13px;line-height:20px}.sherlock-about-check{color:var(--dsw-alias-label-primary);cursor:pointer;background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l2);border-radius:7px;margin-top:4px;padding:4px 10px;font-size:12px;line-height:18px}.sherlock-about-check:hover:not(:disabled){background:var(--dsw-alias-bg-layer-3)}.sherlock-about-check:disabled{cursor:default;opacity:.55}.sherlock-about-check-state{color:var(--dsw-alias-label-secondary);margin:6px 0 0;font-size:12px;line-height:18px}.sherlock-about-check-state[data-error=true]{color:var(--dsw-alias-state-error-primary)}.sherlock-about-changelog{padding-top:24px}.sherlock-about-title{margin:0 0 8px;font-size:16px;font-weight:600;line-height:24px}.sherlock-about-release{border-bottom:1px solid var(--dsw-alias-border-l2);padding:14px 0 18px}.sherlock-about-release:last-child{border-bottom:none}.sherlock-about-release-header{justify-content:space-between;align-items:center;gap:16px;display:flex}.sherlock-about-release-version{font-size:14px;font-weight:600;line-height:22px}.sherlock-about-release-date{color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:20px}.sherlock-about-release-items{color:var(--dsw-alias-label-secondary);flex-direction:column;gap:7px;margin:11px 0 0;padding-left:20px;font-size:13px;line-height:21px;display:flex}.sherlock-about-state{color:var(--dsw-alias-label-secondary);padding:28px 0;font-size:14px;line-height:22px}"; ++ if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=\"sherlock-about\"]") === null) { ++ const tag = document.createElement("style"); ++ tag.dataset.plugin = "sherlock"; ++ tag.dataset.pluginCss = "sherlock-about"; ++ tag.textContent = sherlockAboutCss; ++ document.head.appendChild(tag); ++ } ++ function SherlockAboutContent({ info, t }) { ++ const [checkState, setCheckState] = (0, react.useState)({ status: "idle" }); ++ const checkForUpdates = async () => { ++ const check = window.sherlockAbout?.checkForUpdates; ++ if (typeof check !== "function") { ++ setCheckState({ status: "error" }); ++ return; ++ } ++ setCheckState({ status: "checking" }); ++ try { ++ setCheckState({ status: "result", update: await check() }); ++ } catch { ++ setCheckState({ status: "error" }); ++ } ++ }; ++ let checkMessage = null; ++ if (checkState.status === "checking") checkMessage = t("about.checking"); ++ else if (checkState.status === "error") checkMessage = t("about.checkFailed"); ++ else if (checkState.status === "result") { ++ const update = checkState.update; ++ if (update.phase === "up-to-date") checkMessage = t("about.upToDate"); ++ else if (update.phase === "available") checkMessage = t("about.updateAvailable").replace("{version}", update.availableVersion ?? ""); ++ else if (update.phase === "downloading") checkMessage = t("about.downloading").replace("{percent}", String(Math.round(update.percent ?? 0))); ++ else if (update.phase === "downloaded") checkMessage = t("about.restarting"); ++ else if (update.phase === "error" || update.phase === "unsupported") checkMessage = t("about.checkFailed"); ++ else checkMessage = t("about.checking"); ++ } ++ return (0, react_jsx_runtime.jsxs)("div", { ++ className: "sherlock-about", ++ children: [(0, react_jsx_runtime.jsxs)("div", { ++ className: "sherlock-about-hero", ++ children: [(0, react_jsx_runtime.jsx)("div", { ++ className: "sherlock-about-mark", ++ "aria-hidden": "true", ++ children: "S" ++ }), (0, react_jsx_runtime.jsxs)("div", { ++ className: "sherlock-about-product-info", ++ children: [(0, react_jsx_runtime.jsx)("h2", { ++ className: "sherlock-about-product", ++ children: info.productName ++ }), (0, react_jsx_runtime.jsxs)("div", { ++ className: "sherlock-about-version-row", ++ children: [(0, react_jsx_runtime.jsx)("p", { ++ className: "sherlock-about-version", ++ children: `${t("about.version")} ${info.version}` ++ }), (0, react_jsx_runtime.jsx)("button", { ++ type: "button", ++ className: "sherlock-about-check", ++ "data-about-check-update": "true", ++ disabled: checkState.status === "checking", ++ onClick: () => void checkForUpdates(), ++ children: checkState.status === "checking" ? t("about.checking") : t("about.check") ++ })] ++ }), checkMessage === null ? null : (0, react_jsx_runtime.jsx)("p", { ++ className: "sherlock-about-check-state", ++ "data-error": checkState.status === "error" || checkState.status === "result" && (checkState.update.phase === "error" || checkState.update.phase === "unsupported"), ++ role: checkState.status === "error" ? "alert" : "status", ++ children: checkMessage ++ })] ++ })] ++ }), (0, react_jsx_runtime.jsxs)("section", { ++ className: "sherlock-about-changelog", ++ children: [(0, react_jsx_runtime.jsx)("h3", { ++ className: "sherlock-about-title", ++ children: t("about.changelog") ++ }), info.releaseNotes.length === 0 ? (0, react_jsx_runtime.jsx)("p", { ++ className: "sherlock-about-state", ++ children: t("about.empty") ++ }) : info.releaseNotes.map((note) => (0, react_jsx_runtime.jsxs)("article", { ++ className: "sherlock-about-release", ++ children: [(0, react_jsx_runtime.jsxs)("div", { ++ className: "sherlock-about-release-header", ++ children: [(0, react_jsx_runtime.jsx)("span", { ++ className: "sherlock-about-release-version", ++ children: `v${note.version}` ++ }), (0, react_jsx_runtime.jsx)("time", { ++ className: "sherlock-about-release-date", ++ dateTime: note.date, ++ children: note.date ++ })] ++ }), (0, react_jsx_runtime.jsx)("ul", { ++ className: "sherlock-about-release-items", ++ children: note.items.map((item) => (0, react_jsx_runtime.jsx)("li", { children: item }, item)) ++ })] ++ }, note.version))] ++ })] ++ }); ++ } ++ function SherlockAboutSection({ t }) { ++ const [state, setState] = (0, react.useState)({ status: "loading" }); ++ (0, react.useEffect)(() => { ++ let active = true; ++ const getInfo = window.sherlockAbout?.getInfo; ++ if (typeof getInfo !== "function") { ++ setState({ status: "error" }); ++ return () => { ++ active = false; ++ }; ++ } ++ Promise.resolve(getInfo()).then((info) => { ++ if (active) setState({ status: "ready", info }); ++ }).catch(() => { ++ if (active) setState({ status: "error" }); ++ }); ++ return () => { ++ active = false; ++ }; ++ }, []); ++ if (state.status === "ready") return (0, react_jsx_runtime.jsx)(SherlockAboutContent, { ++ info: state.info, ++ t ++ }); ++ return (0, react_jsx_runtime.jsx)("p", { ++ className: "sherlock-about-state", ++ role: state.status === "error" ? "alert" : "status", ++ children: t(state.status === "error" ? "about.error" : "about.loading") ++ }); ++ } + //#endregion + //#region \0dsh-css:/home/runner/work/deepseek-harness/deepseek-harness/packages/client/ui-settings-general/src/client/SettingsDocumentAction.module.css.mjs + const css = ".me01iq_action{align-items:center;gap:8px;min-width:0;display:flex}.me01iq_error{max-width:180px;color:var(--dsw-alias-state-error-primary);text-overflow:ellipsis;white-space:nowrap;font-size:12px;line-height:18px;overflow:hidden}"; +@@ -442,7 +573,20 @@ window.__ModuleLoader__.load({ + "close": "关闭", + "openDocument": "打开配置文件", + "openDocument.error": "无法打开配置文件", +- "general.nav": "通用设置" ++ "general.nav": "通用设置", ++ "about.nav": "关于", ++ "about.version": "当前版本", ++ "about.changelog": "更新日志", ++ "about.loading": "正在读取版本信息…", ++ "about.error": "暂时无法读取版本信息", ++ "about.empty": "暂无更新日志", ++ "about.check": "检查更新", ++ "about.checking": "正在检查更新…", ++ "about.upToDate": "Sherlock 已是最新版本", ++ "about.updateAvailable": "发现新版本 {version}", ++ "about.downloading": "正在下载更新 {percent}%", ++ "about.restarting": "更新已下载，正在重新启动…", ++ "about.checkFailed": "检查更新失败" + }; + /** English dictionary, checked complete against the zh key set. */ + const en = { +@@ -451,7 +595,20 @@ window.__ModuleLoader__.load({ + "close": "Close", + "openDocument": "Open configuration file", + "openDocument.error": "Could not open configuration file", +- "general.nav": "General" ++ "general.nav": "General", ++ "about.nav": "About", ++ "about.version": "Current version", ++ "about.changelog": "Release notes", ++ "about.loading": "Loading version information…", ++ "about.error": "Version information is temporarily unavailable", ++ "about.empty": "No release notes yet", ++ "about.check": "Check for updates", ++ "about.checking": "Checking for updates…", ++ "about.upToDate": "Sherlock is up to date", ++ "about.updateAvailable": "Version {version} is available", ++ "about.downloading": "Downloading update {percent}%", ++ "about.restarting": "Update downloaded. Restarting…", ++ "about.checkFailed": "Could not check for updates" + }; + //#endregion + //#region lib/types/client/index.js +@@ -575,13 +732,6 @@ window.__ModuleLoader__.load({ + name: "settings.header", + locale: NS + }, HeaderContent)); +- if (documentInjected !== void 0) ctx.slots.inject("settings.action", () => ctx.slots.register({ +- name: "settings.action", +- id: "open-document", +- order: 0, +- locale: NS, +- inject: documentInjected +- }, SettingsDocumentAction)); + ctx.slots.inject("settings.close", () => ctx.slots.register({ + name: "settings.close", + locale: NS +@@ -597,8 +747,17 @@ window.__ModuleLoader__.load({ + scope: "root" + } } + }, GeneralSection)); ++ ctx.slots.inject("settings.section", () => ctx.slots.register({ ++ name: "settings.section", ++ id: "about", ++ order: 11, ++ label: () => t("about.nav"), ++ locale: NS ++ }, SherlockAboutSection)); + } + //#endregion ++ exports.SherlockAboutContent = SherlockAboutContent; ++ exports.SherlockAboutSection = SherlockAboutSection; + exports.SettingsDocumentStore = SettingsDocumentStore; + exports.apply = apply; + exports.inject = inject; diff --git a/patches/@deepseek-ai+dsh-client-ui-settings-models+0.1.0-rc.7.patch b/patches/@deepseek-ai+dsh-client-ui-settings-models+0.1.0-rc.7.patch index 5f58f0e56..ad11eed63 100644 --- a/patches/@deepseek-ai+dsh-client-ui-settings-models+0.1.0-rc.7.patch +++ b/patches/@deepseek-ai+dsh-client-ui-settings-models+0.1.0-rc.7.patch @@ -1,8 +1,8 @@ diff --git a/node_modules/@deepseek-ai/dsh-client-ui-settings-models/lib/client.js b/node_modules/@deepseek-ai/dsh-client-ui-settings-models/lib/client.js -index 02caaf7..935dceb 100644 +index 02caaf7..bf68ca4 100644 --- a/node_modules/@deepseek-ai/dsh-client-ui-settings-models/lib/client.js +++ b/node_modules/@deepseek-ai/dsh-client-ui-settings-models/lib/client.js -@@ -66,6 +66,14 @@ window.__ModuleLoader__.load({ +@@ -66,6 +66,22 @@ window.__ModuleLoader__.load({ tag.textContent = css$3; document.head.appendChild(tag); } @@ -13,11 +13,71 @@ index 02caaf7..935dceb 100644 + tag.dataset.pluginCss = providerPickerTagId; + tag.textContent = ".dshProviderPicker{flex-direction:column;gap:10px;display:flex}.dshProviderSearch{box-sizing:border-box;border:1px solid var(--dsw-alias-border-l2);width:100%;height:36px;font:inherit;background:var(--dsw-alias-bg-layer-1);color:var(--dsw-alias-label-primary);border-radius:8px;padding:0 11px;font-size:13px}.dshProviderSearch:focus{border-color:var(--dsw-alias-border-l1);outline:none}.dshProviderSearch::placeholder{color:var(--dsw-alias-label-dimmed)}.dshProviderGrid{grid-template-columns:repeat(2,minmax(0,1fr));gap:8px;display:grid}.dshProviderCard{box-sizing:border-box;color:var(--dsw-alias-label-primary);background:var(--dsw-alias-bg-layer-1);border:1px solid var(--dsw-alias-border-l2);border-radius:8px;flex-direction:column;align-items:flex-start;min-height:58px;padding:10px 12px;display:flex;cursor:pointer;text-align:left;font:inherit}.dshProviderCard:hover{background:var(--dsw-alias-interactive-bg-hover)}.dshProviderCard[aria-pressed=true]{border-color:var(--dsw-alias-border-l1);background:var(--dsw-alias-interactive-bg-hover)}.dshProviderCard:focus-visible{outline:none;box-shadow:0 0 0 2px var(--dsw-alias-border-l3)}.dshProviderName{font-size:14px;font-weight:500;line-height:20px}.dshProviderRoute{color:var(--dsw-alias-label-tertiary);font-size:11px;line-height:16px}.dshProviderSummary{box-sizing:border-box;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-1);border-radius:8px;align-items:center;gap:12px;min-height:52px;padding:8px 10px 8px 12px;display:flex}.dshProviderSummaryText{flex-direction:column;min-width:0;display:flex}.dshProviderChange{color:var(--dsw-alias-label-secondary);background:transparent;border:1px solid var(--dsw-alias-border-l2);border-radius:14px;margin-left:auto;padding:4px 10px;font:inherit;font-size:12px;cursor:pointer}.dshProviderChange:hover{background:var(--dsw-alias-interactive-bg-hover)}@media (width<=620px){.dshProviderGrid{grid-template-columns:1fr}}"; + document.head.appendChild(tag); ++ } ++ const modelVisionTagId = "@deepseek-ai/dsh-client-ui-settings-models/ModelVision"; ++ if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(modelVisionTagId) + "]") === null) { ++ const tag = document.createElement("style"); ++ tag.dataset.plugin = "@deepseek-ai/dsh-client-ui-settings-models"; ++ tag.dataset.pluginCss = modelVisionTagId; ++ tag.textContent = ".sherlockModelRow{grid-template-columns:minmax(0,1.4fr) minmax(0,1fr) auto auto auto}.sherlockModelVision{color:var(--dsw-alias-label-secondary);white-space:nowrap;cursor:pointer;align-items:center;gap:5px;padding:0 4px;font-size:12px;line-height:18px;display:inline-flex}.sherlockModelVision input{accent-color:var(--dsw-alias-brand-primary);cursor:pointer;margin:0}.sherlockModelVision:has(input:disabled){cursor:default;opacity:.55}.sherlockModelVision input:disabled{cursor:default}"; ++ document.head.appendChild(tag); + } var ModelsSection_module_css_default = { "editorRoute": "zGbnIq_editorRoute", "section": "zGbnIq_section", -@@ -837,6 +845,11 @@ window.__ModuleLoader__.load({ +@@ -210,6 +226,28 @@ window.__ModuleLoader__.load({ + if (!Array.isArray(value)) return []; + return value.map((entry) => typeof entry === "object" && entry !== null && !Array.isArray(entry) ? entry : {}); + } ++ /** Translate the Vision checkbox into the model schema consumed by Harness. */ ++ function modelInputForVision(model, enabled) { ++ const input = Array.isArray(model.input) ? model.input.filter((value) => value === "text" || value === "image") : []; ++ const next = new Set(input); ++ next.add("text"); ++ if (enabled) next.add("image"); ++ else next.delete("image"); ++ return [...next]; ++ } ++ function ModelVisionToggle({ model, index, t, disabled, onChange }) { ++ return (0, react_jsx_runtime.jsxs)("label", { ++ className: "sherlockModelVision", ++ children: [(0, react_jsx_runtime.jsx)("input", { ++ type: "checkbox", ++ "data-model-vision": "true", ++ checked: Array.isArray(model.input) && model.input.includes("image"), ++ "aria-label": `${t("modelVision")} ${String(index + 1)}`, ++ disabled, ++ onChange: (event) => onChange(modelInputForVision(model, event.target.checked)) ++ }), (0, react_jsx_runtime.jsx)("span", { children: t("modelVision") })] ++ }); ++ } + /** + * Validate adapter constraints that the serialized schema cannot express. + * @param value - user-owned `models` value, or undefined while inherited. +@@ -373,7 +411,7 @@ window.__ModuleLoader__.load({ + children: props.models.map((model, index) => (0, react_jsx_runtime.jsxs)("div", { + className: ModelsSection_module_css_default["modelEntry"], + children: [(0, react_jsx_runtime.jsxs)("div", { +- className: ModelsSection_module_css_default["modelRow"], ++ className: `${ModelsSection_module_css_default["modelRow"]} sherlockModelRow`, + children: [ + (0, react_jsx_runtime.jsx)("input", { + className: ModelsSection_module_css_default["input"], +@@ -401,6 +439,13 @@ window.__ModuleLoader__.load({ + update(index, "name", event.target.value === "" ? void 0 : event.target.value); + } + }), ++ (0, react_jsx_runtime.jsx)(ModelVisionToggle, { ++ model, ++ index, ++ t: props.t, ++ disabled: props.disabled, ++ onChange: (input) => update(index, "input", input) ++ }), + (0, react_jsx_runtime.jsx)("button", { + type: "button", + className: ModelsSection_module_css_default["iconButton"], +@@ -837,6 +882,11 @@ window.__ModuleLoader__.load({ return next; }); }; @@ -29,7 +89,30 @@ index 02caaf7..935dceb 100644 const askable = probe.provider !== void 0 || probe.baseURL !== void 0 && probe.baseURL.length > 0; return (0, react_jsx_runtime.jsxs)("section", { className: ModelsSection_module_css_default["modelCatalog"], -@@ -1003,7 +1016,15 @@ window.__ModuleLoader__.load({ +@@ -881,7 +931,7 @@ window.__ModuleLoader__.load({ + models.map((model, index) => (0, react_jsx_runtime.jsxs)("div", { + className: ModelsSection_module_css_default["modelEntry"], + children: [(0, react_jsx_runtime.jsxs)("div", { +- className: ModelsSection_module_css_default["modelRow"], ++ className: `${ModelsSection_module_css_default["modelRow"]} sherlockModelRow`, + children: [ + (0, react_jsx_runtime.jsx)("input", { + className: ModelsSection_module_css_default["input"], +@@ -905,6 +955,13 @@ window.__ModuleLoader__.load({ + patch(index, { name: event.target.value === "" ? void 0 : event.target.value }); + } + }), ++ (0, react_jsx_runtime.jsx)(ModelVisionToggle, { ++ model, ++ index, ++ t, ++ disabled, ++ onChange: (input) => patch(index, { input }) ++ }), + (0, react_jsx_runtime.jsx)("button", { + type: "button", + className: ModelsSection_module_css_default["iconButton"], +@@ -1003,7 +1060,15 @@ window.__ModuleLoader__.load({ onClick: adoptPicked, children: t("fetchAdopt") })] }), @@ -46,7 +129,7 @@ index 02caaf7..935dceb 100644 className: ModelsSection_module_css_default["candidateList"], children: (candidates ?? []).map((candidate) => (0, react_jsx_runtime.jsx)("li", { className: ModelsSection_module_css_default["candidate"], -@@ -1021,7 +1042,7 @@ window.__ModuleLoader__.load({ +@@ -1021,7 +1086,7 @@ window.__ModuleLoader__.load({ })] }) }, candidate.id)) @@ -55,7 +138,7 @@ index 02caaf7..935dceb 100644 }) ] }); -@@ -1753,6 +1774,26 @@ window.__ModuleLoader__.load({ +@@ -1753,6 +1818,26 @@ window.__ModuleLoader__.load({ function providerCopy(template, target) { return template.replace("{provider}", () => providerTargetLabel(target)); } @@ -82,7 +165,7 @@ index 02caaf7..935dceb 100644 /** * Render the Models section content column. * @param props - slot-delivered injected dependencies. -@@ -1778,6 +1819,8 @@ window.__ModuleLoader__.load({ +@@ -1778,6 +1863,8 @@ window.__ModuleLoader__.load({ const [deleteFailure, setDeleteFailure] = (0, react.useState)(void 0); const [savedTarget, setSavedTarget] = (0, react.useState)(void 0); const [declaring, setDeclaring] = (0, react.useState)(false); @@ -91,7 +174,7 @@ index 02caaf7..935dceb 100644 const [dismissedSetup, setDismissedSetup] = (0, react.useState)(() => /* @__PURE__ */ new Set()); const announceSaved = (target) => { controller.load().then(() => { -@@ -1847,10 +1890,16 @@ window.__ModuleLoader__.load({ +@@ -1847,10 +1934,16 @@ window.__ModuleLoader__.load({ }; const anyUsable = state.rows.some(providerUsable); const configured = state.rows.filter((row) => row.configured); @@ -109,7 +192,7 @@ index 02caaf7..935dceb 100644 return (0, react_jsx_runtime.jsxs)("div", { className: ModelsSection_module_css_default["section"], children: [ -@@ -1967,24 +2016,66 @@ window.__ModuleLoader__.load({ +@@ -1967,24 +2060,66 @@ window.__ModuleLoader__.load({ className: ModelsSection_module_css_default["addCard"], children: [(0, react_jsx_runtime.jsxs)("div", { className: ModelsSection_module_css_default["field"], @@ -191,7 +274,7 @@ index 02caaf7..935dceb 100644 }), (0, react_jsx_runtime.jsx)(ProviderEditor, { provider: addTarget.provider, displayName: addTarget.displayName, -@@ -2027,6 +2118,8 @@ window.__ModuleLoader__.load({ +@@ -2027,6 +2162,8 @@ window.__ModuleLoader__.load({ setDeclaring(false); setAdding(true); setEditing(targetOf(first)); @@ -200,7 +283,7 @@ index 02caaf7..935dceb 100644 }, children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconPlusOutline16, { size: 14 }), t("add")] }), (0, react_jsx_runtime.jsxs)("button", { -@@ -2135,7 +2228,7 @@ window.__ModuleLoader__.load({ +@@ -2135,7 +2272,7 @@ window.__ModuleLoader__.load({ } //#endregion //#region \0dsh-css:/home/runner/work/deepseek-harness/deepseek-harness/packages/client/ui-settings-models/src/client/DeepSeekOnboardingDialog.module.css.mjs @@ -209,7 +292,7 @@ index 02caaf7..935dceb 100644 const tagId$1 = "@deepseek-ai/dsh-client-ui-settings-models/DeepSeekOnboardingDialog.module.css"; if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId$1) + "]") === null) { const tag = document.createElement("style"); -@@ -2146,50 +2239,60 @@ window.__ModuleLoader__.load({ +@@ -2146,50 +2283,59 @@ window.__ModuleLoader__.load({ } var DeepSeekOnboardingDialog_module_css_default = { "description": "GL8Viq_description", @@ -225,7 +308,6 @@ index 02caaf7..935dceb 100644 //#region lib/types/client/DeepSeekOnboardingDialog.js + /** Mainstream catalog routes exposed during first-run setup. */ + const ONBOARDING_PROVIDERS = [ -+ { provider: "deepseek-official", displayName: "DeepSeek", kind: "onboardingManufacturer" }, + { provider: "openai", displayName: "OpenAI", kind: "onboardingManufacturer" }, + { provider: "anthropic", displayName: "Anthropic", kind: "onboardingManufacturer" }, + { provider: "google", displayName: "Google Gemini", kind: "onboardingManufacturer" }, @@ -261,7 +343,7 @@ index 02caaf7..935dceb 100644 const { complete, controller, useModels, api, t } = props; const state = useModels((snapshot) => snapshot); - const readiness = onboardingReadiness(state); -+ const [selectedProvider, setSelectedProvider] = (0, react.useState)("deepseek-official"); ++ const [selectedProvider, setSelectedProvider] = (0, react.useState)("openai"); + const choices = ONBOARDING_PROVIDERS.flatMap((choice) => { + const row = state.rows.find((candidate) => candidate.entry.provider === choice.provider && candidate.entry.settingsNs !== ""); + return row === void 0 || state.namespaces.get(row.entry.settingsNs) === void 0 ? [] : [{ @@ -299,7 +381,7 @@ index 02caaf7..935dceb 100644 const finishCredential = (changed) => { if (!changed) { complete(); -@@ -2199,28 +2302,54 @@ window.__ModuleLoader__.load({ +@@ -2199,28 +2345,54 @@ window.__ModuleLoader__.load({ }; return (0, react_jsx_runtime.jsxs)(OnboardingModal, { title: t("onboardingTitle"), @@ -359,7 +441,28 @@ index 02caaf7..935dceb 100644 })] }); } -@@ -2457,6 +2586,8 @@ window.__ModuleLoader__.load({ +@@ -2307,17 +2479,17 @@ window.__ModuleLoader__.load({ + * Bump only when the notice changes materially and every user should see it + * again. The acknowledgement is compared for exact equality. + */ +- const WELCOME_NOTICE_VERSION = "2026-08-13.1"; ++ const WELCOME_NOTICE_VERSION = "2026-08-24.1"; + /** The complete editable internal-testing notice in both supported GUI locales. */ + const WELCOME_NOTICE_COPY = { + zh: { + title: "内测声明", +- body: "DeepSeek Harness 目前的 0.1 版本仍处在面向 Harness 开发者进行测试的阶段，还有许多地方需要持续改进和打磨，希望听取广大开发者的反馈建议。预计 DeepSeek Harness 的核心插件以及基础 API 都会在接下来的一段时间内快速迭代、持续演化。\n\n我们期待与全球开发者一起，在开源、开放、可复用、可组合的基础设施之上，共同探索智能上限。欢迎全球 Harness 开发者加入 DSH 插件生态。", ++ body: "Sherlock 目前仍处于早期测试阶段，还有许多地方需要持续改进和打磨，欢迎反馈使用中遇到的问题和建议。Sherlock 的核心能力与基础 API 会继续快速迭代。\n\n我们期待与用户一起，在本地优先、开放、可复用、可组合的基础设施之上，探索个人知识与智能协作的更多可能。", + continueLabel: "继续" + }, + en: { + title: "Internal Testing Notice", +- body: "DeepSeek Harness 0.1 remains in testing for Harness developers. Many areas need further improvement, and we welcome feedback from the developer community. DeepSeek Harness's core plugins and foundational APIs will continue to evolve rapidly over the coming months.\n\nWe look forward to exploring the limits of intelligence with developers around the world, building on open-source, open, reusable, and composable infrastructure. We welcome Harness developers everywhere to join the DSH plugin ecosystem.", ++ body: "Sherlock remains in early testing. Many areas still need improvement, and we welcome feedback about issues and ideas from real use. Sherlock's core capabilities and foundational APIs will continue to evolve rapidly.\n\nWe look forward to exploring new possibilities for personal knowledge and intelligent collaboration on local-first, open, reusable, and composable infrastructure.", + continueLabel: "Continue" + } + }; +@@ -2457,6 +2629,8 @@ window.__ModuleLoader__.load({ deleting: "Deleting {provider}…", add: "Add provider", provider: "Provider", @@ -368,7 +471,15 @@ index 02caaf7..935dceb 100644 close: "Close", cancel: "Cancel", apply: "Apply", -@@ -2511,6 +2642,8 @@ window.__ModuleLoader__.load({ +@@ -2483,6 +2657,7 @@ window.__ModuleLoader__.load({ + model: "Model", + modelId: "Model ID", + modelName: "Display name", ++ modelVision: "Vision", + modelNamePlaceholder: "Uses the model ID when empty", + contextWindow: "Context window", + contextWindowPlaceholder: "Uses the provider default", +@@ -2511,6 +2686,8 @@ window.__ModuleLoader__.load({ fetchEmpty: "The provider listed no models. Add them by hand.", fetchTitle: "Choose models to add", fetchDescription: "These are the models this provider has available. Choose the ones to add.", @@ -377,14 +488,14 @@ index 02caaf7..935dceb 100644 fetchAdopt: "Add selected", customAdd: "Add a custom provider", customTitle: "Custom provider", -@@ -2530,10 +2663,14 @@ window.__ModuleLoader__.load({ +@@ -2530,10 +2707,14 @@ window.__ModuleLoader__.load({ welcomeBody: WELCOME_NOTICE_COPY.en.body, welcomeContinue: WELCOME_NOTICE_COPY.en.continueLabel, welcomeError: "The acknowledgement could not be saved. Please try again.", - onboardingTitle: "Add an API key to get started", - onboardingDescription: "Configure the official DeepSeek provider to start building.", + onboardingTitle: "Connect a model provider", -+ onboardingDescription: "Choose a provider and enter its API key. DSH will enable that provider's built-in model catalog automatically.", ++ onboardingDescription: "Choose a provider and enter its API key. Sherlock will enable that provider's built-in model catalog automatically.", + onboardingProvider: "Model provider", + onboardingManufacturer: "Model developer", + onboardingAggregator: "Model aggregation platform", @@ -395,7 +506,7 @@ index 02caaf7..935dceb 100644 onboardingSaving: "Saving…", keyRequired: "Enter an API key to continue." }; -@@ -2553,6 +2690,8 @@ window.__ModuleLoader__.load({ +@@ -2553,6 +2734,8 @@ window.__ModuleLoader__.load({ deleting: "正在删除 {provider}…", add: "添加提供方", provider: "提供方", @@ -404,7 +515,15 @@ index 02caaf7..935dceb 100644 close: "关闭", cancel: "取消", apply: "保存", -@@ -2607,6 +2746,8 @@ window.__ModuleLoader__.load({ +@@ -2579,6 +2762,7 @@ window.__ModuleLoader__.load({ + model: "模型", + modelId: "模型 ID", + modelName: "显示名称", ++ modelVision: "视觉", + modelNamePlaceholder: "留空时使用模型 ID", + contextWindow: "上下文窗口", + contextWindowPlaceholder: "使用提供方默认值", +@@ -2607,6 +2791,8 @@ window.__ModuleLoader__.load({ fetchEmpty: "该提供方没有列出任何模型，请手动添加。", fetchTitle: "选择要添加的模型", fetchDescription: "以下是模型提供方的可用模型，勾选要添加的模型。", @@ -413,14 +532,14 @@ index 02caaf7..935dceb 100644 fetchAdopt: "添加所选", customAdd: "添加自定义提供方", customTitle: "自定义提供方", -@@ -2626,10 +2767,14 @@ window.__ModuleLoader__.load({ +@@ -2626,10 +2812,14 @@ window.__ModuleLoader__.load({ welcomeBody: WELCOME_NOTICE_COPY.zh.body, welcomeContinue: WELCOME_NOTICE_COPY.zh.continueLabel, welcomeError: "暂时无法保存确认状态，请重试。", - onboardingTitle: "添加一个 API Key 开始使用", - onboardingDescription: "配置 DeepSeek 官方模型，即可开始使用。", + onboardingTitle: "接入模型提供方", -+ onboardingDescription: "选择提供方并填写 API Key，DSH 会自动启用该提供方的内置模型目录。之后可在「设置 → 模型」中添加更多提供方。", ++ onboardingDescription: "选择提供方并填写 API Key，Sherlock 会自动启用该提供方的内置模型目录。之后可在「设置 → 模型」中添加更多提供方。", + onboardingProvider: "选择模型提供方", + onboardingManufacturer: "模型厂商", + onboardingAggregator: "模型聚合平台", @@ -431,3 +550,12 @@ index 02caaf7..935dceb 100644 onboardingSaving: "保存中…", keyRequired: "请输入 API 密钥后继续。" }; +@@ -2732,6 +2922,8 @@ window.__ModuleLoader__.load({ + }, DeepSeekOnboardingDialog)); + } + //#endregion ++ exports.ModelListEditor = ModelListEditor; ++ exports.modelInputForVision = modelInputForVision; + exports.apply = apply; + exports.inject = inject; + exports.refreshIfLoaded = refreshIfLoaded; diff --git a/patches/@deepseek-ai+dsh-client-ui-settings-plugins+0.1.0-rc.7.patch b/patches/@deepseek-ai+dsh-client-ui-settings-plugins+0.1.0-rc.7.patch new file mode 100644 index 000000000..be023b6eb --- /dev/null +++ b/patches/@deepseek-ai+dsh-client-ui-settings-plugins+0.1.0-rc.7.patch @@ -0,0 +1,355 @@ +diff --git a/node_modules/@deepseek-ai/dsh-client-ui-settings-plugins/lib/client.js b/node_modules/@deepseek-ai/dsh-client-ui-settings-plugins/lib/client.js +index aa98760..ae1d379 100644 +--- a/node_modules/@deepseek-ai/dsh-client-ui-settings-plugins/lib/client.js ++++ b/node_modules/@deepseek-ai/dsh-client-ui-settings-plugins/lib/client.js +@@ -92,6 +92,51 @@ window.__ModuleLoader__.load({ + ] + }); + } ++ /** A staged finite-choice field rendered as a native accessible selector. */ ++ function SelectField(props) { ++ return (0, react_jsx_runtime.jsxs)("div", { ++ className: fields_module_css_default.field, ++ children: [ ++ (0, react_jsx_runtime.jsxs)("div", { ++ className: fields_module_css_default.head, ++ children: [(0, react_jsx_runtime.jsx)("label", { ++ className: fields_module_css_default.label, ++ htmlFor: props.id, ++ children: props.label ++ }), props.overridden ? (0, react_jsx_runtime.jsxs)("span", { ++ className: fields_module_css_default.badges, ++ children: [(0, react_jsx_runtime.jsx)("span", { ++ className: fields_module_css_default.badge, ++ children: props.overriddenLabel ++ }), (0, react_jsx_runtime.jsx)("button", { ++ type: "button", ++ className: fields_module_css_default.reset, ++ disabled: props.disabled, ++ onClick: props.onReset, ++ children: props.resetLabel ++ })] ++ }) : null] ++ }), ++ (0, react_jsx_runtime.jsx)("select", { ++ id: props.id, ++ className: fields_module_css_default.input, ++ value: props.text, ++ disabled: props.disabled, ++ onChange: (event) => { ++ props.onEdit(event.target.value); ++ }, ++ children: props.options.map((option) => (0, react_jsx_runtime.jsx)("option", { ++ value: option.value, ++ children: option.label ++ }, option.value)) ++ }), ++ (0, react_jsx_runtime.jsx)("p", { ++ className: fields_module_css_default.hint, ++ children: props.hint ++ }) ++ ] ++ }); ++ } + /** + * A write-only credential control. The value never rides a response, so the + * control reports only whether one is configured and starts blank; a blank +@@ -518,53 +563,26 @@ window.__ModuleLoader__.load({ + state, + onSave: props.save, + onDiscard: props.discard, +- children: [ +- (0, react_jsx_runtime.jsx)(SecretField, { +- id: "plugin-config-web-search-key", +- label: t("webSearchApiKey"), +- hint: t("webSearchApiKeyHint"), +- disabled: !state.apiKeyWritable, +- text: state.apiKey.text, +- configured: state.apiKeyConfigured, +- stateLabel: state.apiKeyConfigured ? t("webSearchApiKeySet") : t("webSearchApiKeyUnset"), +- onEdit: (text) => { +- props.edit("apiKey", text); +- } +- }), +- (0, react_jsx_runtime.jsx)(ValueField, { +- id: "plugin-config-web-search-endpoint", +- label: t("webSearchBaseUrl"), +- hint: t("webSearchBaseUrlHint"), +- overriddenLabel: t("overridden"), +- resetLabel: t("reset"), +- invalidLabel: t("invalidNumber"), +- disabled, +- ...state.baseURL, +- onEdit: (text) => { +- props.edit("baseURL", text); +- }, +- onReset: () => { +- props.resetField("baseURL"); +- } +- }), +- (0, react_jsx_runtime.jsx)(ValueField, { +- id: "plugin-config-web-search-max-uses", +- label: t("webSearchMaxUses"), +- hint: t("webSearchMaxUsesHint"), +- overriddenLabel: t("overridden"), +- resetLabel: t("reset"), +- invalidLabel: t("invalidNumber"), +- numeric: true, +- disabled, +- ...state.maxUses, +- onEdit: (text) => { +- props.edit("maxUses", text); +- }, +- onReset: () => { +- props.resetField("maxUses"); +- } +- }) +- ] ++ children: (0, react_jsx_runtime.jsx)(SelectField, { ++ id: "plugin-config-web-search-mode", ++ label: t("webSearchMode"), ++ hint: t("webSearchModeHint"), ++ overriddenLabel: t("overridden"), ++ resetLabel: t("reset"), ++ disabled, ++ ...state.mode, ++ options: [ ++ { value: "auto", label: t("webSearchModeAuto") }, ++ { value: "native-only", label: t("webSearchModeNativeOnly") }, ++ { value: "off", label: t("webSearchModeOff") } ++ ], ++ onEdit: (text) => { ++ props.edit("mode", text); ++ }, ++ onReset: () => { ++ props.resetField("mode"); ++ } ++ }) + }); + } + //#endregion +@@ -623,6 +641,17 @@ window.__ModuleLoader__.load({ + } + }; + } ++ function choiceField(field, choices) { ++ const allowed = new Set(choices); ++ return { ++ field, ++ format: (value) => typeof value === "string" && allowed.has(value) ? value : choices[0], ++ parse: (text) => allowed.has(text) ? { ++ kind: "set", ++ value: text ++ } : void 0 ++ }; ++ } + /** + * Stages one card's edits over one settings namespace and writes them on save. + * +@@ -993,145 +1022,28 @@ window.__ModuleLoader__.load({ + }; + //#endregion + //#region lib/types/client/web-search-card-controller.js +- /** +- * The web-search card's staged form over the `web-search-deepseek` settings +- * namespace. +- * +- * The key is the one control that does not live in the section: its literal +- * never rides a response, so the card learns only whether one is configured +- * and writes it through the credentials domain, addressed by the reference the +- * section names. It is still staged with the rest of the form, so one save +- * covers everything the card shows. +- */ +- /** +- * Namespace of the DeepSeek search provider. Spelled here rather than +- * imported: a client package must not depend on a Host package. +- */ +- const WEB_SEARCH_NS = "web-search-deepseek"; +- /** Credential reference the provider resolves when the section names none. */ +- const DEFAULT_API_KEY_REF = "DEEPSEEK_API_KEY"; +- /** Form field the credential control stages under. */ +- const API_KEY_FIELD = "apiKey"; +- /** Bridges the `web-search-deepseek` scope and the credentials domain onto the card. */ ++ /** Search behavior is user-owned but carries no search-service credential. */ ++ const WEB_SEARCH_NS = "web-search-session-model"; + var WebSearchCardController = class { +- scope; +- api; + form; + store; +- credential = { +- ref: "", +- configured: false, +- writable: true +- }; +- /** +- * @param scope - the bound settings scope for the `web-search-deepseek` namespace. +- * @param api - wire face used for the credential the section references. +- */ +- constructor(scope, api) { +- this.scope = scope; +- this.api = api; +- this.form = new CardForm(scope, [textField("baseURL"), numberField("maxUses")], [{ +- field: API_KEY_FIELD, +- write: (text) => this.writeKey(text) +- }]); ++ constructor(scope) { ++ this.form = new CardForm(scope, [choiceField("mode", ["auto", "native-only", "off"])]); + this.store = this.form.bind(() => this.projection()); +- scope.subscribe(() => { +- this.readCredential(); +- }); +- this.readCredential(); + } + projection() { + return { + ...this.form.shell(), +- baseURL: this.form.field("baseURL"), +- maxUses: this.form.field("maxUses"), +- apiKey: this.form.field(API_KEY_FIELD), +- apiKeyConfigured: this.credential.configured, +- apiKeyWritable: this.credential.writable ++ mode: this.form.field("mode") + }; + } +- /** +- * Ask the credentials domain about the reference the section currently names. +- * +- * The answer is stored with the reference it describes: `apiKeyEnv` can +- * change between the request and its response, and two reads can settle out +- * of order, so a response is published only while it still answers for the +- * reference in force. +- */ +- async readCredential() { +- const ref = refOf(this.scope.getSnapshot()); +- if (ref !== this.credential.ref) { +- this.credential = { +- ref, +- configured: false, +- writable: true +- }; +- this.store.set(this.projection()); +- } +- let response; +- try { +- response = await this.api.credentials.describe({ refs: [ref] }); +- } catch (_credentialReadFailure) { +- return; +- } +- if (!response.result.ok || ref !== refOf(this.scope.getSnapshot())) return; +- const view = response.result.value.credentials[ref]; +- const next = { +- ref, +- configured: view?.configured ?? false, +- writable: view?.writable ?? true +- }; +- if (next.configured === this.credential.configured && next.writable === this.credential.writable) return; +- this.credential = next; +- this.store.set(this.projection()); +- } +- /** +- * Re-read after the Host reports a change to the reference this card watches. +- * +- * A key can be written from somewhere else — the Models page addresses the +- * same reference — and the settings section does not change when it is, so +- * without this the badge keeps reporting a state the Host already replaced. +- * @param ref - the reference the Host reports as changed. +- */ +- refreshCredential(ref) { +- if (ref !== this.credential.ref) return; +- this.readCredential(); +- } +- /** +- * Build the face the card's slot registration injects. +- * @returns the card's snapshot and its form actions. +- */ + inject() { + return { + hooks: { webSearchCard: this.store }, + ...this.form.actions() + }; + } +- /** +- * Write the staged key, then re-read whether the Host now holds one. +- * @param value - the staged credential literal. +- * @returns whether the Host reports a configured credential afterwards. +- */ +- async writeKey(value) { +- try { +- await this.api.credentials.set({ +- ref: refOf(this.scope.getSnapshot()), +- value +- }); +- } catch (_credentialWriteFailure) {} +- await this.readCredential(); +- return this.credential.configured; +- } + }; +- /** +- * The credential reference the section names, or the provider's default. +- * @param snapshot - the current scope snapshot. +- * @returns the reference to address. +- */ +- function refOf(snapshot) { +- const declared = snapshot.value?.apiKeyEnv; +- return declared !== void 0 && declared.length > 0 ? declared : DEFAULT_API_KEY_REF; +- } + //#endregion + //#region lib/types/client/locales.js + /** Locale bundles for the plugin configuration section and its plugin cards. */ +@@ -1165,15 +1077,12 @@ window.__ModuleLoader__.load({ + agentLoopMaxParallel: "Parallel tool calls", + agentLoopMaxParallelHint: "Upper bound on parallel-safe calls running at once within one step.", + webSearchTitle: "Web search", +- webSearchDescription: "The DeepSeek search provider.", +- webSearchApiKey: "API key", +- webSearchApiKeyHint: "Stored outside the settings file. Leave blank to keep the current key.", +- webSearchApiKeySet: "A key is configured.", +- webSearchApiKeyUnset: "No key is configured; search is unavailable until one is.", +- webSearchBaseUrl: "Endpoint", +- webSearchBaseUrlHint: "Leave blank to use the provider default.", +- webSearchMaxUses: "Max searches per request", +- webSearchMaxUsesHint: "How many times one request may search before it must answer." ++ webSearchDescription: "Use model-native search when available, with a free local browser fallback.", ++ webSearchMode: "Search mode", ++ webSearchModeHint: "Automatic needs no search-service account or key.", ++ webSearchModeAuto: "Automatic (recommended)", ++ webSearchModeNativeOnly: "Model native only", ++ webSearchModeOff: "Off" + }; + /** Simplified Chinese copy. */ + const zh = { +@@ -1205,15 +1114,12 @@ window.__ModuleLoader__.load({ + agentLoopMaxParallel: "并行工具调用数", + agentLoopMaxParallelHint: "同一步内最多同时运行多少个可并行的调用。", + webSearchTitle: "网页搜索", +- webSearchDescription: "DeepSeek 搜索提供方。", +- webSearchApiKey: "API Key", +- webSearchApiKeyHint: "不写入设置文件。留空表示保持当前密钥。", +- webSearchApiKeySet: "已配置密钥。", +- webSearchApiKeyUnset: "未配置密钥；配置之前搜索不可用。", +- webSearchBaseUrl: "接口地址", +- webSearchBaseUrlHint: "留空则使用提供方默认地址。", +- webSearchMaxUses: "单次请求最多搜索次数", +- webSearchMaxUsesHint: "一次请求在必须作答前最多可以搜索多少次。" ++ webSearchDescription: "模型支持时优先原生搜索，否则自动使用免费的本地浏览器。", ++ webSearchMode: "搜索模式", ++ webSearchModeHint: "自动模式无需额外搜索服务账号或密钥。", ++ webSearchModeAuto: "自动（推荐）", ++ webSearchModeNativeOnly: "仅模型原生", ++ webSearchModeOff: "关闭" + }; + //#endregion + //#region lib/types/client/index.js +@@ -1250,10 +1156,7 @@ window.__ModuleLoader__.load({ + }), "ui-settings-plugins: section dictionaries"); + const bash = new BashCardController(ctx.settingsScope.bind({ namespace: SHELL_NS })); + const agentLoop = new AgentLoopCardController(ctx.settingsScope.bind({ namespace: AGENT_LOOP_NS })); +- const webSearch = new WebSearchCardController(ctx.settingsScope.bind({ namespace: WEB_SEARCH_NS }), api); +- ctx.effect(() => ctx.remote.$on("credentials/updated", (ref) => { +- webSearch.refreshCredential(ref); +- }), "ui-settings-plugins: credential invalidations"); ++ const webSearch = new WebSearchCardController(ctx.settingsScope.bind({ namespace: WEB_SEARCH_NS })); + const configurable = new ConfigurablePluginsTabController(api, () => ctx.slots.entries("settings.plugin.item")); + ctx.effect(() => () => { + configurable.dispose(); diff --git a/patches/@deepseek-ai+dsh-client-ui-sidebar+0.1.0-rc.7.patch b/patches/@deepseek-ai+dsh-client-ui-sidebar+0.1.0-rc.7.patch index 6064b3c3a..a0fcda8b7 100644 --- a/patches/@deepseek-ai+dsh-client-ui-sidebar+0.1.0-rc.7.patch +++ b/patches/@deepseek-ai+dsh-client-ui-sidebar+0.1.0-rc.7.patch @@ -1,8 +1,8 @@ diff --git a/node_modules/@deepseek-ai/dsh-client-ui-sidebar/lib/client.js b/node_modules/@deepseek-ai/dsh-client-ui-sidebar/lib/client.js -index 9ca3639..16d58b0 100644 +index 9ca3639..ee985a7 100644 --- a/node_modules/@deepseek-ai/dsh-client-ui-sidebar/lib/client.js +++ b/node_modules/@deepseek-ai/dsh-client-ui-sidebar/lib/client.js -@@ -23,16 +23,20 @@ window.__ModuleLoader__.load({ +@@ -23,16 +23,17 @@ window.__ModuleLoader__.load({ } //#endregion //#region \0dsh-css:/home/runner/work/deepseek-harness/deepseek-harness/packages/client/ui-sidebar/src/client/SidebarRoot.module.css.mjs @@ -14,70 +14,52 @@ index 9ca3639..16d58b0 100644 tag.dataset.plugin = "@deepseek-ai/dsh-client-ui-sidebar"; tag.dataset.pluginCss = tagId; - tag.textContent = css; -+ tag.textContent = css + ".hHd-Xa_root:not(.hHd-Xa_collapsed){padding-top:32px}" + (navigator.userAgent.includes("Macintosh") ? ".hHd-Xa_root.hHd-Xa_collapsed{padding:46px 22px 6px}" : ""); ++ tag.textContent = css + ".hHd-Xa_root:not(.hHd-Xa_collapsed){padding-top:32px}.hHd-Xa_sherlockLogo{display:block;width:120px;height:17px;flex:none;background:currentColor;-webkit-mask:url(/sherlock-logo.svg) center/contain no-repeat;mask:url(/sherlock-logo.svg) center/contain no-repeat}.hHd-Xa_researchIcon{display:block;width:16px;height:16px;flex:none;background:currentColor;-webkit-mask:url(/sherlock-research.svg) center/contain no-repeat;mask:url(/sherlock-research.svg) center/contain no-repeat}.hHd-Xa_collapsed .hHd-Xa_researchIcon{width:18px;height:18px}.hHd-Xa_collapsed .hHd-Xa_toggle .hHd-Xa_panelIcon{display:inline}.hHd-Xa_newSessionGroup{display:flex;gap:8px;margin:0 2px 8px}.hHd-Xa_newSessionGroup .hHd-Xa_newSession{flex:1;min-width:0;margin:0;padding:8px 10px}.hHd-Xa_collapsed .hHd-Xa_newSessionGroup{flex-direction:column;align-items:flex-start;gap:4px;margin:0 0 12px}.hHd-Xa_collapsed .hHd-Xa_newSessionGroup .hHd-Xa_newSession{flex:none;margin:0}" + (navigator.userAgent.includes("Macintosh") ? ".hHd-Xa_root{background:rgba(255,255,255,.62)}body[data-ds-dark-theme] .hHd-Xa_root{background:rgba(18,18,20,.46)}" : "") + (navigator.userAgent.includes("Macintosh") ? ".hHd-Xa_root.hHd-Xa_collapsed{padding:46px 22px 6px}" : ""); document.head.appendChild(tag); } var SidebarRoot_module_css_default = { -+ "brandLockup": "hHd-Xa_brandLockup", -+ "brandMark": "hHd-Xa_brandMark", -+ "brandWordmark": "hHd-Xa_brandWordmark", -+ "railFish": "hHd-Xa_railFish", ++ "sherlockLogo": "hHd-Xa_sherlockLogo", "iconButton": "hHd-Xa_iconButton", "settingsArea": "hHd-Xa_settingsArea", "wide": "hHd-Xa_wide", -@@ -56,6 +60,51 @@ window.__ModuleLoader__.load({ +@@ -46,16 +47,26 @@ window.__ModuleLoader__.load({ + "fading": "hHd-Xa_fading", + "wide-in": "hHd-Xa_wide-in", + "newSessionLabel": "hHd-Xa_newSessionLabel", ++ "newSessionGroup": "hHd-Xa_newSessionGroup", ++ "researchIcon": "hHd-Xa_researchIcon", + "railIn": "hHd-Xa_railIn", + "rail-in": "hHd-Xa_rail-in", + "toggle": "hHd-Xa_toggle", + "collapsed": "hHd-Xa_collapsed", + "regionArea": "hHd-Xa_regionArea", + "panelIcon": "hHd-Xa_panelIcon", +- "railFish": "hHd-Xa_railFish", "newSession": "hHd-Xa_newSession" }; //#endregion -+ //#region lib/types/client/DshDesktopLogo.js -+ const DSH_DESKTOP_LIGHT_LOGO_URL = "/dsh-desktop-logo-light.png"; -+ const DSH_DESKTOP_DARK_LOGO_URL = "/dsh-desktop-logo-dark.png"; -+ function DshDesktopLogo({ height = 20, className }) { -+ return (0, react_jsx_runtime.jsxs)("svg", { -+ width: height * 1030 / 590, -+ height, -+ className, -+ viewBox: "150 330 1030 590", -+ fill: "none", -+ "aria-hidden": "true", -+ children: [(0, react_jsx_runtime.jsx)("style", { -+ children: ".dshDesktopLogoDark{display:none}body[data-ds-dark-theme] .dshDesktopLogoLight{display:none}body[data-ds-dark-theme] .dshDesktopLogoDark{display:block}" -+ }), (0, react_jsx_runtime.jsx)("image", { -+ className: "dshDesktopLogoLight", -+ href: DSH_DESKTOP_LIGHT_LOGO_URL, -+ x: 150, -+ y: 330, -+ width: 1030, -+ height: 590, -+ preserveAspectRatio: "xMidYMid meet" -+ }), (0, react_jsx_runtime.jsx)("image", { -+ className: "dshDesktopLogoDark", -+ href: DSH_DESKTOP_DARK_LOGO_URL, -+ x: 150, -+ y: 330, -+ width: 1030, -+ height: 590, -+ preserveAspectRatio: "xMidYMid meet" -+ })] -+ }); -+ } -+ function DshDesktopBrand() { -+ return (0, react_jsx_runtime.jsxs)("span", { -+ className: SidebarRoot_module_css_default.brandLockup, -+ children: [(0, react_jsx_runtime.jsx)("span", { -+ className: SidebarRoot_module_css_default.brandMark, -+ children: (0, react_jsx_runtime.jsx)(DshDesktopLogo, {}) -+ }), (0, react_jsx_runtime.jsx)("span", { -+ className: SidebarRoot_module_css_default.brandWordmark, -+ children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.BrandWordmark, {}) -+ })] ++ //#region lib/types/client/SherlockLogo.js ++ function SherlockLogo() { ++ return (0, react_jsx_runtime.jsx)("span", { ++ className: SidebarRoot_module_css_default.sherlockLogo, ++ role: "img", ++ "aria-label": "Sherlock" + }); + } + //#endregion //#region lib/types/client/SidebarRoot.js /** * Sidebar shell: column geometry only. Collapse is a slide plus crossfade: -@@ -138,6 +187,8 @@ window.__ModuleLoader__.load({ +@@ -88,7 +99,7 @@ window.__ModuleLoader__.load({ + * @param props - composed slot props (runtime share + injected callbacks, contract/slots.ts). + * @returns the sidebar element tree. + */ +- function SidebarRoot({ collapsed, width, startSession, toggleSidebar, t, renderSlot }) { ++ function SidebarRoot({ collapsed, width, startSession, startResearchSession, toggleSidebar, t, renderSlot }) { + const [settled, setSettled] = (0, react.useState)(collapsed); + (0, react.useEffect)(() => { + if (!collapsed) { +@@ -138,6 +149,8 @@ window.__ModuleLoader__.load({ }, [pointerInside]); return (0, react_jsx_runtime.jsxs)("div", { ref: column, @@ -86,32 +68,178 @@ index 9ca3639..16d58b0 100644 className: clsx(SidebarRoot_module_css_default.root, !wide && SidebarRoot_module_css_default.collapsed, !wide && everWide.current && SidebarRoot_module_css_default.railIn, collapsed && wide && SidebarRoot_module_css_default.fading, !pointerInside && SidebarRoot_module_css_default.quietBars), style: wide ? { width: collapsed ? lastWideWidth.current : width } : void 0, onPointerEnter: () => { -@@ -157,7 +208,7 @@ window.__ModuleLoader__.load({ +@@ -153,11 +166,12 @@ window.__ModuleLoader__.load({ + children: [wide && (0, react_jsx_runtime.jsx)("button", { + type: "button", + className: clsx(SidebarRoot_module_css_default.brand, SidebarRoot_module_css_default.wide), +- "aria-label": t("session.new.label"), ++ "aria-label": "Sherlock", ++ "data-sherlock-developer-trigger": "", onClick: () => { - startSession(); +- startSession(); ++ window.sherlockDeveloperMode?.logoClick(); }, - children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.BrandWordmark, {}) -+ children: (0, react_jsx_runtime.jsx)(DshDesktopBrand, {}) ++ children: (0, react_jsx_runtime.jsx)(SherlockLogo, {}) }), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, { label: collapsed ? t("toggle.open") : t("toggle.collapse"), delayMs: 500, -@@ -168,9 +219,9 @@ window.__ModuleLoader__.load({ +@@ -168,32 +182,48 @@ window.__ModuleLoader__.load({ onClick: () => { toggleSidebar(); }, - children: [!wide && (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.FishLogo, { -+ children: [!wide && (0, react_jsx_runtime.jsx)(DshDesktopLogo, { - className: SidebarRoot_module_css_default.railFish, +- className: SidebarRoot_module_css_default.railFish, - size: 24 -+ height: 18 - }), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconPanelLeftOutline16, { +- }), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconPanelLeftOutline16, { ++ children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconPanelLeftOutline16, { className: SidebarRoot_module_css_default.panelIcon, size: wide ? 16 : 18 -@@ -205,6 +256,7 @@ window.__ModuleLoader__.load({ - }) +- })] ++ }) + }) + })] + }), +- (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, { +- label: t("session.new.label"), +- delayMs: 500, +- disabled: wide, +- children: (0, react_jsx_runtime.jsxs)("button", { +- type: "button", +- className: SidebarRoot_module_css_default.newSession, +- "aria-label": t("session.new.label"), +- onClick: () => { +- startSession(); +- }, +- children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconNewChatOutline16, { size: wide ? 14 : 18 }), wide && (0, react_jsx_runtime.jsx)("span", { +- className: clsx(SidebarRoot_module_css_default.newSessionLabel, SidebarRoot_module_css_default.wide), +- children: t("session.new") +- })] +- }) ++ (0, react_jsx_runtime.jsxs)("div", { ++ className: SidebarRoot_module_css_default.newSessionGroup, ++ children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, { ++ label: t("session.new.label"), ++ delayMs: 500, ++ disabled: wide, ++ children: (0, react_jsx_runtime.jsxs)("button", { ++ type: "button", ++ className: SidebarRoot_module_css_default.newSession, ++ "aria-label": t("session.new.label"), ++ onClick: () => { ++ startSession(); ++ }, ++ children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconNewChatOutline16, { size: wide ? 14 : 18 }), wide && (0, react_jsx_runtime.jsx)("span", { ++ className: clsx(SidebarRoot_module_css_default.newSessionLabel, SidebarRoot_module_css_default.wide), ++ children: t("session.new") ++ })] ++ }) ++ }), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, { ++ label: t("session.newResearch.label"), ++ delayMs: 500, ++ disabled: wide, ++ children: (0, react_jsx_runtime.jsxs)("button", { ++ type: "button", ++ className: SidebarRoot_module_css_default.newSession, ++ "aria-label": t("session.newResearch.label"), ++ onClick: () => { ++ startResearchSession(); ++ }, ++ children: [(0, react_jsx_runtime.jsx)("span", { className: SidebarRoot_module_css_default.researchIcon, "data-sherlock-research-icon": "", "aria-hidden": "true" }), wide && (0, react_jsx_runtime.jsx)("span", { ++ className: clsx(SidebarRoot_module_css_default.newSessionLabel, SidebarRoot_module_css_default.wide), ++ children: t("session.newResearch") ++ })] ++ }) ++ })] }), - (0, react_jsx_runtime.jsxs)("div", { -+ "data-dsh-sidebar-footer": "", - className: SidebarRoot_module_css_default.footArea, - children: [(0, react_jsx_runtime.jsx)("div", { - className: SidebarRoot_module_css_default.footerActions, + (0, react_jsx_runtime.jsx)("div", { + className: SidebarRoot_module_css_default.regionArea, +@@ -222,15 +252,19 @@ window.__ModuleLoader__.load({ + /** `sidebar` namespace dictionaries: shell controls (brand row, New Session, fold toggle). */ + /** Simplified Chinese dictionary (the key-set source of truth). */ + const zh = { +- "session.new": "新会话", +- "session.new.label": "新建会话", ++ "session.new": "新对话", ++ "session.new.label": "新建对话", ++ "session.newResearch": "新研究", ++ "session.newResearch.label": "新建研究", + "toggle.open": "打开侧边栏", + "toggle.collapse": "收起侧边栏" + }; + /** English dictionary, checked complete against the zh key set. */ + const en = { +- "session.new": "New Session", +- "session.new.label": "New session", ++ "session.new": "New Chat", ++ "session.new.label": "New chat", ++ "session.newResearch": "New Research", ++ "session.newResearch.label": "New research", + "toggle.open": "Open sidebar", + "toggle.collapse": "Collapse sidebar" + }; +@@ -256,7 +290,17 @@ window.__ModuleLoader__.load({ + }), "ui-sidebar: dictionaries"); + const injectProps = () => ({ + startSession: (workspaceId) => { +- ctx.workspaces.startSession(workspaceId); ++ ctx.workspaces.startSession(workspaceId, (sessionId) => { ++ window.dispatchEvent(new CustomEvent("sherlock:conversation-initial-chat", { detail: { sessionId } })); ++ }); ++ }, ++ startResearchSession: (workspaceId) => { ++ ctx.workspaces.startSession(workspaceId, (sessionId) => { ++ try { ++ window.sessionStorage.setItem("sherlock.conversation.initial-research-session.v1", sessionId); ++ } catch {} ++ window.dispatchEvent(new CustomEvent("sherlock:conversation-initial-research", { detail: { sessionId } })); ++ }); + }, + toggleSidebar: () => { + ctx.layout.toggleSidebar(); +diff --git a/node_modules/@deepseek-ai/dsh-client-ui-sidebar/lib/types/client/SidebarRoot.d.ts b/node_modules/@deepseek-ai/dsh-client-ui-sidebar/lib/types/client/SidebarRoot.d.ts +index d53f185..7aa857c 100644 +--- a/node_modules/@deepseek-ai/dsh-client-ui-sidebar/lib/types/client/SidebarRoot.d.ts ++++ b/node_modules/@deepseek-ai/dsh-client-ui-sidebar/lib/types/client/SidebarRoot.d.ts +@@ -4,5 +4,5 @@ import type { SidebarRootComponentProps } from './contract/slots.ts'; + * @param props - composed slot props (runtime share + injected callbacks, contract/slots.ts). + * @returns the sidebar element tree. + */ +-export declare function SidebarRoot({ collapsed, width, startSession, toggleSidebar, t, renderSlot, }: SidebarRootComponentProps): import("react").JSX.Element; ++export declare function SidebarRoot({ collapsed, width, startSession, startResearchSession, toggleSidebar, t, renderSlot, }: SidebarRootComponentProps): import("react").JSX.Element; + //# sourceMappingURL=SidebarRoot.d.ts.map +diff --git a/node_modules/@deepseek-ai/dsh-client-ui-sidebar/lib/types/client/contract/slots.d.ts b/node_modules/@deepseek-ai/dsh-client-ui-sidebar/lib/types/client/contract/slots.d.ts +index dc15aa7..fe3d206 100644 +--- a/node_modules/@deepseek-ai/dsh-client-ui-sidebar/lib/types/client/contract/slots.d.ts ++++ b/node_modules/@deepseek-ai/dsh-client-ui-sidebar/lib/types/client/contract/slots.d.ts +@@ -78,6 +78,8 @@ export type SidebarRootInjected = { + * recent Workspace, or clear into the New Session pure view when none exist. + */ + startSession: (workspaceId?: WorkspaceId) => void; ++ /** Start a blank Session whose first visible conversation view is Research. */ ++ startResearchSession: (workspaceId?: WorkspaceId) => void; + /** Toggle the sidebar column through the layout service. */ + toggleSidebar: () => void; + }; +diff --git a/node_modules/@deepseek-ai/dsh-client-ui-sidebar/lib/types/client/locales.d.ts b/node_modules/@deepseek-ai/dsh-client-ui-sidebar/lib/types/client/locales.d.ts +index 4bfe2ad..b1e153f 100644 +--- a/node_modules/@deepseek-ai/dsh-client-ui-sidebar/lib/types/client/locales.d.ts ++++ b/node_modules/@deepseek-ai/dsh-client-ui-sidebar/lib/types/client/locales.d.ts +@@ -3,6 +3,8 @@ + export declare const zh: { + 'session.new': string; + 'session.new.label': string; ++ 'session.newResearch': string; ++ 'session.newResearch.label': string; + 'toggle.open': string; + 'toggle.collapse': string; + }; +@@ -12,6 +14,8 @@ export type SidebarKey = keyof typeof zh; + export declare const en: { + 'session.new': string; + 'session.new.label': string; ++ 'session.newResearch': string; ++ 'session.newResearch.label': string; + 'toggle.open': string; + 'toggle.collapse': string; + }; diff --git a/patches/@deepseek-ai+dsh-client-ui-tool+0.1.0-rc.7.patch b/patches/@deepseek-ai+dsh-client-ui-tool+0.1.0-rc.7.patch new file mode 100644 index 000000000..59cc23714 --- /dev/null +++ b/patches/@deepseek-ai+dsh-client-ui-tool+0.1.0-rc.7.patch @@ -0,0 +1,88 @@ +diff --git a/node_modules/@deepseek-ai/dsh-client-ui-tool/lib/client.js b/node_modules/@deepseek-ai/dsh-client-ui-tool/lib/client.js +index 5d397a8..9fcb5d4 100644 +--- a/node_modules/@deepseek-ai/dsh-client-ui-tool/lib/client.js ++++ b/node_modules/@deepseek-ai/dsh-client-ui-tool/lib/client.js +@@ -939,7 +939,7 @@ window.__ModuleLoader__.load({ + } + //#endregion + //#region \0dsh-css:/home/runner/work/deepseek-harness/deepseek-harness/packages/client/ui-tool/src/client/tool/ToolDetails.module.css.mjs +- const css$1 = ".xDAfVq_description{color:var(--dsw-alias-label-secondary);font:var(--dsw-font-xs-13);margin:0 0 6px}.xDAfVq_cardBody{margin:0}.xDAfVq_recovery{white-space:pre-wrap;overflow-wrap:anywhere;color:var(--dsw-alias-label-tertiary);font:var(--dsw-font-xs-13);margin:6px 0 0}.xDAfVq_code{background:var(--dsw-alias-markdown-code-block);font-family:var(--ds-font-family-code);color:var(--dsw-alias-label-primary);white-space:pre-wrap;word-break:break-word;border-radius:12px;margin:0;padding:16px;font-size:13px;line-height:22px}.xDAfVq_code[data-error]{color:var(--dsw-alias-state-error-primary)}.xDAfVq_read,.xDAfVq_web{margin:0}.xDAfVq_empty{color:var(--dsw-alias-label-tertiary);padding:8px 0;font-size:13px;line-height:20px}"; ++ const css$1 = ".xDAfVq_description{color:var(--dsw-alias-label-secondary);font:var(--dsw-font-xs-13);margin:0 0 6px}.xDAfVq_cardBody{margin:0}.xDAfVq_recovery{white-space:pre-wrap;overflow-wrap:anywhere;color:var(--dsw-alias-label-tertiary);font:var(--dsw-font-xs-13);margin:6px 0 0}.xDAfVq_code{background:var(--dsw-alias-markdown-code-block);font-family:var(--ds-font-family-code);color:var(--dsw-alias-label-primary);white-space:pre-wrap;word-break:break-word;border-radius:12px;margin:0;padding:16px;font-size:13px;line-height:22px}.xDAfVq_code[data-error]{color:var(--dsw-alias-state-error-primary)}.xDAfVq_read,.xDAfVq_web{margin:0}.xDAfVq_empty{color:var(--dsw-alias-label-tertiary);padding:8px 0;font-size:13px;line-height:20px}.xDAfVq_fileDrag{box-sizing:border-box;width:100%;min-width:0;height:32px;color:var(--dsw-alias-label-secondary);background:var(--dsw-alias-bg-layer-1);border:1px solid var(--dsw-alias-border-l2);border-radius:7px;align-items:center;gap:7px;margin:0 0 10px;padding:0 9px;display:flex;cursor:grab}.xDAfVq_fileDrag:active{cursor:grabbing}.xDAfVq_fileDrag:focus{outline:none}.xDAfVq_fileDrag span{text-overflow:ellipsis;white-space:nowrap;overflow:hidden}"; + const tagId$1 = "@deepseek-ai/dsh-client-ui-tool/ToolDetails.module.css"; + if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId$1) + "]") === null) { + const tag = document.createElement("style"); +@@ -955,7 +955,8 @@ window.__ModuleLoader__.load({ + "description": "xDAfVq_description", + "cardBody": "xDAfVq_cardBody", + "recovery": "xDAfVq_recovery", +- "code": "xDAfVq_code" ++ "code": "xDAfVq_code", ++ "fileDrag": "xDAfVq_fileDrag" + }; + //#endregion + //#region lib/types/client/tool/ToolDetails.js +@@ -966,7 +967,7 @@ window.__ModuleLoader__.load({ + * @param props - selected call slice, workspace root, and locale seat. + * @returns the details output body. + */ +- function ToolDetails({ block, cwd, t }) { ++ function ToolDetailsOutput({ block, cwd, t }) { + const terminal = terminalCardModel(block, cwd); + if (terminal !== null) return (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [terminal.description !== void 0 ? (0, react_jsx_runtime.jsx)("div", { + className: ToolDetails_module_css_default.description, +@@ -1015,6 +1016,45 @@ window.__ModuleLoader__.load({ + children: resultText(block) + }); + } ++ const SHERLOCK_FILE_DRAG_TYPE = "application/x-sherlock-file"; ++ function sherlockDetailsFileDescriptor(filePath, cwd) { ++ const resolved = cwd === void 0 || cwd === "" || /^(?:[/\\]|[A-Za-z]:[/\\])/.test(filePath) ? filePath : (0, _deepseek_ai_dsh_client_runtime_client.resolveWorkspacePath)(cwd, filePath); ++ return { ++ path: resolved, ++ name: filePath.split(/[/\\]/).filter(Boolean).at(-1) ?? filePath ++ }; ++ } ++ function writeSherlockFileDrag(dataTransfer, descriptor) { ++ dataTransfer.effectAllowed = "copy"; ++ dataTransfer.setData(SHERLOCK_FILE_DRAG_TYPE, JSON.stringify(descriptor)); ++ } ++ function ToolDetails({ block, cwd, t }) { ++ const { filePath } = toolRowModel(callName(block), block, cwd); ++ const descriptor = filePath === void 0 ? null : sherlockDetailsFileDescriptor(filePath, cwd); ++ const fileDragChip = descriptor === null ? null : (0, react_jsx_runtime.jsxs)("div", { ++ className: ToolDetails_module_css_default.fileDrag, ++ draggable: true, ++ "data-sherlock-file-drag-source": descriptor.path, ++ title: descriptor.path, ++ onDragStart: (event) => writeSherlockFileDrag(event.dataTransfer, descriptor), ++ children: [(0, react_jsx_runtime.jsx)("svg", { ++ viewBox: "0 0 16 16", ++ width: "14", ++ height: "14", ++ "aria-hidden": true, ++ children: (0, react_jsx_runtime.jsx)("path", { ++ d: "M3.5 1.5h5l4 4v9h-9zM8.5 1.5v4h4", ++ fill: "none", ++ stroke: "currentColor", ++ strokeWidth: "1.2", ++ strokeLinejoin: "round" ++ }) ++ }), (0, react_jsx_runtime.jsx)("span", { children: descriptor.name })] ++ }); ++ return (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { ++ children: [fileDragChip, (0, react_jsx_runtime.jsx)(ToolDetailsOutput, { block, cwd, t })] ++ }); ++ } + //#endregion + //#region lib/types/client/locale.js + /** Locale namespace supplied by the conversation owner to Tool renderers. */ +@@ -1623,6 +1663,9 @@ window.__ModuleLoader__.load({ + //#endregion + exports.apply = apply; + exports.inject = inject; ++ exports.ToolDetails = ToolDetails; ++ exports.sherlockDetailsFileDescriptor = sherlockDetailsFileDescriptor; ++ exports.writeSherlockFileDrag = writeSherlockFileDrag; + return module.exports; + } + }); diff --git a/patches/@deepseek-ai+dsh-client-ui-workspace+0.1.0-rc.7.patch b/patches/@deepseek-ai+dsh-client-ui-workspace+0.1.0-rc.7.patch new file mode 100644 index 000000000..bbe93a70e --- /dev/null +++ b/patches/@deepseek-ai+dsh-client-ui-workspace+0.1.0-rc.7.patch @@ -0,0 +1,252 @@ +diff --git a/node_modules/@deepseek-ai/dsh-client-ui-workspace/lib/client.js b/node_modules/@deepseek-ai/dsh-client-ui-workspace/lib/client.js +index ec779d5..bf024e2 100644 +--- a/node_modules/@deepseek-ai/dsh-client-ui-workspace/lib/client.js ++++ b/node_modules/@deepseek-ai/dsh-client-ui-workspace/lib/client.js +@@ -337,7 +337,7 @@ window.__ModuleLoader__.load({ + const tag = document.createElement("style"); + tag.dataset.plugin = "@deepseek-ai/dsh-client-ui-workspace"; + tag.dataset.pluginCss = tagId$2; +- tag.textContent = css$2; ++ tag.textContent = css$2 + ".YDXeBa_folderActive{color:var(--dsw-alias-label-secondary)}"; + document.head.appendChild(tag); + } + var Rows_module_css_default = { +@@ -413,6 +413,10 @@ window.__ModuleLoader__.load({ + d: d.getDate() + })} ${pad2(d.getHours())}:${pad2(d.getMinutes())}` }); + } ++ /** Keep the current workspace glyph as a neutral outline instead of a blue duotone fill. */ ++ function WorkspaceFolderIcon({ expanded }) { ++ return expanded ? (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconFolderOpenOutline16, {}) : (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconFolderClose16, {}); ++ } + /** Hover-card body: workspace title, full directory path, absolute creation time. */ + function WorkspaceHoverContent({ label, cwd, createdAt, t }) { + return (0, react_jsx_runtime.jsxs)("div", { +@@ -438,6 +442,39 @@ window.__ModuleLoader__.load({ + const rect = e.currentTarget.getBoundingClientRect(); + return e.clientY < rect.top + rect.height / 2 ? "before" : "after"; + } ++ /** Build the real-workspace action menu in product order. */ ++ function workspaceMenuItems(t) { ++ return [{ ++ id: "finder", ++ label: t("openInFinder"), ++ icon: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconFolderOpenOutline16, {}) ++ }, { ++ id: "rename", ++ label: t("rename"), ++ icon: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconEditOutline16, {}) ++ }, { ++ id: "delete", ++ label: t("delete.workspace"), ++ icon: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconTrashOutline16, {}), ++ danger: true ++ }]; ++ } ++ /** Dispatch one workspace action-menu selection. */ ++ function runWorkspaceMenuAction(id, actions) { ++ if (id === "finder") actions.open(); ++ else if (id === "rename") actions.rename(); ++ else if (id === "delete") actions.delete(); ++ } ++ /** Reveal one workspace through the native Desktop bridge, with a web-host fallback. */ ++ async function showWorkspaceInFinder(path, fallback) { ++ const desktop = typeof window === "undefined" ? void 0 : window.dshDesktop; ++ if (typeof desktop?.showItemInFolder === "function") { ++ const result = await desktop.showItemInFolder(path); ++ if (result?.ok !== true) throw new Error("Finder reveal was not acknowledged by Sherlock."); ++ return; ++ } ++ await fallback(path); ++ } + /** + * Project (workspace) header row: folder + title; + * hover reveals the chevron and create button, and dwelling on a real +@@ -455,16 +492,7 @@ window.__ModuleLoader__.load({ + const label = row.workspaceId === void 0 ? t("group.ungrouped") : row.label; + const active = group.expanded && group.containsCurrent; + const [menuOpen, setMenuOpen] = (0, react.useState)(false); +- const workspaceMenuItems = [{ +- id: "rename", +- label: t("rename"), +- icon: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconEditOutline16, {}) +- }, { +- id: "delete", +- label: t("delete.workspace"), +- icon: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconTrashOutline16, {}), +- danger: true +- }]; ++ const menuItems = workspaceMenuItems(t); + const ownRow = (0, react_jsx_runtime.jsxs)("div", { + className: clsx(Rows_module_css_default.projectRow, menuOpen && Rows_module_css_default.menuOpen), + role: "treeitem", +@@ -480,7 +508,7 @@ window.__ModuleLoader__.load({ + children: [ + (0, react_jsx_runtime.jsx)("span", { + className: clsx(Rows_module_css_default.slot, Rows_module_css_default.folder, active && Rows_module_css_default.folderActive), +- children: row.expanded ? (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconFolderOpen16, {}) : (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconFolderClose16, {}) ++ children: (0, react_jsx_runtime.jsx)(WorkspaceFolderIcon, { expanded: row.expanded }) + }), + (0, react_jsx_runtime.jsx)("span", { + className: clsx(Rows_module_css_default.slot, Rows_module_css_default.chevron), +@@ -500,13 +528,10 @@ window.__ModuleLoader__.load({ + onClose: () => { + setMenuOpen(false); + }, +- items: workspaceMenuItems, ++ items: menuItems, + onSelect: (id) => { + setMenuOpen(false); +- /* v8 ignore next -- workspaceMenuItems carries exactly these two rows today. */ +- if (id !== "rename" && id !== "delete") return; +- if (id === "rename") actions.rename(); +- else actions.delete(); ++ runWorkspaceMenuAction(id, actions); + }, + portal: true, + closeOnPointerLeave: true, +@@ -971,7 +996,7 @@ window.__ModuleLoader__.load({ + const tag = document.createElement("style"); + tag.dataset.plugin = "@deepseek-ai/dsh-client-ui-workspace"; + tag.dataset.pluginCss = tagId; +- tag.textContent = css; ++ tag.textContent = css + ".qDHVXG_fade{display:none}"; + document.head.appendChild(tag); + } + var WorkspaceBrowser_module_css_default = { +@@ -1030,6 +1055,8 @@ window.__ModuleLoader__.load({ + * focus() forces a synchronous layout and would jank the slide. + */ + const EXPAND_SLIDE_MS = 300; ++ /** Preserve the rail search intent when the sidebar owner remounts this slot as wide. */ ++ let focusSearchAfterSidebarExpand = false; + /** Pause between the latest keystroke and a Host content-search request. */ + const SEARCH_DEBOUNCE_MS = 250; + /** `session.search` wire bound, measured in JavaScript UTF-16 code units. */ +@@ -1196,7 +1223,7 @@ window.__ModuleLoader__.load({ + return e.clientY < rect.top + rect.height / 2 ? "before" : "after"; + } + /** The scrolling session tree; unmounting drops the sessions subscription and expand-all state. */ +- function SessionTree({ useSessions, startSession, open, forkSession, workspaces, archivedSessionIds, onRenameRequest, onDeleteRequest, onSessionRename, onSessionArchive, insertWorkspaceBefore, insertSessionBefore, orderBy, groupExpansion, setGroupExpanded, sessionOrderByAccount, sessionUpdatedAtByAccount, syncSessionOrderAccount, setSessionOrder, t }) { ++ function SessionTree({ useSessions, startSession, open, openWorkspacePath, forkSession, workspaces, archivedSessionIds, onRenameRequest, onDeleteRequest, onSessionRename, onSessionArchive, insertWorkspaceBefore, insertSessionBefore, orderBy, groupExpansion, setGroupExpanded, sessionOrderByAccount, sessionUpdatedAtByAccount, syncSessionOrderAccount, setSessionOrder, t }) { + const list = useSessions((s) => s); + const current = list.current; + const [expandedSessionGroups, setExpandedSessionGroups] = (0, react.useState)([]); +@@ -1388,8 +1415,14 @@ window.__ModuleLoader__.load({ + } + }, + drag: workspaceDragProps, +- actions: group.workspaceId === void 0 ? void 0 : { +- rename: () => { ++ actions: group.workspaceId === void 0 ? void 0 : { ++ open: () => { ++ /* v8 ignore next -- real workspace groups always carry their Host path. */ ++ if (group.cwd !== void 0) openWorkspacePath(group.cwd).catch((reason) => { ++ console.warn("workspace path open rejected:", reason); ++ }); ++ }, ++ rename: () => { + /* v8 ignore next -- narrowing guard: the actions object exists only for real-workspace groups. */ + if (group.workspaceId !== void 0) onRenameRequest(group.workspaceId, group.label); + }, +@@ -1644,7 +1677,7 @@ window.__ModuleLoader__.load({ + * @param props - composed slot props (shell owner share + store + injected actions). + * @returns the region element tree. + */ +- function WorkspaceBrowser({ wide, expandSidebar, useSessions, useWorkspaces, useStore, actions, startSession, open, renameSession, forkSession, renameWorkspace, deleteWorkspace, insertWorkspaceBefore, archiveSession, insertSessionBefore, createWorkspace, searchSessions, searchResultLimit, useDirectoryFlow, renderSlot, t }) { ++ function WorkspaceBrowser({ wide, expandSidebar, useSessions, useWorkspaces, useStore, actions, startSession, open, openWorkspacePath, renameSession, forkSession, renameWorkspace, deleteWorkspace, insertWorkspaceBefore, archiveSession, insertSessionBefore, createWorkspace, searchSessions, searchResultLimit, useDirectoryFlow, renderSlot, t }) { + const workspaces = useWorkspaces((state) => state.items); + const workspacePhase = useWorkspaces((state) => state.phase); + const archivedSessionIds = useWorkspaces((state) => state.archivedSessionIds); +@@ -1667,7 +1700,8 @@ window.__ModuleLoader__.load({ + workspaces + ]); + const [query, setQuery] = (0, react.useState)(""); +- const [searchExpanded, setSearchExpanded] = (0, react.useState)(false); ++ const resumeSearchAfterSidebarExpand = wide && focusSearchAfterSidebarExpand; ++ const [searchExpanded, setSearchExpanded] = (0, react.useState)(resumeSearchAfterSidebarExpand); + const normalizedQuery = sanitizeSearchQuery(query).trim(); + const [remoteSearch, setRemoteSearch] = (0, react.useState)({ + query: "", +@@ -1680,11 +1714,12 @@ window.__ModuleLoader__.load({ + const [wsPickerOpen, setWsPickerOpen] = (0, react.useState)(false); + const wsPlusRef = (0, react.useRef)(null); + const composingRef = (0, react.useRef)(false); +- const [searchOnExpand, setSearchOnExpand] = (0, react.useState)(false); ++ const [searchOnExpand, setSearchOnExpand] = (0, react.useState)(resumeSearchAfterSidebarExpand); + (0, react.useEffect)(() => { + if (wide && searchOnExpand) { + const timer = window.setTimeout(() => { + searchInput.current?.focus({ preventScroll: true }); ++ focusSearchAfterSidebarExpand = false; + setSearchOnExpand(false); + }, EXPAND_SLIDE_MS); + return () => { +@@ -1701,7 +1736,7 @@ window.__ModuleLoader__.load({ + searchOnExpand + ]); + (0, react.useEffect)(() => { +- if (!wide || !searchExpanded) return; ++ if (!wide || !searchExpanded || searchOnExpand) return; + const onClick = (event) => { + if (!(event.target instanceof Node) || searchRoot.current?.contains(event.target) === true) return; + searchInput.current?.blur(); +@@ -1714,6 +1749,7 @@ window.__ModuleLoader__.load({ + }; + }, [ + normalizedQuery, ++ searchOnExpand, + wide, + searchExpanded + ]); +@@ -1972,6 +2008,7 @@ window.__ModuleLoader__.load({ + className: WorkspaceBrowser_module_css_default.searchButton, + "aria-label": t("search.sessions.aria"), + onClick: () => { ++ focusSearchAfterSidebarExpand = true; + setSearchExpanded(true); + setSearchOnExpand(true); + expandSidebar(); +@@ -2006,6 +2043,7 @@ window.__ModuleLoader__.load({ + t + }) : (0, react_jsx_runtime.jsx)(SessionTree, { + useSessions, ++ openWorkspacePath, + onSessionRename, + onSessionArchive, + forkSession, +@@ -2211,6 +2249,7 @@ window.__ModuleLoader__.load({ + "conflict.named": "已存在名为“{name}”的工作区。", + "folderError.title": "无法打开文件夹", + "folderError.retry": "重新选择", ++ "openInFinder": "在 Finder 中显示", + "rename": "重命名", + "rename.workspace.title": "重命名工作区", + "rename.session.title": "重命名会话", +@@ -2276,6 +2315,7 @@ window.__ModuleLoader__.load({ + "conflict.named": "A workspace named “{name}” already exists.", + "folderError.title": "Couldn’t open folder", + "folderError.retry": "Choose again", ++ "openInFinder": "Show in Finder", + "rename": "Rename", + "rename.workspace.title": "Rename workspace", + "rename.session.title": "Rename session", +@@ -2357,6 +2397,7 @@ window.__ModuleLoader__.load({ + open: (sessionId) => { + ctx.sessions.open(sessionId); + }, ++ openWorkspacePath: (path) => showWorkspaceInFinder(path, (fallbackPath) => ctx.workspaces.openPath(fallbackPath)), + searchSessions, + searchResultLimit: ctx.sessions.searchResultLimit, + renameSession: async (sessionId, title) => { +@@ -2418,6 +2459,10 @@ window.__ModuleLoader__.load({ + //#endregion + exports.apply = apply; + exports.inject = inject; ++ exports.runWorkspaceMenuAction = runWorkspaceMenuAction; ++ exports.showWorkspaceInFinder = showWorkspaceInFinder; ++ exports.WorkspaceFolderIcon = WorkspaceFolderIcon; ++ exports.workspaceMenuItems = workspaceMenuItems; + return module.exports; + } + }); diff --git a/patches/@deepseek-ai+dsh-credentials-local+0.1.0-rc.7.patch b/patches/@deepseek-ai+dsh-credentials-local+0.1.0-rc.7.patch new file mode 100644 index 000000000..a6144aba7 --- /dev/null +++ b/patches/@deepseek-ai+dsh-credentials-local+0.1.0-rc.7.patch @@ -0,0 +1,71 @@ +diff --git a/node_modules/@deepseek-ai/dsh-credentials-local/lib/index.js b/node_modules/@deepseek-ai/dsh-credentials-local/lib/index.js +index c048b43..a79aa2f 100644 +--- a/node_modules/@deepseek-ai/dsh-credentials-local/lib/index.js ++++ b/node_modules/@deepseek-ai/dsh-credentials-local/lib/index.js +@@ -126,8 +126,21 @@ function parseCredentialsDocument(text, filename) { + if (document.errors.length > 0) throw new Error(`credentials-local: invalid document at ${filename}: ${document.errors.map(describeYamlError).join("; ")}`); + const root = document.toJS() ?? {}; + if (typeof root !== "object" || root === null || Array.isArray(root)) throw new TypeError(`credentials-local: ${filename} must be a mapping of credential reference to value`); ++ const fields = root; ++ if (typeof fields.version === "number") { ++ if (fields.version !== 1) throw new Error(`credentials-local: ${filename} declares unsupported credentials document version ${JSON.stringify(fields.version)}`); ++ for (const key of Object.keys(fields)) if (key !== "version" && key !== "refs" && key !== "records") throw new Error(`credentials-local: unknown top-level key "${key}" in ${filename}`); ++ if (fields.records !== void 0 && fields.records !== null && (typeof fields.records !== "object" || Array.isArray(fields.records))) throw new TypeError(`credentials-local: "records" in ${filename} must be a mapping`); ++ return parseCredentialReferences(fields.refs, filename); ++ } ++ return parseCredentialReferences(fields, filename); ++} ++/** Parse the reference mapping shared by the flat and version-1 layouts. */ ++function parseCredentialReferences(section, filename) { ++ if (section === void 0 || section === null) return /* @__PURE__ */ new Map(); ++ if (typeof section !== "object" || Array.isArray(section)) throw new TypeError(`credentials-local: the credential references in ${filename} must be a mapping`); + const entries = /* @__PURE__ */ new Map(); +- for (const [key, value] of Object.entries(root)) { ++ for (const [key, value] of Object.entries(section)) { + credentialRef(key); + if (typeof value !== "string") throw new TypeError(`credentials-local: the value for "${key}" in ${filename} must be a string`); + if (value.length === 0) throw new Error(`credentials-local: the value for "${key}" in ${filename} is empty; remove the key instead`); +@@ -144,10 +157,12 @@ function parseCredentialsDocument(text, filename) { + * @param value - the new value, or `undefined` to delete the key. + * @returns the text to persist. + */ +-function renderDocument(text, ref, value) { ++function renderCredentialsDocument(text, ref, value) { + const document = text === void 0 ? new Document({}) : parseDocument(text); +- if (value === void 0) document.deleteIn([ref]); +- else document.setIn([ref], value); ++ const versioned = typeof document.getIn(["version"]) === "number"; ++ const path = versioned ? ["refs", ref] : [ref]; ++ if (value === void 0) document.deleteIn(path); ++ else document.setIn(path, value); + return document.toString(); + } + /** File-backed credentials provider (`$DSH_HOME/.credentials.yaml`). */ +@@ -307,7 +322,7 @@ var LocalCredentialProvider = class extends CredentialProvider { + await this.reconcileFromDisk(); + const existing = this.values.get(ref); + if (value === void 0 && existing === void 0) return; +- const nextText = renderDocument(this.text, ref, value); ++ const nextText = renderCredentialsDocument(this.text, ref, value); + await writeFileAtomic(this.spec.filename, nextText, { + mode: 384, + dirMode: 448 +@@ -395,4 +410,4 @@ var LocalCredentialProvider = class extends CredentialProvider { + } + }; + //#endregion +-export { CREDENTIALS_FILENAME, LocalCredentialProvider, LocalCredentialProvider as default, parseCredentialsDocument, resolveSpec }; ++export { CREDENTIALS_FILENAME, LocalCredentialProvider, LocalCredentialProvider as default, parseCredentialsDocument, renderCredentialsDocument, resolveSpec }; +diff --git a/node_modules/@deepseek-ai/dsh-credentials-local/lib/types/index.d.ts b/node_modules/@deepseek-ai/dsh-credentials-local/lib/types/index.d.ts +index 461db69..ec77021 100644 +--- a/node_modules/@deepseek-ai/dsh-credentials-local/lib/types/index.d.ts ++++ b/node_modules/@deepseek-ai/dsh-credentials-local/lib/types/index.d.ts +@@ -77,6 +77,8 @@ export declare function resolveSpec(config: Config): ResolvedSpec; + * @returns the parsed entries, keyed by reference. + */ + export declare function parseCredentialsDocument(text: string, filename: string): Map; ++/** Render one reference update while preserving flat or version-1 document layout. */ ++export declare function renderCredentialsDocument(text: string | undefined, ref: string, value: string | undefined): string; + /** File-backed credentials provider (`$DSH_HOME/.credentials.yaml`). */ + export declare class LocalCredentialProvider extends CredentialProvider { + config: Config; diff --git a/patches/@deepseek-ai+dsh-fs-local+0.1.0-rc.7.patch b/patches/@deepseek-ai+dsh-fs-local+0.1.0-rc.7.patch new file mode 100644 index 000000000..5794fbe12 --- /dev/null +++ b/patches/@deepseek-ai+dsh-fs-local+0.1.0-rc.7.patch @@ -0,0 +1,41 @@ +diff --git a/node_modules/@deepseek-ai/dsh-fs-local/lib/index.js b/node_modules/@deepseek-ai/dsh-fs-local/lib/index.js +index 9138759..d44a309 100644 +--- a/node_modules/@deepseek-ai/dsh-fs-local/lib/index.js ++++ b/node_modules/@deepseek-ai/dsh-fs-local/lib/index.js +@@ -1,5 +1,6 @@ + import { constants } from "node:buffer"; + import { basename, dirname, isAbsolute, join, relative, resolve, sep, toNamespacedPath } from "node:path"; ++import { homedir } from "node:os"; + import { pathToFileURL } from "node:url"; + import z from "@deepseek-ai/schemastery"; + import { FileSystem, FsError, FsTargetKey, FsVersion } from "@deepseek-ai/dsh-fs"; +@@ -120,6 +121,11 @@ function errorMessage(error) { + function isPermissionError(error) { + return error instanceof Error && "code" in error && (error.code === "EACCES" || error.code === "EPERM"); + } ++function expandHomePath(path) { ++ if (path === "~") return homedir(); ++ if (path.startsWith("~/") || path.startsWith("~\\")) return join(homedir(), path.slice(2)); ++ return path; ++} + function throwIfAborted(signal, verb) { + if (signal?.aborted) throw new FsError(`${verb} aborted`, "FS_ABORTED"); + } +@@ -152,7 +158,7 @@ function versionOf(info) { + */ + async function resolveLocalTarget(cwd, path) { + if (path.trim().length === 0) throw new FsError("file_path must be a non-empty string", "FS_NOT_FOUND"); +- const displayPath = resolve(cwd, path); ++ const displayPath = resolve(cwd, expandHomePath(path)); + try { + return { + displayPath, +@@ -734,7 +740,7 @@ var LocalFileSystem = class extends FileSystem { + async lstat(path, opts, signal) { + if (signal?.aborted) throw new FsError("lstat aborted", "FS_ABORTED"); + if (path.trim().length === 0) throw new FsError("file_path must be a non-empty string", "FS_NOT_FOUND"); +- const info = await probeNoFollow(resolve(opts?.cwd ?? this.config.cwd, path)); ++ const info = await probeNoFollow(resolve(opts?.cwd ?? this.config.cwd, expandHomePath(path))); + if (signal?.aborted) throw new FsError("lstat aborted", "FS_ABORTED"); + if (!info) return void 0; + return { diff --git a/patches/@deepseek-ai+dsh-host-apiproxy+0.1.0-rc.7.patch b/patches/@deepseek-ai+dsh-host-apiproxy+0.1.0-rc.7.patch index a107fc79a..b7fceb131 100644 --- a/patches/@deepseek-ai+dsh-host-apiproxy+0.1.0-rc.7.patch +++ b/patches/@deepseek-ai+dsh-host-apiproxy+0.1.0-rc.7.patch @@ -1,5 +1,5 @@ diff --git a/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/index.js b/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/index.js -index 11ee6c4..bf19e6c 100644 +index 11ee6c4..01cd376 100644 --- a/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/index.js +++ b/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/index.js @@ -1,8 +1,8 @@ @@ -24,10 +24,82 @@ index 11ee6c4..bf19e6c 100644 import { GoalError } from "@deepseek-ai/dsh-goal"; import { SettingsConflictError, settingsNamespace } from "@deepseek-ai/dsh-settings"; import { credentialRef } from "@deepseek-ai/dsh-credentials"; -@@ -23,6 +23,110 @@ import { DirectoryPickerError } from "@deepseek-ai/dsh-host-directory-picker"; +@@ -23,6 +23,182 @@ import { DirectoryPickerError } from "@deepseek-ai/dsh-host-directory-picker"; import { API_REMOTE_FORWARDED_EVENTS, ApiRemoteSessionNotFound, ApiRemoteSubagentSessionOwnership, apiRemoteSubagentOwnershipError, createApiRemoteAgentResolver, hasApiRemoteSubagentOwner, inspectApiRemoteSession } from "@deepseek-ai/dsh-api-remotes"; import { release } from "node:os"; import { runNativeCommand } from "@deepseek-ai/dsh-native-command"; ++//#region lib/types/session-model-selection.js ++const SESSION_MODEL_SELECTION_LIMIT = 256; ++const SESSION_MODEL_SELECTION_SETTINGS_NAMESPACE = settingsNamespace("session-model-selection"); ++const SESSION_MODEL_SELECTION_SETTINGS_SCHEMA = z.object({ ++ selections: z.array(z.object({ ++ sessionId: z.string().required(), ++ provider: z.string().required(), ++ model: z.string().required(), ++ reasoningEffort: z.string() ++ })).max(SESSION_MODEL_SELECTION_LIMIT).default([]) ++}); ++function copyModelSelection(selection) { ++ return { ++ provider: selection.provider, ++ model: selection.model, ++ ...selection.reasoningEffort === void 0 ? {} : { reasoningEffort: selection.reasoningEffort } ++ }; ++} ++function copySessionModelSelection(selection) { ++ return { ++ sessionId: selection.sessionId, ++ ...copyModelSelection(selection) ++ }; ++} ++/** A serialized durable selection table with one bounded, lossless write chain. */ ++function createBoundedSessionModelSelectionStore(options) { ++ const limit = options.limit ?? SESSION_MODEL_SELECTION_LIMIT; ++ if (!Number.isSafeInteger(limit) || limit <= 0) throw new Error("session model selection limit must be a positive finite integer"); ++ let writes = Promise.resolve(); ++ return { ++ get(sessionId) { ++ const found = options.load().find((entry) => entry.sessionId === sessionId); ++ return found === void 0 ? void 0 : copyModelSelection(found); ++ }, ++ save(sessionId, selection) { ++ const write = writes.then(async () => { ++ const existing = options.load().filter((entry) => entry.sessionId !== sessionId).map(copySessionModelSelection); ++ const next = [...existing, { ++ sessionId, ++ ...copyModelSelection(selection) ++ }].slice(-limit); ++ await options.persist(next); ++ }); ++ writes = write.catch(() => void 0); ++ return write; ++ } ++ }; ++} ++/** Resolve one conversation while migrating legacy request-only model state. */ ++function resolveSessionModelSelection(options) { ++ const explicit = options.live ?? options.durable; ++ if (explicit !== void 0) return { ++ current: copyModelSelection(explicit), ++ routable: options.routeServed(explicit.provider) ++ }; ++ if (options.request !== void 0 && options.routeServed(options.request.provider)) return { ++ current: copyModelSelection(options.request), ++ routable: true ++ }; ++ if (options.routeServed(options.defaultSelection.provider)) return { ++ current: copyModelSelection(options.defaultSelection), ++ routable: true ++ }; ++ return options.request === void 0 ? { ++ current: void 0, ++ routable: false ++ } : { ++ current: copyModelSelection(options.request), ++ routable: false ++ }; ++} ++//#endregion +//#region lib/types/preset-archive.js +const PRESET_ARCHIVE_FORMAT = "dsh-preset"; +const PRESET_ARCHIVE_VERSION = 1; @@ -114,7 +186,7 @@ index 11ee6c4..bf19e6c 100644 + if (typeof manifest !== "object" || manifest === null || manifest.format !== PRESET_ARCHIVE_FORMAT || manifest.version !== PRESET_ARCHIVE_VERSION || typeof manifest.id !== "string" || !PRESET_ARCHIVE_ID.test(manifest.id)) throw new Error("Preset package manifest is unsupported or invalid"); + if (manifest.name !== void 0 && (typeof manifest.name !== "string" || manifest.name.length > 160)) throw new Error("Preset package manifest has an invalid name"); + if (manifest.description !== void 0 && (typeof manifest.description !== "string" || manifest.description.length > 4e3)) throw new Error("Preset package manifest has an invalid description"); -+ if (manifest.sourceDshVersion !== void 0 && (typeof manifest.sourceDshVersion !== "string" || manifest.sourceDshVersion.length > 64)) throw new Error("Preset package manifest has an invalid DSH version"); ++ if (manifest.sourceDshVersion !== void 0 && (typeof manifest.sourceDshVersion !== "string" || manifest.sourceDshVersion.length > 64)) throw new Error("Preset package manifest has an invalid Sherlock version"); + const files = /* @__PURE__ */ Object.create(null); + for (const [name, bytes] of Object.entries(archive)) { + if (name === "manifest.json") continue; @@ -135,7 +207,193 @@ index 11ee6c4..bf19e6c 100644 //#region lib/types/session-export.js /** * Host-side session-log download: streams one ZIP archive whose files are the -@@ -3150,7 +3254,13 @@ function createApiProxy(ctx, defaults) { +@@ -576,7 +752,7 @@ const sessionHistoryValueSchema = z$1.object({ + const sessionModelsRequestSchema = z$1.object({ sessionId: sessionIdSchema }); + /** session.models response value. */ + const sessionModelsValueSchema = z$1.object({ +- current: modelSelectionSchema, ++ current: modelSelectionSchema.nullable(), + routable: z$1.boolean(), + groups: z$1.array(modelProviderGroupSchema), + failures: z$1.array(modelCatalogFailureSchema) +@@ -1666,6 +1842,25 @@ function changedWorkspaceView(workspaceId, value) { + updatedAt: record.updatedAt + }; + } ++/** Remember the durable insertion point of every transient inbox message. */ ++function rememberQueueAnchorSeqs(anchorSeqs, event) { ++ if (event.type !== "agent/inbox/spliced") return; ++ for (const message of event.data.inserted) anchorSeqs.set(message.id, event.seq); ++} ++/** Project both inbox lists, preserving the event position where each row entered. */ ++function projectQueueItems(agent, splice, anchorSeqs = /* @__PURE__ */ new Map()) { ++ const project = (target) => { ++ const messages = target === "next-turn" ? agent.inbox.nextTurn : agent.inbox.nextStep; ++ return splice?.target === target ? messages.toSpliced(splice.start, splice.removedCount ?? 0, ...splice.inserted) : messages; ++ }; ++ const item = (message, placement) => ({ ++ id: message.id, ++ ...anchorSeqs.has(message.id) ? { anchorSeq: anchorSeqs.get(message.id) } : {}, ++ placement, ++ message ++ }); ++ return [...project("next-turn").map((message) => item(message, "queued")), ...project("next-step").map((message) => item(message, message.source.kind === "user" ? "steering" : "context"))]; ++} + /** + * Implement ApiProxy over a composed host context. + * @param ctx - a context with the Host spine and Workspace registry mounted. +@@ -1675,6 +1870,21 @@ function changedWorkspaceView(workspaceId, value) { + function createApiProxy(ctx, defaults) { + const sessionExportCompressionLevel = defaults.sessionExportCompressionLevel ?? 6; + const coldBlankProbeMaxBytes = defaults.coldBlankProbeMaxBytes ?? 1024; ++ let sessionModelSelectionSettings; ++ const durableSessionSelections = createBoundedSessionModelSelectionStore({ ++ load: () => sessionModelSelectionSettings?.get().selections ?? [], ++ persist: async (selections) => { ++ if (sessionModelSelectionSettings === void 0) throw new Error("durable session model selection storage is unavailable"); ++ await sessionModelSelectionSettings.replace({ selections }); ++ } ++ }); ++ ctx.inject(["settings"], (settingsCtx) => { ++ const scope = settingsCtx.settings.register(SESSION_MODEL_SELECTION_SETTINGS_NAMESPACE, SESSION_MODEL_SELECTION_SETTINGS_SCHEMA); ++ sessionModelSelectionSettings = scope; ++ settingsCtx.effect(() => () => { ++ if (sessionModelSelectionSettings === scope) sessionModelSelectionSettings = void 0; ++ }, "api-proxy: session model selection settings"); ++ }); + /** The seed model each create/resume declares; re-read so it never goes stale. */ + const agentOptions = () => { + const { provider, model } = defaults.defaultModelSelection(); +@@ -1692,6 +1902,8 @@ function createApiProxy(ctx, defaults) { + * not enforcement: the wire is reachable directly. + */ + const presetSwitches = /* @__PURE__ */ new Map(); ++ /** Process-local insertion anchors survive transient queue baselines and reconnects. */ ++ const queueAnchorSeqs = /* @__PURE__ */ new Map(); + /** Client-chosen identity creation/resume, deduplicated across concurrent retries. */ + const sessionCreations = /* @__PURE__ */ new Map(); + /** Serializes path ownership and explicit title checks with Workspace mutations. */ +@@ -1709,12 +1921,13 @@ function createApiProxy(ctx, defaults) { + /** + * Install or return the session-local model selection that prompt assembly snapshots. + * +- * Precedence, resolved on EVERY read rather than seeded once: a selection +- * made in this process, else the session's own latest logged request/header, +- * else the live Agent default. Re-reading keeps the two tiers exact in both +- * directions: a session with a recorded request derives its selection from +- * its log, while a blank session (New Session reuses one rather than minting +- * another) reads any default saved after it was created. There is no create-time ++ * Precedence, resolved on EVERY read rather than seeded once: an explicit ++ * selection made in this process, else the durable session selection, else a ++ * still-routable latest request/header, else the live Agent default. An ++ * unavailable explicit selection stays blocked; only legacy request-only state ++ * falls forward when its provider has been retired. Re-reading keeps a blank ++ * session (New Session reuses one rather than minting another) synchronized ++ * with any default saved after it was created. There is no create-time + * per-session override tier on this wire — if one returns (a create-options + * contribution), it must fold in between the selection and the log. + */ +@@ -1724,14 +1937,18 @@ function createApiProxy(ctx, defaults) { + let picked; + const selection = { + get current() { +- if (picked !== void 0) return picked; + const logged = agent.session.requestHeader()?.config; +- if (logged === void 0) return defaults.defaultModelSelection(); +- return { +- provider: logged.provider, +- model: logged.model, +- ...logged.reasoningEffort === void 0 ? {} : { reasoningEffort: logged.reasoningEffort } +- }; ++ return resolveSessionModelSelection({ ++ live: picked, ++ durable: durableSessionSelections.get(agent.session.id), ++ ...logged === void 0 ? {} : { request: { ++ provider: logged.provider, ++ model: logged.model, ++ ...logged.reasoningEffort === void 0 ? {} : { reasoningEffort: logged.reasoningEffort } ++ } }, ++ defaultSelection: defaults.defaultModelSelection(), ++ routeServed ++ }).current; + }, + set current(next) { + picked = next; +@@ -1844,30 +2061,24 @@ function createApiProxy(ctx, defaults) { + stateVersion: 1 + }); + }); +- /** Project both durable inbox lists, optionally including the splice currently being emitted. */ +- const queueItems = (agent, splice) => { +- const project = (target) => { +- const messages = target === "next-turn" ? agent.inbox.nextTurn : agent.inbox.nextStep; +- return splice?.target === target ? messages.toSpliced(splice.start, splice.removedCount ?? 0, ...splice.inserted) : messages; +- }; +- return [...project("next-turn").map((message) => ({ +- id: message.id, +- placement: "queued", +- message +- })), ...project("next-step").map((message) => ({ +- id: message.id, +- placement: message.source.kind === "user" ? "steering" : "context", +- message +- }))]; +- }; + ctx.on("session/event", (session, event) => { + if (event.type !== "agent/inbox/spliced") return; + const agent = ctx.agents.get(session.id); + if (agent?.session !== session) return; ++ let anchors = queueAnchorSeqs.get(session.id); ++ if (anchors === void 0) { ++ anchors = /* @__PURE__ */ new Map(); ++ queueAnchorSeqs.set(session.id, anchors); ++ } ++ rememberQueueAnchorSeqs(anchors, event); ++ const items = projectQueueItems(agent, event.data, anchors); ++ const liveIds = new Set(items.map((item) => item.id)); ++ for (const id of anchors.keys()) if (!liveIds.has(id)) anchors.delete(id); ++ if (anchors.size === 0) queueAnchorSeqs.delete(session.id); + broadcast({ + type: "session/queue", + sessionId: session.id, +- items: queueItems(agent, event.data) ++ items + }); + }); + /** Remove a wait before settling it: synchronous deletion makes the first claimant win. */ +@@ -2295,6 +2506,11 @@ function createApiProxy(ctx, defaults) { + if ("error" in found) return { refused: err(request, found.error) }; + const agent = found.agent; + const selection = selectionFor(agent).current; ++ if (selection === void 0) return { refused: err(request, { ++ code: "model-unavailable", ++ message: "no configured routable default or saved session model; select a model for this session", ++ details: {} ++ }) }; + if (!routeServed(selection.provider)) return { refused: err(request, { + code: "model-unavailable", + message: `no adapter serves provider "${selection.provider}"; select a model for this session`, +@@ -2608,9 +2824,9 @@ function createApiProxy(ctx, defaults) { + if ("error" in found) return err(request, found.error); + const current = selectionFor(found.agent).current; + const { groups, failures } = await buildModelCatalog(ctx); +- const routable = routeServed(current.provider); ++ const routable = current !== void 0 && routeServed(current.provider); + return ok(request, { +- current: { ...current }, ++ current: current === void 0 ? null : { ...current }, + routable, + groups, + failures +@@ -2643,6 +2859,7 @@ function createApiProxy(ctx, defaults) { + model: resolved.model, + ...resolved.reasoningEffort === void 0 ? {} : { reasoningEffort: resolved.reasoningEffort } + }; ++ await durableSessionSelections.save(sessionId, selected); + selectionFor(found.agent).current = selected; + try { + await defaults.saveDefaultModelSelection?.(selected); +@@ -3150,7 +3367,13 @@ function createApiProxy(ctx, defaults) { })); }, async pickDirectory(request, signal) { @@ -150,7 +408,7 @@ index 11ee6c4..bf19e6c 100644 if (capability.kind !== "native") return err(request, { code: "directory-picker-unavailable", message: `host.pickDirectory needs the native capability; the composed picker serves "${capability.kind}"`, -@@ -3172,7 +3282,13 @@ function createApiProxy(ctx, defaults) { +@@ -3172,7 +3395,13 @@ function createApiProxy(ctx, defaults) { } }, async listDirectory(request, signal) { @@ -165,7 +423,7 @@ index 11ee6c4..bf19e6c 100644 if (capability.kind !== "browse") return err(request, { code: "directory-picker-unavailable", message: `host.listDirectory needs the browse capability; the composed picker serves "${capability.kind}"`, -@@ -3190,7 +3306,13 @@ function createApiProxy(ctx, defaults) { +@@ -3190,7 +3419,13 @@ function createApiProxy(ctx, defaults) { } }, async createDirectory(request) { @@ -180,7 +438,7 @@ index 11ee6c4..bf19e6c 100644 if (capability.kind !== "browse") return err(request, { code: "directory-picker-unavailable", message: `host.createDirectory needs the browse capability; the composed picker serves "${capability.kind}"`, -@@ -3244,6 +3366,127 @@ function createApiProxy(ctx, defaults) { +@@ -3244,6 +3479,127 @@ function createApiProxy(ctx, defaults) { } }, agentPresets: { @@ -308,7 +566,16 @@ index 11ee6c4..bf19e6c 100644 async list(request) { const presets = ctx.get("agentPresets"); if (presets === void 0) return ok(request, { -@@ -4932,6 +5175,34 @@ function toFetchHandler(api) { +@@ -3572,7 +3928,7 @@ function createApiProxy(ctx, defaults) { + if (agent?.session === session && agent.inbox.hasPending) queue.push(frame({ + type: "session/queue", + sessionId: session.id, +- items: queueItems(agent) ++ items: projectQueueItems(agent, void 0, queueAnchorSeqs.get(session.id)) + })); + } + const jobs = ctx.get("jobs"); +@@ -4932,6 +5288,34 @@ function toFetchHandler(api) { rpcId: RpcId(randomUUID()), payload: {} }, req.signal)); @@ -325,7 +592,7 @@ index 11ee6c4..bf19e6c 100644 + } + if (path === "/api/agent-preset.import" && req.method === "POST") { + const contentType = req.headers.get("content-type")?.split(";", 1)[0]?.trim().toLowerCase(); -+ if (contentType !== PRESET_ARCHIVE_MIME && contentType !== "application/zip" && contentType !== "application/octet-stream") return presetArchiveFailure("Content type must be a DSH preset package.", 415); ++ if (contentType !== PRESET_ARCHIVE_MIME && contentType !== "application/zip" && contentType !== "application/octet-stream") return presetArchiveFailure("Content type must be a Sherlock preset package.", 415); + const contentLength = Number(req.headers.get("content-length")); + if (Number.isFinite(contentLength) && contentLength > PRESET_ARCHIVE_MAX_COMPRESSED) return presetArchiveFailure("Preset package is larger than 16 MB.", 413); + let data; @@ -343,7 +610,15 @@ index 11ee6c4..bf19e6c 100644 if (path === "/api/session.export" && (req.method === "GET" || req.method === "HEAD")) { const parsed = sessionLogQuerySchema.safeParse(Object.fromEntries(url.searchParams)); if (!parsed.success) return new Response("missing or invalid sessionId query parameter", { status: 400 }); -@@ -5531,7 +5802,6 @@ var ApiProxyService = class extends Service { +@@ -5089,6 +5473,7 @@ const muxFrameSchema = z$1.discriminatedUnion("type", [ + sessionId: sessionIdSchema, + items: z$1.array(z$1.object({ + id: messageIdSchema$1, ++ anchorSeq: z$1.number().int().nonnegative().optional(), + placement: z$1.union([ + z$1.literal("queued"), + z$1.literal("steering"), +@@ -5531,7 +5916,6 @@ var ApiProxyService = class extends Service { "agentDefaultModel", "agents", "attachments", @@ -351,3 +626,99 @@ index 11ee6c4..bf19e6c 100644 "llm", "sessions", "subagents", +@@ -5584,4 +5968,4 @@ var ApiProxyService = class extends Service { + } + }; + //#endregion +-export { AbstractApiClient, ApiProxyService, ApiProxyService as default, InProcessApiClient, RpcId, createApiProxy, toFetchHandler }; ++export { AbstractApiClient, ApiProxyService, ApiProxyService as default, InProcessApiClient, RpcId, createApiProxy, createBoundedSessionModelSelectionStore, projectQueueItems, rememberQueueAnchorSeqs, resolveSessionModelSelection, toFetchHandler }; +diff --git a/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/events.d.ts b/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/events.d.ts +index 5b82d8d..92f8067 100644 +--- a/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/events.d.ts ++++ b/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/events.d.ts +@@ -35,6 +35,8 @@ export type ToolEventView = { + export interface QueuedInboxItem { + /** Message identity used by inbox mutations. */ + id: MessageId; ++ /** Durable event sequence where this transient row entered the inbox, when known. */ ++ anchorSeq?: number; + /** Agent-resolved FIFO placement; queued and steering items render on different surfaces, context items stay invisible until claimed. */ + placement: 'queued' | 'steering' | 'context'; + /** Complete pending message; it is not durable until the Agent claims it. */ +diff --git a/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/events.schema.js b/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/events.schema.js +index adcd82d..db313ba 100644 +--- a/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/events.schema.js ++++ b/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/events.schema.js +@@ -46,6 +46,7 @@ export const muxFrameSchema = z.discriminatedUnion('type', [ + sessionId: sessionIdSchema, + items: z.array(z.object({ + id: messageIdSchema, ++ anchorSeq: z.number().int().nonnegative().optional(), + placement: z.union([z.literal('queued'), z.literal('steering'), z.literal('context')]), + message: messageSchema, + })), +diff --git a/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/sessions.d.ts b/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/sessions.d.ts +index 48132be..42a8940 100644 +--- a/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/sessions.d.ts ++++ b/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/sessions.d.ts +@@ -145,7 +145,7 @@ export interface ModelCatalogFailure { + /** Detached model-directory snapshot for one session. */ + export interface SessionModels { + /** Model selection for the session's next assembled step. */ +- current: ModelSelection; ++ current: ModelSelection | null; + /** + * Whether an adapter currently serves `current.provider`, and therefore + * whether this session can start a turn at all. Deliberately NOT derivable +diff --git a/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/sessions.schema.js b/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/sessions.schema.js +index 026ffb3..7f88cee 100644 +--- a/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/sessions.schema.js ++++ b/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/sessions.schema.js +@@ -191,7 +191,7 @@ export const sessionModelsRequestSchema = z.object({ + }); + /** session.models response value. */ + export const sessionModelsValueSchema = z.object({ +- current: modelSelectionSchema, ++ current: modelSelectionSchema.nullable(), + routable: z.boolean(), + groups: z.array(modelProviderGroupSchema), + failures: z.array(modelCatalogFailureSchema), +diff --git a/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/index.d.ts b/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/index.d.ts +index 6737e91..e3d8361 100644 +--- a/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/index.d.ts ++++ b/node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/index.d.ts +@@ -13,6 +13,7 @@ + */ + import { Context, Service } from '@deepseek-ai/cordis'; + import z from '@deepseek-ai/schemastery'; ++import type { ModelSelection } from '@deepseek-ai/dsh-agent'; + import type { ApiProxy } from './api/index.ts'; + export type * from './api/index.ts'; + export { RpcId } from './api/rpc.ts'; +@@ -21,6 +22,26 @@ export { AbstractApiClient, InProcessApiClient } from './fetch/client.ts'; + export type { IApiClient } from './fetch/client.ts'; + export { createApiProxy } from './api-proxy.ts'; + export type { ApiProxyDefaults } from './api-proxy.ts'; ++export interface DurableSessionModelSelection extends ModelSelection { ++ sessionId: string; ++} ++export interface BoundedSessionModelSelectionStoreOptions { ++ load(): readonly DurableSessionModelSelection[]; ++ persist(next: readonly DurableSessionModelSelection[]): Promise; ++ limit?: number; ++} ++export interface BoundedSessionModelSelectionStore { ++ get(sessionId: string): ModelSelection | undefined; ++ save(sessionId: string, selection: ModelSelection): Promise; ++} ++export declare function createBoundedSessionModelSelectionStore(options: BoundedSessionModelSelectionStoreOptions): BoundedSessionModelSelectionStore; ++export declare function resolveSessionModelSelection(options: { ++ live?: ModelSelection; ++ durable?: ModelSelection; ++ request?: ModelSelection; ++ defaultSelection: ModelSelection; ++ routeServed(provider: string): boolean; ++}): { current: ModelSelection | undefined; routable: boolean }; + declare module '@deepseek-ai/cordis' { + interface Context { + /** The host-side ApiProxy implementation (the transport-agnostic gateway face). */ diff --git a/patches/@deepseek-ai+dsh-session+0.1.0-rc.7.patch b/patches/@deepseek-ai+dsh-session+0.1.0-rc.7.patch new file mode 100644 index 000000000..6f78d4e15 --- /dev/null +++ b/patches/@deepseek-ai+dsh-session+0.1.0-rc.7.patch @@ -0,0 +1,25 @@ +diff --git a/node_modules/@deepseek-ai/dsh-session/lib/index.js b/node_modules/@deepseek-ai/dsh-session/lib/index.js +index 1102035..44606ad 100644 +--- a/node_modules/@deepseek-ai/dsh-session/lib/index.js ++++ b/node_modules/@deepseek-ai/dsh-session/lib/index.js +@@ -1095,7 +1095,8 @@ const KNOWN_SESSION_EVENT_TYPES = new Set([ + "turn/end", + "turn/start", + "user/message", +- "web/deepseek-search-llm-request" ++ "web/deepseek-search-llm-request", ++ "web/session-model-search-llm-request" + ]); + //#endregion + //#region lib/types/index.js +diff --git a/node_modules/@deepseek-ai/dsh-session/lib/types/known-event-types.js b/node_modules/@deepseek-ai/dsh-session/lib/types/known-event-types.js +index 7541caa..f2af323 100644 +--- a/node_modules/@deepseek-ai/dsh-session/lib/types/known-event-types.js ++++ b/node_modules/@deepseek-ai/dsh-session/lib/types/known-event-types.js +@@ -60,5 +60,6 @@ export const KNOWN_SESSION_EVENT_TYPES = new Set([ + 'turn/start', + 'user/message', + 'web/deepseek-search-llm-request', ++ 'web/session-model-search-llm-request', + ]); + //# sourceMappingURL=known-event-types.js.map diff --git a/patches/@deepseek-ai+dsh-session-log-export+0.1.0-rc.7.patch b/patches/@deepseek-ai+dsh-session-log-export+0.1.0-rc.7.patch new file mode 100644 index 000000000..b7eda4972 --- /dev/null +++ b/patches/@deepseek-ai+dsh-session-log-export+0.1.0-rc.7.patch @@ -0,0 +1,32 @@ +diff --git a/node_modules/@deepseek-ai/dsh-session-log-export/lib/client.js b/node_modules/@deepseek-ai/dsh-session-log-export/lib/client.js +index 80481e4..6b961f3 100644 +--- a/node_modules/@deepseek-ai/dsh-session-log-export/lib/client.js ++++ b/node_modules/@deepseek-ai/dsh-session-log-export/lib/client.js +@@ -187,18 +187,7 @@ window.__ModuleLoader__.load({ + * @returns the persistent Header action and Session-scoped dialog. + */ + function SessionLogDownloadHeaderAction(props) { +- const { sessionId, useSessionLogDownload, request } = props; +- const busy = useSessionLogDownload((state) => state.bySession[String(sessionId)])?.status === "downloading"; +- return (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [(0, react_jsx_runtime.jsxs)("button", { +- type: "button", +- className: HeaderAction_module_css_default.sessionLogButton, +- disabled: busy, +- "aria-busy": busy, +- onClick: () => { +- request(sessionId); +- }, +- children: [(0, react_jsx_runtime.jsx)("span", { children: "Session log" }), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconDownloadOutline16, { size: 12 })] +- }), (0, react_jsx_runtime.jsx)(SessionLogDownloadDialog, { ...props })] }); ++ return (0, react_jsx_runtime.jsx)(SessionLogDownloadDialog, { ...props }); + } + //#endregion + //#region lib/types/client/locales.js +@@ -261,6 +250,7 @@ window.__ModuleLoader__.load({ + //#endregion + exports.apply = apply; + exports.inject = inject; ++ exports.SessionLogDownloadHeaderAction = SessionLogDownloadHeaderAction; + return module.exports; + } + }); diff --git a/patches/@deepseek-ai+dsh-system-prompt+0.1.0-rc.7.patch b/patches/@deepseek-ai+dsh-system-prompt+0.1.0-rc.7.patch new file mode 100644 index 000000000..d840610c9 --- /dev/null +++ b/patches/@deepseek-ai+dsh-system-prompt+0.1.0-rc.7.patch @@ -0,0 +1,13 @@ +diff --git a/node_modules/@deepseek-ai/dsh-system-prompt/lib/index.js b/node_modules/@deepseek-ai/dsh-system-prompt/lib/index.js +index 7c166a8..785f652 100644 +--- a/node_modules/@deepseek-ai/dsh-system-prompt/lib/index.js ++++ b/node_modules/@deepseek-ai/dsh-system-prompt/lib/index.js +@@ -166,7 +166,7 @@ var SystemPrompt = class extends Service { + if (config.includeHarnessIdentity ?? true) this.section({ + name: "harness:identity", + order: -100, +- text: "You are an AI agent powered by DeepSeek Harness." ++ text: "You are Sherlock Agent." + }); + this.section({ + name: PERSONA_SECTION, diff --git a/patches/@deepseek-ai+dsh-tool-fs-search+0.1.0-rc.7.patch b/patches/@deepseek-ai+dsh-tool-fs-search+0.1.0-rc.7.patch new file mode 100644 index 000000000..c60635bca --- /dev/null +++ b/patches/@deepseek-ai+dsh-tool-fs-search+0.1.0-rc.7.patch @@ -0,0 +1,27 @@ +diff --git a/node_modules/@deepseek-ai/dsh-tool-fs-search/lib/index.js b/node_modules/@deepseek-ai/dsh-tool-fs-search/lib/index.js +index a5ca0d8..b0d9c25 100644 +--- a/node_modules/@deepseek-ai/dsh-tool-fs-search/lib/index.js ++++ b/node_modules/@deepseek-ai/dsh-tool-fs-search/lib/index.js +@@ -191,10 +191,11 @@ async function runRipgrep(ctx, exec, toolName, argv, rawOutputMaxBytes, graceMs, + if (stdout === void 0 || stderr === void 0) throw new SearchError(`${toolName} search command produced no collected output streams`, "SEARCH_FAILED"); + if (exec.signal.aborted) throw new SearchError(`${toolName} was aborted before completion (tool timeout or caller cancellation)`, "SEARCH_ABORTED"); + if (outcome.signal !== null || outcome.exitCode === null) throw new SearchError(`${toolName} search command was killed by signal ${outcome.signal ?? "(unknown)"}`, "SEARCH_FAILED"); +- if (outcome.exitCode !== 0 && outcome.exitCode !== 1) throw classifyRunFailure(toolName, outcome.exitCode, stderr.text, stderr.lossy); ++ const emptySearchScope = outcome.exitCode === 2 && /\bNo files were searched\b/i.test(stderr.text); ++ if (outcome.exitCode !== 0 && outcome.exitCode !== 1 && !emptySearchScope) throw classifyRunFailure(toolName, outcome.exitCode, stderr.text, stderr.lossy); + return { + stdout: completeStdout(toolName, stdout, rawOutputMaxBytes), +- noMatches: outcome.exitCode === 1, ++ noMatches: outcome.exitCode === 1 || emptySearchScope, + workdir + }; + } +@@ -1077,7 +1078,7 @@ function applyGrepTool(ctx, caps) { + ctx.systemPrompt.section({ + name: "tool:grep", + order: 104, +- text: "Use the grep tool — not shell grep or rg — to search file contents. Use read on a matched file when you need surrounding context." ++ text: "Use the grep tool — not shell grep or rg — to search file contents. Use read on a matched file when you need surrounding context. Pass path when the target is outside the session workspace. After a zero-match result or failure, do not repeat the same grep arguments; change pattern/path or use another relevant tool." + }); + const tool = defineTool({ + name: "grep", diff --git a/patches/@deepseek-ai+dsh-web-app+0.1.0-rc.7.patch b/patches/@deepseek-ai+dsh-web-app+0.1.0-rc.7.patch new file mode 100644 index 000000000..9c56e5ffe --- /dev/null +++ b/patches/@deepseek-ai+dsh-web-app+0.1.0-rc.7.patch @@ -0,0 +1,22 @@ +diff --git a/node_modules/@deepseek-ai/dsh-web-app/lib/index.js b/node_modules/@deepseek-ai/dsh-web-app/lib/index.js +index 954e771..6ff4167 100644 +--- a/node_modules/@deepseek-ai/dsh-web-app/lib/index.js ++++ b/node_modules/@deepseek-ai/dsh-web-app/lib/index.js +@@ -53,7 +53,7 @@ function resolveLanTrust(bindHost, extra) { + } + /** Model-visible orientation and acceptance boundary for sessions created through `dsh web`. */ + function webSurfacePrompt(webUrl) { +- return `You are interacting with the user through the DeepSeek Harness Web GUI at ${webUrl}. When the user refers to "this page", "this GUI", or "this app" without naming another target, they mean this GUI. The browser provides no implicit DOM, route, or screenshot context. The client-plugin HMR receiver is active, but client-plugin changes reload without a refresh only while \`pnpm run dev:web\` is also running from this same checkout to rebuild their bundles; verify that watcher before promising automatic updates. Every other change — the apps/web shell and plain packages — requires rebuilding the affected Web artifacts and verifying this existing URL after a page refresh. Starting another server does not update this GUI. The apps/web Vite entry builds the shell but is not a standalone application because only dsh web injects window.__DSH_BOOT__. Do not start a replacement server unless the user asks; if one is needed, use a managed background job and verify its exact URL.`; ++ return `You are interacting with the user through the Sherlock desktop interface at ${webUrl}. When the user refers to "this page", "this GUI", or "this app" without naming another target, they mean this GUI. The browser provides no implicit DOM, route, or screenshot context. The client-plugin HMR receiver is active, but client-plugin changes reload without a refresh only while \`pnpm run dev:web\` is also running from this same checkout to rebuild their bundles; verify that watcher before promising automatic updates. Every other change — the apps/web shell and plain packages — requires rebuilding the affected Web artifacts and verifying this existing URL after a page refresh. Starting another server does not update this GUI. The apps/web Vite entry builds the shell but is not a standalone application because only dsh web injects window.__DSH_BOOT__. Do not start a replacement server unless the user asks; if one is needed, use a managed background job and verify its exact URL.`; + } + /** Resolve the canonical loopback URL from the active Web server. */ + function localWebUrl(ctx) { +@@ -95,7 +95,7 @@ function apply(ctx, config) { + ctx.inject(["shellEnv"], (runtimeCtx) => { + runtimeCtx.shellEnv.register({ + name: "web-runtime", +- variables: { [DSH_WEB_URL]: { description: "Canonical local URL of the DeepSeek Harness Web GUI serving this session." } }, ++ variables: { [DSH_WEB_URL]: { description: "Canonical local URL of the Sherlock desktop interface serving this session." } }, + resolve: () => ({ [DSH_WEB_URL]: localWebUrl(runtimeCtx) }) + }); + }); diff --git a/patches/@deepseek-ai+dsh-web-frontend+0.1.0-rc.7.patch b/patches/@deepseek-ai+dsh-web-frontend+0.1.0-rc.7.patch new file mode 100644 index 000000000..9d7ccdefa --- /dev/null +++ b/patches/@deepseek-ai+dsh-web-frontend+0.1.0-rc.7.patch @@ -0,0 +1,73 @@ +diff --git a/node_modules/@deepseek-ai/dsh-web-frontend/dist/assets/index-C-1AiF3k.js b/node_modules/@deepseek-ai/dsh-web-frontend/dist/assets/index-C-1AiF3k.js +index e3cda35..62877f8 100644 +--- a/node_modules/@deepseek-ai/dsh-web-frontend/dist/assets/index-C-1AiF3k.js ++++ b/node_modules/@deepseek-ai/dsh-web-frontend/dist/assets/index-C-1AiF3k.js +@@ -69,7 +69,7 @@ Error generating stack: `+d.message+` + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. +- */var M0;function I6(){if(M0)return ml;M0=1;var n=E1(),r=T6();function i(C,v){return C===v&&(C!==0||1/C===1/v)||C!==C&&v!==v}var s=typeof Object.is=="function"?Object.is:i,u=r.useSyncExternalStore,c=n.useRef,h=n.useEffect,p=n.useMemo,g=n.useDebugValue;return ml.useSyncExternalStoreWithSelector=function(C,v,L,w,_){var k=c(null);if(k.current===null){var E={hasValue:!1,value:null};k.current=E}else E=k.current;k=p(function(){function B(V){if(!W){if(W=!0,z=V,V=w(V),_!==void 0&&E.hasValue){var Z=E.value;if(_(Z,V))return ee=Z}return ee=V}if(Z=ee,s(z,V))return Z;var ne=w(V);return _!==void 0&&_(Z,ne)?Z:(z=V,ee=ne)}var W=!1,z,ee,Q=L===void 0?null:L;return[function(){return B(v())},Q===null?void 0:function(){return B(Q())}]},[v,L,w,_]);var T=u(C,k[0],k[1]);return h(function(){E.hasValue=!0,E.value=T},[T]),g(T),T},ml}var O0;function $6(){return O0||(O0=1,pl.exports=I6()),pl.exports}var H6=$6();function ru(n){const r=s=>n.subscribe(s),i=()=>n.getSnapshot();return function(u,c){return H6.useSyncExternalStoreWithSelector(r,i,void 0,u,c)}}class li extends Error{}class Er extends Error{}function V6(n){return typeof n=="function"?n():n}const Do=Object.freeze([]);class A6{constructor(){P(this,"records",new Map);P(this,"mutateListeners",new Set);P(this,"handleScopes",new Map);P(this,"dirty",new Set);P(this,"flushScheduled",!1);P(this,"abdicated",new WeakSet);P(this,"entryErrorListeners",new Set);const r=this.record("root");r.spec={kind:"single",scope:"root"},r.declaredBy="(built-in)",r.declarationEpoch=1}register(r,i){const s=this.records.get(r.name);if(!(s!=null&&s.spec))throw new Error(`slot "${r.name}" is not declared (a parent entry's children table must declare it)`);const u=s.spec,c=r.priority??0,h=C=>`at priority ${c}${C.registrant!==void 0?` (registered by ${C.registrant})`:""} — register at a different priority to shadow it (lowest renders)`;switch(u.kind){case"single":{const C=s.entries.find(v=>(v.options.priority??0)===c);if(C)throw new Error(`single slot "${r.name}" already has a registration ${h(C)}`);break}case"keyed":{if(r.key===void 0)throw new Error(`keyed slot "${r.name}" requires options.key`);const C=s.entries.find(v=>v.options.key===r.key&&(v.options.priority??0)===c);if(C)throw new Error(`keyed slot "${r.name}" already has an entry for key "${r.key}" ${h(C)}`);break}case"list":{if(r.id===void 0)throw new Error(`list slot "${r.name}" requires options.id`);const C=s.entries.find(v=>v.options.id===r.id&&(v.options.priority??0)===c);if(C)throw new Error(`list slot "${r.name}" already has an entry with id "${r.id}" ${h(C)}`);break}case"chain":if(r.select===void 0)throw new Error(`chain slot "${r.name}" requires options.select`);break}if(r.children)for(const C of Object.keys(r.children)){const v=this.records.get(C);if(v!=null&&v.spec)throw new Error(`slot "${C}" is already declared (by ${v.declaredBy??"an unknown entry"})`)}if(r.store!==void 0&&typeof r.store!="function"){const C=this.handleScopes.get(r.store);if(C&&C.scope!==u.scope)throw new Error(`store handle mounted under "${r.name}" (scope "${u.scope}") is already mounted under scope "${C.scope}" — one handle, one scope`);C?C.count+=1:this.handleScopes.set(r.store,{scope:u.scope,count:1})}const p={component:i,options:{...r.key!==void 0?{key:r.key}:{},...r.id!==void 0?{id:r.id}:{},...r.order!==void 0?{order:r.order}:{},...r.label!==void 0?{label:r.label}:{},...r.priority!==void 0?{priority:r.priority}:{}},...r.select!==void 0?{select:r.select}:{},...r.inject!==void 0?{inject:r.inject}:{},...r.children!==void 0?{children:r.children}:{},...r.store!==void 0?{store:r.store}:{},...r.locale!==void 0?{locale:r.locale}:{},...r.registrant!==void 0?{registrant:r.registrant}:{}},g=[...s.entries,p];if(g.sort(u.kind==="list"?(C,v)=>(C.options.priority??0)-(v.options.priority??0)||(C.options.order??0)-(v.options.order??0):(C,v)=>(C.options.priority??0)-(v.options.priority??0)),s.entries=g,this.markDirty(r.name,s),r.children){const C=[];for(const[v,L]of Object.entries(r.children)){const w=this.record(v);w.spec=L,w.declaredBy=`an entry in "${r.name}"${r.registrant?` (${r.registrant})`:""}`,w.parent=r.name,w.declarationEpoch+=1,C.push([v,w])}for(const[v,L]of C)this.markDirty(v,L);for(const[,v]of C)this.notifyDeclaration(v)}return()=>{s.entries.includes(p)&&(s.entries=s.entries.filter(C=>C!==p),this.markDirty(r.name,s),this.releaseEntry(p))}}isLive(r){for(const i of this.records.values())if(i.entries.includes(r))return!0;return!1}entries(r){var i;return((i=this.records.get(r))==null?void 0:i.entries)??Do}entriesOfSlot(r){const i=this.records.get(r);if(!(i!=null&&i.spec))return Do;const s=i.spec.kind;if(s==="chain")return i.entries;const u=[],c=new Set;for(const h of i.entries){if(this.abdicated.has(h))continue;const p=s==="keyed"?h.options.key:s==="list"?h.options.id:void 0;c.has(p)||(c.add(p),u.push(h))}return u}spec(r){var i;return(i=this.records.get(r))==null?void 0:i.spec}specDynamic(r){var i;return(i=this.records.get(r))==null?void 0:i.spec}snapshot(r){const i=(s,u)=>{const c=this.records.get(s);if((c==null?void 0:c.spec)===void 0||u.has(s))return;const h=new Set(u);h.add(s);const p=new Set(this.entriesOfSlot(s)),g=[...this.records.entries()].filter(([,C])=>C.spec!==void 0&&C.parent===s).flatMap(([C])=>{const v=i(C,h);return v===void 0?[]:[v]});return{name:s,kind:c.spec.kind,scope:c.spec.scope,...c.declaredBy===void 0?{}:{declaredBy:c.declaredBy},occupants:c.entries.map(C=>({...C.registrant===void 0?{}:{registrant:C.registrant},...C.options.key===void 0?{}:{key:C.options.key},...C.options.id===void 0?{}:{id:C.options.id},...C.options.order===void 0?{}:{order:C.options.order},priority:C.options.priority??0,active:p.has(C)})),children:g}};if(r!==void 0){const s=i(r,new Set);return s===void 0?[]:[s]}return[...this.records.entries()].filter(([,s])=>{var u;return s.spec!==void 0&&(s.parent===void 0||((u=this.records.get(s.parent))==null?void 0:u.spec)===void 0)}).flatMap(([s])=>{const u=i(s,new Set);return u===void 0?[]:[u]})}declarationEpoch(r){var i;return((i=this.records.get(r))==null?void 0:i.declarationEpoch)??0}subscribe(r,i){const s=this.record(r);return s.listeners.add(i),()=>{s.listeners.delete(i)}}subscribeDeclaration(r,i){const s=this.record(r);return s.declarationListeners.add(i),()=>{s.declarationListeners.delete(i)}}getVersion(r){var i;return((i=this.records.get(r))==null?void 0:i.version)??0}onMutate(r){return this.mutateListeners.add(r),()=>{this.mutateListeners.delete(r)}}reportEntryError(r,i,s,u){if(u.abdicate){if(this.abdicated.has(i))return;this.abdicated.add(i);const c=this.records.get(r);c!==void 0&&this.markDirty(r,c)}for(const c of[...this.entryErrorListeners])c(r,i,s,{abdicated:u.abdicate})}onEntryError(r){return this.entryErrorListeners.add(r),()=>{this.entryErrorListeners.delete(r)}}releaseEntry(r){if(r.store!==void 0&&typeof r.store!="function"){const i=this.handleScopes.get(r.store);i&&--i.count===0&&this.handleScopes.delete(r.store)}if(r.children)for(const i of Object.keys(r.children)){const s=this.records.get(i);if(!s)continue;const u=s.entries;s.spec=void 0,s.declaredBy=void 0,s.parent=void 0,s.declarationEpoch+=1,s.entries=Do,this.markDirty(i,s),this.notifyDeclaration(s);for(const c of u)this.releaseEntry(c)}}record(r){let i=this.records.get(r);return i||(i={spec:void 0,declaredBy:void 0,parent:void 0,declarationEpoch:0,entries:Do,version:0,listeners:new Set,declarationListeners:new Set},this.records.set(r,i)),i}markDirty(r,i){i.version+=1;for(const s of[...this.mutateListeners])s(r);this.dirty.add(i),this.flushScheduled||(this.flushScheduled=!0,queueMicrotask(()=>{this.flush()}))}notifyDeclaration(r){for(const i of[...r.declarationListeners])i()}flush(){this.flushScheduled=!1;const r=[...this.dirty];this.dirty.clear();for(const i of r)for(const s of[...i.listeners])s()}}const D6=Object.freeze(Object.defineProperty({__proto__:null,SlotCore:A6,SlotOwnershipError:Er,StaleAuthorizationError:li,resolveSlotLabel:V6},Symbol.toStringTag,{value:"Module"}));var R=E1();const F6=j1(R),B6=ni({__proto__:null,default:F6},[R]);class sn extends Error{}const P3=R.createContext(null);function Kn(){const n=R.useContext(P3);if(!n)throw new sn("slot machinery rendered outside the installed renderer tree");return n}const ou=R.createContext(null);function iu(){const n=R.useContext(ou);if(!n)throw new sn("session-aware slot rendered outside the root binding provider");return n}function Ht(n){let r=N0.get(n);return r===void 0&&(r=ru(n),N0.set(n,r)),r}const N0=new WeakMap,T3={getSnapshot:()=>{},subscribe:()=>()=>{}};function z6(n){return n!==void 0?Ht(n):Z6}function Z6(n,r){Ht(T3)(()=>{})}function U6(n){let r=R0.get(n);return r===void 0&&(r=(i,s,u)=>{var h;return Ht(((h=n.projections)==null?void 0:h.faceOf(i))??T3)(s??(p=>p),u)},R0.set(n,r)),r}const R0=new WeakMap;function W6({children:n}){const r=Kn(),i=Ht(r.sessions.provideInfo)(s=>s);return f.jsx(ou.Provider,{value:i,children:n})}function I3({empty:n,children:r}){const i=Kn(),s=Ht(i.sessions.provideInfo)(c=>c),u=s.sessionId;return u===void 0?f.jsx(f.Fragment,{children:(n==null?void 0:n())??null}):f.jsx(ou.Provider,{value:s,children:r(u)},u)}const P0=new WeakMap;function q6(n,r){let i=P0.get(r);return i||(i=(s,u,c)=>{var p;if(!n.isLive(r))throw new li(`renderSlot('${s}') from a disposed registration`);const h=(p=r.children)==null?void 0:p[s];if(h===void 0)throw new Er(`slot '${s}' is not declared by this entry's children`);if(h.kind==="chain")throw new Er(`slot '${s}' is declared 'chain' — use renderSlotChain`);return f.jsx(F3,{slotKey:s,ownerProps:u,opts:c})},P0.set(r,i)),i}const T0=new WeakMap;function Q6(n,r){let i=T0.get(r);return i||(i=(s,u,c)=>{var p;if(!n.isLive(r))throw new li(`renderSlotChain('${s}') from a disposed registration`);const h=(p=r.children)==null?void 0:p[s];if(h===void 0)throw new Er(`slot '${s}' is not declared by this entry's children`);if(h.kind!=="chain")throw new Er(`slot '${s}' is declared '${h.kind}', not 'chain' — use renderSlot`);return f.jsx(F3,{slotKey:s,ownerProps:u,opts:c})},T0.set(r,i)),i}const I0=new WeakMap,$0=new WeakMap,H0=new WeakMap,$3={};function su(n,r,i){const s=n.inject;if(!s)return $3;const u=[];return r!==void 0&&u.push(r.sessionId),i!==void 0&&u.push(i),K6(s(...u))}function K6(n){var c;const r=n.hooks;if(r===void 0)return n;const{hooks:i,...s}=n,u=s;for(const[h,p]of Object.entries(r)){const g=`use${((c=h[0])==null?void 0:c.toUpperCase())??""}${h.slice(1)}`;u[g]=Ht(p)}return u}const vl=new WeakMap,H3={props:$3};function J6(n){var p;if(n===void 0)return H3;let r=vl.get(n);if(r!==void 0)return r;const i=n.hooks;if(i===void 0)return r={props:n},vl.set(n,r),r;const{hooks:s,...u}=n,c=u;let h;for(const[g,C]of Object.entries(i)){const v=`use${((p=g[0])==null?void 0:p.toUpperCase())??""}${g.slice(1)}`;typeof C=="function"?(h??(h={}),h[g]=C):c[v]=Ht(C)}return r=h===void 0?{props:c}:{props:c,slotHookFactories:h},vl.set(n,r),r}function G6(n,r,i){var u;const s={};for(const[c,h]of Object.entries(n)){const p=`use${((u=c[0])==null?void 0:u.toUpperCase())??""}${c.slice(1)}`;s[p]=h(r,i)}return s}function Y6(n,r){let i=I0.get(n);return i||(i=su(n,void 0,r),I0.set(n,i)),i}function X6(n,r,i){let s=$0.get(n);s||(s=new WeakMap,$0.set(n,s));let u=s.get(r);return u||(u=su(n,r,i),s.set(r,u)),u}function e8(n,r,i){let s=H0.get(n);s||(s=new WeakMap,H0.set(n,s));let u=s.get(r);return u||(u=su(n,r,i),s.set(r,u)),u}const V0=new WeakMap;function t8(n,r){let i=V0.get(n);i||(i=new Map,V0.set(n,i));const s=n.getSnapshot().revision,u=i.get(r);if(u&&u.revision===s)return u.t;const c=n.bind(r),h=(p,g)=>c(p,g);return i.set(r,{revision:s,t:h}),h}const n8=()=>()=>{},r8=()=>0,A0=new WeakMap;function o8(n){let r=A0.get(n);return r||(r={subscribe:i=>n.subscribe(i),getRevision:()=>n.getSnapshot().revision},A0.set(n,r)),r}function V3(n){const r=n!==void 0?o8(n):void 0;return R.useSyncExternalStore((r==null?void 0:r.subscribe)??n8,(r==null?void 0:r.getRevision)??r8)}let i8=0;const D0=new WeakMap;function v1(n){let r=D0.get(n);return r===void 0&&(r=i8++,D0.set(n,r)),r}class lu extends R.Component{constructor(){super(...arguments);P(this,"state",{failed:!1})}static getDerivedStateFromError(i){if(i instanceof sn)throw i;return{failed:!0}}componentDidCatch(i){console.error(`slot entry crashed in '${this.props.slotKey}':`,i),this.props.onEntryError(i)}render(){return this.state.failed?f.jsx("div",{"data-slot-error":this.props.slotKey}):this.props.children}}const F0=new WeakMap;function s8(n,r,i){var h;let s=F0.get(n);if(s===void 0&&(s={root:{useSessions:Ht(n.sessions.list),useWorkspaces:Ht(n.workspaces.list)},session:new WeakMap,sessionMaybe:new WeakMap},F0.set(n,s)),r==="root")return s.root;if(i===void 0)throw new sn(`scope '${r}' rendered without session provide info`);const u=r==="session"?s.session:s.sessionMaybe;let c=u.get(i);if(c!==void 0)return c;c={...s.root};for(const[p,g]of Object.entries(i.hooks)){const C=`use${((h=p[0])==null?void 0:h.toUpperCase())??""}${p.slice(1)}`;if(r==="session-maybe")c[C]=z6(g);else{if(g===void 0)throw new sn(`strict session hook '${p}' has no source`);c[C]=Ht(g)}}return Object.assign(c,i.props),c.sessionId=i.sessionId,c.useProjection=U6(i),u.set(i,c),c}function uu(n,r,i,s){const u=s8(n,i,s),c={...u};if(r.locale!==void 0){const p=n.locale;if(p===void 0)throw new sn(`entry declares locale namespace '${r.locale}' but no locale face is installed (locale plugin missing from the composition?)`);c.t=t8(p,r.locale)}const h=i==="session-maybe"&&(s==null?void 0:s.sessionId)===void 0?void 0:n.storeOf(r,s==null?void 0:s.sessionId);return h!==void 0&&(c.useStore=Ht(h),c.actions=h.actions),r.children!==void 0&&(c.renderSlot=q6(n,r),Object.values(r.children).some(p=>p.kind==="chain")&&(c.renderSlotChain=Q6(n,r)),Object.values(r.children).some(p=>p.scope==="session")&&(c.SessionProvider=I3)),{kit:c,standard:u,actions:h==null?void 0:h.actions}}function l8({slotKey:n,Comp:r,kit:i,standard:s,injected:u,slotInjected:c,ownerProps:h,hookContext:p,hasHookContext:g}){const C=R.useMemo(()=>{if(!g)throw new sn(`slot '${n}' has contextual injected Hooks but no hookContext`);return G6(c.slotHookFactories,s,p)},[g,p,c.slotHookFactories,n,s]);return f.jsx(r,{...i,...u,...c.props,...C,...h})}function au(n,r,i,s,u,c,h,p,g){return c.slotHookFactories===void 0?f.jsx(r,{...i,...u,...c.props,...h}):f.jsx(l8,{slotKey:n,Comp:r,kit:i,standard:s,injected:u,slotInjected:c,ownerProps:h,hookContext:p,hasHookContext:g})}function u8({entry:n,ownerProps:r,info:i,slotKey:s,slotInjected:u,hookContext:c,hasHookContext:h}){const p=Kn(),g=n.component,{kit:C,standard:v,actions:L}=uu(p,n,"session",i),w=X6(n,i,L);return au(s,g,C,v,w,u,r,c,h)}function a8({entry:n,ownerProps:r,info:i,slotKey:s,slotInjected:u,hookContext:c,hasHookContext:h}){const p=Kn(),g=n.component,{kit:C,standard:v,actions:L}=uu(p,n,"session-maybe",i),w=e8(n,i,L);return au(s,g,C,v,w,u,r,c,h)}function c8({entry:n,ownerProps:r,slotKey:i,slotInjected:s,hookContext:u,hasHookContext:c}){const h=iu(),[p,g]=R.useState(f8);let{adopted:C,epoch:v}=p;return h.sessionId!==void 0&&C===void 0?(C=h.sessionId,g({adopted:C,epoch:v})):C!==void 0&&h.sessionId!==void 0&&h.sessionId!==C?(C=h.sessionId,v+=1,g({adopted:C,epoch:v})):C!==void 0&&h.sessionId===void 0&&(C=void 0,v+=1,g({adopted:C,epoch:v})),f.jsx(a8,{entry:n,ownerProps:r,info:h,slotKey:i,slotInjected:s,hookContext:u,hasHookContext:c},v)}const f8={adopted:void 0,epoch:0};function A3({entry:n,ownerProps:r,slotKey:i,slotInjected:s,hookContext:u,hasHookContext:c}){const h=Kn(),p=n.component,{kit:g,standard:C,actions:v}=uu(h,n,"root",void 0),L=Y6(n,v);return au(i,p,g,C,L,s,r,u,c)}function d8({slotKey:n,entry:r,ownerProps:i,slotInjected:s,hookContext:u,hasHookContext:c,onEntryError:h}){const p=iu();return p.sessionId===void 0?null:f.jsx(lu,{slotKey:n,onEntryError:h,children:f.jsx(u8,{entry:r,ownerProps:i,info:p,slotKey:n,slotInjected:s,hookContext:u,hasHookContext:c})},p.sessionId)}const D3={display:"contents"};function F3({slotKey:n,ownerProps:r,opts:i}){const s=Kn();R.useSyncExternalStore(c=>s.subscribe(n,c),()=>s.getVersion(n)),V3(s.locale);const u=iu();return f.jsx("div",{"data-slot":n,style:D3,children:h8(s,n,r,i,u)})}function h8(n,r,i,s,u){const c=n.specOf(r);if(!c)return null;const h=c.scope==="session"&&u.sessionId===void 0;if(h&&(c.kind!=="chain"||!(s!=null&&s.overlay)))return f.jsx(f.Fragment,{children:(s==null?void 0:s.fallback)??null});const p=h?[]:n.entriesOf(r),g=J6(c.inject),C=(E,T,B=i)=>{const W=s!==void 0&&Object.hasOwn(s,"hookContext"),z=s==null?void 0:s.hookContext,ee=Q=>{n.reportEntryError(r,E,Q,{abdicate:c.kind!=="chain"})};return c.scope==="session"?f.jsx(d8,{slotKey:r,entry:E,ownerProps:B,slotInjected:g,hookContext:z,hasHookContext:W,onEntryError:ee},T):f.jsx(lu,{slotKey:r,onEntryError:ee,children:c.scope==="session-maybe"?f.jsx(c8,{entry:E,ownerProps:B,slotKey:r,slotInjected:g,hookContext:z,hasHookContext:W}):f.jsx(A3,{entry:E,ownerProps:B,slotKey:r,slotInjected:g,hookContext:z,hasHookContext:W})},T)},v=()=>f.jsx("div",{"data-slot-error":r});if(c.kind==="single"){const E=n.entriesOfSlot(r)[0];return E?C(E,v1(E)):p.length>0?v():f.jsx(f.Fragment,{children:(s==null?void 0:s.fallback)??null})}if(c.kind==="keyed"){const E=n.entriesOfSlot(r).find(T=>T.options.key===(s==null?void 0:s.entryKey));return E?C(E,v1(E)):p.some(B=>B.options.key===(s==null?void 0:s.entryKey))?v():f.jsx(f.Fragment,{children:(s==null?void 0:s.fallback)??null})}if(c.kind==="chain"){let E=null;for(const T of p){let B;try{B=T.select(i)}catch(W){console.error(`chain selector crashed in '${r}' (${T.registrant??"unknown registrant"}), treating as declined:`,W);continue}if(B!==null){E=C(T,v1(T),{...i,matched:B});break}}return s!=null&&s.overlay?f.jsxs(f.Fragment,{children:[f.jsx("div",{"data-chain-overlay-fallback":r,style:{display:E===null?"contents":"none"},children:s.fallback??null}),E]}):E??f.jsx(f.Fragment,{children:(s==null?void 0:s.fallback)??null})}const w=n.entriesOfSlot(r).map(E=>({entry:E,id:E.options.id,order:E.options.order??0})),_=new Set(w.map(E=>E.id));for(const E of p)_.has(E.options.id)||(_.add(E.options.id),w.push({entry:void 0,id:E.options.id,order:E.options.order??0}));let k=[...w].sort((E,T)=>E.order-T.order);return(s==null?void 0:s.only)!==void 0&&(k=k.filter(E=>E.id===s.only)),k.length===0?f.jsx(f.Fragment,{children:(s==null?void 0:s.fallback)??null}):f.jsx(f.Fragment,{children:k.map((E,T)=>E.entry!==void 0?C(E.entry,`e${v1(E.entry)}`):f.jsx("div",{"data-slot-error":r},`x${E.id??T}`))})}function p8({ownerProps:n}){const r=Kn();R.useSyncExternalStore(s=>r.subscribe("root",s),()=>r.getVersion("root")),V3(r.locale);const i=r.entriesOfSlot("root")[0];if(!i){if(r.entriesOf("root").length>0)return f.jsx("div",{"data-slot-error":"root"});throw new sn("renderSlot('root') before any 'root' registration (boot order)")}return f.jsx("div",{"data-slot":"root",style:D3,children:f.jsx(lu,{slotKey:"root",onEntryError:s=>{r.reportEntryError("root",i,s,{abdicate:!0})},children:f.jsx(A3,{entry:i,ownerProps:n,slotKey:"root",slotInjected:H3,hookContext:void 0,hasHookContext:!1})},v1(i))})}function B3(){return{renderRoot(n,r){return f.jsx(P3.Provider,{value:n,children:f.jsx(W6,{children:f.jsx(p8,{ownerProps:r})})})}}}function m8(n){const r={inflight:0,listeners:new Set,fn:n,invoke:()=>{B0(r,1),r.fn().catch(i=>{console.error("useInvoke action failed:",i)}).finally(()=>{B0(r,-1)})},subscribe:i=>(r.listeners.add(i),()=>{r.listeners.delete(i)}),getPending:()=>r.inflight>0};return r}function B0(n,r){const i=n.inflight>0;if(n.inflight+=r,i!==n.inflight>0)for(const s of[...n.listeners])s()}function C8(n){const r=R.useRef(null);r.current??(r.current=m8(n));const i=r.current;i.fn=n;const s=R.useSyncExternalStore(i.subscribe,i.getPending);return[i.invoke,s]}const g8=Object.freeze(Object.defineProperty({__proto__:null,SessionProvider:I3,SlotAssemblyError:sn,SlotOwnershipError:Er,StaleAuthorizationError:li,bindSnapshotSelector:ru,createSlotRenderer:B3,useInvoke:C8},Symbol.toStringTag,{value:"Module"}));function v8({title:n}){const r=R.useRef(document.title);return R.useEffect(()=>(document.title=n===void 0?r.current:`${n} — ${r.current}`,()=>{document.title=r.current}),[n]),null}function y8(n){const{ctx:r}=n,i=r.get("sessions");if(i===void 0)throw new Error("shell assembly: sessions service unavailable");const s=ru(i.list),u=()=>{const c=s(h=>{var g;const p=h.current;return p===void 0||(g=h.byId[p])==null?void 0:g.title});return f.jsx(v8,{...c===void 0?{}:{title:c}})};return()=>f.jsxs(f.Fragment,{children:[f.jsx(u,{}),r.slots.renderSlot("root",{})]})}const Fl="@deepseek-ai/dsh-client-app-shell",w8="app-shell",x8=["slots","sessions","layout"];function _8(n){n.slots.install(B3());let r;n.reflect.provide("appShell",{renderApp:()=>(r??(r=y8({ctx:n})),r())})}const L8=Object.freeze(Object.defineProperty({__proto__:null,APP_SHELL_ID:Fl,apply:_8,inject:x8,name:w8},Symbol.toStringTag,{value:"Module"})),k8="_boot_9gj4p_6",S8="_card_9gj4p_13",j8="_wordmark_9gj4p_20",E8="_hint_9gj4p_28",b8="_spinner_9gj4p_34",M8="_failed_9gj4p_47",O8="_failedTitle_9gj4p_54",N8="_failedItem_9gj4p_61",nn={boot:k8,card:S8,wordmark:j8,hint:E8,spinner:b8,failed:M8,failedTitle:O8,failedItem:N8};function R8(n){const r=R.useSyncExternalStore(n.settled.subscribe,n.settled.getSnapshot),i=R.useSyncExternalStore(n.status.subscribe,n.status.getSnapshot),s=R.useSyncExternalStore(n.error.subscribe,n.error.getSnapshot),u=Object.entries(i).filter(([,h])=>h==="failed");if(r)return f.jsx(f.Fragment,{children:n.renderApp()});const c=s!==void 0||u.length>0;return f.jsx("div",{className:nn.boot,children:f.jsxs("div",{className:nn.card,children:[f.jsx("div",{className:nn.wordmark,children:"HARNESS"}),c?f.jsxs("div",{className:nn.failed,children:[f.jsx("div",{className:nn.failedTitle,children:"Failed to load plugins"}),u.map(([h])=>f.jsx("div",{className:nn.failedItem,children:h},h)),s!==void 0&&f.jsx("div",{className:nn.failedItem,children:s})]}):f.jsxs(f.Fragment,{children:[f.jsx("div",{className:nn.spinner}),f.jsx("div",{className:nn.hint,children:"Loading plugins…"})]})]})})}var ln=O3();const P8=j1(ln),T8=ni({__proto__:null,default:P8},[ln]);function z3(n){var r,i,s="";if(typeof n=="string"||typeof n=="number")s+=n;else if(typeof n=="object")if(Array.isArray(n)){var u=n.length;for(r=0;rf.jsx("rect",{className:yl.cell,x:s,y:u,width:"2",height:"2",style:{animationDelay:`${(c-z0.length)*125}ms`}},`${s}-${u}`))}):f.jsx("span",{className:ye(yl.dot,i),"data-state":n,style:{width:r,height:r},"aria-hidden":"true"})}const V8=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M8.00003 0.3237C3.76075 0.3237 0.32373 3.76072 0.32373 8C0.32373 9.17603 0.589121 10.2922 1.0632 11.2901L1.35291 11.8989L2.5705 11.3205L2.28079 10.7117C1.89079 9.89074 1.67301 8.97167 1.67301 8C1.67301 4.50546 4.50549 1.67298 8.00003 1.67298C11.4946 1.67298 14.3271 4.50546 14.3271 8C14.3271 11.4945 11.4946 14.327 8.00003 14.327C7.28473 14.327 6.76077 14.277 6.29621 14.1487C5.83857 14.0224 5.40441 13.8109 4.88514 13.4488C4.12569 12.919 3.03778 12.7316 2.141 13.2978L2.12682 13.307L2.11264 13.3171L1.34886 13.854L1.79659 15.188L2.86122 14.4384C3.19068 14.2305 3.68325 14.2542 4.11326 14.5539C4.72789 14.9826 5.30042 15.2724 5.93762 15.4484C6.56803 15.6224 7.22776 15.6763 8.00003 15.6763C12.2393 15.6763 15.6763 12.2393 15.6763 8C15.6763 3.76072 12.2393 0.3237 8.00003 0.3237ZM7.32033 4.82535V7.32536H4.82538V8.67464H7.32033V11.1747H8.6696V8.67464H11.1747V7.32536H8.6696V4.82535H7.32033Z",fill:"currentColor"})}),A8=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M11.894845 6.647401C11.894845 3.725463 9.534486 1.356779 6.623219 1.35657C3.711786 1.35657 1.351635 3.725338 1.351635 6.647401C1.351843 9.569296 3.711911 11.938273 6.623219 11.938273C9.534361 11.938064 11.894637 9.569171 11.894845 6.647401ZM13.245462 6.647401C13.245254 10.317935 10.280401 13.293613 6.623219 13.293821C2.965871 13.293821 0.000204 10.31806 0 6.647401C0 2.976574 2.965746 0 6.623219 0C10.280526 0.000205 13.245462 2.9767 13.245462 6.647401Z",fill:"currentColor"}),f.jsx("path",{d:"M16.000417 15.041079L15.044449 16.000433L11.530434 12.473588L12.486298 11.514234L16.000417 15.041079Z",fill:"currentColor"})]}),D8=({size:n=14,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{fillRule:"evenodd",clipRule:"evenodd",d:"M7.00018 0.353516C10.6708 0.353535 13.6468 3.32958 13.6469 7.00018C13.6468 10.6708 10.6708 13.6468 7.00018 13.6469C3.32957 13.6468 0.353535 10.6708 0.353516 7.00018C0.353535 3.32957 3.32957 0.353531 7.00018 0.353516ZM5.44643 7.59661C5.49463 8.97506 5.70762 10.191 6.02136 11.0793C6.20141 11.5891 6.40328 11.9585 6.59898 12.1889C6.79501 12.4196 6.93213 12.454 7.00018 12.454C7.06822 12.454 7.20533 12.4197 7.40138 12.1889C7.59708 11.9585 7.79895 11.589 7.979 11.0793C8.29274 10.191 8.50574 8.97506 8.55394 7.59661H5.44643ZM1.57861 7.59661C1.80785 9.70467 3.2386 11.4509 5.1715 12.1388C5.07135 11.9317 4.97972 11.7098 4.89746 11.477C4.53084 10.4391 4.30224 9.0828 4.25357 7.59661H1.57861ZM9.74679 7.59661C9.69813 9.0828 9.46952 10.4391 9.1029 11.477C9.0206 11.7099 8.92818 11.9316 8.82797 12.1388C10.7613 11.4511 12.1925 9.70496 12.4218 7.59661H9.74679ZM5.1706 1.8616C3.23814 2.54963 1.80876 4.29604 1.5795 6.40376H4.25357C4.30224 4.91756 4.53083 3.56129 4.89746 2.5234C4.97968 2.29066 5.07051 2.0686 5.1706 1.8616ZM7.00018 1.54637C6.93213 1.54638 6.79503 1.5807 6.59898 1.81145C6.40332 2.04177 6.20139 2.41058 6.02136 2.92012C5.70754 3.80851 5.49461 5.02499 5.44643 6.40376H8.55394C8.50575 5.025 8.29282 3.80851 7.979 2.92012C7.79898 2.41059 7.59705 2.04177 7.40138 1.81145C7.20531 1.58067 7.06823 1.54637 7.00018 1.54637ZM8.82887 1.8616C8.92902 2.0687 9.02064 2.29053 9.1029 2.5234C9.46953 3.56129 9.69812 4.91756 9.74679 6.40376H12.4209C12.1916 4.29575 10.7618 2.54943 8.82887 1.8616Z",fill:"currentColor"})}),F8=({size:n=14,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsxs("g",{clipPath:"url(#clip0_2580_121189)",children:[f.jsx("path",{d:"M12.1192 4.91016C11.9392 4.52714 11.7007 4.1292 11.4483 3.78809C11.385 3.70258 11.3517 3.68409 11.2462 3.67383C10.7419 3.6248 10.2318 3.69454 9.72662 3.64551C9.29108 3.60318 8.93739 3.40341 8.67682 3.05176C8.38762 2.66127 8.19217 2.20926 7.90338 1.81934C7.83985 1.73359 7.80848 1.71542 7.70221 1.70508C7.24758 1.6609 6.7511 1.66104 6.29791 1.70508C6.19164 1.71542 6.16027 1.73359 6.09674 1.81934C5.80775 2.20954 5.61248 2.66131 5.3233 3.05176C5.06273 3.40341 4.70904 3.60318 4.2735 3.64551C3.76831 3.69454 3.25825 3.6248 2.75397 3.67383C2.6484 3.68409 2.61509 3.70258 2.55182 3.78809C2.30019 4.12814 2.06125 4.52646 1.88092 4.91016C1.83256 5.01309 1.83242 5.04912 1.88092 5.15235C2.07954 5.57482 2.37449 5.94529 2.5733 6.36817C2.76971 6.78606 2.76964 7.21293 2.5733 7.63086C2.37462 8.05374 2.07947 8.42453 1.88092 8.84668C1.83235 8.95004 1.83257 8.98695 1.88092 9.08985C2.06098 9.47285 2.2994 9.87079 2.55182 10.2119C2.61509 10.2974 2.6484 10.3159 2.75397 10.3262C3.25879 10.3753 3.76834 10.3055 4.2735 10.3545C4.70904 10.3968 5.06273 10.5966 5.3233 10.9482C5.6125 11.3387 5.80795 11.7907 6.09674 12.1807C6.16027 12.2664 6.19164 12.2846 6.29791 12.2949C6.7511 12.339 7.24758 12.3391 7.70221 12.2949C7.80848 12.2846 7.83985 12.2664 7.90338 12.1807C8.19237 11.7905 8.38764 11.3387 8.67682 10.9482C8.93739 10.5966 9.29108 10.3968 9.72662 10.3545C10.2318 10.3055 10.7419 10.3752 11.2462 10.3262C11.3517 10.3159 11.385 10.2974 11.4483 10.2119C11.7007 9.87079 11.9391 9.47285 12.1192 9.08985C12.1675 8.98695 12.1678 8.95004 12.1192 8.84668C11.9205 8.42428 11.6255 8.05377 11.4268 7.63086C11.2305 7.21293 11.2304 6.78606 11.4268 6.36817C11.6256 5.94531 11.9207 5.5746 12.1192 5.15235C12.1677 5.04912 12.1676 5.01309 12.1192 4.91016ZM13.2051 5.66309C13.0064 6.08573 12.7114 6.45579 12.5128 6.87793C12.4642 6.98123 12.4645 7.01829 12.5128 7.1211C12.7112 7.54328 13.0064 7.91405 13.2051 8.33692C13.4015 8.75487 13.4015 9.18169 13.2051 9.59961C12.9911 10.0551 12.7109 10.5221 12.4122 10.9258C12.1522 11.277 11.7974 11.4782 11.3624 11.5205C10.8573 11.5696 10.3477 11.4999 9.84283 11.5488C9.73621 11.5592 9.70429 11.5772 9.64069 11.6631C9.35229 12.0526 9.15705 12.5044 8.86823 12.8945C8.60854 13.2452 8.25275 13.447 7.81842 13.4893C7.28749 13.5409 6.71096 13.5407 6.1817 13.4893C5.74737 13.447 5.39158 13.2452 5.1319 12.8945C4.84312 12.5045 4.64808 12.0529 4.35944 11.6631C4.29583 11.5772 4.26392 11.5592 4.15729 11.5488C3.65283 11.5 3.14295 11.5696 2.63776 11.5205C2.20274 11.4782 1.84796 11.277 1.58795 10.9258C1.28834 10.5209 1.00864 10.0543 0.794982 9.59961C0.598644 9.18169 0.598598 8.75487 0.794982 8.33692C0.993688 7.91405 1.28889 7.54328 1.48737 7.1211C1.53567 7.01829 1.53593 6.98123 1.48737 6.87793C1.28887 6.45603 0.993667 6.08569 0.794982 5.66309C0.598535 5.24516 0.59869 4.81829 0.794982 4.40039C1.00898 3.94492 1.28922 3.47791 1.58795 3.07422C1.84796 2.723 2.20274 2.5218 2.63776 2.47949C3.14295 2.43038 3.65283 2.50003 4.15729 2.45117C4.26391 2.44081 4.29583 2.4228 4.35944 2.33692C4.64783 1.94742 4.84308 1.49557 5.1319 1.10547C5.39158 0.754835 5.74737 0.553005 6.1817 0.510744C6.71263 0.459147 7.28917 0.459309 7.81842 0.510744C8.25275 0.553005 8.60854 0.754835 8.86823 1.10547C9.157 1.49551 9.35204 1.94708 9.64069 2.33692C9.70429 2.4228 9.73621 2.44081 9.84283 2.45117C10.3477 2.50007 10.8573 2.43039 11.3624 2.47949C11.7974 2.5218 12.1522 2.723 12.4122 3.07422C12.7118 3.47909 12.9915 3.94567 13.2051 4.40039C13.4014 4.81829 13.4016 5.24516 13.2051 5.66309Z",fill:"currentColor"}),f.jsx("path",{d:"M7.9317 7C7.9317 6.48569 7.51438 6.06836 7.00006 6.06836C6.48575 6.06836 6.06842 6.48569 6.06842 7C6.06842 7.51432 6.48575 7.93164 7.00006 7.93164C7.51438 7.93164 7.9317 7.51432 7.9317 7ZM9.13092 7C9.13092 8.17706 8.17712 9.13086 7.00006 9.13086C5.823 9.13086 4.8692 8.17706 4.8692 7C4.8692 5.82294 5.823 4.86914 7.00006 4.86914C8.17712 4.86914 9.13092 5.82294 9.13092 7Z",fill:"currentColor"})]}),f.jsx("defs",{children:f.jsx("clipPath",{id:"clip0_2580_121189",children:f.jsx("rect",{width:14,height:14,fill:"currentColor"})})})]}),B8=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsxs("g",{clipPath:"url(#clip0_1450_63327)",children:[f.jsx("path",{d:"M14.0861 5.51366C13.8717 5.0575 13.588 4.58542 13.2889 4.18108C13.208 4.07172 13.1596 4.04373 13.0243 4.03054C12.4277 3.97255 11.8245 4.05527 11.2269 3.9972C10.7224 3.94816 10.3133 3.71661 10.0115 3.30919C9.66986 2.84777 9.43973 2.31343 9.09824 1.85234C9.01771 1.74365 8.96805 1.71589 8.83354 1.70282C8.29432 1.65044 7.70402 1.65061 7.16656 1.70282C7.03205 1.71589 6.98239 1.74365 6.90186 1.85234C6.56067 2.31303 6.33025 2.84774 5.98855 3.30919C5.68681 3.71661 5.27774 3.94816 4.77317 3.9972C4.17564 4.05527 3.57239 3.97255 2.97585 4.03054C2.84046 4.04373 2.79208 4.07172 2.71115 4.18108C2.41212 4.58542 2.12835 5.0575 1.91403 5.51366C1.85299 5.64359 1.85286 5.7018 1.91403 5.8319C2.14865 6.33077 2.49748 6.76892 2.73237 7.26854C2.9594 7.7515 2.96041 8.24717 2.73338 8.73044C2.49837 9.23061 2.14891 9.66837 1.91403 10.1681C1.85291 10.2982 1.85299 10.3564 1.91403 10.4863C2.12856 10.9429 2.41185 11.4142 2.71115 11.8189C2.79208 11.9283 2.84046 11.9563 2.97585 11.9694C3.57239 12.0274 4.17564 11.9447 4.77317 12.0028C5.27774 12.0518 5.68681 12.2834 5.98855 12.6908C6.33024 13.1522 6.56037 13.6866 6.90186 14.1476C6.98239 14.2563 7.03205 14.2841 7.16656 14.2972C7.70402 14.3494 8.29432 14.3495 8.83354 14.2972C8.96805 14.2841 9.01771 14.2563 9.09824 14.1476C9.43944 13.687 9.66985 13.1522 10.0115 12.6908C10.3133 12.2834 10.7224 12.0518 11.2269 12.0028C11.8244 11.9447 12.4271 12.0275 13.0243 11.9694C13.1596 11.9563 13.208 11.9283 13.2889 11.8189C13.5891 11.4131 13.872 10.942 14.0861 10.4863C14.1471 10.3564 14.1472 10.2982 14.0861 10.1681C13.8513 9.66861 13.5017 9.23061 13.2667 8.73044C13.0397 8.24717 13.0407 7.7515 13.2677 7.26854C13.5026 6.7689 13.8513 6.33106 14.0861 5.8319C14.1472 5.7018 14.1471 5.64359 14.0861 5.51366ZM15.3035 6.40373C15.0685 6.90359 14.7188 7.34119 14.4841 7.84037C14.4231 7.97025 14.423 8.02855 14.4841 8.15861C14.7189 8.65833 15.0685 9.09611 15.3035 9.59626C15.5308 10.0801 15.5308 10.5744 15.3035 11.0582C15.052 11.5933 14.7225 12.1426 14.37 12.6191C14.0685 13.0265 13.6581 13.259 13.1536 13.3081C12.5566 13.366 11.9541 13.2835 11.3573 13.3414C11.2228 13.3545 11.1731 13.3823 11.0926 13.491C10.7511 13.9521 10.521 14.4864 10.1793 14.9478C9.87828 15.3542 9.46719 15.5869 8.96387 15.6358C8.34008 15.6964 7.66194 15.6966 7.03623 15.6358C6.53291 15.5869 6.12182 15.3542 5.82084 14.9478C5.47911 14.4863 5.24878 13.9517 4.90753 13.491C4.82701 13.3823 4.77734 13.3545 4.64284 13.3414C4.04647 13.2835 3.44373 13.366 2.84653 13.3081C2.34201 13.259 1.93164 13.0265 1.63013 12.6191C1.27867 12.144 0.948453 11.5941 0.696621 11.0582C0.469315 10.5744 0.469279 10.0801 0.696621 9.59626C0.931628 9.09613 1.2813 8.65807 1.51597 8.15861C1.57708 8.02855 1.57702 7.97025 1.51597 7.84037C1.28117 7.34095 0.931635 6.9036 0.696621 6.40373C0.469213 5.91992 0.469367 5.42562 0.696621 4.94183C0.948441 4.40587 1.27868 3.85598 1.63013 3.38092C1.93164 2.97349 2.34201 2.74095 2.84653 2.6919C3.44353 2.63397 4.04599 2.71649 4.64284 2.65856C4.77734 2.64549 4.82701 2.61774 4.90753 2.50904C5.24905 2.04792 5.47913 1.51362 5.82084 1.05219C6.12182 0.645806 6.53291 0.413119 7.03623 0.364178C7.66002 0.303556 8.33816 0.303369 8.96387 0.364178C9.46719 0.413119 9.87828 0.645806 10.1793 1.05219C10.521 1.51365 10.7513 2.04828 11.0926 2.50904C11.1731 2.61774 11.2228 2.64549 11.3573 2.65856C11.9541 2.71649 12.5566 2.63397 13.1536 2.6919C13.6581 2.74095 14.0685 2.97349 14.37 3.38092C14.7214 3.85598 15.0517 4.40587 15.3035 4.94183C15.5307 5.42562 15.5309 5.91992 15.3035 6.40373Z",fill:"currentColor"}),f.jsx("path",{d:"M9.13764 7.99999C9.13764 7.3715 8.62855 6.8624 8.00005 6.8624C7.37155 6.8624 6.86246 7.3715 6.86246 7.99999C6.86246 8.62849 7.37155 9.13759 8.00005 9.13759C8.62855 9.13759 9.13764 8.62849 9.13764 7.99999ZM10.4834 7.99999C10.4834 9.37126 9.37132 10.4833 8.00005 10.4833C6.62878 10.4833 5.51674 9.37126 5.51674 7.99999C5.51674 6.62873 6.62878 5.51669 8.00005 5.51669C9.37132 5.51669 10.4834 6.62873 10.4834 7.99999Z",fill:"currentColor"})]}),f.jsx("defs",{children:f.jsx("clipPath",{id:"clip0_1450_63327",children:f.jsx("rect",{width:16,height:16,fill:"currentColor"})})})]}),z8=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{fillRule:"evenodd",clipRule:"evenodd",d:"M9.67272 0.522841C10.8339 0.522841 11.76 0.522714 12.4963 0.602493C13.2453 0.683657 13.8789 0.854248 14.4264 1.25197C14.7504 1.48739 15.0355 1.77247 15.2709 2.0965C15.6686 2.64394 15.8392 3.27758 15.9204 4.02655C16.0002 4.7629 16 5.68895 16 6.85014V9.14986C16 10.3111 16.0002 11.2371 15.9204 11.9735C15.8392 12.7224 15.6686 13.3561 15.2709 13.9035C15.0355 14.2275 14.7504 14.5126 14.4264 14.748C13.8789 15.1458 13.2453 15.3163 12.4963 15.3975C11.76 15.4773 10.8339 15.4772 9.67272 15.4772H6.3273C5.16611 15.4772 4.24006 15.4773 3.50371 15.3975C2.75474 15.3163 2.1211 15.1458 1.57366 14.748C1.24963 14.5126 0.964549 14.2275 0.729131 13.9035C0.331407 13.3561 0.160817 12.7224 0.0796529 11.9735C-0.000126137 11.2371 1.25338e-09 10.3111 1.25338e-09 9.14986V6.85014C1.25329e-09 5.68895 -0.000126137 4.7629 0.0796529 4.02655C0.160817 3.27758 0.331407 2.64394 0.729131 2.0965C0.964549 1.77247 1.24963 1.48739 1.57366 1.25197C2.1211 0.854248 2.75474 0.683657 3.50371 0.602493C4.24006 0.522714 5.16611 0.522841 6.3273 0.522841H9.67272ZM5.54303 1.88715V14.1118C5.78636 14.1128 6.04709 14.1169 6.3273 14.1169H9.67272C10.8639 14.1169 11.7032 14.1164 12.3493 14.0465C12.9824 13.9779 13.3497 13.8494 13.6268 13.6482C13.8354 13.4966 14.0195 13.3125 14.1711 13.1039C14.3723 12.8268 14.5007 12.4595 14.5693 11.8264C14.6393 11.1803 14.6398 10.341 14.6398 9.14986V6.85014C14.6398 5.65896 14.6393 4.81967 14.5693 4.1736C14.5007 3.54048 14.3723 3.17318 14.1711 2.89609C14.0195 2.68747 13.8354 2.50337 13.6268 2.35179C13.3497 2.1506 12.9824 2.02212 12.3493 1.95353C11.7032 1.88358 10.8639 1.88307 9.67272 1.88307H6.3273C6.04709 1.88307 5.78636 1.8862 5.54303 1.88715ZM4.1828 1.91166C3.99125 1.9216 3.8148 1.93577 3.65076 1.95353C3.01764 2.02212 2.65034 2.1506 2.37325 2.35179C2.16463 2.50337 1.98052 2.68747 1.82895 2.89609C1.62776 3.17318 1.49928 3.54048 1.43069 4.1736C1.36074 4.81967 1.36023 5.65896 1.36023 6.85014V9.14986C1.36023 10.341 1.36074 11.1803 1.43069 11.8264C1.49928 12.4595 1.62776 12.8268 1.82895 13.1039C1.98052 13.3125 2.16463 13.4966 2.37325 13.6482C2.65034 13.8494 3.01764 13.9779 3.65076 14.0465C3.81478 14.0642 3.99127 14.0774 4.1828 14.0873V1.91166Z",fill:"currentColor"})}),Z8=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M4.55146 8.00001C4.55146 8.63513 4.03659 9.15001 3.40146 9.15001C2.76634 9.15001 2.25146 8.63513 2.25146 8.00001C2.25146 7.36488 2.76634 6.85001 3.40146 6.85001C4.03659 6.85001 4.55146 7.36488 4.55146 8.00001Z",fill:"currentColor"}),f.jsx("path",{d:"M9.1476 8.00001C9.1476 8.63513 8.63273 9.15001 7.9976 9.15001C7.36248 9.15001 6.8476 8.63513 6.8476 8.00001C6.8476 7.36488 7.36248 6.85001 7.9976 6.85001C8.63273 6.85001 9.1476 7.36488 9.1476 8.00001Z",fill:"currentColor"}),f.jsx("path",{d:"M13.7486 8.00001C13.7486 8.63513 13.2338 9.15001 12.5986 9.15001C11.9635 9.15001 11.4486 8.63513 11.4486 8.00001C11.4486 7.36488 11.9635 6.85001 12.5986 6.85001C13.2338 6.85001 13.7486 7.36488 13.7486 8.00001Z",fill:"currentColor"})]}),U8=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M8.64453 1.5V7.34961H14.5V8.65039H8.64453V14.5H7.34473V8.65039H1.5V7.34961H7.34473V1.5H8.64453Z",fill:"currentColor"})}),cu=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M15.0498 3.92579L8.49512 12.3818C8.25774 12.6881 8.04517 12.9645 7.84668 13.1689C7.63957 13.3823 7.38732 13.5841 7.04492 13.6719C6.86373 13.7183 6.6757 13.7346 6.48926 13.7197C6.13666 13.6915 5.8528 13.5355 5.6123 13.3604C5.38201 13.1926 5.12573 12.9567 4.83984 12.6953L1.03125 9.21289L1.96875 8.1875L5.77734 11.6699C6.08684 11.9529 6.27773 12.1249 6.43066 12.2363C6.50183 12.2882 6.54699 12.3135 6.57324 12.3252C6.58525 12.3305 6.59269 12.3322 6.5957 12.333C6.59802 12.3336 6.59961 12.334 6.59961 12.334C6.63317 12.3367 6.66758 12.3335 6.7002 12.3252C6.7002 12.3252 6.70211 12.3251 6.7041 12.3242C6.70698 12.3229 6.71348 12.319 6.72461 12.3115C6.74849 12.2956 6.78843 12.2642 6.84961 12.2012C6.98138 12.0654 7.13957 11.8628 7.39648 11.5313L13.9502 3.07422L15.0498 3.92579Z",fill:"currentColor"})}),W8=({size:n=14,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M11.5635 4.58984L7.61426 9.07715C7.35154 9.37561 7.11346 9.64812 6.89453 9.84668C6.66593 10.054 6.38519 10.2506 6.01465 10.3164C5.82079 10.3508 5.62207 10.3529 5.42773 10.3213C5.0561 10.2609 4.77266 10.0674 4.54102 9.86328C4.31926 9.66791 4.07752 9.39911 3.81055 9.10449L2.44531 7.59863L3.55664 6.59082L4.92188 8.09766C5.21256 8.41844 5.38878 8.61191 5.53223 8.73828C5.61022 8.80699 5.65253 8.83192 5.66895 8.83984C5.69648 8.84429 5.72449 8.84467 5.75195 8.83984C5.72657 8.84451 5.75564 8.85422 5.88672 8.73535C6.02833 8.60692 6.20225 8.41088 6.48828 8.08594L10.4385 3.59961L11.5635 4.58984Z",fill:"currentColor"})}),q8=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{fillRule:"evenodd",clipRule:"evenodd",d:"M13.0762 1.37207C14.0846 1.37228 14.9021 2.19077 14.9023 3.19922C14.9022 4.20772 14.0847 5.02518 13.0762 5.02539C12.2967 5.02539 11.6325 4.53691 11.3701 3.84961H4.35547C4.79397 4.26458 5.15861 4.7644 5.41699 5.33496L7.10645 9.06738C7.88526 10.7875 9.55104 11.9228 11.4189 12.0371C11.7085 11.4109 12.3411 10.9756 13.0762 10.9756C14.0843 10.9759 14.9023 11.7936 14.9023 12.8018C14.9023 13.81 14.0843 14.6277 13.0762 14.6279C12.2534 14.6279 11.5574 14.0832 11.3291 13.335C8.9868 13.1879 6.89981 11.7612 5.92285 9.60352L4.23242 5.87109C3.67503 4.64033 2.44878 3.84961 1.09766 3.84961V2.54883C1.10665 2.54883 1.11601 2.54975 1.125 2.5498L11.3701 2.54883C11.6326 1.86151 12.2969 1.37207 13.0762 1.37207ZM13.0762 12.2764C12.7858 12.2764 12.5508 12.5114 12.5508 12.8018C12.5508 13.0921 12.7858 13.3281 13.0762 13.3281C13.3664 13.3279 13.6025 13.092 13.6025 12.8018C13.6025 12.5115 13.3664 12.2766 13.0762 12.2764ZM13.0762 2.67285C12.7855 2.67285 12.55 2.90861 12.5498 3.19922C12.5499 3.48987 12.7855 3.72559 13.0762 3.72559C13.3667 3.72538 13.6024 3.48975 13.6025 3.19922C13.6023 2.90874 13.3666 2.67306 13.0762 2.67285Z",fill:"currentColor"})}),Bl=({size:n=14,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M11.8486 5.5L11.4238 5.92383L8.69727 8.65137C8.44157 8.90706 8.21562 9.13382 8.01172 9.29785C7.79912 9.46883 7.55595 9.61756 7.25 9.66602C7.08435 9.69222 6.91565 9.69222 6.75 9.66602C6.44405 9.61756 6.20088 9.46883 5.98828 9.29785C5.78438 9.13382 5.55843 8.90706 5.30273 8.65137L2.57617 5.92383L2.15137 5.5L3 4.65137L3.42383 5.07617L6.15137 7.80273C6.42595 8.07732 6.59876 8.24849 6.74023 8.3623C6.87291 8.46904 6.92272 8.47813 6.9375 8.48047C6.97895 8.48703 7.02105 8.48703 7.0625 8.48047C7.07728 8.47813 7.12709 8.46904 7.25977 8.3623C7.40124 8.24849 7.57405 8.07732 7.84863 7.80273L10.5762 5.07617L11 4.65137L11.8486 5.5Z",fill:"currentColor"})}),U3=({size:n=14,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M8.5 2.15137L8.07617 2.57617L5.34863 5.30273C5.09294 5.55843 4.86618 5.78438 4.70215 5.98828C4.53117 6.20088 4.38244 6.44405 4.33398 6.75C4.30778 6.91565 4.30778 7.08435 4.33398 7.25C4.38244 7.55595 4.53117 7.79912 4.70215 8.01172C4.86618 8.21561 5.09294 8.44157 5.34863 8.69727L8.07617 11.4238L8.5 11.8486L9.34863 11L8.92383 10.5762L6.19727 7.84863C5.92268 7.57405 5.75151 7.40124 5.6377 7.25977C5.53096 7.12709 5.52187 7.07728 5.51953 7.0625C5.51297 7.02105 5.51297 6.97895 5.51953 6.9375C5.52187 6.92272 5.53096 6.87291 5.6377 6.74023C5.75152 6.59876 5.92268 6.42595 6.19727 6.15137L8.92383 3.42383L9.34863 3L8.5 2.15137Z",fill:"currentColor"})}),W3=({size:n=14,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M5.5 2.15137L5.92383 2.57617L8.65137 5.30273C8.90706 5.55843 9.13382 5.78438 9.29785 5.98828C9.46883 6.20088 9.61756 6.44405 9.66602 6.75C9.69222 6.91565 9.69222 7.08435 9.66602 7.25C9.61756 7.55595 9.46883 7.79912 9.29785 8.01172C9.13382 8.21561 8.90706 8.44157 8.65137 8.69727L5.92383 11.4238L5.5 11.8486L4.65137 11L5.07617 10.5762L7.80273 7.84863C8.07732 7.57405 8.24849 7.40124 8.3623 7.25977C8.46904 7.12709 8.47813 7.07728 8.48047 7.0625C8.48703 7.02105 8.48703 6.97895 8.48047 6.9375C8.47813 6.92272 8.46904 6.87291 8.3623 6.74023C8.24848 6.59876 8.07732 6.42595 7.80273 6.15137L5.07617 3.42383L4.65137 3L5.5 2.15137Z",fill:"currentColor"})}),Q8=({size:n=14,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M4.25 2.82782L4.25 11.1722C4.25 11.6622 4.84243 11.9076 5.18891 11.5611L9.36109 7.38891C9.57588 7.17412 9.57588 6.82588 9.36109 6.61109L5.18891 2.43891C4.84243 2.09243 4.25 2.33782 4.25 2.82782Z",fill:"currentColor"})}),K8=({size:n=14,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M2.15137 8.5L2.57617 8.07617L5.30273 5.34863C5.55843 5.09294 5.78438 4.86618 5.98828 4.70215C6.20088 4.53117 6.44405 4.38244 6.75 4.33398C6.91565 4.30778 7.08435 4.30778 7.25 4.33398C7.55595 4.38244 7.79912 4.53117 8.01172 4.70215C8.21561 4.86618 8.44157 5.09294 8.69727 5.34863L11.4238 8.07617L11.8486 8.5L11 9.34863L10.5762 8.92383L7.84863 6.19727C7.57405 5.92269 7.40124 5.75152 7.25977 5.6377C7.12709 5.53096 7.07728 5.52187 7.0625 5.51953C7.02105 5.51297 6.97895 5.51297 6.9375 5.51953C6.92272 5.52187 6.87291 5.53096 6.74023 5.6377C6.59876 5.75152 6.42595 5.92268 6.15137 6.19727L3.42383 8.92383L3 9.34863L2.15137 8.5Z",fill:"currentColor"})}),fu=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M14.1168 13.197L13.197 14.1167L1.8833 2.80303L2.80309 1.88324L14.1168 13.197Z",fill:"currentColor"}),f.jsx("path",{d:"M13.197 1.88326L14.1168 2.80305L2.80309 14.1168L1.8833 13.197L13.197 1.88326Z",fill:"currentColor"})]}),q3=({size:n=14,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M10.6074 4.40278L8.00975 6.99973L10.6074 9.59739L9.59736 10.6074L6.9997 8.00978L4.40274 10.6074L3.3927 9.59739L5.98966 6.99973L3.3927 4.40278L4.40274 3.39273L6.9997 5.98969L9.59736 3.39273L10.6074 4.40278Z",fill:"currentColor"})}),Q3=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M6.14929 4.02032C7.11197 4.02032 7.87983 4.02016 8.49597 4.07598C9.12128 4.13269 9.65792 4.25188 10.1415 4.53106C10.7202 4.8653 11.2008 5.3459 11.535 5.92462C11.8142 6.40818 11.9334 6.94481 11.9901 7.57012C12.0459 8.18625 12.0458 8.95419 12.0458 9.9168C12.0458 10.8795 12.0459 11.6473 11.9901 12.2635C11.9334 12.8888 11.8142 13.4254 11.535 13.909C11.2008 14.4877 10.7202 14.9683 10.1415 15.3025C9.65792 15.5817 9.12128 15.7009 8.49597 15.7576C7.87984 15.8134 7.11196 15.8133 6.14929 15.8133C5.18667 15.8133 4.41874 15.8134 3.80261 15.7576C3.1773 15.7009 2.64067 15.5817 2.1571 15.3025C1.5784 14.9683 1.09778 14.4877 0.76355 13.909C0.484366 13.4254 0.365184 12.8888 0.308472 12.2635C0.252649 11.6473 0.252808 10.8795 0.252808 9.9168C0.252808 8.95418 0.252664 8.18625 0.308472 7.57012C0.365184 6.94481 0.484366 6.40818 0.76355 5.92462C1.09777 5.34589 1.57839 4.86529 2.1571 4.53106C2.64067 4.25188 3.1773 4.13269 3.80261 4.07598C4.41874 4.02017 5.18666 4.02032 6.14929 4.02032ZM6.14929 5.37774C5.16181 5.37774 4.46634 5.37761 3.92566 5.42657C3.39434 5.47472 3.07859 5.56574 2.83582 5.70587C2.4632 5.92106 2.15354 6.2307 1.93835 6.60333C1.79823 6.8461 1.70721 7.16185 1.65906 7.69317C1.6101 8.23385 1.61023 8.92933 1.61023 9.9168C1.61023 10.9043 1.61009 11.5998 1.65906 12.1404C1.70721 12.6717 1.79823 12.9875 1.93835 13.2303C2.15356 13.6029 2.46321 13.9126 2.83582 14.1277C3.07859 14.2679 3.39434 14.3589 3.92566 14.407C4.46634 14.456 5.16182 14.4559 6.14929 14.4559C7.13682 14.4559 7.83224 14.456 8.37292 14.407C8.90425 14.3589 9.21999 14.2679 9.46277 14.1277C9.83535 13.9126 10.145 13.6029 10.3602 13.2303C10.5004 12.9875 10.5914 12.6717 10.6395 12.1404C10.6885 11.5998 10.6884 10.9043 10.6884 9.9168C10.6884 8.92934 10.6885 8.23384 10.6395 7.69317C10.5914 7.16185 10.5004 6.8461 10.3602 6.60333C10.1451 6.23071 9.83536 5.92107 9.46277 5.70587C9.21999 5.56574 8.90424 5.47472 8.37292 5.42657C7.83224 5.3776 7.13682 5.37774 6.14929 5.37774ZM9.80164 0.367975C10.7638 0.367975 11.5314 0.36788 12.1473 0.423639C12.7726 0.480307 13.3093 0.598759 13.7928 0.877741C14.3717 1.21192 14.8521 1.69355 15.1864 2.27227C15.4655 2.75574 15.5857 3.29164 15.6425 3.9168C15.6983 4.53301 15.6971 5.3016 15.6971 6.26446V7.82989C15.6971 8.29264 15.6989 8.58993 15.6649 8.84844C15.4668 10.3525 14.401 11.5738 12.9833 11.9988V10.5467C13.6973 10.1903 14.2105 9.49662 14.3192 8.67169C14.3387 8.52347 14.3407 8.3358 14.3407 7.82989V6.26446C14.3407 5.27706 14.3398 4.58149 14.2909 4.04083C14.2428 3.50968 14.1526 3.19372 14.0126 2.95098C13.7974 2.57849 13.4876 2.26869 13.1151 2.05352C12.8724 1.91347 12.5564 1.82237 12.0253 1.77423C11.4847 1.72528 10.7888 1.7254 9.80164 1.7254H7.71472C6.7562 1.72558 5.92665 2.27697 5.52332 3.07891H4.07019C4.54221 1.51132 5.9932 0.368186 7.71472 0.367975H9.80164Z",fill:"currentColor"})}),J8=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M7.92136 0.349152C10.3744 0.349234 12.5564 1.5052 13.9557 3.29894L15.1281 2.12759C15.3303 1.92546 15.6767 2.06943 15.6767 2.35538V5.53923C15.6766 5.71626 15.5329 5.85976 15.3559 5.86002H12.171C11.8854 5.8597 11.7426 5.51465 11.9443 5.31249L12.9641 4.29056C11.8237 2.74305 9.98908 1.74106 7.92136 1.74097C4.46436 1.74097 1.66233 4.543 1.66233 8C1.66233 11.457 4.46436 14.259 7.92136 14.259C11.3782 14.2589 14.1804 11.4569 14.1804 8H15.5722C15.5722 12.2251 12.1465 15.6507 7.92136 15.6508C3.69614 15.6508 0.270508 12.2252 0.270508 8C0.270508 3.77478 3.69614 0.349152 7.92136 0.349152Z",fill:"currentColor"})}),G8=({size:n=14,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M1.272 6.21348C1.70645 3.08888 4.59169 0.908064 7.71634 1.34239C8.95495 1.51469 10.0438 2.07331 10.8814 2.87755L11.9458 1.81407C12.1347 1.6255 12.4572 1.75911 12.4575 2.02598V5.08751C12.4574 5.25303 12.3233 5.38731 12.1577 5.38731H9.0972C8.82993 5.38731 8.69629 5.06361 8.88528 4.87462L10.0327 3.72618C9.3732 3.09994 8.52006 2.66569 7.5513 2.53087C5.08313 2.18779 2.80376 3.91044 2.46048 6.37852C2.11747 8.84665 3.84009 11.1261 6.30814 11.4693C8.77612 11.8121 11.0557 10.0896 11.399 7.62169L11.9937 7.70372L12.5874 7.78673C12.153 10.9112 9.26756 13.0919 6.1431 12.6578C3.01854 12.2234 0.837738 9.33809 1.272 6.21348Z",fill:"currentColor"})}),Y8=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M8.27868 0.811572C8.81991 0.142194 9.79022 0.0421835 10.4538 0.557601L10.5823 0.669306L10.6066 0.693544L10.6097 0.695652L10.6392 0.725159C11.355 1.44679 11.6337 2.49468 11.3716 3.47669L11.3706 3.48091L11.3611 3.51674L11.3601 3.51885L10.889 5.22604C10.8796 5.25997 10.8707 5.29157 10.8627 5.32088C10.8934 5.32095 10.927 5.32194 10.9628 5.32194H11.9007C12.4264 5.32194 12.7831 5.319 13.0651 5.36725C14.8182 5.66719 15.9851 7.34568 15.6565 9.09357C15.6036 9.37487 15.477 9.7092 15.294 10.2022L14.3371 12.7798C14.1402 13.3104 13.9774 13.7518 13.8102 14.1024C13.6376 14.4645 13.4386 14.7793 13.1442 15.0424C12.9712 15.197 12.7802 15.3303 12.5751 15.4386C12.226 15.6231 11.8608 15.7 11.4612 15.7358C11.0743 15.7705 10.6035 15.7695 10.0375 15.7695H4.87377C4.08053 15.7695 3.42928 15.7702 2.90734 15.7137C2.37212 15.6557 1.88991 15.5311 1.46676 15.2237C1.22415 15.0474 1.01078 14.8339 0.834466 14.5914C0.527021 14.1682 0.401373 13.686 0.343384 13.1508C0.286822 12.6287 0.287531 11.9769 0.287531 11.1833V9.51405C0.287531 8.84778 0.281347 8.36714 0.399237 7.9565C0.671152 7.00935 1.41115 6.26832 2.35829 5.99638C2.76894 5.87849 3.24958 5.88573 3.91585 5.88573C4.11983 5.88573 4.14548 5.88319 4.16244 5.88046C4.23532 5.86863 4.30409 5.83663 4.35845 5.78667C4.3711 5.77504 4.38761 5.75604 4.51442 5.59488L8.25655 0.838972L8.2576 0.837918L8.27868 0.811572ZM1.69122 11.1833C1.69122 12.0082 1.69217 12.5711 1.73865 13.0001C1.78371 13.4157 1.86473 13.6221 1.96943 13.7662C2.0592 13.8898 2.16733 13.9989 2.29085 14.0887C2.43501 14.1934 2.64216 14.2744 3.05803 14.3195C3.45897 14.3629 3.97637 14.3656 4.7157 14.3659C4.30801 13.8053 4.06453 13.1171 4.06444 12.371V8.59406H5.46813V12.371C5.46838 13.4733 6.36166 14.3669 7.46407 14.3669H10.0375C10.6286 14.3669 11.0269 14.3663 11.3369 14.3385C11.6339 14.3118 11.7956 14.2638 11.9196 14.1983C12.0241 14.1431 12.1213 14.0747 12.2094 13.996C12.314 13.9025 12.4151 13.7678 12.5435 13.4986C12.6774 13.2176 12.8162 12.845 13.0219 12.2909L13.9788 9.71322C14.1848 9.15816 14.2531 8.96731 14.2781 8.83433C14.4618 7.85692 13.8093 6.91895 12.8291 6.75092C12.6957 6.7281 12.4928 6.72458 11.9007 6.72458H10.9628C10.7737 6.72458 10.5693 6.72657 10.4 6.70666C10.2211 6.68562 9.96702 6.63024 9.74771 6.43161C9.64454 6.33811 9.55957 6.2261 9.4969 6.10177C9.3639 5.83784 9.37799 5.57899 9.40521 5.40097C9.431 5.23261 9.48672 5.03616 9.53694 4.85404L10.008 3.14579L10.0175 3.11102C10.1488 2.61338 10.0078 2.08338 9.64654 1.71681L9.6086 1.67887L9.55064 1.64304C9.48795 1.62043 9.41425 1.63814 9.36938 1.69362L9.35779 1.70627L9.35884 1.70732L5.61672 6.46217C5.51822 6.58735 5.42237 6.7133 5.30689 6.81942C5.05075 7.05471 4.73126 7.20939 4.38796 7.26519C4.23315 7.29032 4.07513 7.28837 3.91585 7.28837C3.15356 7.28837 2.91916 7.2957 2.7461 7.34528C2.26364 7.48379 1.88564 7.86081 1.74708 8.34325C1.69738 8.51636 1.69122 8.7511 1.69122 9.51405V11.1833Z",fill:"currentColor"})}),X8=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M14.0593 12.922L15.0976 10.1247C15.3087 9.5559 15.4143 9.27138 15.4566 9.04658C15.7349 7.56751 14.7472 6.14737 13.2637 5.89357C13.0382 5.85499 12.7348 5.85499 12.1281 5.85499H11.1099C10.6615 5.85499 10.4372 5.85499 10.3034 5.73376C10.2607 5.69508 10.2255 5.64885 10.1995 5.5974C10.1182 5.43613 10.1778 5.21997 10.297 4.78765L10.8081 2.93419L10.819 2.89456C11.0336 2.09024 10.8051 1.23244 10.2189 0.64139L10.1898 0.612405L10.1692 0.592068C9.77357 0.210076 9.13559 0.249344 8.78983 0.676966L8.77186 0.699678L4.71076 5.86083C4.52965 6.09101 4.38573 6.35138 4.38573 6.64427V12.7431C4.38573 14.3601 5.69654 15.6709 7.31351 15.6709L10.1068 15.6709C11.3628 15.6709 11.9908 15.6709 12.5043 15.3995C12.6723 15.3107 12.8289 15.2018 12.9706 15.0752C13.4037 14.6882 13.6222 14.0995 14.0593 12.922Z",fill:"currentColor"}),f.jsx("path",{d:"M2.91388 13.2113C2.91388 14.6907 4.08499 15.5536 4.08499 15.5536H2.65606C1.46328 15.5536 0.496338 14.5866 0.496338 13.3938V8.34439C0.496338 7.15161 1.46328 6.18467 2.65606 6.18467H2.91388V13.2113Z",fill:"currentColor"})]}),e9=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M7.72451 15.1086C7.18929 15.7705 6.22975 15.8694 5.57357 15.3597L5.44643 15.2492L5.42247 15.2253L5.41934 15.2232L5.39016 15.194C4.68239 14.4804 4.40679 13.4441 4.66589 12.473L4.66693 12.4689L4.67631 12.4334L4.67735 12.4314L5.14318 10.7431C5.15243 10.7096 5.1613 10.6783 5.16923 10.6493C5.13878 10.6493 5.10558 10.6483 5.07023 10.6483H4.14274C3.62288 10.6483 3.27015 10.6512 2.9912 10.6035C1.25757 10.3069 0.103662 8.64702 0.42863 6.91854C0.480965 6.64037 0.606164 6.30975 0.787119 5.82223L1.73336 3.27321C1.92812 2.74852 2.08912 2.31209 2.25442 1.96535C2.42515 1.60724 2.62191 1.29594 2.91304 1.03578C3.08408 0.882951 3.273 0.751121 3.47579 0.643944C3.82102 0.461504 4.18214 0.38551 4.57731 0.350066C4.95993 0.315784 5.42553 0.316718 5.98521 0.316718H11.0916C11.876 0.316718 12.52 0.31607 13.0362 0.37195C13.5655 0.429293 14.0423 0.552534 14.4608 0.856536C14.7007 1.03085 14.9117 1.24193 15.086 1.48181C15.3901 1.90027 15.5143 2.37709 15.5717 2.90638C15.6276 3.42269 15.6269 4.06721 15.6269 4.85202V6.50274C15.6269 7.1616 15.633 7.6369 15.5164 8.04299C15.2475 8.97962 14.5158 9.71242 13.5791 9.98133C13.173 10.0979 12.6977 10.0908 12.0389 10.0908C11.8372 10.0908 11.8118 10.0933 11.795 10.096C11.723 10.1077 11.6549 10.1393 11.6012 10.1887C11.5887 10.2002 11.5724 10.219 11.447 10.3784L7.74639 15.0815L7.74535 15.0825L7.72451 15.1086ZM14.2388 4.85202C14.2388 4.03628 14.2379 3.47965 14.1919 3.05541C14.1473 2.64443 14.0672 2.4403 13.9637 2.29779C13.8749 2.17562 13.768 2.06769 13.6458 1.9789C13.5033 1.87532 13.2984 1.79523 12.8872 1.75067C12.4907 1.70773 11.979 1.70511 11.2479 1.70482C11.6511 2.25917 11.8918 2.93968 11.8919 3.67755V7.41251H10.5038V3.67755C10.5036 2.58745 9.62023 1.70378 8.53007 1.70378H5.98521C5.40065 1.70378 5.00679 1.70442 4.70028 1.73192C4.40651 1.7583 4.24662 1.80571 4.12399 1.87052C4.02069 1.92511 3.92452 1.99276 3.8374 2.07061C3.73401 2.16306 3.634 2.2962 3.50705 2.56249C3.37462 2.84027 3.23734 3.20873 3.03393 3.75675L2.08768 6.30578C1.88395 6.85467 1.81646 7.0434 1.79172 7.1749C1.61005 8.14146 2.25533 9.06902 3.22464 9.23517C3.35654 9.25774 3.55717 9.26123 4.14274 9.26123H5.07023C5.25717 9.26123 5.4593 9.25926 5.62672 9.27894C5.80364 9.29975 6.05492 9.35452 6.27179 9.55094C6.37381 9.6434 6.45784 9.75417 6.51982 9.87712C6.65133 10.1381 6.6374 10.3941 6.61048 10.5701C6.58498 10.7366 6.52988 10.9309 6.48022 11.111L6.01439 12.8003L6.00501 12.8347C5.87513 13.3268 6.01464 13.8509 6.37184 14.2134L6.40935 14.2509L6.46667 14.2863C6.52866 14.3087 6.60155 14.2912 6.64591 14.2363L6.65738 14.2238L6.65633 14.2228L10.3569 9.52072C10.4543 9.39693 10.5491 9.27238 10.6633 9.16744C10.9166 8.93476 11.2325 8.7818 11.572 8.72662C11.7251 8.70177 11.8814 8.70369 12.0389 8.70369C12.7927 8.70369 13.0245 8.69645 13.1956 8.64742C13.6727 8.51045 14.0465 8.13761 14.1836 7.66053C14.2327 7.48935 14.2388 7.25721 14.2388 6.50274V4.85202Z",fill:"currentColor"})}),t9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M1.92838 3.06811L0.88799 5.87104C0.676449 6.44097 0.570628 6.72606 0.52825 6.95131C0.249414 8.43336 1.2391 9.85637 2.72555 10.1107C2.95149 10.1493 3.25549 10.1493 3.86348 10.1493H4.88371C5.33306 10.1493 5.55774 10.1493 5.69187 10.2708C5.73467 10.3096 5.76994 10.3559 5.79593 10.4074C5.87738 10.569 5.81766 10.7856 5.69821 11.2188L5.18609 13.076L5.17522 13.1157C4.9602 13.9217 5.1891 14.7812 5.7765 15.3735L5.80568 15.4025L5.82635 15.4229C6.22273 15.8056 6.862 15.7663 7.20846 15.3378L7.22647 15.315L11.2958 10.1435C11.4772 9.91284 11.6214 9.65195 11.6214 9.35847V3.24734C11.6214 1.62711 10.308 0.313655 8.68776 0.313655L5.88886 0.313654C4.63032 0.313654 4.00105 0.313654 3.48649 0.585577C3.31815 0.674536 3.16127 0.783647 3.01929 0.910507C2.58531 1.29828 2.36633 1.88824 1.92838 3.06811Z",fill:"currentColor"}),f.jsx("path",{d:"M13.0963 2.77815C13.0963 1.29585 11.9228 0.431205 11.9228 0.431205H13.3546C14.5498 0.431205 15.5187 1.4001 15.5187 2.59529V7.65491C15.5187 8.8501 14.5498 9.81899 13.3546 9.81899H13.0963V2.77815Z",fill:"currentColor"})]}),n9=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M7.95889 1.52285C7.95888 0.826234 8.76055 0.467983 9.27669 0.875208L9.37524 0.967191L15.1317 7.18358C15.5582 7.64419 15.5582 8.35614 15.1317 8.81676L9.37524 15.0331C8.87034 15.578 7.95888 15.2205 7.95889 14.4775V10.8207C7.10614 10.8432 6.31361 10.9316 5.45468 11.2515C4.39484 11.6463 3.18248 12.413 1.64676 13.9425C1.4533 14.135 1.18329 14.1696 0.969086 14.0908C0.74748 14.0091 0.547307 13.7879 0.54859 13.4844L0.55516 13.1315C0.618924 11.3494 1.11153 9.29838 2.27656 7.63787C3.45289 5.96147 5.29554 4.71635 7.95889 4.54797V1.52285ZM9.20911 5.13366C9.20899 5.50567 8.9031 5.77687 8.56523 5.77755C5.99383 5.78282 4.33736 6.8762 3.29964 8.35496C2.54519 9.43014 2.10739 10.7283 1.9152 11.9939C3.04749 11.0323 4.0569 10.4385 5.01917 10.0801C6.29638 9.60449 7.4406 9.56343 8.56429 9.56295C8.9178 9.5628 9.20894 9.84909 9.20911 10.2068L9.20817 13.3737L14.1837 8.00017L9.20817 2.62571L9.20911 5.13366Z",fill:"currentColor"})}),r9=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M9.94076 1.34942C10.7047 0.90231 11.6503 0.902415 12.4143 1.34942C12.7061 1.52015 12.9688 1.79118 13.3104 2.13284C13.6521 2.47448 13.9231 2.73721 14.0939 3.02894C14.5408 3.79294 14.5409 4.73856 14.0939 5.50251C13.9231 5.79415 13.652 6.05704 13.3104 6.39861L6.65932 13.0497C6.28068 13.4284 6.00695 13.7108 5.66543 13.9097C5.32391 14.1085 4.94315 14.2074 4.42705 14.3498L3.24394 14.6761C2.77527 14.8054 2.34538 14.9262 2.00131 14.9684C1.65196 15.0112 1.17964 15.0013 0.810764 14.6325C0.441921 14.2637 0.432107 13.7913 0.47486 13.442C0.517035 13.0979 0.6379 12.668 0.767181 12.1993L1.09352 11.0162C1.23588 10.5001 1.33481 10.1193 1.5336 9.77784C1.7325 9.43632 2.0149 9.1626 2.39355 8.78395L9.04466 2.13284C9.38625 1.79126 9.64911 1.52016 9.94076 1.34942ZM15.5427 14.8398H7.55223L8.96707 13.425H15.5427V14.8398ZM3.39382 9.78422C2.965 10.213 2.84244 10.3436 2.75709 10.49C2.67183 10.6366 2.61862 10.8079 2.45733 11.3925L2.13099 12.5756C2.00183 13.0439 1.92194 13.3419 1.88863 13.5536C2.10041 13.5204 2.39872 13.4416 2.86764 13.3123L4.05075 12.9859C4.63544 12.8246 4.80669 12.7715 4.95323 12.6862C5.09968 12.6008 5.23022 12.4783 5.65905 12.0494L10.721 6.98644L8.45577 4.72121L3.39382 9.78422ZM11.7 2.57079C11.3774 2.38198 10.9777 2.38198 10.6551 2.57079C10.5602 2.62647 10.4487 2.72931 10.0449 3.13311L9.45604 3.72094L11.7213 5.98617L12.3102 5.39833C12.7139 4.99457 12.8168 4.88307 12.8725 4.78818C13.0613 4.46561 13.0612 4.06585 12.8725 3.74326C12.8169 3.64827 12.7146 3.53752 12.3102 3.13311C11.9057 2.72863 11.795 2.6264 11.7 2.57079Z",fill:"currentColor"})}),o9=({size:n=14,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M7.06431 5.93342C7.68763 5.93342 8.19307 6.43904 8.19322 7.06233C8.19322 7.68573 7.68772 8.19123 7.06431 8.19123C6.44099 8.19113 5.9354 7.68567 5.9354 7.06233C5.93555 6.43911 6.44108 5.93353 7.06431 5.93342Z",fill:"currentColor"}),f.jsx("path",{fillRule:"evenodd",clipRule:"evenodd",d:"M8.6815 0.963693C10.1169 0.447019 11.6266 0.374829 12.5633 1.31135C13.5 2.24805 13.4277 3.75776 12.911 5.19319C12.7126 5.74431 12.4386 6.31796 12.0965 6.89729C12.4969 7.54638 12.8141 8.19018 13.036 8.80647C13.5527 10.2419 13.6251 11.7516 12.6883 12.6883C11.7516 13.625 10.242 13.5527 8.8065 13.036C8.19022 12.8141 7.54641 12.4969 6.89732 12.0965C6.31797 12.4386 5.74435 12.7125 5.19322 12.911C3.75777 13.4276 2.2481 13.5 1.31138 12.5633C0.374859 11.6266 0.447049 10.1168 0.963724 8.68147C1.17185 8.10338 1.46321 7.50063 1.82896 6.8924C1.52182 6.35711 1.27235 5.82825 1.08872 5.31819C0.572068 3.88278 0.499714 2.37306 1.43638 1.43635C2.37308 0.499655 3.8828 0.572044 5.31822 1.08869C5.82828 1.27232 6.35715 1.5218 6.89243 1.82893C7.50066 1.46318 8.10341 1.17181 8.6815 0.963693ZM11.3573 8.01154C10.9083 8.62253 10.3901 9.22873 9.80943 9.8094C9.22877 10.3901 8.62255 10.9083 8.01158 11.3572C8.4257 11.5841 8.8287 11.7688 9.21275 11.9071C10.5456 12.3868 11.4246 12.2547 11.8397 11.8397C12.2548 11.4246 12.3869 10.5456 11.9071 9.21272C11.7688 8.82866 11.5841 8.42568 11.3573 8.01154ZM2.56529 8.02912C2.37344 8.39322 2.21495 8.74796 2.09263 9.08772C1.61291 10.4204 1.74512 11.2995 2.16001 11.7147C2.57505 12.1297 3.45415 12.2618 4.78697 11.7821C5.11057 11.6656 5.44786 11.5164 5.7938 11.3367C5.249 10.9223 4.70922 10.4533 4.19029 9.9344C3.57578 9.31987 3.03169 8.67633 2.56529 8.02912ZM6.90708 3.2469C6.24065 3.70479 5.5646 4.26321 4.91392 4.91389C4.26325 5.56456 3.70482 6.24063 3.24693 6.90705C3.72674 7.63325 4.32777 8.37459 5.03892 9.08576C5.64943 9.69627 6.28183 10.2265 6.90806 10.6678C7.59368 10.2025 8.2908 9.63076 8.96079 8.96076C9.6308 8.29075 10.2025 7.59366 10.6678 6.90803C10.2265 6.2818 9.69631 5.6494 9.08579 5.03889C8.37462 4.32773 7.63328 3.72672 6.90708 3.2469ZM11.7147 2.15998C11.2996 1.74509 10.4204 1.61288 9.08775 2.0926C8.74835 2.21479 8.39382 2.37271 8.03013 2.56428C8.67728 3.03065 9.31995 3.5758 9.93443 4.19026C10.4534 4.7092 10.9223 5.24896 11.3368 5.79377C11.5164 5.44785 11.6656 5.11052 11.7821 4.78694C12.2618 3.45416 12.1297 2.57502 11.7147 2.15998ZM4.91197 2.2176C3.57922 1.73788 2.70004 1.86995 2.28501 2.28498C1.87001 2.70003 1.73791 3.5792 2.21763 4.91194C2.31709 5.18822 2.44112 5.47427 2.58677 5.7674C3.01931 5.1887 3.51474 4.6158 4.06529 4.06526C4.61584 3.5147 5.18872 3.01928 5.76743 2.58674C5.47431 2.4411 5.18824 2.31706 4.91197 2.2176Z",fill:"currentColor"})]}),i9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M8.00192 6.64454C8.75026 6.64454 9.35732 7.25169 9.35739 8.00001C9.35739 8.74838 8.7503 9.35548 8.00192 9.35548C7.25367 9.35533 6.64743 8.74829 6.64743 8.00001C6.6475 7.25178 7.25371 6.64468 8.00192 6.64454Z",fill:"currentColor"}),f.jsx("path",{fillRule:"evenodd",clipRule:"evenodd",d:"M9.97165 1.29981C11.5853 0.718916 13.271 0.642197 14.3144 1.68555C15.3577 2.72902 15.2811 4.41466 14.7002 6.02833C14.4707 6.66561 14.1504 7.32937 13.75 8.00001C14.1504 8.67062 14.4707 9.33444 14.7002 9.97169C15.2811 11.5854 15.3578 13.271 14.3144 14.3145C13.271 15.3579 11.5854 15.2811 9.97165 14.7002C9.3344 14.4708 8.67059 14.1505 7.99997 13.75C7.32933 14.1505 6.66558 14.4708 6.02829 14.7002C4.41461 15.2811 2.72899 15.3578 1.68552 14.3145C0.642155 13.271 0.71887 11.5854 1.29977 9.97169C1.52915 9.33454 1.84865 8.67049 2.24899 8.00001C1.84866 7.32953 1.52915 6.66544 1.29977 6.02833C0.718852 4.41459 0.64207 2.729 1.68552 1.68555C2.72897 0.642112 4.41456 0.718887 6.02829 1.29981C6.66541 1.52918 7.32949 1.8487 7.99997 2.24903C8.67045 1.84869 9.33451 1.52919 9.97165 1.29981ZM12.9404 9.2129C12.4391 9.893 11.8616 10.5681 11.2148 11.2149C10.568 11.8616 9.89296 12.4391 9.21286 12.9404C9.62532 13.1579 10.0271 13.338 10.4121 13.4766C11.9146 14.0174 12.9172 13.8738 13.3955 13.3955C13.8737 12.9173 14.0174 11.9146 13.4765 10.4121C13.3379 10.0271 13.1578 9.62535 12.9404 9.2129ZM3.05856 9.2129C2.84121 9.62523 2.66197 10.0272 2.52341 10.4121C1.98252 11.9146 2.12627 12.9172 2.60446 13.3955C3.08278 13.8737 4.08544 14.0174 5.58786 13.4766C5.97264 13.338 6.37389 13.1577 6.7861 12.9404C6.10624 12.4393 5.43168 11.8614 4.78513 11.2149C4.13823 10.5679 3.55992 9.89313 3.05856 9.2129ZM7.99899 3.792C7.23179 4.31419 6.45306 4.95512 5.70407 5.70411C4.95509 6.45309 4.31415 7.23184 3.79196 7.99903C4.3143 8.76666 4.95471 9.54653 5.70407 10.2959C6.45309 11.0449 7.23271 11.6848 7.99997 12.207C8.76725 11.6848 9.54683 11.0449 10.2959 10.2959C11.0449 9.54686 11.6848 8.76729 12.207 8.00001C11.6848 7.23275 11.0449 6.45312 10.2959 5.70411C9.5465 4.95475 8.76662 4.31434 7.99899 3.792ZM5.58786 2.52344C4.08533 1.98255 3.08272 2.12625 2.60446 2.6045C2.12621 3.08275 1.98252 4.08536 2.52341 5.5879C2.66189 5.97253 2.8414 6.37409 3.05856 6.78614C3.55983 6.10611 4.1384 5.43189 4.78513 4.78516C5.43186 4.13843 6.10606 3.55987 6.7861 3.0586C6.37405 2.84144 5.97249 2.66192 5.58786 2.52344ZM13.3955 2.6045C12.9172 2.12631 11.9146 1.98257 10.4121 2.52344C10.0272 2.66201 9.62519 2.84125 9.21286 3.0586C9.8931 3.55996 10.5679 4.13827 11.2148 4.78516C11.8614 5.43172 12.4392 6.10627 12.9404 6.78614C13.1577 6.37393 13.338 5.97267 13.4765 5.5879C14.0174 4.08549 13.8736 3.08281 13.3955 2.6045Z",fill:"currentColor"})]}),s9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsxs("mask",{id:"mask0_agent_preset_16",maskUnits:"userSpaceOnUse",x:"0",y:"0",width:"16",height:"16",children:[f.jsx("rect",{width:"16",height:"16",fill:"white"}),f.jsx("circle",{cx:"7.9995",cy:"3.28319",r:"1.712",fill:"black"}),f.jsx("circle",{cx:"3.51122",cy:"11.3855",r:"1.712",fill:"black"}),f.jsx("circle",{cx:"12.4878",cy:"11.3855",r:"1.712",fill:"black"})]}),f.jsx("path",{mask:"url(#mask0_agent_preset_16)",d:"M12.2881 11.0425C12.6002 11.3723 13.0413 11.5786 13.5312 11.5786L13.5342 11.5776C13.1476 12.3233 12.6119 12.9785 11.9639 13.5005C10.9327 14.3309 9.6199 14.8286 8.19336 14.8286C7.29864 14.8285 6.45056 14.6313 5.6875 14.2808C6.08309 14.0281 6.36707 13.6189 6.45215 13.1392C6.99022 13.3561 7.57767 13.476 8.19336 13.4761C9.30019 13.4761 10.3157 13.0915 11.1152 12.4478C11.5935 12.0626 11.9924 11.5848 12.2881 11.0425ZM4.14746 4.36475C4.25569 4.83228 4.55488 5.2247 4.95898 5.4585C4.07956 6.30639 3.53144 7.49605 3.53125 8.81396C3.53125 9.69534 3.77613 10.5202 4.20117 11.2231C3.74959 11.3817 3.38395 11.7232 3.19531 12.1597C2.5541 11.2032 2.17969 10.052 2.17969 8.81396C2.17989 7.05087 2.93868 5.4646 4.14746 4.36475ZM8.19336 2.80029C8.85717 2.80029 9.49784 2.90834 10.0967 3.10791C12.3237 3.85044 13.9725 5.86061 14.1846 8.28369C13.9832 8.20048 13.7627 8.15382 13.5312 8.15381C13.2802 8.15381 13.042 8.20907 12.8271 8.30615C12.6281 6.47264 11.3666 4.95616 9.66895 4.39014C9.2063 4.236 8.70989 4.15186 8.19336 4.15186C7.96112 4.15189 7.7329 4.16981 7.50977 4.20264C7.51947 4.12886 7.52637 4.05348 7.52637 3.97705C7.52628 3.56604 7.3811 3.18914 7.13965 2.89404C7.48183 2.83352 7.83381 2.80033 8.19336 2.80029Z",fill:"currentColor"}),f.jsx("path",{d:"M9.1123 3.28271C9.11205 2.66858 8.61322 2.17041 7.99902 2.17041C7.38504 2.17067 6.88697 2.66874 6.88672 3.28271C6.88672 3.89691 7.38489 4.39574 7.99902 4.396C8.61338 4.396 9.1123 3.89707 9.1123 3.28271ZM10.3115 3.28271C10.3115 4.55981 9.27612 5.59521 7.99902 5.59521C6.72214 5.59496 5.6875 4.55965 5.6875 3.28271C5.68776 2.00599 6.7223 0.971447 7.99902 0.971191C9.27596 0.971191 10.3113 2.00584 10.3115 3.28271Z",fill:"currentColor"}),f.jsx("path",{d:"M4.62402 11.385C4.62377 10.7709 4.12494 10.2727 3.51074 10.2727C2.89676 10.273 2.39869 10.771 2.39844 11.385C2.39844 11.9992 2.89661 12.498 3.51074 12.4983C4.1251 12.4983 4.62402 11.9994 4.62402 11.385ZM5.82324 11.385C5.82324 12.6621 4.78784 13.6975 3.51074 13.6975C2.23386 13.6973 1.19922 12.6619 1.19922 11.385C1.19947 10.1083 2.23402 9.07374 3.51074 9.07349C4.78768 9.07349 5.82299 10.1081 5.82324 11.385Z",fill:"currentColor"}),f.jsx("path",{d:"M13.6006 11.385C13.6003 10.7709 13.1015 10.2727 12.4873 10.2727C11.8733 10.273 11.3753 10.771 11.375 11.385C11.375 11.9992 11.8732 12.498 12.4873 12.4983C13.1017 12.4983 13.6006 11.9994 13.6006 11.385ZM14.7998 11.385C14.7998 12.6621 13.7644 13.6975 12.4873 13.6975C11.2104 13.6973 10.1758 12.6619 10.1758 11.385C10.176 10.1083 11.2106 9.07374 12.4873 9.07349C13.7642 9.07349 14.7995 10.1081 14.7998 11.385Z",fill:"currentColor"})]}),l9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M11.2426 4.80473V6.10551H4.75819V4.80473H11.2426Z",fill:"currentColor"}),f.jsx("path",{d:"M9.40858 7.84478V9.14557H4.75819V7.84478H9.40858Z",fill:"currentColor"}),f.jsx("path",{d:"M9.23438 0.546389C10.1941 0.546389 10.9683 0.544914 11.5859 0.611819C12.2161 0.680096 12.7634 0.825745 13.2393 1.17139C13.5172 1.3733 13.7619 1.61812 13.9639 1.896C14.3096 2.37183 14.4551 2.91922 14.5234 3.54932C14.5903 4.16686 14.5889 4.94133 14.5889 5.90088V10.0981C14.5889 11.0576 14.5903 11.8321 14.5234 12.4497C14.4552 13.0798 14.3094 13.6272 13.9639 14.103C13.7619 14.381 13.5172 14.6257 13.2393 14.8276C12.7633 15.1734 12.2163 15.3189 11.5859 15.3872C10.9683 15.4541 10.1942 15.4536 9.23438 15.4536H6.76563C5.80591 15.4536 5.03168 15.4541 4.41407 15.3872C3.78385 15.3189 3.23665 15.1734 2.76074 14.8276C2.48291 14.6257 2.23802 14.3809 2.03614 14.103C1.69066 13.6272 1.54483 13.0798 1.47657 12.4497C1.40973 11.8321 1.41114 11.0576 1.41114 10.0981V5.90088C1.41113 4.94132 1.40966 4.16686 1.47657 3.54932C1.54488 2.91921 1.69042 2.37184 2.03614 1.896C2.2381 1.61807 2.4828 1.37333 2.76074 1.17139C3.23665 0.825682 3.78386 0.680109 4.41407 0.611819C5.03168 0.544905 5.80591 0.546389 6.76563 0.546389H9.23438ZM6.76563 1.896C5.77586 1.896 5.0876 1.89738 4.55957 1.95459C4.0443 2.01043 3.76214 2.11349 3.55469 2.26416C3.39135 2.38284 3.24761 2.52662 3.12891 2.68994C2.97821 2.89736 2.8752 3.17967 2.81934 3.69483C2.76214 4.22279 2.76075 4.91131 2.76074 5.90088V10.0981C2.76074 11.0876 2.76221 11.7762 2.81934 12.3042C2.87516 12.8194 2.97829 13.1026 3.12891 13.3101C3.24754 13.4733 3.39147 13.6172 3.55469 13.7358C3.76213 13.8865 4.04438 13.9896 4.55957 14.0454C5.0876 14.1026 5.77586 14.103 6.76563 14.103H9.23438C10.2242 14.103 10.9124 14.1026 11.4404 14.0454C11.9556 13.9896 12.2379 13.8865 12.4453 13.7358C12.6086 13.6172 12.7525 13.4733 12.8711 13.3101C13.0217 13.1026 13.1248 12.8195 13.1807 12.3042C13.2378 11.7762 13.2393 11.0876 13.2393 10.0981V5.90088C13.2393 4.91131 13.2379 4.22279 13.1807 3.69483C13.1248 3.17969 13.0218 2.89736 12.8711 2.68994C12.7524 2.52667 12.6086 2.38281 12.4453 2.26416C12.2379 2.11355 11.9556 2.01041 11.4404 1.95459C10.9124 1.8974 10.2241 1.896 9.23438 1.896H6.76563Z",fill:"currentColor"})]}),u9=({size:n=14,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M8.19727 5.86969C9.2092 6.90067 9.20969 8.55271 8.19727 9.58338L6.88871 10.8919C5.85801 11.9039 4.20584 11.9037 3.17502 10.8919L3.10873 10.8243C2.09622 9.7934 2.09626 8.14148 3.10873 7.11058L4.36757 5.85174C4.28261 6.33758 4.30355 6.84354 4.44077 7.33362L3.89249 7.88053C3.30043 8.48348 3.30108 9.4507 3.89318 10.0536L3.94566 10.1061C4.54861 10.698 5.51521 10.6981 6.11808 10.1061L7.41283 8.81275C8.00484 8.21002 8.00504 7.24267 7.41352 6.63964L7.35966 6.58716C7.21975 6.44976 7.05995 6.34434 6.89009 6.27089L7.70009 5.4609C7.85176 5.55768 7.99607 5.67091 8.1296 5.80202L8.19727 5.86969Z",fill:"currentColor"}),f.jsx("path",{d:"M5.80913 8.12648C4.79584 7.09547 4.79591 5.44245 5.80913 4.41141C5.81733 4.40304 5.82707 4.39209 5.8409 4.37826L7.07833 3.14082C7.09224 3.12693 7.10311 3.11729 7.11148 3.10906C8.14253 2.09591 9.79557 2.09579 10.8266 3.10906L10.8908 3.17328C11.9041 4.20425 11.9039 5.85727 10.8908 6.88835L9.63193 8.14581C9.70566 7.66581 9.67564 7.16895 9.53456 6.68948L10.1063 6.11772C10.6989 5.51458 10.6992 4.54691 10.1063 3.94391L10.0552 3.8942C9.45215 3.30157 8.48446 3.30151 7.88142 3.8942L6.59358 5.18204C6.00081 5.78507 6.00092 6.75274 6.59358 7.35584L6.6433 7.40694C6.77998 7.54132 6.93555 7.64528 7.10112 7.71837L6.29251 8.52699C6.14446 8.43127 6.00395 8.31906 5.87335 8.1907L5.80913 8.12648Z",fill:"currentColor"})]}),a9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M9.94133 6.50173C11.3218 7.99603 11.3218 10.3011 9.94128 11.7954C9.88691 11.8542 9.82125 11.9196 9.72099 12.0198L7.75707 13.9838C7.65709 14.0838 7.592 14.1491 7.53334 14.2034C6.03906 15.5843 3.7327 15.5854 2.23827 14.2048C2.17933 14.1503 2.11374 14.0844 2.01315 13.9838C1.91318 13.8839 1.84922 13.8188 1.79495 13.7601C0.413857 12.2657 0.413909 9.95948 1.795 8.46503C1.84923 8.4064 1.91335 8.34115 2.01321 8.24129L3.79275 6.46313C3.71814 7.08101 3.75236 7.71445 3.90115 8.33518L3.00344 9.23151C2.89398 9.34097 2.8535 9.38307 2.82251 9.41658C1.93771 10.3744 1.93704 11.8514 2.82179 12.8092C2.85279 12.8427 2.89383 12.884 3.0034 12.9936C3.11272 13.1029 3.15429 13.1442 3.18777 13.1752C4.14561 14.0603 5.62381 14.0608 6.58178 13.1758C6.61532 13.1448 6.65722 13.1032 6.76685 12.9935L8.73077 11.0296C8.83999 10.9204 8.88142 10.8787 8.91238 10.8452C9.79744 9.88728 9.7969 8.40911 8.91173 7.45124C8.88074 7.41775 8.83944 7.3762 8.73011 7.26687C8.62082 7.15757 8.58061 7.11623 8.54712 7.08526C8.37347 6.92477 8.18243 6.79361 7.98088 6.69165L9.00289 5.66964C9.17506 5.78373 9.34035 5.91265 9.49663 6.05703C9.55538 6.11135 9.62026 6.17652 9.72036 6.27662C9.82094 6.3772 9.88686 6.4428 9.94133 6.50173Z",fill:"currentColor"}),f.jsx("path",{d:"M6.06816 9.49196C4.68626 7.99724 4.68667 5.68942 6.06885 4.19487C6.12268 4.13671 6.18789 4.07306 6.28706 3.9739L8.24541 2.01416C8.34478 1.91479 8.41018 1.85055 8.46845 1.79665C9.96301 0.414902 12.2689 0.414922 13.7635 1.79665C13.8217 1.85051 13.8866 1.91559 13.9858 2.01486C14.0849 2.11394 14.1502 2.17769 14.204 2.23583C15.5861 3.7304 15.5866 6.03823 14.2047 7.53291C14.1508 7.59125 14.0854 7.65638 13.9858 7.75595L12.1994 9.54098C12.2614 8.92982 12.2185 8.30587 12.0634 7.69657L12.9956 6.76573C13.1044 6.65692 13.1458 6.61529 13.1765 6.58205C14.0621 5.62404 14.0621 4.1454 13.1765 3.18738C13.1458 3.15419 13.104 3.1135 12.9956 3.00508C12.8877 2.89716 12.8471 2.85551 12.814 2.82485C11.8559 1.9389 10.376 1.93886 9.41794 2.82485C9.38479 2.85554 9.34381 2.89622 9.23564 3.00439L7.27728 4.96413C7.16875 5.07265 7.12708 5.11322 7.09636 5.14643C6.21074 6.10441 6.21153 7.58236 7.09705 8.5404C7.12775 8.57357 7.16826 8.61575 7.27659 8.72408C7.38456 8.83205 7.42647 8.87227 7.45958 8.90293C7.62849 9.0591 7.81309 9.1881 8.00856 9.28894L6.98795 10.3095C6.82111 10.1978 6.66052 10.0715 6.50872 9.93114C6.45057 9.87733 6.38547 9.81341 6.28637 9.71431C6.1871 9.61504 6.12202 9.55018 6.06816 9.49196Z",fill:"currentColor"})]}),c9=({size:n=8,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 8 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M6.54199 8.62824C6.54199 8.44193 6.54146 8.28829 6.53906 8.15851L1.11719 13.5814L0.728516 13.1927L0.339844 12.803L5.76172 7.38019C5.63201 7.3778 5.47812 7.37824 5.29199 7.37824H1.43555V6.27863H5.29199C5.65471 6.27863 5.97167 6.27814 6.22852 6.30597C6.49541 6.33493 6.76232 6.3998 7.00293 6.57452C7.13452 6.67013 7.25108 6.78571 7.34668 6.9173C7.52157 7.15808 7.5863 7.4256 7.61523 7.69269C7.64305 7.94948 7.64258 8.26562 7.64258 8.62824V12.4857H6.54199V8.62824Z",fill:"currentColor"})}),f9=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M13.588429 5.147807C13.588429 4.739638 13.587271 4.403003 13.582013 4.118684L1.703098 15.99968L0.85155 15.148178L0 14.294485L11.878915 2.413442C11.594721 2.408199 11.257569 2.409154 10.849776 2.409154H2.400594V0.000001H10.849776C11.644471 0.000001 12.338899 -0.001059 12.901622 0.059909C13.486363 0.123352 14.071136 0.265493 14.598303 0.648292C14.886598 0.857751 15.141981 1.110984 15.351433 1.399281C15.734578 1.926807 15.876362 2.512925 15.939743 3.098105C16.000775 3.660718 15.99968 4.353347 15.99968 5.147807V13.599133H13.588429V5.147807Z",fill:"currentColor"})}),d9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M14.9943 1.92389V3.32428H1.00598V1.92389H14.9943Z",fill:"currentColor"}),f.jsx("path",{d:"M14.9943 5.50784V6.90823H1.00598V5.50784H14.9943Z",fill:"currentColor"}),f.jsx("path",{d:"M14.9943 9.09177V10.4922H1.00598V9.09177H14.9943Z",fill:"currentColor"}),f.jsx("path",{d:"M8.93274 12.6757V14.0761H1.00598V12.6757H8.93274Z",fill:"currentColor"})]}),h9=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M14.4782 4.84067L14.2138 10.1152C14.1102 12.1872 14.067 13.0115 13.3866 13.9607C13.1044 14.3546 12.7498 14.6912 12.3424 14.9535C11.8239 15.2872 11.2415 15.4316 10.5585 15.4998C9.88727 15.5668 9.04946 15.5656 7.99998 15.5656C6.95051 15.5656 6.1127 15.5668 5.44142 15.4998C4.75851 15.4316 4.17602 15.2872 3.65753 14.9535C3.25012 14.6912 2.89559 14.3546 2.61332 13.9607C1.93296 13.0115 1.88979 12.1872 1.78619 10.1152L1.52179 4.84067L2.89006 4.77277L3.15343 10.0463C3.26221 12.2218 3.32452 12.6015 3.72646 13.1624C3.90825 13.4161 4.13686 13.6334 4.39927 13.8023C4.66204 13.9714 5.00263 14.0792 5.57825 14.1367C6.16562 14.1953 6.92298 14.1963 7.99998 14.1963C9.07699 14.1963 9.83434 14.1953 10.4217 14.1367C10.9973 14.0792 11.3379 13.9714 11.6007 13.8023C11.8631 13.6334 12.0917 13.4161 12.2735 13.1624C12.6755 12.6015 12.7378 12.2218 12.8465 10.0463L13.1099 4.77277L14.4782 4.84067ZM5.43011 6.22849H6.7994V11.3909H5.43011V6.22849ZM9.20056 6.22849H10.5699V11.3909H9.20056V6.22849ZM8.53597 0.434431C9.17976 0.434431 9.6522 0.426926 10.0966 0.571258C10.2357 0.616451 10.3717 0.672554 10.502 0.738948C10.9182 0.951107 11.2464 1.29099 11.7015 1.74612L12.4978 2.54136H15.3742V3.91169H0.625732V2.54136H3.50218L4.29845 1.74612C4.75358 1.29099 5.08174 0.951107 5.49801 0.738948C5.62831 0.672554 5.76425 0.616451 5.90334 0.571258C6.34776 0.426926 6.82021 0.434431 7.46399 0.434431H8.53597ZM7.46399 1.80476C6.73208 1.80476 6.51641 1.81187 6.32617 1.87369C6.25545 1.89667 6.18668 1.92533 6.12041 1.95907C5.96398 2.03878 5.82348 2.16253 5.44142 2.54136H10.5585C10.1765 2.16253 10.036 2.03878 9.87955 1.95907C9.81329 1.92533 9.74452 1.89667 9.6738 1.87369C9.48356 1.81187 9.26789 1.80476 8.53597 1.80476H7.46399Z",fill:"currentColor"})}),K3=({size:n=14,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M6.3002 3.32843L7.69986 3.32843L7.69986 7.79657H6.3002L6.3002 3.32843Z",fill:"currentColor"}),f.jsx("path",{d:"M6.3002 9.01935H7.69986V10.6711H6.3002V9.01935Z",fill:"currentColor"}),f.jsx("path",{d:"M12.6328 6.99976C12.6328 3.88874 10.111 1.36694 7 1.36694C3.88899 1.36695 1.3672 3.88875 1.36719 6.99976C1.36719 10.1108 3.88899 12.6326 7 12.6326C10.111 12.6326 12.6328 10.1108 12.6328 6.99976ZM13.8582 6.99976C13.8582 10.7873 10.7876 13.8579 7 13.8579C3.21244 13.8579 0.141846 10.7873 0.141846 6.99976C0.141857 3.2122 3.21245 0.141612 7 0.141602C10.7876 0.141602 13.8581 3.21219 13.8582 6.99976Z",fill:"currentColor"})]}),p9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M11.0307 5.46369C11.0305 3.78995 9.6734 2.43357 7.99961 2.43357C6.32601 2.43379 4.96972 3.79009 4.96949 5.46369C4.96949 7.13748 6.32587 8.49455 7.99961 8.49477C9.67354 8.49477 11.0307 7.13762 11.0307 5.46369ZM12.3163 5.46369C12.3163 7.84777 10.3837 9.78042 7.99961 9.78042C5.61572 9.7802 3.68288 7.84763 3.68288 5.46369C3.6831 3.07993 5.61586 1.14718 7.99961 1.14695C10.3836 1.14695 12.3161 3.0798 12.3163 5.46369Z",fill:"currentColor"}),f.jsx("path",{d:"M8.00002 10.3316C11.7343 10.3316 14.1864 11.8997 15.0387 14.4445L14.4292 14.6483L13.8197 14.8531C13.1955 12.9893 11.3673 11.6182 8.00002 11.6182C4.63277 11.6182 2.80455 12.9893 2.18031 14.8531L1.5708 14.6483L0.961304 14.4445C1.81368 11.8997 4.26579 10.3316 8.00002 10.3316Z",fill:"currentColor"})]}),m9=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M8.3125 0.981587C8.66767 1.0545 8.97902 1.20558 9.2627 1.43374C9.48724 1.61438 9.73029 1.85933 9.97949 2.10854L14.707 6.83608L13.293 8.25014L9 3.95717V15.0431H7V3.95717L2.70703 8.25014L1.29297 6.83608L6.02051 2.10854C6.26971 1.85933 6.51277 1.61438 6.7373 1.43374C6.97662 1.24126 7.28445 1.04542 7.6875 0.981587C7.8973 0.94841 8.1031 0.956564 8.3125 0.981587Z",fill:"currentColor"})}),C9=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M2 4.88C2 3.68009 2 3.08013 2.30557 2.65954C2.40426 2.52371 2.52371 2.40426 2.65954 2.30557C3.08013 2 3.68009 2 4.88 2H11.12C12.3199 2 12.9199 2 13.3405 2.30557C13.4763 2.40426 13.5957 2.52371 13.6944 2.65954C14 3.08013 14 3.68009 14 4.88V11.12C14 12.3199 14 12.9199 13.6944 13.3405C13.5957 13.4763 13.4763 13.5957 13.3405 13.6944C12.9199 14 12.3199 14 11.12 14H4.88C3.68009 14 3.08013 14 2.65954 13.6944C2.52371 13.5957 2.40426 13.4763 2.30557 13.3405C2 12.9199 2 12.3199 2 11.12V4.88Z",fill:"currentColor"})}),g9=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M5.5498 9.75V5H6.9502V9.75C6.9502 10.3299 7.4201 10.7998 8 10.7998C8.5799 10.7998 9.0498 10.3299 9.0498 9.75V4.5C9.0498 2.9536 7.7964 1.7002 6.25 1.7002C4.7036 1.7002 3.4502 2.9536 3.4502 4.5V9.75C3.4502 12.2629 5.4871 14.2998 8 14.2998C10.5129 14.2998 12.5498 12.2629 12.5498 9.75V4H13.9502V9.75C13.9502 13.0361 11.2861 15.7002 8 15.7002C4.71391 15.7002 2.0498 13.0361 2.0498 9.75V4.5C2.04981 2.1804 3.9304 0.299806 6.25 0.299805C8.5696 0.299805 10.4502 2.1804 10.4502 4.5V9.75C10.4502 11.1031 9.3531 12.2002 8 12.2002C6.6469 12.2002 5.5498 11.1031 5.5498 9.75Z",fill:"currentColor"})}),v9=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M2.871 13.1286C0.0387669 10.2962 0.0387669 5.70383 2.871 2.87141C5.70341 0.0390029 10.2957 0.0391154 13.1282 2.87141L12.1387 3.86094C9.85292 1.57538 6.1469 1.57596 3.86123 3.86163C1.57573 6.14732 1.57573 9.85269 3.86123 12.1384C6.1469 14.424 9.85292 14.4246 12.1387 12.1391L13.1282 13.1286C10.2957 15.9609 5.70341 15.961 2.871 13.1286Z",fill:"currentColor"})}),y9=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M15.3695 11.411L15.1234 12.8866C14.8869 14.3042 13.6603 15.3436 12.223 15.3436H3.77673C2.33958 15.3434 1.1128 14.3042 0.876343 12.8866L0.630249 11.411L2.05408 11.1747L2.29919 12.6493C2.41973 13.3713 3.04475 13.9001 3.77673 13.9003H12.223C12.9551 13.9002 13.58 13.3713 13.7006 12.6493L13.9457 11.1747L15.3695 11.411ZM8.72205 8.994C8.77717 8.93934 8.83792 8.88106 8.90271 8.81627L12.4828 5.23424L13.5043 6.25572L9.92224 9.8358C9.6395 10.1185 9.38763 10.3732 9.15857 10.5575C8.91892 10.7503 8.63953 10.9224 8.2865 10.9784C8.09711 11.0083 7.90363 11.0083 7.71423 10.9784C7.36106 10.9224 7.0809 10.7503 6.84119 10.5575C6.61215 10.3732 6.36022 10.1185 6.07751 9.8358L2.49646 6.25572L3.51697 5.23424L7.09705 8.81627C7.16219 8.88142 7.22331 8.94006 7.27869 8.99498V1.3065H8.72205V8.994Z",fill:"currentColor"})}),w9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M14.1446 8C14.1446 4.6062 11.3938 1.85539 8 1.85539C4.6062 1.85539 1.85539 4.6062 1.85539 8C1.85539 11.3938 4.6062 14.1446 8 14.1446C11.3938 14.1446 14.1446 11.3938 14.1446 8ZM15.511 8C15.511 12.148 12.148 15.511 8 15.511C3.85202 15.511 0.489014 12.148 0.489014 8C0.489014 3.85202 3.85202 0.489014 8 0.489014C12.148 0.489014 15.511 3.85202 15.511 8Z",fill:"currentColor"}),f.jsx("path",{d:"M10.5617 8.42578C10.852 8.21614 10.852 7.78386 10.5617 7.57422L7.25708 5.18751C6.90974 4.93666 6.42436 5.18484 6.42436 5.61329V10.3867C6.42436 10.8152 6.90974 11.0633 7.25708 10.8125L10.5617 8.42578Z",fill:"currentColor"})]}),x9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M14.1448 8.00024C14.1448 4.60644 11.394 1.85563 8.00024 1.85563C4.60644 1.85563 1.85563 4.60644 1.85563 8.00024C1.85563 11.394 4.60644 14.1448 8.00024 14.1448C11.394 14.1448 14.1448 11.394 14.1448 8.00024ZM15.5112 8.00024C15.5112 12.1482 12.1482 15.5112 8.00024 15.5112C3.85226 15.5112 0.489258 12.1482 0.489258 8.00024C0.489258 3.85226 3.85226 0.489258 8.00024 0.489258C12.1482 0.489258 15.5112 3.85226 15.5112 8.00024Z",fill:"currentColor"}),f.jsx("path",{d:"M7.14244 5.14258V10.8569H5.71387V5.14258H7.14244Z",fill:"currentColor"}),f.jsx("path",{d:"M10.286 5.14258V10.8569H8.85742V5.14258H10.286Z",fill:"currentColor"})]}),_9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M2.58875 12.3407L6.59167 8.33777L7.66296 9.40808L3.66003 13.411H7.99988V14.8065H3.05457C2.02633 14.8065 1.19324 13.9734 1.19324 12.9452V7.99988H2.58875V12.3407Z",fill:"currentColor"}),f.jsx("path",{d:"M12.9452 1.19324C13.9734 1.19324 14.8065 2.02633 14.8065 3.05457V7.99988H13.411V3.66003L9.40808 7.66296L8.33777 6.59167L12.3407 2.58875H7.99988V1.19324H12.9452Z",fill:"currentColor"})]}),L9=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{fillRule:"evenodd",clipRule:"evenodd",d:"M12.3368 1.53569L11.931 4.43172H14.8086V5.79673H11.7404L11.1962 9.67859H14.2839V11.0436H11.0056L10.4994 14.6529L9.14873 14.4643L9.62731 11.0436H5.75876L5.25252 14.6529L3.90186 14.4643L4.38043 11.0436H1.69141V9.67859H4.57104L5.11417 5.79673H2.21609V4.43172H5.30581L5.73724 1.34713L7.08995 1.53569L6.68414 4.43172H10.5527L10.9841 1.34713L12.3368 1.53569ZM5.94937 9.67859H9.81791L10.361 5.79673H6.49353L5.94937 9.67859Z",fill:"currentColor"})}),k9=({size:n=14,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsxs("g",{clipPath:"url(#clip0_1840_45990)",children:[f.jsx("path",{d:"M3.03426 5.66661L1.70084 7.00003L3.0315 8.33069L2.14762 9.21457L-0.0669245 7.00003L2.15038 4.78273L3.03426 5.66661ZM7 14.067L4.77924 11.8462L5.66313 10.9623L7 12.2992L8.33342 10.9658L9.2173 11.8496L7 14.067ZM11.8489 9.21803L10.965 8.33414L12.2992 7.00003L10.9623 5.66316L11.8462 4.77927L14.0669 7.00003L11.8489 9.21803ZM8.33066 3.03153L7 1.70087L5.66589 3.03498L4.782 2.1511L7 -0.0668945L9.21454 2.14765L8.33066 3.03153Z",fill:"currentColor"}),f.jsx("rect",{x:"5.98535",y:"5.98535",width:"2.02942",height:"2.02942",fill:"currentColor"})]}),f.jsx("defs",{children:f.jsx("clipPath",{id:"clip0_1840_45990",children:f.jsx("rect",{width:"14",height:"14",fill:"currentColor"})})})]}),S9=({size:n=14,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",children:[f.jsx("path",{transform:"translate(0.6689 1.073)",d:"M11.4818 5.57813C11.4818 4.45301 11.4807 3.66237 11.4075 3.05908C11.3359 2.46953 11.2024 2.13852 10.9939 1.89441C10.9247 1.81341 10.8493 1.73801 10.7683 1.66882C10.5242 1.46033 10.1932 1.32686 9.60364 1.25525C9.00034 1.18198 8.20974 1.18091 7.0846 1.18091L5.57813 1.18091C4.45301 1.18091 3.66238 1.18198 3.05908 1.25525C2.46953 1.32686 2.13852 1.46033 1.89441 1.66882C1.81341 1.73801 1.73801 1.81341 1.66882 1.89441C1.46033 2.13852 1.32686 2.46953 1.25525 3.05908C1.18198 3.66238 1.18091 4.45301 1.18091 5.57813L1.18091 6.2771C1.18091 7.40218 1.18197 8.19288 1.25525 8.79614C1.32687 9.38553 1.46036 9.71674 1.66882 9.96082C1.73797 10.0417 1.81347 10.1173 1.89441 10.1864C2.13851 10.3948 2.46965 10.5275 3.05908 10.5991C3.66238 10.6724 4.45298 10.6735 5.57813 10.6735L7.0846 10.6735C8.20977 10.6735 9.00033 10.6724 9.60364 10.5991C10.1931 10.5275 10.5242 10.3948 10.7683 10.1864C10.8493 10.1173 10.9247 10.0417 10.9939 9.96082C11.2024 9.71674 11.3358 9.38553 11.4075 8.79614C11.4808 8.19288 11.4818 7.40218 11.4818 6.2771L11.4818 5.57813ZM12.6627 6.2771C12.6627 7.37222 12.6637 8.247 12.5798 8.93799C12.4942 9.64284 12.3133 10.2359 11.8928 10.7282C11.7834 10.8562 11.6637 10.9751 11.5356 11.0845C11.0434 11.5049 10.4511 11.6867 9.74634 11.7723C9.05525 11.8563 8.17999 11.8552 7.0846 11.8552L5.57813 11.8552C4.48273 11.8552 3.60747 11.8563 2.91638 11.7723C2.21157 11.6867 1.61933 11.5049 1.12708 11.0845C0.99901 10.9751 0.879281 10.8562 0.769898 10.7282C0.349454 10.2359 0.168506 9.64284 0.0828864 8.93799C-0.00101964 8.247 4.88512e-07 7.37222 6.47206e-07 6.2771L6.47206e-07 5.57813C6.47206e-07 4.48273 -0.00106163 3.60747 0.0828864 2.91638C0.168502 2.21168 0.349594 1.61928 0.769898 1.12708C0.879302 0.998981 0.998981 0.879302 1.12708 0.769898C1.61928 0.349594 2.21168 0.168502 2.91638 0.0828864C3.60747 -0.00106163 4.48273 6.47206e-07 5.57813 6.47206e-07L7.0846 6.47206e-07C8.17999 6.47206e-07 9.05525 -0.00106163 9.74634 0.0828864C10.451 0.168505 11.0434 0.349587 11.5356 0.769898C11.6637 0.879302 11.7834 0.998981 11.8928 1.12708C12.3131 1.61928 12.4942 2.21169 12.5798 2.91638C12.6638 3.60747 12.6627 4.48273 12.6627 5.57813L12.6627 6.2771Z",fill:"currentColor"}),f.jsx("path",{transform:"translate(0.6689 1.073)",d:"M6.02607 5.50955L6.44306 5.9274L3.84284 8.52762L3.425 8.11063L3.00715 7.69278L4.77253 5.9274L3.00715 4.16202L3.84284 3.32633L6.02607 5.50955Z",fill:"currentColor"}),f.jsx("path",{transform:"translate(0.6689 1.073)",d:"M9.23789 7.35397L9.23789 8.53488L6.96238 8.53488L6.96238 7.35397L9.23789 7.35397Z",fill:"currentColor"})]}),j9=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",children:f.jsx("path",{transform:"translate(1.292 1.3)",d:"M10.3232 9.18164C11.2868 9.18164 12.0985 9.82833 12.3506 10.7109L13.415 10.7109L13.415 11.8711L12.3496 11.8711C12.0971 12.7532 11.2864 13.3994 10.3232 13.3994C9.36031 13.3992 8.55012 12.7531 8.29785 11.8711L0 11.8711L0 10.7109L8.29688 10.7109C8.54876 9.82845 9.35988 9.18186 10.3232 9.18164ZM10.3232 10.3418C9.7999 10.3421 9.37534 10.7667 9.375 11.29C9.375 11.8137 9.79969 12.239 10.3232 12.2393C10.847 12.2393 11.2725 11.8138 11.2725 11.29C11.2721 10.7666 10.8468 10.3418 10.3232 10.3418ZM12.4326 11.291C12.4326 11.3549 12.4284 11.418 12.4229 11.4805C12.4287 11.4181 12.4326 11.355 12.4326 11.291ZM8.21484 11.2832C8.21484 11.2856 8.21484 11.2886 8.21484 11.291L8.21484 11.29C8.21484 11.2878 8.21484 11.2855 8.21484 11.2832ZM3.08301 4.59082C4.04605 4.59095 4.85696 5.23717 5.10938 6.11914L13.415 6.11914L13.415 7.2793L5.11035 7.2793C4.85833 8.16202 4.04648 8.80846 3.08301 8.80859C2.11972 8.80843 1.30963 8.16179 1.05762 7.2793L0 7.2793L0 6.11914L1.05762 6.11914C1.30994 5.23728 2.12006 4.59098 3.08301 4.59082ZM3.08301 5.75098C2.55962 5.75117 2.13512 6.17587 2.13477 6.69922C2.13477 7.22287 2.5594 7.64824 3.08301 7.64844C3.60665 7.64828 4.03223 7.2229 4.03223 6.69922C4.03187 6.17585 3.60643 5.75113 3.08301 5.75098ZM5.19238 6.69922C5.19238 6.763 5.18816 6.82633 5.18262 6.88867C5.18846 6.82629 5.19238 6.76313 5.19238 6.69922C5.19236 6.63495 5.18853 6.57152 5.18262 6.50879C5.18826 6.57154 5.19236 6.635 5.19238 6.69922ZM0.982422 6.52344C0.977382 6.58136 0.97463 6.63999 0.974609 6.69922C0.974609 6.75775 0.977496 6.81579 0.982422 6.87305C0.977758 6.81579 0.974609 6.75767 0.974609 6.69922C0.974628 6.64 0.977618 6.58142 0.982422 6.52344ZM10.3232 0C11.2869 0 12.0986 0.646596 12.3506 1.5293L13.415 1.5293L13.415 2.68945L12.3496 2.68945C12.363 2.64266 12.3754 2.59488 12.3857 2.54688C12.1838 3.50118 11.3376 4.21777 10.3232 4.21777C9.36037 4.21756 8.55018 3.57139 8.29785 2.68945L0 2.68945L0 1.5293L8.29688 1.5293C8.5487 0.646717 9.35981 0.00021854 10.3232 0ZM10.3232 1.16016C9.79984 1.16042 9.37524 1.58499 9.375 2.1084C9.375 2.63201 9.79969 3.05735 10.3232 3.05762C10.847 3.05762 11.2725 2.63217 11.2725 2.1084C11.2722 1.58483 10.8469 1.16016 10.3232 1.16016ZM12.4229 2.29883C12.4287 2.23641 12.4326 2.17331 12.4326 2.10938C12.4326 2.17327 12.4284 2.23638 12.4229 2.29883ZM8.21484 2.10938L8.21484 2.1084L8.21484 2.10938ZM8.22266 1.93359C8.21785 1.98897 8.21506 2.04499 8.21484 2.10156C8.21503 2.04501 8.2181 1.98902 8.22266 1.93359ZM8.22266 11.1162C8.2179 11.1713 8.21507 11.227 8.21484 11.2832C8.21504 11.227 8.21814 11.1713 8.22266 11.1162Z",fill:"currentColor"})}),E9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",children:[f.jsx("path",{transform:"translate(9.52 2.52)",d:"M3.55246 0L3.55246 2.44252L6 2.44252L6 3.55748L3.55246 3.55748L3.55246 6L2.43834 6L2.43834 3.55748L0 3.55748L0 2.44252L2.43834 2.44252L2.43834 0L3.55246 0Z",fill:"currentColor"}),f.jsx("path",{transform:"translate(0.3496 2.35)",d:"M4.76367 0C5.36861 1.80598e-05 5.93113 0.310294 6.25488 0.821289L6.78027 1.64941C6.79685 1.67558 6.81791 1.69775 6.83887 1.71973C6.72186 2.15521 6.65702 2.61192 6.65137 3.08301C6.25601 2.96045 5.90909 2.70478 5.68164 2.3457L5.15723 1.5166C5.07183 1.38189 4.92318 1.3008 4.76367 1.30078L2.32422 1.30078C1.7589 1.30078 1.30078 1.7589 1.30078 2.32422L1.30078 10.1338C1.30078 10.6991 1.7589 11.1572 2.32422 11.1572L11.9766 11.1572C12.5419 11.1572 13 10.6991 13 10.1338L13 8.58398C13.4545 8.5135 13.8903 8.38748 14.3008 8.21289L14.3008 10.1338C14.3008 11.4171 13.2598 12.458 11.9766 12.458L2.32422 12.458C1.04093 12.458 0 11.4171 0 10.1338L0 2.32422C0 1.04093 1.04093 0 2.32422 0L4.76367 0Z",fill:"currentColor"})]}),b9=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",children:f.jsx("path",{d:"M5.19629 1.57104C5.81144 1.5711 6.38623 1.8786 6.72754 2.39038L7.19922 3.09839C7.28454 3.22635 7.42824 3.30344 7.58203 3.30347H12.1699C13.5039 3.30348 14.5859 4.38548 14.5859 5.71948V6.62671C15.2694 7.02689 15.6605 7.85012 15.4385 8.68726L14.3848 12.658C14.1037 13.7164 13.1449 14.4527 12.0498 14.4529H2.91699C1.51651 14.4529 0.451662 13.2814 0.501954 11.9519V3.98706C0.501954 2.65305 1.58396 1.57104 2.91797 1.57104H5.19629ZM3.7793 7.75562C3.30994 7.75562 2.89883 8.07153 2.77832 8.52515L1.91602 11.7722C1.74167 12.4291 2.23734 13.073 2.91699 13.073H12.0498C12.5191 13.0728 12.9304 12.757 13.0508 12.3035L14.1045 8.33374C14.1819 8.04202 13.9619 7.756 13.6602 7.75562H3.7793ZM2.91797 2.9519C2.34625 2.9519 1.88281 3.41534 1.88281 3.98706V7.2937C2.33068 6.7269 3.02249 6.37476 3.7793 6.37476H13.2051V5.71948C13.2051 5.14777 12.7416 4.68434 12.1699 4.68433H7.58203C6.96675 4.6843 6.39209 4.37595 6.05078 3.86401L5.5791 3.15601C5.49379 3.02821 5.34995 2.95196 5.19629 2.9519H2.91797Z",fill:"currentColor"})}),M9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",children:[f.jsx("path",{d:"M5.19629 1.57104C5.81144 1.5711 6.38623 1.8786 6.72754 2.39038L7.19922 3.09839C7.28454 3.22635 7.42824 3.30344 7.58203 3.30347H12.1699C13.5039 3.30348 14.5859 4.38548 14.5859 5.71948V6.62671C15.2694 7.02689 15.6605 7.85012 15.4385 8.68726L14.3848 12.658C14.1037 13.7164 13.1449 14.4527 12.0498 14.4529H2.91699C1.51651 14.4529 0.451662 13.2814 0.501954 11.9519V3.98706C0.501954 2.65305 1.58396 1.57104 2.91797 1.57104H5.19629ZM3.7793 7.75562C3.30994 7.75562 2.89883 8.07153 2.77832 8.52515L1.91602 11.7722C1.74167 12.4291 2.23734 13.073 2.91699 13.073H12.0498C12.5191 13.0728 12.9304 12.757 13.0508 12.3035L14.1045 8.33374C14.1819 8.04202 13.9619 7.756 13.6602 7.75562H3.7793ZM2.91797 2.9519C2.34625 2.9519 1.88281 3.41534 1.88281 3.98706V7.2937C2.33068 6.7269 3.02249 6.37476 3.7793 6.37476H13.2051V5.71948C13.2051 5.14777 12.7416 4.68434 12.1699 4.68433H7.58203C6.96675 4.6843 6.39209 4.37595 6.05078 3.86401L5.5791 3.15601C5.49379 3.02821 5.34995 2.95196 5.19629 2.9519H2.91797Z",fill:"currentColor"}),f.jsx("path",{opacity:"0.2",d:"M13.6602 7.75525C13.9618 7.7556 14.1815 8.04179 14.1045 8.33337L13.0508 12.3031C12.9304 12.7567 12.5191 13.0725 12.0498 13.0726H2.91701C2.23744 13.0725 1.7417 12.4287 1.91603 11.7719L2.77834 8.52478C2.89898 8.07146 3.31018 7.75532 3.77931 7.75525H13.6602ZM5.1963 2.95154C5.34985 2.95159 5.49377 3.02803 5.57912 3.15564L6.0508 3.86365C6.39205 4.37553 6.96685 4.68385 7.58205 4.68396H12.1699C12.7416 4.68396 13.2049 5.14754 13.2051 5.71912V6.37439H3.77931C3.02267 6.37444 2.33067 6.72671 1.88283 7.29333V3.98669C1.88299 3.4152 2.34649 2.95168 2.91798 2.95154H5.1963Z",fill:"currentColor"})]}),O9=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",children:f.jsx("path",{transform:"translate(1.5 2.429)",d:"M5.05582 0.518756L4.50669 0.86654L5.05582 0.518756ZM13 9.4837L13.65 9.4837L13.65 3.53962L13 3.53962L12.35 3.53962L12.35 9.4837L13 9.4837ZM11.3264 1.86603L11.3264 1.21603L6.52313 1.21603L6.52313 1.86603L6.52313 2.51603L11.3264 2.51603L11.3264 1.86603ZM5.58054 1.34727L6.12968 0.999489L5.60495 0.170972L5.05582 0.518756L4.50669 0.86654L5.03141 1.69506L5.58054 1.34727ZM4.11323 1.23058e-13L4.11323 -0.65L1.67359 -0.65L1.67359 5.00699e-14L1.67359 0.65L4.11323 0.65L4.11323 1.23058e-13ZM0 1.67359L-0.65 1.67359L-0.65 9.4837L0 9.4837L0.65 9.4837L0.65 1.67359L0 1.67359ZM11.3264 11.1573L11.3264 10.5073L1.67359 10.5073L1.67359 11.1573L1.67359 11.8073L11.3264 11.8073L11.3264 11.1573ZM0 9.4837L-0.65 9.4837C-0.65 10.767 0.390308 11.8073 1.67359 11.8073L1.67359 11.1573L1.67359 10.5073C1.10828 10.5073 0.65 10.049 0.65 9.4837L0 9.4837ZM1.67359 5.00699e-14L1.67359 -0.65C0.390307 -0.65 -0.65 0.390309 -0.65 1.67359L0 1.67359L0.65 1.67359C0.65 1.10828 1.10828 0.65 1.67359 0.65L1.67359 5.00699e-14ZM5.05582 0.518756L5.60495 0.170972C5.28121 -0.340193 4.71829 -0.65 4.11323 -0.65L4.11323 1.23058e-13L4.11323 0.65C4.27282 0.65 4.4213 0.731715 4.50669 0.86654L5.05582 0.518756ZM6.52313 1.86603L6.52313 1.21603C6.36354 1.21603 6.21507 1.13431 6.12968 0.999489L5.58054 1.34727L5.03141 1.69506C5.35515 2.20622 5.91808 2.51603 6.52313 2.51603L6.52313 1.86603ZM13 3.53962L13.65 3.53962C13.65 2.25634 12.6097 1.21603 11.3264 1.21603L11.3264 1.86603L11.3264 2.51603C11.8917 2.51603 12.35 2.97431 12.35 3.53962L13 3.53962ZM13 9.4837L12.35 9.4837C12.35 10.049 11.8917 10.5073 11.3264 10.5073L11.3264 11.1573L11.3264 11.8073C12.6097 11.8073 13.65 10.767 13.65 9.4837L13 9.4837Z",fill:"currentColor"})}),N9=({size:n=10,className:r})=>f.jsx("svg",{width:n*8/10,height:n,className:r,viewBox:"-0.5 0 8.5 10.5",fill:"none",children:f.jsx("path",{d:"M0 0L-0.5 0L-0.5 7L0 7L0.5 7L0.5 0L0 0ZM3 10L3 10.5L8 10.5L8 10L8 9.5L3 9.5L3 10ZM0 7L-0.5 7C-0.5 8.933 1.067 10.5 3 10.5L3 10L3 9.5C1.61929 9.5 0.5 8.38071 0.5 7L0 7Z",fill:"currentColor"})}),R9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M11.3496 8C11.3496 6.14985 9.85015 4.65039 8 4.65039C6.14985 4.65039 4.65039 6.14985 4.65039 8C4.65039 9.85015 6.14985 11.3496 8 11.3496C9.85015 11.3496 11.3496 9.85015 11.3496 8ZM12.6504 8C12.6504 10.5681 10.5681 12.6504 8 12.6504C5.43188 12.6504 3.34961 10.5681 3.34961 8C3.34961 5.43188 5.43188 3.34961 8 3.34961C10.5681 3.34961 12.6504 5.43188 12.6504 8Z",fill:"currentColor"}),f.jsx("path",{d:"M8.65039 0.5V2.5H7.34961V0.5H8.65039Z",fill:"currentColor"}),f.jsx("path",{d:"M8.65039 13.5V15.5H7.34961V13.5H8.65039Z",fill:"currentColor"}),f.jsx("path",{d:"M3.15808 2.24035L4.57229 3.65456L3.6525 4.57435L2.23829 3.16014L3.15808 2.24035Z",fill:"currentColor"}),f.jsx("path",{d:"M12.3505 11.4327L13.7647 12.8469L12.8449 13.7667L11.4307 12.3525L12.3505 11.4327Z",fill:"currentColor"}),f.jsx("path",{d:"M2.24537 12.8469L3.65958 11.4327L4.57937 12.3525L3.16516 13.7667L2.24537 12.8469Z",fill:"currentColor"}),f.jsx("path",{d:"M11.4377 3.65455L12.852 2.24033L13.7718 3.16012L12.3575 4.57434L11.4377 3.65455Z",fill:"currentColor"}),f.jsx("path",{d:"M0.5 7.35461H2.5V8.6554H0.5L0.5 7.35461Z",fill:"currentColor"}),f.jsx("path",{d:"M13.5 7.35461H15.5V8.6554H13.5V7.35461Z",fill:"currentColor"})]}),P9=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M13.2764 9.52324C12.5607 9.97754 11.7177 10.242 10.7812 10.242C8.11386 10.2419 5.95042 8.07997 5.9502 5.41289C5.9502 4.48128 6.21453 3.61071 6.67188 2.87285C4.30332 3.4658 2.54992 5.60845 2.5498 8.16093C2.5498 11.1712 4.99103 13.6102 8 13.6102C10.5383 13.6102 12.6709 11.8724 13.2764 9.52324ZM7.05078 5.41289C7.051 7.47224 8.72116 9.1423 10.7812 9.14238C11.9248 9.14238 12.887 8.63397 13.5781 7.8084C13.7266 7.63106 13.9701 7.56547 14.1875 7.64433C14.4049 7.72329 14.5497 7.9297 14.5498 8.16093C14.5498 11.7766 11.6161 14.7098 8 14.7098C4.38402 14.7098 1.4502 11.7792 1.4502 8.16093C1.45033 4.54322 4.3812 1.61015 8 1.61015C8.23027 1.61015 8.43585 1.75352 8.51562 1.96953C8.59536 2.18554 8.53241 2.42829 8.35742 2.57793C7.55573 3.26311 7.05078 4.27876 7.05078 5.41289Z",fill:"currentColor"})}),T9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M12.1665 13.5811V14.7803H3.66651V13.5811H12.1665Z",fill:"currentColor"}),f.jsx("path",{d:"M13.4453 7.02379C13.4453 6.04702 13.4452 5.3616 13.3887 4.83434C13.3333 4.31828 13.2302 4.02378 13.0723 3.80309C12.9446 3.62475 12.7877 3.46883 12.6094 3.34117C12.3887 3.18328 12.0942 3.08007 11.5781 3.02477C11.0508 2.96829 10.3655 2.96715 9.38867 2.96715H6.61035C5.63359 2.96715 4.94816 2.96827 4.4209 3.02477C3.90486 3.0801 3.61034 3.18321 3.38965 3.34117C3.21143 3.46878 3.05534 3.62487 2.92774 3.80309C2.76977 4.02377 2.66667 4.3183 2.61133 4.83434C2.55483 5.3616 2.55371 6.04702 2.55371 7.02379C2.55371 8.0006 2.55485 8.68596 2.61133 9.21324C2.66663 9.72936 2.76983 10.0238 2.92774 10.2445C3.0554 10.4228 3.21131 10.5797 3.38965 10.7074C3.61034 10.8654 3.90484 10.9685 4.4209 11.0238C4.94816 11.0803 5.63359 11.0804 6.61035 11.0804H9.38867C10.3654 11.0804 11.0508 11.0803 11.5781 11.0238C12.0941 10.9685 12.3887 10.8652 12.6094 10.7074C12.7877 10.5797 12.9446 10.4229 13.0723 10.2445C13.2301 10.0238 13.3334 9.72927 13.3887 9.21324C13.4452 8.68596 13.4453 8.00058 13.4453 7.02379ZM14.6455 7.02379C14.6455 7.97428 14.646 8.73509 14.5811 9.34117C14.5149 9.95828 14.3756 10.4858 14.0479 10.9437C13.8436 11.229 13.5938 11.4788 13.3086 11.683C12.8507 12.0108 12.3232 12.15 11.7061 12.2162C11.1 12.2811 10.3391 12.2806 9.38867 12.2806H6.61035C5.66018 12.2806 4.89991 12.2811 4.29395 12.2162C3.67684 12.15 3.14935 12.0108 2.69141 11.683C2.40613 11.4788 2.15639 11.229 1.95215 10.9437C1.62436 10.4858 1.4841 9.95828 1.41797 9.34117C1.35305 8.73511 1.35449 7.97424 1.35449 7.02379C1.35449 6.07366 1.35308 5.31333 1.41797 4.70738C1.4841 4.09028 1.62436 3.56279 1.95215 3.10485C2.15638 2.81956 2.40613 2.56982 2.69141 2.36559C3.14935 2.03779 3.67684 1.89753 4.29395 1.83141C4.8999 1.76652 5.66022 1.76793 6.61035 1.76793H9.38867C10.3391 1.76793 11.1 1.76649 11.7061 1.83141C12.3232 1.89753 12.8507 2.03779 13.3086 2.36559C13.5939 2.56982 13.8436 2.81957 14.0479 3.10485C14.3756 3.56279 14.5149 4.09028 14.5811 4.70738C14.646 5.31335 14.6455 6.07362 14.6455 7.02379Z",fill:"currentColor"})]}),I9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{fillRule:"evenodd",clipRule:"evenodd",d:"M12.0997 8.54554C12.2905 8.54989 12.3541 8.58056 12.4535 8.74614L12.8849 9.46387C12.9851 9.63071 13.0464 9.66013 13.2388 9.66447H14.1138C14.3417 9.66448 14.3512 9.66937 14.4686 9.86507L14.892 10.5717C14.9942 10.7422 14.9948 10.8247 14.892 10.9961L14.4756 11.6906C14.3741 11.8677 14.3694 11.9379 14.4756 12.115L14.892 12.8096C14.9942 12.9801 14.9947 13.0625 14.892 13.234L14.4686 13.9406C14.3643 14.1028 14.3063 14.1354 14.1138 14.1412H13.2388C13.0465 14.1456 12.985 14.1752 12.8849 14.3418L12.4535 15.0595C12.353 15.2195 12.2895 15.2558 12.0997 15.2601H11.2237C10.9962 15.2601 10.9871 15.2548 10.8699 15.0595L10.4384 14.3418C10.3383 14.175 10.2767 14.1456 10.0846 14.1412H9.2096C9.01854 14.1355 8.95761 14.1006 8.85477 13.9406L8.43139 13.234C8.32562 13.0576 8.33148 12.9862 8.43139 12.8096L8.84771 12.115C8.95165 11.9416 8.94659 11.863 8.84771 11.6906L8.43139 10.9961C8.32767 10.8232 8.33411 10.7437 8.43139 10.5717L8.85477 9.86507C8.95447 9.69891 9.01875 9.67017 9.2096 9.66447H10.0846C10.2741 9.66441 10.3414 9.62547 10.4384 9.46387L10.8699 8.74614C10.987 8.55106 10.9963 8.54554 11.2237 8.54554H12.0997ZM11.6612 10.232C11.3326 10.7798 10.8155 11.0948 10.1743 11.106C10.4443 11.61 10.4425 12.1976 10.1743 12.6987C10.803 12.7096 11.3391 13.0359 11.6612 13.5727C11.9855 13.0323 12.5131 12.7098 13.148 12.6987C12.879 12.196 12.8789 11.6086 13.148 11.106C12.5076 11.0948 11.9894 10.7794 11.6612 10.232Z",fill:"currentColor"}),f.jsx("path",{fillRule:"evenodd",clipRule:"evenodd",d:"M7.51205 0.790627C9.19055 0.790649 10.7401 1.0691 11.892 1.54364C12.4664 1.78029 12.9719 2.07885 13.3436 2.4408C13.7171 2.80467 13.9916 3.27253 13.9918 3.82384V7.90442C13.6067 7.69532 13.1907 7.53597 12.7529 7.43366V5.66454C12.4928 5.82898 12.2028 5.97601 11.892 6.10405C10.74 6.57865 9.19071 6.85706 7.51205 6.85706C5.8337 6.85703 4.285 6.57852 3.13309 6.10405C2.82215 5.97593 2.53164 5.8291 2.27121 5.66454V7.4135C2.27134 7.75678 2.6066 8.27106 3.62502 8.73405C4.58641 9.17097 5.95762 9.45591 7.50499 9.45681C7.24582 9.83133 7.03684 10.2434 6.88706 10.6826C5.44388 10.6162 4.12516 10.3216 3.11192 9.86104C2.81708 9.72698 2.53185 9.56866 2.27121 9.38928V11.2542C2.27158 11.5974 2.60697 12.1109 3.62502 12.5737C4.41933 12.9347 5.4937 13.1898 6.71569 13.2693C6.80349 13.7128 6.9513 14.1345 7.14814 14.5273C5.60324 14.4862 4.18593 14.1889 3.11192 13.7007C2.01039 13.1998 1.03366 12.3814 1.03333 11.2542V3.82384C1.03352 3.27273 1.30721 2.80461 1.68049 2.4408C2.05211 2.07893 2.55887 1.78026 3.13309 1.54364C4.28492 1.06926 5.83393 0.790683 7.51205 0.790627ZM7.51205 2.02851C5.95492 2.02857 4.57354 2.29079 3.60486 2.68979C3.11958 2.88977 2.76667 3.11253 2.5454 3.32788C2.32671 3.54101 2.2714 3.7089 2.27121 3.82384C2.27121 3.93882 2.32624 4.10625 2.5454 4.3198C2.76667 4.53527 3.11927 4.75781 3.60486 4.9579C4.5736 5.35699 5.95467 5.61914 7.51205 5.61918C9.06942 5.61918 10.4505 5.35695 11.4192 4.9579C11.9051 4.75773 12.2584 4.53536 12.4797 4.3198C12.6988 4.10627 12.7529 3.93882 12.7529 3.82384C12.7527 3.70889 12.6984 3.54104 12.4797 3.32788C12.2584 3.11239 11.9049 2.88989 11.4192 2.68979C10.4505 2.29079 9.06925 2.02853 7.51205 2.02851Z",fill:"currentColor"})]}),$9=({size:n=14,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M7.24707 1.01771C7.52897 1.07653 7.77619 1.19694 8.00391 1.38001C8.19202 1.53136 8.39884 1.73784 8.61914 1.95814L12.6396 5.9806L11.6299 6.99134L7.71484 3.0763V13.0001H6.28516V3.0763L2.36914 6.99134L1.35938 5.9806L5.38086 1.95814C5.60116 1.73784 5.80798 1.53136 5.99609 1.38001C6.19476 1.22027 6.4385 1.06739 6.75195 1.01771C6.91296 0.992304 7.07471 0.997504 7.24707 1.01771Z",fill:"currentColor"})}),H9=({size:n=14,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M7.00049 0.199829C3.24488 0.199829 0.199952 3.24408 0.199707 6.99963C0.199707 8.0414 0.434087 9.03061 0.854004 9.91467L1.11279 10.4576L2.19775 9.94202L1.94092 9.39905L1.81787 9.12268C1.5498 8.46885 1.40186 7.75171 1.40186 6.99963C1.4021 3.90808 3.90888 1.40198 7.00049 1.40198C10.0919 1.40219 12.5979 3.90821 12.5981 6.99963C12.5981 10.0913 10.0921 12.5981 7.00049 12.5983C6.36734 12.5983 5.90348 12.5535 5.49268 12.4401C5.08803 12.3283 4.7041 12.1414 4.24463 11.8209C3.57111 11.3511 2.60588 11.1855 1.81006 11.6881L1.79736 11.6959L1.78467 11.7047L1.25537 12.0778L1.65381 13.2672L2.46045 12.6989C2.75029 12.5214 3.18004 12.5442 3.55615 12.8063C4.10063 13.1861 4.60863 13.4423 5.17334 13.5983C5.73194 13.7525 6.31665 13.8004 7.00049 13.8004C10.7561 13.8002 13.8003 10.7553 13.8003 6.99963C13.8 3.24421 10.7559 0.200041 7.00049 0.199829ZM3.81201 7.47327V8.67542H7.11572V7.47327H3.81201ZM3.81201 6.34924H10.2173V5.14709H3.81201V6.34924Z",fill:"currentColor"})}),V9=({size:n=14,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M13.3277 9.69629V10.976H7.28086V9.69629H13.3277Z",fill:"currentColor"}),f.jsx("path",{d:"M13.3277 2.97256V4.25225H7.28086V2.97256H13.3277Z",fill:"currentColor"}),f.jsx("path",{d:"M4.64512 10.336C4.64505 9.62755 4.07081 9.05322 3.3623 9.05322C2.65386 9.05329 2.07956 9.62759 2.07949 10.336C2.07949 11.0445 2.65382 11.6188 3.3623 11.6188C4.07085 11.6188 4.64512 11.0446 4.64512 10.336ZM5.92559 10.336C5.92559 11.7515 4.77777 12.8993 3.3623 12.8993C1.94689 12.8993 0.799805 11.7515 0.799805 10.336C0.799871 8.92066 1.94693 7.7736 3.3623 7.77354C4.77773 7.77354 5.92552 8.92062 5.92559 10.336Z",fill:"currentColor"}),f.jsx("path",{d:"M4.64531 3.6123C4.6453 2.90382 4.07098 2.32949 3.3625 2.32949C2.65403 2.32951 2.0797 2.90383 2.07969 3.6123C2.07969 4.32079 2.65402 4.8951 3.3625 4.89512C4.07099 4.89512 4.64531 4.3208 4.64531 3.6123ZM5.925 3.6123C5.925 5.02772 4.77792 6.1748 3.3625 6.1748C1.9471 6.17479 0.8 5.02771 0.8 3.6123C0.800013 2.19691 1.9471 1.04982 3.3625 1.0498C4.77791 1.0498 5.92499 2.1969 5.925 3.6123Z",fill:"currentColor"})]}),A9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M10.8239 3.54733V4.78443H4.63437V3.54733H10.8239Z",fill:"currentColor"}),f.jsx("path",{d:"M10.8239 6.12629V7.36338H4.63437V6.12629H10.8239Z",fill:"currentColor"}),f.jsx("path",{d:"M9.073 8.70524V9.94234H4.63437V8.70524H9.073Z",fill:"currentColor"}),f.jsx("path",{d:"M9.13321 0.573526C10.0076 0.573525 10.7179 0.572522 11.285 0.63397C11.8645 0.696791 12.3743 0.831648 12.8193 1.1548C13.0776 1.34246 13.3056 1.57047 13.4933 1.82875C13.8164 2.2737 13.9513 2.7836 14.0141 3.36303C14.0755 3.93015 14.0745 4.64049 14.0745 5.51485V6.1757L12.7327 7.5629V5.51485C12.7327 4.61092 12.732 3.9862 12.6803 3.5081C12.6298 3.0427 12.5379 2.79497 12.4083 2.61654C12.3033 2.47211 12.176 2.34472 12.0315 2.23977C11.8531 2.11016 11.6054 2.01823 11.14 1.96777C10.6618 1.91601 10.0372 1.91539 9.13321 1.91539H6.32658C5.42262 1.91539 4.79796 1.91604 4.31983 1.96777C3.85451 2.01819 3.60672 2.11029 3.42827 2.23977C3.28392 2.34465 3.15643 2.47223 3.0515 2.61654C2.9219 2.79496 2.82997 3.04274 2.7795 3.5081C2.72774 3.9862 2.72712 4.61092 2.72712 5.51485V10.023C2.72712 10.9273 2.72773 11.5525 2.7795 12.0307C2.82992 12.4959 2.92205 12.7429 3.0515 12.9213C3.15645 13.0657 3.28384 13.1931 3.42827 13.2981C3.60676 13.4277 3.85408 13.5206 4.31983 13.5711C4.79797 13.6228 5.42259 13.6234 6.32658 13.6234H6.87057L5.57707 14.9593C5.03527 14.9556 4.57031 14.9467 4.17476 14.9039C3.59508 14.841 3.08558 14.7063 2.64048 14.383C2.38215 14.1953 2.15422 13.9684 1.96653 13.7101C1.64319 13.2649 1.50851 12.7546 1.4457 12.1748C1.38432 11.6076 1.38525 10.8974 1.38525 10.023V5.51485C1.38525 4.64049 1.38426 3.93015 1.4457 3.36303C1.50853 2.78363 1.64341 2.27368 1.96653 1.82875C2.15417 1.57059 2.38228 1.34239 2.64048 1.1548C3.08544 0.831805 3.59533 0.696762 4.17476 0.63397C4.74193 0.572552 5.45218 0.573525 6.32658 0.573526H9.13321Z",fill:"currentColor"}),f.jsx("path",{d:"M14.2193 14.9553H10.0124L11.3744 13.6134H14.2193V14.9553Z",fill:"currentColor"}),f.jsx("path",{d:"M8.24493 13.3711L7.49015 14.8806C7.40148 15.058 7.58961 15.2461 7.76695 15.1574L9.27651 14.4027L14.6147 9.09934L13.5832 8.06775L8.24493 13.3711Z",fill:"currentColor"})]}),D9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M8 0C8.31451 0 8.62464 0.019379 8.92969 0.0546875C8.48228 0.403371 8.0952 0.825758 7.78809 1.30469C4.18586 1.41664 1.2998 4.37061 1.2998 8C1.2998 11.7003 4.29969 14.7002 8 14.7002C11.6297 14.7002 14.5829 11.8136 14.6943 8.21094C15.1734 7.90377 15.5956 7.51688 15.9443 7.06934C15.9797 7.37473 16 7.68512 16 8C16 12.4183 12.4183 16 8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0ZM7.0166 3.6084C7.00658 3.73765 7 3.86817 7 4C7 4.31845 7.03098 4.62973 7.08789 4.93164C5.76489 5.32438 4.7998 6.54958 4.7998 8C4.7998 9.76731 6.23269 11.2002 8 11.2002C9.45065 11.2002 10.6749 10.2345 11.0674 8.91113C11.3696 8.96818 11.6812 9 12 9C12.1315 9 12.2617 8.99239 12.3906 8.98242C11.9423 10.995 10.1477 12.5 8 12.5C5.51472 12.5 3.5 10.4853 3.5 8C3.5 5.85255 5.00435 4.05702 7.0166 3.6084Z",fill:"currentColor"}),f.jsx("path",{d:"M7.5 8.62109L9.12109 7",stroke:"currentColor",strokeWidth:"1.3"}),f.jsx("path",{d:"M9.08245 3.35798L11.8651 0.575334C11.895 0.545384 11.9463 0.56391 11.9502 0.606086L12.2362 3.69859C12.2384 3.72259 12.2574 3.74159 12.2814 3.74378L15.3697 4.02583C15.4119 4.02968 15.4305 4.08101 15.4005 4.11098L12.618 6.89351C12.6086 6.90289 12.5959 6.90816 12.5826 6.90816L9.11781 6.90815C9.09019 6.90816 9.06781 6.88577 9.06781 6.85816L9.06781 3.39333C9.06781 3.38007 9.07308 3.36735 9.08245 3.35798Z",stroke:"currentColor",strokeWidth:"1.3"})]}),F9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M6.1 3.1Q6.6 7.8 11.3 8.3Q6.6 8.8 6.1 13.5Q5.6 8.8 0.9 8.3Q5.6 7.8 6.1 3.1Z",fill:"currentColor"}),f.jsx("path",{d:"M11.9 1Q12.2 3.7 14.9 4Q12.2 4.3 11.9 7Q11.6 4.3 8.9 4Q11.6 3.7 11.9 1Z",fill:"currentColor"}),f.jsx("path",{d:"M12.5 9.4Q12.7 11.4 14.7 11.6Q12.7 11.8 12.5 13.8Q12.3 11.8 10.3 11.6Q12.3 11.4 12.5 9.4Z",fill:"currentColor"})]}),B9=({size:n=12,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg","aria-hidden":!0,children:f.jsx("path",{d:"M16 8L10.8571 12V10.552L14.1383 8L10.8571 5.448V4L16 8ZM5.14286 10.552L1.86171 8L5.14286 5.448V4L0 8L5.14286 12V10.552ZM9.02514 4L5.59657 12H6.84057L10.2691 4H9.02514Z",fill:"currentColor"})}),z9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M12.5113 15.4067C12.4395 15.6249 12.1308 15.6249 12.059 15.4067L11.643 14.1416C11.454 13.567 11.0033 13.1164 10.4288 12.9274L9.16369 12.5113C8.94544 12.4395 8.94544 12.1308 9.16369 12.059L10.4288 11.643C11.0033 11.454 11.454 11.0033 11.643 10.4288L12.059 9.16369C12.1308 8.94544 12.4395 8.94544 12.5113 9.16369L12.9274 10.4288C13.1164 11.0033 13.567 11.454 14.1416 11.643L15.4067 12.059C15.6249 12.1308 15.6249 12.4395 15.4067 12.5113L14.1416 12.9274C13.567 13.1164 13.1164 13.567 12.9274 14.1416L12.5113 15.4067Z",fill:"currentColor"}),f.jsx("path",{d:"M9.02246 0.546878C9.9822 0.546878 10.7564 0.545403 11.374 0.612307C12.0042 0.680586 12.5515 0.826244 13.0273 1.17188C13.3052 1.37376 13.5501 1.61868 13.752 1.89649C14.0975 2.37225 14.2432 2.91984 14.3115 3.54981C14.3784 4.16727 14.377 4.94206 14.377 5.90137V8.51367C13.9611 8.29533 13.5071 8.13985 13.0273 8.06055V5.90137C13.0273 4.9121 13.0259 4.22322 12.9688 3.69532C12.9129 3.18044 12.8098 2.89782 12.6592 2.69043C12.5406 2.52724 12.3966 2.38326 12.2334 2.26465C12.026 2.11404 11.7437 2.0109 11.2285 1.95508C10.7005 1.89789 10.0122 1.89649 9.02246 1.89649H6.55371C5.56395 1.89649 4.87569 1.89787 4.34766 1.95508C3.83242 2.01092 3.55022 2.11398 3.34278 2.26465C3.17953 2.38329 3.03564 2.52719 2.91699 2.69043C2.76642 2.89782 2.66325 3.18042 2.60742 3.69532C2.55027 4.22322 2.54883 4.9121 2.54883 5.90137V10.0986C2.54883 11.0878 2.55031 11.7768 2.60742 12.3047C2.66326 12.8196 2.76642 13.1032 2.91699 13.3105C3.03558 13.4736 3.17966 13.6178 3.34278 13.7363C3.5502 13.8869 3.83265 13.9901 4.34766 14.0459C4.87568 14.1031 5.56398 14.1035 6.55371 14.1035H8.08399C8.27443 14.6025 8.55077 15.0585 8.89551 15.4541H6.55371C5.59402 15.4541 4.81976 15.4546 4.20215 15.3877C3.57204 15.3194 3.02468 15.1738 2.54883 14.8281C2.27111 14.6263 2.02606 14.3813 1.82422 14.1035C1.47883 13.6278 1.33293 13.08 1.26465 12.4502C1.19783 11.8327 1.19922 11.0579 1.19922 10.0986V5.90137C1.19922 4.94206 1.1978 4.16727 1.26465 3.54981C1.33295 2.91984 1.47867 2.37225 1.82422 1.89649C2.02613 1.61864 2.27098 1.37379 2.54883 1.17188C3.02472 0.826181 3.57197 0.6806 4.20215 0.612307C4.81976 0.545393 5.594 0.546877 6.55371 0.546878H9.02246ZM9.19629 9.14649H4.5459V7.84571H9.19629V9.14649ZM11.0303 6.10645H4.5459V4.80567H11.0303V6.10645Z",fill:"currentColor"})]}),Z9=({size:n=14,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M12.5757 7.00012C12.5757 3.92085 10.0794 1.42463 7.00012 1.42456C3.9208 1.42456 1.42456 3.9208 1.42456 7.00012C1.42463 10.0794 3.92085 12.5757 7.00012 12.5757C10.0793 12.5756 12.5756 10.0793 12.5757 7.00012ZM13.8002 7.00012C13.8001 10.7559 10.7559 13.8001 7.00012 13.8002C3.2443 13.8002 0.199291 10.7559 0.199219 7.00012C0.199219 3.24426 3.24426 0.199219 7.00012 0.199219C10.7559 0.199291 13.8002 3.2443 13.8002 7.00012Z",fill:"currentColor"}),f.jsx("path",{d:"M6.18042 8.68184C6.18043 8.09153 6.32893 7.34655 6.92127 6.8481C7.28566 6.54148 7.76104 6.27318 8.0022 6.10811C8.28964 5.91137 8.42234 5.76562 8.48328 5.58944C8.57774 5.31609 8.53121 5.00904 8.34912 4.76741C8.17409 4.53522 7.83879 4.32222 7.28186 4.32222C5.99668 4.32225 5.46969 5.11832 5.46949 5.78939H4.24414C4.24436 4.39942 5.36327 3.09691 7.28186 3.09688C8.17773 3.09688 8.89489 3.45606 9.32752 4.02999C9.75287 4.59438 9.86938 5.32775 9.64026 5.99019C9.44847 6.5444 9.04722 6.87743 8.69434 7.11898C8.29506 7.39226 8.02318 7.52192 7.70996 7.78548C7.51943 7.94582 7.40577 8.24899 7.40577 8.68184V8.75533H6.18042V8.68184Z",fill:"currentColor"}),f.jsx("path",{d:"M7.39455 9.44026V10.8109H6.16921V9.44026H7.39455Z",fill:"currentColor"})]}),U9=({size:n=20,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 20 20",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{fillRule:"evenodd",clipRule:"evenodd",d:"M15.8659 2.05975C17.2603 2.05995 18.3913 3.19096 18.3914 4.58527V5.4874C18.3914 6.02747 18.2192 6.52672 17.9303 6.93735C17.9336 6.96524 17.9388 6.99318 17.9388 7.02195V12.8884C17.9388 13.6345 17.9395 14.2379 17.8996 14.7254C17.8642 15.1593 17.7936 15.5499 17.6373 15.9141L17.5654 16.0685C17.278 16.6328 16.8405 17.1046 16.3038 17.434L16.0679 17.5661C15.66 17.7739 15.2196 17.8598 14.7237 17.9003C14.2362 17.9401 13.6327 17.9405 12.8867 17.9405H7.11122C6.36511 17.9405 5.76171 17.9401 5.27418 17.9003C4.84051 17.8649 4.44949 17.7952 4.08545 17.6391L3.93104 17.5661C3.36673 17.2785 2.89392 16.8414 2.56465 16.3044L2.43245 16.0685C2.22473 15.6608 2.13878 15.2211 2.09825 14.7254C2.05841 14.2379 2.05912 13.6345 2.05912 12.8884V7.02195C2.05912 6.99284 2.06422 6.96449 2.06758 6.93629C1.77931 6.52592 1.60858 6.02687 1.60858 5.4874V4.58527C1.60876 3.19084 2.73962 2.05975 4.1341 2.05975H15.8659ZM16.4984 7.92936C16.296 7.98169 16.0847 8.01288 15.8659 8.01291H4.1341C3.91478 8.01291 3.70246 7.98194 3.49955 7.92936V12.8884C3.49955 13.6582 3.50053 14.1927 3.53445 14.608C3.56769 15.0146 3.62923 15.244 3.71635 15.415L3.7925 15.5514C3.98339 15.8627 4.25749 16.1165 4.58464 16.2833L4.72529 16.3435C4.88095 16.3993 5.08638 16.4402 5.39158 16.4651C5.80685 16.4991 6.34138 16.5001 7.11122 16.5001H12.8867C13.6564 16.5001 14.1911 16.499 14.6063 16.4651C15.0128 16.432 15.2423 16.3703 15.4133 16.2833L15.5508 16.2061C15.8618 16.0152 16.116 15.7419 16.2827 15.415L16.3429 15.2732C16.3985 15.1177 16.4396 14.9128 16.4645 14.608C16.4985 14.1927 16.4984 13.6583 16.4984 12.8884V7.92936ZM4.1341 3.50019C3.53511 3.50019 3.0492 3.98631 3.04902 4.58527V5.4874C3.04902 6.08649 3.535 6.57248 4.1341 6.57248H15.8659C16.4648 6.57228 16.951 6.08638 16.951 5.4874V4.58527C16.9509 3.98644 16.4647 3.50038 15.8659 3.50019H4.1341Z",fill:"currentColor"}),f.jsx("path",{d:"M12.7962 12.5661V11.0832H7.20548V12.5661L12.7962 12.5661Z",fill:"currentColor"})]}),W9="_root_9cl6j_3",q9="_row_9cl6j_10",Q9="_leading_9cl6j_23",K9="_iconIdle_9cl6j_42",J9="_chevronHover_9cl6j_48",G9="_title_9cl6j_64",Fn={root:W9,row:q9,leading:Q9,iconIdle:K9,chevronHover:J9,title:G9};function Y9({icon:n,title:r,open:i,expandable:s,onToggle:u,expandOnRowClick:c=!1,previewChevron:h=s,keepContentWhenOpen:p=!1,collapsedContent:g,children:C,className:v,rowClassName:L,leadingClassName:w,chevronClassName:_,titleClassName:k}){const E=s&&c,T=ee=>{ee.stopPropagation(),u()},B=ee=>{!E||ee.key!=="Enter"&&ee.key!==" "||(ee.preventDefault(),u())},W=h?f.jsxs(f.Fragment,{children:[f.jsx("span",{className:Fn.iconIdle,children:n}),f.jsx(Bl,{className:ye(_,Fn.chevronHover)})]}):n,z=i?f.jsx(Bl,{className:_}):W;return f.jsxs("div",{className:ye(Fn.root,v),"data-open":i||void 0,children:[f.jsxs("div",{className:ye(Fn.row,L),"data-disclosure-row":!0,"data-expandable":E||void 0,role:E?"button":void 0,tabIndex:E?0:void 0,"aria-expanded":E?i:void 0,onClick:E?u:void 0,onKeyDown:E?B:void 0,children:[s&&!E?f.jsx("button",{type:"button",className:ye(Fn.leading,w),"aria-expanded":i,onClick:T,children:z}):f.jsx("span",{className:ye(Fn.leading,w),children:z}),f.jsx("span",{className:ye(Fn.title,k),children:r}),(p||!i)&&g]}),i&&C]})}const X9="_button_kz6gm_4",e7="_md_kz6gm_24",t7="_sm_kz6gm_30",n7="_primary_kz6gm_38",r7="_ghost_kz6gm_47",o7="_outline_kz6gm_56",i7="_toolbar_kz6gm_65",s7="_icon_kz6gm_73",Fo={button:X9,md:e7,sm:t7,primary:n7,ghost:r7,outline:o7,toolbar:i7,icon:s7};function zl({variant:n="ghost",size:r="md",icon:i,className:s,children:u,...c}){return f.jsxs("button",{type:"button",className:ye(Fo.button,Fo[n],Fo[r],s),...c,children:[i!=null&&f.jsx("span",{className:Fo.icon,children:i}),u]})}const l7="_pill_e3ygd_1",u7="_interactive_e3ygd_15",a7="_active_e3ygd_23",m1={pill:l7,interactive:u7,active:a7};function J3({active:n=!1,className:r,children:i,onClick:s,...u}){return s?f.jsx("button",{type:"button",className:ye(m1.pill,m1.interactive,n&&m1.active,r),onClick:s,...u,children:i}):f.jsx("span",{className:ye(m1.pill,n&&m1.active,r),children:i})}const c7="_wrap_1ao1y_1",f7="_icon_1ao1y_16",d7="_input_1ao1y_25",wl={wrap:c7,icon:f7,input:d7};function h7({icon:n,className:r,...i}){return f.jsxs("span",{className:ye(wl.wrap,r),children:[n!=null&&f.jsx("span",{className:wl.icon,children:n}),f.jsx("input",{className:wl.input,...i})]})}const p7=200;function G3(n){const r=R.useRef(null),i=R.useRef(n);i.current=n;const s=R.useCallback(()=>{r.current!==null&&(clearTimeout(r.current),r.current=null)},[]),u=R.useCallback(()=>{s(),r.current=setTimeout(()=>{r.current=null,i.current()},p7)},[s]);return R.useEffect(()=>s,[s]),{arm:u,cancel:s}}const m7="_root_19372_1",C7="_list_19372_8",g7="_submenu_19372_9",v7="_portal_19372_43",y7="_sideTop_19372_51",w7="_alignEnd_19372_56",x7="_scrollable_19372_21",_7="_viewport_19372_21",L7="_footer_19372_63",k7="_itemWrap_19372_91",S7="_item_19372_91",j7="_denseList_19372_118",E7="_label_19372_123",b7="_compactList_19372_127",M7="_itemIcon_19372_143",O7="_separator_19372_81",N7="_itemLabel_19372_173",R7="_check_19372_181",P7="_selected_19372_188",T7="_danger_19372_193",Te={root:m7,list:C7,submenu:g7,portal:v7,sideTop:y7,alignEnd:w7,scrollable:x7,viewport:_7,footer:L7,itemWrap:k7,item:S7,denseList:j7,label:E7,compactList:b7,itemIcon:M7,separator:O7,itemLabel:N7,check:R7,selected:P7,danger:T7};function Z0(n){return"type"in n&&n.type==="separator"}function U0(n){return"type"in n&&n.type==="label"}const I7={visibility:"hidden",left:0,top:0};function Y3({open:n,anchor:r,items:i,selectedId:s,selectedIds:u,onSelect:c,onClose:h,align:p="start",side:g="bottom",portal:C=!1,closeOnPointerLeave:v=!1,dense:L=!1,compact:w=!1,getAnchorRect:_,footer:k,className:E}){const T=R.useRef(null),B=R.useRef(null),[W,z]=R.useState(null),[ee,Q]=R.useState(null),{arm:V,cancel:Z}=G3(h);R.useLayoutEffect(()=>{if(!n||!C){Q(null);return}const q=()=>{var j;let ce;if(_!==void 0?ce=_():ce=((j=T.current)==null?void 0:j.getBoundingClientRect())??null,ce===null)return;const le=12,he=window.innerWidth,pe=window.innerHeight,Se=B.current,we=(Se==null?void 0:Se.offsetWidth)??0,U=(Se==null?void 0:Se.offsetHeight)??0;let ie,K;g==="right"?(ie=ce.right+4,K=ce.top):p==="start"?(ie=ce.left,K=g==="bottom"?ce.bottom+4:ce.top-U-4):(ie=ce.right-we,K=g==="bottom"?ce.bottom+4:ce.top-U-4),we>0&&(ie=Math.min(Math.max(ie,le),he-we-le)),U>0&&(K=Math.min(Math.max(K,le),pe-U-le)),Q({left:ie,top:K})};return q(),window.addEventListener("scroll",q,!0),window.addEventListener("resize",q),()=>{window.removeEventListener("scroll",q,!0),window.removeEventListener("resize",q)}},[n,C,p,g,_]),R.useEffect(()=>{if(!n){z(null);return}const q=le=>{var he,pe;le.target instanceof Node&&((he=T.current)==null?void 0:he.contains(le.target))!==!0&&((pe=B.current)==null?void 0:pe.contains(le.target))!==!0&&h()},ce=le=>{le.key==="Escape"&&h()};return document.addEventListener("pointerdown",q),document.addEventListener("keydown",ce),()=>{document.removeEventListener("pointerdown",q),document.removeEventListener("keydown",ce)}},[n,h]),R.useEffect(()=>{n||Z()},[n,Z]);const ne=!i.some(q=>!Z0(q)&&!U0(q)&&q.submenu!==void 0&&q.submenu.length>0),I=q=>{if(Z0(q))return f.jsx("div",{className:Te.separator,role:"separator"},q.id);if(U0(q))return f.jsx("div",{className:Te.label,role:"presentation",children:q.text},q.id);const ce=q.submenu!==void 0&&q.submenu.length>0,le=ce&&W===q.id,he=q.id===s||(u==null?void 0:u.includes(q.id))===!0;return f.jsxs("div",{className:Te.itemWrap,onMouseEnter:()=>{z(ce?q.id:null)},onMouseLeave:()=>{z(null)},children:[f.jsxs("button",{type:"button",role:"menuitem",className:ye(Te.item,he&&Te.selected,q.danger===!0&&Te.danger),disabled:q.disabled,"aria-haspopup":ce?"menu":void 0,"aria-expanded":ce?le:void 0,onFocus:()=>{z(ce?q.id:null)},onClick:()=>{if(ce){z(q.id);return}c(q.id)},children:[q.icon!==void 0&&f.jsx("span",{className:Te.itemIcon,children:q.icon}),f.jsx("span",{className:Te.itemLabel,children:q.label}),he&&f.jsx(cu,{className:Te.check})]}),le&&q.submenu!==void 0&&f.jsx("div",{className:ye(Te.submenu,w&&Te.compactList),role:"menu",children:q.submenu.map(pe=>f.jsxs("button",{type:"button",role:"menuitem",className:Te.item,disabled:pe.disabled,onClick:()=>{c(pe.id)},children:[pe.icon!==void 0&&f.jsx("span",{className:Te.itemIcon,children:pe.icon}),f.jsx("span",{className:Te.itemLabel,children:pe.label})]},pe.id))})]},q.id)},J=n&&f.jsxs("div",{ref:B,className:ye(Te.list,L&&Te.denseList,w&&Te.compactList,ne&&Te.scrollable,C&&Te.portal,g==="top"&&!C&&Te.sideTop,p==="end"&&!C&&Te.alignEnd),style:C?ee??I7:void 0,role:"menu",onClick:q=>{q.stopPropagation()},children:[f.jsx("div",{className:Te.viewport,role:"presentation",children:i.map(I)}),k!==void 0&&k.length>0&&f.jsx("div",{className:Te.footer,role:"presentation",children:k.map(I)})]});return f.jsxs("span",{ref:T,className:ye(Te.root,E),onPointerEnter:v?Z:void 0,onPointerLeave:v?()=>{n&&V()}:void 0,children:[r,C?J!==!1&&ln.createPortal(J,document.body):J]})}const $7=12;function H7(n,r,i){const[s,u]=R.useState(r);return R.useLayoutEffect(()=>{const c=n.current;if(c===null)return;const h=()=>{u(Math.min(r,Math.max(0,c.getBoundingClientRect().bottom-$7)))};return h(),window.addEventListener("resize",h),window.addEventListener("scroll",h,!0),()=>{window.removeEventListener("resize",h),window.removeEventListener("scroll",h,!0)}},[n,r,i]),s}function V7(n,r,i){R.useEffect(()=>{if(!r)return;const s=u=>{var c;u.target instanceof Node&&!((c=n.current)!=null&&c.contains(u.target))&&i(!1)};return document.addEventListener("pointerdown",s),()=>{document.removeEventListener("pointerdown",s)}},[n,r,i])}async function br(n){var s;if((s=navigator.clipboard)!=null&&s.writeText)try{return await navigator.clipboard.writeText(n),!0}catch{return!1}const r=typeof document.execCommand=="function"?document.execCommand.bind(document):void 0;if(r===void 0)return!1;const i=document.createElement("textarea");i.value=n,i.setAttribute("readonly",""),i.style.position="fixed",i.style.left="-9999px",document.body.appendChild(i),i.select();try{return r("copy")}catch{return!1}finally{i.remove()}}const A7="_root_1b2ny_3",D7="_card_1b2ny_13",F7="_copyable_1b2ny_25",B7="_feedback_1b2ny_34",z7="_copied_1b2ny_40",Z7="_status_1b2ny_47",xr={root:A7,card:D7,copyable:F7,feedback:B7,copied:z7,status:Z7};function U7({anchor:n,content:r,openDelayMs:i=500,disabled:s=!1,copyText:u,copyLabel:c="复制",copiedLabel:h="复制成功"}){const p=R.useRef(null),g=R.useRef(null),C=R.useRef(null),v=R.useRef(null),L=R.useRef(null),w=R.useRef(0),_=R.useRef(!1),k=R.useRef(!0),[E,T]=R.useState(!1),[B,W]=R.useState(null),[z,ee]=R.useState(!1),Q=R.useCallback(()=>{v.current!==null&&(clearTimeout(v.current),v.current=null),L.current=null,ee(!1)},[]),V=R.useCallback(()=>{w.current+=1,Q(),T(!1)},[Q]),{arm:Z,cancel:ne}=G3(V),I=()=>{C.current!==null&&(clearTimeout(C.current),C.current=null)};R.useEffect(()=>{s&&(I(),ne(),V())},[s,ne,V]),R.useEffect(()=>(k.current=!0,()=>{k.current=!1,w.current+=1,I(),v.current!==null&&(clearTimeout(v.current),v.current=null)}),[]),R.useLayoutEffect(()=>{if(!E){W(null);return}const le=()=>{var U;const he=p.current;if(he===null)return;const pe=he.getBoundingClientRect(),Se=((U=g.current)==null?void 0:U.offsetHeight)??0,we=pe.top+Se>window.innerHeight-8?window.innerHeight-Se-8:pe.top;W({left:pe.right+8,top:we})};return le(),window.addEventListener("scroll",le,!0),window.addEventListener("resize",le),()=>{window.removeEventListener("scroll",le,!0),window.removeEventListener("resize",le)}},[E]),R.useLayoutEffect(()=>{var he;if(!E||B===null)return;const le=((he=g.current)==null?void 0:he.offsetHeight)??0;B.top+le>window.innerHeight-8&&W({left:B.left,top:window.innerHeight-le-8})},[E,B]);const J=async le=>{if(z||_.current)return;_.current=!0;const he=w.current,pe=await br(le);_.current=!1;const Se=g.current;if(!pe||!k.current||he!==w.current||Se===null)return;const we=Se.offsetHeight;L.current=we>0?we:null,ee(!0),v.current=setTimeout(Q,1e3)},q=u!==void 0,ce=E&&B!==null&&f.jsx("div",{ref:g,className:`${xr.card}${q?` ${xr.copyable}`:""}${z?` ${xr.feedback}`:""}`,style:{...B,minHeight:z&&L.current!==null?L.current:void 0},role:q?"button":void 0,tabIndex:q?0:void 0,"aria-label":q?`${c}: ${u}`:void 0,onClick:q?le=>{const he=window.getSelection();if(he!==null&&!he.isCollapsed){for(let pe=0;pe{le.key!=="Enter"&&le.key!==" "||(le.preventDefault(),J(u))}:void 0,children:z?f.jsx("span",{className:xr.copied,"aria-hidden":"true",children:h}):r});return f.jsxs("span",{ref:p,className:xr.root,onPointerEnter:()=>{s||(ne(),!E&&(I(),C.current=setTimeout(()=>{T(!0)},i)))},onPointerLeave:()=>{I(),E&&Z()},onPointerDownCapture:le=>{var he;(he=g.current)!=null&&he.contains(le.target)||(I(),ne(),V())},children:[n,E&&q&&f.jsx("span",{className:xr.status,role:"status",children:z?h:""}),ce!==!1&&ln.createPortal(ce,document.body)]})}const W7="_root_15u5s_2",q7="_mask_15u5s_14",Q7="_dialog_15u5s_22",K7="_content_15u5s_37",J7="_header_15u5s_45",G7="_title_15u5s_53",Y7="_close_15u5s_61",X7="_description_15u5s_80",ef="_body_15u5s_89",tf="_footer_15u5s_97",Ut={root:W7,mask:q7,dialog:Q7,content:K7,header:J7,title:G7,close:Y7,description:X7,body:ef,footer:tf};function X3({open:n,onClose:r,title:i,closeLabel:s="Close",description:u,children:c,footer:h,className:p,contentClassName:g,headless:C=!1}){return R.useEffect(()=>{if(!n)return;const v=L=>{L.key==="Escape"&&r()};return document.addEventListener("keydown",v),()=>{document.removeEventListener("keydown",v)}},[n,r]),n?ln.createPortal(f.jsxs("div",{className:Ut.root,role:"presentation",children:[f.jsx("div",{className:Ut.mask,"aria-hidden":"true",onClick:r}),f.jsx("div",{className:ye(Ut.dialog,p),role:"dialog","aria-modal":"true","aria-label":i,children:C?c:f.jsxs(f.Fragment,{children:[f.jsxs("div",{className:ye(Ut.content,g),children:[f.jsxs("div",{className:Ut.header,children:[f.jsx("h2",{className:Ut.title,children:i}),f.jsx("button",{type:"button",className:Ut.close,"aria-label":s,onClick:r,children:f.jsx(fu,{size:14})})]}),u!==void 0&&u!==""&&f.jsx("p",{className:Ut.description,children:u}),c!==void 0&&f.jsx("div",{className:Ut.body,children:c})]}),h!==void 0&&f.jsx("div",{className:Ut.footer,children:h})]})})]}),document.body):null}const nf="_onboardingOverlay_1cfrq_3",rf="_onboardingMask_1cfrq_10",of="_onboardingStage_1cfrq_21",xl={onboardingOverlay:nf,onboardingMask:rf,onboardingStage:of};function sf({children:n}){return R.useEffect(()=>{const r=document.getElementById("root");if(r!==null)return r.inert=!0,()=>{r.inert=!1}},[]),ln.createPortal(f.jsxs("div",{className:xl.onboardingOverlay,role:"presentation",children:[f.jsx("div",{className:xl.onboardingMask,"aria-hidden":"true"}),f.jsx("div",{className:xl.onboardingStage,children:n})]}),document.body)}const lf="_confirmation_1nu42_1",uf="_confirmationContent_1nu42_7",af="_warning_1nu42_19",cf="_warningIcon_1nu42_32",ff="_acknowledgement_1nu42_38",df="_modalAction_1nu42_67",hf="_confirmAction_1nu42_71",Bn={confirmation:lf,confirmationContent:uf,warning:af,warningIcon:cf,acknowledgement:ff,modalAction:df,confirmAction:hf};function pf({open:n,title:r,description:i,acknowledgeLabel:s,cancelLabel:u,confirmLabel:c,acknowledged:h,disabled:p=!1,onAcknowledgedChange:g,onCancel:C,onConfirm:v}){return f.jsxs(X3,{open:n,onClose:C,title:r,className:Bn.confirmation,contentClassName:Bn.confirmationContent,footer:f.jsxs(f.Fragment,{children:[f.jsx(zl,{variant:"outline",className:Bn.modalAction,onClick:C,children:u}),f.jsx(zl,{variant:"primary",className:Bn.confirmAction,disabled:p||!h,onClick:v,children:c})]}),children:[f.jsxs("div",{className:Bn.warning,children:[f.jsx(K3,{size:18,className:Bn.warningIcon}),f.jsx("p",{children:i})]}),f.jsxs("label",{className:Bn.acknowledgement,children:[f.jsx("input",{type:"checkbox",checked:h,disabled:p,autoFocus:!0,onChange:L=>{g(L.currentTarget.checked)}}),f.jsx("span",{children:s})]})]})}const mf="_banner_ugy7y_1",Cf={banner:mf};function gf({reconnecting:n,label:r="连接已断开，正在重连…"}){return n?f.jsx("div",{className:Cf.banner,children:r}):null}function vf({size:n=24,className:r}){return f.jsx("svg",{width:n,height:n*17.04/23.16,className:r,viewBox:"0 0 23.16 17.04",fill:"none","aria-hidden":"true",children:f.jsx("path",{d:"M22.9168 1.43018C22.6713 1.31018 22.5658 1.53918 22.4223 1.65519C22.3733 1.69269 22.3318 1.74169 22.2903 1.78669C21.9317 2.1697 21.5127 2.42121 20.9657 2.39121C20.1657 2.34621 19.4827 2.59771 18.8787 3.20973C18.7502 2.45521 18.3236 2.0047 17.6746 1.71569C17.3351 1.56568 16.9916 1.41518 16.7536 1.08867C16.5876 0.856163 16.5421 0.597155 16.4591 0.341647C16.4061 0.187643 16.3536 0.0301382 16.1761 0.00363739C15.9836 -0.0263635 15.9081 0.135141 15.8326 0.270145C15.5306 0.822162 15.4136 1.43018 15.4251 2.0462C15.4516 3.43174 16.0366 4.53527 17.1991 5.3203C17.3311 5.4103 17.3651 5.5003 17.3236 5.63181C17.2441 5.90231 17.1501 6.16482 17.0671 6.43533C17.0141 6.60784 16.9351 6.64584 16.7501 6.57033C16.1121 6.30383 15.5611 5.90931 15.074 5.4328C14.2475 4.63328 13.5 3.75075 12.568 3.05973C12.349 2.89822 12.13 2.74822 11.9034 2.60522C10.9524 1.68169 12.028 0.923165 12.277 0.833162C12.5375 0.739159 12.3675 0.41615 11.5259 0.42015C10.6844 0.42365 9.91439 0.705658 8.93286 1.08117C8.78935 1.13767 8.63835 1.17867 8.48384 1.21267C7.59332 1.04367 6.66829 1.00617 5.70226 1.11517C3.88321 1.31768 2.43016 2.1777 1.36213 3.64575C0.0790928 5.4103 -0.222916 7.41536 0.146595 9.50642C0.535106 11.7105 1.66014 13.535 3.38869 14.9616C5.18125 16.4406 7.24581 17.1657 9.60138 17.0266C11.0319 16.9441 12.6245 16.7526 14.421 15.2321C14.874 15.4576 15.3496 15.5476 16.1381 15.6151C16.7456 15.6716 17.3306 15.5851 17.7836 15.4911C18.4931 15.3411 18.4441 14.6841 18.1876 14.5636C16.1081 13.595 16.5646 13.9891 16.1496 13.67C17.2061 12.42 18.8202 10.1979 19.3182 7.17235C19.3672 6.83834 19.4297 6.36783 19.4222 6.09732C19.4182 5.93231 19.4562 5.86831 19.6447 5.84931C20.1657 5.78931 20.6712 5.64681 21.1357 5.3913C22.4833 4.65528 23.0268 3.44624 23.1548 1.9972C23.1738 1.77569 23.1508 1.54668 22.9168 1.43018ZM11.1749 14.4736C9.15936 12.889 8.18184 12.3675 7.77832 12.39C7.40081 12.4125 7.46881 12.8445 7.55182 13.126C7.63882 13.404 7.75182 13.5955 7.91033 13.8396C8.01983 14.0011 8.09533 14.2411 7.80083 14.4216C7.15181 14.8231 6.02327 14.2866 5.97027 14.2601C4.65673 13.4865 3.5587 12.4655 2.78467 11.069C2.03715 9.72493 1.60314 8.28289 1.53164 6.74384C1.51264 6.37233 1.62214 6.24082 1.99215 6.17332C2.47916 6.08332 2.98118 6.06432 3.46769 6.13582C5.52476 6.43633 7.27581 7.35586 8.74385 8.8129C9.58188 9.64243 10.2159 10.634 10.8689 11.6025C11.5634 12.631 12.3105 13.611 13.262 14.4146C13.598 14.6961 13.866 14.9101 14.1225 15.0681C13.349 15.1546 12.058 15.1731 11.1749 14.4746L11.1749 14.4736ZM12.141 8.25988C12.141 8.09488 12.273 7.96338 12.439 7.96338C12.4765 7.96338 12.5105 7.97088 12.541 7.98188C12.5825 7.99688 12.6205 8.01938 12.6505 8.05338C12.7035 8.10588 12.7335 8.18088 12.7335 8.25988C12.7335 8.42489 12.6015 8.55639 12.4355 8.55639C12.2695 8.55639 12.141 8.42489 12.141 8.25988ZM15.1415 9.79893C14.949 9.87793 14.7565 9.94544 14.5715 9.95294C14.2845 9.96794 13.9715 9.85143 13.8015 9.70893C13.5375 9.48742 13.3485 9.36342 13.2695 8.97691C13.2355 8.8119 13.2545 8.55639 13.2845 8.40989C13.3525 8.09438 13.277 7.89187 13.0545 7.70787C12.8735 7.55786 12.643 7.51636 12.39 7.51636C12.2955 7.51636 12.209 7.47486 12.1445 7.44136C12.039 7.38886 11.9519 7.25735 12.035 7.09585C12.0615 7.04335 12.19 6.91584 12.22 6.89334C12.5635 6.69784 12.9595 6.76184 13.326 6.90834C13.6655 7.04735 13.9225 7.30236 14.292 7.66287C14.6695 8.09838 14.7375 8.21838 14.9525 8.54539C15.1225 8.8009 15.277 9.06341 15.3831 9.36392C15.4471 9.55142 15.3641 9.70493 15.1415 9.79893Z",fill:"currentColor"})})}function yf({size:n=24,className:r}){return f.jsxs("svg",{width:n*182/24,height:n,className:r,viewBox:"0 0 182 24",fill:"none","aria-hidden":"true",children:[f.jsx("path",{d:"M68.416 18.2447H67.0501V16.1272H68.416C69.2619 16.1272 70.1166 15.9163 70.6671 15.3304C71.2181 14.7444 71.426 13.8455 71.426 12.9471C71.426 12.0487 71.2268 11.1498 70.6671 10.5643C70.1083 9.97831 69.2619 9.76744 68.416 9.76744C67.5701 9.76744 66.7154 9.97831 66.1639 10.5643C65.6129 11.1503 65.4049 12.0487 65.4049 12.9471V21.6435H63.009V7.6582H65.4049V8.54883H65.8442C65.8918 8.49393 65.9394 8.44728 65.9875 8.40064C66.5871 7.85353 67.5049 7.6582 68.4072 7.6582C69.8212 7.6582 71.2341 8.00998 72.1607 8.98662C73.0868 9.96325 73.4143 11.4632 73.4143 12.9558C73.4143 14.4485 73.0785 15.9406 72.1607 16.925C71.2424 17.9094 69.8212 18.2457 68.416 18.2457V18.2447Z",fill:"currentColor"}),f.jsx("path",{d:"M31.9551 8.03497H33.3204V10.1525H31.9551C31.1087 10.1525 30.2545 10.3633 29.7035 10.9493C29.1525 11.5353 28.945 12.4342 28.945 13.3326C28.945 14.231 29.1447 15.1294 29.7035 15.7154C30.2623 16.3014 31.1087 16.5122 31.9551 16.5122C32.8015 16.5122 33.6562 16.3014 34.2072 15.7154C34.7582 15.1294 34.9657 14.231 34.9657 13.3326V4.62842H37.3611V18.6219H34.9657V17.7313H34.5264C34.4783 17.7857 34.4307 17.8329 34.3826 17.8795C33.7835 18.4261 32.8652 18.6219 31.9629 18.6219C30.5494 18.6219 29.136 18.2707 28.2099 17.294C27.2838 16.3174 26.9563 14.817 26.9563 13.3248C26.9563 11.8327 27.2916 10.34 28.2099 9.35561C29.136 8.37898 30.5494 8.03497 31.9551 8.03497Z",fill:"currentColor"}),f.jsx("path",{d:"M49.3786 13.1431V13.9948H42.9984V12.2996H47.2305C47.1348 11.6825 46.9113 11.1043 46.5119 10.682C45.9371 10.0727 45.0503 9.85409 44.1723 9.85409C43.2943 9.85409 42.4076 10.0727 41.8328 10.682C41.258 11.2913 41.05 12.2213 41.05 13.1435C41.05 14.0658 41.2575 15.003 41.8328 15.6046C42.4076 16.2061 43.2939 16.433 44.1723 16.433C45.0508 16.433 45.9371 16.2143 46.5119 15.6046C46.5916 15.5186 46.6635 15.4248 46.7354 15.331H49.0992C48.8918 16.0657 48.5643 16.7299 48.0691 17.2454C47.111 18.2531 45.6339 18.6205 44.1723 18.6205C42.7108 18.6205 41.2337 18.2609 40.2755 17.2454C39.3174 16.2299 38.9661 14.6828 38.9661 13.1435C38.9661 11.6043 39.3096 10.0494 40.2755 9.04168C41.242 8.03396 42.7108 7.66663 44.1723 7.66663C45.6339 7.66663 47.111 8.02618 48.0691 9.04168C49.0351 10.0572 49.3786 11.6043 49.3786 13.1435V13.1431Z",fill:"currentColor"}),f.jsx("path",{d:"M61.4045 13.1431V13.9948H55.0243V12.2996H59.2564C59.1602 11.6825 58.9372 11.1043 58.5378 10.682C57.963 10.0727 57.0762 9.85409 56.1982 9.85409C55.3202 9.85409 54.4335 10.0727 53.8587 10.682C53.2839 11.2913 53.0759 12.2213 53.0759 13.1435C53.0759 14.0658 53.2834 15.003 53.8587 15.6046C54.4335 16.2061 55.3202 16.433 56.1982 16.433C57.0762 16.433 57.963 16.2143 58.5378 15.6046C58.6179 15.5186 58.6894 15.4248 58.7608 15.331H61.1251C60.9171 16.0657 60.5897 16.7299 60.0945 17.2454C59.1364 18.2531 57.6593 18.6205 56.1982 18.6205C54.7372 18.6205 53.2596 18.2609 52.3014 17.2454C51.3432 16.2299 50.9919 14.6828 50.9919 13.1435C50.9919 11.6043 51.3355 10.0494 52.3014 9.04168C53.2678 8.03396 54.7367 7.66663 56.1982 7.66663C57.6598 7.66663 59.1364 8.02618 60.0945 9.04168C61.061 10.0572 61.4045 11.6043 61.4045 13.1435V13.1431Z",fill:"currentColor"}),f.jsx("path",{d:"M80.242 18.6214C81.7035 18.6214 83.1801 18.4105 84.1383 17.809C85.0965 17.2075 85.4482 16.2931 85.4482 15.3869C85.4482 14.4807 85.1042 13.5585 84.1383 12.9647C83.1801 12.371 81.703 12.1518 80.242 12.1518C79.6186 12.1518 79.0438 12.0658 78.6366 11.8394C78.2294 11.6047 78.0778 11.2534 78.0778 10.9017C78.0778 10.5499 78.2216 10.1908 78.6366 9.9639C79.0438 9.72921 79.6749 9.65147 80.2973 9.65147C80.9198 9.65147 81.5509 9.73747 81.9591 9.9639C82.3663 10.1986 82.5179 10.5499 82.5179 10.9017H84.9531C84.9531 9.99499 84.6421 9.07327 83.7719 8.47951C82.9017 7.88576 81.5679 7.66663 80.2424 7.66663C78.9169 7.66663 77.5837 7.8775 76.713 8.47951C75.8427 9.08104 75.5308 9.99499 75.5308 10.9017C75.5308 11.8083 75.8423 12.73 76.713 13.3238C77.5832 13.9176 78.9165 14.1367 80.2424 14.1367C80.929 14.1367 81.688 14.2227 82.1428 14.4491C82.5985 14.676 82.7579 15.0351 82.7579 15.3869C82.7579 15.7387 82.5985 16.0977 82.1428 16.3246C81.688 16.5511 80.9931 16.6371 80.3066 16.6371C79.62 16.6371 78.9169 16.5511 78.4694 16.3246C78.0224 16.0982 77.8543 15.7387 77.8543 15.3869H75.0435C75.0435 16.2935 75.3865 17.2153 76.3534 17.809C77.3194 18.4028 78.7809 18.6214 80.2424 18.6214H80.242Z",fill:"currentColor"}),f.jsx("path",{d:"M97.4733 13.1431V13.9948H91.0932V12.2996H95.3252C95.23 11.6825 95.006 11.1043 94.6071 10.682C94.0313 10.0727 93.1456 9.85409 92.2666 9.85409C91.3876 9.85409 90.5018 10.0727 89.927 10.682C89.3522 11.2913 89.1452 12.2213 89.1452 13.1435C89.1452 14.0658 89.3522 15.003 89.927 15.6046C90.5018 16.2061 91.3886 16.433 92.2666 16.433C93.1446 16.433 94.0313 16.2143 94.6071 15.6046C94.6863 15.5186 94.7587 15.4248 94.8301 15.331H97.1935C96.9855 16.0657 96.6585 16.7299 96.1639 17.2454C95.2057 18.2531 93.7281 18.6205 92.2666 18.6205C90.805 18.6205 89.3284 18.2609 88.3703 17.2454C87.4121 16.2299 87.0613 14.6828 87.0613 13.1435C87.0613 11.6043 87.4043 10.0494 88.3703 9.04168C89.3367 8.03396 90.806 7.66663 92.2666 7.66663C93.7272 7.66663 95.2057 8.02618 96.1639 9.04168C97.1298 10.0572 97.4729 11.6043 97.4729 13.1435L97.4733 13.1431Z",fill:"currentColor"}),f.jsx("path",{d:"M109.499 13.1431V13.9948H103.119V12.2996H107.351C107.256 11.6825 107.032 11.1043 106.632 10.682C106.057 10.0727 105.172 9.85409 104.293 9.85409C103.414 9.85409 102.528 10.0727 101.953 10.682C101.378 11.2913 101.17 12.2213 101.17 13.1435C101.17 14.0658 101.378 15.003 101.953 15.6046C102.528 16.2061 103.415 16.433 104.293 16.433C105.171 16.433 106.057 16.2143 106.632 15.6046C106.712 15.5186 106.784 15.4248 106.856 15.331H109.22C109.012 16.0657 108.685 16.7299 108.19 17.2454C107.231 18.2531 105.754 18.6205 104.293 18.6205C102.831 18.6205 101.355 18.2609 100.396 17.2454C99.4382 16.2299 99.0864 14.6828 99.0864 13.1435C99.0864 11.6043 99.4295 10.0494 100.396 9.04168C101.362 8.03396 102.832 7.66663 104.293 7.66663C105.754 7.66663 107.231 8.02618 108.19 9.04168C109.156 10.0572 109.499 11.6043 109.499 13.1435V13.1431Z",fill:"currentColor"}),f.jsx("path",{d:"M113.5 4.62817H111.104V18.6217H113.5V4.62817Z",fill:"currentColor"}),f.jsx("path",{d:"M117.589 12.8154L121.517 18.6208H118.554L114.625 12.8154L118.554 8.15088H121.517L117.589 12.8154Z",fill:"currentColor"}),f.jsx("g",{clipPath:"url(#dsh-wordmark-whale-clip)",children:f.jsx("path",{d:"M23.0584 4.95203C22.8129 4.83203 22.7074 5.06103 22.5639 5.17704C22.5149 5.21454 22.4734 5.26354 22.4319 5.30854C22.0734 5.69155 21.6543 5.94306 21.1073 5.91306C20.3073 5.86806 19.6243 6.11957 19.0203 6.73158C18.8918 5.97706 18.4652 5.52655 17.8162 5.23754C17.4767 5.08753 17.1332 4.93703 16.8952 4.61052C16.7292 4.37801 16.6837 4.11901 16.6007 3.8635C16.5477 3.70949 16.4952 3.55199 16.3177 3.52549C16.1252 3.49549 16.0497 3.65699 15.9742 3.792C15.6722 4.34401 15.5552 4.95203 15.5667 5.56805C15.5932 6.95359 16.1782 8.05712 17.3407 8.84215C17.4727 8.93215 17.5067 9.02215 17.4652 9.15366C17.3857 9.42416 17.2917 9.68667 17.2087 9.95718C17.1557 10.1297 17.0767 10.1677 16.8917 10.0922C16.2537 9.82568 15.7027 9.43117 15.2156 8.95465C14.3891 8.15513 13.6416 7.2726 12.7096 6.58158C12.4906 6.42007 12.2716 6.27007 12.045 6.12707C11.094 5.20354 12.1696 4.44502 12.4186 4.35501C12.6791 4.26101 12.5091 3.938 11.6675 3.942C10.826 3.9455 10.056 4.22751 9.07446 4.60302C8.93096 4.65952 8.77995 4.70052 8.62545 4.73452C7.73492 4.56552 6.80989 4.52802 5.84386 4.63702C4.02481 4.83953 2.57177 5.69955 1.50373 7.1676C0.220694 8.93215 -0.0813148 10.9372 0.288196 13.0283C0.676708 15.2323 1.80174 17.0569 3.53029 18.4834C5.32285 19.9625 7.38741 20.6875 9.74298 20.5485C11.1735 20.466 12.7661 20.2745 14.5626 18.7539C15.0156 18.9795 15.4912 19.0695 16.2797 19.137C16.8872 19.1935 17.4722 19.107 17.9252 19.013C18.6347 18.8629 18.5857 18.2059 18.3292 18.0854C16.2497 17.1169 16.7062 17.5109 16.2912 17.1919C17.3477 15.9419 18.9618 13.7198 19.4598 10.6942C19.5088 10.3602 19.5713 9.88968 19.5638 9.61917C19.5598 9.45417 19.5978 9.39016 19.7863 9.37116C20.3073 9.31116 20.8128 9.16866 21.2773 8.91315C22.6249 8.17713 23.1684 6.96809 23.2964 5.51905C23.3154 5.29754 23.2924 5.06853 23.0584 4.95203ZM11.3165 17.9954C9.30097 16.4109 8.32344 15.8894 7.91992 15.9119C7.54241 15.9344 7.61042 16.3664 7.69342 16.6479C7.78042 16.9259 7.89342 17.1174 8.05193 17.3614C8.16143 17.5229 8.23694 17.7629 7.94243 17.9434C7.29341 18.3449 6.16487 17.8084 6.11187 17.7819C4.79833 17.0084 3.7003 15.9874 2.92628 14.5908C2.17875 13.2468 1.74474 11.8047 1.67324 10.2657C1.65424 9.89418 1.76374 9.76267 2.13375 9.69517C2.62077 9.60517 3.12278 9.58617 3.6093 9.65767C5.66636 9.95818 7.41741 10.8777 8.88545 12.3348C9.72348 13.1643 10.3575 14.1558 11.0105 15.1243C11.705 16.1529 12.4521 17.1329 13.4036 17.9364C13.7396 18.2179 14.0076 18.4319 14.2641 18.5899C13.4906 18.6764 12.1996 18.6949 11.3165 17.9964V17.9954ZM12.2826 11.7817C12.2826 11.6167 12.4146 11.4852 12.5806 11.4852C12.6181 11.4852 12.6521 11.4927 12.6826 11.5037C12.7241 11.5187 12.7621 11.5412 12.7921 11.5752C12.8451 11.6277 12.8751 11.7027 12.8751 11.7817C12.8751 11.9467 12.7431 12.0782 12.5771 12.0782C12.4111 12.0782 12.2826 11.9467 12.2826 11.7817ZM15.2831 13.3208C15.0906 13.3998 14.8981 13.4673 14.7131 13.4748C14.4261 13.4898 14.1131 13.3733 13.9431 13.2308C13.6791 13.0093 13.4901 12.8853 13.4111 12.4988C13.3771 12.3338 13.3961 12.0782 13.4261 11.9317C13.4941 11.6162 13.4186 11.4137 13.1961 11.2297C13.0151 11.0797 12.7846 11.0382 12.5316 11.0382C12.4371 11.0382 12.3506 10.9967 12.2861 10.9632C12.1806 10.9107 12.0936 10.7792 12.1766 10.6177C12.2031 10.5652 12.3316 10.4377 12.3616 10.4152C12.7051 10.2197 13.1011 10.2837 13.4676 10.4302C13.8071 10.5692 14.0641 10.8242 14.4336 11.1847C14.8111 11.6202 14.8791 11.7402 15.0941 12.0672C15.2641 12.3228 15.4186 12.5853 15.5247 12.8858C15.5887 13.0733 15.5057 13.2268 15.2831 13.3208Z",fill:"currentColor"})}),f.jsx("rect",{x:"129.348",y:"5.5",width:"52",height:"14",rx:"2",fill:"currentColor"}),f.jsxs("g",{clipPath:"url(#dsh-wordmark-badge-clip)",children:[f.jsx("path",{d:"M132.848 8.93205H134.08V16.137H132.848V8.93205ZM136.5 8.93205H137.732V16.137H136.5V8.93205ZM133.365 13.024V11.99H137.193V13.024H133.365Z",fill:"var(--dsw-alias-label-primary-inverted)"}),f.jsx("path",{d:"M140.397 14.432L140.672 13.453H143.202L143.532 14.432H140.397ZM140.287 16.137H139.055L141.277 8.93205H142.201L142.146 9.74605L140.947 13.915H140.969L140.287 16.137ZM145.039 16.137H143.741L143.07 13.948L143.081 13.937L141.871 9.74605L141.926 8.93205H142.817L145.039 16.137Z",fill:"var(--dsw-alias-label-primary-inverted)"}),f.jsx("path",{d:"M146.846 8.93205H149.068C149.852 8.93205 150.443 9.11538 150.839 9.48205C151.235 9.84138 151.433 10.3327 151.433 10.956C151.433 11.22 151.396 11.4657 151.323 11.693C151.249 11.9204 151.125 12.1257 150.949 12.309C150.773 12.4924 150.531 12.65 150.223 12.782C149.922 12.9067 149.541 13.0057 149.079 13.079V13.321H146.846V12.639L148.023 12.485C148.631 12.4044 149.09 12.298 149.398 12.166C149.706 12.034 149.915 11.8764 150.025 11.693C150.135 11.5024 150.19 11.2934 150.19 11.066C150.19 10.6994 150.083 10.417 149.871 10.219C149.658 10.021 149.324 9.92205 148.87 9.92205H146.846V8.93205ZM146.395 8.93205H147.627V16.137H146.395V8.93205ZM151.917 16.093V16.137H150.366L149.024 14.322C148.87 14.1094 148.73 13.9407 148.606 13.816C148.481 13.684 148.345 13.5887 148.199 13.53C148.052 13.464 147.872 13.42 147.66 13.398C147.447 13.3687 147.176 13.3504 146.846 13.343V13.145H149.079C149.233 13.211 149.368 13.2844 149.486 13.365C149.61 13.4457 149.735 13.5447 149.86 13.662C149.992 13.7794 150.138 13.937 150.3 14.135L151.917 16.093Z",fill:"var(--dsw-alias-label-primary-inverted)"}),f.jsx("path",{d:"M153.58 9.57005L153.591 8.93205H154.46L157.584 15.51V16.137H156.704L153.58 9.57005ZM158.024 16.137H156.968L156.88 8.93205H158.024V16.137ZM154.24 16.137H153.096V8.93205H154.152L154.24 16.137Z",fill:"var(--dsw-alias-label-primary-inverted)"}),f.jsx("path",{d:"M159.963 8.93205H161.206V16.137H159.963V8.93205ZM160.095 9.96605V8.93205H164.858V9.96605H160.095ZM160.095 16.137V15.103H164.902V16.137H160.095ZM160.095 13.013V11.99H164.374V13.013H160.095Z",fill:"var(--dsw-alias-label-primary-inverted)"}),f.jsx("path",{d:"M169.052 15.257C169.543 15.257 169.895 15.1654 170.108 14.982C170.328 14.7987 170.438 14.5457 170.438 14.223C170.438 14.047 170.405 13.8967 170.339 13.772C170.273 13.6474 170.152 13.5337 169.976 13.431C169.807 13.321 169.558 13.2147 169.228 13.112L168.491 12.881C167.846 12.6757 167.38 12.4044 167.094 12.067C166.808 11.7297 166.665 11.3007 166.665 10.78C166.665 10.428 166.76 10.1017 166.951 9.80105C167.142 9.50038 167.428 9.25838 167.809 9.07505C168.19 8.89172 168.663 8.80005 169.228 8.80005C169.631 8.80005 169.998 8.82938 170.328 8.88805C170.665 8.93938 171.039 9.01638 171.45 9.11905L171.274 10.175C170.834 10.0504 170.442 9.96238 170.097 9.91105C169.76 9.85238 169.463 9.82305 169.206 9.82305C168.737 9.82305 168.403 9.90738 168.205 10.076C168.007 10.2374 167.908 10.439 167.908 10.681C167.908 10.857 167.941 11.0147 168.007 11.154C168.073 11.286 168.19 11.407 168.359 11.517C168.535 11.627 168.784 11.7334 169.107 11.836L169.866 12.078C170.526 12.276 170.995 12.5327 171.274 12.848C171.553 13.156 171.692 13.585 171.692 14.135C171.692 14.5604 171.589 14.9344 171.384 15.257C171.179 15.5797 170.878 15.8327 170.482 16.016C170.093 16.1994 169.609 16.291 169.03 16.291C168.627 16.291 168.212 16.247 167.787 16.159C167.362 16.071 166.9 15.9427 166.401 15.774L166.665 14.718C167.156 14.894 167.6 15.0297 167.996 15.125C168.399 15.213 168.751 15.257 169.052 15.257Z",fill:"var(--dsw-alias-label-primary-inverted)"}),f.jsx("path",{d:"M175.809 15.257C176.3 15.257 176.652 15.1654 176.865 14.982C177.085 14.7987 177.195 14.5457 177.195 14.223C177.195 14.047 177.162 13.8967 177.096 13.772C177.03 13.6474 176.909 13.5337 176.733 13.431C176.564 13.321 176.315 13.2147 175.985 13.112L175.248 12.881C174.603 12.6757 174.137 12.4044 173.851 12.067C173.565 11.7297 173.422 11.3007 173.422 10.78C173.422 10.428 173.517 10.1017 173.708 9.80105C173.899 9.50038 174.185 9.25838 174.566 9.07505C174.947 8.89172 175.42 8.80005 175.985 8.80005C176.388 8.80005 176.755 8.82938 177.085 8.88805C177.422 8.93938 177.796 9.01638 178.207 9.11905L178.031 10.175C177.591 10.0504 177.199 9.96238 176.854 9.91105C176.517 9.85238 176.22 9.82305 175.963 9.82305C175.494 9.82305 175.16 9.90738 174.962 10.076C174.764 10.2374 174.665 10.439 174.665 10.681C174.665 10.857 174.698 11.0147 174.764 11.154C174.83 11.286 174.947 11.407 175.116 11.517C175.292 11.627 175.541 11.7334 175.864 11.836L176.623 12.078C177.283 12.276 177.752 12.5327 178.031 12.848C178.31 13.156 178.449 13.585 178.449 14.135C178.449 14.5604 178.346 14.9344 178.141 15.257C177.936 15.5797 177.635 15.8327 177.239 16.016C176.85 16.1994 176.366 16.291 175.787 16.291C175.384 16.291 174.969 16.247 174.544 16.159C174.119 16.071 173.657 15.9427 173.158 15.774L173.422 14.718C173.913 14.894 174.357 15.0297 174.753 15.125C175.156 15.213 175.508 15.257 175.809 15.257Z",fill:"var(--dsw-alias-label-primary-inverted)"})]}),f.jsxs("defs",{children:[f.jsx("clipPath",{id:"dsh-wordmark-whale-clip",children:f.jsx("rect",{width:"23.16",height:"17.0435",fill:"white",transform:"translate(0.141602 3.52185)"})}),f.jsx("clipPath",{id:"dsh-wordmark-badge-clip",children:f.jsx("rect",{width:"46",height:"14",fill:"white",transform:"translate(132.348 5.5)"})})]})]})}const wf="_bubble_owhem_8",xf={bubble:wf};function _f({label:n,side:r="right",delayMs:i=0,disabled:s=!1,maxWidth:u,children:c}){const h=R.useRef(null),p=c.ref,g=R.useCallback(Z=>{h.current=Z,typeof p=="function"?p(Z):p!=null&&(p.current=Z)},[p]),[C,v]=R.useState(null),[L,w]=R.useState(r),_=R.useRef(null),k=C===null?null:typeof n=="function"?n():n,E=C===null?0:L==="right"?C.top+(C.bottom-C.top)/2:L==="top"?C.top-8:C.bottom+8,T=12;R.useLayoutEffect(()=>{if(C===null)return;const Z=()=>{const ne=_.current;if(ne===null)return;ne.style.left=`${C.x}px`;const I=ne.getBoundingClientRect();let J=0;if(I.right>window.innerWidth-T&&(J=window.innerWidth-T-I.right),I.left+J=T;L==="bottom"&&!q&&ce&&w("top"),L==="top"&&!ce&&q&&w("bottom")};return Z(),window.addEventListener("resize",Z),()=>{window.removeEventListener("resize",Z)}},[L,C,k,r]);const B=R.useRef(null),W=R.useRef({hover:!1,focus:!1}),z=R.useCallback(()=>{B.current!==null&&(clearTimeout(B.current),B.current=null)},[]);R.useEffect(()=>(s&&(z(),W.current={hover:!1,focus:!1},v(null)),z),[z,s]);const ee=()=>{if(s)return;const Z=h.current;if(Z===null)return;const ne=Z.getBoundingClientRect();w(r),v({x:r==="right"?ne.right+10:ne.left+ne.width/2,top:ne.top,bottom:ne.bottom})},Q=()=>{if(z(),i<=0){ee();return}B.current=setTimeout(()=>{B.current=null,ee()},i)},V=()=>{z(),!W.current.hover&&!W.current.focus&&v(null)};return f.jsxs(f.Fragment,{children:[R.cloneElement(c,{ref:g,onMouseEnter:Z=>{var ne,I;(I=(ne=c.props).onMouseEnter)==null||I.call(ne,Z),W.current.hover=!0,Q()},onMouseLeave:Z=>{var ne,I;(I=(ne=c.props).onMouseLeave)==null||I.call(ne,Z),W.current.hover=!1,z(),v(null)},onFocus:Z=>{var ne,I;(I=(ne=c.props).onFocus)==null||I.call(ne,Z),W.current.focus=!0,z(),ee()},onBlur:Z=>{var ne,I;(I=(ne=c.props).onBlur)==null||I.call(ne,Z),W.current.focus=!1,V()}}),C!==null&&f.jsx("span",{ref:_,className:xf.bubble,"data-side":L,style:{left:C.x,top:E,...u===void 0?{}:{maxWidth:u}},role:"tooltip",children:k})]})}const Lf="_toast_fvpz7_7",kf="_icon_fvpz7_35",Sf="_text_fvpz7_42",_l={toast:Lf,icon:kf,text:Sf},jf=3e3,Ef=1e3;function bf({text:n,icon:r,anchor:i,onDone:s}){R.useEffect(()=>{const h=setTimeout(s,jf+Ef);return()=>{clearTimeout(h)}},[s]);const[u,c]=R.useState(null);return R.useLayoutEffect(()=>{if(i==null)return;const h=()=>{const p=i.getBoundingClientRect();c(p.left+p.width/2)};return h(),window.addEventListener("resize",h),()=>{window.removeEventListener("resize",h)}},[i]),ln.createPortal(f.jsxs("div",{className:_l.toast,role:"alert",style:u===null?void 0:{left:u},children:[r!==void 0&&f.jsx("span",{className:_l.icon,"aria-hidden":!0,children:r}),f.jsx("span",{className:_l.text,children:n})]}),document.body)}const Mf="_root_4qrvp_1",Of="_container_4qrvp_30",Nf="_expandedTopLevel_4qrvp_39",Rf="_topLevelBracket_4qrvp_46",Pf="_expandedTopLevelContainer_4qrvp_51",Tf="_row_4qrvp_55",If="_children_4qrvp_60",$f="_expander_4qrvp_78",Hf="_label_4qrvp_95",Vf="_clickableLabel_4qrvp_101",Af="_stringValue_4qrvp_105",Df="_numberValue_4qrvp_109",Ff="_keywordValue_4qrvp_113",Bf="_otherValue_4qrvp_117",zf="_punctuation_4qrvp_121",Zf="_preview_4qrvp_125",Uf="_previewProperty_4qrvp_129",Wf="_previewEllipsis_4qrvp_133",qf="_copyAnchor_4qrvp_137",Qf="_copyButton_4qrvp_143",Kf="_collapseIcon_4qrvp_202",fe={root:Mf,container:Of,expandedTopLevel:Nf,topLevelBracket:Rf,expandedTopLevelContainer:Pf,row:Tf,children:If,expander:$f,label:Hf,clickableLabel:Vf,stringValue:Af,numberValue:Df,keywordValue:Ff,otherValue:Bf,punctuation:zf,preview:Zf,previewProperty:Uf,previewEllipsis:Wf,copyAnchor:qf,copyButton:Qf,collapseIcon:Kf},Jf=4,Gf=5,W0=2,q0={copyValue:"Copy value",copyJson:"Copy JSON",copyPath:"Copy property path",copyPrettyJson:"Copy pretty JSON",copyCompactJson:"Copy compact JSON",copied:"Copied",copyFailed:"Copy failed",collapseNode:"Collapse JSON node",expandNode:"Expand JSON node",copyButtonTitle:n=>`${n}; right-click for copy options`};function Yf(n){return[{id:"value",label:n.copyValue},{id:"json",label:n.copyJson},{id:"path",label:n.copyPath}]}function Xf(n){return[{id:"prettyJson",label:n.copyPrettyJson},{id:"json",label:n.copyCompactJson},{id:"path",label:n.copyPath}]}function Yo(n){return typeof n=="object"&&n!==null&&!(n instanceof Date)}function Xo(n){return Array.isArray(n)?n.map((r,i)=>[String(i),r]):Object.keys(n).map(r=>[r,n[r]])}function du(n){return Array.isArray(n)?["[","]"]:["{","}"]}function ed(n){return n===null?f.jsx("span",{className:fe.keywordValue,children:"null"}):typeof n=="string"?f.jsx("span",{className:fe.stringValue,children:JSON.stringify(n)}):typeof n=="number"?f.jsx("span",{className:fe.numberValue,children:String(n)}):typeof n=="boolean"?f.jsx("span",{className:fe.keywordValue,children:String(n)}):typeof n=="bigint"?f.jsx("span",{className:fe.otherValue,children:n.toString()}):typeof n>"u"?f.jsx("span",{className:fe.otherValue,children:"undefined"}):typeof n=="symbol"?f.jsx("span",{className:fe.otherValue,children:n.description??"Symbol"}):typeof n=="function"?f.jsx("span",{className:fe.otherValue,children:n.name||"Function"}):null}function ec(n,r){if(!Yo(n))return ed(n);const i=Array.isArray(n),s=Xo(n),u=i?Gf:Jf,c=s.slice(0,u),[h,p]=du(n);return f.jsxs(f.Fragment,{children:[f.jsx("span",{className:fe.punctuation,children:h}),r>=W0?f.jsx("span",{className:fe.previewEllipsis,children:"…"}):c.map(([g,C],v)=>f.jsxs("span",{children:[v>0&&f.jsx("span",{className:fe.punctuation,children:", "}),!i&&f.jsxs(f.Fragment,{children:[f.jsx("span",{className:fe.previewProperty,children:g}),f.jsx("span",{className:fe.punctuation,children:": "})]}),ec(C,r+1)]},g)),ru&&f.jsx("span",{className:fe.previewEllipsis,children:", …"}),f.jsx("span",{className:fe.punctuation,children:p})]})}function td(n){return n===null?f.jsx("span",{className:fe.keywordValue,children:"null"}):typeof n=="string"?f.jsx("span",{className:fe.stringValue,children:JSON.stringify(n)}):typeof n=="boolean"?f.jsx("span",{className:fe.keywordValue,children:String(n)}):typeof n=="number"?f.jsx("span",{className:fe.numberValue,children:String(n)}):typeof n=="bigint"?f.jsx("span",{className:fe.numberValue,children:`${n.toString()}n`}):n instanceof Date?f.jsx("span",{className:fe.otherValue,children:n.toISOString()}):typeof n=="function"?f.jsxs("span",{className:fe.otherValue,children:["function() ","{ }"]}):typeof n>"u"?f.jsx("span",{className:fe.otherValue,children:"undefined"}):f.jsx("span",{className:fe.otherValue,children:n.toString()})}function nd(n){return n===""?'""':n}function Zl(n){return n.map(r=>typeof r=="number"?`n${String(r)}`:`s${String(r.length)}:${r}`).join("/")}function tc(n){n.focus()}function rd(n,r){const i=n.closest('[role="tree"]');if(i===null)return;const s=Array.from(i.querySelectorAll("[data-json-expander]")),u=s.indexOf(n);if(u<0||s.length===0)return;const c=(u+r+s.length)%s.length,h=s[c];h!==void 0&&tc(h)}function Ll({field:n,expandable:r,onToggle:i}){return n===void 0?null:f.jsxs("span",{className:ye(fe.label,r&&fe.clickableLabel),onClick:r?i:void 0,children:[nd(n),":"]})}function Ul({field:n,initialExpanded:r,labels:i,lastElement:s,onClaimTabStop:u,onRowHover:c,path:h,tabStopId:p,value:g}){const C=R.useId(),v=R.useRef(null),[L,w]=R.useState(r),_=Zl(h),k=Yo(g),E=k?Xo(g):[],T=E.length>0,B=()=>{w(V=>!V),tc(v.current)},W=V=>{if(V.key==="ArrowRight"||V.key==="ArrowLeft"){V.preventDefault(),w(V.key==="ArrowRight");return}(V.key==="ArrowUp"||V.key==="ArrowDown")&&(V.preventDefault(),rd(V.currentTarget,V.key==="ArrowUp"?-1:1))},z=(V,Z)=>f.jsx("div",{className:fe.row,role:"treeitem","aria-expanded":Z,onMouseOver:ne=>{ne.stopPropagation(),c(ne.currentTarget,{path:h,value:g})},children:V});if(!k)return z(f.jsxs(f.Fragment,{children:[f.jsx(Ll,{field:n,expandable:!1,onToggle:B}),td(g),!s&&f.jsx("span",{className:fe.punctuation,children:","})]}));const[ee,Q]=du(g);return T?z(f.jsxs(f.Fragment,{children:[f.jsx("span",{ref:v,className:ye(fe.expander,L?fe.collapseIcon:fe.expandIcon),"data-json-expander":!0,role:"button","aria-label":L?i.collapseNode:i.expandNode,"aria-expanded":L,"aria-controls":L?C:void 0,tabIndex:p===_?0:-1,onFocus:()=>{u(_)},onClick:B,onKeyDown:W}),f.jsx(Ll,{field:n,expandable:!0,onToggle:B}),f.jsx("span",{className:fe.preview,children:ec(g,0)}),!s&&f.jsx("span",{className:fe.punctuation,children:","}),L&&f.jsx("ul",{id:C,role:"group",className:fe.children,children:E.map(([V,Z],ne)=>f.jsx(Ul,{field:V,value:Z,path:[...h,Array.isArray(g)?ne:V],labels:i,lastElement:ne===E.length-1,initialExpanded:!1,tabStopId:p,onClaimTabStop:u,onRowHover:c},V))})]}),L):z(f.jsxs(f.Fragment,{children:[f.jsx(Ll,{field:n,expandable:!1,onToggle:B}),f.jsx("span",{className:fe.punctuation,children:ee}),f.jsx("span",{className:fe.punctuation,children:Q}),!s&&f.jsx("span",{className:fe.punctuation,children:","})]}))}function od(n){return n.reduce((r,i)=>typeof i=="number"?`${r}[${String(i)}]`:/^[A-Za-z_$][\w$]*$/.test(i)?`${r}.${i}`:`${r}[${JSON.stringify(i)}]`,"$")}function id(n,r){return r==="path"?od(n.path):r==="prettyJson"?JSON.stringify(n.value,null,2):r==="json"?JSON.stringify(n.value):typeof n.value=="string"?n.value:typeof n.value>"u"?"undefined":typeof n.value=="bigint"?n.value.toString():typeof n.value=="symbol"?n.value.description??"Symbol":typeof n.value=="function"?n.value.name||"Function":JSON.stringify(n.value)}function sd({data:n,label:r="JSON",className:i,copyable:s=!0,expandTopLevel:u=!0,labels:c}){const h=R.useMemo(()=>c===void 0?q0:{...q0,...c},[c]),p=Xo(n),g=p.findIndex(([,O])=>Yo(O)&&Xo(O).length>0),C=p[g],v=u?C===void 0?null:Zl([Array.isArray(n)?g:C[0]]):Yo(n)&&p.length>0?Zl([]):null,L=R.useRef(null),w=R.useRef(),_=R.useRef(null),k=R.useRef(!1),E=R.useRef(),[T,B]=R.useState(),[W,z]=R.useState("idle"),[ee,Q]=R.useState(!1),[V,Z]=R.useState(v),ne=O=>{var oe;(oe=w.current)==null||oe.removeAttribute("data-json-copy-active"),w.current=O,O==null||O.setAttribute("data-json-copy-active","")},I=()=>{ne(void 0),B(void 0),z("idle"),k.current=!1,Q(!1)},J=O=>{const oe=L.current;if(oe===null)throw new Error("JsonTree root is not mounted");const de=oe.getBoundingClientRect(),ve=O.getBoundingClientRect();return{left:de.left+oe.clientWidth-26,side:ve.top-de.top>oe.clientHeight/2?"top":"bottom",top:ve.top}},q=(O,oe)=>{const de=J(O);B({...oe,...de})},ce=O=>{const oe=J(O);B(de=>de===void 0?de:{...de,...oe})};R.useEffect(()=>()=>{var O;E.current!==void 0&&clearTimeout(E.current),(O=w.current)==null||O.removeAttribute("data-json-copy-active")},[]),R.useEffect(()=>{var O;(O=w.current)==null||O.removeAttribute("data-json-copy-active"),w.current=void 0,k.current=!1,B(void 0),z("idle"),Q(!1),Z(v)},[n,u,v]),R.useEffect(()=>{const O=()=>{const oe=w.current;oe!==void 0&&ce(oe)};return window.addEventListener("scroll",O,!0),window.addEventListener("resize",O),()=>{window.removeEventListener("scroll",O,!0),window.removeEventListener("resize",O)}},[]);const le=(O,oe)=>{!s||k.current||w.current!==O&&(ne(O),z("idle"),k.current=!1,Q(!1),q(O,oe))},he=O=>{!s||k.current||O.target instanceof Element&&O.target.closest("[data-json-copy-button]")===null&&I()},pe=O=>{const oe=w.current;oe!==void 0&&ce(oe)},Se=async O=>{if(T!==void 0){try{await navigator.clipboard.writeText(id(T,O)),z("copied")}catch{z("failed")}E.current!==void 0&&clearTimeout(E.current),E.current=setTimeout(()=>{z("idle")},1500)}},[we,U]=du(n),ie=typeof(T==null?void 0:T.value)=="object"&&T.value!==null,K=ie?"prettyJson":"value",j=W==="copied"?h.copied:W==="failed"?h.copyFailed:ie?h.copyPrettyJson:h.copyValue;return f.jsxs("div",{ref:L,className:ye(fe.root,i),onMouseOver:he,onMouseLeave:()=>{k.current||I()},onScroll:pe,children:[u?f.jsxs("div",{className:fe.expandedTopLevel,children:[f.jsx("div",{className:ye(fe.row,fe.topLevelBracket),"data-json-root-row":!0,onMouseOver:O=>{O.stopPropagation(),le(O.currentTarget,{path:[],value:n})},children:f.jsx("span",{className:fe.punctuation,children:we})}),f.jsx("div",{"aria-label":r,className:ye(fe.container,fe.expandedTopLevelContainer),role:"tree",children:p.map(([O,oe],de)=>f.jsx(Ul,{field:O,value:oe,path:[Array.isArray(n)?de:O],labels:h,lastElement:de===p.length-1,initialExpanded:!1,tabStopId:V,onClaimTabStop:Z,onRowHover:le},O))}),f.jsx("div",{className:ye(fe.row,fe.topLevelBracket),children:f.jsx("span",{className:fe.punctuation,children:U})})]}):f.jsx("div",{"aria-label":r,className:fe.container,role:"tree",children:f.jsx(Ul,{value:n,path:[],labels:h,lastElement:!0,initialExpanded:!0,tabStopId:V,onClaimTabStop:Z,onRowHover:le})}),T!==void 0&&f.jsx("span",{className:fe.copyAnchor,style:{left:T.left,top:T.top},children:f.jsx(Y3,{open:ee,compact:!0,portal:!0,align:"end",side:T.side,anchor:f.jsx("button",{ref:_,type:"button",className:fe.copyButton,"data-json-copy-button":!0,"data-state":W,"aria-label":j,title:h.copyButtonTitle(j),onClick:()=>void Se(K),onContextMenu:O=>{O.preventDefault(),O.stopPropagation(),k.current=!0,Q(!0)},children:W==="copied"?f.jsx(cu,{size:12}):f.jsx(Q3,{size:12})}),items:ie?Xf(h):Yf(h),onSelect:O=>{Se(O),k.current=!1,Q(!1)},onClose:I,getAnchorRect:()=>_.current.getBoundingClientRect()})})]})}var kl,Q0;function ld(){if(Q0)return kl;Q0=1;const n=[[{color:"0, 0, 0",class:"ansi-black"},{color:"187, 0, 0",class:"ansi-red"},{color:"0, 187, 0",class:"ansi-green"},{color:"187, 187, 0",class:"ansi-yellow"},{color:"0, 0, 187",class:"ansi-blue"},{color:"187, 0, 187",class:"ansi-magenta"},{color:"0, 187, 187",class:"ansi-cyan"},{color:"255,255,255",class:"ansi-white"}],[{color:"85, 85, 85",class:"ansi-bright-black"},{color:"255, 85, 85",class:"ansi-bright-red"},{color:"0, 255, 0",class:"ansi-bright-green"},{color:"255, 255, 85",class:"ansi-bright-yellow"},{color:"85, 85, 255",class:"ansi-bright-blue"},{color:"255, 85, 255",class:"ansi-bright-magenta"},{color:"85, 255, 255",class:"ansi-bright-cyan"},{color:"255, 255, 255",class:"ansi-bright-white"}]],r=/(https?:\/\/(?:[A-Za-z0-9#;/?:@=+$',_.!~*()[\]-]|&|%[A-Fa-f0-9]{2})+)/gm;class i{static escapeForHtml(u){return new i().escapeForHtml(u)}static linkify(u){return new i().linkify(u)}static ansiToHtml(u,c){return new i().ansiToHtml(u,c)}static ansiToJson(u,c){return new i().ansiToJson(u,c)}static ansiToText(u){return new i().ansiToText(u)}constructor(){this.fg=this.bg=this.fg_truecolor=this.bg_truecolor=null,this.bright=0,this.decorations=[]}setupPalette(){this.PALETTE_COLORS=[];for(let p=0;p<2;++p)for(let g=0;g<8;++g)this.PALETTE_COLORS.push(n[p][g].color);let u=[0,95,135,175,215,255],c=(p,g,C)=>u[p]+", "+u[g]+", "+u[C];for(let p=0;p<6;++p)for(let g=0;g<6;++g)for(let C=0;C<6;++C)this.PALETTE_COLORS.push(c(p,g,C));let h=8;for(let p=0;p<24;++p,h+=10)this.PALETTE_COLORS.push(h+", "+h+", "+h)}escapeForHtml(u){return u.replace(/[&<>\"]/gm,c=>c=="&"?"&":c=='"'?""":c=="<"?"<":c==">"?">":"")}linkify(u){return u.replace(r,c=>`${c}`)}ansiToHtml(u,c){return this.process(u,c,!0)}ansiToJson(u,c){return c=c||{},c.json=!0,c.clearLine=!1,this.process(u,c,!0)}ansiToText(u){return this.process(u,{},!1)}process(u,c,h){let p=this,g=u.split(/\033\[/),C=g.shift();c==null&&(c={}),c.clearLine=/\r/.test(u);let v=g.map(L=>this.processChunk(L,c,h));if(c&&c.json){let L=p.processChunkJson("");return L.content=C,L.clearLine=c.clearLine,v.unshift(L),c.remove_empty&&(v=v.filter(w=>!w.isEmpty())),v}else v.unshift(C);return v.join("")}processChunkJson(u,c,h){c=typeof c>"u"?{}:c;let p=c.use_classes=typeof c.use_classes<"u"&&c.use_classes,g=c.key=p?"class":"color",C={content:u,fg:null,bg:null,fg_truecolor:null,bg_truecolor:null,isInverted:!1,clearLine:c.clearLine,decoration:null,decorations:[],was_processed:!1,isEmpty:()=>!C.content},v=u.match(/^([!\x3c-\x3f]*)([\d;]*)([\x20-\x2c]*[\x40-\x7e])([\s\S]*)/m);if(!v)return C;C.content=v[4];let L=v[2].split(";");if(v[1]!==""||v[3]!=="m"||!h)return C;let w=this;for(;L.length>0;){let _=L.shift(),k=parseInt(_);if(isNaN(k)||k===0)w.fg=w.bg=null,w.decorations=[];else if(k===1)w.decorations.push("bold");else if(k===2)w.decorations.push("dim");else if(k===3)w.decorations.push("italic");else if(k===4)w.decorations.push("underline");else if(k===5)w.decorations.push("blink");else if(k===7)w.decorations.push("reverse");else if(k===8)w.decorations.push("hidden");else if(k===9)w.decorations.push("strikethrough");else if(k===21)w.removeDecoration("bold");else if(k===22)w.removeDecoration("bold"),w.removeDecoration("dim");else if(k===23)w.removeDecoration("italic");else if(k===24)w.removeDecoration("underline");else if(k===25)w.removeDecoration("blink");else if(k===27)w.removeDecoration("reverse");else if(k===28)w.removeDecoration("hidden");else if(k===29)w.removeDecoration("strikethrough");else if(k===39)w.fg=null;else if(k===49)w.bg=null;else if(k>=30&&k<38)w.fg=n[0][k%10][g];else if(k>=90&&k<98)w.fg=n[1][k%10][g];else if(k>=40&&k<48)w.bg=n[0][k%10][g];else if(k>=100&&k<108)w.bg=n[1][k%10][g];else if(k===38||k===48){let E=k===38;if(L.length>=1){let T=L.shift();if(T==="5"&&L.length>=1){let B=parseInt(L.shift());if(B>=0&&B<=255)if(!p)this.PALETTE_COLORS||w.setupPalette(),E?w.fg=this.PALETTE_COLORS[B]:w.bg=this.PALETTE_COLORS[B];else{let W=B>=16?"ansi-palette-"+B:n[B>7?1:0][B%8].class;E?w.fg=W:w.bg=W}}else if(T==="2"&&L.length>=3){let B=parseInt(L.shift()),W=parseInt(L.shift()),z=parseInt(L.shift());if(B>=0&&B<=255&&W>=0&&W<=255&&z>=0&&z<=255){let ee=B+", "+W+", "+z;p?E?(w.fg="ansi-truecolor",w.fg_truecolor=ee):(w.bg="ansi-truecolor",w.bg_truecolor=ee):E?w.fg=ee:w.bg=ee}}}}}return w.fg===null&&w.bg===null&&w.decorations.length===0||(C.fg=w.fg,C.bg=w.bg,C.fg_truecolor=w.fg_truecolor,C.bg_truecolor=w.bg_truecolor,C.decorations=w.decorations,C.decoration=w.decorations.slice(-1).pop()||null,C.was_processed=!0),C}processChunk(u,c,h){c=c||{};let p=this.processChunkJson(u,c,h),g=c.use_classes;if(p.decorations=p.decorations.filter(k=>{if(k==="reverse"){p.fg||(p.fg=n[0][7][g?"class":"color"]),p.bg||(p.bg=n[0][0][g?"class":"color"]);let E=p.fg;p.fg=p.bg,p.bg=E;let T=p.fg_truecolor;return p.fg_truecolor=p.bg_truecolor,p.bg_truecolor=T,p.isInverted=!0,!1}return!0}),c.json)return p;if(p.isEmpty())return"";if(!p.was_processed)return p.content;let C=[],v=[],L=[],w={},_=k=>{let E=[],T;for(T in k)k.hasOwnProperty(T)&&E.push("data-"+T+'="'+this.escapeForHtml(k[T])+'"');return E.length>0?" "+E.join(" "):""};return p.isInverted&&(w["ansi-is-inverted"]="true"),p.fg&&(g?(C.push(p.fg+"-fg"),p.fg_truecolor!==null&&(w["ansi-truecolor-fg"]=p.fg_truecolor,p.fg_truecolor=null)):C.push("color:rgb("+p.fg+")")),p.bg&&(g?(C.push(p.bg+"-bg"),p.bg_truecolor!==null&&(w["ansi-truecolor-bg"]=p.bg_truecolor,p.bg_truecolor=null)):C.push("background-color:rgb("+p.bg+")")),p.decorations.forEach(k=>{if(g){v.push("ansi-"+k);return}k==="bold"?v.push("font-weight:bold"):k==="dim"?v.push("opacity:0.5"):k==="italic"?v.push("font-style:italic"):k==="hidden"?v.push("visibility:hidden"):k==="strikethrough"?L.push("line-through"):L.push(k)}),L.length&&v.push("text-decoration:"+L.join(" ")),g?'"+p.content+"":'"+p.content+""}removeDecoration(u){const c=this.decorations.indexOf(u);c>=0&&this.decorations.splice(c,1)}}return kl=i,kl}var ud=ld();const ad=j1(ud),cd={"0,0,0":"var(--dsw-alias-label-primary)","255,255,255":"var(--dsw-alias-label-primary)","85,85,85":"var(--dsw-alias-label-tertiary)","187,0,0":"var(--dsw-alias-state-error-primary)","255,85,85":"var(--dsw-alias-state-error-secondary)","0,187,0":"var(--dsw-alias-state-success-primary)","0,255,0":"var(--dsw-alias-state-success-secondary)","187,187,0":"var(--dsw-alias-state-warn-primary)","255,255,85":"var(--dsw-alias-state-warn-secondary)","0,0,187":"var(--dsw-alias-state-business-primary)","85,85,255":"var(--dsw-static-blue-400)"},fd={bold:{fontWeight:700},dim:{opacity:.7},italic:{fontStyle:"italic"},underline:{textDecoration:"underline"},strikethrough:{textDecoration:"line-through"},hidden:{visibility:"hidden"}},dd=/\u001b\][^\u0007\u001b]*(?:\u0007|\u001b\\)?/g,hd=/\u001b(?!\[)[\u0020-\u002f]*[\u0030-\u007e]?/g,pd=/[\u0000-\u0007\u000b-\u001a\u001c-\u001f\u007f]/g,md=/\r|\u0008|\u001b\[[\u0030-\u003f]*[\u0020-\u002f]*K/,Cd=/\u001b\[([\u0030-\u003f]*)[\u0020-\u002f]*m/g,K0=8,gd=/^[\p{Mn}\p{Me}\p{Cf}\u200b-\u200f\u2060]$/u,vd=new RegExp("\\p{Script=Han}|\\p{Script=Hiragana}|\\p{Script=Katakana}|\\p{Script=Hangul}|\\p{Emoji_Presentation}|[\\uff01-\\uff60\\u3000-\\u303e]","u");function Sl(n){const r=n.codePointAt(0);return r===void 0||r<4352?!1:vd.test(n)}const y1={fg:"",bg:"",attrs:[]},yd={22:["1","2"],23:["3"],24:["4"],25:["5","6"],27:["7"],28:["8"],29:["9"]};function nc(n,r){const i=r===""?["0"]:r.split(";");let s=n;for(let u=0;u!h.includes(g))};continue}const p=Number(c);if(c==="39"){s={...s,fg:""};continue}if(c==="49"){s={...s,bg:""};continue}if(p>=30&&p<=37||p>=90&&p<=97){s={...s,fg:c};continue}if(p>=40&&p<=47||p>=100&&p<=107){s={...s,bg:c};continue}s.attrs.includes(c)||(s={...s,attrs:[...s.attrs,c]})}return s}function J0(n){const r=[...n.attrs];return n.fg!==""&&r.push(n.fg),n.bg!==""&&r.push(n.bg),r.length===0?"":`\x1B[${r.join(";")}m`}function Bo(n,r){return n.fg===r.fg&&n.bg===r.bg&&n.attrs.length===r.attrs.length&&n.attrs.every((i,s)=>i===r.attrs[s])}function wd(n,r){var L;const i=/\u001b\[([\u0030-\u003f]*)[\u0020-\u002f]*([\u0040-\u007e])/g,s=[];let u=0,c=r,h=0;const p=(w,_)=>{var E;const k=s[w];(k==null?void 0:k.spacer)===!0&&w>0?s[w-1]={sgr:c,char:_}:k!==void 0&&Sl(k.char)&&((E=s[w+1])==null?void 0:E.spacer)===!0&&(s[w+1]={sgr:c,char:_}),s[w]={sgr:c,char:_}},g=w=>{for(const _ of w){if(_==="\r"){u=0;continue}if(_==="\b"){u=Math.max(0,u-1);continue}if(_===" "){const k=u+K0-u%K0;for(;u0?s[u-1]:void 0;k!==void 0&&(s[u-1]={sgr:k.sgr,char:k.char+_});continue}p(u," "),s[u]={sgr:c,char:_},u++,Sl(_)&&(s[u]={sgr:c,char:"",spacer:!0},u++)}};for(const w of n.matchAll(i)){g(n.slice(h,w.index)),h=w.index+w[0].length;const _=String(w[1]),k=String(w[2]);if(k==="K"){const E=String(_.split(";")[0]);if(E==="1")for(let T=0;T<=u;T++)p(T," ");else s.length=E==="2"?0:u;continue}k==="m"&&(c=nc(c,_))}g(n.slice(h));let C="",v=r;for(let w=0;w0&&Sl(((L=s[w-1])==null?void 0:L.char)??"");C+=_.spacer===!0&&!k?" ":_.char}return Bo(v,c)||(Bo(v,y1)||(C+="\x1B[0m"),C+=J0(c)),{text:C,sgr:c}}function xd(n){const r=[];let i=y1;for(const s of n.split(` ++ */var M0;function I6(){if(M0)return ml;M0=1;var n=E1(),r=T6();function i(C,v){return C===v&&(C!==0||1/C===1/v)||C!==C&&v!==v}var s=typeof Object.is=="function"?Object.is:i,u=r.useSyncExternalStore,c=n.useRef,h=n.useEffect,p=n.useMemo,g=n.useDebugValue;return ml.useSyncExternalStoreWithSelector=function(C,v,L,w,_){var k=c(null);if(k.current===null){var E={hasValue:!1,value:null};k.current=E}else E=k.current;k=p(function(){function B(V){if(!W){if(W=!0,z=V,V=w(V),_!==void 0&&E.hasValue){var Z=E.value;if(_(Z,V))return ee=Z}return ee=V}if(Z=ee,s(z,V))return Z;var ne=w(V);return _!==void 0&&_(Z,ne)?Z:(z=V,ee=ne)}var W=!1,z,ee,Q=L===void 0?null:L;return[function(){return B(v())},Q===null?void 0:function(){return B(Q())}]},[v,L,w,_]);var T=u(C,k[0],k[1]);return h(function(){E.hasValue=!0,E.value=T},[T]),g(T),T},ml}var O0;function $6(){return O0||(O0=1,pl.exports=I6()),pl.exports}var H6=$6();function ru(n){const r=s=>n.subscribe(s),i=()=>n.getSnapshot();return function(u,c){return H6.useSyncExternalStoreWithSelector(r,i,void 0,u,c)}}class li extends Error{}class Er extends Error{}function V6(n){return typeof n=="function"?n():n}const Do=Object.freeze([]);class A6{constructor(){P(this,"records",new Map);P(this,"mutateListeners",new Set);P(this,"handleScopes",new Map);P(this,"dirty",new Set);P(this,"flushScheduled",!1);P(this,"abdicated",new WeakSet);P(this,"entryErrorListeners",new Set);const r=this.record("root");r.spec={kind:"single",scope:"root"},r.declaredBy="(built-in)",r.declarationEpoch=1}register(r,i){const s=this.records.get(r.name);if(!(s!=null&&s.spec))throw new Error(`slot "${r.name}" is not declared (a parent entry's children table must declare it)`);const u=s.spec,c=r.priority??0,h=C=>`at priority ${c}${C.registrant!==void 0?` (registered by ${C.registrant})`:""} — register at a different priority to shadow it (lowest renders)`;switch(u.kind){case"single":{const C=s.entries.find(v=>(v.options.priority??0)===c);if(C)throw new Error(`single slot "${r.name}" already has a registration ${h(C)}`);break}case"keyed":{if(r.key===void 0)throw new Error(`keyed slot "${r.name}" requires options.key`);const C=s.entries.find(v=>v.options.key===r.key&&(v.options.priority??0)===c);if(C)throw new Error(`keyed slot "${r.name}" already has an entry for key "${r.key}" ${h(C)}`);break}case"list":{if(r.id===void 0)throw new Error(`list slot "${r.name}" requires options.id`);const C=s.entries.find(v=>v.options.id===r.id&&(v.options.priority??0)===c);if(C)throw new Error(`list slot "${r.name}" already has an entry with id "${r.id}" ${h(C)}`);break}case"chain":if(r.select===void 0)throw new Error(`chain slot "${r.name}" requires options.select`);break}if(r.children)for(const C of Object.keys(r.children)){const v=this.records.get(C);if(v!=null&&v.spec)throw new Error(`slot "${C}" is already declared (by ${v.declaredBy??"an unknown entry"})`)}if(r.store!==void 0&&typeof r.store!="function"){const C=this.handleScopes.get(r.store);if(C&&C.scope!==u.scope)throw new Error(`store handle mounted under "${r.name}" (scope "${u.scope}") is already mounted under scope "${C.scope}" — one handle, one scope`);C?C.count+=1:this.handleScopes.set(r.store,{scope:u.scope,count:1})}const p={component:i,options:{...r.key!==void 0?{key:r.key}:{},...r.id!==void 0?{id:r.id}:{},...r.order!==void 0?{order:r.order}:{},...r.label!==void 0?{label:r.label}:{},...r.priority!==void 0?{priority:r.priority}:{}},...r.select!==void 0?{select:r.select}:{},...r.inject!==void 0?{inject:r.inject}:{},...r.children!==void 0?{children:r.children}:{},...r.store!==void 0?{store:r.store}:{},...r.locale!==void 0?{locale:r.locale}:{},...r.registrant!==void 0?{registrant:r.registrant}:{}},g=[...s.entries,p];if(g.sort(u.kind==="list"?(C,v)=>(C.options.priority??0)-(v.options.priority??0)||(C.options.order??0)-(v.options.order??0):(C,v)=>(C.options.priority??0)-(v.options.priority??0)),s.entries=g,this.markDirty(r.name,s),r.children){const C=[];for(const[v,L]of Object.entries(r.children)){const w=this.record(v);w.spec=L,w.declaredBy=`an entry in "${r.name}"${r.registrant?` (${r.registrant})`:""}`,w.parent=r.name,w.declarationEpoch+=1,C.push([v,w])}for(const[v,L]of C)this.markDirty(v,L);for(const[,v]of C)this.notifyDeclaration(v)}return()=>{s.entries.includes(p)&&(s.entries=s.entries.filter(C=>C!==p),this.markDirty(r.name,s),this.releaseEntry(p))}}isLive(r){for(const i of this.records.values())if(i.entries.includes(r))return!0;return!1}entries(r){var i;return((i=this.records.get(r))==null?void 0:i.entries)??Do}entriesOfSlot(r){const i=this.records.get(r);if(!(i!=null&&i.spec))return Do;const s=i.spec.kind;if(s==="chain")return i.entries;const u=[],c=new Set;for(const h of i.entries){if(this.abdicated.has(h))continue;const p=s==="keyed"?h.options.key:s==="list"?h.options.id:void 0;c.has(p)||(c.add(p),u.push(h))}return u}spec(r){var i;return(i=this.records.get(r))==null?void 0:i.spec}specDynamic(r){var i;return(i=this.records.get(r))==null?void 0:i.spec}snapshot(r){const i=(s,u)=>{const c=this.records.get(s);if((c==null?void 0:c.spec)===void 0||u.has(s))return;const h=new Set(u);h.add(s);const p=new Set(this.entriesOfSlot(s)),g=[...this.records.entries()].filter(([,C])=>C.spec!==void 0&&C.parent===s).flatMap(([C])=>{const v=i(C,h);return v===void 0?[]:[v]});return{name:s,kind:c.spec.kind,scope:c.spec.scope,...c.declaredBy===void 0?{}:{declaredBy:c.declaredBy},occupants:c.entries.map(C=>({...C.registrant===void 0?{}:{registrant:C.registrant},...C.options.key===void 0?{}:{key:C.options.key},...C.options.id===void 0?{}:{id:C.options.id},...C.options.order===void 0?{}:{order:C.options.order},priority:C.options.priority??0,active:p.has(C)})),children:g}};if(r!==void 0){const s=i(r,new Set);return s===void 0?[]:[s]}return[...this.records.entries()].filter(([,s])=>{var u;return s.spec!==void 0&&(s.parent===void 0||((u=this.records.get(s.parent))==null?void 0:u.spec)===void 0)}).flatMap(([s])=>{const u=i(s,new Set);return u===void 0?[]:[u]})}declarationEpoch(r){var i;return((i=this.records.get(r))==null?void 0:i.declarationEpoch)??0}subscribe(r,i){const s=this.record(r);return s.listeners.add(i),()=>{s.listeners.delete(i)}}subscribeDeclaration(r,i){const s=this.record(r);return s.declarationListeners.add(i),()=>{s.declarationListeners.delete(i)}}getVersion(r){var i;return((i=this.records.get(r))==null?void 0:i.version)??0}onMutate(r){return this.mutateListeners.add(r),()=>{this.mutateListeners.delete(r)}}reportEntryError(r,i,s,u){if(u.abdicate){if(this.abdicated.has(i))return;this.abdicated.add(i);const c=this.records.get(r);c!==void 0&&this.markDirty(r,c)}for(const c of[...this.entryErrorListeners])c(r,i,s,{abdicated:u.abdicate})}onEntryError(r){return this.entryErrorListeners.add(r),()=>{this.entryErrorListeners.delete(r)}}releaseEntry(r){if(r.store!==void 0&&typeof r.store!="function"){const i=this.handleScopes.get(r.store);i&&--i.count===0&&this.handleScopes.delete(r.store)}if(r.children)for(const i of Object.keys(r.children)){const s=this.records.get(i);if(!s)continue;const u=s.entries;s.spec=void 0,s.declaredBy=void 0,s.parent=void 0,s.declarationEpoch+=1,s.entries=Do,this.markDirty(i,s),this.notifyDeclaration(s);for(const c of u)this.releaseEntry(c)}}record(r){let i=this.records.get(r);return i||(i={spec:void 0,declaredBy:void 0,parent:void 0,declarationEpoch:0,entries:Do,version:0,listeners:new Set,declarationListeners:new Set},this.records.set(r,i)),i}markDirty(r,i){i.version+=1;for(const s of[...this.mutateListeners])s(r);this.dirty.add(i),this.flushScheduled||(this.flushScheduled=!0,queueMicrotask(()=>{this.flush()}))}notifyDeclaration(r){for(const i of[...r.declarationListeners])i()}flush(){this.flushScheduled=!1;const r=[...this.dirty];this.dirty.clear();for(const i of r)for(const s of[...i.listeners])s()}}const D6=Object.freeze(Object.defineProperty({__proto__:null,SlotCore:A6,SlotOwnershipError:Er,StaleAuthorizationError:li,resolveSlotLabel:V6},Symbol.toStringTag,{value:"Module"}));var R=E1();const F6=j1(R),B6=ni({__proto__:null,default:F6},[R]);class sn extends Error{}const P3=R.createContext(null);function Kn(){const n=R.useContext(P3);if(!n)throw new sn("slot machinery rendered outside the installed renderer tree");return n}const ou=R.createContext(null);function iu(){const n=R.useContext(ou);if(!n)throw new sn("session-aware slot rendered outside the root binding provider");return n}function Ht(n){let r=N0.get(n);return r===void 0&&(r=ru(n),N0.set(n,r)),r}const N0=new WeakMap,T3={getSnapshot:()=>{},subscribe:()=>()=>{}};function z6(n){return n!==void 0?Ht(n):Z6}function Z6(n,r){Ht(T3)(()=>{})}function U6(n){let r=R0.get(n);return r===void 0&&(r=(i,s,u)=>{var h;return Ht(((h=n.projections)==null?void 0:h.faceOf(i))??T3)(s??(p=>p),u)},R0.set(n,r)),r}const R0=new WeakMap;function W6({children:n}){const r=Kn(),i=Ht(r.sessions.provideInfo)(s=>s);return f.jsx(ou.Provider,{value:i,children:n})}function I3({empty:n,children:r}){const i=Kn(),s=Ht(i.sessions.provideInfo)(c=>c),u=s.sessionId;return u===void 0?f.jsx(f.Fragment,{children:(n==null?void 0:n())??null}):f.jsx(ou.Provider,{value:s,children:r(u)},u)}const P0=new WeakMap;function q6(n,r){let i=P0.get(r);return i||(i=(s,u,c)=>{var p;if(!n.isLive(r))throw new li(`renderSlot('${s}') from a disposed registration`);const h=(p=r.children)==null?void 0:p[s];if(h===void 0)throw new Er(`slot '${s}' is not declared by this entry's children`);if(h.kind==="chain")throw new Er(`slot '${s}' is declared 'chain' — use renderSlotChain`);return f.jsx(F3,{slotKey:s,ownerProps:u,opts:c})},P0.set(r,i)),i}const T0=new WeakMap;function Q6(n,r){let i=T0.get(r);return i||(i=(s,u,c)=>{var p;if(!n.isLive(r))throw new li(`renderSlotChain('${s}') from a disposed registration`);const h=(p=r.children)==null?void 0:p[s];if(h===void 0)throw new Er(`slot '${s}' is not declared by this entry's children`);if(h.kind!=="chain")throw new Er(`slot '${s}' is declared '${h.kind}', not 'chain' — use renderSlot`);return f.jsx(F3,{slotKey:s,ownerProps:u,opts:c})},T0.set(r,i)),i}const I0=new WeakMap,$0=new WeakMap,H0=new WeakMap,$3={};function su(n,r,i){const s=n.inject;if(!s)return $3;const u=[];return r!==void 0&&u.push(r.sessionId),i!==void 0&&u.push(i),K6(s(...u))}function K6(n){var c;const r=n.hooks;if(r===void 0)return n;const{hooks:i,...s}=n,u=s;for(const[h,p]of Object.entries(r)){const g=`use${((c=h[0])==null?void 0:c.toUpperCase())??""}${h.slice(1)}`;u[g]=Ht(p)}return u}const vl=new WeakMap,H3={props:$3};function J6(n){var p;if(n===void 0)return H3;let r=vl.get(n);if(r!==void 0)return r;const i=n.hooks;if(i===void 0)return r={props:n},vl.set(n,r),r;const{hooks:s,...u}=n,c=u;let h;for(const[g,C]of Object.entries(i)){const v=`use${((p=g[0])==null?void 0:p.toUpperCase())??""}${g.slice(1)}`;typeof C=="function"?(h??(h={}),h[g]=C):c[v]=Ht(C)}return r=h===void 0?{props:c}:{props:c,slotHookFactories:h},vl.set(n,r),r}function G6(n,r,i){var u;const s={};for(const[c,h]of Object.entries(n)){const p=`use${((u=c[0])==null?void 0:u.toUpperCase())??""}${c.slice(1)}`;s[p]=h(r,i)}return s}function Y6(n,r){let i=I0.get(n);return i||(i=su(n,void 0,r),I0.set(n,i)),i}function X6(n,r,i){let s=$0.get(n);s||(s=new WeakMap,$0.set(n,s));let u=s.get(r);return u||(u=su(n,r,i),s.set(r,u)),u}function e8(n,r,i){let s=H0.get(n);s||(s=new WeakMap,H0.set(n,s));let u=s.get(r);return u||(u=su(n,r,i),s.set(r,u)),u}const V0=new WeakMap;function t8(n,r){let i=V0.get(n);i||(i=new Map,V0.set(n,i));const s=n.getSnapshot().revision,u=i.get(r);if(u&&u.revision===s)return u.t;const c=n.bind(r),h=(p,g)=>c(p,g);return i.set(r,{revision:s,t:h}),h}const n8=()=>()=>{},r8=()=>0,A0=new WeakMap;function o8(n){let r=A0.get(n);return r||(r={subscribe:i=>n.subscribe(i),getRevision:()=>n.getSnapshot().revision},A0.set(n,r)),r}function V3(n){const r=n!==void 0?o8(n):void 0;return R.useSyncExternalStore((r==null?void 0:r.subscribe)??n8,(r==null?void 0:r.getRevision)??r8)}let i8=0;const D0=new WeakMap;function v1(n){let r=D0.get(n);return r===void 0&&(r=i8++,D0.set(n,r)),r}class lu extends R.Component{constructor(){super(...arguments);P(this,"state",{failed:!1})}static getDerivedStateFromError(i){if(i instanceof sn)throw i;return{failed:!0}}componentDidCatch(i){console.error(`slot entry crashed in '${this.props.slotKey}':`,i),this.props.onEntryError(i)}render(){return this.state.failed?f.jsx("div",{"data-slot-error":this.props.slotKey}):this.props.children}}const F0=new WeakMap;function s8(n,r,i){var h;let s=F0.get(n);if(s===void 0&&(s={root:{useSessions:Ht(n.sessions.list),useWorkspaces:Ht(n.workspaces.list)},session:new WeakMap,sessionMaybe:new WeakMap},F0.set(n,s)),r==="root")return s.root;if(i===void 0)throw new sn(`scope '${r}' rendered without session provide info`);const u=r==="session"?s.session:s.sessionMaybe;let c=u.get(i);if(c!==void 0)return c;c={...s.root};for(const[p,g]of Object.entries(i.hooks)){const C=`use${((h=p[0])==null?void 0:h.toUpperCase())??""}${p.slice(1)}`;if(r==="session-maybe")c[C]=z6(g);else{if(g===void 0)throw new sn(`strict session hook '${p}' has no source`);c[C]=Ht(g)}}return Object.assign(c,i.props),c.sessionId=i.sessionId,c.useProjection=U6(i),u.set(i,c),c}function uu(n,r,i,s){const u=s8(n,i,s),c={...u};if(r.locale!==void 0){const p=n.locale;if(p===void 0)throw new sn(`entry declares locale namespace '${r.locale}' but no locale face is installed (locale plugin missing from the composition?)`);c.t=t8(p,r.locale)}const h=i==="session-maybe"&&(s==null?void 0:s.sessionId)===void 0?void 0:n.storeOf(r,s==null?void 0:s.sessionId);return h!==void 0&&(c.useStore=Ht(h),c.actions=h.actions),r.children!==void 0&&(c.renderSlot=q6(n,r),Object.values(r.children).some(p=>p.kind==="chain")&&(c.renderSlotChain=Q6(n,r)),Object.values(r.children).some(p=>p.scope==="session")&&(c.SessionProvider=I3)),{kit:c,standard:u,actions:h==null?void 0:h.actions}}function l8({slotKey:n,Comp:r,kit:i,standard:s,injected:u,slotInjected:c,ownerProps:h,hookContext:p,hasHookContext:g}){const C=R.useMemo(()=>{if(!g)throw new sn(`slot '${n}' has contextual injected Hooks but no hookContext`);return G6(c.slotHookFactories,s,p)},[g,p,c.slotHookFactories,n,s]);return f.jsx(r,{...i,...u,...c.props,...C,...h})}function au(n,r,i,s,u,c,h,p,g){return c.slotHookFactories===void 0?f.jsx(r,{...i,...u,...c.props,...h}):f.jsx(l8,{slotKey:n,Comp:r,kit:i,standard:s,injected:u,slotInjected:c,ownerProps:h,hookContext:p,hasHookContext:g})}function u8({entry:n,ownerProps:r,info:i,slotKey:s,slotInjected:u,hookContext:c,hasHookContext:h}){const p=Kn(),g=n.component,{kit:C,standard:v,actions:L}=uu(p,n,"session",i),w=X6(n,i,L);return au(s,g,C,v,w,u,r,c,h)}function a8({entry:n,ownerProps:r,info:i,slotKey:s,slotInjected:u,hookContext:c,hasHookContext:h}){const p=Kn(),g=n.component,{kit:C,standard:v,actions:L}=uu(p,n,"session-maybe",i),w=e8(n,i,L);return au(s,g,C,v,w,u,r,c,h)}function c8({entry:n,ownerProps:r,slotKey:i,slotInjected:s,hookContext:u,hasHookContext:c}){const h=iu(),[p,g]=R.useState(f8);let{adopted:C,epoch:v}=p;return h.sessionId!==void 0&&C===void 0?(C=h.sessionId,g({adopted:C,epoch:v})):C!==void 0&&h.sessionId!==void 0&&h.sessionId!==C?(C=h.sessionId,v+=1,g({adopted:C,epoch:v})):C!==void 0&&h.sessionId===void 0&&(C=void 0,v+=1,g({adopted:C,epoch:v})),f.jsx(a8,{entry:n,ownerProps:r,info:h,slotKey:i,slotInjected:s,hookContext:u,hasHookContext:c},v)}const f8={adopted:void 0,epoch:0};function A3({entry:n,ownerProps:r,slotKey:i,slotInjected:s,hookContext:u,hasHookContext:c}){const h=Kn(),p=n.component,{kit:g,standard:C,actions:v}=uu(h,n,"root",void 0),L=Y6(n,v);return au(i,p,g,C,L,s,r,u,c)}function d8({slotKey:n,entry:r,ownerProps:i,slotInjected:s,hookContext:u,hasHookContext:c,onEntryError:h}){const p=iu();return p.sessionId===void 0?null:f.jsx(lu,{slotKey:n,onEntryError:h,children:f.jsx(u8,{entry:r,ownerProps:i,info:p,slotKey:n,slotInjected:s,hookContext:u,hasHookContext:c})},p.sessionId)}const D3={display:"contents"};function F3({slotKey:n,ownerProps:r,opts:i}){const s=Kn();R.useSyncExternalStore(c=>s.subscribe(n,c),()=>s.getVersion(n)),V3(s.locale);const u=iu();return f.jsx("div",{"data-slot":n,style:D3,children:h8(s,n,r,i,u)})}function h8(n,r,i,s,u){const c=n.specOf(r);if(!c)return null;const h=c.scope==="session"&&u.sessionId===void 0;if(h&&(c.kind!=="chain"||!(s!=null&&s.overlay)))return f.jsx(f.Fragment,{children:(s==null?void 0:s.fallback)??null});const p=h?[]:n.entriesOf(r),g=J6(c.inject),C=(E,T,B=i)=>{const W=s!==void 0&&Object.hasOwn(s,"hookContext"),z=s==null?void 0:s.hookContext,ee=Q=>{n.reportEntryError(r,E,Q,{abdicate:c.kind!=="chain"})};return c.scope==="session"?f.jsx(d8,{slotKey:r,entry:E,ownerProps:B,slotInjected:g,hookContext:z,hasHookContext:W,onEntryError:ee},T):f.jsx(lu,{slotKey:r,onEntryError:ee,children:c.scope==="session-maybe"?f.jsx(c8,{entry:E,ownerProps:B,slotKey:r,slotInjected:g,hookContext:z,hasHookContext:W}):f.jsx(A3,{entry:E,ownerProps:B,slotKey:r,slotInjected:g,hookContext:z,hasHookContext:W})},T)},v=()=>f.jsx("div",{"data-slot-error":r});if(c.kind==="single"){const E=n.entriesOfSlot(r)[0];return E?C(E,v1(E)):p.length>0?v():f.jsx(f.Fragment,{children:(s==null?void 0:s.fallback)??null})}if(c.kind==="keyed"){const E=n.entriesOfSlot(r).find(T=>T.options.key===(s==null?void 0:s.entryKey));return E?C(E,v1(E)):p.some(B=>B.options.key===(s==null?void 0:s.entryKey))?v():f.jsx(f.Fragment,{children:(s==null?void 0:s.fallback)??null})}if(c.kind==="chain"){let E=null;for(const T of p){let B;try{B=T.select(i)}catch(W){console.error(`chain selector crashed in '${r}' (${T.registrant??"unknown registrant"}), treating as declined:`,W);continue}if(B!==null){E=C(T,v1(T),{...i,matched:B});break}}return s!=null&&s.overlay?f.jsxs(f.Fragment,{children:[f.jsx("div",{"data-chain-overlay-fallback":r,style:{display:E===null?"contents":"none"},children:s.fallback??null}),E]}):E??f.jsx(f.Fragment,{children:(s==null?void 0:s.fallback)??null})}const w=n.entriesOfSlot(r).map(E=>({entry:E,id:E.options.id,order:E.options.order??0})),_=new Set(w.map(E=>E.id));for(const E of p)_.has(E.options.id)||(_.add(E.options.id),w.push({entry:void 0,id:E.options.id,order:E.options.order??0}));let k=[...w].sort((E,T)=>E.order-T.order);return(s==null?void 0:s.only)!==void 0&&(k=k.filter(E=>E.id===s.only)),k.length===0?f.jsx(f.Fragment,{children:(s==null?void 0:s.fallback)??null}):f.jsx(f.Fragment,{children:k.map((E,T)=>E.entry!==void 0?C(E.entry,`e${v1(E.entry)}`):f.jsx("div",{"data-slot-error":r},`x${E.id??T}`))})}function p8({ownerProps:n}){const r=Kn();R.useSyncExternalStore(s=>r.subscribe("root",s),()=>r.getVersion("root")),V3(r.locale);const i=r.entriesOfSlot("root")[0];if(!i){if(r.entriesOf("root").length>0)return f.jsx("div",{"data-slot-error":"root"});throw new sn("renderSlot('root') before any 'root' registration (boot order)")}return f.jsx("div",{"data-slot":"root",style:D3,children:f.jsx(lu,{slotKey:"root",onEntryError:s=>{r.reportEntryError("root",i,s,{abdicate:!0})},children:f.jsx(A3,{entry:i,ownerProps:n,slotKey:"root",slotInjected:H3,hookContext:void 0,hasHookContext:!1})},v1(i))})}function B3(){return{renderRoot(n,r){return f.jsx(P3.Provider,{value:n,children:f.jsx(W6,{children:f.jsx(p8,{ownerProps:r})})})}}}function m8(n){const r={inflight:0,listeners:new Set,fn:n,invoke:()=>{B0(r,1),r.fn().catch(i=>{console.error("useInvoke action failed:",i)}).finally(()=>{B0(r,-1)})},subscribe:i=>(r.listeners.add(i),()=>{r.listeners.delete(i)}),getPending:()=>r.inflight>0};return r}function B0(n,r){const i=n.inflight>0;if(n.inflight+=r,i!==n.inflight>0)for(const s of[...n.listeners])s()}function C8(n){const r=R.useRef(null);r.current??(r.current=m8(n));const i=r.current;i.fn=n;const s=R.useSyncExternalStore(i.subscribe,i.getPending);return[i.invoke,s]}const g8=Object.freeze(Object.defineProperty({__proto__:null,SessionProvider:I3,SlotAssemblyError:sn,SlotOwnershipError:Er,StaleAuthorizationError:li,bindSnapshotSelector:ru,createSlotRenderer:B3,useInvoke:C8},Symbol.toStringTag,{value:"Module"}));function v8({title:n}){const r=R.useRef(document.title);return R.useEffect(()=>(document.title=n===void 0?r.current:`${n} — ${r.current}`,()=>{document.title=r.current}),[n]),null}function y8(n){const{ctx:r}=n,i=r.get("sessions");if(i===void 0)throw new Error("shell assembly: sessions service unavailable");const s=ru(i.list),u=()=>{const c=s(h=>{var g;const p=h.current;return p===void 0||(g=h.byId[p])==null?void 0:g.title});return f.jsx(v8,{...c===void 0?{}:{title:c}})};return()=>f.jsxs(f.Fragment,{children:[f.jsx(u,{}),r.slots.renderSlot("root",{})]})}const Fl="@deepseek-ai/dsh-client-app-shell",w8="app-shell",x8=["slots","sessions","layout"];function _8(n){n.slots.install(B3());let r;n.reflect.provide("appShell",{renderApp:()=>(r??(r=y8({ctx:n})),r())})}const L8=Object.freeze(Object.defineProperty({__proto__:null,APP_SHELL_ID:Fl,apply:_8,inject:x8,name:w8},Symbol.toStringTag,{value:"Module"})),k8="_boot_9gj4p_6",S8="_card_9gj4p_13",j8="_wordmark_9gj4p_20",E8="_hint_9gj4p_28",b8="_spinner_9gj4p_34",M8="_failed_9gj4p_47",O8="_failedTitle_9gj4p_54",N8="_failedItem_9gj4p_61",nn={boot:k8,card:S8,wordmark:j8,hint:E8,spinner:b8,failed:M8,failedTitle:O8,failedItem:N8};function R8(n){const r=R.useSyncExternalStore(n.settled.subscribe,n.settled.getSnapshot),i=R.useSyncExternalStore(n.status.subscribe,n.status.getSnapshot),s=R.useSyncExternalStore(n.error.subscribe,n.error.getSnapshot),u=Object.entries(i).filter(([,h])=>h==="failed");if(r)return f.jsx(f.Fragment,{children:n.renderApp()});const c=s!==void 0||u.length>0;return f.jsx("div",{className:nn.boot,children:f.jsxs("div",{className:nn.card,children:[f.jsx("div",{className:nn.wordmark,children:"HARNESS"}),c?f.jsxs("div",{className:nn.failed,children:[f.jsx("div",{className:nn.failedTitle,children:"Failed to load plugins"}),u.map(([h])=>f.jsx("div",{className:nn.failedItem,children:h},h)),s!==void 0&&f.jsx("div",{className:nn.failedItem,children:s})]}):f.jsxs(f.Fragment,{children:[f.jsx("div",{className:nn.spinner}),f.jsx("div",{className:nn.hint,children:"Loading plugins…"})]})]})})}var ln=O3();const P8=j1(ln),T8=ni({__proto__:null,default:P8},[ln]);function z3(n){var r,i,s="";if(typeof n=="string"||typeof n=="number")s+=n;else if(typeof n=="object")if(Array.isArray(n)){var u=n.length;for(r=0;rf.jsx("rect",{className:yl.cell,x:s,y:u,width:"2",height:"2",style:{animationDelay:`${(c-z0.length)*125}ms`}},`${s}-${u}`))}):f.jsx("span",{className:ye(yl.dot,i),"data-state":n,style:{width:r,height:r},"aria-hidden":"true"})}const V8=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M8.00003 0.3237C3.76075 0.3237 0.32373 3.76072 0.32373 8C0.32373 9.17603 0.589121 10.2922 1.0632 11.2901L1.35291 11.8989L2.5705 11.3205L2.28079 10.7117C1.89079 9.89074 1.67301 8.97167 1.67301 8C1.67301 4.50546 4.50549 1.67298 8.00003 1.67298C11.4946 1.67298 14.3271 4.50546 14.3271 8C14.3271 11.4945 11.4946 14.327 8.00003 14.327C7.28473 14.327 6.76077 14.277 6.29621 14.1487C5.83857 14.0224 5.40441 13.8109 4.88514 13.4488C4.12569 12.919 3.03778 12.7316 2.141 13.2978L2.12682 13.307L2.11264 13.3171L1.34886 13.854L1.79659 15.188L2.86122 14.4384C3.19068 14.2305 3.68325 14.2542 4.11326 14.5539C4.72789 14.9826 5.30042 15.2724 5.93762 15.4484C6.56803 15.6224 7.22776 15.6763 8.00003 15.6763C12.2393 15.6763 15.6763 12.2393 15.6763 8C15.6763 3.76072 12.2393 0.3237 8.00003 0.3237ZM7.32033 4.82535V7.32536H4.82538V8.67464H7.32033V11.1747H8.6696V8.67464H11.1747V7.32536H8.6696V4.82535H7.32033Z",fill:"currentColor"})}),A8=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M11.894845 6.647401C11.894845 3.725463 9.534486 1.356779 6.623219 1.35657C3.711786 1.35657 1.351635 3.725338 1.351635 6.647401C1.351843 9.569296 3.711911 11.938273 6.623219 11.938273C9.534361 11.938064 11.894637 9.569171 11.894845 6.647401ZM13.245462 6.647401C13.245254 10.317935 10.280401 13.293613 6.623219 13.293821C2.965871 13.293821 0.000204 10.31806 0 6.647401C0 2.976574 2.965746 0 6.623219 0C10.280526 0.000205 13.245462 2.9767 13.245462 6.647401Z",fill:"currentColor"}),f.jsx("path",{d:"M16.000417 15.041079L15.044449 16.000433L11.530434 12.473588L12.486298 11.514234L16.000417 15.041079Z",fill:"currentColor"})]}),D8=({size:n=14,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{fillRule:"evenodd",clipRule:"evenodd",d:"M7.00018 0.353516C10.6708 0.353535 13.6468 3.32958 13.6469 7.00018C13.6468 10.6708 10.6708 13.6468 7.00018 13.6469C3.32957 13.6468 0.353535 10.6708 0.353516 7.00018C0.353535 3.32957 3.32957 0.353531 7.00018 0.353516ZM5.44643 7.59661C5.49463 8.97506 5.70762 10.191 6.02136 11.0793C6.20141 11.5891 6.40328 11.9585 6.59898 12.1889C6.79501 12.4196 6.93213 12.454 7.00018 12.454C7.06822 12.454 7.20533 12.4197 7.40138 12.1889C7.59708 11.9585 7.79895 11.589 7.979 11.0793C8.29274 10.191 8.50574 8.97506 8.55394 7.59661H5.44643ZM1.57861 7.59661C1.80785 9.70467 3.2386 11.4509 5.1715 12.1388C5.07135 11.9317 4.97972 11.7098 4.89746 11.477C4.53084 10.4391 4.30224 9.0828 4.25357 7.59661H1.57861ZM9.74679 7.59661C9.69813 9.0828 9.46952 10.4391 9.1029 11.477C9.0206 11.7099 8.92818 11.9316 8.82797 12.1388C10.7613 11.4511 12.1925 9.70496 12.4218 7.59661H9.74679ZM5.1706 1.8616C3.23814 2.54963 1.80876 4.29604 1.5795 6.40376H4.25357C4.30224 4.91756 4.53083 3.56129 4.89746 2.5234C4.97968 2.29066 5.07051 2.0686 5.1706 1.8616ZM7.00018 1.54637C6.93213 1.54638 6.79503 1.5807 6.59898 1.81145C6.40332 2.04177 6.20139 2.41058 6.02136 2.92012C5.70754 3.80851 5.49461 5.02499 5.44643 6.40376H8.55394C8.50575 5.025 8.29282 3.80851 7.979 2.92012C7.79898 2.41059 7.59705 2.04177 7.40138 1.81145C7.20531 1.58067 7.06823 1.54637 7.00018 1.54637ZM8.82887 1.8616C8.92902 2.0687 9.02064 2.29053 9.1029 2.5234C9.46953 3.56129 9.69812 4.91756 9.74679 6.40376H12.4209C12.1916 4.29575 10.7618 2.54943 8.82887 1.8616Z",fill:"currentColor"})}),F8=({size:n=14,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsxs("g",{clipPath:"url(#clip0_2580_121189)",children:[f.jsx("path",{d:"M12.1192 4.91016C11.9392 4.52714 11.7007 4.1292 11.4483 3.78809C11.385 3.70258 11.3517 3.68409 11.2462 3.67383C10.7419 3.6248 10.2318 3.69454 9.72662 3.64551C9.29108 3.60318 8.93739 3.40341 8.67682 3.05176C8.38762 2.66127 8.19217 2.20926 7.90338 1.81934C7.83985 1.73359 7.80848 1.71542 7.70221 1.70508C7.24758 1.6609 6.7511 1.66104 6.29791 1.70508C6.19164 1.71542 6.16027 1.73359 6.09674 1.81934C5.80775 2.20954 5.61248 2.66131 5.3233 3.05176C5.06273 3.40341 4.70904 3.60318 4.2735 3.64551C3.76831 3.69454 3.25825 3.6248 2.75397 3.67383C2.6484 3.68409 2.61509 3.70258 2.55182 3.78809C2.30019 4.12814 2.06125 4.52646 1.88092 4.91016C1.83256 5.01309 1.83242 5.04912 1.88092 5.15235C2.07954 5.57482 2.37449 5.94529 2.5733 6.36817C2.76971 6.78606 2.76964 7.21293 2.5733 7.63086C2.37462 8.05374 2.07947 8.42453 1.88092 8.84668C1.83235 8.95004 1.83257 8.98695 1.88092 9.08985C2.06098 9.47285 2.2994 9.87079 2.55182 10.2119C2.61509 10.2974 2.6484 10.3159 2.75397 10.3262C3.25879 10.3753 3.76834 10.3055 4.2735 10.3545C4.70904 10.3968 5.06273 10.5966 5.3233 10.9482C5.6125 11.3387 5.80795 11.7907 6.09674 12.1807C6.16027 12.2664 6.19164 12.2846 6.29791 12.2949C6.7511 12.339 7.24758 12.3391 7.70221 12.2949C7.80848 12.2846 7.83985 12.2664 7.90338 12.1807C8.19237 11.7905 8.38764 11.3387 8.67682 10.9482C8.93739 10.5966 9.29108 10.3968 9.72662 10.3545C10.2318 10.3055 10.7419 10.3752 11.2462 10.3262C11.3517 10.3159 11.385 10.2974 11.4483 10.2119C11.7007 9.87079 11.9391 9.47285 12.1192 9.08985C12.1675 8.98695 12.1678 8.95004 12.1192 8.84668C11.9205 8.42428 11.6255 8.05377 11.4268 7.63086C11.2305 7.21293 11.2304 6.78606 11.4268 6.36817C11.6256 5.94531 11.9207 5.5746 12.1192 5.15235C12.1677 5.04912 12.1676 5.01309 12.1192 4.91016ZM13.2051 5.66309C13.0064 6.08573 12.7114 6.45579 12.5128 6.87793C12.4642 6.98123 12.4645 7.01829 12.5128 7.1211C12.7112 7.54328 13.0064 7.91405 13.2051 8.33692C13.4015 8.75487 13.4015 9.18169 13.2051 9.59961C12.9911 10.0551 12.7109 10.5221 12.4122 10.9258C12.1522 11.277 11.7974 11.4782 11.3624 11.5205C10.8573 11.5696 10.3477 11.4999 9.84283 11.5488C9.73621 11.5592 9.70429 11.5772 9.64069 11.6631C9.35229 12.0526 9.15705 12.5044 8.86823 12.8945C8.60854 13.2452 8.25275 13.447 7.81842 13.4893C7.28749 13.5409 6.71096 13.5407 6.1817 13.4893C5.74737 13.447 5.39158 13.2452 5.1319 12.8945C4.84312 12.5045 4.64808 12.0529 4.35944 11.6631C4.29583 11.5772 4.26392 11.5592 4.15729 11.5488C3.65283 11.5 3.14295 11.5696 2.63776 11.5205C2.20274 11.4782 1.84796 11.277 1.58795 10.9258C1.28834 10.5209 1.00864 10.0543 0.794982 9.59961C0.598644 9.18169 0.598598 8.75487 0.794982 8.33692C0.993688 7.91405 1.28889 7.54328 1.48737 7.1211C1.53567 7.01829 1.53593 6.98123 1.48737 6.87793C1.28887 6.45603 0.993667 6.08569 0.794982 5.66309C0.598535 5.24516 0.59869 4.81829 0.794982 4.40039C1.00898 3.94492 1.28922 3.47791 1.58795 3.07422C1.84796 2.723 2.20274 2.5218 2.63776 2.47949C3.14295 2.43038 3.65283 2.50003 4.15729 2.45117C4.26391 2.44081 4.29583 2.4228 4.35944 2.33692C4.64783 1.94742 4.84308 1.49557 5.1319 1.10547C5.39158 0.754835 5.74737 0.553005 6.1817 0.510744C6.71263 0.459147 7.28917 0.459309 7.81842 0.510744C8.25275 0.553005 8.60854 0.754835 8.86823 1.10547C9.157 1.49551 9.35204 1.94708 9.64069 2.33692C9.70429 2.4228 9.73621 2.44081 9.84283 2.45117C10.3477 2.50007 10.8573 2.43039 11.3624 2.47949C11.7974 2.5218 12.1522 2.723 12.4122 3.07422C12.7118 3.47909 12.9915 3.94567 13.2051 4.40039C13.4014 4.81829 13.4016 5.24516 13.2051 5.66309Z",fill:"currentColor"}),f.jsx("path",{d:"M7.9317 7C7.9317 6.48569 7.51438 6.06836 7.00006 6.06836C6.48575 6.06836 6.06842 6.48569 6.06842 7C6.06842 7.51432 6.48575 7.93164 7.00006 7.93164C7.51438 7.93164 7.9317 7.51432 7.9317 7ZM9.13092 7C9.13092 8.17706 8.17712 9.13086 7.00006 9.13086C5.823 9.13086 4.8692 8.17706 4.8692 7C4.8692 5.82294 5.823 4.86914 7.00006 4.86914C8.17712 4.86914 9.13092 5.82294 9.13092 7Z",fill:"currentColor"})]}),f.jsx("defs",{children:f.jsx("clipPath",{id:"clip0_2580_121189",children:f.jsx("rect",{width:14,height:14,fill:"currentColor"})})})]}),B8=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsxs("g",{clipPath:"url(#clip0_1450_63327)",children:[f.jsx("path",{d:"M14.0861 5.51366C13.8717 5.0575 13.588 4.58542 13.2889 4.18108C13.208 4.07172 13.1596 4.04373 13.0243 4.03054C12.4277 3.97255 11.8245 4.05527 11.2269 3.9972C10.7224 3.94816 10.3133 3.71661 10.0115 3.30919C9.66986 2.84777 9.43973 2.31343 9.09824 1.85234C9.01771 1.74365 8.96805 1.71589 8.83354 1.70282C8.29432 1.65044 7.70402 1.65061 7.16656 1.70282C7.03205 1.71589 6.98239 1.74365 6.90186 1.85234C6.56067 2.31303 6.33025 2.84774 5.98855 3.30919C5.68681 3.71661 5.27774 3.94816 4.77317 3.9972C4.17564 4.05527 3.57239 3.97255 2.97585 4.03054C2.84046 4.04373 2.79208 4.07172 2.71115 4.18108C2.41212 4.58542 2.12835 5.0575 1.91403 5.51366C1.85299 5.64359 1.85286 5.7018 1.91403 5.8319C2.14865 6.33077 2.49748 6.76892 2.73237 7.26854C2.9594 7.7515 2.96041 8.24717 2.73338 8.73044C2.49837 9.23061 2.14891 9.66837 1.91403 10.1681C1.85291 10.2982 1.85299 10.3564 1.91403 10.4863C2.12856 10.9429 2.41185 11.4142 2.71115 11.8189C2.79208 11.9283 2.84046 11.9563 2.97585 11.9694C3.57239 12.0274 4.17564 11.9447 4.77317 12.0028C5.27774 12.0518 5.68681 12.2834 5.98855 12.6908C6.33024 13.1522 6.56037 13.6866 6.90186 14.1476C6.98239 14.2563 7.03205 14.2841 7.16656 14.2972C7.70402 14.3494 8.29432 14.3495 8.83354 14.2972C8.96805 14.2841 9.01771 14.2563 9.09824 14.1476C9.43944 13.687 9.66985 13.1522 10.0115 12.6908C10.3133 12.2834 10.7224 12.0518 11.2269 12.0028C11.8244 11.9447 12.4271 12.0275 13.0243 11.9694C13.1596 11.9563 13.208 11.9283 13.2889 11.8189C13.5891 11.4131 13.872 10.942 14.0861 10.4863C14.1471 10.3564 14.1472 10.2982 14.0861 10.1681C13.8513 9.66861 13.5017 9.23061 13.2667 8.73044C13.0397 8.24717 13.0407 7.7515 13.2677 7.26854C13.5026 6.7689 13.8513 6.33106 14.0861 5.8319C14.1472 5.7018 14.1471 5.64359 14.0861 5.51366ZM15.3035 6.40373C15.0685 6.90359 14.7188 7.34119 14.4841 7.84037C14.4231 7.97025 14.423 8.02855 14.4841 8.15861C14.7189 8.65833 15.0685 9.09611 15.3035 9.59626C15.5308 10.0801 15.5308 10.5744 15.3035 11.0582C15.052 11.5933 14.7225 12.1426 14.37 12.6191C14.0685 13.0265 13.6581 13.259 13.1536 13.3081C12.5566 13.366 11.9541 13.2835 11.3573 13.3414C11.2228 13.3545 11.1731 13.3823 11.0926 13.491C10.7511 13.9521 10.521 14.4864 10.1793 14.9478C9.87828 15.3542 9.46719 15.5869 8.96387 15.6358C8.34008 15.6964 7.66194 15.6966 7.03623 15.6358C6.53291 15.5869 6.12182 15.3542 5.82084 14.9478C5.47911 14.4863 5.24878 13.9517 4.90753 13.491C4.82701 13.3823 4.77734 13.3545 4.64284 13.3414C4.04647 13.2835 3.44373 13.366 2.84653 13.3081C2.34201 13.259 1.93164 13.0265 1.63013 12.6191C1.27867 12.144 0.948453 11.5941 0.696621 11.0582C0.469315 10.5744 0.469279 10.0801 0.696621 9.59626C0.931628 9.09613 1.2813 8.65807 1.51597 8.15861C1.57708 8.02855 1.57702 7.97025 1.51597 7.84037C1.28117 7.34095 0.931635 6.9036 0.696621 6.40373C0.469213 5.91992 0.469367 5.42562 0.696621 4.94183C0.948441 4.40587 1.27868 3.85598 1.63013 3.38092C1.93164 2.97349 2.34201 2.74095 2.84653 2.6919C3.44353 2.63397 4.04599 2.71649 4.64284 2.65856C4.77734 2.64549 4.82701 2.61774 4.90753 2.50904C5.24905 2.04792 5.47913 1.51362 5.82084 1.05219C6.12182 0.645806 6.53291 0.413119 7.03623 0.364178C7.66002 0.303556 8.33816 0.303369 8.96387 0.364178C9.46719 0.413119 9.87828 0.645806 10.1793 1.05219C10.521 1.51365 10.7513 2.04828 11.0926 2.50904C11.1731 2.61774 11.2228 2.64549 11.3573 2.65856C11.9541 2.71649 12.5566 2.63397 13.1536 2.6919C13.6581 2.74095 14.0685 2.97349 14.37 3.38092C14.7214 3.85598 15.0517 4.40587 15.3035 4.94183C15.5307 5.42562 15.5309 5.91992 15.3035 6.40373Z",fill:"currentColor"}),f.jsx("path",{d:"M9.13764 7.99999C9.13764 7.3715 8.62855 6.8624 8.00005 6.8624C7.37155 6.8624 6.86246 7.3715 6.86246 7.99999C6.86246 8.62849 7.37155 9.13759 8.00005 9.13759C8.62855 9.13759 9.13764 8.62849 9.13764 7.99999ZM10.4834 7.99999C10.4834 9.37126 9.37132 10.4833 8.00005 10.4833C6.62878 10.4833 5.51674 9.37126 5.51674 7.99999C5.51674 6.62873 6.62878 5.51669 8.00005 5.51669C9.37132 5.51669 10.4834 6.62873 10.4834 7.99999Z",fill:"currentColor"})]}),f.jsx("defs",{children:f.jsx("clipPath",{id:"clip0_1450_63327",children:f.jsx("rect",{width:16,height:16,fill:"currentColor"})})})]}),z8=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{fillRule:"evenodd",clipRule:"evenodd",d:"M9.67272 0.522841C10.8339 0.522841 11.76 0.522714 12.4963 0.602493C13.2453 0.683657 13.8789 0.854248 14.4264 1.25197C14.7504 1.48739 15.0355 1.77247 15.2709 2.0965C15.6686 2.64394 15.8392 3.27758 15.9204 4.02655C16.0002 4.7629 16 5.68895 16 6.85014V9.14986C16 10.3111 16.0002 11.2371 15.9204 11.9735C15.8392 12.7224 15.6686 13.3561 15.2709 13.9035C15.0355 14.2275 14.7504 14.5126 14.4264 14.748C13.8789 15.1458 13.2453 15.3163 12.4963 15.3975C11.76 15.4773 10.8339 15.4772 9.67272 15.4772H6.3273C5.16611 15.4772 4.24006 15.4773 3.50371 15.3975C2.75474 15.3163 2.1211 15.1458 1.57366 14.748C1.24963 14.5126 0.964549 14.2275 0.729131 13.9035C0.331407 13.3561 0.160817 12.7224 0.0796529 11.9735C-0.000126137 11.2371 1.25338e-09 10.3111 1.25338e-09 9.14986V6.85014C1.25329e-09 5.68895 -0.000126137 4.7629 0.0796529 4.02655C0.160817 3.27758 0.331407 2.64394 0.729131 2.0965C0.964549 1.77247 1.24963 1.48739 1.57366 1.25197C2.1211 0.854248 2.75474 0.683657 3.50371 0.602493C4.24006 0.522714 5.16611 0.522841 6.3273 0.522841H9.67272ZM5.54303 1.88715V14.1118C5.78636 14.1128 6.04709 14.1169 6.3273 14.1169H9.67272C10.8639 14.1169 11.7032 14.1164 12.3493 14.0465C12.9824 13.9779 13.3497 13.8494 13.6268 13.6482C13.8354 13.4966 14.0195 13.3125 14.1711 13.1039C14.3723 12.8268 14.5007 12.4595 14.5693 11.8264C14.6393 11.1803 14.6398 10.341 14.6398 9.14986V6.85014C14.6398 5.65896 14.6393 4.81967 14.5693 4.1736C14.5007 3.54048 14.3723 3.17318 14.1711 2.89609C14.0195 2.68747 13.8354 2.50337 13.6268 2.35179C13.3497 2.1506 12.9824 2.02212 12.3493 1.95353C11.7032 1.88358 10.8639 1.88307 9.67272 1.88307H6.3273C6.04709 1.88307 5.78636 1.8862 5.54303 1.88715ZM4.1828 1.91166C3.99125 1.9216 3.8148 1.93577 3.65076 1.95353C3.01764 2.02212 2.65034 2.1506 2.37325 2.35179C2.16463 2.50337 1.98052 2.68747 1.82895 2.89609C1.62776 3.17318 1.49928 3.54048 1.43069 4.1736C1.36074 4.81967 1.36023 5.65896 1.36023 6.85014V9.14986C1.36023 10.341 1.36074 11.1803 1.43069 11.8264C1.49928 12.4595 1.62776 12.8268 1.82895 13.1039C1.98052 13.3125 2.16463 13.4966 2.37325 13.6482C2.65034 13.8494 3.01764 13.9779 3.65076 14.0465C3.81478 14.0642 3.99127 14.0774 4.1828 14.0873V1.91166Z",fill:"currentColor"})}),Z8=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M4.55146 8.00001C4.55146 8.63513 4.03659 9.15001 3.40146 9.15001C2.76634 9.15001 2.25146 8.63513 2.25146 8.00001C2.25146 7.36488 2.76634 6.85001 3.40146 6.85001C4.03659 6.85001 4.55146 7.36488 4.55146 8.00001Z",fill:"currentColor"}),f.jsx("path",{d:"M9.1476 8.00001C9.1476 8.63513 8.63273 9.15001 7.9976 9.15001C7.36248 9.15001 6.8476 8.63513 6.8476 8.00001C6.8476 7.36488 7.36248 6.85001 7.9976 6.85001C8.63273 6.85001 9.1476 7.36488 9.1476 8.00001Z",fill:"currentColor"}),f.jsx("path",{d:"M13.7486 8.00001C13.7486 8.63513 13.2338 9.15001 12.5986 9.15001C11.9635 9.15001 11.4486 8.63513 11.4486 8.00001C11.4486 7.36488 11.9635 6.85001 12.5986 6.85001C13.2338 6.85001 13.7486 7.36488 13.7486 8.00001Z",fill:"currentColor"})]}),U8=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M8.64453 1.5V7.34961H14.5V8.65039H8.64453V14.5H7.34473V8.65039H1.5V7.34961H7.34473V1.5H8.64453Z",fill:"currentColor"})}),cu=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M15.0498 3.92579L8.49512 12.3818C8.25774 12.6881 8.04517 12.9645 7.84668 13.1689C7.63957 13.3823 7.38732 13.5841 7.04492 13.6719C6.86373 13.7183 6.6757 13.7346 6.48926 13.7197C6.13666 13.6915 5.8528 13.5355 5.6123 13.3604C5.38201 13.1926 5.12573 12.9567 4.83984 12.6953L1.03125 9.21289L1.96875 8.1875L5.77734 11.6699C6.08684 11.9529 6.27773 12.1249 6.43066 12.2363C6.50183 12.2882 6.54699 12.3135 6.57324 12.3252C6.58525 12.3305 6.59269 12.3322 6.5957 12.333C6.59802 12.3336 6.59961 12.334 6.59961 12.334C6.63317 12.3367 6.66758 12.3335 6.7002 12.3252C6.7002 12.3252 6.70211 12.3251 6.7041 12.3242C6.70698 12.3229 6.71348 12.319 6.72461 12.3115C6.74849 12.2956 6.78843 12.2642 6.84961 12.2012C6.98138 12.0654 7.13957 11.8628 7.39648 11.5313L13.9502 3.07422L15.0498 3.92579Z",fill:"currentColor"})}),W8=({size:n=14,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M11.5635 4.58984L7.61426 9.07715C7.35154 9.37561 7.11346 9.64812 6.89453 9.84668C6.66593 10.054 6.38519 10.2506 6.01465 10.3164C5.82079 10.3508 5.62207 10.3529 5.42773 10.3213C5.0561 10.2609 4.77266 10.0674 4.54102 9.86328C4.31926 9.66791 4.07752 9.39911 3.81055 9.10449L2.44531 7.59863L3.55664 6.59082L4.92188 8.09766C5.21256 8.41844 5.38878 8.61191 5.53223 8.73828C5.61022 8.80699 5.65253 8.83192 5.66895 8.83984C5.69648 8.84429 5.72449 8.84467 5.75195 8.83984C5.72657 8.84451 5.75564 8.85422 5.88672 8.73535C6.02833 8.60692 6.20225 8.41088 6.48828 8.08594L10.4385 3.59961L11.5635 4.58984Z",fill:"currentColor"})}),q8=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{fillRule:"evenodd",clipRule:"evenodd",d:"M13.0762 1.37207C14.0846 1.37228 14.9021 2.19077 14.9023 3.19922C14.9022 4.20772 14.0847 5.02518 13.0762 5.02539C12.2967 5.02539 11.6325 4.53691 11.3701 3.84961H4.35547C4.79397 4.26458 5.15861 4.7644 5.41699 5.33496L7.10645 9.06738C7.88526 10.7875 9.55104 11.9228 11.4189 12.0371C11.7085 11.4109 12.3411 10.9756 13.0762 10.9756C14.0843 10.9759 14.9023 11.7936 14.9023 12.8018C14.9023 13.81 14.0843 14.6277 13.0762 14.6279C12.2534 14.6279 11.5574 14.0832 11.3291 13.335C8.9868 13.1879 6.89981 11.7612 5.92285 9.60352L4.23242 5.87109C3.67503 4.64033 2.44878 3.84961 1.09766 3.84961V2.54883C1.10665 2.54883 1.11601 2.54975 1.125 2.5498L11.3701 2.54883C11.6326 1.86151 12.2969 1.37207 13.0762 1.37207ZM13.0762 12.2764C12.7858 12.2764 12.5508 12.5114 12.5508 12.8018C12.5508 13.0921 12.7858 13.3281 13.0762 13.3281C13.3664 13.3279 13.6025 13.092 13.6025 12.8018C13.6025 12.5115 13.3664 12.2766 13.0762 12.2764ZM13.0762 2.67285C12.7855 2.67285 12.55 2.90861 12.5498 3.19922C12.5499 3.48987 12.7855 3.72559 13.0762 3.72559C13.3667 3.72538 13.6024 3.48975 13.6025 3.19922C13.6023 2.90874 13.3666 2.67306 13.0762 2.67285Z",fill:"currentColor"})}),Bl=({size:n=14,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M11.8486 5.5L11.4238 5.92383L8.69727 8.65137C8.44157 8.90706 8.21562 9.13382 8.01172 9.29785C7.79912 9.46883 7.55595 9.61756 7.25 9.66602C7.08435 9.69222 6.91565 9.69222 6.75 9.66602C6.44405 9.61756 6.20088 9.46883 5.98828 9.29785C5.78438 9.13382 5.55843 8.90706 5.30273 8.65137L2.57617 5.92383L2.15137 5.5L3 4.65137L3.42383 5.07617L6.15137 7.80273C6.42595 8.07732 6.59876 8.24849 6.74023 8.3623C6.87291 8.46904 6.92272 8.47813 6.9375 8.48047C6.97895 8.48703 7.02105 8.48703 7.0625 8.48047C7.07728 8.47813 7.12709 8.46904 7.25977 8.3623C7.40124 8.24849 7.57405 8.07732 7.84863 7.80273L10.5762 5.07617L11 4.65137L11.8486 5.5Z",fill:"currentColor"})}),U3=({size:n=14,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M8.5 2.15137L8.07617 2.57617L5.34863 5.30273C5.09294 5.55843 4.86618 5.78438 4.70215 5.98828C4.53117 6.20088 4.38244 6.44405 4.33398 6.75C4.30778 6.91565 4.30778 7.08435 4.33398 7.25C4.38244 7.55595 4.53117 7.79912 4.70215 8.01172C4.86618 8.21561 5.09294 8.44157 5.34863 8.69727L8.07617 11.4238L8.5 11.8486L9.34863 11L8.92383 10.5762L6.19727 7.84863C5.92268 7.57405 5.75151 7.40124 5.6377 7.25977C5.53096 7.12709 5.52187 7.07728 5.51953 7.0625C5.51297 7.02105 5.51297 6.97895 5.51953 6.9375C5.52187 6.92272 5.53096 6.87291 5.6377 6.74023C5.75152 6.59876 5.92268 6.42595 6.19727 6.15137L8.92383 3.42383L9.34863 3L8.5 2.15137Z",fill:"currentColor"})}),W3=({size:n=14,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M5.5 2.15137L5.92383 2.57617L8.65137 5.30273C8.90706 5.55843 9.13382 5.78438 9.29785 5.98828C9.46883 6.20088 9.61756 6.44405 9.66602 6.75C9.69222 6.91565 9.69222 7.08435 9.66602 7.25C9.61756 7.55595 9.46883 7.79912 9.29785 8.01172C9.13382 8.21561 8.90706 8.44157 8.65137 8.69727L5.92383 11.4238L5.5 11.8486L4.65137 11L5.07617 10.5762L7.80273 7.84863C8.07732 7.57405 8.24849 7.40124 8.3623 7.25977C8.46904 7.12709 8.47813 7.07728 8.48047 7.0625C8.48703 7.02105 8.48703 6.97895 8.48047 6.9375C8.47813 6.92272 8.46904 6.87291 8.3623 6.74023C8.24848 6.59876 8.07732 6.42595 7.80273 6.15137L5.07617 3.42383L4.65137 3L5.5 2.15137Z",fill:"currentColor"})}),Q8=({size:n=14,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M4.25 2.82782L4.25 11.1722C4.25 11.6622 4.84243 11.9076 5.18891 11.5611L9.36109 7.38891C9.57588 7.17412 9.57588 6.82588 9.36109 6.61109L5.18891 2.43891C4.84243 2.09243 4.25 2.33782 4.25 2.82782Z",fill:"currentColor"})}),K8=({size:n=14,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M2.15137 8.5L2.57617 8.07617L5.30273 5.34863C5.55843 5.09294 5.78438 4.86618 5.98828 4.70215C6.20088 4.53117 6.44405 4.38244 6.75 4.33398C6.91565 4.30778 7.08435 4.30778 7.25 4.33398C7.55595 4.38244 7.79912 4.53117 8.01172 4.70215C8.21561 4.86618 8.44157 5.09294 8.69727 5.34863L11.4238 8.07617L11.8486 8.5L11 9.34863L10.5762 8.92383L7.84863 6.19727C7.57405 5.92269 7.40124 5.75152 7.25977 5.6377C7.12709 5.53096 7.07728 5.52187 7.0625 5.51953C7.02105 5.51297 6.97895 5.51297 6.9375 5.51953C6.92272 5.52187 6.87291 5.53096 6.74023 5.6377C6.59876 5.75152 6.42595 5.92268 6.15137 6.19727L3.42383 8.92383L3 9.34863L2.15137 8.5Z",fill:"currentColor"})}),fu=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M14.1168 13.197L13.197 14.1167L1.8833 2.80303L2.80309 1.88324L14.1168 13.197Z",fill:"currentColor"}),f.jsx("path",{d:"M13.197 1.88326L14.1168 2.80305L2.80309 14.1168L1.8833 13.197L13.197 1.88326Z",fill:"currentColor"})]}),q3=({size:n=14,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M10.6074 4.40278L8.00975 6.99973L10.6074 9.59739L9.59736 10.6074L6.9997 8.00978L4.40274 10.6074L3.3927 9.59739L5.98966 6.99973L3.3927 4.40278L4.40274 3.39273L6.9997 5.98969L9.59736 3.39273L10.6074 4.40278Z",fill:"currentColor"})}),Q3=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M6.14929 4.02032C7.11197 4.02032 7.87983 4.02016 8.49597 4.07598C9.12128 4.13269 9.65792 4.25188 10.1415 4.53106C10.7202 4.8653 11.2008 5.3459 11.535 5.92462C11.8142 6.40818 11.9334 6.94481 11.9901 7.57012C12.0459 8.18625 12.0458 8.95419 12.0458 9.9168C12.0458 10.8795 12.0459 11.6473 11.9901 12.2635C11.9334 12.8888 11.8142 13.4254 11.535 13.909C11.2008 14.4877 10.7202 14.9683 10.1415 15.3025C9.65792 15.5817 9.12128 15.7009 8.49597 15.7576C7.87984 15.8134 7.11196 15.8133 6.14929 15.8133C5.18667 15.8133 4.41874 15.8134 3.80261 15.7576C3.1773 15.7009 2.64067 15.5817 2.1571 15.3025C1.5784 14.9683 1.09778 14.4877 0.76355 13.909C0.484366 13.4254 0.365184 12.8888 0.308472 12.2635C0.252649 11.6473 0.252808 10.8795 0.252808 9.9168C0.252808 8.95418 0.252664 8.18625 0.308472 7.57012C0.365184 6.94481 0.484366 6.40818 0.76355 5.92462C1.09777 5.34589 1.57839 4.86529 2.1571 4.53106C2.64067 4.25188 3.1773 4.13269 3.80261 4.07598C4.41874 4.02017 5.18666 4.02032 6.14929 4.02032ZM6.14929 5.37774C5.16181 5.37774 4.46634 5.37761 3.92566 5.42657C3.39434 5.47472 3.07859 5.56574 2.83582 5.70587C2.4632 5.92106 2.15354 6.2307 1.93835 6.60333C1.79823 6.8461 1.70721 7.16185 1.65906 7.69317C1.6101 8.23385 1.61023 8.92933 1.61023 9.9168C1.61023 10.9043 1.61009 11.5998 1.65906 12.1404C1.70721 12.6717 1.79823 12.9875 1.93835 13.2303C2.15356 13.6029 2.46321 13.9126 2.83582 14.1277C3.07859 14.2679 3.39434 14.3589 3.92566 14.407C4.46634 14.456 5.16182 14.4559 6.14929 14.4559C7.13682 14.4559 7.83224 14.456 8.37292 14.407C8.90425 14.3589 9.21999 14.2679 9.46277 14.1277C9.83535 13.9126 10.145 13.6029 10.3602 13.2303C10.5004 12.9875 10.5914 12.6717 10.6395 12.1404C10.6885 11.5998 10.6884 10.9043 10.6884 9.9168C10.6884 8.92934 10.6885 8.23384 10.6395 7.69317C10.5914 7.16185 10.5004 6.8461 10.3602 6.60333C10.1451 6.23071 9.83536 5.92107 9.46277 5.70587C9.21999 5.56574 8.90424 5.47472 8.37292 5.42657C7.83224 5.3776 7.13682 5.37774 6.14929 5.37774ZM9.80164 0.367975C10.7638 0.367975 11.5314 0.36788 12.1473 0.423639C12.7726 0.480307 13.3093 0.598759 13.7928 0.877741C14.3717 1.21192 14.8521 1.69355 15.1864 2.27227C15.4655 2.75574 15.5857 3.29164 15.6425 3.9168C15.6983 4.53301 15.6971 5.3016 15.6971 6.26446V7.82989C15.6971 8.29264 15.6989 8.58993 15.6649 8.84844C15.4668 10.3525 14.401 11.5738 12.9833 11.9988V10.5467C13.6973 10.1903 14.2105 9.49662 14.3192 8.67169C14.3387 8.52347 14.3407 8.3358 14.3407 7.82989V6.26446C14.3407 5.27706 14.3398 4.58149 14.2909 4.04083C14.2428 3.50968 14.1526 3.19372 14.0126 2.95098C13.7974 2.57849 13.4876 2.26869 13.1151 2.05352C12.8724 1.91347 12.5564 1.82237 12.0253 1.77423C11.4847 1.72528 10.7888 1.7254 9.80164 1.7254H7.71472C6.7562 1.72558 5.92665 2.27697 5.52332 3.07891H4.07019C4.54221 1.51132 5.9932 0.368186 7.71472 0.367975H9.80164Z",fill:"currentColor"})}),J8=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M7.92136 0.349152C10.3744 0.349234 12.5564 1.5052 13.9557 3.29894L15.1281 2.12759C15.3303 1.92546 15.6767 2.06943 15.6767 2.35538V5.53923C15.6766 5.71626 15.5329 5.85976 15.3559 5.86002H12.171C11.8854 5.8597 11.7426 5.51465 11.9443 5.31249L12.9641 4.29056C11.8237 2.74305 9.98908 1.74106 7.92136 1.74097C4.46436 1.74097 1.66233 4.543 1.66233 8C1.66233 11.457 4.46436 14.259 7.92136 14.259C11.3782 14.2589 14.1804 11.4569 14.1804 8H15.5722C15.5722 12.2251 12.1465 15.6507 7.92136 15.6508C3.69614 15.6508 0.270508 12.2252 0.270508 8C0.270508 3.77478 3.69614 0.349152 7.92136 0.349152Z",fill:"currentColor"})}),G8=({size:n=14,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M1.272 6.21348C1.70645 3.08888 4.59169 0.908064 7.71634 1.34239C8.95495 1.51469 10.0438 2.07331 10.8814 2.87755L11.9458 1.81407C12.1347 1.6255 12.4572 1.75911 12.4575 2.02598V5.08751C12.4574 5.25303 12.3233 5.38731 12.1577 5.38731H9.0972C8.82993 5.38731 8.69629 5.06361 8.88528 4.87462L10.0327 3.72618C9.3732 3.09994 8.52006 2.66569 7.5513 2.53087C5.08313 2.18779 2.80376 3.91044 2.46048 6.37852C2.11747 8.84665 3.84009 11.1261 6.30814 11.4693C8.77612 11.8121 11.0557 10.0896 11.399 7.62169L11.9937 7.70372L12.5874 7.78673C12.153 10.9112 9.26756 13.0919 6.1431 12.6578C3.01854 12.2234 0.837738 9.33809 1.272 6.21348Z",fill:"currentColor"})}),Y8=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M8.27868 0.811572C8.81991 0.142194 9.79022 0.0421835 10.4538 0.557601L10.5823 0.669306L10.6066 0.693544L10.6097 0.695652L10.6392 0.725159C11.355 1.44679 11.6337 2.49468 11.3716 3.47669L11.3706 3.48091L11.3611 3.51674L11.3601 3.51885L10.889 5.22604C10.8796 5.25997 10.8707 5.29157 10.8627 5.32088C10.8934 5.32095 10.927 5.32194 10.9628 5.32194H11.9007C12.4264 5.32194 12.7831 5.319 13.0651 5.36725C14.8182 5.66719 15.9851 7.34568 15.6565 9.09357C15.6036 9.37487 15.477 9.7092 15.294 10.2022L14.3371 12.7798C14.1402 13.3104 13.9774 13.7518 13.8102 14.1024C13.6376 14.4645 13.4386 14.7793 13.1442 15.0424C12.9712 15.197 12.7802 15.3303 12.5751 15.4386C12.226 15.6231 11.8608 15.7 11.4612 15.7358C11.0743 15.7705 10.6035 15.7695 10.0375 15.7695H4.87377C4.08053 15.7695 3.42928 15.7702 2.90734 15.7137C2.37212 15.6557 1.88991 15.5311 1.46676 15.2237C1.22415 15.0474 1.01078 14.8339 0.834466 14.5914C0.527021 14.1682 0.401373 13.686 0.343384 13.1508C0.286822 12.6287 0.287531 11.9769 0.287531 11.1833V9.51405C0.287531 8.84778 0.281347 8.36714 0.399237 7.9565C0.671152 7.00935 1.41115 6.26832 2.35829 5.99638C2.76894 5.87849 3.24958 5.88573 3.91585 5.88573C4.11983 5.88573 4.14548 5.88319 4.16244 5.88046C4.23532 5.86863 4.30409 5.83663 4.35845 5.78667C4.3711 5.77504 4.38761 5.75604 4.51442 5.59488L8.25655 0.838972L8.2576 0.837918L8.27868 0.811572ZM1.69122 11.1833C1.69122 12.0082 1.69217 12.5711 1.73865 13.0001C1.78371 13.4157 1.86473 13.6221 1.96943 13.7662C2.0592 13.8898 2.16733 13.9989 2.29085 14.0887C2.43501 14.1934 2.64216 14.2744 3.05803 14.3195C3.45897 14.3629 3.97637 14.3656 4.7157 14.3659C4.30801 13.8053 4.06453 13.1171 4.06444 12.371V8.59406H5.46813V12.371C5.46838 13.4733 6.36166 14.3669 7.46407 14.3669H10.0375C10.6286 14.3669 11.0269 14.3663 11.3369 14.3385C11.6339 14.3118 11.7956 14.2638 11.9196 14.1983C12.0241 14.1431 12.1213 14.0747 12.2094 13.996C12.314 13.9025 12.4151 13.7678 12.5435 13.4986C12.6774 13.2176 12.8162 12.845 13.0219 12.2909L13.9788 9.71322C14.1848 9.15816 14.2531 8.96731 14.2781 8.83433C14.4618 7.85692 13.8093 6.91895 12.8291 6.75092C12.6957 6.7281 12.4928 6.72458 11.9007 6.72458H10.9628C10.7737 6.72458 10.5693 6.72657 10.4 6.70666C10.2211 6.68562 9.96702 6.63024 9.74771 6.43161C9.64454 6.33811 9.55957 6.2261 9.4969 6.10177C9.3639 5.83784 9.37799 5.57899 9.40521 5.40097C9.431 5.23261 9.48672 5.03616 9.53694 4.85404L10.008 3.14579L10.0175 3.11102C10.1488 2.61338 10.0078 2.08338 9.64654 1.71681L9.6086 1.67887L9.55064 1.64304C9.48795 1.62043 9.41425 1.63814 9.36938 1.69362L9.35779 1.70627L9.35884 1.70732L5.61672 6.46217C5.51822 6.58735 5.42237 6.7133 5.30689 6.81942C5.05075 7.05471 4.73126 7.20939 4.38796 7.26519C4.23315 7.29032 4.07513 7.28837 3.91585 7.28837C3.15356 7.28837 2.91916 7.2957 2.7461 7.34528C2.26364 7.48379 1.88564 7.86081 1.74708 8.34325C1.69738 8.51636 1.69122 8.7511 1.69122 9.51405V11.1833Z",fill:"currentColor"})}),X8=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M14.0593 12.922L15.0976 10.1247C15.3087 9.5559 15.4143 9.27138 15.4566 9.04658C15.7349 7.56751 14.7472 6.14737 13.2637 5.89357C13.0382 5.85499 12.7348 5.85499 12.1281 5.85499H11.1099C10.6615 5.85499 10.4372 5.85499 10.3034 5.73376C10.2607 5.69508 10.2255 5.64885 10.1995 5.5974C10.1182 5.43613 10.1778 5.21997 10.297 4.78765L10.8081 2.93419L10.819 2.89456C11.0336 2.09024 10.8051 1.23244 10.2189 0.64139L10.1898 0.612405L10.1692 0.592068C9.77357 0.210076 9.13559 0.249344 8.78983 0.676966L8.77186 0.699678L4.71076 5.86083C4.52965 6.09101 4.38573 6.35138 4.38573 6.64427V12.7431C4.38573 14.3601 5.69654 15.6709 7.31351 15.6709L10.1068 15.6709C11.3628 15.6709 11.9908 15.6709 12.5043 15.3995C12.6723 15.3107 12.8289 15.2018 12.9706 15.0752C13.4037 14.6882 13.6222 14.0995 14.0593 12.922Z",fill:"currentColor"}),f.jsx("path",{d:"M2.91388 13.2113C2.91388 14.6907 4.08499 15.5536 4.08499 15.5536H2.65606C1.46328 15.5536 0.496338 14.5866 0.496338 13.3938V8.34439C0.496338 7.15161 1.46328 6.18467 2.65606 6.18467H2.91388V13.2113Z",fill:"currentColor"})]}),e9=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M7.72451 15.1086C7.18929 15.7705 6.22975 15.8694 5.57357 15.3597L5.44643 15.2492L5.42247 15.2253L5.41934 15.2232L5.39016 15.194C4.68239 14.4804 4.40679 13.4441 4.66589 12.473L4.66693 12.4689L4.67631 12.4334L4.67735 12.4314L5.14318 10.7431C5.15243 10.7096 5.1613 10.6783 5.16923 10.6493C5.13878 10.6493 5.10558 10.6483 5.07023 10.6483H4.14274C3.62288 10.6483 3.27015 10.6512 2.9912 10.6035C1.25757 10.3069 0.103662 8.64702 0.42863 6.91854C0.480965 6.64037 0.606164 6.30975 0.787119 5.82223L1.73336 3.27321C1.92812 2.74852 2.08912 2.31209 2.25442 1.96535C2.42515 1.60724 2.62191 1.29594 2.91304 1.03578C3.08408 0.882951 3.273 0.751121 3.47579 0.643944C3.82102 0.461504 4.18214 0.38551 4.57731 0.350066C4.95993 0.315784 5.42553 0.316718 5.98521 0.316718H11.0916C11.876 0.316718 12.52 0.31607 13.0362 0.37195C13.5655 0.429293 14.0423 0.552534 14.4608 0.856536C14.7007 1.03085 14.9117 1.24193 15.086 1.48181C15.3901 1.90027 15.5143 2.37709 15.5717 2.90638C15.6276 3.42269 15.6269 4.06721 15.6269 4.85202V6.50274C15.6269 7.1616 15.633 7.6369 15.5164 8.04299C15.2475 8.97962 14.5158 9.71242 13.5791 9.98133C13.173 10.0979 12.6977 10.0908 12.0389 10.0908C11.8372 10.0908 11.8118 10.0933 11.795 10.096C11.723 10.1077 11.6549 10.1393 11.6012 10.1887C11.5887 10.2002 11.5724 10.219 11.447 10.3784L7.74639 15.0815L7.74535 15.0825L7.72451 15.1086ZM14.2388 4.85202C14.2388 4.03628 14.2379 3.47965 14.1919 3.05541C14.1473 2.64443 14.0672 2.4403 13.9637 2.29779C13.8749 2.17562 13.768 2.06769 13.6458 1.9789C13.5033 1.87532 13.2984 1.79523 12.8872 1.75067C12.4907 1.70773 11.979 1.70511 11.2479 1.70482C11.6511 2.25917 11.8918 2.93968 11.8919 3.67755V7.41251H10.5038V3.67755C10.5036 2.58745 9.62023 1.70378 8.53007 1.70378H5.98521C5.40065 1.70378 5.00679 1.70442 4.70028 1.73192C4.40651 1.7583 4.24662 1.80571 4.12399 1.87052C4.02069 1.92511 3.92452 1.99276 3.8374 2.07061C3.73401 2.16306 3.634 2.2962 3.50705 2.56249C3.37462 2.84027 3.23734 3.20873 3.03393 3.75675L2.08768 6.30578C1.88395 6.85467 1.81646 7.0434 1.79172 7.1749C1.61005 8.14146 2.25533 9.06902 3.22464 9.23517C3.35654 9.25774 3.55717 9.26123 4.14274 9.26123H5.07023C5.25717 9.26123 5.4593 9.25926 5.62672 9.27894C5.80364 9.29975 6.05492 9.35452 6.27179 9.55094C6.37381 9.6434 6.45784 9.75417 6.51982 9.87712C6.65133 10.1381 6.6374 10.3941 6.61048 10.5701C6.58498 10.7366 6.52988 10.9309 6.48022 11.111L6.01439 12.8003L6.00501 12.8347C5.87513 13.3268 6.01464 13.8509 6.37184 14.2134L6.40935 14.2509L6.46667 14.2863C6.52866 14.3087 6.60155 14.2912 6.64591 14.2363L6.65738 14.2238L6.65633 14.2228L10.3569 9.52072C10.4543 9.39693 10.5491 9.27238 10.6633 9.16744C10.9166 8.93476 11.2325 8.7818 11.572 8.72662C11.7251 8.70177 11.8814 8.70369 12.0389 8.70369C12.7927 8.70369 13.0245 8.69645 13.1956 8.64742C13.6727 8.51045 14.0465 8.13761 14.1836 7.66053C14.2327 7.48935 14.2388 7.25721 14.2388 6.50274V4.85202Z",fill:"currentColor"})}),t9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M1.92838 3.06811L0.88799 5.87104C0.676449 6.44097 0.570628 6.72606 0.52825 6.95131C0.249414 8.43336 1.2391 9.85637 2.72555 10.1107C2.95149 10.1493 3.25549 10.1493 3.86348 10.1493H4.88371C5.33306 10.1493 5.55774 10.1493 5.69187 10.2708C5.73467 10.3096 5.76994 10.3559 5.79593 10.4074C5.87738 10.569 5.81766 10.7856 5.69821 11.2188L5.18609 13.076L5.17522 13.1157C4.9602 13.9217 5.1891 14.7812 5.7765 15.3735L5.80568 15.4025L5.82635 15.4229C6.22273 15.8056 6.862 15.7663 7.20846 15.3378L7.22647 15.315L11.2958 10.1435C11.4772 9.91284 11.6214 9.65195 11.6214 9.35847V3.24734C11.6214 1.62711 10.308 0.313655 8.68776 0.313655L5.88886 0.313654C4.63032 0.313654 4.00105 0.313654 3.48649 0.585577C3.31815 0.674536 3.16127 0.783647 3.01929 0.910507C2.58531 1.29828 2.36633 1.88824 1.92838 3.06811Z",fill:"currentColor"}),f.jsx("path",{d:"M13.0963 2.77815C13.0963 1.29585 11.9228 0.431205 11.9228 0.431205H13.3546C14.5498 0.431205 15.5187 1.4001 15.5187 2.59529V7.65491C15.5187 8.8501 14.5498 9.81899 13.3546 9.81899H13.0963V2.77815Z",fill:"currentColor"})]}),n9=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M7.95889 1.52285C7.95888 0.826234 8.76055 0.467983 9.27669 0.875208L9.37524 0.967191L15.1317 7.18358C15.5582 7.64419 15.5582 8.35614 15.1317 8.81676L9.37524 15.0331C8.87034 15.578 7.95888 15.2205 7.95889 14.4775V10.8207C7.10614 10.8432 6.31361 10.9316 5.45468 11.2515C4.39484 11.6463 3.18248 12.413 1.64676 13.9425C1.4533 14.135 1.18329 14.1696 0.969086 14.0908C0.74748 14.0091 0.547307 13.7879 0.54859 13.4844L0.55516 13.1315C0.618924 11.3494 1.11153 9.29838 2.27656 7.63787C3.45289 5.96147 5.29554 4.71635 7.95889 4.54797V1.52285ZM9.20911 5.13366C9.20899 5.50567 8.9031 5.77687 8.56523 5.77755C5.99383 5.78282 4.33736 6.8762 3.29964 8.35496C2.54519 9.43014 2.10739 10.7283 1.9152 11.9939C3.04749 11.0323 4.0569 10.4385 5.01917 10.0801C6.29638 9.60449 7.4406 9.56343 8.56429 9.56295C8.9178 9.5628 9.20894 9.84909 9.20911 10.2068L9.20817 13.3737L14.1837 8.00017L9.20817 2.62571L9.20911 5.13366Z",fill:"currentColor"})}),r9=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M9.94076 1.34942C10.7047 0.90231 11.6503 0.902415 12.4143 1.34942C12.7061 1.52015 12.9688 1.79118 13.3104 2.13284C13.6521 2.47448 13.9231 2.73721 14.0939 3.02894C14.5408 3.79294 14.5409 4.73856 14.0939 5.50251C13.9231 5.79415 13.652 6.05704 13.3104 6.39861L6.65932 13.0497C6.28068 13.4284 6.00695 13.7108 5.66543 13.9097C5.32391 14.1085 4.94315 14.2074 4.42705 14.3498L3.24394 14.6761C2.77527 14.8054 2.34538 14.9262 2.00131 14.9684C1.65196 15.0112 1.17964 15.0013 0.810764 14.6325C0.441921 14.2637 0.432107 13.7913 0.47486 13.442C0.517035 13.0979 0.6379 12.668 0.767181 12.1993L1.09352 11.0162C1.23588 10.5001 1.33481 10.1193 1.5336 9.77784C1.7325 9.43632 2.0149 9.1626 2.39355 8.78395L9.04466 2.13284C9.38625 1.79126 9.64911 1.52016 9.94076 1.34942ZM15.5427 14.8398H7.55223L8.96707 13.425H15.5427V14.8398ZM3.39382 9.78422C2.965 10.213 2.84244 10.3436 2.75709 10.49C2.67183 10.6366 2.61862 10.8079 2.45733 11.3925L2.13099 12.5756C2.00183 13.0439 1.92194 13.3419 1.88863 13.5536C2.10041 13.5204 2.39872 13.4416 2.86764 13.3123L4.05075 12.9859C4.63544 12.8246 4.80669 12.7715 4.95323 12.6862C5.09968 12.6008 5.23022 12.4783 5.65905 12.0494L10.721 6.98644L8.45577 4.72121L3.39382 9.78422ZM11.7 2.57079C11.3774 2.38198 10.9777 2.38198 10.6551 2.57079C10.5602 2.62647 10.4487 2.72931 10.0449 3.13311L9.45604 3.72094L11.7213 5.98617L12.3102 5.39833C12.7139 4.99457 12.8168 4.88307 12.8725 4.78818C13.0613 4.46561 13.0612 4.06585 12.8725 3.74326C12.8169 3.64827 12.7146 3.53752 12.3102 3.13311C11.9057 2.72863 11.795 2.6264 11.7 2.57079Z",fill:"currentColor"})}),o9=({size:n=14,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M7.06431 5.93342C7.68763 5.93342 8.19307 6.43904 8.19322 7.06233C8.19322 7.68573 7.68772 8.19123 7.06431 8.19123C6.44099 8.19113 5.9354 7.68567 5.9354 7.06233C5.93555 6.43911 6.44108 5.93353 7.06431 5.93342Z",fill:"currentColor"}),f.jsx("path",{fillRule:"evenodd",clipRule:"evenodd",d:"M8.6815 0.963693C10.1169 0.447019 11.6266 0.374829 12.5633 1.31135C13.5 2.24805 13.4277 3.75776 12.911 5.19319C12.7126 5.74431 12.4386 6.31796 12.0965 6.89729C12.4969 7.54638 12.8141 8.19018 13.036 8.80647C13.5527 10.2419 13.6251 11.7516 12.6883 12.6883C11.7516 13.625 10.242 13.5527 8.8065 13.036C8.19022 12.8141 7.54641 12.4969 6.89732 12.0965C6.31797 12.4386 5.74435 12.7125 5.19322 12.911C3.75777 13.4276 2.2481 13.5 1.31138 12.5633C0.374859 11.6266 0.447049 10.1168 0.963724 8.68147C1.17185 8.10338 1.46321 7.50063 1.82896 6.8924C1.52182 6.35711 1.27235 5.82825 1.08872 5.31819C0.572068 3.88278 0.499714 2.37306 1.43638 1.43635C2.37308 0.499655 3.8828 0.572044 5.31822 1.08869C5.82828 1.27232 6.35715 1.5218 6.89243 1.82893C7.50066 1.46318 8.10341 1.17181 8.6815 0.963693ZM11.3573 8.01154C10.9083 8.62253 10.3901 9.22873 9.80943 9.8094C9.22877 10.3901 8.62255 10.9083 8.01158 11.3572C8.4257 11.5841 8.8287 11.7688 9.21275 11.9071C10.5456 12.3868 11.4246 12.2547 11.8397 11.8397C12.2548 11.4246 12.3869 10.5456 11.9071 9.21272C11.7688 8.82866 11.5841 8.42568 11.3573 8.01154ZM2.56529 8.02912C2.37344 8.39322 2.21495 8.74796 2.09263 9.08772C1.61291 10.4204 1.74512 11.2995 2.16001 11.7147C2.57505 12.1297 3.45415 12.2618 4.78697 11.7821C5.11057 11.6656 5.44786 11.5164 5.7938 11.3367C5.249 10.9223 4.70922 10.4533 4.19029 9.9344C3.57578 9.31987 3.03169 8.67633 2.56529 8.02912ZM6.90708 3.2469C6.24065 3.70479 5.5646 4.26321 4.91392 4.91389C4.26325 5.56456 3.70482 6.24063 3.24693 6.90705C3.72674 7.63325 4.32777 8.37459 5.03892 9.08576C5.64943 9.69627 6.28183 10.2265 6.90806 10.6678C7.59368 10.2025 8.2908 9.63076 8.96079 8.96076C9.6308 8.29075 10.2025 7.59366 10.6678 6.90803C10.2265 6.2818 9.69631 5.6494 9.08579 5.03889C8.37462 4.32773 7.63328 3.72672 6.90708 3.2469ZM11.7147 2.15998C11.2996 1.74509 10.4204 1.61288 9.08775 2.0926C8.74835 2.21479 8.39382 2.37271 8.03013 2.56428C8.67728 3.03065 9.31995 3.5758 9.93443 4.19026C10.4534 4.7092 10.9223 5.24896 11.3368 5.79377C11.5164 5.44785 11.6656 5.11052 11.7821 4.78694C12.2618 3.45416 12.1297 2.57502 11.7147 2.15998ZM4.91197 2.2176C3.57922 1.73788 2.70004 1.86995 2.28501 2.28498C1.87001 2.70003 1.73791 3.5792 2.21763 4.91194C2.31709 5.18822 2.44112 5.47427 2.58677 5.7674C3.01931 5.1887 3.51474 4.6158 4.06529 4.06526C4.61584 3.5147 5.18872 3.01928 5.76743 2.58674C5.47431 2.4411 5.18824 2.31706 4.91197 2.2176Z",fill:"currentColor"})]}),i9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M8.00192 6.64454C8.75026 6.64454 9.35732 7.25169 9.35739 8.00001C9.35739 8.74838 8.7503 9.35548 8.00192 9.35548C7.25367 9.35533 6.64743 8.74829 6.64743 8.00001C6.6475 7.25178 7.25371 6.64468 8.00192 6.64454Z",fill:"currentColor"}),f.jsx("path",{fillRule:"evenodd",clipRule:"evenodd",d:"M9.97165 1.29981C11.5853 0.718916 13.271 0.642197 14.3144 1.68555C15.3577 2.72902 15.2811 4.41466 14.7002 6.02833C14.4707 6.66561 14.1504 7.32937 13.75 8.00001C14.1504 8.67062 14.4707 9.33444 14.7002 9.97169C15.2811 11.5854 15.3578 13.271 14.3144 14.3145C13.271 15.3579 11.5854 15.2811 9.97165 14.7002C9.3344 14.4708 8.67059 14.1505 7.99997 13.75C7.32933 14.1505 6.66558 14.4708 6.02829 14.7002C4.41461 15.2811 2.72899 15.3578 1.68552 14.3145C0.642155 13.271 0.71887 11.5854 1.29977 9.97169C1.52915 9.33454 1.84865 8.67049 2.24899 8.00001C1.84866 7.32953 1.52915 6.66544 1.29977 6.02833C0.718852 4.41459 0.64207 2.729 1.68552 1.68555C2.72897 0.642112 4.41456 0.718887 6.02829 1.29981C6.66541 1.52918 7.32949 1.8487 7.99997 2.24903C8.67045 1.84869 9.33451 1.52919 9.97165 1.29981ZM12.9404 9.2129C12.4391 9.893 11.8616 10.5681 11.2148 11.2149C10.568 11.8616 9.89296 12.4391 9.21286 12.9404C9.62532 13.1579 10.0271 13.338 10.4121 13.4766C11.9146 14.0174 12.9172 13.8738 13.3955 13.3955C13.8737 12.9173 14.0174 11.9146 13.4765 10.4121C13.3379 10.0271 13.1578 9.62535 12.9404 9.2129ZM3.05856 9.2129C2.84121 9.62523 2.66197 10.0272 2.52341 10.4121C1.98252 11.9146 2.12627 12.9172 2.60446 13.3955C3.08278 13.8737 4.08544 14.0174 5.58786 13.4766C5.97264 13.338 6.37389 13.1577 6.7861 12.9404C6.10624 12.4393 5.43168 11.8614 4.78513 11.2149C4.13823 10.5679 3.55992 9.89313 3.05856 9.2129ZM7.99899 3.792C7.23179 4.31419 6.45306 4.95512 5.70407 5.70411C4.95509 6.45309 4.31415 7.23184 3.79196 7.99903C4.3143 8.76666 4.95471 9.54653 5.70407 10.2959C6.45309 11.0449 7.23271 11.6848 7.99997 12.207C8.76725 11.6848 9.54683 11.0449 10.2959 10.2959C11.0449 9.54686 11.6848 8.76729 12.207 8.00001C11.6848 7.23275 11.0449 6.45312 10.2959 5.70411C9.5465 4.95475 8.76662 4.31434 7.99899 3.792ZM5.58786 2.52344C4.08533 1.98255 3.08272 2.12625 2.60446 2.6045C2.12621 3.08275 1.98252 4.08536 2.52341 5.5879C2.66189 5.97253 2.8414 6.37409 3.05856 6.78614C3.55983 6.10611 4.1384 5.43189 4.78513 4.78516C5.43186 4.13843 6.10606 3.55987 6.7861 3.0586C6.37405 2.84144 5.97249 2.66192 5.58786 2.52344ZM13.3955 2.6045C12.9172 2.12631 11.9146 1.98257 10.4121 2.52344C10.0272 2.66201 9.62519 2.84125 9.21286 3.0586C9.8931 3.55996 10.5679 4.13827 11.2148 4.78516C11.8614 5.43172 12.4392 6.10627 12.9404 6.78614C13.1577 6.37393 13.338 5.97267 13.4765 5.5879C14.0174 4.08549 13.8736 3.08281 13.3955 2.6045Z",fill:"currentColor"})]}),s9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsxs("mask",{id:"mask0_agent_preset_16",maskUnits:"userSpaceOnUse",x:"0",y:"0",width:"16",height:"16",children:[f.jsx("rect",{width:"16",height:"16",fill:"white"}),f.jsx("circle",{cx:"7.9995",cy:"3.28319",r:"1.712",fill:"black"}),f.jsx("circle",{cx:"3.51122",cy:"11.3855",r:"1.712",fill:"black"}),f.jsx("circle",{cx:"12.4878",cy:"11.3855",r:"1.712",fill:"black"})]}),f.jsx("path",{mask:"url(#mask0_agent_preset_16)",d:"M12.2881 11.0425C12.6002 11.3723 13.0413 11.5786 13.5312 11.5786L13.5342 11.5776C13.1476 12.3233 12.6119 12.9785 11.9639 13.5005C10.9327 14.3309 9.6199 14.8286 8.19336 14.8286C7.29864 14.8285 6.45056 14.6313 5.6875 14.2808C6.08309 14.0281 6.36707 13.6189 6.45215 13.1392C6.99022 13.3561 7.57767 13.476 8.19336 13.4761C9.30019 13.4761 10.3157 13.0915 11.1152 12.4478C11.5935 12.0626 11.9924 11.5848 12.2881 11.0425ZM4.14746 4.36475C4.25569 4.83228 4.55488 5.2247 4.95898 5.4585C4.07956 6.30639 3.53144 7.49605 3.53125 8.81396C3.53125 9.69534 3.77613 10.5202 4.20117 11.2231C3.74959 11.3817 3.38395 11.7232 3.19531 12.1597C2.5541 11.2032 2.17969 10.052 2.17969 8.81396C2.17989 7.05087 2.93868 5.4646 4.14746 4.36475ZM8.19336 2.80029C8.85717 2.80029 9.49784 2.90834 10.0967 3.10791C12.3237 3.85044 13.9725 5.86061 14.1846 8.28369C13.9832 8.20048 13.7627 8.15382 13.5312 8.15381C13.2802 8.15381 13.042 8.20907 12.8271 8.30615C12.6281 6.47264 11.3666 4.95616 9.66895 4.39014C9.2063 4.236 8.70989 4.15186 8.19336 4.15186C7.96112 4.15189 7.7329 4.16981 7.50977 4.20264C7.51947 4.12886 7.52637 4.05348 7.52637 3.97705C7.52628 3.56604 7.3811 3.18914 7.13965 2.89404C7.48183 2.83352 7.83381 2.80033 8.19336 2.80029Z",fill:"currentColor"}),f.jsx("path",{d:"M9.1123 3.28271C9.11205 2.66858 8.61322 2.17041 7.99902 2.17041C7.38504 2.17067 6.88697 2.66874 6.88672 3.28271C6.88672 3.89691 7.38489 4.39574 7.99902 4.396C8.61338 4.396 9.1123 3.89707 9.1123 3.28271ZM10.3115 3.28271C10.3115 4.55981 9.27612 5.59521 7.99902 5.59521C6.72214 5.59496 5.6875 4.55965 5.6875 3.28271C5.68776 2.00599 6.7223 0.971447 7.99902 0.971191C9.27596 0.971191 10.3113 2.00584 10.3115 3.28271Z",fill:"currentColor"}),f.jsx("path",{d:"M4.62402 11.385C4.62377 10.7709 4.12494 10.2727 3.51074 10.2727C2.89676 10.273 2.39869 10.771 2.39844 11.385C2.39844 11.9992 2.89661 12.498 3.51074 12.4983C4.1251 12.4983 4.62402 11.9994 4.62402 11.385ZM5.82324 11.385C5.82324 12.6621 4.78784 13.6975 3.51074 13.6975C2.23386 13.6973 1.19922 12.6619 1.19922 11.385C1.19947 10.1083 2.23402 9.07374 3.51074 9.07349C4.78768 9.07349 5.82299 10.1081 5.82324 11.385Z",fill:"currentColor"}),f.jsx("path",{d:"M13.6006 11.385C13.6003 10.7709 13.1015 10.2727 12.4873 10.2727C11.8733 10.273 11.3753 10.771 11.375 11.385C11.375 11.9992 11.8732 12.498 12.4873 12.4983C13.1017 12.4983 13.6006 11.9994 13.6006 11.385ZM14.7998 11.385C14.7998 12.6621 13.7644 13.6975 12.4873 13.6975C11.2104 13.6973 10.1758 12.6619 10.1758 11.385C10.176 10.1083 11.2106 9.07374 12.4873 9.07349C13.7642 9.07349 14.7995 10.1081 14.7998 11.385Z",fill:"currentColor"})]}),l9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M11.2426 4.80473V6.10551H4.75819V4.80473H11.2426Z",fill:"currentColor"}),f.jsx("path",{d:"M9.40858 7.84478V9.14557H4.75819V7.84478H9.40858Z",fill:"currentColor"}),f.jsx("path",{d:"M9.23438 0.546389C10.1941 0.546389 10.9683 0.544914 11.5859 0.611819C12.2161 0.680096 12.7634 0.825745 13.2393 1.17139C13.5172 1.3733 13.7619 1.61812 13.9639 1.896C14.3096 2.37183 14.4551 2.91922 14.5234 3.54932C14.5903 4.16686 14.5889 4.94133 14.5889 5.90088V10.0981C14.5889 11.0576 14.5903 11.8321 14.5234 12.4497C14.4552 13.0798 14.3094 13.6272 13.9639 14.103C13.7619 14.381 13.5172 14.6257 13.2393 14.8276C12.7633 15.1734 12.2163 15.3189 11.5859 15.3872C10.9683 15.4541 10.1942 15.4536 9.23438 15.4536H6.76563C5.80591 15.4536 5.03168 15.4541 4.41407 15.3872C3.78385 15.3189 3.23665 15.1734 2.76074 14.8276C2.48291 14.6257 2.23802 14.3809 2.03614 14.103C1.69066 13.6272 1.54483 13.0798 1.47657 12.4497C1.40973 11.8321 1.41114 11.0576 1.41114 10.0981V5.90088C1.41113 4.94132 1.40966 4.16686 1.47657 3.54932C1.54488 2.91921 1.69042 2.37184 2.03614 1.896C2.2381 1.61807 2.4828 1.37333 2.76074 1.17139C3.23665 0.825682 3.78386 0.680109 4.41407 0.611819C5.03168 0.544905 5.80591 0.546389 6.76563 0.546389H9.23438ZM6.76563 1.896C5.77586 1.896 5.0876 1.89738 4.55957 1.95459C4.0443 2.01043 3.76214 2.11349 3.55469 2.26416C3.39135 2.38284 3.24761 2.52662 3.12891 2.68994C2.97821 2.89736 2.8752 3.17967 2.81934 3.69483C2.76214 4.22279 2.76075 4.91131 2.76074 5.90088V10.0981C2.76074 11.0876 2.76221 11.7762 2.81934 12.3042C2.87516 12.8194 2.97829 13.1026 3.12891 13.3101C3.24754 13.4733 3.39147 13.6172 3.55469 13.7358C3.76213 13.8865 4.04438 13.9896 4.55957 14.0454C5.0876 14.1026 5.77586 14.103 6.76563 14.103H9.23438C10.2242 14.103 10.9124 14.1026 11.4404 14.0454C11.9556 13.9896 12.2379 13.8865 12.4453 13.7358C12.6086 13.6172 12.7525 13.4733 12.8711 13.3101C13.0217 13.1026 13.1248 12.8195 13.1807 12.3042C13.2378 11.7762 13.2393 11.0876 13.2393 10.0981V5.90088C13.2393 4.91131 13.2379 4.22279 13.1807 3.69483C13.1248 3.17969 13.0218 2.89736 12.8711 2.68994C12.7524 2.52667 12.6086 2.38281 12.4453 2.26416C12.2379 2.11355 11.9556 2.01041 11.4404 1.95459C10.9124 1.8974 10.2241 1.896 9.23438 1.896H6.76563Z",fill:"currentColor"})]}),u9=({size:n=14,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M8.19727 5.86969C9.2092 6.90067 9.20969 8.55271 8.19727 9.58338L6.88871 10.8919C5.85801 11.9039 4.20584 11.9037 3.17502 10.8919L3.10873 10.8243C2.09622 9.7934 2.09626 8.14148 3.10873 7.11058L4.36757 5.85174C4.28261 6.33758 4.30355 6.84354 4.44077 7.33362L3.89249 7.88053C3.30043 8.48348 3.30108 9.4507 3.89318 10.0536L3.94566 10.1061C4.54861 10.698 5.51521 10.6981 6.11808 10.1061L7.41283 8.81275C8.00484 8.21002 8.00504 7.24267 7.41352 6.63964L7.35966 6.58716C7.21975 6.44976 7.05995 6.34434 6.89009 6.27089L7.70009 5.4609C7.85176 5.55768 7.99607 5.67091 8.1296 5.80202L8.19727 5.86969Z",fill:"currentColor"}),f.jsx("path",{d:"M5.80913 8.12648C4.79584 7.09547 4.79591 5.44245 5.80913 4.41141C5.81733 4.40304 5.82707 4.39209 5.8409 4.37826L7.07833 3.14082C7.09224 3.12693 7.10311 3.11729 7.11148 3.10906C8.14253 2.09591 9.79557 2.09579 10.8266 3.10906L10.8908 3.17328C11.9041 4.20425 11.9039 5.85727 10.8908 6.88835L9.63193 8.14581C9.70566 7.66581 9.67564 7.16895 9.53456 6.68948L10.1063 6.11772C10.6989 5.51458 10.6992 4.54691 10.1063 3.94391L10.0552 3.8942C9.45215 3.30157 8.48446 3.30151 7.88142 3.8942L6.59358 5.18204C6.00081 5.78507 6.00092 6.75274 6.59358 7.35584L6.6433 7.40694C6.77998 7.54132 6.93555 7.64528 7.10112 7.71837L6.29251 8.52699C6.14446 8.43127 6.00395 8.31906 5.87335 8.1907L5.80913 8.12648Z",fill:"currentColor"})]}),a9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M9.94133 6.50173C11.3218 7.99603 11.3218 10.3011 9.94128 11.7954C9.88691 11.8542 9.82125 11.9196 9.72099 12.0198L7.75707 13.9838C7.65709 14.0838 7.592 14.1491 7.53334 14.2034C6.03906 15.5843 3.7327 15.5854 2.23827 14.2048C2.17933 14.1503 2.11374 14.0844 2.01315 13.9838C1.91318 13.8839 1.84922 13.8188 1.79495 13.7601C0.413857 12.2657 0.413909 9.95948 1.795 8.46503C1.84923 8.4064 1.91335 8.34115 2.01321 8.24129L3.79275 6.46313C3.71814 7.08101 3.75236 7.71445 3.90115 8.33518L3.00344 9.23151C2.89398 9.34097 2.8535 9.38307 2.82251 9.41658C1.93771 10.3744 1.93704 11.8514 2.82179 12.8092C2.85279 12.8427 2.89383 12.884 3.0034 12.9936C3.11272 13.1029 3.15429 13.1442 3.18777 13.1752C4.14561 14.0603 5.62381 14.0608 6.58178 13.1758C6.61532 13.1448 6.65722 13.1032 6.76685 12.9935L8.73077 11.0296C8.83999 10.9204 8.88142 10.8787 8.91238 10.8452C9.79744 9.88728 9.7969 8.40911 8.91173 7.45124C8.88074 7.41775 8.83944 7.3762 8.73011 7.26687C8.62082 7.15757 8.58061 7.11623 8.54712 7.08526C8.37347 6.92477 8.18243 6.79361 7.98088 6.69165L9.00289 5.66964C9.17506 5.78373 9.34035 5.91265 9.49663 6.05703C9.55538 6.11135 9.62026 6.17652 9.72036 6.27662C9.82094 6.3772 9.88686 6.4428 9.94133 6.50173Z",fill:"currentColor"}),f.jsx("path",{d:"M6.06816 9.49196C4.68626 7.99724 4.68667 5.68942 6.06885 4.19487C6.12268 4.13671 6.18789 4.07306 6.28706 3.9739L8.24541 2.01416C8.34478 1.91479 8.41018 1.85055 8.46845 1.79665C9.96301 0.414902 12.2689 0.414922 13.7635 1.79665C13.8217 1.85051 13.8866 1.91559 13.9858 2.01486C14.0849 2.11394 14.1502 2.17769 14.204 2.23583C15.5861 3.7304 15.5866 6.03823 14.2047 7.53291C14.1508 7.59125 14.0854 7.65638 13.9858 7.75595L12.1994 9.54098C12.2614 8.92982 12.2185 8.30587 12.0634 7.69657L12.9956 6.76573C13.1044 6.65692 13.1458 6.61529 13.1765 6.58205C14.0621 5.62404 14.0621 4.1454 13.1765 3.18738C13.1458 3.15419 13.104 3.1135 12.9956 3.00508C12.8877 2.89716 12.8471 2.85551 12.814 2.82485C11.8559 1.9389 10.376 1.93886 9.41794 2.82485C9.38479 2.85554 9.34381 2.89622 9.23564 3.00439L7.27728 4.96413C7.16875 5.07265 7.12708 5.11322 7.09636 5.14643C6.21074 6.10441 6.21153 7.58236 7.09705 8.5404C7.12775 8.57357 7.16826 8.61575 7.27659 8.72408C7.38456 8.83205 7.42647 8.87227 7.45958 8.90293C7.62849 9.0591 7.81309 9.1881 8.00856 9.28894L6.98795 10.3095C6.82111 10.1978 6.66052 10.0715 6.50872 9.93114C6.45057 9.87733 6.38547 9.81341 6.28637 9.71431C6.1871 9.61504 6.12202 9.55018 6.06816 9.49196Z",fill:"currentColor"})]}),c9=({size:n=8,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 8 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M6.54199 8.62824C6.54199 8.44193 6.54146 8.28829 6.53906 8.15851L1.11719 13.5814L0.728516 13.1927L0.339844 12.803L5.76172 7.38019C5.63201 7.3778 5.47812 7.37824 5.29199 7.37824H1.43555V6.27863H5.29199C5.65471 6.27863 5.97167 6.27814 6.22852 6.30597C6.49541 6.33493 6.76232 6.3998 7.00293 6.57452C7.13452 6.67013 7.25108 6.78571 7.34668 6.9173C7.52157 7.15808 7.5863 7.4256 7.61523 7.69269C7.64305 7.94948 7.64258 8.26562 7.64258 8.62824V12.4857H6.54199V8.62824Z",fill:"currentColor"})}),f9=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M13.588429 5.147807C13.588429 4.739638 13.587271 4.403003 13.582013 4.118684L1.703098 15.99968L0.85155 15.148178L0 14.294485L11.878915 2.413442C11.594721 2.408199 11.257569 2.409154 10.849776 2.409154H2.400594V0.000001H10.849776C11.644471 0.000001 12.338899 -0.001059 12.901622 0.059909C13.486363 0.123352 14.071136 0.265493 14.598303 0.648292C14.886598 0.857751 15.141981 1.110984 15.351433 1.399281C15.734578 1.926807 15.876362 2.512925 15.939743 3.098105C16.000775 3.660718 15.99968 4.353347 15.99968 5.147807V13.599133H13.588429V5.147807Z",fill:"currentColor"})}),d9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M14.9943 1.92389V3.32428H1.00598V1.92389H14.9943Z",fill:"currentColor"}),f.jsx("path",{d:"M14.9943 5.50784V6.90823H1.00598V5.50784H14.9943Z",fill:"currentColor"}),f.jsx("path",{d:"M14.9943 9.09177V10.4922H1.00598V9.09177H14.9943Z",fill:"currentColor"}),f.jsx("path",{d:"M8.93274 12.6757V14.0761H1.00598V12.6757H8.93274Z",fill:"currentColor"})]}),h9=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M14.4782 4.84067L14.2138 10.1152C14.1102 12.1872 14.067 13.0115 13.3866 13.9607C13.1044 14.3546 12.7498 14.6912 12.3424 14.9535C11.8239 15.2872 11.2415 15.4316 10.5585 15.4998C9.88727 15.5668 9.04946 15.5656 7.99998 15.5656C6.95051 15.5656 6.1127 15.5668 5.44142 15.4998C4.75851 15.4316 4.17602 15.2872 3.65753 14.9535C3.25012 14.6912 2.89559 14.3546 2.61332 13.9607C1.93296 13.0115 1.88979 12.1872 1.78619 10.1152L1.52179 4.84067L2.89006 4.77277L3.15343 10.0463C3.26221 12.2218 3.32452 12.6015 3.72646 13.1624C3.90825 13.4161 4.13686 13.6334 4.39927 13.8023C4.66204 13.9714 5.00263 14.0792 5.57825 14.1367C6.16562 14.1953 6.92298 14.1963 7.99998 14.1963C9.07699 14.1963 9.83434 14.1953 10.4217 14.1367C10.9973 14.0792 11.3379 13.9714 11.6007 13.8023C11.8631 13.6334 12.0917 13.4161 12.2735 13.1624C12.6755 12.6015 12.7378 12.2218 12.8465 10.0463L13.1099 4.77277L14.4782 4.84067ZM5.43011 6.22849H6.7994V11.3909H5.43011V6.22849ZM9.20056 6.22849H10.5699V11.3909H9.20056V6.22849ZM8.53597 0.434431C9.17976 0.434431 9.6522 0.426926 10.0966 0.571258C10.2357 0.616451 10.3717 0.672554 10.502 0.738948C10.9182 0.951107 11.2464 1.29099 11.7015 1.74612L12.4978 2.54136H15.3742V3.91169H0.625732V2.54136H3.50218L4.29845 1.74612C4.75358 1.29099 5.08174 0.951107 5.49801 0.738948C5.62831 0.672554 5.76425 0.616451 5.90334 0.571258C6.34776 0.426926 6.82021 0.434431 7.46399 0.434431H8.53597ZM7.46399 1.80476C6.73208 1.80476 6.51641 1.81187 6.32617 1.87369C6.25545 1.89667 6.18668 1.92533 6.12041 1.95907C5.96398 2.03878 5.82348 2.16253 5.44142 2.54136H10.5585C10.1765 2.16253 10.036 2.03878 9.87955 1.95907C9.81329 1.92533 9.74452 1.89667 9.6738 1.87369C9.48356 1.81187 9.26789 1.80476 8.53597 1.80476H7.46399Z",fill:"currentColor"})}),K3=({size:n=14,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M6.3002 3.32843L7.69986 3.32843L7.69986 7.79657H6.3002L6.3002 3.32843Z",fill:"currentColor"}),f.jsx("path",{d:"M6.3002 9.01935H7.69986V10.6711H6.3002V9.01935Z",fill:"currentColor"}),f.jsx("path",{d:"M12.6328 6.99976C12.6328 3.88874 10.111 1.36694 7 1.36694C3.88899 1.36695 1.3672 3.88875 1.36719 6.99976C1.36719 10.1108 3.88899 12.6326 7 12.6326C10.111 12.6326 12.6328 10.1108 12.6328 6.99976ZM13.8582 6.99976C13.8582 10.7873 10.7876 13.8579 7 13.8579C3.21244 13.8579 0.141846 10.7873 0.141846 6.99976C0.141857 3.2122 3.21245 0.141612 7 0.141602C10.7876 0.141602 13.8581 3.21219 13.8582 6.99976Z",fill:"currentColor"})]}),p9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M11.0307 5.46369C11.0305 3.78995 9.6734 2.43357 7.99961 2.43357C6.32601 2.43379 4.96972 3.79009 4.96949 5.46369C4.96949 7.13748 6.32587 8.49455 7.99961 8.49477C9.67354 8.49477 11.0307 7.13762 11.0307 5.46369ZM12.3163 5.46369C12.3163 7.84777 10.3837 9.78042 7.99961 9.78042C5.61572 9.7802 3.68288 7.84763 3.68288 5.46369C3.6831 3.07993 5.61586 1.14718 7.99961 1.14695C10.3836 1.14695 12.3161 3.0798 12.3163 5.46369Z",fill:"currentColor"}),f.jsx("path",{d:"M8.00002 10.3316C11.7343 10.3316 14.1864 11.8997 15.0387 14.4445L14.4292 14.6483L13.8197 14.8531C13.1955 12.9893 11.3673 11.6182 8.00002 11.6182C4.63277 11.6182 2.80455 12.9893 2.18031 14.8531L1.5708 14.6483L0.961304 14.4445C1.81368 11.8997 4.26579 10.3316 8.00002 10.3316Z",fill:"currentColor"})]}),m9=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M8.3125 0.981587C8.66767 1.0545 8.97902 1.20558 9.2627 1.43374C9.48724 1.61438 9.73029 1.85933 9.97949 2.10854L14.707 6.83608L13.293 8.25014L9 3.95717V15.0431H7V3.95717L2.70703 8.25014L1.29297 6.83608L6.02051 2.10854C6.26971 1.85933 6.51277 1.61438 6.7373 1.43374C6.97662 1.24126 7.28445 1.04542 7.6875 0.981587C7.8973 0.94841 8.1031 0.956564 8.3125 0.981587Z",fill:"currentColor"})}),C9=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M2 4.88C2 3.68009 2 3.08013 2.30557 2.65954C2.40426 2.52371 2.52371 2.40426 2.65954 2.30557C3.08013 2 3.68009 2 4.88 2H11.12C12.3199 2 12.9199 2 13.3405 2.30557C13.4763 2.40426 13.5957 2.52371 13.6944 2.65954C14 3.08013 14 3.68009 14 4.88V11.12C14 12.3199 14 12.9199 13.6944 13.3405C13.5957 13.4763 13.4763 13.5957 13.3405 13.6944C12.9199 14 12.3199 14 11.12 14H4.88C3.68009 14 3.08013 14 2.65954 13.6944C2.52371 13.5957 2.40426 13.4763 2.30557 13.3405C2 12.9199 2 12.3199 2 11.12V4.88Z",fill:"currentColor"})}),g9=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M5.5498 9.75V5H6.9502V9.75C6.9502 10.3299 7.4201 10.7998 8 10.7998C8.5799 10.7998 9.0498 10.3299 9.0498 9.75V4.5C9.0498 2.9536 7.7964 1.7002 6.25 1.7002C4.7036 1.7002 3.4502 2.9536 3.4502 4.5V9.75C3.4502 12.2629 5.4871 14.2998 8 14.2998C10.5129 14.2998 12.5498 12.2629 12.5498 9.75V4H13.9502V9.75C13.9502 13.0361 11.2861 15.7002 8 15.7002C4.71391 15.7002 2.0498 13.0361 2.0498 9.75V4.5C2.04981 2.1804 3.9304 0.299806 6.25 0.299805C8.5696 0.299805 10.4502 2.1804 10.4502 4.5V9.75C10.4502 11.1031 9.3531 12.2002 8 12.2002C6.6469 12.2002 5.5498 11.1031 5.5498 9.75Z",fill:"currentColor"})}),v9=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M2.871 13.1286C0.0387669 10.2962 0.0387669 5.70383 2.871 2.87141C5.70341 0.0390029 10.2957 0.0391154 13.1282 2.87141L12.1387 3.86094C9.85292 1.57538 6.1469 1.57596 3.86123 3.86163C1.57573 6.14732 1.57573 9.85269 3.86123 12.1384C6.1469 14.424 9.85292 14.4246 12.1387 12.1391L13.1282 13.1286C10.2957 15.9609 5.70341 15.961 2.871 13.1286Z",fill:"currentColor"})}),y9=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M15.3695 11.411L15.1234 12.8866C14.8869 14.3042 13.6603 15.3436 12.223 15.3436H3.77673C2.33958 15.3434 1.1128 14.3042 0.876343 12.8866L0.630249 11.411L2.05408 11.1747L2.29919 12.6493C2.41973 13.3713 3.04475 13.9001 3.77673 13.9003H12.223C12.9551 13.9002 13.58 13.3713 13.7006 12.6493L13.9457 11.1747L15.3695 11.411ZM8.72205 8.994C8.77717 8.93934 8.83792 8.88106 8.90271 8.81627L12.4828 5.23424L13.5043 6.25572L9.92224 9.8358C9.6395 10.1185 9.38763 10.3732 9.15857 10.5575C8.91892 10.7503 8.63953 10.9224 8.2865 10.9784C8.09711 11.0083 7.90363 11.0083 7.71423 10.9784C7.36106 10.9224 7.0809 10.7503 6.84119 10.5575C6.61215 10.3732 6.36022 10.1185 6.07751 9.8358L2.49646 6.25572L3.51697 5.23424L7.09705 8.81627C7.16219 8.88142 7.22331 8.94006 7.27869 8.99498V1.3065H8.72205V8.994Z",fill:"currentColor"})}),w9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M14.1446 8C14.1446 4.6062 11.3938 1.85539 8 1.85539C4.6062 1.85539 1.85539 4.6062 1.85539 8C1.85539 11.3938 4.6062 14.1446 8 14.1446C11.3938 14.1446 14.1446 11.3938 14.1446 8ZM15.511 8C15.511 12.148 12.148 15.511 8 15.511C3.85202 15.511 0.489014 12.148 0.489014 8C0.489014 3.85202 3.85202 0.489014 8 0.489014C12.148 0.489014 15.511 3.85202 15.511 8Z",fill:"currentColor"}),f.jsx("path",{d:"M10.5617 8.42578C10.852 8.21614 10.852 7.78386 10.5617 7.57422L7.25708 5.18751C6.90974 4.93666 6.42436 5.18484 6.42436 5.61329V10.3867C6.42436 10.8152 6.90974 11.0633 7.25708 10.8125L10.5617 8.42578Z",fill:"currentColor"})]}),x9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M14.1448 8.00024C14.1448 4.60644 11.394 1.85563 8.00024 1.85563C4.60644 1.85563 1.85563 4.60644 1.85563 8.00024C1.85563 11.394 4.60644 14.1448 8.00024 14.1448C11.394 14.1448 14.1448 11.394 14.1448 8.00024ZM15.5112 8.00024C15.5112 12.1482 12.1482 15.5112 8.00024 15.5112C3.85226 15.5112 0.489258 12.1482 0.489258 8.00024C0.489258 3.85226 3.85226 0.489258 8.00024 0.489258C12.1482 0.489258 15.5112 3.85226 15.5112 8.00024Z",fill:"currentColor"}),f.jsx("path",{d:"M7.14244 5.14258V10.8569H5.71387V5.14258H7.14244Z",fill:"currentColor"}),f.jsx("path",{d:"M10.286 5.14258V10.8569H8.85742V5.14258H10.286Z",fill:"currentColor"})]}),_9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M2.58875 12.3407L6.59167 8.33777L7.66296 9.40808L3.66003 13.411H7.99988V14.8065H3.05457C2.02633 14.8065 1.19324 13.9734 1.19324 12.9452V7.99988H2.58875V12.3407Z",fill:"currentColor"}),f.jsx("path",{d:"M12.9452 1.19324C13.9734 1.19324 14.8065 2.02633 14.8065 3.05457V7.99988H13.411V3.66003L9.40808 7.66296L8.33777 6.59167L12.3407 2.58875H7.99988V1.19324H12.9452Z",fill:"currentColor"})]}),L9=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{fillRule:"evenodd",clipRule:"evenodd",d:"M12.3368 1.53569L11.931 4.43172H14.8086V5.79673H11.7404L11.1962 9.67859H14.2839V11.0436H11.0056L10.4994 14.6529L9.14873 14.4643L9.62731 11.0436H5.75876L5.25252 14.6529L3.90186 14.4643L4.38043 11.0436H1.69141V9.67859H4.57104L5.11417 5.79673H2.21609V4.43172H5.30581L5.73724 1.34713L7.08995 1.53569L6.68414 4.43172H10.5527L10.9841 1.34713L12.3368 1.53569ZM5.94937 9.67859H9.81791L10.361 5.79673H6.49353L5.94937 9.67859Z",fill:"currentColor"})}),k9=({size:n=14,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsxs("g",{clipPath:"url(#clip0_1840_45990)",children:[f.jsx("path",{d:"M3.03426 5.66661L1.70084 7.00003L3.0315 8.33069L2.14762 9.21457L-0.0669245 7.00003L2.15038 4.78273L3.03426 5.66661ZM7 14.067L4.77924 11.8462L5.66313 10.9623L7 12.2992L8.33342 10.9658L9.2173 11.8496L7 14.067ZM11.8489 9.21803L10.965 8.33414L12.2992 7.00003L10.9623 5.66316L11.8462 4.77927L14.0669 7.00003L11.8489 9.21803ZM8.33066 3.03153L7 1.70087L5.66589 3.03498L4.782 2.1511L7 -0.0668945L9.21454 2.14765L8.33066 3.03153Z",fill:"currentColor"}),f.jsx("rect",{x:"5.98535",y:"5.98535",width:"2.02942",height:"2.02942",fill:"currentColor"})]}),f.jsx("defs",{children:f.jsx("clipPath",{id:"clip0_1840_45990",children:f.jsx("rect",{width:"14",height:"14",fill:"currentColor"})})})]}),S9=({size:n=14,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",children:[f.jsx("path",{transform:"translate(0.6689 1.073)",d:"M11.4818 5.57813C11.4818 4.45301 11.4807 3.66237 11.4075 3.05908C11.3359 2.46953 11.2024 2.13852 10.9939 1.89441C10.9247 1.81341 10.8493 1.73801 10.7683 1.66882C10.5242 1.46033 10.1932 1.32686 9.60364 1.25525C9.00034 1.18198 8.20974 1.18091 7.0846 1.18091L5.57813 1.18091C4.45301 1.18091 3.66238 1.18198 3.05908 1.25525C2.46953 1.32686 2.13852 1.46033 1.89441 1.66882C1.81341 1.73801 1.73801 1.81341 1.66882 1.89441C1.46033 2.13852 1.32686 2.46953 1.25525 3.05908C1.18198 3.66238 1.18091 4.45301 1.18091 5.57813L1.18091 6.2771C1.18091 7.40218 1.18197 8.19288 1.25525 8.79614C1.32687 9.38553 1.46036 9.71674 1.66882 9.96082C1.73797 10.0417 1.81347 10.1173 1.89441 10.1864C2.13851 10.3948 2.46965 10.5275 3.05908 10.5991C3.66238 10.6724 4.45298 10.6735 5.57813 10.6735L7.0846 10.6735C8.20977 10.6735 9.00033 10.6724 9.60364 10.5991C10.1931 10.5275 10.5242 10.3948 10.7683 10.1864C10.8493 10.1173 10.9247 10.0417 10.9939 9.96082C11.2024 9.71674 11.3358 9.38553 11.4075 8.79614C11.4808 8.19288 11.4818 7.40218 11.4818 6.2771L11.4818 5.57813ZM12.6627 6.2771C12.6627 7.37222 12.6637 8.247 12.5798 8.93799C12.4942 9.64284 12.3133 10.2359 11.8928 10.7282C11.7834 10.8562 11.6637 10.9751 11.5356 11.0845C11.0434 11.5049 10.4511 11.6867 9.74634 11.7723C9.05525 11.8563 8.17999 11.8552 7.0846 11.8552L5.57813 11.8552C4.48273 11.8552 3.60747 11.8563 2.91638 11.7723C2.21157 11.6867 1.61933 11.5049 1.12708 11.0845C0.99901 10.9751 0.879281 10.8562 0.769898 10.7282C0.349454 10.2359 0.168506 9.64284 0.0828864 8.93799C-0.00101964 8.247 4.88512e-07 7.37222 6.47206e-07 6.2771L6.47206e-07 5.57813C6.47206e-07 4.48273 -0.00106163 3.60747 0.0828864 2.91638C0.168502 2.21168 0.349594 1.61928 0.769898 1.12708C0.879302 0.998981 0.998981 0.879302 1.12708 0.769898C1.61928 0.349594 2.21168 0.168502 2.91638 0.0828864C3.60747 -0.00106163 4.48273 6.47206e-07 5.57813 6.47206e-07L7.0846 6.47206e-07C8.17999 6.47206e-07 9.05525 -0.00106163 9.74634 0.0828864C10.451 0.168505 11.0434 0.349587 11.5356 0.769898C11.6637 0.879302 11.7834 0.998981 11.8928 1.12708C12.3131 1.61928 12.4942 2.21169 12.5798 2.91638C12.6638 3.60747 12.6627 4.48273 12.6627 5.57813L12.6627 6.2771Z",fill:"currentColor"}),f.jsx("path",{transform:"translate(0.6689 1.073)",d:"M6.02607 5.50955L6.44306 5.9274L3.84284 8.52762L3.425 8.11063L3.00715 7.69278L4.77253 5.9274L3.00715 4.16202L3.84284 3.32633L6.02607 5.50955Z",fill:"currentColor"}),f.jsx("path",{transform:"translate(0.6689 1.073)",d:"M9.23789 7.35397L9.23789 8.53488L6.96238 8.53488L6.96238 7.35397L9.23789 7.35397Z",fill:"currentColor"})]}),j9=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",children:f.jsx("path",{transform:"translate(1.292 1.3)",d:"M10.3232 9.18164C11.2868 9.18164 12.0985 9.82833 12.3506 10.7109L13.415 10.7109L13.415 11.8711L12.3496 11.8711C12.0971 12.7532 11.2864 13.3994 10.3232 13.3994C9.36031 13.3992 8.55012 12.7531 8.29785 11.8711L0 11.8711L0 10.7109L8.29688 10.7109C8.54876 9.82845 9.35988 9.18186 10.3232 9.18164ZM10.3232 10.3418C9.7999 10.3421 9.37534 10.7667 9.375 11.29C9.375 11.8137 9.79969 12.239 10.3232 12.2393C10.847 12.2393 11.2725 11.8138 11.2725 11.29C11.2721 10.7666 10.8468 10.3418 10.3232 10.3418ZM12.4326 11.291C12.4326 11.3549 12.4284 11.418 12.4229 11.4805C12.4287 11.4181 12.4326 11.355 12.4326 11.291ZM8.21484 11.2832C8.21484 11.2856 8.21484 11.2886 8.21484 11.291L8.21484 11.29C8.21484 11.2878 8.21484 11.2855 8.21484 11.2832ZM3.08301 4.59082C4.04605 4.59095 4.85696 5.23717 5.10938 6.11914L13.415 6.11914L13.415 7.2793L5.11035 7.2793C4.85833 8.16202 4.04648 8.80846 3.08301 8.80859C2.11972 8.80843 1.30963 8.16179 1.05762 7.2793L0 7.2793L0 6.11914L1.05762 6.11914C1.30994 5.23728 2.12006 4.59098 3.08301 4.59082ZM3.08301 5.75098C2.55962 5.75117 2.13512 6.17587 2.13477 6.69922C2.13477 7.22287 2.5594 7.64824 3.08301 7.64844C3.60665 7.64828 4.03223 7.2229 4.03223 6.69922C4.03187 6.17585 3.60643 5.75113 3.08301 5.75098ZM5.19238 6.69922C5.19238 6.763 5.18816 6.82633 5.18262 6.88867C5.18846 6.82629 5.19238 6.76313 5.19238 6.69922C5.19236 6.63495 5.18853 6.57152 5.18262 6.50879C5.18826 6.57154 5.19236 6.635 5.19238 6.69922ZM0.982422 6.52344C0.977382 6.58136 0.97463 6.63999 0.974609 6.69922C0.974609 6.75775 0.977496 6.81579 0.982422 6.87305C0.977758 6.81579 0.974609 6.75767 0.974609 6.69922C0.974628 6.64 0.977618 6.58142 0.982422 6.52344ZM10.3232 0C11.2869 0 12.0986 0.646596 12.3506 1.5293L13.415 1.5293L13.415 2.68945L12.3496 2.68945C12.363 2.64266 12.3754 2.59488 12.3857 2.54688C12.1838 3.50118 11.3376 4.21777 10.3232 4.21777C9.36037 4.21756 8.55018 3.57139 8.29785 2.68945L0 2.68945L0 1.5293L8.29688 1.5293C8.5487 0.646717 9.35981 0.00021854 10.3232 0ZM10.3232 1.16016C9.79984 1.16042 9.37524 1.58499 9.375 2.1084C9.375 2.63201 9.79969 3.05735 10.3232 3.05762C10.847 3.05762 11.2725 2.63217 11.2725 2.1084C11.2722 1.58483 10.8469 1.16016 10.3232 1.16016ZM12.4229 2.29883C12.4287 2.23641 12.4326 2.17331 12.4326 2.10938C12.4326 2.17327 12.4284 2.23638 12.4229 2.29883ZM8.21484 2.10938L8.21484 2.1084L8.21484 2.10938ZM8.22266 1.93359C8.21785 1.98897 8.21506 2.04499 8.21484 2.10156C8.21503 2.04501 8.2181 1.98902 8.22266 1.93359ZM8.22266 11.1162C8.2179 11.1713 8.21507 11.227 8.21484 11.2832C8.21504 11.227 8.21814 11.1713 8.22266 11.1162Z",fill:"currentColor"})}),E9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",children:[f.jsx("path",{transform:"translate(9.52 2.52)",d:"M3.55246 0L3.55246 2.44252L6 2.44252L6 3.55748L3.55246 3.55748L3.55246 6L2.43834 6L2.43834 3.55748L0 3.55748L0 2.44252L2.43834 2.44252L2.43834 0L3.55246 0Z",fill:"currentColor"}),f.jsx("path",{transform:"translate(0.3496 2.35)",d:"M4.76367 0C5.36861 1.80598e-05 5.93113 0.310294 6.25488 0.821289L6.78027 1.64941C6.79685 1.67558 6.81791 1.69775 6.83887 1.71973C6.72186 2.15521 6.65702 2.61192 6.65137 3.08301C6.25601 2.96045 5.90909 2.70478 5.68164 2.3457L5.15723 1.5166C5.07183 1.38189 4.92318 1.3008 4.76367 1.30078L2.32422 1.30078C1.7589 1.30078 1.30078 1.7589 1.30078 2.32422L1.30078 10.1338C1.30078 10.6991 1.7589 11.1572 2.32422 11.1572L11.9766 11.1572C12.5419 11.1572 13 10.6991 13 10.1338L13 8.58398C13.4545 8.5135 13.8903 8.38748 14.3008 8.21289L14.3008 10.1338C14.3008 11.4171 13.2598 12.458 11.9766 12.458L2.32422 12.458C1.04093 12.458 0 11.4171 0 10.1338L0 2.32422C0 1.04093 1.04093 0 2.32422 0L4.76367 0Z",fill:"currentColor"})]}),b9=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",children:f.jsx("path",{d:"M5.19629 1.57104C5.81144 1.5711 6.38623 1.8786 6.72754 2.39038L7.19922 3.09839C7.28454 3.22635 7.42824 3.30344 7.58203 3.30347H12.1699C13.5039 3.30348 14.5859 4.38548 14.5859 5.71948V6.62671C15.2694 7.02689 15.6605 7.85012 15.4385 8.68726L14.3848 12.658C14.1037 13.7164 13.1449 14.4527 12.0498 14.4529H2.91699C1.51651 14.4529 0.451662 13.2814 0.501954 11.9519V3.98706C0.501954 2.65305 1.58396 1.57104 2.91797 1.57104H5.19629ZM3.7793 7.75562C3.30994 7.75562 2.89883 8.07153 2.77832 8.52515L1.91602 11.7722C1.74167 12.4291 2.23734 13.073 2.91699 13.073H12.0498C12.5191 13.0728 12.9304 12.757 13.0508 12.3035L14.1045 8.33374C14.1819 8.04202 13.9619 7.756 13.6602 7.75562H3.7793ZM2.91797 2.9519C2.34625 2.9519 1.88281 3.41534 1.88281 3.98706V7.2937C2.33068 6.7269 3.02249 6.37476 3.7793 6.37476H13.2051V5.71948C13.2051 5.14777 12.7416 4.68434 12.1699 4.68433H7.58203C6.96675 4.6843 6.39209 4.37595 6.05078 3.86401L5.5791 3.15601C5.49379 3.02821 5.34995 2.95196 5.19629 2.9519H2.91797Z",fill:"currentColor"})}),M9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",children:[f.jsx("path",{d:"M5.19629 1.57104C5.81144 1.5711 6.38623 1.8786 6.72754 2.39038L7.19922 3.09839C7.28454 3.22635 7.42824 3.30344 7.58203 3.30347H12.1699C13.5039 3.30348 14.5859 4.38548 14.5859 5.71948V6.62671C15.2694 7.02689 15.6605 7.85012 15.4385 8.68726L14.3848 12.658C14.1037 13.7164 13.1449 14.4527 12.0498 14.4529H2.91699C1.51651 14.4529 0.451662 13.2814 0.501954 11.9519V3.98706C0.501954 2.65305 1.58396 1.57104 2.91797 1.57104H5.19629ZM3.7793 7.75562C3.30994 7.75562 2.89883 8.07153 2.77832 8.52515L1.91602 11.7722C1.74167 12.4291 2.23734 13.073 2.91699 13.073H12.0498C12.5191 13.0728 12.9304 12.757 13.0508 12.3035L14.1045 8.33374C14.1819 8.04202 13.9619 7.756 13.6602 7.75562H3.7793ZM2.91797 2.9519C2.34625 2.9519 1.88281 3.41534 1.88281 3.98706V7.2937C2.33068 6.7269 3.02249 6.37476 3.7793 6.37476H13.2051V5.71948C13.2051 5.14777 12.7416 4.68434 12.1699 4.68433H7.58203C6.96675 4.6843 6.39209 4.37595 6.05078 3.86401L5.5791 3.15601C5.49379 3.02821 5.34995 2.95196 5.19629 2.9519H2.91797Z",fill:"currentColor"}),f.jsx("path",{opacity:"0.2",d:"M13.6602 7.75525C13.9618 7.7556 14.1815 8.04179 14.1045 8.33337L13.0508 12.3031C12.9304 12.7567 12.5191 13.0725 12.0498 13.0726H2.91701C2.23744 13.0725 1.7417 12.4287 1.91603 11.7719L2.77834 8.52478C2.89898 8.07146 3.31018 7.75532 3.77931 7.75525H13.6602ZM5.1963 2.95154C5.34985 2.95159 5.49377 3.02803 5.57912 3.15564L6.0508 3.86365C6.39205 4.37553 6.96685 4.68385 7.58205 4.68396H12.1699C12.7416 4.68396 13.2049 5.14754 13.2051 5.71912V6.37439H3.77931C3.02267 6.37444 2.33067 6.72671 1.88283 7.29333V3.98669C1.88299 3.4152 2.34649 2.95168 2.91798 2.95154H5.1963Z",fill:"currentColor"})]}),O9=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",children:f.jsx("path",{transform:"translate(1.5 2.429)",d:"M5.05582 0.518756L4.50669 0.86654L5.05582 0.518756ZM13 9.4837L13.65 9.4837L13.65 3.53962L13 3.53962L12.35 3.53962L12.35 9.4837L13 9.4837ZM11.3264 1.86603L11.3264 1.21603L6.52313 1.21603L6.52313 1.86603L6.52313 2.51603L11.3264 2.51603L11.3264 1.86603ZM5.58054 1.34727L6.12968 0.999489L5.60495 0.170972L5.05582 0.518756L4.50669 0.86654L5.03141 1.69506L5.58054 1.34727ZM4.11323 1.23058e-13L4.11323 -0.65L1.67359 -0.65L1.67359 5.00699e-14L1.67359 0.65L4.11323 0.65L4.11323 1.23058e-13ZM0 1.67359L-0.65 1.67359L-0.65 9.4837L0 9.4837L0.65 9.4837L0.65 1.67359L0 1.67359ZM11.3264 11.1573L11.3264 10.5073L1.67359 10.5073L1.67359 11.1573L1.67359 11.8073L11.3264 11.8073L11.3264 11.1573ZM0 9.4837L-0.65 9.4837C-0.65 10.767 0.390308 11.8073 1.67359 11.8073L1.67359 11.1573L1.67359 10.5073C1.10828 10.5073 0.65 10.049 0.65 9.4837L0 9.4837ZM1.67359 5.00699e-14L1.67359 -0.65C0.390307 -0.65 -0.65 0.390309 -0.65 1.67359L0 1.67359L0.65 1.67359C0.65 1.10828 1.10828 0.65 1.67359 0.65L1.67359 5.00699e-14ZM5.05582 0.518756L5.60495 0.170972C5.28121 -0.340193 4.71829 -0.65 4.11323 -0.65L4.11323 1.23058e-13L4.11323 0.65C4.27282 0.65 4.4213 0.731715 4.50669 0.86654L5.05582 0.518756ZM6.52313 1.86603L6.52313 1.21603C6.36354 1.21603 6.21507 1.13431 6.12968 0.999489L5.58054 1.34727L5.03141 1.69506C5.35515 2.20622 5.91808 2.51603 6.52313 2.51603L6.52313 1.86603ZM13 3.53962L13.65 3.53962C13.65 2.25634 12.6097 1.21603 11.3264 1.21603L11.3264 1.86603L11.3264 2.51603C11.8917 2.51603 12.35 2.97431 12.35 3.53962L13 3.53962ZM13 9.4837L12.35 9.4837C12.35 10.049 11.8917 10.5073 11.3264 10.5073L11.3264 11.1573L11.3264 11.8073C12.6097 11.8073 13.65 10.767 13.65 9.4837L13 9.4837Z",fill:"currentColor"})}),N9=({size:n=10,className:r})=>f.jsx("svg",{width:n*8/10,height:n,className:r,viewBox:"-0.5 0 8.5 10.5",fill:"none",children:f.jsx("path",{d:"M0 0L-0.5 0L-0.5 7L0 7L0.5 7L0.5 0L0 0ZM3 10L3 10.5L8 10.5L8 10L8 9.5L3 9.5L3 10ZM0 7L-0.5 7C-0.5 8.933 1.067 10.5 3 10.5L3 10L3 9.5C1.61929 9.5 0.5 8.38071 0.5 7L0 7Z",fill:"currentColor"})}),R9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M11.3496 8C11.3496 6.14985 9.85015 4.65039 8 4.65039C6.14985 4.65039 4.65039 6.14985 4.65039 8C4.65039 9.85015 6.14985 11.3496 8 11.3496C9.85015 11.3496 11.3496 9.85015 11.3496 8ZM12.6504 8C12.6504 10.5681 10.5681 12.6504 8 12.6504C5.43188 12.6504 3.34961 10.5681 3.34961 8C3.34961 5.43188 5.43188 3.34961 8 3.34961C10.5681 3.34961 12.6504 5.43188 12.6504 8Z",fill:"currentColor"}),f.jsx("path",{d:"M8.65039 0.5V2.5H7.34961V0.5H8.65039Z",fill:"currentColor"}),f.jsx("path",{d:"M8.65039 13.5V15.5H7.34961V13.5H8.65039Z",fill:"currentColor"}),f.jsx("path",{d:"M3.15808 2.24035L4.57229 3.65456L3.6525 4.57435L2.23829 3.16014L3.15808 2.24035Z",fill:"currentColor"}),f.jsx("path",{d:"M12.3505 11.4327L13.7647 12.8469L12.8449 13.7667L11.4307 12.3525L12.3505 11.4327Z",fill:"currentColor"}),f.jsx("path",{d:"M2.24537 12.8469L3.65958 11.4327L4.57937 12.3525L3.16516 13.7667L2.24537 12.8469Z",fill:"currentColor"}),f.jsx("path",{d:"M11.4377 3.65455L12.852 2.24033L13.7718 3.16012L12.3575 4.57434L11.4377 3.65455Z",fill:"currentColor"}),f.jsx("path",{d:"M0.5 7.35461H2.5V8.6554H0.5L0.5 7.35461Z",fill:"currentColor"}),f.jsx("path",{d:"M13.5 7.35461H15.5V8.6554H13.5V7.35461Z",fill:"currentColor"})]}),P9=({size:n=16,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M13.2764 9.52324C12.5607 9.97754 11.7177 10.242 10.7812 10.242C8.11386 10.2419 5.95042 8.07997 5.9502 5.41289C5.9502 4.48128 6.21453 3.61071 6.67188 2.87285C4.30332 3.4658 2.54992 5.60845 2.5498 8.16093C2.5498 11.1712 4.99103 13.6102 8 13.6102C10.5383 13.6102 12.6709 11.8724 13.2764 9.52324ZM7.05078 5.41289C7.051 7.47224 8.72116 9.1423 10.7812 9.14238C11.9248 9.14238 12.887 8.63397 13.5781 7.8084C13.7266 7.63106 13.9701 7.56547 14.1875 7.64433C14.4049 7.72329 14.5497 7.9297 14.5498 8.16093C14.5498 11.7766 11.6161 14.7098 8 14.7098C4.38402 14.7098 1.4502 11.7792 1.4502 8.16093C1.45033 4.54322 4.3812 1.61015 8 1.61015C8.23027 1.61015 8.43585 1.75352 8.51562 1.96953C8.59536 2.18554 8.53241 2.42829 8.35742 2.57793C7.55573 3.26311 7.05078 4.27876 7.05078 5.41289Z",fill:"currentColor"})}),T9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M12.1665 13.5811V14.7803H3.66651V13.5811H12.1665Z",fill:"currentColor"}),f.jsx("path",{d:"M13.4453 7.02379C13.4453 6.04702 13.4452 5.3616 13.3887 4.83434C13.3333 4.31828 13.2302 4.02378 13.0723 3.80309C12.9446 3.62475 12.7877 3.46883 12.6094 3.34117C12.3887 3.18328 12.0942 3.08007 11.5781 3.02477C11.0508 2.96829 10.3655 2.96715 9.38867 2.96715H6.61035C5.63359 2.96715 4.94816 2.96827 4.4209 3.02477C3.90486 3.0801 3.61034 3.18321 3.38965 3.34117C3.21143 3.46878 3.05534 3.62487 2.92774 3.80309C2.76977 4.02377 2.66667 4.3183 2.61133 4.83434C2.55483 5.3616 2.55371 6.04702 2.55371 7.02379C2.55371 8.0006 2.55485 8.68596 2.61133 9.21324C2.66663 9.72936 2.76983 10.0238 2.92774 10.2445C3.0554 10.4228 3.21131 10.5797 3.38965 10.7074C3.61034 10.8654 3.90484 10.9685 4.4209 11.0238C4.94816 11.0803 5.63359 11.0804 6.61035 11.0804H9.38867C10.3654 11.0804 11.0508 11.0803 11.5781 11.0238C12.0941 10.9685 12.3887 10.8652 12.6094 10.7074C12.7877 10.5797 12.9446 10.4229 13.0723 10.2445C13.2301 10.0238 13.3334 9.72927 13.3887 9.21324C13.4452 8.68596 13.4453 8.00058 13.4453 7.02379ZM14.6455 7.02379C14.6455 7.97428 14.646 8.73509 14.5811 9.34117C14.5149 9.95828 14.3756 10.4858 14.0479 10.9437C13.8436 11.229 13.5938 11.4788 13.3086 11.683C12.8507 12.0108 12.3232 12.15 11.7061 12.2162C11.1 12.2811 10.3391 12.2806 9.38867 12.2806H6.61035C5.66018 12.2806 4.89991 12.2811 4.29395 12.2162C3.67684 12.15 3.14935 12.0108 2.69141 11.683C2.40613 11.4788 2.15639 11.229 1.95215 10.9437C1.62436 10.4858 1.4841 9.95828 1.41797 9.34117C1.35305 8.73511 1.35449 7.97424 1.35449 7.02379C1.35449 6.07366 1.35308 5.31333 1.41797 4.70738C1.4841 4.09028 1.62436 3.56279 1.95215 3.10485C2.15638 2.81956 2.40613 2.56982 2.69141 2.36559C3.14935 2.03779 3.67684 1.89753 4.29395 1.83141C4.8999 1.76652 5.66022 1.76793 6.61035 1.76793H9.38867C10.3391 1.76793 11.1 1.76649 11.7061 1.83141C12.3232 1.89753 12.8507 2.03779 13.3086 2.36559C13.5939 2.56982 13.8436 2.81957 14.0479 3.10485C14.3756 3.56279 14.5149 4.09028 14.5811 4.70738C14.646 5.31335 14.6455 6.07362 14.6455 7.02379Z",fill:"currentColor"})]}),I9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{fillRule:"evenodd",clipRule:"evenodd",d:"M12.0997 8.54554C12.2905 8.54989 12.3541 8.58056 12.4535 8.74614L12.8849 9.46387C12.9851 9.63071 13.0464 9.66013 13.2388 9.66447H14.1138C14.3417 9.66448 14.3512 9.66937 14.4686 9.86507L14.892 10.5717C14.9942 10.7422 14.9948 10.8247 14.892 10.9961L14.4756 11.6906C14.3741 11.8677 14.3694 11.9379 14.4756 12.115L14.892 12.8096C14.9942 12.9801 14.9947 13.0625 14.892 13.234L14.4686 13.9406C14.3643 14.1028 14.3063 14.1354 14.1138 14.1412H13.2388C13.0465 14.1456 12.985 14.1752 12.8849 14.3418L12.4535 15.0595C12.353 15.2195 12.2895 15.2558 12.0997 15.2601H11.2237C10.9962 15.2601 10.9871 15.2548 10.8699 15.0595L10.4384 14.3418C10.3383 14.175 10.2767 14.1456 10.0846 14.1412H9.2096C9.01854 14.1355 8.95761 14.1006 8.85477 13.9406L8.43139 13.234C8.32562 13.0576 8.33148 12.9862 8.43139 12.8096L8.84771 12.115C8.95165 11.9416 8.94659 11.863 8.84771 11.6906L8.43139 10.9961C8.32767 10.8232 8.33411 10.7437 8.43139 10.5717L8.85477 9.86507C8.95447 9.69891 9.01875 9.67017 9.2096 9.66447H10.0846C10.2741 9.66441 10.3414 9.62547 10.4384 9.46387L10.8699 8.74614C10.987 8.55106 10.9963 8.54554 11.2237 8.54554H12.0997ZM11.6612 10.232C11.3326 10.7798 10.8155 11.0948 10.1743 11.106C10.4443 11.61 10.4425 12.1976 10.1743 12.6987C10.803 12.7096 11.3391 13.0359 11.6612 13.5727C11.9855 13.0323 12.5131 12.7098 13.148 12.6987C12.879 12.196 12.8789 11.6086 13.148 11.106C12.5076 11.0948 11.9894 10.7794 11.6612 10.232Z",fill:"currentColor"}),f.jsx("path",{fillRule:"evenodd",clipRule:"evenodd",d:"M7.51205 0.790627C9.19055 0.790649 10.7401 1.0691 11.892 1.54364C12.4664 1.78029 12.9719 2.07885 13.3436 2.4408C13.7171 2.80467 13.9916 3.27253 13.9918 3.82384V7.90442C13.6067 7.69532 13.1907 7.53597 12.7529 7.43366V5.66454C12.4928 5.82898 12.2028 5.97601 11.892 6.10405C10.74 6.57865 9.19071 6.85706 7.51205 6.85706C5.8337 6.85703 4.285 6.57852 3.13309 6.10405C2.82215 5.97593 2.53164 5.8291 2.27121 5.66454V7.4135C2.27134 7.75678 2.6066 8.27106 3.62502 8.73405C4.58641 9.17097 5.95762 9.45591 7.50499 9.45681C7.24582 9.83133 7.03684 10.2434 6.88706 10.6826C5.44388 10.6162 4.12516 10.3216 3.11192 9.86104C2.81708 9.72698 2.53185 9.56866 2.27121 9.38928V11.2542C2.27158 11.5974 2.60697 12.1109 3.62502 12.5737C4.41933 12.9347 5.4937 13.1898 6.71569 13.2693C6.80349 13.7128 6.9513 14.1345 7.14814 14.5273C5.60324 14.4862 4.18593 14.1889 3.11192 13.7007C2.01039 13.1998 1.03366 12.3814 1.03333 11.2542V3.82384C1.03352 3.27273 1.30721 2.80461 1.68049 2.4408C2.05211 2.07893 2.55887 1.78026 3.13309 1.54364C4.28492 1.06926 5.83393 0.790683 7.51205 0.790627ZM7.51205 2.02851C5.95492 2.02857 4.57354 2.29079 3.60486 2.68979C3.11958 2.88977 2.76667 3.11253 2.5454 3.32788C2.32671 3.54101 2.2714 3.7089 2.27121 3.82384C2.27121 3.93882 2.32624 4.10625 2.5454 4.3198C2.76667 4.53527 3.11927 4.75781 3.60486 4.9579C4.5736 5.35699 5.95467 5.61914 7.51205 5.61918C9.06942 5.61918 10.4505 5.35695 11.4192 4.9579C11.9051 4.75773 12.2584 4.53536 12.4797 4.3198C12.6988 4.10627 12.7529 3.93882 12.7529 3.82384C12.7527 3.70889 12.6984 3.54104 12.4797 3.32788C12.2584 3.11239 11.9049 2.88989 11.4192 2.68979C10.4505 2.29079 9.06925 2.02853 7.51205 2.02851Z",fill:"currentColor"})]}),$9=({size:n=14,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M7.24707 1.01771C7.52897 1.07653 7.77619 1.19694 8.00391 1.38001C8.19202 1.53136 8.39884 1.73784 8.61914 1.95814L12.6396 5.9806L11.6299 6.99134L7.71484 3.0763V13.0001H6.28516V3.0763L2.36914 6.99134L1.35938 5.9806L5.38086 1.95814C5.60116 1.73784 5.80798 1.53136 5.99609 1.38001C6.19476 1.22027 6.4385 1.06739 6.75195 1.01771C6.91296 0.992304 7.07471 0.997504 7.24707 1.01771Z",fill:"currentColor"})}),H9=({size:n=14,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:f.jsx("path",{d:"M7.00049 0.199829C3.24488 0.199829 0.199952 3.24408 0.199707 6.99963C0.199707 8.0414 0.434087 9.03061 0.854004 9.91467L1.11279 10.4576L2.19775 9.94202L1.94092 9.39905L1.81787 9.12268C1.5498 8.46885 1.40186 7.75171 1.40186 6.99963C1.4021 3.90808 3.90888 1.40198 7.00049 1.40198C10.0919 1.40219 12.5979 3.90821 12.5981 6.99963C12.5981 10.0913 10.0921 12.5981 7.00049 12.5983C6.36734 12.5983 5.90348 12.5535 5.49268 12.4401C5.08803 12.3283 4.7041 12.1414 4.24463 11.8209C3.57111 11.3511 2.60588 11.1855 1.81006 11.6881L1.79736 11.6959L1.78467 11.7047L1.25537 12.0778L1.65381 13.2672L2.46045 12.6989C2.75029 12.5214 3.18004 12.5442 3.55615 12.8063C4.10063 13.1861 4.60863 13.4423 5.17334 13.5983C5.73194 13.7525 6.31665 13.8004 7.00049 13.8004C10.7561 13.8002 13.8003 10.7553 13.8003 6.99963C13.8 3.24421 10.7559 0.200041 7.00049 0.199829ZM3.81201 7.47327V8.67542H7.11572V7.47327H3.81201ZM3.81201 6.34924H10.2173V5.14709H3.81201V6.34924Z",fill:"currentColor"})}),V9=({size:n=14,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M13.3277 9.69629V10.976H7.28086V9.69629H13.3277Z",fill:"currentColor"}),f.jsx("path",{d:"M13.3277 2.97256V4.25225H7.28086V2.97256H13.3277Z",fill:"currentColor"}),f.jsx("path",{d:"M4.64512 10.336C4.64505 9.62755 4.07081 9.05322 3.3623 9.05322C2.65386 9.05329 2.07956 9.62759 2.07949 10.336C2.07949 11.0445 2.65382 11.6188 3.3623 11.6188C4.07085 11.6188 4.64512 11.0446 4.64512 10.336ZM5.92559 10.336C5.92559 11.7515 4.77777 12.8993 3.3623 12.8993C1.94689 12.8993 0.799805 11.7515 0.799805 10.336C0.799871 8.92066 1.94693 7.7736 3.3623 7.77354C4.77773 7.77354 5.92552 8.92062 5.92559 10.336Z",fill:"currentColor"}),f.jsx("path",{d:"M4.64531 3.6123C4.6453 2.90382 4.07098 2.32949 3.3625 2.32949C2.65403 2.32951 2.0797 2.90383 2.07969 3.6123C2.07969 4.32079 2.65402 4.8951 3.3625 4.89512C4.07099 4.89512 4.64531 4.3208 4.64531 3.6123ZM5.925 3.6123C5.925 5.02772 4.77792 6.1748 3.3625 6.1748C1.9471 6.17479 0.8 5.02771 0.8 3.6123C0.800013 2.19691 1.9471 1.04982 3.3625 1.0498C4.77791 1.0498 5.92499 2.1969 5.925 3.6123Z",fill:"currentColor"})]}),A9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M10.8239 3.54733V4.78443H4.63437V3.54733H10.8239Z",fill:"currentColor"}),f.jsx("path",{d:"M10.8239 6.12629V7.36338H4.63437V6.12629H10.8239Z",fill:"currentColor"}),f.jsx("path",{d:"M9.073 8.70524V9.94234H4.63437V8.70524H9.073Z",fill:"currentColor"}),f.jsx("path",{d:"M9.13321 0.573526C10.0076 0.573525 10.7179 0.572522 11.285 0.63397C11.8645 0.696791 12.3743 0.831648 12.8193 1.1548C13.0776 1.34246 13.3056 1.57047 13.4933 1.82875C13.8164 2.2737 13.9513 2.7836 14.0141 3.36303C14.0755 3.93015 14.0745 4.64049 14.0745 5.51485V6.1757L12.7327 7.5629V5.51485C12.7327 4.61092 12.732 3.9862 12.6803 3.5081C12.6298 3.0427 12.5379 2.79497 12.4083 2.61654C12.3033 2.47211 12.176 2.34472 12.0315 2.23977C11.8531 2.11016 11.6054 2.01823 11.14 1.96777C10.6618 1.91601 10.0372 1.91539 9.13321 1.91539H6.32658C5.42262 1.91539 4.79796 1.91604 4.31983 1.96777C3.85451 2.01819 3.60672 2.11029 3.42827 2.23977C3.28392 2.34465 3.15643 2.47223 3.0515 2.61654C2.9219 2.79496 2.82997 3.04274 2.7795 3.5081C2.72774 3.9862 2.72712 4.61092 2.72712 5.51485V10.023C2.72712 10.9273 2.72773 11.5525 2.7795 12.0307C2.82992 12.4959 2.92205 12.7429 3.0515 12.9213C3.15645 13.0657 3.28384 13.1931 3.42827 13.2981C3.60676 13.4277 3.85408 13.5206 4.31983 13.5711C4.79797 13.6228 5.42259 13.6234 6.32658 13.6234H6.87057L5.57707 14.9593C5.03527 14.9556 4.57031 14.9467 4.17476 14.9039C3.59508 14.841 3.08558 14.7063 2.64048 14.383C2.38215 14.1953 2.15422 13.9684 1.96653 13.7101C1.64319 13.2649 1.50851 12.7546 1.4457 12.1748C1.38432 11.6076 1.38525 10.8974 1.38525 10.023V5.51485C1.38525 4.64049 1.38426 3.93015 1.4457 3.36303C1.50853 2.78363 1.64341 2.27368 1.96653 1.82875C2.15417 1.57059 2.38228 1.34239 2.64048 1.1548C3.08544 0.831805 3.59533 0.696762 4.17476 0.63397C4.74193 0.572552 5.45218 0.573525 6.32658 0.573526H9.13321Z",fill:"currentColor"}),f.jsx("path",{d:"M14.2193 14.9553H10.0124L11.3744 13.6134H14.2193V14.9553Z",fill:"currentColor"}),f.jsx("path",{d:"M8.24493 13.3711L7.49015 14.8806C7.40148 15.058 7.58961 15.2461 7.76695 15.1574L9.27651 14.4027L14.6147 9.09934L13.5832 8.06775L8.24493 13.3711Z",fill:"currentColor"})]}),D9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M8 0C8.31451 0 8.62464 0.019379 8.92969 0.0546875C8.48228 0.403371 8.0952 0.825758 7.78809 1.30469C4.18586 1.41664 1.2998 4.37061 1.2998 8C1.2998 11.7003 4.29969 14.7002 8 14.7002C11.6297 14.7002 14.5829 11.8136 14.6943 8.21094C15.1734 7.90377 15.5956 7.51688 15.9443 7.06934C15.9797 7.37473 16 7.68512 16 8C16 12.4183 12.4183 16 8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0ZM7.0166 3.6084C7.00658 3.73765 7 3.86817 7 4C7 4.31845 7.03098 4.62973 7.08789 4.93164C5.76489 5.32438 4.7998 6.54958 4.7998 8C4.7998 9.76731 6.23269 11.2002 8 11.2002C9.45065 11.2002 10.6749 10.2345 11.0674 8.91113C11.3696 8.96818 11.6812 9 12 9C12.1315 9 12.2617 8.99239 12.3906 8.98242C11.9423 10.995 10.1477 12.5 8 12.5C5.51472 12.5 3.5 10.4853 3.5 8C3.5 5.85255 5.00435 4.05702 7.0166 3.6084Z",fill:"currentColor"}),f.jsx("path",{d:"M7.5 8.62109L9.12109 7",stroke:"currentColor",strokeWidth:"1.3"}),f.jsx("path",{d:"M9.08245 3.35798L11.8651 0.575334C11.895 0.545384 11.9463 0.56391 11.9502 0.606086L12.2362 3.69859C12.2384 3.72259 12.2574 3.74159 12.2814 3.74378L15.3697 4.02583C15.4119 4.02968 15.4305 4.08101 15.4005 4.11098L12.618 6.89351C12.6086 6.90289 12.5959 6.90816 12.5826 6.90816L9.11781 6.90815C9.09019 6.90816 9.06781 6.88577 9.06781 6.85816L9.06781 3.39333C9.06781 3.38007 9.07308 3.36735 9.08245 3.35798Z",stroke:"currentColor",strokeWidth:"1.3"})]}),F9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M6.1 3.1Q6.6 7.8 11.3 8.3Q6.6 8.8 6.1 13.5Q5.6 8.8 0.9 8.3Q5.6 7.8 6.1 3.1Z",fill:"currentColor"}),f.jsx("path",{d:"M11.9 1Q12.2 3.7 14.9 4Q12.2 4.3 11.9 7Q11.6 4.3 8.9 4Q11.6 3.7 11.9 1Z",fill:"currentColor"}),f.jsx("path",{d:"M12.5 9.4Q12.7 11.4 14.7 11.6Q12.7 11.8 12.5 13.8Q12.3 11.8 10.3 11.6Q12.3 11.4 12.5 9.4Z",fill:"currentColor"})]}),B9=({size:n=12,className:r})=>f.jsx("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg","aria-hidden":!0,children:f.jsx("path",{d:"M16 8L10.8571 12V10.552L14.1383 8L10.8571 5.448V4L16 8ZM5.14286 10.552L1.86171 8L5.14286 5.448V4L0 8L5.14286 12V10.552ZM9.02514 4L5.59657 12H6.84057L10.2691 4H9.02514Z",fill:"currentColor"})}),z9=({size:n=16,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 16 16",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M12.5113 15.4067C12.4395 15.6249 12.1308 15.6249 12.059 15.4067L11.643 14.1416C11.454 13.567 11.0033 13.1164 10.4288 12.9274L9.16369 12.5113C8.94544 12.4395 8.94544 12.1308 9.16369 12.059L10.4288 11.643C11.0033 11.454 11.454 11.0033 11.643 10.4288L12.059 9.16369C12.1308 8.94544 12.4395 8.94544 12.5113 9.16369L12.9274 10.4288C13.1164 11.0033 13.567 11.454 14.1416 11.643L15.4067 12.059C15.6249 12.1308 15.6249 12.4395 15.4067 12.5113L14.1416 12.9274C13.567 13.1164 13.1164 13.567 12.9274 14.1416L12.5113 15.4067Z",fill:"currentColor"}),f.jsx("path",{d:"M9.02246 0.546878C9.9822 0.546878 10.7564 0.545403 11.374 0.612307C12.0042 0.680586 12.5515 0.826244 13.0273 1.17188C13.3052 1.37376 13.5501 1.61868 13.752 1.89649C14.0975 2.37225 14.2432 2.91984 14.3115 3.54981C14.3784 4.16727 14.377 4.94206 14.377 5.90137V8.51367C13.9611 8.29533 13.5071 8.13985 13.0273 8.06055V5.90137C13.0273 4.9121 13.0259 4.22322 12.9688 3.69532C12.9129 3.18044 12.8098 2.89782 12.6592 2.69043C12.5406 2.52724 12.3966 2.38326 12.2334 2.26465C12.026 2.11404 11.7437 2.0109 11.2285 1.95508C10.7005 1.89789 10.0122 1.89649 9.02246 1.89649H6.55371C5.56395 1.89649 4.87569 1.89787 4.34766 1.95508C3.83242 2.01092 3.55022 2.11398 3.34278 2.26465C3.17953 2.38329 3.03564 2.52719 2.91699 2.69043C2.76642 2.89782 2.66325 3.18042 2.60742 3.69532C2.55027 4.22322 2.54883 4.9121 2.54883 5.90137V10.0986C2.54883 11.0878 2.55031 11.7768 2.60742 12.3047C2.66326 12.8196 2.76642 13.1032 2.91699 13.3105C3.03558 13.4736 3.17966 13.6178 3.34278 13.7363C3.5502 13.8869 3.83265 13.9901 4.34766 14.0459C4.87568 14.1031 5.56398 14.1035 6.55371 14.1035H8.08399C8.27443 14.6025 8.55077 15.0585 8.89551 15.4541H6.55371C5.59402 15.4541 4.81976 15.4546 4.20215 15.3877C3.57204 15.3194 3.02468 15.1738 2.54883 14.8281C2.27111 14.6263 2.02606 14.3813 1.82422 14.1035C1.47883 13.6278 1.33293 13.08 1.26465 12.4502C1.19783 11.8327 1.19922 11.0579 1.19922 10.0986V5.90137C1.19922 4.94206 1.1978 4.16727 1.26465 3.54981C1.33295 2.91984 1.47867 2.37225 1.82422 1.89649C2.02613 1.61864 2.27098 1.37379 2.54883 1.17188C3.02472 0.826181 3.57197 0.6806 4.20215 0.612307C4.81976 0.545393 5.594 0.546877 6.55371 0.546878H9.02246ZM9.19629 9.14649H4.5459V7.84571H9.19629V9.14649ZM11.0303 6.10645H4.5459V4.80567H11.0303V6.10645Z",fill:"currentColor"})]}),Z9=({size:n=14,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 14 14",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{d:"M12.5757 7.00012C12.5757 3.92085 10.0794 1.42463 7.00012 1.42456C3.9208 1.42456 1.42456 3.9208 1.42456 7.00012C1.42463 10.0794 3.92085 12.5757 7.00012 12.5757C10.0793 12.5756 12.5756 10.0793 12.5757 7.00012ZM13.8002 7.00012C13.8001 10.7559 10.7559 13.8001 7.00012 13.8002C3.2443 13.8002 0.199291 10.7559 0.199219 7.00012C0.199219 3.24426 3.24426 0.199219 7.00012 0.199219C10.7559 0.199291 13.8002 3.2443 13.8002 7.00012Z",fill:"currentColor"}),f.jsx("path",{d:"M6.18042 8.68184C6.18043 8.09153 6.32893 7.34655 6.92127 6.8481C7.28566 6.54148 7.76104 6.27318 8.0022 6.10811C8.28964 5.91137 8.42234 5.76562 8.48328 5.58944C8.57774 5.31609 8.53121 5.00904 8.34912 4.76741C8.17409 4.53522 7.83879 4.32222 7.28186 4.32222C5.99668 4.32225 5.46969 5.11832 5.46949 5.78939H4.24414C4.24436 4.39942 5.36327 3.09691 7.28186 3.09688C8.17773 3.09688 8.89489 3.45606 9.32752 4.02999C9.75287 4.59438 9.86938 5.32775 9.64026 5.99019C9.44847 6.5444 9.04722 6.87743 8.69434 7.11898C8.29506 7.39226 8.02318 7.52192 7.70996 7.78548C7.51943 7.94582 7.40577 8.24899 7.40577 8.68184V8.75533H6.18042V8.68184Z",fill:"currentColor"}),f.jsx("path",{d:"M7.39455 9.44026V10.8109H6.16921V9.44026H7.39455Z",fill:"currentColor"})]}),U9=({size:n=20,className:r})=>f.jsxs("svg",{width:n,height:n,className:r,viewBox:"0 0 20 20",fill:"none",xmlns:"http://www.w3.org/2000/svg",children:[f.jsx("path",{fillRule:"evenodd",clipRule:"evenodd",d:"M15.8659 2.05975C17.2603 2.05995 18.3913 3.19096 18.3914 4.58527V5.4874C18.3914 6.02747 18.2192 6.52672 17.9303 6.93735C17.9336 6.96524 17.9388 6.99318 17.9388 7.02195V12.8884C17.9388 13.6345 17.9395 14.2379 17.8996 14.7254C17.8642 15.1593 17.7936 15.5499 17.6373 15.9141L17.5654 16.0685C17.278 16.6328 16.8405 17.1046 16.3038 17.434L16.0679 17.5661C15.66 17.7739 15.2196 17.8598 14.7237 17.9003C14.2362 17.9401 13.6327 17.9405 12.8867 17.9405H7.11122C6.36511 17.9405 5.76171 17.9401 5.27418 17.9003C4.84051 17.8649 4.44949 17.7952 4.08545 17.6391L3.93104 17.5661C3.36673 17.2785 2.89392 16.8414 2.56465 16.3044L2.43245 16.0685C2.22473 15.6608 2.13878 15.2211 2.09825 14.7254C2.05841 14.2379 2.05912 13.6345 2.05912 12.8884V7.02195C2.05912 6.99284 2.06422 6.96449 2.06758 6.93629C1.77931 6.52592 1.60858 6.02687 1.60858 5.4874V4.58527C1.60876 3.19084 2.73962 2.05975 4.1341 2.05975H15.8659ZM16.4984 7.92936C16.296 7.98169 16.0847 8.01288 15.8659 8.01291H4.1341C3.91478 8.01291 3.70246 7.98194 3.49955 7.92936V12.8884C3.49955 13.6582 3.50053 14.1927 3.53445 14.608C3.56769 15.0146 3.62923 15.244 3.71635 15.415L3.7925 15.5514C3.98339 15.8627 4.25749 16.1165 4.58464 16.2833L4.72529 16.3435C4.88095 16.3993 5.08638 16.4402 5.39158 16.4651C5.80685 16.4991 6.34138 16.5001 7.11122 16.5001H12.8867C13.6564 16.5001 14.1911 16.499 14.6063 16.4651C15.0128 16.432 15.2423 16.3703 15.4133 16.2833L15.5508 16.2061C15.8618 16.0152 16.116 15.7419 16.2827 15.415L16.3429 15.2732C16.3985 15.1177 16.4396 14.9128 16.4645 14.608C16.4985 14.1927 16.4984 13.6583 16.4984 12.8884V7.92936ZM4.1341 3.50019C3.53511 3.50019 3.0492 3.98631 3.04902 4.58527V5.4874C3.04902 6.08649 3.535 6.57248 4.1341 6.57248H15.8659C16.4648 6.57228 16.951 6.08638 16.951 5.4874V4.58527C16.9509 3.98644 16.4647 3.50038 15.8659 3.50019H4.1341Z",fill:"currentColor"}),f.jsx("path",{d:"M12.7962 12.5661V11.0832H7.20548V12.5661L12.7962 12.5661Z",fill:"currentColor"})]}),W9="_root_9cl6j_3",q9="_row_9cl6j_10",Q9="_leading_9cl6j_23",K9="_iconIdle_9cl6j_42",J9="_chevronHover_9cl6j_48",G9="_title_9cl6j_64",Fn={root:W9,row:q9,leading:Q9,iconIdle:K9,chevronHover:J9,title:G9};function Y9({icon:n,title:r,open:i,expandable:s,onToggle:u,expandOnRowClick:c=!1,previewChevron:h=s,keepContentWhenOpen:p=!1,collapsedContent:g,children:C,className:v,rowClassName:L,leadingClassName:w,chevronClassName:_,titleClassName:k}){const E=s&&c,T=ee=>{ee.stopPropagation(),u()},B=ee=>{!E||ee.key!=="Enter"&&ee.key!==" "||(ee.preventDefault(),u())},W=h?f.jsxs(f.Fragment,{children:[f.jsx("span",{className:Fn.iconIdle,children:n}),f.jsx(Bl,{className:ye(_,Fn.chevronHover)})]}):n,z=i?f.jsx(Bl,{className:_}):W;return f.jsxs("div",{className:ye(Fn.root,v),"data-open":i||void 0,children:[f.jsxs("div",{className:ye(Fn.row,L),"data-disclosure-row":!0,"data-expandable":E||void 0,role:E?"button":void 0,tabIndex:E?0:void 0,"aria-expanded":E?i:void 0,onClick:E?u:void 0,onKeyDown:E?B:void 0,children:[s&&!E?f.jsx("button",{type:"button",className:ye(Fn.leading,w),"aria-expanded":i,onClick:T,children:z}):f.jsx("span",{className:ye(Fn.leading,w),children:z}),f.jsx("span",{className:ye(Fn.title,k),children:r}),(p||!i)&&g]}),i&&C]})}const X9="_button_kz6gm_4",e7="_md_kz6gm_24",t7="_sm_kz6gm_30",n7="_primary_kz6gm_38",r7="_ghost_kz6gm_47",o7="_outline_kz6gm_56",i7="_toolbar_kz6gm_65",s7="_icon_kz6gm_73",Fo={button:X9,md:e7,sm:t7,primary:n7,ghost:r7,outline:o7,toolbar:i7,icon:s7};function zl({variant:n="ghost",size:r="md",icon:i,className:s,children:u,...c}){return f.jsxs("button",{type:"button",className:ye(Fo.button,Fo[n],Fo[r],s),...c,children:[i!=null&&f.jsx("span",{className:Fo.icon,children:i}),u]})}const l7="_pill_e3ygd_1",u7="_interactive_e3ygd_15",a7="_active_e3ygd_23",m1={pill:l7,interactive:u7,active:a7};function J3({active:n=!1,className:r,children:i,onClick:s,...u}){return s?f.jsx("button",{type:"button",className:ye(m1.pill,m1.interactive,n&&m1.active,r),onClick:s,...u,children:i}):f.jsx("span",{className:ye(m1.pill,n&&m1.active,r),children:i})}const c7="_wrap_1ao1y_1",f7="_icon_1ao1y_16",d7="_input_1ao1y_25",wl={wrap:c7,icon:f7,input:d7};function h7({icon:n,className:r,...i}){return f.jsxs("span",{className:ye(wl.wrap,r),children:[n!=null&&f.jsx("span",{className:wl.icon,children:n}),f.jsx("input",{className:wl.input,...i})]})}const p7=200;function G3(n){const r=R.useRef(null),i=R.useRef(n);i.current=n;const s=R.useCallback(()=>{r.current!==null&&(clearTimeout(r.current),r.current=null)},[]),u=R.useCallback(()=>{s(),r.current=setTimeout(()=>{r.current=null,i.current()},p7)},[s]);return R.useEffect(()=>s,[s]),{arm:u,cancel:s}}const m7="_root_19372_1",C7="_list_19372_8",g7="_submenu_19372_9",v7="_portal_19372_43",y7="_sideTop_19372_51",w7="_alignEnd_19372_56",x7="_scrollable_19372_21",_7="_viewport_19372_21",L7="_footer_19372_63",k7="_itemWrap_19372_91",S7="_item_19372_91",j7="_denseList_19372_118",E7="_label_19372_123",b7="_compactList_19372_127",M7="_itemIcon_19372_143",O7="_separator_19372_81",N7="_itemLabel_19372_173",R7="_check_19372_181",P7="_selected_19372_188",T7="_danger_19372_193",Te={root:m7,list:C7,submenu:g7,portal:v7,sideTop:y7,alignEnd:w7,scrollable:x7,viewport:_7,footer:L7,itemWrap:k7,item:S7,denseList:j7,label:E7,compactList:b7,itemIcon:M7,separator:O7,itemLabel:N7,check:R7,selected:P7,danger:T7};function Z0(n){return"type"in n&&n.type==="separator"}function U0(n){return"type"in n&&n.type==="label"}const I7={visibility:"hidden",left:0,top:0};function Y3({open:n,anchor:r,items:i,selectedId:s,selectedIds:u,onSelect:c,onClose:h,align:p="start",side:g="bottom",portal:C=!1,closeOnPointerLeave:v=!1,dense:L=!1,compact:w=!1,getAnchorRect:_,footer:k,className:E}){const T=R.useRef(null),B=R.useRef(null),[W,z]=R.useState(null),[ee,Q]=R.useState(null),{arm:V,cancel:Z}=G3(h);R.useLayoutEffect(()=>{if(!n||!C){Q(null);return}const q=()=>{var j;let ce;if(_!==void 0?ce=_():ce=((j=T.current)==null?void 0:j.getBoundingClientRect())??null,ce===null)return;const le=12,he=window.innerWidth,pe=window.innerHeight,Se=B.current,we=(Se==null?void 0:Se.offsetWidth)??0,U=(Se==null?void 0:Se.offsetHeight)??0;let ie,K;g==="right"?(ie=ce.right+4,K=ce.top):p==="start"?(ie=ce.left,K=g==="bottom"?ce.bottom+4:ce.top-U-4):(ie=ce.right-we,K=g==="bottom"?ce.bottom+4:ce.top-U-4),we>0&&(ie=Math.min(Math.max(ie,le),he-we-le)),U>0&&(K=Math.min(Math.max(K,le),pe-U-le)),Q({left:ie,top:K})};return q(),window.addEventListener("scroll",q,!0),window.addEventListener("resize",q),()=>{window.removeEventListener("scroll",q,!0),window.removeEventListener("resize",q)}},[n,C,p,g,_]),R.useEffect(()=>{if(!n){z(null);return}const q=le=>{var he,pe;le.target instanceof Node&&((he=T.current)==null?void 0:he.contains(le.target))!==!0&&((pe=B.current)==null?void 0:pe.contains(le.target))!==!0&&h()},ce=le=>{le.key==="Escape"&&h()};return document.addEventListener("pointerdown",q),document.addEventListener("keydown",ce),()=>{document.removeEventListener("pointerdown",q),document.removeEventListener("keydown",ce)}},[n,h]),R.useEffect(()=>{n||Z()},[n,Z]);const ne=!i.some(q=>!Z0(q)&&!U0(q)&&q.submenu!==void 0&&q.submenu.length>0),I=q=>{if(Z0(q))return f.jsx("div",{className:Te.separator,role:"separator"},q.id);if(U0(q))return f.jsx("div",{className:Te.label,role:"presentation",children:q.text},q.id);const ce=q.submenu!==void 0&&q.submenu.length>0,le=ce&&W===q.id,he=q.id===s||(u==null?void 0:u.includes(q.id))===!0;return f.jsxs("div",{className:Te.itemWrap,onMouseEnter:()=>{z(ce?q.id:null)},onMouseLeave:()=>{z(null)},children:[f.jsxs("button",{type:"button",role:"menuitem",className:ye(Te.item,he&&Te.selected,q.danger===!0&&Te.danger),disabled:q.disabled,"aria-haspopup":ce?"menu":void 0,"aria-expanded":ce?le:void 0,onFocus:()=>{z(ce?q.id:null)},onClick:()=>{if(ce){z(q.id);return}c(q.id)},children:[q.icon!==void 0&&f.jsx("span",{className:Te.itemIcon,children:q.icon}),f.jsx("span",{className:Te.itemLabel,children:q.label}),he&&f.jsx(cu,{className:Te.check})]}),le&&q.submenu!==void 0&&f.jsx("div",{className:ye(Te.submenu,w&&Te.compactList),role:"menu",children:q.submenu.map(pe=>f.jsxs("button",{type:"button",role:"menuitem",className:Te.item,disabled:pe.disabled,onClick:()=>{c(pe.id)},children:[pe.icon!==void 0&&f.jsx("span",{className:Te.itemIcon,children:pe.icon}),f.jsx("span",{className:Te.itemLabel,children:pe.label})]},pe.id))})]},q.id)},J=n&&f.jsxs("div",{ref:B,className:ye(Te.list,L&&Te.denseList,w&&Te.compactList,ne&&Te.scrollable,C&&Te.portal,g==="top"&&!C&&Te.sideTop,p==="end"&&!C&&Te.alignEnd),style:C?ee??I7:void 0,role:"menu",onClick:q=>{q.stopPropagation()},children:[f.jsx("div",{className:Te.viewport,role:"presentation",children:i.map(I)}),k!==void 0&&k.length>0&&f.jsx("div",{className:Te.footer,role:"presentation",children:k.map(I)})]});return f.jsxs("span",{ref:T,className:ye(Te.root,E),onPointerEnter:v?Z:void 0,onPointerLeave:v?()=>{n&&V()}:void 0,children:[r,C?J!==!1&&ln.createPortal(J,document.body):J]})}const $7=12;function H7(n,r,i){const[s,u]=R.useState(r);return R.useLayoutEffect(()=>{const c=n.current;if(c===null)return;const h=()=>{u(Math.min(r,Math.max(0,c.getBoundingClientRect().bottom-$7)))};return h(),window.addEventListener("resize",h),window.addEventListener("scroll",h,!0),()=>{window.removeEventListener("resize",h),window.removeEventListener("scroll",h,!0)}},[n,r,i]),s}function V7(n,r,i){R.useEffect(()=>{if(!r)return;const s=u=>{var c;u.target instanceof Node&&!((c=n.current)!=null&&c.contains(u.target))&&i(!1)};return document.addEventListener("pointerdown",s),()=>{document.removeEventListener("pointerdown",s)}},[n,r,i])}async function br(n){var s;if((s=navigator.clipboard)!=null&&s.writeText)try{return await navigator.clipboard.writeText(n),!0}catch{return!1}const r=typeof document.execCommand=="function"?document.execCommand.bind(document):void 0;if(r===void 0)return!1;const i=document.createElement("textarea");i.value=n,i.setAttribute("readonly",""),i.style.position="fixed",i.style.left="-9999px",document.body.appendChild(i),i.select();try{return r("copy")}catch{return!1}finally{i.remove()}}const A7="_root_1b2ny_3",D7="_card_1b2ny_13",F7="_copyable_1b2ny_25",B7="_feedback_1b2ny_34",z7="_copied_1b2ny_40",Z7="_status_1b2ny_47",xr={root:A7,card:D7,copyable:F7,feedback:B7,copied:z7,status:Z7};function U7({anchor:n,content:r,openDelayMs:i=500,disabled:s=!1,copyText:u,copyLabel:c="复制",copiedLabel:h="复制成功"}){const p=R.useRef(null),g=R.useRef(null),C=R.useRef(null),v=R.useRef(null),L=R.useRef(null),w=R.useRef(0),_=R.useRef(!1),k=R.useRef(!0),[E,T]=R.useState(!1),[B,W]=R.useState(null),[z,ee]=R.useState(!1),Q=R.useCallback(()=>{v.current!==null&&(clearTimeout(v.current),v.current=null),L.current=null,ee(!1)},[]),V=R.useCallback(()=>{w.current+=1,Q(),T(!1)},[Q]),{arm:Z,cancel:ne}=G3(V),I=()=>{C.current!==null&&(clearTimeout(C.current),C.current=null)};R.useEffect(()=>{s&&(I(),ne(),V())},[s,ne,V]),R.useEffect(()=>(k.current=!0,()=>{k.current=!1,w.current+=1,I(),v.current!==null&&(clearTimeout(v.current),v.current=null)}),[]),R.useLayoutEffect(()=>{if(!E){W(null);return}const le=()=>{var U;const he=p.current;if(he===null)return;const pe=he.getBoundingClientRect(),Se=((U=g.current)==null?void 0:U.offsetHeight)??0,we=pe.top+Se>window.innerHeight-8?window.innerHeight-Se-8:pe.top;W({left:pe.right+8,top:we})};return le(),window.addEventListener("scroll",le,!0),window.addEventListener("resize",le),()=>{window.removeEventListener("scroll",le,!0),window.removeEventListener("resize",le)}},[E]),R.useLayoutEffect(()=>{var he;if(!E||B===null)return;const le=((he=g.current)==null?void 0:he.offsetHeight)??0;B.top+le>window.innerHeight-8&&W({left:B.left,top:window.innerHeight-le-8})},[E,B]);const J=async le=>{if(z||_.current)return;_.current=!0;const he=w.current,pe=await br(le);_.current=!1;const Se=g.current;if(!pe||!k.current||he!==w.current||Se===null)return;const we=Se.offsetHeight;L.current=we>0?we:null,ee(!0),v.current=setTimeout(Q,1e3)},q=u!==void 0,ce=E&&B!==null&&f.jsx("div",{ref:g,className:`${xr.card}${q?` ${xr.copyable}`:""}${z?` ${xr.feedback}`:""}`,style:{...B,minHeight:z&&L.current!==null?L.current:void 0},role:q?"button":void 0,tabIndex:q?0:void 0,"aria-label":q?`${c}: ${u}`:void 0,onClick:q?le=>{const he=window.getSelection();if(he!==null&&!he.isCollapsed){for(let pe=0;pe{le.key!=="Enter"&&le.key!==" "||(le.preventDefault(),J(u))}:void 0,children:z?f.jsx("span",{className:xr.copied,"aria-hidden":"true",children:h}):r});return f.jsxs("span",{ref:p,className:xr.root,onPointerEnter:()=>{s||(ne(),!E&&(I(),C.current=setTimeout(()=>{T(!0)},i)))},onPointerLeave:()=>{I(),E&&Z()},onPointerDownCapture:le=>{var he;(he=g.current)!=null&&he.contains(le.target)||(I(),ne(),V())},children:[n,E&&q&&f.jsx("span",{className:xr.status,role:"status",children:z?h:""}),ce!==!1&&ln.createPortal(ce,document.body)]})}const W7="_root_15u5s_2",q7="_mask_15u5s_14",Q7="_dialog_15u5s_22",K7="_content_15u5s_37",J7="_header_15u5s_45",G7="_title_15u5s_53",Y7="_close_15u5s_61",X7="_description_15u5s_80",ef="_body_15u5s_89",tf="_footer_15u5s_97",Ut={root:W7,mask:q7,dialog:Q7,content:K7,header:J7,title:G7,close:Y7,description:X7,body:ef,footer:tf};function X3({open:n,onClose:r,title:i,closeLabel:s="Close",description:u,children:c,footer:h,className:p,contentClassName:g,headless:C=!1}){return R.useEffect(()=>{if(!n)return;const v=L=>{L.key==="Escape"&&r()};return document.addEventListener("keydown",v),()=>{document.removeEventListener("keydown",v)}},[n,r]),n?ln.createPortal(f.jsxs("div",{className:Ut.root,role:"presentation",children:[f.jsx("div",{className:Ut.mask,"aria-hidden":"true",onClick:r}),f.jsx("div",{className:ye(Ut.dialog,p),role:"dialog","aria-modal":"true","aria-label":i,children:C?c:f.jsxs(f.Fragment,{children:[f.jsxs("div",{className:ye(Ut.content,g),children:[f.jsxs("div",{className:Ut.header,children:[f.jsx("h2",{className:Ut.title,children:i}),f.jsx("button",{type:"button",className:Ut.close,"aria-label":s,onClick:r,children:f.jsx(fu,{size:14})})]}),u!==void 0&&u!==""&&f.jsx("p",{className:Ut.description,children:u}),c!==void 0&&f.jsx("div",{className:Ut.body,children:c})]}),h!==void 0&&f.jsx("div",{className:Ut.footer,children:h})]})})]}),document.body):null}const nf="_onboardingOverlay_1cfrq_3",rf="_onboardingMask_1cfrq_10",of="_onboardingStage_1cfrq_21",xl={onboardingOverlay:nf,onboardingMask:rf,onboardingStage:of};function sf({children:n}){return R.useEffect(()=>{const r=document.getElementById("root");if(r!==null)return r.inert=!0,()=>{r.inert=!1}},[]),ln.createPortal(f.jsxs("div",{className:xl.onboardingOverlay,role:"presentation",children:[f.jsx("div",{className:xl.onboardingMask,"aria-hidden":"true"}),f.jsx("div",{className:xl.onboardingStage,children:n})]}),document.body)}const lf="_confirmation_1nu42_1",uf="_confirmationContent_1nu42_7",af="_warning_1nu42_19",cf="_warningIcon_1nu42_32",ff="_acknowledgement_1nu42_38",df="_modalAction_1nu42_67",hf="_confirmAction_1nu42_71",Bn={confirmation:lf,confirmationContent:uf,warning:af,warningIcon:cf,acknowledgement:ff,modalAction:df,confirmAction:hf};function pf({open:n,title:r,description:i,acknowledgeLabel:s,cancelLabel:u,confirmLabel:c,acknowledged:h,disabled:p=!1,onAcknowledgedChange:g,onCancel:C,onConfirm:v}){return f.jsxs(X3,{open:n,onClose:C,title:r,className:Bn.confirmation,contentClassName:Bn.confirmationContent,footer:f.jsxs(f.Fragment,{children:[f.jsx(zl,{variant:"outline",className:Bn.modalAction,onClick:C,children:u}),f.jsx(zl,{variant:"primary",className:Bn.confirmAction,disabled:p||!h,onClick:v,children:c})]}),children:[f.jsxs("div",{className:Bn.warning,children:[f.jsx(K3,{size:18,className:Bn.warningIcon}),f.jsx("p",{children:i})]}),f.jsxs("label",{className:Bn.acknowledgement,children:[f.jsx("input",{type:"checkbox",checked:h,disabled:p,autoFocus:!0,onChange:L=>{g(L.currentTarget.checked)}}),f.jsx("span",{children:s})]})]})}const mf="_banner_ugy7y_1",Cf={banner:mf};function gf({reconnecting:n,label:r="连接已断开，正在重连…"}){return n?f.jsx("div",{className:Cf.banner,children:r}):null}function vf({size:n=24,className:r}){return f.jsx("svg",{width:n,height:n*17.04/23.16,className:r,viewBox:"0 0 23.16 17.04",fill:"none","aria-hidden":"true",children:f.jsx("path",{d:"M22.9168 1.43018C22.6713 1.31018 22.5658 1.53918 22.4223 1.65519C22.3733 1.69269 22.3318 1.74169 22.2903 1.78669C21.9317 2.1697 21.5127 2.42121 20.9657 2.39121C20.1657 2.34621 19.4827 2.59771 18.8787 3.20973C18.7502 2.45521 18.3236 2.0047 17.6746 1.71569C17.3351 1.56568 16.9916 1.41518 16.7536 1.08867C16.5876 0.856163 16.5421 0.597155 16.4591 0.341647C16.4061 0.187643 16.3536 0.0301382 16.1761 0.00363739C15.9836 -0.0263635 15.9081 0.135141 15.8326 0.270145C15.5306 0.822162 15.4136 1.43018 15.4251 2.0462C15.4516 3.43174 16.0366 4.53527 17.1991 5.3203C17.3311 5.4103 17.3651 5.5003 17.3236 5.63181C17.2441 5.90231 17.1501 6.16482 17.0671 6.43533C17.0141 6.60784 16.9351 6.64584 16.7501 6.57033C16.1121 6.30383 15.5611 5.90931 15.074 5.4328C14.2475 4.63328 13.5 3.75075 12.568 3.05973C12.349 2.89822 12.13 2.74822 11.9034 2.60522C10.9524 1.68169 12.028 0.923165 12.277 0.833162C12.5375 0.739159 12.3675 0.41615 11.5259 0.42015C10.6844 0.42365 9.91439 0.705658 8.93286 1.08117C8.78935 1.13767 8.63835 1.17867 8.48384 1.21267C7.59332 1.04367 6.66829 1.00617 5.70226 1.11517C3.88321 1.31768 2.43016 2.1777 1.36213 3.64575C0.0790928 5.4103 -0.222916 7.41536 0.146595 9.50642C0.535106 11.7105 1.66014 13.535 3.38869 14.9616C5.18125 16.4406 7.24581 17.1657 9.60138 17.0266C11.0319 16.9441 12.6245 16.7526 14.421 15.2321C14.874 15.4576 15.3496 15.5476 16.1381 15.6151C16.7456 15.6716 17.3306 15.5851 17.7836 15.4911C18.4931 15.3411 18.4441 14.6841 18.1876 14.5636C16.1081 13.595 16.5646 13.9891 16.1496 13.67C17.2061 12.42 18.8202 10.1979 19.3182 7.17235C19.3672 6.83834 19.4297 6.36783 19.4222 6.09732C19.4182 5.93231 19.4562 5.86831 19.6447 5.84931C20.1657 5.78931 20.6712 5.64681 21.1357 5.3913C22.4833 4.65528 23.0268 3.44624 23.1548 1.9972C23.1738 1.77569 23.1508 1.54668 22.9168 1.43018ZM11.1749 14.4736C9.15936 12.889 8.18184 12.3675 7.77832 12.39C7.40081 12.4125 7.46881 12.8445 7.55182 13.126C7.63882 13.404 7.75182 13.5955 7.91033 13.8396C8.01983 14.0011 8.09533 14.2411 7.80083 14.4216C7.15181 14.8231 6.02327 14.2866 5.97027 14.2601C4.65673 13.4865 3.5587 12.4655 2.78467 11.069C2.03715 9.72493 1.60314 8.28289 1.53164 6.74384C1.51264 6.37233 1.62214 6.24082 1.99215 6.17332C2.47916 6.08332 2.98118 6.06432 3.46769 6.13582C5.52476 6.43633 7.27581 7.35586 8.74385 8.8129C9.58188 9.64243 10.2159 10.634 10.8689 11.6025C11.5634 12.631 12.3105 13.611 13.262 14.4146C13.598 14.6961 13.866 14.9101 14.1225 15.0681C13.349 15.1546 12.058 15.1731 11.1749 14.4746L11.1749 14.4736ZM12.141 8.25988C12.141 8.09488 12.273 7.96338 12.439 7.96338C12.4765 7.96338 12.5105 7.97088 12.541 7.98188C12.5825 7.99688 12.6205 8.01938 12.6505 8.05338C12.7035 8.10588 12.7335 8.18088 12.7335 8.25988C12.7335 8.42489 12.6015 8.55639 12.4355 8.55639C12.2695 8.55639 12.141 8.42489 12.141 8.25988ZM15.1415 9.79893C14.949 9.87793 14.7565 9.94544 14.5715 9.95294C14.2845 9.96794 13.9715 9.85143 13.8015 9.70893C13.5375 9.48742 13.3485 9.36342 13.2695 8.97691C13.2355 8.8119 13.2545 8.55639 13.2845 8.40989C13.3525 8.09438 13.277 7.89187 13.0545 7.70787C12.8735 7.55786 12.643 7.51636 12.39 7.51636C12.2955 7.51636 12.209 7.47486 12.1445 7.44136C12.039 7.38886 11.9519 7.25735 12.035 7.09585C12.0615 7.04335 12.19 6.91584 12.22 6.89334C12.5635 6.69784 12.9595 6.76184 13.326 6.90834C13.6655 7.04735 13.9225 7.30236 14.292 7.66287C14.6695 8.09838 14.7375 8.21838 14.9525 8.54539C15.1225 8.8009 15.277 9.06341 15.3831 9.36392C15.4471 9.55142 15.3641 9.70493 15.1415 9.79893Z",fill:"currentColor"})})}function yf({size:n=24,className:r}){return f.jsxs("svg",{width:n*182/24,height:n,className:r,viewBox:"0 0 182 24",fill:"none","aria-hidden":"true",children:[f.jsx("path",{d:"M68.416 18.2447H67.0501V16.1272H68.416C69.2619 16.1272 70.1166 15.9163 70.6671 15.3304C71.2181 14.7444 71.426 13.8455 71.426 12.9471C71.426 12.0487 71.2268 11.1498 70.6671 10.5643C70.1083 9.97831 69.2619 9.76744 68.416 9.76744C67.5701 9.76744 66.7154 9.97831 66.1639 10.5643C65.6129 11.1503 65.4049 12.0487 65.4049 12.9471V21.6435H63.009V7.6582H65.4049V8.54883H65.8442C65.8918 8.49393 65.9394 8.44728 65.9875 8.40064C66.5871 7.85353 67.5049 7.6582 68.4072 7.6582C69.8212 7.6582 71.2341 8.00998 72.1607 8.98662C73.0868 9.96325 73.4143 11.4632 73.4143 12.9558C73.4143 14.4485 73.0785 15.9406 72.1607 16.925C71.2424 17.9094 69.8212 18.2457 68.416 18.2457V18.2447Z",fill:"currentColor"}),f.jsx("path",{d:"M31.9551 8.03497H33.3204V10.1525H31.9551C31.1087 10.1525 30.2545 10.3633 29.7035 10.9493C29.1525 11.5353 28.945 12.4342 28.945 13.3326C28.945 14.231 29.1447 15.1294 29.7035 15.7154C30.2623 16.3014 31.1087 16.5122 31.9551 16.5122C32.8015 16.5122 33.6562 16.3014 34.2072 15.7154C34.7582 15.1294 34.9657 14.231 34.9657 13.3326V4.62842H37.3611V18.6219H34.9657V17.7313H34.5264C34.4783 17.7857 34.4307 17.8329 34.3826 17.8795C33.7835 18.4261 32.8652 18.6219 31.9629 18.6219C30.5494 18.6219 29.136 18.2707 28.2099 17.294C27.2838 16.3174 26.9563 14.817 26.9563 13.3248C26.9563 11.8327 27.2916 10.34 28.2099 9.35561C29.136 8.37898 30.5494 8.03497 31.9551 8.03497Z",fill:"currentColor"}),f.jsx("path",{d:"M49.3786 13.1431V13.9948H42.9984V12.2996H47.2305C47.1348 11.6825 46.9113 11.1043 46.5119 10.682C45.9371 10.0727 45.0503 9.85409 44.1723 9.85409C43.2943 9.85409 42.4076 10.0727 41.8328 10.682C41.258 11.2913 41.05 12.2213 41.05 13.1435C41.05 14.0658 41.2575 15.003 41.8328 15.6046C42.4076 16.2061 43.2939 16.433 44.1723 16.433C45.0508 16.433 45.9371 16.2143 46.5119 15.6046C46.5916 15.5186 46.6635 15.4248 46.7354 15.331H49.0992C48.8918 16.0657 48.5643 16.7299 48.0691 17.2454C47.111 18.2531 45.6339 18.6205 44.1723 18.6205C42.7108 18.6205 41.2337 18.2609 40.2755 17.2454C39.3174 16.2299 38.9661 14.6828 38.9661 13.1435C38.9661 11.6043 39.3096 10.0494 40.2755 9.04168C41.242 8.03396 42.7108 7.66663 44.1723 7.66663C45.6339 7.66663 47.111 8.02618 48.0691 9.04168C49.0351 10.0572 49.3786 11.6043 49.3786 13.1435V13.1431Z",fill:"currentColor"}),f.jsx("path",{d:"M61.4045 13.1431V13.9948H55.0243V12.2996H59.2564C59.1602 11.6825 58.9372 11.1043 58.5378 10.682C57.963 10.0727 57.0762 9.85409 56.1982 9.85409C55.3202 9.85409 54.4335 10.0727 53.8587 10.682C53.2839 11.2913 53.0759 12.2213 53.0759 13.1435C53.0759 14.0658 53.2834 15.003 53.8587 15.6046C54.4335 16.2061 55.3202 16.433 56.1982 16.433C57.0762 16.433 57.963 16.2143 58.5378 15.6046C58.6179 15.5186 58.6894 15.4248 58.7608 15.331H61.1251C60.9171 16.0657 60.5897 16.7299 60.0945 17.2454C59.1364 18.2531 57.6593 18.6205 56.1982 18.6205C54.7372 18.6205 53.2596 18.2609 52.3014 17.2454C51.3432 16.2299 50.9919 14.6828 50.9919 13.1435C50.9919 11.6043 51.3355 10.0494 52.3014 9.04168C53.2678 8.03396 54.7367 7.66663 56.1982 7.66663C57.6598 7.66663 59.1364 8.02618 60.0945 9.04168C61.061 10.0572 61.4045 11.6043 61.4045 13.1435V13.1431Z",fill:"currentColor"}),f.jsx("path",{d:"M80.242 18.6214C81.7035 18.6214 83.1801 18.4105 84.1383 17.809C85.0965 17.2075 85.4482 16.2931 85.4482 15.3869C85.4482 14.4807 85.1042 13.5585 84.1383 12.9647C83.1801 12.371 81.703 12.1518 80.242 12.1518C79.6186 12.1518 79.0438 12.0658 78.6366 11.8394C78.2294 11.6047 78.0778 11.2534 78.0778 10.9017C78.0778 10.5499 78.2216 10.1908 78.6366 9.9639C79.0438 9.72921 79.6749 9.65147 80.2973 9.65147C80.9198 9.65147 81.5509 9.73747 81.9591 9.9639C82.3663 10.1986 82.5179 10.5499 82.5179 10.9017H84.9531C84.9531 9.99499 84.6421 9.07327 83.7719 8.47951C82.9017 7.88576 81.5679 7.66663 80.2424 7.66663C78.9169 7.66663 77.5837 7.8775 76.713 8.47951C75.8427 9.08104 75.5308 9.99499 75.5308 10.9017C75.5308 11.8083 75.8423 12.73 76.713 13.3238C77.5832 13.9176 78.9165 14.1367 80.2424 14.1367C80.929 14.1367 81.688 14.2227 82.1428 14.4491C82.5985 14.676 82.7579 15.0351 82.7579 15.3869C82.7579 15.7387 82.5985 16.0977 82.1428 16.3246C81.688 16.5511 80.9931 16.6371 80.3066 16.6371C79.62 16.6371 78.9169 16.5511 78.4694 16.3246C78.0224 16.0982 77.8543 15.7387 77.8543 15.3869H75.0435C75.0435 16.2935 75.3865 17.2153 76.3534 17.809C77.3194 18.4028 78.7809 18.6214 80.2424 18.6214H80.242Z",fill:"currentColor"}),f.jsx("path",{d:"M97.4733 13.1431V13.9948H91.0932V12.2996H95.3252C95.23 11.6825 95.006 11.1043 94.6071 10.682C94.0313 10.0727 93.1456 9.85409 92.2666 9.85409C91.3876 9.85409 90.5018 10.0727 89.927 10.682C89.3522 11.2913 89.1452 12.2213 89.1452 13.1435C89.1452 14.0658 89.3522 15.003 89.927 15.6046C90.5018 16.2061 91.3886 16.433 92.2666 16.433C93.1446 16.433 94.0313 16.2143 94.6071 15.6046C94.6863 15.5186 94.7587 15.4248 94.8301 15.331H97.1935C96.9855 16.0657 96.6585 16.7299 96.1639 17.2454C95.2057 18.2531 93.7281 18.6205 92.2666 18.6205C90.805 18.6205 89.3284 18.2609 88.3703 17.2454C87.4121 16.2299 87.0613 14.6828 87.0613 13.1435C87.0613 11.6043 87.4043 10.0494 88.3703 9.04168C89.3367 8.03396 90.806 7.66663 92.2666 7.66663C93.7272 7.66663 95.2057 8.02618 96.1639 9.04168C97.1298 10.0572 97.4729 11.6043 97.4729 13.1435L97.4733 13.1431Z",fill:"currentColor"}),f.jsx("path",{d:"M109.499 13.1431V13.9948H103.119V12.2996H107.351C107.256 11.6825 107.032 11.1043 106.632 10.682C106.057 10.0727 105.172 9.85409 104.293 9.85409C103.414 9.85409 102.528 10.0727 101.953 10.682C101.378 11.2913 101.17 12.2213 101.17 13.1435C101.17 14.0658 101.378 15.003 101.953 15.6046C102.528 16.2061 103.415 16.433 104.293 16.433C105.171 16.433 106.057 16.2143 106.632 15.6046C106.712 15.5186 106.784 15.4248 106.856 15.331H109.22C109.012 16.0657 108.685 16.7299 108.19 17.2454C107.231 18.2531 105.754 18.6205 104.293 18.6205C102.831 18.6205 101.355 18.2609 100.396 17.2454C99.4382 16.2299 99.0864 14.6828 99.0864 13.1435C99.0864 11.6043 99.4295 10.0494 100.396 9.04168C101.362 8.03396 102.832 7.66663 104.293 7.66663C105.754 7.66663 107.231 8.02618 108.19 9.04168C109.156 10.0572 109.499 11.6043 109.499 13.1435V13.1431Z",fill:"currentColor"}),f.jsx("path",{d:"M113.5 4.62817H111.104V18.6217H113.5V4.62817Z",fill:"currentColor"}),f.jsx("path",{d:"M117.589 12.8154L121.517 18.6208H118.554L114.625 12.8154L118.554 8.15088H121.517L117.589 12.8154Z",fill:"currentColor"}),f.jsx("g",{clipPath:"url(#dsh-wordmark-whale-clip)",children:f.jsx("path",{d:"M23.0584 4.95203C22.8129 4.83203 22.7074 5.06103 22.5639 5.17704C22.5149 5.21454 22.4734 5.26354 22.4319 5.30854C22.0734 5.69155 21.6543 5.94306 21.1073 5.91306C20.3073 5.86806 19.6243 6.11957 19.0203 6.73158C18.8918 5.97706 18.4652 5.52655 17.8162 5.23754C17.4767 5.08753 17.1332 4.93703 16.8952 4.61052C16.7292 4.37801 16.6837 4.11901 16.6007 3.8635C16.5477 3.70949 16.4952 3.55199 16.3177 3.52549C16.1252 3.49549 16.0497 3.65699 15.9742 3.792C15.6722 4.34401 15.5552 4.95203 15.5667 5.56805C15.5932 6.95359 16.1782 8.05712 17.3407 8.84215C17.4727 8.93215 17.5067 9.02215 17.4652 9.15366C17.3857 9.42416 17.2917 9.68667 17.2087 9.95718C17.1557 10.1297 17.0767 10.1677 16.8917 10.0922C16.2537 9.82568 15.7027 9.43117 15.2156 8.95465C14.3891 8.15513 13.6416 7.2726 12.7096 6.58158C12.4906 6.42007 12.2716 6.27007 12.045 6.12707C11.094 5.20354 12.1696 4.44502 12.4186 4.35501C12.6791 4.26101 12.5091 3.938 11.6675 3.942C10.826 3.9455 10.056 4.22751 9.07446 4.60302C8.93096 4.65952 8.77995 4.70052 8.62545 4.73452C7.73492 4.56552 6.80989 4.52802 5.84386 4.63702C4.02481 4.83953 2.57177 5.69955 1.50373 7.1676C0.220694 8.93215 -0.0813148 10.9372 0.288196 13.0283C0.676708 15.2323 1.80174 17.0569 3.53029 18.4834C5.32285 19.9625 7.38741 20.6875 9.74298 20.5485C11.1735 20.466 12.7661 20.2745 14.5626 18.7539C15.0156 18.9795 15.4912 19.0695 16.2797 19.137C16.8872 19.1935 17.4722 19.107 17.9252 19.013C18.6347 18.8629 18.5857 18.2059 18.3292 18.0854C16.2497 17.1169 16.7062 17.5109 16.2912 17.1919C17.3477 15.9419 18.9618 13.7198 19.4598 10.6942C19.5088 10.3602 19.5713 9.88968 19.5638 9.61917C19.5598 9.45417 19.5978 9.39016 19.7863 9.37116C20.3073 9.31116 20.8128 9.16866 21.2773 8.91315C22.6249 8.17713 23.1684 6.96809 23.2964 5.51905C23.3154 5.29754 23.2924 5.06853 23.0584 4.95203ZM11.3165 17.9954C9.30097 16.4109 8.32344 15.8894 7.91992 15.9119C7.54241 15.9344 7.61042 16.3664 7.69342 16.6479C7.78042 16.9259 7.89342 17.1174 8.05193 17.3614C8.16143 17.5229 8.23694 17.7629 7.94243 17.9434C7.29341 18.3449 6.16487 17.8084 6.11187 17.7819C4.79833 17.0084 3.7003 15.9874 2.92628 14.5908C2.17875 13.2468 1.74474 11.8047 1.67324 10.2657C1.65424 9.89418 1.76374 9.76267 2.13375 9.69517C2.62077 9.60517 3.12278 9.58617 3.6093 9.65767C5.66636 9.95818 7.41741 10.8777 8.88545 12.3348C9.72348 13.1643 10.3575 14.1558 11.0105 15.1243C11.705 16.1529 12.4521 17.1329 13.4036 17.9364C13.7396 18.2179 14.0076 18.4319 14.2641 18.5899C13.4906 18.6764 12.1996 18.6949 11.3165 17.9964V17.9954ZM12.2826 11.7817C12.2826 11.6167 12.4146 11.4852 12.5806 11.4852C12.6181 11.4852 12.6521 11.4927 12.6826 11.5037C12.7241 11.5187 12.7621 11.5412 12.7921 11.5752C12.8451 11.6277 12.8751 11.7027 12.8751 11.7817C12.8751 11.9467 12.7431 12.0782 12.5771 12.0782C12.4111 12.0782 12.2826 11.9467 12.2826 11.7817ZM15.2831 13.3208C15.0906 13.3998 14.8981 13.4673 14.7131 13.4748C14.4261 13.4898 14.1131 13.3733 13.9431 13.2308C13.6791 13.0093 13.4901 12.8853 13.4111 12.4988C13.3771 12.3338 13.3961 12.0782 13.4261 11.9317C13.4941 11.6162 13.4186 11.4137 13.1961 11.2297C13.0151 11.0797 12.7846 11.0382 12.5316 11.0382C12.4371 11.0382 12.3506 10.9967 12.2861 10.9632C12.1806 10.9107 12.0936 10.7792 12.1766 10.6177C12.2031 10.5652 12.3316 10.4377 12.3616 10.4152C12.7051 10.2197 13.1011 10.2837 13.4676 10.4302C13.8071 10.5692 14.0641 10.8242 14.4336 11.1847C14.8111 11.6202 14.8791 11.7402 15.0941 12.0672C15.2641 12.3228 15.4186 12.5853 15.5247 12.8858C15.5887 13.0733 15.5057 13.2268 15.2831 13.3208Z",fill:"currentColor"})}),f.jsx("rect",{x:"129.348",y:"5.5",width:"52",height:"14",rx:"2",fill:"currentColor"}),f.jsxs("g",{clipPath:"url(#dsh-wordmark-badge-clip)",children:[f.jsx("path",{d:"M132.848 8.93205H134.08V16.137H132.848V8.93205ZM136.5 8.93205H137.732V16.137H136.5V8.93205ZM133.365 13.024V11.99H137.193V13.024H133.365Z",fill:"var(--dsw-alias-label-primary-inverted)"}),f.jsx("path",{d:"M140.397 14.432L140.672 13.453H143.202L143.532 14.432H140.397ZM140.287 16.137H139.055L141.277 8.93205H142.201L142.146 9.74605L140.947 13.915H140.969L140.287 16.137ZM145.039 16.137H143.741L143.07 13.948L143.081 13.937L141.871 9.74605L141.926 8.93205H142.817L145.039 16.137Z",fill:"var(--dsw-alias-label-primary-inverted)"}),f.jsx("path",{d:"M146.846 8.93205H149.068C149.852 8.93205 150.443 9.11538 150.839 9.48205C151.235 9.84138 151.433 10.3327 151.433 10.956C151.433 11.22 151.396 11.4657 151.323 11.693C151.249 11.9204 151.125 12.1257 150.949 12.309C150.773 12.4924 150.531 12.65 150.223 12.782C149.922 12.9067 149.541 13.0057 149.079 13.079V13.321H146.846V12.639L148.023 12.485C148.631 12.4044 149.09 12.298 149.398 12.166C149.706 12.034 149.915 11.8764 150.025 11.693C150.135 11.5024 150.19 11.2934 150.19 11.066C150.19 10.6994 150.083 10.417 149.871 10.219C149.658 10.021 149.324 9.92205 148.87 9.92205H146.846V8.93205ZM146.395 8.93205H147.627V16.137H146.395V8.93205ZM151.917 16.093V16.137H150.366L149.024 14.322C148.87 14.1094 148.73 13.9407 148.606 13.816C148.481 13.684 148.345 13.5887 148.199 13.53C148.052 13.464 147.872 13.42 147.66 13.398C147.447 13.3687 147.176 13.3504 146.846 13.343V13.145H149.079C149.233 13.211 149.368 13.2844 149.486 13.365C149.61 13.4457 149.735 13.5447 149.86 13.662C149.992 13.7794 150.138 13.937 150.3 14.135L151.917 16.093Z",fill:"var(--dsw-alias-label-primary-inverted)"}),f.jsx("path",{d:"M153.58 9.57005L153.591 8.93205H154.46L157.584 15.51V16.137H156.704L153.58 9.57005ZM158.024 16.137H156.968L156.88 8.93205H158.024V16.137ZM154.24 16.137H153.096V8.93205H154.152L154.24 16.137Z",fill:"var(--dsw-alias-label-primary-inverted)"}),f.jsx("path",{d:"M159.963 8.93205H161.206V16.137H159.963V8.93205ZM160.095 9.96605V8.93205H164.858V9.96605H160.095ZM160.095 16.137V15.103H164.902V16.137H160.095ZM160.095 13.013V11.99H164.374V13.013H160.095Z",fill:"var(--dsw-alias-label-primary-inverted)"}),f.jsx("path",{d:"M169.052 15.257C169.543 15.257 169.895 15.1654 170.108 14.982C170.328 14.7987 170.438 14.5457 170.438 14.223C170.438 14.047 170.405 13.8967 170.339 13.772C170.273 13.6474 170.152 13.5337 169.976 13.431C169.807 13.321 169.558 13.2147 169.228 13.112L168.491 12.881C167.846 12.6757 167.38 12.4044 167.094 12.067C166.808 11.7297 166.665 11.3007 166.665 10.78C166.665 10.428 166.76 10.1017 166.951 9.80105C167.142 9.50038 167.428 9.25838 167.809 9.07505C168.19 8.89172 168.663 8.80005 169.228 8.80005C169.631 8.80005 169.998 8.82938 170.328 8.88805C170.665 8.93938 171.039 9.01638 171.45 9.11905L171.274 10.175C170.834 10.0504 170.442 9.96238 170.097 9.91105C169.76 9.85238 169.463 9.82305 169.206 9.82305C168.737 9.82305 168.403 9.90738 168.205 10.076C168.007 10.2374 167.908 10.439 167.908 10.681C167.908 10.857 167.941 11.0147 168.007 11.154C168.073 11.286 168.19 11.407 168.359 11.517C168.535 11.627 168.784 11.7334 169.107 11.836L169.866 12.078C170.526 12.276 170.995 12.5327 171.274 12.848C171.553 13.156 171.692 13.585 171.692 14.135C171.692 14.5604 171.589 14.9344 171.384 15.257C171.179 15.5797 170.878 15.8327 170.482 16.016C170.093 16.1994 169.609 16.291 169.03 16.291C168.627 16.291 168.212 16.247 167.787 16.159C167.362 16.071 166.9 15.9427 166.401 15.774L166.665 14.718C167.156 14.894 167.6 15.0297 167.996 15.125C168.399 15.213 168.751 15.257 169.052 15.257Z",fill:"var(--dsw-alias-label-primary-inverted)"}),f.jsx("path",{d:"M175.809 15.257C176.3 15.257 176.652 15.1654 176.865 14.982C177.085 14.7987 177.195 14.5457 177.195 14.223C177.195 14.047 177.162 13.8967 177.096 13.772C177.03 13.6474 176.909 13.5337 176.733 13.431C176.564 13.321 176.315 13.2147 175.985 13.112L175.248 12.881C174.603 12.6757 174.137 12.4044 173.851 12.067C173.565 11.7297 173.422 11.3007 173.422 10.78C173.422 10.428 173.517 10.1017 173.708 9.80105C173.899 9.50038 174.185 9.25838 174.566 9.07505C174.947 8.89172 175.42 8.80005 175.985 8.80005C176.388 8.80005 176.755 8.82938 177.085 8.88805C177.422 8.93938 177.796 9.01638 178.207 9.11905L178.031 10.175C177.591 10.0504 177.199 9.96238 176.854 9.91105C176.517 9.85238 176.22 9.82305 175.963 9.82305C175.494 9.82305 175.16 9.90738 174.962 10.076C174.764 10.2374 174.665 10.439 174.665 10.681C174.665 10.857 174.698 11.0147 174.764 11.154C174.83 11.286 174.947 11.407 175.116 11.517C175.292 11.627 175.541 11.7334 175.864 11.836L176.623 12.078C177.283 12.276 177.752 12.5327 178.031 12.848C178.31 13.156 178.449 13.585 178.449 14.135C178.449 14.5604 178.346 14.9344 178.141 15.257C177.936 15.5797 177.635 15.8327 177.239 16.016C176.85 16.1994 176.366 16.291 175.787 16.291C175.384 16.291 174.969 16.247 174.544 16.159C174.119 16.071 173.657 15.9427 173.158 15.774L173.422 14.718C173.913 14.894 174.357 15.0297 174.753 15.125C175.156 15.213 175.508 15.257 175.809 15.257Z",fill:"var(--dsw-alias-label-primary-inverted)"})]}),f.jsxs("defs",{children:[f.jsx("clipPath",{id:"dsh-wordmark-whale-clip",children:f.jsx("rect",{width:"23.16",height:"17.0435",fill:"white",transform:"translate(0.141602 3.52185)"})}),f.jsx("clipPath",{id:"dsh-wordmark-badge-clip",children:f.jsx("rect",{width:"46",height:"14",fill:"white",transform:"translate(132.348 5.5)"})})]})]})}const wf="_bubble_owhem_8",xf={bubble:wf};function _f({label:n,side:r="right",delayMs:i=0,disabled:s=!1,maxWidth:u,children:c}){const h=R.useRef(null),p=c.ref,g=R.useCallback(Z=>{h.current=Z,typeof p=="function"?p(Z):p!=null&&(p.current=Z)},[p]),[C,v]=R.useState(null),[L,w]=R.useState(r),_=R.useRef(null),k=C===null?null:typeof n=="function"?n():n,E=C===null?0:L==="right"?C.top+(C.bottom-C.top)/2:L==="top"?C.top-8:C.bottom+8,T=12;R.useLayoutEffect(()=>{if(C===null)return;const Z=()=>{const ne=_.current;if(ne===null)return;ne.style.left=`${C.x}px`;const I=ne.getBoundingClientRect();let J=0;if(I.right>window.innerWidth-T&&(J=window.innerWidth-T-I.right),I.left+J=T;L==="bottom"&&!q&&ce&&w("top"),L==="top"&&!ce&&q&&w("bottom")};return Z(),window.addEventListener("resize",Z),()=>{window.removeEventListener("resize",Z)}},[L,C,k,r]);const B=R.useRef(null),W=R.useRef({hover:!1,focus:!1}),z=R.useCallback(()=>{B.current!==null&&(clearTimeout(B.current),B.current=null)},[]);R.useEffect(()=>(s&&(z(),W.current={hover:!1,focus:!1},v(null)),z),[z,s]);const ee=()=>{if(s)return;const Z=h.current;if(Z===null)return;const ne=Z.getBoundingClientRect();w(r),v({x:r==="right"?ne.right+10:ne.left+ne.width/2,top:ne.top,bottom:ne.bottom})},Q=()=>{if(z(),i<=0){ee();return}B.current=setTimeout(()=>{B.current=null,ee()},i)},V=()=>{z(),!W.current.hover&&!W.current.focus&&v(null)};return f.jsxs(f.Fragment,{children:[R.cloneElement(c,{ref:g,onMouseEnter:Z=>{var ne,I;(I=(ne=c.props).onMouseEnter)==null||I.call(ne,Z),W.current.hover=!0,Q()},onMouseLeave:Z=>{var ne,I;(I=(ne=c.props).onMouseLeave)==null||I.call(ne,Z),W.current.hover=!1,z(),v(null)},onFocus:Z=>{var ne,I;(I=(ne=c.props).onFocus)==null||I.call(ne,Z),W.current.focus=!0,z(),ee()},onBlur:Z=>{var ne,I;(I=(ne=c.props).onBlur)==null||I.call(ne,Z),W.current.focus=!1,V()}}),C!==null&&ln.createPortal(f.jsx("span",{ref:_,className:xf.bubble,"data-side":L,style:{position:"fixed",left:C.x,top:E,...u===void 0?{}:{maxWidth:u}},role:"tooltip",children:k}),document.body)]})}const Lf="_toast_fvpz7_7",kf="_icon_fvpz7_35",Sf="_text_fvpz7_42",_l={toast:Lf,icon:kf,text:Sf},jf=3e3,Ef=1e3;function bf({text:n,icon:r,anchor:i,onDone:s}){R.useEffect(()=>{const h=setTimeout(s,jf+Ef);return()=>{clearTimeout(h)}},[s]);const[u,c]=R.useState(null);return R.useLayoutEffect(()=>{if(i==null)return;const h=()=>{const p=i.getBoundingClientRect();c(p.left+p.width/2)};return h(),window.addEventListener("resize",h),()=>{window.removeEventListener("resize",h)}},[i]),ln.createPortal(f.jsxs("div",{className:_l.toast,role:"alert",style:u===null?void 0:{left:u},children:[r!==void 0&&f.jsx("span",{className:_l.icon,"aria-hidden":!0,children:r}),f.jsx("span",{className:_l.text,children:n})]}),document.body)}const Mf="_root_4qrvp_1",Of="_container_4qrvp_30",Nf="_expandedTopLevel_4qrvp_39",Rf="_topLevelBracket_4qrvp_46",Pf="_expandedTopLevelContainer_4qrvp_51",Tf="_row_4qrvp_55",If="_children_4qrvp_60",$f="_expander_4qrvp_78",Hf="_label_4qrvp_95",Vf="_clickableLabel_4qrvp_101",Af="_stringValue_4qrvp_105",Df="_numberValue_4qrvp_109",Ff="_keywordValue_4qrvp_113",Bf="_otherValue_4qrvp_117",zf="_punctuation_4qrvp_121",Zf="_preview_4qrvp_125",Uf="_previewProperty_4qrvp_129",Wf="_previewEllipsis_4qrvp_133",qf="_copyAnchor_4qrvp_137",Qf="_copyButton_4qrvp_143",Kf="_collapseIcon_4qrvp_202",fe={root:Mf,container:Of,expandedTopLevel:Nf,topLevelBracket:Rf,expandedTopLevelContainer:Pf,row:Tf,children:If,expander:$f,label:Hf,clickableLabel:Vf,stringValue:Af,numberValue:Df,keywordValue:Ff,otherValue:Bf,punctuation:zf,preview:Zf,previewProperty:Uf,previewEllipsis:Wf,copyAnchor:qf,copyButton:Qf,collapseIcon:Kf},Jf=4,Gf=5,W0=2,q0={copyValue:"Copy value",copyJson:"Copy JSON",copyPath:"Copy property path",copyPrettyJson:"Copy pretty JSON",copyCompactJson:"Copy compact JSON",copied:"Copied",copyFailed:"Copy failed",collapseNode:"Collapse JSON node",expandNode:"Expand JSON node",copyButtonTitle:n=>`${n}; right-click for copy options`};function Yf(n){return[{id:"value",label:n.copyValue},{id:"json",label:n.copyJson},{id:"path",label:n.copyPath}]}function Xf(n){return[{id:"prettyJson",label:n.copyPrettyJson},{id:"json",label:n.copyCompactJson},{id:"path",label:n.copyPath}]}function Yo(n){return typeof n=="object"&&n!==null&&!(n instanceof Date)}function Xo(n){return Array.isArray(n)?n.map((r,i)=>[String(i),r]):Object.keys(n).map(r=>[r,n[r]])}function du(n){return Array.isArray(n)?["[","]"]:["{","}"]}function ed(n){return n===null?f.jsx("span",{className:fe.keywordValue,children:"null"}):typeof n=="string"?f.jsx("span",{className:fe.stringValue,children:JSON.stringify(n)}):typeof n=="number"?f.jsx("span",{className:fe.numberValue,children:String(n)}):typeof n=="boolean"?f.jsx("span",{className:fe.keywordValue,children:String(n)}):typeof n=="bigint"?f.jsx("span",{className:fe.otherValue,children:n.toString()}):typeof n>"u"?f.jsx("span",{className:fe.otherValue,children:"undefined"}):typeof n=="symbol"?f.jsx("span",{className:fe.otherValue,children:n.description??"Symbol"}):typeof n=="function"?f.jsx("span",{className:fe.otherValue,children:n.name||"Function"}):null}function ec(n,r){if(!Yo(n))return ed(n);const i=Array.isArray(n),s=Xo(n),u=i?Gf:Jf,c=s.slice(0,u),[h,p]=du(n);return f.jsxs(f.Fragment,{children:[f.jsx("span",{className:fe.punctuation,children:h}),r>=W0?f.jsx("span",{className:fe.previewEllipsis,children:"…"}):c.map(([g,C],v)=>f.jsxs("span",{children:[v>0&&f.jsx("span",{className:fe.punctuation,children:", "}),!i&&f.jsxs(f.Fragment,{children:[f.jsx("span",{className:fe.previewProperty,children:g}),f.jsx("span",{className:fe.punctuation,children:": "})]}),ec(C,r+1)]},g)),ru&&f.jsx("span",{className:fe.previewEllipsis,children:", …"}),f.jsx("span",{className:fe.punctuation,children:p})]})}function td(n){return n===null?f.jsx("span",{className:fe.keywordValue,children:"null"}):typeof n=="string"?f.jsx("span",{className:fe.stringValue,children:JSON.stringify(n)}):typeof n=="boolean"?f.jsx("span",{className:fe.keywordValue,children:String(n)}):typeof n=="number"?f.jsx("span",{className:fe.numberValue,children:String(n)}):typeof n=="bigint"?f.jsx("span",{className:fe.numberValue,children:`${n.toString()}n`}):n instanceof Date?f.jsx("span",{className:fe.otherValue,children:n.toISOString()}):typeof n=="function"?f.jsxs("span",{className:fe.otherValue,children:["function() ","{ }"]}):typeof n>"u"?f.jsx("span",{className:fe.otherValue,children:"undefined"}):f.jsx("span",{className:fe.otherValue,children:n.toString()})}function nd(n){return n===""?'""':n}function Zl(n){return n.map(r=>typeof r=="number"?`n${String(r)}`:`s${String(r.length)}:${r}`).join("/")}function tc(n){n.focus()}function rd(n,r){const i=n.closest('[role="tree"]');if(i===null)return;const s=Array.from(i.querySelectorAll("[data-json-expander]")),u=s.indexOf(n);if(u<0||s.length===0)return;const c=(u+r+s.length)%s.length,h=s[c];h!==void 0&&tc(h)}function Ll({field:n,expandable:r,onToggle:i}){return n===void 0?null:f.jsxs("span",{className:ye(fe.label,r&&fe.clickableLabel),onClick:r?i:void 0,children:[nd(n),":"]})}function Ul({field:n,initialExpanded:r,labels:i,lastElement:s,onClaimTabStop:u,onRowHover:c,path:h,tabStopId:p,value:g}){const C=R.useId(),v=R.useRef(null),[L,w]=R.useState(r),_=Zl(h),k=Yo(g),E=k?Xo(g):[],T=E.length>0,B=()=>{w(V=>!V),tc(v.current)},W=V=>{if(V.key==="ArrowRight"||V.key==="ArrowLeft"){V.preventDefault(),w(V.key==="ArrowRight");return}(V.key==="ArrowUp"||V.key==="ArrowDown")&&(V.preventDefault(),rd(V.currentTarget,V.key==="ArrowUp"?-1:1))},z=(V,Z)=>f.jsx("div",{className:fe.row,role:"treeitem","aria-expanded":Z,onMouseOver:ne=>{ne.stopPropagation(),c(ne.currentTarget,{path:h,value:g})},children:V});if(!k)return z(f.jsxs(f.Fragment,{children:[f.jsx(Ll,{field:n,expandable:!1,onToggle:B}),td(g),!s&&f.jsx("span",{className:fe.punctuation,children:","})]}));const[ee,Q]=du(g);return T?z(f.jsxs(f.Fragment,{children:[f.jsx("span",{ref:v,className:ye(fe.expander,L?fe.collapseIcon:fe.expandIcon),"data-json-expander":!0,role:"button","aria-label":L?i.collapseNode:i.expandNode,"aria-expanded":L,"aria-controls":L?C:void 0,tabIndex:p===_?0:-1,onFocus:()=>{u(_)},onClick:B,onKeyDown:W}),f.jsx(Ll,{field:n,expandable:!0,onToggle:B}),f.jsx("span",{className:fe.preview,children:ec(g,0)}),!s&&f.jsx("span",{className:fe.punctuation,children:","}),L&&f.jsx("ul",{id:C,role:"group",className:fe.children,children:E.map(([V,Z],ne)=>f.jsx(Ul,{field:V,value:Z,path:[...h,Array.isArray(g)?ne:V],labels:i,lastElement:ne===E.length-1,initialExpanded:!1,tabStopId:p,onClaimTabStop:u,onRowHover:c},V))})]}),L):z(f.jsxs(f.Fragment,{children:[f.jsx(Ll,{field:n,expandable:!1,onToggle:B}),f.jsx("span",{className:fe.punctuation,children:ee}),f.jsx("span",{className:fe.punctuation,children:Q}),!s&&f.jsx("span",{className:fe.punctuation,children:","})]}))}function od(n){return n.reduce((r,i)=>typeof i=="number"?`${r}[${String(i)}]`:/^[A-Za-z_$][\w$]*$/.test(i)?`${r}.${i}`:`${r}[${JSON.stringify(i)}]`,"$")}function id(n,r){return r==="path"?od(n.path):r==="prettyJson"?JSON.stringify(n.value,null,2):r==="json"?JSON.stringify(n.value):typeof n.value=="string"?n.value:typeof n.value>"u"?"undefined":typeof n.value=="bigint"?n.value.toString():typeof n.value=="symbol"?n.value.description??"Symbol":typeof n.value=="function"?n.value.name||"Function":JSON.stringify(n.value)}function sd({data:n,label:r="JSON",className:i,copyable:s=!0,expandTopLevel:u=!0,labels:c}){const h=R.useMemo(()=>c===void 0?q0:{...q0,...c},[c]),p=Xo(n),g=p.findIndex(([,O])=>Yo(O)&&Xo(O).length>0),C=p[g],v=u?C===void 0?null:Zl([Array.isArray(n)?g:C[0]]):Yo(n)&&p.length>0?Zl([]):null,L=R.useRef(null),w=R.useRef(),_=R.useRef(null),k=R.useRef(!1),E=R.useRef(),[T,B]=R.useState(),[W,z]=R.useState("idle"),[ee,Q]=R.useState(!1),[V,Z]=R.useState(v),ne=O=>{var oe;(oe=w.current)==null||oe.removeAttribute("data-json-copy-active"),w.current=O,O==null||O.setAttribute("data-json-copy-active","")},I=()=>{ne(void 0),B(void 0),z("idle"),k.current=!1,Q(!1)},J=O=>{const oe=L.current;if(oe===null)throw new Error("JsonTree root is not mounted");const de=oe.getBoundingClientRect(),ve=O.getBoundingClientRect();return{left:de.left+oe.clientWidth-26,side:ve.top-de.top>oe.clientHeight/2?"top":"bottom",top:ve.top}},q=(O,oe)=>{const de=J(O);B({...oe,...de})},ce=O=>{const oe=J(O);B(de=>de===void 0?de:{...de,...oe})};R.useEffect(()=>()=>{var O;E.current!==void 0&&clearTimeout(E.current),(O=w.current)==null||O.removeAttribute("data-json-copy-active")},[]),R.useEffect(()=>{var O;(O=w.current)==null||O.removeAttribute("data-json-copy-active"),w.current=void 0,k.current=!1,B(void 0),z("idle"),Q(!1),Z(v)},[n,u,v]),R.useEffect(()=>{const O=()=>{const oe=w.current;oe!==void 0&&ce(oe)};return window.addEventListener("scroll",O,!0),window.addEventListener("resize",O),()=>{window.removeEventListener("scroll",O,!0),window.removeEventListener("resize",O)}},[]);const le=(O,oe)=>{!s||k.current||w.current!==O&&(ne(O),z("idle"),k.current=!1,Q(!1),q(O,oe))},he=O=>{!s||k.current||O.target instanceof Element&&O.target.closest("[data-json-copy-button]")===null&&I()},pe=O=>{const oe=w.current;oe!==void 0&&ce(oe)},Se=async O=>{if(T!==void 0){try{await navigator.clipboard.writeText(id(T,O)),z("copied")}catch{z("failed")}E.current!==void 0&&clearTimeout(E.current),E.current=setTimeout(()=>{z("idle")},1500)}},[we,U]=du(n),ie=typeof(T==null?void 0:T.value)=="object"&&T.value!==null,K=ie?"prettyJson":"value",j=W==="copied"?h.copied:W==="failed"?h.copyFailed:ie?h.copyPrettyJson:h.copyValue;return f.jsxs("div",{ref:L,className:ye(fe.root,i),onMouseOver:he,onMouseLeave:()=>{k.current||I()},onScroll:pe,children:[u?f.jsxs("div",{className:fe.expandedTopLevel,children:[f.jsx("div",{className:ye(fe.row,fe.topLevelBracket),"data-json-root-row":!0,onMouseOver:O=>{O.stopPropagation(),le(O.currentTarget,{path:[],value:n})},children:f.jsx("span",{className:fe.punctuation,children:we})}),f.jsx("div",{"aria-label":r,className:ye(fe.container,fe.expandedTopLevelContainer),role:"tree",children:p.map(([O,oe],de)=>f.jsx(Ul,{field:O,value:oe,path:[Array.isArray(n)?de:O],labels:h,lastElement:de===p.length-1,initialExpanded:!1,tabStopId:V,onClaimTabStop:Z,onRowHover:le},O))}),f.jsx("div",{className:ye(fe.row,fe.topLevelBracket),children:f.jsx("span",{className:fe.punctuation,children:U})})]}):f.jsx("div",{"aria-label":r,className:fe.container,role:"tree",children:f.jsx(Ul,{value:n,path:[],labels:h,lastElement:!0,initialExpanded:!0,tabStopId:V,onClaimTabStop:Z,onRowHover:le})}),T!==void 0&&f.jsx("span",{className:fe.copyAnchor,style:{left:T.left,top:T.top},children:f.jsx(Y3,{open:ee,compact:!0,portal:!0,align:"end",side:T.side,anchor:f.jsx("button",{ref:_,type:"button",className:fe.copyButton,"data-json-copy-button":!0,"data-state":W,"aria-label":j,title:h.copyButtonTitle(j),onClick:()=>void Se(K),onContextMenu:O=>{O.preventDefault(),O.stopPropagation(),k.current=!0,Q(!0)},children:W==="copied"?f.jsx(cu,{size:12}):f.jsx(Q3,{size:12})}),items:ie?Xf(h):Yf(h),onSelect:O=>{Se(O),k.current=!1,Q(!1)},onClose:I,getAnchorRect:()=>_.current.getBoundingClientRect()})})]})}var kl,Q0;function ld(){if(Q0)return kl;Q0=1;const n=[[{color:"0, 0, 0",class:"ansi-black"},{color:"187, 0, 0",class:"ansi-red"},{color:"0, 187, 0",class:"ansi-green"},{color:"187, 187, 0",class:"ansi-yellow"},{color:"0, 0, 187",class:"ansi-blue"},{color:"187, 0, 187",class:"ansi-magenta"},{color:"0, 187, 187",class:"ansi-cyan"},{color:"255,255,255",class:"ansi-white"}],[{color:"85, 85, 85",class:"ansi-bright-black"},{color:"255, 85, 85",class:"ansi-bright-red"},{color:"0, 255, 0",class:"ansi-bright-green"},{color:"255, 255, 85",class:"ansi-bright-yellow"},{color:"85, 85, 255",class:"ansi-bright-blue"},{color:"255, 85, 255",class:"ansi-bright-magenta"},{color:"85, 255, 255",class:"ansi-bright-cyan"},{color:"255, 255, 255",class:"ansi-bright-white"}]],r=/(https?:\/\/(?:[A-Za-z0-9#;/?:@=+$',_.!~*()[\]-]|&|%[A-Fa-f0-9]{2})+)/gm;class i{static escapeForHtml(u){return new i().escapeForHtml(u)}static linkify(u){return new i().linkify(u)}static ansiToHtml(u,c){return new i().ansiToHtml(u,c)}static ansiToJson(u,c){return new i().ansiToJson(u,c)}static ansiToText(u){return new i().ansiToText(u)}constructor(){this.fg=this.bg=this.fg_truecolor=this.bg_truecolor=null,this.bright=0,this.decorations=[]}setupPalette(){this.PALETTE_COLORS=[];for(let p=0;p<2;++p)for(let g=0;g<8;++g)this.PALETTE_COLORS.push(n[p][g].color);let u=[0,95,135,175,215,255],c=(p,g,C)=>u[p]+", "+u[g]+", "+u[C];for(let p=0;p<6;++p)for(let g=0;g<6;++g)for(let C=0;C<6;++C)this.PALETTE_COLORS.push(c(p,g,C));let h=8;for(let p=0;p<24;++p,h+=10)this.PALETTE_COLORS.push(h+", "+h+", "+h)}escapeForHtml(u){return u.replace(/[&<>\"]/gm,c=>c=="&"?"&":c=='"'?""":c=="<"?"<":c==">"?">":"")}linkify(u){return u.replace(r,c=>`${c}`)}ansiToHtml(u,c){return this.process(u,c,!0)}ansiToJson(u,c){return c=c||{},c.json=!0,c.clearLine=!1,this.process(u,c,!0)}ansiToText(u){return this.process(u,{},!1)}process(u,c,h){let p=this,g=u.split(/\033\[/),C=g.shift();c==null&&(c={}),c.clearLine=/\r/.test(u);let v=g.map(L=>this.processChunk(L,c,h));if(c&&c.json){let L=p.processChunkJson("");return L.content=C,L.clearLine=c.clearLine,v.unshift(L),c.remove_empty&&(v=v.filter(w=>!w.isEmpty())),v}else v.unshift(C);return v.join("")}processChunkJson(u,c,h){c=typeof c>"u"?{}:c;let p=c.use_classes=typeof c.use_classes<"u"&&c.use_classes,g=c.key=p?"class":"color",C={content:u,fg:null,bg:null,fg_truecolor:null,bg_truecolor:null,isInverted:!1,clearLine:c.clearLine,decoration:null,decorations:[],was_processed:!1,isEmpty:()=>!C.content},v=u.match(/^([!\x3c-\x3f]*)([\d;]*)([\x20-\x2c]*[\x40-\x7e])([\s\S]*)/m);if(!v)return C;C.content=v[4];let L=v[2].split(";");if(v[1]!==""||v[3]!=="m"||!h)return C;let w=this;for(;L.length>0;){let _=L.shift(),k=parseInt(_);if(isNaN(k)||k===0)w.fg=w.bg=null,w.decorations=[];else if(k===1)w.decorations.push("bold");else if(k===2)w.decorations.push("dim");else if(k===3)w.decorations.push("italic");else if(k===4)w.decorations.push("underline");else if(k===5)w.decorations.push("blink");else if(k===7)w.decorations.push("reverse");else if(k===8)w.decorations.push("hidden");else if(k===9)w.decorations.push("strikethrough");else if(k===21)w.removeDecoration("bold");else if(k===22)w.removeDecoration("bold"),w.removeDecoration("dim");else if(k===23)w.removeDecoration("italic");else if(k===24)w.removeDecoration("underline");else if(k===25)w.removeDecoration("blink");else if(k===27)w.removeDecoration("reverse");else if(k===28)w.removeDecoration("hidden");else if(k===29)w.removeDecoration("strikethrough");else if(k===39)w.fg=null;else if(k===49)w.bg=null;else if(k>=30&&k<38)w.fg=n[0][k%10][g];else if(k>=90&&k<98)w.fg=n[1][k%10][g];else if(k>=40&&k<48)w.bg=n[0][k%10][g];else if(k>=100&&k<108)w.bg=n[1][k%10][g];else if(k===38||k===48){let E=k===38;if(L.length>=1){let T=L.shift();if(T==="5"&&L.length>=1){let B=parseInt(L.shift());if(B>=0&&B<=255)if(!p)this.PALETTE_COLORS||w.setupPalette(),E?w.fg=this.PALETTE_COLORS[B]:w.bg=this.PALETTE_COLORS[B];else{let W=B>=16?"ansi-palette-"+B:n[B>7?1:0][B%8].class;E?w.fg=W:w.bg=W}}else if(T==="2"&&L.length>=3){let B=parseInt(L.shift()),W=parseInt(L.shift()),z=parseInt(L.shift());if(B>=0&&B<=255&&W>=0&&W<=255&&z>=0&&z<=255){let ee=B+", "+W+", "+z;p?E?(w.fg="ansi-truecolor",w.fg_truecolor=ee):(w.bg="ansi-truecolor",w.bg_truecolor=ee):E?w.fg=ee:w.bg=ee}}}}}return w.fg===null&&w.bg===null&&w.decorations.length===0||(C.fg=w.fg,C.bg=w.bg,C.fg_truecolor=w.fg_truecolor,C.bg_truecolor=w.bg_truecolor,C.decorations=w.decorations,C.decoration=w.decorations.slice(-1).pop()||null,C.was_processed=!0),C}processChunk(u,c,h){c=c||{};let p=this.processChunkJson(u,c,h),g=c.use_classes;if(p.decorations=p.decorations.filter(k=>{if(k==="reverse"){p.fg||(p.fg=n[0][7][g?"class":"color"]),p.bg||(p.bg=n[0][0][g?"class":"color"]);let E=p.fg;p.fg=p.bg,p.bg=E;let T=p.fg_truecolor;return p.fg_truecolor=p.bg_truecolor,p.bg_truecolor=T,p.isInverted=!0,!1}return!0}),c.json)return p;if(p.isEmpty())return"";if(!p.was_processed)return p.content;let C=[],v=[],L=[],w={},_=k=>{let E=[],T;for(T in k)k.hasOwnProperty(T)&&E.push("data-"+T+'="'+this.escapeForHtml(k[T])+'"');return E.length>0?" "+E.join(" "):""};return p.isInverted&&(w["ansi-is-inverted"]="true"),p.fg&&(g?(C.push(p.fg+"-fg"),p.fg_truecolor!==null&&(w["ansi-truecolor-fg"]=p.fg_truecolor,p.fg_truecolor=null)):C.push("color:rgb("+p.fg+")")),p.bg&&(g?(C.push(p.bg+"-bg"),p.bg_truecolor!==null&&(w["ansi-truecolor-bg"]=p.bg_truecolor,p.bg_truecolor=null)):C.push("background-color:rgb("+p.bg+")")),p.decorations.forEach(k=>{if(g){v.push("ansi-"+k);return}k==="bold"?v.push("font-weight:bold"):k==="dim"?v.push("opacity:0.5"):k==="italic"?v.push("font-style:italic"):k==="hidden"?v.push("visibility:hidden"):k==="strikethrough"?L.push("line-through"):L.push(k)}),L.length&&v.push("text-decoration:"+L.join(" ")),g?'"+p.content+"":'"+p.content+""}removeDecoration(u){const c=this.decorations.indexOf(u);c>=0&&this.decorations.splice(c,1)}}return kl=i,kl}var ud=ld();const ad=j1(ud),cd={"0,0,0":"var(--dsw-alias-label-primary)","255,255,255":"var(--dsw-alias-label-primary)","85,85,85":"var(--dsw-alias-label-tertiary)","187,0,0":"var(--dsw-alias-state-error-primary)","255,85,85":"var(--dsw-alias-state-error-secondary)","0,187,0":"var(--dsw-alias-state-success-primary)","0,255,0":"var(--dsw-alias-state-success-secondary)","187,187,0":"var(--dsw-alias-state-warn-primary)","255,255,85":"var(--dsw-alias-state-warn-secondary)","0,0,187":"var(--dsw-alias-state-business-primary)","85,85,255":"var(--dsw-static-blue-400)"},fd={bold:{fontWeight:700},dim:{opacity:.7},italic:{fontStyle:"italic"},underline:{textDecoration:"underline"},strikethrough:{textDecoration:"line-through"},hidden:{visibility:"hidden"}},dd=/\u001b\][^\u0007\u001b]*(?:\u0007|\u001b\\)?/g,hd=/\u001b(?!\[)[\u0020-\u002f]*[\u0030-\u007e]?/g,pd=/[\u0000-\u0007\u000b-\u001a\u001c-\u001f\u007f]/g,md=/\r|\u0008|\u001b\[[\u0030-\u003f]*[\u0020-\u002f]*K/,Cd=/\u001b\[([\u0030-\u003f]*)[\u0020-\u002f]*m/g,K0=8,gd=/^[\p{Mn}\p{Me}\p{Cf}\u200b-\u200f\u2060]$/u,vd=new RegExp("\\p{Script=Han}|\\p{Script=Hiragana}|\\p{Script=Katakana}|\\p{Script=Hangul}|\\p{Emoji_Presentation}|[\\uff01-\\uff60\\u3000-\\u303e]","u");function Sl(n){const r=n.codePointAt(0);return r===void 0||r<4352?!1:vd.test(n)}const y1={fg:"",bg:"",attrs:[]},yd={22:["1","2"],23:["3"],24:["4"],25:["5","6"],27:["7"],28:["8"],29:["9"]};function nc(n,r){const i=r===""?["0"]:r.split(";");let s=n;for(let u=0;u!h.includes(g))};continue}const p=Number(c);if(c==="39"){s={...s,fg:""};continue}if(c==="49"){s={...s,bg:""};continue}if(p>=30&&p<=37||p>=90&&p<=97){s={...s,fg:c};continue}if(p>=40&&p<=47||p>=100&&p<=107){s={...s,bg:c};continue}s.attrs.includes(c)||(s={...s,attrs:[...s.attrs,c]})}return s}function J0(n){const r=[...n.attrs];return n.fg!==""&&r.push(n.fg),n.bg!==""&&r.push(n.bg),r.length===0?"":`\x1B[${r.join(";")}m`}function Bo(n,r){return n.fg===r.fg&&n.bg===r.bg&&n.attrs.length===r.attrs.length&&n.attrs.every((i,s)=>i===r.attrs[s])}function wd(n,r){var L;const i=/\u001b\[([\u0030-\u003f]*)[\u0020-\u002f]*([\u0040-\u007e])/g,s=[];let u=0,c=r,h=0;const p=(w,_)=>{var E;const k=s[w];(k==null?void 0:k.spacer)===!0&&w>0?s[w-1]={sgr:c,char:_}:k!==void 0&&Sl(k.char)&&((E=s[w+1])==null?void 0:E.spacer)===!0&&(s[w+1]={sgr:c,char:_}),s[w]={sgr:c,char:_}},g=w=>{for(const _ of w){if(_==="\r"){u=0;continue}if(_==="\b"){u=Math.max(0,u-1);continue}if(_===" "){const k=u+K0-u%K0;for(;u0?s[u-1]:void 0;k!==void 0&&(s[u-1]={sgr:k.sgr,char:k.char+_});continue}p(u," "),s[u]={sgr:c,char:_},u++,Sl(_)&&(s[u]={sgr:c,char:"",spacer:!0},u++)}};for(const w of n.matchAll(i)){g(n.slice(h,w.index)),h=w.index+w[0].length;const _=String(w[1]),k=String(w[2]);if(k==="K"){const E=String(_.split(";")[0]);if(E==="1")for(let T=0;T<=u;T++)p(T," ");else s.length=E==="2"?0:u;continue}k==="m"&&(c=nc(c,_))}g(n.slice(h));let C="",v=r;for(let w=0;w0&&Sl(((L=s[w-1])==null?void 0:L.char)??"");C+=_.spacer===!0&&!k?" ":_.char}return Bo(v,c)||(Bo(v,y1)||(C+="\x1B[0m"),C+=J0(c)),{text:C,sgr:c}}function xd(n){const r=[];let i=y1;for(const s of n.split(` + `)){const u=s.replace(/\r+$/,"");if(md.test(u)){const c=wd(u,i);r.push(c.text),i=c.sgr;continue}r.push(u);for(const c of u.matchAll(Cd))i=nc(i,String(c[1]))}return r.join(` + `)}function _d(n){const r=n.replace(dd,"").replace(hd,"");return xd(r).replace(pd,"")}function Ld(n){const r={},i=n.bg===null?void 0:`rgb(${n.bg})`;if(i!==void 0&&(r.backgroundColor=i),n.fg!==null){const s=`rgb(${n.fg})`;r.color=i===void 0?cd[n.fg.replace(/\s+/g,"")]??s:s}for(const s of n.decorations)Object.assign(r,fd[s]);return Object.keys(r).length===0?void 0:r}function kd(n){let r=[];const i=[r];for(const s of ad.ansiToJson(_d(n),{json:!0,remove_empty:!0})){const u=Ld(s);for(const[c,h]of s.content.split(` + `).entries())c>0&&(r=[],i.push(r)),h!==""&&r.push({text:h,style:u})}return i}function rc(n,r,i){const s=n-r,u=Math.ceil(r/2);return{hidden:s,capped:s>0&&!i,headLines:u,tailLines:r-u}}const Sd=1e3;function oc(n){const[r,i]=R.useState(!1),s=R.useCallback(()=>{r||br(n).then(u=>{u&&(i(!0),window.setTimeout(()=>{i(!1)},Sd))})},[r,n]);return{copied:r,onCopy:s}}const jd="_block_10eou_7",Ed="_header_10eou_38",bd="_prompt_10eou_76",Md="_promptLine_10eou_84",Od="_runState_10eou_97",Nd="_runStateLabel_10eou_105",Rd="_cwd_10eou_114",Pd="_command_10eou_122",Td="_status_10eou_134",Id="_copyButton_10eou_142",$d="_output_10eou_162",Hd="_line_10eou_186",Vd="_expand_10eou_191",Ad="_empty_10eou_207",ot={block:jd,header:Ed,prompt:bd,promptLine:Md,runState:Od,runStateLabel:Nd,cwd:Rd,command:Pd,status:Td,copyButton:Id,output:$d,line:Hd,expand:Vd,empty:Ad},ic=16,G0={signal:n=>`信号 ${n}`,exitCode:n=>`退出码 ${n}`,running:"运行中",failed:"失败",done:"已完成",copy:"复制",copied:"复制成功",noOutput:"无输出",collapseAria:"收起输出",collapse:"收起",expandAria:n=>`展开其余 ${n} 行输出`,expand:n=>`… 其余 ${n} 行`};function Dd(n,r){const i=n.replace(/[/\\]+$/,"");if(r!==void 0&&i===r.replace(/[/\\]+$/,""))return"~";const s=i.split(/[/\\]/).pop();return s===void 0||s===""?n:s}function sc(n,r,i){if(r!==void 0)return i.signal(r);if(n!==void 0&&n!==0)return i.exitCode(n)}function Fd(n,r,i,s){return n?{state:"ongoing",label:s.running}:sc(r,i,s)!==void 0?{state:"error",label:s.failed}:{state:"done",label:s.done}}function Y0(n){return n.map((r,i)=>r.style===void 0?r.text:f.jsx("span",{style:r.style,children:r.text},i))}function Bd({command:n,cwd:r,home:i,output:s,exitCode:u,signal:c,running:h=!1,maxLines:p=ic,className:g,labels:C}){const v=R.useMemo(()=>C===void 0?G0:{...G0,...C},[C]),L=s??"",w=R.useMemo(()=>{const J=kd(L),q=J[J.length-1];return J.length>1&&q!==void 0&&q.every(le=>le.text==="")?J.slice(0,-1):J},[L]),[_,k]=R.useState(!1),{copied:E,onCopy:T}=oc(L),B=R.useCallback(()=>{k(J=>!J)},[]),W=sc(u,c,v),z=Fd(h,u,c,v),ee=R.useMemo(()=>(n.endsWith(` +diff --git a/node_modules/@deepseek-ai/dsh-web-frontend/dist/index.html b/node_modules/@deepseek-ai/dsh-web-frontend/dist/index.html +index 4b23bcc..28912a4 100644 +--- a/node_modules/@deepseek-ai/dsh-web-frontend/dist/index.html ++++ b/node_modules/@deepseek-ai/dsh-web-frontend/dist/index.html +@@ -4,8 +4,8 @@ + + + +- +- DeepSeek Harness ++ ++ Sherlock + + + +diff --git a/node_modules/@deepseek-ai/dsh-web-frontend/dist/manifest.webmanifest b/node_modules/@deepseek-ai/dsh-web-frontend/dist/manifest.webmanifest +index 20a428f..0c52b69 100644 +--- a/node_modules/@deepseek-ai/dsh-web-frontend/dist/manifest.webmanifest ++++ b/node_modules/@deepseek-ai/dsh-web-frontend/dist/manifest.webmanifest +@@ -1,15 +1,15 @@ + { + "id": "/", +- "name": "DeepSeek Harness", +- "short_name": "DSH", ++ "name": "Sherlock", ++ "short_name": "Sherlock", + "start_url": "/", + "scope": "/", + "display": "fullscreen", + "icons": [ + { +- "src": "/favicon.svg", +- "sizes": "any", +- "type": "image/svg+xml", ++ "src": "/sherlock-icon.png", ++ "sizes": "1254x1254", ++ "type": "image/png", + "purpose": "any" + } + ] +diff --git a/node_modules/@deepseek-ai/dsh-web-frontend/dist/sherlock-icon.png b/node_modules/@deepseek-ai/dsh-web-frontend/dist/sherlock-icon.png +new file mode 100644 +index 0000000..dd78096 +Binary files /dev/null and b/node_modules/@deepseek-ai/dsh-web-frontend/dist/sherlock-icon.png differ +diff --git a/node_modules/@deepseek-ai/dsh-web-frontend/dist/sherlock-logo.svg b/node_modules/@deepseek-ai/dsh-web-frontend/dist/sherlock-logo.svg +new file mode 100644 +index 0000000..a99ae70 +--- /dev/null ++++ b/node_modules/@deepseek-ai/dsh-web-frontend/dist/sherlock-logo.svg +@@ -0,0 +1,10 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ diff --git a/script/build_and_run.sh b/script/build_and_run.sh new file mode 100755 index 000000000..16df283e1 --- /dev/null +++ b/script/build_and_run.sh @@ -0,0 +1,162 @@ +#!/bin/bash + +set -euo pipefail + +project_root="$(cd "$(dirname "$0")/.." && pwd)" +cd "$project_root" + +mode="${1:---run}" +machine_arch="$(uname -m)" +if [ "$machine_arch" = "arm64" ]; then + formal_app="$project_root/dist-notarized/mac-arm64/Sherlock.app" +else + formal_app="$project_root/dist-notarized/mac/Sherlock.app" +fi +formal_executable="$formal_app/Contents/MacOS/Sherlock" +formal_runtime_node="$formal_app/Contents/Resources/app/node_modules/node/bin/node" +workspace_runtime_node="$project_root/node_modules/node/bin/node" + +stop_sherlock_apps() { + pkill -x 'Sherlock Dev' 2>/dev/null || true + pkill -x 'Sherlock' 2>/dev/null || true +} + +ensure_workspace_runtime() { + if [ ! -x "$workspace_runtime_node" ]; then + echo 'Workspace Node.js runtime is missing; rebuilding the node package.' + npm rebuild node + fi + test -x "$workspace_runtime_node" || { + echo "Workspace Node.js runtime could not be prepared at: $workspace_runtime_node" >&2 + exit 1 + } +} + +build_formal_app() { + stop_sherlock_apps + ensure_workspace_runtime + npm run package:formal:dir + test -x "$formal_executable" || { + echo "Sherlock executable was not built at: $formal_executable" >&2 + exit 1 + } + test -x "$formal_runtime_node" || { + echo "Bundled Node.js runtime was not built at: $formal_runtime_node" >&2 + exit 1 + } + codesign --verify --deep --strict --verbose=2 "$formal_app" +} + +open_formal_app() { + open -na "$formal_app" +} + +case "$mode" in + --run) + build_formal_app + open_formal_app + ;; + --verify) + build_formal_app + open_formal_app + stable_checks=0 + for _attempt in $(seq 1 80); do + if pgrep -x 'Sherlock' >/dev/null; then + stable_checks=$((stable_checks + 1)) + if [ "$stable_checks" -ge 4 ]; then + echo 'Sherlock is running.' + exit 0 + fi + else + stable_checks=0 + fi + sleep 0.5 + done + echo 'Sherlock did not stay running.' >&2 + exit 1 + ;; + --debug) + build_formal_app + exec /usr/bin/lldb -- "$formal_executable" + ;; + --logs) + build_formal_app + open_formal_app + exec /usr/bin/log stream --style compact --predicate 'process == "Sherlock"' + ;; + --telemetry) + build_formal_app + open_formal_app + exec /usr/bin/log stream --style compact --predicate 'subsystem == "com.evanarts.sherlock"' + ;; + --formal) + stop_sherlock_apps + test "$machine_arch" = "arm64" || { + echo 'The local formal release currently supports Apple Silicon only.' >&2 + exit 1 + } + node "$project_root/scripts/verify-formal-git-state.mjs" --repo "$project_root" + legacy_identity='8B8FCCFB659D94D5C9A9CE2B735EB0FAE457CC7B' + developer_identity='DDFBC7F4DA5EC49721E454BB06329C6D1E8A7B9F' + signing_identities="$(security find-identity -v -p codesigning)" + printf '%s\n' "$signing_identities" | grep -F "$legacy_identity" | grep -F 'Sherlock Desktop Update Signing' >/dev/null || { + echo 'The Sherlock Desktop Update Signing identity is not prepared.' >&2 + exit 1 + } + printf '%s\n' "$signing_identities" | grep -F "$developer_identity" | grep -F 'Developer ID Application: yafeng he (FAV8TLDK73)' >/dev/null || { + echo 'The Developer ID Application identity is not prepared.' >&2 + exit 1 + } + APPLE_API_KEY="${APPLE_API_KEY:-/Users/heyafeng/Downloads/AuthKey_KSJ7725349.p8}" + APPLE_API_KEY_ID="${APPLE_API_KEY_ID:-KSJ7725349}" + APPLE_API_ISSUER="${APPLE_API_ISSUER:-840d0b5c-4924-4f62-8a86-6201e832a4d6}" + export APPLE_API_KEY APPLE_API_KEY_ID APPLE_API_ISSUER + test -f "$APPLE_API_KEY" || { + echo "The App Store Connect API key is missing: $APPLE_API_KEY" >&2 + exit 1 + } + + CSC_NAME="$developer_identity" npm run package:mac:notarized:arm64 + + notarized_dmg="$project_root/dist-notarized/sherlock-mac-arm64.dmg" + release_version="$(node -p "require('./package.json').version")" + xcrun stapler validate "$formal_app" + node "$project_root/scripts/build-legacy-migration-bridge.mjs" \ + --version "$release_version" \ + --app "$formal_app" \ + --output "$project_root/dist-legacy" \ + --identity "$legacy_identity" + xcrun notarytool submit "$notarized_dmg" \ + --key "$APPLE_API_KEY" \ + --key-id "$APPLE_API_KEY_ID" \ + --issuer "$APPLE_API_ISSUER" \ + --wait + xcrun stapler staple "$notarized_dmg" + xcrun stapler validate "$formal_app" + xcrun stapler validate "$notarized_dmg" + node "$project_root/scripts/refresh-mac-update-metadata.mjs" \ + --metadata "$project_root/dist-notarized/latest-mac.yml" \ + --dmg "$notarized_dmg" + codesign --verify --deep --strict --verbose=2 "$formal_app" + codesign --verify --verbose=2 "$notarized_dmg" + spctl --assess --type execute --verbose=2 "$formal_app" + spctl --assess --type open --context context:primary-signature --verbose=2 "$notarized_dmg" + hdiutil verify "$notarized_dmg" + node "$project_root/scripts/prepare-macos-dual-release.mjs" \ + --version "$release_version" \ + --arch arm64 \ + --legacy "$project_root/dist-legacy" \ + --notarized "$project_root/dist-notarized" \ + --output "$project_root/dist-release" + test -d "$formal_app" || { + echo "Formal Sherlock app was not built at: $formal_app" >&2 + exit 1 + } + formal_smoke_user_data="$(mktemp -d /tmp/sherlock-formal-smoke.XXXXXX)" + open -na "$formal_app" --args "--sherlock-user-data-dir=$formal_smoke_user_data" + ;; + *) + echo 'Usage: ./script/build_and_run.sh [--run|--verify|--debug|--logs|--telemetry|--formal]' >&2 + exit 2 + ;; +esac diff --git a/scripts/build-legacy-migration-bridge.mjs b/scripts/build-legacy-migration-bridge.mjs new file mode 100644 index 000000000..5340526ba --- /dev/null +++ b/scripts/build-legacy-migration-bridge.mjs @@ -0,0 +1,176 @@ +#!/usr/bin/env node + +import { execFile as execFileCallback } from 'node:child_process' +import { copyFile, mkdir, readFile, rm, stat, writeFile } from 'node:fs/promises' +import { createRequire } from 'node:module' +import path from 'node:path' +import { promisify } from 'node:util' +import { fileURLToPath } from 'node:url' +import { stringify } from 'yaml' + +const require = createRequire(import.meta.url) +const plist = require('plist') +const { buildBlockMap } = require('app-builder-lib/out/targets/blockmap/blockmap') +const execFile = promisify(execFileCallback) +const projectRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..') + +const bridgeContract = { + bundleIdentifier: 'io.dsh.desktop', + embeddedBundleIdentifier: 'com.evanarts.sherlock', + productName: 'Sherlock', + executableName: 'Sherlock', + signingName: 'Sherlock Desktop Update Signing', + signingFingerprint: '8B8FCCFB659D94D5C9A9CE2B735EB0FAE457CC7B' +} + +export async function buildLegacyMigrationBridge(options) { + if (process.platform !== 'darwin' || process.arch !== 'arm64') { + throw new Error('The legacy migration bridge must be built on Apple Silicon macOS.') + } + + const version = String(options.version ?? '') + if (!/^\d+\.\d+\.\d+$/.test(version)) throw new Error(`Invalid release version: ${version}`) + + const notarizedApp = path.resolve(options.notarizedApp) + const outputDirectory = path.resolve(options.outputDirectory) + const outputName = path.basename(outputDirectory) + if (outputName !== 'dist-legacy' && !outputName.startsWith('sherlock-bridge-build.')) { + throw new Error(`Refusing to replace unsafe bridge output directory: ${outputDirectory}`) + } + const identity = options.identity ?? bridgeContract.signingFingerprint + const appInfo = plist.parse(await readFile(path.join(notarizedApp, 'Contents', 'Info.plist'), 'utf8')) + if (appInfo.CFBundleIdentifier !== bridgeContract.embeddedBundleIdentifier) { + throw new Error(`Notarized app identifier is ${appInfo.CFBundleIdentifier ?? 'missing'}.`) + } + if (appInfo.CFBundleShortVersionString !== version) { + throw new Error(`Notarized app version is ${appInfo.CFBundleShortVersionString ?? 'missing'}, expected ${version}.`) + } + + const wrapperApp = path.join(outputDirectory, 'bridge', `${bridgeContract.productName}.app`) + const contents = path.join(wrapperApp, 'Contents') + const macosDirectory = path.join(contents, 'MacOS') + const frameworksDirectory = path.join(contents, 'Frameworks') + const resourcesDirectory = path.join(contents, 'Resources') + const executable = path.join(macosDirectory, bridgeContract.executableName) + const embeddedApp = path.join(resourcesDirectory, `${bridgeContract.productName}.app`) + const zip = path.join(outputDirectory, 'sherlock-mac-arm64-legacy.zip') + const blockmap = `${zip}.blockmap` + + await rm(outputDirectory, { recursive: true, force: true }) + await mkdir(macosDirectory, { recursive: true }) + await mkdir(frameworksDirectory, { recursive: true }) + await mkdir(resourcesDirectory, { recursive: true }) + + const source = path.join(projectRoot, 'scripts', 'macos', 'legacy-migration-bridge.swift') + await execFile('/usr/bin/swiftc', [ + '-O', + '-target', + 'arm64-apple-macos12.0', + '-framework', + 'AppKit', + source, + '-o', + executable + ]) + + await writeFile( + path.join(contents, 'Info.plist'), + plist.build({ + CFBundleDevelopmentRegion: 'zh_CN', + CFBundleDisplayName: bridgeContract.productName, + CFBundleExecutable: bridgeContract.executableName, + CFBundleIconFile: 'icon.icns', + CFBundleIdentifier: bridgeContract.bundleIdentifier, + CFBundleInfoDictionaryVersion: '6.0', + CFBundleName: bridgeContract.productName, + CFBundlePackageType: 'APPL', + CFBundleShortVersionString: version, + CFBundleVersion: version, + CFBundleSupportedPlatforms: ['MacOSX'], + LSMinimumSystemVersion: '12.0', + NSHighResolutionCapable: true + }) + ) + + await execFile('/usr/bin/ditto', [notarizedApp, embeddedApp]) + for (const framework of [ + 'Squirrel.framework', + 'Mantle.framework', + 'ReactiveObjC.framework' + ]) { + await execFile('/usr/bin/ditto', [ + path.join(notarizedApp, 'Contents', 'Frameworks', framework), + path.join(frameworksDirectory, framework) + ]) + } + await copyFile(path.join(notarizedApp, 'Contents', 'Resources', 'icon.icns'), path.join(resourcesDirectory, 'icon.icns')) + await execFile('/usr/bin/codesign', ['--verify', '--deep', '--strict', embeddedApp]) + await execFile('/usr/bin/xcrun', ['stapler', 'validate', embeddedApp]) + await execFile('/usr/sbin/spctl', ['--assess', '--type', 'execute', embeddedApp]) + + await execFile('/usr/bin/codesign', [ + '--force', + '--sign', + identity, + '--identifier', + 'io.dsh.desktop', + '--timestamp=none', + wrapperApp + ]) + await execFile('/usr/bin/codesign', ['--verify', '--deep', '--strict', wrapperApp]) + const requirement = `=identifier \"io.dsh.desktop\" and certificate root = H\"${bridgeContract.signingFingerprint.toLowerCase()}\"` + await execFile('/usr/bin/codesign', ['--verify', '--strict', '-R', requirement, wrapperApp]) + + await execFile('/usr/bin/ditto', ['-c', '-k', '--sequesterRsrc', '--keepParent', wrapperApp, zip]) + const updateInfo = await buildBlockMap(zip, 'gzip', blockmap) + const zipStat = await stat(zip) + if (updateInfo.size !== zipStat.size) throw new Error('Legacy bridge ZIP size changed while hashing.') + + await writeFile( + path.join(outputDirectory, 'latest-mac.yml'), + stringify({ + version, + files: [ + { + url: path.basename(zip), + sha512: updateInfo.sha512, + size: updateInfo.size + } + ], + path: path.basename(zip), + sha512: updateInfo.sha512, + releaseDate: new Date().toISOString() + }) + ) + + return { wrapperApp, zip, blockmap } +} + +function parseArguments(argv) { + const values = new Map() + for (let index = 0; index < argv.length; index += 2) { + const key = argv[index] + const value = argv[index + 1] + if (!key?.startsWith('--') || !value) throw new Error('Invalid legacy bridge arguments.') + values.set(key.slice(2), value) + } + for (const required of ['version', 'app', 'output']) { + if (!values.has(required)) throw new Error(`--${required} is required.`) + } + return { + version: values.get('version'), + notarizedApp: values.get('app'), + outputDirectory: values.get('output'), + identity: values.get('identity') + } +} + +if (path.resolve(process.argv[1] ?? '') === fileURLToPath(import.meta.url)) { + try { + const result = await buildLegacyMigrationBridge(parseArguments(process.argv.slice(2))) + process.stdout.write(`Prepared legacy migration bridge: ${result.zip}\n`) + } catch (error) { + console.error(error instanceof Error ? error.message : String(error)) + process.exitCode = 1 + } +} diff --git a/scripts/bundled-skill-parity.d.mts b/scripts/bundled-skill-parity.d.mts new file mode 100644 index 000000000..8964a2f51 --- /dev/null +++ b/scripts/bundled-skill-parity.d.mts @@ -0,0 +1,16 @@ +export interface BundledSkillParityOptions { + sourceSkillDirectory: string + packagedSkillDirectory: string +} + +export interface BundledSkillParityResult { + slug: string + version: string + fingerprint: string +} + +export function bundledSkillFingerprint(root: string): string + +export function verifyBundledSkillParity( + options: BundledSkillParityOptions +): BundledSkillParityResult diff --git a/scripts/bundled-skill-parity.mjs b/scripts/bundled-skill-parity.mjs new file mode 100644 index 000000000..67608736f --- /dev/null +++ b/scripts/bundled-skill-parity.mjs @@ -0,0 +1,83 @@ +import { createHash } from 'node:crypto' +import { existsSync, readFileSync, readlinkSync, readdirSync } from 'node:fs' +import path from 'node:path' + +function readMetadata(skillDirectory) { + const metadataPath = path.join(skillDirectory, '_meta.json') + if (!existsSync(metadataPath)) { + throw new Error(`bundled skill metadata is missing: ${metadataPath}`) + } + const metadata = JSON.parse(readFileSync(metadataPath, 'utf8')) + if ( + typeof metadata.slug !== 'string' || + typeof metadata.version !== 'string' || + metadata.source !== 'eSkill' + ) { + throw new Error(`bundled skill metadata is invalid: ${metadataPath}`) + } + return metadata +} + +export function bundledSkillFingerprint(root) { + const hash = createHash('sha256') + + function visit(directory, relativeDirectory) { + const entries = readdirSync(directory, { withFileTypes: true }).sort((left, right) => + left.name.localeCompare(right.name, 'en') + ) + for (const entry of entries) { + const relativePath = path.posix.join(relativeDirectory, entry.name) + const absolutePath = path.join(directory, entry.name) + if (entry.isDirectory()) { + hash.update(`directory\0${relativePath}\0`) + visit(absolutePath, relativePath) + } else if (entry.isFile()) { + hash.update(`file\0${relativePath}\0`) + hash.update(readFileSync(absolutePath)) + hash.update('\0') + } else if (entry.isSymbolicLink()) { + hash.update(`symlink\0${relativePath}\0${readlinkSync(absolutePath)}\0`) + } + } + } + + visit(root, '') + return hash.digest('hex') +} + +export function verifyBundledSkillParity({ + sourceSkillDirectory, + packagedSkillDirectory +}) { + if (!existsSync(sourceSkillDirectory)) { + throw new Error(`source bundled skill is missing: ${sourceSkillDirectory}`) + } + if (!existsSync(packagedSkillDirectory)) { + throw new Error(`packaged bundled skill is missing: ${packagedSkillDirectory}`) + } + + const sourceMetadata = readMetadata(sourceSkillDirectory) + const packagedMetadata = readMetadata(packagedSkillDirectory) + if ( + sourceMetadata.slug !== packagedMetadata.slug || + sourceMetadata.version !== packagedMetadata.version + ) { + throw new Error( + `packaged bundled skill version does not match source: ${sourceMetadata.slug} ${sourceMetadata.version} != ${packagedMetadata.slug} ${packagedMetadata.version}` + ) + } + + const sourceFingerprint = bundledSkillFingerprint(sourceSkillDirectory) + const packagedFingerprint = bundledSkillFingerprint(packagedSkillDirectory) + if (sourceFingerprint !== packagedFingerprint) { + throw new Error( + `packaged bundled skill content does not match source: ${sourceMetadata.slug} ${sourceMetadata.version}` + ) + } + + return { + slug: sourceMetadata.slug, + version: sourceMetadata.version, + fingerprint: sourceFingerprint + } +} diff --git a/scripts/cloudflare-r2-multipart-client.d.mts b/scripts/cloudflare-r2-multipart-client.d.mts new file mode 100644 index 000000000..2c384067b --- /dev/null +++ b/scripts/cloudflare-r2-multipart-client.d.mts @@ -0,0 +1,41 @@ +export const WRANGLER_MAX_UPLOAD_BYTES: number +export const DEFAULT_MULTIPART_PART_SIZE: number +export const DEFAULT_MULTIPART_CONCURRENCY: number + +export function selectUploadTransport(size: number): 'wrangler' | 'multipart' +export function assertMultipartReleaseKey(key: string, version: string): void +export function validateExistingImmutableResponse(options: { + key: string + localSize: number + response: Response +}): void +export function fetchCloudflareWorker( + input: string | URL, + init?: RequestInit +): Promise +export function copyR2Object(options: { + endpoint: string + token: string + version: string + sourceKey: string + targetKey: string + contentType: string + cacheControl: string + fetchImpl?: typeof fetch +}): Promise + +export function uploadFileMultipart(options: { + endpoint: string + token: string + version: string + key: string + source: string + contentType: string + cacheControl: string + partSize?: number + concurrency?: number + maxPartAttempts?: number + retryDelayMs?: number + fetchImpl?: typeof fetch + onProgress?: (progress: { key: string; completedBytes: number; totalBytes: number }) => void +}): Promise diff --git a/scripts/cloudflare-r2-multipart-client.mjs b/scripts/cloudflare-r2-multipart-client.mjs new file mode 100644 index 000000000..f7d99b347 --- /dev/null +++ b/scripts/cloudflare-r2-multipart-client.mjs @@ -0,0 +1,267 @@ +import { open, stat } from 'node:fs/promises' +import { resolve4 } from 'node:dns/promises' +import https from 'node:https' + +export const WRANGLER_MAX_UPLOAD_BYTES = 300 * 1024 * 1024 +export const DEFAULT_MULTIPART_PART_SIZE = 16 * 1024 * 1024 +export const DEFAULT_MULTIPART_CONCURRENCY = 6 + +export function selectUploadTransport(size) { + if (!Number.isSafeInteger(size) || size < 0) throw new Error(`Invalid upload size: ${size}`) + return size > WRANGLER_MAX_UPLOAD_BYTES ? 'multipart' : 'wrangler' +} + +export function assertMultipartReleaseKey(key, version) { + const escapedVersion = version.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') + const immutable = new RegExp( + `^releases/v${escapedVersion}/sherlock-mac-arm64(?:-legacy)?\\.(?:zip|dmg)$` + ) + if (immutable.test(key) || key === 'download/sherlock-mac-arm64.dmg') return + if (/^releases\/v[^/]+\//.test(key)) { + throw new Error(`Multipart uploads may only target the current release v${version}: ${key}`) + } + throw new Error(`Multipart uploads may only target a Sherlock release payload: ${key}`) +} + +export function validateExistingImmutableResponse({ key, localSize, response }) { + if (response.status !== 200) { + throw new Error(`Existing immutable object check failed for ${key}: HTTP ${response.status}`) + } + const remoteSize = Number(response.headers.get('content-length')) + if (!Number.isSafeInteger(remoteSize) || remoteSize !== localSize) { + throw new Error( + `Existing immutable object size mismatch for ${key}: local ${localSize}, remote ${remoteSize}` + ) + } + const cacheControl = response.headers.get('cache-control') ?? '' + if (!/(?:^|[, ])immutable(?:$|[, ])/i.test(cacheControl)) { + throw new Error(`Existing immutable object has unsafe cache policy for ${key}: ${cacheControl}`) + } +} + +export async function fetchCloudflareWorker(input, init = {}) { + const url = new URL(input) + if (!/^[a-z0-9-]+\.[a-z0-9-]+\.workers\.dev$/.test(url.hostname)) { + return fetch(url, init) + } + const edgeAddresses = await resolve4('updates.evanarts.com') + if (edgeAddresses.length === 0) throw new Error('Could not resolve a Cloudflare edge address.') + + let lastError + for (const address of edgeAddresses) { + try { + const response = await requestCloudflareEdge({ url, address, init }) + if (response.status === 404 && (await response.clone().text()).includes('error code: 1042')) { + lastError = new Error(`Cloudflare Worker has not propagated to edge ${address}.`) + continue + } + return response + } catch (error) { + lastError = error + } + } + throw lastError ?? new Error('Cloudflare Worker request failed.') +} + +function requestCloudflareEdge({ url, address, init }) { + return new Promise((resolve, reject) => { + const headers = new Headers(init.headers) + headers.set('host', url.hostname) + const request = https.request( + { + hostname: address, + port: 443, + servername: url.hostname, + path: `${url.pathname}${url.search}`, + method: init.method ?? 'GET', + headers: Object.fromEntries(headers.entries()) + }, + (response) => { + const chunks = [] + response.on('data', (chunk) => chunks.push(chunk)) + response.once('error', reject) + response.once('end', () => { + const responseHeaders = new Headers() + for (const [name, value] of Object.entries(response.headers)) { + if (Array.isArray(value)) { + for (const item of value) responseHeaders.append(name, item) + } else if (value !== undefined) { + responseHeaders.set(name, value) + } + } + resolve( + new Response(Buffer.concat(chunks), { + status: response.statusCode ?? 500, + statusText: response.statusMessage, + headers: responseHeaders + }) + ) + }) + } + ) + request.setTimeout(360_000, () => request.destroy(new Error('Cloudflare request timed out.'))) + request.once('error', reject) + if (init.body !== undefined && init.body !== null) request.write(init.body) + request.end() + }) +} + +export async function uploadFileMultipart(options) { + const { + endpoint, + token, + version, + key, + source, + contentType, + cacheControl, + partSize = DEFAULT_MULTIPART_PART_SIZE, + concurrency = DEFAULT_MULTIPART_CONCURRENCY, + maxPartAttempts = 4, + retryDelayMs = 1_000, + fetchImpl, + onProgress = () => {} + } = options + assertMultipartReleaseKey(key, version) + if ( + !endpoint.startsWith('http://127.0.0.1:') && + !/^https:\/\/[a-z0-9-]+\.[a-z0-9-]+\.workers\.dev$/.test(endpoint) + ) { + throw new Error(`Multipart uploader endpoint is not an approved Wrangler Worker: ${endpoint}`) + } + if (!token) throw new Error('Multipart uploader token is required.') + if (!Number.isSafeInteger(partSize) || partSize <= 0) { + throw new Error(`Invalid multipart part size: ${partSize}`) + } + if (!Number.isSafeInteger(concurrency) || concurrency < 1 || concurrency > 8) { + throw new Error(`Invalid multipart concurrency: ${concurrency}`) + } + if (!Number.isSafeInteger(maxPartAttempts) || maxPartAttempts < 1 || maxPartAttempts > 8) { + throw new Error(`Invalid multipart retry count: ${maxPartAttempts}`) + } + const send = fetchImpl ?? fetchCloudflareWorker + + const { size: totalBytes } = await stat(source) + const request = async (pathname, init) => { + const response = await send(`${endpoint}${pathname}`, { + ...init, + headers: { + authorization: `Bearer ${token}`, + ...init.headers + } + }) + if (!response.ok) { + const detail = await response.text().catch(() => '') + throw new Error(`R2 multipart ${init.method} ${pathname} failed (${response.status}): ${detail}`) + } + return response + } + + const created = await request('/multipart/create', { + method: 'POST', + headers: { 'content-type': 'application/json' }, + body: JSON.stringify({ key, version, contentType, cacheControl }) + }) + const { uploadId } = await created.json() + if (typeof uploadId !== 'string' || !uploadId) { + throw new Error('R2 multipart create did not return an uploadId.') + } + + const uploadedParts = [] + let completedBytes = 0 + try { + const partCount = Math.ceil(totalBytes / partSize) + const file = await open(source, 'r') + let nextPartNumber = 1 + const uploadNextParts = async () => { + while (nextPartNumber <= partCount) { + const partNumber = nextPartNumber + nextPartNumber += 1 + const position = (partNumber - 1) * partSize + const length = Math.min(partSize, totalBytes - position) + const chunk = Buffer.allocUnsafe(length) + const { bytesRead } = await file.read(chunk, 0, length, position) + if (bytesRead !== length) { + throw new Error(`Could only read ${bytesRead} of ${length} bytes for part ${partNumber}.`) + } + const query = new URLSearchParams({ key, version, uploadId, partNumber: String(partNumber) }) + let response + let lastError + for (let attempt = 1; attempt <= maxPartAttempts; attempt += 1) { + try { + response = await request(`/multipart/part?${query}`, { + method: 'PUT', + headers: { 'content-type': 'application/octet-stream' }, + body: chunk, + duplex: 'half' + }) + break + } catch (error) { + lastError = error + if (attempt < maxPartAttempts && retryDelayMs > 0) { + await new Promise((resolve) => setTimeout(resolve, retryDelayMs * attempt)) + } + } + } + if (!response) throw lastError ?? new Error(`R2 multipart part ${partNumber} failed.`) + const result = await response.json() + if (typeof result.etag !== 'string' || !result.etag) { + throw new Error(`R2 multipart part ${partNumber} did not return an etag.`) + } + uploadedParts.push({ partNumber, etag: result.etag }) + completedBytes += length + onProgress({ key, completedBytes, totalBytes }) + } + } + const workers = Array.from({ length: Math.min(concurrency, partCount) }, () => uploadNextParts()) + const results = await Promise.allSettled(workers) + await file.close() + const failed = results.find((result) => result.status === 'rejected') + if (failed) throw failed.reason + uploadedParts.sort((left, right) => left.partNumber - right.partNumber) + await request('/multipart/complete', { + method: 'POST', + headers: { 'content-type': 'application/json' }, + body: JSON.stringify({ key, version, uploadId, parts: uploadedParts }) + }) + } catch (error) { + await request('/multipart/abort', { + method: 'POST', + headers: { 'content-type': 'application/json' }, + body: JSON.stringify({ key, version, uploadId }) + }).catch(() => {}) + throw error + } +} + +export async function copyR2Object(options) { + const { + endpoint, + token, + version, + sourceKey, + targetKey, + contentType, + cacheControl, + fetchImpl = fetchCloudflareWorker + } = options + assertMultipartReleaseKey(sourceKey, version) + if (sourceKey !== `releases/v${version}/sherlock-mac-arm64.dmg`) { + throw new Error(`Only the current immutable DMG can be promoted: ${sourceKey}`) + } + if (targetKey !== 'download/sherlock-mac-arm64.dmg') { + throw new Error(`Only the stable Sherlock DMG can be promoted: ${targetKey}`) + } + const response = await fetchImpl(`${endpoint}/copy`, { + method: 'POST', + headers: { + authorization: `Bearer ${token}`, + 'content-type': 'application/json' + }, + body: JSON.stringify({ sourceKey, targetKey, version, contentType, cacheControl }) + }) + if (!response.ok) { + const detail = await response.text().catch(() => '') + throw new Error(`R2 Worker copy failed (${response.status}): ${detail}`) + } +} diff --git a/scripts/cloudflare-r2-multipart-worker.d.mts b/scripts/cloudflare-r2-multipart-worker.d.mts new file mode 100644 index 000000000..c5ef4bff2 --- /dev/null +++ b/scripts/cloudflare-r2-multipart-worker.d.mts @@ -0,0 +1,12 @@ +declare const worker: { + fetch(request: Request, env: { + RELEASE_UPLOAD_TOKEN: string + RELEASE_VERSION: string + SHERLOCK_RELEASES: { + createMultipartUpload(key: string, options?: unknown): Promise<{ uploadId: string }> + resumeMultipartUpload?(key: string, uploadId: string): unknown + } + }): Promise +} + +export default worker diff --git a/scripts/cloudflare-r2-multipart-worker.mjs b/scripts/cloudflare-r2-multipart-worker.mjs new file mode 100644 index 000000000..df7354647 --- /dev/null +++ b/scripts/cloudflare-r2-multipart-worker.mjs @@ -0,0 +1,120 @@ +const json = (value, status = 200) => + Response.json(value, { + status, + headers: { 'cache-control': 'no-store' } + }) + +function assertAuthorized(request, env) { + if ( + typeof env.RELEASE_UPLOAD_TOKEN !== 'string' || + request.headers.get('authorization') !== `Bearer ${env.RELEASE_UPLOAD_TOKEN}` + ) { + throw new HttpError(401, 'Unauthorized') + } +} + +function assertReleaseTarget(key, version, env) { + if (version !== env.RELEASE_VERSION) { + throw new HttpError(400, 'Release version does not match the active upload session.') + } + const escapedVersion = version.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') + const immutable = new RegExp( + `^releases/v${escapedVersion}/sherlock-mac-arm64(?:-legacy)?\\.(?:zip|dmg)$` + ) + if (!immutable.test(key) && key !== 'download/sherlock-mac-arm64.dmg') { + throw new HttpError(400, 'Key is not an allowed Sherlock release payload.') + } +} + +async function parseJson(request) { + try { + return await request.json() + } catch { + throw new HttpError(400, 'Request body must be valid JSON.') + } +} + +class HttpError extends Error { + constructor(status, message) { + super(message) + this.status = status + } +} + +export default { + async fetch(request, env) { + try { + assertAuthorized(request, env) + const url = new URL(request.url) + if (request.method === 'GET' && url.pathname === '/health') { + return json({ ok: true, version: env.RELEASE_VERSION }) + } + + if (request.method === 'POST' && url.pathname === '/multipart/create') { + const { key, version, contentType, cacheControl } = await parseJson(request) + assertReleaseTarget(key, version, env) + const upload = await env.SHERLOCK_RELEASES.createMultipartUpload(key, { + httpMetadata: { contentType, cacheControl } + }) + return json({ uploadId: upload.uploadId }) + } + + if (request.method === 'PUT' && url.pathname === '/multipart/part') { + const key = url.searchParams.get('key') + const version = url.searchParams.get('version') + const uploadId = url.searchParams.get('uploadId') + const partNumber = Number(url.searchParams.get('partNumber')) + assertReleaseTarget(key, version, env) + if (!uploadId || !Number.isSafeInteger(partNumber) || partNumber < 1 || !request.body) { + throw new HttpError(400, 'Multipart part parameters are invalid.') + } + const upload = env.SHERLOCK_RELEASES.resumeMultipartUpload(key, uploadId) + const part = await upload.uploadPart(partNumber, request.body) + return json({ partNumber: part.partNumber, etag: part.etag }) + } + + if (request.method === 'POST' && url.pathname === '/multipart/complete') { + const { key, version, uploadId, parts } = await parseJson(request) + assertReleaseTarget(key, version, env) + if (!uploadId || !Array.isArray(parts) || parts.length === 0) { + throw new HttpError(400, 'Multipart completion parameters are invalid.') + } + const upload = env.SHERLOCK_RELEASES.resumeMultipartUpload(key, uploadId) + await upload.complete(parts) + return json({ ok: true }) + } + + if (request.method === 'POST' && url.pathname === '/multipart/abort') { + const { key, version, uploadId } = await parseJson(request) + assertReleaseTarget(key, version, env) + if (!uploadId) throw new HttpError(400, 'Multipart uploadId is required.') + const upload = env.SHERLOCK_RELEASES.resumeMultipartUpload(key, uploadId) + await upload.abort() + return json({ ok: true }) + } + + if (request.method === 'POST' && url.pathname === '/copy') { + const { sourceKey, targetKey, version, contentType, cacheControl } = await parseJson(request) + assertReleaseTarget(sourceKey, version, env) + if (sourceKey !== `releases/v${version}/sherlock-mac-arm64.dmg`) { + throw new HttpError(400, 'Only the current immutable DMG can be promoted.') + } + if (targetKey !== 'download/sherlock-mac-arm64.dmg') { + throw new HttpError(400, 'Only the stable Sherlock DMG can be promoted.') + } + const source = await env.SHERLOCK_RELEASES.get(sourceKey) + if (!source) throw new HttpError(404, 'Immutable DMG was not found.') + await env.SHERLOCK_RELEASES.put(targetKey, source.body, { + httpMetadata: { contentType, cacheControl } + }) + return json({ ok: true }) + } + + return json({ error: 'Not found' }, 404) + } catch (error) { + if (error instanceof HttpError) return json({ error: error.message }, error.status) + console.error(error) + return json({ error: 'Multipart upload failed.' }, 500) + } + } +} diff --git a/scripts/cloudflare-release-plan.d.mts b/scripts/cloudflare-release-plan.d.mts new file mode 100644 index 000000000..56e29fbf0 --- /dev/null +++ b/scripts/cloudflare-release-plan.d.mts @@ -0,0 +1,20 @@ +export type CloudflareUploadPhase = 'immutable' | 'stable' | 'metadata' + +export interface CloudflareUploadEntry { + phase: CloudflareUploadPhase + source: string + key: string + contentType: string + cacheControl: string +} + +export interface CloudflareReleasePlanOptions { + version: string + tag?: string + assetDirectory: string + outputDirectory: string +} + +export function buildCloudflareReleasePlan( + options: CloudflareReleasePlanOptions +): Promise diff --git a/scripts/cloudflare-release-plan.mjs b/scripts/cloudflare-release-plan.mjs new file mode 100644 index 000000000..056ae6a8d --- /dev/null +++ b/scripts/cloudflare-release-plan.mjs @@ -0,0 +1,174 @@ +import { access, mkdir, readFile, readdir, writeFile } from 'node:fs/promises' +import path from 'node:path' +import { parse, stringify } from 'yaml' + +const IMMUTABLE_CACHE = 'public, max-age=31536000, immutable' +const REVALIDATE_CACHE = 'no-cache, max-age=0, must-revalidate' +const METADATA_TARGETS = new Map([ + ['latest.yml', 'latest/latest.yml'], + ['latest-mac.yml', 'latest/latest-mac.yml'], + ['latest-mac-notarized.yml', 'notarized/latest/latest-mac.yml'] +]) +const METADATA_FILES = [...METADATA_TARGETS.keys()] + +/** + * @typedef {'immutable' | 'stable' | 'metadata'} UploadPhase + * @typedef {{ phase: UploadPhase, source: string, key: string, contentType: string, cacheControl: string }} UploadEntry + * @typedef {{ version: string, tag?: string, assetDirectory: string, outputDirectory: string }} ReleasePlanOptions + */ + +/** + * Build the complete, ordered R2 upload plan without publishing anything. + * Immutable payloads always precede stable aliases and mutable update metadata. + * + * @param {ReleasePlanOptions} options + * @returns {Promise} + */ +export async function buildCloudflareReleasePlan(options) { + const version = validateVersion(options.version) + const tag = options.tag ?? `v${version}` + if (tag !== `v${version}`) { + throw new Error(`Release tag ${tag} does not match version ${version}.`) + } + + const assetDirectory = path.resolve(options.assetDirectory) + const outputDirectory = path.resolve(options.outputDirectory) + const directoryEntries = await readdir(assetDirectory, { withFileTypes: true }) + const assetNames = directoryEntries + .filter((entry) => entry.isFile() && !METADATA_FILES.includes(entry.name)) + .map((entry) => entry.name) + .sort((left, right) => left.localeCompare(right, 'en')) + + const metadataNames = [] + for (const name of METADATA_FILES) { + if (directoryEntries.some((entry) => entry.isFile() && entry.name === name)) { + metadataNames.push(name) + } + } + if (metadataNames.length === 0) { + throw new Error('Release assets are missing latest.yml or latest-mac.yml metadata.') + } + + await mkdir(outputDirectory, { recursive: true }) + for (const name of metadataNames) { + const source = path.join(assetDirectory, name) + const metadata = parse(await readFile(source, 'utf8')) + validateMetadata(metadata, name, version) + await validateAndRewriteReferences(metadata, assetDirectory, tag, name) + await writeFile(path.join(outputDirectory, name), stringify(metadata), 'utf8') + } + + /** @type {UploadEntry[]} */ + const plan = assetNames.map((name) => ({ + phase: /** @type {const} */ ('immutable'), + source: path.join(assetDirectory, name), + key: `releases/${tag}/${name}`, + contentType: contentTypeFor(name), + cacheControl: IMMUTABLE_CACHE + })) + + for (const name of assetNames.filter((name) => name.endsWith('.dmg'))) { + plan.push({ + phase: 'stable', + source: path.join(assetDirectory, name), + key: `download/${name}`, + contentType: contentTypeFor(name), + cacheControl: REVALIDATE_CACHE + }) + } + + for (const name of metadataNames) { + plan.push({ + phase: 'metadata', + source: path.join(outputDirectory, name), + key: METADATA_TARGETS.get(name), + contentType: contentTypeFor(name), + cacheControl: REVALIDATE_CACHE + }) + } + + assertAtomicOrder(plan) + return plan +} + +function validateVersion(value) { + if (typeof value !== 'string' || !/^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/.test(value)) { + throw new Error(`Invalid release version: ${String(value)}`) + } + return value +} + +function validateMetadata(metadata, name, version) { + if (!metadata || typeof metadata !== 'object') { + throw new Error(`${name} is not valid update metadata.`) + } + if (metadata.version !== version) { + throw new Error(`${name} version ${String(metadata.version)} does not match ${version}.`) + } + if (!Array.isArray(metadata.files) || metadata.files.length === 0) { + throw new Error(`${name} must contain at least one update file.`) + } + for (const file of metadata.files) { + if (!file || typeof file !== 'object' || typeof file.sha512 !== 'string' || !file.sha512.trim()) { + throw new Error(`${name} contains an update file without sha512.`) + } + } + if (metadata.path !== undefined && (typeof metadata.sha512 !== 'string' || !metadata.sha512.trim())) { + throw new Error(`${name} contains a path without sha512.`) + } +} + +async function validateAndRewriteReferences(metadata, assetDirectory, tag, metadataName) { + const releasesPrefix = + metadataName === 'latest-mac-notarized.yml' ? '../../releases' : '../releases' + for (const file of metadata.files) { + const filename = safeAssetFilename(file.url) + await requireFile(path.join(assetDirectory, filename), filename) + file.url = `${releasesPrefix}/${tag}/${filename}` + } + + if (metadata.path !== undefined) { + const filename = safeAssetFilename(metadata.path) + await requireFile(path.join(assetDirectory, filename), filename) + metadata.path = `${releasesPrefix}/${tag}/${filename}` + } +} + +function safeAssetFilename(value) { + if ( + typeof value !== 'string' || + !/^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(value) || + path.basename(value) !== value + ) { + throw new Error(`Update metadata requires a safe asset filename, received: ${String(value)}`) + } + return value +} + +async function requireFile(filename, displayName) { + try { + await access(filename) + } catch { + throw new Error(`Update metadata references missing asset: ${displayName}`) + } +} + +function assertAtomicOrder(plan) { + const rank = { immutable: 0, stable: 1, metadata: 2 } + let previous = -1 + for (const entry of plan) { + const current = rank[entry.phase] + if (current < previous) { + throw new Error('Cloudflare release metadata was scheduled before immutable assets.') + } + previous = current + } +} + +function contentTypeFor(filename) { + if (filename.endsWith('.yml') || filename.endsWith('.yaml')) return 'application/yaml' + if (filename.endsWith('.zip')) return 'application/zip' + if (filename.endsWith('.dmg')) return 'application/x-apple-diskimage' + if (filename.endsWith('.exe')) return 'application/vnd.microsoft.portable-executable' + return 'application/octet-stream' +} diff --git a/scripts/cloudflare-release-retention.d.mts b/scripts/cloudflare-release-retention.d.mts new file mode 100644 index 000000000..cfbc05485 --- /dev/null +++ b/scripts/cloudflare-release-retention.d.mts @@ -0,0 +1,28 @@ +export interface ReleaseInventory { + schemaVersion: 1 + releases: Record +} + +export interface PublicationPlanEntry { + phase: string + key: string +} + +export interface ReleaseRetentionPlan { + deletedVersion: string + deleteKeys: string[] + nextInventory: ReleaseInventory +} + +export function validateReleaseInventory(value: unknown): ReleaseInventory + +export function immutableKeysFromPublicationPlan( + plan: PublicationPlanEntry[], + version: string +): string[] + +export function buildReleaseRetentionPlan(options: { + inventory: ReleaseInventory + currentVersion: string + currentKeys: string[] +}): ReleaseRetentionPlan diff --git a/scripts/cloudflare-release-retention.mjs b/scripts/cloudflare-release-retention.mjs new file mode 100644 index 000000000..00a32fc6d --- /dev/null +++ b/scripts/cloudflare-release-retention.mjs @@ -0,0 +1,107 @@ +const VERSION_PATTERN = /^\d+\.\d+\.\d+$/ + +export function validateReleaseInventory(value) { + if (!value || typeof value !== 'object' || value.schemaVersion !== 1) { + throw new Error('Release inventory must use schemaVersion 1.') + } + if (!value.releases || typeof value.releases !== 'object' || Array.isArray(value.releases)) { + throw new Error('Release inventory must contain a releases object.') + } + + for (const [version, keys] of Object.entries(value.releases)) { + validateVersion(version) + if (!Array.isArray(keys) || keys.length === 0) { + throw new Error(`Release ${version} must contain at least one immutable release key.`) + } + const uniqueKeys = new Set(keys) + if (uniqueKeys.size !== keys.length) { + throw new Error(`Release ${version} contains a duplicate object key.`) + } + for (const key of keys) validateImmutableKey(key, version) + } + return value +} + +export function immutableKeysFromPublicationPlan(plan, version) { + validateVersion(version) + if (!Array.isArray(plan)) throw new Error('Cloudflare publication plan must be an array.') + const keys = plan + .filter((entry) => entry && entry.phase === 'immutable') + .map((entry) => entry.key) + .sort((left, right) => left.localeCompare(right, 'en')) + if (keys.length === 0) throw new Error('Cloudflare publication plan has no immutable keys.') + if (new Set(keys).size !== keys.length) { + throw new Error('Cloudflare publication plan contains a duplicate immutable key.') + } + for (const key of keys) validateImmutableKey(key, version) + return keys +} + +export function buildReleaseRetentionPlan({ inventory, currentVersion, currentKeys }) { + validateReleaseInventory(inventory) + validateVersion(currentVersion) + if (Object.hasOwn(inventory.releases, currentVersion)) { + throw new Error(`Release ${currentVersion} already exists in the retention inventory.`) + } + if (!Array.isArray(currentKeys) || currentKeys.length === 0) { + throw new Error('The current release must contain at least one immutable release key.') + } + const normalizedCurrentKeys = [...currentKeys].sort((left, right) => + left.localeCompare(right, 'en') + ) + if (new Set(normalizedCurrentKeys).size !== normalizedCurrentKeys.length) { + throw new Error(`Release ${currentVersion} contains a duplicate object key.`) + } + for (const key of normalizedCurrentKeys) validateImmutableKey(key, currentVersion) + + const previousVersions = Object.keys(inventory.releases).sort(compareVersions) + if (previousVersions.length === 0) { + throw new Error('No older release exists; refusing to prune the current release.') + } + const deletedVersion = previousVersions[0] + const deleteKeys = [...inventory.releases[deletedVersion]] + const retainedEntries = previousVersions + .slice(1) + .map((version) => [version, [...inventory.releases[version]]]) + retainedEntries.push([currentVersion, normalizedCurrentKeys]) + retainedEntries.sort(([left], [right]) => compareVersions(left, right)) + + return { + deletedVersion, + deleteKeys, + nextInventory: { + schemaVersion: 1, + releases: Object.fromEntries(retainedEntries) + } + } +} + +function validateVersion(version) { + if (typeof version !== 'string' || !VERSION_PATTERN.test(version)) { + throw new Error(`Invalid stable release version: ${String(version)}`) + } +} + +function validateImmutableKey(key, version) { + if (typeof key !== 'string' || !key.startsWith('releases/v')) { + throw new Error(`Release ${version} contains a non-immutable release key: ${String(key)}`) + } + const expectedPrefix = `releases/v${version}/` + if (!key.startsWith(expectedPrefix)) { + throw new Error(`Object key ${key} does not belong to release ${version}.`) + } + const filename = key.slice(expectedPrefix.length) + if (!filename || filename.includes('/') || filename === '.' || filename === '..') { + throw new Error(`Release ${version} contains an unsafe object key: ${key}`) + } +} + +function compareVersions(left, right) { + const leftParts = left.split('.').map(Number) + const rightParts = right.split('.').map(Number) + for (let index = 0; index < 3; index += 1) { + const difference = leftParts[index] - rightParts[index] + if (difference !== 0) return difference + } + return 0 +} diff --git a/scripts/create-sherlock-session-handoff.mjs b/scripts/create-sherlock-session-handoff.mjs new file mode 100644 index 000000000..d70f7603e --- /dev/null +++ b/scripts/create-sherlock-session-handoff.mjs @@ -0,0 +1,64 @@ +#!/usr/bin/env node +import { readFileSync } from 'node:fs' +import path from 'node:path' +import { buildFeatureHandoff, handoffOutputPath, writeFeatureHandoff } from './lib/sherlock-integration-model.mjs' + +function usage() { + return '用法：create-sherlock-session-handoff --repo --base --metadata [--output ] [--format text|json]' +} + +function parseArguments(argv) { + if (argv.length === 1 && argv[0] === '--help') return { help: true } + const values = new Map() + for (let index = 0; index < argv.length; index += 1) { + const option = argv[index] + if (!['--repo', '--base', '--metadata', '--output', '--format'].includes(option)) { + throw new Error(`${usage()}\n未知参数：${option}`) + } + if (values.has(option)) throw new Error(`${usage()}\n参数不能重复：${option}`) + const value = argv[index + 1] + if (!value || value.startsWith('--')) throw new Error(`${usage()}\n参数缺少值：${option}`) + values.set(option, value) + index += 1 + } + for (const required of ['--repo', '--base', '--metadata']) { + if (!values.has(required)) throw new Error(`${usage()}\n缺少必填参数：${required}`) + } + const format = values.get('--format') ?? 'text' + if (format !== 'text' && format !== 'json') throw new Error(`${usage()}\n--format 只能是 text 或 json。`) + return { + repository: values.get('--repo'), + baseCommit: values.get('--base'), + metadataPath: values.get('--metadata'), + outputPath: values.get('--output'), + format + } +} + +function main() { + const options = parseArguments(process.argv.slice(2)) + if (options.help) { + process.stdout.write(`${usage()}\n`) + return + } + const metadata = JSON.parse(readFileSync(options.metadataPath, 'utf8')) + const handoff = buildFeatureHandoff({ + repository: options.repository, + baseCommit: options.baseCommit, + metadata, + generatedAt: metadata.generatedAt + }) + const outputPath = options.outputPath + ? path.resolve(options.outputPath) + : handoffOutputPath(options.repository, handoff) + const bytes = writeFeatureHandoff(outputPath, handoff) + if (options.format === 'json') process.stdout.write(bytes) + else process.stdout.write(`${outputPath}\n`) +} + +try { + main() +} catch (error) { + process.stderr.write(`${error instanceof Error ? error.message : String(error)}\n`) + process.exitCode = 2 +} diff --git a/scripts/install-brand-assets.mjs b/scripts/install-brand-assets.mjs index 1720b1d6f..9098976a8 100644 --- a/scripts/install-brand-assets.mjs +++ b/scripts/install-brand-assets.mjs @@ -1,11 +1,11 @@ -import { copyFile, mkdir, readFile, writeFile } from 'node:fs/promises' +import { copyFile, cp, mkdir, readFile, rm, writeFile } from 'node:fs/promises' import { fileURLToPath } from 'node:url' import path from 'node:path' const projectRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..') const source = path.join(projectRoot, 'build', 'icon.png') -const lightSource = path.join(projectRoot, 'build', 'logo-light.png') -const darkSource = path.join(projectRoot, 'build', 'logo-dark.png') +const sherlockSource = path.join(projectRoot, 'build', 'sherlock-logo.svg') +const sherlockResearchSource = path.join(projectRoot, 'build', 'sherlock-research.svg') const destinationDirectory = path.join( projectRoot, 'node_modules', @@ -13,49 +13,120 @@ const destinationDirectory = path.join( 'dsh-web-frontend', 'dist' ) -const destination = path.join(destinationDirectory, 'dsh-desktop-logo.png') -const lightDestination = path.join(destinationDirectory, 'dsh-desktop-logo-light.png') -const darkDestination = path.join(destinationDirectory, 'dsh-desktop-logo-dark.png') +const destination = path.join(destinationDirectory, 'sherlock-icon.png') +const legacyDestination = path.join(destinationDirectory, 'dsh-desktop-logo.png') +const sherlockDestination = path.join(destinationDirectory, 'sherlock-logo.svg') +const sherlockResearchDestination = path.join(destinationDirectory, 'sherlock-research.svg') const indexPath = path.join(destinationDirectory, 'index.html') const manifestPath = path.join(destinationDirectory, 'manifest.webmanifest') +const shippedPresetRoot = path.join( + projectRoot, + 'node_modules', + '@deepseek-ai', + 'dsh', + 'config', + 'agent-presets' +) +const sherlockPresetRoot = path.join( + projectRoot, + 'node_modules', + '@deepseek-ai', + 'dsh', + 'config', + 'sherlock-agent-presets' +) +const sherlockPersonaText = 'You are a coding agent powered by the {{model}} model. Your working directory is {{cwd}}. During multi-step work, provide concise user-facing progress updates in the user\'s language before substantial new work and after meaningful milestones. Each update should briefly state what has been established and what comes next, then continue the task without waiting for acknowledgment. Do not reveal private reasoning, raw commands, local paths, credentials, or repetitive tool logs. For long-running work, provide a useful update whenever you regain control after a meaningful phase instead of leaving the user with only a loading indicator. Keep the final answer focused on the outcome and do not repeat the entire progress transcript.' function replaceRequired(contents, search, replacement, file) { if (contents.includes(replacement)) return contents if (!contents.includes(search)) { - throw new Error(`Could not update DSH Desktop branding in ${file}: expected content was not found`) + throw new Error(`Could not update Sherlock branding in ${file}: expected content was not found`) + } + return contents.replace(search, replacement) +} + +function replaceRequiredAny(contents, searches, replacement, file) { + if (contents.includes(replacement)) return contents + const search = searches.find((candidate) => contents.includes(candidate)) + if (!search) { + throw new Error(`Could not update Sherlock branding in ${file}: expected content was not found`) } return contents.replace(search, replacement) } await mkdir(destinationDirectory, { recursive: true }) await copyFile(source, destination) -await copyFile(lightSource, lightDestination) -await copyFile(darkSource, darkDestination) +await copyFile(sherlockSource, sherlockDestination) +await copyFile(sherlockResearchSource, sherlockResearchDestination) +await rm(legacyDestination, { force: true }) +await rm(sherlockPresetRoot, { recursive: true, force: true }) +await mkdir(sherlockPresetRoot, { recursive: true }) +await cp( + path.join(shippedPresetRoot, 'standard'), + path.join(sherlockPresetRoot, 'standard'), + { recursive: true } +) +const sherlockAgentPath = path.join(sherlockPresetRoot, 'standard', 'agent.cordis.yml') +const sherlockAgent = await readFile(sherlockAgentPath, 'utf8') +await writeFile( + sherlockAgentPath, + replaceRequired( + sherlockAgent, + 'You are a coding agent powered by the {{model}} model. Your working directory is {{cwd}}.', + sherlockPersonaText, + path.relative(projectRoot, sherlockAgentPath) + ), + 'utf8' +) const index = await readFile(indexPath, 'utf8') +const brandedIndex = replaceRequiredAny( + index, + [ + '', + '' + ], + '', + path.relative(projectRoot, indexPath) +) await writeFile( indexPath, replaceRequired( - index, - '', - '', + brandedIndex, + 'DeepSeek Harness', + 'Sherlock', path.relative(projectRoot, indexPath) ) ) const manifest = await readFile(manifestPath, 'utf8') -await writeFile( - manifestPath, +const namedManifest = replaceRequired( replaceRequired( manifest, - '"src": "/favicon.svg",\n "sizes": "any",\n "type": "image/svg+xml"', - '"src": "/dsh-desktop-logo.png",\n "sizes": "1254x1254",\n "type": "image/png"', + '"name": "DeepSeek Harness"', + '"name": "Sherlock"', + path.relative(projectRoot, manifestPath) + ), + '"short_name": "DSH"', + '"short_name": "Sherlock"', + path.relative(projectRoot, manifestPath) +) +await writeFile( + manifestPath, + replaceRequiredAny( + namedManifest, + [ + '"src": "/favicon.svg",\n "sizes": "any",\n "type": "image/svg+xml"', + '"src": "/dsh-desktop-logo.png",\n "sizes": "1254x1254",\n "type": "image/png"' + ], + '"src": "/sherlock-icon.png",\n "sizes": "1254x1254",\n "type": "image/png"', path.relative(projectRoot, manifestPath) ) ) -console.log(`Installed DSH Desktop brand assets: ${[ +console.log(`Installed Sherlock brand assets: ${[ destination, - lightDestination, - darkDestination + sherlockDestination, + sherlockResearchDestination, + path.join(sherlockPresetRoot, 'standard') ].map((file) => path.relative(projectRoot, file)).join(', ')}`) diff --git a/scripts/install-local-git-policy.mjs b/scripts/install-local-git-policy.mjs new file mode 100644 index 000000000..08594dc33 --- /dev/null +++ b/scripts/install-local-git-policy.mjs @@ -0,0 +1,28 @@ +import { execFileSync } from 'node:child_process' +import { existsSync } from 'node:fs' +import path from 'node:path' + +function readOption(name) { + const index = process.argv.indexOf(name) + if (index === -1) return undefined + const value = process.argv[index + 1] + if (!value || value.startsWith('--')) throw new Error(`${name} 缺少路径参数。`) + return value +} + +try { + const repository = path.resolve(readOption('--repo') ?? process.cwd()) + if (!existsSync(path.join(repository, '.githooks'))) { + throw new Error(`仓库缺少 .githooks 目录：${repository}`) + } + execFileSync('git', ['-C', repository, 'rev-parse', '--git-dir'], { stdio: 'ignore' }) + execFileSync( + 'git', + ['-C', repository, 'config', '--local', 'core.hooksPath', '.githooks'], + { stdio: 'inherit' } + ) + console.log('已启用 Sherlock 本地 Git 规范：core.hooksPath=.githooks') +} catch (error) { + console.error(`安装本地 Git 规范失败：${error instanceof Error ? error.message : error}`) + process.exitCode = 1 +} diff --git a/scripts/install-pdfjs-assets.mjs b/scripts/install-pdfjs-assets.mjs new file mode 100644 index 000000000..153ecd89b --- /dev/null +++ b/scripts/install-pdfjs-assets.mjs @@ -0,0 +1,80 @@ +import { cp, mkdir, readFile, readdir, rename, rm, writeFile } from 'node:fs/promises' +import path from 'node:path' +import { fileURLToPath } from 'node:url' + +const PDFJS_VERSION = '4.10.38' +const projectRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..') + +function argument(name) { + const index = process.argv.indexOf(name) + if (index === -1) return undefined + const value = process.argv[index + 1] + if (!value || value.startsWith('--')) throw new Error(`${name} requires a path.`) + return path.resolve(value) +} + +const source = argument('--source') ?? path.join(projectRoot, 'node_modules', 'pdfjs-dist') +const destination = argument('--destination') ?? path.join( + projectRoot, + 'node_modules', + '@deepseek-ai', + 'dsh-web-frontend', + 'dist', + 'sherlock-pdfjs' +) +const destinationParent = path.dirname(destination) +const stagingPrefix = `${path.basename(destination)}.staging-` +const staging = path.join(destinationParent, `${stagingPrefix}${process.pid}`) + +function processIsRunning(pid) { + try { + process.kill(pid, 0) + return true + } catch (error) { + return error?.code === 'EPERM' + } +} + +async function removeStaleStagingDirectories() { + await mkdir(destinationParent, { recursive: true }) + for (const entry of await readdir(destinationParent, { withFileTypes: true })) { + if (!entry.isDirectory() || !entry.name.startsWith(stagingPrefix)) continue + const suffix = entry.name.slice(stagingPrefix.length) + if (!/^\d+$/.test(suffix)) continue + const pid = Number(suffix) + if (Number.isSafeInteger(pid) && pid > 0 && processIsRunning(pid)) continue + await rm(path.join(destinationParent, entry.name), { recursive: true, force: true }) + } +} + +if (!process.argv.includes('--source')) { + const manifest = JSON.parse(await readFile(path.join(source, 'package.json'), 'utf8')) + if (manifest.version !== PDFJS_VERSION) { + throw new Error(`Expected pdfjs-dist ${PDFJS_VERSION}, found ${String(manifest.version)}.`) + } +} + +await removeStaleStagingDirectories() +await rm(staging, { recursive: true, force: true }) +await mkdir(staging, { recursive: true }) +try { + await Promise.all([ + cp(path.join(source, 'build', 'pdf.min.mjs'), path.join(staging, 'pdf.min.js')), + cp(path.join(source, 'build', 'pdf.worker.min.mjs'), path.join(staging, 'pdf.worker.min.js')), + cp(path.join(source, 'LICENSE'), path.join(staging, 'LICENSE')), + cp(path.join(source, 'cmaps'), path.join(staging, 'cmaps'), { recursive: true }), + cp(path.join(source, 'standard_fonts'), path.join(staging, 'standard_fonts'), { recursive: true }) + ]) + await writeFile(path.join(staging, 'loader.js'), [ + "import * as pdfjsLib from './pdf.min.js'", + "pdfjsLib.GlobalWorkerOptions.workerSrc = '/sherlock-pdfjs/pdf.worker.min.js'", + 'globalThis.__sherlockPdfjs = pdfjsLib', + '' + ].join('\n')) + await rm(destination, { recursive: true, force: true }) + await rename(staging, destination) +} finally { + await rm(staging, { recursive: true, force: true }) +} + +console.log(`Installed PDF.js ${PDFJS_VERSION} assets: ${path.relative(projectRoot, destination)}`) diff --git a/scripts/lib/patch-sherlock-better-sidebar.d.mts b/scripts/lib/patch-sherlock-better-sidebar.d.mts new file mode 100644 index 000000000..3c01bc4b7 --- /dev/null +++ b/scripts/lib/patch-sherlock-better-sidebar.d.mts @@ -0,0 +1,2 @@ +export declare function patchBetterSidebarClient(source: string): string +export declare function patchBetterSidebarPackage(packageRoot: string): Promise diff --git a/scripts/lib/patch-sherlock-better-sidebar.mjs b/scripts/lib/patch-sherlock-better-sidebar.mjs new file mode 100644 index 000000000..b2049864e --- /dev/null +++ b/scripts/lib/patch-sherlock-better-sidebar.mjs @@ -0,0 +1,228 @@ +import { readFile, writeFile } from 'node:fs/promises' +import path from 'node:path' + +const PATCH_MARKER = '/* sherlock:pinned-sidebar-tabs:v1 */' +const RECONCILE_PATCH_MARKER = '/* sherlock:pinned-sidebar-reconcile:v1 */' +const EDGE_PATCH_MARKER = '/* sherlock:pinned-sidebar-edge:v1 */' +const FILE_DRAG_PATCH_MARKER = '/* sherlock:files-to-research-canvas:v2 */' +const LEGACY_FILE_DRAG_PATCH_MARKER = '/* sherlock:files-to-research-canvas:v1 */' +const PANEL_SURFACE_SYNC_PATCH_MARKER = '/* sherlock:panel-surface-sync:v1 */' +const PANEL_DRAG_DIMENSION_PATCH_MARKER = '/* sherlock:panel-drag-dimensions:v1 */' + +function replaceExact(source, before, after, label, expectedCount = 1) { + const count = source.split(before).length - 1 + if (count !== expectedCount) { + throw new Error(`Unable to patch Better Sidebar ${label}: expected ${expectedCount}, found ${count}`) + } + return source.split(before).join(after) +} + +/** + * Extend the bundled Better Sidebar runtime with the small host contract used + * by Research mode. The transform is deliberately exact so a plugin upgrade + * fails packaging instead of silently shipping a half-compatible sidebar. + */ +export function patchBetterSidebarClient(source) { + let next = source + + if (!next.includes(PATCH_MARKER)) next = replaceExact( + next, + '\t\tfunction openTabInActivePane(state, tab) {\n\t\t\tlet targetId = state.activePane ?? firstLeaf(state.splits).id;', + `\t\tfunction openTabInActivePane(state, tab) {\n\t\t\t${PATCH_MARKER}\n\t\t\tconst pinned = tab.meta?.sherlockPinned === true;\n\t\t\tlet targetId = pinned ? firstLeaf(state.splits).id : state.activePane ?? firstLeaf(state.splits).id;`, + 'pinned landing pane' + ) + if (!source.includes(PATCH_MARKER)) next = replaceExact( + next, + '\t\t\t\t[targetKey]: mapLeaf(state[targetKey], targetId, (leaf) => {\n\t\t\t\t\tleaf.tabs = [...leaf.tabs, tab];\n\t\t\t\t\tleaf.active = tab.id;', + '\t\t\t\t[targetKey]: mapLeaf(state[targetKey], targetId, (leaf) => {\n\t\t\t\t\tleaf.tabs = pinned ? [tab, ...leaf.tabs] : [...leaf.tabs, tab];\n\t\t\t\t\tleaf.active = tab.id;', + 'pinned first position' + ) + if (!next.includes(RECONCILE_PATCH_MARKER)) next = replaceExact( + next, + '\t\t\t\tconst existing = leaf.tabs.find((candidate) => candidate.id === tab.id);\n\t\t\t\tif (existing !== void 0) return activateTab(state, leaf.id, existing.id);', + `\t\t\t\tconst existing = leaf.tabs.find((candidate) => candidate.id === tab.id);\n\t\t\t\t${RECONCILE_PATCH_MARKER}\n\t\t\t\tif (existing !== void 0) {\n\t\t\t\t\tif (!pinned) return activateTab(state, leaf.id, existing.id);\n\t\t\t\t\tconst reconciled = { ...existing, ...tab, meta: { ...existing.meta, ...tab.meta } };\n\t\t\t\t\treturn openTabInActivePane(closeTab(state, leaf.id, existing.id), reconciled);\n\t\t\t\t}`, + 'persisted pinned tab reconciliation' + ) + + if (!next.includes(EDGE_PATCH_MARKER)) next = replaceExact( + next, + '\t\tfunction moveTabToEdge(state, fromPane, tabId, toPane, zone) {', + `\t\tfunction moveTabToEdge(state, fromPane, tabId, toPane, zone) {\n\t\t\t${EDGE_PATCH_MARKER}\n\t\t\tconst moving = leafWithTab(state[treeOf(state, fromPane)], tabId)?.tabs.find((tab) => tab.id === tabId);\n\t\t\tif (moving?.meta?.sherlockPinned === true) return state;\n\t\t\tconst targetHasPinned = leafWithTab(state[treeOf(state, toPane)], \"sherlock-research-conversation\")?.id === toPane;\n\t\t\tif (targetHasPinned && (zone === \"left\" || zone === \"up\")) zone = \"center\";`, + 'pinned edge boundary' + ) + + if (next.includes(FILE_DRAG_PATCH_MARKER) && !next.includes('const previewEligible = relativePath !== null')) { + next = replaceExact( + next, + '\t\t\tconst relativePath = safeSherlockSidebarRelativePath(filePath, cwd, relativePathHint);\n\t\t\tevent.dataTransfer.effectAllowed = "copy";\n\t\t\tevent.dataTransfer.setData("application/x-sherlock-file", JSON.stringify(relativePath === null ? { path: filePath, name } : { path: filePath, name, sessionId, relativePath }));', + '\t\t\tconst relativePath = safeSherlockSidebarRelativePath(filePath, cwd, relativePathHint);\n\t\t\tconst previewEligible = relativePath !== null && relativePath.length <= 512 && typeof sessionId === "string" && sessionId.length > 0 && sessionId.length <= 512;\n\t\t\tevent.dataTransfer.effectAllowed = "copy";\n\t\t\tevent.dataTransfer.setData("application/x-sherlock-file", JSON.stringify(previewEligible ? { path: filePath, name, sessionId, relativePath } : { path: filePath, name }));', + 'bounded Research file preview identity' + ) + } + + if (!next.includes(FILE_DRAG_PATCH_MARKER) && next.includes(LEGACY_FILE_DRAG_PATCH_MARKER)) { + next = replaceExact( + next, + `${LEGACY_FILE_DRAG_PATCH_MARKER}\n\t\tfunction writeSherlockSidebarFileDrag(event, filePath, name) {\n\t\t\tif (event.dataTransfer === null) return;\n\t\t\tevent.dataTransfer.effectAllowed = "copy";\n\t\t\tevent.dataTransfer.setData("application/x-sherlock-file", JSON.stringify({ path: filePath, name }));\n\t\t}`, + `${FILE_DRAG_PATCH_MARKER}\n\t\tfunction safeSherlockSidebarRelativePath(filePath, cwd, relativePathHint) {\n\t\t\tconst raw = typeof relativePathHint === "string" ? relativePathHint : typeof cwd === "string" && (filePath.startsWith(\`\${cwd}/\`) || filePath.startsWith(\`\${cwd}\\\\\`)) ? filePath.slice(cwd.length + 1) : "";\n\t\t\tconst relativePath = raw.replaceAll("\\\\", "/");\n\t\t\tif (relativePath === "" || /^(?:\\/|[A-Za-z]:\\/)/.test(relativePath) || relativePath.split("/").some((part) => part === "" || part === "." || part === "..")) return null;\n\t\t\treturn relativePath;\n\t\t}\n\t\tfunction writeSherlockSidebarFileDrag(event, filePath, name, sessionId, cwd, relativePathHint) {\n\t\t\tif (event.dataTransfer === null) return;\n\t\t\tconst relativePath = safeSherlockSidebarRelativePath(filePath, cwd, relativePathHint);\n\t\t\tconst previewEligible = relativePath !== null && relativePath.length <= 512 && typeof sessionId === "string" && sessionId.length > 0 && sessionId.length <= 512;\n\t\t\tevent.dataTransfer.effectAllowed = "copy";\n\t\t\tevent.dataTransfer.setData("application/x-sherlock-file", JSON.stringify(previewEligible ? { path: filePath, name, sessionId, relativePath } : { path: filePath, name }));\n\t\t}`, + 'Research file drag payload upgrade' + ) + next = replaceExact(next, + 'writeSherlockSidebarFileDrag(event, entry.path, entry.name);', + 'writeSherlockSidebarFileDrag(event, entry.path, entry.name, sessionId, cwd);', + 'file tree preview identity') + next = replaceExact(next, + 'writeSherlockSidebarFileDrag(event, absolutePath, baseName$1(absolutePath));', + 'writeSherlockSidebarFileDrag(event, absolutePath, baseName$1(absolutePath), sessionId, cwd, rel);', + 'search result preview identity') + } + + if (!next.includes(FILE_DRAG_PATCH_MARKER)) { + next = replaceExact( + next, + `\t\tfunction baseName$1(path) {\n\t\t\tconst trimmed = path.replace(/[\\\\/]+$/, "");\n\t\t\tconst at = Math.max(trimmed.lastIndexOf("/"), trimmed.lastIndexOf("\\\\"));\n\t\t\treturn at === -1 ? trimmed : trimmed.slice(at + 1);\n\t\t}\n\t\t/** How long the row's "copied" label stays after a successful write. */`, + `\t\tfunction baseName$1(path) {\n\t\t\tconst trimmed = path.replace(/[\\\\/]+$/, "");\n\t\t\tconst at = Math.max(trimmed.lastIndexOf("/"), trimmed.lastIndexOf("\\\\"));\n\t\t\treturn at === -1 ? trimmed : trimmed.slice(at + 1);\n\t\t}\n\t\t${FILE_DRAG_PATCH_MARKER}\n\t\tfunction safeSherlockSidebarRelativePath(filePath, cwd, relativePathHint) {\n\t\t\tconst raw = typeof relativePathHint === "string" ? relativePathHint : typeof cwd === "string" && (filePath.startsWith(\`\${cwd}/\`) || filePath.startsWith(\`\${cwd}\\\\\`)) ? filePath.slice(cwd.length + 1) : "";\n\t\t\tconst relativePath = raw.replaceAll("\\\\", "/");\n\t\t\tif (relativePath === "" || /^(?:\\/|[A-Za-z]:\\/)/.test(relativePath) || relativePath.split("/").some((part) => part === "" || part === "." || part === "..")) return null;\n\t\t\treturn relativePath;\n\t\t}\n\t\tfunction writeSherlockSidebarFileDrag(event, filePath, name, sessionId, cwd, relativePathHint) {\n\t\t\tif (event.dataTransfer === null) return;\n\t\t\tconst relativePath = safeSherlockSidebarRelativePath(filePath, cwd, relativePathHint);\n\t\t\tconst previewEligible = relativePath !== null && relativePath.length <= 512 && typeof sessionId === "string" && sessionId.length > 0 && sessionId.length <= 512;\n\t\t\tevent.dataTransfer.effectAllowed = "copy";\n\t\t\tevent.dataTransfer.setData("application/x-sherlock-file", JSON.stringify(previewEligible ? { path: filePath, name, sessionId, relativePath } : { path: filePath, name }));\n\t\t}\n\t\t/** How long the row's "copied" label stays after a successful write. */`, + 'Research file drag payload' + ) + next = replaceExact( + next, + `\t\t\t\t\t\tstyle: { paddingLeft: depth * 22 + 6 },\n\t\t\t\t\t\ttitle: entry.broken ? \`\${entry.path} — \${t("brokenSymlink")}\` : entry.path,\n\t\t\t\t\t\tonClick: () => {`, + `\t\t\t\t\t\tstyle: { paddingLeft: depth * 22 + 6 },\n\t\t\t\t\t\ttitle: entry.broken ? \`\${entry.path} — \${t("brokenSymlink")}\` : entry.path,\n\t\t\t\t\t\tdraggable: true,\n\t\t\t\t\t\t"data-sherlock-file-drag-source": entry.path,\n\t\t\t\t\t\tonDragStart: (event) => {\n\t\t\t\t\t\t\twriteSherlockSidebarFileDrag(event, entry.path, entry.name, sessionId, cwd);\n\t\t\t\t\t\t},\n\t\t\t\t\t\tonClick: () => {`, + 'file tree drag source' + ) + next = replaceExact( + next, + `\t\t\t\t\t\terror === null && results !== null && results.matches.map((rel) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {\n\t\t\t\t\t\t\ttype: "button",\n\t\t\t\t\t\t\tclassName: sidebar_module_css_default.editorSearchResult,\n\t\t\t\t\t\t\ttitle: rel,\n\t\t\t\t\t\t\tonClick: () => {\n\t\t\t\t\t\t\t\tonOpenFile(resolveSidebarPath(cwd, rel));\n\t\t\t\t\t\t\t},\n\t\t\t\t\t\t\tchildren: rel\n\t\t\t\t\t\t}, rel)),`, + `\t\t\t\t\t\terror === null && results !== null && results.matches.map((rel) => {\n\t\t\t\t\t\t\tconst absolutePath = resolveSidebarPath(cwd, rel);\n\t\t\t\t\t\t\treturn /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {\n\t\t\t\t\t\t\t\ttype: "button",\n\t\t\t\t\t\t\t\tclassName: sidebar_module_css_default.editorSearchResult,\n\t\t\t\t\t\t\t\ttitle: rel,\n\t\t\t\t\t\t\t\tdraggable: true,\n\t\t\t\t\t\t\t\t"data-sherlock-file-drag-source": absolutePath,\n\t\t\t\t\t\t\t\tonDragStart: (event) => {\n\t\t\t\t\t\t\t\t\twriteSherlockSidebarFileDrag(event, absolutePath, baseName$1(absolutePath), sessionId, cwd, rel);\n\t\t\t\t\t\t\t\t},\n\t\t\t\t\t\t\t\tonClick: () => {\n\t\t\t\t\t\t\t\t\tonOpenFile(absolutePath);\n\t\t\t\t\t\t\t\t},\n\t\t\t\t\t\t\t\tchildren: rel\n\t\t\t\t\t\t\t}, rel);\n\t\t\t\t\t\t}),`, + 'search result drag source' + ) + } + + if (!next.includes(PANEL_DRAG_DIMENSION_PATCH_MARKER)) next = replaceExact( + next, + `\t\t\tconst applyDrag = (width, height) => { +\t\t\t\tpanelRef.current?.style.setProperty("width", \`\${width}px\`); +\t\t\t\tbottomRef.current?.style.setProperty("height", \`\${height}px\`); +\t\t\t\tbottomRef.current?.style.setProperty("right", \`\${window.innerWidth - centerRect.right + (width - (state?.width ?? 0))}px\`); +\t\t\t\twriteGeometry(width, height); +\t\t\t};`, + `\t\t\tconst applyDrag = (width, height) => { +\t\t\t\t${PANEL_DRAG_DIMENSION_PATCH_MARKER} +\t\t\t\tif (width > 0) panelRef.current?.style.setProperty("width", \`\${width}px\`); +\t\t\t\tif (height > 0) bottomRef.current?.style.setProperty("height", \`\${height}px\`); +\t\t\t\tbottomRef.current?.style.setProperty("right", \`\${window.innerWidth - centerRect.right + (width - (state?.width ?? 0))}px\`); +\t\t\t\twriteGeometry(width, height); +\t\t\t};`, + 'dragged panel physical dimensions' + ) + + if (!next.includes(PANEL_SURFACE_SYNC_PATCH_MARKER)) next = replaceExact( + next, + `\t\t\t(0, react.useEffect)(() => { +\t\t\t\tif (anyDragging) document.body.setAttribute("data-dsh-sidebar-dragging", ""); +\t\t\t\telse document.body.removeAttribute("data-dsh-sidebar-dragging"); +\t\t\t}, [anyDragging]);`, + `\t\t\t(0, react.useLayoutEffect)(() => { +\t\t\t\t${PANEL_SURFACE_SYNC_PATCH_MARKER} +\t\t\t\tconst committed = snapshot.state; +\t\t\t\tif (anyDragging || narrow || committed === void 0) return; +\t\t\t\tpanelRef.current?.style.setProperty("width", \`\${Math.min(committed.width, window.innerWidth)}px\`); +\t\t\t\tbottomRef.current?.style.setProperty("height", \`\${Math.min(committed.bottomHeight, window.innerHeight)}px\`); +\t\t\t\tif (centerRect.right > 0) bottomRef.current?.style.setProperty("right", \`\${window.innerWidth - centerRect.right}px\`); +\t\t\t}, [ +\t\t\t\tanyDragging, +\t\t\t\tnarrow, +\t\t\t\tsnapshot.state?.panelOpen, +\t\t\t\tsnapshot.state?.width, +\t\t\t\tsnapshot.state?.bottomOpen, +\t\t\t\tsnapshot.state?.bottomHeight, +\t\t\t\tcenterRect.right +\t\t\t]); +\t\t\t(0, react.useEffect)(() => { +\t\t\t\tif (anyDragging) document.body.setAttribute("data-dsh-sidebar-dragging", ""); +\t\t\t\telse document.body.removeAttribute("data-dsh-sidebar-dragging"); +\t\t\t}, [anyDragging]);`, + 'committed panel surface dimensions' + ) + + if (source.includes(PATCH_MARKER)) return next + + const moveBefore = `\t\t\t\t\tconst insertAt = index >= 0 && index <= leaf.tabs.length ? index : leaf.tabs.length;\n\t\t\t\t\tleaf.tabs = [\n\t\t\t\t\t\t...leaf.tabs.slice(0, insertAt),\n\t\t\t\t\t\tmoved,\n\t\t\t\t\t\t...leaf.tabs.slice(insertAt)\n\t\t\t\t\t];` + const moveAfter = `\t\t\t\t\tconst requestedIndex = index >= 0 && index <= leaf.tabs.length ? index : leaf.tabs.length;\n\t\t\t\t\tconst pinnedCount = leaf.tabs.filter((tab) => tab.meta?.sherlockPinned === true).length;\n\t\t\t\t\tconst insertAt = moved.meta?.sherlockPinned === true ? 0 : Math.max(pinnedCount, requestedIndex);\n\t\t\t\t\tleaf.tabs = [\n\t\t\t\t\t\t...leaf.tabs.slice(0, insertAt),\n\t\t\t\t\t\tmoved,\n\t\t\t\t\t\t...leaf.tabs.slice(insertAt)\n\t\t\t\t\t];` + next = replaceExact(next, moveBefore, moveAfter, 'cross-panel pinned move boundary') + next = replaceExact( + next, + moveBefore.replaceAll('\t\t\t\t\t', '\t\t\t\t'), + moveAfter.replaceAll('\t\t\t\t\t', '\t\t\t\t'), + 'same-panel pinned move boundary' + ) + + next = replaceExact( + next, + '\t\t\t"settingSelect"\n\t\t];', + '\t\t\t"settingSelect",\n\t\t\t"panelState"\n\t\t];', + 'panel state feature' + ) + + const serviceBefore = `\t\t\tconst closeTab$1 = (tabId, scope) => {\n\t\t\t\tlet closed;\n\t\t\t\tstore.reduce((state) => {\n\t\t\t\t\tif (!tabOpenIn(state, tabId)) return state;\n\t\t\t\t\tconst paneId = findPaneIdOf(state, tabId);\n\t\t\t\t\tclosed = leafWithTab(state[treeOf(state, paneId)], tabId)?.tabs.find((tab) => tab.id === tabId);\n\t\t\t\t\treturn closeTab(state, paneId, tabId);\n\t\t\t\t});\n\t\t\t\tif (closed !== void 0) {\n\t\t\t\t\tconst sessionId = scope?.sessionId ?? store.getSnapshot().sessionId;\n\t\t\t\t\tif (sessionId !== void 0) {\n\t\t\t\t\t\tconst descriptor = tabs.get(closed.type);\n\t\t\t\t\t\tsafeCall(() => descriptor?.onClose?.(closed, scope ?? { sessionId }));\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t};\n\t\t\t/** The snapshot the store publishes (state/prefs carry the active session). */\n\t\t\tconst getSnapshot = () => store.getSnapshot();\n\t\t\t/** Store changes: session switch, state mutations, prefs writes. */\n\t\t\tconst subscribeState = (listener) => store.subscribe(listener);\n\t\t\t/** Patch an open tab's display fields (a missing tab id is a no-op). */\n\t\t\tconst updateTab = (tabId, patch) => {\n\t\t\t\tstore.reduce((state) => patchTab(state, tabId, {\n\t\t\t\t\t...patch.title !== void 0 ? { title: patch.title } : {},\n\t\t\t\t\t...patch.path !== void 0 ? { path: patch.path } : {},\n\t\t\t\t\t...patch.meta !== void 0 ? { meta: patch.meta } : {}\n\t\t\t\t}));\n\t\t\t};\n\t\t\t/** Activate an open tab (the tab-bar activation path; fires onActivate). */\n\t\t\tconst activateTab$1 = (tabId, scope) => {\n\t\t\t\tlet activated;\n\t\t\t\tstore.reduce((state) => {\n\t\t\t\t\tif (!tabOpenIn(state, tabId)) return state;\n\t\t\t\t\tconst paneId = findPaneIdOf(state, tabId);\n\t\t\t\t\tactivated = leafWithTab(state[treeOf(state, paneId)], tabId)?.tabs.find((tab) => tab.id === tabId);\n\t\t\t\t\treturn activateTab(state, paneId, tabId);\n\t\t\t\t});\n\t\t\t\tif (activated !== void 0) {\n\t\t\t\t\tconst sessionId = scope?.sessionId ?? store.getSnapshot().sessionId;\n\t\t\t\t\tif (sessionId !== void 0) {\n\t\t\t\t\t\tconst descriptor = tabs.get(activated.type);\n\t\t\t\t\t\tsafeCall(() => descriptor?.onActivate?.(activated, scope ?? { sessionId }));\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t};` + const serviceAfter = `\t\t\tconst closeTab$1 = (tabId, scope) => {\n\t\t\t\tlet closed;\n\t\t\t\tconst activeSessionId = store.getSnapshot().sessionId;\n\t\t\t\tconst targetsInactiveSession = scope !== void 0 && scope.sessionId !== activeSessionId;\n\t\t\t\tconst reducer = (state) => {\n\t\t\t\t\tif (!tabOpenIn(state, tabId)) return state;\n\t\t\t\t\tconst paneId = findPaneIdOf(state, tabId);\n\t\t\t\t\tconst candidate = leafWithTab(state[treeOf(state, paneId)], tabId)?.tabs.find((tab) => tab.id === tabId);\n\t\t\t\t\tif (candidate?.meta?.sherlockClosable === false) return state;\n\t\t\t\t\tclosed = candidate;\n\t\t\t\t\treturn closeTab(state, paneId, tabId);\n\t\t\t\t};\n\t\t\t\tif (targetsInactiveSession) store.reduceFor(scope.sessionId, reducer);\n\t\t\t\telse store.reduce(reducer);\n\t\t\t\tif (closed !== void 0) {\n\t\t\t\t\tconst sessionId = scope?.sessionId ?? activeSessionId;\n\t\t\t\t\tif (sessionId !== void 0) {\n\t\t\t\t\t\tconst descriptor = tabs.get(closed.type);\n\t\t\t\t\t\tsafeCall(() => descriptor?.onClose?.(closed, scope ?? { sessionId }));\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t};\n\t\t\t/** The snapshot the store publishes (state/prefs carry the active session). */\n\t\t\tconst getSnapshot = () => store.getSnapshot();\n\t\t\t/** Store changes: session switch, state mutations, prefs writes. */\n\t\t\tconst subscribeState = (listener) => store.subscribe(listener);\n\t\t\t/** Patch an open tab's display fields (a missing tab id is a no-op). */\n\t\t\tconst updateTab = (tabId, patch, scope) => {\n\t\t\t\tconst reducer = (state) => patchTab(state, tabId, {\n\t\t\t\t\t...patch.title !== void 0 ? { title: patch.title } : {},\n\t\t\t\t\t...patch.path !== void 0 ? { path: patch.path } : {},\n\t\t\t\t\t...patch.meta !== void 0 ? { meta: patch.meta } : {}\n\t\t\t\t});\n\t\t\t\tconst targetsInactiveSession = scope !== void 0 && scope.sessionId !== store.getSnapshot().sessionId;\n\t\t\t\ttargetsInactiveSession ? store.reduceFor(scope.sessionId, reducer) : store.reduce(reducer);\n\t\t\t};\n\t\t\t/** Activate an open tab (the tab-bar activation path; fires onActivate). */\n\t\t\tconst activateTab$1 = (tabId, scope) => {\n\t\t\t\tlet activated;\n\t\t\t\tconst activeSessionId = store.getSnapshot().sessionId;\n\t\t\t\tconst targetsInactiveSession = scope !== void 0 && scope.sessionId !== activeSessionId;\n\t\t\t\tconst reducer = (state) => {\n\t\t\t\t\tif (!tabOpenIn(state, tabId)) return state;\n\t\t\t\t\tconst paneId = findPaneIdOf(state, tabId);\n\t\t\t\t\tactivated = leafWithTab(state[treeOf(state, paneId)], tabId)?.tabs.find((tab) => tab.id === tabId);\n\t\t\t\t\treturn activateTab(state, paneId, tabId);\n\t\t\t\t};\n\t\t\t\tif (targetsInactiveSession) store.reduceFor(scope.sessionId, reducer);\n\t\t\t\telse store.reduce(reducer);\n\t\t\t\tif (activated !== void 0) {\n\t\t\t\t\tconst sessionId = scope?.sessionId ?? activeSessionId;\n\t\t\t\t\tif (sessionId !== void 0) {\n\t\t\t\t\t\tconst descriptor = tabs.get(activated.type);\n\t\t\t\t\t\tsafeCall(() => descriptor?.onActivate?.(activated, scope ?? { sessionId }));\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t};` + next = replaceExact(next, serviceBefore, serviceAfter, 'session-targeted service operations') + + next = replaceExact( + next, + '\t\t\t/** Open a file in the sidebar editor of `scope`\'s session (title defaults', + `\t\t\tconst setPanelState = (patch, scope) => {\n\t\t\t\tconst reducer = (state) => {\n\t\t\t\t\tlet result = state;\n\t\t\t\t\tif (typeof patch.width === "number") result = setWidth(result, patch.width);\n\t\t\t\t\tif (typeof patch.open === "boolean" && result.panelOpen !== patch.open) result = { ...result, panelOpen: patch.open };\n\t\t\t\t\treturn result;\n\t\t\t\t};\n\t\t\t\tconst targetsInactiveSession = scope !== void 0 && scope.sessionId !== store.getSnapshot().sessionId;\n\t\t\t\ttargetsInactiveSession ? store.reduceFor(scope.sessionId, reducer) : store.reduce(reducer);\n\t\t\t};\n\t\t\t/** Open a file in the sidebar editor of \`scope\`'s session (title defaults`, + 'panel state service' + ) + next = replaceExact( + next, + '\t\t\t\tactivateTab: activateTab$1,\n\t\t\t\topenFile', + '\t\t\t\tactivateTab: activateTab$1,\n\t\t\t\tsetPanelState,\n\t\t\t\topenFile', + 'panel state export' + ) + + next = replaceExact( + next, + '\t\t\t\t\tchildren: [tabs.map((tab) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {', + '\t\t\t\t\tchildren: [tabs.map((tab) => {\n\t\t\t\t\t\tconst pinned = tab.meta?.sherlockPinned === true;\n\t\t\t\t\t\treturn /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {', + 'tab render metadata' + ) + next = replaceExact(next, '\t\t\t\t\t\tdraggable: true,', '\t\t\t\t\t\tdraggable: !pinned,', 'fixed tab drag') + next = replaceExact( + next, + '\t\t\t\t\t\tonDragStart: (event) => {\n\t\t\t\t\t\t\tsetTabDragging(true);', + '\t\t\t\t\t\tonDragStart: (event) => {\n\t\t\t\t\t\t\tif (pinned) { event.preventDefault(); return; }\n\t\t\t\t\t\t\tsetTabDragging(true);', + 'fixed tab drag handler' + ) + next = replaceExact( + next, + '\t\t\t\t\t\t\tif (event.button === 1) {', + '\t\t\t\t\t\t\tif (event.button === 1 && tab.meta?.sherlockClosable !== false) {', + 'fixed tab middle click' + ) + const closeBefore = `\t\t\t\t\t\t\t/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {\n\t\t\t\t\t\t\t\ttype: "button",\n\t\t\t\t\t\t\t\tclassName: sidebar_module_css_default.tabClose,\n\t\t\t\t\t\t\t\t"aria-label": t("close"),\n\t\t\t\t\t\t\t\tonClick: (event) => {\n\t\t\t\t\t\t\t\t\tevent.stopPropagation();\n\t\t\t\t\t\t\t\t\tonClose(tab.id);\n\t\t\t\t\t\t\t\t},\n\t\t\t\t\t\t\t\tchildren: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCloseFill14, {})\n\t\t\t\t\t\t\t})` + const closeAfter = `\t\t\t\t\t\t\ttab.meta?.sherlockClosable !== false ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {\n\t\t\t\t\t\t\t\ttype: "button",\n\t\t\t\t\t\t\t\tclassName: sidebar_module_css_default.tabClose,\n\t\t\t\t\t\t\t\t"aria-label": t("close"),\n\t\t\t\t\t\t\t\tonClick: (event) => {\n\t\t\t\t\t\t\t\t\tevent.stopPropagation();\n\t\t\t\t\t\t\t\t\tonClose(tab.id);\n\t\t\t\t\t\t\t\t},\n\t\t\t\t\t\t\t\tchildren: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCloseFill14, {})\n\t\t\t\t\t\t\t}) : null` + next = replaceExact(next, closeBefore, closeAfter, 'fixed tab close control') + next = replaceExact( + next, + '\t\t\t\t\t}, tab.id)), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Menu, {', + '\t\t\t\t\t}, tab.id); }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Menu, {', + 'tab render closure' + ) + + return next +} + +export async function patchBetterSidebarPackage(packageRoot) { + const manifestPath = path.join(packageRoot, 'package.json') + const manifest = JSON.parse(await readFile(manifestPath, 'utf8')) + if (manifest.name !== 'dsh-better-sidebar' || manifest.version !== '0.14.1') { + throw new Error( + `Unsupported Better Sidebar package for Sherlock patch: ${manifest.name}@${manifest.version}` + ) + } + const clientPath = path.join(packageRoot, 'lib', 'client.js') + const source = await readFile(clientPath, 'utf8') + const patched = patchBetterSidebarClient(source) + if (patched !== source) await writeFile(clientPath, patched, 'utf8') +} diff --git a/scripts/lib/patch-sherlock-office-preview.d.mts b/scripts/lib/patch-sherlock-office-preview.d.mts new file mode 100644 index 000000000..018f673db --- /dev/null +++ b/scripts/lib/patch-sherlock-office-preview.d.mts @@ -0,0 +1,2 @@ +export declare function patchSherlockOfficePreviewClient(source: string): string +export declare function patchSherlockOfficePreviewPackage(packageDirectory: string): Promise diff --git a/scripts/lib/patch-sherlock-office-preview.mjs b/scripts/lib/patch-sherlock-office-preview.mjs new file mode 100644 index 000000000..b89278557 --- /dev/null +++ b/scripts/lib/patch-sherlock-office-preview.mjs @@ -0,0 +1,469 @@ +import { createHash } from 'node:crypto' +import { readFile, writeFile } from 'node:fs/promises' +import path from 'node:path' + +const PATCH_MARKER = '/* sherlock:office-preview-service:v1 */' +const PATCHED_CLIENT_SHA256 = 'be2bb640433d2e7a80f1beb7992bba871c2e2f8748fbc950ae3adcdc3977e143' + +const PATCH_INTEGRITY_ANCHORS = Object.freeze([ + [PATCH_MARKER, 1], + ['function validOfficeCapabilityUrl(value) {', 1], + ['return validOfficeCapabilityUrl(path) ? path : fileUrl(scope, path, false);', 1], + ['return validOfficeCapabilityUrl(path) ? path : fileUrl(scope, path, true);', 1], + ['function createOfficePreviewLifecycle() {', 1], + ['function createOfficePreviewMount(host) {', 1], + ['const lifecycle = createOfficePreviewLifecycle();', 3], + ['fetch(mediaUrl(scope, path), { signal: lifecycle.signal });', 3], + ['const mount = createOfficePreviewMount(wrap);', 1], + ['const mount = createOfficePreviewMount(host);', 1], + ['await renderAsync(buf, mount, void 0, {', 1], + ['if (!lifecycle.attach({ dispose: () => mount.remove() })) return;', 1], + ['if (!lifecycle.attach(univer)) return;', 1], + ['const viewer = await PptxViewer.open(bytes, mount, {', 1], + ['...continuousPptxViewerOptions(lifecycle.signal, host),', 1], + ['zipLimits: { ...RECOMMENDED_ZIP_LIMITS, maxEntryUncompressedBytes: 64 * 1024 * 1024 }', 1], + ['if (!lifecycle.attach({ destroy: () => { viewer.destroy(); mount.remove(); } })) return;', 1], + ['const inject = [];', 1], + ['function OfficePreviewComponent(props) {', 1], + ['...(kind === "pptx" ? { toolbar: "host" } : {})', 1], + ['const officePreviewService = Object.freeze({', 1], + ['ctx.provide("officePreview", officePreviewService);', 1], + ['ctx.inject(["betterSidebar"]', 1], + ['for (const viewer of officeViewers()) sidebarCtx.effect(() => betterSidebar.registerFileViewer(viewer), `dsh-better-sidebar-plugin-office: viewer ${viewer.id}`);', 1], + ['exports.apply = apply;', 1], + ['exports.createOfficePreviewLifecycle = createOfficePreviewLifecycle;', 1], + ['exports.inject = inject;', 1], + ['exports.officePreviewService = officePreviewService;', 1], + ['exports.officeViewers = officeViewers;', 1] +]) + +const LEGACY_INTEGRITY_ANCHORS = Object.freeze([ + '\t\t\treturn fileUrl(scope, path, false);', + '\t\t\treturn fileUrl(scope, path, true);', + '\t\t\t\tlet cancelled = false;\n\t\t\t\tconst container = viewportRef.current;', + '\t\t\t\tlet cancelled = false;\n\t\t\t\tconst host = hostRef.current;', + '\t\t\t\tconst controller = new AbortController();\n\t\t\t\tconst host = hostRef.current;', + 'await renderAsync(buf, wrap, void 0, {', + 'PptxViewer.open(bytes, host, {', + 'univerRef.current?.dispose();', + 'viewerRef.current?.destroy();', + 'if (wrap !== null) wrap.innerHTML = "";', + 'const inject = ["betterSidebar"];', + 'const betterSidebar = ctx.betterSidebar;' +]) + +function occurrenceCount(source, value) { + return source.split(value).length - 1 +} + +function assertOfficePreviewPatchIntegrity(source) { + for (const [anchor, expected] of PATCH_INTEGRITY_ANCHORS) { + const actual = occurrenceCount(source, anchor) + if (actual !== expected) { + throw new Error(`Office preview patch integrity failed for new anchor: expected ${expected}, found ${actual}`) + } + } + for (const anchor of LEGACY_INTEGRITY_ANCHORS) { + const actual = occurrenceCount(source, anchor) + if (actual !== 0) { + throw new Error(`Office preview patch integrity failed for legacy anchor: expected 0, found ${actual}`) + } + } + const fingerprint = createHash('sha256').update(source, 'utf8').digest('hex') + if (fingerprint !== PATCHED_CLIENT_SHA256) { + throw new Error( + `Office preview patch integrity failed for fixed client fingerprint: expected ${PATCHED_CLIENT_SHA256}, found ${fingerprint}` + ) + } +} + +function replaceExact(source, before, after, label, expectedCount = 1) { + const count = occurrenceCount(source, before) + if (count !== expectedCount) { + throw new Error(`Unable to patch Office preview ${label}: expected ${expectedCount}, found ${count}`) + } + return source.split(before).join(after) +} + +function transformExactSection(source, startMarker, endMarker, label, transform) { + const startCount = source.split(startMarker).length - 1 + const endCount = source.split(endMarker).length - 1 + if (startCount !== 1 || endCount !== 1) { + throw new Error(`Unable to patch Office preview ${label}: section markers drifted`) + } + const start = source.indexOf(startMarker) + const end = source.indexOf(endMarker, start + startMarker.length) + if (start < 0 || end <= start) { + throw new Error(`Unable to patch Office preview ${label}: invalid section order`) + } + const section = source.slice(start, end) + const patched = transform(section) + if (patched === section) { + throw new Error(`Unable to patch Office preview ${label}: section was unchanged`) + } + return source.slice(0, start) + patched + source.slice(end) +} + +function alignPptxZipEntryLimit(source) { + const aligned = 'zipLimits: { ...RECOMMENDED_ZIP_LIMITS, maxEntryUncompressedBytes: 64 * 1024 * 1024 }' + if (source.includes(aligned)) return source + return replaceExact( + source, + 'zipLimits: RECOMMENDED_ZIP_LIMITS', + aligned, + 'PPTX ZIP entry limit' + ) +} + +/** + * Publish the bundled Office engines as a capability-only Cordis service while + * leaving their existing Better Sidebar viewers registered through the same + * components. Exact transforms intentionally fail packaging when upstream + * changes the lifecycle or registration points. + */ +export function patchSherlockOfficePreviewClient(source) { + if (source.includes(PATCH_MARKER)) { + let migrated = source.includes('...(kind === "pptx" ? { toolbar: "inline" } : {})') + ? replaceExact( + source, + '...(kind === "pptx" ? { toolbar: "inline" } : {})', + '...(kind === "pptx" ? { toolbar: "host" } : {})', + 'Research PPT toolbar mode' + ) + : source + migrated = alignPptxZipEntryLimit(migrated) + assertOfficePreviewPatchIntegrity(migrated) + return migrated + } + let next = source + + next = replaceExact( + next, + `\t\t/** Absolute URL of the media route for one path (raw bytes). */ +\t\tfunction mediaUrl(scope, path) { +\t\t\treturn fileUrl(scope, path, false); +\t\t} +\t\t/** Absolute URL of the download route (Content-Disposition: attachment). */ +\t\tfunction downloadUrl(scope, path) { +\t\t\treturn fileUrl(scope, path, true); +\t\t}`, + `\t\t${PATCH_MARKER} +\t\tfunction validOfficeCapabilityUrl(value) { +\t\t\tif (typeof value !== "string" || value.length > 2048) return false; +\t\t\ttry { +\t\t\t\tconst parsed = new URL(value); +\t\t\t\treturn parsed.protocol === "sherlock-preview:" && parsed.username === "" && parsed.password === "" && parsed.port === "" && parsed.pathname === "/" && parsed.search === "" && parsed.hash === "" && /^[A-Za-z0-9_-]+$/.test(parsed.hostname); +\t\t\t} catch { +\t\t\t\treturn false; +\t\t\t} +\t\t} +\t\t/** Absolute URL of the media route for one path (raw bytes). */ +\t\tfunction mediaUrl(scope, path) { +\t\t\treturn validOfficeCapabilityUrl(path) ? path : fileUrl(scope, path, false); +\t\t} +\t\t/** Absolute URL of the download route (Content-Disposition: attachment). */ +\t\tfunction downloadUrl(scope, path) { +\t\t\treturn validOfficeCapabilityUrl(path) ? path : fileUrl(scope, path, true); +\t\t}`, + 'capability URL routing' + ) + + next = replaceExact( + next, + '\t\tfunction DocxView(props) {', + `\t\tfunction disposeOfficePreviewResource(resource) { +\t\t\ttry { +\t\t\t\tif (typeof resource?.dispose === "function") resource.dispose(); +\t\t\t\telse if (typeof resource?.destroy === "function") resource.destroy(); +\t\t\t} catch {} +\t\t} +\t\tfunction createOfficePreviewLifecycle() { +\t\t\tconst controller = new AbortController(); +\t\t\tlet resource = null; +\t\t\tlet disposed = false; +\t\t\treturn { +\t\t\t\tsignal: controller.signal, +\t\t\t\tattach(nextResource) { +\t\t\t\t\tif (disposed) { +\t\t\t\t\t\tdisposeOfficePreviewResource(nextResource); +\t\t\t\t\t\treturn false; +\t\t\t\t\t} +\t\t\t\t\tresource = nextResource; +\t\t\t\t\treturn true; +\t\t\t\t}, +\t\t\t\tdispose() { +\t\t\t\t\tif (disposed) return; +\t\t\t\t\tdisposed = true; +\t\t\t\t\tcontroller.abort(); +\t\t\t\t\tdisposeOfficePreviewResource(resource); +\t\t\t\t\tresource = null; +\t\t\t\t} +\t\t\t}; +\t\t} +\t\tfunction createOfficePreviewMount(host) { +\t\t\tconst mount = document.createElement("div"); +\t\t\tObject.assign(mount.style, { width: "100%", height: "100%", minWidth: "0", minHeight: "0" }); +\t\t\thost.appendChild(mount); +\t\t\treturn mount; +\t\t} +\t\tfunction DocxView(props) {`, + 'shared engine lifecycle' + ) + + next = replaceExact(next, '\t\t\t\tlet cancelled = false;\n\t\t\t\tconst container = viewportRef.current;', + '\t\t\t\tconst lifecycle = createOfficePreviewLifecycle();\n\t\t\t\tconst container = viewportRef.current;', + 'DOCX lifecycle') + next = replaceExact(next, + '\t\t\t\tif (container === null || wrap === null) return;\n\t\t\t\tsetZoom(100);', + '\t\t\t\tif (container === null || wrap === null) return;\n\t\t\t\tconst mount = createOfficePreviewMount(wrap);\n\t\t\t\tsetZoom(100);', + 'DOCX isolated mount') + next = replaceExact(next, 'const response = await fetch(mediaUrl(scope, path));', + 'const response = await fetch(mediaUrl(scope, path), { signal: lifecycle.signal });', + 'DOCX/XLSX fetch signals', 2) + next = replaceExact(next, 'if (cancelled) return;', 'if (lifecycle.signal.aborted) return;', + 'DOCX/XLSX cancellation checks', 5) + next = replaceExact(next, + `\t\t\t\t\t\tawait renderAsync(buf, wrap, void 0, { +\t\t\t\t\t\t\tclassName: "docx", +\t\t\t\t\t\t\tinWrapper: true, +\t\t\t\t\t\t\tignoreWidth: false, +\t\t\t\t\t\t\tignoreHeight: false, +\t\t\t\t\t\t\tbreakPages: true, +\t\t\t\t\t\t\texperimental: false +\t\t\t\t\t\t}); +\t\t\t\t\t\tif (!cancelled) setLoad({ status: "ready" });`, + `\t\t\t\t\t\tawait renderAsync(buf, mount, void 0, { +\t\t\t\t\t\t\tclassName: "docx", +\t\t\t\t\t\t\tinWrapper: true, +\t\t\t\t\t\t\tignoreWidth: false, +\t\t\t\t\t\t\tignoreHeight: false, +\t\t\t\t\t\t\tbreakPages: true, +\t\t\t\t\t\t\texperimental: false +\t\t\t\t\t\t}); +\t\t\t\t\t\tif (!lifecycle.attach({ dispose: () => mount.remove() })) return; +\t\t\t\t\t\tsetLoad({ status: "ready" });`, + 'DOCX late render cleanup') + next = replaceExact(next, + `\t\t\t\t\t} catch (error) { +\t\t\t\t\t\tif (!cancelled) setLoad({ +\t\t\t\t\t\t\tstatus: "error", +\t\t\t\t\t\t\tmessage: error instanceof Error ? error.message : String(error) +\t\t\t\t\t\t}); +\t\t\t\t\t}`, + `\t\t\t\t\t} catch (error) { +\t\t\t\t\t\tif (!lifecycle.signal.aborted) { +\t\t\t\t\t\t\tmount.remove(); +\t\t\t\t\t\t\tsetLoad({ +\t\t\t\t\t\t\t\tstatus: "error", +\t\t\t\t\t\t\t\tmessage: error instanceof Error ? error.message : String(error) +\t\t\t\t\t\t\t}); +\t\t\t\t\t\t} +\t\t\t\t\t}`, + 'DOCX aborted error suppression' + ) + next = replaceExact(next, + `\t\t\t\treturn () => { +\t\t\t\t\tcancelled = true; +\t\t\t\t\tif (wrap !== null) wrap.innerHTML = ""; +\t\t\t\t};`, + `\t\t\t\treturn () => { +\t\t\t\t\tlifecycle.dispose(); +\t\t\t\t\tmount.remove(); +\t\t\t\t};`, + 'DOCX teardown') + + next = replaceExact(next, '\t\t\t\tlet cancelled = false;\n\t\t\t\tconst host = hostRef.current;', + '\t\t\t\tconst lifecycle = createOfficePreviewLifecycle();\n\t\t\t\tconst host = hostRef.current;', + 'XLSX lifecycle') + next = replaceExact(next, + `\t\t\t\t\t\tconst { univer, univerAPI } = createUniver({ +\t\t\t\t\t\t\tlocale, +\t\t\t\t\t\t\tlocales: localePack !== null ? { [locale]: mergeLocales(localePack) } : {}, +\t\t\t\t\t\t\tpresets: [UniverSheetsCorePreset({ container: host })] +\t\t\t\t\t\t}); +\t\t\t\t\t\tuniverRef.current = univer; +\t\t\t\t\t\tuniverAPI.createWorkbook(workbookData); +\t\t\t\t\t\tif (!cancelled) setLoad({ status: "ready" });`, + `\t\t\t\t\t\tconst { univer, univerAPI } = createUniver({ +\t\t\t\t\t\t\tlocale, +\t\t\t\t\t\t\tlocales: localePack !== null ? { [locale]: mergeLocales(localePack) } : {}, +\t\t\t\t\t\t\tpresets: [UniverSheetsCorePreset({ container: host })] +\t\t\t\t\t\t}); +\t\t\t\t\t\tif (!lifecycle.attach(univer)) return; +\t\t\t\t\t\tuniverRef.current = univer; +\t\t\t\t\t\tuniverAPI.createWorkbook(workbookData); +\t\t\t\t\t\tif (!lifecycle.signal.aborted) setLoad({ status: "ready" });`, + 'XLSX engine ownership') + next = replaceExact(next, + `\t\t\t\t\t\tif (!cancelled) { +\t\t\t\t\t\t\ttry { +\t\t\t\t\t\t\t\tuniverRef.current?.dispose(); +\t\t\t\t\t\t\t} catch {} +\t\t\t\t\t\t\tuniverRef.current = null; +\t\t\t\t\t\t\thost.innerHTML = "";`, + `\t\t\t\t\t\tif (!lifecycle.signal.aborted) { +\t\t\t\t\t\t\tlifecycle.dispose(); +\t\t\t\t\t\t\tuniverRef.current = null; +\t\t\t\t\t\t\thost.innerHTML = "";`, + 'XLSX failure ownership') + next = replaceExact(next, + `\t\t\t\treturn () => { +\t\t\t\t\tcancelled = true; +\t\t\t\t\ttry { +\t\t\t\t\t\tuniverRef.current?.dispose(); +\t\t\t\t\t} catch {} +\t\t\t\t\tuniverRef.current = null; +\t\t\t\t\tif (host !== null) host.innerHTML = ""; +\t\t\t\t};`, + `\t\t\t\treturn () => { +\t\t\t\t\tlifecycle.dispose(); +\t\t\t\t\tuniverRef.current = null; +\t\t\t\t\tif (host !== null) host.innerHTML = ""; +\t\t\t\t};`, + 'XLSX teardown') + + next = replaceExact(next, '\t\t\t\tconst controller = new AbortController();\n\t\t\t\tconst host = hostRef.current;', + '\t\t\t\tconst lifecycle = createOfficePreviewLifecycle();\n\t\t\t\tconst host = hostRef.current;', + 'PPTX lifecycle') + next = replaceExact(next, + '\t\t\t\tif (host === null) return;\n\t\t\t\tsetLoad({ status: "loading" });', + '\t\t\t\tif (host === null) return;\n\t\t\t\tconst mount = createOfficePreviewMount(host);\n\t\t\t\tsetLoad({ status: "loading" });', + 'PPTX isolated mount') + next = transformExactSection( + next, + '\t\tfunction PptxView(props) {', + '\t\t//#endregion\n\t\t//#region src/client/icons.tsx', + 'PPTX abort signal', + (section) => replaceExact( + section, + 'controller.signal', + 'lifecycle.signal', + 'PPTX abort signal', + 6 + ) + ) + next = replaceExact(next, + `\t\t\t\t\t\tconst viewer = await PptxViewer.open(bytes, host, { +\t\t\t\t\t\t\t...continuousPptxViewerOptions(lifecycle.signal, host),`, + `\t\t\t\t\t\tconst viewer = await PptxViewer.open(bytes, mount, { +\t\t\t\t\t\t\t...continuousPptxViewerOptions(lifecycle.signal, host),`, + 'PPTX isolated engine mount') + next = replaceExact(next, + `\t\t\t\t\t\tif (lifecycle.signal.aborted) { +\t\t\t\t\t\t\tviewer.destroy(); +\t\t\t\t\t\t\treturn; +\t\t\t\t\t\t} +\t\t\t\t\t\tviewerRef.current = viewer;`, + `\t\t\t\t\t\tif (!lifecycle.attach({ destroy: () => { viewer.destroy(); mount.remove(); } })) return; +\t\t\t\t\t\tviewerRef.current = viewer;`, + 'PPTX engine ownership') + next = replaceExact(next, + `\t\t\t\t\t} catch (error) { +\t\t\t\t\t\tif (lifecycle.signal.aborted) return; +\t\t\t\t\t\ttry { +\t\t\t\t\t\t\tviewerRef.current?.destroy(); +\t\t\t\t\t\t} catch {} +\t\t\t\t\t\tviewerRef.current = null; +\t\t\t\t\t\thost.innerHTML = "";`, + `\t\t\t\t\t} catch (error) { +\t\t\t\t\t\tif (lifecycle.signal.aborted) return; +\t\t\t\t\t\tlifecycle.dispose(); +\t\t\t\t\t\tviewerRef.current = null; +\t\t\t\t\t\tmount.remove();`, + 'PPTX failure ownership') + next = replaceExact(next, + `\t\t\t\treturn () => { +\t\t\t\t\tcontroller.abort(); +\t\t\t\t\ttry { +\t\t\t\t\t\tviewerRef.current?.destroy(); +\t\t\t\t\t} catch {} +\t\t\t\t\tviewerRef.current = null; +\t\t\t\t\thost.innerHTML = ""; +\t\t\t\t};`, + `\t\t\t\treturn () => { +\t\t\t\t\tlifecycle.dispose(); +\t\t\t\t\tviewerRef.current = null; +\t\t\t\t\tmount.remove(); +\t\t\t\t};`, + 'PPTX teardown') + next = alignPptxZipEntryLimit(next) + + next = replaceExact( + next, + `\t\t/** Services required before mounting: better-sidebar's client service. */ +\t\tconst inject = ["betterSidebar"];`, + `\t\t/** The adapter is useful without Better Sidebar; the sidebar is an optional child injection. */ +\t\tconst inject = [];`, + 'optional sidebar injection' + ) + next = replaceExact( + next, + `\t\t/** +\t\t* Client plugin body. +\t\t* @param ctx - the client cordis context (betterSidebar service). +\t\t*/ +\t\tfunction apply(ctx) { +\t\t\tconst betterSidebar = ctx.betterSidebar; +\t\t\tif (betterSidebar === void 0) return; +\t\t\tfor (const viewer of officeViewers()) ctx.effect(() => betterSidebar.registerFileViewer(viewer), \`dsh-better-sidebar-plugin-office: viewer \${viewer.id}\`); +\t\t} +\t\t//#endregion +\t\texports.apply = apply; +\t\texports.inject = inject; +\t\texports.officeViewers = officeViewers;`, + `\t\tconst officePreviewScope = Object.freeze({ sessionId: "sherlock-research", cwd: "" }); +\t\tfunction officePreviewKind(value) { +\t\t\tconst kind = String(value ?? "").replace(/^\\./, "").toLowerCase(); +\t\t\treturn kind === "docx" || kind === "xlsx" || kind === "pptx" ? kind : null; +\t\t} +\t\tfunction OfficePreviewComponent(props) { +\t\t\tconst kind = officePreviewKind(props?.kind); +\t\t\tif (kind === null || !validOfficeCapabilityUrl(props?.sourceUrl)) return (0, react$1.createElement)("div", { "data-sherlock-office-preview-unavailable": "" }, t("downloadToView")); +\t\t\tconst Component = kind === "docx" ? DocxView : kind === "xlsx" ? XlsxView : PptxView; +\t\t\treturn (0, react$1.createElement)(Component, { +\t\t\t\tscope: officePreviewScope, +\t\t\t\tpath: props.sourceUrl, +\t\t\t\ttitle: props.title, +\t\t\t\t...(kind === "pptx" ? { toolbar: "host" } : {}) +\t\t\t}); +\t\t} +\t\tconst officePreviewService = Object.freeze({ +\t\t\tComponent: OfficePreviewComponent, +\t\t\tsupports: (value) => officePreviewKind(value) !== null +\t\t}); +\t\t/** +\t\t* Client plugin body. Publishes the Research adapter unconditionally and +\t\t* preserves the existing sidebar viewers when Better Sidebar is present. +\t\t*/ +\t\tfunction apply(ctx) { +\t\t\tctx.provide("officePreview", officePreviewService); +\t\t\tctx.inject(["betterSidebar"], (sidebarCtx) => { +\t\t\t\tconst betterSidebar = sidebarCtx.betterSidebar; +\t\t\t\tif (betterSidebar === void 0) return; +\t\t\t\tfor (const viewer of officeViewers()) sidebarCtx.effect(() => betterSidebar.registerFileViewer(viewer), \`dsh-better-sidebar-plugin-office: viewer \${viewer.id}\`); +\t\t\t}); +\t\t} +\t\t//#endregion +\t\texports.apply = apply; +\t\texports.createOfficePreviewLifecycle = createOfficePreviewLifecycle; +\t\texports.inject = inject; +\t\texports.officePreviewService = officePreviewService; +\t\texports.officeViewers = officeViewers;`, + 'Cordis service publication' + ) + assertOfficePreviewPatchIntegrity(next) + return next +} + +export async function patchSherlockOfficePreviewPackage(packageDirectory) { + const manifestPath = path.join(packageDirectory, 'package.json') + const manifest = JSON.parse(await readFile(manifestPath, 'utf8')) + if (manifest.name !== '@huanlin/dsh-plugin-better-sidebar-plugin-office' || + manifest.version !== '0.1.0') { + throw new Error(`Unsupported bundled Office plugin ${String(manifest.name)}@${String(manifest.version)}`) + } + const clientPath = path.join(packageDirectory, 'lib', 'client.js') + const source = await readFile(clientPath, 'utf8') + const patched = patchSherlockOfficePreviewClient(source) + if (patched !== source) await writeFile(clientPath, patched, 'utf8') +} diff --git a/scripts/lib/sherlock-active-batch.d.mts b/scripts/lib/sherlock-active-batch.d.mts new file mode 100644 index 000000000..9ddf7bd8a --- /dev/null +++ b/scripts/lib/sherlock-active-batch.d.mts @@ -0,0 +1,54 @@ +export type Sha256Digest = string + +export interface ActiveBatchLease { + schemaVersion: 1 + revision: number + batchId: string + branch: string + manifestPath: string + baseMainCommit: string + currentTip: string + ownerTokenHash: string + createdAt: string + updatedAt: string + acceptedTip?: string + acceptedManifestDigest?: Sha256Digest + acceptedAt?: string +} + +export function readActiveBatchLease(repository: string): ActiveBatchLease | null +export function acquireActiveBatchLease(options: { + repository: string + lease: Omit + ownerToken: string +}): { lease: ActiveBatchLease; created: boolean } +export function updateActiveBatchTip(options: { + repository: string + ownerToken: string + expectedRevision: number + expectedTip: string + nextTip: string + updatedAt: string +}): ActiveBatchLease +export function markActiveBatchAccepted(options: { + repository: string + ownerToken: string + expectedRevision: number + acceptedTip: string + acceptedManifestDigest: Sha256Digest + acceptedAt: string +}): ActiveBatchLease +export function recoverActiveBatchOwnership(options: { + repository: string + expectedBatchId: string + expectedTip: string + expectedManifestDigest: Sha256Digest +}): { lease: ActiveBatchLease; ownerTokenFile: string } +export function archiveActiveBatchLease(options: { + repository: string + ownerToken?: string + expectedBatchId: string + outcome: 'promoted' | 'cancelled' + archivedAt: string + explicitCancellation?: boolean +}): { lease: ActiveBatchLease; archivePath: string } diff --git a/scripts/lib/sherlock-active-batch.mjs b/scripts/lib/sherlock-active-batch.mjs new file mode 100644 index 000000000..5300d34bd --- /dev/null +++ b/scripts/lib/sherlock-active-batch.mjs @@ -0,0 +1,397 @@ +import { createHash, randomBytes } from 'node:crypto' +import { + closeSync, + existsSync, + linkSync, + mkdirSync, + openSync, + readFileSync, + renameSync, + rmdirSync, + statSync, + unlinkSync, + writeFileSync +} from 'node:fs' +import path from 'node:path' +import { resolveRepositoryContext, runGit } from './sherlock-git-state.mjs' + +const fullSha = /^[0-9a-f]{40}$/ +const sha256 = /^[0-9a-f]{64}$/ +const batchId = /^\d{8}-\d{2}$/ + +function fail(message) { + throw new Error(`活动集成租约无效：${message}`) +} + +function object(value, label) { + if (!value || typeof value !== 'object' || Array.isArray(value)) fail(`${label} 必须是对象。`) + return value +} + +function exactKeys(value, label, keys) { + for (const key of Object.keys(value)) { + if (!keys.includes(key)) fail(`${label} 包含未知字段 ${key}。`) + } +} + +function nonEmptyString(value, label) { + if (typeof value !== 'string' || value.length === 0) fail(`${label} 必须是非空字符串。`) + return value +} + +function commit(value, label) { + if (typeof value !== 'string' || !fullSha.test(value)) fail(`${label} 必须是 40 位小写提交 SHA。`) + return value +} + +function digest(value, label) { + if (typeof value !== 'string' || !sha256.test(value)) fail(`${label} 必须是 64 位小写 SHA-256 摘要。`) + return value +} + +function timestamp(value, label) { + const text = nonEmptyString(value, label) + const parsed = new Date(text) + if (Number.isNaN(parsed.getTime()) || parsed.toISOString() !== text) fail(`${label} 必须是规范 ISO 时间。`) + return text +} + +function canonicalManifestPath(batch) { + return `config/sherlock-integration-batches/${batch}.json` +} + +function branchFor(batch) { + return `codex/integration/${batch}` +} + +function tokenHash(token) { + return createHash('sha256').update(token, 'utf8').digest('hex') +} + +function validateLease(value) { + const lease = object(value, 'lease') + exactKeys(lease, 'lease', [ + 'schemaVersion', 'revision', 'batchId', 'branch', 'manifestPath', 'baseMainCommit', 'currentTip', + 'ownerTokenHash', 'createdAt', 'updatedAt', 'acceptedTip', 'acceptedManifestDigest', 'acceptedAt' + ]) + if (lease.schemaVersion !== 1) fail('schemaVersion 必须为 1。') + if (!Number.isSafeInteger(lease.revision) || lease.revision < 1) fail('revision 必须是正整数。') + const parsedBatch = nonEmptyString(lease.batchId, 'batchId') + if (!batchId.test(parsedBatch)) fail('batchId 必须匹配 YYYYMMDD-NN。') + if (lease.branch !== branchFor(parsedBatch)) fail('branch 必须精确派生自 batchId。') + if (lease.manifestPath !== canonicalManifestPath(parsedBatch)) fail('manifestPath 必须是批次的精确受跟踪路径。') + const acceptedFields = [lease.acceptedTip, lease.acceptedManifestDigest, lease.acceptedAt] + if (acceptedFields.some((field) => field !== undefined) && acceptedFields.some((field) => field === undefined)) { + fail('验收字段必须全部存在或全部缺失。') + } + const parsed = { + schemaVersion: 1, + revision: lease.revision, + batchId: parsedBatch, + branch: lease.branch, + manifestPath: lease.manifestPath, + baseMainCommit: commit(lease.baseMainCommit, 'baseMainCommit'), + currentTip: commit(lease.currentTip, 'currentTip'), + ownerTokenHash: digest(lease.ownerTokenHash, 'ownerTokenHash'), + createdAt: timestamp(lease.createdAt, 'createdAt'), + updatedAt: timestamp(lease.updatedAt, 'updatedAt') + } + if (lease.acceptedTip !== undefined) { + parsed.acceptedTip = commit(lease.acceptedTip, 'acceptedTip') + parsed.acceptedManifestDigest = digest(lease.acceptedManifestDigest, 'acceptedManifestDigest') + parsed.acceptedAt = timestamp(lease.acceptedAt, 'acceptedAt') + } + return parsed +} + +function validateLeaseDraft(value, ownerToken) { + const draft = object(value, 'lease') + exactKeys(draft, 'lease', [ + 'batchId', 'branch', 'manifestPath', 'baseMainCommit', 'currentTip', 'createdAt', 'updatedAt', + 'acceptedTip', 'acceptedManifestDigest', 'acceptedAt' + ]) + return validateLease({ ...draft, schemaVersion: 1, revision: 1, ownerTokenHash: tokenHash(validateOwnerToken(ownerToken)) }) +} + +function validateOwnerToken(value) { + const token = nonEmptyString(value, 'ownerToken') + if (token.includes('\0')) fail('ownerToken 不能包含 NUL 字符。') + return token +} + +function leaseLocations(repository) { + const context = resolveRepositoryContext(repository) + const root = path.join(context.commonDirectory, 'sherlock-integration') + return { + context, + root, + active: path.join(root, 'active'), + leaseFile: path.join(root, 'active', 'lease.json'), + lockFile: path.join(root, '.active-mutation-lock'), + ownerFile: path.join(context.gitDirectory, 'sherlock-integration-owner.json') + } +} + +function readLeaseFile(leaseFile) { + if (!existsSync(leaseFile)) return null + try { + return validateLease(JSON.parse(readFileSync(leaseFile, 'utf8'))) + } catch (error) { + if (error instanceof Error && error.message.startsWith('活动集成租约无效：')) throw error + fail(`lease.json 不是有效 JSON。`) + } +} + +function assertRepositoryAtLease(repository, lease) { + const context = resolveRepositoryContext(repository) + if (!context.branch || context.branch !== lease.branch) fail('当前 worktree 必须保持连接到租约分支。') + if (context.head !== lease.currentTip) fail('当前 HEAD 必须精确等于租约 currentTip。') + return context +} + +function assertCommitExists(repository, value, label) { + const resolved = runGit(repository, ['rev-parse', '--verify', `${value}^{commit}`]).stdout.trim() + if (resolved !== value) fail(`${label} 必须解析为精确提交。`) +} + +function assertTrackedManifest(repository, lease) { + runGit(repository, ['ls-files', '--error-unmatch', '--', lease.manifestPath]) + const manifestFile = path.join(resolveRepositoryContext(repository).worktreeRoot, lease.manifestPath) + if (!existsSync(manifestFile) || !statSync(manifestFile).isFile()) fail('manifestPath 必须指向当前 worktree 的受跟踪普通文件。') + return manifestFile +} + +function currentManifestDigest(repository, lease) { + return createHash('sha256').update(readFileSync(assertTrackedManifest(repository, lease))).digest('hex') +} + +function ownerRecord(ownerFile) { + if (!existsSync(ownerFile)) fail('owner token 文件不存在。') + if ((statSync(ownerFile).mode & 0o777) !== 0o600) fail('owner token 文件权限必须为 0600。') + let value + try { + value = JSON.parse(readFileSync(ownerFile, 'utf8')) + } catch { + fail('owner token 文件不是有效 JSON。') + } + const record = object(value, 'owner token 文件') + exactKeys(record, 'owner token 文件', ['schemaVersion', 'batchId', 'ownerToken']) + if (record.schemaVersion !== 1) fail('owner token 文件 schemaVersion 必须为 1。') + if (!batchId.test(record.batchId)) fail('owner token 文件 batchId 无效。') + return { batchId: record.batchId, ownerToken: validateOwnerToken(record.ownerToken) } +} + +function assertOwner(ownerFile, lease, token) { + const provided = validateOwnerToken(token) + if (tokenHash(provided) !== lease.ownerTokenHash) fail('owner token 不匹配。') + const persisted = ownerRecord(ownerFile) + if (persisted.batchId !== lease.batchId || tokenHash(persisted.ownerToken) !== lease.ownerTokenHash) { + fail('持久 owner token 与租约不匹配。') + } +} + +function createOwnerRecord(ownerFile, lease, token) { + if (existsSync(ownerFile)) { + assertOwner(ownerFile, lease, token) + return + } + const descriptor = openSync(ownerFile, 'wx', 0o600) + try { + writeFileSync(descriptor, `${JSON.stringify({ schemaVersion: 1, batchId: lease.batchId, ownerToken: token })}\n`, 'utf8') + } finally { + closeSync(descriptor) + } + if ((statSync(ownerFile).mode & 0o777) !== 0o600) fail('owner token 文件权限必须为 0600。') +} + +function withMutationLock(locations, operation) { + mkdirSync(locations.root, { recursive: true }) + let descriptor + try { + descriptor = openSync(locations.lockFile, 'wx', 0o600) + } catch (error) { + if (error && typeof error === 'object' && error.code === 'EEXIST') fail('另一个租约操作正在进行。') + throw error + } + closeSync(descriptor) + try { + return operation() + } finally { + if (existsSync(locations.lockFile)) unlinkSync(locations.lockFile) + } +} + +function atomicWrite(file, value) { + const temporary = `${file}.tmp-${process.pid}-${randomBytes(8).toString('hex')}` + const descriptor = openSync(temporary, 'wx', 0o600) + try { + writeFileSync(descriptor, `${JSON.stringify(value, null, 2)}\n`, 'utf8') + } finally { + closeSync(descriptor) + } + renameSync(temporary, file) +} + +function sameLease(left, right) { + return JSON.stringify(left) === JSON.stringify(right) +} + +function replaceLease(locations, current, next) { + const live = readLeaseFile(locations.leaseFile) + if (!live || !sameLease(live, current)) fail('租约在 compare-and-swap 前已变化。') + atomicWrite(locations.leaseFile, next) +} + +function reserveArchiveDestination(archiveDirectory) { + try { + mkdirSync(archiveDirectory, { mode: 0o700 }) + } catch (error) { + if (error && typeof error === 'object' && error.code === 'EEXIST') { + fail('目标归档目录已存在，拒绝覆盖。') + } + throw error + } +} + +export function readActiveBatchLease(repository) { + return readLeaseFile(leaseLocations(repository).leaseFile) +} + +export function acquireActiveBatchLease({ repository, lease, ownerToken }) { + const candidate = validateLeaseDraft(lease, ownerToken) + assertCommitExists(repository, candidate.baseMainCommit, 'baseMainCommit') + assertRepositoryAtLease(repository, candidate) + const locations = leaseLocations(repository) + return withMutationLock(locations, () => { + const current = readLeaseFile(locations.leaseFile) + if (current) { + if (!sameLease(current, candidate)) fail('已有活动租约与请求状态不一致。') + assertOwner(locations.ownerFile, current, ownerToken) + return { lease: current, created: false } + } + if (existsSync(locations.active)) fail('活动租约目录已存在，拒绝覆盖。') + createOwnerRecord(locations.ownerFile, candidate, validateOwnerToken(ownerToken)) + const staging = path.join(locations.root, `.active-staging-${process.pid}-${randomBytes(8).toString('hex')}`) + mkdirSync(staging, { mode: 0o700 }) + atomicWrite(path.join(staging, 'lease.json'), candidate) + try { + if (existsSync(locations.active)) fail('活动租约目录已存在，拒绝覆盖。') + renameSync(staging, locations.active) + } catch (error) { + if (existsSync(staging)) { + try { unlinkSync(path.join(staging, 'lease.json')) } catch {} + try { rmdirSync(staging) } catch {} + } + if (error instanceof Error && error.message.startsWith('活动集成租约无效：')) throw error + fail('活动租约已被其他 worktree 创建。') + } + return { lease: candidate, created: true } + }) +} + +export function updateActiveBatchTip({ repository, ownerToken, expectedRevision, expectedTip, nextTip, updatedAt }) { + if (!Number.isSafeInteger(expectedRevision) || expectedRevision < 1) fail('expectedRevision 必须是正整数。') + commit(expectedTip, 'expectedTip') + commit(nextTip, 'nextTip') + timestamp(updatedAt, 'updatedAt') + const locations = leaseLocations(repository) + return withMutationLock(locations, () => { + const current = readLeaseFile(locations.leaseFile) + if (!current) fail('不存在活动租约。') + assertOwner(locations.ownerFile, current, ownerToken) + if (current.revision !== expectedRevision) fail('租约 revision 已过期。') + if (current.currentTip !== expectedTip) fail('租约 currentTip 已过期。') + const context = resolveRepositoryContext(repository) + if (!context.branch || context.branch !== current.branch || context.head !== nextTip) fail('当前分支和 HEAD 必须精确等于 nextTip。') + assertCommitExists(repository, nextTip, 'nextTip') + const next = validateLease({ + ...current, + revision: current.revision + 1, + currentTip: nextTip, + updatedAt, + acceptedTip: undefined, + acceptedManifestDigest: undefined, + acceptedAt: undefined + }) + replaceLease(locations, current, next) + return next + }) +} + +export function markActiveBatchAccepted({ repository, ownerToken, expectedRevision, acceptedTip, acceptedManifestDigest, acceptedAt }) { + if (!Number.isSafeInteger(expectedRevision) || expectedRevision < 1) fail('expectedRevision 必须是正整数。') + commit(acceptedTip, 'acceptedTip') + digest(acceptedManifestDigest, 'acceptedManifestDigest') + timestamp(acceptedAt, 'acceptedAt') + const locations = leaseLocations(repository) + return withMutationLock(locations, () => { + const current = readLeaseFile(locations.leaseFile) + if (!current) fail('不存在活动租约。') + assertOwner(locations.ownerFile, current, ownerToken) + if (current.revision !== expectedRevision) fail('租约 revision 已过期。') + assertRepositoryAtLease(repository, current) + if (acceptedTip !== current.currentTip) fail('acceptedTip 必须精确等于 currentTip。') + if (currentManifestDigest(repository, current) !== acceptedManifestDigest) fail('acceptedManifestDigest 与当前受跟踪清单不匹配。') + const next = validateLease({ + ...current, + revision: current.revision + 1, + updatedAt: acceptedAt, + acceptedTip, + acceptedManifestDigest, + acceptedAt + }) + replaceLease(locations, current, next) + return next + }) +} + +export function recoverActiveBatchOwnership({ repository, expectedBatchId, expectedTip, expectedManifestDigest }) { + if (typeof expectedBatchId !== 'string' || !batchId.test(expectedBatchId)) fail('expectedBatchId 必须匹配 YYYYMMDD-NN。') + commit(expectedTip, 'expectedTip') + digest(expectedManifestDigest, 'expectedManifestDigest') + const locations = leaseLocations(repository) + const lease = readLeaseFile(locations.leaseFile) + if (!lease) fail('不存在活动租约。') + if (lease.batchId !== expectedBatchId) fail('expectedBatchId 与租约不匹配。') + if (lease.currentTip !== expectedTip) fail('expectedTip 与租约不匹配。') + assertRepositoryAtLease(repository, lease) + const persisted = ownerRecord(locations.ownerFile) + if (persisted.batchId !== lease.batchId || tokenHash(persisted.ownerToken) !== lease.ownerTokenHash) fail('持久 owner token 与租约不匹配。') + if (currentManifestDigest(repository, lease) !== expectedManifestDigest) fail('expectedManifestDigest 与当前受跟踪清单不匹配。') + return { lease, ownerTokenFile: locations.ownerFile } +} + +export function archiveActiveBatchLease({ repository, ownerToken, expectedBatchId, outcome, archivedAt, explicitCancellation = false }) { + if (typeof expectedBatchId !== 'string' || !batchId.test(expectedBatchId)) fail('expectedBatchId 必须匹配 YYYYMMDD-NN。') + if (outcome !== 'promoted' && outcome !== 'cancelled') fail('outcome 必须为 promoted 或 cancelled。') + timestamp(archivedAt, 'archivedAt') + if (outcome === 'cancelled' && ownerToken === undefined && explicitCancellation !== true) { + fail('无 owner token 的取消必须明确确认。') + } + const locations = leaseLocations(repository) + return withMutationLock(locations, () => { + const lease = readLeaseFile(locations.leaseFile) + if (!lease) fail('不存在活动租约。') + if (lease.batchId !== expectedBatchId) fail('expectedBatchId 与租约不匹配。') + assertRepositoryAtLease(repository, lease) + if (outcome === 'promoted' && ownerToken === undefined) fail('promoted 必须提供有效 owner token。') + if (ownerToken !== undefined) assertOwner(locations.ownerFile, lease, ownerToken) + const directoryTimestamp = archivedAt.replaceAll(':', '-') + const archiveDirectory = path.join(locations.root, 'history', `${lease.batchId}-${outcome}-${directoryTimestamp}`) + const archivePath = path.join(archiveDirectory, 'lease.json') + mkdirSync(path.dirname(archiveDirectory), { recursive: true }) + reserveArchiveDestination(archiveDirectory) + try { + linkSync(locations.leaseFile, archivePath) + } catch { + fail('归档 lease 发布失败；已保留活动租约和目标目录以便恢复。') + } + try { + unlinkSync(locations.leaseFile) + rmdirSync(locations.active) + } catch { + fail('归档 lease 已发布但 active 清理未完成；请显式恢复。') + } + return { lease, archivePath } + }) +} diff --git a/scripts/lib/sherlock-git-state.d.mts b/scripts/lib/sherlock-git-state.d.mts new file mode 100644 index 000000000..2ac6e0ee4 --- /dev/null +++ b/scripts/lib/sherlock-git-state.d.mts @@ -0,0 +1,50 @@ +export interface GitCommandResult { + status: number + stdout: string + stderr: string +} + +export interface RepositoryContext { + worktreeRoot: string + gitDirectory: string + commonDirectory: string + branch: string | null + head: string + linkedWorktree: boolean +} + +export interface RepositoryStatus { + trackedChanges: string[] + untrackedSources: string[] + untrackedOutputs: string[] + sourceClean: boolean +} + +export interface RegisteredWorktree { + path: string + head: string + branch: string | null + locked: boolean + prunable: boolean +} + +export interface RangeCommit { + commit: string + parents: string[] + subject: string +} + +export interface NameStatusChange { + status: string + path: string + previousPath?: string +} + +export function runGit(repository: string, args: readonly string[], options?: { allowFailure?: boolean }): GitCommandResult +export function resolveRepositoryContext(repository: string): RepositoryContext +export function readRepositoryStatus(repository: string): RepositoryStatus +export function listRegisteredWorktrees(repository: string): RegisteredWorktree[] +export function resolveCommit(repository: string, revision: string): string +export function isAncestor(repository: string, ancestor: string, descendant: string): boolean +export function listRangeCommits(repository: string, base: string, tip: string): RangeCommit[] +export function diffNameStatus(repository: string, base: string, tip: string): NameStatusChange[] diff --git a/scripts/lib/sherlock-git-state.mjs b/scripts/lib/sherlock-git-state.mjs new file mode 100644 index 000000000..0db7127fa --- /dev/null +++ b/scripts/lib/sherlock-git-state.mjs @@ -0,0 +1,254 @@ +import { spawnSync } from 'node:child_process' +import { existsSync, realpathSync } from 'node:fs' +import path from 'node:path' + +const gitOutputLimit = 64 * 1024 * 1024 +const generatedOutputRoots = new Set([ + 'dist', + 'dist-dev', + 'dist-internal', + 'dist-notarized', + 'dist-legacy', + 'dist-release', + 'dist-local-integration', + 'dist-feature-preview', + 'output', + '.sherlock-build' +]) + +function gitFailureMessage(args, result) { + const diagnostic = result.stderr.trim() || result.stdout.trim() + return diagnostic || `git ${args.join(' ')} 执行失败（退出码 ${result.status}）。` +} + +function outputRecords(output) { + return output.split('\0').filter((record) => record.length > 0) +} + +function nulFields(output) { + const fields = output.split('\0') + if (fields.at(-1) === '') fields.pop() + return fields +} + +function removeGitLineTerminator(output) { + return output.endsWith('\n') ? output.slice(0, -1) : output +} + +function absoluteGitPath(worktreeRoot, gitPath) { + return path.normalize(realpathSync(path.resolve(worktreeRoot, gitPath))) +} + +function recordedGitPath(worktreeRoot, gitPath) { + const absolutePath = path.normalize(path.resolve(worktreeRoot, gitPath)) + return existsSync(absolutePath) ? path.normalize(realpathSync(absolutePath)) : absolutePath +} + +function isGeneratedOutput(filePath) { + const separator = filePath.indexOf('/') + return separator > 0 && generatedOutputRoots.has(filePath.slice(0, separator)) +} + +function assertRevision(revision) { + if (typeof revision !== 'string' || revision.startsWith('-')) { + throw new Error('Git 修订版本不能以 - 开头。') + } + return revision +} + +export function runGit(repository, args, options = {}) { + const result = spawnSync('git', ['-C', path.resolve(repository), ...args], { + encoding: 'utf8', + stdio: ['ignore', 'pipe', 'pipe'], + maxBuffer: gitOutputLimit + }) + if (result.error) throw result.error + if (typeof result.status !== 'number') { + throw new Error(`git ${args.join(' ')} 未返回退出状态。`) + } + + const commandResult = { + status: result.status, + stdout: result.stdout ?? '', + stderr: result.stderr ?? '' + } + if (commandResult.status !== 0 && !options.allowFailure) { + throw new Error(gitFailureMessage(args, commandResult)) + } + return commandResult +} + +export function resolveRepositoryContext(repository) { + const worktreeRoot = path.normalize( + realpathSync( + path.resolve(removeGitLineTerminator(runGit(repository, ['rev-parse', '--show-toplevel']).stdout)) + ) + ) + const gitDirectory = absoluteGitPath( + worktreeRoot, + removeGitLineTerminator(runGit(worktreeRoot, ['rev-parse', '--git-dir']).stdout) + ) + const commonDirectory = absoluteGitPath( + worktreeRoot, + removeGitLineTerminator(runGit(worktreeRoot, ['rev-parse', '--git-common-dir']).stdout) + ) + const branchOutput = runGit(worktreeRoot, ['branch', '--show-current']).stdout.trim() + const head = runGit(worktreeRoot, ['rev-parse', 'HEAD']).stdout.trim() + + return { + worktreeRoot, + gitDirectory, + commonDirectory, + branch: branchOutput || null, + head, + linkedWorktree: gitDirectory !== commonDirectory + } +} + +export function readRepositoryStatus(repository) { + const output = runGit(repository, [ + 'status', + '--porcelain=v1', + '-z', + '--untracked-files=all' + ]).stdout + const trackedChanges = [] + const untrackedSources = [] + const untrackedOutputs = [] + + for (const record of outputRecords(output)) { + if (!record.startsWith('?? ')) { + trackedChanges.push(record) + continue + } + + const filePath = record.slice(3) + if (isGeneratedOutput(filePath)) untrackedOutputs.push(filePath) + else untrackedSources.push(filePath) + } + + return { + trackedChanges, + untrackedSources, + untrackedOutputs, + sourceClean: trackedChanges.length === 0 && untrackedSources.length === 0 + } +} + +export function listRegisteredWorktrees(repository) { + const output = runGit(repository, ['worktree', 'list', '--porcelain', '-z']).stdout + + return output + .split('\0\0') + .filter((block) => block.length > 0) + .map((block) => { + const fields = new Map( + outputRecords(block).map((record) => { + const separator = record.indexOf(' ') + return separator === -1 ? [record, ''] : [record.slice(0, separator), record.slice(separator + 1)] + }) + ) + const worktreePath = fields.get('worktree') + if (!worktreePath) throw new Error('Git worktree 记录缺少路径。') + const branchReference = fields.get('branch') ?? '' + + return { + path: recordedGitPath(path.resolve(repository), worktreePath), + head: fields.get('HEAD') ?? '', + branch: branchReference.replace(/^refs\/heads\//, '') || null, + locked: fields.has('locked'), + prunable: fields.has('prunable') + } + }) +} + +export function resolveCommit(repository, revision) { + const safeRevision = assertRevision(revision) + return runGit(repository, [ + 'rev-parse', + '--verify', + '--end-of-options', + `${safeRevision}^{commit}` + ]).stdout.trim() +} + +export function isAncestor(repository, ancestor, descendant) { + const safeAncestor = assertRevision(ancestor) + const safeDescendant = assertRevision(descendant) + const result = runGit( + repository, + ['merge-base', '--is-ancestor', '--end-of-options', safeAncestor, safeDescendant], + { allowFailure: true } + ) + if (result.status === 0) return true + if (result.status === 1) return false + throw new Error( + gitFailureMessage(['merge-base', '--is-ancestor', safeAncestor, safeDescendant], result) + ) +} + +export function listRangeCommits(repository, base, tip) { + const safeBase = assertRevision(base) + const safeTip = assertRevision(tip) + const records = nulFields( + runGit(repository, [ + 'log', + '-z', + '--topo-order', + '--reverse', + '--format=%H%x00%P%x00%s', + '--end-of-options', + `${safeBase}..${safeTip}` + ]).stdout + ) + if (records.length % 3 !== 0) throw new Error('Git 提交范围输出格式无效。') + + const commits = [] + for (let index = 0; index < records.length; index += 3) { + commits.push({ + commit: records[index], + parents: records[index + 1] ? records[index + 1].split(' ') : [], + subject: records[index + 2] + }) + } + return commits +} + +export function diffNameStatus(repository, base, tip) { + const safeBase = assertRevision(base) + const safeTip = assertRevision(tip) + const records = outputRecords( + runGit(repository, [ + 'diff', + '--name-status', + '-z', + '--find-renames', + '--find-copies-harder', + '--end-of-options', + safeBase, + safeTip, + '--' + ]).stdout + ) + const changes = [] + + for (let index = 0; index < records.length; ) { + const status = records[index++] + if (!status) throw new Error('Git 文件变更输出格式无效。') + if (status.startsWith('R') || status.startsWith('C')) { + const previousPath = records[index++] + const filePath = records[index++] + if (previousPath === undefined || filePath === undefined) { + throw new Error('Git 重命名或复制输出缺少路径。') + } + changes.push({ status, path: filePath, previousPath }) + continue + } + + const filePath = records[index++] + if (filePath === undefined) throw new Error('Git 文件变更输出缺少路径。') + changes.push({ status, path: filePath }) + } + + return changes +} diff --git a/scripts/lib/sherlock-integration-cli-outcome.d.mts b/scripts/lib/sherlock-integration-cli-outcome.d.mts new file mode 100644 index 000000000..f55d388c4 --- /dev/null +++ b/scripts/lib/sherlock-integration-cli-outcome.d.mts @@ -0,0 +1,24 @@ +export interface IntegrationOutcome { + status: string + batchId: string + branch: string + beforeCommit: string + afterCommit: string + conflictContext?: { + integrationTip: string + featureTip: string + featureBase: string + } + recoveryCommand?: string +} + +export function formatIntegrationOutcome(result: IntegrationOutcome): { + exitCode: 0 | 3 | 4 + channel: 'stdout' + output: string +} + +export function formatIntegrationError(error: unknown): { + exitCode: 1 | 2 + channel: 'stderr' +} diff --git a/scripts/lib/sherlock-integration-cli-outcome.mjs b/scripts/lib/sherlock-integration-cli-outcome.mjs new file mode 100644 index 000000000..9ab2a5d60 --- /dev/null +++ b/scripts/lib/sherlock-integration-cli-outcome.mjs @@ -0,0 +1,29 @@ +function humanToken(status) { + return status === 'planned' ? 'INTEGRATION PLANNED' + : status === 'prepared' ? 'INTEGRATION PREPARED' + : status === 'merged' ? 'INTEGRATION MERGED' + : status === 'conflict' ? 'INTEGRATION CONFLICT' + : status === 'ownership-recovered' ? 'INTEGRATION OWNERSHIP_RECOVERED' + : status === 'main-synchronized' ? 'INTEGRATION MAIN_SYNCHRONIZED' + : status === 'accepted' ? 'INTEGRATION ACCEPTED' + : status === 'promoted' ? 'INTEGRATION PROMOTED' + : status === 'cancelled' ? 'INTEGRATION CANCELLED' + : 'INTEGRATION RECOVERY_REQUIRED' +} + +export function formatIntegrationOutcome(result) { + let output = `${humanToken(result.status)} batch=${result.batchId} branch=${result.branch} before=${result.beforeCommit} after=${result.afterCommit}\n` + if (result.conflictContext) { + output += `CONFLICT integrationTip=${result.conflictContext.integrationTip} featureTip=${result.conflictContext.featureTip} featureBase=${result.conflictContext.featureBase}\n` + } + if (result.recoveryCommand) output += `RECOVERY ${result.recoveryCommand}\n` + return { + exitCode: result.status === 'recovery-required' ? 4 : result.status === 'conflict' ? 3 : 0, + channel: 'stdout', + output + } +} + +export function formatIntegrationError(error) { + return { exitCode: error && typeof error === 'object' && error.integrationExit === 1 ? 1 : 2, channel: 'stderr' } +} diff --git a/scripts/lib/sherlock-integration-executor.d.mts b/scripts/lib/sherlock-integration-executor.d.mts new file mode 100644 index 000000000..a7a66eac5 --- /dev/null +++ b/scripts/lib/sherlock-integration-executor.d.mts @@ -0,0 +1,94 @@ +import type { IntegrationBatchManifest } from './sherlock-integration-model.mjs' + +export interface IntegrationExecutionResult { + schemaVersion: 1 + status: 'planned' | 'prepared' | 'merged' | 'conflict' | 'ownership-recovered' | 'main-synchronized' | 'accepted' | 'promoted' | 'cancelled' | 'recovery-required' + batchId: string + branch: string + beforeCommit: string + afterCommit: string + actions: Array<{ kind: string; description: string; argv?: string[] }> + recoveryCommand?: string + conflictContext?: { integrationTip: string; featureTip: string; featureBase: string } +} + +export function createIntegrationBatch(options: { + mainRepository: string + worktreePath: string + batchId: string + handoffPaths: string[] + integrationChecks: IntegrationBatchManifest['integrationChecks'] + dryRun: boolean + now: string +}): IntegrationExecutionResult + +export function adoptIntegrationBatch(options: { + integrationRepository: string + batchId: string + handoffPaths: string[] + integrationChecks: IntegrationBatchManifest['integrationChecks'] + dryRun: boolean + now: string +}): IntegrationExecutionResult + +export function readPersistedIntegrationOwnerToken(repository: string): string +export function formatIntegrationRecoveryCommand(options: { + repository: string + manifestPath: string + featureBranch: string +}): string +export function mergeIntegrationFeature(options: { + integrationRepository: string + manifestPath: string + featureBranch: string + ownerToken: string + dryRun: boolean + now: string +}): IntegrationExecutionResult +export function continueIntegrationFeature(options: { + integrationRepository: string + manifestPath: string + featureBranch: string + ownerToken: string + dryRun: boolean + now: string +}): IntegrationExecutionResult +export function recoverIntegrationOwnership(options: { + integrationRepository: string + manifestPath: string + confirmBatchId: string + confirmTip: string +}): IntegrationExecutionResult +export function synchronizeIntegrationMain(options: { + integrationRepository: string + manifestPath: string + ownerToken: string + dryRun: boolean + now: string +}): IntegrationExecutionResult +export function acceptIntegrationBatch(options: { + integrationRepository: string + manifestPath: string + commit: string + confirmBatchId: string + ownerToken: string + now: string +}): IntegrationExecutionResult +export function promoteIntegrationBatch(options: { + integrationRepository: string + manifestPath: string + mainWorktree: string + confirmBatchId: string + confirmTip: string + ownerToken: string + dryRun: boolean + now: string +}): IntegrationExecutionResult +export function cancelIntegrationBatch(options: { + integrationRepository: string + manifestPath: string + confirmBatchId: string + explicitCancellation: boolean + dryRun: boolean + now: string +}): IntegrationExecutionResult diff --git a/scripts/lib/sherlock-integration-executor.mjs b/scripts/lib/sherlock-integration-executor.mjs new file mode 100644 index 000000000..6e946d80b --- /dev/null +++ b/scripts/lib/sherlock-integration-executor.mjs @@ -0,0 +1,848 @@ +import { createHash, randomBytes, timingSafeEqual } from 'node:crypto' +import { existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from 'node:fs' +import { spawnSync } from 'node:child_process' +import path from 'node:path' +import { + acquireActiveBatchLease, + archiveActiveBatchLease, + markActiveBatchAccepted, + readActiveBatchLease, + recoverActiveBatchOwnership, + updateActiveBatchTip +} from './sherlock-active-batch.mjs' +import { + createIntegrationBatchManifest, + validateFeatureHandoff, + validateIntegrationBatchManifest +} from './sherlock-integration-model.mjs' +import { preflightIntegrationAction } from './sherlock-integration-preflight.mjs' +import { + isAncestor, + listRegisteredWorktrees, + readRepositoryStatus, + resolveCommit, + resolveRepositoryContext, + runGit +} from './sherlock-git-state.mjs' + +const batchPattern = /^\d{8}-\d{2}$/ + +function fail(message) { + const error = new Error(`集成批次执行失败：${message}`) + error.integrationExit = 1 + throw error +} + +function branchFor(batchId) { + if (typeof batchId !== 'string' || !batchPattern.test(batchId)) fail('batchId 必须匹配 YYYYMMDD-NN。') + return `codex/integration/${batchId}` +} + +function manifestPathFor(batchId) { + return `config/sherlock-integration-batches/${batchId}.json` +} + +function strictNow(now) { + if (typeof now !== 'string' || Number.isNaN(Date.parse(now)) || new Date(now).toISOString() !== now) { + fail('now 必须是规范 ISO 时间。') + } + return now +} + +function sourceClean(repository, label) { + const status = readRepositoryStatus(repository) + if (!status.sourceClean) fail(`${label} 必须没有未提交的源码改动。`) +} + +function absentReference(repository, reference, label) { + const result = runGit(repository, ['show-ref', '--verify', '--quiet', '--', reference], { allowFailure: true }) + if (result.status === 0) fail(`${label} 已存在：${reference}`) + if (result.status !== 1) fail(`无法检查 ${label}：${reference}`) +} + +function canonicalMain(repository) { + let context + try { + context = resolveRepositoryContext(repository) + } catch { + fail('create 只能从精确的规范 main worktree 执行。') + } + if (context.branch !== 'main' || context.gitDirectory !== context.commonDirectory) { + fail('create 只能从精确的规范 main worktree 执行。') + } + const registered = listRegisteredWorktrees(context.worktreeRoot) + const exact = registered.find((entry) => entry.path === context.worktreeRoot) + if (!exact || exact.branch !== 'main' || exact.prunable) fail('规范 main worktree 未被 Git 正常登记。') + sourceClean(context.worktreeRoot, '规范 main worktree') + return context +} + +function currentMainTip(repository) { + return resolveCommit(repository, 'refs/heads/main') +} + +function requireIgnoredWorktreeDirectory(repository) { + const result = runGit(repository, ['check-ignore', '-q', '--', '.worktrees/'], { allowFailure: true }) + if (result.status !== 0) fail('.worktrees/ 必须由 Git 忽略。') +} + +function loadHandoffs(repository, handoffPaths, integrationChecks, batchId, beforeCommit, now) { + if (!Array.isArray(handoffPaths) || handoffPaths.length === 0) fail('至少需要一张交接卡。') + const handoffs = handoffPaths.map((handoffPath, index) => { + if (typeof handoffPath !== 'string' || handoffPath.length === 0) fail(`handoffPaths[${index}] 必须是非空路径。`) + let parsed + try { + parsed = JSON.parse(readFileSync(handoffPath, 'utf8')) + } catch (error) { + fail(`无法读取交接卡 ${handoffPath}：${error instanceof Error ? error.message : String(error)}`) + } + const handoff = validateFeatureHandoff(parsed) + const liveTip = resolveCommit(repository, `refs/heads/${handoff.branch}`) + if (liveTip !== handoff.tipCommit) fail(`交接卡功能分支已移动：${handoff.branch}`) + if (!isAncestor(repository, handoff.baseCommit, handoff.tipCommit)) { + fail(`交接卡功能基线不是 tip 的祖先：${handoff.branch}`) + } + return handoff + }) + return createIntegrationBatchManifest({ + batchId, + branch: branchFor(batchId), + baseMainCommit: beforeCommit, + handoffs, + integrationChecks, + createdAt: strictNow(now) + }) +} + +function noActiveLease(repository) { + const lease = readActiveBatchLease(repository) + if (lease) fail(`已有活动集成租约：${lease.batchId}`) +} + +function targetAbsent(mainContext, worktreePath, batchId) { + const normalized = path.resolve(worktreePath) + const worktreeRoot = path.join(mainContext.worktreeRoot, '.worktrees') + const relativeTarget = path.relative(worktreeRoot, normalized) + if (!relativeTarget || relativeTarget === '..' || relativeTarget.startsWith(`..${path.sep}`) || path.isAbsolute(relativeTarget)) { + fail('集成 worktree 路径必须位于规范 main 的 .worktrees/ 目录。') + } + if (existsSync(normalized)) fail(`集成 worktree 路径已存在：${normalized}`) + const registered = listRegisteredWorktrees(mainContext.worktreeRoot) + if (registered.some((entry) => entry.path === normalized)) fail(`集成 worktree 已被 Git 登记：${normalized}`) + absentReference(mainContext.worktreeRoot, `refs/heads/${branchFor(batchId)}`, '集成分支') + const manifestPath = manifestPathFor(batchId) + if (existsSync(path.join(mainContext.worktreeRoot, manifestPath))) fail(`集成清单路径已存在：${manifestPath}`) + const tracked = runGit(mainContext.worktreeRoot, ['ls-files', '--error-unmatch', '--', manifestPath], { allowFailure: true }) + if (tracked.status === 0) fail(`集成清单路径已被跟踪：${manifestPath}`) + if (tracked.status !== 1) fail(`无法检查集成清单路径：${manifestPath}`) + const inTip = runGit(mainContext.worktreeRoot, ['cat-file', '-e', `${mainContext.head}:${manifestPath}`], { allowFailure: true }) + if (inTip.status === 0) fail(`main 已包含集成清单路径：${manifestPath}`) + if (inTip.status !== 128) fail(`无法检查 main 中的集成清单路径：${manifestPath}`) + return normalized +} + +function requireAdoptableIntegration(repository, batchId) { + const context = resolveRepositoryContext(repository) + const branch = branchFor(batchId) + if (!context.linkedWorktree) fail('adopt 只能接管 Git 已登记的 linked worktree。') + if (context.branch !== branch) fail(`adopt worktree 必须位于 ${branch}。`) + const registered = listRegisteredWorktrees(context.worktreeRoot) + const entry = registered.find((candidate) => candidate.path === context.worktreeRoot) + if (!entry || entry.branch !== branch || entry.prunable) fail('adopt worktree 未被 Git 正常登记。') + sourceClean(context.worktreeRoot, 'adopt 集成 worktree') + const mainTip = currentMainTip(context.worktreeRoot) + if (context.head !== mainTip) fail('adopt worktree 的 HEAD 必须精确等于当前本地 main tip。') + const manifestPath = manifestPathFor(batchId) + if (existsSync(path.join(context.worktreeRoot, manifestPath))) fail(`集成清单路径已存在：${manifestPath}`) + const tracked = runGit(context.worktreeRoot, ['ls-files', '--error-unmatch', '--', manifestPath], { allowFailure: true }) + if (tracked.status === 0) fail(`集成清单路径已被跟踪：${manifestPath}`) + if (tracked.status !== 1) fail(`无法检查集成清单路径：${manifestPath}`) + return context +} + +function action(kind, description, argv) { + return argv ? { kind, description, argv } : { kind, description } +} + +function recoveryResult({ batchId, branch, beforeCommit, repository, actions }) { + let afterCommit = beforeCommit + try { afterCommit = resolveRepositoryContext(repository).head } catch {} + return { + schemaVersion: 1, + status: 'recovery-required', + batchId, + branch, + beforeCommit, + afterCommit, + actions: [ + ...actions.map(({ kind, description }) => ({ kind, description })), + action('recovery-state-preserved', '已保留现有批次状态，待后续显式恢复流程处理。') + ] + } +} + +function posixQuote(value) { + if (typeof value !== 'string' || value.includes('\0')) fail('恢复命令参数必须是不含 NUL 的字符串。') + return `'${value.replaceAll("'", "'\"'\"'")}'` +} + +export function formatIntegrationRecoveryCommand({ repository, manifestPath, featureBranch }) { + return `npm run git:integration -- continue --repo ${posixQuote(repository)} --manifest ${posixQuote(manifestPath)} --feature ${posixQuote(featureBranch)}` +} + +function checkedNow(now) { + return strictNow(now) +} + +function readManifestForMutation(repository, manifestPath) { + const context = resolveRepositoryContext(repository) + const lease = readActiveBatchLease(context.worktreeRoot) + if (!lease) fail('不存在活动集成租约。') + const expectedPath = path.join(context.worktreeRoot, lease.manifestPath) + if (path.resolve(manifestPath) !== path.resolve(expectedPath)) fail('manifestPath 必须精确匹配活动租约。') + runGit(context.worktreeRoot, ['ls-files', '--error-unmatch', '--', lease.manifestPath]) + let manifest + try { + manifest = validateIntegrationBatchManifest(JSON.parse(readFileSync(expectedPath, 'utf8'))) + } catch (error) { + fail(`无法读取集成批次清单：${error instanceof Error ? error.message : String(error)}`) + } + if (manifest.batchId !== lease.batchId || manifest.branch !== lease.branch) fail('集成清单与活动租约不匹配。') + return { context, lease, manifest, manifestPath: expectedPath } +} + +function manifestDigest(manifestPath) { + return createHash('sha256').update(readFileSync(manifestPath)).digest('hex') +} + +function canonicalMainWorktree(repository) { + const candidates = listRegisteredWorktrees(repository) + .filter((entry) => entry.branch === 'main' && !entry.prunable) + .map((entry) => { + try { return resolveRepositoryContext(entry.path) } catch { return null } + }) + .filter(Boolean) + .filter((context) => context.branch === 'main' && context.gitDirectory === context.commonDirectory) + if (candidates.length !== 1) fail('必须存在且只存在一个规范 main worktree。') + return candidates[0] +} + +function requireExactConfirmation(value, expected, label) { + if (typeof value !== 'string' || value !== expected) fail(`${label} 必须精确匹配当前批次状态。`) +} + +function resultFor(status, state, beforeCommit, afterCommit, actions) { + return { + schemaVersion: 1, + status, + batchId: state.lease.batchId, + branch: state.lease.branch, + beforeCommit, + afterCommit, + actions + } +} + +function recordMainSynchronization({ repository, lease, manifest, manifestPath, previousMainCommit, mainCommit, mergeCommit, checks, now, ownerToken }) { + const nextManifest = validateIntegrationBatchManifest({ + ...manifest, + expectedMainCommit: mainCommit, + mainSynchronizations: [...manifest.mainSynchronizations, { + previousMainCommit, + mainCommit, + mergeCommit, + verificationCommit: mergeCommit, + checks, + recordedAt: now + }] + }) + writeFileSync(manifestPath, `${JSON.stringify(nextManifest, null, 2)}\n`, 'utf8') + runGit(repository, ['add', '--', lease.manifestPath]) + runGit(repository, ['commit', '-m', `集成：记录 main 同步验证`]) + const recordCommit = resolveRepositoryContext(repository).head + updateActiveBatchTip({ + repository, + ownerToken, + expectedRevision: lease.revision, + expectedTip: lease.currentTip, + nextTip: recordCommit, + updatedAt: now + }) + return recordCommit +} + +function verifyMutationOwner(context, lease, ownerToken, { requireLeaseTip = true } = {}) { + if (typeof ownerToken !== 'string' || ownerToken.length === 0 || ownerToken.includes('\0')) fail('ownerToken 无效。') + if (context.branch !== lease.branch) fail('当前 worktree 必须位于活动租约分支。') + if (requireLeaseTip && context.head !== lease.currentTip) fail('当前 HEAD 必须精确等于活动租约 currentTip。') + const hash = createHash('sha256').update(ownerToken, 'utf8').digest('hex') + if (!timingSafeEqual(Buffer.from(hash, 'utf8'), Buffer.from(lease.ownerTokenHash, 'utf8'))) fail('owner token 不匹配。') + const ownerPath = path.join(context.gitDirectory, 'sherlock-integration-owner.json') + if (!existsSync(ownerPath) || (statSync(ownerPath).mode & 0o777) !== 0o600) fail('owner token 文件不可用。') + let record + try { record = JSON.parse(readFileSync(ownerPath, 'utf8')) } catch { fail('owner token 文件不是有效 JSON。') } + if (!record || record.schemaVersion !== 1 || record.batchId !== lease.batchId || typeof record.ownerToken !== 'string') { + fail('持久 owner token 与租约不匹配。') + } + const persistedHash = createHash('sha256').update(record.ownerToken, 'utf8').digest('hex') + if (!timingSafeEqual(Buffer.from(persistedHash, 'utf8'), Buffer.from(lease.ownerTokenHash, 'utf8')) || record.ownerToken !== ownerToken) { + fail('持久 owner token 与租约不匹配。') + } +} + +export function readPersistedIntegrationOwnerToken(repository) { + const context = resolveRepositoryContext(repository) + const ownerPath = path.join(context.gitDirectory, 'sherlock-integration-owner.json') + let record + try { record = JSON.parse(readFileSync(ownerPath, 'utf8')) } catch { fail('无法读取持久 owner token。') } + if (!record || record.schemaVersion !== 1 || typeof record.ownerToken !== 'string' || record.ownerToken.length === 0 || record.ownerToken.includes('\0')) { + fail('持久 owner token 无效。') + } + return record.ownerToken +} + +function selectedFeature(manifest, featureBranch) { + const feature = manifest.features.find((entry) => entry.handoff.branch === featureBranch) + if (!feature) fail(`功能分支不在集成批次中：${featureBranch}`) + return feature +} + +function requirePassingPreflight(repository, phase, manifestPath, featureBranch, mainWorktree, expectedAcceptedTip) { + const report = preflightIntegrationAction({ repository, phase, manifestPath, featureBranch, mainWorktree, expectedAcceptedTip }) + if (!report.ok) { + const details = report.findings.filter((entry) => entry.severity === 'error').map((entry) => entry.message).join('；') + fail(`预检未通过：${details || '未知原因'}`) + } + return report +} + +function runDeclaredChecks(repository, checks, verifiedCommit, now) { + const evidence = [] + for (const check of checks) { + const result = spawnSync(check.argv[0], check.argv.slice(1), { + cwd: repository, + encoding: 'utf8', + shell: false, + timeout: check.timeoutMs, + maxBuffer: 64 * 1024 * 1024 + }) + if (result.error || result.status !== 0) { + const diagnostic = result.error?.message || result.stderr || result.stdout || `退出码 ${result.status}` + const error = new Error(`集成检查失败：${check.argv.join(' ')}；${diagnostic.trim()}`) + error.checkFailure = true + throw error + } + evidence.push({ + argv: [...check.argv], + outcome: 'passed', + summary: `已在暂存合并树执行：${check.argv.join(' ')}`, + verifiedCommit, + completedAt: now, + timeoutMs: check.timeoutMs + }) + } + return evidence +} + +function mergeParents(repository, commit) { + const text = runGit(repository, ['show', '-s', '--format=%P', '--end-of-options', commit]).stdout.trim() + return text ? text.split(' ') : [] +} + +function manifestWithMergedFeature(manifest, featureBranch, merged) { + return validateIntegrationBatchManifest({ + ...manifest, + features: manifest.features.map((feature) => feature.handoff.branch === featureBranch ? { ...feature, merged } : feature) + }) +} + +function exactMergedEvidence(feature, checks, mergeCommit) { + const merged = feature.merged + if (!merged || merged.mergeCommit !== mergeCommit || merged.verificationCommit !== mergeCommit) return false + if (merged.checks.length !== checks.length) return false + return merged.checks.every((check, index) => + check.verifiedCommit === mergeCommit && + check.outcome === 'passed' && + check.timeoutMs === checks[index].timeoutMs && + check.summary === `已在暂存合并树执行：${checks[index].argv.join(' ')}` && + JSON.stringify(check.argv) === JSON.stringify(checks[index].argv) + ) +} + +function assertLiveFeatureTip(repository, feature) { + if (resolveCommit(repository, `refs/heads/${feature.handoff.branch}`) !== feature.handoff.tipCommit) { + fail('功能分支引用不再指向交接卡 tip。') + } +} + +function stagedManifestOnly(repository, manifestPath) { + const unstaged = runGit(repository, ['diff', '--name-only', '--']).stdout + const staged = runGit(repository, ['diff', '--cached', '--name-only', '--']).stdout.trim().split('\n').filter(Boolean) + return unstaged.length === 0 && staged.length === 1 && staged[0] === manifestPath +} + +function headManifest(repository, manifestPath) { + try { + return validateIntegrationBatchManifest(JSON.parse(runGit(repository, ['show', `HEAD:${manifestPath}`]).stdout)) + } catch { + return null + } +} + +function boundaryForContinuation(repository, feature, lease) { + const context = resolveRepositoryContext(repository) + const parents = mergeParents(repository, context.head) + if (parents.length !== 2 || parents[1] !== feature.handoff.tipCommit) return null + if (lease.currentTip !== context.head && parents[0] !== lease.currentTip) return null + return { context, mergeCommit: context.head } +} + +function recordMergedFeature({ repository, lease, manifest, manifestPath, featureBranch, mergeCommit, checks, now, ownerToken }) { + const nextManifest = manifestWithMergedFeature(manifest, featureBranch, { + mergeCommit, + verificationCommit: mergeCommit, + checks, + recordedAt: now + }) + writeFileSync(manifestPath, `${JSON.stringify(nextManifest, null, 2)}\n`, 'utf8') + runGit(repository, ['add', '--', lease.manifestPath]) + runGit(repository, ['commit', '-m', `集成：记录功能 ${featureBranch} 合并验证`]) + const recordCommit = resolveRepositoryContext(repository).head + updateActiveBatchTip({ + repository, + ownerToken, + expectedRevision: lease.revision, + expectedTip: lease.currentTip, + nextTip: recordCommit, + updatedAt: now + }) + return recordCommit +} + +function mergeRecoveryResult({ repository, manifestPath, featureBranch, beforeCommit, actions }) { + const state = readManifestForMutation(repository, manifestPath) + return { + ...recoveryResult({ batchId: state.lease.batchId, branch: state.lease.branch, beforeCommit, repository, actions }), + recoveryCommand: formatIntegrationRecoveryCommand({ repository: state.context.worktreeRoot, manifestPath, featureBranch }) + } +} + +function mergeActions(featureBranch, checks) { + return [ + action('merge-feature', '以完整功能历史创建未提交的合并边界。', ['merge', '--no-ff', '--no-commit', featureBranch]), + ...checks.map((check) => action('run-integration-check', '在暂存合并树执行声明的检查。', [...check.argv])), + action('commit-merge', '提交中文功能合并边界。', ['commit', '-m', `集成：合并功能 ${featureBranch}`]), + action('record-merge-evidence', '提交精确的合并和检查证据。', ['commit', '-m', `集成：记录功能 ${featureBranch} 合并验证`]) + ] +} + +export function mergeIntegrationFeature({ integrationRepository, manifestPath, featureBranch, ownerToken, dryRun, now }) { + if (typeof dryRun !== 'boolean') fail('dryRun 必须为布尔值。') + checkedNow(now) + const state = readManifestForMutation(integrationRepository, manifestPath) + const feature = selectedFeature(state.manifest, featureBranch) + if (feature.merged) fail('功能已经记录为完成合并。') + requirePassingPreflight(state.context.worktreeRoot, 'merge', state.manifestPath, featureBranch) + verifyMutationOwner(state.context, state.lease, ownerToken) + if (isAncestor(state.context.worktreeRoot, feature.handoff.tipCommit, state.context.head)) fail('功能 tip 已在集成历史中；请使用 continue 恢复记录。') + const actions = mergeActions(featureBranch, state.manifest.integrationChecks) + if (dryRun) return { schemaVersion: 1, status: 'planned', batchId: state.lease.batchId, branch: state.lease.branch, beforeCommit: state.context.head, afterCommit: state.context.head, actions } + + const beforeCommit = state.context.head + const merge = runGit(state.context.worktreeRoot, ['merge', '--no-ff', '--no-commit', featureBranch], { allowFailure: true }) + if (merge.status !== 0) { + const inConflict = runGit(state.context.worktreeRoot, ['rev-parse', '-q', '--verify', 'MERGE_HEAD'], { allowFailure: true }).status === 0 + if (inConflict) { + return { + schemaVersion: 1, + status: 'conflict', + batchId: state.lease.batchId, + branch: state.lease.branch, + beforeCommit, + afterCommit: beforeCommit, + actions: [...actions, action('merge-conflict-preserved', '已保留 MERGE_HEAD 和未合并文件，等待显式解决。')], + conflictContext: { integrationTip: beforeCommit, featureTip: feature.handoff.tipCommit, featureBase: feature.handoff.baseCommit } + } + } + fail(`合并命令失败：${merge.stderr.trim() || merge.stdout.trim()}`) + } + try { + const stagedChecks = runDeclaredChecks(state.context.worktreeRoot, state.manifest.integrationChecks, '0'.repeat(40), now) + runGit(state.context.worktreeRoot, ['commit', '-m', `集成：合并功能 ${featureBranch}`]) + const mergeCommit = resolveRepositoryContext(state.context.worktreeRoot).head + const parents = mergeParents(state.context.worktreeRoot, mergeCommit) + if (parents.length !== 2 || parents[0] !== beforeCommit || parents[1] !== feature.handoff.tipCommit) fail('合并边界父提交与预期功能 tip 不匹配。') + const checks = stagedChecks.map((check) => ({ ...check, verifiedCommit: mergeCommit })) + const advancedLease = updateActiveBatchTip({ + repository: state.context.worktreeRoot, + ownerToken, + expectedRevision: state.lease.revision, + expectedTip: beforeCommit, + nextTip: mergeCommit, + updatedAt: now + }) + const afterCommit = recordMergedFeature({ repository: state.context.worktreeRoot, lease: advancedLease, manifest: state.manifest, manifestPath: state.manifestPath, featureBranch, mergeCommit, checks, now, ownerToken }) + return { schemaVersion: 1, status: 'merged', batchId: state.lease.batchId, branch: state.lease.branch, beforeCommit, afterCommit, actions } + } catch (error) { + if (error && typeof error === 'object' && error.checkFailure) { + const aborted = runGit(state.context.worktreeRoot, ['merge', '--abort'], { allowFailure: true }) + if (aborted.status === 0) fail(error.message) + return mergeRecoveryResult({ repository: state.context.worktreeRoot, manifestPath: state.manifestPath, featureBranch, beforeCommit, actions }) + } + return mergeRecoveryResult({ repository: state.context.worktreeRoot, manifestPath: state.manifestPath, featureBranch, beforeCommit, actions }) + } +} + +export function continueIntegrationFeature({ integrationRepository, manifestPath, featureBranch, ownerToken, dryRun, now }) { + if (typeof dryRun !== 'boolean') fail('dryRun 必须为布尔值。') + checkedNow(now) + const state = readManifestForMutation(integrationRepository, manifestPath) + const feature = selectedFeature(state.manifest, featureBranch) + const actions = mergeActions(featureBranch, state.manifest.integrationChecks) + if (feature.merged) { + assertLiveFeatureTip(state.context.worktreeRoot, feature) + verifyMutationOwner(state.context, state.lease, ownerToken, { requireLeaseTip: false }) + const headRecord = headManifest(state.context.worktreeRoot, state.lease.manifestPath) + const recordParents = mergeParents(state.context.worktreeRoot, state.context.head) + const clean = readRepositoryStatus(state.context.worktreeRoot).sourceClean + if ( + headRecord && !headRecord.features.find((entry) => entry.handoff.branch === featureBranch)?.merged && + clean === false && stagedManifestOnly(state.context.worktreeRoot, state.lease.manifestPath) + ) { + const boundary = boundaryForContinuation(state.context.worktreeRoot, feature, state.lease) + if (!boundary || !exactMergedEvidence(feature, state.manifest.integrationChecks, boundary.mergeCommit)) { + fail('暂存的合并记录不满足精确恢复条件。') + } + if (dryRun) return { schemaVersion: 1, status: 'planned', batchId: state.lease.batchId, branch: state.lease.branch, beforeCommit: boundary.mergeCommit, afterCommit: boundary.mergeCommit, actions } + runGit(state.context.worktreeRoot, ['commit', '-m', `集成：记录功能 ${featureBranch} 合并验证`]) + const recordCommit = resolveRepositoryContext(state.context.worktreeRoot).head + const nextLease = updateActiveBatchTip({ repository: state.context.worktreeRoot, ownerToken, expectedRevision: state.lease.revision, expectedTip: state.lease.currentTip, nextTip: recordCommit, updatedAt: now }) + return { schemaVersion: 1, status: 'merged', batchId: nextLease.batchId, branch: nextLease.branch, beforeCommit: boundary.mergeCommit, afterCommit: recordCommit, actions } + } + if ( + clean && recordParents.length === 1 && recordParents[0] === state.lease.currentTip && + runGit(state.context.worktreeRoot, ['diff-tree', '--no-commit-id', '--name-only', '-r', state.context.head]).stdout.trim() === state.lease.manifestPath && + runGit(state.context.worktreeRoot, ['show', '-s', '--format=%s', state.context.head]).stdout.trim() === `集成：记录功能 ${featureBranch} 合并验证` && + exactMergedEvidence(feature, state.manifest.integrationChecks, state.lease.currentTip) + ) { + if (dryRun) return { schemaVersion: 1, status: 'planned', batchId: state.lease.batchId, branch: state.lease.branch, beforeCommit: state.context.head, afterCommit: state.context.head, actions } + const nextLease = updateActiveBatchTip({ repository: state.context.worktreeRoot, ownerToken, expectedRevision: state.lease.revision, expectedTip: state.lease.currentTip, nextTip: state.context.head, updatedAt: now }) + return { schemaVersion: 1, status: 'merged', batchId: nextLease.batchId, branch: nextLease.branch, beforeCommit: state.context.head, afterCommit: state.context.head, actions } + } + fail('功能已经记录为完成合并。') + } + requirePassingPreflight(state.context.worktreeRoot, 'continue', state.manifestPath, featureBranch) + verifyMutationOwner(state.context, state.lease, ownerToken, { requireLeaseTip: false }) + const parents = mergeParents(state.context.worktreeRoot, state.context.head) + const leaseAlreadyAdvanced = state.lease.currentTip === state.context.head + if ( + parents.length !== 2 || + parents[1] !== feature.handoff.tipCommit || + (!leaseAlreadyAdvanced && parents[0] !== state.lease.currentTip) + ) { + fail('continue 只能记录父提交精确匹配租约 tip 和功能 tip 的边界合并。') + } + if (dryRun) return { schemaVersion: 1, status: 'planned', batchId: state.lease.batchId, branch: state.lease.branch, beforeCommit: state.context.head, afterCommit: state.context.head, actions } + const mergeCommit = state.context.head + try { + const checks = runDeclaredChecks(state.context.worktreeRoot, state.manifest.integrationChecks, mergeCommit, now) + const afterCommit = recordMergedFeature({ repository: state.context.worktreeRoot, lease: state.lease, manifest: state.manifest, manifestPath: state.manifestPath, featureBranch, mergeCommit, checks, now, ownerToken }) + return { schemaVersion: 1, status: 'merged', batchId: state.lease.batchId, branch: state.lease.branch, beforeCommit: mergeCommit, afterCommit, actions } + } catch { + return mergeRecoveryResult({ repository: state.context.worktreeRoot, manifestPath: state.manifestPath, featureBranch, beforeCommit: mergeCommit, actions }) + } +} + +function establishBatch({ repository, context, batchId, manifest, beforeCommit, dryRun, createArgv }) { + const branch = branchFor(batchId) + const manifestPath = manifestPathFor(batchId) + const actions = [] + if (createArgv) actions.push(action('create-worktree', '创建新的集成 worktree。', createArgv)) + else actions.push(action('adopt-worktree', '接管既有集成 worktree，不移动分支或路径。')) + actions.push(action('acquire-lease', '取得活动集成批次租约。')) + actions.push(action('write-manifest', '写入受跟踪集成批次清单。')) + actions.push(action('commit-manifest', '提交集成批次清单。', ['commit', '-m', `集成：创建批次 ${batchId}`])) + if (dryRun) { + return { schemaVersion: 1, status: 'planned', batchId, branch, beforeCommit, afterCommit: beforeCommit, actions } + } + + let integrationRepository = context.worktreeRoot + let leaseAcquired = false + let worktreeCreated = false + try { + if (createArgv) { + runGit(context.worktreeRoot, createArgv) + integrationRepository = path.resolve(createArgv[4]) + worktreeCreated = true + } + const integrationContext = resolveRepositoryContext(integrationRepository) + if (integrationContext.branch !== branch || integrationContext.head !== beforeCommit) { + fail('创建或接管后的集成 worktree 不再位于预期分支和提交。') + } + const ownerToken = randomBytes(32).toString('hex') + const acquired = acquireActiveBatchLease({ + repository: integrationContext.worktreeRoot, + ownerToken, + lease: { + batchId, + branch, + manifestPath, + baseMainCommit: beforeCommit, + currentTip: beforeCommit, + createdAt: manifest.createdAt, + updatedAt: manifest.createdAt + } + }) + if (!acquired.created) fail('活动集成租约已存在，拒绝重用。') + leaseAcquired = true + const diskManifest = path.join(integrationContext.worktreeRoot, manifestPath) + mkdirSync(path.dirname(diskManifest), { recursive: true }) + writeFileSync(diskManifest, `${JSON.stringify(manifest, null, 2)}\n`, { encoding: 'utf8', flag: 'wx' }) + runGit(integrationContext.worktreeRoot, ['add', '--', manifestPath]) + runGit(integrationContext.worktreeRoot, ['commit', '-m', `集成：创建批次 ${batchId}`]) + const afterCommit = resolveRepositoryContext(integrationContext.worktreeRoot).head + if (resolveCommit(integrationContext.worktreeRoot, `${afterCommit}^`) !== beforeCommit) { + fail('集成清单必须成为集成分支的首个提交。') + } + const files = runGit(integrationContext.worktreeRoot, ['diff-tree', '--no-commit-id', '--name-only', '-r', afterCommit]).stdout.trim() + if (files !== manifestPath) fail('首个集成提交只能包含批次清单。') + updateActiveBatchTip({ + repository: integrationContext.worktreeRoot, + ownerToken, + expectedRevision: acquired.lease.revision, + expectedTip: beforeCommit, + nextTip: afterCommit, + updatedAt: manifest.createdAt + }) + return { schemaVersion: 1, status: 'prepared', batchId, branch, beforeCommit, afterCommit, actions } + } catch (error) { + if (leaseAcquired || worktreeCreated) { + return recoveryResult({ batchId, branch, beforeCommit, repository: integrationRepository, actions }) + } + throw error + } +} + +export function createIntegrationBatch({ mainRepository, worktreePath, batchId, handoffPaths, integrationChecks, dryRun, now }) { + if (typeof worktreePath !== 'string' || worktreePath.length === 0) fail('worktreePath 必须是非空路径。') + if (typeof dryRun !== 'boolean') fail('dryRun 必须为布尔值。') + const main = canonicalMain(mainRepository) + const branch = branchFor(batchId) + requireIgnoredWorktreeDirectory(main.worktreeRoot) + const target = targetAbsent(main, worktreePath, batchId) + noActiveLease(main.worktreeRoot) + const beforeCommit = currentMainTip(main.worktreeRoot) + if (main.head !== beforeCommit) fail('规范 main worktree 的 HEAD 必须精确等于本地 main tip。') + const manifest = loadHandoffs(main.worktreeRoot, handoffPaths, integrationChecks, batchId, beforeCommit, now) + return establishBatch({ + repository: main.worktreeRoot, + context: main, + batchId, + manifest, + beforeCommit, + dryRun, + createArgv: ['worktree', 'add', '-b', branch, target, beforeCommit] + }) +} + +export function adoptIntegrationBatch({ integrationRepository, batchId, handoffPaths, integrationChecks, dryRun, now }) { + if (typeof dryRun !== 'boolean') fail('dryRun 必须为布尔值。') + const integration = requireAdoptableIntegration(integrationRepository, batchId) + noActiveLease(integration.worktreeRoot) + const beforeCommit = integration.head + const manifest = loadHandoffs(integration.worktreeRoot, handoffPaths, integrationChecks, batchId, beforeCommit, now) + return establishBatch({ + repository: integration.worktreeRoot, + context: integration, + batchId, + manifest, + beforeCommit, + dryRun + }) +} + +export function recoverIntegrationOwnership({ integrationRepository, manifestPath, confirmBatchId, confirmTip }) { + const state = readManifestForMutation(integrationRepository, manifestPath) + requireExactConfirmation(confirmBatchId, state.lease.batchId, 'confirmBatchId') + requireExactConfirmation(confirmTip, state.lease.currentTip, 'confirmTip') + let recovered + try { + recovered = recoverActiveBatchOwnership({ + repository: state.context.worktreeRoot, + expectedBatchId: confirmBatchId, + expectedTip: confirmTip, + expectedManifestDigest: manifestDigest(state.manifestPath) + }) + } catch (error) { + fail(error instanceof Error ? error.message : String(error)) + } + if (recovered.lease.branch !== state.context.branch || recovered.lease.currentTip !== state.context.head) { + fail('恢复 owner 的 worktree 分支或 HEAD 已变化。') + } + return resultFor('ownership-recovered', state, state.context.head, state.context.head, [ + action('recover-owner', '验证已持久化 owner token、租约、清单字节摘要和当前集成 tip。') + ]) +} + +export function synchronizeIntegrationMain({ integrationRepository, manifestPath, ownerToken, dryRun, now }) { + if (typeof dryRun !== 'boolean') fail('dryRun 必须为布尔值。') + checkedNow(now) + const state = readManifestForMutation(integrationRepository, manifestPath) + const main = canonicalMainWorktree(state.context.worktreeRoot) + sourceClean(main.worktreeRoot, '规范 main worktree') + requirePassingPreflight(state.context.worktreeRoot, 'sync-main', state.manifestPath, undefined, main.worktreeRoot) + verifyMutationOwner(state.context, state.lease, ownerToken) + const mainTip = resolveCommit(main.worktreeRoot, 'refs/heads/main') + if (main.head !== mainTip) fail('规范 main worktree 的 HEAD 必须精确等于本地 main tip。') + if (mainTip === state.manifest.expectedMainCommit) fail('当前 local main 没有可同步的新提交。') + if (!isAncestor(state.context.worktreeRoot, state.manifest.expectedMainCommit, mainTip)) { + fail('当前 local main 不再是 expectedMainCommit 的后继，拒绝同步。') + } + if (isAncestor(state.context.worktreeRoot, mainTip, state.context.head)) { + fail('当前 local main 已包含在集成历史中，拒绝伪造同步记录。') + } + const actions = [ + action('merge-main', '以非 rebase 合并将当前 local main 同步到集成分支。', ['merge', '--no-ff', '--no-commit', 'refs/heads/main']), + ...state.manifest.integrationChecks.map((check) => action('run-integration-check', '在暂存 main 合并树执行声明的检查。', [...check.argv])), + action('commit-main-sync', '提交 main 同步边界。', ['commit', '-m', `集成：同步 main ${mainTip}`]), + action('record-main-sync-evidence', '提交精确 main 同步和检查证据。', ['commit', '-m', '集成：记录 main 同步验证']) + ] + if (dryRun) return resultFor('planned', state, state.context.head, state.context.head, actions) + + const beforeCommit = state.context.head + const merge = runGit(state.context.worktreeRoot, ['merge', '--no-ff', '--no-commit', 'refs/heads/main'], { allowFailure: true }) + if (merge.status !== 0) { + const inConflict = runGit(state.context.worktreeRoot, ['rev-parse', '-q', '--verify', 'MERGE_HEAD'], { allowFailure: true }).status === 0 + if (inConflict) return recoveryResult({ batchId: state.lease.batchId, branch: state.lease.branch, beforeCommit, repository: state.context.worktreeRoot, actions }) + fail(`同步 main 失败：${merge.stderr.trim() || merge.stdout.trim()}`) + } + try { + const stagedChecks = runDeclaredChecks(state.context.worktreeRoot, state.manifest.integrationChecks, '0'.repeat(40), now) + runGit(state.context.worktreeRoot, ['commit', '-m', `集成：同步 main ${mainTip}`]) + const mergeCommit = resolveRepositoryContext(state.context.worktreeRoot).head + const parents = mergeParents(state.context.worktreeRoot, mergeCommit) + if (parents.length !== 2 || parents[0] !== beforeCommit || parents[1] !== mainTip) fail('main 同步合并边界父提交不匹配。') + const checks = stagedChecks.map((check) => ({ ...check, verifiedCommit: mergeCommit })) + const advancedLease = updateActiveBatchTip({ + repository: state.context.worktreeRoot, + ownerToken, + expectedRevision: state.lease.revision, + expectedTip: beforeCommit, + nextTip: mergeCommit, + updatedAt: now + }) + const afterCommit = recordMainSynchronization({ + repository: state.context.worktreeRoot, + lease: advancedLease, + manifest: state.manifest, + manifestPath: state.manifestPath, + previousMainCommit: state.manifest.expectedMainCommit, + mainCommit: mainTip, + mergeCommit, + checks, + now, + ownerToken + }) + return resultFor('main-synchronized', state, beforeCommit, afterCommit, actions) + } catch (error) { + if (error && typeof error === 'object' && error.checkFailure) { + const aborted = runGit(state.context.worktreeRoot, ['merge', '--abort'], { allowFailure: true }) + if (aborted.status === 0) fail(error.message) + } + return recoveryResult({ batchId: state.lease.batchId, branch: state.lease.branch, beforeCommit, repository: state.context.worktreeRoot, actions }) + } +} + +export function acceptIntegrationBatch({ integrationRepository, manifestPath, commit, confirmBatchId, ownerToken, now }) { + checkedNow(now) + const state = readManifestForMutation(integrationRepository, manifestPath) + requireExactConfirmation(confirmBatchId, state.lease.batchId, 'confirmBatchId') + requireExactConfirmation(commit, state.context.head, 'commit') + requirePassingPreflight(state.context.worktreeRoot, 'accept', state.manifestPath, undefined, undefined, commit) + verifyMutationOwner(state.context, state.lease, ownerToken) + try { + markActiveBatchAccepted({ + repository: state.context.worktreeRoot, + ownerToken, + expectedRevision: state.lease.revision, + acceptedTip: commit, + acceptedManifestDigest: manifestDigest(state.manifestPath), + acceptedAt: now + }) + } catch (error) { + fail(error instanceof Error ? error.message : String(error)) + } + return resultFor('accepted', state, state.context.head, state.context.head, [ + action('accept-batch', '仅在租约中记录精确集成 tip 与原始清单字节摘要。') + ]) +} + +export function promoteIntegrationBatch({ integrationRepository, manifestPath, mainWorktree, confirmBatchId, confirmTip, ownerToken, dryRun, now }) { + if (typeof dryRun !== 'boolean') fail('dryRun 必须为布尔值。') + checkedNow(now) + const state = readManifestForMutation(integrationRepository, manifestPath) + const canonical = canonicalMainWorktree(state.context.worktreeRoot) + if (path.resolve(mainWorktree) !== canonical.worktreeRoot) fail('mainWorktree 必须精确等于已登记的规范 main worktree。') + sourceClean(canonical.worktreeRoot, '规范 main worktree') + requireExactConfirmation(confirmBatchId, state.lease.batchId, 'confirmBatchId') + requireExactConfirmation(confirmTip, state.context.head, 'confirmTip') + verifyMutationOwner(state.context, state.lease, ownerToken) + if (state.lease.acceptedTip !== state.context.head || state.lease.acceptedManifestDigest !== manifestDigest(state.manifestPath)) { + fail('租约验收 tip 或清单字节摘要已过期。') + } + const alreadyPromoted = canonical.head === state.context.head + if (alreadyPromoted) { + requirePassingPreflight(state.context.worktreeRoot, 'accept', state.manifestPath, undefined, undefined, confirmTip) + } else { + requirePassingPreflight(state.context.worktreeRoot, 'promote', state.manifestPath, undefined, canonical.worktreeRoot, confirmTip) + if (canonical.head !== state.manifest.expectedMainCommit) fail('规范 main worktree 的 HEAD 不再匹配 expectedMainCommit。') + if (!isAncestor(state.context.worktreeRoot, canonical.head, state.context.head)) fail('集成 tip 不是规范 main 的 fast-forward 后继。') + } + for (const feature of state.manifest.features) { + if (!isAncestor(state.context.worktreeRoot, feature.handoff.tipCommit, state.context.head)) { + fail(`功能 tip 未包含在集成 tip 中：${feature.handoff.branch}`) + } + } + const actions = [ + ...(alreadyPromoted ? [] : [action('promote-fast-forward', '仅以 --ff-only 将已验收集成分支推进规范 main。', ['merge', '--ff-only', state.lease.branch])]), + ...state.manifest.integrationChecks.map((check) => action('confirm-promoted-main', '在已推进的规范 main 执行声明的集成确认。', [...check.argv])), + action('archive-lease', '将活动租约无覆盖归档为 promoted。') + ] + if (dryRun) return resultFor('planned', state, state.context.head, state.context.head, actions) + if (!alreadyPromoted) { + const promoted = runGit(canonical.worktreeRoot, ['merge', '--ff-only', state.lease.branch], { allowFailure: true }) + if (promoted.status !== 0) fail(`推进 main 失败：${promoted.stderr.trim() || promoted.stdout.trim()}`) + } + try { + runDeclaredChecks(canonical.worktreeRoot, state.manifest.integrationChecks, state.context.head, now) + const mainAfterConfirmation = resolveRepositoryContext(canonical.worktreeRoot).head + if (mainAfterConfirmation !== state.context.head) fail('确认后的 main HEAD 与已验收集成 tip 不匹配。') + for (const feature of state.manifest.features) { + if (!isAncestor(canonical.worktreeRoot, feature.handoff.tipCommit, mainAfterConfirmation)) fail(`确认后的 main 缺少功能 tip：${feature.handoff.branch}`) + } + } catch { + return recoveryResult({ batchId: state.lease.batchId, branch: state.lease.branch, beforeCommit: state.context.head, repository: state.context.worktreeRoot, actions }) + } + try { + archiveActiveBatchLease({ repository: state.context.worktreeRoot, ownerToken, expectedBatchId: state.lease.batchId, outcome: 'promoted', archivedAt: now }) + } catch { + return recoveryResult({ batchId: state.lease.batchId, branch: state.lease.branch, beforeCommit: state.context.head, repository: state.context.worktreeRoot, actions }) + } + return resultFor('promoted', state, state.context.head, state.context.head, actions) +} + +export function cancelIntegrationBatch({ integrationRepository, manifestPath, confirmBatchId, explicitCancellation, dryRun, now }) { + if (typeof dryRun !== 'boolean') fail('dryRun 必须为布尔值。') + checkedNow(now) + const state = readManifestForMutation(integrationRepository, manifestPath) + requireExactConfirmation(confirmBatchId, state.lease.batchId, 'confirmBatchId') + if (explicitCancellation !== true) fail('取消批次必须提供 explicitCancellation。') + const actions = [action('archive-lease', '仅归档活动租约为 cancelled，不清理分支、worktree 或文件。')] + if (dryRun) return resultFor('planned', state, state.context.head, state.context.head, actions) + try { + archiveActiveBatchLease({ repository: state.context.worktreeRoot, expectedBatchId: state.lease.batchId, outcome: 'cancelled', archivedAt: now, explicitCancellation: true }) + } catch (error) { + fail(error instanceof Error ? error.message : String(error)) + } + return resultFor('cancelled', state, state.context.head, state.context.head, actions) +} diff --git a/scripts/lib/sherlock-integration-model.d.mts b/scripts/lib/sherlock-integration-model.d.mts new file mode 100644 index 000000000..1acf54ac2 --- /dev/null +++ b/scripts/lib/sherlock-integration-model.d.mts @@ -0,0 +1,97 @@ +import type { NameStatusChange, RangeCommit } from './sherlock-git-state.mjs' + +export interface CheckEvidence { + argv: [string, ...string[]] + outcome: 'passed' + summary: string + verifiedCommit: string + completedAt: string + timeoutMs: number +} + +export interface FeatureHandoff { + schemaVersion: 1 + featureName: string + branch: string + baseCommit: string + tipCommit: string + commits: RangeCommit[] + files: NameStatusChange[] + checks: CheckEvidence[] + uiVerification: { outcome: 'passed' | 'not-applicable'; summary: string } + acceptanceCriteria: string[] + risks: string[] + generatedAt: string +} + +export interface IntegrationBatchManifest { + schemaVersion: 1 + batchId: string + branch: string + baseMainCommit: string + expectedMainCommit: string + createdAt: string + features: Array<{ + handoff: FeatureHandoff + merged?: { + mergeCommit: string + verificationCommit: string + checks: CheckEvidence[] + recordedAt: string + } + }> + integrationChecks: Array<{ argv: [string, ...string[]]; timeoutMs: number }> + mainSynchronizations: Array<{ + previousMainCommit: string + mainCommit: string + mergeCommit: string + verificationCommit: string + checks: CheckEvidence[] + recordedAt: string + }> +} + +export type IntegrationPhase = + | 'prepare' + | 'merge' + | 'continue' + | 'recover-owner' + | 'sync-main' + | 'accept' + | 'promote' + | 'cancel' + +export interface PreflightReport { + schemaVersion: 1 + ok: boolean + phase: IntegrationPhase + branch: string | null + head: string + batchId?: string + findings: Array<{ + code: string + severity: 'info' | 'warning' | 'error' + message: string + details?: Record + }> + plannedActions: Array<{ kind: string; description: string; argv?: string[] }> +} + +export function validateFeatureHandoff(value: unknown): FeatureHandoff +export function buildFeatureHandoff(options: { + repository: string + baseCommit: string + metadata: unknown + generatedAt: string +}): FeatureHandoff +export function handoffOutputPath(repository: string, handoff: FeatureHandoff): string +export function writeFeatureHandoff(outputPath: string, handoff: FeatureHandoff): string +export function validateIntegrationBatchManifest(value: unknown): IntegrationBatchManifest +export function createIntegrationBatchManifest(options: { + batchId: string + branch: string + baseMainCommit: string + handoffs: FeatureHandoff[] + integrationChecks: IntegrationBatchManifest['integrationChecks'] + createdAt: string +}): IntegrationBatchManifest diff --git a/scripts/lib/sherlock-integration-model.mjs b/scripts/lib/sherlock-integration-model.mjs new file mode 100644 index 000000000..246626816 --- /dev/null +++ b/scripts/lib/sherlock-integration-model.mjs @@ -0,0 +1,445 @@ +import { closeSync, existsSync, linkSync, mkdirSync, openSync, readFileSync, unlinkSync, writeFileSync } from 'node:fs' +import path from 'node:path' +import { + diffNameStatus, + isAncestor, + listRangeCommits, + readRepositoryStatus, + resolveCommit, + resolveRepositoryContext +} from './sherlock-git-state.mjs' + +const fullSha = /^[0-9a-f]{40}$/ +const featureBranch = /^codex\/feat\/[a-z0-9][a-z0-9-]*-\d{8}$/ + +function fail(message) { + throw new Error(`功能交接卡无效：${message}`) +} + +function object(value, label) { + if (!value || typeof value !== 'object' || Array.isArray(value)) fail(`${label} 必须是对象。`) + return value +} + +function exactKeys(value, label, allowedKeys) { + for (const key of Object.keys(value)) { + if (!allowedKeys.includes(key)) fail(`${label} 包含未知字段 ${key}。`) + } +} + +function string(value, label, { nonEmpty = true } = {}) { + if (typeof value !== 'string' || (nonEmpty && value.length === 0)) fail(`${label} 必须是非空字符串。`) + return value +} + +function sha(value, label) { + const valueString = string(value, label) + if (!fullSha.test(valueString)) fail(`${label} 必须是 40 位小写提交 SHA。`) + return valueString +} + +function timestamp(value, label) { + const valueString = string(value, label) + if (Number.isNaN(Date.parse(valueString))) fail(`${label} 必须是可解析的时间。`) + return valueString +} + +function strings(value, label, { nonEmpty = false } = {}) { + if (!Array.isArray(value) || (nonEmpty && value.length === 0)) fail(`${label} 必须是${nonEmpty ? '非空' : ''}字符串数组。`) + return value.map((item, index) => string(item, `${label}[${index}]`)) +} + +function safeRepositoryPath(value, label) { + const filePath = string(value, label) + if ( + filePath.includes('\0') || + filePath.includes('\\') || + /^[A-Za-z]:/.test(filePath) || + path.posix.isAbsolute(filePath) || + path.win32.isAbsolute(filePath) || + filePath === '.' || + filePath === '..' || + filePath.split('/').includes('..') || + path.posix.normalize(filePath) !== filePath + ) { + fail(`${label} 必须是已规范化的仓库相对路径。`) + } + return filePath +} + +function validateCommit(value, index) { + const commit = object(value, `commits[${index}]`) + exactKeys(commit, `commits[${index}]`, ['commit', 'parents', 'subject']) + return { + commit: sha(commit.commit, `commits[${index}].commit`), + parents: strings(commit.parents, `commits[${index}].parents`).map((parent, parentIndex) => + sha(parent, `commits[${index}].parents[${parentIndex}]`) + ), + subject: string(commit.subject, `commits[${index}].subject`, { nonEmpty: false }) + } +} + +function validateFile(value, index) { + const change = object(value, `files[${index}]`) + exactKeys(change, `files[${index}]`, ['status', 'path', 'previousPath']) + const status = string(change.status, `files[${index}].status`) + const renameOrCopy = /^([RC])(\d{1,3})$/.exec(status) + const ordinaryStatus = /^[ADMTUXB]$/.test(status) + if (!ordinaryStatus && (!renameOrCopy || (renameOrCopy[2] && Number(renameOrCopy[2]) > 100))) { + fail(`files[${index}].status 无效。`) + } + const result = { status, path: safeRepositoryPath(change.path, `files[${index}].path`) } + const needsPreviousPath = Boolean(renameOrCopy) + if (needsPreviousPath && change.previousPath === undefined) { + fail(`files[${index}].previousPath 是重命名或复制记录的必填路径。`) + } + if (!needsPreviousPath && change.previousPath !== undefined) { + fail(`files[${index}].previousPath 只允许用于重命名或复制记录。`) + } + if (change.previousPath !== undefined) { + result.previousPath = safeRepositoryPath(change.previousPath, `files[${index}].previousPath`) + } + return result +} + +function validateCheck(value, index, tipCommit) { + const check = object(value, `checks[${index}]`) + exactKeys(check, `checks[${index}]`, ['argv', 'outcome', 'summary', 'verifiedCommit', 'completedAt', 'timeoutMs']) + if (!Array.isArray(check.argv) || check.argv.length === 0) fail(`checks[${index}].argv 必须是非空参数数组。`) + const argv = check.argv.map((argument, argumentIndex) => { + const valueString = string(argument, `checks[${index}].argv[${argumentIndex}]`) + if (valueString.includes('\0')) fail(`checks[${index}].argv[${argumentIndex}] 不能包含 NUL 字符。`) + return valueString + }) + if (check.outcome !== 'passed') fail(`checks[${index}].outcome 必须为 passed。`) + const verifiedCommit = sha(check.verifiedCommit, `checks[${index}].verifiedCommit`) + if (verifiedCommit !== tipCommit) fail(`checks[${index}].verifiedCommit 必须绑定当前 tipCommit。`) + if (!Number.isSafeInteger(check.timeoutMs) || check.timeoutMs <= 0) { + fail(`checks[${index}].timeoutMs 必须是正整数。`) + } + return { + argv, + outcome: 'passed', + summary: string(check.summary, `checks[${index}].summary`), + verifiedCommit, + completedAt: timestamp(check.completedAt, `checks[${index}].completedAt`), + timeoutMs: check.timeoutMs + } +} + +export function validateFeatureHandoff(value) { + const handoff = object(value, '交接卡') + exactKeys(handoff, '交接卡', [ + 'schemaVersion', + 'featureName', + 'branch', + 'baseCommit', + 'tipCommit', + 'commits', + 'files', + 'checks', + 'uiVerification', + 'acceptanceCriteria', + 'risks', + 'generatedAt' + ]) + if (handoff.schemaVersion !== 1) fail('schemaVersion 必须为 1。') + const branch = string(handoff.branch, 'branch') + if (!featureBranch.test(branch)) fail('branch 必须匹配 codex/feat/-。') + const baseCommit = sha(handoff.baseCommit, 'baseCommit') + const tipCommit = sha(handoff.tipCommit, 'tipCommit') + if (baseCommit === tipCommit) fail('baseCommit 和 tipCommit 不能相同。') + if (!Array.isArray(handoff.commits) || handoff.commits.length === 0) fail('commits 必须是非空数组。') + const commits = handoff.commits.map(validateCommit) + const commitIds = new Set(commits.map((commit) => commit.commit)) + if (commitIds.size !== commits.length) fail('commits 不能包含重复提交。') + if (commits.at(-1).commit !== tipCommit) fail('commits 必须按范围顺序结束于 tipCommit。') + if (commitIds.has(baseCommit)) fail('commits 不能包含 baseCommit。') + const commitPositions = new Map(commits.map((commit, index) => [commit.commit, index])) + const reachable = new Set([tipCommit]) + const pending = [tipCommit] + while (pending.length > 0) { + const commit = commits[commitPositions.get(pending.pop())] + for (const parent of commit.parents) { + if (commitPositions.has(parent) && !reachable.has(parent)) { + reachable.add(parent) + pending.push(parent) + } + } + } + for (const [index, commit] of commits.entries()) { + for (const parent of commit.parents) { + if (parent === baseCommit) continue + const parentIndex = commitPositions.get(parent) + if (parentIndex === undefined) fail(`commits[${index}] 的父提交未包含在范围内。`) + if (parentIndex >= index) fail(`commits 必须按父提交在前的拓扑顺序排列。`) + } + if (!reachable.has(commit.commit)) fail(`commits[${index}] 是未连接到 tipCommit 的孤立提交。`) + } + if (!Array.isArray(handoff.files)) fail('files 必须是数组。') + const files = handoff.files.map(validateFile) + if (!Array.isArray(handoff.checks)) fail('checks 必须是数组。') + const checks = handoff.checks.map((check, index) => validateCheck(check, index, tipCommit)) + const uiVerification = object(handoff.uiVerification, 'uiVerification') + exactKeys(uiVerification, 'uiVerification', ['outcome', 'summary']) + if (uiVerification.outcome !== 'passed' && uiVerification.outcome !== 'not-applicable') { + fail('uiVerification.outcome 必须为 passed 或 not-applicable。') + } + return { + schemaVersion: 1, + featureName: string(handoff.featureName, 'featureName'), + branch, + baseCommit, + tipCommit, + commits, + files, + checks, + uiVerification: { + outcome: uiVerification.outcome, + summary: string(uiVerification.summary, 'uiVerification.summary') + }, + acceptanceCriteria: strings(handoff.acceptanceCriteria, 'acceptanceCriteria', { nonEmpty: true }), + risks: strings(handoff.risks, 'risks'), + generatedAt: timestamp(handoff.generatedAt, 'generatedAt') + } +} + +export function buildFeatureHandoff({ repository, baseCommit, metadata, generatedAt }) { + const context = resolveRepositoryContext(repository) + if (!context.branch || !featureBranch.test(context.branch)) { + fail('当前分支必须匹配 codex/feat/-。') + } + const status = readRepositoryStatus(context.worktreeRoot) + if (!status.sourceClean) fail('功能 worktree 必须没有未提交的源码改动。') + const declaredBase = sha(baseCommit, 'baseCommit') + if (resolveCommit(context.worktreeRoot, declaredBase) !== declaredBase) { + fail('baseCommit 必须是可解析的完整提交 SHA。') + } + const branchRef = `refs/heads/${context.branch}` + if (resolveCommit(context.worktreeRoot, branchRef) !== context.head) { + fail('功能分支引用必须精确指向当前 HEAD。') + } + if (!isAncestor(context.worktreeRoot, declaredBase, context.head)) { + fail('baseCommit 必须是 tipCommit 的祖先。') + } + const commits = listRangeCommits(context.worktreeRoot, declaredBase, context.head) + if (commits.length === 0) fail('功能提交范围不能为空。') + const fields = object(metadata, 'metadata') + const handoff = validateFeatureHandoff({ + schemaVersion: 1, + featureName: fields.featureName, + branch: context.branch, + baseCommit: declaredBase, + tipCommit: context.head, + commits, + // baseCommit is required to be an ancestor, making this exact two-endpoint + // comparison equivalent to Git's three-dot feature inventory. + files: diffNameStatus(context.worktreeRoot, declaredBase, context.head), + checks: fields.checks, + uiVerification: fields.uiVerification, + acceptanceCriteria: fields.acceptanceCriteria, + risks: fields.risks, + generatedAt + }) + const after = resolveRepositoryContext(context.worktreeRoot) + if (after.branch !== context.branch || after.head !== context.head || resolveCommit(after.worktreeRoot, branchRef) !== after.head) { + fail('生成期间功能分支引用发生变化。') + } + if (!readRepositoryStatus(after.worktreeRoot).sourceClean) { + fail('生成期间功能 worktree 出现未提交的源码改动。') + } + return handoff +} + +export function handoffOutputPath(repository, handoff) { + const context = resolveRepositoryContext(repository) + const normalizedBranch = handoff.branch.replaceAll('/', '-') + return path.join(context.commonDirectory, 'sherlock-integration', 'handoffs', `${normalizedBranch}-${handoff.tipCommit.slice(0, 12)}.json`) +} + +export function writeFeatureHandoff(outputPath, handoff) { + const bytes = `${JSON.stringify(handoff, null, 2)}\n` + if (existsSync(outputPath)) { + if (readFileSync(outputPath, 'utf8') === bytes) return bytes + throw new Error(`交接卡已存在且内容不同，拒绝覆盖：${outputPath}`) + } + mkdirSync(path.dirname(outputPath), { recursive: true }) + const temporaryPath = `${outputPath}.tmp-${process.pid}-${Date.now()}-${Math.random().toString(16).slice(2)}` + let temporaryDescriptor + try { + temporaryDescriptor = openSync(temporaryPath, 'wx', 0o600) + writeFileSync(temporaryDescriptor, bytes, 'utf8') + closeSync(temporaryDescriptor) + temporaryDescriptor = undefined + linkSync(temporaryPath, outputPath) + } finally { + if (temporaryDescriptor !== undefined) closeSync(temporaryDescriptor) + if (existsSync(temporaryPath)) unlinkSync(temporaryPath) + } + return bytes +} + +const batchIdPattern = /^\d{8}-\d{2}$/ + +function batchFail(message) { + throw new Error(`集成批次清单无效：${message}`) +} + +function batchObject(value, label) { + if (!value || typeof value !== 'object' || Array.isArray(value)) batchFail(`${label} 必须是对象。`) + return value +} + +function batchExactKeys(value, label, allowedKeys) { + for (const key of Object.keys(value)) { + if (!allowedKeys.includes(key)) batchFail(`${label} 包含未知字段 ${key}。`) + } +} + +function batchSha(value, label) { + if (typeof value !== 'string' || !fullSha.test(value)) batchFail(`${label} 必须是 40 位小写提交 SHA。`) + return value +} + +function batchTimestamp(value, label) { + if (typeof value !== 'string' || value.length === 0 || Number.isNaN(Date.parse(value))) { + batchFail(`${label} 必须是可解析的时间。`) + } + return value +} + +function batchArgv(value, label) { + if (!Array.isArray(value) || value.length === 0) batchFail(`${label} 必须是非空参数数组。`) + return value.map((argument, index) => { + if (typeof argument !== 'string' || argument.length === 0 || argument.includes('\0')) { + batchFail(`${label}[${index}] 必须是不含 NUL 的非空字符串。`) + } + return argument + }) +} + +function batchTimeout(value, label) { + if (!Number.isSafeInteger(value) || value <= 0) batchFail(`${label} 必须是正整数。`) + return value +} + +function validateBatchCheck(value, index, verifiedCommit) { + const check = batchObject(value, `checks[${index}]`) + batchExactKeys(check, `checks[${index}]`, ['argv', 'outcome', 'summary', 'verifiedCommit', 'completedAt', 'timeoutMs']) + if (check.outcome !== 'passed') batchFail(`checks[${index}].outcome 必须为 passed。`) + const actualVerifiedCommit = batchSha(check.verifiedCommit, `checks[${index}].verifiedCommit`) + if (actualVerifiedCommit !== verifiedCommit) batchFail(`checks[${index}].verifiedCommit 必须绑定验证提交。`) + if (typeof check.summary !== 'string' || check.summary.length === 0) batchFail(`checks[${index}].summary 必须是非空字符串。`) + return { + argv: batchArgv(check.argv, `checks[${index}].argv`), + outcome: 'passed', + summary: check.summary, + verifiedCommit: actualVerifiedCommit, + completedAt: batchTimestamp(check.completedAt, `checks[${index}].completedAt`), + timeoutMs: batchTimeout(check.timeoutMs, `checks[${index}].timeoutMs`) + } +} + +function validateIntegrationCheck(value, index) { + const check = batchObject(value, `integrationChecks[${index}]`) + batchExactKeys(check, `integrationChecks[${index}]`, ['argv', 'timeoutMs']) + return { + argv: batchArgv(check.argv, `integrationChecks[${index}].argv`), + timeoutMs: batchTimeout(check.timeoutMs, `integrationChecks[${index}].timeoutMs`) + } +} + +function validateMergedFeature(value, index) { + const merged = batchObject(value, `features[${index}].merged`) + batchExactKeys(merged, `features[${index}].merged`, ['mergeCommit', 'verificationCommit', 'checks', 'recordedAt']) + const mergeCommit = batchSha(merged.mergeCommit, `features[${index}].merged.mergeCommit`) + const verificationCommit = batchSha(merged.verificationCommit, `features[${index}].merged.verificationCommit`) + if (!Array.isArray(merged.checks)) batchFail(`features[${index}].merged.checks 必须是数组。`) + return { + mergeCommit, + verificationCommit, + checks: merged.checks.map((check, checkIndex) => validateBatchCheck(check, checkIndex, verificationCommit)), + recordedAt: batchTimestamp(merged.recordedAt, `features[${index}].merged.recordedAt`) + } +} + +function validateMainSynchronization(value, index) { + const synchronization = batchObject(value, `mainSynchronizations[${index}]`) + batchExactKeys(synchronization, `mainSynchronizations[${index}]`, ['previousMainCommit', 'mainCommit', 'mergeCommit', 'verificationCommit', 'checks', 'recordedAt']) + const verificationCommit = batchSha(synchronization.verificationCommit, `mainSynchronizations[${index}].verificationCommit`) + if (!Array.isArray(synchronization.checks)) batchFail(`mainSynchronizations[${index}].checks 必须是数组。`) + return { + previousMainCommit: batchSha(synchronization.previousMainCommit, `mainSynchronizations[${index}].previousMainCommit`), + mainCommit: batchSha(synchronization.mainCommit, `mainSynchronizations[${index}].mainCommit`), + mergeCommit: batchSha(synchronization.mergeCommit, `mainSynchronizations[${index}].mergeCommit`), + verificationCommit, + checks: synchronization.checks.map((check, checkIndex) => validateBatchCheck(check, checkIndex, verificationCommit)), + recordedAt: batchTimestamp(synchronization.recordedAt, `mainSynchronizations[${index}].recordedAt`) + } +} + +export function validateIntegrationBatchManifest(value) { + const manifest = batchObject(value, '集成批次清单') + batchExactKeys(manifest, '集成批次清单', [ + 'schemaVersion', + 'batchId', + 'branch', + 'baseMainCommit', + 'expectedMainCommit', + 'createdAt', + 'features', + 'integrationChecks', + 'mainSynchronizations' + ]) + if (manifest.schemaVersion !== 1) batchFail('schemaVersion 必须为 1。') + if (typeof manifest.batchId !== 'string' || !batchIdPattern.test(manifest.batchId)) { + batchFail('batchId 必须匹配 YYYYMMDD-NN。') + } + const branch = `codex/integration/${manifest.batchId}` + if (manifest.branch !== branch) batchFail('branch 必须精确派生自 batchId。') + if (!Array.isArray(manifest.features) || manifest.features.length === 0) batchFail('features 必须是非空数组。') + const featureBranches = new Set() + const featureTips = new Set() + const features = manifest.features.map((feature, index) => { + const featureValue = batchObject(feature, `features[${index}]`) + batchExactKeys(featureValue, `features[${index}]`, ['handoff', 'merged']) + const handoff = validateFeatureHandoff(featureValue.handoff) + if (featureBranches.has(handoff.branch)) batchFail('features 不能包含重复 feature branch。') + if (featureTips.has(handoff.tipCommit)) batchFail('features 不能包含重复 feature tip。') + featureBranches.add(handoff.branch) + featureTips.add(handoff.tipCommit) + const result = { handoff } + if (featureValue.merged !== undefined) result.merged = validateMergedFeature(featureValue.merged, index) + return result + }) + if (!Array.isArray(manifest.integrationChecks)) batchFail('integrationChecks 必须是数组。') + if (!Array.isArray(manifest.mainSynchronizations)) batchFail('mainSynchronizations 必须是数组。') + return { + schemaVersion: 1, + batchId: manifest.batchId, + branch, + baseMainCommit: batchSha(manifest.baseMainCommit, 'baseMainCommit'), + expectedMainCommit: batchSha(manifest.expectedMainCommit, 'expectedMainCommit'), + createdAt: batchTimestamp(manifest.createdAt, 'createdAt'), + features, + integrationChecks: manifest.integrationChecks.map(validateIntegrationCheck), + mainSynchronizations: manifest.mainSynchronizations.map(validateMainSynchronization) + } +} + +export function createIntegrationBatchManifest({ batchId, branch, baseMainCommit, handoffs, integrationChecks, createdAt }) { + if (typeof batchId !== 'string' || !batchIdPattern.test(batchId)) batchFail('batchId 必须匹配 YYYYMMDD-NN。') + if (branch !== `codex/integration/${batchId}`) batchFail('branch 必须精确派生自 batchId。') + if (!Array.isArray(handoffs)) batchFail('handoffs 必须是数组。') + return validateIntegrationBatchManifest({ + schemaVersion: 1, + batchId, + branch, + baseMainCommit, + expectedMainCommit: baseMainCommit, + createdAt, + features: handoffs.map((handoff) => ({ handoff })), + integrationChecks, + mainSynchronizations: [] + }) +} diff --git a/scripts/lib/sherlock-integration-preflight.d.mts b/scripts/lib/sherlock-integration-preflight.d.mts new file mode 100644 index 000000000..24e3a88ca --- /dev/null +++ b/scripts/lib/sherlock-integration-preflight.d.mts @@ -0,0 +1,16 @@ +import type { FeatureHandoff, IntegrationBatchManifest, IntegrationPhase, PreflightReport } from './sherlock-integration-model.mjs' + +export function verifyFeatureHandoff(options: { + repository: string + handoff: FeatureHandoff + batchMainCommit: string +}): PreflightReport + +export function preflightIntegrationAction(options: { + repository: string + phase: IntegrationPhase + manifestPath?: string + featureBranch?: string + mainWorktree?: string + expectedAcceptedTip?: string +}): PreflightReport diff --git a/scripts/lib/sherlock-integration-preflight.mjs b/scripts/lib/sherlock-integration-preflight.mjs new file mode 100644 index 000000000..57fdcf3c9 --- /dev/null +++ b/scripts/lib/sherlock-integration-preflight.mjs @@ -0,0 +1,406 @@ +import { readFileSync } from 'node:fs' +import path from 'node:path' +import { spawnSync } from 'node:child_process' +import { + diffNameStatus, + isAncestor, + listRangeCommits, + listRegisteredWorktrees, + readRepositoryStatus, + resolveCommit, + resolveRepositoryContext, + runGit +} from './sherlock-git-state.mjs' +import { validateFeatureHandoff, validateIntegrationBatchManifest } from './sherlock-integration-model.mjs' + +const fullSha = /^[0-9a-f]{40}$/ +const phases = new Set(['prepare', 'merge', 'continue', 'recover-owner', 'sync-main', 'accept', 'promote', 'cancel']) +const phaseRequirements = Object.freeze({ + prepare: { + manifest: 'forbidden', feature: 'forbidden', mainWorktree: 'forbidden', acceptedTip: 'forbidden', + sourceClean: true, action: 'prepare-batch', description: '准备创建新的集成批次。' + }, + merge: { + manifest: 'required', feature: 'required', mainWorktree: 'forbidden', acceptedTip: 'forbidden', + sourceClean: true, noMergeHead: true, unrecordedFeature: true, action: 'merge-feature', description: '验证合并指定功能。' + }, + continue: { + manifest: 'required', feature: 'required', mainWorktree: 'forbidden', acceptedTip: 'forbidden', + sourceClean: true, continuation: true, action: 'continue-merge', description: '验证继续或恢复指定功能的合并。' + }, + 'recover-owner': { + manifest: 'required', feature: 'forbidden', mainWorktree: 'forbidden', acceptedTip: 'required', + sourceClean: true, integrationBranch: true, action: 'recover-owner', description: '验证集成批次的 owner 恢复。' + }, + 'sync-main': { + manifest: 'required', feature: 'forbidden', mainWorktree: 'required', acceptedTip: 'forbidden', + sourceClean: true, action: 'synchronize-main', description: '验证与 main 的同步。' + }, + accept: { + manifest: 'required', feature: 'forbidden', mainWorktree: 'forbidden', acceptedTip: 'required', + sourceClean: true, allFeaturesMerged: true, action: 'accept-batch', description: '验证集成批次验收。' + }, + promote: { + manifest: 'required', feature: 'forbidden', mainWorktree: 'required', acceptedTip: 'required', + sourceClean: true, allFeaturesMerged: true, action: 'promote-fast-forward', description: '验证向 main 的 fast-forward 推进。' + }, + cancel: { + manifest: 'required', feature: 'forbidden', mainWorktree: 'forbidden', acceptedTip: 'forbidden', + action: 'cancel-batch', description: '验证显式取消集成批次。' + } +}) + +function finding(code, severity, message, details) { + return details === undefined ? { code, severity, message } : { code, severity, message, details } +} + +function sameJson(left, right) { + return JSON.stringify(left) === JSON.stringify(right) +} + +function readPatchId(repository, commit) { + try { + const patch = runGit(repository, [ + 'show', + '--format=', + '--no-ext-diff', + '--no-textconv', + '--end-of-options', + commit + ]) + const result = spawnSync('git', ['-C', path.resolve(repository), 'patch-id', '--stable'], { + input: patch.stdout, + encoding: 'utf8', + maxBuffer: 64 * 1024 * 1024 + }) + if (result.error || result.status !== 0) return null + const patchId = result.stdout.trim().split(/\s+/)[0] + return /^[0-9a-f]{40}$/.test(patchId) ? patchId : null + } catch { + return null + } +} + +function reportFor(repository, phase) { + const context = resolveRepositoryContext(repository) + return { + schemaVersion: 1, + ok: true, + phase, + branch: context.branch, + head: context.head, + findings: [], + plannedActions: [] + } +} + +function addError(report, code, message, details) { + report.findings.push(finding(code, 'error', message, details)) + report.ok = false +} + +function addInfo(report, code, message, details) { + report.findings.push(finding(code, 'info', message, details)) +} + +function attempt(report, code, action) { + try { + return action() + } catch (error) { + addError(report, code, error instanceof Error ? error.message : String(error)) + return undefined + } +} + +function featureReport(repository, phase) { + return reportFor(repository, phase) +} + +export function verifyFeatureHandoff({ repository, handoff, batchMainCommit }) { + const report = featureReport(repository, 'merge') + let card + try { + card = validateFeatureHandoff(handoff) + } catch (error) { + addError(report, 'feature-handoff-invalid', error instanceof Error ? error.message : String(error)) + return report + } + + const context = resolveRepositoryContext(repository) + let liveTip + try { + liveTip = resolveCommit(context.worktreeRoot, `refs/heads/${card.branch}`) + } catch (error) { + addError(report, 'feature-ref-missing', `功能分支引用不可解析：${card.branch}`, { branch: card.branch }) + } + if (liveTip && liveTip !== card.tipCommit) { + addError(report, 'feature-ref-moved', '功能分支引用不再指向交接卡 tip。', { expected: card.tipCommit, actual: liveTip, branch: card.branch }) + } + + const worktrees = attempt(report, 'feature-worktree-list-failed', () => listRegisteredWorktrees(context.worktreeRoot)) ?? [] + for (const worktree of worktrees.filter((entry) => entry.branch === card.branch)) { + if (worktree.prunable) { + addError(report, 'feature-worktree-prunable', '功能分支登记的 worktree 已不可用。', { path: worktree.path }) + continue + } + const status = attempt(report, 'feature-worktree-status-failed', () => readRepositoryStatus(worktree.path)) + if (status && !status.sourceClean) { + addError(report, 'feature-worktree-dirty', '功能分支登记的 worktree 含未提交源码改动。', { + path: worktree.path, + trackedChanges: status.trackedChanges, + untrackedSources: status.untrackedSources + }) + } + } + + const comparisonTip = liveTip ?? card.tipCommit + const featureBaseAncestor = attempt(report, 'feature-ancestry-check-failed', () => isAncestor(context.worktreeRoot, card.baseCommit, comparisonTip)) + if (featureBaseAncestor === false) addError(report, 'feature-base-not-ancestor', '交接卡 base 不是功能 tip 的祖先。', { base: card.baseCommit, tip: comparisonTip }) + const batchBaseAncestor = attempt(report, 'batch-ancestry-check-failed', () => isAncestor(context.worktreeRoot, card.baseCommit, batchMainCommit)) + if (batchBaseAncestor === false) addError(report, 'feature-base-not-ancestor', '交接卡 base 不是当前集成提交的祖先。', { base: card.baseCommit, batchMainCommit }) + + const liveCommits = attempt(report, 'feature-history-read-failed', () => listRangeCommits(context.worktreeRoot, card.baseCommit, comparisonTip)) + if (liveCommits && !sameJson(liveCommits, card.commits)) { + addError(report, 'feature-history-mismatch', '功能提交历史与交接卡不一致。', { expected: card.commits, actual: liveCommits }) + } + const liveFiles = attempt(report, 'feature-files-read-failed', () => diffNameStatus(context.worktreeRoot, card.baseCommit, comparisonTip)) + if (liveFiles && !sameJson(liveFiles, card.files)) { + addError(report, 'feature-file-inventory-mismatch', '功能文件清单与交接卡不一致。', { expected: card.files, actual: liveFiles }) + } + for (const check of card.checks) { + if (check.verifiedCommit !== comparisonTip) { + addError(report, 'feature-check-stale', '功能检查证据未绑定当前功能 tip。', { expected: comparisonTip, actual: check.verifiedCommit, argv: check.argv }) + } + } + + const equivalent = new Set() + const batchCommits = attempt(report, 'batch-history-read-failed', () => listRangeCommits(context.worktreeRoot, card.baseCommit, batchMainCommit)) ?? [] + const batchPatchIds = new Set(batchCommits.map((commit) => readPatchId(context.worktreeRoot, commit.commit)).filter(Boolean)) + for (const commit of card.commits) { + const reachable = attempt(report, 'feature-merge-reachability-failed', () => isAncestor(context.worktreeRoot, commit.commit, batchMainCommit)) + if (reachable) { + equivalent.add(commit.commit) + continue + } + const patchId = readPatchId(context.worktreeRoot, commit.commit) + if (patchId && batchPatchIds.has(patchId)) equivalent.add(commit.commit) + } + if (equivalent.size === card.commits.length) { + addInfo(report, 'feature-already-merged', '功能提交已完整存在于当前集成历史，可幂等跳过。', { branch: card.branch }) + } else if (equivalent.size > 0) { + addError(report, 'feature-partially-merged', '功能提交仅部分存在于当前集成历史，不能自动重复合并。', { + branch: card.branch, + equivalentCommits: [...equivalent], + missingCommits: card.commits.map((commit) => commit.commit).filter((commit) => !equivalent.has(commit)) + }) + } + return report +} + +function actionFor(requirements, featureBranch) { + const target = requirements.feature === 'required' && featureBranch ? `功能 ${featureBranch}` : '批次' + return { kind: requirements.action, description: `${requirements.description}目标：${target}；变更必须由集成执行器显式执行。` } +} + +function hasInput(value) { + return typeof value === 'string' && value.length > 0 +} + +function validatePhaseInputs(report, requirements, inputs) { + for (const [name, requirement] of Object.entries(requirements)) { + if (!['manifest', 'feature', 'mainWorktree', 'acceptedTip'].includes(name)) continue + const value = inputs[name] + if (requirement === 'required' && !hasInput(value)) { + addError(report, 'phase-input-required', `${name} 是 ${report.phase} 阶段的必填输入。`, { phase: report.phase, input: name }) + } + if (requirement === 'forbidden' && value !== undefined) { + addError(report, 'phase-input-forbidden', `${name} 不允许用于 ${report.phase} 阶段。`, { phase: report.phase, input: name }) + } + } +} + +function mergeInProgress(repository) { + return runGit(repository, ['rev-parse', '-q', '--verify', 'MERGE_HEAD'], { allowFailure: true }).status === 0 +} + +function resolveRecordedCommit(report, repository, commit, code, label) { + try { + const resolved = resolveCommit(repository, commit) + if (resolved !== commit) { + addError(report, code, `${label} 没有精确解析为记录的提交。`, { expected: commit, actual: resolved }) + return undefined + } + return resolved + } catch (error) { + addError(report, code, `${label} 不可解析。`, { + commit, + error: error instanceof Error ? error.message : String(error) + }) + return undefined + } +} + +function requireAncestor(report, repository, ancestor, descendant, code, message, details) { + if (!ancestor || !descendant) return + const result = attempt(report, `${code}-check-failed`, () => isAncestor(repository, ancestor, descendant)) + if (result === false) addError(report, code, message, details) +} + +function validateMergedFeatureEvidence(report, repository, integrationHead, feature, featureVerification) { + const merged = feature.merged + if (!merged) return + const mergeCommit = resolveRecordedCommit(report, repository, merged.mergeCommit, 'merged-merge-commit-unresolved', '记录的 mergeCommit') + const verificationCommit = resolveRecordedCommit(report, repository, merged.verificationCommit, 'merged-verification-commit-unresolved', '记录的 verificationCommit') + requireAncestor( + report, + repository, + mergeCommit, + integrationHead, + 'merged-merge-commit-not-reachable', + '记录的 mergeCommit 不是当前集成 HEAD 的祖先。', + { mergeCommit: merged.mergeCommit, head: integrationHead, branch: feature.handoff.branch } + ) + requireAncestor( + report, + repository, + verificationCommit, + integrationHead, + 'merged-verification-commit-not-reachable', + '记录的 verificationCommit 不是当前集成 HEAD 的祖先。', + { verificationCommit: merged.verificationCommit, head: integrationHead, branch: feature.handoff.branch } + ) + requireAncestor( + report, + repository, + feature.handoff.tipCommit, + mergeCommit, + 'merged-feature-tip-not-merged', + '功能 tip 不是记录的 mergeCommit 的祖先。', + { tipCommit: feature.handoff.tipCommit, mergeCommit: merged.mergeCommit, branch: feature.handoff.branch } + ) + requireAncestor( + report, + repository, + mergeCommit, + verificationCommit, + 'merged-verification-not-after-merge', + '记录的 verificationCommit 必须等于或位于 mergeCommit 之后。', + { mergeCommit: merged.mergeCommit, verificationCommit: merged.verificationCommit, branch: feature.handoff.branch } + ) + for (const check of merged.checks) { + if (check.verifiedCommit !== merged.verificationCommit) { + addError(report, 'merged-check-tip-mismatch', '记录的合并检查未绑定 verificationCommit。', { + verifiedCommit: check.verifiedCommit, + verificationCommit: merged.verificationCommit, + argv: check.argv, + branch: feature.handoff.branch + }) + } + } + const liveMerged = featureVerification?.findings.some( + (item) => item.code === 'feature-already-merged' && item.severity === 'info' + ) + if (!liveMerged) { + addError(report, 'merged-live-feature-not-integrated', '实时功能预检未证明该功能已完整合入当前集成历史。', { + branch: feature.handoff.branch, + tipCommit: feature.handoff.tipCommit + }) + } +} + +export function preflightIntegrationAction({ repository, phase, manifestPath, featureBranch, mainWorktree, expectedAcceptedTip }) { + if (!phases.has(phase)) throw new Error('phase 必须是受支持的集成阶段。') + const requirements = phaseRequirements[phase] + const report = reportFor(repository, phase) + report.plannedActions.push(actionFor(requirements, featureBranch)) + validatePhaseInputs(report, requirements, { + manifest: manifestPath, + feature: featureBranch, + mainWorktree, + acceptedTip: expectedAcceptedTip + }) + if (requirements.sourceClean) { + const status = attempt(report, 'integration-worktree-status-failed', () => readRepositoryStatus(repository)) + if (status && !status.sourceClean) { + addError(report, 'integration-worktree-dirty', '当前集成 worktree 含未提交源码改动。', { + trackedChanges: status.trackedChanges, + untrackedSources: status.untrackedSources + }) + } + } + let manifest + if (manifestPath) { + try { + manifest = validateIntegrationBatchManifest(JSON.parse(readFileSync(manifestPath, 'utf8'))) + } catch (error) { + addError(report, 'batch-manifest-invalid', error instanceof Error ? error.message : String(error), { manifestPath }) + } + if (manifest) { + report.batchId = manifest.batchId + if (report.branch !== manifest.branch) addError(report, 'integration-branch-mismatch', '当前分支不是清单指定的集成分支。', { expected: manifest.branch, actual: report.branch }) + if (requirements.integrationBranch && (!report.branch || !/^codex\/integration\/\d{8}-\d{2}$/.test(report.branch))) { + addError(report, 'integration-branch-required', '当前 worktree 必须位于合法集成分支。', { branch: report.branch }) + } + const baseAncestor = attempt(report, 'batch-base-ancestry-check-failed', () => isAncestor(repository, manifest.baseMainCommit, report.head)) + if (baseAncestor === false) addError(report, 'batch-base-not-ancestor', '批次 baseMainCommit 不是当前集成提交的祖先。', { base: manifest.baseMainCommit, head: report.head }) + const expectedAncestor = attempt(report, 'batch-expected-main-ancestry-check-failed', () => isAncestor(repository, manifest.expectedMainCommit, report.head)) + if (expectedAncestor === false) addError(report, 'batch-expected-main-not-ancestor', '批次 expectedMainCommit 不是当前集成提交的祖先。', { expectedMainCommit: manifest.expectedMainCommit, head: report.head }) + const selected = requirements.feature === 'required' && hasInput(featureBranch) + ? manifest.features.filter((feature) => feature.handoff.branch === featureBranch) + : [] + if (requirements.feature === 'required' && hasInput(featureBranch) && selected.length !== 1) { + addError(report, 'feature-not-in-batch', '指定功能分支不在批次清单中。', { featureBranch }) + } + if (requirements.unrecordedFeature && selected[0]?.merged) { + addError(report, 'feature-already-recorded-merged', '指定功能已记录为完成合并，不能再次执行 merge。', { featureBranch }) + } + if (requirements.continuation && selected[0]) { + const feature = selected[0] + const continued = attempt(report, 'continuation-state-check-failed', () => + mergeInProgress(repository) || (!feature.merged && isAncestor(repository, feature.handoff.tipCommit, report.head)) + ) + if (!continued) addError(report, 'continuation-state-required', 'continue 阶段必须检测到 MERGE_HEAD 或未记录的功能 tip 已在当前 HEAD 中。', { featureBranch }) + if (feature.merged) addError(report, 'feature-already-recorded-merged', '已记录完成合并的功能不能继续 merge。', { featureBranch }) + } + if (requirements.allFeaturesMerged) { + const unmerged = manifest.features.filter((feature) => !feature.merged).map((feature) => feature.handoff.branch) + if (unmerged.length > 0) addError(report, 'batch-features-unmerged', '验收或推进前必须记录所有功能已完成合并。', { branches: unmerged }) + } + const featuresToVerify = requirements.feature === 'required' + ? selected + : requirements.allFeaturesMerged || phase === 'sync-main' || phase === 'recover-owner' + ? manifest.features + : [] + const featureVerifications = new Map() + for (const feature of featuresToVerify) { + const featureResult = attempt(report, 'feature-preflight-failed', () => verifyFeatureHandoff({ repository, handoff: feature.handoff, batchMainCommit: report.head })) + featureVerifications.set(feature.handoff.branch, featureResult) + if (featureResult) { + report.findings.push(...featureResult.findings) + if (!featureResult.ok) report.ok = false + } + } + if (requirements.allFeaturesMerged) { + for (const feature of manifest.features) { + validateMergedFeatureEvidence(report, repository, report.head, feature, featureVerifications.get(feature.handoff.branch)) + } + } + } + } + if (requirements.acceptedTip === 'required' && hasInput(expectedAcceptedTip)) { + if (!fullSha.test(expectedAcceptedTip)) addError(report, 'accepted-tip-invalid', 'expectedAcceptedTip 必须是完整小写 SHA。') + else if (report.head !== expectedAcceptedTip) addError(report, 'accepted-tip-mismatch', '当前集成提交不是预期验收提交。', { expected: expectedAcceptedTip, actual: report.head }) + } + if (requirements.mainWorktree === 'required' && hasInput(mainWorktree)) { + const mainContext = attempt(report, 'main-worktree-invalid', () => resolveRepositoryContext(mainWorktree)) + if (mainContext) { + if (mainContext.branch !== 'main') addError(report, 'main-worktree-branch-invalid', 'main worktree 必须位于 main 分支。', { branch: mainContext.branch }) + const status = attempt(report, 'main-worktree-status-failed', () => readRepositoryStatus(mainContext.worktreeRoot)) + if (status && !status.sourceClean) addError(report, 'main-worktree-dirty', 'main worktree 含未提交源码改动。') + if (manifest && phase === 'promote' && mainContext.head !== manifest.expectedMainCommit) { + addError(report, 'main-worktree-expected-mismatch', 'main worktree HEAD 必须精确匹配批次 expectedMainCommit。', { expected: manifest.expectedMainCommit, actual: mainContext.head }) + } + } + } + return report +} diff --git a/scripts/lib/sherlock-shared-source-gate.d.mts b/scripts/lib/sherlock-shared-source-gate.d.mts new file mode 100644 index 000000000..b9346099a --- /dev/null +++ b/scripts/lib/sherlock-shared-source-gate.d.mts @@ -0,0 +1,25 @@ +export type Sha256Digest = string + +export interface SharedSourceSnapshot { + mode: 'local-main' | 'local-integration' + worktreeRoot: string + branch: string + commit: string + mainCommit: string + sourceClean: true + batchId: string | null + manifestPath: string | null + manifestDigest: Sha256Digest | null + features: readonly { branch: string; commit: string }[] + leaseRevision: number | null +} + +export function verifySharedBuildSource(options: { + repository: string + ownerToken?: string +}): SharedSourceSnapshot + +export function assertSharedBuildSourceUnchanged( + before: SharedSourceSnapshot, + after: SharedSourceSnapshot +): void diff --git a/scripts/lib/sherlock-shared-source-gate.mjs b/scripts/lib/sherlock-shared-source-gate.mjs new file mode 100644 index 000000000..6ecdd6cca --- /dev/null +++ b/scripts/lib/sherlock-shared-source-gate.mjs @@ -0,0 +1,183 @@ +import { createHash, timingSafeEqual } from 'node:crypto' +import { existsSync, readFileSync, statSync } from 'node:fs' +import path from 'node:path' +import { readActiveBatchLease } from './sherlock-active-batch.mjs' +import { + isAncestor, + listRegisteredWorktrees, + readRepositoryStatus, + resolveCommit, + resolveRepositoryContext, + runGit +} from './sherlock-git-state.mjs' +import { validateIntegrationBatchManifest } from './sherlock-integration-model.mjs' + +function fail(message) { + throw new Error(`共享构建来源无效：${message}`) +} + +function digest(bytes) { + return createHash('sha256').update(bytes).digest('hex') +} + +function canonicalManifestPath(batchId) { + return `config/sherlock-integration-batches/${batchId}.json` +} + +function canonicalMainContext(repository) { + const candidates = listRegisteredWorktrees(repository) + .filter((entry) => entry.branch === 'main' && !entry.prunable) + .map((entry) => { + try { + return resolveRepositoryContext(entry.path) + } catch { + return null + } + }) + .filter((context) => context && context.branch === 'main' && context.gitDirectory === context.commonDirectory) + if (candidates.length !== 1) fail('必须存在且只存在一个规范 main worktree。') + return candidates[0] +} + +function ownerMatches(ownerToken, expectedHash) { + if (typeof ownerToken !== 'string' || ownerToken.length === 0 || ownerToken.includes('\0')) { + fail('local-integration 构建必须提供 ownerToken。') + } + const actual = Buffer.from(digest(Buffer.from(ownerToken, 'utf8')), 'utf8') + const expected = Buffer.from(expectedHash, 'utf8') + if (actual.length !== expected.length || !timingSafeEqual(actual, expected)) { + fail('ownerToken 与活动集成租约不匹配。') + } +} + +function sourceClean(repository) { + if (!readRepositoryStatus(repository).sourceClean) fail('当前 worktree 含未提交源码改动。') +} + +function trackedManifest(repository, lease) { + if (lease.manifestPath !== canonicalManifestPath(lease.batchId)) { + fail('活动租约 manifestPath 不是批次的精确安全路径。') + } + runGit(repository, ['ls-files', '--error-unmatch', '--', lease.manifestPath]) + const manifestFile = path.join(resolveRepositoryContext(repository).worktreeRoot, lease.manifestPath) + if (!existsSync(manifestFile) || !statSync(manifestFile).isFile()) { + fail('活动租约 manifestPath 必须指向受跟踪普通文件。') + } + const bytes = readFileSync(manifestFile) + let manifest + try { + manifest = validateIntegrationBatchManifest(JSON.parse(bytes.toString('utf8'))) + } catch (error) { + fail(`集成批次清单无效：${error instanceof Error ? error.message : String(error)}`) + } + return { manifest, manifestDigest: digest(bytes) } +} + +function localMainSnapshot(context, main) { + if (context.worktreeRoot !== main.worktreeRoot || context.branch !== 'main') { + fail('local-main 构建必须从规范 main worktree 执行。') + } + sourceClean(context.worktreeRoot) + if (readActiveBatchLease(context.worktreeRoot)) fail('活动集成租约存在，local-main 构建被阻止。') + const mainCommit = resolveCommit(context.worktreeRoot, 'refs/heads/main') + if (context.head !== mainCommit) fail('local-main HEAD 必须精确等于 refs/heads/main。') + return { + mode: 'local-main', + worktreeRoot: context.worktreeRoot, + branch: 'main', + commit: context.head, + mainCommit, + sourceClean: true, + batchId: null, + manifestPath: null, + manifestDigest: null, + features: [], + leaseRevision: null + } +} + +function localIntegrationSnapshot(context, lease, ownerToken) { + const registration = listRegisteredWorktrees(context.worktreeRoot).find( + (entry) => entry.path === context.worktreeRoot + ) + if (!registration || registration.prunable || registration.branch !== lease.branch) { + fail('活动集成来源必须是 Git 正常登记的租约 worktree。') + } + if (context.branch !== lease.branch) fail('当前集成分支不是活动租约分支。') + if (context.head !== lease.currentTip) fail('当前集成 HEAD 必须精确等于活动租约 currentTip。') + ownerMatches(ownerToken, lease.ownerTokenHash) + sourceClean(context.worktreeRoot) + const { manifest, manifestDigest } = trackedManifest(context.worktreeRoot, lease) + if ( + manifest.batchId !== lease.batchId || + manifest.branch !== lease.branch || + manifest.baseMainCommit !== lease.baseMainCommit + ) { + fail('集成批次清单必须精确匹配活动租约的批次、分支和 base。') + } + const mainCommit = resolveCommit(context.worktreeRoot, 'refs/heads/main') + if (!isAncestor(context.worktreeRoot, mainCommit, lease.currentTip)) { + fail('当前 local main 必须是活动集成 tip 的祖先。') + } + const features = manifest.features.map(({ handoff }) => { + const liveTip = resolveCommit(context.worktreeRoot, `refs/heads/${handoff.branch}`) + if (liveTip !== handoff.tipCommit) fail(`功能分支引用不再精确指向声明 tip：${handoff.branch}`) + if (!isAncestor(context.worktreeRoot, handoff.tipCommit, lease.currentTip)) { + fail(`声明功能 tip 不可从当前集成 tip 到达：${handoff.branch}`) + } + return { branch: handoff.branch, commit: handoff.tipCommit } + }) + if (features.length === 0) fail('集成批次必须声明至少一个功能。') + return { + mode: 'local-integration', + worktreeRoot: context.worktreeRoot, + branch: lease.branch, + commit: lease.currentTip, + mainCommit, + sourceClean: true, + batchId: lease.batchId, + manifestPath: lease.manifestPath, + manifestDigest, + features, + leaseRevision: lease.revision + } +} + +export function verifySharedBuildSource({ repository, ownerToken }) { + const context = resolveRepositoryContext(repository) + const main = canonicalMainContext(context.worktreeRoot) + const lease = readActiveBatchLease(context.worktreeRoot) + if (context.worktreeRoot === main.worktreeRoot) return localMainSnapshot(context, main) + if (!lease) fail('只允许规范 main 或活动集成租约分支作为共享构建来源。') + return localIntegrationSnapshot(context, lease, ownerToken) +} + +function mismatch(field, before, after) { + fail(`${field} 已变化（before: ${JSON.stringify(before)}；after: ${JSON.stringify(after)}）。`) +} + +export function assertSharedBuildSourceUnchanged(before, after) { + const scalarFields = [ + 'mode', + 'worktreeRoot', + 'branch', + 'commit', + 'mainCommit', + 'sourceClean', + 'batchId', + 'manifestPath', + 'manifestDigest', + 'leaseRevision' + ] + for (const field of scalarFields) { + if (before[field] !== after[field]) mismatch(field, before[field], after[field]) + } + const maximum = Math.max(before.features.length, after.features.length) + for (let index = 0; index < maximum; index += 1) { + const left = before.features[index] + const right = after.features[index] + if (!left || !right) mismatch(`features[${index}]`, left ?? null, right ?? null) + if (left.branch !== right.branch) mismatch(`features[${index}].branch`, left.branch, right.branch) + if (left.commit !== right.commit) mismatch(`features[${index}].commit`, left.commit, right.commit) + } +} diff --git a/scripts/macos/legacy-migration-bridge.swift b/scripts/macos/legacy-migration-bridge.swift new file mode 100644 index 000000000..122c7c2cf --- /dev/null +++ b/scripts/macos/legacy-migration-bridge.swift @@ -0,0 +1,116 @@ +import AppKit +import Foundation + +private let legacyBundleIdentifier = "io.dsh.desktop" +private let sherlockBundleIdentifier = "com.evanarts.sherlock" +private let embeddedRelativePath = "Contents/Resources/Sherlock.app" + +private enum BridgeError: LocalizedError { + case invalidBundle(String) + case commandFailed(String, Int32) + + var errorDescription: String? { + switch self { + case .invalidBundle(let message): + return message + case .commandFailed(let command, let status): + return "\(command) failed with status \(status)." + } + } +} + +@discardableResult +private func run(_ executable: String, _ arguments: [String]) throws -> Int32 { + let process = Process() + process.executableURL = URL(fileURLWithPath: executable) + process.arguments = arguments + try process.run() + process.waitUntilExit() + guard process.terminationStatus == 0 else { + throw BridgeError.commandFailed(([executable] + arguments).joined(separator: " "), process.terminationStatus) + } + return process.terminationStatus +} + +private func showFailure(_ error: Error) { + let alert = NSAlert() + alert.alertStyle = .critical + alert.messageText = "Sherlock 更新未完成" + alert.informativeText = "请重新打开 Sherlock 后再试。\n\n\(error.localizedDescription)" + alert.addButton(withTitle: "好") + alert.runModal() +} + +private func migrateToNotarizedSherlock() throws { + let fileManager = FileManager.default + let currentApp = Bundle.main.bundleURL.standardizedFileURL + guard Bundle.main.bundleIdentifier == legacyBundleIdentifier else { + throw BridgeError.invalidBundle("Legacy bridge bundle identifier is invalid.") + } + + let embeddedApp = currentApp.appendingPathComponent(embeddedRelativePath).standardizedFileURL + guard + let embeddedBundle = Bundle(url: embeddedApp), + embeddedBundle.bundleIdentifier == sherlockBundleIdentifier + else { + throw BridgeError.invalidBundle("The notarized Sherlock application is missing.") + } + + let parent = currentApp.deletingLastPathComponent() + let token = UUID().uuidString + let stagedApp = parent.appendingPathComponent(".Sherlock-migration-\(token).app") + let backupApp = parent.appendingPathComponent(".Sherlock-legacy-\(token).app") + + try run("/usr/bin/ditto", [embeddedApp.path, stagedApp.path]) + try run("/usr/bin/codesign", ["--verify", "--deep", "--strict", stagedApp.path]) + + do { + try fileManager.moveItem(at: currentApp, to: backupApp) + do { + try fileManager.moveItem(at: stagedApp, to: currentApp) + } catch { + try? fileManager.moveItem(at: backupApp, to: currentApp) + throw error + } + + var openArguments = ["-na", currentApp.path] + let forwardedArguments = ProcessInfo.processInfo.arguments.dropFirst().filter { + $0.hasPrefix("--sherlock-") || $0.hasPrefix("--remote-debugging-port=") + } + if !forwardedArguments.isEmpty { + openArguments.append("--args") + openArguments.append(contentsOf: forwardedArguments) + } + + do { + try run("/usr/bin/open", openArguments) + } catch { + let failedApp = parent.appendingPathComponent(".Sherlock-failed-\(token).app") + try? fileManager.moveItem(at: currentApp, to: failedApp) + try? fileManager.moveItem(at: backupApp, to: currentApp) + try? fileManager.removeItem(at: failedApp) + throw error + } + + let cleanup = Process() + cleanup.executableURL = URL(fileURLWithPath: "/bin/sh") + cleanup.arguments = [ + "-c", + "sleep 8; /bin/rm -rf -- \"$1\"", + "sherlock-bridge-cleanup", + backupApp.path + ] + try cleanup.run() + } catch { + try? fileManager.removeItem(at: stagedApp) + throw error + } +} + +do { + try migrateToNotarizedSherlock() + exit(EXIT_SUCCESS) +} catch { + showFailure(error) + exit(EXIT_FAILURE) +} diff --git a/scripts/manage-sherlock-integration.mjs b/scripts/manage-sherlock-integration.mjs new file mode 100644 index 000000000..0e0df53b0 --- /dev/null +++ b/scripts/manage-sherlock-integration.mjs @@ -0,0 +1,127 @@ +#!/usr/bin/env node +import { readFileSync } from 'node:fs' +import { + adoptIntegrationBatch, + acceptIntegrationBatch, + cancelIntegrationBatch, + continueIntegrationFeature, + createIntegrationBatch, + mergeIntegrationFeature, + promoteIntegrationBatch, + readPersistedIntegrationOwnerToken, + recoverIntegrationOwnership, + synchronizeIntegrationMain +} from './lib/sherlock-integration-executor.mjs' +import { formatIntegrationError, formatIntegrationOutcome } from './lib/sherlock-integration-cli-outcome.mjs' + +function fail(message) { + throw new Error(message) +} + +function parse(argv) { + if (argv.length === 1 && argv[0] === '--help') return { help: true } + const command = argv[0] + if (!['create', 'adopt', 'merge', 'continue', 'recover-owner', 'sync-main', 'accept', 'promote', 'cancel'].includes(command)) fail('第一个参数必须为 create、adopt、merge、continue、recover-owner、sync-main、accept、promote 或 cancel。') + const options = { handoffs: [] } + for (let index = 1; index < argv.length; index += 1) { + const argument = argv[index] + if (argument === '--dry-run' || argument === '--json' || argument === '--explicit-cancellation') { + const key = argument.slice(2).replaceAll('-', '_') + if (options[key]) fail(`不能重复传入 ${argument}。`) + options[key] = true + continue + } + if (!['--repo', '--worktree', '--batch', '--handoff', '--checks', '--manifest', '--feature', '--commit', '--confirm-batch', '--confirm-tip', '--main-worktree'].includes(argument)) fail(`未知参数：${argument}`) + const value = argv[index + 1] + if (!value || value.startsWith('--')) fail(`${argument} 缺少值。`) + if (argument === '--handoff') { + options.handoffs.push(value) + } else { + const key = argument.slice(2).replaceAll('-', '_') + if (options[key] !== undefined) fail(`不能重复传入 ${argument}。`) + options[key] = value + } + index += 1 + } + if (command === 'create' || command === 'adopt') { + if (!options.repo || !options.batch || options.handoffs.length === 0 || !options.checks) { + fail('--repo、--batch、至少一个 --handoff 和 --checks 为必填参数。') + } + if (options.manifest || options.feature) fail('create/adopt 不接受 --manifest 或 --feature。') + if (command === 'create' && !options.worktree) fail('create 必须提供 --worktree。') + if (command === 'adopt' && options.worktree) fail('adopt 不接受 --worktree。') + } else if (command === 'merge' || command === 'continue') { + if (!options.repo || !options.manifest || !options.feature) fail('merge/continue 必须提供 --repo、--manifest 和 --feature。') + if (options.batch || options.handoffs.length > 0 || options.checks || options.worktree) fail('merge/continue 不接受批次创建参数。') + } else if (command === 'recover-owner') { + if (!options.repo || !options.manifest || !options.confirm_batch || !options.confirm_tip) fail('recover-owner 必须提供 --repo、--manifest、--confirm-batch 和 --confirm-tip。') + if (options.dry_run || options.commit || options.main_worktree || options.explicit_cancellation || options.batch || options.handoffs.length > 0 || options.checks || options.worktree || options.feature) fail('recover-owner 不接受批次创建、功能、dry-run、commit、main-worktree 或 cancellation 参数。') + } else if (command === 'sync-main') { + if (!options.repo || !options.manifest) fail('sync-main 必须提供 --repo 和 --manifest。') + if (options.commit || options.confirm_batch || options.confirm_tip || options.main_worktree || options.explicit_cancellation || options.batch || options.handoffs.length > 0 || options.checks || options.worktree || options.feature) fail('sync-main 不接受批次创建、功能、验收、推进或取消参数。') + } else if (command === 'accept') { + if (!options.repo || !options.manifest || !options.commit || !options.confirm_batch) fail('accept 必须提供 --repo、--manifest、--commit 和 --confirm-batch。') + if (options.dry_run || options.confirm_tip || options.main_worktree || options.explicit_cancellation || options.batch || options.handoffs.length > 0 || options.checks || options.worktree || options.feature) fail('accept 不接受批次创建、功能、dry-run、confirm-tip、main-worktree 或 cancellation 参数。') + } else if (command === 'promote') { + if (!options.repo || !options.manifest || !options.main_worktree || !options.confirm_batch || !options.confirm_tip) fail('promote 必须提供 --repo、--manifest、--main-worktree、--confirm-batch 和 --confirm-tip。') + if (options.commit || options.explicit_cancellation || options.batch || options.handoffs.length > 0 || options.checks || options.worktree || options.feature) fail('promote 不接受批次创建、功能、commit 或 cancellation 参数。') + } else { + if (!options.repo || !options.manifest || !options.confirm_batch || !options.explicit_cancellation) fail('cancel 必须提供 --repo、--manifest、--confirm-batch 和 --explicit-cancellation。') + if (options.commit || options.confirm_tip || options.main_worktree || options.batch || options.handoffs.length > 0 || options.checks || options.worktree || options.feature) fail('cancel 不接受批次创建、功能、commit、confirm-tip 或 main-worktree 参数。') + } + return { command, ...options } +} + +function readChecks(file) { + try { + return JSON.parse(readFileSync(file, 'utf8')) + } catch (error) { + fail(`无法读取 --checks：${error instanceof Error ? error.message : String(error)}`) + } +} + +function printHuman(result) { + process.stdout.write(formatIntegrationOutcome(result).output) +} + +function printHelp() { + process.stdout.write('Usage: npm run git:integration -- [options]\n') + process.stdout.write('recover-owner --repo --manifest --confirm-batch --confirm-tip [--json]\n') + process.stdout.write('sync-main --repo --manifest [--dry-run] [--json]\n') + process.stdout.write('accept --repo --manifest --commit --confirm-batch [--json]\n') + process.stdout.write('promote --repo --manifest --main-worktree --confirm-batch --confirm-tip [--dry-run] [--json]\n') + process.stdout.write('cancel --repo --manifest --confirm-batch --explicit-cancellation [--dry-run] [--json]\n') +} + +try { + const options = parse(process.argv.slice(2)) + if (options.help) { + printHelp() + process.exitCode = 0 + } else { + const now = new Date().toISOString() + const result = options.command === 'create' || options.command === 'adopt' + ? (options.command === 'create' + ? createIntegrationBatch({ batchId: options.batch, handoffPaths: options.handoffs, integrationChecks: readChecks(options.checks), dryRun: Boolean(options.dry_run), now, mainRepository: options.repo, worktreePath: options.worktree }) + : adoptIntegrationBatch({ batchId: options.batch, handoffPaths: options.handoffs, integrationChecks: readChecks(options.checks), dryRun: Boolean(options.dry_run), now, integrationRepository: options.repo })) + : (options.command === 'merge' + ? mergeIntegrationFeature({ integrationRepository: options.repo, manifestPath: options.manifest, featureBranch: options.feature, ownerToken: readPersistedIntegrationOwnerToken(options.repo), dryRun: Boolean(options.dry_run), now }) + : options.command === 'continue' + ? continueIntegrationFeature({ integrationRepository: options.repo, manifestPath: options.manifest, featureBranch: options.feature, ownerToken: readPersistedIntegrationOwnerToken(options.repo), dryRun: Boolean(options.dry_run), now }) + : options.command === 'recover-owner' + ? recoverIntegrationOwnership({ integrationRepository: options.repo, manifestPath: options.manifest, confirmBatchId: options.confirm_batch, confirmTip: options.confirm_tip }) + : options.command === 'sync-main' + ? synchronizeIntegrationMain({ integrationRepository: options.repo, manifestPath: options.manifest, ownerToken: readPersistedIntegrationOwnerToken(options.repo), dryRun: Boolean(options.dry_run), now }) + : options.command === 'accept' + ? acceptIntegrationBatch({ integrationRepository: options.repo, manifestPath: options.manifest, commit: options.commit, confirmBatchId: options.confirm_batch, ownerToken: readPersistedIntegrationOwnerToken(options.repo), now }) + : options.command === 'promote' + ? promoteIntegrationBatch({ integrationRepository: options.repo, manifestPath: options.manifest, mainWorktree: options.main_worktree, confirmBatchId: options.confirm_batch, confirmTip: options.confirm_tip, ownerToken: readPersistedIntegrationOwnerToken(options.repo), dryRun: Boolean(options.dry_run), now }) + : cancelIntegrationBatch({ integrationRepository: options.repo, manifestPath: options.manifest, confirmBatchId: options.confirm_batch, explicitCancellation: options.explicit_cancellation === true, dryRun: Boolean(options.dry_run), now })) + if (options.json) process.stdout.write(`${JSON.stringify(result)}\n`) + else printHuman(result) + process.exitCode = formatIntegrationOutcome(result).exitCode + } +} catch (error) { + process.stderr.write(`${error instanceof Error ? error.message : String(error)}\n`) + process.exitCode = formatIntegrationError(error).exitCode +} diff --git a/scripts/patch-web-frontend-loading.mjs b/scripts/patch-web-frontend-loading.mjs new file mode 100644 index 000000000..fe0ddfde8 --- /dev/null +++ b/scripts/patch-web-frontend-loading.mjs @@ -0,0 +1,95 @@ +import { readdirSync, readFileSync, writeFileSync } from 'node:fs' +import { join } from 'node:path' + +const assetsDirectory = join( + process.cwd(), + 'node_modules', + '@deepseek-ai', + 'dsh-web-frontend', + 'dist', + 'assets' +) +const primitivesPath = join( + process.cwd(), + 'node_modules', + '@deepseek-ai', + 'dsh-client-ui-primitives', + 'lib', + 'index.js' +) + +const ringMotionCss = + '@keyframes dsh-state-ring-spin{to{transform:rotate(360deg)}}' + + '.dsh-state-ring{color:var(--dsw-alias-label-secondary);animation:dsh-state-ring-spin 1s linear infinite}' + + '@media (prefers-reduced-motion:reduce){.dsh-state-ring{animation:none}}' + +function asset(suffix) { + const matches = readdirSync(assetsDirectory).filter( + (name) => name.startsWith('index-') && name.endsWith(suffix) + ) + if (matches.length !== 1) { + throw new Error(`Expected one dsh-web-frontend ${suffix} asset, found ${matches.length}`) + } + return join(assetsDirectory, matches[0]) +} + +function patchJavaScript(path) { + let source = readFileSync(path, 'utf8') + const replacement = 'n==="ongoing"?f.jsx(v9,{size:r,className:ye(yl.matrix,i)})' + if (source.includes(replacement)) return + + const startNeedle = 'n==="ongoing"?f.jsx("svg",{className:ye(yl.matrix,i)' + const endNeedle = ':f.jsx("span"' + const start = source.indexOf(startNeedle) + const end = source.indexOf(endNeedle, start) + if (start < 0 || end < 0) throw new Error('Unable to find the running StateDot bundle') + + source = source.slice(0, start) + replacement + source.slice(end) + writeFileSync(path, source) +} + +function patchPrimitives(path) { + let source = readFileSync(path, 'utf8') + if (source.includes('className: "dshStateRingMotion"')) return + + const startNeedle = '\tif (state === "ongoing") return jsx("svg", {' + const endNeedle = '\n\treturn jsx("span"' + const start = source.indexOf(startNeedle) + const end = source.indexOf(endNeedle, start) + if (start < 0 || end < 0) throw new Error('Unable to find the source StateDot component') + + const replacement = [ + '\tif (state === "ongoing") return jsxs(Fragment, {', + '\t\tchildren: [jsx("style", {', + '\t\t\tclassName: "dshStateRingMotion",', + `\t\t\tchildren: ${JSON.stringify(ringMotionCss)}`, + '\t\t}), jsx(IconLoadingOutline16, {', + '\t\t\tsize,', + '\t\t\tclassName: clsx(StateDot_module_css_default.matrix, "dsh-state-ring", className)', + '\t\t})]', + '\t});' + ].join('\n') + + source = source.slice(0, start) + replacement + source.slice(end) + writeFileSync(path, source) +} + +function patchStyles(path) { + let source = readFileSync(path, 'utf8') + const replacement = + '._matrix_10orb_4{flex:none;color:var(--dsw-alias-label-secondary);animation:_spin_9gj4p_34 1s linear infinite}@media(prefers-reduced-motion:reduce){._matrix_10orb_4{animation:none}}' + if (source.includes(replacement)) return + + const startNeedle = '._matrix_10orb_4{flex:none;color:var(--dsh-state-ongoing)}' + const endNeedle = '._root_9cl6j_3' + const start = source.indexOf(startNeedle) + const end = source.indexOf(endNeedle, start) + if (start < 0 || end < 0) throw new Error('Unable to find the running StateDot styles') + + source = source.slice(0, start) + replacement + source.slice(end) + writeFileSync(path, source) +} + +patchPrimitives(primitivesPath) +patchJavaScript(asset('.js')) +patchStyles(asset('.css')) diff --git a/scripts/prepare-bundled-plugin-profile.mjs b/scripts/prepare-bundled-plugin-profile.mjs new file mode 100644 index 000000000..f8e9a002d --- /dev/null +++ b/scripts/prepare-bundled-plugin-profile.mjs @@ -0,0 +1,292 @@ +import { cp, lstat, mkdir, mkdtemp, readFile, readdir, realpath, rename, rm, writeFile } from 'node:fs/promises' +import { createHash } from 'node:crypto' +import { homedir } from 'node:os' +import path from 'node:path' +import { spawnSync } from 'node:child_process' +import { fileURLToPath } from 'node:url' +import { patchBetterSidebarPackage } from './lib/patch-sherlock-better-sidebar.mjs' +import { patchSherlockOfficePreviewPackage } from './lib/patch-sherlock-office-preview.mjs' + +const projectRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..') +const policyPath = path.join(projectRoot, 'build', 'sherlock-bundled-plugins.json') +const outputPath = path.join(projectRoot, 'build', 'sherlock-plugin-profile') +const defaultSourceProfile = path.join( + homedir(), + 'Library', + 'Application Support', + 'sherlock-desktop', + 'harness', + 'profiles', + 'web' +) + +const excludedSourceNames = new Set([ + '.git', + '.DS_Store', + 'node_modules', + 'coverage', + '.credentials.yaml', + 'settings.yaml' +]) + +async function portableTreeFingerprint(root, relative = '', hash = createHash('sha256')) { + const entries = await readdir(path.join(root, relative), { withFileTypes: true }) + entries.sort((left, right) => left.name.localeCompare(right.name)) + for (const entry of entries) { + const childRelative = path.join(relative, entry.name) + const childPath = path.join(root, childRelative) + const stat = await lstat(childPath) + hash.update(`${childRelative}\0`) + if (stat.isDirectory()) { + hash.update('directory\0') + await portableTreeFingerprint(root, childRelative, hash) + } else if (stat.isFile()) { + hash.update('file\0') + hash.update(await readFile(childPath)) + hash.update('\0') + } + } + return hash +} + +function sameList(left, right) { + return left.length === right.length && left.every((value, index) => value === right[index]) +} + +function vendorRelativePath(packageName) { + return path.posix.join('vendor', ...packageName.split('/')) +} + +function stripExcludedProfileEntries(source, excludedEntryIds) { + const retiredIds = new Set(excludedEntryIds) + const lines = source.split(/\r?\n/u) + const kept = [] + + for (let index = 0; index < lines.length; ) { + const match = /^-\s+id:\s*["']?([^\s"'#]+)["']?\s*(?:#.*)?$/u.exec(lines[index]) + if (!match || !retiredIds.has(match[1])) { + kept.push(lines[index]) + index += 1 + continue + } + + index += 1 + while (index < lines.length && !/^-\s+id:/u.test(lines[index])) index += 1 + } + + return `${kept.join('\n').replace(/\n+$/u, '')}\n` +} + +async function copyInstalledPlugin(source, target) { + await cp(source, target, { + recursive: true, + dereference: true, + force: true, + filter(candidate) { + const relative = path.relative(source, candidate) + if (!relative) return true + const parts = relative.split(path.sep) + return !parts.some( + (part) => excludedSourceNames.has(part) || part === '.env' || part.startsWith('.env.') + ) + } + }) + + const manifestPath = path.join(target, 'package.json') + const manifest = JSON.parse(await readFile(manifestPath, 'utf8')) + delete manifest.devDependencies + delete manifest.scripts + await writeFile(manifestPath, `${JSON.stringify(manifest, null, 2)}\n`, 'utf8') +} + +async function validatePortableTree(root) { + const prohibitedNames = new Set(['.credentials.yaml', 'settings.yaml', 'sessions', 'workspaces']) + const pending = [root] + while (pending.length > 0) { + const directory = pending.pop() + for (const entry of await readdir(directory, { withFileTypes: true })) { + if (prohibitedNames.has(entry.name)) { + throw new Error(`Refusing to bundle user-owned Harness data: ${path.join(directory, entry.name)}`) + } + const entryPath = path.join(directory, entry.name) + const stat = await lstat(entryPath) + if (stat.isSymbolicLink()) { + const resolved = await realpath(entryPath) + if (resolved !== root && !resolved.startsWith(`${root}${path.sep}`)) { + throw new Error(`Bundled plugin symlink escapes the portable profile: ${entryPath}`) + } + } else if (stat.isDirectory()) { + pending.push(entryPath) + } + } + } +} + +async function main() { + const sourceProfile = path.resolve( + process.env.SHERLOCK_PLUGIN_PROFILE_SOURCE || defaultSourceProfile + ) + const sourceManifestPath = path.join(sourceProfile, 'package.json') + const [policy, sourceManifest] = await Promise.all([ + readFile(policyPath, 'utf8').then(JSON.parse), + readFile(sourceManifestPath, 'utf8').then(JSON.parse) + ]) + const sourcePlugins = + sourceManifest.dsh?.sherlock?.plugins ?? Object.keys(sourceManifest.dependencies ?? {}) + const sourceBundles = sourceManifest.dsh?.profile?.bundles ?? [] + const excludedPlugins = policy.excludedPlugins ?? [] + const excludedEntryIds = policy.excludedEntryIds ?? [] + const unexpectedSourcePlugins = sourcePlugins.filter( + (packageName) => !policy.plugins.includes(packageName) && !excludedPlugins.includes(packageName) + ) + const missingPolicyPlugins = policy.plugins.filter( + (packageName) => !sourcePlugins.includes(packageName) + ) + const includedRetiredPlugins = policy.plugins.filter((packageName) => + excludedPlugins.includes(packageName) + ) + + if ( + unexpectedSourcePlugins.length > 0 || + missingPolicyPlugins.length > 0 || + includedRetiredPlugins.length > 0 + ) { + throw new Error( + `Sherlock formal plugin set differs from the release policy.\nFormal: ${sourcePlugins.join(', ')}\nPolicy: ${policy.plugins.join(', ')}\nRetired: ${excludedPlugins.join(', ')}` + ) + } + const activeSourceBundles = sourceBundles.filter( + (packageName) => !excludedPlugins.includes(packageName) + ) + if (!sameList(activeSourceBundles, policy.bundles)) { + throw new Error('Sherlock formal bundle order differs from the release policy.') + } + if (!sourcePlugins.includes('dsh-file-drop')) { + throw new Error('Sherlock formal is missing dsh-file-drop, which provides the attachment button.') + } + + const buildRoot = path.dirname(outputPath) + await mkdir(buildRoot, { recursive: true }) + const stageRoot = await mkdtemp(path.join(buildRoot, '.sherlock-plugin-profile-stage-')) + const stagedProfile = path.join(stageRoot, 'web') + const vendorRoot = path.join(stagedProfile, 'vendor') + + try { + await mkdir(vendorRoot, { recursive: true }) + const dependencies = {} + for (const packageName of policy.plugins) { + const installedPath = path.join(sourceProfile, 'node_modules', ...packageName.split('/')) + const packageSource = await realpath(installedPath) + const relativeVendorPath = vendorRelativePath(packageName) + const vendorPath = path.join(stagedProfile, ...relativeVendorPath.split('/')) + await mkdir(path.dirname(vendorPath), { recursive: true }) + await copyInstalledPlugin(packageSource, vendorPath) + const copiedManifest = JSON.parse(await readFile(path.join(vendorPath, 'package.json'), 'utf8')) + if (copiedManifest.name !== packageName) { + throw new Error(`Installed plugin name mismatch for ${packageName}: ${copiedManifest.name}`) + } + if (packageName === 'dsh-better-sidebar') await patchBetterSidebarPackage(vendorPath) + if (packageName === '@huanlin/dsh-plugin-better-sidebar-plugin-office') { + await patchSherlockOfficePreviewPackage(vendorPath) + } + dependencies[packageName] = `file:${relativeVendorPath}` + } + + for (const packageName of policy.runtimePackages) { + const packageSource = path.join(projectRoot, 'packages', packageName) + const relativeVendorPath = vendorRelativePath(packageName) + const vendorPath = path.join(stagedProfile, ...relativeVendorPath.split('/')) + await mkdir(path.dirname(vendorPath), { recursive: true }) + await copyInstalledPlugin(packageSource, vendorPath) + const copiedManifest = JSON.parse(await readFile(path.join(vendorPath, 'package.json'), 'utf8')) + if (copiedManifest.name !== packageName) { + throw new Error(`Sherlock runtime package name mismatch for ${packageName}: ${copiedManifest.name}`) + } + dependencies[packageName] = `file:${relativeVendorPath}` + } + + const stagedManifest = { + name: 'dsh-profile-web', + private: true, + dependencies, + dsh: { + profile: { bundles: [...policy.bundles] }, + sherlock: { + plugins: [...policy.plugins], + retiredPlugins: [...excludedPlugins] + } + } + } + const sourceProfilePatch = await readFile(path.join(sourceProfile, 'cordis.patch.yml'), 'utf8') + await Promise.all([ + writeFile( + path.join(stagedProfile, 'package.json'), + `${JSON.stringify(stagedManifest, null, 2)}\n`, + 'utf8' + ), + writeFile( + path.join(stagedProfile, 'pnpm-workspace.yaml'), + 'packages:\n - .\n\nnodeLinker: hoisted\nautoInstallPeers: false\n', + 'utf8' + ), + writeFile( + path.join(stagedProfile, 'cordis.patch.yml'), + stripExcludedProfileEntries(sourceProfilePatch, excludedEntryIds), + 'utf8' + ) + ]) + + const pnpmPath = path.join(projectRoot, 'node_modules', 'pnpm', 'bin', 'pnpm.cjs') + const install = spawnSync( + process.execPath, + [pnpmPath, 'install', '--prod', '--ignore-scripts', '--no-frozen-lockfile'], + { cwd: stagedProfile, stdio: 'inherit', env: { ...process.env, CI: '1' } } + ) + if (install.status !== 0) { + throw new Error(`Failed to install the portable Sherlock plugin profile (exit ${install.status}).`) + } + + for (const packageName of policy.plugins) { + const packagePath = path.join(stagedProfile, 'node_modules', ...packageName.split('/')) + const manifest = JSON.parse(await readFile(path.join(packagePath, 'package.json'), 'utf8')) + const patch = manifest.dsh?.bundle?.patch + if (typeof patch !== 'string') throw new Error(`${packageName} is not a DSH bundle.`) + await lstat(path.join(packagePath, patch)) + } + for (const packageName of policy.runtimePackages) { + await lstat(path.join(stagedProfile, 'node_modules', packageName, 'package.json')) + } + await validatePortableTree(stagedProfile) + + // electron-builder excludes directory segments named node_modules from extraResources. + // Ship the installed offline tree under a neutral name and restore it on first launch. + await rename(path.join(stagedProfile, 'node_modules'), path.join(stagedProfile, 'modules')) + const contentFingerprint = (await portableTreeFingerprint(vendorRoot)).digest('hex') + await writeFile( + path.join(stagedProfile, 'sherlock-profile-content.sha256'), + `${contentFingerprint}\n`, + 'utf8' + ) + + for (const name of ['package.json', 'pnpm-lock.yaml']) { + const content = await readFile(path.join(stagedProfile, name), 'utf8') + if (content.includes(sourceProfile) || content.includes(homedir())) { + throw new Error(`${name} contains a publisher-specific absolute path.`) + } + } + + await rm(outputPath, { recursive: true, force: true }) + await rename(stagedProfile, outputPath) + console.log(`Prepared bundled Sherlock plugin profile with ${policy.plugins.length} plugins.`) + for (const packageName of policy.plugins) console.log(`- ${packageName}`) + console.log(`Included ${policy.runtimePackages.length} Sherlock runtime packages.`) + for (const packageName of policy.runtimePackages) console.log(`- ${packageName}`) + } finally { + await rm(stageRoot, { recursive: true, force: true }) + } +} + +main().catch((error) => { + console.error(error instanceof Error ? error.message : String(error)) + process.exitCode = 1 +}) diff --git a/scripts/prepare-macos-dual-release.mjs b/scripts/prepare-macos-dual-release.mjs new file mode 100644 index 000000000..5d20e1f97 --- /dev/null +++ b/scripts/prepare-macos-dual-release.mjs @@ -0,0 +1,104 @@ +#!/usr/bin/env node + +import { access, copyFile, mkdir, readFile, rm } from 'node:fs/promises' +import path from 'node:path' +import { fileURLToPath } from 'node:url' +import { parse } from 'yaml' + +const projectRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..') + +export async function prepareMacosDualRelease(options) { + const architecture = options.architecture ?? 'arm64' + if (!['arm64', 'x64'].includes(architecture)) { + throw new Error(`Unsupported macOS architecture: ${architecture}`) + } + const version = String(options.version ?? '') + if (!/^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/.test(version)) { + throw new Error(`Invalid release version: ${version}`) + } + + const legacyDirectory = path.resolve(options.legacyDirectory) + const notarizedDirectory = path.resolve(options.notarizedDirectory) + const outputDirectory = path.resolve(options.outputDirectory) + if (path.basename(outputDirectory) !== 'dist-release') { + throw new Error(`Release output directory must be named dist-release: ${outputDirectory}`) + } + + const legacyZip = `sherlock-mac-${architecture}-legacy.zip` + const notarizedZip = `sherlock-mac-${architecture}.zip` + const notarizedDmg = `sherlock-mac-${architecture}.dmg` + const copies = [ + [path.join(legacyDirectory, legacyZip), path.join(outputDirectory, legacyZip)], + [ + path.join(legacyDirectory, `${legacyZip}.blockmap`), + path.join(outputDirectory, `${legacyZip}.blockmap`) + ], + [path.join(notarizedDirectory, notarizedZip), path.join(outputDirectory, notarizedZip)], + [ + path.join(notarizedDirectory, `${notarizedZip}.blockmap`), + path.join(outputDirectory, `${notarizedZip}.blockmap`) + ], + [path.join(notarizedDirectory, notarizedDmg), path.join(outputDirectory, notarizedDmg)], + [path.join(legacyDirectory, 'latest-mac.yml'), path.join(outputDirectory, 'latest-mac.yml')], + [ + path.join(notarizedDirectory, 'latest-mac.yml'), + path.join(outputDirectory, 'latest-mac-notarized.yml') + ] + ] + + await Promise.all(copies.map(([source]) => access(source))) + const [legacyMetadata, notarizedMetadata] = await Promise.all([ + readFile(path.join(legacyDirectory, 'latest-mac.yml'), 'utf8').then(parse), + readFile(path.join(notarizedDirectory, 'latest-mac.yml'), 'utf8').then(parse) + ]) + validateMetadata(legacyMetadata, version, legacyZip, 'legacy') + validateMetadata(notarizedMetadata, version, notarizedZip, 'notarized') + + await rm(outputDirectory, { recursive: true, force: true }) + await mkdir(outputDirectory, { recursive: true }) + await Promise.all(copies.map(([source, destination]) => copyFile(source, destination))) + return copies.map(([, destination]) => destination) +} + +function validateMetadata(metadata, version, expectedZip, channel) { + if (!metadata || metadata.version !== version || !Array.isArray(metadata.files)) { + throw new Error(`${channel} metadata does not describe version ${version}.`) + } + const zip = metadata.files.find((file) => file?.url === expectedZip) + if (!zip?.sha512 || !Number.isFinite(zip.size)) { + throw new Error(`${channel} metadata does not reference ${expectedZip}.`) + } + if (metadata.path !== expectedZip || metadata.sha512 !== zip.sha512) { + throw new Error(`${channel} metadata primary update is not ${expectedZip}.`) + } +} + +function parseArguments(argv) { + const values = new Map() + for (let index = 0; index < argv.length; index += 2) { + const key = argv[index] + const value = argv[index + 1] + if (!key?.startsWith('--') || !value) throw new Error('Invalid release preparation arguments.') + values.set(key.slice(2), value) + } + for (const required of ['version', 'legacy', 'notarized', 'output']) { + if (!values.has(required)) throw new Error(`--${required} is required.`) + } + return { + version: values.get('version'), + architecture: values.get('arch') ?? 'arm64', + legacyDirectory: values.get('legacy'), + notarizedDirectory: values.get('notarized'), + outputDirectory: values.get('output') + } +} + +if (path.resolve(process.argv[1] ?? '') === fileURLToPath(import.meta.url)) { + try { + const prepared = await prepareMacosDualRelease(parseArguments(process.argv.slice(2))) + process.stdout.write(`Prepared ${prepared.length} dual-channel macOS release files.\n`) + } catch (error) { + console.error(error instanceof Error ? error.message : String(error)) + process.exitCode = 1 + } +} diff --git a/scripts/prepare-macos-signing-keychain.mjs b/scripts/prepare-macos-signing-keychain.mjs index dfe1171a6..76ebc9fdf 100644 --- a/scripts/prepare-macos-signing-keychain.mjs +++ b/scripts/prepare-macos-signing-keychain.mjs @@ -1,14 +1,11 @@ import { appendFile, chmod, rm, writeFile } from 'node:fs/promises' -import { createHash, randomBytes } from 'node:crypto' +import { randomBytes } from 'node:crypto' import { execFile as execFileCallback } from 'node:child_process' import { promisify } from 'node:util' import path from 'node:path' const execFile = promisify(execFileCallback) -const developerIdG2CertificateUrl = - 'https://www.apple.com/certificateauthority/DeveloperIDG2CA.cer' -const developerIdG2CertificateSha256 = - 'f16cd3c54c7f83cea4bf1a3e6a0819c8aaa8e4a1528fd144715f350643d2df3a' +const signingIdentityName = 'Sherlock Desktop Update Signing' function required(name) { const value = process.env[name]?.trim() @@ -41,29 +38,13 @@ async function writeCertificate(source, destination) { }) } -async function downloadVerifiedCertificate(source, expectedSha256, destination) { - const response = await fetch(source) - if (!response.ok) { - throw new Error(`Unable to download Apple intermediate certificate: ${response.status}`) - } - const certificate = Buffer.from(await response.arrayBuffer()) - const actualSha256 = createHash('sha256').update(certificate).digest('hex') - if (actualSha256 !== expectedSha256) { - throw new Error(`Apple intermediate certificate checksum mismatch: ${actualSha256}`) - } - await writeFile(destination, certificate, { mode: 0o600 }) -} - const runnerTemp = required('RUNNER_TEMP') const githubOutput = required('GITHUB_OUTPUT') const certificateSource = required('CSC_LINK') const certificatePassword = required('CSC_KEY_PASSWORD') const token = randomBytes(12).toString('hex') const certificatePath = path.join(runnerTemp, `dsh-desktop-signing-${token}.p12`) -const intermediateCertificatePath = path.join( - runnerTemp, - `dsh-desktop-developer-id-g2-${token}.cer` -) +const publicCertificatePath = path.join(runnerTemp, `sherlock-update-signing-${token}.pem`) const keychainPath = path.join(runnerTemp, `dsh-desktop-signing-${token}.keychain-db`) const keychainListPath = path.join(runnerTemp, `dsh-desktop-keychains-${token}.txt`) const keychainPassword = randomBytes(32).toString('base64') @@ -93,13 +74,6 @@ try { '-P', certificatePassword ) - await downloadVerifiedCertificate( - developerIdG2CertificateUrl, - developerIdG2CertificateSha256, - intermediateCertificatePath - ) - await security('import', intermediateCertificatePath, '-k', keychainPath) - await rm(intermediateCertificatePath, { force: true }) await security( 'set-key-partition-list', '-S', @@ -109,6 +83,27 @@ try { keychainPassword, keychainPath ) + const { stdout: publicCertificate } = await security( + 'find-certificate', + '-c', + signingIdentityName, + '-p', + keychainPath + ) + if (!publicCertificate.includes('BEGIN CERTIFICATE')) { + throw new Error(`The ${signingIdentityName} certificate was not found in the supplied P12.`) + } + await writeFile(publicCertificatePath, publicCertificate, { mode: 0o600 }) + await security( + 'add-trusted-cert', + '-r', + 'trustRoot', + '-p', + 'codeSign', + '-k', + keychainPath, + publicCertificatePath + ) await security( 'list-keychains', '-d', @@ -119,13 +114,16 @@ try { ) const { stdout } = await security('find-identity', '-v', '-p', 'codesigning', keychainPath) - if (!/^\s*\d+\)/m.test(stdout)) { - throw new Error('No valid code-signing identity was imported into the temporary keychain') - } + const escapedIdentityName = signingIdentityName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') + const identity = new RegExp( + `^\\s*\\d+\\)\\s+([0-9A-F]{40})\\s+"${escapedIdentityName}"$`, + 'm' + ).exec(stdout)?.[1] + if (!identity) throw new Error(`No valid ${signingIdentityName} code-signing identity was imported.`) await appendFile( githubOutput, - `keychain=${keychainPath}\ncertificate=${certificatePath}\nkeychain_list=${keychainListPath}\n` + `keychain=${keychainPath}\ncertificate=${certificatePath}\npublic_certificate=${publicCertificatePath}\nkeychain_list=${keychainListPath}\nidentity=${identity}\n` ) console.log('Prepared temporary macOS signing keychain.') } catch (error) { @@ -134,7 +132,7 @@ try { } await security('delete-keychain', keychainPath).catch(() => rm(keychainPath, { force: true })) await rm(certificatePath, { force: true }) - await rm(intermediateCertificatePath, { force: true }) + await rm(publicCertificatePath, { force: true }) await rm(keychainListPath, { force: true }) throw error } diff --git a/scripts/provision-macos-signing-identity.mjs b/scripts/provision-macos-signing-identity.mjs new file mode 100644 index 000000000..2cf62a4a9 --- /dev/null +++ b/scripts/provision-macos-signing-identity.mjs @@ -0,0 +1,142 @@ +import { execFile as execFileCallback } from 'node:child_process' +import { randomBytes } from 'node:crypto' +import { copyFile, mkdtemp, rm } from 'node:fs/promises' +import { tmpdir } from 'node:os' +import path from 'node:path' +import { promisify } from 'node:util' + +const execFile = promisify(execFileCallback) +const identityName = 'Sherlock Desktop Update Signing' +const temporaryPrefix = path.join(path.resolve(tmpdir()), 'sherlock-signing-provision-') + +async function run(executable, args) { + return execFile(executable, args, { encoding: 'utf8' }) +} + +async function findIdentity() { + const { stdout } = await run('/usr/bin/security', [ + 'find-identity', + '-v', + '-p', + 'codesigning' + ]) + return /^\s*\d+\)\s+([0-9A-F]{40})\s+"Sherlock Desktop Update Signing"$/m.exec( + stdout + )?.[1] +} + +if (process.platform !== 'darwin') throw new Error('Sherlock macOS signing requires macOS.') + +const existingIdentity = await findIdentity() +if (existingIdentity) { + process.stdout.write(`SHERLOCK_SIGNING_IDENTITY_READY ${existingIdentity}\n`) + process.exit(0) +} + +const existingCertificate = await run('/usr/bin/security', [ + 'find-certificate', + '-c', + identityName, + '-a' +]).catch(() => undefined) +if (existingCertificate?.stdout) { + throw new Error( + 'A Sherlock signing certificate exists without a usable private key. Refusing to replace the update identity.' + ) +} + +const { stdout: defaultKeychainOutput } = await run('/usr/bin/security', [ + 'default-keychain', + '-d', + 'user' +]) +const defaultKeychain = defaultKeychainOutput.trim().replace(/^"|"$/g, '') +if (!defaultKeychain) throw new Error('The default macOS user keychain was not found.') + +const root = await mkdtemp(temporaryPrefix) +const key = path.join(root, 'identity.key') +const certificate = path.join(root, 'identity.pem') +const p12 = path.join(root, 'identity.p12') +const probe = path.join(root, 'Sherlock-signing-probe') +const certificatePassword = randomBytes(36).toString('base64url') + +try { + await run('/usr/bin/openssl', [ + 'req', + '-x509', + '-newkey', + 'rsa:3072', + '-nodes', + '-keyout', + key, + '-out', + certificate, + '-days', + '3650', + '-subj', + `/CN=${identityName}/O=Sherlock`, + '-addext', + 'keyUsage=critical,digitalSignature', + '-addext', + 'extendedKeyUsage=codeSigning', + '-addext', + 'basicConstraints=critical,CA:FALSE' + ]) + await run('/usr/bin/openssl', [ + 'pkcs12', + '-export', + '-out', + p12, + '-inkey', + key, + '-in', + certificate, + '-name', + identityName, + '-passout', + `pass:${certificatePassword}` + ]) + await run('/usr/bin/security', [ + 'import', + p12, + '-k', + defaultKeychain, + '-P', + certificatePassword, + '-T', + '/usr/bin/codesign', + '-T', + '/usr/bin/productbuild' + ]) + await run('/usr/bin/security', [ + 'add-trusted-cert', + '-r', + 'trustRoot', + '-p', + 'codeSign', + '-k', + defaultKeychain, + certificate + ]) + + const identity = await findIdentity() + if (!identity) throw new Error('The Sherlock signing identity was imported but is not valid.') + + await copyFile('/usr/bin/true', probe) + await run('/usr/bin/codesign', [ + '--force', + '--sign', + identity, + '--identifier', + 'io.dsh.desktop.signing-probe', + '--timestamp=none', + probe + ]) + await run('/usr/bin/codesign', ['--verify', '--strict', probe]) + process.stdout.write(`SHERLOCK_SIGNING_IDENTITY_READY ${identity}\n`) +} finally { + if (!path.resolve(root).startsWith(temporaryPrefix)) { + throw new Error('Refusing to clean an unexpected signing provision path.') + } + await rm(root, { recursive: true, force: true }) +} diff --git a/scripts/prune-oldest-cloudflare-release.mjs b/scripts/prune-oldest-cloudflare-release.mjs new file mode 100644 index 000000000..78d02fc4c --- /dev/null +++ b/scripts/prune-oldest-cloudflare-release.mjs @@ -0,0 +1,114 @@ +#!/usr/bin/env node + +import { spawn } from 'node:child_process' +import { readFile, rename, writeFile } from 'node:fs/promises' +import path from 'node:path' +import { fileURLToPath } from 'node:url' +import { + buildReleaseRetentionPlan, + immutableKeysFromPublicationPlan +} from './cloudflare-release-retention.mjs' + +const projectRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..') + +export function parseRetentionArguments(argv) { + const values = new Map() + let dryRun = false + for (let index = 0; index < argv.length; index += 1) { + const argument = argv[index] + if (argument === '--dry-run') { + dryRun = true + continue + } + if (!argument.startsWith('--')) throw new Error(`Unexpected argument: ${argument}`) + const value = argv[index + 1] + if (!value || value.startsWith('--')) throw new Error(`${argument} requires a value.`) + values.set(argument.slice(2), value) + index += 1 + } + for (const required of ['bucket', 'version', 'plan', 'inventory']) { + if (!values.get(required)) throw new Error(`--${required} is required.`) + } + const bucket = values.get('bucket') + if (!/^[a-z0-9][a-z0-9-]{1,61}[a-z0-9]$/.test(bucket)) { + throw new Error(`Invalid R2 bucket name: ${bucket}`) + } + return { + bucket, + version: values.get('version'), + planPath: path.resolve(values.get('plan')), + inventoryPath: path.resolve(values.get('inventory')), + dryRun + } +} + +export async function pruneOldestCloudflareRelease(options) { + const [inventory, publicationPlan] = await Promise.all([ + readJson(options.inventoryPath), + readJson(options.planPath) + ]) + const currentKeys = immutableKeysFromPublicationPlan(publicationPlan, options.version) + const retentionPlan = buildReleaseRetentionPlan({ + inventory, + currentVersion: options.version, + currentKeys + }) + if (options.dryRun) return retentionPlan + + for (const key of retentionPlan.deleteKeys) { + await runWrangler([ + 'r2', + 'object', + 'delete', + `${options.bucket}/${key}`, + '--remote', + '--force' + ]) + } + await writeJsonAtomically(options.inventoryPath, retentionPlan.nextInventory) + return retentionPlan +} + +async function readJson(filename) { + return JSON.parse(await readFile(filename, 'utf8')) +} + +async function writeJsonAtomically(filename, value) { + const temporaryPath = `${filename}.tmp` + await writeFile(temporaryPath, `${JSON.stringify(value, null, 2)}\n`, 'utf8') + await rename(temporaryPath, filename) +} + +function runWrangler(arguments_) { + const executable = path.join( + projectRoot, + 'node_modules', + '.bin', + process.platform === 'win32' ? 'wrangler.cmd' : 'wrangler' + ) + return new Promise((resolve, reject) => { + const child = spawn(executable, arguments_, { + cwd: projectRoot, + env: process.env, + stdio: 'inherit', + shell: process.platform === 'win32' + }) + child.once('error', reject) + child.once('exit', (code, signal) => { + if (code === 0) resolve() + else reject(new Error(`Wrangler exited with ${signal ? `signal ${signal}` : `code ${code}`}.`)) + }) + }) +} + +const invokedPath = process.argv[1] ? path.resolve(process.argv[1]) : '' +if (invokedPath === fileURLToPath(import.meta.url)) { + try { + const options = parseRetentionArguments(process.argv.slice(2)) + const plan = await pruneOldestCloudflareRelease(options) + process.stdout.write(`${JSON.stringify(plan, null, 2)}\n`) + } catch (error) { + console.error(error instanceof Error ? error.message : String(error)) + process.exitCode = 1 + } +} diff --git a/scripts/publish-cloudflare-release.mjs b/scripts/publish-cloudflare-release.mjs new file mode 100644 index 000000000..bfdc7d952 --- /dev/null +++ b/scripts/publish-cloudflare-release.mjs @@ -0,0 +1,297 @@ +#!/usr/bin/env node + +import { spawn } from 'node:child_process' +import { randomBytes } from 'node:crypto' +import { mkdtemp, rm, stat, writeFile } from 'node:fs/promises' +import { tmpdir } from 'node:os' +import path from 'node:path' +import { fileURLToPath } from 'node:url' +import { buildCloudflareReleasePlan } from './cloudflare-release-plan.mjs' +import { + copyR2Object, + fetchCloudflareWorker, + selectUploadTransport, + uploadFileMultipart, + validateExistingImmutableResponse +} from './cloudflare-r2-multipart-client.mjs' + +const projectRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..') + +export function parsePublisherArguments(argv) { + const values = new Map() + let dryRun = false + let resume = false + + for (let index = 0; index < argv.length; index += 1) { + const argument = argv[index] + if (argument === '--dry-run') { + dryRun = true + continue + } + if (argument === '--resume') { + resume = true + continue + } + if (!argument.startsWith('--')) throw new Error(`Unexpected argument: ${argument}`) + const value = argv[index + 1] + if (!value || value.startsWith('--')) throw new Error(`${argument} requires a value.`) + values.set(argument.slice(2), value) + index += 1 + } + + for (const required of ['bucket', 'version', 'assets', 'prepared']) { + if (!values.get(required)) throw new Error(`--${required} is required.`) + } + const bucket = values.get('bucket') + if (!/^[a-z0-9][a-z0-9-]{1,61}[a-z0-9]$/.test(bucket)) { + throw new Error(`Invalid R2 bucket name: ${bucket}`) + } + + return { + bucket, + version: values.get('version'), + tag: values.get('tag'), + assetDirectory: path.resolve(values.get('assets')), + outputDirectory: path.resolve(values.get('prepared')), + dryRun, + resume + } +} + +export async function publishCloudflareRelease(options) { + const plan = await buildCloudflareReleasePlan(options) + if (options.dryRun) return plan + + let uploads = await Promise.all( + plan.map(async (entry) => ({ + entry, + transport: selectUploadTransport((await stat(entry.source)).size) + })) + ) + if (options.resume) uploads = await skipVerifiedImmutableUploads(uploads) + const needsMultipart = uploads.some(({ transport }) => transport === 'multipart') + const multipart = needsMultipart + ? await startMultipartWorker({ bucket: options.bucket, version: options.version }) + : undefined + + try { + for (const { entry, transport } of uploads) { + if (multipart && entry.key === 'download/sherlock-mac-arm64.dmg') { + await copyR2Object({ + endpoint: multipart.endpoint, + token: multipart.token, + version: options.version, + sourceKey: `releases/v${options.version}/sherlock-mac-arm64.dmg`, + targetKey: entry.key, + contentType: entry.contentType, + cacheControl: entry.cacheControl + }) + } else if (transport === 'multipart') { + if (!multipart) throw new Error('Multipart upload proxy is unavailable.') + await uploadFileMultipart({ + endpoint: multipart.endpoint, + token: multipart.token, + version: options.version, + key: entry.key, + source: entry.source, + contentType: entry.contentType, + cacheControl: entry.cacheControl, + onProgress({ key, completedBytes, totalBytes }) { + const percent = Math.floor((completedBytes / totalBytes) * 100) + process.stderr.write(`R2 multipart ${key}: ${percent}%\n`) + } + }) + } else { + await runWrangler([ + 'r2', + 'object', + 'put', + `${options.bucket}/${entry.key}`, + '--remote', + '--file', + entry.source, + '--content-type', + entry.contentType, + '--cache-control', + entry.cacheControl + ]) + } + } + } finally { + await multipart?.stop() + } + return plan +} + +async function skipVerifiedImmutableUploads(uploads) { + const pending = [] + for (const upload of uploads) { + if (upload.entry.phase !== 'immutable') { + pending.push(upload) + continue + } + const localSize = (await stat(upload.entry.source)).size + const response = await fetch(`https://updates.evanarts.com/${upload.entry.key}`, { + method: 'HEAD', + cache: 'no-store' + }) + if (response.status === 404) { + pending.push(upload) + continue + } + validateExistingImmutableResponse({ key: upload.entry.key, localSize, response }) + process.stderr.write(`R2 resume verified existing ${upload.entry.key}\n`) + } + return pending +} + +async function startMultipartWorker({ bucket, version }) { + const root = await mkdtemp(path.join(tmpdir(), 'sherlock-r2-multipart-')) + const config = path.join(root, 'wrangler.toml') + const workerName = `sherlock-release-upload-${randomBytes(4).toString('hex')}` + await writeFile( + config, + [ + `name = "${workerName}"`, + 'compatibility_date = "2026-08-25"', + 'workers_dev = true', + '', + '[[r2_buckets]]', + 'binding = "SHERLOCK_RELEASES"', + `bucket_name = "${bucket}"`, + '' + ].join('\n'), + 'utf8' + ) + const token = randomBytes(32).toString('hex') + let deployed = false + let endpoint + try { + const output = await runWranglerCaptured( + [ + 'deploy', + path.join(projectRoot, 'scripts', 'cloudflare-r2-multipart-worker.mjs'), + '--config', + config, + '--var', + `RELEASE_UPLOAD_TOKEN:${token}`, + '--var', + `RELEASE_VERSION:${version}` + ], + token + ) + deployed = true + endpoint = output.match(/https:\/\/[a-z0-9-]+\.[a-z0-9-]+\.workers\.dev/)?.[0] + if (!endpoint) throw new Error(`Wrangler did not report the multipart Worker URL.\n${output}`) + await waitForMultipartWorker({ endpoint, token }) + } catch (error) { + if (deployed) { + await runWrangler(['delete', workerName, '--config', config, '--force']).catch(() => {}) + } + await rm(root, { recursive: true, force: true }) + throw error + } + + let stopped = false + return { + endpoint, + token, + async stop() { + if (stopped) return + stopped = true + try { + await runWrangler(['delete', workerName, '--config', config, '--force']) + } finally { + await rm(root, { recursive: true, force: true }) + } + } + } +} + +function runWranglerCaptured(arguments_, redactedValue) { + const executable = wranglerExecutable() + return new Promise((resolve, reject) => { + const child = spawn( + executable, + [...arguments_, '--install-skills=false'], + { + cwd: projectRoot, + env: process.env, + stdio: ['ignore', 'pipe', 'pipe'], + shell: process.platform === 'win32' + } + ) + let output = '' + const collect = (chunk) => { + output += chunk + } + child.stdout.on('data', collect) + child.stderr.on('data', collect) + child.once('error', reject) + child.once('exit', (code, signal) => { + const sanitized = redactedValue ? output.replaceAll(redactedValue, '[REDACTED]') : output + if (code === 0) resolve(sanitized) + else { + reject( + new Error( + `Wrangler exited with ${signal ? `signal ${signal}` : `code ${code}`}.\n${sanitized}` + ) + ) + } + }) + }) +} + +async function waitForMultipartWorker({ endpoint, token }) { + const deadline = Date.now() + 120_000 + while (Date.now() < deadline) { + try { + const response = await fetchCloudflareWorker(`${endpoint}/health`, { + headers: { authorization: `Bearer ${token}` } + }) + if (response.ok) return + } catch { + // The new workers.dev route has not propagated yet. + } + await new Promise((resolve) => setTimeout(resolve, 500)) + } + throw new Error(`Timed out waiting for multipart Worker at ${endpoint}.`) +} + +function runWrangler(arguments_) { + const executable = wranglerExecutable() + return new Promise((resolve, reject) => { + const child = spawn(executable, [...arguments_, '--install-skills=false'], { + cwd: projectRoot, + env: process.env, + stdio: 'inherit', + shell: process.platform === 'win32' + }) + child.once('error', reject) + child.once('exit', (code, signal) => { + if (code === 0) resolve() + else reject(new Error(`Wrangler exited with ${signal ? `signal ${signal}` : `code ${code}`}.`)) + }) + }) +} + +function wranglerExecutable() { + return path.join( + projectRoot, + 'node_modules', + '.bin', + process.platform === 'win32' ? 'wrangler.cmd' : 'wrangler' + ) +} + +const invokedPath = process.argv[1] ? path.resolve(process.argv[1]) : '' +if (invokedPath === fileURLToPath(import.meta.url)) { + try { + const options = parsePublisherArguments(process.argv.slice(2)) + const plan = await publishCloudflareRelease(options) + if (options.dryRun) process.stdout.write(`${JSON.stringify(plan, null, 2)}\n`) + } catch (error) { + console.error(error instanceof Error ? error.message : String(error)) + process.exitCode = 1 + } +} diff --git a/scripts/refresh-mac-update-metadata.d.mts b/scripts/refresh-mac-update-metadata.d.mts new file mode 100644 index 000000000..aeba67d06 --- /dev/null +++ b/scripts/refresh-mac-update-metadata.d.mts @@ -0,0 +1,4 @@ +export function refreshMacUpdateMetadata(options: { + metadataPath: string + dmgPath: string +}): Promise diff --git a/scripts/refresh-mac-update-metadata.mjs b/scripts/refresh-mac-update-metadata.mjs new file mode 100644 index 000000000..08c214a66 --- /dev/null +++ b/scripts/refresh-mac-update-metadata.mjs @@ -0,0 +1,72 @@ +#!/usr/bin/env node + +import { createHash } from 'node:crypto' +import { createReadStream } from 'node:fs' +import { readFile, stat, writeFile } from 'node:fs/promises' +import path from 'node:path' +import { fileURLToPath } from 'node:url' +import { parse, stringify } from 'yaml' + +/** + * Refresh the electron-updater entry for a DMG after the disk image is signed, + * notarized, and stapled. These operations can change both its size and digest. + * + * @param {{ metadataPath: string, dmgPath: string }} options + */ +export async function refreshMacUpdateMetadata(options) { + const metadataPath = path.resolve(options.metadataPath) + const dmgPath = path.resolve(options.dmgPath) + const dmgName = path.basename(dmgPath) + const metadata = parse(await readFile(metadataPath, 'utf8')) + + if (!metadata || typeof metadata !== 'object' || !Array.isArray(metadata.files)) { + throw new Error(`${metadataPath} is not valid macOS update metadata.`) + } + + const entry = metadata.files.find((file) => file?.url === dmgName) + if (!entry) { + throw new Error(`${metadataPath} does not reference ${dmgName}.`) + } + + const fileStats = await stat(dmgPath) + entry.sha512 = await sha512Base64(dmgPath) + entry.size = fileStats.size + await writeFile(metadataPath, stringify(metadata), 'utf8') +} + +function sha512Base64(filename) { + return new Promise((resolve, reject) => { + const digest = createHash('sha512') + const input = createReadStream(filename) + input.on('error', reject) + input.on('data', (chunk) => digest.update(chunk)) + input.on('end', () => resolve(digest.digest('base64'))) + }) +} + +function parseArguments(argv) { + const values = new Map() + for (let index = 0; index < argv.length; index += 2) { + const argument = argv[index] + const value = argv[index + 1] + if (!argument?.startsWith('--') || !value) { + throw new Error('Usage: refresh-mac-update-metadata --metadata --dmg ') + } + values.set(argument.slice(2), value) + } + const metadataPath = values.get('metadata') + const dmgPath = values.get('dmg') + if (!metadataPath || !dmgPath || values.size !== 2) { + throw new Error('Usage: refresh-mac-update-metadata --metadata --dmg ') + } + return { metadataPath, dmgPath } +} + +if (path.resolve(process.argv[1] ?? '') === fileURLToPath(import.meta.url)) { + try { + await refreshMacUpdateMetadata(parseArguments(process.argv.slice(2))) + } catch (error) { + console.error(error instanceof Error ? error.message : String(error)) + process.exitCode = 1 + } +} diff --git a/scripts/sync-plugin-profile.mjs b/scripts/sync-plugin-profile.mjs new file mode 100644 index 000000000..92fe3d14b --- /dev/null +++ b/scripts/sync-plugin-profile.mjs @@ -0,0 +1,262 @@ +import { constants } from 'node:fs' +import { + cp, + mkdir, + mkdtemp, + readFile, + rename, + rm, + stat, + symlink, + writeFile +} from 'node:fs/promises' +import { homedir } from 'node:os' +import path from 'node:path' +import { pathToFileURL } from 'node:url' + +const DIRECTIONS = new Set(['formal-to-dev', 'dev-to-formal']) +const RECEIPT_FILENAME = 'plugin-profile-sync.json' + +async function pathExists(filePath) { + try { + await stat(filePath) + return true + } catch (error) { + if (error?.code === 'ENOENT') return false + throw error + } +} + +function cloneJson(value) { + return JSON.parse(JSON.stringify(value)) +} + +export function rewriteLocalPluginReferences(manifest, sourceCustomRoot, targetCustomRoot) { + const result = cloneJson(manifest) + const dependencies = result.dependencies ?? {} + + for (const [name, specifier] of Object.entries(dependencies)) { + if (typeof specifier !== 'string') continue + const protocol = ['file:', 'link:'].find((candidate) => + specifier.startsWith(`${candidate}${sourceCustomRoot}${path.sep}`) + ) + if (!protocol) continue + const sourcePrefix = `${protocol}${sourceCustomRoot}${path.sep}` + dependencies[name] = `${protocol}${targetCustomRoot}${path.sep}${specifier.slice(sourcePrefix.length)}` + } + + return result +} + +function localPluginDirectories(manifest, customRoot) { + return Object.entries(manifest.dependencies ?? {}) + .map(([name, specifier]) => { + if (typeof specifier !== 'string') return undefined + const protocol = ['file:', 'link:'].find((candidate) => + specifier.startsWith(`${candidate}${customRoot}${path.sep}`) + ) + return protocol ? { name, directory: specifier.slice(protocol.length) } : undefined + }) + .filter(Boolean) +} + +async function copyTree(source, target) { + try { + await cp(source, target, { + recursive: true, + force: true, + preserveTimestamps: true, + mode: constants.COPYFILE_FICLONE + }) + } catch (error) { + if (error?.code !== 'ENOTSUP' && error?.code !== 'EINVAL') throw error + await rm(target, { recursive: true, force: true }) + await cp(source, target, { + recursive: true, + force: true, + preserveTimestamps: true + }) + } +} + +function safeTimestamp(date) { + return date.toISOString().replaceAll(':', '-').replaceAll('.', '-') +} + +async function rewriteStagedProfile(profileDirectory, sourceCustomRoot, targetCustomRoot) { + const manifestPath = path.join(profileDirectory, 'package.json') + const manifest = JSON.parse(await readFile(manifestPath, 'utf8')) + const rewritten = rewriteLocalPluginReferences(manifest, sourceCustomRoot, targetCustomRoot) + await writeFile(manifestPath, `${JSON.stringify(rewritten, null, 2)}\n`, 'utf8') + + const lockfilePath = path.join(profileDirectory, 'pnpm-lock.yaml') + if (await pathExists(lockfilePath)) { + const lockfile = await readFile(lockfilePath, 'utf8') + await writeFile(lockfilePath, lockfile.replaceAll(sourceCustomRoot, targetCustomRoot), 'utf8') + } + + return rewritten +} + +async function relinkLocalPlugins(profileDirectory, manifest, targetCustomRoot) { + for (const { name, directory } of localPluginDirectories(manifest, targetCustomRoot)) { + const pluginLink = path.join(profileDirectory, 'node_modules', name) + await rm(pluginLink, { recursive: true, force: true }) + await mkdir(path.dirname(pluginLink), { recursive: true }) + await symlink(directory, pluginLink, process.platform === 'win32' ? 'junction' : 'dir') + } +} + +export async function syncHarnessPluginProfile({ + sourceUserData, + targetUserData, + direction, + now = new Date() +}) { + if (!DIRECTIONS.has(direction)) { + throw new Error(`Unknown plugin sync direction: ${direction}`) + } + + const sourceRoot = path.resolve(sourceUserData) + const targetRoot = path.resolve(targetUserData) + if (sourceRoot === targetRoot) { + throw new Error('Plugin sync source and target must be different user-data directories.') + } + + const sourceHarness = path.join(sourceRoot, 'harness') + const targetHarness = path.join(targetRoot, 'harness') + const sourceProfile = path.join(sourceHarness, 'profiles', 'web') + const targetProfile = path.join(targetHarness, 'profiles', 'web') + const sourceCustom = path.join(sourceHarness, 'custom-plugins') + const targetCustom = path.join(targetHarness, 'custom-plugins') + const sourceManifestPath = path.join(sourceProfile, 'package.json') + + if (!(await pathExists(sourceManifestPath))) { + throw new Error(`Source plugin profile does not exist: ${sourceManifestPath}`) + } + + const sourceManifest = JSON.parse(await readFile(sourceManifestPath, 'utf8')) + for (const { name, directory } of localPluginDirectories(sourceManifest, sourceCustom)) { + if (!(await pathExists(directory))) { + throw new Error(`Local plugin source is missing for ${name}: ${directory}`) + } + } + + await mkdir(targetHarness, { recursive: true }) + const stageDirectory = await mkdtemp(path.join(targetHarness, '.plugin-profile-sync-stage-')) + const stagedProfile = path.join(stageDirectory, 'web') + const stagedCustom = path.join(stageDirectory, 'custom-plugins') + const backupRoot = path.join(targetHarness, 'profile-sync-backups') + await mkdir(backupRoot, { recursive: true }) + const backupDirectory = await mkdtemp( + path.join(backupRoot, `${safeTimestamp(now)}-${direction}-`) + ) + const backupProfile = path.join(backupDirectory, 'profiles', 'web') + const backupCustom = path.join(backupDirectory, 'custom-plugins') + + let profileBackedUp = false + let customBackedUp = false + let profileInstalled = false + let customInstalled = false + + try { + await copyTree(sourceProfile, stagedProfile) + const sourceHasCustomPlugins = await pathExists(sourceCustom) + if (sourceHasCustomPlugins) await copyTree(sourceCustom, stagedCustom) + const stagedManifest = await rewriteStagedProfile( + stagedProfile, + sourceCustom, + targetCustom + ) + await relinkLocalPlugins(stagedProfile, stagedManifest, targetCustom) + + if (await pathExists(targetProfile)) { + await mkdir(path.dirname(backupProfile), { recursive: true }) + await rename(targetProfile, backupProfile) + profileBackedUp = true + } + if (await pathExists(targetCustom)) { + await mkdir(path.dirname(backupCustom), { recursive: true }) + await rename(targetCustom, backupCustom) + customBackedUp = true + } + + await mkdir(path.dirname(targetProfile), { recursive: true }) + await rename(stagedProfile, targetProfile) + profileInstalled = true + if (sourceHasCustomPlugins) { + await rename(stagedCustom, targetCustom) + customInstalled = true + } + + const plugins = Object.keys(stagedManifest.dependencies ?? {}) + const receipt = { + version: 1, + direction, + syncedAt: now.toISOString(), + sourceUserData: sourceRoot, + targetUserData: targetRoot, + backupDirectory, + plugins + } + await writeFile( + path.join(targetHarness, RECEIPT_FILENAME), + `${JSON.stringify(receipt, null, 2)}\n`, + 'utf8' + ) + + return { ...receipt, backupDirectory, plugins } + } catch (error) { + if (customInstalled) await rm(targetCustom, { recursive: true, force: true }) + if (profileInstalled) await rm(targetProfile, { recursive: true, force: true }) + if (customBackedUp && (await pathExists(backupCustom))) { + await rename(backupCustom, targetCustom) + } + if (profileBackedUp && (await pathExists(backupProfile))) { + await mkdir(path.dirname(targetProfile), { recursive: true }) + await rename(backupProfile, targetProfile) + } + throw error + } finally { + await rm(stageDirectory, { recursive: true, force: true }) + } +} + +function applicationSupportDirectory() { + if (process.platform === 'darwin') { + return path.join(homedir(), 'Library', 'Application Support') + } + if (process.platform === 'win32') { + if (!process.env.APPDATA) throw new Error('APPDATA is not set.') + return process.env.APPDATA + } + return process.env.XDG_CONFIG_HOME ?? path.join(homedir(), '.config') +} + +export function resolveSyncEndpoints(direction, appDataRoot = applicationSupportDirectory()) { + if (!DIRECTIONS.has(direction)) { + throw new Error('Use formal-to-dev or dev-to-formal.') + } + const formal = path.join(appDataRoot, 'sherlock-desktop') + const development = path.join(appDataRoot, 'dsh-desktop-dev') + return direction === 'formal-to-dev' + ? { sourceUserData: formal, targetUserData: development } + : { sourceUserData: development, targetUserData: formal } +} + +async function main() { + const direction = process.argv[2] + const endpoints = resolveSyncEndpoints(direction) + const result = await syncHarnessPluginProfile({ ...endpoints, direction }) + console.log(`Plugin profile sync complete: ${direction}`) + console.log(`Plugins: ${result.plugins.join(', ') || '(none)'}`) + console.log(`Backup: ${result.backupDirectory}`) +} + +const entryUrl = process.argv[1] ? pathToFileURL(path.resolve(process.argv[1])).href : undefined +if (entryUrl === import.meta.url) { + main().catch((error) => { + console.error(error instanceof Error ? error.message : String(error)) + process.exitCode = 1 + }) +} diff --git a/scripts/verify-formal-git-state.mjs b/scripts/verify-formal-git-state.mjs new file mode 100644 index 000000000..958f69686 --- /dev/null +++ b/scripts/verify-formal-git-state.mjs @@ -0,0 +1,157 @@ +import { existsSync, readFileSync, readdirSync, realpathSync } from 'node:fs' +import path from 'node:path' +import { fileURLToPath } from 'node:url' +import { + listRegisteredWorktrees, + readRepositoryStatus, + resolveRepositoryContext, + runGit +} from './lib/sherlock-git-state.mjs' +import { readActiveBatchLease } from './lib/sherlock-active-batch.mjs' + +function localBranches(repository) { + const output = runGit(repository, [ + 'for-each-ref', + '--format=%(refname:short)', + 'refs/heads' + ]).stdout.trim() + return output ? output.split(/\r?\n/).filter(Boolean) : [] +} + +function explicitlyCancelledIntegrationBranches(repository) { + const context = resolveRepositoryContext(repository) + const historyRoot = path.join(context.commonDirectory, 'sherlock-integration', 'history') + const cancelled = new Set() + if (!existsSync(historyRoot)) return cancelled + + for (const entry of readdirSync(historyRoot, { withFileTypes: true })) { + if (!entry.isDirectory()) continue + const match = /^(\d{8}-\d{2})-cancelled-/.exec(entry.name) + if (!match) continue + const batchId = match[1] + const leaseFile = path.join(historyRoot, entry.name, 'lease.json') + if (!existsSync(leaseFile)) continue + + try { + const lease = JSON.parse(readFileSync(leaseFile, 'utf8')) + const branch = `codex/integration/${batchId}` + if ( + lease?.schemaVersion === 1 && + lease?.batchId === batchId && + lease?.branch === branch && + lease?.currentTip === runGit(repository, ['rev-parse', `refs/heads/${branch}`], { allowFailure: true }).stdout.trim() + ) { + cancelled.add(branch) + } + } catch { + // Invalid or stale archives must not weaken the formal source gate. + } + } + return cancelled +} + +function readVersion(repository) { + const packageJson = JSON.parse(readFileSync(path.join(repository, 'package.json'), 'utf8')) + if (typeof packageJson.version !== 'string') { + throw new Error('package.json 缺少有效的 version。') + } + if (!/^\d+\.\d+\.\d+$/.test(packageJson.version)) { + throw new Error(`package.json 版本号不是标准三段式 SemVer：${packageJson.version}`) + } + return packageJson.version +} + +function verifyMajorTag(repository, version, head) { + const [major, minor, patchVersion] = version.split('.').map(Number) + if (major < 1 || minor !== 0 || patchVersion !== 0) return [] + + const tag = `V${version}` + try { + const tagType = runGit(repository, ['cat-file', '-t', `refs/tags/${tag}`]).stdout.trim() + const taggedCommit = runGit(repository, ['rev-list', '-n', '1', tag]).stdout.trim() + if (tagType !== 'tag') { + return [`大版本 ${version} 必须使用注释标签 ${tag}，不能使用轻量标签。`] + } + if (taggedCommit !== head) { + return [`大版本标签 ${tag} 必须指向当前正式构建提交 ${head}。`] + } + return [] + } catch { + return [`大版本 ${version} 必须先在当前提交创建本地注释标签 ${tag}。`] + } +} + +export function verifyFormalGitState(repository) { + const context = resolveRepositoryContext(repository) + const errors = [] + const branch = context.branch ?? '' + const { trackedChanges, untrackedSources } = readRepositoryStatus(context.worktreeRoot) + const version = readVersion(context.worktreeRoot) + + if (branch !== 'main') { + errors.push(`正式构建必须从 main 分支执行，当前分支是 ${branch || '(detached HEAD)'}。`) + } + if (trackedChanges.length > 0) { + errors.push('存在尚未提交的代码改动；请先用中文说明提交后再构建正式版。') + } + if (untrackedSources.length > 0) { + errors.push(`存在未纳入 Git 的源码文件：${untrackedSources.join('、')}`) + } + if (readActiveBatchLease(context.worktreeRoot)) { + errors.push('存在活动集成租约；请先完成晋升或显式取消后再构建正式版。') + } + + const currentWorktree = realpathSync(context.worktreeRoot) + for (const worktree of listRegisteredWorktrees(context.worktreeRoot)) { + if (!existsSync(worktree.path) || realpathSync(worktree.path) === currentWorktree) continue + const status = readRepositoryStatus(worktree.path) + if (status.trackedChanges.length > 0 || status.untrackedSources.length > 0) { + errors.push( + `另一个 worktree 存在尚未提交的改动：${worktree.branch ?? '(detached HEAD)'}（${worktree.path}）` + ) + } + } + + const cancelledIntegrationBranches = explicitlyCancelledIntegrationBranches(context.worktreeRoot) + const unmergedBranches = localBranches(context.worktreeRoot) + .filter((candidate) => candidate !== 'main' && !cancelledIntegrationBranches.has(candidate)) + .map((candidate) => ({ + name: candidate, + ahead: Number( + runGit(context.worktreeRoot, ['rev-list', '--count', `main..${candidate}`]).stdout.trim() + ) + })) + .filter((candidate) => candidate.ahead > 0) + if (unmergedBranches.length > 0) { + errors.push( + `以下本地分支仍有提交尚未合并到 main：${unmergedBranches + .map((candidate) => `${candidate.name}（${candidate.ahead} 个提交）`) + .join('、')}` + ) + } + + errors.push(...verifyMajorTag(context.worktreeRoot, version, context.head)) + if (errors.length > 0) throw new Error(errors.join('\n')) + + return { branch, head: context.head, version } +} + +function readOption(name) { + const index = process.argv.indexOf(name) + if (index === -1) return undefined + const value = process.argv[index + 1] + if (!value || value.startsWith('--')) throw new Error(`${name} 缺少路径参数。`) + return value +} + +if (path.resolve(process.argv[1] ?? '') === fileURLToPath(import.meta.url)) { + try { + const result = verifyFormalGitState(readOption('--repo') ?? process.cwd()) + console.log( + `正式构建源码检查通过：${result.branch} ${result.head.slice(0, 12)}，版本 ${result.version}` + ) + } catch (error) { + console.error(`正式构建源码检查失败：\n${error instanceof Error ? error.message : error}`) + process.exitCode = 1 + } +} diff --git a/scripts/verify-packaged-macos.mjs b/scripts/verify-packaged-macos.mjs new file mode 100644 index 000000000..a2e79fa33 --- /dev/null +++ b/scripts/verify-packaged-macos.mjs @@ -0,0 +1,136 @@ +import { existsSync } from 'node:fs' +import { execFileSync } from 'node:child_process' +import path from 'node:path' +import { verifyBundledSkillParity } from './bundled-skill-parity.mjs' + +const args = process.argv.slice(2) + +function readOption(name) { + const index = args.indexOf(name) + if (index === -1) return undefined + + const value = args[index + 1] + if (!value || value.startsWith('--')) { + throw new Error(`${name} requires a value`) + } + + return value +} + +function resolveAutomaticAppPath() { + const appName = 'Sherlock.app' + const candidates = + process.arch === 'arm64' + ? [path.resolve('dist/mac-arm64', appName), path.resolve('dist/mac', appName)] + : [path.resolve('dist/mac', appName), path.resolve('dist/mac-x64', appName)] + + const appPath = candidates.find((candidate) => existsSync(candidate)) + if (!appPath) { + throw new Error(`packaged app not found; checked: ${candidates.join(', ')}`) + } + + return appPath +} + +function verifyRuntime(runtimeNode, runtimeRoot) { + if (!existsSync(runtimeNode)) { + throw new Error(`runtime Node executable not found: ${runtimeNode}`) + } + if (!existsSync(path.join(runtimeRoot, 'package.json'))) { + throw new Error(`runtime package root not found: ${runtimeRoot}`) + } + + const probe = String.raw` +const { createRequire } = require('node:module') +const { pathToFileURL } = require('node:url') +const path = require('node:path') + +const runtimeRoot = process.argv[1] +const runtimeRequire = createRequire(path.join(runtimeRoot, 'package.json')) + +async function loadDependency(name, required) { + let entryPath + try { + entryPath = runtimeRequire.resolve(name) + } catch (error) { + if (!required && error && error.code === 'MODULE_NOT_FOUND') { + console.log(name + ': not present (optional)') + return + } + throw error + } + + await import(pathToFileURL(entryPath).href) + console.log(name + ': loadable') +} + +Promise.resolve() + .then(() => loadDependency('apache-arrow', true)) + .then(() => loadDependency('@lancedb/lancedb', false)) + .catch((error) => { + console.error(error && error.stack ? error.stack : error) + process.exitCode = 1 + }) +` + + execFileSync(runtimeNode, ['-e', probe, runtimeRoot], { + cwd: runtimeRoot, + stdio: 'inherit' + }) +} + +function verifySignature(appPath) { + if (process.platform !== 'darwin') { + throw new Error('macOS package signature verification must run on macOS') + } + + execFileSync( + '/usr/bin/codesign', + ['--verify', '--deep', '--strict', '--all-architectures', '--verbose=2', appPath], + { stdio: 'inherit' } + ) + console.log('signature: valid') +} + +try { + const appOption = readOption('--app') + const runtimeRootOption = readOption('--runtime-root') + const runtimeNodeOption = readOption('--runtime-node') + + if (appOption) { + if (runtimeRootOption || runtimeNodeOption) { + throw new Error('--app cannot be combined with --runtime-root or --runtime-node') + } + + const appPath = appOption === 'auto' ? resolveAutomaticAppPath() : path.resolve(appOption) + if (!existsSync(appPath)) { + throw new Error(`packaged app not found: ${appPath}`) + } + + const resourcesPath = path.join(appPath, 'Contents', 'Resources') + const runtimeRoot = path.join(resourcesPath, 'app') + const runtimeNode = path.join(runtimeRoot, 'node_modules', 'node', 'bin', 'node') + const bundledSkill = verifyBundledSkillParity({ + sourceSkillDirectory: path.resolve('skills', 'efund-ppt-maker'), + packagedSkillDirectory: path.join( + resourcesPath, + 'sherlock-skills', + 'efund-ppt-maker' + ) + }) + + verifyRuntime(runtimeNode, runtimeRoot) + verifySignature(appPath) + console.log(`bundled skill: ${bundledSkill.slug} ${bundledSkill.version} (source parity)`) + console.log(`package: verified (${appPath})`) + } else { + if (!runtimeRootOption || !runtimeNodeOption) { + throw new Error('provide --app or both --runtime-root and --runtime-node') + } + + verifyRuntime(path.resolve(runtimeNodeOption), path.resolve(runtimeRootOption)) + } +} catch (error) { + console.error(`macOS package verification failed: ${error instanceof Error ? error.message : error}`) + process.exitCode = 1 +} diff --git a/scripts/verify-self-signed-update-identity.mjs b/scripts/verify-self-signed-update-identity.mjs new file mode 100644 index 000000000..8fc0726c2 --- /dev/null +++ b/scripts/verify-self-signed-update-identity.mjs @@ -0,0 +1,170 @@ +import { execFile as execFileCallback } from 'node:child_process' +import { copyFile, mkdtemp, rm } from 'node:fs/promises' +import { tmpdir } from 'node:os' +import path from 'node:path' +import { promisify } from 'node:util' + +const execFile = promisify(execFileCallback) +const temporaryPrefix = path.join(path.resolve(tmpdir()), 'sherlock-self-signed-update-') +const root = await mkdtemp(temporaryPrefix) +const keychain = path.join(root, 'fixture.keychain-db') +const key = path.join(root, 'identity.key') +const certificate = path.join(root, 'identity.pem') +const p12 = path.join(root, 'identity.p12') +const first = path.join(root, 'Sherlock-0.5.0') +const second = path.join(root, 'Sherlock-0.6.0') +const keychainPassword = 'temporary-keychain-password' +const certificatePassword = 'temporary-certificate-password' +let originalKeychains = [] +let keychainCreated = false + +function parseKeychains(stdout) { + return stdout + .split('\n') + .map((line) => line.trim().replace(/^"|"$/g, '')) + .filter(Boolean) +} + +async function run(executable, args) { + return execFile(executable, args, { encoding: 'utf8' }) +} + +try { + originalKeychains = parseKeychains( + (await run('/usr/bin/security', ['list-keychains', '-d', 'user'])).stdout + ) + + await run('/usr/bin/openssl', [ + 'req', + '-x509', + '-newkey', + 'rsa:2048', + '-nodes', + '-keyout', + key, + '-out', + certificate, + '-days', + '1', + '-subj', + '/CN=Sherlock Update Fixture/O=Sherlock', + '-addext', + 'keyUsage=critical,digitalSignature', + '-addext', + 'extendedKeyUsage=codeSigning', + '-addext', + 'basicConstraints=critical,CA:FALSE' + ]) + await run('/usr/bin/openssl', [ + 'pkcs12', + '-export', + '-out', + p12, + '-inkey', + key, + '-in', + certificate, + '-name', + 'Sherlock Update Fixture', + '-passout', + `pass:${certificatePassword}` + ]) + + await run('/usr/bin/security', ['create-keychain', '-p', keychainPassword, keychain]) + keychainCreated = true + await run('/usr/bin/security', ['set-keychain-settings', '-lut', '300', keychain]) + await run('/usr/bin/security', ['unlock-keychain', '-p', keychainPassword, keychain]) + await run('/usr/bin/security', [ + 'import', + p12, + '-k', + keychain, + '-P', + certificatePassword, + '-T', + '/usr/bin/codesign' + ]) + await run('/usr/bin/security', [ + 'set-key-partition-list', + '-S', + 'apple-tool:,apple:', + '-s', + '-k', + keychainPassword, + keychain + ]) + await run('/usr/bin/security', [ + 'list-keychains', + '-d', + 'user', + '-s', + keychain, + ...originalKeychains.filter((item) => item !== keychain) + ]) + + const identities = await run('/usr/bin/security', [ + 'find-certificate', + '-a', + '-Z', + '-c', + 'Sherlock Update Fixture', + keychain + ]) + if (process.env.SHERLOCK_SIGNING_DEBUG === '1') { + const certificateDetails = await run('/usr/bin/openssl', [ + 'x509', + '-in', + certificate, + '-noout', + '-subject', + '-issuer', + '-purpose' + ]) + console.error(`[identity]\n${identities.stdout.trim()}\n[certificate]\n${certificateDetails.stdout.trim()}`) + } + const identity = /^SHA-1 hash:\s*([0-9A-F]{40})$/m.exec(identities.stdout)?.[1] + if (!identity) throw new Error('Temporary self-signed code-signing certificate is unavailable.') + + await Promise.all([copyFile('/usr/bin/true', first), copyFile('/usr/bin/true', second)]) + for (const binary of [first, second]) { + await run('/usr/bin/codesign', [ + '--force', + '--sign', + identity, + '--keychain', + keychain, + '--identifier', + 'io.sherlock.update.fixture', + '--timestamp=none', + binary + ]) + await run('/usr/bin/codesign', ['--verify', '--strict', binary]) + } + + const requirementOutput = await run('/usr/bin/codesign', ['-d', '-r-', first]) + if (process.env.SHERLOCK_SIGNING_DEBUG === '1') { + console.error(`[requirement]\n${requirementOutput.stdout.trim()}`) + } + const requirement = /^designated => (.+)$/m.exec(requirementOutput.stdout)?.[1]?.trim() + if (!requirement) throw new Error('Unable to extract the first fixture designated requirement.') + + await run('/usr/bin/codesign', ['--verify', '--strict', `-R=${requirement}`, second]) + process.stdout.write('SELF_SIGNED_UPDATE_IDENTITY_OK\n') +} finally { + if (originalKeychains.length > 0) { + await run('/usr/bin/security', [ + 'list-keychains', + '-d', + 'user', + '-s', + ...originalKeychains + ]).catch(() => {}) + } + if (keychainCreated) { + await run('/usr/bin/security', ['delete-keychain', keychain]).catch(() => {}) + } + if (!path.resolve(root).startsWith(temporaryPrefix)) { + throw new Error('Refusing to clean an unexpected self-signed update fixture path.') + } + await rm(root, { recursive: true, force: true }) +} diff --git a/scripts/verify-sherlock-integration.mjs b/scripts/verify-sherlock-integration.mjs new file mode 100644 index 000000000..bbf968270 --- /dev/null +++ b/scripts/verify-sherlock-integration.mjs @@ -0,0 +1,57 @@ +#!/usr/bin/env node +import { preflightIntegrationAction } from './lib/sherlock-integration-preflight.mjs' + +function fail(message) { + throw new Error(message) +} + +function parseArguments(argv) { + if (argv.length === 1 && argv[0] === '--help') return { help: true } + const options = {} + for (let index = 0; index < argv.length; index += 1) { + const argument = argv[index] + if (argument === '--json') { + if (options.json) fail('不能重复传入 --json。') + options.json = true + continue + } + if (!['--repo', '--phase', '--manifest', '--feature', '--main-worktree', '--commit'].includes(argument)) { + fail(`未知参数：${argument}`) + } + const key = argument.slice(2).replaceAll('-', '_') + const value = argv[index + 1] + if (!value || value.startsWith('--')) fail(`${argument} 缺少值。`) + if (options[key] !== undefined) fail(`不能重复传入 ${argument}。`) + options[key] = value + index += 1 + } + if (!options.repo || !options.phase) fail('--repo 和 --phase 为必填参数。') + return options +} + +try { + const options = parseArguments(process.argv.slice(2)) + if (options.help) { + process.stdout.write('Usage: npm run git:integration:preflight -- --repo --phase [--manifest ] [--feature ] [--main-worktree ] [--commit ] [--json]\n') + process.exitCode = 0 + } else { + const report = preflightIntegrationAction({ + repository: options.repo, + phase: options.phase, + manifestPath: options.manifest, + featureBranch: options.feature, + mainWorktree: options.main_worktree, + expectedAcceptedTip: options.commit + }) + if (options.json) { + process.stdout.write(`${JSON.stringify(report)}\n`) + } else { + process.stdout.write(`PREFLIGHT ${report.ok ? 'PASSED' : 'BLOCKED'} phase=${report.phase}\n`) + for (const item of report.findings) process.stdout.write(`${item.severity.toUpperCase()} ${item.code}: ${item.message}\n`) + } + process.exitCode = report.ok ? 0 : 1 + } +} catch (error) { + process.stderr.write(`${error instanceof Error ? error.message : String(error)}\n`) + process.exitCode = 2 +} diff --git a/skills/efund-ppt-maker/SKILL.md b/skills/efund-ppt-maker/SKILL.md new file mode 100644 index 000000000..0c1d8af39 --- /dev/null +++ b/skills/efund-ppt-maker/SKILL.md @@ -0,0 +1,210 @@ +--- +name: efund-ppt-maker +description: 按照易方达 PPT 规范创建、续写、改版或统一 PowerPoint 演示文稿。适用于公司汇报、方案、路演、培训、架构、流程、数据图表、表格、KPI 单页、技术叙事，以及把用户确认的修改版沉淀为后续规则；封面必须按标准配置精确复用字号、位置、字体、右侧品牌图片和其他固定家具，数据与证据页优先使用左侧解释、右侧图表/视觉的双区版式，整页流程仅用于真实流程解释，表格按任务清单、重点行突出或紧凑对比选择品牌语法；文案使用直接、具体、可验证的业务表达，并强制检查单行顶栏标题、完整品牌页脚、正文左对齐、文字与图形安全距离、同级网格对齐、字号保真、对象越界和逐页渲染质量。 +--- + +# 易方达规范 PPT 制作 + +以三份经过审计的成品 PPT 为品牌证据，把模板视为完整品牌系统，把案例页视为视觉语法和质量标尺，不视为正文布局答案。选择一个最匹配的源稿作为唯一品牌来源；先根据内容关系自主设计正文几何，再决定在品牌壳内原创或受控重组。整页复用只用于固定标准页、明确续写或结构完全匹配的少数页面。用户已确认或亲自修改的页面优先于内置案例。不得只取色值后自由发挥，也不得把多个源稿的页面或图标混入同一输出文件。 + +## 开始前 + +1. 读取 [cover-contract.md](references/cover-contract.md)、[writing-style-contract.md](references/writing-style-contract.md)、[design-system.md](references/design-system.md)、[layout-catalog.md](references/layout-catalog.md)、[table-layout-contract.md](references/table-layout-contract.md)、[typography-contract.md](references/typography-contract.md)、[privacy-contract.md](references/privacy-contract.md) 和 [runtime-compatibility.md](references/runtime-compatibility.md)。 +2. 新建、续写、改已有页、总结用户改版，或需要规划叙事、图片和高密度页面时，读取 [authoring-guide.md](references/authoring-guide.md) 和 [layout-design-playbook.md](references/layout-design-playbook.md)。 +3. 运行 `python "$SKILL_DIR/scripts/check_efund_font_asset.py"`，确认 `assets/fonts/STHeiti_YFD.ttf` 存在、哈希正确，并包含 `华文黑体_易方达` / `STHeiti_YFD` 字体名。渲染器找不到该字体时，优先使用技能内字体资产完成本次进程级字体注册；不得静默回退到微软雅黑、苹方或系统黑体。 +4. 开始编辑前验证当前运行环境具备：读取与复制 PPTX、保留母版/组合/主题、对象级编辑、逐页渲染、对象几何与字体检查。缺少任一关键能力时停止并说明缺口，不得静默降级为从空白页重画。 +5. 将 `SKILL_DIR` 解析为本技能目录；所有资源路径必须相对 `SKILL_DIR`，不得写入开发机器的绝对路径。临时文件放在项目外的 scratch 目录，最终 PPTX 放在用户指定位置或项目 `outputs/`。 + +## 选择唯一品牌来源 + +- 通用公司汇报、基金业务、培训、图表、表格、声明：使用 `assets/efund-template-v6.pptx`。 +- 企业级 AI、技术平台、架构与转型叙事：使用 `assets/efund-ai-platform-v21.pptx`。 +- 一页式 KPI、价值总览、经营驾驶舱：使用 `assets/efund-ework-onepage.pptx`。 +- 需要从干净品牌壳自主设计正文页时，可使用 `assets/efund-master-skeleton.pptx`；只使用 `标题和内容`、`图形内容1`、`图形内容2`、`结尾页` 四个中文布局。骨架只提供母版家具和版心，不提供正文布局答案。 +- 用户另给模板时，用户模板优先；仍执行本技能的品牌和 QA 规则。 + +品牌证据优先级为：用户最新确认成稿 → 用户当前整份 PPT → 内置案例页 → 备用母版骨架。先按“观点、比较、顺序、因果、必要条件、层级、系统、演进、反馈、防御、证据、决策、行动”完成内容蓝图和无样式几何草图，再用 `layout-catalog.md` 与 `assets/previews/*.png` 提取一至两个局部视觉语法。案例中的列数、坐标和模块比例不是默认答案；新内容不得先选案例页再反向塞入。一个输出文件仍只允许一个品牌来源。 + +## 工作流 + +### 1. 定义沟通任务 + +先判断任务属于“从内容新建、按参考续写、优化已有页、总结用户改版”中的哪一种。用一句话写清受众、希望其做出的理解/判断/行动以及核心结论；在看页码前先排出完整故事线。每页只承担一个叙事任务，标题优先写成可直接说出口的结论。正式答谢页之前必须有一页实质性结论、行动或决策收束，不用“谢谢”替代内容结尾。若用户提供亲自修改并确认的版本，在 scratch 中建立 `style-delta.txt`，记录稳定规则而不是只记录改了哪些词。 + +按 [writing-style-contract.md](references/writing-style-contract.md) 起草和压缩文案。优先使用“具体对象 + 明确动作 + 业务结果/证据”，避免“不是……而是……”“不仅……更……”“让……真正成为……”等模板化句式，以及“新引擎、新范式、价值跃迁、开启新篇章”等无证据口号。确有对比时使用共同维度和数据；法规原文、直接引语或正式口号只能逐 Shape 说明来源后保留。 + +### 2. 建立内容和版式映射 + +在 `template-frame-map.json` 的顶层 `outputSlides` 数组中为每页记录：叙事角色、结论标题、内容关系、必要证据、`moduleCount`、相对重要性、信息密度、阅读顺序、主视觉、几何方案、案例影响、构建模式、品牌来源、字体角色、图标/图形来源、实心/浅色/无框的容器选择，以及将新增、改写、移动、替换或删除的对象。原创或受控重组页只要有两个及以上模块，就必须填写 `alignmentGroups`：为每组同级对象列出成品 ID、要检查的边缘/尺寸/中心线/间距和不超过 4px 的容差；不得用“肉眼差不多”代替网格约束。每个普通内容页还必须填写 `visualTextBinding`，记录 `visualType`、`supportsClaim`、`textAnchor`、`sourceOrGeneration`、`whyThisVisual`、`informationCarried` 和成品中的 `visualObjectIds`；必须能回答“这个视觉支撑哪一句相邻文字、替文字承载了什么证据或关系”。固定封面、目录、法务和纯结束页可写 `{"exempt": true, "pageKind": "...", "reason": "..."}`，原因必须具体。封面还必须声明 `coverProfile` 和 `sourceSlide`；内置配置及对象槽见 `cover-contract.md`。原创或受控重组页必须填写 `layoutDecision`；直接复用页必须填写 `reuseEligibility`。不得把该数组改名为 `pages`。构建模式只允许 `reuse`、`controlled-recomposition`、`original-in-brand-shell`。同一结构连续不超过两页；超过 8 页的材料至少使用三种清晰可辨的内容结构。一个输出文件只允许一个源 PPTX。 + +### 3. 按三种构建模式制作 + +使用能够保持母版、主题、组合层级和对象几何的幻灯片编辑引擎。先全量检查源稿，创建 `template-audit.txt`、`template-frame-map.json`、`deviation-log.txt` 和 `template-starter.pptx`。工具选择只看能力和导出保真度，不依赖特定厂商或产品名称。 + +- `original-in-brand-shell`：新内容和新正文页的默认模式。从所选品牌来源的干净正文页或白名单母版布局新建；保留全部品牌家具，在正文安全区内按照内容蓝图自主设计可编辑对象，不从案例页坐标开始。 +- `controlled-recomposition`：需要继承同一源稿的局部图形组、图标组或视觉装置时使用；保留页头、Logo、页脚、字体、图标家族和关键视觉语法，但正文几何仍由内容关系重新设计。 +- `reuse`：封面的唯一合法模式；也用于目录、法务、结尾等固定标准页，明确要求续写同系列版式的页面，或内容关系、模块数、密度、主焦点层级和阅读顺序全部相同的正文页。仅“能换字”不构成复用理由。 + +直接复用和从案例页受控重组时必须映射到 `sourceSlide`；品牌壳原创页映射到干净 `sourceSlide` 或白名单 `sourceLayout`。受控重组和原创模式的每个新增对象都要记录 `action: "add"`、最终 Shape ID、文本角色、允许字号、区域、理由及不得覆盖的继承对象。骨架路线在新增首张页面后立即断言输出画布尺寸与源母版一致，不接受编辑引擎默认的其他 16:9 尺寸。 + +封面必须按 [cover-contract.md](references/cover-contract.md) 选择标准配置并整页保真复制。标题、主副标题、部门/姓名、日期只能写入指定 Shape ID；布局层右侧山水品牌图片及其媒体、裁切、坐标、尺寸、层级，连同页脚图、Logo、免责声明和保密提示全部锁定。标题过长时精简文案或改选允许该题名结构的配置，禁止移动/缩放文本框、缩小字号、改字体、增减段落、删除右侧品牌图、用色块替代品牌图或新增封面视觉。 + +必须保持源页的字号、字体、字重、行距、段距、内边距、对齐、页眉、Logo、页脚和页码。所有普通正文页顶栏题名对象命名为 `page-title`，设置 `textRole: "page-title"`，固定单行、左对齐，不得包含人工换行，也不得进入 Logo 前 16px 保护带；题名放不下时依次精简文案、换页型或拆分叙事，禁止扩大标题框、缩小字号或做成两行。新增中文逐个文本 run 显式设为 `华文黑体_易方达`，并在 DrawingML run properties 中显式写入东亚字体 `a:ea typeface="华文黑体_易方达"`；英文和数字设为 Arial。不得只依赖主题默认字体或只设置拉丁字体。新文案放不下时依次执行：精简文案 → 换源页 → 拆页。禁止缩小字号或换窄字体硬塞内容。 + +源页或母版已经提供标题条、Logo 或页脚时，不得在页面上再叠一套同类家具。普通内容页必须在最终对象清单与渲染结果中同时保留源模板的完整页脚：分隔线、左侧公司名、中部保密提示、右侧页码，缺一即失败；若编辑引擎未展开母版对象，布局导出仍须把这些继承家具列入 `scope: "slide"` 的最终可见对象清单。只删除映射中明确标记为未使用的内容占位符；不得批量删除母版、布局或品牌对象。 + +页脚分隔线以下是品牌专属区域，不承载来源、脚注、免责声明之外的新增说明，也不得把来源文字压在线上。先从继承布局读取实际页脚线；归一化 960×540 画布通常约为 `y=496`。所有正文、图表、表格、来源和注释的底边必须停在页脚线至少 8px 以上；底部来源带建议置于 `y=466–484`，保持单行 7–8pt。来源较长时移到图表上方/旁侧或拆成两页，禁止向下侵入页脚区。 + +比较、指标、阶段结论、决策和转折页优先使用品牌深蓝实心重点块配白字大数字或结论；辅助信息使用浅蓝/浅灰填充分区或无边框对齐。可以采用“一个实心主焦点 + 若干浅色/无框支撑”，也可采用同语义的一组实心流程节点；不得让多个等权深色块互相争抢。谨慎黄描边只用于一个关键焦点或风险信号。默认禁止用三个及以上大面积空心灰框组织正文。 + +任何情况下都不得使用图形阴影，包括外阴影、内阴影、预设阴影、发光模拟阴影或半透明复制层制造的伪阴影。层级只通过实心/浅色填充、字号、留白、对齐和必要线条建立。 + +数据、证据、调研结论和方案论证页优先使用“左侧解释 + 右侧图表/主视觉”的标准证据双区页，并把它作为长材料的基础版式。普通内容页达到 6 页时，至少三分之一使用该轮廓；通常可占三分之一到二分之一，但不得为了配额虚构图表或数据。左侧约 35%–42%，负责结论、口径和 2–3 条解释；右侧约 58%–65%，放一个主图表、表格、关系图或证据视觉及近邻来源。对象命名为 `standard-narrative-title`、`standard-narrative-body`、`standard-visual-title`：解释标题 15pt 加粗，解释正文 12pt 常规、150% 行距，图表/视觉标题固定 10pt、常规、不加粗，并显式设置 `华文黑体_易方达`。 + +标准证据双区页必须按“真实排版后的文字高度”分配空间，不得只比较文本框坐标。`standard-narrative-body` 的行数 × 实际字号 × 150% 行距，加上文本内边距，必须完整落在文本框内；其实际文字底边与下方结论、提示或浅色总结块至少保留 16px。右侧图表须为类别标签预留独立标签槽或标签沟槽；负值柱、正值柱、数据标记和数值标签均不得进入类别标签槽。若标签或正文放不下，依次缩短文案、扩大区域或拆页，禁止用覆盖、负边距或减小字号处理。 + +浅蓝建议、结论或行动提示框使用左对齐文本，保留 10–14px 左右内边距；不得为了“居中好看”把两行建议排成居中标语。此类对象统一在名称中包含 `takeaway`、`recommendation`、`suggestion` 或 `advice`，便于自动检查。 + +每个新增可见文本对象都要声明 `textRole`。解释、段落、模块说明、表格正文、来源、注释、建议和结论一律左对齐；数字列右对齐。只有短节点标签、表头、页码、指标数字和源模板明确居中的短标签可以居中。含两行及以上正文的图形必须导出 `textInsets`，左右上下内边距均不少于 10px；不能靠把文字居中来掩盖列宽或内边距不足。 + +整页流程只用于真实顺序、因果链、阶段演进或反馈回路的解释页；并列条件、角色分工、控制层和证据集合改用矩阵、层级、左文右图、支撑结构、纵深防御或汇聚关系。不得把整份材料的大部分页面都做成全宽流程。 + +表格必须按 [table-layout-contract.md](references/table-layout-contract.md) 选择“任务清单、重点行突出、紧凑对比”之一。默认使用青色表头、无外框、浅灰分组/斑马底和唯一重点行；模式 A 编号任务清单可使用细水平分隔线，模式 B 分组表格和模式 C 紧凑对比表不得绘制正文行分隔线，改用底色、留白和对齐建立层级。禁止全格重边框、平均高饱和填色或将表格做成 UI 卡片墙。 + +### 4. 处理图片与图标 + +- 普通内容页视觉覆盖率必须为 100%：每页至少有一个承载信息的相关视觉，可为真实图片、官方截图、图表、流程、架构、关系图、信息图形、对照矩阵、实心数据结构或成组语义图标。 +- 视觉必须与本页主张和相邻文字建立一一对应：`supportsClaim` 写被支撑的具体结论，`textAnchor` 写相邻标题/段落或对象 ID，`informationCarried` 写视觉自身承载的证据、数量、顺序、因果、层级或比较关系。只写“与主题相关”“丰富页面”“图文并茂”不合格。 +- 纯装饰图库、抽象背景、Logo、标题条、分隔线、无语义色块和零散小图标不计入视觉覆盖率；不得用与文字无关的机器人、握手、城市、科技光效等通用图片占位。 +- 视觉与文字分工而不重复：视觉负责呈现对象、证据或关系，文字负责给出结论和解释；不得把整段文字原样再做成图片。 +- 按内容选择视觉：趋势/数量用图表或大数字，比较用对照图或矩阵，顺序/因果用流程，层级/系统用架构图，产品行为用官方截图，人物/场景/实物用真实照片，抽象观点用可验证的关系图或信息图形。 +- 按严格顺序选视觉：同一源稿中的现成图标/图形组合 → 易方达或产品官方资产 → 单一专业 SVG 图标家族。前一层可用时不得跳到后一层。 +- 优先复制源页中的完整图标组、底板、线条和间距，不要只抠出单个图标后重新拼装。不得从另外两份案例稿借用图标。 +- 外部图标必须来自同一图标家族，线性/面性、描边粗细、圆角、视角和留白一致；只使用品牌蓝、青、灰、白及谨慎黄。 +- 优先真实图片、官方截图、数据图表和源稿中的品牌资产；不得伪造 UI、Logo、数据或案例。 +- 用户提供的截图、照片和图表先检查姓名、账号、联系方式、业务数据、日期水印和本机路径。存在敏感信息时，替换底层图片部件或制作明确标注为匿名样例的同尺寸示意图；禁止仅用可移除形状遮挡。 +- 新图片先按目标框比例裁切，主体朝向正文；同一张图片除背景外不重复使用。 +- “清理大号图片”仅针对正文装饰图、无关情绪图和敏感截图；标准封面右侧山水图属于固定品牌家具，必须从源封面继承，不得按正文图片规则删除。 +- 架构/流程优先复用源页图形；连接线先于节点创建并置于节点后方。每条关系连接线在布局 JSON 中导出 `lineStart` / `lineEnd` 或 `points`，并可选用 `fromId` / `toId` 标记其合法端点；除连接对象本身外，线段不得进入任何文字框外扩 8px 的安全区。 +- 禁止用 emoji、Unicode 符号、Wingdings/图标字体、随手画的几何符号或 AI 生成的小图标代替专业图标。 + +### 5. 导出并执行六道 QA 门禁 + +不得在任一硬错误未解决时交付。 + +第一道，检查封面硬合同。内置封面配置： + +```bash +python "$SKILL_DIR/scripts/check_efund_cover.py" "$FINAL_PPTX" \ + --final-slide 1 --profile "$COVER_PROFILE" \ + --json-output "$QA_DIR/efund-cover.json" +``` + +用户模板封面改用 `--reference-pptx "$SOURCE_PPTX" --reference-slide "$SOURCE_COVER_SLIDE"`。画布、布局、可见对象 ID/类型/坐标/尺寸、段落数、有效字号、字体、字重、文本框设置和品牌家具必须与参考封面完全一致；内置配置还必须验证右侧品牌图是图片对象且媒体、裁切、坐标、尺寸完全一致。 + +第二道，检查 PPTX 结构： + +```bash +python "$SKILL_DIR/scripts/qa_efund_pptx.py" "$FINAL_PPTX" \ + --json-output "$QA_DIR/efund-structure.json" +``` + +`shape-shadow-forbidden` 是硬错误；任何可见幻灯片对象不得含外阴影、内阴影或预设阴影效果。 + +第三道，检查文案自然度和业务具体性： + +```bash +python "$SKILL_DIR/scripts/check_efund_writing_style.py" "$FINAL_PPTX" \ + --map "$QA_DIR/template-frame-map.json" \ + --json-output "$QA_DIR/efund-writing-style.json" \ + --warnings-as-errors +``` + +任何模板化反差句、无证据排比、宏大背景开场和口号化表达必须改写。法务原文、直接引语或正式口号仅可通过映射中的 `writingStyleExemptions` 逐 Shape 放行，必须填写具体来源和原因。 + +第四道，检查继承与原创文本的字号保真： + +```bash +python "$SKILL_DIR/scripts/check_efund_typography.py" \ + --source-pptx "$SOURCE_PPTX" \ + --final-pptx "$FINAL_PPTX" \ + --map "$QA_DIR/template-frame-map.json" \ + --json-output "$QA_DIR/efund-typography.json" \ + --strict --warnings-as-errors +``` + +纯母版原创文件没有 `sourceSlide` 时省略 `--source-pptx`。任何字号差异必须逐 Shape 说明，禁止全局放行。 + +第五道，使用当前环境的对象检查能力导出符合 [runtime-compatibility.md](references/runtime-compatibility.md) 约定的逐页 `*.layout.json`，再检查布局： + +```bash +python "$SKILL_DIR/scripts/lint_efund_layouts.py" "$LAYOUT_DIR/final" \ + --map "$QA_DIR/template-frame-map.json" \ + --json-output "$QA_DIR/efund-layout.json" +``` + +所有 `error` 必须清零。缺少 `layoutDecision`、原创几何理由、直接复用资格证明或 `visualTextBinding` 均为硬错误；声明的 `visualObjectIds` 必须在对应布局 JSON 中存在，纯装饰或空泛相关性理由不得通过。每个字体 warning 必须映射到继承对象；新增可见中文若缺少显式东亚字体或使用非首选字体即判失败。`wireframe-heavy` 必须改成实心、浅色填充或无框结构；只有表格、矩阵、泳道和确需表达边界的流程分区可在 `qa-review.txt` 逐对象说明后保留。每个其他 warning 必须逐页观察后修复，或在 `qa-review.txt` 记录对象、原因和为何属于源稿的有意重叠；不得静默忽略。 + +`wrapped-title`、`title-logo-clearance-violation`、`missing-brand-footer-furniture` 和 `footer-clearance-violation` 是硬错误：顶栏标题必须单行且避开 Logo 保护带；普通内容页必须具有完整品牌页脚；任何正文、图表、表格、来源或注释进入页脚分隔线前 8px 的保护带都必须重新排版，不得登记为“有意重叠”放行。 + +`body-text-not-left-aligned`、`text-inset-clearance`、`missing-text-insets`、`connector-text-clearance`、`connector-endpoints-missing`、`missing-alignment-groups` 和 `alignment-group-violation` 也是硬错误：正文角色必须左对齐，正文图形内边距不得小于 10px，连接线必须提供端点且避开文字外扩 8px 安全区，同级模块必须按声明的边缘、尺寸、中心线和间距网格对齐。 + +`standard-narrative-text-overflow`、`narrative-callout-clearance`、`chart-label-mark-overlap`、`advisory-callout-not-left-aligned` 和 `insufficient-standard-evidence-layouts` 同样是硬错误：标准解释正文的真实排版高度必须装入文本框，下方总结块须留足 16px，图表类别标签不得与柱、点、面积或数值标记相交，建议/结论浅色框必须左对齐；普通内容页达到 6 页时，标准证据双区页不得少于三分之一。模式 B/C 表格若使用 `grouped-table-*` 命名，`grouped-table-separator-line` 必须为零；不得用“模板有意重叠”或“线条较细”放行。 + +第六道，使用当前环境可用的演示文稿渲染接口检测画布溢出，并把每页渲染为 PNG。逐页按 100% 尺寸检查标题换行、字体家族/字重、文本裁切、多行正文孤行、图标清晰度与风格一致性、图片裁切、对齐、图表标签、页脚、Logo、内容密度、实心结构的主次和全篇视觉节奏；朗读标题与结论，确认语气像业务负责人直接陈述事实，不像宣传口号或模板化演讲金句；逐条核对 `visualTextBinding`。封面另须与对应标准页并排检查题名位置、字号、留白和品牌家具。总览图不能代替逐页检查。 + +最后将 `template-frame-map.json` 与成品对象清单逐项比对，确认所有品牌家具和未授权修改对象保持不变。只有封面、结构、文案自然度、字号保真、布局、溢出、模板忠实度和逐页视觉检查全部通过后才可交付。 + +正式外发前按 [privacy-contract.md](references/privacy-contract.md) 清理文档属性、自定义属性、备注正文、批注、旧缩略图、外部关系和嵌入 Office 对象，避免保留编辑者、运行环境、工具链或业务敏感信息： + +```bash +python "$SKILL_DIR/scripts/sanitize_pptx_metadata.py" \ + "$FINAL_PPTX" "$OUTPUT_DIR/final-clean.pptx" \ + --clear-notes --remove-comments --remove-thumbnails \ + --neutralize-external-links + +python "$SKILL_DIR/scripts/audit_pptx_privacy.py" \ + "$OUTPUT_DIR/final-clean.pptx" \ + --require-redacted-notes --require-no-comments \ + --require-no-thumbnails --require-no-external-links \ + --warnings-as-errors +``` + +把项目已识别的姓名、联系方式、精确内部指标和项目代号逐项追加为 `--deny-text`。图片内信息不受 XML 审计覆盖，必须逐页渲染复核；含敏感内容的底层媒体应通过 `--replace-part` 永久替换。对清理后的文件重新运行封面、结构和文案检查，并确认文件可打开、页数一致、逐页渲染无意外变化。最终交付文件不得含临时路径、运行日志或平台集成配置。 + +## 禁止项 + +- 禁止使用不能保留母版、主题、组合层级或对象几何的工具从空白页重建。低层级 OOXML 修改只能用于边界明确、可回滚且经过前后渲染验证的修复。 +- 禁止从空白页模仿“感觉相近”的易方达风格。 +- 禁止原创、受控重组或重新绘制封面；禁止移动、缩放、改色或增删封面标准对象，禁止缩小封面字号、改变段落数、删除右侧品牌图、把右侧品牌图改为实心色块，或在封面新增图片/图标。联名 Logo 只能替换既有图片槽底层媒体。 +- 禁止先选案例页再反向塞入内容；禁止复制完整正文几何后只替换文案。 +- 禁止把案例页的列数、坐标、模块比例或阅读顺序当成默认模板。不能从信息结构解释的几何必须重新设计。 +- 禁止改变品牌色角色、中文/英文字体体系、标题条、Logo 区或页脚结构。 +- 禁止在已有母版页头、Logo 或页脚之上覆盖另一套标题背景、Logo、页脚线或页码。 +- 禁止在新增可见文本中混用微软雅黑、苹方、黑体、宋体、Calibri 等非指定字体；继承对象中的历史字体必须逐对象登记。 +- 禁止让顶栏标题换成两行、使用人工换行或进入 Logo 前 16px 保护带；新增普通正文不得小于 10pt。仅源页继承的紧凑 KPI 标签、来源、脚注和法务文本可保留 6–9pt，且必须逐对象确认清晰、单行、无裁切并写入 `qa-review.txt`。 +- 禁止删除普通内容页的页脚分隔线、公司名、保密提示或页码；禁止把来源、脚注、灰色说明或任何正文放在页脚分隔线以下，或让文本框/表格/图表侵入分隔线前 8px 的保护带。 +- 禁止把解释、正文段落、模块说明、表格正文、来源、注释、建议或结论居中；禁止让文字与容器边缘小于 10px、让连接线进入文字外扩 8px 安全区，或让同级模块在边缘、尺寸、基线和间距上无故错位。 +- 禁止用密集卡片墙、胶囊、按钮和阴影把页面做成 UI 仪表盘。 +- 禁止在任何图形、文本框、图片框、图表底板或流程节点上使用阴影、发光伪阴影或复制层伪阴影；该规则无例外。 +- 禁止用三个及以上大面积空心灰框、细线框卡片或“只有边框没有视觉层级”的容器组织普通正文；只有表格、矩阵、泳道和确需表达边界的流程分区可例外。 +- 禁止把并列条件、角色、控制层或证据集合伪装成全页流程；禁止用人工硬回车留下 1–4 个汉字的正文孤行。 +- 禁止让标准解释正文按文本框高度“勉强放入”却在实际行距下溢出，禁止把结论块压在正文实际文字底边上；禁止图表类别标签与柱、点、面积或数值标签发生遮挡。 +- 禁止把标准证据页的图表/视觉标题做成 15pt 粗体大标题；它固定为 10pt 常规 `华文黑体_易方达`。禁止把浅蓝建议、结论或行动提示框设为居中对齐。 +- 禁止在分组重点表和紧凑对比表的正文区绘制横向分割线；这两类表格只依靠表头、行底色、分组底色、重点行和留白分层。 +- 禁止在并非流程解释的页面使用全宽流程图；数据与证据明确时优先左文右图/图表，不用箭头替代图表、表格或比较维度。 +- 禁止使用 emoji、字符图标、图标字体、多个图标库混搭或低清晰度小图；禁止为了“图文并茂”堆无意义图标。 +- 禁止普通内容页只有文字；禁止把装饰背景、Logo、标题条、分隔线或无语义小图标登记为相关视觉；禁止用与主张无关的通用图库图片充数。 +- 禁止使用“不是……而是……”“不仅……更……”“更……更……更……”等模板化修辞代替证据；禁止使用“开启新篇章、打造新引擎、构建新范式、实现价值跃迁”等空泛口号。法规原文、直接引语和正式口号只能逐 Shape 说明来源后保留。 +- 禁止交付含空占位符、模板提示语、越界对象、非预期重叠或缺失品牌资产的 PPTX。 +- 禁止在外发文件或技能包中保留开发机器路径、编辑者信息、模型/平台名称、缓存、日志、临时文件或厂商专属集成配置。 + +## 资产 + +- `assets/efund-template-v6.pptx`：46 页脱敏后的通用规范与版式库；第 2–6 页标准封面完整保留原始右侧山水品牌图、裁切与底部 Logo 分区，带姓名水印的纵向大截图已永久删除。 +- `assets/efund-ai-platform-v21.pptx`：33 页脱敏后的企业 AI 成品叙事库；第 1 页标准封面完整保留原始右侧山水品牌图，人物、备注、截图账号和内部精确指标已泛化，正文大号装饰/情绪照片已移除，架构、图表、产品截图和语义图形保留。 +- `assets/efund-ework-onepage.pptx`：脱敏后的一页式高密度 KPI 范例；经营数值均为泛化量级，未使用布局中的大号装饰照片已清除。 +- `assets/efund-master-skeleton.pptx`：脱敏后的易方达母版骨架；用于按信息结构自主设计正文页，只提供品牌家具和版心，未使用布局中的大号装饰照片也已清除。 +- `assets/brand/`：从源稿提取的真实标题条、Logo、页脚线和标准封面右侧山水图，仅用于修复导入/导出造成的品牌元素缺失；封面图只能按 `cover-contract.md` 的既有图片槽、裁切和层级恢复，禁止用于正文铺版。 +- `assets/fonts/STHeiti_YFD.ttf`：PPT 使用的 `华文黑体_易方达` 字体文件；内部字体名同时包含 `STHeiti_YFD`，SHA-256 为 `c371bf3656aefdec1a056b461c8c9ef6d1b367105eb6cedcb23ade7687de5e92`。只用于本技能生成、渲染和编辑易方达演示文稿。 +- `assets/previews/`：三份案例源稿的页码总览及备用母版预览；只用于提取视觉语法和确认母版家具，不替代打开单页查看。 diff --git a/skills/efund-ppt-maker/_meta.json b/skills/efund-ppt-maker/_meta.json new file mode 100644 index 000000000..2ea9b298a --- /dev/null +++ b/skills/efund-ppt-maker/_meta.json @@ -0,0 +1 @@ +{"slug":"efund-ppt-maker","cnName":"PPT制作助手","version":"v1.0.6","source":"eSkill"} diff --git a/skills/efund-ppt-maker/assets/brand/efund-cover-water.jpeg b/skills/efund-ppt-maker/assets/brand/efund-cover-water.jpeg new file mode 100644 index 000000000..4f2487604 Binary files /dev/null and b/skills/efund-ppt-maker/assets/brand/efund-cover-water.jpeg differ diff --git a/skills/efund-ppt-maker/assets/brand/efund-footer-line.png b/skills/efund-ppt-maker/assets/brand/efund-footer-line.png new file mode 100644 index 000000000..1e2912606 Binary files /dev/null and b/skills/efund-ppt-maker/assets/brand/efund-footer-line.png differ diff --git a/skills/efund-ppt-maker/assets/brand/efund-header-strip.png b/skills/efund-ppt-maker/assets/brand/efund-header-strip.png new file mode 100644 index 000000000..b0ec4c3bb Binary files /dev/null and b/skills/efund-ppt-maker/assets/brand/efund-header-strip.png differ diff --git a/skills/efund-ppt-maker/assets/brand/efund-logo.png b/skills/efund-ppt-maker/assets/brand/efund-logo.png new file mode 100644 index 000000000..726723e34 Binary files /dev/null and b/skills/efund-ppt-maker/assets/brand/efund-logo.png differ diff --git a/skills/efund-ppt-maker/assets/efund-ai-platform-v21.pptx b/skills/efund-ppt-maker/assets/efund-ai-platform-v21.pptx new file mode 100644 index 000000000..dea88adca Binary files /dev/null and b/skills/efund-ppt-maker/assets/efund-ai-platform-v21.pptx differ diff --git a/skills/efund-ppt-maker/assets/efund-ework-onepage.pptx b/skills/efund-ppt-maker/assets/efund-ework-onepage.pptx new file mode 100644 index 000000000..dfc3d6e17 Binary files /dev/null and b/skills/efund-ppt-maker/assets/efund-ework-onepage.pptx differ diff --git a/skills/efund-ppt-maker/assets/efund-master-skeleton.pptx b/skills/efund-ppt-maker/assets/efund-master-skeleton.pptx new file mode 100644 index 000000000..347beb42f Binary files /dev/null and b/skills/efund-ppt-maker/assets/efund-master-skeleton.pptx differ diff --git a/skills/efund-ppt-maker/assets/efund-template-v6.pptx b/skills/efund-ppt-maker/assets/efund-template-v6.pptx new file mode 100644 index 000000000..1aa571288 Binary files /dev/null and b/skills/efund-ppt-maker/assets/efund-template-v6.pptx differ diff --git a/skills/efund-ppt-maker/assets/fonts/STHeiti_YFD.ttf b/skills/efund-ppt-maker/assets/fonts/STHeiti_YFD.ttf new file mode 100644 index 000000000..5a0f0c7ed Binary files /dev/null and b/skills/efund-ppt-maker/assets/fonts/STHeiti_YFD.ttf differ diff --git a/skills/efund-ppt-maker/assets/previews/efund-ai-platform-v21.png b/skills/efund-ppt-maker/assets/previews/efund-ai-platform-v21.png new file mode 100644 index 000000000..c90954edb Binary files /dev/null and b/skills/efund-ppt-maker/assets/previews/efund-ai-platform-v21.png differ diff --git a/skills/efund-ppt-maker/assets/previews/efund-ework-onepage.png b/skills/efund-ppt-maker/assets/previews/efund-ework-onepage.png new file mode 100644 index 000000000..3aeda116e Binary files /dev/null and b/skills/efund-ppt-maker/assets/previews/efund-ework-onepage.png differ diff --git a/skills/efund-ppt-maker/assets/previews/efund-master-skeleton.png b/skills/efund-ppt-maker/assets/previews/efund-master-skeleton.png new file mode 100644 index 000000000..f5521c505 Binary files /dev/null and b/skills/efund-ppt-maker/assets/previews/efund-master-skeleton.png differ diff --git a/skills/efund-ppt-maker/assets/previews/efund-template-v6.png b/skills/efund-ppt-maker/assets/previews/efund-template-v6.png new file mode 100644 index 000000000..3167990d0 Binary files /dev/null and b/skills/efund-ppt-maker/assets/previews/efund-template-v6.png differ diff --git a/skills/efund-ppt-maker/references/authoring-guide.md b/skills/efund-ppt-maker/references/authoring-guide.md new file mode 100644 index 000000000..f3c67b3e0 --- /dev/null +++ b/skills/efund-ppt-maker/references/authoring-guide.md @@ -0,0 +1,150 @@ +# 内容、图像与 QA 指南 + +## 目录 + +1. 风格继承与任务类型 +2. 叙事规划 +3. 文案压缩与自然表达 +4. 自适应版式 +5. 图像与数据 +6. 字体与图标落地 +7. 品牌壳内构建 +8. QA 判定 + +## 1. 风格继承与任务类型 + +先判断任务属于新建、基于案例扩展、修改现有稿件，还是学习用户已经确认的改法。视觉与表达优先级固定为：用户本轮确认的修改 → 用户此前确认的修改 → 当前稿件自身规律 → 本次选定的唯一案例或母版 → 通用规范。 + +当用户提供修改前后版本时，先做反向归纳，并在临时目录写 `style-delta.txt`：逐项记录标题、信息密度、列宽、留白、图标、颜色、段距、数字强调和品牌构件的变化。它只用于当前任务；只有用户明确要求沉淀长期规则时，才写回技能文件。 + +用户局部修改覆盖被修改对象及其同级对象的一致性规则，不自动推翻整套品牌系统。若修改与画布安全、品牌色、Logo 或字体硬规则冲突，保留用户意图并在 `deviation-log.txt` 说明处理。 + +## 2. 叙事规划 + +先写一句沟通任务：到结束时，受众应当做出什么理解、判断或行动，因为哪一个核心结论成立。 + +选择与任务相符的叙事弧：背景→问题→证据→方案→行动；现状→变化→目标态；问题→分析→答案；或技术原理→实现→效果→边界。目录不是叙事。 + +每页只保留一个主张。标题写成结论句，例如“统一的数据语义层让 Agent 可以稳定调用全量数据”，不要只写“数据层”。标题较长时压缩修饰语，不得缩字或换成两行。 + +先判断每页的内容关系：观点、比较、顺序、因果、必要条件、层级、系统、演进、反馈、防御、证据、决策或行动。再为整份材料安排密度节奏：低密度页面负责建立判断，中密度页面负责解释，高密度页面负责证据，最后用实质性结论或行动页收束。相同轮廓连续不超过两页；超过 8 页的材料至少使用三种清晰可辨的结构。正式答谢页不承担内容收束职责。 + +查看案例页前先完成无样式内容蓝图：主张、证据、模块数、相对重要性、阅读顺序、主视觉、视觉与文字锚点的对应关系和预期行动。再按 [layout-design-playbook.md](layout-design-playbook.md) 画出正文几何草图。案例只能校准品牌壳和局部视觉装置，不能反向决定内容要分成几栏。封面例外：不做原创草图，直接按 [cover-contract.md](cover-contract.md) 选择与题名结构匹配的固定配置。 + +## 3. 文案压缩与自然表达 + +按顺序压缩：删除重复背景 → 把过程改成结论 → 将并列短语合并 → 只保留能改变判断的数字 → 把细节移到下一页或附录。 + +每个段落优先采用“结论 + 一句证据/解释”。三栏、四栏和节点内不要放完整长段。若一页需要超过 6 个相互独立的观点，拆页。 + +分析、策略和方案页优先按“判断 → 关键数字 → 不超过 3 条支撑 → 可选行动结论”组织；其中 2–4 个并列模块各自只保留一个模块结论。技术参数、法务条款、引用原文和标准表格按其专用版式处理，不强套该结构。 + +执行 [writing-style-contract.md](writing-style-contract.md)：用具体对象、动作、结果和证据构成句子，不用“不是……而是……”“不仅……更……”制造虚假反差，不用“让数据真正成为、开启新篇章、打造新引擎、实现跃迁”等口号填补证据。把“赋能、重塑、闭环”拆成可观察动作，例如“统一口径、自动生成任务、责任人回填结果”。正常事实否定可保留，例如“模型未通过回归测试，暂不发布”。 + +## 4. 自适应版式 + +- 先从内容关系生成行列、块宽、焦点面积和连接方向，再叠加品牌视觉语法。除直接复用资格全部满足外，不从案例页的坐标和比例起稿。 +- 同级模块内容量接近时，默认等宽、等高、等间距；只有信息量或重要性确实不同，且视觉层级需要表达该差异时，才使用非对称列宽。 +- 版式不仅检查左右对齐，还要检查垂直重心。上半页过密、下半页空洞时，优先调整图片、关键数字、行距和模块高度，不用无意义装饰填空。 +- 同一层级的标题、图标、数字、底板和说明必须采用同一套样式。某一列内容较少时通过留白保持节奏，不为“填满”单独放大字体或图标。 +- 不用人工硬换行制造视觉整齐。先压缩文案、调整列宽或拆页；标题、短标签和关键数字尤其不得用强制换行掩盖溢出。 +- 顶栏标题使用 `page-title` / `textRole: page-title`，保持单行、左对齐并与 Logo 区相隔至少 16px。先把标题压缩为一个直接结论；仍放不下时拆分叙事，不把标题框增高为两行。 +- 多行正文最后一行只剩 1–4 个汉字，或明显短于上一行且页面仍有横向空间时，优先改写、扩宽文本框或调整构图；不得用硬回车制造或掩盖孤行。 +- 只有所选源页本身使用卡片时才继续使用卡片。文本型页面、架构页和流程页不得被统一改造成卡片墙。 +- 比较、指标、决策与转折页优先采用品牌深蓝实心重点块配白字大数字或短结论。辅助内容使用浅蓝/浅灰填充或无框对齐；不得默认给每个段落套灰色空心框。 +- 任何对象都不使用阴影；禁止外阴影、内阴影、预设阴影、发光伪阴影和半透明复制层伪阴影。 +- 可以使用一个深蓝主焦点配若干浅色支撑，也可以使用一组同语义实心流程节点；避免多个等权深色块互相争抢。谨慎黄描边一页只强调一个焦点。 +- 线框只在边界本身有语义时使用，例如表格、矩阵、泳道或责任区；三个及以上大面积空心框属于需整改的默认负面结构。 +- 整页流程只用于真实顺序、因果链、阶段演进或反馈回路。并列条件、角色分工、控制层和证据集合使用矩阵、层级、支撑结构、纵深防御或汇聚关系，不用箭头伪造先后。 +- 有可信数据、关系机制或可比较证据时，优先采用左侧 35%–42% 结论解释、右侧 58%–65% 图表或主视觉的基础证据双区页。普通内容页达到 6 页时，此类页面至少占三分之一，通常可占三分之一至二分之一。 +- 需要展示任务、分组、方案或指标比较时，按 [table-layout-contract.md](table-layout-contract.md) 选择编号任务清单、分组重点表或紧凑对比表。 +- 当页面需要“一段解释 + 一个主视觉/证据”时，使用标准证据双区页。三个具名文本对象固定为 `standard-narrative-title`、`standard-narrative-body`、`standard-visual-title`：解释标题 15pt 加粗，解释正文 12pt 常规、150% 行距，图表/视觉标题 10pt 常规、不加粗；中文/英文数字仍分别显式使用 `华文黑体_易方达` / Arial。 +- 标准证据双区页先按真实行数、实际字号、150% 行距和文本内边距计算解释正文所需高度，再放置下方结论块；两者实际边界至少相隔 16px。图表先划出类别标签槽和数据绘图区，数据标记不得倒侵标签槽。 +- 浅蓝建议、结论或行动提示框统一左对齐，保留 10–14px 左右内边距；对象名包含 `takeaway`、`recommendation`、`suggestion` 或 `advice`，不得居中排成口号。 +- 解释、正文、模块说明、表格正文、来源、注释、建议和结论统一声明正文类 `textRole` 并左对齐；数字列右对齐。只有短节点标签、表头、指标数字和页码允许居中。含正文图形的 `textInsets` 四侧至少 10px。 +- 两个及以上模块先按语义划分同级组，再在 `alignmentGroups` 中声明边缘、尺寸、中心线或间距检查。非对称布局不要求主焦点与辅助区等宽，但同级辅助区仍须共用可解释的网格。 +- 关系图先布置文字与节点，再布置位于节点后方的连接线；导出实际端点，保证线段与非端点文字外扩 8px 的安全区不相交。 +- 模式 B 分组重点表和模式 C 紧凑对比表的正文不画分隔线；使用行底色、分组底色、重点行与留白分层。只有模式 A 编号任务清单保留细水平分隔线。 + +## 5. 图像与数据 + +- 普通内容页不得只有文字。每页至少安排一个与主张直接相关、能够独立承载证据或关系的视觉；装饰背景、品牌家具、分隔线和无语义小图标不计数。 +- 先为视觉写 `supportsClaim`、`textAnchor` 和 `informationCarried`，再选素材或构图。三者必须具体到本页；“丰富页面”“与主题相关”“图文并茂”不算设计理由。 +- 观点/判断使用结论块加证据图形；趋势/数量使用图表或实心大数字；比较使用对照图或矩阵；顺序/因果使用流程；层级/系统使用架构图；产品行为使用官方截图；人物、场景和真实物体使用高清横图；抽象概念使用关系图或信息图形。 +- 图片、图表或图解紧邻其对应标题、短注或结论；不让视觉漂在页面另一侧，也不把与文字无关的机器人、握手、城市、科技光效当作行业通用配图。 +- 先确定图片框比例和主体方向，再搜索或生成。不要生成官方产品截图、公司 Logo、数据证据或真实人物替代图。 +- 图表先计算后设计。标题给结论，图中只保留必要标签；主系列用深蓝/青，其他系列灰化。 +- 引用外部数据时，在图表标题附近或正文底部以 7–8pt 标注来源和日期。来源、口径和脚注属于正文，其底边必须至少高于页脚分割线 8px；推荐底部来源带位于 y=466–484。来源过长时上移到图表附近或拆页，禁止越过分割线。 + +## 6. 字体与图标落地 + +在 `source-notes.txt` 中记录每页的字体角色和图标来源。新增中文、英文、数字分别显式设为 `华文黑体_易方达`、Arial、Arial；继承对象中的其他字体必须写明源页和对象 ID。新增中文的每个 DrawingML 文本 run 都要写入 ``，只设置 Latin 字体或主题字体不算合格。 + +图标按“同一源稿继承组 → 官方资产 → 单一专业 SVG 家族”选择。外部图标需记录来源、许可、家族名和使用页；不得使用 emoji、Unicode、图标字体或多个图标库混搭。 + +复制图标时连同底板、标签、间距和颜色一起复制。缩放同级图标时保持等尺寸与等视觉重量，不拉伸、不低清截图、不用阴影或渐变补救。 + +## 7. 品牌壳内构建 + +先完成内容蓝图和几何草图，再完整检查唯一品牌来源 PPTX，建立 `template-frame-map.json`。每页只能采用以下三种模式： + +- `original-in-brand-shell`：新内容和新正文页默认使用；从干净正文壳或白名单母版布局开始，按当前信息结构原创可编辑正文对象。 +- `controlled-recomposition`：需要继承同一源稿的局部图形组、图标组或视觉装置时使用；正文几何仍按内容蓝图重建。 +- `reuse`：封面的唯一合法模式；也用于其他固定标准页、明确同系列续写，或关系、模块数、密度、焦点层级和阅读顺序全部相同的正文页。 + +原创或受控重组页必须记录 `layoutDecision`：`contentStructure`、`readingOrder`、`primaryVisual`、`geometryPlan`、`caseInfluence`、`whyNotDirectReuse` 和 `originalityEvidence`。每个普通内容页必须记录 `visualTextBinding`：视觉类型、支撑主张、相邻文字锚点、来源或生成方式、选择理由、视觉承载的信息和成品对象 ID。直接复用页必须记录 `reuseEligibility`，逐项证明 `sameRelationship`、`sameModuleCount`、`sameDensity`、`sameFocalHierarchy`、`sameReadingOrder` 为真并填写 `reason`。 + +案例直接复用与受控重组页必须有 `sourceSlide` 和对象级 `editTargets`；品牌壳原创页记录干净 `sourceSlide` 或白名单 `sourceLayout`，备用母版页再记录 `reuseMode: "master-layout"`。新增对象记录 `action: "add"`、`finalShapeIds`、`textRole`、`allowedFontSizesPt`、作用区域、理由以及不得覆盖的继承对象。 + +直接复用路线只编辑继承对象。任一资格不满足就改为受控重组或原创，不得因为“占位框刚好够用”而复用。受控重组可以在正文安全区内新增底板、图形、文本和连接关系，但不得覆盖新的标题条、Logo 或页脚，不得改变品牌字体和色彩角色。删除源内容时必须按对象 ID 明确记录，避免误删品牌文字、页码和母版家具。 + +封面不得套用上一段的“资格不满足就重组或原创”处理：只能换用另一种标准封面配置或精简题名。封面文本只进入配置指定的既有 Shape ID；坐标、尺寸、段落数、字号、字体、字重、文本框边距、布局层右侧山水品牌图的媒体/裁切/层级、Logo 和页脚全部锁定。联名页只允许替换既有 Logo 图片槽的底层媒体。 + +备用母版路线只允许使用版式目录列出的布局。新增首张页面后立即核对画布尺寸与源母版完全一致，不能只检查 16:9 比例。先识别布局已经提供的标题条、Logo、页脚线、页码和占位符，再新增内容；不得重复绘制已有品牌构件，也不得为了“干净”而批量删除全部占位符。页脚只按实际母版审计，不假定每个布局都具有相同的公司名或保密文字。 + +所有继承与原创文本都执行 [typography-contract.md](typography-contract.md)：继承 Shape 保持可见字号集合和内部层级，原创 Shape 使用离散字号阶梯并在映射中声明最终 Shape ID。 + +若所用编辑引擎在导入/导出时丢失 Logo 或标题条，使用 `assets/brand/` 中从源稿提取的真实资产修复，并记录在 `deviation-log.txt`。 + +## 8. QA 判定 + +### 自动检查或模板保真比对必须失败的情况 + +- 非 10 英寸宽的易方达 16:9 画布，或与所选源母版尺寸不一致。 +- 对象超出画布容差。 +- 空结构占位符。 +- `单击此处`、`Click to add`、`20xx`、`xxx` 等模板提示语残留。 +- 顶栏标题在布局检查中为两行或更多。 +- 顶栏标题进入 Logo 前 16px 保护带。 +- 普通内容页缺失源稿要求的标题条、Logo，或缺失页脚分隔线、公司名、保密提示、页码中的任一项。 +- 正文角色居中/右对齐、含正文图形内边距小于 10px、连接线未导出端点或进入文字外扩 8px 安全区。 +- 两个及以上模块未声明 `alignmentGroups`，或组内边缘、尺寸、中心线、间距超过声明容差。 +- 任一非页脚家具的正文、图表、表格、来源或注释越过页脚分割线上方 8px 的正文安全下沿。 +- 新增中文 run 缺少显式 ``，或新增可见文本使用非 `华文黑体_易方达` / Arial 字体。 +- 继承文本字号集合与源 Shape 不一致，或原创文本字号不在映射声明的离散阶梯内。 +- 原创或受控重组页缺少完整 `layoutDecision`，或正文几何无法由信息结构解释。 +- 普通内容页缺少完整 `visualTextBinding`，视觉对象不存在，或只能用“美观、装饰、丰富页面、与主题相关”解释视觉用途。 +- `reuse` 页缺少 `reuseEligibility`，任一一致性资格为假，或复用原因只有“可以换字”“版面相近”等空泛描述。 +- 封面缺少 `coverProfile`、使用非 `reuse` 模式、源页不匹配，右侧品牌图缺失/换图/改裁切/被色块替代，或其他封面对象位置、尺寸、字号、字体、段落数和品牌家具与参考不一致。 +- 出现模板化反差句、无证据排比、宏大背景开场或口号化表达，且未按 `writingStyleExemptions` 逐 Shape 说明原文来源。 +- 使用 emoji、字符图标、图标字体或明显混搭的图标家族。 +- 任一可见对象使用图形阴影或发光伪阴影。 +- 同一页重复出现标题条、Logo、页脚线、页码或公司名等品牌构件。 + +### 必须人工逐页复核的警告 + +- 文本低于 10pt；只有源页继承的紧凑 KPI 标签、脚注、来源或法务可保留 6–9pt，且必须逐对象确认清晰、单行、无裁切。 +- 标题超过 26 个等效中文字符。 +- 两个对象发生显著交叠。容器包含文本、图片蒙版、箭头经过节点背后可判定为有意；其余应修复。 +- 标准解释正文按实际行距计算后溢出文本框、与下方总结块间距小于 16px，或图表类别标签与数据标记相交，均直接失败，不进入人工“有意重叠”判定。 +- 单页正文超过 650 个字符；法务页除外。 +- 图片主体被裁掉、比例变形或视线背离正文。 +- 图标来源不明、像素模糊、同级尺寸/描边/圆角不一致，或与所选案例视觉语言不一致。 +- 同级列信息量接近却宽度明显不等，或同级标题、图标、数字和底板样式不一致。 +- 页面垂直重心失衡、列间信息密度悬殊，或通过人工硬换行掩盖空间问题。 +- 多行正文出现 1–4 个汉字的孤行，且可通过改写、扩宽或重排消除。 +- 普通正文页出现三个及以上大面积空心线框容器。只有表格、矩阵、泳道或责任区等边界本身具有语义时才可保留，并逐对象说明。 +- 连续三页使用相同轮廓，或长篇材料只使用单一结构导致视觉节奏单调。 +- 案例影响扩展为完整列数、坐标、块宽比例和阅读顺序，且未通过直接复用资格检查。 + +人工判定写入 `qa-review.txt`，格式为：页码、对象、警告、视觉检查结果、处理方式。只写“已检查”不算有效判定。 diff --git a/skills/efund-ppt-maker/references/cover-contract.md b/skills/efund-ppt-maker/references/cover-contract.md new file mode 100644 index 000000000..f03844e4c --- /dev/null +++ b/skills/efund-ppt-maker/references/cover-contract.md @@ -0,0 +1,95 @@ +# 易方达封面硬合同 + +封面不是正文页，也不是可自由发挥的“品牌风格页”。它必须直接复用标准封面页，完整保留画布、布局、标题框、字号、字体、字重、行距、右侧山水品牌图、页脚、Logo、保密提示和留白。允许修改的只有指定文本槽内容，以及联名封面中既有 Logo 图片槽的底层图片。 + +## 强制规则 + +1. `pageKind` 必须为 `cover`，`buildMode` 必须为 `reuse`，并在 `template-frame-map.json` 中声明 `coverProfile` 和 `sourceSlide`。 +2. 先从下表选择能容纳题名结构的封面配置，再精简文案；不得为了塞入长标题而移动、缩放标题框、减小字号、换窄字体或新增文本框。 +3. 标题、副标题、姓名、部门和日期必须写入源页既有 Shape ID。不得把多个槽合并，也不得拆成新的对象。 +4. 标题段落数必须与配置一致。单标题保持一段；主副标题保持两段。不得出现意外换行。 +5. 中文使用 `华文黑体_易方达`，英文和数字使用 Arial；字号和字重必须与源页逐段一致。 +6. 右侧山水品牌图是标准封面的锁定图片对象，必须保留原始媒体、裁切、坐标、尺寸和层级；不得删除、重绘、换图、改色或替换为实心色块。底部页脚图、Logo、免责声明和保密提示同样锁定。 +7. 封面不新增第二张照片、装饰插图、背景图、图标、边框、标题条或额外 Logo。需要联名时只能使用 `v6-co-brand` 的既有 Logo 图片槽。 +8. 用户另给模板时，以用户模板指定的封面页作为 `user-template` 精确参考，规则相同。 + +## 内置封面配置 + +尺寸单位为 EMU；`914400 EMU = 1 英寸`。坐标顺序为 `x, y, cx, cy`。 + +| coverProfile | 资产与源页 | 题名 Shape ID 与坐标 | 题名样式 | 身份信息 | +|---|---|---|---|---| +| `v6-cn-simple` | `assets/efund-template-v6.pptx` 第 2 页 | ID 3：`230192,1123498,5850468,515526` | 单段中文 28pt | ID 12：日期 14pt，`240278,3315494,1095172,415498` | +| `v6-cn-subtitle` | 同上第 3 页 | ID 3：`230192,1123498,5850468,938719` | 主标题 28pt；副标题 22pt 加粗；两段 | ID 12：姓名/部门与日期 14pt，`230192,3208945,1319592,738664` | +| `v6-bilingual` | 同上第 4 页 | ID 3：`230192,1123498,5850468,838691` | 中文 28pt；英文 21pt 加粗；两段 | ID 12：姓名 14/12pt；ID 11：日期 14/12pt | +| `v6-english` | 同上第 5 页 | ID 8：`219434,1177288,7933254,938719` | 英文主标题 28pt；副标题 18pt 加粗；两段 | ID 4：姓名与日期 14pt | +| `v6-co-brand` | 同上第 6 页 | ID 4：`233490,1159893,5850468,515526` | 单段中文 28pt | ID 13：姓名/部门与日期 14pt；Logo 槽为 ID 10、11、12 | +| `ai-tech-internal` | `assets/efund-ai-platform-v21.pptx` 第 1 页 | ID 8：`222430,1176610,6449589,482953` | 单段中文 24pt | 副标题 ID 3：16pt；部门 ID 4：14pt；日期 ID 9：14pt | + +V6 画布固定为 `9144000 × 5148263 EMU`；AI 技术封面画布固定为 `9144000 × 5143500 EMU`。不得由编辑引擎换成近似的默认宽屏尺寸。 + +## 锁定品牌家具 + +V6 中文/双语/英文/联名封面和 AI 技术封面的右侧山水品牌图均为布局层 Shape ID 6，从 `x=6912769` 开始，宽 `2231231`；V6 高 `4367213`，AI 技术封面高 `4364431`。图片必须使用内置源媒体，并保持原始裁切 `l=30921, t=155, r=35021, b=-155`、拉伸方式和层级。其底边下方是独立的品牌页脚与 Logo 分区，不属于图片槽，不得被图片覆盖。英文封面使用源页对应的英文页脚文字和布局。以源文件 XML 为唯一精确值；本文数值用于人工审核，不替代自动比对。 + +`assets/brand/efund-cover-water.jpeg` 是同一源媒体的修复副本，只在编辑引擎丢失布局图片时使用。恢复时必须替换 Shape ID 6 的底层媒体并保留布局对象；不得在幻灯片层新建图片，也不得把该图用于正文、章节页或结束页。 + +联名 Logo 槽固定如下： + +- ID 10：`345365,2478781,915198,237951` +- ID 11：`1501950,2480708,702610,256529` +- ID 12：`2327614,2374908,1101405,468128` + +允许替换这三个槽的底层图片，但必须保持 Shape ID、坐标、尺寸、裁切方式和层级不变。没有足够 Logo 时保留适用的既有槽结构，不新增第四个 Logo。 + +## 映射示例 + +```json +{ + "outputSlide": 1, + "narrativeRole": "封面", + "buildMode": "reuse", + "coverProfile": "v6-cn-subtitle", + "sourceSlide": 3, + "visualTextBinding": { + "exempt": true, + "pageKind": "cover", + "reason": "固定品牌封面仅承载题名和身份信息，必须保持标准家具" + }, + "reuseEligibility": { + "sameRelationship": true, + "sameModuleCount": true, + "sameDensity": true, + "sameFocalHierarchy": true, + "sameReadingOrder": true, + "reason": "使用易方达标准中文主副标题封面，题名结构和身份信息槽与源页完全一致" + }, + "editTargets": [ + {"shapeId": 3, "action": "replace-text", "role": "title-and-subtitle"}, + {"shapeId": 12, "action": "replace-text", "role": "identity-and-date"} + ] +} +``` + +## 自动门禁 + +内置配置： + +```bash +python "$SKILL_DIR/scripts/check_efund_cover.py" "$FINAL_PPTX" \ + --final-slide 1 --profile "$COVER_PROFILE" \ + --json-output "$QA_DIR/efund-cover.json" +``` + +用户模板： + +```bash +python "$SKILL_DIR/scripts/check_efund_cover.py" "$FINAL_PPTX" \ + --final-slide 1 \ + --reference-pptx "$SOURCE_PPTX" --reference-slide "$SOURCE_COVER_SLIDE" \ + --json-output "$QA_DIR/efund-cover.json" +``` + +用户模板若确有既定 Logo 图片槽，可为每个槽追加 `--allow-picture-replacement "$SHAPE_ID"`；该参数只允许替换底层媒体，不放宽槽位坐标、尺寸、裁切和层级。 + +该门禁必须检查：画布、布局、所有可见封面对象的 Shape ID/类型/坐标/尺寸、文本段落数、有效字号、字体、字重、文本框边距与对齐，以及布局层的品牌家具。内置配置必须额外确认 Shape ID 6 仍为图片对象，并核对源媒体哈希、裁切、拉伸、坐标和尺寸；缺图、换图、改裁切或用色块替代均为硬错误。任一误差为硬错误。 diff --git a/skills/efund-ppt-maker/references/design-system.md b/skills/efund-ppt-maker/references/design-system.md new file mode 100644 index 000000000..dc572ae37 --- /dev/null +++ b/skills/efund-ppt-maker/references/design-system.md @@ -0,0 +1,135 @@ +# 易方达演示文稿设计系统 + +## 1. 画布与固定结构 + +- 使用 16:9 横版。源稿宽度为 10 英寸；V21 高 5.625 英寸，V6/EWork 高约 5.63 英寸。不得改成 4:3。 +- 封面是固定标准页，必须按 [cover-contract.md](cover-contract.md) 精确复用对应源页；其画布、标题/副标题/身份信息框坐标、字号、字体、字重、段落数、右侧山水品牌图及布局层其他品牌家具不得改动。 +- 将画布归一化为 960×540：正文水平安全区约为 x=38–923，即左右各约 0.40 英寸；顶部标题区域 y=0–83；正文主要区域 y=96–488；页脚分隔线约 y=496。 +- 常规正文页标题框约为 x=38、y=22、w=650、h=28；右上 Logo 约为 x=776、y=26、w=146、h=32。标题不得侵入 Logo 区。 +- 普通内容页顶栏标题固定使用 `page-title` / `textRole: page-title`，单行、左对齐、无人工换行；标题框右边界与 Logo 区至少相隔 16px。标题过长时压缩文案或拆分叙事，不增高标题框、不缩字。 +- 正文、图片、图表、表格、来源和注释的底边必须至少高于页脚线 8px；版权、保密提示和页码只放在页脚区。来源与脚注仍属于正文，禁止放到分割线以下。 +- 普通内容页必须保留源模板完整页脚：约 y=496 的分隔线、左侧公司名、中部保密提示、右侧页码。最终布局对象清单和逐页渲染中都必须看见这四项；不能因为母版对象未展开而跳过检查。 +- 如需底部来源带，优先使用 y=466–484 的单行窄带和 7–8pt 文字；信息过长时放到图表附近或拆页。 + +## 2. 色彩角色 + +| 角色 | 色值 | 用法 | +|---|---|---| +| 品牌深蓝 | `#005096` | Logo 区、一级标题、关键结论、主折线 | +| 品牌蓝 | `#0078B4` | 次级标题、层级标签、强调框 | +| 品牌青 | `#1EB9E1` | 顶部标题条、数据大字、流程重点 | +| 正文深灰 | `#3C3C3C` | 大部分正文与说明 | +| 次级灰 | `#969696` | 注释、次要标签、非重点比较项 | +| 浅灰 | `#D7D7D7` / `#C1C6C8` | 分隔、表格底、弱化区域 | +| 白 | `#FFFFFF` | 主画布、标题反白、留白 | +| 谨慎黄 | `#FFC819` | 风险、例外或单一关键提示；一页通常不超过一个角色 | + +同一页面优先使用深蓝、蓝、青、灰四个角色。不要引入紫色、粉色、渐变虹彩或高饱和多色分类。透明浅蓝可作为分组底，但应保持扁平、无阴影。 + +所有对象均使用扁平样式；禁止外阴影、内阴影、预设阴影、发光模拟阴影和半透明复制层伪阴影。层级只通过颜色、字号、留白和对齐形成。 + +## 3. 字体与字号 + +- 中文可见文本：`华文黑体_易方达`。新增文本必须在每个 DrawingML run 上显式写入 ``，不得只设置 Latin 字体、主题字体或依赖自动回退。 +- 字体文件随技能存放于 `assets/fonts/STHeiti_YFD.ttf`；其字体族名为 `华文黑体_易方达`，内部英文名为 `STHeiti_YFD`。开始制作前先运行 `scripts/check_efund_font_asset.py`；渲染环境缺字体时使用该资产做进程级注册，不得改用相近字体。 +- 英文、数字：Arial。仅在原始图表或继承对象中保留 Arial Narrow 等变体；新增图表标签、表格数字和页脚英文同样使用 Arial。 +- 不得在新增可见文本中混用微软雅黑、苹方、黑体、宋体、Calibri 等字体。继承对象若含历史字体，只能原样保留并在 QA 中登记，不得扩散到新对象。 +- 若本机缺少 `华文黑体_易方达`，仍须在 PPTX 中保留该字体名；若最终渲染无法验证真实字面宽度和换行，停止交付并提示安装字体，不得静默换成相近字体。 +- 页面标题：23pt、加粗、白色、单行。 +- 内文一级标题：15pt、加粗、`#005096`。 +- 内文一级正文：12pt、`#3C3C3C`。 +- 内文二级标题：12pt、加粗、`#005096`。 +- 内文二级正文：10pt、`#3C3C3C`。 +- 标准证据双区页的解释标题为 15pt、加粗；图表/视觉标题为 10pt、常规、不加粗；解释正文为 12pt、常规、150% 行距。对象分别命名为 `standard-narrative-title`、`standard-visual-title`、`standard-narrative-body`。普通内容页达到 6 页时，至少三分之一使用这一基础轮廓；不得用虚构数据凑比例，右侧也可承载表格、关系图或信息流程图。 +- 标准证据双区页按真实文字排版高度留白：`standard-narrative-body` 的实际行数、字号、150% 行距和内边距必须完全装入文本框；实际文字底边与下方 `takeaway` / `conclusion` / `callout` 至少间隔 16px。右侧图表类别标签使用独立槽位，任何数据标记不得进入该槽位。 +- 浅蓝建议、结论或行动提示框默认左对齐，左右内边距 10–14px；对象名包含 `takeaway`、`recommendation`、`suggestion` 或 `advice`。两行建议不得居中排成标语。 +- 解释、正文段落、模块说明、表格正文、来源、注释、建议和结论默认左对齐；数字列右对齐。只有短节点标签、表头、指标数字、页码和源模板明确居中的短标签可以居中。每个新增文本对象声明 `textRole`，不依赖模型根据文本长度猜测对齐。 +- 注释、来源、页脚：7–8pt、灰色。EWork 等源页中继承的紧凑 KPI 标签可保留 6–9pt，但不得把新增长正文压到该字号，并须逐对象视觉确认。 +- 原创正文建议 1.3–1.5 倍行距；继承正文保持源 Shape 的行距与段距。段间距要形成分组。标题、栏目标题、指标数字不得因文案变长而自动缩字。 +- 字重只用于层级：页面标题和一级标题加粗，正文常规；不要用全页粗体制造强调。 +- 继承对象保留源 Shape 的字号集合；原创对象只使用 [typography-contract.md](typography-contract.md) 的离散字号阶梯，并在映射中记录最终 Shape ID、文本角色和允许字号。 + +## 4. 标题与文案预算 + +- 文案遵守 [writing-style-contract.md](writing-style-contract.md)：标题和结论使用具体对象、动作与结果，不用修辞性反转、宏大背景或空泛口号制造力度。 +- 避免“不是……而是……”“不仅……更……”“让……真正成为……”“更智能、更高效、更安全”等模板句。确有比较时用共同维度和数据表达。 +- “赋能、重塑、闭环、跃迁、引擎、范式”等词只有在后文明确对应流程、责任、时长、数量或风险变化时才可保留；否则改成具体动作。 +- 顶栏标题按等效中文字符计算，建议不超过 26 个，硬上限 34 个；英文/数字两个字符约按一个中文字符计。 +- 图文页：正文总量建议 140–220 个中文字符；真实图片或官方截图占宽度通常为 40%–50%。流程、架构、图表和信息图形的面积按关系复杂度确定，不为凑比例拉伸。 +- 三栏页：每栏标题不超过 10 字，每栏正文 55–90 字。 +- 四栏页：每栏标题不超过 8 字，每栏正文 40–65 字。 +- 架构/流程页：节点标签不超过 10 字，节点说明不超过 18 字；超过时拆出讲解页。 +- KPI 单页：最多 3 个一级价值区，每区 2–4 个指标；说明文字总量建议不超过 360 字。 +- 法务/免责声明页可高密度，但必须直接复用对应源页字号、栏宽和段距，不得把普通正文页压成法务密度。 + +## 5. 图文、图标与图形 + +- 普通内容页必须 100% 图文并茂，每页至少有一个承载信息的视觉：真实图片、官方截图、图表、流程、架构、关系图、信息图形、对照矩阵、实心数据结构或成组语义图标。 +- 数据证据、研究发现、方案论证和比较页优先采用“左侧 35%–42% 解释 + 右侧 58%–65% 图表或主视觉”。左侧回答结论与含义，右侧承载可比较证据、关系图或信息流程；普通内容页达到 6 页时，该基础版式至少占三分之一。 +- 每个视觉必须直接支撑本页主张或相邻文字，并承担至少一种信息功能：证据、数量、顺序、因果、层级、比较、对象或场景。纯装饰图库、抽象背景、Logo、标题条、分隔线、无语义色块和零散小图标不计入视觉覆盖率。 +- 视觉与文字不得机械重复。视觉负责展示对象、证据和关系，邻近的标题、结论或短注负责解释“这意味着什么”；视觉与其文字锚点必须在空间上邻近。 +- 按信息关系选视觉：趋势/数量用图表或大数字，比较用对照图或矩阵，顺序/因果用流程，层级/系统用架构图，产品行为用官方截图，人物/场景/实物用真实照片，抽象观点用关系图或信息图形。 +- 整页流程图只用于真实顺序、因果链、阶段演进或反馈回路；数据、对象比较和职责分组改用左文右图或表格。 +- 表格按 [table-layout-contract.md](table-layout-contract.md) 的编号任务清单、分组重点行、紧凑对比三种模式选型；只有编号任务清单可使用细水平分隔线，分组重点表和紧凑对比表正文不画分隔线。 +- 使用真实图片、官方截图、清晰数据图表和少量简单图形。图片必须有叙事作用，避免与主题无关的机器人、握手、城市、科技光效等通用图库。 +- 标准封面右侧山水图是固定品牌家具，不参加正文视觉覆盖率，也不适用“删除大号装饰图片”规则；它只能从标准封面继承并保持原始裁切。 +- 图标来源顺序：同一源稿的继承图标/图形组 → 易方达或产品官方图标 → 单一专业 SVG 图标家族。案例中已有可用表达时不得另找图标。 +- 同一输出文件只使用一个图标体系。不得混用线性与面性图标、不同描边粗细、不同圆角或不同透视视角。 +- 优先复制源页的完整图标组及其底板、颜色、间距和标签；不把多个案例页的图标拆散后重新拼贴。 +- 辅助图标建议在归一化 960×540 画布上使用 20–32px，核心能力图标 36–48px；同级图标必须等尺寸、等视觉重量、等边距。 +- 线性图标使用一致的 1.5–2px 视觉描边；面性图标保持相同填充比例。图标颜色限于品牌深蓝、蓝、青、灰、白和谨慎黄。 +- 每个图标必须表达清晰含义并紧邻标签；一页通常不超过 6 个同级图标。图标不是装饰点阵。 +- 禁止 emoji、Unicode 字符、Wingdings/图标字体、手绘几何代替物、AI 生成的小图标和低分辨率截图图标。 +- 右图左文是默认概念页；主体放在图片靠外侧，朝向正文。图片裁切比例由继承框决定，不得拉伸。 +- 图表最多突出一个主系列，其余系列用灰色或浅蓝；结论写进标题或图表上方，不让观众自行猜测。 +- 结构图以矩形、细线、箭头、层级色块为主。避免大面积圆角、阴影、拟物、胶囊和 UI 卡片墙。 +- 一页只设一个视觉焦点。Logo、标题条和页脚不计入焦点数量。 + +## 6. 实心结构与线框限制 + +- 比较、指标、阶段结论、决策与转折页优先采用品牌深蓝 `#005096` 实心块，配白色大数字、短结论或高对比标签。实心块既承担容器作用，也承担视觉焦点作用。 +- 默认组合为“一个实心主焦点 + 浅蓝/浅灰填充支撑 + 无框对齐说明”。流程或阶段关系也可使用一组同语义、同尺寸的实心节点，但不能让多个等权深色块同时争抢视线。 +- 谨慎黄描边只用于一个关键焦点、风险或例外信号；不得给每个模块都套黄色或高饱和描边。 +- 浅色分区必须具有真实填充色，不使用“白底 + 灰色细框”伪装成分组。可以依靠留白、对齐线和色块边界完成层次，而不是给每段文字都画框。 +- 三个及以上大面积空心灰框、空心圆角卡片或只有边框没有视觉层级的容器，视为普通正文页的负面结构。 +- 线框只在边界本身具有语义时使用，例如表格、矩阵、泳道、组织边界或流程责任区；线宽约 0.75–1pt、颜色弱化，框内必须有明确结构，不能留下大块空白。 +- 从案例页受控重组时，优先复用 AI V21 第 14、23、26、29–30 页中的实心指标、平台底座、流程节点和价值条；不要把其内容截图成位图。 + +## 7. 对齐与留白 + +- 标题条、Logo、页脚、字体角色、色彩角色和图标家族属于品牌系统；正文区的列数、模块坐标、块宽比例和阅读顺序不属于品牌资产，必须由当前页的信息结构决定。 +- 完成无样式内容蓝图和几何草图后，才从案例页提取局部视觉语法。除通过直接复用资格检查外，不复制案例页完整正文几何。 +- 所有主要对象对齐到相同左边界、列网格或中心线；同级模块等宽、等高、等间距。两个及以上模块必须在映射中用 `alignmentGroups` 记录对象 ID、检查轴和 0–4px 容差，并由布局检查器验证。 +- 同级模块信息量接近时保持等比例；仅当内容量或重要性有实质差异时使用非对称列宽，并通过对齐线维持秩序。 +- 同级模块的标题、图标、数字、底板、描边和说明样式必须一致，不因某列内容较少而单独放大或改变颜色。 +- 含正文的容器四侧内边距至少 10px，通常左右 12–14px；在布局 JSON 中导出 `textInsets`。列间距至少 16–24px。不得用居中对齐掩盖内边距或列宽不足。 +- 连接线必须导出实际端点，并停留在节点后方；除合法连接的节点外，线段不得进入任何文字边界外扩 8px 的安全区。需要跨过标签时移动连接路径、标签或节点，不把文字压在线上。 +- 内容区上下至少保留 12–18px 缓冲，不得贴住标题区或页脚线。 +- 同时检查页面垂直重心和各列信息密度；不为“填满页面”而增加无价值元素，也不留下无法解释的大块空白。通过扩大图片、提高关键数字、调整行距、列宽或拆页获得平衡。 +- 不用人工硬换行制造整齐。先压缩文案、调整宽度或拆页；不能用换行掩盖标题溢出或列宽不合理。 +- 多行正文最后一行只剩 1–4 个汉字，或在有可用宽度时明显短于上一行，应通过改写、扩宽或重排消除，不用硬回车修饰行尾。 +- 只有所选源页本身使用卡片时才延续卡片语言；文本页、架构页和流程页不统一改造成卡片墙。 + +## 8. 硬性验收 + +- 10 英寸宽的 16:9 画布；标题条、Logo、页脚和页码完整。不得只因比例仍是 16:9 就接受编辑引擎替换后的其他画布尺寸。 +- 标题单行且不侵入 Logo 区。 +- 普通内容页完整保留页脚分隔线、公司名、保密提示和页码。 +- 新增普通正文不小于 10pt；仅继承的紧凑 KPI 标签、来源/脚注/法务可为 6–9pt，并须在 QA 记录中逐对象判定。 +- 新增中文/英文/数字分别为 `华文黑体_易方达` / Arial / Arial；新增中文 run 具有显式 `a:ea` 设置，任何非首选字体必须证明来自继承对象。 +- 图标优先来自所选案例源页；同页同级图标在家族、描边、尺寸、色彩、底板和间距上统一，无 emoji、字符图标或多库混搭。 +- 无文本裁切、形状越界、图片变形、空占位符、模板提示语、非预期重叠。 +- 无任何图形阴影、发光伪阴影或复制层伪阴影。 +- 具名标准证据页文本对象通过解释标题 15pt 加粗、图表/视觉标题 10pt 常规不加粗、正文 12pt/150% 行距和显式中英文字体检查；普通正文没有可修复的孤行。 +- 具名标准证据页的解释正文真实排版高度不溢出，下方结论块至少留出 16px；图表类别标签与柱、点、面积和数值标记无交叠。 +- 浅蓝建议、结论或行动提示框文本左对齐；普通内容页达到 6 页时，具名标准证据双区页不少于三分之一。 +- 所有正文角色左对齐，数字列右对齐；含正文图形内边距至少 10px，连接线与非端点文字至少相隔 8px。 +- `alignmentGroups` 中声明的同级对象边缘、尺寸、中心线和间距均在规定容差内。 +- 分组重点表与紧凑对比表的正文区没有横向分隔线，层级由底色、留白和对齐形成。 +- 普通正文页无三个及以上大面积空心线框容器；保留的线框均能说明其边界语义，并在 `qa-review.txt` 中逐项记录。 +- 标题条、Logo、页脚线、页码和公司名等品牌构件无重复叠加。 +- 每页至少有一个明确结论；每个普通内容页至少有一个与该结论或相邻文字直接相关、且承载可说明信息的视觉。 +- `template-frame-map.json` 中每个普通内容页具有完整 `visualTextBinding`，所列 `visualObjectIds` 均存在于成品对象清单；仅固定封面、目录、法务和纯结束页可按合同豁免。 +- 封面声明有效 `coverProfile` 与 `sourceSlide`，使用 `reuse`，并通过 `check_efund_cover.py` 的画布、位置、字号、字体、右侧品牌图媒体/裁切和其他品牌家具精确比对。 +- `check_efund_writing_style.py --warnings-as-errors` 为 0 warning；例外仅限有来源的法务原文、直接引语或正式口号，并逐 Shape 登记。 +- 每页逐张渲染复核；所有自动检查错误为 0，警告均有修复或书面判定。 diff --git a/skills/efund-ppt-maker/references/layout-catalog.md b/skills/efund-ppt-maker/references/layout-catalog.md new file mode 100644 index 000000000..7c4bd5036 --- /dev/null +++ b/skills/efund-ppt-maker/references/layout-catalog.md @@ -0,0 +1,143 @@ +# 品牌视觉语法与案例索引 + +本文件不是可直接套用的页面模板目录。先按 [layout-design-playbook.md](layout-design-playbook.md) 完成内容蓝图和正文几何草图，再选择唯一品牌来源，并从下列案例提取一至两个局部视觉语法。页码均为对应资产中的 1-based 页码。 + +## 目录 + +1. 通用品牌案例 +2. AI/技术叙事 +3. KPI 单页 +4. 备用母版骨架 +5. 实心结构优先索引 +6. 图标与图形风格复用索引 +7. 案例使用原则 + +## 通用品牌案例：`assets/efund-template-v6.pptx` + +表中的“推荐源页”表示可观察的品牌语法证据，不表示默认复制该页的完整正文几何。封面必须直接复用并遵守 [cover-contract.md](cover-contract.md)；目录、法务和结尾等其他固定标准页可以直接复用；普通正文页须先通过复用资格检查。 + +| 任务 | 推荐源页 | 说明 | +|---|---:|---| +| 中文封面 | 2、3 | `v6-cn-simple` / `v6-cn-subtitle`；按是否有副标题选择，保留右侧品牌图，不改字号和位置 | +| 中英双语封面 | 4 | `v6-bilingual`；固定双语两段和右侧品牌图 | +| 英文封面 | 5 | `v6-english`；固定英文主副标题槽和右侧品牌图 | +| 联合品牌封面 | 6 | `v6-co-brand`；保留右侧品牌图，只能替换既有 Logo 图片槽 | +| 目录 | 7 | 唯一标准目录版式 | +| 短文本观点 | 11 | 1–2 段、留白较多 | +| 长文本说明 | 12、13 | 多段正文或分级标题 | +| 指标/数字突出 | 14 | 结论段 + 大数字框 | +| 左文右图/图表 | 16 | 标准 50/50 图文 | +| 复杂图表 + 解释 | 17 | 左侧结论、右侧多图表 | +| 横向长图表 | 18 | 单一大图表 | +| 色彩说明 | 20 | 调色板或分类色 | +| 饼图/圆环 | 21 | 仅用于份额关系 | +| 柱形图 | 22 | 横向比较或年度对比 | +| 折线图 | 23 | 趋势、变化、基准比较 | +| 组合图 | 24 | 双轴/多指标趋势 | +| 模型图 | 25 | 中心模型 + 周边能力 | +| 图表结论突出 | 26 | 图表旁放结论标签 | +| 框架图 | 27 | 顶层目标 + 多业务列 | +| 组织架构 | 28 | 树形层级 | +| 流程图 | 29 | 环形或阶段流程 | +| 标准表格 | 30 | 少量行列、蓝色表头 | +| 表格重点 | 31 | 关键行/单元格青色突出 | +| 评分表 | 32 | 星级或离散评级 | +| 任务清单表 | 33 | 序号 + 工作内容 + 说明 | +| 风险/免责声明 | 35–42 | 按产品类型和语言选择，不得压缩到普通页 | +| 中文结尾 | 44 | 谢谢 + 联系方式 | +| 英文结尾 | 45 | Thank You | + +1、8–10、46 是模板说明页，不得作为成品页直接交付。 + +## AI/技术叙事：`assets/efund-ai-platform-v21.pptx` + +| 任务 | 推荐源页 | 说明 | +|---|---:|---| +| AI/平台封面 | 1 | `ai-tech-internal`；固定标题、副标题、部门、日期槽和右侧品牌图 | +| 概念开场 + 全宽文本 | 2 | 低密度观点页；不含大号照片，使用留白和文本层级建立焦点 | +| 市场数据 + 柱图 | 3 | 左侧说明、右侧图表 | +| 四条编号结论 | 4 | 1–4 大号序号 + 结论句 | +| 六大能力 | 5 | 2×3 能力矩阵 | +| 三阶段演进 | 6 | 纵向时间轴 + 阶段说明 | +| 产品说明 + 截图 | 7 | 左侧文字、右侧产品图 | +| 四类工程/方法 | 8 | 横向流程 + 四列定义 | +| 四维对比 | 9 | 四列 VS 对照 | +| 五层架构 | 10 | 左侧层标签 + 右侧说明 | +| 四栏能力 | 11、18、22、25 | 统一的层级标签 + 四列正文 | +| 双侧资源/能力 | 12 | 中心系统 + 左右资源 | +| 大型技术架构图 | 13、23 | 横向主流程 + 上下能力层 | +| KPI/性能指标 | 14 | 指标大字 + 结论带 | +| 数据治理说明 | 16、17 | 步骤、口径、结果 | +| 问题/挑战 + 小图 | 19 | 三组挑战和方法缩略图 | +| 实验/模型效果 | 20、21 | 流程图或表格 + 关键结论 | +| 金融安全体系 | 24 | 六边形能力组；只替换继承节点 | +| 闭环流程 | 26 | 横向链路 + 底部反馈箭头 | +| 标准 Skill/Agent 案例 | 27、28 | 三栏说明 + 底部流程 | +| 使用场景 + 指标矩阵 | 29、30 | 价值区、业务区、KPI 数字 | +| 组织变革三角色 | 31 | 三栏角色与职责 | +| 低密度结论收束 | 32 | 左对齐结论页；不含大号照片，以短句和留白收束 | +| 结尾 | 33 | 谢谢 | + +数据证据、关系机制和方案论证页优先参考第 3 页的“左侧解释 + 右侧主视觉”阅读结构。只提取左右比例、图表层级和来源位置，不直接照搬原页数据或文字。普通内容页达到 6 页时，这一基础轮廓至少占三分之一；图表/视觉标题统一为 10pt 常规 `华文黑体_易方达`，浅蓝建议框使用左对齐。 + +表格版式优先参考 V6 第 30、31、33 页，并按 [table-layout-contract.md](table-layout-contract.md) 选择紧凑对比、分组重点或编号任务清单。编号任务清单可保留细水平线；紧凑对比和分组重点表正文不画分隔线。整页流程只在顺序、因果、阶段或闭环本身需要解释时使用。 + +## KPI 单页：`assets/efund-ework-onepage.pptx` + +| 任务 | 推荐源页 | 说明 | +|---|---:|---| +| 一页式价值/KPI 总览 | 1 | 顶部总述；三大价值区；每区 2–4 个数据；底部品牌与口号条 | + +## 备用母版骨架：`assets/efund-master-skeleton.pptx` + +它提供干净的易方达品牌壳，适合按信息结构自主设计正文页。它不提供内容、正文几何、配色或图标答案；页面内容仍须遵守本目录与设计系统。 + +仅允许使用以下布局名称： + +| 布局名称 | 适用任务 | 约束 | +|---|---|---| +| `标题和内容` | 简洁正文、短清单 | 先检查占位符，不重复绘制标题条、Logo 或页脚 | +| `图形内容1` | 单一图形/图表 + 说明 | 图形必须服务于一个结论 | +| `图形内容2` | 双区图形/对照 | 两区同级时等宽、同样式 | +| `结尾页` | 无合适案例结尾页时的备用结束页 | 不新增第二套品牌标识 | + +不得使用带数字前缀、英文名、说明用途或未列出的布局。不得把骨架页与案例页混在同一输出文件中。 + +## 实心结构优先索引 + +下列页面适合提取实心结构的局部视觉语法；仅当直接复用资格全部满足时才复制完整正文结构： + +| 表达任务 | 推荐源页 | 可复用结构 | +|---|---:|---| +| 指标对比、关键差异 | AI V21 第 14 页 | 大数字、深蓝/青实心指标区、短结论带 | +| 平台底座、安全底座 | AI V21 第 23 页 | 深蓝实心底座、白字分层、上层能力与底座的清晰主次 | +| 端到端流程、闭环 | AI V21 第 26 页 | 同语义实心节点、连接关系、底部反馈链 | +| 场景价值、业务 KPI | AI V21 第 29–30 页 | 实心价值条、重点数据区、浅色辅助区 | +| 单页经营结论 | EWork 第 1 页 | 顶部总述、实心价值区与高对比数据 | + +使用时保持对象可编辑，并根据内容关系决定“一个实心主焦点 + 浅色/无框支撑”或“同语义实心节点序列”。不得把源页截图后铺成整页，也不得把多个深色块做成等权卡片墙。 + +## 图标与图形风格复用索引 + +仅在当前输出文件已经选择对应源稿时使用；不得跨源稿复制。 + +| 风格任务 | 推荐源页 | 可复用内容 | +|---|---:|---| +| 能力编号与简洁分组 | AI V21 第 4–5 页 | 大号编号、蓝青层级、能力标签间距 | +| 入口、服务、算力等技术小图标 | AI V21 第 13–14 页 | 线性/圆形图标、指标底板、流程关系 | +| 平台与安全能力节点 | AI V21 第 23–24 页 | 圆形服务图标、六边形能力组、统一蓝青体系 | +| 闭环步骤与反馈关系 | AI V21 第 26 页 | 流程节点、箭头、阶段标签 | +| 框架/模型节点 | V6 第 25、27、29 页 | 中心模型、矩形能力块、流程线条 | +| KPI 与品牌信息组 | EWork 第 1 页 | 指标数字、短标签、白色指标底板和底部品牌条 | + +## 案例使用原则 + +1. 先独立完成信息结构和几何草图，再匹配局部视觉语法。三栏内容不要塞入四栏页，也不要为了迁就案例页改变模块数量。 +2. 普通正文默认在品牌壳内原创；需要继承局部图形组、图标组或实心装置时使用受控重组。案例影响通常限于一至两个视觉装置。 +3. 直接复用必须同时满足关系、模块数、密度、焦点层级和阅读顺序一致，并有固定标准页、明确续写或其他具体理由。复制后只改映射中明确列出的继承对象。 +4. 内容量过大时优先压缩或拆页；需要干净正文壳时启用备用母版骨架。禁止从另一个资产复制一页到当前输出文件。 +5. 不同页之间要变化轮廓：同一结构连续不超过两页；超过 8 页的材料至少使用三种清晰可辨的内容结构，并形成“低密度观点 → 中密度解释 → 高密度证据 → 结论收束”的节奏。 +6. 封面必须按硬合同使用标准配置；目录、法务、结尾页使用专门源页，不得由正文页改造。 +7. 案例中已有图标或图形表达时，优先复制完整继承组；不要以“更现代”为理由换成另一套视觉语言。 +8. 默认不采用由多个大面积空心灰框构成的视觉语法。确需表达表格、矩阵、泳道或责任边界时，线框才作为结构语义保留。 +9. 正文案例不提供可直接挪用的大号装饰/情绪照片。标准封面右侧山水图是固定品牌家具，只能随封面继承；正文确需照片时，按当前主张单独选择或生成语义相关素材，并重新执行版权、隐私、裁切和视觉绑定检查。 diff --git a/skills/efund-ppt-maker/references/layout-design-playbook.md b/skills/efund-ppt-maker/references/layout-design-playbook.md new file mode 100644 index 000000000..43fa018de --- /dev/null +++ b/skills/efund-ppt-maker/references/layout-design-playbook.md @@ -0,0 +1,156 @@ +# 信息结构驱动的原创布局方法 + +正文区的几何关系由内容决定。案例页只提供品牌外壳、字体、色彩、图标家族、实心/浅色/无框的视觉语法、信息密度与留白标尺，不提供必须照抄的列数和坐标。 + +## 1. 先做内容蓝图 + +查看案例页之前，先为每页写出： +- `claim`：观众离开本页时必须记住的一个判断；使用具体对象、动作和结果，不写“不是……而是……”式演讲金句。 +- `evidence`：支撑判断的数字、事实、例子或机制。 +- `contentStructure`：观点、比较、顺序、因果、必要条件、层级、系统、演进、反馈、防御、证据、决策或行动。 +- `moduleCount`：真正独立的信息单元数量，不按视觉容器数量倒推。 +- `relativeImportance`：主焦点、次级支撑和背景信息分别是什么。 +- `readingOrder`：从哪里进入、经过哪些关系、最后落在哪里。 +- `primaryVisual`：大数字、真实图片、图表、流程、架构、对照或结论块。 +- `visualTextBinding`：视觉类型、它支撑的具体主张、相邻文字锚点、素材来源、选择理由、视觉独立承载的信息和成品对象 ID。 +- `density`：低、中、高；高密度是否应拆页。 +- `action`：本页是否需要引导选择、决策或下一步。 + +未完成这份蓝图，不得先翻案例找“长得像的页面”。 +## 2. 从关系生成几何 + +1. 把内容单元写成无样式列表，删除重复或不能改变判断的信息。 +2. 用箭头、包含、并列、对照或权重先画关系草图，不使用品牌样式。 +3. 确定唯一主焦点及其面积、位置和对比度；把承载信息的视觉放在其文字锚点附近，并写清视觉替文字表达的证据或关系；其余对象必须服务于它。 +4. 在 960×540 画布安全区内决定行列、非对称宽度、连接方向与留白，不从源页坐标开始。把两个及以上同级模块写入 `alignmentGroups`，声明需要一致的边缘、尺寸、中心线或间距及 0–4px 容差。 +5. 再加入易方达视觉语法：深蓝实心重点、浅蓝/浅灰分区、无框对齐、统一图标和必要连接线。所有对象保持扁平，禁止任何阴影、发光伪阴影或复制层伪阴影。 +6. 检查标题、正文、图形和页脚后的垂直重心；空间不合理时调整内容或拆页。 +7. 检查正文、图表、表格、来源和注释的底边；所有非页脚家具必须至少高于页脚分割线 8px。普通内容页同时确认页脚分隔线、公司名、保密提示和页码四件套完整存在。 + +所有新增文本对象先指定 `textRole` 再决定对齐：解释、段落、模块说明、表格正文、来源、注释、建议和结论左对齐；数字列右对齐；只有短节点标签、表头、指标数字和页码居中。含正文图形四侧 `textInsets` 至少 10px。关系连接线导出实际端点，并避开非端点文字外扩 8px 的安全区。 + +页面正文的列数、块宽、模块顺序和焦点比例必须能由内容蓝图解释。若唯一解释是“案例页原来如此”，重新设计。 + +普通内容页必须有至少一个信息视觉。抽象背景、Logo、标题条、分隔线、无语义色块和零散小图标不计数；若视觉不能指向具体相邻文字，或不能说明自己承载了证据、数量、顺序、因果、层级、比较、对象或场景中的至少一项，重新选图或重构图解。 + +## 3. 十三类关系的构图决策 + +以下是决策方法，不是固定模板： + +- **观点**：一个强结论占据主视区，最多配一组证据或一张图；不拆成多张等权卡片。 +- **比较**：先确定共同维度，再决定左右、上下或中心差异带；差异大小可驱动非对称宽度。 +- **顺序**：方向、阶段数和回路决定节点排列；有反馈才画闭环，没有反馈不强造圆环。 +- **因果**：原因、机制、结果必须可追踪；机制是核心时给它最大面积，不平均分栏。 +- **必要条件**：用门槛、支撑三角、乘积关系或缺一不可的组合表达；并列条件没有先后时不画箭头。 +- **层级**：父子、总分和归属决定嵌套或树形；层级深度超过三层时拆页。 +- **系统**：先画边界、输入、核心、输出和治理；底座可用实心结构，但不得把所有组件做成等权框。 +- **演进**：按时间或成熟度排列阶段，明确转折点、进入条件和阶段结果；没有时间或状态变化时不用时间轴。 +- **反馈**：先画主链，再用一条回路说明反馈对象、触发信号和被调整的规则；不为视觉完整制造无意义闭环。 +- **防御**：按风险进入路径、控制层和失效后兜底组织纵深防线、闸门或漏斗；每层必须对应具体风险或控制动作。 +- **证据**：数据图表是主视觉，结论直接写在图表上方或邻近重点；装饰图标不能抢占面积。 +- **决策**：选项、标准、权衡和推荐必须同时可见；推荐项用唯一深蓝焦点或谨慎黄信号。 +- **行动**：用责任主体、动作、交付物、时间点和验证方式形成责任链或泳道；只写任务名的并列卡片不算行动方案。 + +整页流程只用于真实的顺序、因果链、阶段演进或反馈回路。并列条件、角色分工、控制层和证据集合应使用支撑结构、矩阵、层级、纵深防御或汇聚关系，禁止为了连接页面而强行加箭头。 + +基础证据双区页的默认构图为左侧 35%–42% 结论与解释、右侧 58%–65% 图表或主视觉。左侧回答“发生了什么、为什么重要”，右侧回答“证据或关系是什么”。普通内容页达到 6 页时，该轮廓至少占三分之一；右侧可使用数据图表、表格、关系图或信息流程。先按真实行数、实际字号、150% 行距和内边距算出解释正文所需高度，再放置下方结论块并至少留 16px；右侧 `standard-visual-title` 固定为 10pt 常规 `华文黑体_易方达`，图表先锁定类别标签槽，再在剩余区域绘制数据标记。浅蓝建议/结论框文字左对齐。表格页面按 [table-layout-contract.md](table-layout-contract.md) 选择三种模式：模式 A 可用细水平线，模式 B/C 只用青色表头、白/灰主体、少量整行高亮和留白建立层级。 + +## 4. 案例如何参与 + +完成内容蓝图和几何草图后，再查看 [layout-catalog.md](layout-catalog.md)。每页通常只提取一至两个视觉装置，例如实心底座、数字写法、阶段标签、连接线或图标家族。 + +允许继承： + +- 标题条、Logo、页脚、页码、版心与母版关系。 +- 字体、字号角色、品牌色角色、图标家族和线条风格。 +- 与当前信息关系适配的局部视觉装置。 + +不得默认继承： + +- 完整列数、全部坐标、模块宽度比例和阅读顺序。 +- 为源内容量定制的空白、占位或焦点位置。 +- 与新内容无关的装饰、截图式整页结构或多个等权空心框。 + +## 5. 三种构建模式 + +- 新内容和新正文页默认使用 `original-in-brand-shell`：从所选品牌来源的干净正文壳或白名单母版布局开始，自主构建正文。 +- 需要保留某个案例的局部图形组、图标组或视觉装置时，使用 `controlled-recomposition`，但正文几何仍由内容蓝图决定。 +- `reuse` 是封面的唯一合法模式；也用于其他固定标准页、明确续写同系列页面、用户要求保持原页版式，或下列资格全部满足的正文页。封面不得进入正文原创布局流程，须先按 [cover-contract.md](cover-contract.md) 选定标准配置。 + +正文页直接复用必须同时满足： + +1. 内容关系相同。 +2. 模块数量相同。 +3. 信息密度处于同一档。 +4. 主焦点层级与阅读顺序相同。 +5. 有明确复用原因，而不是“可以换字”。 + +任一项不满足，不得标记为 `reuse`。 + +## 6. 映射证据 + +原创或受控重组页先在页级记录 `moduleCount`，再在 `layoutDecision` 中至少记录： + +```json +{ + "contentStructure": "五类输入经三项治理机制汇聚为两类输出", + "readingOrder": "左侧输入 → 中央治理 → 右侧结果 → 底部结论", + "primaryVisual": "中央深蓝实心治理核心", + "geometryPlan": "5→3→2 非对称横向汇聚；中央区最宽", + "caseInfluence": ["V21 第23页：深蓝底座", "V21 第26页：连接线语法"], + "whyNotDirectReuse": "案例没有相同模块数和焦点层级", + "originalityEvidence": ["列数由5→3→2关系生成", "中央机制面积由重要性决定"] +} +``` + +同级模块另行记录可机器检查的网格： + +```json +{ + "alignmentGroups": [ + { + "name": "三项治理机制", + "objectIds": ["14", "15", "16"], + "checks": ["top", "width", "height", "horizontal-gap"], + "tolerancePx": 2 + } + ] +} +``` + +每个普通内容页同时记录： + +```json +{ + "visualTextBinding": { + "visualType": "diagram", + "supportsClaim": "统一治理把分散能力变成可规模复用、可追责的企业资产", + "textAnchor": "底部核心判断，Shape 20", + "sourceOrGeneration": "本页可编辑矩形与箭头，视觉语法取自唯一品牌来源", + "whyThisVisual": "五类输入、三项治理、两类结果需要同时呈现汇聚关系", + "informationCarried": "5→3→2 的数量变化、治理居中的层级和从输入到结果的方向", + "visualObjectIds": ["2", "3", "4", "5", "14", "15", "16", "17", "18"] + } +} +``` + +固定封面、目录、法务和纯结束页若确实没有信息视觉，可使用 `exempt: true`；封面必须写 `pageKind: "cover"`、具体原因、`coverProfile` 和 `sourceSlide`，并完全执行 [cover-contract.md](cover-contract.md)。例如目录/法务可使用 `{"visualTextBinding": {"exempt": true, "pageKind": "legal", "reason": "固定法务页必须保持标准文本结构"}}`。其他页面不得豁免。直接复用页在 `reuseEligibility` 中逐项记录关系、模块数、密度、焦点层级、阅读顺序五个一致性布尔值和 `reason`。同一正文轮廓最多连续使用两页；超过 8 页至少出现三种由内容关系驱动的明显不同结构。 + +## 7. 原创布局验收 + +- 每个主要块都能对应 `claim`、`evidence`、关系或阅读顺序。 +- 标题和结论可直接由业务负责人说出口，删除模板化反差、无证据排比和宏大口号。 +- 每个普通内容页具有可核对的 `visualTextBinding`；视觉对象真实存在、邻近文字锚点并承载独立信息，纯装饰不计。 +- 案例影响只落在品牌壳和局部视觉装置，不是完整几何复制。 +- 页面有唯一焦点，优先使用实心重点、浅色支撑和无框对齐；普通正文不出现三个及以上大面积空心线框。 +- 页面不存在外阴影、内阴影、预设阴影、发光伪阴影或半透明复制层伪阴影。 +- 所有对象可编辑、在安全区内、字号符合合同，连接线位于节点后方。 +- 顶栏标题保持单行并避开 Logo 保护带；普通内容页页脚四件套完整。 +- 正文角色左对齐、正文容器四侧内边距至少 10px；连接线与非端点文字至少相隔 8px。 +- 同级模块通过 `alignmentGroups` 的边缘、尺寸、中心线和间距检查。 +- 标准解释正文按实际行距仍完整落在框内，与下方结论块保留至少 16px；图表类别标签未被柱、点、面积或数值标签遮挡。 +- 图表/视觉标题为 10pt 常规 `华文黑体_易方达`，浅蓝建议/结论框左对齐；普通内容页达到 6 页时，基础证据双区页不少于三分之一。 +- 分组重点表和紧凑对比表正文无分隔线。 +- 多行正文不得用人工换行留下 1–4 个汉字的孤行；在宽度仍可调整时，应先改写、扩宽或拆分内容。 +- 逐页人工复核时回答：“为什么这个块在这里、为什么是这个尺寸？”若答案不能回到信息结构，必须重排。 +- 再回答：“删除任一连接线后，关系是否仍成立？把页面改成等宽三栏会丢失什么信息？”若没有明确答案，说明几何没有真正表达内容关系。 diff --git a/skills/efund-ppt-maker/references/privacy-contract.md b/skills/efund-ppt-maker/references/privacy-contract.md new file mode 100644 index 000000000..eac8ce8aa --- /dev/null +++ b/skills/efund-ppt-maker/references/privacy-contract.md @@ -0,0 +1,59 @@ +# PPT 隐私与脱敏约定 + +内置案例和对外成品都必须做到“无法从可见内容、隐藏部件或媒体文件恢复被清理的信息”。脱敏只改变具体身份和业务数值，不改变页面关系、品牌家具、字体层级、可编辑性和版式教学价值。 + +## 需要清理的内容 + +- 人员：姓名、账号、头像、邮箱、手机号、工号、编辑者和批注作者。 +- 业务：非公开项目名、客户或产品代号、精确经营指标、模型评测值、内部规模、预算、日期水印和运行截图。 +- 隐藏内容：演讲者备注正文、批注、人员部件、自定义属性、旧封面缩略图、本机路径和外部文件关系。 +- 嵌入对象：Excel、Word、PowerPoint 等嵌入 Office 文件的作者、自定义属性、外部关系和可识别文本。 +- 图片：截图、扫描件和表格图片中的姓名、账号、数值、时间戳或水印。 + +公开来源数据可以保留，但必须有明确来源且不会与内部经营数据混淆。无法确认公开性的内容一律按敏感信息处理。 + +## 脱敏方式 + +1. 人物姓名和账号改为“内部分享”“示例用户”等中性文本，不留空白姓名框。 +2. 精确指标改为自然语言量级或区间，例如“千亿级”“数百”“多数达到良好”。可编辑正文禁止使用 `XXX`、`待填写` 等模板提示语。 +3. 备注保留 Office 必需结构，但正文统一替换为“备注已脱敏”；兼容性优先时使用 `--clear-notes`，不要默认物理删除备注母版。 +4. 图片中的敏感内容必须替换底层媒体部件，或制作同尺寸、明确标注为匿名数据的示意图。禁止只在图片上覆盖矩形，因为遮罩可被移除。 +5. 修改必须在副本上进行。用户提供的原始文件不得覆盖；输出文件应使用新的名称或位于独立输出目录。 + +## 执行命令 + +```bash +python "$SKILL_DIR/scripts/sanitize_pptx_metadata.py" \ + "$SOURCE_PPTX" "$CLEAN_PPTX" \ + --replace-map "$REPLACEMENT_MAP" \ + --clear-notes --remove-comments --remove-thumbnails \ + --neutralize-external-links +``` + +图片部件替换示例： + +```bash +python "$SKILL_DIR/scripts/sanitize_pptx_metadata.py" \ + "$SOURCE_PPTX" "$CLEAN_PPTX" \ + --replace-part "ppt/media/image1.png=$SCRATCH/anonymous-image1.png" +``` + +每个项目把已识别的敏感字面值逐项加入隐私审计： + +```bash +python "$SKILL_DIR/scripts/audit_pptx_privacy.py" \ + "$CLEAN_PPTX" \ + --deny-text "<姓名或内部代号>" \ + --deny-text "<精确内部指标>" \ + --require-redacted-notes --require-no-comments \ + --require-no-thumbnails --require-no-external-links \ + --warnings-as-errors +``` + +## 验收 + +- 隐私审计必须为 `Errors: 0; Warnings: 0`。 +- 对 PPTX 外层和嵌入 Office 包进行全文搜索，不得命中敏感字面值、本机绝对路径或编辑者信息。 +- 重新渲染全部页面并逐页检查；重点放大封面、截图页、KPI 页、图表页和图片表格。 +- 对脱敏前后的结构 QA 进行比较，不得新增错误；原有模板警告只能按对象登记，不能扩散。 +- 确认页数、母版、布局、组合、图表、字体、图片裁切和可编辑性保持正常。 diff --git a/skills/efund-ppt-maker/references/runtime-compatibility.md b/skills/efund-ppt-maker/references/runtime-compatibility.md new file mode 100644 index 000000000..e3c90b8d0 --- /dev/null +++ b/skills/efund-ppt-maker/references/runtime-compatibility.md @@ -0,0 +1,187 @@ +# 运行环境兼容约定 + +本技能不绑定特定厂商、模型或办公套件。执行环境通过下列能力约定接入。 + +## 1. 必需能力 + +- 读取 PPTX 的页尺寸、母版、主题、文本、图片、图表、组合和对象几何。 +- 从指定源页复制幻灯片，并保持对象 ID 或建立稳定的新旧对象映射。 +- 从指定母版的命名布局新建幻灯片，并保留源母版画布尺寸、品牌构件和占位符语义；不得套用编辑引擎的默认页面尺寸。 +- 修改继承文本、图片、图表数据和基本图形，不破坏未修改对象。 +- 支持为新建文本对象写入稳定对象名、`textRole`、四侧 `textInsets`、逐 run 字号/字重/Latin 与 East Asian 字体，以及逐段百分比行距；标准证据双区页必须能保留 `standard-narrative-title`、`standard-narrative-body`、`standard-visual-title` 三个对象名，并在布局数据中导出真实行数、字号、字重和段落对齐，以检查 150% 行距、10pt 常规图表标题、正文左对齐和图形内文字安全距离。 +- 对封面源页与成品页执行对象级精确比对，包括画布、布局关系、Shape ID、坐标、尺寸、段落数、有效字号、字体、字重、文本框设置，以及布局层右侧品牌图的对象类型、媒体、裁切和其他品牌家具。 +- 能检查可见幻灯片对象的 DrawingML 效果列表；发现 `outerShdw`、`innerShdw` 或 `prstShdw` 时以 `shape-shadow-forbidden` 硬错误终止。 +- 按逻辑页序读取可见文本对象，并执行模板化句式与口号化表达检查；支持按页码和 Shape ID 记录有来源的例外。 +- 将每页渲染为 PNG，分辨率不低于 1600×900。 +- 导出逐页对象布局数据，至少包含页框、最终可见的继承与页面层对象、对象名称、类型、边界框、文本角色、文本、字体、字号、文本行数、段落对齐、文字内边距，以及形状的填充色、线条色和线宽。连接线还必须导出 `lineStart` / `lineEnd` 或 `points`，坐标与 `bbox` 使用同一归一化坐标系。 +- 执行 Python 3 标准库脚本；封面、结构、文案、字号、布局检查及属性清理脚本均不依赖第三方 Python 包。 +- 读取并注册技能内 `assets/fonts/STHeiti_YFD.ttf`；至少能在生成进程或渲染进程中把它解析为 `华文黑体_易方达` / `STHeiti_YFD`。字体资产先通过 `scripts/check_efund_font_asset.py` 的哈希和内部名称检查。 + +缺少“保真复制、逐页渲染、对象检查”中的任一项时，不得交付正式成品。 + +## 2. 路径约定 + +- 从 `SKILL.md` 所在目录解析 `SKILL_DIR`。 +- 模板、预览和品牌资产始终通过 `SKILL_DIR/assets/...` 访问。 +- 不在成品、记录或脚本参数中写入开发机器的用户名、主目录或绝对路径。 +- 临时文件写入独立 scratch 目录；正式输出只包含 PPTX 和用户要求的交付附件。 +- 对外发布前运行 `scripts/sanitize_pptx_metadata.py` 清理编辑者、修改者、时间戳、应用名称和自定义属性；清理后的 PPTX 必须重新通过结构 QA 与逐页渲染检查。 + +## 3. 布局 JSON 接口 + +每页输出一个 `*.layout.json`。推荐文件名为 `slide-001.layout.json`。最小结构： + +```json +{ + "slide": { + "slide": 1, + "frame": {"left": 0, "top": 0, "width": 960, "height": 540} + }, + "elements": [ + { + "id": "stable-object-id", + "name": "Title 1", + "kind": "text", + "textRole": "page-title", + "scope": "slide", + "bbox": [38, 22, 650, 28], + "text": "结论型标题", + "resolvedFontSize": 32, + "resolvedTextStyle": {"fontSize": 32, "fontFamily": "华文黑体_易方达"}, + "textLayout": {"lineCount": 1}, + "fillColor": "#005096", + "lineColor": "#005096", + "lineWidth": 0, + "paragraphs": [] + } + ] +} +``` + +`bbox` 单位使用归一化 960×540 画布像素，顺序为 `[x, y, width, height]`。若运行环境使用其他坐标系，导出时按比例转换。组合子元素可保留，但最终可见的母版/布局家具也必须展开到对象清单，`scope` 统一写 `slide`，否则无法检查完整页脚。`fillColor`、`lineColor` 和 `lineWidth` 对形状必须输出；无填充可写 `transparent` 或 `none`，无边线时 `lineWidth` 写 0。 + +正文、解释、模块说明、表格正文、来源、注释、建议和结论使用 `textRole`：`body`、`explanation`、`module-description`、`table-body`、`source`、`note`、`recommendation` 或 `conclusion`；这些角色必须导出实际段落对齐并左对齐。短节点标签、表头、指标数字和页码可分别使用 `node-label`、`table-header`、`metric-value`、`page-number`。含正文的图形导出 `textInsets: {"left": 12, "top": 10, "right": 12, "bottom": 10}`，四侧不得小于 10px。 + +连接线示例： + +```json +{ + "id": "connector-7", + "name": "relationship-connector", + "kind": "shape", + "geometry": "line", + "scope": "slide", + "bbox": [340, 180, 220, 90], + "lineStart": [340, 225], + "lineEnd": [560, 260], + "fromId": "node-2", + "toId": "node-5" +} +``` + +`fromId` / `toId` 只标记连接线合法接触的节点；不得把附近的普通文字对象登记为端点来绕过 8px 文字安全区检查。 + +## 4. 保真检查接口 + +`template-frame-map.json` 至少记录输出页、叙事角色、内容关系、构建模式、品牌来源、布局决策、图文语义绑定和对象操作。构建模式只允许 `reuse`、`controlled-recomposition`、`original-in-brand-shell`；新正文页默认使用 `original-in-brand-shell`。封面必须使用 `reuse`，并记录 `coverProfile` 与 `sourceSlide`。母版原创页额外记录 `reuseMode: "master-layout"`。案例复用或重组页记录 `sourceSlide`；品牌壳原创页记录干净 `sourceSlide` 或 `sourceLayout`。 + +`outputSlide` 与 `sourceSlide` 都是演示文稿中的 1-based 逻辑页码，不是压缩包内 `slideN.xml` 的文件编号。删除或重排页面后两者可能不同；检查器必须通过 `presentation.xml` 及其关系表解析实际 slide 部件。 + +顶层页数组固定命名为 `outputSlides`，不得使用 `pages` 或其他别名。最小骨架： + +```json +{ + "schemaVersion": "1.0", + "singleSourcePptx": "assets/efund-ai-platform-v21.pptx", + "outputSlides": [ + { + "outputSlide": 1, + "sourceSlide": 14, + "buildMode": "controlled-recomposition", + "moduleCount": 3, + "layoutDecision": { + "contentStructure": "比较", + "readingOrder": "左侧基线 → 中央差异 → 右侧建议", + "primaryVisual": "中央深蓝实心差异块", + "geometryPlan": "按证据量形成30/40/30非对称三段", + "caseInfluence": ["V21 第14页：大数字语法"], + "whyNotDirectReuse": "模块数与阅读顺序不同", + "originalityEvidence": ["列宽由证据量决定", "中央焦点由决策重要性决定"] + }, + "visualTextBinding": { + "visualType": "comparison-visual", + "supportsClaim": "共享治理先行在速度、风险和复用范围上更优", + "textAnchor": "底部推进建议，Shape 18", + "sourceOrGeneration": "本页可编辑矩形、比较分区和实心结论带", + "whyThisVisual": "两条路径需要在三个共同维度上同时比较并收束为推荐", + "informationCarried": "三项评价维度、两条路径差异和唯一推荐方向", + "visualObjectIds": ["3", "4", "5", "6", "7", "8", "9"] + }, + "alignmentGroups": [ + { + "name": "三项评价维度", + "objectIds": ["3", "4", "5"], + "checks": ["top", "width", "height", "horizontal-gap"], + "tolerancePx": 2 + } + ], + "editTargets": [] + } + ] +} +``` + +`original-in-brand-shell` 和 `controlled-recomposition` 的 `layoutDecision` 必须包含上述七个字段，且内容具体到本页。`moduleCount` 为 2 或更大时必须提供非空 `alignmentGroups`；每组至少包含两个 `objectIds`，`checks` 可使用 `left`、`right`、`top`、`bottom`、`width`、`height`、`center-x`、`center-y`、`horizontal-gap`、`vertical-gap`，`tolerancePx` 必须在 0–4 之间。只把语义同级的对象放在一组；非对称主焦点与辅助区不强求等宽，但仍应声明适用的顶部、底部或中心线约束。每个普通内容页的 `visualTextBinding` 必须包含 `visualType`、`supportsClaim`、`textAnchor`、`sourceOrGeneration`、`whyThisVisual`、`informationCarried` 和非空 `visualObjectIds`；检查器会核对对象 ID 是否存在于对应 `*.layout.json`。固定封面、目录、法务和纯结束页可使用 `exempt: true`，但必须填写允许的 `pageKind` 与具体 `reason`。封面声明 `pageKind: "cover"` 时，`coverProfile` 只能使用 [cover-contract.md](cover-contract.md) 的内置配置或 `user-template`，且 `buildMode` 必须为 `reuse`。`reuse` 还必须包含： + +```json +{ + "reuseEligibility": { + "sameRelationship": true, + "sameModuleCount": true, + "sameDensity": true, + "sameFocalHierarchy": true, + "sameReadingOrder": true, + "reason": "固定中文目录页，沿用标准目录版式" + } +} +``` + +任一布尔值为假、字段缺失或理由只是“可以换字”“看起来相近”，均不得使用 `reuse`。 + +所有对象变更统一放在 `editTargets` 中： + +- `rewrite`：原位改写继承对象，记录源 `shapeId`；成品 ID 改变时再记录 `finalShapeId`。 +- `rewrite-and-reposition`：改写并移动继承对象，除上述字段外记录目标区域和理由。 +- `delete`：删除继承对象，记录源 `shapeId` 和删除理由。 +- `add`：新增可编辑对象，记录 `finalShapeIds`、`textRole`、`expectedFontSizesPt` 或 `allowedFontSizesPt`、区域、理由及与继承对象的覆盖限制。 + +字号检查通过 `scripts/check_efund_typography.py` 比较继承 Shape 的可见字号集合，并核验原创 Shape 的字号合同。任何无法解析、找不到 Shape 或缺少字号声明的警告都必须处理。交付前比较 starter 与 final： + +- 顶栏标题对象使用 `page-title` / `textRole: page-title`，必须单行、左对齐且右边界停在 Logo 前 16px 保护带之外；两行、人工换行或侵入保护带分别触发 `wrapped-title` / `title-logo-clearance-violation`。 +- 普通内容页的标题条、Logo、页脚线、公司名、保密提示和页码不得缺失；页脚四件套不完整触发 `missing-brand-footer-furniture`。 +- 标题条、Logo、页脚线、公司名、保密提示和页码不得重复叠加；母版已提供的品牌构件不得在页面层再次绘制。 +- 未列入可编辑/删除清单的对象不得发生文本、媒体、几何或样式变化。 +- 继承图标和图片可用媒体哈希验证；相同资产应保持相同哈希。 +- 任何工具兼容性修复都写入 `deviation-log.txt`，注明页码、对象、原因、处理和渲染结论。 +- 普通正文页的三个及以上大面积空心线框容器会触发 `wireframe-heavy`；仅表格、矩阵、泳道或责任边界等语义明确的结构可人工说明后保留。 +- QA 必须把页脚分割线以上 8px 设为正文安全下沿。任何非页脚家具越过该线均触发 `footer-clearance-violation`。 +- 正文类 `textRole` 出现居中或右对齐时触发 `body-text-not-left-aligned`；含正文图形未导出 `textInsets` 或任一侧小于 10px 时，分别触发 `missing-text-insets` / `text-inset-clearance`。 +- 关系连接线未导出端点时触发 `connector-endpoints-missing`；线段进入非端点文字对象外扩 8px 的安全区时触发 `connector-text-clearance`。 +- `moduleCount >= 2` 的原创/受控重组页缺少 `alignmentGroups` 时触发 `missing-alignment-groups`；声明组内的边缘、尺寸、中心线或间距超出 `tolerancePx` 时触发 `alignment-group-violation`。 +- `standard-narrative-body` 的真实行数 × 实际字号 × 150% 行距加内边距若超过文本框，触发 `standard-narrative-text-overflow`；其真实文字底边与下方总结块间距不足 16px，触发 `narrative-callout-clearance`。 +- `standard-visual-title` 必须在结构 QA 中通过 10pt、常规、不加粗和显式 `华文黑体_易方达` 检查；任何偏差均为硬错误。 +- 名称含 `takeaway`、`recommendation`、`suggestion` 或 `advice` 的建议/结论框只要出现居中或右对齐段落，就触发 `advisory-callout-not-left-aligned`。 +- 普通内容页达到 6 页时，包含 `standard-narrative-title`、`standard-narrative-body`、`standard-visual-title` 三个具名对象的基础证据双区页必须不少于三分之一，否则触发 `insufficient-standard-evidence-layouts`。 +- 名称含 `label` 的图表类别标签与名称含 `bar`、`column`、`mark`、`point` 或 `area` 的数据标记相交时，触发 `chart-label-mark-overlap`。数值标签必须使用 `value` 或 `data-label` 命名以区别类别标签。 +- 模式 B 分组表对象使用 `grouped-table-*` 命名；其正文区存在 `rule` 或 `separator` 线条时，触发 `grouped-table-separator-line`。 +- `source`、`note`、`来源`、`注释`、`脚注` 等对象始终按正文内容检查，不得因为接近底部而被误判为页脚家具。 +- 原创或受控重组页缺少布局决策，或直接复用页缺少完整资格证明时，布局检查必须失败。 +- 普通内容页缺少图文语义绑定、声明的视觉对象不存在、理由空泛或仅有装饰作用时，布局检查必须失败。 +- 封面缺少 `coverProfile`、使用非 `reuse` 模式、源页不匹配，右侧品牌图缺失/换图/改裁切/被色块替代，或未通过 `scripts/check_efund_cover.py` 的逐对象精确比对时，必须失败。 +- 文案命中 `scripts/check_efund_writing_style.py` 的模板化反差、无证据排比或口号规则且没有逐 Shape 来源说明时，必须失败。 +- 任一可见幻灯片对象使用外阴影、内阴影或预设阴影时，结构检查必须失败。 +- 具名标准证据页文本不符合 15pt/12pt、标题加粗、正文 150% 行距或显式 `华文黑体_易方达` / Arial 时，结构检查必须失败。 + +## 5. 渲染判定 + +优先使用最终观看环境的渲染器；条件允许时再使用第二种独立渲染器交叉检查。两种渲染结果若在字体换行、图片裁切、透明度、阴影或图表上不一致，以风险更高的结果为准并修复。备用母版页还必须逐页检查布局名称、重复品牌构件、占位提示语和垂直重心。 diff --git a/skills/efund-ppt-maker/references/table-layout-contract.md b/skills/efund-ppt-maker/references/table-layout-contract.md new file mode 100644 index 000000000..c38dbb2d5 --- /dev/null +++ b/skills/efund-ppt-maker/references/table-layout-contract.md @@ -0,0 +1,67 @@ +# 易方达表格版式契约 + +本契约用于所有表格、清单式数据块和矩阵型信息页。目标是让表格像信息设计，而不是把 Excel 原样贴进幻灯片。 + +## 1. 共同硬规则 + +- 表格必须留在正文安全区内。表格、表题、注释和来源的底边必须至少高于页脚分割线 8px。 +- 表格上方先放 14–16pt 的蓝色表题；数据来源或口径说明放在表格附近，优先置于表格下方的正文区，禁止落入页脚。 +- 表头使用易方达青色，推荐 `#1EB9E1` 或模板中的等价青色；表头文字为白色、加粗、居中。 +- 正文以白色为主，分组、交替行或小计行使用浅灰色 `#E8E8E8`；深色正文推荐 `#4A4A4A`。 +- 不使用粗重外框，不默认绘制完整纵向网格。模式 A 可用细水平分隔线；模式 B/C 只用行底色、分组底色、留白和对齐建立层级，不画正文行分隔线。 +- 数字列右对齐或小数点对齐；同一列保持相同小数位、单位和正负号格式。 +- 中文说明、用途、影响、最低控制等表格正文左对齐；只有表头和短等级标签居中。不得把整列说明文字居中来制造“整齐”。新增表格文本分别声明 `table-header`、`table-body`、`numeric-column` 角色。 +- 中文使用易方达品牌字体，数字与英文可使用 Arial；表头 9–11pt，正文 9–11pt，关键数字 11–14pt。 +- 每张表只强调一个主要结论。整行青色高亮最多 1–2 行，避免多处同时抢夺注意力。 +- 同一行、列和合并分组的边界使用统一网格；需要由多个文本框/底板拼出表格时，在 `alignmentGroups` 中分别检查列左/右边缘、行顶/底边缘、列宽和行高，容差不超过 2px。 +- 当数据过密导致正文小于 9pt、行高不足或来源区被挤压时，必须拆页，不得向页脚侵占空间。 + +## 2. 模式 A：编号任务清单 + +适用于 3–5 个工作模块、职责模块、阶段产出或问题类型。 + +- 左侧使用大号青色序号 `1.`、`2.`、`3.` 建立扫描锚点。 +- 中间为模块名称，右侧为工作情况、关键动作或说明。 +- 顶部可使用一条青色表头，常见列名为“工作内容 / 工作情况”。 +- 正文仅使用细水平分隔线，不绘制完整单元格边框。 +- 右侧描述可使用灰色圆点列表；每个模块控制在 1–3 条，避免形成长段落。 +- 模块标题采用深灰色中等字号，序号比正文大 2–3 倍。 + +## 3. 模式 B：分组表格与重点行 + +适用于多层分类、渠道、部门、产品、岗位或阶段数据。 + +- 最左列可纵向合并同组分类，正文行保持白底。 +- 小计、阶段汇总或合计行使用浅灰底。 +- 需要强调的关键对象整行使用青色底、白色加粗文字；不要只给某一个数字着色而破坏行扫描。 +- 分类、名称、数值列按信息层级对齐；同组中的重复值可留空或合并，降低视觉噪音。 +- 表格可以较密，但必须保留清晰行距和至少 9pt 正文字号。 +- 正文区不得绘制横向分隔线，包括分组交界、小计行上下和重点行上下；白底、浅灰底、青色重点行和额外留白已经承担分组职责。 +- 为便于自动检查，本模式新增对象统一使用 `grouped-table-*` 前缀；不得新增 `grouped-table-*-rule`、`grouped-table-*-separator` 或同义线条对象。 + +## 4. 模式 C：紧凑对比表 + +适用于 3–5 个方案、年份、角色或指标的横向比较。 + +- 表头为青色；主体以白底与浅灰底交替区分。 +- 最后一行或结论行可使用整行青色高亮，表达“关键基准 / 推荐方案 / 核心结论”。 +- 正文区不画横向或纵向分隔线；通过白/浅灰交替底色和唯一青色结论行完成扫描。 +- 只保留必要行列；可在表格下方添加一行 7–8pt 的口径或来源说明。 +- 表格下方说明仍属于正文，必须位于页脚分割线之上，推荐底边不超过正文安全区下沿。 + +## 5. 选型规则 + +- 若读者需要理解“有哪些模块、每个模块做什么”，选择模式 A。 +- 若读者需要在分组中定位关键对象、观察小计或突出一行，选择模式 B。 +- 若读者需要比较少量方案或指标并快速得到结论，选择模式 C。 +- 若主要目的是呈现趋势、差距或占比，优先使用左文右图的数据证据页，而不是把趋势硬塞进大表格。 + +## 6. QA 检查 + +- 表题、表格、注释和来源是否全部位于页脚分割线之上？ +- 是否按模式建立层级：A 可用细水平线，B/C 只用底色、留白和对齐？ +- 模式 B/C 的正文区是否完全没有分隔线？ +- 是否只有一个主要高亮结论？ +- 数字格式、单位、对齐方式是否一致？ +- 是否存在小于 9pt 的正文，或被迫压缩的行高？ +- 表格是否选择了与信息任务匹配的 A、B、C 模式？ diff --git a/skills/efund-ppt-maker/references/typography-contract.md b/skills/efund-ppt-maker/references/typography-contract.md new file mode 100644 index 000000000..63af52fbe --- /dev/null +++ b/skills/efund-ppt-maker/references/typography-contract.md @@ -0,0 +1,117 @@ +# 字号保真契约 + +## 目录 + +1. 两条字号路径 +2. 原创字号阶梯 +3. 单位换算 +4. 映射要求 +5. 交付门禁 + +## 1. 两条字号路径 + +### 继承文本框 + +- 复用或重组继承文本框时，保持源 Shape 的可见字号集合和内部层级。移动或调整文本框尺寸不是改字号的理由。 +- 替换文案时逐段、逐 run 修改；源框含多个字号时，不得用一次纯字符串赋值把富文本层级压平。 +- 源 Shape 从版式或母版继承字号时，成品继续继承，不写入一个“看起来相同”的任意显式字号。 +- 文案放不下时依次压缩文案、重排对象、换构图或拆页，不启用自动缩字。 + +### 原创文本框 + +- 创建前先确定文本角色，并在整份材料中保持同一角色的主字号稳定。 +- 只使用本文件规定的离散字号阶梯，不生成 9.7pt、13.2pt 等为了“刚好塞下”的偶然字号。 +- 在 `template-frame-map.json` 中记录最终 Shape ID、文本角色和允许字号，让自动检查覆盖原创对象。 + +两条路径均须继续遵守中文 run 显式 `a:ea typeface="华文黑体_易方达"`、英文和数字 Arial、普通正文不小于 10pt 的规则。 + +字号角色同时决定对齐，不得拆开处理：页面标题、解释、普通正文、模块说明、表格正文、来源、注释、建议和结论使用左对齐；数字列右对齐；只有短节点标签、表头、指标数字、页码和源模板明确居中的短标签使用居中。每个新增文本对象在布局数据和映射中使用一致的 `textRole`。 + +## 2. 原创字号阶梯 + +| 文本角色 | 允许字号 | +|---|---| +| 正文页标题 | 23pt，白色、加粗、单行 | +| 页面大结论 | 18pt | +| 模块标题、引导句 | 14pt 或 16pt | +| 标准证据页解释标题 | 15pt，加粗 | +| 标准证据页图表/视觉标题 | 10pt，常规、不加粗 | +| 标准证据页解释正文 | 12pt，常规，150% 行距 | +| 普通正文 | 10pt、11pt 或 12pt | +| 图注、来源、页脚 | 7pt、8pt 或 9pt | +| 指标数字 | 20pt、24pt、28pt、32pt、36pt 或 44pt | +| 封底答谢词 | 45–54pt，以源封底为准 | + +同一角色在同一份材料中优先只选一个主字号。只有信息层级确有差异时使用相邻档位，不在相邻页面随意跳动。 + +## 3. 单位换算 + +PowerPoint OOXML 使用 pt。若编辑环境使用 96dpi 像素，换算为： + +> `像素字号 = PowerPoint pt × 4 / 3` + +例如 10pt 对应约 13.33px，18pt 对应 24px，23pt 对应约 30.67px。导出后仍必须以 PPTX 中实际 pt 值为准，不能只相信编辑环境显示值。 + +## 4. 映射要求 + +继承对象使用： + +```json +{ + "action": "rewrite-and-reposition", + "shapeId": "17", + "reason": "保留字号层级，仅重排正文位置" +} +``` + +原创文本对象使用： + +```json +{ + "action": "add", + "newPrimitiveAllowed": true, + "finalShapeIds": ["42", "43"], + "textRole": "body", + "allowedFontSizesPt": [10, 11, 12], + "zone": {"left": 0.4, "top": 1.05, "width": 9.2, "height": 4.0}, + "reason": "用实心数据对比结构表达核心差异", + "mustNotOverlapInherited": true +} +``` + +只写对象名称而不写最终 Shape ID，不能通过字号门禁。一个 `add` 目标包含多个文本角色时应拆成多个映射目标。 + +`body`、`body-text`、`paragraph`、`explanation`、`narrative-body`、`module-body`、`module-description`、`table-body`、`takeaway`、`recommendation`、`suggestion`、`advice`、`conclusion`、`source` 和 `note` 均属于强制左对齐角色。含正文的图形还必须导出四侧不少于 10px 的 `textInsets`。 + +纯图形、底板或连接线仍记录 `action: "add"` 和最终 Shape ID，但将 `textRole` 设为 `non-text-visual` 或 `non-text-connector`；字号检查器会跳过这些非文本目标。不得用 `non-text-*` 绕过含可见文字的对象。 + +标准证据双区页的三个文本对象必须使用稳定对象名和对应角色： + +- `standard-narrative-title`：15pt、加粗。 +- `standard-visual-title`：10pt、常规、不加粗，中文 run 显式使用 `华文黑体_易方达`。 +- `standard-narrative-body`：12pt、正文段落显式 150% 行距；完整长段不得全部加粗，局部关键词强调可保留。 + +`qa_efund_pptx.py` 会按对象名执行这组检查。该页型只在内容确实形成“解释 + 主视觉/证据”时使用，不是整稿配额。 + +## 5. 交付门禁 + +运行： + +```bash +python "$SKILL_DIR/scripts/check_efund_typography.py" \ + --source-pptx "$SOURCE_PPTX" \ + --final-pptx "$FINAL_PPTX" \ + --map "$QA_DIR/template-frame-map.json" \ + --json-output "$QA_DIR/efund-typography.json" \ + --strict --warnings-as-errors +``` + +纯母版新建页没有 `sourceSlide` 时可省略 `--source-pptx`，但所有新增文本仍须在映射中声明 Shape ID 和允许字号。 + +检查结果必须满足： + +- 继承对象的可见字号集合与源 Shape 一致。 +- 原创对象的实际字号均属于声明的允许阶梯。 +- 没有“找不到 Shape”“没有字号声明”或“字号无法解析”的未处理警告。 +- 具名标准证据页文本满足对象名对应的字号、字重、150% 行距和显式中英文字体合同；其中 `standard-visual-title` 必须为 10pt 常规、不加粗。 +- 例外必须逐 Shape 说明原因并使用 `--allow 输出页码:ShapeID` 放行；不得全局忽略。 diff --git a/skills/efund-ppt-maker/references/writing-style-contract.md b/skills/efund-ppt-maker/references/writing-style-contract.md new file mode 100644 index 000000000..f045d42ad --- /dev/null +++ b/skills/efund-ppt-maker/references/writing-style-contract.md @@ -0,0 +1,59 @@ +# 易方达 PPT 自然业务表达合同 + +PPT 文案应像业务负责人在会上直接陈述判断：对象明确、动作具体、结果可验证。避免通过对仗、反转、口号和抽象大词制造“有洞察”的表面效果。 + +## 核心规则 + +1. 标题优先使用“对象 + 变化/动作 + 结果”，正文补充证据、口径、责任主体或时间。 +2. 删除人为制造反差的模板句，尤其是“不是……而是……”“不只是……更是……”“不仅……更……”。 +3. 删除无法落到事实的口号，例如“开启新篇章”“打造新引擎”“实现价值跃迁”“让数据真正成为……”。 +4. 把抽象动词改成可观察动作：将“赋能”改为支持、缩短、减少、统一、自动推送；将“重塑”写清具体改变了哪个流程、岗位或责任；将“闭环”写清触发、处理、反馈和责任人。 +5. 每页只保留一个判断。能用数字、流程变化、责任变化或交付物说明时，不用“更智能、更高效、更安全”等排比。 +6. 不虚构对立面。确有两种方案需要比较时，用共同维度、数据和推荐结论呈现，不用修辞性反转代替证据。 +7. 法规原文、直接引语、正式口号和必须保留的既有品牌文案可例外，但须逐 Shape 记录来源和原因。 + +## 改写示例 + +| 避免 | 推荐 | +|---|---| +| 这不是一次工具升级，而是一场组织变革 | 本次建设同步调整工具、流程和岗位协作 | +| 平台不仅提升效率，更重塑业务模式 | 平台将材料整理时间从 2 小时缩短至 20 分钟，并把复核环节前移 | +| 让数据真正成为业务增长的新引擎 | 统一数据口径后，经营指标可直接进入周度决策看板 | +| 打造端到端智能闭环 | 系统识别异常后生成任务，责任人处理并回填结果 | +| 从被动响应走向主动洞察 | 指标达到阈值后，系统主动推送异常原因和待办 | +| 更智能、更高效、更安全 | 自动分类覆盖 80% 请求；平均处理时长下降 35%；高风险操作保留人工复核 | + +正常否定句不属于模板化修辞。例如“模型未通过回归测试，暂不发布”直接描述事实，应保留。 + +## 写作顺序 + +1. 写清对象：谁、哪个系统、哪条流程或哪类客户。 +2. 写清动作：新增、取消、统一、缩短、迁移、自动推送、人工复核。 +3. 写清结果：时长、数量、准确率、风险、责任边界或交付物。 +4. 删除不影响判断的形容词、副词和宏大背景。 +5. 朗读一遍；如果句子像宣传口号、行业白皮书摘要或无证据的演讲金句，重新改写。 + +## 自动门禁 + +```bash +python "$SKILL_DIR/scripts/check_efund_writing_style.py" "$FINAL_PPTX" \ + --map "$QA_DIR/template-frame-map.json" \ + --json-output "$QA_DIR/efund-writing-style.json" \ + --warnings-as-errors +``` + +检查器只扫描逻辑幻灯片中的可见文本对象，不扫描备注和画布外模板说明。法务页可通过映射中的 `pageKind: "legal"` 豁免。法规原文、直接引语或正式口号使用： + +```json +{ + "writingStyleExemptions": [ + { + "shapeId": "18", + "codes": ["contrast-not-but"], + "reason": "监管文件直接引语，保持原文" + } + ] +} +``` + +也可临时使用 `--allow 页码:ShapeID:规则代码`；不得全局关闭检查。每个例外必须具有可核验来源和具体原因。 diff --git a/skills/efund-ppt-maker/scripts/audit_pptx_privacy.py b/skills/efund-ppt-maker/scripts/audit_pptx_privacy.py new file mode 100644 index 000000000..bdd8d3274 --- /dev/null +++ b/skills/efund-ppt-maker/scripts/audit_pptx_privacy.py @@ -0,0 +1,266 @@ +#!/usr/bin/env python3 +"""Audit a PPTX and embedded Office packages for identifiable or hidden content.""" + +from __future__ import annotations + +import argparse +import io +import json +import re +import sys +import zipfile +from pathlib import Path +from typing import Any +from urllib.parse import unquote +from xml.etree import ElementTree as ET + +EMAIL_RE = re.compile(r"(?i)\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}\b") +PHONE_RE = re.compile(r"(? dict[str, str]: + return {"severity": severity, "code": code, "member": member, "message": message} + + +def local_name(tag: str) -> str: + return tag.rsplit("}", 1)[-1] + + +def xml_text_and_attributes(data: bytes) -> tuple[str, dict[str, list[str]]]: + try: + root = ET.fromstring(data) + except ET.ParseError: + return "", {} + texts: list[str] = [] + attrs: dict[str, list[str]] = {} + for element in root.iter(): + if local_name(element.tag) == "t" and element.text: + texts.append(element.text) + for name, value in element.attrib.items(): + attrs.setdefault(local_name(name), []).append(value) + return "".join(texts), attrs + + +def inspect_text( + text: str, + member: str, + deny_texts: tuple[str, ...], + findings: list[dict[str, str]], +) -> None: + for value in deny_texts: + if value and value in text: + findings.append(issue("error", "forbidden-text", member, "发现禁止保留的字面文本")) + for value in sorted(set(EMAIL_RE.findall(text))): + if value.lower().startswith(("xxx@", "example@")): + continue + findings.append(issue("warning", "possible-email", member, f"可能的邮箱：{value}")) + for value in sorted(set(PHONE_RE.findall(text))): + findings.append(issue("warning", "possible-phone", member, f"可能的手机号：{value}")) + if LOCAL_PATH_RE.search(text): + findings.append(issue("error", "local-path", member, "发现本机绝对路径")) + + +def inspect_relationships( + data: bytes, + member: str, + require_no_external_links: bool, + findings: list[dict[str, str]], +) -> None: + try: + root = ET.fromstring(data) + except ET.ParseError: + return + for relationship in root: + target = unquote(relationship.get("Target") or "") + if LOCAL_PATH_RE.search(target): + findings.append(issue("error", "local-relationship", member, "外部关系包含本机路径")) + if ( + require_no_external_links + and relationship.get("TargetMode") == "External" + and target.lower() != "about:blank" + ): + findings.append( + issue("error", "external-relationship", member, f"仍有外部关系：{target}") + ) + + +def inspect_core_metadata( + data: bytes, + member: str, + findings: list[dict[str, str]], +) -> None: + try: + root = ET.fromstring(data) + except ET.ParseError: + return + for element in root.iter(): + if local_name(element.tag) in {"creator", "lastModifiedBy"} and (element.text or "").strip(): + findings.append( + issue( + "error", + "editor-metadata", + member, + f"{local_name(element.tag)} 仍含可识别信息", + ) + ) + + +def inspect_notes_redaction( + data: bytes, + member: str, + findings: list[dict[str, str]], +) -> None: + try: + root = ET.fromstring(data) + except ET.ParseError: + return + for element in root.iter(): + if local_name(element.tag) != "t": + continue + value = (element.text or "").strip() + if value and not SAFE_NOTE_TEXT_RE.fullmatch(value): + findings.append( + issue("error", "unredacted-note-text", member, "备注正文仍含未脱敏文本") + ) + return + + +def inspect_package( + archive: zipfile.ZipFile, + *, + label: str, + deny_texts: tuple[str, ...], + require_no_notes: bool, + require_no_comments: bool, + require_no_thumbnails: bool, + require_no_external_links: bool, + require_redacted_notes: bool, + inspect_embedded: bool, +) -> list[dict[str, str]]: + findings: list[dict[str, str]] = [] + names = archive.namelist() + + if "docProps/custom.xml" in names: + findings.append(issue("error", "custom-properties", f"{label}:docProps/custom.xml", "仍有自定义属性")) + if require_no_notes: + for name in names: + if name.startswith(("ppt/notesSlides/", "ppt/notesMasters/")): + findings.append(issue("error", "notes-part", f"{label}:{name}", "仍有备注或备注母版")) + if require_no_comments: + for name in names: + if name.startswith(COMMENT_PREFIXES) or name in COMMENT_PARTS: + findings.append(issue("error", "comment-part", f"{label}:{name}", "仍有批注或人员部件")) + if require_no_thumbnails: + for name in names: + if name.startswith("docProps/thumbnail."): + findings.append(issue("error", "thumbnail-part", f"{label}:{name}", "仍有旧封面缩略图")) + + for name in names: + member = f"{label}:{name}" + payload = archive.read(name) + if name == "docProps/core.xml": + inspect_core_metadata(payload, member, findings) + if require_redacted_notes and name.startswith("ppt/notesSlides/") and name.endswith(".xml"): + inspect_notes_redaction(payload, member, findings) + if name.endswith(".rels"): + inspect_relationships(payload, member, require_no_external_links, findings) + if name.endswith((".xml", ".rels")): + text, attrs = xml_text_and_attributes(payload) + inspect_text(text, member, deny_texts, findings) + for key in ("descr", "title", "name", "Target"): + for value in attrs.get(key, []): + inspect_text(value, member, deny_texts, findings) + decoded = payload.decode("utf-8", errors="ignore") + for value in deny_texts: + if value and value in decoded and value not in text: + findings.append( + issue("error", "forbidden-text", member, "XML 属性或结构中发现禁止文本") + ) + if ( + inspect_embedded + and name.startswith("ppt/embeddings/") + and Path(name).suffix.lower() in EMBEDDED_SUFFIXES + ): + try: + with zipfile.ZipFile(io.BytesIO(payload), "r") as nested: + findings.extend( + inspect_package( + nested, + label=member, + deny_texts=deny_texts, + require_no_notes=False, + require_no_comments=False, + require_no_thumbnails=False, + require_no_external_links=require_no_external_links, + require_redacted_notes=False, + inspect_embedded=False, + ) + ) + except zipfile.BadZipFile: + findings.append( + issue("warning", "unreadable-embedded-package", member, "嵌入对象不是可审计的 Office ZIP") + ) + return findings + + +def main() -> int: + parser = argparse.ArgumentParser(description="检查 PPTX 的个人信息、隐藏内容和外部关系。") + parser.add_argument("pptx", type=Path) + parser.add_argument("--deny-text", action="append", default=[]) + parser.add_argument("--require-no-notes", action="store_true") + parser.add_argument("--require-redacted-notes", action="store_true") + parser.add_argument("--require-no-comments", action="store_true") + parser.add_argument("--require-no-thumbnails", action="store_true") + parser.add_argument("--require-no-external-links", action="store_true") + parser.add_argument("--warnings-as-errors", action="store_true") + parser.add_argument("--json-output", type=Path) + args = parser.parse_args() + + pptx = args.pptx.expanduser().resolve() + try: + with zipfile.ZipFile(pptx, "r") as archive: + broken = archive.testzip() + if broken: + print(f"Invalid PPTX member: {broken}", file=sys.stderr) + return 2 + findings = inspect_package( + archive, + label=pptx.name, + deny_texts=tuple(args.deny_text), + require_no_notes=args.require_no_notes, + require_no_comments=args.require_no_comments, + require_no_thumbnails=args.require_no_thumbnails, + require_no_external_links=args.require_no_external_links, + require_redacted_notes=args.require_redacted_notes, + inspect_embedded=True, + ) + except (OSError, zipfile.BadZipFile) as exc: + print(f"Cannot inspect PPTX: {exc}", file=sys.stderr) + return 2 + + report: dict[str, Any] = { + "pptx": str(pptx), + "errorCount": sum(item["severity"] == "error" for item in findings), + "warningCount": sum(item["severity"] == "warning" for item in findings), + "issues": findings, + } + if args.json_output: + args.json_output.parent.mkdir(parents=True, exist_ok=True) + args.json_output.write_text(json.dumps(report, ensure_ascii=False, indent=2), encoding="utf-8") + + print(f"Errors: {report['errorCount']}; Warnings: {report['warningCount']}") + for item in findings: + print(f"[{item['severity'].upper()}] {item['code']} {item['member']}: {item['message']}") + failed = report["errorCount"] > 0 or ( + args.warnings_as_errors and report["warningCount"] > 0 + ) + return 1 if failed else 0 + + +if __name__ == "__main__": + raise SystemExit(main()) diff --git a/skills/efund-ppt-maker/scripts/check_efund_cover.py b/skills/efund-ppt-maker/scripts/check_efund_cover.py new file mode 100644 index 000000000..ef7b67646 --- /dev/null +++ b/skills/efund-ppt-maker/scripts/check_efund_cover.py @@ -0,0 +1,756 @@ +#!/usr/bin/env python3 +"""Verify an E Fund cover against an exact built-in or user-supplied reference.""" + +from __future__ import annotations + +import argparse +import hashlib +import json +import posixpath +import sys +import zipfile +from dataclasses import dataclass +from pathlib import Path +from typing import Any +from xml.etree import ElementTree as ET + +P = "http://schemas.openxmlformats.org/presentationml/2006/main" +A = "http://schemas.openxmlformats.org/drawingml/2006/main" +R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships" +PR = "http://schemas.openxmlformats.org/package/2006/relationships" +NS = {"p": P, "a": A, "r": R} +EMU_TOLERANCE = 0 +FONT_TOLERANCE_PT = 0.01 + +PROFILES = { + "v6-cn-simple": ("efund-template-v6.pptx", 2), + "v6-cn-subtitle": ("efund-template-v6.pptx", 3), + "v6-bilingual": ("efund-template-v6.pptx", 4), + "v6-english": ("efund-template-v6.pptx", 5), + "v6-co-brand": ("efund-template-v6.pptx", 6), + "ai-tech-internal": ("efund-ai-platform-v21.pptx", 1), +} + +REQUIRED_COVER_PICTURES = {profile: "6" for profile in PROFILES} + + +@dataclass +class PackageView: + path: Path + archive: zipfile.ZipFile + canvas: tuple[int, int] + theme_fonts: dict[str, str] + default_font_size: float + + +def issue(code: str, message: str, scope: str = "cover") -> dict[str, str]: + return {"severity": "error", "code": code, "scope": scope, "message": message} + + +def xml_root(package: PackageView, part: str) -> ET.Element: + return ET.fromstring(package.archive.read(part)) + + +def rels_part(part: str) -> str: + folder, name = posixpath.split(part) + return posixpath.join(folder, "_rels", f"{name}.rels") + + +def relationships(package: PackageView, part: str) -> dict[str, tuple[str, str]]: + rel_part = rels_part(part) + if rel_part not in package.archive.namelist(): + return {} + root = xml_root(package, rel_part) + result: dict[str, tuple[str, str]] = {} + for rel in root.findall(f"{{{PR}}}Relationship"): + rel_id = rel.get("Id") + target = rel.get("Target") + if not rel_id or not target: + continue + result[rel_id] = (target, rel.get("TargetMode") or "Internal") + return result + + +def resolve_target(part: str, target: str) -> str: + if target.startswith("/"): + return target.lstrip("/") + return posixpath.normpath(posixpath.join(posixpath.dirname(part), target)) + + +def presentation_metadata(archive: zipfile.ZipFile) -> tuple[tuple[int, int], float]: + root = ET.fromstring(archive.read("ppt/presentation.xml")) + size = root.find("p:sldSz", NS) + if size is None: + raise ValueError("ppt/presentation.xml 缺少 p:sldSz") + canvas = (int(size.get("cx") or 0), int(size.get("cy") or 0)) + default_size = 18.0 + default_rpr = root.find(".//p:defaultTextStyle/a:lvl1pPr/a:defRPr", NS) + if default_rpr is not None and default_rpr.get("sz"): + default_size = int(default_rpr.get("sz") or 1800) / 100 + return canvas, default_size + + +def theme_fonts(archive: zipfile.ZipFile) -> dict[str, str]: + candidates = sorted(name for name in archive.namelist() if name.startswith("ppt/theme/theme")) + result = { + "+mj-lt": "Arial", + "+mn-lt": "Arial", + "+mj-ea": "华文黑体_易方达", + "+mn-ea": "华文黑体_易方达", + } + if not candidates: + return result + root = ET.fromstring(archive.read(candidates[0])) + for token, path in { + "+mj-lt": ".//a:fontScheme/a:majorFont/a:latin", + "+mj-ea": ".//a:fontScheme/a:majorFont/a:ea", + "+mn-lt": ".//a:fontScheme/a:minorFont/a:latin", + "+mn-ea": ".//a:fontScheme/a:minorFont/a:ea", + }.items(): + node = root.find(path, NS) + if node is not None and node.get("typeface"): + result[token] = str(node.get("typeface")) + return result + + +def open_package(path: Path) -> PackageView: + archive = zipfile.ZipFile(path) + canvas, default_size = presentation_metadata(archive) + return PackageView(path, archive, canvas, theme_fonts(archive), default_size) + + +def logical_slide_part(package: PackageView, number: int) -> str: + if number < 1: + raise ValueError("页码必须为 1-based 正整数") + root = xml_root(package, "ppt/presentation.xml") + slide_ids = root.findall("./p:sldIdLst/p:sldId", NS) + if number > len(slide_ids): + raise ValueError(f"文件不存在第 {number} 个逻辑页") + rel_id = slide_ids[number - 1].get(f"{{{R}}}id") + target = relationships(package, "ppt/presentation.xml").get(str(rel_id)) + if not target or target[1] != "Internal": + raise ValueError(f"无法解析第 {number} 个逻辑页") + return resolve_target("ppt/presentation.xml", target[0]) + + +def linked_layout_part(package: PackageView, part: str) -> str: + rels = relationships(package, part) + for target, mode in rels.values(): + if mode == "Internal" and "slideLayout" in target: + return resolve_target(part, target) + raise ValueError(f"{part} 没有 slideLayout 关系") + + +def object_id(element: ET.Element) -> str | None: + node = element.find(".//p:cNvPr", NS) + return node.get("id") if node is not None else None + + +def element_kind(element: ET.Element) -> str: + return element.tag.rsplit("}", 1)[-1] + + +def element_geometry(element: ET.Element) -> tuple[int, int, int, int] | None: + xfrm = element.find("./p:spPr/a:xfrm", NS) + if xfrm is None: + xfrm = element.find("./p:grpSpPr/a:xfrm", NS) + if xfrm is not None: + off = xfrm.find("a:off", NS) + ext = xfrm.find("a:ext", NS) + else: + xfrm = element.find("./p:xfrm", NS) + if xfrm is None: + return None + off = xfrm.find("a:off", NS) + ext = xfrm.find("a:ext", NS) + if off is None or ext is None: + return None + return ( + int(off.get("x") or 0), + int(off.get("y") or 0), + int(ext.get("cx") or 0), + int(ext.get("cy") or 0), + ) + + +def on_canvas(box: tuple[int, int, int, int], canvas: tuple[int, int]) -> bool: + x, y, width, height = box + return x < canvas[0] and y < canvas[1] and x + width > 0 and y + height > 0 + + +def shape_tree_objects(root: ET.Element, canvas: tuple[int, int]) -> dict[str, ET.Element]: + tree = root.find(".//p:spTree", NS) + if tree is None: + return {} + result: dict[str, ET.Element] = {} + for element in list(tree): + if element_kind(element) not in {"sp", "pic", "graphicFrame", "cxnSp", "grpSp"}: + continue + identifier = object_id(element) + geometry = element_geometry(element) + if identifier and geometry and on_canvas(geometry, canvas): + result[identifier] = element + return result + + +def normalize_font(package: PackageView, value: str | None, east_asian: bool) -> str: + fallback = "+mj-ea" if east_asian else "+mj-lt" + chosen = value or fallback + chosen = package.theme_fonts.get(chosen, chosen) + return chosen.strip().casefold() + + +def is_east_asian(text: str) -> bool: + return any("\u2e80" <= char <= "\u9fff" for char in text) + + +def inherited_rpr(paragraph: ET.Element) -> ET.Element | None: + value = paragraph.find("./a:pPr/a:defRPr", NS) + return value if value is not None else paragraph.find("./a:endParaRPr", NS) + + +def xml_signature( + element: ET.Element | None, + ignored_attributes: set[str] | None = None, +) -> tuple[Any, ...] | None: + if element is None: + return None + ignored = ignored_attributes or set() + tag = element.tag.rsplit("}", 1)[-1] + attributes = tuple( + sorted((name, value) for name, value in element.attrib.items() if name not in ignored) + ) + children = tuple(xml_signature(child, ignored) for child in list(element)) + return tag, attributes, children + + +def run_style( + package: PackageView, + run: ET.Element, + paragraph: ET.Element, +) -> tuple[float, str, str, bool, bool]: + text_node = run.find("./a:t", NS) + text = text_node.text if text_node is not None and text_node.text else "" + rpr = run.find("./a:rPr", NS) + if rpr is None: + rpr = inherited_rpr(paragraph) + size = package.default_font_size + bold = False + italic = False + latin: str | None = None + east: str | None = None + text_color = "" + if rpr is not None: + if rpr.get("sz"): + size = int(rpr.get("sz") or 0) / 100 + bold = rpr.get("b") in {"1", "true"} + italic = rpr.get("i") in {"1", "true"} + latin_node = rpr.find("a:latin", NS) + east_node = rpr.find("a:ea", NS) + latin = latin_node.get("typeface") if latin_node is not None else None + east = east_node.get("typeface") if east_node is not None else None + text_color = repr(xml_signature(rpr.find("./a:solidFill", NS))) + return ( + size, + normalize_font(package, latin, False), + normalize_font(package, east, True), + bold, + italic, + text_color, + ) + + +def paragraph_signature(package: PackageView, paragraph: ET.Element) -> dict[str, Any]: + text = "".join(node.text or "" for node in paragraph.findall(".//a:t", NS)) + runs = paragraph.findall("./a:r", NS) + paragraph.findall("./a:fld", NS) + styles = {run_style(package, run, paragraph) for run in runs} + if not styles: + pseudo = ET.Element(f"{{{A}}}r") + styles = {run_style(package, pseudo, paragraph)} + ppr = paragraph.find("./a:pPr", NS) + return { + "hasEastAsianText": is_east_asian(text), + "styles": sorted(styles), + "alignment": ppr.get("algn") if ppr is not None else None, + "level": ppr.get("lvl") if ppr is not None else None, + "paragraphFormat": repr(xml_signature(ppr)), + } + + +def body_signature(package: PackageView, element: ET.Element) -> dict[str, Any] | None: + body = element.find("./p:txBody", NS) + if body is None: + return None + paragraphs = body.findall("./a:p", NS) + body_pr = body.find("./a:bodyPr", NS) + return { + "paragraphCount": len(paragraphs), + "paragraphs": [paragraph_signature(package, paragraph) for paragraph in paragraphs], + "bodyPr": repr(xml_signature(body_pr)), + } + + +def shape_style_signature(element: ET.Element) -> tuple[Any, ...] | None: + properties = element.find("./p:spPr", NS) + if properties is None: + properties = element.find("./p:grpSpPr", NS) + if properties is None: + return None + fill = next( + ( + properties.find(f"./a:{name}", NS) + for name in ("solidFill", "gradFill", "pattFill", "blipFill", "noFill") + if properties.find(f"./a:{name}", NS) is not None + ), + None, + ) + line = properties.find("./a:ln", NS) + xfrm = properties.find("./a:xfrm", NS) + transform_attributes = ( + tuple(sorted(xfrm.attrib.items())) if xfrm is not None else tuple() + ) + geometry = properties.find("./a:prstGeom", NS) + return ( + xml_signature(fill), + xml_signature(line), + transform_attributes, + xml_signature(geometry), + ) + + +def picture_crop_signature(element: ET.Element) -> tuple[Any, ...] | None: + fill = element.find("./p:blipFill", NS) + if fill is None: + return None + ignored = {f"{{{R}}}embed", f"{{{R}}}link"} + return xml_signature(fill, ignored) + + +def element_text(element: ET.Element) -> str: + return "\n".join( + "".join(node.text or "" for node in paragraph.findall(".//a:t", NS)) + for paragraph in element.findall("./p:txBody/a:p", NS) + ) + + +def media_hash(package: PackageView, part: str, element: ET.Element) -> str | None: + blip = element.find(".//a:blip", NS) + if blip is None: + return None + rel_id = blip.get(f"{{{R}}}embed") + if not rel_id: + return None + target = relationships(package, part).get(rel_id) + if not target or target[1] != "Internal": + return None + media_part = resolve_target(part, target[0]) + if media_part not in package.archive.namelist(): + return None + return hashlib.sha256(package.archive.read(media_part)).hexdigest() + + +def compare_geometry( + reference: tuple[int, int, int, int], + final: tuple[int, int, int, int], +) -> bool: + return all(abs(a - b) <= EMU_TOLERANCE for a, b in zip(reference, final)) + + +def compare_text( + reference_package: PackageView, + reference_element: ET.Element, + final_package: PackageView, + final_element: ET.Element, + identifier: str, + scope: str, +) -> list[dict[str, str]]: + reference = body_signature(reference_package, reference_element) + final = body_signature(final_package, final_element) + if reference is None and final is None: + return [] + if reference is None or final is None: + return [issue("cover-text-body-mismatch", f"Shape ID {identifier} 文本框结构已改变", scope)] + findings: list[dict[str, str]] = [] + if reference["paragraphCount"] != final["paragraphCount"]: + findings.append( + issue( + "cover-paragraph-count-mismatch", + f"Shape ID {identifier} 段落数必须为 {reference['paragraphCount']}，实际为 {final['paragraphCount']}", + scope, + ) + ) + return findings + if reference["bodyPr"] != final["bodyPr"]: + findings.append( + issue( + "cover-textbox-margins-mismatch", + f"Shape ID {identifier} 的文本框边距、锚点或换行设置已改变", + scope, + ) + ) + for index, (expected, actual) in enumerate( + zip(reference["paragraphs"], final["paragraphs"]), start=1 + ): + if ( + expected["alignment"] != actual["alignment"] + or expected["level"] != actual["level"] + or expected["paragraphFormat"] != actual["paragraphFormat"] + ): + findings.append( + issue( + "cover-paragraph-layout-mismatch", + f"Shape ID {identifier} 第 {index} 段的对齐或层级已改变", + scope, + ) + ) + expected_styles = expected["styles"] + actual_styles = actual["styles"] + if len(expected_styles) != len(actual_styles): + expected_sizes = sorted({style[0] for style in expected_styles}) + actual_sizes = sorted({style[0] for style in actual_styles}) + if expected_sizes != actual_sizes: + findings.append( + issue( + "cover-font-size-mismatch", + f"Shape ID {identifier} 第 {index} 段字号集合必须为 {expected_sizes}pt，实际为 {actual_sizes}pt", + scope, + ) + ) + findings.append( + issue( + "cover-font-style-mismatch", + f"Shape ID {identifier} 第 {index} 段出现了额外字号、字体或字重", + scope, + ) + ) + continue + for expected_style, actual_style in zip(expected_styles, actual_styles): + size_matches = abs(expected_style[0] - actual_style[0]) <= FONT_TOLERANCE_PT + other_matches = expected_style[1:] == actual_style[1:] + if not size_matches: + findings.append( + issue( + "cover-font-size-mismatch", + f"Shape ID {identifier} 第 {index} 段字号必须为 {expected_style[0]:g}pt，实际为 {actual_style[0]:g}pt", + scope, + ) + ) + if not other_matches: + findings.append( + issue( + "cover-font-style-mismatch", + f"Shape ID {identifier} 第 {index} 段的字体、字重或斜体与标准封面不一致", + scope, + ) + ) + return findings + + +def check_required_cover_picture( + profile: str, + reference_package: PackageView, + reference_part: str, + final_package: PackageView, + final_part: str, +) -> list[dict[str, str]]: + identifier = REQUIRED_COVER_PICTURES[profile] + reference_objects = shape_tree_objects( + xml_root(reference_package, reference_part), reference_package.canvas + ) + final_objects = shape_tree_objects( + xml_root(final_package, final_part), final_package.canvas + ) + reference_element = reference_objects.get(identifier) + final_element = final_objects.get(identifier) + if reference_element is None or element_kind(reference_element) != "pic": + return [ + issue( + "cover-reference-brand-picture-invalid", + f"内置配置 {profile} 的标准封面右侧品牌图 Shape ID {identifier} 缺失；" + "不得以色块作为封面检查基准", + "cover-layout", + ) + ] + if final_element is None or element_kind(final_element) != "pic": + return [ + issue( + "cover-required-brand-picture-missing", + f"标准封面右侧品牌图 Shape ID {identifier} 必须保留为图片对象；" + "禁止删除、重绘或替换为实心色块", + "cover-layout", + ) + ] + findings: list[dict[str, str]] = [] + reference_geometry = element_geometry(reference_element) + final_geometry = element_geometry(final_element) + if ( + reference_geometry is None + or final_geometry is None + or not compare_geometry(reference_geometry, final_geometry) + ): + findings.append( + issue( + "cover-required-brand-picture-geometry-mismatch", + f"标准封面右侧品牌图 Shape ID {identifier} 坐标或尺寸必须为 " + f"{reference_geometry}，实际为 {final_geometry}", + "cover-layout", + ) + ) + if picture_crop_signature(reference_element) != picture_crop_signature(final_element): + findings.append( + issue( + "cover-required-brand-picture-crop-mismatch", + f"标准封面右侧品牌图 Shape ID {identifier} 的裁切、拉伸或图片效果已改变", + "cover-layout", + ) + ) + if media_hash(reference_package, reference_part, reference_element) != media_hash( + final_package, final_part, final_element + ): + findings.append( + issue( + "cover-required-brand-picture-media-mismatch", + f"标准封面右侧品牌图 Shape ID {identifier} 必须使用内置源图媒体", + "cover-layout", + ) + ) + return findings + + +def compare_part( + reference_package: PackageView, + reference_part: str, + final_package: PackageView, + final_part: str, + *, + scope: str, + allowed_picture_replacements: set[str], +) -> list[dict[str, str]]: + reference_root = xml_root(reference_package, reference_part) + final_root = xml_root(final_package, final_part) + reference_objects = shape_tree_objects(reference_root, reference_package.canvas) + final_objects = shape_tree_objects(final_root, final_package.canvas) + findings: list[dict[str, str]] = [] + if scope == "cover-layout": + reference_canvas = reference_root.find("./p:cSld", NS) + final_canvas = final_root.find("./p:cSld", NS) + reference_name = reference_canvas.get("name") if reference_canvas is not None else None + final_name = final_canvas.get("name") if final_canvas is not None else None + if reference_name != final_name: + findings.append( + issue( + "cover-layout-name-mismatch", + f"封面布局名称必须为 {reference_name!r}，实际为 {final_name!r}", + scope, + ) + ) + for attribute in ("showMasterSp", "userDrawn"): + if reference_root.get(attribute) != final_root.get(attribute): + findings.append( + issue( + "cover-layout-contract-mismatch", + f"封面布局属性 {attribute} 已改变", + scope, + ) + ) + missing = sorted(set(reference_objects) - set(final_objects), key=int) + extra = sorted(set(final_objects) - set(reference_objects), key=int) + if missing: + findings.append( + issue("cover-object-missing", "缺少标准对象 Shape ID：" + "、".join(missing), scope) + ) + if extra: + findings.append( + issue("cover-extra-object", "出现未授权可见对象 Shape ID：" + "、".join(extra), scope) + ) + for identifier in sorted(set(reference_objects) & set(final_objects), key=int): + reference_element = reference_objects[identifier] + final_element = final_objects[identifier] + if element_kind(reference_element) != element_kind(final_element): + findings.append( + issue( + "cover-object-type-mismatch", + f"Shape ID {identifier} 类型必须为 {element_kind(reference_element)}", + scope, + ) + ) + continue + reference_geometry = element_geometry(reference_element) + final_geometry = element_geometry(final_element) + if ( + reference_geometry is None + or final_geometry is None + or not compare_geometry(reference_geometry, final_geometry) + ): + findings.append( + issue( + "cover-geometry-mismatch", + f"Shape ID {identifier} 坐标或尺寸必须为 {reference_geometry}，实际为 {final_geometry}", + scope, + ) + ) + if shape_style_signature(reference_element) != shape_style_signature(final_element): + findings.append( + issue( + "cover-shape-style-mismatch", + f"Shape ID {identifier} 的填充、线条、旋转或几何样式已改变", + scope, + ) + ) + if picture_crop_signature(reference_element) != picture_crop_signature(final_element): + findings.append( + issue( + "cover-picture-crop-mismatch", + f"Shape ID {identifier} 的图片裁切或图片效果已改变", + scope, + ) + ) + findings.extend( + compare_text( + reference_package, + reference_element, + final_package, + final_element, + identifier, + scope, + ) + ) + if scope == "cover-layout" and element_text(reference_element) != element_text(final_element): + findings.append( + issue( + "cover-brand-text-mismatch", + f"Shape ID {identifier} 的布局层品牌文字已改变", + scope, + ) + ) + if ( + element_kind(reference_element) == "pic" + and identifier not in allowed_picture_replacements + ): + if media_hash(reference_package, reference_part, reference_element) != media_hash( + final_package, final_part, final_element + ): + findings.append( + issue( + "cover-brand-media-mismatch", + f"Shape ID {identifier} 的品牌图片部件已改变", + scope, + ) + ) + return findings + + +def main() -> int: + parser = argparse.ArgumentParser(description="按易方达封面硬合同检查字号、位置和品牌家具。") + parser.add_argument("final_pptx", type=Path) + parser.add_argument("--final-slide", type=int, default=1) + parser.add_argument("--profile", choices=sorted(PROFILES)) + parser.add_argument("--reference-pptx", type=Path) + parser.add_argument("--reference-slide", type=int) + parser.add_argument( + "--allow-picture-replacement", + action="append", + default=[], + metavar="SHAPE_ID", + help="用户模板中明确允许替换底层媒体的既有图片 Shape ID；可重复", + ) + parser.add_argument("--json-output", type=Path) + args = parser.parse_args() + + if args.profile: + if args.reference_pptx or args.reference_slide or args.allow_picture_replacement: + parser.error( + "--profile 不能与 --reference-pptx/--reference-slide/--allow-picture-replacement 同时使用" + ) + asset_name, reference_slide = PROFILES[args.profile] + reference_path = Path(__file__).resolve().parent.parent / "assets" / asset_name + allowed_picture_replacements = ( + {"10", "11", "12"} if args.profile == "v6-co-brand" else set() + ) + else: + if not args.reference_pptx or not args.reference_slide: + parser.error("必须提供 --profile，或同时提供 --reference-pptx 和 --reference-slide") + reference_path = args.reference_pptx.expanduser().resolve() + reference_slide = args.reference_slide + allowed_picture_replacements = set(args.allow_picture_replacement) + + final_path = args.final_pptx.expanduser().resolve() + reference_path = reference_path.expanduser().resolve() + findings: list[dict[str, str]] = [] + try: + reference_package = open_package(reference_path) + final_package = open_package(final_path) + try: + if reference_package.canvas != final_package.canvas: + findings.append( + issue( + "cover-canvas-mismatch", + f"画布必须为 {reference_package.canvas} EMU，实际为 {final_package.canvas} EMU", + ) + ) + reference_slide_part = logical_slide_part(reference_package, reference_slide) + final_slide_part = logical_slide_part(final_package, args.final_slide) + findings.extend( + compare_part( + reference_package, + reference_slide_part, + final_package, + final_slide_part, + scope="cover-slide", + allowed_picture_replacements=allowed_picture_replacements, + ) + ) + reference_layout = linked_layout_part(reference_package, reference_slide_part) + final_layout = linked_layout_part(final_package, final_slide_part) + if args.profile: + findings.extend( + check_required_cover_picture( + args.profile, + reference_package, + reference_layout, + final_package, + final_layout, + ) + ) + findings.extend( + compare_part( + reference_package, + reference_layout, + final_package, + final_layout, + scope="cover-layout", + allowed_picture_replacements=set(), + ) + ) + finally: + reference_package.archive.close() + final_package.archive.close() + except (OSError, KeyError, ValueError, zipfile.BadZipFile, ET.ParseError) as exc: + findings.append(issue("cover-check-failed", str(exc))) + + report = { + "finalPptx": str(final_path), + "finalSlide": args.final_slide, + "profile": args.profile, + "referencePptx": str(reference_path), + "referenceSlide": reference_slide, + "errorCount": len(findings), + "warningCount": 0, + "issues": findings, + } + if args.json_output: + args.json_output.parent.mkdir(parents=True, exist_ok=True) + args.json_output.write_text( + json.dumps(report, ensure_ascii=False, indent=2), + encoding="utf-8", + ) + print(f"Errors: {report['errorCount']}; Warnings: 0") + for finding in findings: + print( + f"[ERROR] {finding['code']} scope={finding['scope']}: {finding['message']}" + ) + return 1 if findings else 0 + + +if __name__ == "__main__": + sys.exit(main()) diff --git a/skills/efund-ppt-maker/scripts/check_efund_font_asset.py b/skills/efund-ppt-maker/scripts/check_efund_font_asset.py new file mode 100644 index 000000000..fa56b84f6 --- /dev/null +++ b/skills/efund-ppt-maker/scripts/check_efund_font_asset.py @@ -0,0 +1,74 @@ +#!/usr/bin/env python3 +"""Verify the bundled EFund Chinese font asset without third-party packages.""" + +from __future__ import annotations + +import argparse +import hashlib +import json +import sys +from pathlib import Path + +EXPECTED_SHA256 = "c371bf3656aefdec1a056b461c8c9ef6d1b367105eb6cedcb23ade7687de5e92" +EXPECTED_NAMES = ("华文黑体_易方达", "STHeiti_YFD") + + +def main() -> int: + parser = argparse.ArgumentParser(description="检查技能内华文黑体_易方达字体资产。") + parser.add_argument( + "font", + nargs="?", + type=Path, + default=Path(__file__).resolve().parent.parent / "assets" / "fonts" / "STHeiti_YFD.ttf", + ) + parser.add_argument("--json-output", type=Path) + args = parser.parse_args() + + font = args.font.expanduser().resolve() + errors: list[str] = [] + if not font.is_file(): + errors.append(f"字体文件不存在：{font}") + payload = b"" + else: + payload = font.read_bytes() + + digest = hashlib.sha256(payload).hexdigest() if payload else None + if digest and digest != EXPECTED_SHA256: + errors.append(f"SHA-256 不匹配：{digest}") + + signature = payload[:4] + if payload and signature not in {b"\x00\x01\x00\x00", b"OTTO", b"ttcf"}: + errors.append(f"不是受支持的 OpenType/TrueType 字体签名：{signature!r}") + + found_names: list[str] = [] + for name in EXPECTED_NAMES: + encoded_variants = (name.encode("utf-8"), name.encode("utf-16-be")) + if any(value in payload for value in encoded_variants): + found_names.append(name) + else: + errors.append(f"字体内部未找到名称：{name}") + + report = { + "font": str(font), + "bytes": len(payload), + "sha256": digest, + "expectedSha256": EXPECTED_SHA256, + "foundNames": found_names, + "errorCount": len(errors), + "errors": errors, + } + if args.json_output: + args.json_output.parent.mkdir(parents=True, exist_ok=True) + args.json_output.write_text(json.dumps(report, ensure_ascii=False, indent=2), encoding="utf-8") + + print(f"Font: {font}") + print(f"SHA-256: {digest or 'missing'}") + print(f"Names: {', '.join(found_names) or 'none'}") + print(f"Errors: {len(errors)}") + for error in errors: + print(f"[ERROR] {error}") + return 1 if errors else 0 + + +if __name__ == "__main__": + sys.exit(main()) diff --git a/skills/efund-ppt-maker/scripts/check_efund_typography.py b/skills/efund-ppt-maker/scripts/check_efund_typography.py new file mode 100644 index 000000000..7b0120c94 --- /dev/null +++ b/skills/efund-ppt-maker/scripts/check_efund_typography.py @@ -0,0 +1,492 @@ +#!/usr/bin/env python3 +"""Check inherited and newly added text-shape font sizes in an E Fund PPTX.""" + +from __future__ import annotations + +import argparse +import json +import posixpath +import re +import sys +import xml.etree.ElementTree as ET +from pathlib import Path +from typing import Any +from zipfile import BadZipFile, ZipFile + +P_NS = "http://schemas.openxmlformats.org/presentationml/2006/main" +A_NS = "http://schemas.openxmlformats.org/drawingml/2006/main" +R_NS = "http://schemas.openxmlformats.org/officeDocument/2006/relationships" +PKG_REL_NS = "http://schemas.openxmlformats.org/package/2006/relationships" +NS = {"p": P_NS, "a": A_NS, "r": R_NS} +INHERITED_ACTIONS = {"rewrite", "rewrite-and-reposition"} +ROLE_SIZE_LADDERS = { + "page-title": {23.0}, + "slide-title": {23.0}, + "big-conclusion": {18.0}, + "module-title": {14.0, 16.0}, + "module-lead": {14.0, 16.0}, + "lead": {14.0, 16.0}, + "body": {10.0, 11.0, 12.0}, + "annotation": {7.0, 8.0, 9.0}, + "source-note": {7.0, 8.0, 9.0}, + "caption": {7.0, 8.0, 9.0}, + "footer": {7.0, 8.0, 9.0}, + "metric": {20.0, 24.0, 28.0, 32.0, 36.0, 44.0}, + "metric-number": {20.0, 24.0, 28.0, 32.0, 36.0, 44.0}, + "thanks": {float(size) for size in range(45, 55)}, +} + + +def parse_xml(data: bytes, source: str) -> ET.Element: + try: + return ET.fromstring(data) + except ET.ParseError as exc: + raise ValueError(f"{source} XML 无法解析：{exc}") from exc + + +def logical_slide_part(archive: ZipFile, slide_number: int) -> str: + presentation_part = "ppt/presentation.xml" + relationships_part = "ppt/_rels/presentation.xml.rels" + if presentation_part not in archive.namelist(): + raise ValueError(f"找不到演示文稿部件：{presentation_part}") + if relationships_part not in archive.namelist(): + raise ValueError(f"找不到演示文稿关系：{relationships_part}") + + presentation = parse_xml(archive.read(presentation_part), presentation_part) + slide_ids = presentation.findall("./p:sldIdLst/p:sldId", NS) + if slide_number < 1 or slide_number > len(slide_ids): + raise ValueError( + f"逻辑页码超出范围：{slide_number}；文稿共 {len(slide_ids)} 页" + ) + relationship_id = slide_ids[slide_number - 1].get(f"{{{R_NS}}}id") + if not relationship_id: + raise ValueError(f"逻辑第 {slide_number} 页缺少关系 ID") + + relationships = parse_xml( + archive.read(relationships_part), relationships_part + ) + targets = { + relationship.get("Id"): relationship.get("Target") + for relationship in relationships.findall(f"{{{PKG_REL_NS}}}Relationship") + } + target = targets.get(relationship_id) + if not target: + raise ValueError( + f"逻辑第 {slide_number} 页的关系 {relationship_id} 没有内部目标" + ) + part = ( + target.lstrip("/") + if target.startswith("/") + else posixpath.normpath(posixpath.join("ppt", target)) + ) + if part not in archive.namelist(): + raise ValueError(f"逻辑第 {slide_number} 页对应部件不存在：{part}") + return part + + +def shape_records(archive: ZipFile, slide_number: int) -> dict[str, dict[str, Any]]: + part = logical_slide_part(archive, slide_number) + root = parse_xml(archive.read(part), part) + records: dict[str, dict[str, Any]] = {} + for shape in root.findall(".//p:sp", NS): + non_visual = shape.find("./p:nvSpPr/p:cNvPr", NS) + if non_visual is None or not non_visual.get("id"): + continue + shape_id = str(non_visual.get("id")) + text = "".join(node.text or "" for node in shape.findall(".//a:t", NS)).strip() + sizes: set[float] = set() + unresolved_runs = 0 + visible_runs = 0 + for paragraph in shape.findall(".//a:p", NS): + default_properties = paragraph.find("./a:pPr/a:defRPr", NS) + default_size = ( + default_properties.get("sz") if default_properties is not None else None + ) + runs = list(paragraph.findall("./a:r", NS)) + list( + paragraph.findall("./a:fld", NS) + ) + for run in runs: + run_text = "".join( + node.text or "" for node in run.findall(".//a:t", NS) + ) + if not run_text.strip(): + continue + visible_runs += 1 + properties = run.find("./a:rPr", NS) + raw_size = ( + properties.get("sz") + if properties is not None and properties.get("sz") + else default_size + ) + if raw_size and raw_size.isdigit(): + sizes.add(round(int(raw_size) / 100, 1)) + else: + unresolved_runs += 1 + records[shape_id] = { + "name": non_visual.get("name"), + "text": text, + "sizes": sorted(sizes), + "visibleRuns": visible_runs, + "unresolvedRuns": unresolved_runs, + } + return records + + +def list_values(value: object) -> list[object]: + if value is None: + return [] + return value if isinstance(value, list) else [value] + + +def id_values(target: dict[str, Any], plural: str, singular: str) -> list[str]: + values = list_values(target.get(plural)) + if target.get(singular) is not None: + values.append(target[singular]) + return [str(value) for value in values if value is not None] + + +def number_list(value: object) -> list[float]: + numbers: list[float] = [] + for item in list_values(value): + if isinstance(item, bool): + raise ValueError(f"无效字号：{item!r}") + try: + number = round(float(item), 1) + except (TypeError, ValueError) as exc: + raise ValueError(f"无效字号：{item!r}") from exc + if number <= 0: + raise ValueError(f"字号必须大于 0：{item!r}") + numbers.append(number) + return sorted(set(numbers)) + + +def parse_allow(values: list[str]) -> set[tuple[int, str]]: + allowed: set[tuple[int, str]] = set() + for value in values: + match = re.fullmatch(r"(\d+):(.+)", value) + if not match: + raise ValueError(f"无效 --allow：{value!r}；应为 输出页码:ShapeID") + allowed.add((int(match.group(1)), match.group(2))) + return allowed + + +def target_source_ids(target: dict[str, Any]) -> list[str]: + explicit = id_values(target, "sourceShapeIds", "sourceShapeId") + return explicit or id_values(target, "shapeIds", "shapeId") + + +def target_final_ids(target: dict[str, Any]) -> list[str]: + return id_values(target, "finalShapeIds", "finalShapeId") + + +def issue( + severity: str, + code: str, + message: str, + output_slide: int, + shape_id: str | None = None, +) -> dict[str, Any]: + result: dict[str, Any] = { + "severity": severity, + "code": code, + "message": message, + "outputSlide": output_slide, + } + if shape_id is not None: + result["shapeId"] = shape_id + return result + + +def compare( + source_pptx: Path | None, + final_pptx: Path, + map_path: Path, + allowed: set[tuple[int, str]], +) -> dict[str, Any]: + frame_map = json.loads(map_path.read_text(encoding="utf-8")) + entries = frame_map.get("outputSlides") + if not isinstance(entries, list): + raise ValueError("template-frame-map.json 缺少 outputSlides 数组") + + issues: list[dict[str, Any]] = [] + checked_inherited = 0 + checked_added = 0 + needs_source = any( + entry.get("sourceSlide") is not None + and any( + target.get("action") in INHERITED_ACTIONS + for target in entry.get("editTargets", []) + ) + for entry in entries + ) + if needs_source and source_pptx is None: + raise ValueError("映射包含继承文本对象，必须提供 --source-pptx") + + source_archive = ZipFile(source_pptx) if source_pptx is not None else None + try: + with ZipFile(final_pptx) as final_archive: + for entry in entries: + output_slide = int(entry["outputSlide"]) + source_slide_value = entry.get("sourceSlide") + source_slide = ( + int(source_slide_value) if source_slide_value is not None else None + ) + final_shapes = shape_records(final_archive, output_slide) + source_shapes = ( + shape_records(source_archive, source_slide) + if source_archive is not None and source_slide is not None + else {} + ) + + for target in entry.get("editTargets", []): + action = target.get("action") + if action in INHERITED_ACTIONS: + source_ids = target_source_ids(target) + final_ids = target_final_ids(target) + if not source_ids: + issues.append( + issue( + "warning", + "missing-source-shape-id", + "继承文本目标未声明源 Shape ID", + output_slide, + ) + ) + continue + if final_ids and len(final_ids) != len(source_ids): + issues.append( + issue( + "warning", + "shape-id-count-mismatch", + "源/成品 Shape ID 数量不一致", + output_slide, + ) + ) + continue + pairs = zip(source_ids, final_ids or source_ids) + for source_id, final_id in pairs: + source_shape = source_shapes.get(source_id) + final_shape = final_shapes.get(final_id) + if source_shape is None or final_shape is None: + missing = "源" if source_shape is None else "成品" + issues.append( + issue( + "warning", + "shape-not-found", + f"{missing}文本 Shape 未找到：{source_id if source_shape is None else final_id}", + output_slide, + final_id, + ) + ) + continue + if not source_shape["text"]: + continue + checked_inherited += 1 + if ( + source_shape["unresolvedRuns"] + or final_shape["unresolvedRuns"] + ): + issues.append( + issue( + "warning", + "unresolved-font-size", + "继承文本存在未显式解析的 run 字号，须结合布局导出人工确认", + output_slide, + final_id, + ) + ) + if source_shape["sizes"] == final_shape["sizes"]: + continue + if (output_slide, final_id) in allowed: + continue + issues.append( + issue( + "error", + "inherited-font-size-mismatch", + f"继承字号 {source_shape['sizes']}pt → {final_shape['sizes']}pt；{final_shape['text'][:60]}", + output_slide, + final_id, + ) + ) + + if action != "add": + continue + role = str(target.get("textRole") or "").strip() + final_ids = target_final_ids(target) + if not final_ids: + issues.append( + issue( + "warning", + "missing-final-shape-id", + "原创文本目标未声明 finalShapeIds", + output_slide, + ) + ) + continue + if target.get("checkTypography") is False or role.startswith( + "non-text" + ): + for final_id in final_ids: + final_shape = final_shapes.get(final_id) + if final_shape is not None and final_shape["text"]: + issues.append( + issue( + "error", + "non-text-target-has-text", + "声明为非文本的新增对象含有可见文字", + output_slide, + final_id, + ) + ) + continue + expected = number_list( + target.get("expectedFontSizesPt", target.get("fontSizePt")) + ) + allowed_sizes = number_list(target.get("allowedFontSizesPt")) + if not expected and not allowed_sizes: + issues.append( + issue( + "warning", + "missing-font-size-contract", + f"原创文本目标未声明允许字号；角色={role or '未声明'}", + output_slide, + ) + ) + continue + declared_contract = expected or allowed_sizes + role_ladder = ROLE_SIZE_LADDERS.get(role) + if role_ladder is not None and any( + size not in role_ladder for size in declared_contract + ): + issues.append( + issue( + "error", + "font-contract-outside-role-ladder", + f"角色 {role} 声明字号 {declared_contract}pt，超出全局阶梯 {sorted(role_ladder)}pt", + output_slide, + ) + ) + for final_id in final_ids: + final_shape = final_shapes.get(final_id) + if final_shape is None: + if (output_slide, final_id) in allowed: + continue + issues.append( + issue( + "error", + "new-shape-not-found", + "找不到声明的原创文本 Shape", + output_slide, + final_id, + ) + ) + continue + if not final_shape["text"]: + issues.append( + issue( + "warning", + "new-shape-has-no-text", + "声明的原创文本 Shape 没有可见文字", + output_slide, + final_id, + ) + ) + continue + checked_added += 1 + actual = final_shape["sizes"] + matches = bool(actual) and ( + actual == expected + if expected + else all(size in allowed_sizes for size in actual) + ) + if final_shape["unresolvedRuns"]: + matches = False + if matches or (output_slide, final_id) in allowed: + continue + contract = declared_contract + issues.append( + issue( + "error", + "new-font-size-outside-contract", + f"原创字号 {actual}pt 不符合 {contract}pt；角色={role or '未声明'}；{final_shape['text'][:60]}", + output_slide, + final_id, + ) + ) + finally: + if source_archive is not None: + source_archive.close() + + return { + "sourcePptx": str(source_pptx.resolve()) if source_pptx else None, + "finalPptx": str(final_pptx.resolve()), + "map": str(map_path.resolve()), + "checkedInheritedTextShapes": checked_inherited, + "checkedAddedTextShapes": checked_added, + "errorCount": sum(item["severity"] == "error" for item in issues), + "warningCount": sum(item["severity"] == "warning" for item in issues), + "issues": issues, + } + + +def main() -> int: + parser = argparse.ArgumentParser(description="检查易方达 PPT 继承与原创文本的字号保真。") + parser.add_argument("--source-pptx", type=Path) + parser.add_argument("--final-pptx", required=True, type=Path) + parser.add_argument("--map", required=True, dest="map_path", type=Path) + parser.add_argument("--json-output", type=Path) + parser.add_argument( + "--allow", + action="append", + default=[], + metavar="OUTPUT_SLIDE:SHAPE_ID", + help="逐 Shape 放行一个有明确理由的字号差异", + ) + parser.add_argument("--strict", action="store_true") + parser.add_argument("--warnings-as-errors", action="store_true") + args = parser.parse_args() + + for path in (args.final_pptx, args.map_path): + if not path.is_file(): + parser.error(f"文件不存在：{path}") + if args.source_pptx is not None and not args.source_pptx.is_file(): + parser.error(f"文件不存在：{args.source_pptx}") + + try: + report = compare( + args.source_pptx.expanduser().resolve() if args.source_pptx else None, + args.final_pptx.expanduser().resolve(), + args.map_path.expanduser().resolve(), + parse_allow(args.allow), + ) + except (BadZipFile, KeyError, OSError, ValueError, json.JSONDecodeError) as exc: + print(f"ERROR: {exc}", file=sys.stderr) + return 2 + + if args.json_output: + args.json_output.parent.mkdir(parents=True, exist_ok=True) + args.json_output.write_text( + json.dumps(report, ensure_ascii=False, indent=2), encoding="utf-8" + ) + + print( + "Text shapes checked: " + f"inherited={report['checkedInheritedTextShapes']}; " + f"added={report['checkedAddedTextShapes']}" + ) + print(f"Errors: {report['errorCount']}; Warnings: {report['warningCount']}") + for item in report["issues"]: + shape = f" shape={item['shapeId']}" if "shapeId" in item else "" + print( + f"[{item['severity'].upper()}] {item['code']} " + f"slide={item['outputSlide']}{shape}: {item['message']}" + ) + + failed = (args.strict and report["errorCount"] > 0) or ( + args.warnings_as_errors and report["warningCount"] > 0 + ) + return 1 if failed else 0 + + +if __name__ == "__main__": + sys.exit(main()) diff --git a/skills/efund-ppt-maker/scripts/check_efund_writing_style.py b/skills/efund-ppt-maker/scripts/check_efund_writing_style.py new file mode 100644 index 000000000..1d164a8d4 --- /dev/null +++ b/skills/efund-ppt-maker/scripts/check_efund_writing_style.py @@ -0,0 +1,387 @@ +#!/usr/bin/env python3 +"""Flag templated, slogan-like wording in visible PowerPoint slide text.""" + +from __future__ import annotations + +import argparse +import json +import posixpath +import re +import sys +import zipfile +from dataclasses import dataclass +from pathlib import Path +from typing import Any +from xml.etree import ElementTree as ET + +P = "http://schemas.openxmlformats.org/presentationml/2006/main" +A = "http://schemas.openxmlformats.org/drawingml/2006/main" +R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships" +PR = "http://schemas.openxmlformats.org/package/2006/relationships" +NS = {"p": P, "a": A, "r": R} + + +@dataclass(frozen=True) +class Rule: + code: str + pattern: re.Pattern[str] + message: str + rewrite: str + + +RULES = ( + Rule( + "contrast-not-but", + re.compile(r"(?:不是|不只是|不再是|并非|绝非)[^。！？；\n]{1,48}?[，,]?(?:而是|而在于)"), + "避免用“不是……而是……”制造修辞性反差", + "直接写明对象、变化和结果；确有两种方案时改用共同维度比较", + ), + Rule( + "not-only-more", + re.compile(r"(?:不仅|不只)[^。！？；\n]{1,48}?[，,；;](?:更|而且|还|也)"), + "避免用“不仅……更/而且……”堆叠价值判断", + "拆成具体动作与可验证结果", + ), + Rule( + "three-more", + re.compile( + r"更[^，。！？；\n]{1,12}[、，]更[^，。！？；\n]{1,12}[、，]更[^，。！？；\n]{1,12}" + ), + "避免连续三个“更……”形成无证据排比", + "分别给出时长、数量、风险或交付变化", + ), + Rule( + "make-truly", + re.compile(r"让[^。！？；\n]{1,28}真正(?:成为|实现|释放|发挥)"), + "“让……真正……”通常缺少具体动作", + "写明前置条件、执行动作和可观察结果", + ), + Rule( + "slogan-engine", + re.compile(r"(?:打造|构建|成为|培育|注入)[^。！？；\n]{0,24}(?:新引擎|新动能|新范式)"), + "避免“打造新引擎/新范式”等口号化表达", + "改写为具体能力、流程变化或业务指标", + ), + Rule( + "slogan-new-chapter", + re.compile(r"(?:开启|书写|共创)[^。！？；\n]{0,20}(?:新篇章|新未来)"), + "避免“开启新篇章/共创新未来”等宣传口号", + "直接陈述下一阶段交付、责任和时间", + ), + Rule( + "slogan-leap", + re.compile(r"(?:实现|推动|完成|引领)[^。！？；\n]{0,24}(?:跃迁|蝶变)"), + "避免“实现跃迁/蝶变”等不可验证表述", + "说明能力提升的具体维度、基线和目标", + ), + Rule( + "vague-empower", + re.compile( + r"(?:全面|深度|持续|智能|精准|高效|科技|AI|数据|平台)?赋能" + r"(?:业务|发展|增长|转型|创新|未来|组织|行业|千行百业|提质增效)" + ), + "“赋能业务/增长/转型”没有说明实际动作", + "改成支持、缩短、减少、统一、自动推送等具体动作，并补充结果", + ), + Rule( + "slogan-closed-loop", + re.compile(r"(?:打造|构建|形成)[^。！？；\n]{0,20}(?:智能|业务|管理|价值)?闭环"), + "避免用“打造闭环”替代流程说明", + "写清触发条件、处理步骤、反馈结果和责任主体", + ), + Rule( + "boilerplate-wave", + re.compile(r"在[^，。！？；\n]{1,24}(?:浪潮|时代|大背景)下"), + "避免用宏大背景作为无信息量开场", + "从本页直接相关的事实、问题或变化切入", + ), + Rule( + "boilerplate-with-development", + re.compile(r"随着[^，。！？；\n]{1,28}不断(?:发展|演进|深入|加速)"), + "避免“随着……不断发展”式通用开场", + "写明发生了什么具体变化及其业务影响", + ), +) + + +def issue( + severity: str, + code: str, + message: str, + slide: int, + shape_id: str, + shape_name: str, + text: str, + rewrite: str, +) -> dict[str, Any]: + return { + "severity": severity, + "code": code, + "message": message, + "slide": slide, + "shapeId": shape_id, + "shapeName": shape_name, + "text": text, + "rewrite": rewrite, + } + + +def rels_part(part: str) -> str: + folder, name = posixpath.split(part) + return posixpath.join(folder, "_rels", f"{name}.rels") + + +def relationships( + archive: zipfile.ZipFile, + part: str, +) -> dict[str, tuple[str, str]]: + rel_part = rels_part(part) + if rel_part not in archive.namelist(): + return {} + root = ET.fromstring(archive.read(rel_part)) + result: dict[str, tuple[str, str]] = {} + for rel in root.findall(f"{{{PR}}}Relationship"): + rel_id = rel.get("Id") + target = rel.get("Target") + if rel_id and target: + result[rel_id] = (target, rel.get("TargetMode") or "Internal") + return result + + +def resolve_target(part: str, target: str) -> str: + if target.startswith("/"): + return target.lstrip("/") + return posixpath.normpath(posixpath.join(posixpath.dirname(part), target)) + + +def presentation_info( + archive: zipfile.ZipFile, +) -> tuple[tuple[int, int], list[str]]: + part = "ppt/presentation.xml" + root = ET.fromstring(archive.read(part)) + size = root.find("p:sldSz", NS) + if size is None: + raise ValueError("ppt/presentation.xml 缺少 p:sldSz") + canvas = (int(size.get("cx") or 0), int(size.get("cy") or 0)) + rels = relationships(archive, part) + slide_parts: list[str] = [] + for slide_id in root.findall("./p:sldIdLst/p:sldId", NS): + rel_id = slide_id.get(f"{{{R}}}id") + target = rels.get(str(rel_id)) + if not target or target[1] != "Internal": + raise ValueError(f"无法解析逻辑页关系 {rel_id}") + slide_parts.append(resolve_target(part, target[0])) + return canvas, slide_parts + + +def element_geometry(element: ET.Element) -> tuple[int, int, int, int] | None: + xfrm = element.find("./p:spPr/a:xfrm", NS) + if xfrm is None: + xfrm = element.find("./p:grpSpPr/a:xfrm", NS) + if xfrm is not None: + off = xfrm.find("a:off", NS) + ext = xfrm.find("a:ext", NS) + else: + xfrm = element.find("./p:xfrm", NS) + if xfrm is None: + return None + off = xfrm.find("a:off", NS) + ext = xfrm.find("a:ext", NS) + if off is None or ext is None: + return None + return ( + int(off.get("x") or 0), + int(off.get("y") or 0), + int(ext.get("cx") or 0), + int(ext.get("cy") or 0), + ) + + +def on_canvas(box: tuple[int, int, int, int], canvas: tuple[int, int]) -> bool: + x, y, width, height = box + return x < canvas[0] and y < canvas[1] and x + width > 0 and y + height > 0 + + +def visible_text_objects( + root: ET.Element, + canvas: tuple[int, int], +) -> list[tuple[str, str, str]]: + tree = root.find(".//p:spTree", NS) + if tree is None: + return [] + result: list[tuple[str, str, str]] = [] + for element in list(tree): + kind = element.tag.rsplit("}", 1)[-1] + if kind not in {"sp", "graphicFrame", "grpSp"}: + continue + c_nv_pr = element.find(".//p:cNvPr", NS) + if c_nv_pr is None or c_nv_pr.get("hidden") in {"1", "true"}: + continue + geometry = element_geometry(element) + if geometry is not None and not on_canvas(geometry, canvas): + continue + paragraphs = [] + for paragraph in element.findall(".//a:p", NS): + text = "".join(node.text or "" for node in paragraph.findall(".//a:t", NS)).strip() + if text: + paragraphs.append(text) + text = "\n".join(paragraphs).strip() + if text: + result.append( + ( + str(c_nv_pr.get("id") or ""), + str(c_nv_pr.get("name") or ""), + text, + ) + ) + return result + + +def page_metadata(map_path: Path | None) -> dict[int, dict[str, Any]]: + if map_path is None: + return {} + data = json.loads(map_path.read_text(encoding="utf-8")) + pages = data.get("outputSlides") + if not isinstance(pages, list): + raise ValueError("映射必须包含 outputSlides 数组") + result: dict[int, dict[str, Any]] = {} + for page in pages: + if isinstance(page, dict): + result[int(page.get("outputSlide"))] = page + return result + + +def parse_cli_allow(values: list[str]) -> set[tuple[int, str, str | None]]: + result: set[tuple[int, str, str | None]] = set() + for value in values: + parts = value.split(":") + if len(parts) not in {2, 3}: + raise ValueError(f"--allow 必须为 页码:ShapeID[:规则代码]，实际为 {value!r}") + result.add((int(parts[0]), parts[1], parts[2] if len(parts) == 3 else None)) + return result + + +def map_allows(page: dict[str, Any], shape_id: str, code: str) -> bool: + exemptions = page.get("writingStyleExemptions") + if not isinstance(exemptions, list): + return False + for exemption in exemptions: + if not isinstance(exemption, dict): + continue + if str(exemption.get("shapeId") or "") != shape_id: + continue + reason = exemption.get("reason") + if not isinstance(reason, str) or len(reason.strip()) < 4: + continue + codes = exemption.get("codes") + if codes == "*" or ( + isinstance(codes, list) and (code in codes or "*" in codes) + ): + return True + return False + + +def page_kind(page: dict[str, Any]) -> str | None: + direct = page.get("pageKind") + if isinstance(direct, str): + return direct + binding = page.get("visualTextBinding") + if isinstance(binding, dict) and isinstance(binding.get("pageKind"), str): + return str(binding.get("pageKind")) + return None + + +def main() -> int: + parser = argparse.ArgumentParser(description="检查易方达 PPT 中的模板化、口号化文案。") + parser.add_argument("pptx", type=Path) + parser.add_argument("--map", type=Path) + parser.add_argument("--allow", action="append", default=[], metavar="SLIDE:SHAPE[:CODE]") + parser.add_argument("--json-output", type=Path) + parser.add_argument("--warnings-as-errors", action="store_true") + args = parser.parse_args() + + findings: list[dict[str, Any]] = [] + pptx = args.pptx.expanduser().resolve() + try: + allows = parse_cli_allow(args.allow) + pages = page_metadata(args.map.expanduser().resolve() if args.map else None) + with zipfile.ZipFile(pptx) as archive: + canvas, slide_parts = presentation_info(archive) + for slide, part in enumerate(slide_parts, start=1): + page = pages.get(slide, {}) + if page_kind(page) == "legal": + continue + root = ET.fromstring(archive.read(part)) + for shape_id, shape_name, text in visible_text_objects(root, canvas): + for rule in RULES: + match = rule.pattern.search(text) + if not match: + continue + if ( + (slide, shape_id, None) in allows + or (slide, shape_id, rule.code) in allows + or map_allows(page, shape_id, rule.code) + ): + continue + findings.append( + issue( + "warning", + rule.code, + rule.message, + slide, + shape_id, + shape_name, + match.group(0), + rule.rewrite, + ) + ) + except ( + OSError, + TypeError, + ValueError, + KeyError, + zipfile.BadZipFile, + ET.ParseError, + json.JSONDecodeError, + ) as exc: + findings.append( + issue( + "error", + "writing-style-check-failed", + str(exc), + 0, + "", + "", + "", + "修复输入文件、页映射或参数后重试", + ) + ) + + report = { + "pptx": str(pptx), + "templateFrameMap": str(args.map.expanduser().resolve()) if args.map else None, + "errorCount": sum(item["severity"] == "error" for item in findings), + "warningCount": sum(item["severity"] == "warning" for item in findings), + "issues": findings, + } + if args.json_output: + args.json_output.parent.mkdir(parents=True, exist_ok=True) + args.json_output.write_text( + json.dumps(report, ensure_ascii=False, indent=2), + encoding="utf-8", + ) + print(f"Errors: {report['errorCount']}; Warnings: {report['warningCount']}") + for finding in findings: + print( + f"[{finding['severity'].upper()}] {finding['code']} " + f"slide={finding['slide']} shape={finding['shapeId']}: " + f"{finding['message']}；命中“{finding['text']}”；建议：{finding['rewrite']}" + ) + failed = report["errorCount"] > 0 or ( + args.warnings_as_errors and report["warningCount"] > 0 + ) + return 1 if failed else 0 + + +if __name__ == "__main__": + sys.exit(main()) diff --git a/skills/efund-ppt-maker/scripts/lint_efund_layouts.py b/skills/efund-ppt-maker/scripts/lint_efund_layouts.py new file mode 100644 index 000000000..9ee18071d --- /dev/null +++ b/skills/efund-ppt-maker/scripts/lint_efund_layouts.py @@ -0,0 +1,1509 @@ +#!/usr/bin/env python3 +"""Lint normalized slide-layout JSON for wrapping, sizing, bounds, and overlaps.""" + +from __future__ import annotations + +import argparse +import json +import math +import re +import sys +from pathlib import Path +from typing import Any + +LEGAL_RE = re.compile(r"(?:风险提示|免责声明|Risk Reminder|Disclaimer|附注)", re.I) +BUILD_MODES = {"reuse", "controlled-recomposition", "original-in-brand-shell"} +LAYOUT_DECISION_FIELDS = ( + "contentStructure", + "readingOrder", + "primaryVisual", + "geometryPlan", + "caseInfluence", + "whyNotDirectReuse", + "originalityEvidence", +) +REUSE_QUALIFIERS = ( + "sameRelationship", + "sameModuleCount", + "sameDensity", + "sameFocalHierarchy", + "sameReadingOrder", +) +VISUAL_TEXT_BINDING_FIELDS = ( + "visualType", + "supportsClaim", + "textAnchor", + "sourceOrGeneration", + "whyThisVisual", + "informationCarried", + "visualObjectIds", +) +VISUAL_TYPES = { + "photo", + "chart", + "diagram", + "architecture", + "process", + "official-screenshot", + "icon-group", + "data-visual", + "table", + "map", + "timeline", + "illustration", + "comparison-visual", +} +VISUAL_EXEMPT_PAGE_KINDS = {"cover", "agenda", "legal", "closing"} +COVER_PROFILES = { + "v6-cn-simple": 2, + "v6-cn-subtitle": 3, + "v6-bilingual": 4, + "v6-english": 5, + "v6-co-brand": 6, + "ai-tech-internal": 1, + "user-template": None, +} +BODY_LEFT_ALIGNED_ROLES = { + "body", + "body-text", + "paragraph", + "explanation", + "narrative-body", + "module-body", + "module-description", + "table-body", + "takeaway", + "recommendation", + "suggestion", + "advice", + "conclusion", + "source", + "note", +} +LEFT_ALIGNMENT_VALUES = {"", "left", "start", "l", "none"} +MIN_TEXT_INSET_PX = 10.0 +CONNECTOR_TEXT_CLEARANCE_PX = 8.0 +ALIGNMENT_CHECKS = { + "left", + "right", + "top", + "bottom", + "width", + "height", + "center-x", + "center-y", + "horizontal-gap", + "vertical-gap", +} + + +def issue(severity: str, code: str, message: str, slide: int) -> dict[str, Any]: + return {"severity": severity, "code": code, "message": message, "slide": slide} + + +def weighted_length(text: str) -> float: + return sum(1.0 if ord(char) > 127 else 0.5 for char in re.sub(r"\s+", "", text)) + + +def area(box: list[float]) -> float: + return max(0.0, box[2]) * max(0.0, box[3]) + + +def intersection(a: list[float], b: list[float]) -> float: + left = max(a[0], b[0]) + top = max(a[1], b[1]) + right = min(a[0] + a[2], b[0] + b[2]) + bottom = min(a[1] + a[3], b[1] + b[3]) + return max(0.0, right - left) * max(0.0, bottom - top) + + +def horizontal_intersection(a: list[float], b: list[float]) -> float: + return max(0.0, min(a[0] + a[2], b[0] + b[2]) - max(a[0], b[0])) + + +def object_label(element: dict[str, Any]) -> str: + return str(element.get("name") or element.get("aid") or element.get("id") or element.get("kind")) + + +def normalized_label(element: dict[str, Any]) -> str: + return object_label(element).strip().lower().replace("_", "-") + + +def has_content(value: object) -> bool: + if isinstance(value, str): + return bool(value.strip()) + if isinstance(value, list): + return bool(value) and all(has_content(item) for item in value) + return value is not None + + +def weak_reuse_reason(value: object) -> bool: + if not isinstance(value, str): + return True + normalized = re.sub(r"[\s，。；、,.!！]", "", value).lower() + weak = { + "可以换字", + "可换字", + "版面相近", + "布局相近", + "看起来相近", + "看起来一样", + "样式合适", + "套用模板", + } + return len(normalized) < 6 or normalized in weak + + +def weak_visual_binding(binding: dict[str, Any]) -> bool: + weak = { + "装饰", + "美观", + "好看", + "丰富页面", + "图文并茂", + "占位", + "支撑本页结论", + "呼应文字", + "与主题相关", + "提升设计感", + } + minimum_lengths = { + "supportsClaim": 6, + "whyThisVisual": 8, + "informationCarried": 6, + } + for name, minimum in minimum_lengths.items(): + value = binding.get(name) + if not isinstance(value, str): + return True + normalized = re.sub(r"[\s，。；、,.!！:：]", "", value) + if len(normalized) < minimum or normalized in weak: + return True + return False + + +def is_connector(element: dict[str, Any]) -> bool: + label = normalized_label(element) + geometry = str(element.get("geometry") or "").lower() + return "connector" in label or "连接符" in label or geometry in {"line", "straightconnector1"} + + +def is_chart_category_label(element: dict[str, Any]) -> bool: + label = normalized_label(element) + return ( + "label" in label + and "value" not in label + and "data-label" not in label + and "axis" not in label + and bool(str(element.get("text") or "").strip()) + ) + + +def is_chart_data_mark(element: dict[str, Any]) -> bool: + label = normalized_label(element) + segments = set(re.split(r"[-\s]+", label)) + return bool(segments.intersection({"bar", "column", "mark", "point", "area"})) + + +def is_advisory_callout(element: dict[str, Any]) -> bool: + label = normalized_label(element) + text = str(element.get("text") or "").strip() + return bool(text) and any( + token in label + for token in ("takeaway", "recommendation", "suggestion", "advice") + ) + + +def paragraph_alignments(element: dict[str, Any]) -> set[str]: + values: set[str] = set() + for paragraph in element.get("paragraphs") or []: + style = paragraph.get("resolvedTextStyle") or {} + value = style.get("alignment") if isinstance(style, dict) else None + if value is not None: + values.add(str(value).strip().lower()) + if not values: + style = element.get("resolvedTextStyle") or {} + value = style.get("alignment") if isinstance(style, dict) else None + if value is not None: + values.add(str(value).strip().lower()) + return values + + +def standard_narrative_required_height(element: dict[str, Any]) -> float | None: + if normalized_label(element) != "standard-narrative-body": + return None + layout = element.get("textLayout") or {} + try: + line_count = int(layout.get("lineCount") or 0) + except (TypeError, ValueError): + return None + sizes = font_sizes(element) + if line_count <= 0 or not sizes: + return None + # Layout JSON uses normalized CSS pixels. The contract requires 150% line + # spacing; add 4px for top/bottom text insets when the runtime cannot + # expose them directly. + return line_count * max(sizes) * 1.5 + 4.0 + + +def font_sizes(element: dict[str, Any]) -> list[float]: + sizes: list[float] = [] + resolved = element.get("resolvedFontSize") + if isinstance(resolved, (int, float)) and resolved > 0: + sizes.append(float(resolved)) + style = element.get("resolvedTextStyle") or {} + value = style.get("fontSize") if isinstance(style, dict) else None + if isinstance(value, (int, float)) and value > 0: + sizes.append(float(value)) + for paragraph in element.get("paragraphs") or []: + for run in paragraph.get("runs") or []: + value = run.get("fontSize") + if isinstance(value, (int, float)) and value > 0: + sizes.append(float(value)) + return sizes + + +def element_role(element: dict[str, Any]) -> str: + value = element.get("textRole") or element.get("role") or "" + return str(value).strip().lower().replace("_", "-") + + +def is_page_title(element: dict[str, Any], fw: float) -> bool: + text = str(element.get("text") or "").strip() + box = element.get("_box") + if not text or not isinstance(box, list): + return False + role = element_role(element) + label = normalized_label(element) + explicit = role in {"page-title", "slide-title", "top-bar-title"} or any( + token in label for token in ("page-title", "slide-title", "top-bar-title") + ) + named_title = ( + label.startswith("title") + and not any(token in label for token in ("subtitle", "visual-title", "module-title")) + ) + sizes = font_sizes(element) + max_size = max(sizes) if sizes else 0.0 + geometric = ( + box[0] >= 0 + and box[1] >= 0 + and box[1] <= 62 + and box[0] < fw * 0.78 + and box[0] + box[2] <= fw + 3.0 + and max_size >= 18.0 + ) + return explicit or (named_title and box[1] <= 83) or geometric + + +def reported_line_count(element: dict[str, Any]) -> int: + layout = element.get("textLayout") or {} + try: + layout_count = int(layout.get("lineCount") or 0) + except (TypeError, ValueError): + layout_count = 0 + text_count = str(element.get("text") or "").count("\n") + 1 + return max(1, layout_count, text_count) + + +def requires_left_alignment(element: dict[str, Any]) -> bool: + role = element_role(element) + label = normalized_label(element) + if role in BODY_LEFT_ALIGNED_ROLES: + return True + if is_advisory_callout(element): + return True + return any( + token in label + for token in ( + "body-copy", + "body-text", + "narrative-explanation", + "module-description", + "table-body", + "source-note", + ) + ) + + +def text_insets(element: dict[str, Any]) -> dict[str, float] | None: + raw = element.get("textInsets") + if isinstance(raw, list) and len(raw) == 4: + try: + return { + "left": float(raw[0]), + "top": float(raw[1]), + "right": float(raw[2]), + "bottom": float(raw[3]), + } + except (TypeError, ValueError): + return None + if not isinstance(raw, dict): + return None + aliases = { + "left": ("left", "l"), + "top": ("top", "t"), + "right": ("right", "r"), + "bottom": ("bottom", "b"), + } + result: dict[str, float] = {} + for side, names in aliases.items(): + value = next((raw.get(name) for name in names if raw.get(name) is not None), None) + try: + result[side] = float(value) + except (TypeError, ValueError): + return None + return result + + +def needs_body_inset_check(element: dict[str, Any]) -> bool: + if element.get("kind") != "shape" or not str(element.get("text") or "").strip(): + return False + if requires_left_alignment(element): + return True + return reported_line_count(element) >= 2 and weighted_length(str(element.get("text") or "")) >= 14 + + +def point_pair(value: object) -> tuple[float, float] | None: + if isinstance(value, list) and len(value) >= 2: + try: + return float(value[0]), float(value[1]) + except (TypeError, ValueError): + return None + if isinstance(value, dict): + try: + return float(value["x"]), float(value["y"]) + except (KeyError, TypeError, ValueError): + return None + return None + + +def connector_segment( + element: dict[str, Any], +) -> tuple[tuple[float, float], tuple[float, float]] | None: + start = point_pair(element.get("lineStart") or element.get("start")) + end = point_pair(element.get("lineEnd") or element.get("end")) + if start and end: + return start, end + points = element.get("points") + if isinstance(points, list) and len(points) >= 2: + start = point_pair(points[0]) + end = point_pair(points[-1]) + if start and end: + return start, end + box = element.get("_box") + label = normalized_label(element) + if isinstance(box, list) and not "connector" in label: + if box[3] <= 4.0: + return (box[0], box[1]), (box[0] + box[2], box[1] + box[3]) + if box[2] <= 4.0: + return (box[0], box[1]), (box[0] + box[2], box[1] + box[3]) + return None + + +def point_in_box(point: tuple[float, float], box: list[float]) -> bool: + return ( + box[0] <= point[0] <= box[0] + box[2] + and box[1] <= point[1] <= box[1] + box[3] + ) + + +def orientation( + first: tuple[float, float], + second: tuple[float, float], + third: tuple[float, float], +) -> float: + return (second[0] - first[0]) * (third[1] - first[1]) - ( + second[1] - first[1] + ) * (third[0] - first[0]) + + +def on_segment( + first: tuple[float, float], + point: tuple[float, float], + second: tuple[float, float], +) -> bool: + return ( + min(first[0], second[0]) - 1e-6 <= point[0] <= max(first[0], second[0]) + 1e-6 + and min(first[1], second[1]) - 1e-6 + <= point[1] + <= max(first[1], second[1]) + 1e-6 + ) + + +def segments_intersect( + a1: tuple[float, float], + a2: tuple[float, float], + b1: tuple[float, float], + b2: tuple[float, float], +) -> bool: + o1 = orientation(a1, a2, b1) + o2 = orientation(a1, a2, b2) + o3 = orientation(b1, b2, a1) + o4 = orientation(b1, b2, a2) + if ((o1 > 0 > o2) or (o1 < 0 < o2)) and ((o3 > 0 > o4) or (o3 < 0 < o4)): + return True + for value, first, point, second in ( + (o1, a1, b1, a2), + (o2, a1, b2, a2), + (o3, b1, a1, b2), + (o4, b1, a2, b2), + ): + if abs(value) <= 1e-6 and on_segment(first, point, second): + return True + return False + + +def segment_intersects_box( + start: tuple[float, float], end: tuple[float, float], box: list[float] +) -> bool: + if point_in_box(start, box) or point_in_box(end, box): + return True + left, top, width, height = box + top_left = (left, top) + top_right = (left + width, top) + bottom_right = (left + width, top + height) + bottom_left = (left, top + height) + return any( + segments_intersect(start, end, edge_start, edge_end) + for edge_start, edge_end in ( + (top_left, top_right), + (top_right, bottom_right), + (bottom_right, bottom_left), + (bottom_left, top_left), + ) + ) + + +def looks_unfilled(fill: object) -> bool: + value = str(fill or "").strip().lower().replace(" ", "") + if not value or value in { + "none", + "transparent", + "#ffffff", + "ffffff", + "white", + "#00000000", + "00000000", + "#ffffff00", + "ffffff00", + }: + return True + match = re.fullmatch(r"rgba\(\d+,\d+,\d+,([0-9.]+)\)", value) + return bool(match and float(match.group(1)) <= 0.05) + + +def is_large_wireframe(element: dict[str, Any], fw: float, fh: float) -> bool: + if element.get("kind") != "shape": + return False + geometry = str(element.get("geometry") or "").lower() + if geometry not in {"rect", "roundrect"}: + return False + box = element.get("_box") + if not isinstance(box, list): + return False + ratio = area(box) / max(1.0, fw * fh) + if ratio < 0.055 or ratio > 0.45: + return False + line_width = element.get("lineWidth") + has_line = bool(element.get("lineColor")) or ( + isinstance(line_width, (int, float)) and line_width > 0 + ) + return has_line and looks_unfilled(element.get("fillColor")) + + +def is_footer_furniture(element: dict[str, Any], footer_line_y: float) -> bool: + """Return true only for inherited-style footer furniture, never source notes.""" + label = object_label(element).lower() + text = re.sub(r"\s+", "", str(element.get("text") or "")) + box = element.get("_box") + if not isinstance(box, list) or box[1] < footer_line_y - 4: + return False + if any(token in label for token in ("source", "note", "来源", "脚注", "注释")): + return False + if any( + token in label + for token in ( + "footer", + "页脚", + "sldnum", + "slide-number", + "page-number", + "logo", + "公司名", + "保密", + ) + ): + return True + if any( + token in text + for token in ( + "易方达基金管理有限公司", + "仅供内部交流讨论", + "禁止外传", + "confidential", + "copyright", + "allrightsreserved", + ) + ): + return True + if re.fullmatch(r"[#<>（）()\s]*\d{1,3}[#<>（）()\s]*", text): + return True + geometry = str(element.get("geometry") or "").lower() + return ( + geometry in {"line", "straightconnector1"} + and abs(box[1] - footer_line_y) <= 4 + and box[3] <= 4 + ) + + +def unique_layout_elements(object_index: dict[str, dict[str, Any]]) -> list[dict[str, Any]]: + unique: list[dict[str, Any]] = [] + seen: set[int] = set() + for element in object_index.values(): + identity = id(element) + if identity in seen: + continue + seen.add(identity) + unique.append(element) + return unique + + +def missing_footer_furniture(object_index: dict[str, dict[str, Any]]) -> list[str]: + roles = { + "页脚分隔线": False, + "左侧公司名": False, + "中部保密提示": False, + "右侧页码": False, + } + for element in unique_layout_elements(object_index): + box = element.get("_box") + if not isinstance(box, list) or box[1] < 488: + continue + label = normalized_label(element) + text = re.sub(r"\s+", "", str(element.get("text") or "")) + geometry = str(element.get("geometry") or "").lower() + if ( + ( + geometry in {"line", "straightconnector1"} + and box[2] >= 480 + and box[3] <= 4 + ) + or any(token in label for token in ("footer-divider", "footer-rule", "footer-line")) + ): + roles["页脚分隔线"] = True + if "易方达基金管理有限公司" in text or any( + token in label for token in ("footer-company", "company-name") + ): + roles["左侧公司名"] = True + if any(token in text.lower() for token in ("仅供内部交流讨论", "禁止外传", "confidential")) or any( + token in label for token in ("footer-confidentiality", "confidentiality") + ): + roles["中部保密提示"] = True + if ( + any(token in label for token in ("page-number", "slide-number", "sldnum")) + or re.fullmatch(r"[#<>（）()\s]*\d{1,3}[#<>（）()\s]*", text) + ): + roles["右侧页码"] = True + return [name for name, present in roles.items() if not present] + + +def alignment_group_findings( + groups: object, + object_index: dict[str, dict[str, Any]], + slide: int, +) -> list[dict[str, Any]]: + if not isinstance(groups, list): + return [] + findings: list[dict[str, Any]] = [] + for group_index, group in enumerate(groups, start=1): + if not isinstance(group, dict): + findings.append( + issue( + "error", + "invalid-alignment-group", + f"alignmentGroups 第 {group_index} 项必须是对象", + slide, + ) + ) + continue + group_name = str(group.get("name") or f"第 {group_index} 组") + object_ids = group.get("objectIds") + checks = group.get("checks") + try: + tolerance = float(group.get("tolerancePx", 2.0)) + except (TypeError, ValueError): + tolerance = -1.0 + if ( + not isinstance(object_ids, list) + or len(object_ids) < 2 + or not isinstance(checks, list) + or not checks + or tolerance < 0 + or tolerance > 4 + ): + findings.append( + issue( + "error", + "invalid-alignment-group", + f"{group_name} 必须声明至少两个 objectIds、非空 checks，tolerancePx 须为 0–4", + slide, + ) + ) + continue + invalid_checks = [str(value) for value in checks if value not in ALIGNMENT_CHECKS] + if invalid_checks: + findings.append( + issue( + "error", + "invalid-alignment-group", + f"{group_name} 使用了未知检查项：{'、'.join(invalid_checks)}", + slide, + ) + ) + continue + elements: list[dict[str, Any]] = [] + missing_ids: list[str] = [] + seen: set[int] = set() + for value in object_ids: + key = str(value).strip() + element = object_index.get(key) + if not element or not isinstance(element.get("_box"), list): + missing_ids.append(key) + continue + if id(element) not in seen: + seen.add(id(element)) + elements.append(element) + if missing_ids or len(elements) < 2: + findings.append( + issue( + "error", + "invalid-alignment-group", + f"{group_name} 找不到布局对象：{'、'.join(missing_ids) or '有效对象不足两个'}", + slide, + ) + ) + continue + boxes = [element["_box"] for element in elements] + values_by_check = { + "left": [box[0] for box in boxes], + "right": [box[0] + box[2] for box in boxes], + "top": [box[1] for box in boxes], + "bottom": [box[1] + box[3] for box in boxes], + "width": [box[2] for box in boxes], + "height": [box[3] for box in boxes], + "center-x": [box[0] + box[2] / 2 for box in boxes], + "center-y": [box[1] + box[3] / 2 for box in boxes], + } + violations: list[str] = [] + for check in checks: + if check in values_by_check: + values = values_by_check[check] + delta = max(values) - min(values) + if delta > tolerance: + violations.append(f"{check} 偏差 {delta:.1f}px") + elif check == "horizontal-gap": + ordered = sorted(boxes, key=lambda box: box[0]) + gaps = [ + ordered[index + 1][0] - (ordered[index][0] + ordered[index][2]) + for index in range(len(ordered) - 1) + ] + if gaps and max(gaps) - min(gaps) > tolerance: + violations.append( + f"horizontal-gap 偏差 {max(gaps) - min(gaps):.1f}px" + ) + elif check == "vertical-gap": + ordered = sorted(boxes, key=lambda box: box[1]) + gaps = [ + ordered[index + 1][1] - (ordered[index][1] + ordered[index][3]) + for index in range(len(ordered) - 1) + ] + if gaps and max(gaps) - min(gaps) > tolerance: + violations.append( + f"vertical-gap 偏差 {max(gaps) - min(gaps):.1f}px" + ) + if violations: + findings.append( + issue( + "error", + "alignment-group-violation", + f"{group_name} 未通过同级网格：{'；'.join(violations)}；容差 {tolerance:.1f}px", + slide, + ) + ) + return findings + + +def analyze_file( + path: Path, +) -> tuple[int, list[dict[str, Any]], dict[str, dict[str, Any]]]: + data = json.loads(path.read_text(encoding="utf-8")) + slide_info = data.get("slide") or {} + slide = int(slide_info.get("slide") or 0) + frame = slide_info.get("frame") or {"left": 0, "top": 0, "width": 960, "height": 540} + fw = float(frame.get("width") or 960) + fh = float(frame.get("height") or 540) + footer_line_y = fh - 44 + content_safe_bottom = footer_line_y - 8 + findings: list[dict[str, Any]] = [] + elements = [item for item in data.get("elements") or [] if item.get("scope") == "slide"] + object_index: dict[str, dict[str, Any]] = {} + for element in elements: + for name in ("id", "aid", "name"): + value = element.get(name) + if value is not None and str(value).strip(): + object_index[str(value).strip()] = element + + usable: list[dict[str, Any]] = [] + for element in elements: + box = element.get("bbox") + if not isinstance(box, list) or len(box) != 4: + continue + box = [float(value) for value in box] + element["_box"] = box + usable.append(element) + if ( + box[1] + box[3] > content_safe_bottom + and not is_footer_furniture(element, footer_line_y) + ): + findings.append( + issue( + "error", + "footer-clearance-violation", + f"{object_label(element)} 底边 {box[1] + box[3]:.1f} 超过正文安全底线 " + f"{content_safe_bottom:.1f}；来源/注释必须整体位于页脚分隔线上方并保留至少 8px 间距", + slide, + ) + ) + tolerance = 3.0 + if ( + not is_connector(element) + and ( + box[0] < -tolerance + or box[1] < -tolerance + or box[0] + box[2] > fw + tolerance + or box[1] + box[3] > fh + tolerance + ) + ): + findings.append( + issue( + "warning", + "out-of-bounds-geometry", + f"{object_label(element)} bbox={box}；组合坐标可能失真，须以渲染溢出测试为准", + slide, + ) + ) + + text = str(element.get("text") or "").strip() + if not text: + continue + layout = element.get("textLayout") or {} + sizes = font_sizes(element) + max_size = max(sizes) if sizes else 0 + min_size = min(sizes) if sizes else 0 + is_title = is_page_title(element, fw) + legal = bool(LEGAL_RE.search(text)) + if is_title: + line_count = reported_line_count(element) + if line_count > 1: + findings.append( + issue("error", "wrapped-title", f"{object_label(element)} 标题为 {line_count} 行", slide) + ) + logo_safe_left = fw * 0.79 - 16.0 + if box[0] + box[2] > logo_safe_left: + findings.append( + issue( + "error", + "title-logo-clearance-violation", + f"{object_label(element)} 右边界 {box[0] + box[2]:.1f} 进入 Logo 前 16px 保护带；" + f"标题框右边界不得超过 {logo_safe_left:.1f}", + slide, + ) + ) + equivalent = weighted_length(text) + if equivalent > 34: + findings.append( + issue("warning", "long-title", f"标题约 {equivalent:.1f} 个等效中文字符", slide) + ) + elif box[1] < fh - 44 and not legal and min_size: + actual_pt = min_size * 0.75 + if actual_pt < 7: + findings.append( + issue( + "warning", + "illegible-text", + f"{object_label(element)} 最小约 {actual_pt:.1f}pt；仅源注/脚注/法务可保留", + slide, + ) + ) + elif actual_pt < 10: + findings.append( + issue("warning", "small-body-text", f"{object_label(element)} 最小约 {actual_pt:.1f}pt", slide) + ) + + if requires_left_alignment(element): + non_left = sorted( + value + for value in paragraph_alignments(element) + if value not in LEFT_ALIGNMENT_VALUES + ) + if non_left: + findings.append( + issue( + "error", + "body-text-not-left-aligned", + f"{object_label(element)} 的正文角色 {element_role(element) or 'body'} " + f"使用 {', '.join(non_left)} 对齐；解释、说明、建议、结论和表格正文必须左对齐", + slide, + ) + ) + + if needs_body_inset_check(element): + insets = text_insets(element) + if insets is None: + findings.append( + issue( + "error", + "missing-text-insets", + f"{object_label(element)} 是含正文的图形，但布局 JSON 未导出 textInsets；" + "无法验证文字与图形边缘的安全距离", + slide, + ) + ) + else: + tight = [ + f"{side}={value:.1f}px" + for side, value in insets.items() + if value < MIN_TEXT_INSET_PX + ] + if tight: + findings.append( + issue( + "error", + "text-inset-clearance", + f"{object_label(element)} 的正文内边距不足 {MIN_TEXT_INSET_PX:.0f}px：" + + "、".join(tight), + slide, + ) + ) + + text_elements = [ + element + for element in usable + if str(element.get("text") or "").strip() + and not is_footer_furniture(element, footer_line_y) + ] + connector_clearance_count = 0 + for connector in (element for element in usable if is_connector(element)): + if is_footer_furniture(connector, footer_line_y): + continue + label = normalized_label(connector) + if any(token in label for token in ("axis", "rule", "divider", "separator")): + continue + segment = connector_segment(connector) + if segment is None: + findings.append( + issue( + "error", + "connector-endpoints-missing", + f"{object_label(connector)} 未导出 lineStart/lineEnd 或 points；" + "无法验证连接线与文字的 8px 安全距离", + slide, + ) + ) + continue + attached_ids = { + str(value).strip() + for name in ("fromId", "toId", "sourceId", "targetId") + if (value := connector.get(name)) is not None + } + for text_element in text_elements: + aliases = { + str(text_element.get(name)).strip() + for name in ("id", "aid", "name") + if text_element.get(name) is not None + } + if attached_ids.intersection(aliases): + continue + text_box = text_element["_box"] + expanded_box = [ + text_box[0] - CONNECTOR_TEXT_CLEARANCE_PX, + text_box[1] - CONNECTOR_TEXT_CLEARANCE_PX, + text_box[2] + CONNECTOR_TEXT_CLEARANCE_PX * 2, + text_box[3] + CONNECTOR_TEXT_CLEARANCE_PX * 2, + ] + if segment_intersects_box(segment[0], segment[1], expanded_box): + connector_clearance_count += 1 + findings.append( + issue( + "error", + "connector-text-clearance", + f"{object_label(connector)} 进入 {object_label(text_element)} 外扩 " + f"{CONNECTOR_TEXT_CLEARANCE_PX:.0f}px 的文字安全区；须移动连接线、标签或节点", + slide, + ) + ) + if connector_clearance_count >= 20: + findings.append( + issue( + "error", + "connector-clearance-cap", + "本页连接线文字安全距离错误已截断为 20 条", + slide, + ) + ) + break + if connector_clearance_count >= 20: + break + + wireframes = [ + object_label(element) + for element in usable + if is_large_wireframe(element, fw, fh) + ] + if len(wireframes) >= 3: + findings.append( + issue( + "warning", + "wireframe-heavy", + f"发现 {len(wireframes)} 个大面积空心线框容器；优先改为实心重点块、浅色分区或无边框对齐。示例：" + + "、".join(wireframes[:4]), + slide, + ) + ) + + narrative_bodies = [ + element for element in usable if normalized_label(element) == "standard-narrative-body" + ] + callouts = [ + element + for element in usable + if any( + token in normalized_label(element) + for token in ("takeaway", "conclusion", "callout", "summary-block") + ) + ] + for body in narrative_bodies: + required_height = standard_narrative_required_height(body) + body_box = body["_box"] + if required_height is not None and required_height > body_box[3] + 1.0: + findings.append( + issue( + "error", + "standard-narrative-text-overflow", + f"{object_label(body)} 按真实行数、字号和 150% 行距至少需要 " + f"{required_height:.1f}px，高于文本框 {body_box[3]:.1f}px", + slide, + ) + ) + actual_bottom = body_box[1] + max(body_box[3], required_height or body_box[3]) + for callout in callouts: + callout_box = callout["_box"] + if horizontal_intersection(body_box, callout_box) <= 4: + continue + gap = callout_box[1] - actual_bottom + if -callout_box[3] < gap < 16.0: + findings.append( + issue( + "error", + "narrative-callout-clearance", + f"{object_label(body)} 的实际文字底边与 {object_label(callout)} " + f"仅相隔 {gap:.1f}px；至少需要 16px", + slide, + ) + ) + + chart_labels = [element for element in usable if is_chart_category_label(element)] + chart_marks = [element for element in usable if is_chart_data_mark(element)] + for label in chart_labels: + for mark in chart_marks: + common = intersection(label["_box"], mark["_box"]) + if common > 16.0: + findings.append( + issue( + "error", + "chart-label-mark-overlap", + f"{object_label(label)} 与数据标记 {object_label(mark)} 相交 " + f"{common:.1f}px²；须为类别标签保留独立槽位", + slide, + ) + ) + + for callout in (element for element in usable if is_advisory_callout(element)): + alignments = paragraph_alignments(callout) + non_left = sorted( + value + for value in alignments + if value not in {"", "left", "start", "l", "none"} + ) + if non_left: + findings.append( + issue( + "error", + "advisory-callout-not-left-aligned", + f"{object_label(callout)} 的建议/结论文本对齐为 {', '.join(non_left)}；必须左对齐", + slide, + ) + ) + + grouped_table_elements = [ + element for element in usable if normalized_label(element).startswith("grouped-table-") + ] + if grouped_table_elements: + for element in grouped_table_elements: + label = normalized_label(element) + geometry = str(element.get("geometry") or "").lower() + if ( + any(token in label for token in ("rule", "separator", "divider")) + or geometry in {"line", "straightconnector1"} + ): + findings.append( + issue( + "error", + "grouped-table-separator-line", + f"{object_label(element)} 是分组表正文分隔线；模式 B/C 必须改用底色和留白分层", + slide, + ) + ) + + overlap_count = 0 + for index, first in enumerate(usable): + if is_connector(first): + continue + a = first["_box"] + a_area = area(a) + if a_area <= 16 or a_area > fw * fh * 0.60: + continue + for second in usable[index + 1 :]: + if is_connector(second): + continue + b = second["_box"] + b_area = area(b) + if b_area <= 16 or b_area > fw * fh * 0.60: + continue + common = intersection(a, b) + smaller = min(a_area, b_area) + if smaller <= 0 or common <= 40: + continue + ratio = common / smaller + if ratio >= 0.96: + continue + if ratio >= 0.25: + overlap_count += 1 + findings.append( + issue( + "warning", + "overlap-review", + f"{object_label(first)} 与 {object_label(second)} 重叠 {ratio:.0%}（需视觉判定）", + slide, + ) + ) + if overlap_count >= 25: + findings.append(issue("warning", "overlap-cap", "本页重叠警告已截断为 25 条", slide)) + break + if overlap_count >= 25: + break + + return slide, findings, object_index + + +def validate_frame_map( + path: Path, + expected_slides: set[int], + layout_objects: dict[int, dict[str, dict[str, Any]]], +) -> list[dict[str, Any]]: + try: + data = json.loads(path.read_text(encoding="utf-8")) + except (OSError, json.JSONDecodeError) as exc: + return [issue("error", "invalid-frame-map", f"无法读取映射：{exc}", 0)] + + pages = data.get("outputSlides") + if not isinstance(pages, list) or not pages: + return [ + issue( + "error", + "missing-output-slides", + "template-frame-map.json 必须包含非空 outputSlides 数组", + 0, + ) + ] + + findings: list[dict[str, Any]] = [] + mapped_slides: set[int] = set() + content_slides: list[int] = [] + for entry in pages: + if not isinstance(entry, dict): + findings.append(issue("error", "invalid-slide-map", "页映射必须是对象", 0)) + continue + try: + slide = int(entry.get("outputSlide")) + except (TypeError, ValueError): + findings.append(issue("error", "invalid-output-slide", "outputSlide 必须是 1-based 整数", 0)) + continue + if slide in mapped_slides: + findings.append(issue("error", "duplicate-output-slide", "outputSlides 中页码重复", slide)) + mapped_slides.add(slide) + + declared_page_kind = entry.get("pageKind") + page_kind: str | None = ( + str(declared_page_kind) if has_content(declared_page_kind) else None + ) + content_page = False + binding = entry.get("visualTextBinding") + if not isinstance(binding, dict): + findings.append( + issue( + "error", + "missing-visual-text-binding", + "每页必须提供 visualTextBinding；普通内容页不得只有文字", + slide, + ) + ) + elif binding.get("exempt") is True: + page_kind = binding.get("pageKind") + reason = binding.get("reason") + if page_kind not in VISUAL_EXEMPT_PAGE_KINDS or weak_reuse_reason(reason): + findings.append( + issue( + "error", + "invalid-visual-exemption", + "仅固定封面、目录、法务和纯结束页可豁免，且必须填写具体原因", + slide, + ) + ) + else: + content_slides.append(slide) + content_page = True + missing_binding = [ + name for name in VISUAL_TEXT_BINDING_FIELDS if not has_content(binding.get(name)) + ] + if missing_binding: + findings.append( + issue( + "error", + "incomplete-visual-text-binding", + "图文语义绑定缺少具体字段：" + "、".join(missing_binding), + slide, + ) + ) + else: + visual_type = binding.get("visualType") + if visual_type not in VISUAL_TYPES: + findings.append( + issue( + "error", + "invalid-visual-type", + f"visualType 必须为 {sorted(VISUAL_TYPES)} 之一", + slide, + ) + ) + if weak_visual_binding(binding): + findings.append( + issue( + "error", + "weak-visual-relevance", + "视觉必须具体说明支撑的主张、选用原因和独立承载的信息，不能只写美观、装饰或与主题相关", + slide, + ) + ) + visual_ids = binding.get("visualObjectIds") + if not isinstance(visual_ids, list) or not visual_ids: + findings.append( + issue( + "error", + "invalid-visual-object-ids", + "visualObjectIds 必须是非空对象 ID 数组", + slide, + ) + ) + else: + known_objects = layout_objects.get(slide, {}) + unknown = [ + str(value) + for value in visual_ids + if str(value).strip() not in known_objects + ] + if unknown: + findings.append( + issue( + "error", + "missing-visual-object", + "声明的视觉对象未出现在对应布局 JSON：" + + "、".join(unknown[:8]), + slide, + ) + ) + + if content_page: + missing_footer = missing_footer_furniture(layout_objects.get(slide, {})) + if missing_footer: + findings.append( + issue( + "error", + "missing-brand-footer-furniture", + "普通内容页必须保留完整品牌页脚，当前缺少：" + + "、".join(missing_footer), + slide, + ) + ) + + mode = entry.get("buildMode") + if mode not in BUILD_MODES: + findings.append( + issue( + "error", + "invalid-build-mode", + f"buildMode 必须为 {sorted(BUILD_MODES)} 之一", + slide, + ) + ) + continue + + try: + module_count = int(entry.get("moduleCount") or 0) + except (TypeError, ValueError): + module_count = -1 + alignment_groups = entry.get("alignmentGroups") + if mode != "reuse" and module_count >= 2 and not ( + isinstance(alignment_groups, list) and alignment_groups + ): + findings.append( + issue( + "error", + "missing-alignment-groups", + "含两个及以上模块的原创/受控重组页必须声明 alignmentGroups，" + "记录同级对象的边缘、尺寸、基线或间距约束", + slide, + ) + ) + findings.extend( + alignment_group_findings(alignment_groups, layout_objects.get(slide, {}), slide) + ) + + for target in entry.get("editTargets") or []: + if not isinstance(target, dict): + continue + role = str(target.get("textRole") or "").strip().lower().replace("_", "-") + if role not in BODY_LEFT_ALIGNED_ROLES: + continue + raw_ids = target.get("finalShapeIds") + if not isinstance(raw_ids, list): + raw_ids = [ + value + for value in (target.get("finalShapeId"), target.get("shapeId")) + if value is not None + ] + for value in raw_ids: + element = layout_objects.get(slide, {}).get(str(value).strip()) + if not element: + continue + non_left = sorted( + alignment + for alignment in paragraph_alignments(element) + if alignment not in LEFT_ALIGNMENT_VALUES + ) + if non_left: + findings.append( + issue( + "error", + "body-text-not-left-aligned", + f"{object_label(element)} 在映射中声明为 {role}，实际使用 " + f"{', '.join(non_left)} 对齐；正文角色必须左对齐", + slide, + ) + ) + + if page_kind == "cover": + profile = entry.get("coverProfile") + if profile not in COVER_PROFILES: + findings.append( + issue( + "error", + "invalid-cover-profile", + f"固定封面必须声明 coverProfile，且只能为 {sorted(COVER_PROFILES)} 之一", + slide, + ) + ) + if mode != "reuse": + findings.append( + issue( + "error", + "cover-must-reuse", + "封面是固定标准页，buildMode 必须为 reuse；不得原创或受控重组封面", + slide, + ) + ) + expected_source = COVER_PROFILES.get(profile) + source_slide = entry.get("sourceSlide") + if expected_source is not None: + try: + source_slide_number = int(source_slide) + except (TypeError, ValueError): + source_slide_number = -1 + if source_slide_number != expected_source: + findings.append( + issue( + "error", + "cover-source-slide-mismatch", + f"{profile} 必须复用源第 {expected_source} 页", + slide, + ) + ) + elif profile == "user-template": + try: + valid_source_slide = int(source_slide) >= 1 + except (TypeError, ValueError): + valid_source_slide = False + if not valid_source_slide: + findings.append( + issue( + "error", + "missing-cover-source-slide", + "user-template 封面必须声明 1-based sourceSlide", + slide, + ) + ) + + if mode == "reuse": + eligibility = entry.get("reuseEligibility") + if not isinstance(eligibility, dict): + findings.append( + issue( + "error", + "missing-reuse-eligibility", + "直接复用页必须提供 reuseEligibility", + slide, + ) + ) + continue + failed = [name for name in REUSE_QUALIFIERS if eligibility.get(name) is not True] + if failed: + findings.append( + issue( + "error", + "unqualified-direct-reuse", + "直接复用资格未全部满足：" + "、".join(failed), + slide, + ) + ) + if weak_reuse_reason(eligibility.get("reason")): + findings.append( + issue( + "error", + "weak-reuse-reason", + "直接复用原因必须具体，不能只写可以换字、版面相近或套用模板", + slide, + ) + ) + else: + decision = entry.get("layoutDecision") + if not isinstance(decision, dict): + findings.append( + issue( + "error", + "missing-layout-decision", + "原创或受控重组页必须提供 layoutDecision", + slide, + ) + ) + continue + missing = [name for name in LAYOUT_DECISION_FIELDS if not has_content(decision.get(name))] + if missing: + findings.append( + issue( + "error", + "incomplete-layout-decision", + "布局决策缺少具体字段：" + "、".join(missing), + slide, + ) + ) + + if len(content_slides) >= 6: + standard_names = { + "standard-narrative-title", + "standard-narrative-body", + "standard-visual-title", + } + standard_slides: list[int] = [] + for slide in content_slides: + names = { + str(value).strip().lower() + for value in layout_objects.get(slide, {}) + } + if standard_names.issubset(names): + standard_slides.append(slide) + minimum = math.ceil(len(content_slides) / 3) + if len(standard_slides) < minimum: + findings.append( + issue( + "error", + "insufficient-standard-evidence-layouts", + f"普通内容页 {len(content_slides)} 页，基础证据双区页仅 {len(standard_slides)} 页；" + f"至少需要 {minimum} 页（普通内容页的三分之一）", + 0, + ) + ) + + for slide in sorted(expected_slides - mapped_slides): + findings.append( + issue( + "error", + "unmapped-layout-slide", + "存在布局 JSON，但 template-frame-map.json 没有对应 outputSlide", + slide, + ) + ) + return findings + + +def main() -> int: + parser = argparse.ArgumentParser(description="检查规范化的易方达逐页布局 JSON。") + parser.add_argument("layout_dir", type=Path) + parser.add_argument( + "--map", + type=Path, + help="可选：校验布局决策、直接复用资格、图文语义绑定和视觉对象存在性", + ) + parser.add_argument("--json-output", type=Path) + parser.add_argument("--warnings-as-errors", action="store_true") + args = parser.parse_args() + + paths = sorted(args.layout_dir.expanduser().resolve().glob("*.layout.json")) + if not paths: + print(f"No .layout.json files found in {args.layout_dir}", file=sys.stderr) + return 2 + + findings: list[dict[str, Any]] = [] + slides: list[int] = [] + layout_objects: dict[int, dict[str, dict[str, Any]]] = {} + for path in paths: + slide, file_findings, object_index = analyze_file(path) + slides.append(slide) + layout_objects[slide] = object_index + findings.extend(file_findings) + if args.map: + findings.extend( + validate_frame_map(args.map.expanduser().resolve(), set(slides), layout_objects) + ) + report = { + "layoutDir": str(args.layout_dir.expanduser().resolve()), + "templateFrameMap": str(args.map.expanduser().resolve()) if args.map else None, + "slides": slides, + "errorCount": sum(item["severity"] == "error" for item in findings), + "warningCount": sum(item["severity"] == "warning" for item in findings), + "issues": findings, + } + if args.json_output: + args.json_output.parent.mkdir(parents=True, exist_ok=True) + args.json_output.write_text(json.dumps(report, ensure_ascii=False, indent=2), encoding="utf-8") + + print(f"Layouts: {len(paths)}") + print(f"Errors: {report['errorCount']}; Warnings: {report['warningCount']}") + for item in findings: + print(f"[{item['severity'].upper()}] {item['code']} slide={item['slide']}: {item['message']}") + + failed = report["errorCount"] > 0 or (args.warnings_as_errors and report["warningCount"] > 0) + return 1 if failed else 0 + + +if __name__ == "__main__": + sys.exit(main()) diff --git a/skills/efund-ppt-maker/scripts/qa_efund_pptx.py b/skills/efund-ppt-maker/scripts/qa_efund_pptx.py new file mode 100644 index 000000000..399ef178d --- /dev/null +++ b/skills/efund-ppt-maker/scripts/qa_efund_pptx.py @@ -0,0 +1,555 @@ +#!/usr/bin/env python3 +"""Structural QA for E Fund-style PPTX files. Uses only Python stdlib.""" + +from __future__ import annotations + +import argparse +import json +import re +import sys +import xml.etree.ElementTree as ET +from pathlib import Path +from typing import Any, Iterable +from zipfile import BadZipFile, ZipFile + +P_NS = "http://schemas.openxmlformats.org/presentationml/2006/main" +A_NS = "http://schemas.openxmlformats.org/drawingml/2006/main" +NS = {"p": P_NS, "a": A_NS} +EMU_PER_INCH = 914400 +TARGET_ASPECT = 16 / 9 +TARGET_WIDTH_EMU = 10 * EMU_PER_INCH +PROMPT_RE = re.compile( + r"(?:单击此处|Click\s+to\s+(?:add|edit)|Slide\s+Number|\bFooter\b|20xx|\bxxx\b)", + re.IGNORECASE, +) +LEGAL_RE = re.compile(r"(?:风险提示|免责声明|Risk Reminder|Disclaimer|附注)", re.I) +PREFERRED_FONTS = {"Arial", "华文黑体_易方达"} +PREFERRED_EAST_ASIAN_FONT = "华文黑体_易方达" +CJK_RE = re.compile(r"[\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff]") +ALLOWED_LEGACY_FONTS = { + "Arial Narrow", + "华文黑体", + "微软雅黑", + "PingFang SC", + "STHeiti", +} +STANDARD_TEXT_SPECS = { + "standard-narrative-title": {"size": 15.0, "kind": "title"}, + "standard-visual-title": {"size": 10.0, "kind": "visual-title"}, + "standard-narrative-body": {"size": 12.0, "kind": "body"}, +} +STANDARD_BODY_LINE_SPACING_PCT = 150.0 + + +def local_name(tag: str) -> str: + return tag.rsplit("}", 1)[-1] + + +def slide_key(name: str) -> int: + match = re.search(r"slide(\d+)\.xml$", name) + return int(match.group(1)) if match else 10**9 + + +def text_of(element: ET.Element) -> str: + return "".join(node.text or "" for node in element.findall(".//a:t", NS)).strip() + + +def object_name(element: ET.Element) -> str: + node = element.find(".//p:cNvPr", NS) + return (node.get("name") if node is not None else None) or local_name(element.tag) + + +def has_forbidden_shadow(element: ET.Element) -> bool: + shadow_tags = {"outerShdw", "innerShdw", "prstShdw"} + return any(local_name(node.tag) in shadow_tags for node in element.iter()) + + +def get_transform(element: ET.Element) -> tuple[int, int, int, int] | None: + kind = local_name(element.tag) + if kind == "graphicFrame": + xfrm = element.find("p:xfrm", NS) + elif kind == "grpSp": + xfrm = element.find("p:grpSpPr/a:xfrm", NS) + else: + xfrm = element.find("p:spPr/a:xfrm", NS) + if xfrm is None: + return None + off = xfrm.find("a:off", NS) + ext = xfrm.find("a:ext", NS) + if off is None or ext is None: + return None + try: + return ( + int(off.get("x") or 0), + int(off.get("y") or 0), + int(ext.get("cx") or 0), + int(ext.get("cy") or 0), + ) + except ValueError: + return None + + +def top_level_objects(root: ET.Element) -> Iterable[ET.Element]: + tree = root.find("p:cSld/p:spTree", NS) + if tree is None: + return [] + accepted = {"sp", "pic", "graphicFrame", "cxnSp", "grpSp"} + return [child for child in list(tree) if local_name(child.tag) in accepted] + + +def weighted_title_length(text: str) -> float: + return sum(1.0 if ord(char) > 127 else 0.5 for char in re.sub(r"\s+", "", text)) + + +def issue(severity: str, code: str, message: str, slide: int | None = None) -> dict[str, Any]: + item: dict[str, Any] = {"severity": severity, "code": code, "message": message} + if slide is not None: + item["slide"] = slide + return item + + +def font_families(zf: ZipFile) -> set[str]: + families: set[str] = set() + prefixes = ("ppt/slides/", "ppt/slideLayouts/", "ppt/slideMasters/") + for name in zf.namelist(): + if not name.endswith(".xml") or not name.startswith(prefixes): + continue + try: + root = ET.fromstring(zf.read(name)) + except ET.ParseError: + continue + for node in root.iter(): + if local_name(node.tag) in {"latin", "ea", "cs", "sym"}: + value = (node.get("typeface") or "").strip() + if value and not value.startswith("+"): + families.add(value.replace(""", '"')) + return families + + +def east_asian_font_audit(element: ET.Element) -> dict[str, Any]: + """Audit explicit East Asian typefaces on DrawingML runs containing CJK text.""" + preferred = 0 + implicit: list[str] = [] + wrong: list[tuple[str, str]] = [] + runs = list(element.findall(".//a:r", NS)) + list(element.findall(".//a:fld", NS)) + for run in runs: + text = "".join(node.text or "" for node in run.findall(".//a:t", NS)).strip() + if not text or not CJK_RE.search(text): + continue + run_properties = run.find("a:rPr", NS) + east_asian = run_properties.find("a:ea", NS) if run_properties is not None else None + typeface = (east_asian.get("typeface") if east_asian is not None else "") or "" + typeface = typeface.strip() + sample = re.sub(r"\s+", " ", text)[:24] + if typeface == PREFERRED_EAST_ASIAN_FONT: + preferred += 1 + elif not typeface or typeface.startswith("+"): + implicit.append(sample) + else: + wrong.append((sample, typeface)) + return {"preferredExplicit": preferred, "implicit": implicit, "wrong": wrong} + + +def visible_runs(element: ET.Element) -> list[ET.Element]: + return [ + run + for run in list(element.findall(".//a:r", NS)) + list(element.findall(".//a:fld", NS)) + if text_of(run) + ] + + +def drawingml_bold(run_properties: ET.Element | None) -> bool: + if run_properties is None: + return False + value = (run_properties.get("b") or "").strip().lower() + return value in {"1", "true", "on"} + + +def paragraph_text(paragraph: ET.Element) -> str: + return "".join(node.text or "" for node in paragraph.findall(".//a:t", NS)).strip() + + +def paragraph_line_spacing_pct(paragraph: ET.Element) -> float | None: + node = paragraph.find("a:pPr/a:lnSpc/a:spcPct", NS) + if node is None: + return None + try: + return int(node.get("val") or 0) / 1000 + except ValueError: + return None + + +def paragraph_is_fully_bold(paragraph: ET.Element) -> bool: + runs = visible_runs(paragraph) + return bool(runs) and all(drawingml_bold(run.find("a:rPr", NS)) for run in runs) + + +def audit_named_standard_text( + element: ET.Element, slide_number: int +) -> list[dict[str, Any]]: + """Enforce the optional standard evidence-page text contract by stable object name.""" + name = object_name(element).strip().lower() + spec = STANDARD_TEXT_SPECS.get(name) + if spec is None: + return [] + + issues: list[dict[str, Any]] = [] + runs = visible_runs(element) + if not runs: + return [ + issue( + "error", + "standard-text-empty", + f"具名标准文本对象 {object_name(element)} 为空", + slide_number, + ) + ] + + expected_size = float(spec["size"]) + for run in runs: + run_text = text_of(run) + run_properties = run.find("a:rPr", NS) + try: + actual_size = ( + int(run_properties.get("sz") or 0) / 100 + if run_properties is not None + else 0 + ) + except ValueError: + actual_size = 0 + if abs(actual_size - expected_size) > 0.01: + issues.append( + issue( + "error", + "standard-text-size", + f"{object_name(element)} 的“{run_text[:20]}”为 {actual_size:g}pt，要求 {expected_size:g}pt", + slide_number, + ) + ) + + if spec["kind"] == "title" and not drawingml_bold(run_properties): + issues.append( + issue( + "error", + "standard-title-not-bold", + f"{object_name(element)} 的标题 run 必须加粗：{run_text[:20]}", + slide_number, + ) + ) + if spec["kind"] == "visual-title" and drawingml_bold(run_properties): + issues.append( + issue( + "error", + "standard-visual-title-bold", + f"{object_name(element)} 的图表/视觉标题必须为常规字重：{run_text[:20]}", + slide_number, + ) + ) + + if CJK_RE.search(run_text): + east_asian = run_properties.find("a:ea", NS) if run_properties is not None else None + typeface = (east_asian.get("typeface") if east_asian is not None else "") or "" + if typeface.strip() != PREFERRED_EAST_ASIAN_FONT: + issues.append( + issue( + "error", + "standard-text-east-asian-font", + f"{object_name(element)} 的中文 run 必须显式使用 {PREFERRED_EAST_ASIAN_FONT}：{run_text[:20]}", + slide_number, + ) + ) + if re.search(r"[A-Za-z0-9]", run_text): + latin = run_properties.find("a:latin", NS) if run_properties is not None else None + typeface = (latin.get("typeface") if latin is not None else "") or "" + if typeface.strip() != "Arial": + issues.append( + issue( + "error", + "standard-text-latin-font", + f"{object_name(element)} 的英文/数字 run 必须显式使用 Arial：{run_text[:20]}", + slide_number, + ) + ) + + if spec["kind"] == "body": + for paragraph in element.findall(".//a:p", NS): + body_text = paragraph_text(paragraph) + if not body_text: + continue + spacing = paragraph_line_spacing_pct(paragraph) + if spacing is None or abs(spacing - STANDARD_BODY_LINE_SPACING_PCT) > 0.01: + actual = "未显式设置" if spacing is None else f"{spacing:g}%" + issues.append( + issue( + "error", + "standard-body-line-spacing", + f"{object_name(element)} 的正文段落行距为 {actual}，要求 150%：{body_text[:20]}", + slide_number, + ) + ) + if len(re.sub(r"\s+", "", body_text)) >= 8 and paragraph_is_fully_bold(paragraph): + issues.append( + issue( + "error", + "standard-body-all-bold", + f"{object_name(element)} 的完整正文段落不得全部加粗：{body_text[:20]}", + slide_number, + ) + ) + return issues + + +def analyze(path: Path) -> dict[str, Any]: + issues: list[dict[str, Any]] = [] + result: dict[str, Any] = {"file": str(path), "issues": issues} + try: + with ZipFile(path) as zf: + presentation = ET.fromstring(zf.read("ppt/presentation.xml")) + size = presentation.find("p:sldSz", NS) + if size is None: + issues.append(issue("error", "missing-slide-size", "presentation.xml 缺少 p:sldSz")) + return result + width = int(size.get("cx") or 0) + height = int(size.get("cy") or 0) + aspect = width / height if height else 0 + result["slideSizeEmu"] = {"width": width, "height": height} + result["aspectRatio"] = aspect + if width <= 0 or height <= 0 or abs(aspect - TARGET_ASPECT) > 0.004: + issues.append( + issue("error", "aspect-ratio", f"画布比例 {aspect:.5f} 不是允许的 16:9") + ) + if abs(width - TARGET_WIDTH_EMU) > int(0.01 * EMU_PER_INCH): + issues.append( + issue( + "error", + "canvas-width", + f"画布宽度为 {width / EMU_PER_INCH:.3f} 英寸，不是易方达案例的 10 英寸", + ) + ) + + slide_names = sorted( + ( + name + for name in zf.namelist() + if re.fullmatch(r"ppt/slides/slide\d+\.xml", name) + ), + key=slide_key, + ) + result["slideCount"] = len(slide_names) + tolerance_x = int(width * 0.008) + tolerance_y = int(height * 0.008) + slide_summaries: list[dict[str, Any]] = [] + east_asian_totals = {"preferredExplicit": 0, "implicit": 0, "wrong": 0} + + for slide_number, name in enumerate(slide_names, start=1): + root = ET.fromstring(zf.read(name)) + all_text = "\n".join(filter(None, (text_of(obj) for obj in top_level_objects(root)))) + char_count = len(re.sub(r"\s+", "", all_text)) + summary: dict[str, Any] = {"slide": slide_number, "characters": char_count} + slide_summaries.append(summary) + legal = bool(LEGAL_RE.search(all_text)) + + if PROMPT_RE.search(all_text): + matched = PROMPT_RE.search(all_text) + issues.append( + issue( + "error", + "template-prompt", + f"残留模板提示语：{matched.group(0) if matched else 'unknown'}", + slide_number, + ) + ) + if char_count > 650 and not legal: + issues.append( + issue("warning", "high-density", f"正文约 {char_count} 字符，需检查是否应拆页", slide_number) + ) + + title_candidates: list[tuple[int, str]] = [] + implicit_east_asian: list[tuple[str, str]] = [] + wrong_east_asian: list[tuple[str, str, str]] = [] + slide_east_asian = {"preferredExplicit": 0, "implicit": 0, "wrong": 0} + for obj in top_level_objects(root): + kind = local_name(obj.tag) + text = text_of(obj) + if has_forbidden_shadow(obj): + issues.append( + issue( + "error", + "shape-shadow-forbidden", + f"对象 {object_name(obj)} 使用了图形阴影；易方达页面必须保持扁平无阴影", + slide_number, + ) + ) + issues.extend(audit_named_standard_text(obj, slide_number)) + east_asian = east_asian_font_audit(obj) + slide_east_asian["preferredExplicit"] += east_asian["preferredExplicit"] + slide_east_asian["implicit"] += len(east_asian["implicit"]) + slide_east_asian["wrong"] += len(east_asian["wrong"]) + implicit_east_asian.extend( + (object_name(obj), sample) for sample in east_asian["implicit"] + ) + wrong_east_asian.extend( + (object_name(obj), sample, typeface) + for sample, typeface in east_asian["wrong"] + ) + transform = get_transform(obj) + if obj.find(".//p:ph", NS) is not None and not text: + issues.append( + issue( + "error", + "empty-placeholder", + f"空占位符：{object_name(obj)}", + slide_number, + ) + ) + if transform is None: + continue + x, y, obj_width, obj_height = transform + if kind not in {"grpSp", "cxnSp"} and obj_width > 0 and obj_height > 0: + if ( + x < -tolerance_x + or y < -tolerance_y + or x + obj_width > width + tolerance_x + or y + obj_height > height + tolerance_y + ): + fully_outside = ( + x + obj_width <= 0 + or y + obj_height <= 0 + or x >= width + or y >= height + ) + code = "off-canvas-object" if fully_outside else "out-of-bounds-geometry" + message = ( + "对象完全位于画布外，通常是模板制作说明；成品应确认删除" + if fully_outside + else "对象边界跨出画布；必须用渲染溢出测试确认可见像素" + ) + issues.append( + issue( + "warning", + code, + f"{message}：{object_name(obj)} x={x}, y={y}, w={obj_width}, h={obj_height}", + slide_number, + ) + ) + if ( + kind not in {"grpSp", "cxnSp"} + and text + and x >= 0 + and y >= 0 + and y < int(0.85 * EMU_PER_INCH) + and x < int(7.7 * EMU_PER_INCH) + ): + title_candidates.append((y, text.replace("\n", " ").strip())) + + sizes = [] + for node in obj.findall(".//*[@sz]"): + try: + sizes.append(int(node.get("sz") or 0) / 100) + except ValueError: + pass + if kind not in {"grpSp", "cxnSp"} and text and sizes and not legal: + min_size = min(value for value in sizes if value > 0) if any(sizes) else 0 + if min_size and min_size < 10 and y < int(5.12 * EMU_PER_INCH): + issues.append( + issue( + "warning", + "small-body-text", + f"对象 {object_name(obj)} 含 {min_size:g}pt 文本；仅脚注/来源允许低于 10pt", + slide_number, + ) + ) + + summary["eastAsianFontRuns"] = slide_east_asian + for key in east_asian_totals: + east_asian_totals[key] += slide_east_asian[key] + if implicit_east_asian: + samples = "；".join( + f"{name}：{sample}" for name, sample in implicit_east_asian[:3] + ) + issues.append( + issue( + "warning", + "implicit-east-asian-font", + f"{len(implicit_east_asian)} 个中文 run 未显式设置 a:ea；继承对象须登记，新增长文本则 QA 失败。示例：{samples}", + slide_number, + ) + ) + if wrong_east_asian: + samples = "；".join( + f"{name}：{sample}（{typeface}）" + for name, sample, typeface in wrong_east_asian[:3] + ) + issues.append( + issue( + "warning", + "wrong-east-asian-font", + f"{len(wrong_east_asian)} 个中文 run 显式使用非首选东亚字体；继承对象须登记，新增长文本则 QA 失败。示例：{samples}", + slide_number, + ) + ) + + if title_candidates: + title = min(title_candidates, key=lambda item: item[0])[1] + summary["title"] = title + equivalent = weighted_title_length(title) + if equivalent > 34: + issues.append( + issue( + "warning", + "long-title", + f"标题约 {equivalent:.1f} 个等效中文字符，可能侵入 Logo 区或换行", + slide_number, + ) + ) + + fonts = sorted(font_families(zf)) + result["fonts"] = fonts + nonpreferred = sorted( + font for font in fonts if font not in PREFERRED_FONTS | ALLOWED_LEGACY_FONTS + ) + if nonpreferred: + issues.append( + issue( + "warning", + "nonpreferred-fonts", + "发现非首选字体；必须逐对象证明来自继承图表/品牌对象，若用于新增可见文本则 QA 失败：" + + ", ".join(nonpreferred), + ) + ) + result["eastAsianFontRuns"] = east_asian_totals + result["slides"] = slide_summaries + except (BadZipFile, KeyError, ET.ParseError, OSError, ValueError) as exc: + issues.append(issue("error", "unreadable-pptx", f"无法读取 PPTX：{exc}")) + + result["errorCount"] = sum(item["severity"] == "error" for item in issues) + result["warningCount"] = sum(item["severity"] == "warning" for item in issues) + return result + + +def main() -> int: + parser = argparse.ArgumentParser(description="检查易方达风格 PPTX 的结构、越界、占位符和字体。") + parser.add_argument("pptx", type=Path) + parser.add_argument("--json-output", type=Path) + parser.add_argument("--warnings-as-errors", action="store_true") + args = parser.parse_args() + + report = analyze(args.pptx.expanduser().resolve()) + if args.json_output: + args.json_output.parent.mkdir(parents=True, exist_ok=True) + args.json_output.write_text(json.dumps(report, ensure_ascii=False, indent=2), encoding="utf-8") + + print(f"Slides: {report.get('slideCount', 0)}") + print(f"Errors: {report.get('errorCount', 0)}; Warnings: {report.get('warningCount', 0)}") + for item in report["issues"]: + where = f" slide={item['slide']}" if "slide" in item else "" + print(f"[{item['severity'].upper()}] {item['code']}{where}: {item['message']}") + + failed = report.get("errorCount", 0) > 0 or ( + args.warnings_as_errors and report.get("warningCount", 0) > 0 + ) + return 1 if failed else 0 + + +if __name__ == "__main__": + sys.exit(main()) diff --git a/skills/efund-ppt-maker/scripts/sanitize_pptx_metadata.py b/skills/efund-ppt-maker/scripts/sanitize_pptx_metadata.py new file mode 100644 index 000000000..ae6d29ec7 --- /dev/null +++ b/skills/efund-ppt-maker/scripts/sanitize_pptx_metadata.py @@ -0,0 +1,474 @@ +#!/usr/bin/env python3 +"""Remove editor and toolchain metadata from a PPTX without changing slide content.""" + +from __future__ import annotations + +import argparse +import html +import io +import json +import os +import re +import tempfile +import zipfile +from dataclasses import dataclass +from pathlib import Path +from urllib.parse import unquote +from xml.sax.saxutils import escape as xml_escape + + +CORE_CLEAR = { + "creator", + "lastModifiedBy", + "description", + "keywords", + "category", + "contentStatus", + "identifier", + "language", + "subject", +} +CORE_REMOVE: set[str] = set() +APP_CLEAR = {"Manager", "HyperlinkBase", "Template", "Company"} +APP_REMOVE: set[str] = set() +APP_ZERO = {"TotalTime"} +LOCAL_TARGET_RE = re.compile(r"^(?:file:|/?[A-Za-z]:[\\/]|/Users/|/home/)", re.I) +LOCAL_PATH_RE = re.compile(r"(?:file:/{0,3})?(?:[A-Za-z]:[\\/]|/Users/|/home/)", re.I) +DESCR_ATTR_RE = re.compile(r'(\bdescr=")([^"]*)(")') +REL_TAG_RE = re.compile(r"<(?:[A-Za-z0-9_.-]+:)?Relationship\b[^>]*?/?>", re.I) +TARGET_ATTR_RE = re.compile(r'(\bTarget\s*=\s*)(["\'])(.*?)(\2)', re.I) +OVERRIDE_TAG_RE = re.compile(r"<(?:[A-Za-z0-9_.-]+:)?Override\b[^>]*?/?>", re.I) +PART_NAME_RE = re.compile(r'\bPartName\s*=\s*["\']([^"\']+)["\']', re.I) +TYPE_ATTR_RE = re.compile(r'\bType\s*=\s*["\']([^"\']+)["\']', re.I) +TEXT_NODE_RE = re.compile( + r"(<(?:[A-Za-z0-9_.-]+:)?t\b[^>]*>)(.*?)" + r"()", + re.I | re.S, +) + + +@dataclass(frozen=True) +class SanitizePolicy: + redactions: tuple[str, ...] = () + replacements: tuple[tuple[str, str], ...] = () + part_replacements: tuple[tuple[str, bytes], ...] = () + clear_notes: bool = False + remove_notes: bool = False + remove_comments: bool = False + remove_thumbnails: bool = False + neutralize_external_links: bool = False + + +def replace_element_text(text: str, name: str, replacement: str) -> str: + pattern = re.compile( + rf"(<(?:[A-Za-z0-9_.-]+:)?{re.escape(name)}\b[^>]*>).*?" + rf"()", + re.I | re.S, + ) + return pattern.sub(lambda match: f"{match.group(1)}{replacement}{match.group(2)}", text) + + +def remove_element(text: str, name: str) -> str: + pattern = re.compile( + rf"<(?:[A-Za-z0-9_.-]+:)?{re.escape(name)}\b[^>]*?(?:/>|>.*?" + rf")", + re.I | re.S, + ) + return pattern.sub("", text) + + +def clean_core(data: bytes) -> bytes: + text = data.decode("utf-8") + for name in CORE_REMOVE: + text = remove_element(text, name) + for name in CORE_CLEAR: + text = replace_element_text(text, name, "") + return text.encode("utf-8") + + +def clean_app(data: bytes, policy: SanitizePolicy) -> bytes: + text = data.decode("utf-8") + for name in APP_REMOVE: + text = remove_element(text, name) + for name in APP_CLEAR: + text = replace_element_text(text, name, "") + for name in APP_ZERO: + text = replace_element_text(text, name, "0") + if policy.remove_notes: + text = replace_element_text(text, "Notes", "0") + return text.encode("utf-8") + + +def clean_content_types(data: bytes, policy: SanitizePolicy) -> bytes: + text = data.decode("utf-8") + + def replace_override(match: re.Match[str]) -> str: + tag = match.group(0) + part_match = PART_NAME_RE.search(tag) + part_name = part_match.group(1) if part_match else "" + if part_name == "/docProps/custom.xml": + return "" + if policy.remove_notes and part_name.startswith(("/ppt/notesSlides/", "/ppt/notesMasters/")): + return "" + if policy.remove_comments and ( + part_name.startswith(("/ppt/comments/", "/ppt/threadedComments/", "/ppt/persons/")) + or part_name in {"/ppt/commentAuthors.xml", "/ppt/authors.xml"} + ): + return "" + if policy.remove_thumbnails and part_name.startswith("/docProps/thumbnail."): + return "" + return tag + + cleaned = OVERRIDE_TAG_RE.sub(replace_override, text) + return cleaned.encode("utf-8") + + +def clean_relationships( + data: bytes, + policy: SanitizePolicy, + *, + remove_custom: bool = False, +) -> bytes: + text = data.decode("utf-8") + + def replace_relationship(match: re.Match[str]) -> str: + tag = match.group(0) + if remove_custom and ("docProps/custom.xml" in tag or "/custom-properties" in tag): + return "" + type_match = TYPE_ATTR_RE.search(tag) + rel_type = type_match.group(1).rsplit("/", 1)[-1].lower() if type_match else "" + if policy.remove_notes and rel_type in {"notesslide", "notesmaster"}: + return "" + if policy.remove_comments and rel_type in { + "comments", + "commentauthors", + "threadedcomment", + "person", + }: + return "" + if policy.remove_thumbnails and rel_type == "thumbnail": + return "" + if not re.search(r'\bTargetMode\s*=\s*["\']External["\']', tag, re.I): + return tag + target_match = TARGET_ATTR_RE.search(tag) + if not target_match: + return tag + if not policy.neutralize_external_links and not LOCAL_TARGET_RE.search( + unquote(target_match.group(3)) + ): + return tag + return TARGET_ATTR_RE.sub( + lambda item: f"{item.group(1)}{item.group(2)}about:blank{item.group(4)}", + tag, + count=1, + ) + + cleaned = REL_TAG_RE.sub(replace_relationship, text) + return cleaned.encode("utf-8") + + +def clean_nonvisual_attributes(data: bytes) -> bytes: + text = data.decode("utf-8") + + def replace(match: re.Match[str]) -> str: + value = match.group(2) + if not LOCAL_PATH_RE.search(value): + return match.group(0) + neutral = value.replace("\\", "/").rstrip("/").rsplit("/", 1)[-1] + return f"{match.group(1)}{neutral}{match.group(3)}" + + cleaned = DESCR_ATTR_RE.sub(replace, text) + return cleaned.encode("utf-8") if cleaned != text else data + + +def clear_notes_body(data: bytes) -> bytes: + """Keep the notes package structure but replace body text with a neutral marker.""" + text = data.decode("utf-8") + shape_pattern = re.compile( + r"(<(?:[A-Za-z0-9_.-]+:)?sp\b[^>]*>.*?" + r")", + re.I | re.S, + ) + body_placeholder = re.compile( + r"<(?:[A-Za-z0-9_.-]+:)?ph\b[^>]*\btype\s*=\s*[\"']body[\"']", + re.I, + ) + text_node = re.compile( + r"(<(?:[A-Za-z0-9_.-]+:)?t\b[^>]*>).*?" + r"()", + re.I | re.S, + ) + + def replace_shape(match: re.Match[str]) -> str: + shape = match.group(1) + if not body_placeholder.search(shape): + return shape + first = True + + def replace_text(item: re.Match[str]) -> str: + nonlocal first + replacement = "备注已脱敏" if first else "" + first = False + return f"{item.group(1)}{replacement}{item.group(2)}" + + return text_node.sub(replace_text, shape) + + cleaned = shape_pattern.sub(replace_shape, text) + return cleaned.encode("utf-8") if cleaned != text else data + + +def redact_literals( + data: bytes, + redactions: tuple[str, ...], + replacements: tuple[tuple[str, str], ...] = (), +) -> bytes: + cleaned = data + for source, replacement in replacements: + if source: + cleaned = cleaned.replace(source.encode("utf-8"), replacement.encode("utf-8")) + for value in redactions: + if value: + cleaned = cleaned.replace(value.encode("utf-8"), b"") + try: + text = cleaned.decode("utf-8") + except UnicodeDecodeError: + return cleaned + for source, replacement in replacements: + if source: + text = replace_across_text_nodes(text, source, replacement) + for value in redactions: + if value: + text = replace_across_text_nodes(text, value, "") + return text.encode("utf-8") + + +def replace_across_text_nodes(text: str, source: str, replacement: str) -> str: + """Replace a phrase even when PowerPoint splits it across several a:t runs.""" + while True: + matches = list(TEXT_NODE_RE.finditer(text)) + if not matches: + return text + values = [html.unescape(match.group(2)) for match in matches] + offsets: list[int] = [] + total = 0 + for value in values: + offsets.append(total) + total += len(value) + joined = "".join(values) + start = joined.find(source) + if start < 0: + return text + end = start + len(source) + first_index = next( + index + for index, (offset, value) in enumerate(zip(offsets, values)) + if offset + len(value) > start + ) + last_index = next( + index + for index in range(first_index, len(values)) + if offsets[index] + len(values[index]) >= end + ) + replacements_by_index: dict[int, str] = {} + first_value = values[first_index] + first_local = start - offsets[first_index] + if first_index == last_index: + last_local = end - offsets[last_index] + replacements_by_index[first_index] = ( + first_value[:first_local] + replacement + first_value[last_local:] + ) + else: + replacements_by_index[first_index] = first_value[:first_local] + replacement + for index in range(first_index + 1, last_index): + replacements_by_index[index] = "" + last_local = end - offsets[last_index] + replacements_by_index[last_index] = values[last_index][last_local:] + for index in range(last_index, first_index - 1, -1): + match = matches[index] + value = xml_escape(replacements_by_index[index]) + text = text[: match.start(2)] + value + text[match.end(2) :] + + +def clean_presentation(data: bytes, policy: SanitizePolicy) -> bytes: + text = data.decode("utf-8") + if policy.remove_notes: + text = remove_element(text, "notesMasterIdLst") + return text.encode("utf-8") + + +def clean_embedded_office_package(data: bytes, policy: SanitizePolicy) -> bytes: + source_buffer = io.BytesIO(data) + output_buffer = io.BytesIO() + try: + with zipfile.ZipFile(source_buffer, "r") as src, zipfile.ZipFile(output_buffer, "w") as dst: + for info in src.infolist(): + name = info.filename + payload = src.read(name) + if name == "docProps/custom.xml": + cleaned = None + elif name == "docProps/core.xml": + cleaned = clean_core(payload) + elif name == "docProps/app.xml": + cleaned = clean_app(payload, policy) + elif name == "[Content_Types].xml": + cleaned = clean_content_types(payload, policy) + elif name.endswith(".rels"): + cleaned = clean_relationships( + payload, + policy, + remove_custom=name == "_rels/.rels", + ) + elif name.endswith(".xml"): + cleaned = clean_nonvisual_attributes(payload) + else: + cleaned = payload + if cleaned is not None: + if name.endswith((".xml", ".rels")): + cleaned = redact_literals( + cleaned, + policy.redactions, + policy.replacements, + ) + dst.writestr(info, cleaned) + return output_buffer.getvalue() + except zipfile.BadZipFile: + return data + + +def transform_member(name: str, data: bytes, policy: SanitizePolicy) -> bytes | None: + if policy.remove_notes and name.startswith(("ppt/notesSlides/", "ppt/notesMasters/")): + return None + if policy.remove_comments and ( + name.startswith(("ppt/comments/", "ppt/threadedComments/", "ppt/persons/")) + or name in {"ppt/commentAuthors.xml", "ppt/authors.xml"} + ): + return None + if policy.remove_thumbnails and name.startswith("docProps/thumbnail."): + return None + if name == "docProps/custom.xml": + return None + if name == "docProps/core.xml": + cleaned = clean_core(data) + elif name == "docProps/app.xml": + cleaned = clean_app(data, policy) + elif name == "[Content_Types].xml": + cleaned = clean_content_types(data, policy) + elif name == "ppt/presentation.xml": + cleaned = clean_presentation(data, policy) + elif policy.clear_notes and name.startswith("ppt/notesSlides/") and name.endswith(".xml"): + cleaned = clear_notes_body(data) + elif name.startswith("ppt/embeddings/") and Path(name).suffix.lower() in { + ".xlsx", + ".xlsm", + ".docx", + ".pptx", + }: + cleaned = clean_embedded_office_package(data, policy) + elif name.endswith(".rels"): + cleaned = clean_relationships(data, policy, remove_custom=name == "_rels/.rels") + elif name.endswith(".xml"): + cleaned = clean_nonvisual_attributes(data) + else: + cleaned = data + if name.endswith((".xml", ".rels")): + cleaned = redact_literals(cleaned, policy.redactions, policy.replacements) + return cleaned + + +def sanitize(source: Path, output: Path, policy: SanitizePolicy | None = None) -> None: + source = source.expanduser().resolve() + output = output.expanduser().resolve() + policy = policy or SanitizePolicy() + if not source.is_file(): + raise FileNotFoundError(source) + if source.suffix.lower() != ".pptx" or output.suffix.lower() != ".pptx": + raise ValueError("输入和输出都必须使用 .pptx 扩展名") + + output.parent.mkdir(parents=True, exist_ok=True) + source_mode = source.stat().st_mode & 0o777 + fd, temp_name = tempfile.mkstemp(prefix="pptx-clean-", suffix=".pptx", dir=output.parent) + os.close(fd) + temp_path = Path(temp_name) + try: + replacement_parts = dict(policy.part_replacements) + with zipfile.ZipFile(source, "r") as src, zipfile.ZipFile(temp_path, "w") as dst: + for info in src.infolist(): + if info.filename in replacement_parts: + cleaned = replacement_parts[info.filename] + else: + cleaned = transform_member(info.filename, src.read(info.filename), policy) + if cleaned is not None: + dst.writestr(info, cleaned) + with zipfile.ZipFile(temp_path, "r") as check: + if "ppt/presentation.xml" not in check.namelist(): + raise ValueError("输出不是有效的 PowerPoint 包") + broken = check.testzip() + if broken: + raise ValueError(f"输出包校验失败：{broken}") + os.chmod(temp_path, source_mode) + os.replace(temp_path, output) + finally: + if temp_path.exists(): + temp_path.unlink() + + +def main() -> int: + parser = argparse.ArgumentParser(description="清理 PPTX 中的编辑者与工具链元数据。") + parser.add_argument("source", type=Path) + parser.add_argument("output", type=Path) + parser.add_argument("--redact-text", action="append", default=[], help="从 XML 文本中删除指定字面值") + parser.add_argument("--replace-map", type=Path, help="JSON 对象：将 XML 中的键替换为对应字符串值") + parser.add_argument( + "--replace-part", + action="append", + default=[], + metavar="PACKAGE_MEMBER=FILE", + help="用本地文件永久替换指定 PPTX 包部件", + ) + parser.add_argument("--remove-notes", action="store_true", help="删除演讲者备注与备注母版") + parser.add_argument( + "--clear-notes", + action="store_true", + help="保留备注结构，但将备注正文替换为“备注已脱敏”（兼容性优先）", + ) + parser.add_argument("--remove-comments", action="store_true", help="删除批注、批注作者和人员部件") + parser.add_argument("--remove-thumbnails", action="store_true", help="删除可能缓存旧封面的文档缩略图") + parser.add_argument( + "--neutralize-external-links", + action="store_true", + help="将所有外部关系目标替换为 about:blank", + ) + args = parser.parse_args() + replacements: tuple[tuple[str, str], ...] = () + if args.replace_map: + raw = json.loads(args.replace_map.expanduser().read_text(encoding="utf-8")) + if not isinstance(raw, dict) or not all( + isinstance(key, str) and isinstance(value, str) for key, value in raw.items() + ): + raise ValueError("--replace-map 必须是字符串到字符串的 JSON 对象") + replacements = tuple(raw.items()) + part_replacements: list[tuple[str, bytes]] = [] + for spec in args.replace_part: + member, separator, file_name = spec.partition("=") + if not separator or not member or not file_name: + raise ValueError("--replace-part 格式必须为 PACKAGE_MEMBER=FILE") + part_replacements.append( + (member, Path(file_name).expanduser().resolve().read_bytes()) + ) + policy = SanitizePolicy( + redactions=tuple(args.redact_text), + replacements=replacements, + part_replacements=tuple(part_replacements), + clear_notes=args.clear_notes, + remove_notes=args.remove_notes, + remove_comments=args.remove_comments, + remove_thumbnails=args.remove_thumbnails, + neutralize_external_links=args.neutralize_external_links, + ) + sanitize(args.source, args.output, policy) + print(args.output.expanduser().resolve()) + return 0 + + +if __name__ == "__main__": + raise SystemExit(main()) diff --git a/src/main/app-data-migration.ts b/src/main/app-data-migration.ts new file mode 100644 index 000000000..07e028b3a --- /dev/null +++ b/src/main/app-data-migration.ts @@ -0,0 +1,57 @@ +import { basename, dirname, join } from 'node:path' +import { constants, cpSync, existsSync, renameSync, rmSync, writeFileSync } from 'node:fs' + +const VOLATILE_NAMES = new Set([ + 'Cache', + 'Code Cache', + 'DawnCache', + 'DawnGraphiteCache', + 'DawnWebGPUCache', + 'GPUCache', + 'SingletonCookie', + 'SingletonLock', + 'SingletonSocket' +]) +const MIGRATION_MARKER = '.sherlock-legacy-migration-complete' + +/** + * Copies durable data from the historical DSH directory into Sherlock's new + * application identity. A sibling staging directory keeps interrupted copies + * from making a later launch look like migration already completed. + */ +export function migrateLegacyUserData(legacyUserData: string, targetUserData: string): boolean { + if (!existsSync(legacyUserData) || existsSync(join(targetUserData, MIGRATION_MARKER))) { + return false + } + + const copyOptions = { + recursive: true, + mode: constants.COPYFILE_FICLONE, + filter: (source: string): boolean => !VOLATILE_NAMES.has(basename(source)) + } as const + + if (existsSync(targetUserData)) { + cpSync(legacyUserData, targetUserData, { + ...copyOptions, + errorOnExist: false, + force: false + }) + writeFileSync(join(targetUserData, MIGRATION_MARKER), new Date().toISOString(), 'utf8') + return true + } + + const stagingDirectory = join( + dirname(targetUserData), + `.${basename(targetUserData)}.migrating-${process.pid}-${Date.now()}` + ) + + try { + cpSync(legacyUserData, stagingDirectory, copyOptions) + writeFileSync(join(stagingDirectory, MIGRATION_MARKER), new Date().toISOString(), 'utf8') + renameSync(stagingDirectory, targetUserData) + return true + } catch (error) { + rmSync(stagingDirectory, { force: true, recursive: true }) + throw error + } +} diff --git a/src/main/app-identity.ts b/src/main/app-identity.ts new file mode 100644 index 000000000..b53133564 --- /dev/null +++ b/src/main/app-identity.ts @@ -0,0 +1,32 @@ +import { isAbsolute, join, normalize } from 'node:path' + +export interface DesktopIdentity { + name: 'Sherlock' | 'Sherlock Dev' + userData: string +} + +export type DesktopChannel = 'development' | 'legacy' | 'legacy-bridge' | 'notarized' + +export function resolveDesktopIdentity( + appDataPath: string, + channel: DesktopChannel, + explicitUserDataPath: string +): DesktopIdentity { + const name = channel === 'development' ? 'Sherlock Dev' : 'Sherlock' + const defaultDirectory = + channel === 'development' + ? 'dsh-desktop-dev' + : channel === 'notarized' || channel === 'legacy-bridge' + ? 'sherlock-desktop' + : 'dsh-desktop' + const explicitPath = explicitUserDataPath.trim() + + if (explicitPath && !isAbsolute(explicitPath)) { + throw new Error('The Sherlock user-data path must be absolute.') + } + + return { + name, + userData: explicitPath ? normalize(explicitPath) : join(appDataPath, defaultDirectory) + } +} diff --git a/src/main/bundled-plugin-profile.ts b/src/main/bundled-plugin-profile.ts new file mode 100644 index 000000000..657e082d9 --- /dev/null +++ b/src/main/bundled-plugin-profile.ts @@ -0,0 +1,244 @@ +import { createHash } from 'node:crypto' +import { + constants, + cpSync, + existsSync, + lstatSync, + mkdirSync, + mkdtempSync, + readlinkSync, + readdirSync, + readFileSync, + renameSync, + rmSync, + writeFileSync +} from 'node:fs' +import path from 'node:path' + +const RECEIPT_FILENAME = 'bundled-plugin-profile.json' +const CONTENT_FINGERPRINT_FILENAME = 'sherlock-profile-content.sha256' + +export interface BundledPluginProfileInstallOptions { + userDataPath: string + bundledProfilePath: string + appVersion: string + now?: Date +} + +export interface BundledPluginProfileInstallResult { + installed: boolean + plugins: string[] + backupDirectory?: string +} + +interface ProfileManifest { + dependencies?: Record + dsh?: { + profile?: { bundles?: string[] } + sherlock?: { plugins?: string[]; retiredPlugins?: string[] } + } +} + +interface InstallReceipt { + version: 1 + appVersion: string + fingerprint: string + installedAt: string + plugins: string[] + backupDirectory?: string +} + +function readJson(filePath: string): T { + return JSON.parse(readFileSync(filePath, 'utf8')) as T +} + +function safeTimestamp(date: Date): string { + return date.toISOString().replaceAll(':', '-').replaceAll('.', '-') +} + +function hashProfileTree(hash: ReturnType, root: string, relative = ''): void { + for (const entry of readdirSync(path.join(root, relative), { withFileTypes: true }).sort((a, b) => + a.name.localeCompare(b.name) + )) { + const childRelative = path.join(relative, entry.name) + const childPath = path.join(root, childRelative) + const stat = lstatSync(childPath) + hash.update(`${childRelative}\0`) + if (stat.isSymbolicLink()) { + hash.update(`link\0${readlinkSync(childPath)}\0`) + } else if (stat.isDirectory()) { + hash.update('directory\0') + hashProfileTree(hash, root, childRelative) + } else if (stat.isFile()) { + hash.update('file\0') + hash.update(readFileSync(childPath)) + hash.update('\0') + } + } +} + +function profileFingerprint(profilePath: string, appVersion: string): string { + const hash = createHash('sha256') + hash.update(`sherlock:${appVersion}\n`) + for (const name of [ + 'package.json', + 'pnpm-lock.yaml', + 'cordis.patch.yml', + CONTENT_FINGERPRINT_FILENAME + ]) { + const filePath = path.join(profilePath, name) + hash.update(`${name}\0`) + if (existsSync(filePath)) hash.update(readFileSync(filePath)) + hash.update('\0') + } + if (!existsSync(path.join(profilePath, CONTENT_FINGERPRINT_FILENAME))) { + for (const directory of ['vendor', 'modules']) { + const root = path.join(profilePath, directory) + if (!existsSync(root)) continue + hash.update(`${directory}\0`) + hashProfileTree(hash, root) + } + } + return hash.digest('hex') +} + +function copyProfile(source: string, target: string): void { + cpSync(source, target, { + recursive: true, + force: true, + preserveTimestamps: true, + mode: constants.COPYFILE_FICLONE + }) +} + +function currentReceipt(receiptPath: string): InstallReceipt | undefined { + if (!existsSync(receiptPath)) return undefined + try { + const receipt = readJson(receiptPath) + return receipt.version === 1 ? receipt : undefined + } catch { + return undefined + } +} + +function retiredPluginPath(customPluginsPath: string, packageName: string): string { + if (!/^(?:@[a-z0-9][a-z0-9._-]*\/)?[a-z0-9][a-z0-9._-]*$/iu.test(packageName)) { + throw new Error(`Invalid retired Sherlock plugin name: ${packageName}`) + } + const candidate = path.resolve(customPluginsPath, ...packageName.split('/')) + const relative = path.relative(customPluginsPath, candidate) + if (!relative || relative.startsWith('..') || path.isAbsolute(relative)) { + throw new Error(`Retired Sherlock plugin escapes the custom plugin directory: ${packageName}`) + } + return candidate +} + +function removeRetiredCustomPlugins(harnessPath: string, retiredPlugins: string[]): void { + const customPluginsPath = path.join(harnessPath, 'custom-plugins') + for (const packageName of retiredPlugins) { + const pluginPath = retiredPluginPath(customPluginsPath, packageName) + rmSync(pluginPath, { recursive: true, force: true }) + + if (packageName.startsWith('@')) { + const scopePath = path.dirname(pluginPath) + if (existsSync(scopePath) && readdirSync(scopePath).length === 0) { + rmSync(scopePath, { recursive: true, force: true }) + } + } + } +} + +/** + * Install the product-owned plugin profile before Harness starts. + * + * Only the profile directory is replaced. Credentials, model settings, + * workspaces, sessions, and every other Harness path remain user-owned. + * An older profile is renamed into a timestamped backup before the packaged + * profile is made live so a failed copy can always be rolled back. + */ +export function installBundledPluginProfile( + options: BundledPluginProfileInstallOptions +): BundledPluginProfileInstallResult { + const bundledManifestPath = path.join(options.bundledProfilePath, 'package.json') + if (!existsSync(bundledManifestPath)) return { installed: false, plugins: [] } + + const manifest = readJson(bundledManifestPath) + const plugins = manifest.dsh?.sherlock?.plugins ?? Object.keys(manifest.dependencies ?? {}) + const retiredPlugins = manifest.dsh?.sherlock?.retiredPlugins ?? [] + const bundles = manifest.dsh?.profile?.bundles + if (!Array.isArray(bundles) || !bundles.includes('dsh-file-drop')) { + throw new Error('The packaged Sherlock plugin profile is missing its attachment bundle.') + } + if (plugins.some((packageName) => retiredPlugins.includes(packageName))) { + throw new Error('The packaged Sherlock plugin profile includes a retired plugin.') + } + + const harnessPath = path.join(options.userDataPath, 'harness') + removeRetiredCustomPlugins(harnessPath, retiredPlugins) + const profilesPath = path.join(harnessPath, 'profiles') + const targetProfilePath = path.join(profilesPath, 'web') + const receiptPath = path.join(harnessPath, RECEIPT_FILENAME) + const fingerprint = profileFingerprint(options.bundledProfilePath, options.appVersion) + const receipt = currentReceipt(receiptPath) + if ( + receipt?.fingerprint === fingerprint && + receipt.appVersion === options.appVersion && + existsSync(path.join(targetProfilePath, 'package.json')) + ) { + return { installed: false, plugins } + } + + mkdirSync(harnessPath, { recursive: true }) + mkdirSync(profilesPath, { recursive: true }) + const stageRoot = mkdtempSync(path.join(harnessPath, '.bundled-plugin-profile-stage-')) + const stagedProfilePath = path.join(stageRoot, 'web') + const backupRoot = path.join(harnessPath, 'profile-sync-backups') + let backupDirectory: string | undefined + let oldProfileMoved = false + let newProfileInstalled = false + + try { + copyProfile(options.bundledProfilePath, stagedProfilePath) + const packagedModulesPath = path.join(stagedProfilePath, 'modules') + const installedModulesPath = path.join(stagedProfilePath, 'node_modules') + if (!existsSync(packagedModulesPath) || existsSync(installedModulesPath)) { + throw new Error('The packaged Sherlock plugin profile is missing its offline modules.') + } + renameSync(packagedModulesPath, installedModulesPath) + + if (existsSync(targetProfilePath)) { + mkdirSync(backupRoot, { recursive: true }) + const backupContainer = mkdtempSync( + path.join(backupRoot, `${safeTimestamp(options.now ?? new Date())}-bundled-`) + ) + backupDirectory = path.join(backupContainer, 'web') + renameSync(targetProfilePath, backupDirectory) + oldProfileMoved = true + } + + renameSync(stagedProfilePath, targetProfilePath) + newProfileInstalled = true + + const nextReceipt: InstallReceipt = { + version: 1, + appVersion: options.appVersion, + fingerprint, + installedAt: (options.now ?? new Date()).toISOString(), + plugins, + ...(backupDirectory ? { backupDirectory } : {}) + } + writeFileSync(receiptPath, `${JSON.stringify(nextReceipt, null, 2)}\n`, { + encoding: 'utf8', + mode: 0o600 + }) + return { installed: true, plugins, ...(backupDirectory ? { backupDirectory } : {}) } + } catch (error) { + if (newProfileInstalled) rmSync(targetProfilePath, { recursive: true, force: true }) + if (oldProfileMoved && backupDirectory && existsSync(backupDirectory)) { + renameSync(backupDirectory, targetProfilePath) + } + throw error + } finally { + rmSync(stageRoot, { recursive: true, force: true }) + } +} diff --git a/src/main/bundled-skill-sync.ts b/src/main/bundled-skill-sync.ts new file mode 100644 index 000000000..de42a9170 --- /dev/null +++ b/src/main/bundled-skill-sync.ts @@ -0,0 +1,197 @@ +import { + constants, + cpSync, + existsSync, + mkdirSync, + mkdtempSync, + readFileSync, + readlinkSync, + readdirSync, + renameSync, + rmSync +} from 'node:fs' +import { createHash } from 'node:crypto' +import path from 'node:path' + +export interface BundledESkillSyncOptions { + bundledSkillDirectory: string + overrideSkillDirectories: string[] + now?: Date +} + +export interface BundledESkillUpgrade { + slug: string + fromVersion: string + toVersion: string + targetDirectory: string + backupDirectory: string +} + +export interface BundledESkillSyncResult { + upgraded: BundledESkillUpgrade[] +} + +interface ESkillMetadata { + slug: string + version: string + source: string +} + +function readESkillMetadata(skillDirectory: string): ESkillMetadata | undefined { + try { + const value = JSON.parse( + readFileSync(path.join(skillDirectory, '_meta.json'), 'utf8') + ) as Partial + if ( + typeof value.slug !== 'string' || + typeof value.version !== 'string' || + value.source !== 'eSkill' + ) { + return undefined + } + return { slug: value.slug, version: value.version, source: value.source } + } catch { + return undefined + } +} + +function semanticVersion(version: string): [number, number, number] | undefined { + const match = /^v?(\d+)\.(\d+)\.(\d+)$/.exec(version) + if (!match) return undefined + return [Number(match[1]), Number(match[2]), Number(match[3])] +} + +function compareVersions(left: string, right: string): number | undefined { + const leftParts = semanticVersion(left) + const rightParts = semanticVersion(right) + if (!leftParts || !rightParts) return undefined + for (const index of [0, 1, 2] as const) { + const difference = leftParts[index] - rightParts[index] + if (difference !== 0) return difference + } + return 0 +} + +function safeTimestamp(date: Date): string { + return date.toISOString().replaceAll(':', '-').replaceAll('.', '-') +} + +function directoryFingerprint(root: string): string { + const hash = createHash('sha256') + + function visit(directory: string, relativeDirectory: string): void { + const entries = readdirSync(directory, { withFileTypes: true }).sort((left, right) => + left.name.localeCompare(right.name, 'en') + ) + for (const entry of entries) { + const relativePath = path.posix.join(relativeDirectory, entry.name) + const absolutePath = path.join(directory, entry.name) + if (entry.isDirectory()) { + hash.update(`directory\0${relativePath}\0`) + visit(absolutePath, relativePath) + } else if (entry.isFile()) { + hash.update(`file\0${relativePath}\0`) + hash.update(readFileSync(absolutePath)) + hash.update('\0') + } else if (entry.isSymbolicLink()) { + hash.update(`symlink\0${relativePath}\0${readlinkSync(absolutePath)}\0`) + } + } + } + + visit(root, '') + return hash.digest('hex') +} + +function copySkill(source: string, target: string): void { + cpSync(source, target, { + recursive: true, + force: true, + preserveTimestamps: true, + mode: constants.COPYFILE_FICLONE + }) +} + +function replaceSkill( + bundledSkillDirectory: string, + targetDirectory: string, + metadata: { slug: string; fromVersion: string; toVersion: string }, + now: Date +): BundledESkillUpgrade { + const overrideRoot = path.dirname(targetDirectory) + const backupRoot = path.join(overrideRoot, '.sherlock-skill-backups') + mkdirSync(backupRoot, { recursive: true }) + const stageRoot = mkdtempSync(path.join(backupRoot, '.stage-')) + const stagedSkillDirectory = path.join(stageRoot, metadata.slug) + const backupContainer = mkdtempSync( + path.join(backupRoot, `${safeTimestamp(now)}-${metadata.slug}-`) + ) + const backupDirectory = path.join(backupContainer, 'skill') + let oldSkillMoved = false + let newSkillInstalled = false + + try { + copySkill(bundledSkillDirectory, stagedSkillDirectory) + renameSync(targetDirectory, backupDirectory) + oldSkillMoved = true + renameSync(stagedSkillDirectory, targetDirectory) + newSkillInstalled = true + return { + slug: metadata.slug, + fromVersion: metadata.fromVersion, + toVersion: metadata.toVersion, + targetDirectory, + backupDirectory + } + } catch (error) { + if (newSkillInstalled) rmSync(targetDirectory, { recursive: true, force: true }) + if (oldSkillMoved && existsSync(backupDirectory)) { + renameSync(backupDirectory, targetDirectory) + } + throw error + } finally { + rmSync(stageRoot, { recursive: true, force: true }) + } +} + +export function synchronizeBundledESkillOverrides( + options: BundledESkillSyncOptions +): BundledESkillSyncResult { + if (!existsSync(options.bundledSkillDirectory)) return { upgraded: [] } + + const upgraded: BundledESkillUpgrade[] = [] + for (const entry of readdirSync(options.bundledSkillDirectory, { withFileTypes: true })) { + if (!entry.isDirectory()) continue + const bundledSkill = path.join(options.bundledSkillDirectory, entry.name) + const bundledMetadata = readESkillMetadata(bundledSkill) + if (!bundledMetadata || bundledMetadata.slug !== entry.name) continue + + for (const overrideRoot of options.overrideSkillDirectories) { + const targetDirectory = path.join(overrideRoot, entry.name) + if (!existsSync(targetDirectory)) continue + const targetMetadata = readESkillMetadata(targetDirectory) + if (!targetMetadata || targetMetadata.slug !== bundledMetadata.slug) continue + const versionDifference = compareVersions(targetMetadata.version, bundledMetadata.version) + if (versionDifference === undefined || versionDifference > 0) continue + if ( + versionDifference === 0 && + directoryFingerprint(targetDirectory) === directoryFingerprint(bundledSkill) + ) { + continue + } + upgraded.push( + replaceSkill( + bundledSkill, + targetDirectory, + { + slug: bundledMetadata.slug, + fromVersion: targetMetadata.version, + toVersion: bundledMetadata.version + }, + options.now ?? new Date() + ) + ) + } + } + return { upgraded } +} diff --git a/src/main/context-menu-template.ts b/src/main/context-menu-template.ts index def9c2747..5e7199f3b 100644 --- a/src/main/context-menu-template.ts +++ b/src/main/context-menu-template.ts @@ -1,10 +1,14 @@ import type { MenuItemConstructorOptions } from 'electron' +import { isAbsolute } from 'node:path' +import { fileURLToPath } from 'node:url' export interface ContextMenuState { isEditable: boolean selectionText: string linkURL: string hasImageContents: boolean + /** Existing absolute local path under the clicked content, when any. */ + finderPath: string editFlags: { canUndo: boolean canRedo: boolean @@ -19,12 +23,14 @@ export interface ContextMenuActions { openLink: (url: string) => void copyLink: (url: string) => void copyImage: () => void + revealItem: (path: string) => void } interface ContextMenuLabels { openLink: string copyLink: string copyImage: string + revealItem: string undo: string redo: string cut: string @@ -38,6 +44,7 @@ const labels: Record<'en' | 'zh', ContextMenuLabels> = { openLink: 'Open Link in Browser', copyLink: 'Copy Link Address', copyImage: 'Copy Image', + revealItem: 'Show in Finder', undo: 'Undo', redo: 'Redo', cut: 'Cut', @@ -49,6 +56,7 @@ const labels: Record<'en' | 'zh', ContextMenuLabels> = { openLink: '在浏览器中打开链接', copyLink: '复制链接地址', copyImage: '复制图片', + revealItem: '在 Finder 中显示', undo: '撤销', redo: '重做', cut: '剪切', @@ -71,6 +79,39 @@ export function isExternalWebUrl(rawUrl: string): boolean { } } +/** + * Resolve the first existing absolute filesystem path carried by the native + * context event or by metadata on the clicked rendered element. Relative + * display labels are intentionally ignored: the renderer's title/aria-label + * must supply their absolute backing path before Finder is offered. + */ +export function resolveFinderPath( + values: readonly string[], + exists: (path: string) => boolean +): string { + for (const raw of values) { + const value = raw.trim() + if (value === '') continue + const candidates: string[] = [] + if (value.startsWith('file:')) { + try { + candidates.push(fileURLToPath(value)) + } catch { + // Malformed file URL — continue with the plain-text candidates. + } + } + candidates.push(value) + const slash = value.indexOf('/') + if (slash > 0) candidates.push(value.slice(slash)) + + for (const candidate of candidates) { + const normalized = candidate.trim().replace(/[\s\])}>，。；：、'"”’]+$/u, '') + if (isAbsolute(normalized) && exists(normalized)) return normalized + } + } + return '' +} + function appendSection( template: MenuItemConstructorOptions[], section: MenuItemConstructorOptions[] @@ -89,6 +130,13 @@ export function buildContextMenuTemplate( const template: MenuItemConstructorOptions[] = [] const hasSelection = state.selectionText.trim().length > 0 + if (state.finderPath !== '') { + appendSection(template, [{ + label: text.revealItem, + click: () => actions.revealItem(state.finderPath) + }]) + } + if (state.linkURL) { const linkItems: MenuItemConstructorOptions[] = [] if (isExternalWebUrl(state.linkURL)) { diff --git a/src/main/context-menu.ts b/src/main/context-menu.ts index 7809ba319..3813a812b 100644 --- a/src/main/context-menu.ts +++ b/src/main/context-menu.ts @@ -1,16 +1,52 @@ import { clipboard, Menu, shell, type BrowserWindow } from 'electron' -import { buildContextMenuTemplate } from './context-menu-template' +import { existsSync } from 'node:fs' +import { buildContextMenuTemplate, resolveFinderPath } from './context-menu-template' + +async function clickedElementPathCandidates( + window: BrowserWindow, + x: number, + y: number +): Promise { + if (window.isDestroyed()) return [] + try { + const result = await window.webContents.executeJavaScript(`(() => { + const origin = document.elementFromPoint(${JSON.stringify(x)}, ${JSON.stringify(y)}); + if (!(origin instanceof Element)) return []; + const values = []; + let element = origin; + for (let depth = 0; element instanceof Element && depth < 5; depth += 1) { + for (const name of ['data-path', 'title', 'aria-label', 'href']) { + const value = element.getAttribute(name); + if (value) values.push(value); + } + element = element.parentElement; + } + if (origin.textContent) values.push(origin.textContent); + return values; + })()`, true) + return Array.isArray(result) ? result.filter((value): value is string => typeof value === 'string') : [] + } catch { + return [] + } +} export function installContextMenu( window: BrowserWindow, locale: () => 'en' | 'zh' ): void { - window.webContents.on('context-menu', (_event, params) => { - const template = buildContextMenuTemplate(params, locale(), { + window.webContents.on('context-menu', async (_event, params) => { + const elementCandidates = await clickedElementPathCandidates(window, params.x, params.y) + if (window.isDestroyed()) return + const finderPath = resolveFinderPath( + [params.selectionText, params.linkURL, ...elementCandidates], + existsSync + ) + const template = buildContextMenuTemplate({ ...params, finderPath }, locale(), { openLink: (url) => { void shell.openExternal(url) }, copyLink: (url) => clipboard.writeText(url), + revealItem: (path) => shell.showItemInFolder(path), copyImage: () => { if (window.isDestroyed()) return window.webContents.copyImageAt(params.x, params.y) diff --git a/src/main/developer-mode-state.ts b/src/main/developer-mode-state.ts new file mode 100644 index 000000000..3413273d1 --- /dev/null +++ b/src/main/developer-mode-state.ts @@ -0,0 +1,31 @@ +import { mkdirSync, readFileSync, writeFileSync } from 'node:fs' +import path from 'node:path' + +const DEVELOPER_MODE_STATE_FILENAME = 'sherlock-developer-mode.json' + +type DeveloperModeState = { + enabled?: unknown +} + +export function developerModeStatePath(userDataPath: string): string { + return path.join(userDataPath, DEVELOPER_MODE_STATE_FILENAME) +} + +export function isDeveloperModeEnabled(userDataPath: string): boolean { + try { + const state = JSON.parse( + readFileSync(developerModeStatePath(userDataPath), 'utf8') + ) as DeveloperModeState + return state.enabled === true + } catch { + return false + } +} + +export function setDeveloperModeEnabled(userDataPath: string, enabled: boolean): void { + mkdirSync(userDataPath, { recursive: true }) + writeFileSync(developerModeStatePath(userDataPath), `${JSON.stringify({ enabled })}\n`, { + encoding: 'utf8', + mode: 0o600 + }) +} diff --git a/src/main/index.ts b/src/main/index.ts index 2e2411231..17e754fb7 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -1,6 +1,9 @@ import { spawn } from 'node:child_process' -import { join } from 'node:path' +import { homedir } from 'node:os' +import { isAbsolute, join, normalize, resolve } from 'node:path' +import { pathToFileURL } from 'node:url' import { appendFileSync, existsSync, readFileSync } from 'node:fs' +import { stat } from 'node:fs/promises' import { parse } from 'yaml' import { app, @@ -9,9 +12,12 @@ import { ipcMain, Menu, nativeTheme, + net, + protocol, + session, shell, - type IpcMainInvokeEvent, - type MessageBoxOptions + type BrowserWindowConstructorOptions, + type SaveDialogOptions } from 'electron' import { extractDuplicateLoaderEntryId, @@ -21,7 +27,6 @@ import { HarnessRuntime } from './runtime/harness-runtime' import { removeProfilePluginWithDsh } from './runtime/profile-plugin-command' -import { LanMobileBridge } from './mobile/lan-mobile-bridge' import { secureWindow } from './security' import { ensureLaunchRoot } from './state/launch-root' import { @@ -39,12 +44,66 @@ import { import type { RuntimeSnapshot } from '../shared/contracts' import { resolveHarnessLocale } from './application-locale' import { installContextMenu } from './context-menu' +import { isDeveloperModeEnabled, setDeveloperModeEnabled } from './developer-mode-state' import { WINDOWS_TITLEBAR_HEIGHT, isDesktopMenuCommand, type DesktopMenuCommand } from '../shared/desktop-menu' +import { developerModeArgument } from '../shared/developer-mode' +import { appVersionArgument } from '../shared/app-info' import { buildPluginRecoveryViewModel } from './plugin-recovery-view' +import { resolveDesktopIdentity } from './app-identity' +import { migrateLegacyUserData } from './app-data-migration' +import { installBundledPluginProfile } from './bundled-plugin-profile' +import { synchronizeBundledESkillOverrides } from './bundled-skill-sync' +import { + configureBrowserSearchSecurity, + type BrowserSearchWindow +} from './search/browser-search-controller' +import { isAllowedSearchLocation } from './search/search-engines' +import { + startLocalSearchRuntime, + type LocalSearchRuntime +} from './search/local-search-runtime' +import { ResearchCanvasStorage } from './state/research-canvas-storage' +import { + assertTrustedMainWindowEvent, + registerPrivilegedMainWindowHandlers +} from './ipc-trust' +import { + FileResearchPreviewAuthorizationStorage, + HarnessWorkspaceFileResolver, + RESEARCH_PREVIEW_SCHEME, + ResearchFilePreviewRegistry, + handleResearchFilePreviewProtocolRequest, + registerResearchFilePreviewHandlers +} from './state/research-file-preview' +import { + installResearchCanvasWheelRouter, + registerResearchCanvasWheelIpc, + type ResearchCanvasWheelRouter +} from './state/research-canvas-wheel' +import { + ResearchLinkFrameRegistry, + registerResearchLinkFrameHandlers +} from './state/research-link-frame' +import { registerResearchWebReaderHandlers } from './state/research-web-reader' +import { + registerResearchCanvasExportHandlers, + researchCanvasExportFileOperations +} from './state/research-canvas-export' + +protocol.registerSchemesAsPrivileged([{ + scheme: RESEARCH_PREVIEW_SCHEME, + privileges: { + standard: true, + secure: true, + supportFetchAPI: true, + corsEnabled: true, + stream: true + } +}]) type PluginRecoveryAction = 'uninstall' | 'show-log' | 'quit' | 'restart' @@ -55,9 +114,8 @@ const PLUGIN_RECOVERY_ACTIONS = new Set([ ]) let mainWindow: BrowserWindow | undefined -let mobileWindow: BrowserWindow | undefined let runtime: HarnessRuntime -let mobileBridge: LanMobileBridge +let localSearchRuntime: LocalSearchRuntime | undefined let launchDirectory: string let quitting = false let failureRecoveryVisible = false @@ -67,6 +125,10 @@ let mainWindowNavigationVersion = 0 let rendererPluginFailureLogs: string[] = [] let pluginRecoveryRemovedPlugins: string[] = [] let pluginRecoveryResetTimer: ReturnType | undefined +let harnessThemePreferenceSyncTimer: ReturnType | undefined +let researchFilePreviewRegistry: ResearchFilePreviewRegistry | undefined +let researchCanvasWheelRouter: ResearchCanvasWheelRouter | undefined +const researchLinkFrameRegistry = new ResearchLinkFrameRegistry() function cancelPluginRecoverySessionReset(): void { if (pluginRecoveryResetTimer) clearTimeout(pluginRecoveryResetTimer) @@ -104,20 +166,29 @@ function appendRendererPluginRecoveryLog(logs: readonly string[]): void { } } -function isDevelopmentBuild(): boolean { - if (!app.isPackaged) return true +function resolveDesktopChannel(): 'development' | 'legacy' | 'legacy-bridge' | 'notarized' { + if (!app.isPackaged) return 'development' try { const metadata = JSON.parse( readFileSync(join(app.getAppPath(), 'package.json'), 'utf8') ) as { dshDesktopChannel?: unknown } - return metadata.dshDesktopChannel === 'development' + if ( + metadata.dshDesktopChannel === 'development' || + metadata.dshDesktopChannel === 'notarized' || + metadata.dshDesktopChannel === 'legacy-bridge' || + metadata.dshDesktopChannel === 'legacy' + ) { + return metadata.dshDesktopChannel + } + return 'legacy' } catch { - return false + return 'legacy' } } -const developmentBuild = isDevelopmentBuild() +const desktopChannel = resolveDesktopChannel() +const developmentBuild = desktopChannel === 'development' function windowsTitleBarOverlay(isDark: boolean): Electron.TitleBarOverlayOptions { return { @@ -127,8 +198,30 @@ function windowsTitleBarOverlay(isDark: boolean): Electron.TitleBarOverlayOption } } +function startHarnessThemePreferenceSync(): void { + if (harnessThemePreferenceSyncTimer) return + const sync = (): void => { + const preference = harnessThemePreference() + if (nativeTheme.themeSource !== preference) nativeTheme.themeSource = preference + } + sync() + harnessThemePreferenceSyncTimer = setInterval(sync, 250) + harnessThemePreferenceSyncTimer.unref?.() +} + +function stopHarnessThemePreferenceSync(): void { + if (harnessThemePreferenceSyncTimer) clearInterval(harnessThemePreferenceSyncTimer) + harnessThemePreferenceSyncTimer = undefined +} + function applyWindowChromeTheme(window: BrowserWindow, isDark: boolean): void { if (window.isDestroyed()) return + if (process.platform === 'darwin') { + window.setBackgroundColor('#00000000') + window.setVibrancy('menu') + return + } + window.setBackgroundColor(isDark ? '#141416' : '#ffffff') if (process.platform === 'win32') { window.setTitleBarOverlay(windowsTitleBarOverlay(isDark)) @@ -136,18 +229,66 @@ function applyWindowChromeTheme(window: BrowserWindow, isDark: boolean): void { } function configureAppIdentity(): void { - if (developmentBuild) { - app.setName('DSH Desktop Dev') - app.setPath('userData', join(app.getPath('appData'), 'dsh-desktop-dev')) - return - } - - app.setName('DSH Desktop') // Keep the historical lowercase directory stable across product-name and // branding changes. Harness stores workspaces, sessions, credentials, and // custom presets below userData, so deriving this path from app.getName() // would make an ordinary upgrade look like a fresh installation. - app.setPath('userData', join(app.getPath('appData'), 'dsh-desktop')) + const explicitAppDataPath = app.commandLine.getSwitchValue('sherlock-app-data-dir').trim() + if (explicitAppDataPath && !isAbsolute(explicitAppDataPath)) { + throw new Error('The Sherlock app-data path must be absolute.') + } + const appDataPath = explicitAppDataPath ? normalize(explicitAppDataPath) : app.getPath('appData') + if (explicitAppDataPath) app.setPath('appData', appDataPath) + const explicitUserDataPath = app.commandLine.getSwitchValue('sherlock-user-data-dir') + const identity = resolveDesktopIdentity(appDataPath, desktopChannel, explicitUserDataPath) + if ( + !explicitUserDataPath && + (desktopChannel === 'legacy-bridge' || desktopChannel === 'notarized') + ) { + try { + migrateLegacyUserData(join(appDataPath, 'dsh-desktop'), identity.userData) + } catch (error) { + console.warn('[desktop] failed to migrate legacy Sherlock user data', error) + } + } + app.setName(identity.name) + app.setPath('userData', identity.userData) + if (app.isPackaged) { + try { + const agentsHome = resolve( + process.env.DSH_AGENTS_HOME?.trim() || join(homedir(), '.agents') + ) + const result = synchronizeBundledESkillOverrides({ + bundledSkillDirectory: join(process.resourcesPath, 'sherlock-skills'), + overrideSkillDirectories: [ + join(identity.userData, 'harness', 'skills'), + join(agentsHome, 'skills') + ] + }) + for (const upgrade of result.upgraded) { + console.info( + `[desktop] upgraded official skill ${upgrade.slug} from ${upgrade.fromVersion} to ${upgrade.toVersion}` + ) + } + } catch (error) { + console.warn('[desktop] failed to synchronize bundled Sherlock skills', error) + } + + const bundledProfilePath = join(process.resourcesPath, 'sherlock-plugin-profile') + try { + const result = installBundledPluginProfile({ + userDataPath: identity.userData, + bundledProfilePath, + appVersion: app.getVersion() + }) + if (result.installed) { + console.info('[desktop] installed bundled Sherlock plugin profile', result.plugins) + } + } catch (error) { + console.error('[desktop] failed to install bundled Sherlock plugin profile', error) + throw error + } + } } async function syncNativeTheme(window: BrowserWindow): Promise { @@ -171,7 +312,7 @@ async function syncNativeTheme(window: BrowserWindow): Promise { zIndex: '18', top: '0', left: '80px', - right: '220px', + right: 'max(220px, var(--dsh-sidebar-width, 0px))', height: '24px', background: 'transparent', pointerEvents: 'auto', @@ -230,23 +371,36 @@ function desktopResourcePath(name: string): string { return app.isPackaged ? join(process.resourcesPath, name) : join(app.getAppPath(), 'build', name) } +function bundledSkillDirectory(): string { + return app.isPackaged + ? join(process.resourcesPath, 'sherlock-skills') + : join(app.getAppPath(), 'skills') +} + +function bundledWebSearchEntry(): string { + return pathToFileURL( + join(app.getAppPath(), 'node_modules', 'dsh-web-search-session-model', 'index.js') + ).href +} + +function bundledMarketInstallerEntry(): string { + return pathToFileURL( + join(app.getAppPath(), 'node_modules', 'dsh-desktop-market-installer', 'index.js') + ).href +} + +function bundledResearchTaskEntry(): string { + return pathToFileURL( + join(app.getAppPath(), 'node_modules', 'dsh-research-task-runtime', 'index.js') + ).href +} + function desktopIconPath(): string { return app.isPackaged ? join(process.resourcesPath, 'icon.png') : join(app.getAppPath(), 'build', 'app-icon.png') } -function dshBrandLogoPath(variant: 'light' | 'dark'): string { - return join( - app.getAppPath(), - 'node_modules', - '@deepseek-ai', - 'dsh-web-frontend', - 'dist', - `dsh-desktop-logo-${variant}.png` - ) -} - function harnessLocale(): 'en' | 'zh' { try { const settings = parse( @@ -310,6 +464,7 @@ function installPluginRecoveryNavigation(window: BrowserWindow): void { } function createWindow(): BrowserWindow { + const isMacOS = process.platform === 'darwin' const isWindows = process.platform === 'win32' const window = new BrowserWindow({ width: 1380, @@ -327,11 +482,25 @@ function createWindow(): BrowserWindow { autoHideMenuBar: true } : {}), - backgroundColor: nativeTheme.shouldUseDarkColors ? '#141416' : '#f8f8f6', + ...(isMacOS + ? { + acceptFirstMouse: true, + vibrancy: 'menu' as const, + visualEffectState: 'active' as const, + backgroundColor: '#00000000' + } + : { + backgroundColor: nativeTheme.shouldUseDarkColors ? '#141416' : '#f8f8f6' + }), webPreferences: { contextIsolation: true, nodeIntegration: false, + nodeIntegrationInSubFrames: false, preload: join(import.meta.dirname, '../preload/index.cjs'), + additionalArguments: [ + developerModeArgument(isDeveloperModeEnabled(app.getPath('userData'))), + appVersionArgument(app.getVersion()) + ], sandbox: true, webSecurity: true } @@ -356,9 +525,15 @@ function createWindow(): BrowserWindow { rendererPluginFailureLogs = rendererPluginFailureLogs.slice(-50) }) installPluginRecoveryNavigation(window) - secureWindow(window) + secureWindow(window, { + allowsResearchFrameUrl: (url) => researchLinkFrameRegistry.allows(url) + }) + const canvasWheelRouter = installResearchCanvasWheelRouter(window) + researchCanvasWheelRouter = canvasWheelRouter installContextMenu(window, harnessLocale) window.on('closed', () => { + canvasWheelRouter.dispose() + if (researchCanvasWheelRouter === canvasWheelRouter) researchCanvasWheelRouter = undefined if (mainWindow === window) mainWindow = undefined resolvePluginRecoveryAction('quit') }) @@ -366,6 +541,36 @@ function createWindow(): BrowserWindow { return window } +function createLocalSearchWindow( + options: BrowserWindowConstructorOptions +): BrowserSearchWindow { + const window = new BrowserWindow(options) + const owner = mainWindow + const closeWithOwner = (): void => { + if (!window.isDestroyed()) window.destroy() + } + owner?.once('closed', closeWithOwner) + window.once('closed', () => { + owner?.removeListener('closed', closeWithOwner) + }) + const partition = options.webPreferences?.partition + if (!partition) throw new Error('Local search browser requires an isolated partition.') + configureBrowserSearchSecurity(window, session.fromPartition(partition)) + window.on('page-title-updated', (event) => { + event.preventDefault() + }) + window.webContents.on('will-navigate', (event, url) => { + if ( + isAllowedSearchLocation('bing', url) || + isAllowedSearchLocation('duckduckgo', url) + ) { + return + } + event.preventDefault() + }) + return window +} + async function openHarness(url: string): Promise { const window = mainWindow && !mainWindow.isDestroyed() ? mainWindow : createWindow() if (shouldLoadHarnessUrl(window.webContents.getURL(), url)) { @@ -418,11 +623,11 @@ function restartHarness(): Promise { } function registerHarnessHandlers(): void { + const researchCanvasStorage = new ResearchCanvasStorage(app.getPath('userData')) + ipcMain.removeHandler('harness:restart') ipcMain.handle('harness:restart', async (event) => { - if (!mainWindow || mainWindow.isDestroyed() || event.sender !== mainWindow.webContents) { - throw new Error('Harness restart is only available from the DSH Desktop window.') - } + assertTrustedMainWindowEvent(event, mainWindow) if (runtime.snapshot().phase !== 'ready') { throw new Error('Harness is not ready to restart.') } @@ -433,9 +638,9 @@ function registerHarnessHandlers(): void { ipcMain.removeHandler('desktop-menu:execute') ipcMain.handle('desktop-menu:execute', async (event, command: unknown) => { - assertTrustedMainWindowEvent(event) + assertTrustedMainWindowEvent(event, mainWindow) if (!isDesktopMenuCommand(command)) { - throw new Error('Unknown DSH Desktop menu command.') + throw new Error('Unknown Sherlock menu command.') } await executeDesktopMenuCommand(command) return { ok: true } @@ -443,26 +648,111 @@ function registerHarnessHandlers(): void { ipcMain.removeHandler('desktop-titlebar:set-theme') ipcMain.handle('desktop-titlebar:set-theme', (event, isDark: unknown) => { - assertTrustedMainWindowEvent(event) + assertTrustedMainWindowEvent(event, mainWindow) if (typeof isDark !== 'boolean') { - throw new Error('The DSH Desktop titlebar theme must be a boolean.') + throw new Error('The Sherlock titlebar theme must be a boolean.') } - if (process.platform === 'win32' && mainWindow) { + if ( + (process.platform === 'win32' || process.platform === 'darwin') && + mainWindow + ) { applyWindowChromeTheme(mainWindow, isDark) } return { ok: true } }) -} -function assertTrustedMainWindowEvent(event: IpcMainInvokeEvent): void { - if ( - !mainWindow || - mainWindow.isDestroyed() || - event.sender !== mainWindow.webContents || - event.senderFrame !== mainWindow.webContents.mainFrame - ) { - throw new Error('This action is only available from the main DSH Desktop window.') + registerPrivilegedMainWindowHandlers({ + ipcMain, + getMainWindow: () => mainWindow, + showHarnessLog: () => { + shell.showItemInFolder(join(app.getPath('logs'), 'harness.log')) + }, + openDirectory: async () => { + const window = mainWindow + if (!window) throw new Error('The main Sherlock window is unavailable.') + const result = await dialog.showOpenDialog(window, { + title: harnessLocale() === 'zh' ? '选择工作区目录' : 'Select Workspace Directory', + properties: ['openDirectory', 'createDirectory'] + }) + return result.canceled ? null : result.filePaths[0] ?? null + }, + showItemInFolder: (path: unknown) => { + if (typeof path !== 'string' || !isAbsolute(path) || !existsSync(path)) { + throw new Error('Finder reveal requires an existing absolute filesystem path.') + } + shell.showItemInFolder(path) + return { ok: true } + }, + researchFilesAvailable: async (paths: unknown) => { + const rejected = Array.isArray(paths) + ? Array.from({ length: Math.min(paths.length, 64) }, () => false) + : [] + const values = Array.isArray(paths) ? Array.from(paths) : [] + if ( + !Array.isArray(paths) || + values.length > 64 || + values.some((path) => + typeof path !== 'string' || path.length === 0 || path.length > 512 + ) + ) { + return rejected + } + return Promise.all(values.map((path) => + stat(path).then((value) => value.isFile()).catch(() => false) + )) + }, + researchCanvasStorageGet: (key: unknown) => researchCanvasStorage.getItem(key), + researchCanvasStorageSet: (key: unknown, value: unknown) => + researchCanvasStorage.setItem(key, value), + onStorageReadRejected: (error) => + console.warn('[research-canvas] rejected storage read', error), + onStorageWriteRejected: (error) => + console.warn('[research-canvas] rejected storage write', error) + }) + if (!researchFilePreviewRegistry) { + throw new Error('Research preview registry is unavailable.') } + registerResearchFilePreviewHandlers({ + ipcMain, + getMainWindow: () => mainWindow, + registry: researchFilePreviewRegistry + }) + registerResearchCanvasWheelIpc({ + ipcMain, + getMainWindow: () => mainWindow, + getRouter: () => researchCanvasWheelRouter, + onRejected: (error) => console.warn('[research-canvas] rejected wheel region update', error) + }) + registerResearchLinkFrameHandlers({ + ipcMain, + getMainWindow: () => mainWindow, + registry: researchLinkFrameRegistry + }) + registerResearchWebReaderHandlers({ + ipcMain, + getMainWindow: () => mainWindow, + registry: researchLinkFrameRegistry, + dependencies: { + fetch: (input, init) => net.fetch(input, init), + createTimeoutSignal: (milliseconds) => AbortSignal.timeout(milliseconds) + } + }) + const exportFileOperations = researchCanvasExportFileOperations() + registerResearchCanvasExportHandlers({ + ipcMain, + getMainWindow: () => mainWindow, + dependencies: { + showSaveDialog: async (options) => { + const window = mainWindow + return !window || window.isDestroyed() + ? { canceled: true } + : dialog.showSaveDialog(window, options as SaveDialogOptions) + }, + writeFile: exportFileOperations.writeFile, + copyFile: exportFileOperations.copyFile, + resolveExportSource: (value) => researchFilePreviewRegistry!.resolveExportSource(value) + } + }) } async function executeDesktopMenuCommand(command: DesktopMenuCommand): Promise { @@ -471,9 +761,6 @@ async function executeDesktopMenuCommand(command: DesktopMenuCommand): Promise void showMobilePairing().catch(showUnexpectedError) - }, - { type: 'separator' }, { label: isChinese ? '重启 Harness' : 'Restart Harness', accelerator: 'CmdOrCtrl+Shift+R', @@ -777,69 +1058,40 @@ function installMenu(): void { } } -async function showMobilePairing(): Promise { - if (runtime.snapshot().phase !== 'ready') { - const options: MessageBoxOptions = { - type: 'info', - message: 'Harness is still starting.', - detail: 'Wait until DSH Desktop is ready, then connect your phone again.', - buttons: ['OK'] - } - await (mainWindow ? dialog.showMessageBox(mainWindow, options) : dialog.showMessageBox(options)) - return - } - - const snapshot = await mobileBridge.start() - if (!snapshot.desktopUrl || !snapshot.pairingUrl) { - await mobileBridge.stop() - const options: MessageBoxOptions = { - type: 'warning', - message: 'No private Wi-Fi network was found.', - detail: 'Connect this computer to the same private Wi-Fi as your phone and try again.', - buttons: ['OK'] - } - await (mainWindow ? dialog.showMessageBox(mainWindow, options) : dialog.showMessageBox(options)) - return - } - - if (mobileWindow && !mobileWindow.isDestroyed()) mobileWindow.destroy() - nativeTheme.themeSource = harnessThemePreference() - mobileWindow = new BrowserWindow({ - width: 560, - height: 700, - minWidth: 420, - minHeight: 560, - title: harnessLocale() === 'zh' ? '连接手机' : 'Connect Phone', - icon: desktopIconPath(), - parent: mainWindow, - backgroundColor: nativeTheme.shouldUseDarkColors ? '#141416' : '#ffffff', - webPreferences: { - contextIsolation: true, - nodeIntegration: false, - sandbox: true, - webSecurity: true - } - }) - secureWindow(mobileWindow) - mobileWindow.on('closed', () => { - mobileWindow = undefined - }) - await mobileWindow.loadURL(snapshot.desktopUrl) - mobileWindow.show() - mobileWindow.focus() -} - async function bootstrap(): Promise { if (process.platform === 'darwin') app.dock?.setIcon(desktopIconPath()) launchDirectory = await ensureLaunchRoot(app.getPath('userData')) - registerUpdateHandlers() + registerUpdateHandlers(() => mainWindow) + if (process.platform === 'darwin') startHarnessThemePreferenceSync() + const dshHome = join(app.getPath('userData'), 'harness') + researchFilePreviewRegistry = new ResearchFilePreviewRegistry({ + storage: new FileResearchPreviewAuthorizationStorage(app.getPath('userData')), + workspaceResolver: new HarnessWorkspaceFileResolver(dshHome) + }) + protocol.handle( + RESEARCH_PREVIEW_SCHEME, + (request) => handleResearchFilePreviewProtocolRequest( + researchFilePreviewRegistry!, + () => mainWindow, + request + ) + ) createWindow() + localSearchRuntime = await startLocalSearchRuntime({ + createWindow: createLocalSearchWindow + }) runtime = new HarnessRuntime({ dshEntryPath: dshEntryPath(), nodeExecutablePath: bundledNodePath(), nodeEntryPath: harnessNodeEntryPath(), dshPatchPath: desktopResourcePath('dsh-desktop.patch.yml'), - dshHome: join(app.getPath('userData'), 'harness'), + bundledSkillDirectory: bundledSkillDirectory(), + bundledWebSearchEntry: bundledWebSearchEntry(), + bundledMarketInstallerEntry: bundledMarketInstallerEntry(), + bundledResearchTaskEntry: bundledResearchTaskEntry(), + localSearchUrl: localSearchRuntime.endpoint.url, + localSearchToken: localSearchRuntime.endpoint.token, + dshHome, logPath: join(app.getPath('logs'), 'harness.log'), launchProcess: (executablePath, args, options) => spawn(executablePath, args, options), onChanged: (snapshot) => { @@ -851,40 +1103,17 @@ async function bootstrap(): Promise { } }) registerHarnessHandlers() - mobileBridge = new LanMobileBridge({ - harnessUrl: () => runtime.snapshot().url, - locale: harnessLocale, - brandLogoPaths: { - light: dshBrandLogoPath('light'), - dark: dshBrandLogoPath('dark') - }, - appIconPath: desktopIconPath(), - port: developmentBuild ? 43128 : 43127 - }) - ipcMain.handle('directory-picker:open', async (event) => { - if ( - !mainWindow || - mainWindow.isDestroyed() || - event.sender !== mainWindow.webContents || - event.senderFrame !== mainWindow.webContents.mainFrame - ) { - throw new Error('Directory picker requests are only allowed from the main Harness window') + ipcMain.handle('developer-mode:set-enabled', (event, enabled: unknown) => { + assertTrustedMainWindowEvent(event, mainWindow) + if (typeof enabled !== 'boolean') { + throw new Error('Developer mode state must be a boolean.') } - - const result = await dialog.showOpenDialog(mainWindow, { - title: harnessLocale() === 'zh' ? '选择工作区目录' : 'Select Workspace Directory', - properties: ['openDirectory'] - }) - return result.canceled ? null : result.filePaths[0] ?? null - }) - ipcMain.handle('mobile:open-pairing', () => showMobilePairing()) - ipcMain.handle('mobile:status', () => ({ connected: mobileBridge.snapshot().connected })) - ipcMain.handle('harness:show-log', () => { - shell.showItemInFolder(join(app.getPath('logs'), 'harness.log')) + setDeveloperModeEnabled(app.getPath('userData'), enabled) + return { ok: true } }) ipcMain.removeHandler('harness:open-recovery') ipcMain.handle('harness:open-recovery', async (event, frontendErrorMessage?: unknown) => { - assertTrustedMainWindowEvent(event) + assertTrustedMainWindowEvent(event, mainWindow) const message = typeof frontendErrorMessage === 'string' ? frontendErrorMessage : undefined const logs = [ ...rendererPluginFailureLogs, @@ -896,7 +1125,7 @@ async function bootstrap(): Promise { }) ipcMain.removeHandler('recovery:action') ipcMain.handle('recovery:action', (event, action: unknown) => { - assertTrustedMainWindowEvent(event) + assertTrustedMainWindowEvent(event, mainWindow) if (typeof action === 'string' && PLUGIN_RECOVERY_ACTIONS.has(action as PluginRecoveryAction)) { resolvePluginRecoveryAction(action as PluginRecoveryAction) return { ok: true } @@ -905,7 +1134,7 @@ async function bootstrap(): Promise { }) ipcMain.removeHandler('harness:reset-plugins') ipcMain.handle('harness:reset-plugins', async (event, pluginName?: unknown) => { - assertTrustedMainWindowEvent(event) + assertTrustedMainWindowEvent(event, mainWindow) if (pluginName !== undefined && typeof pluginName !== 'string') { throw new Error('The failing plugin name must be a string.') } @@ -920,6 +1149,7 @@ async function bootstrap(): Promise { startUpdateManager({ prepareToInstall: async () => { await runtime.stop() + await localSearchRuntime?.stop() quitting = true stopUpdateManager() } @@ -939,8 +1169,9 @@ if (!singleInstance) { void openHarness(snapshot.url).catch(showUnexpectedError) } }) - app.whenReady().then(bootstrap).catch((error: unknown) => { + app.whenReady().then(bootstrap).catch(async (error: unknown) => { showUnexpectedError(error) + await localSearchRuntime?.stop() app.quit() }) app.on('activate', () => { @@ -958,7 +1189,8 @@ if (!singleInstance) { if (quitting || !runtime) return event.preventDefault() quitting = true + stopHarnessThemePreferenceSync() stopUpdateManager() - void Promise.all([runtime.stop(), mobileBridge?.stop()]).finally(() => app.quit()) + void Promise.all([runtime.stop(), localSearchRuntime?.stop()]).finally(() => app.quit()) }) } diff --git a/src/main/ipc-trust.ts b/src/main/ipc-trust.ts new file mode 100644 index 000000000..2d2d600dc --- /dev/null +++ b/src/main/ipc-trust.ts @@ -0,0 +1,172 @@ +type RoutedFrame = { + processId: number + routingId: number +} + +export type TrustedWindowEvent = { + sender: unknown + senderFrame: RoutedFrame | null +} + +export type TrustedWindow = { + isDestroyed(): boolean + webContents: { + mainFrame: RoutedFrame + } +} + +export function isTrustedMainWindowEvent( + event: TrustedWindowEvent, + window: TrustedWindow +): boolean { + const senderFrame = event.senderFrame + const mainFrame = window.webContents.mainFrame + return !window.isDestroyed() && + event.sender === window.webContents && + senderFrame !== null && + senderFrame.processId === mainFrame.processId && + senderFrame.routingId === mainFrame.routingId +} + +export function assertTrustedMainWindowEvent( + event: TrustedWindowEvent, + window: TrustedWindow | undefined +): asserts window is TrustedWindow { + if (!window || !isTrustedMainWindowEvent(event, window)) { + throw new Error('This action is only available from the main Sherlock window.') + } +} + +export function registerTrustedMainWindowHandler< + Event extends TrustedWindowEvent, + Arguments extends unknown[], + Result +>( + ipcMain: { + handle( + channel: string, + handler: (event: Event, ...args: Arguments) => Result + ): unknown + }, + channel: string, + getMainWindow: () => TrustedWindow | undefined, + handler: (event: Event, ...args: Arguments) => Result +): void { + ipcMain.handle(channel, (event, ...args) => { + assertTrustedMainWindowEvent(event, getMainWindow()) + return handler(event, ...args) + }) +} + +export function registerTrustedMainWindowListener< + Event extends TrustedWindowEvent & { returnValue: unknown }, + Arguments extends unknown[], + Result +>( + ipcMain: { + on( + channel: string, + listener: (event: Event, ...args: Arguments) => void + ): unknown + }, + channel: string, + getMainWindow: () => TrustedWindow | undefined, + listener: (event: Event, ...args: Arguments) => Result, + rejectedValue: Result, + onRejected?: (error: unknown) => void +): void { + ipcMain.on(channel, (event, ...args) => { + try { + assertTrustedMainWindowEvent(event, getMainWindow()) + event.returnValue = listener(event, ...args) + } catch (error) { + onRejected?.(error) + event.returnValue = rejectedValue + } + }) +} + +type PrivilegedMainWindowIpc = { + removeHandler(channel: string): void + removeAllListeners(channel: string): unknown + handle( + channel: string, + handler: (event: any, ...args: any[]) => unknown + ): unknown + on( + channel: string, + listener: (event: any, ...args: any[]) => void + ): unknown +} + +type PrivilegedMainWindowHandlerOptions = { + ipcMain: PrivilegedMainWindowIpc + getMainWindow(): TrustedWindow | undefined + showHarnessLog(): void + openDirectory(): Promise + showItemInFolder(path: unknown): { ok: boolean } + researchFilesAvailable(paths: unknown): Promise + researchCanvasStorageGet(key: unknown): string | null + researchCanvasStorageSet(key: unknown, value: unknown): boolean + onStorageReadRejected?(error: unknown): void + onStorageWriteRejected?(error: unknown): void +} + +export function registerPrivilegedMainWindowHandlers( + options: PrivilegedMainWindowHandlerOptions +): void { + const { ipcMain, getMainWindow } = options + + ipcMain.removeHandler('harness:show-log') + registerTrustedMainWindowHandler( + ipcMain, + 'harness:show-log', + getMainWindow, + () => options.showHarnessLog() + ) + + ipcMain.removeHandler('directory-picker:open') + registerTrustedMainWindowHandler( + ipcMain, + 'directory-picker:open', + getMainWindow, + () => options.openDirectory() + ) + + ipcMain.removeHandler('filesystem:show-item-in-folder') + registerTrustedMainWindowHandler( + ipcMain, + 'filesystem:show-item-in-folder', + getMainWindow, + (_event, path: unknown) => options.showItemInFolder(path) + ) + + ipcMain.removeHandler('research:files-available') + registerTrustedMainWindowHandler( + ipcMain, + 'research:files-available', + getMainWindow, + (_event, paths: unknown) => options.researchFilesAvailable(paths) + ) + + ipcMain.removeAllListeners('research:canvas-storage:get') + registerTrustedMainWindowListener( + ipcMain, + 'research:canvas-storage:get', + getMainWindow, + (_event, key: unknown) => options.researchCanvasStorageGet(key), + null, + options.onStorageReadRejected + ) + + ipcMain.removeAllListeners('research:canvas-storage:set') + registerTrustedMainWindowListener( + ipcMain, + 'research:canvas-storage:set', + getMainWindow, + (_event, key: unknown, value: unknown) => + options.researchCanvasStorageSet(key, value), + false, + options.onStorageWriteRejected + ) +} diff --git a/src/main/mobile/lan-mobile-pages.ts b/src/main/mobile/lan-mobile-pages.ts index 356e49a3b..a9b71deca 100644 --- a/src/main/mobile/lan-mobile-pages.ts +++ b/src/main/mobile/lan-mobile-pages.ts @@ -11,10 +11,10 @@ export function renderMobilePage({ locale }: MobilePageOptions): string { - + - DSH Mobile + Sherlock
DSH Desktop

${options.connected ? text.manageHeading : text.heading}

${options.connected ? text.manageHint : text.hint}

${text.connected}

${text.closeHint}

${options.qrSvg}
${escapeHtml(options.pairingUrl)}

${text.waiting}
` + :root{color-scheme:light;--bg:#fff;--surface:#fff;--panel:#f7f8fa;--ink:#18191c;--muted:#81858c;--line:#e5e7eb;--brand:#4d6bfe;--success-bg:#f2f8f4;--success-ink:#277347;--success-muted:#557565;--request-bg:#f5f7ff}@media(prefers-color-scheme:dark){:root{color-scheme:dark;--bg:#141416;--surface:#1d1d20;--panel:#202023;--ink:#f5f5f6;--muted:#95979d;--line:#303034;--brand:#6f86ff;--success-bg:#17261d;--success-ink:#75c991;--success-muted:#8ab99a;--request-bg:#1b2033}}*{box-sizing:border-box}html,body{min-height:100%;background:var(--bg)}body{margin:0;color:var(--ink);font:14px/1.5 -apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif}.wrap{max-width:520px;margin:auto;padding:28px 32px;text-align:center}.brand{display:flex;align-items:center;justify-content:center;gap:9px;font-weight:600;margin-bottom:22px}.brand img{width:39px;height:22px;object-fit:contain}.brand .dark-logo{display:none}@media(prefers-color-scheme:dark){.brand .light-logo{display:none}.brand .dark-logo{display:block}}h1{font-size:26px;line-height:1.25;font-weight:600;margin:0 0 8px}p{margin:0;color:var(--muted)}.connection{display:none;flex-direction:column;align-items:center;margin:28px auto 0;max-width:390px;padding:22px;border-radius:14px;background:var(--success-bg);color:var(--success-ink)}.connection.show{display:flex}.connection-title{font-size:16px;font-weight:600}.connection-title:before{content:'✓';display:inline-grid;place-items:center;width:24px;height:24px;margin-right:9px;border-radius:50%;background:#35a867;color:white}.connection-hint{max-width:310px;margin-top:8px;color:var(--success-muted);font-size:13px}.connection-actions{display:flex;gap:8px;margin-top:18px}.connection-actions button{min-width:94px;border:1px solid var(--line);border-radius:9px;background:var(--surface);color:var(--ink);padding:8px 14px;cursor:pointer}.connection-actions .done{background:var(--ink);color:var(--bg);border-color:var(--ink)}.phone-connected .pairing-content{display:none}.manage-connected .connection-hint,.manage-connected .done{display:none}.manage-connected .connection-actions{margin-top:16px}.qr{display:inline-flex;background:#fff;padding:14px;border:1px solid var(--line);border-radius:16px;margin:22px 0 14px}.qr svg{width:220px;height:220px}.hint{font-size:13px}.url-row{display:flex;align-items:center;gap:8px;margin:14px auto 0;max-width:390px}.url{min-width:0;flex:1;font:12px/1.35 ui-monospace,SFMono-Regular,Menlo,monospace;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;background:var(--panel);border-radius:9px;padding:9px 11px;text-align:left}.copy{border:1px solid var(--line);background:var(--surface);color:var(--ink);border-radius:9px;padding:8px 12px;cursor:pointer}.expires{font-size:12px;margin-top:10px}.request{display:none;margin-top:16px;padding:14px;border:1px solid var(--brand);border-radius:12px;background:var(--request-bg);text-align:left}.request.show{display:block}.request-title{display:flex;align-items:center;gap:8px;font-weight:600}.request-title:before{content:'';width:8px;height:8px;border-radius:50%;background:var(--brand)}#address{font-size:12px;color:var(--muted);margin:5px 0 0 16px}.actions{display:flex;justify-content:flex-end;gap:8px;margin-top:12px}.actions button{border:1px solid var(--line);border-radius:9px;background:var(--surface);color:var(--ink);padding:8px 14px;cursor:pointer}.actions .allow{background:var(--ink);color:var(--bg);border-color:var(--ink)}
Sherlock

${options.connected ? text.manageHeading : text.heading}

${options.connected ? text.manageHint : text.hint}

${text.connected}

${text.closeHint}

${options.qrSvg}
${escapeHtml(options.pairingUrl)}

${text.waiting}
` } export function renderPairingWaitPage(pairingId: string, locale: 'en' | 'zh'): string { const zh = locale === 'zh' - const text = { title: zh ? '连接 DSH' : 'Pairing DSH', heading: zh ? '批准此手机' : 'Approve this phone', hint: zh ? '请在 DSH Desktop 中确认连接请求。' : 'Confirm the connection request in DSH Desktop.', waiting: zh ? '正在等待批准…' : 'Waiting for approval…', connected: zh ? '连接成功，正在打开 DSH…' : 'Connected. Opening DSH…', declined: zh ? '连接已被拒绝。' : 'Connection declined.', expired: zh ? '二维码已过期，请扫描新的二维码。' : 'QR code expired. Scan a new one.' } - return `${text.title}

${text.heading}

${text.hint}

${text.waiting}
` + const text = { title: zh ? '连接 Sherlock' : 'Pairing Sherlock', heading: zh ? '批准此手机' : 'Approve this phone', hint: zh ? '请在 Sherlock 中确认连接请求。' : 'Confirm the connection request in Sherlock.', waiting: zh ? '正在等待批准…' : 'Waiting for approval…', connected: zh ? '连接成功，正在打开 Sherlock…' : 'Connected. Opening Sherlock…', declined: zh ? '连接已被拒绝。' : 'Connection declined.', expired: zh ? '二维码已过期，请扫描新的二维码。' : 'QR code expired. Scan a new one.' } + return `${text.title}

${text.heading}

${text.hint}

${text.waiting}
` } function escapeHtml(value: string): string { diff --git a/src/main/plugin-recovery-view.ts b/src/main/plugin-recovery-view.ts index 08deca0df..e7dd158ff 100644 --- a/src/main/plugin-recovery-view.ts +++ b/src/main/plugin-recovery-view.ts @@ -95,11 +95,11 @@ export function describePluginFailure( if (/declares no dsh\.bundle/i.test(text)) { return locale === 'zh' ? { - title: '安装的包不是兼容的 DSH 插件', - detail: '这个包缺少 DSH 插件所需的入口声明，因此 Harness 无法加载。' + title: '安装的包不是兼容的 Sherlock 插件', + detail: '这个包缺少 Sherlock 插件所需的入口声明，因此 Harness 无法加载。' } : { - title: 'The package is not a compatible DSH plugin', + title: 'The package is not a compatible Sherlock plugin', detail: 'It does not declare the entry point required by Harness.' } } @@ -158,7 +158,7 @@ export function buildPluginRecoveryViewModel(options: { if (locale === 'zh') { return { locale, - brand: 'DSH Desktop', + brand: 'Sherlock', badge: '启动修复', heading: canUninstall ? multiple ? `发现 ${plugins.length} 个导致启动失败的插件` : '发现导致启动失败的插件' @@ -185,14 +185,14 @@ export function buildPluginRecoveryViewModel(options: { launchDirectoryLabel: '启动目录', launchDirectory: snapshot.launchDirectory, rawError: snapshot.message, - quitLabel: '退出 DSH Desktop', + quitLabel: '退出 Sherlock', canUninstall } } return { locale, - brand: 'DSH Desktop', + brand: 'Sherlock', badge: 'Startup recovery', heading: canUninstall ? multiple ? `${plugins.length} plugins are preventing startup` : 'A plugin is preventing startup' @@ -219,7 +219,7 @@ export function buildPluginRecoveryViewModel(options: { launchDirectoryLabel: 'Launch directory', launchDirectory: snapshot.launchDirectory, rawError: snapshot.message, - quitLabel: 'Quit DSH Desktop', + quitLabel: 'Quit Sherlock', canUninstall } } diff --git a/src/main/runtime/harness-runtime.ts b/src/main/runtime/harness-runtime.ts index 65fcba14f..1825bcc3e 100644 --- a/src/main/runtime/harness-runtime.ts +++ b/src/main/runtime/harness-runtime.ts @@ -4,12 +4,19 @@ import { mkdir } from 'node:fs/promises' import { createServer } from 'node:net' import { dirname, join } from 'node:path' import type { RuntimePhase, RuntimeSnapshot } from '../../shared/contracts' +import { ensureDshFileDropResearchCanvasCompatibility } from '../state/dsh-file-drop-compat' export interface HarnessRuntimeOptions { dshEntryPath: string nodeExecutablePath: string nodeEntryPath: string dshPatchPath: string + bundledSkillDirectory: string + bundledWebSearchEntry: string + bundledMarketInstallerEntry: string + bundledResearchTaskEntry: string + localSearchUrl: string + localSearchToken: string dshHome: string logPath: string launchProcess( @@ -36,7 +43,12 @@ export function buildHarnessSpawnOptions( launchDirectory: string, dshHome: string, platform: NodeJS.Platform = process.platform, - environment: NodeJS.ProcessEnv = process.env + environment: NodeJS.ProcessEnv = process.env, + bundledSkillDirectory?: string, + bundledWebSearchEntry?: string, + localSearch?: { url: string; token: string }, + bundledMarketInstallerEntry?: string, + bundledResearchTaskEntry?: string ): SpawnOptionsWithoutStdio { const { ELECTRON_RUN_AS_NODE: _runAsNode, ...parentEnvironment } = environment const pathKey = platform === 'win32' ? 'Path' : 'PATH' @@ -46,6 +58,24 @@ export function buildHarnessSpawnOptions( env: { ...parentEnvironment, DSH_HOME: dshHome, + ...(bundledSkillDirectory + ? { DSH_BUNDLED_SKILL_DIR: bundledSkillDirectory } + : {}), + ...(bundledWebSearchEntry + ? { DSH_DESKTOP_WEB_SEARCH_ENTRY: bundledWebSearchEntry } + : {}), + ...(bundledMarketInstallerEntry + ? { DSH_DESKTOP_MARKET_INSTALLER_ENTRY: bundledMarketInstallerEntry } + : {}), + ...(bundledResearchTaskEntry + ? { DSH_DESKTOP_RESEARCH_TASK_ENTRY: bundledResearchTaskEntry } + : {}), + ...(localSearch + ? { + SHERLOCK_LOCAL_SEARCH_URL: localSearch.url, + SHERLOCK_LOCAL_SEARCH_TOKEN: localSearch.token + } + : {}), NO_COLOR: '1', [pathKey]: environment[pathKey] ?? environment.PATH ?? '' }, @@ -121,7 +151,7 @@ export class HarnessRuntime { return } if (!existsSync(this.options.dshPatchPath)) { - this.setState('failed', `DSH Desktop patch was not found: ${this.options.dshPatchPath}`) + this.setState('failed', `Sherlock runtime patch was not found: ${this.options.dshPatchPath}`) return } @@ -129,6 +159,20 @@ export class HarnessRuntime { await mkdir(dirname(this.options.logPath), { recursive: true }) this.logStream = createWriteStream(this.options.logPath, { flags: 'a' }) + try { + const compatibility = await ensureDshFileDropResearchCanvasCompatibility( + this.options.dshHome + ) + if (compatibility.status === 'patched') { + this.writeLog('[desktop] applied dsh-file-drop Research canvas compatibility') + } else if (compatibility.status === 'unsupported') { + this.writeLog(`[desktop] skipped dsh-file-drop compatibility: ${compatibility.reason}`) + } + } catch (error) { + const message = error instanceof Error ? error.message : String(error) + this.writeLog(`[desktop] failed to apply dsh-file-drop compatibility: ${message}`) + } + const port = await reservePort() const url = `http://127.0.0.1:${port}` const args = buildNodeArguments( @@ -143,14 +187,27 @@ export class HarnessRuntime { this.writeLog(`\n[desktop] starting ${new Date().toISOString()}`) this.writeLog(`[desktop] launch directory ${launchDirectory}`) this.writeLog(`[desktop] endpoint ${url}`) - this.setState('starting', 'Starting DeepSeek Harness…') + this.setState('starting', 'Starting Sherlock…') let child: ChildProcessWithoutNullStreams try { child = this.options.launchProcess( this.options.nodeExecutablePath, args, - buildHarnessSpawnOptions(launchDirectory, this.options.dshHome) + buildHarnessSpawnOptions( + launchDirectory, + this.options.dshHome, + process.platform, + process.env, + this.options.bundledSkillDirectory, + this.options.bundledWebSearchEntry, + { + url: this.options.localSearchUrl, + token: this.options.localSearchToken + }, + this.options.bundledMarketInstallerEntry, + this.options.bundledResearchTaskEntry + ) ) } catch (error) { const message = error instanceof Error ? error.message : String(error) diff --git a/src/main/runtime/profile-plugin-command.ts b/src/main/runtime/profile-plugin-command.ts index 3bbbc1c74..87c3ce7b0 100644 --- a/src/main/runtime/profile-plugin-command.ts +++ b/src/main/runtime/profile-plugin-command.ts @@ -118,7 +118,7 @@ export async function removeProfilePluginWithDsh( options.pnpmEntryPath ] if (requiredPaths.some((path) => !existsSync(path))) { - return { ok: false, detail: 'The bundled DSH, Node.js, or pnpm runtime was not found.' } + return { ok: false, detail: 'The bundled Sherlock, Node.js, or pnpm runtime was not found.' } } const profileDirectory = join(options.dshHome, 'profiles', PROFILE) diff --git a/src/main/search/browser-search-controller.ts b/src/main/search/browser-search-controller.ts new file mode 100644 index 000000000..d482d09b7 --- /dev/null +++ b/src/main/search/browser-search-controller.ts @@ -0,0 +1,276 @@ +import type { BrowserWindowConstructorOptions } from 'electron' +import { + buildSearchUrl, + isAllowedSearchLocation, + isSearchChallenge, + normalizeSearchResults, + orderedSearchEngines, + searchExtractionScript, + type SearchResultCandidate, + type SearchSource +} from './search-engines' + +export interface BrowserSearchWindow { + readonly webContents: { + executeJavaScript(script: string): Promise + getURL(): string + stop(): void + } + loadURL(url: string): Promise + show(): void + hide(): void + setTitle(title: string): void + isDestroyed(): boolean + destroy(): void +} + +export interface BrowserSearchControllerOptions { + createWindow(options: BrowserWindowConstructorOptions): BrowserSearchWindow + sleep?(durationMs: number): Promise + navigationTimeoutMs?: number + verificationTimeoutMs?: number +} + +export interface BrowserSearchResult { + sources: SearchSource[] + truncated: false +} + +export function browserSearchWindowOptions(): BrowserWindowConstructorOptions { + return { + show: false, + title: 'Sherlock Web Search', + width: 960, + height: 720, + webPreferences: { + partition: 'sherlock-web-search', + nodeIntegration: false, + contextIsolation: true, + sandbox: true, + webSecurity: true, + backgroundThrottling: false + } + } +} + +export function configureBrowserSearchSecurity( + window: { + webContents: { + setWindowOpenHandler(handler: () => { action: 'deny' }): void + setAudioMuted(muted: boolean): void + } + }, + searchSession: { + setPermissionRequestHandler( + handler: ( + webContents: unknown, + permission: string, + decide: (allowed: boolean) => void + ) => void + ): void + setPermissionCheckHandler(handler: () => boolean): void + on(event: 'will-download', handler: (event: { preventDefault(): void }) => void): void + } +): void { + searchSession.setPermissionRequestHandler((_webContents, _permission, decide) => { + decide(false) + }) + searchSession.setPermissionCheckHandler(() => false) + searchSession.on('will-download', (event) => { + event.preventDefault() + }) + window.webContents.setWindowOpenHandler(() => ({ action: 'deny' })) + window.webContents.setAudioMuted(true) +} + +export class BrowserSearchController { + private window: BrowserSearchWindow + private tail: Promise = Promise.resolve() + private disposed = false + + constructor(private readonly options: BrowserSearchControllerOptions) { + this.window = options.createWindow(browserSearchWindowOptions()) + } + + async search( + query: string, + maxResults: number, + signal?: AbortSignal + ): Promise { + const operation = this.tail.then(() => this.runSearch(query, maxResults, signal)) + this.tail = operation.then( + () => undefined, + () => undefined + ) + return operation + } + + dispose(): void { + this.disposed = true + if (!this.window.isDestroyed()) { + this.window.webContents.stop() + this.window.destroy() + } + } + + private async runSearch( + query: string, + maxResults: number, + signal?: AbortSignal + ): Promise { + this.throwIfUnavailable(signal) + const window = this.currentWindow() + for (const engine of orderedSearchEngines(query)) { + this.throwIfUnavailable(signal) + const url = buildSearchUrl(engine, query) + try { + await this.loadUrl(window, url, signal) + } catch (error) { + if (isAbortError(error) || signal?.aborted === true) throw abortError(signal) + continue + } + this.throwIfUnavailable(signal) + if (!isAllowedSearchLocation(engine, window.webContents.getURL())) continue + try { + await this.completeVerification(window, signal) + const extracted = await this.abortable( + window.webContents.executeJavaScript(searchExtractionScript(engine)), + signal, + window + ) + const candidates = Array.isArray(extracted) + ? (extracted as SearchResultCandidate[]) + : [] + const sources = normalizeSearchResults(candidates, maxResults) + if (sources.length > 0) return { sources, truncated: false } + } catch (error) { + if (isAbortError(error) || signal?.aborted === true) throw abortError(signal) + } + } + throw new Error('Local browser search returned no usable sources.') + } + + private async completeVerification( + window: BrowserSearchWindow, + signal?: AbortSignal + ): Promise { + let state = await this.pageState(window, signal) + if (!isSearchChallenge(state)) return + window.setTitle('完成搜索验证') + window.show() + const startedAt = Date.now() + const timeoutMs = this.options.verificationTimeoutMs ?? 5 * 60_000 + try { + while (isSearchChallenge(state)) { + if (Date.now() - startedAt >= timeoutMs) { + throw new Error('Search verification timed out.') + } + await this.abortable(this.sleep(1_000), signal, window) + state = await this.pageState(window, signal) + } + } finally { + window.hide() + } + } + + private async pageState(window: BrowserSearchWindow, signal?: AbortSignal): Promise<{ + url: string + title: string + text: string + }> { + const value = await this.abortable( + window.webContents.executeJavaScript(`({ + url: location.href, + title: document.title, + text: document.body?.innerText?.slice(0, 4000) ?? '' + })`), + signal, + window + ) + if (typeof value !== 'object' || value === null) { + return { url: '', title: '', text: '' } + } + const page = value as Record + return { + url: typeof page.url === 'string' ? page.url : '', + title: typeof page.title === 'string' ? page.title : '', + text: typeof page.text === 'string' ? page.text : '' + } + } + + private sleep(durationMs: number): Promise { + return this.options.sleep?.(durationMs) ?? + new Promise((resolve) => setTimeout(resolve, durationMs)) + } + + private async loadUrl( + window: BrowserSearchWindow, + url: string, + signal?: AbortSignal + ): Promise { + const timeoutMs = this.options.navigationTimeoutMs ?? 15_000 + let timeout: ReturnType | undefined + const navigationTimeout = new Promise((_resolve, reject) => { + timeout = setTimeout(() => { + window.webContents.stop() + reject(new Error('Search navigation timed out.')) + }, timeoutMs) + }) + try { + await this.abortable(Promise.race([window.loadURL(url), navigationTimeout]), signal, window) + } finally { + if (timeout) clearTimeout(timeout) + } + } + + private throwIfUnavailable(signal?: AbortSignal): void { + if (signal?.aborted === true) throw abortError(signal) + if (this.disposed) { + throw new Error('Local browser search is unavailable.') + } + } + + private currentWindow(): BrowserSearchWindow { + if (this.window.isDestroyed()) { + this.window = this.options.createWindow(browserSearchWindowOptions()) + } + return this.window + } + + private async abortable( + operation: Promise, + signal?: AbortSignal, + window: BrowserSearchWindow = this.window + ): Promise { + if (!signal) return operation + if (signal.aborted) throw abortError(signal) + return new Promise((resolve, reject) => { + const onAbort = (): void => { + window.webContents.stop() + reject(abortError(signal)) + } + signal.addEventListener('abort', onAbort, { once: true }) + operation.then( + (value) => { + signal.removeEventListener('abort', onAbort) + resolve(value) + }, + (error: unknown) => { + signal.removeEventListener('abort', onAbort) + reject(error) + } + ) + }) + } +} + +function abortError(signal?: AbortSignal): DOMException { + return new DOMException( + signal?.reason instanceof Error ? signal.reason.message : 'Search aborted.', + 'AbortError' + ) +} + +function isAbortError(error: unknown): boolean { + return error instanceof DOMException && error.name === 'AbortError' +} diff --git a/src/main/search/local-search-bridge.ts b/src/main/search/local-search-bridge.ts new file mode 100644 index 000000000..3d392d4b7 --- /dev/null +++ b/src/main/search/local-search-bridge.ts @@ -0,0 +1,182 @@ +import { createHash, randomBytes, timingSafeEqual } from 'node:crypto' +import { createServer, type IncomingMessage, type Server, type ServerResponse } from 'node:http' +import type { AddressInfo } from 'node:net' +import type { BrowserSearchResult } from './browser-search-controller' + +const MAX_BODY_BYTES = 16 * 1024 +const MAX_QUERY_LENGTH = 512 +const MAX_RESULTS = 8 + +export interface LocalSearchBridgeOptions { + search( + query: string, + maxResults: number, + signal: AbortSignal + ): Promise +} + +export interface LocalSearchEndpoint { + url: string + token: string +} + +export class LocalSearchBridge { + private server?: Server + private endpoint?: LocalSearchEndpoint + private readonly active = new Set() + + constructor(private readonly options: LocalSearchBridgeOptions) {} + + async start(): Promise { + if (this.endpoint) return this.endpoint + const token = randomBytes(32).toString('hex') + const server = createServer((request, response) => { + void this.handle(request, response, token) + }) + await new Promise((resolve, reject) => { + server.once('error', reject) + server.listen(0, '127.0.0.1', () => { + server.removeListener('error', reject) + resolve() + }) + }) + const address = server.address() as AddressInfo + this.server = server + this.endpoint = { url: `http://127.0.0.1:${address.port}`, token } + return this.endpoint + } + + async stop(): Promise { + for (const controller of this.active) controller.abort(new Error('Local search stopped.')) + this.active.clear() + const server = this.server + this.server = undefined + this.endpoint = undefined + if (!server) return + await new Promise((resolve) => { + server.close(() => resolve()) + server.closeAllConnections?.() + }) + } + + private async handle( + request: IncomingMessage, + response: ServerResponse, + token: string + ): Promise { + if (!authorized(request.headers.authorization, token)) { + sendJson(response, 401, { error: 'Unauthorized.' }) + return + } + const requestUrl = new URL(request.url ?? '/', 'http://127.0.0.1') + if (requestUrl.pathname !== '/search') { + sendJson(response, 404, { error: 'Not found.' }) + return + } + if (request.method !== 'POST') { + response.setHeader('allow', 'POST') + sendJson(response, 405, { error: 'Method not allowed.' }) + return + } + if (!request.headers['content-type']?.toLowerCase().startsWith('application/json')) { + sendJson(response, 415, { error: 'JSON content type required.' }) + return + } + + const body = await readBody(request) + if (body.kind === 'too-large') { + sendJson(response, 413, { error: 'Request body too large.' }) + return + } + if (body.kind === 'invalid') { + sendJson(response, 400, { error: 'Invalid JSON body.' }) + return + } + const parsed = body.value + if (!isRecord(parsed)) { + sendJson(response, 400, { error: 'Invalid search request.' }) + return + } + const query = typeof parsed.query === 'string' ? parsed.query.trim() : '' + if (query.length === 0 || query.length > MAX_QUERY_LENGTH) { + sendJson(response, 400, { error: 'Query must contain 1 to 512 characters.' }) + return + } + const requestedMax = parsed.maxResults === undefined ? 5 : parsed.maxResults + if (!Number.isInteger(requestedMax) || Number(requestedMax) < 1) { + sendJson(response, 400, { error: 'maxResults must be a positive integer.' }) + return + } + const maxResults = Math.min(Number(requestedMax), MAX_RESULTS) + const controller = new AbortController() + this.active.add(controller) + const abort = (): void => { + if (!response.writableEnded) controller.abort(new Error('Search client disconnected.')) + } + request.once('aborted', abort) + response.once('close', abort) + try { + const result = await this.options.search(query, maxResults, controller.signal) + if (!response.destroyed) sendJson(response, 200, result) + } catch (error) { + if (!controller.signal.aborted && !response.destroyed) { + sendJson(response, 502, { + error: error instanceof Error ? error.message : 'Local browser search failed.' + }) + } + } finally { + request.removeListener('aborted', abort) + response.removeListener('close', abort) + this.active.delete(controller) + } + } +} + +function authorized(header: string | undefined, token: string): boolean { + const presented = header?.startsWith('Bearer ') ? header.slice('Bearer '.length) : '' + const expectedHash = createHash('sha256').update(token).digest() + const presentedHash = createHash('sha256').update(presented).digest() + return timingSafeEqual(expectedHash, presentedHash) && presented.length === token.length +} + +async function readBody( + request: IncomingMessage +): Promise< + | { kind: 'ok'; value: unknown } + | { kind: 'invalid' } + | { kind: 'too-large' } +> { + const chunks: Buffer[] = [] + let size = 0 + let tooLarge = false + for await (const chunk of request) { + const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk) + size += buffer.length + if (size > MAX_BODY_BYTES) { + tooLarge = true + continue + } + chunks.push(buffer) + } + if (tooLarge) return { kind: 'too-large' } + try { + return { kind: 'ok', value: JSON.parse(Buffer.concat(chunks).toString('utf8')) } + } catch { + return { kind: 'invalid' } + } +} + +function sendJson(response: ServerResponse, status: number, body: unknown): void { + if (response.headersSent || response.destroyed) return + const payload = JSON.stringify(body) + response.writeHead(status, { + 'content-type': 'application/json; charset=utf-8', + 'content-length': Buffer.byteLength(payload), + 'cache-control': 'no-store' + }) + response.end(payload) +} + +function isRecord(value: unknown): value is Record { + return typeof value === 'object' && value !== null && !Array.isArray(value) +} diff --git a/src/main/search/local-search-runtime.ts b/src/main/search/local-search-runtime.ts new file mode 100644 index 000000000..496cdb866 --- /dev/null +++ b/src/main/search/local-search-runtime.ts @@ -0,0 +1,44 @@ +import type { BrowserWindowConstructorOptions } from 'electron' +import { + BrowserSearchController, + type BrowserSearchWindow +} from './browser-search-controller' +import { + LocalSearchBridge, + type LocalSearchEndpoint +} from './local-search-bridge' + +export interface LocalSearchRuntimeOptions { + createWindow(options: BrowserWindowConstructorOptions): BrowserSearchWindow +} + +export interface LocalSearchRuntime { + endpoint: LocalSearchEndpoint + stop(): Promise +} + +export async function startLocalSearchRuntime( + options: LocalSearchRuntimeOptions +): Promise { + const browser = new BrowserSearchController({ createWindow: options.createWindow }) + const bridge = new LocalSearchBridge({ + search: (query, maxResults, signal) => browser.search(query, maxResults, signal) + }) + try { + const endpoint = await bridge.start() + let stopped = false + return { + endpoint, + stop: async () => { + if (stopped) return + stopped = true + await bridge.stop() + browser.dispose() + } + } + } catch (error) { + await bridge.stop() + browser.dispose() + throw error + } +} diff --git a/src/main/search/search-engines.ts b/src/main/search/search-engines.ts new file mode 100644 index 000000000..0efdf6ca4 --- /dev/null +++ b/src/main/search/search-engines.ts @@ -0,0 +1,138 @@ +export type SearchEngineId = 'bing' | 'duckduckgo' + +export interface SearchResultCandidate { + title?: unknown + url?: unknown + snippet?: unknown +} + +export interface SearchSource { + url: string + title?: string + snippet?: string +} + +const SEARCH_HOSTS: Record> = { + bing: new Set(['www.bing.com', 'cn.bing.com']), + duckduckgo: new Set(['html.duckduckgo.com', 'duckduckgo.com', 'www.duckduckgo.com']) +} + +function cleanText(value: unknown): string | undefined { + if (typeof value !== 'string') return undefined + const cleaned = value.replace(/\s+/gu, ' ').trim() + return cleaned.length > 0 ? cleaned : undefined +} + +function publicHttpUrl(value: unknown): string | undefined { + if (typeof value !== 'string' || !URL.canParse(value)) return undefined + const parsed = new URL(value) + return parsed.protocol === 'https:' || parsed.protocol === 'http:' ? parsed.href : undefined +} + +export function buildSearchUrl(engine: SearchEngineId, query: string): string { + const url = new URL( + engine === 'bing' ? 'https://www.bing.com/search' : 'https://html.duckduckgo.com/html/' + ) + url.searchParams.set('q', query) + return url.href +} + +export function isAllowedSearchLocation(engine: SearchEngineId, url: string): boolean { + if (!URL.canParse(url)) return false + const parsed = new URL(url) + return parsed.protocol === 'https:' && SEARCH_HOSTS[engine].has(parsed.hostname.toLowerCase()) +} + +export function normalizeSearchResults( + candidates: SearchResultCandidate[], + maxResults: number +): SearchSource[] { + const limit = Math.max(0, Math.floor(maxResults)) + const seen = new Set() + const sources: SearchSource[] = [] + for (const candidate of candidates) { + const url = publicHttpUrl(candidate.url) + if (!url || seen.has(url)) continue + seen.add(url) + const title = cleanText(candidate.title) + const snippet = cleanText(candidate.snippet) + sources.push({ + url, + ...(title ? { title } : {}), + ...(snippet ? { snippet } : {}) + }) + if (sources.length >= limit) break + } + return sources +} + +export function isSearchChallenge(page: { + url: string + title: string + text: string +}): boolean { + const haystack = `${page.url}\n${page.title}\n${page.text}`.toLowerCase() + return /(?:captcha|challenge|human verification|verify you are a human|unusual traffic)/u.test( + haystack + ) +} + +export function orderedSearchEngines(query: string): SearchEngineId[] { + return /[\p{Script=Han}]/u.test(query) + ? ['bing', 'duckduckgo'] + : ['duckduckgo', 'bing'] +} + +function textOf(element: Element | null): string | undefined { + return cleanText(element?.textContent) +} + +export function extractSearchResults( + engine: SearchEngineId, + document: Document +): SearchResultCandidate[] { + const rows = + engine === 'bing' + ? document.querySelectorAll('#b_results .b_algo') + : document.querySelectorAll('.result') + return Array.from(rows).flatMap((row) => { + const link = row.querySelector( + engine === 'bing' ? 'h2 a[href]' : 'a.result__a[href]' + ) + if (!link) return [] + const snippet = textOf( + row.querySelector(engine === 'bing' ? '.b_caption p' : '.result__snippet') + ) + return [ + { + url: link.href, + ...(textOf(link) ? { title: textOf(link) } : {}), + ...(snippet ? { snippet } : {}) + } + ] + }) +} + +export function searchExtractionScript(engine: SearchEngineId): string { + const rowSelector = engine === 'bing' ? '#b_results .b_algo' : '.result' + const linkSelector = engine === 'bing' ? 'h2 a[href]' : 'a.result__a[href]' + const snippetSelector = engine === 'bing' ? '.b_caption p' : '.result__snippet' + return `(() => { + const clean = (value) => { + if (typeof value !== 'string') return undefined + const text = value.replace(/\\s+/gu, ' ').trim() + return text.length > 0 ? text : undefined + } + return Array.from(document.querySelectorAll(${JSON.stringify(rowSelector)})).flatMap((row) => { + const link = row.querySelector(${JSON.stringify(linkSelector)}) + if (!link) return [] + const title = clean(link.textContent) + const snippet = clean(row.querySelector(${JSON.stringify(snippetSelector)})?.textContent) + return [{ + url: link.href, + ...(title ? { title } : {}), + ...(snippet ? { snippet } : {}) + }] + }) + })()` +} diff --git a/src/main/security.ts b/src/main/security.ts index fae41786d..ce29f82bd 100644 --- a/src/main/security.ts +++ b/src/main/security.ts @@ -1,17 +1,42 @@ import { shell, type BrowserWindow } from 'electron' import { canGrantWindowPermission, isTrustedAppUrl } from './security-policy' -export function secureWindow(window: BrowserWindow): void { +export function secureWindow( + window: BrowserWindow, + options: { allowsResearchFrameUrl?(url: string): boolean } = {} +): void { window.webContents.setWindowOpenHandler(({ url }) => { if (isTrustedAppUrl(url)) return { action: 'allow' } - if (url.startsWith('https://') || url.startsWith('http://')) void shell.openExternal(url) + if (isExternalUrl(url)) void shell.openExternal(url) return { action: 'deny' } }) window.webContents.on('will-navigate', (event, url) => { if (isTrustedAppUrl(url)) return event.preventDefault() - if (url.startsWith('https://') || url.startsWith('http://')) void shell.openExternal(url) + if (isExternalUrl(url)) void shell.openExternal(url) + }) + + window.webContents.on('will-frame-navigate', (event) => { + if (event.isMainFrame) { + const initiator = event.initiator + const mainFrame = window.webContents.mainFrame + if ( + !initiator || + initiator.processId !== mainFrame.processId || + initiator.routingId !== mainFrame.routingId + ) { + event.preventDefault() + } + return + } + if (isPreviewUrl(event.url)) return + try { + if (options.allowsResearchFrameUrl?.(event.url) === true) return + } catch { + // Fail closed when the authorization registry cannot decide. + } + event.preventDefault() }) window.webContents.on('will-attach-webview', (event) => event.preventDefault()) @@ -31,3 +56,20 @@ export function secureWindow(window: BrowserWindow): void { } ) } + +function isPreviewUrl(rawUrl: string): boolean { + try { + return new URL(rawUrl).protocol === 'sherlock-preview:' + } catch { + return false + } +} + +function isExternalUrl(rawUrl: string): boolean { + try { + const protocol = new URL(rawUrl).protocol + return protocol === 'http:' || protocol === 'https:' + } catch { + return false + } +} diff --git a/src/main/state/dsh-file-drop-compat.ts b/src/main/state/dsh-file-drop-compat.ts new file mode 100644 index 000000000..5aedce535 --- /dev/null +++ b/src/main/state/dsh-file-drop-compat.ts @@ -0,0 +1,296 @@ +import { createHash, randomUUID } from 'node:crypto' +import { + chmod, + lstat, + open, + readFile, + realpath, + rename, + rm +} from 'node:fs/promises' +import { isAbsolute, join, relative, sep } from 'node:path' + +const PLUGIN_NAME = 'dsh-file-drop' +const SUPPORTED_VERSION = '1.0.0' +const PRISTINE_CLIENT_SHA256 = + '51260b81dcee8c091ab708698d9c247b190d3e3b9884e930ad9e3742cb7c6377' +const LEGACY_PATCHED_CLIENT_SHA256 = + 'ef70d5f01c43a4a2451e46f6ef01eea8614a838a043a9eabe8a5e5597bf4ca77' +const INLINE_REFERENCE_PATCHED_CLIENT_SHA256 = + 'c8e269525a469cb1733a8318ab429be3152835997c828eabc5568c07c2044cdf' +const PATCHED_CLIENT_SHA256 = + '333b2a3b543af91176cd5ff7d56163290d15b84861fbd6dcc59d45c24c18e1c9' +const ORIGINAL_FILE_GUARD = ' if (!hasFiles(e)) return' +const RESEARCH_FILE_GUARD = + ' if (!hasFiles(e) || releaseResearchCanvasEvent(e)) return' +const ORIGINAL_LEAVE_START = ` const onDragLeave = (e) => { + e.stopPropagation()` +const RESEARCH_LEAVE_START = ` const onDragLeave = (e) => { + if (releaseResearchCanvasEvent(e)) return + e.stopPropagation()` +const ORIGINAL_APPEND_HELPER = ` function appendToDraft(inputActions, draft, paths) { + if (!inputActions) return + const lines = paths.map((p) => '📎 文件：\`' + p + '\`')` +const INLINE_REFERENCE_MARKER = + 'Sherlock dsh-file-drop compatibility: insert native inline file references.' +const INLINE_REFERENCE_APPEND_HELPER = ` function appendToDraft(inputActions, draft, paths) { + if (!inputActions || !Array.isArray(paths) || paths.length === 0) return + // ${INLINE_REFERENCE_MARKER} + if (typeof inputActions.insertFilePaths === 'function') { + inputActions.insertFilePaths(paths) + return + } + const lines = paths.map((p) => '📎 文件：\`' + p + '\`')` +const DIRECT_PATH_SUCCESS = + " statusStore.set('✓ 已获取 ' + direct.length + ' 个原始路径（桌面壳）')" +const QUIET_DIRECT_PATH_SUCCESS = ` // Sherlock dsh-file-drop compatibility: hide transient success notices. + statusStore.set(null)` +const UPLOAD_STATUS_BLOCK = ` const text = [ + ok.length > 0 ? '✓ ' + ok.length + ' 个文件已上传' : '', + errs.length > 0 ? '✗ ' + errs.join('；') : '', + ].filter(Boolean).join('　') + statusStore.set(text || '没有文件被处理')` +const QUIET_UPLOAD_STATUS_BLOCK = ` const text = errs.length > 0 ? '✗ ' + errs.join('；') : '' + statusStore.set(text || null)` +const SHELL_DROP_SUCCESS = + " statusStore.set('✓ 已获取 ' + shellPaths.length + ' 个原始路径（桌面壳）')" +const QUIET_SHELL_DROP_SUCCESS = ' statusStore.set(null)' +const URI_DROP_SUCCESS = + " statusStore.set('✓ 已获取 ' + paths.length + ' 个文件路径')" +const QUIET_URI_DROP_SUCCESS = ' statusStore.set(null)' +const QUIET_SUCCESS_MARKER = + 'Sherlock dsh-file-drop compatibility: hide transient success notices.' + +export const DSH_FILE_DROP_RESEARCH_CANVAS_MARKER = + 'Sherlock dsh-file-drop compatibility: Research owns its canvas path.' +export const DSH_FILE_DROP_INLINE_REFERENCE_MARKER = INLINE_REFERENCE_MARKER +export const DSH_FILE_DROP_QUIET_SUCCESS_MARKER = QUIET_SUCCESS_MARKER + +export type DshFileDropCompatibilityResult = + | { status: 'not-installed'; clientPath: string } + | { status: 'already-compatible'; clientPath: string } + | { status: 'patched'; clientPath: string } + | { status: 'unsupported'; clientPath: string; reason: string } + +function occurrenceCount(source: string, needle: string): number { + return source.split(needle).length - 1 +} + +function sourceIdentity(source: string): string { + return createHash('sha256').update(source).digest('hex') +} + +export function patchDshFileDropClientSource(source: string): string | undefined { + const identity = sourceIdentity(source) + if (identity === PATCHED_CLIENT_SHA256) return source + const pristine = identity === PRISTINE_CLIENT_SHA256 + const legacyPatched = identity === LEGACY_PATCHED_CLIENT_SHA256 + const inlineReferencePatched = identity === INLINE_REFERENCE_PATCHED_CLIENT_SHA256 + if (!pristine && !legacyPatched && !inlineReferencePatched) return undefined + if (!inlineReferencePatched && occurrenceCount(source, ORIGINAL_APPEND_HELPER) !== 1) { + return undefined + } + + const hasFiles = + " const hasFiles = (e) => e.dataTransfer && Array.from(e.dataTransfer.types || []).includes('Files')" + if ( + pristine && ( + occurrenceCount(source, ORIGINAL_FILE_GUARD) !== 3 || + occurrenceCount(source, ORIGINAL_LEAVE_START) !== 1 || + occurrenceCount(source, hasFiles) !== 1 + ) + ) return undefined + const researchOwnership = `${hasFiles} + // ${DSH_FILE_DROP_RESEARCH_CANVAS_MARKER} + const isResearchCanvasEvent = (e) => { + const path = typeof e.composedPath === 'function' ? e.composedPath() : [e.target] + return path.some((node) => node && typeof node.hasAttribute === 'function' && node.hasAttribute('data-research-canvas')) + } + const releaseResearchCanvasEvent = (e) => { + if (!isResearchCanvasEvent(e)) return false + depthRef.current = 0 + setDrag(false) + return true + }` + + const researchCompatible = pristine + ? source + .replace(hasFiles, researchOwnership) + .replaceAll(ORIGINAL_FILE_GUARD, RESEARCH_FILE_GUARD) + .replace(ORIGINAL_LEAVE_START, RESEARCH_LEAVE_START) + : source + const inlineCompatible = inlineReferencePatched + ? researchCompatible + : researchCompatible.replace(ORIGINAL_APPEND_HELPER, INLINE_REFERENCE_APPEND_HELPER) + if ( + occurrenceCount(inlineCompatible, DIRECT_PATH_SUCCESS) !== 1 || + occurrenceCount(inlineCompatible, UPLOAD_STATUS_BLOCK) !== 1 || + occurrenceCount(inlineCompatible, SHELL_DROP_SUCCESS) !== 1 || + occurrenceCount(inlineCompatible, URI_DROP_SUCCESS) !== 1 + ) return undefined + const patched = inlineCompatible + .replace(DIRECT_PATH_SUCCESS, QUIET_DIRECT_PATH_SUCCESS) + .replace(UPLOAD_STATUS_BLOCK, QUIET_UPLOAD_STATUS_BLOCK) + .replace(SHELL_DROP_SUCCESS, QUIET_SHELL_DROP_SUCCESS) + .replace(URI_DROP_SUCCESS, QUIET_URI_DROP_SUCCESS) + return sourceIdentity(patched) === PATCHED_CLIENT_SHA256 ? patched : undefined +} + +function pluginPaths(dshHome: string): { + pluginDirectory: string + manifestPath: string + clientPath: string +} { + const pluginDirectory = join( + dshHome, + 'profiles', + 'web', + 'node_modules', + PLUGIN_NAME + ) + return { + pluginDirectory, + manifestPath: join(pluginDirectory, 'package.json'), + clientPath: join(pluginDirectory, 'client.js') + } +} + +function isContainedPath(boundary: string, candidate: string): boolean { + const path = relative(boundary, candidate) + return ( + path.length > 0 && + !isAbsolute(path) && + path !== '..' && + !path.startsWith(`..${sep}`) + ) +} + +async function validatePluginPaths(paths: { + pluginDirectory: string + manifestPath: string + clientPath: string +}): Promise<{ sourceMode: number } | { reason: string }> { + const [pluginInfo, manifestInfo, clientInfo] = await Promise.all([ + lstat(paths.pluginDirectory), + lstat(paths.manifestPath), + lstat(paths.clientPath) + ]) + if (pluginInfo.isSymbolicLink() || !pluginInfo.isDirectory()) { + return { reason: 'The dsh-file-drop package directory must be a real directory.' } + } + if (manifestInfo.isSymbolicLink() || !manifestInfo.isFile()) { + return { reason: 'The dsh-file-drop package manifest must be a real file.' } + } + if (clientInfo.isSymbolicLink() || !clientInfo.isFile()) { + return { reason: 'The dsh-file-drop client must be a real file.' } + } + + const [realPluginDirectory, realManifestPath, realClientPath] = await Promise.all([ + realpath(paths.pluginDirectory), + realpath(paths.manifestPath), + realpath(paths.clientPath) + ]) + if ( + !isContainedPath(realPluginDirectory, realManifestPath) || + !isContainedPath(realPluginDirectory, realClientPath) + ) { + return { + reason: 'The dsh-file-drop package files must remain inside the resolved package directory.' + } + } + return { sourceMode: clientInfo.mode } +} + +function isMissing(error: unknown): boolean { + return ( + typeof error === 'object' && + error !== null && + 'code' in error && + error.code === 'ENOENT' + ) +} + +export async function ensureDshFileDropResearchCanvasCompatibility( + dshHome: string +): Promise { + const paths = pluginPaths(dshHome) + const { manifestPath, clientPath } = paths + let manifestRaw: string + let source: string + let sourceMode: number + try { + const pathValidation = await validatePluginPaths(paths) + if ('reason' in pathValidation) { + return { status: 'unsupported', clientPath, reason: pathValidation.reason } + } + const [rawManifest, rawSource] = await Promise.all([ + readFile(manifestPath, 'utf8'), + readFile(clientPath, 'utf8') + ]) + manifestRaw = rawManifest + source = rawSource + sourceMode = pathValidation.sourceMode + } catch (error) { + if (isMissing(error)) return { status: 'not-installed', clientPath } + throw error + } + + let manifest: { name?: unknown; version?: unknown } + try { + manifest = JSON.parse(manifestRaw) as { name?: unknown; version?: unknown } + } catch { + return { + status: 'unsupported', + clientPath, + reason: 'The dsh-file-drop package manifest is not valid JSON.' + } + } + if (manifest.name !== PLUGIN_NAME || manifest.version !== SUPPORTED_VERSION) { + return { + status: 'unsupported', + clientPath, + reason: `Expected ${PLUGIN_NAME} ${SUPPORTED_VERSION}.` + } + } + const identity = sourceIdentity(source) + if (identity === PATCHED_CLIENT_SHA256) { + return { status: 'already-compatible', clientPath } + } + if ( + identity !== PRISTINE_CLIENT_SHA256 && + identity !== LEGACY_PATCHED_CLIENT_SHA256 && + identity !== INLINE_REFERENCE_PATCHED_CLIENT_SHA256 + ) { + return { + status: 'unsupported', + clientPath, + reason: 'The dsh-file-drop 1.0.0 client source identity did not match.' + } + } + + const patched = patchDshFileDropClientSource(source) + if (patched === undefined) { + return { + status: 'unsupported', + clientPath, + reason: 'The dsh-file-drop 1.0.0 client compatibility transform did not match.' + } + } + + const temporaryPath = `${clientPath}.sherlock-${process.pid}-${randomUUID()}.tmp` + const sourcePermissions = sourceMode & 0o7777 + let temporaryFile: Awaited> | undefined + try { + temporaryFile = await open(temporaryPath, 'wx', sourcePermissions) + await temporaryFile.writeFile(patched, 'utf8') + await temporaryFile.sync() + await temporaryFile.close() + temporaryFile = undefined + await chmod(temporaryPath, sourcePermissions) + await rename(temporaryPath, clientPath) + } finally { + await temporaryFile?.close() + await rm(temporaryPath, { force: true }) + } + return { status: 'patched', clientPath } +} diff --git a/src/main/state/research-canvas-export.ts b/src/main/state/research-canvas-export.ts new file mode 100644 index 000000000..e96006f48 --- /dev/null +++ b/src/main/state/research-canvas-export.ts @@ -0,0 +1,262 @@ +import { copyFile, writeFile } from 'node:fs/promises' +import path from 'node:path' +import { registerTrustedMainWindowHandler, type TrustedWindow } from '../ipc-trust' +import { normalizeResearchLinkUrl } from './research-link-frame' + +const MAX_ID_LENGTH = 512 +const MAX_NAME_LENGTH = 160 +const MAX_TEXT_BYTES = 8 * 1024 * 1024 +const MAX_BINARY_BYTES = 16 * 1024 * 1024 + +type TextFormat = 'md' | 'csv' | 'txt' | 'svg' +type BinaryFormat = 'png' | 'jpg' + +export type ResearchCanvasExportRequest = + | { + kind: 'original' + sessionId: string + nodeId: string + authorizationId: string + suggestedName: string + } + | { kind: 'text'; format: TextFormat; suggestedName: string; content: string } + | { kind: 'binary'; format: BinaryFormat; suggestedName: string; base64: string } + | { kind: 'webloc'; suggestedName: string; url: string } + +export type ResearchCanvasExportResult = + | { status: 'saved' } + | { status: 'cancelled' } + | { status: 'error'; message: string } + +export type ResearchCanvasExportDependencies = { + showSaveDialog(options: Record): Promise<{ + canceled: boolean + filePath?: string + }> + writeFile(targetPath: string, data: string | Uint8Array, options: { mode: number }): Promise + copyFile(sourcePath: string, targetPath: string): Promise + resolveExportSource(value: unknown): Promise<{ path: string; name: string } | null> +} + +const defaultFileOperations = { writeFile, copyFile } + +const formatMetadata: Record = { + md: { extension: 'md', label: 'Markdown' }, + csv: { extension: 'csv', label: 'CSV' }, + txt: { extension: 'txt', label: '文本' }, + svg: { extension: 'svg', label: 'SVG' }, + png: { extension: 'png', label: 'PNG' }, + jpg: { extension: 'jpg', label: 'JPEG' }, + webloc: { extension: 'webloc', label: '网页位置' } +} + +function exactRecord(value: unknown, keys: readonly string[]): Record | null { + if (typeof value !== 'object' || value === null || Array.isArray(value)) return null + const record = value as Record + const actual = Object.keys(record) + return actual.length === keys.length && actual.every((key) => keys.includes(key)) + ? record + : null +} + +function boundedId(value: unknown): value is string { + return typeof value === 'string' && value.length > 0 && value.length <= MAX_ID_LENGTH && + !value.includes('\0') +} + +function cleanName(value: unknown): string { + if (typeof value !== 'string') return '组件' + let decoded = value + try { + decoded = decodeURIComponent(value) + } catch {} + const cleaned = decoded + .replace(/[\u0000-\u001f\u007f/\\:*?"<>|]+/g, '') + .replace(/\s+/g, ' ') + .trim() + .replace(/[ .]+$/g, '') + .slice(0, MAX_NAME_LENGTH) + return cleaned === '' ? '组件' : cleaned +} + +function withExtension(value: unknown, extension: string): string { + const cleaned = cleanName(value) + const suffix = `.${extension}` + const currentExtension = path.extname(cleaned) + const stem = (currentExtension === '' ? cleaned : cleaned.slice(0, -currentExtension.length)) + .replace(/[ .]+$/g, '') + .slice(0, 120) || '组件' + return `${stem}${suffix}` +} + +function outputPath(selectedPath: string, extension: string): string { + const currentExtension = path.extname(selectedPath) + return currentExtension.toLowerCase() === `.${extension}` + ? selectedPath + : `${currentExtension === '' ? selectedPath : selectedPath.slice(0, -currentExtension.length)}.${extension}` +} + +function validSvg(value: string): boolean { + return /^(?:\s*<\?xml[^>]*>\s*)?)/i.test(value) && + !/<(?:script|foreignObject)\b|\son\w+\s*=|(?:href|src)\s*=\s*["'](?:https?:|data:)/i.test(value) +} + +function validRequest(value: unknown): ResearchCanvasExportRequest | null { + const input = value as Record | null + if (input?.kind === 'original') { + const record = exactRecord(value, [ + 'kind', 'sessionId', 'nodeId', 'authorizationId', 'suggestedName' + ]) + return record !== null && boundedId(record.sessionId) && boundedId(record.nodeId) && + boundedId(record.authorizationId) && typeof record.suggestedName === 'string' && + record.suggestedName.length <= MAX_NAME_LENGTH + ? record as ResearchCanvasExportRequest + : null + } + if (input?.kind === 'text') { + const record = exactRecord(value, ['kind', 'format', 'suggestedName', 'content']) + if (record === null || !['md', 'csv', 'txt', 'svg'].includes(String(record.format)) || + typeof record.suggestedName !== 'string' || record.suggestedName.length > MAX_NAME_LENGTH || + typeof record.content !== 'string' || Buffer.byteLength(record.content, 'utf8') > MAX_TEXT_BYTES) { + return null + } + if (record.format === 'svg' && !validSvg(record.content)) return null + return record as ResearchCanvasExportRequest + } + if (input?.kind === 'binary') { + const record = exactRecord(value, ['kind', 'format', 'suggestedName', 'base64']) + return record !== null && (record.format === 'png' || record.format === 'jpg') && + typeof record.suggestedName === 'string' && record.suggestedName.length <= MAX_NAME_LENGTH && + typeof record.base64 === 'string' && record.base64.length > 0 && + record.base64.length <= Math.ceil(MAX_BINARY_BYTES / 3) * 4 + 4 + ? record as ResearchCanvasExportRequest + : null + } + if (input?.kind === 'webloc') { + const record = exactRecord(value, ['kind', 'suggestedName', 'url']) + return record !== null && typeof record.suggestedName === 'string' && + record.suggestedName.length <= MAX_NAME_LENGTH && normalizeResearchLinkUrl(record.url) !== null + ? record as ResearchCanvasExportRequest + : null + } + return null +} + +function decodeBinary(request: Extract): Buffer | null { + if (!/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/.test(request.base64)) { + return null + } + const bytes = Buffer.from(request.base64, 'base64') + if (bytes.length === 0 || bytes.length > MAX_BINARY_BYTES) return null + if (request.format === 'png' && !bytes.subarray(0, 4).equals(Buffer.from([0x89, 0x50, 0x4e, 0x47]))) { + return null + } + if (request.format === 'jpg' && !bytes.subarray(0, 3).equals(Buffer.from([0xff, 0xd8, 0xff]))) { + return null + } + return bytes +} + +function xmlEscape(value: string): string { + return value.replace(/&/g, '&').replace(//g, '>') +} + +function webloc(url: string): string { + return `\n\nURL${xmlEscape(url)}\n` +} + +async function chooseTarget( + dependencies: ResearchCanvasExportDependencies, + suggestedName: string, + extension: string, + label: string +): Promise { + const result = await dependencies.showSaveDialog({ + title: '下载组件', + defaultPath: withExtension(suggestedName, extension), + filters: [{ name: label, extensions: [extension] }] + }) + return result.canceled || typeof result.filePath !== 'string' || result.filePath === '' + ? null + : outputPath(result.filePath, extension) +} + +export async function saveResearchCanvasExport( + value: unknown, + dependencies: ResearchCanvasExportDependencies +): Promise { + const request = validRequest(value) + if (request === null) return { status: 'error', message: '下载内容无效。' } + + try { + if (request.kind === 'original') { + const source = await dependencies.resolveExportSource({ + sessionId: request.sessionId, + nodeId: request.nodeId, + authorizationId: request.authorizationId + }) + if (source === null) return { status: 'error', message: '原始文件不可用。' } + const extension = path.extname(source.name).slice(1).toLowerCase() || 'bin' + const target = await chooseTarget( + dependencies, + request.suggestedName || source.name, + extension, + '原始文件' + ) + if (target === null) return { status: 'cancelled' } + await dependencies.copyFile(source.path, target) + return { status: 'saved' } + } + + const binaryBytes = request.kind === 'binary' ? decodeBinary(request) : null + if (request.kind === 'binary' && binaryBytes === null) { + return { status: 'error', message: '下载内容无效。' } + } + const format = request.kind === 'webloc' ? 'webloc' : request.format + const metadata = formatMetadata[format] + const target = await chooseTarget( + dependencies, request.suggestedName, metadata.extension, metadata.label + ) + if (target === null) return { status: 'cancelled' } + + if (request.kind === 'text') { + await dependencies.writeFile(target, request.content, { mode: 0o600 }) + } else if (request.kind === 'binary') { + await dependencies.writeFile(target, binaryBytes!, { mode: 0o600 }) + } else { + const url = normalizeResearchLinkUrl(request.url) + if (url === null) return { status: 'error', message: '下载内容无效。' } + await dependencies.writeFile(target, webloc(url), { mode: 0o600 }) + } + return { status: 'saved' } + } catch { + return { status: 'error', message: '保存失败，请重试。' } + } +} + +type ResearchCanvasExportIpcMain = { + removeHandler(channel: string): void + handle(channel: string, handler: (event: any, value: unknown) => unknown): unknown +} + +export function registerResearchCanvasExportHandlers(options: { + ipcMain: ResearchCanvasExportIpcMain + getMainWindow(): TrustedWindow | undefined + dependencies: ResearchCanvasExportDependencies +}): void { + const channel = 'research:canvas-export:save' + options.ipcMain.removeHandler(channel) + registerTrustedMainWindowHandler( + options.ipcMain, + channel, + options.getMainWindow, + (_event, value: unknown) => saveResearchCanvasExport(value, options.dependencies) + ) +} + +export function researchCanvasExportFileOperations() { + return defaultFileOperations +} diff --git a/src/main/state/research-canvas-storage.ts b/src/main/state/research-canvas-storage.ts new file mode 100644 index 000000000..516890abe --- /dev/null +++ b/src/main/state/research-canvas-storage.ts @@ -0,0 +1,96 @@ +import { createHash } from 'node:crypto' +import { + mkdirSync, + readFileSync, + renameSync, + rmSync, + statSync, + writeFileSync +} from 'node:fs' +import path from 'node:path' + +const RESEARCH_CANVAS_STORAGE_DIRECTORY = 'research-canvas' +const RESEARCH_CANVAS_STORAGE_PREFIXES = [ + 'sherlock.research.canvas.files.v1:', + 'sherlock.research.canvas.artifacts.v1:', + 'sherlock.research.canvas.selection.v1:', + 'sherlock.research.canvas.preview-revocations.v1:' +] as const +const RESEARCH_CANVAS_STORAGE_MAX_KEY_LENGTH = 1_024 +const RESEARCH_CANVAS_STORAGE_MAX_FILE_BYTES = 48 * 1024 * 1024 + +export const RESEARCH_CANVAS_STORAGE_MAX_VALUE_LENGTH = 8 * 1024 * 1024 + +function validResearchCanvasStorageKey(value: unknown): value is string { + return typeof value === 'string' && + value.length <= RESEARCH_CANVAS_STORAGE_MAX_KEY_LENGTH && + RESEARCH_CANVAS_STORAGE_PREFIXES.some( + (prefix) => value.startsWith(prefix) && value.length > prefix.length + ) +} + +function validResearchCanvasStorageValue(value: unknown): value is string { + return typeof value === 'string' && + value.length <= RESEARCH_CANVAS_STORAGE_MAX_VALUE_LENGTH +} + +export function researchCanvasStoragePath(userDataPath: string, key: string): string { + const digest = createHash('sha256').update(key).digest('hex') + return path.join(userDataPath, RESEARCH_CANVAS_STORAGE_DIRECTORY, `${digest}.json`) +} + +export class ResearchCanvasStorage { + private readonly values = new Map() + + constructor(private readonly userDataPath: string) {} + + getItem(key: unknown): string | null { + if (!validResearchCanvasStorageKey(key)) return null + if (this.values.has(key)) return this.values.get(key) ?? null + + const value = this.read(key) + this.values.set(key, value) + return value + } + + setItem(key: unknown, value: unknown): boolean { + if (!validResearchCanvasStorageKey(key) || !validResearchCanvasStorageValue(value)) { + return false + } + if (this.getItem(key) === value) return true + + const filePath = researchCanvasStoragePath(this.userDataPath, key) + const temporaryPath = `${filePath}.${process.pid}.tmp` + const serialized = `${JSON.stringify({ key, value })}\n` + if (Buffer.byteLength(serialized, 'utf8') > RESEARCH_CANVAS_STORAGE_MAX_FILE_BYTES) { + return false + } + + try { + mkdirSync(path.dirname(filePath), { recursive: true, mode: 0o700 }) + writeFileSync(temporaryPath, serialized, { encoding: 'utf8', mode: 0o600 }) + renameSync(temporaryPath, filePath) + this.values.set(key, value) + return true + } catch { + try { + rmSync(temporaryPath, { force: true }) + } catch {} + return false + } + } + + private read(key: string): string | null { + const filePath = researchCanvasStoragePath(this.userDataPath, key) + try { + if (statSync(filePath).size > RESEARCH_CANVAS_STORAGE_MAX_FILE_BYTES) return null + const parsed = JSON.parse(readFileSync(filePath, 'utf8')) as unknown + if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) return null + const record = parsed as { key?: unknown; value?: unknown } + if (record.key !== key || !validResearchCanvasStorageValue(record.value)) return null + return record.value + } catch { + return null + } + } +} diff --git a/src/main/state/research-canvas-wheel.ts b/src/main/state/research-canvas-wheel.ts new file mode 100644 index 000000000..50c174c71 --- /dev/null +++ b/src/main/state/research-canvas-wheel.ts @@ -0,0 +1,230 @@ +import type { + BrowserWindow, + Event as ElectronEvent, + IpcMain, + MouseInputEvent, + MouseWheelInputEvent, + WebContents, + WebContentsDidStartNavigationEventParams +} from 'electron' +import { registerTrustedMainWindowListener } from '../ipc-trust' +import { + RESEARCH_CANVAS_WHEEL_EVENT_CHANNEL, + RESEARCH_CANVAS_WHEEL_REGION_CHANNEL, + type ResearchCanvasNativeWheel, + type ResearchCanvasWheelRegionUpdate +} from '../../shared/research-canvas-wheel' + +const MAX_REGION_COORDINATE = 1_000_000 +const MAX_REGION_SIZE = 32_768 +const MAX_WHEEL_DELTA = 4_096 +const MAX_RETIRED_OWNER_IDS = 64 +const COMMAND_MODIFIERS = new Set(['meta', 'command', 'cmd']) + +type ActiveRegion = Extract + +function plainRecord(value: unknown): value is Record { + return typeof value === 'object' && value !== null && !Array.isArray(value) +} + +function exactKeys(value: Record, expected: readonly string[]): boolean { + const keys = Object.keys(value).sort() + return keys.length === expected.length && keys.every((key, index) => key === expected[index]) +} + +function validGeneration(value: unknown): value is number { + return Number.isSafeInteger(value) && typeof value === 'number' && value > 0 +} + +function validOwnerId(value: unknown): value is string { + return typeof value === 'string' && /^[A-Za-z0-9_-]{1,128}$/.test(value) +} + +function boundedFinite(value: unknown, maximum: number): value is number { + return typeof value === 'number' && Number.isFinite(value) && Math.abs(value) <= maximum +} + +function parseRegionUpdate(value: unknown): ResearchCanvasWheelRegionUpdate | null { + if ( + !plainRecord(value) || typeof value.active !== 'boolean' || + !validGeneration(value.generation) || !validOwnerId(value.ownerId) + ) { + return null + } + if (!value.active) { + return exactKeys(value, ['active', 'generation', 'ownerId']) + ? { active: false, generation: value.generation, ownerId: value.ownerId } + : null + } + if (!exactKeys(value, ['active', 'generation', 'height', 'left', 'ownerId', 'top', 'width'])) return null + if ( + !boundedFinite(value.left, MAX_REGION_COORDINATE) || + !boundedFinite(value.top, MAX_REGION_COORDINATE) || + typeof value.width !== 'number' || !Number.isFinite(value.width) || + typeof value.height !== 'number' || !Number.isFinite(value.height) || + value.width <= 0 || value.height <= 0 || + value.width > MAX_REGION_SIZE || value.height > MAX_REGION_SIZE || + !Number.isFinite(value.left + value.width) || + !Number.isFinite(value.top + value.height) + ) { + return null + } + return { + active: true, + generation: value.generation, + ownerId: value.ownerId, + left: value.left, + top: value.top, + width: value.width, + height: value.height + } +} + +function commandWheel(mouse: MouseInputEvent): mouse is MouseWheelInputEvent { + return mouse.type === 'mouseWheel' && + Array.isArray(mouse.modifiers) && + mouse.modifiers.some((modifier) => COMMAND_MODIFIERS.has(modifier)) +} + +export class ResearchCanvasWheelRouter { + private activeRegion: ActiveRegion | null = null + private currentOwnerId: string | null = null + private lastGeneration = 0 + private readonly retiredOwnerIds = new Set() + private disposed = false + private readonly webContents: WebContents + + private readonly onBeforeMouseEvent = ( + event: ElectronEvent, + mouse: MouseInputEvent + ): void => { + const region = this.activeRegion + if (region === null || !commandWheel(mouse)) return + const { x, y, deltaX, deltaY } = mouse + if ( + !boundedFinite(x, MAX_REGION_COORDINATE) || + !boundedFinite(y, MAX_REGION_COORDINATE) || + !boundedFinite(deltaX, MAX_WHEEL_DELTA) || + !boundedFinite(deltaY, MAX_WHEEL_DELTA) || + (deltaX === 0 && deltaY === 0) || + x < region.left || x >= region.left + region.width || + y < region.top || y >= region.top + region.height + ) { + return + } + const payload: ResearchCanvasNativeWheel = { + generation: region.generation, + ownerId: region.ownerId, + clientX: x, + clientY: y, + deltaX, + deltaY, + deltaMode: 0 + } + try { + this.webContents.send(RESEARCH_CANVAS_WHEEL_EVENT_CHANNEL, payload) + } catch { + this.clear() + return + } + event.preventDefault() + } + + private readonly onDidStartNavigation = ( + event: ElectronEvent, + _url?: string, + isInPlace?: boolean, + isMainFrame?: boolean + ): void => { + const navigationIsMainFrame = typeof event.isMainFrame === 'boolean' + ? event.isMainFrame + : isMainFrame === true + const sameDocument = typeof event.isSameDocument === 'boolean' + ? event.isSameDocument + : isInPlace === true + if (navigationIsMainFrame && !sameDocument) this.resetForDocumentLifecycle() + } + + private readonly onRendererGone = (): void => this.resetForDocumentLifecycle() + private readonly onWindowClosed = (): void => this.dispose() + + private retireOwner(ownerId: string): void { + this.retiredOwnerIds.delete(ownerId) + this.retiredOwnerIds.add(ownerId) + while (this.retiredOwnerIds.size > MAX_RETIRED_OWNER_IDS) { + const oldest = this.retiredOwnerIds.values().next().value as string | undefined + if (oldest === undefined) break + this.retiredOwnerIds.delete(oldest) + } + } + + constructor(private readonly window: BrowserWindow) { + this.webContents = window.webContents + this.webContents.on('before-mouse-event', this.onBeforeMouseEvent) + this.webContents.on('did-start-navigation', this.onDidStartNavigation) + this.webContents.on('render-process-gone', this.onRendererGone) + this.webContents.on('destroyed', this.onRendererGone) + window.on('closed', this.onWindowClosed) + } + + setRegion(value: unknown): boolean { + if (this.disposed) return false + const update = parseRegionUpdate(value) + if ( + update === null || + update.generation <= this.lastGeneration || + this.retiredOwnerIds.has(update.ownerId) + ) return false + if (this.currentOwnerId !== update.ownerId) { + if (!update.active) return false + if (this.currentOwnerId !== null) this.retireOwner(this.currentOwnerId) + this.currentOwnerId = update.ownerId + } + this.lastGeneration = update.generation + this.activeRegion = update.active ? update : null + return true + } + + clear(): void { + this.activeRegion = null + } + + private resetForDocumentLifecycle(): void { + this.activeRegion = null + this.currentOwnerId = null + this.lastGeneration = 0 + this.retiredOwnerIds.clear() + } + + dispose(): void { + if (this.disposed) return + this.disposed = true + this.resetForDocumentLifecycle() + this.webContents.off('before-mouse-event', this.onBeforeMouseEvent) + this.webContents.off('did-start-navigation', this.onDidStartNavigation) + this.webContents.off('render-process-gone', this.onRendererGone) + this.webContents.off('destroyed', this.onRendererGone) + this.window.off('closed', this.onWindowClosed) + } +} + +export function installResearchCanvasWheelRouter(window: BrowserWindow): ResearchCanvasWheelRouter { + return new ResearchCanvasWheelRouter(window) +} + +export function registerResearchCanvasWheelIpc(options: { + ipcMain: IpcMain + getMainWindow(): BrowserWindow | undefined + getRouter(): ResearchCanvasWheelRouter | undefined + onRejected?(error: unknown): void +}): void { + options.ipcMain.removeAllListeners(RESEARCH_CANVAS_WHEEL_REGION_CHANNEL) + registerTrustedMainWindowListener( + options.ipcMain, + RESEARCH_CANVAS_WHEEL_REGION_CHANNEL, + options.getMainWindow, + (_event, value: unknown) => options.getRouter()?.setRegion(value) ?? false, + false, + options.onRejected + ) +} diff --git a/src/main/state/research-file-preview.ts b/src/main/state/research-file-preview.ts new file mode 100644 index 000000000..b9c9917a1 --- /dev/null +++ b/src/main/state/research-file-preview.ts @@ -0,0 +1,1360 @@ +import { randomBytes } from 'node:crypto' +import { + chmodSync, + createReadStream, + mkdirSync, + readFileSync, + renameSync, + rmSync, + statSync, + writeFileSync +} from 'node:fs' +import { open, readFile, realpath, stat } from 'node:fs/promises' +import path from 'node:path' +import { Readable } from 'node:stream' +import { crc32, inflateRawSync } from 'node:zlib' +import { + registerTrustedMainWindowHandler, + type TrustedWindow +} from '../ipc-trust' +import { isTrustedAppUrl } from '../security-policy' + +export const RESEARCH_PREVIEW_SCHEME = 'sherlock-preview' +export const RESEARCH_PREVIEW_CSP = [ + "default-src 'none'", + "img-src sherlock-preview: data:", + "style-src sherlock-preview: 'unsafe-inline'", + "script-src 'none'", + "font-src sherlock-preview:", + "media-src sherlock-preview:", + "connect-src 'none'", + "object-src 'none'", + "frame-src 'none'", + "child-src 'none'", + "worker-src 'none'", + "manifest-src 'none'", + "base-uri 'none'", + "form-action 'none'", + "frame-ancestors 'none'" +].join('; ') + +const AUTHORIZATION_DIRECTORY = 'research-file-preview' +const AUTHORIZATION_FILE = 'authorizations.v1.json' +const AUTHORIZATION_VERSION = 1 +const MAX_AUTHORIZATION_BYTES = 1024 * 1024 +const MAX_AUTHORIZATIONS = 1024 +const DEFAULT_CAPABILITY_TTL_MS = 15 * 60 * 1000 +const MAX_PATH_LENGTH = 8 * 1024 +const MAX_ID_LENGTH = 512 +const MAGIC_PREFIX_BYTES = 512 +const MAX_JSON_VALIDATION_BYTES = 4 * 1024 * 1024 +const MAX_NATIVE_TEXT_PREVIEW_BYTES = 2 * 1024 * 1024 +const MAX_OFFICE_PREVIEW_BYTES = 64 * 1024 * 1024 +const MAX_OFFICE_ZIP_ENTRIES = 4096 +const MAX_OFFICE_CENTRAL_DIRECTORY_BYTES = 8 * 1024 * 1024 +const MAX_OFFICE_ENTRY_BYTES = 64 * 1024 * 1024 +const MAX_OFFICE_EXPANDED_BYTES = 256 * 1024 * 1024 +const MAX_OFFICE_EXPANSION_RATIO = 200 +const CORS_EXPOSE_HEADERS = 'Accept-Ranges, Content-Length, Content-Range, Content-Type' + +export type ResearchPreviewSource = 'finder' | 'sidebar' + +export interface ResearchFilePreviewDescriptor { + authorizationId: string + capabilityToken: string + url: string + contentType: string + name: string +} + +export interface ResearchPreviewAuthorizationRecord { + authorizationId: string + source: ResearchPreviewSource + path: string + root: string + sessionId: string + nodeId: string + contentType: string + name: string + allowSubresources: boolean + createdAt: number +} + +export interface ResearchPreviewAuthorizationStorage { + load(): ResearchPreviewAuthorizationRecord[] + save(records: readonly ResearchPreviewAuthorizationRecord[]): boolean +} + +export interface ResearchPreviewWorkspaceResolver { + resolveRoot(sessionId: string): Promise +} + +interface PreviewStat { + size: number + isFile(): boolean +} + +export interface ResearchPreviewFileSystem { + realpath(targetPath: string): Promise + stat(targetPath: string): Promise + readSlice(targetPath: string, start: number, endInclusive: number): Promise + stream(targetPath: string, start: number, endInclusive: number): ReadableStream +} + +export interface ResearchFilePreviewRegistryOptions { + storage: ResearchPreviewAuthorizationStorage + workspaceResolver?: ResearchPreviewWorkspaceResolver + fileSystem?: ResearchPreviewFileSystem + randomId?: () => string + now?: () => number + capabilityTtlMs?: number +} + +type FinderAdmission = { + path: string + sessionId: string + nodeId: string +} + +type SidebarAdmission = { + relativePath: string + sessionId: string + nodeId: string +} + +type RestoreRequest = { + authorizationId: string + sessionId: string + nodeId: string +} + +type ReleaseCapabilityRequest = RestoreRequest & { + capabilityToken: string +} + +type Capability = { + authorizationId: string + expiresAt: number +} + +type PreviewKind = { + contentType: string + rootPreview: boolean + validateMagic(prefix: Uint8Array): boolean + validateComplete?(value: Uint8Array): boolean + rootMaxBytes?: number + validateRootComplete?(value: Uint8Array): boolean + officeFamily?: OfficeFamily +} + +type OfficeFamily = 'docx' | 'xlsx' | 'pptx' + +const officeFamilyMarker: Record = { + docx: 'word/document.xml', + xlsx: 'xl/workbook.xml', + pptx: 'ppt/presentation.xml' +} + +function officeKind(family: OfficeFamily, contentType: string): PreviewKind { + return { + contentType, + rootPreview: true, + rootMaxBytes: MAX_OFFICE_PREVIEW_BYTES, + officeFamily: family, + validateMagic: (value) => startsWith(value, [0x50, 0x4b, 0x03, 0x04]) + } +} + +function nativeTextKind(contentType = 'text/plain; charset=utf-8'): PreviewKind { + return { + contentType, + rootPreview: true, + validateMagic: textMagic, + rootMaxBytes: MAX_NATIVE_TEXT_PREVIEW_BYTES, + validateRootComplete: utf8TextMagic + } +} + +const unknownTextRootKind = nativeTextKind() + +const previewKinds = new Map([ + ['.png', { contentType: 'image/png', rootPreview: true, validateMagic: (value) => + startsWith(value, [0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]) }], + ['.jpg', { contentType: 'image/jpeg', rootPreview: true, validateMagic: jpegMagic }], + ['.jpeg', { contentType: 'image/jpeg', rootPreview: true, validateMagic: jpegMagic }], + ['.gif', { contentType: 'image/gif', rootPreview: true, validateMagic: gifMagic }], + ['.webp', { contentType: 'image/webp', rootPreview: true, validateMagic: webpMagic }], + ['.bmp', { contentType: 'image/bmp', rootPreview: true, validateMagic: (value) => + startsWith(value, [0x42, 0x4d]) }], + ['.ico', { contentType: 'image/x-icon', rootPreview: true, validateMagic: icoMagic }], + ['.avif', { contentType: 'image/avif', rootPreview: true, validateMagic: avifMagic }], + ['.svg', { contentType: 'image/svg+xml', rootPreview: true, validateMagic: svgMagic }], + ['.pdf', { contentType: 'application/pdf', rootPreview: true, validateMagic: (value) => + startsWith(value, [0x25, 0x50, 0x44, 0x46, 0x2d]) }], + ['.docx', officeKind('docx', + 'application/vnd.openxmlformats-officedocument.wordprocessingml.document')], + ['.xlsx', officeKind('xlsx', + 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')], + ['.pptx', officeKind('pptx', + 'application/vnd.openxmlformats-officedocument.presentationml.presentation')], + ['.html', { contentType: 'text/html; charset=utf-8', rootPreview: true, validateMagic: htmlMagic }], + ['.htm', { contentType: 'text/html; charset=utf-8', rootPreview: true, validateMagic: htmlMagic }], + ['.md', nativeTextKind('text/markdown; charset=utf-8')], + ['.markdown', nativeTextKind('text/markdown; charset=utf-8')], + ['.txt', nativeTextKind()], + ['.log', nativeTextKind()], + ['.ts', nativeTextKind()], + ['.tsx', nativeTextKind()], + ['.jsx', nativeTextKind()], + ['.py', nativeTextKind()], + ['.rb', nativeTextKind()], + ['.go', nativeTextKind()], + ['.rs', nativeTextKind()], + ['.java', nativeTextKind()], + ['.c', nativeTextKind()], + ['.h', nativeTextKind()], + ['.cpp', nativeTextKind()], + ['.hpp', nativeTextKind()], + ['.swift', nativeTextKind()], + ['.kt', nativeTextKind()], + ['.kts', nativeTextKind()], + ['.sh', nativeTextKind()], + ['.bash', nativeTextKind()], + ['.zsh', nativeTextKind()], + ['.fish', nativeTextKind()], + ['.sql', nativeTextKind()], + ['.yaml', nativeTextKind()], + ['.yml', nativeTextKind()], + ['.toml', nativeTextKind()], + ['.ini', nativeTextKind()], + ['.conf', nativeTextKind()], + ['.xml', nativeTextKind()], + ['.csv', nativeTextKind()], + ['.css', nativeTextKind('text/css; charset=utf-8')], + ['.js', nativeTextKind('text/javascript; charset=utf-8')], + ['.mjs', nativeTextKind('text/javascript; charset=utf-8')], + ['.json', { + ...nativeTextKind('application/json; charset=utf-8'), validateComplete: jsonMagic + }], + ['.map', { + ...nativeTextKind('application/json; charset=utf-8'), validateComplete: jsonMagic + }], + ['.woff', { contentType: 'font/woff', rootPreview: false, validateMagic: (value) => + startsWith(value, [0x77, 0x4f, 0x46, 0x46]) }], + ['.woff2', { contentType: 'font/woff2', rootPreview: false, validateMagic: (value) => + startsWith(value, [0x77, 0x4f, 0x46, 0x32]) }], + ['.ttf', { contentType: 'font/ttf', rootPreview: false, validateMagic: trueTypeMagic }], + ['.otf', { contentType: 'font/otf', rootPreview: false, validateMagic: (value) => + Buffer.from(value.subarray(0, 4)).toString('ascii') === 'OTTO' }], + ['.wasm', { contentType: 'application/wasm', rootPreview: false, validateMagic: (value) => + startsWith(value, [0, 0x61, 0x73, 0x6d, 1, 0, 0, 0]) }], + ['.mp3', { contentType: 'audio/mpeg', rootPreview: false, validateMagic: mp3Magic }], + ['.wav', { contentType: 'audio/wav', rootPreview: false, validateMagic: waveMagic }], + ['.ogg', { contentType: 'audio/ogg', rootPreview: false, validateMagic: (value) => + Buffer.from(value.subarray(0, 4)).toString('ascii') === 'OggS' }], + ['.mp4', { contentType: 'video/mp4', rootPreview: false, validateMagic: mp4Magic }], + ['.webm', { contentType: 'video/webm', rootPreview: false, validateMagic: (value) => + startsWith(value, [0x1a, 0x45, 0xdf, 0xa3]) }] +]) + +function startsWith(value: Uint8Array, prefix: readonly number[]): boolean { + return value.length >= prefix.length && prefix.every((byte, index) => value[index] === byte) +} + +function jpegMagic(value: Uint8Array): boolean { + return startsWith(value, [0xff, 0xd8, 0xff]) +} + +function gifMagic(value: Uint8Array): boolean { + const text = Buffer.from(value.subarray(0, 6)).toString('ascii') + return text === 'GIF87a' || text === 'GIF89a' +} + +function webpMagic(value: Uint8Array): boolean { + return Buffer.from(value.subarray(0, 4)).toString('ascii') === 'RIFF' && + Buffer.from(value.subarray(8, 12)).toString('ascii') === 'WEBP' +} + +function avifMagic(value: Uint8Array): boolean { + if (value.length < 16 || Buffer.from(value.subarray(4, 8)).toString('ascii') !== 'ftyp') { + return false + } + const declaredSize = Buffer.from(value.subarray(0, 4)).readUInt32BE(0) + if (declaredSize < 16 || declaredSize > value.length || (declaredSize - 16) % 4 !== 0) { + return false + } + const majorBrand = Buffer.from(value.subarray(8, 12)).toString('ascii') + if (majorBrand === 'avif' || majorBrand === 'avis') return true + for (let offset = 16; offset + 4 <= declaredSize; offset += 4) { + const brand = Buffer.from(value.subarray(offset, offset + 4)).toString('ascii') + if (brand === 'avif' || brand === 'avis') return true + } + return false +} + +function icoMagic(value: Uint8Array): boolean { + if (value.length < 6 || !startsWith(value, [0x00, 0x00, 0x01, 0x00])) return false + const count = Buffer.from(value.subarray(4, 6)).readUInt16LE(0) + if (count === 0) return false + const directoryLength = 6 + count * 16 + return directoryLength <= MAGIC_PREFIX_BYTES && value.length >= directoryLength +} + +function textPrefix(value: Uint8Array): string | null { + if (value.includes(0)) return null + return Buffer.from(value).toString('utf8').replace(/^\uFEFF/, '') +} + +function svgMagic(value: Uint8Array): boolean { + const text = textPrefix(value) + return text !== null && /(?:<\?xml[^>]*>\s*)?(?:\s*)*)/i.test(text) +} + +function htmlMagic(value: Uint8Array): boolean { + const text = textPrefix(value) + return text !== null && /^\s*(?:\s*)*(?:)|<[a-z][a-z0-9:-]*(?:\s|\/?>))/i.test(text) +} + +function textMagic(value: Uint8Array): boolean { + return textPrefix(value) !== null +} + +function utf8TextMagic(value: Uint8Array): boolean { + if (value.includes(0)) return false + try { + new TextDecoder('utf-8', { fatal: true }).decode(value) + return true + } catch { + return false + } +} + +function jsonMagic(value: Uint8Array): boolean { + try { + if (value.includes(0)) return false + const text = new TextDecoder('utf-8', { fatal: true }) + .decode(value) + .replace(/^\uFEFF/, '') + JSON.parse(text) + return true + } catch { + return false + } +} + +function trueTypeMagic(value: Uint8Array): boolean { + return startsWith(value, [0, 1, 0, 0]) || + Buffer.from(value.subarray(0, 4)).toString('ascii') === 'true' +} + +function mp3Magic(value: Uint8Array): boolean { + const secondByte = value.at(1) + return Buffer.from(value.subarray(0, 3)).toString('ascii') === 'ID3' || + (value[0] === 0xff && secondByte !== undefined && (secondByte & 0xe0) === 0xe0) +} + +function waveMagic(value: Uint8Array): boolean { + return Buffer.from(value.subarray(0, 4)).toString('ascii') === 'RIFF' && + Buffer.from(value.subarray(8, 12)).toString('ascii') === 'WAVE' +} + +function mp4Magic(value: Uint8Array): boolean { + return Buffer.from(value.subarray(4, 8)).toString('ascii') === 'ftyp' +} + +function defaultRandomId(): string { + return randomBytes(24).toString('hex') +} + +function boundedId(value: unknown): value is string { + return typeof value === 'string' && value.length > 0 && value.length <= MAX_ID_LENGTH && + !value.includes('\0') +} + +function opaqueId(value: unknown): value is string { + return boundedId(value) && /^[A-Za-z0-9_-]+$/.test(value) +} + +function boundedAbsolutePath(value: unknown): value is string { + return typeof value === 'string' && value.length > 0 && value.length <= MAX_PATH_LENGTH && + !value.includes('\0') && path.isAbsolute(value) +} + +function isContained(root: string, target: string): boolean { + const child = path.relative(root, target) + return child === '' || (!path.isAbsolute(child) && child !== '..' && !child.startsWith(`..${path.sep}`)) +} + +function validRelativePath(value: unknown): value is string { + if (typeof value !== 'string' || value.length === 0 || value.length > MAX_PATH_LENGTH || + value.includes('\0') || path.posix.isAbsolute(value) || path.win32.isAbsolute(value)) { + return false + } + const segments = value.split(/[\\/]/) + return segments.every((segment) => segment.length > 0 && segment !== '.' && segment !== '..') +} + +function validRecord(value: unknown): value is ResearchPreviewAuthorizationRecord { + if (typeof value !== 'object' || value === null || Array.isArray(value)) return false + const record = value as Partial + return opaqueId(record.authorizationId) && + (record.source === 'finder' || record.source === 'sidebar') && + boundedAbsolutePath(record.path) && boundedAbsolutePath(record.root) && + boundedId(record.sessionId) && boundedId(record.nodeId) && + typeof record.contentType === 'string' && record.contentType.length <= 128 && + typeof record.name === 'string' && record.name.length > 0 && record.name.length <= MAX_ID_LENGTH && + typeof record.allowSubresources === 'boolean' && + typeof record.createdAt === 'number' && Number.isFinite(record.createdAt) +} + +export function researchPreviewAuthorizationStoragePath(userDataPath: string): string { + return path.join(userDataPath, AUTHORIZATION_DIRECTORY, AUTHORIZATION_FILE) +} + +export class FileResearchPreviewAuthorizationStorage implements ResearchPreviewAuthorizationStorage { + private readonly storagePath: string + + constructor(userDataPath: string) { + this.storagePath = researchPreviewAuthorizationStoragePath(userDataPath) + try { + chmodSync(this.storagePath, 0o600) + } catch {} + } + + load(): ResearchPreviewAuthorizationRecord[] { + try { + const file = statSync(this.storagePath) + if (!file.isFile() || file.size > MAX_AUTHORIZATION_BYTES) return [] + chmodSync(this.storagePath, 0o600) + const parsed = JSON.parse(readFileSync(this.storagePath, 'utf8')) as unknown + if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) return [] + const value = parsed as { version?: unknown; authorizations?: unknown } + if (value.version !== AUTHORIZATION_VERSION || !Array.isArray(value.authorizations) || + value.authorizations.length > MAX_AUTHORIZATIONS) return [] + return value.authorizations.filter(validRecord) + } catch { + return [] + } + } + + save(records: readonly ResearchPreviewAuthorizationRecord[]): boolean { + if (records.length > MAX_AUTHORIZATIONS || records.some((record) => !validRecord(record))) { + return false + } + const serialized = `${JSON.stringify({ + version: AUTHORIZATION_VERSION, + authorizations: records + })}\n` + if (Buffer.byteLength(serialized, 'utf8') > MAX_AUTHORIZATION_BYTES) return false + + const temporaryPath = `${this.storagePath}.${process.pid}.tmp` + try { + mkdirSync(path.dirname(this.storagePath), { recursive: true, mode: 0o700 }) + writeFileSync(temporaryPath, serialized, { encoding: 'utf8', mode: 0o600 }) + renameSync(temporaryPath, this.storagePath) + chmodSync(this.storagePath, 0o600) + return true + } catch { + try { + rmSync(temporaryPath, { force: true }) + } catch {} + return false + } + } +} + +export class HarnessWorkspaceFileResolver implements ResearchPreviewWorkspaceResolver { + constructor(private readonly dshHome: string) {} + + async resolveRoot(sessionId: string): Promise { + if (!boundedId(sessionId)) return null + const storagePath = path.join(this.dshHome, 'storages', 'workspace.json') + try { + const file = await stat(storagePath) + if (!file.isFile() || file.size > MAX_AUTHORIZATION_BYTES) return null + const parsed = JSON.parse(await readFile(storagePath, 'utf8')) as unknown + if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) return null + const tables = (parsed as { tables?: unknown }).tables + if (typeof tables !== 'object' || tables === null || Array.isArray(tables)) return null + const workspaces = (tables as { workspaces?: unknown }).workspaces + if (typeof workspaces !== 'object' || workspaces === null || Array.isArray(workspaces)) return null + const entries = Object.values(workspaces) + if (entries.length > MAX_AUTHORIZATIONS) return null + for (const entry of entries) { + if (typeof entry !== 'object' || entry === null || Array.isArray(entry)) continue + const workspace = entry as { path?: unknown; sessionIds?: unknown } + if (!boundedAbsolutePath(workspace.path) || !Array.isArray(workspace.sessionIds) || + workspace.sessionIds.length > MAX_AUTHORIZATIONS) continue + if (workspace.sessionIds.includes(sessionId)) return workspace.path + } + return null + } catch { + return null + } + } +} + +const defaultFileSystem: ResearchPreviewFileSystem = { + realpath, + stat, + async readSlice(targetPath, start, endInclusive) { + if (endInclusive < start) return new Uint8Array() + const handle = await open(targetPath, 'r') + try { + const buffer = Buffer.allocUnsafe(endInclusive - start + 1) + const result = await handle.read(buffer, 0, buffer.length, start) + return new Uint8Array(buffer.subarray(0, result.bytesRead)) + } finally { + await handle.close() + } + }, + stream(targetPath, start, endInclusive) { + return Readable.toWeb(createReadStream(targetPath, { + start, + end: endInclusive + })) as ReadableStream + } +} + +function kindForPath(targetPath: string): PreviewKind | undefined { + return previewKinds.get(path.extname(targetPath).toLowerCase()) +} + +function rootKindForPath(targetPath: string): PreviewKind | undefined { + const known = kindForPath(targetPath) + if (known !== undefined) return isRootPreviewKind(known) ? known : undefined + return unknownTextRootKind +} + +type OfficeZipEntry = { + crc32: number + dataStart: number + dataEnd: number + flags: number + localOffset: number + method: number + compressedSize: number + uncompressedSize: number +} + +function zipExtraContainsZip64(value: Buffer): boolean { + let offset = 0 + while (offset < value.length) { + if (offset + 4 > value.length) return true + const id = value.readUInt16LE(offset) + const length = value.readUInt16LE(offset + 2) + offset += 4 + if (offset + length > value.length || id === 0x0001) return true + offset += length + } + return false +} + +function validOfficeZipFlags(method: number, flags: number): boolean { + const allowed = method === 8 + ? 0x080e // deflate: compression option bits 1/2, descriptor bit 3, UTF-8 bit 11 + : method === 0 + ? 0x0808 // stored: descriptor bit 3, UTF-8 bit 11 + : -1 + return allowed >= 0 && (flags & ~allowed) === 0 +} + +function safeOfficeZipName(raw: Buffer): string | null { + let name: string + try { + name = new TextDecoder('utf-8', { fatal: true }).decode(raw) + } catch { + return null + } + if (name.length === 0 || name.includes('\0') || name.includes('\\') || + name.startsWith('/') || /^[A-Za-z]:/.test(name)) return null + const body = name.endsWith('/') ? name.slice(0, -1) : name + if (body.length === 0) return null + const segments = body.split('/') + if (segments.some((segment) => segment.length === 0 || segment === '.' || segment === '..')) { + return null + } + return name +} + +function findOfficeZipEocd(value: Buffer): number { + const minimum = Math.max(0, value.length - (22 + 0xffff)) + for (let offset = value.length - 22; offset >= minimum; offset -= 1) { + if (value.readUInt32LE(offset) !== 0x06054b50) continue + const commentLength = value.readUInt16LE(offset + 20) + if (offset + 22 + commentLength === value.length) return offset + } + return -1 +} + +function validOfficePackage(value: Uint8Array, family: OfficeFamily): boolean { + if (value.byteLength < 22 || value.byteLength > MAX_OFFICE_PREVIEW_BYTES) return false + const archive = Buffer.from(value.buffer, value.byteOffset, value.byteLength) + const eocd = findOfficeZipEocd(archive) + if (eocd < 0) return false + if (eocd >= 20 && archive.readUInt32LE(eocd - 20) === 0x07064b50) return false + const diskNumber = archive.readUInt16LE(eocd + 4) + const centralDisk = archive.readUInt16LE(eocd + 6) + const diskEntries = archive.readUInt16LE(eocd + 8) + const totalEntries = archive.readUInt16LE(eocd + 10) + const centralSize = archive.readUInt32LE(eocd + 12) + const centralOffset = archive.readUInt32LE(eocd + 16) + if (diskNumber !== 0 || centralDisk !== 0 || diskEntries !== totalEntries || + totalEntries === 0 || totalEntries === 0xffff || totalEntries > MAX_OFFICE_ZIP_ENTRIES || + centralSize === 0xffffffff || centralOffset === 0xffffffff || + centralSize > MAX_OFFICE_CENTRAL_DIRECTORY_BYTES || + centralOffset + centralSize !== eocd) return false + + const names = new Set() + const criticalNames = new Set() + const entries: OfficeZipEntry[] = [] + let expandedBytes = 0 + let centralCursor = centralOffset + for (let index = 0; index < totalEntries; index += 1) { + if (centralCursor + 46 > eocd || archive.readUInt32LE(centralCursor) !== 0x02014b50) { + return false + } + const flags = archive.readUInt16LE(centralCursor + 8) + const method = archive.readUInt16LE(centralCursor + 10) + const crc32 = archive.readUInt32LE(centralCursor + 16) + const compressedSize = archive.readUInt32LE(centralCursor + 20) + const uncompressedSize = archive.readUInt32LE(centralCursor + 24) + const nameLength = archive.readUInt16LE(centralCursor + 28) + const extraLength = archive.readUInt16LE(centralCursor + 30) + const commentLength = archive.readUInt16LE(centralCursor + 32) + const startDisk = archive.readUInt16LE(centralCursor + 34) + const localOffset = archive.readUInt32LE(centralCursor + 42) + const centralEnd = centralCursor + 46 + nameLength + extraLength + commentLength + if (centralEnd > eocd || !validOfficeZipFlags(method, flags) || + startDisk !== 0 || compressedSize === 0xffffffff || uncompressedSize === 0xffffffff || + localOffset === 0xffffffff || uncompressedSize > MAX_OFFICE_ENTRY_BYTES) return false + const centralName = archive.subarray(centralCursor + 46, centralCursor + 46 + nameLength) + const centralExtra = archive.subarray( + centralCursor + 46 + nameLength, + centralCursor + 46 + nameLength + extraLength + ) + const name = safeOfficeZipName(centralName) + if (name === null || names.has(name) || zipExtraContainsZip64(centralExtra)) return false + if (method === 0 && compressedSize !== uncompressedSize) return false + if (uncompressedSize > 0 && (compressedSize === 0 || + uncompressedSize > compressedSize * MAX_OFFICE_EXPANSION_RATIO)) return false + expandedBytes += uncompressedSize + if (!Number.isSafeInteger(expandedBytes) || expandedBytes > MAX_OFFICE_EXPANDED_BYTES) { + return false + } + names.add(name) + const lowerName = name.toLowerCase() + if (lowerName === '[content_types].xml' || lowerName === '_rels/.rels' || + Object.values(officeFamilyMarker).includes(lowerName)) { + if (criticalNames.has(lowerName)) return false + criticalNames.add(lowerName) + if (name !== lowerName && name !== '[Content_Types].xml') return false + } + + if (localOffset + 30 > centralOffset || archive.readUInt32LE(localOffset) !== 0x04034b50) { + return false + } + const localFlags = archive.readUInt16LE(localOffset + 6) + const localMethod = archive.readUInt16LE(localOffset + 8) + const localCrc32 = archive.readUInt32LE(localOffset + 14) + const localCompressedSize = archive.readUInt32LE(localOffset + 18) + const localUncompressedSize = archive.readUInt32LE(localOffset + 22) + const localNameLength = archive.readUInt16LE(localOffset + 26) + const localExtraLength = archive.readUInt16LE(localOffset + 28) + const dataStart = localOffset + 30 + localNameLength + localExtraLength + const dataEnd = dataStart + compressedSize + if (dataEnd > centralOffset || !validOfficeZipFlags(localMethod, localFlags) || + localFlags !== flags || localMethod !== method || + localNameLength !== nameLength || + !archive.subarray(localOffset + 30, localOffset + 30 + localNameLength).equals(centralName) || + zipExtraContainsZip64(archive.subarray( + localOffset + 30 + localNameLength, + localOffset + 30 + localNameLength + localExtraLength + ))) return false + if ((flags & 0x0008) === 0) { + if (localCrc32 !== crc32 || localCompressedSize !== compressedSize || + localUncompressedSize !== uncompressedSize) return false + } else if ((localCrc32 !== 0 && localCrc32 !== crc32) || + (localCompressedSize !== 0 && localCompressedSize !== compressedSize) || + (localUncompressedSize !== 0 && localUncompressedSize !== uncompressedSize)) { + return false + } + entries.push({ + crc32, + dataStart, + dataEnd, + flags, + localOffset, + method, + compressedSize, + uncompressedSize + }) + centralCursor = centralEnd + } + if (centralCursor !== eocd) { + if (centralCursor + 6 > eocd || archive.readUInt32LE(centralCursor) !== 0x05054b50 || + centralCursor + 6 + archive.readUInt16LE(centralCursor + 4) !== eocd) return false + } + const ordered = entries.slice().sort((left, right) => left.localOffset - right.localOffset) + let actualExpandedBytes = 0 + for (let index = 0; index < ordered.length; index += 1) { + const entry = ordered[index]! + const previous = ordered[index - 1] + const nextOffset = ordered[index + 1]?.localOffset ?? centralOffset + if (entry.dataEnd > nextOffset || (previous !== undefined && + entry.localOffset === previous.localOffset)) { + return false + } + if ((entry.flags & 0x0008) !== 0) { + const matchesDescriptorAt = (cursor: number): boolean => + cursor + 12 <= nextOffset && archive.readUInt32LE(cursor) === entry.crc32 && + archive.readUInt32LE(cursor + 4) === entry.compressedSize && + archive.readUInt32LE(cursor + 8) === entry.uncompressedSize + const unsignedDescriptorMatches = matchesDescriptorAt(entry.dataEnd) + const signedDescriptorMatches = entry.dataEnd + 16 <= nextOffset && + archive.readUInt32LE(entry.dataEnd) === 0x08074b50 && + matchesDescriptorAt(entry.dataEnd + 4) + if (!unsignedDescriptorMatches && !signedDescriptorMatches) return false + } + const compressed = archive.subarray(entry.dataStart, entry.dataEnd) + const remainingBytes = MAX_OFFICE_EXPANDED_BYTES - actualExpandedBytes + const ratioBytes = entry.compressedSize * MAX_OFFICE_EXPANSION_RATIO + const maxOutputLength = Math.min( + entry.uncompressedSize, + MAX_OFFICE_ENTRY_BYTES, + remainingBytes, + ratioBytes + ) + let expanded: Buffer + try { + expanded = entry.method === 0 + ? compressed + : inflateRawSync(compressed, { maxOutputLength: Math.max(1, maxOutputLength) }) + } catch { + return false + } + if (expanded.byteLength !== entry.uncompressedSize || + expanded.byteLength > maxOutputLength || + crc32(expanded) !== entry.crc32) { + return false + } + actualExpandedBytes += expanded.byteLength + } + if (!names.has('[Content_Types].xml') || !names.has('_rels/.rels')) return false + const presentFamilies = (Object.entries(officeFamilyMarker) as Array<[OfficeFamily, string]>) + .filter(([, marker]) => names.has(marker)) + .map(([entryFamily]) => entryFamily) + return presentFamilies.length === 1 && presentFamilies[0] === family && + names.has(officeFamilyMarker[family]) +} + +async function readValidOfficePackage( + fileSystem: ResearchPreviewFileSystem, + targetPath: string, + fileSize: number, + family: OfficeFamily +): Promise { + if (!Number.isSafeInteger(fileSize) || fileSize < 22 || fileSize > MAX_OFFICE_PREVIEW_BYTES) { + return null + } + const complete = await fileSystem.readSlice(targetPath, 0, fileSize - 1) + return complete.byteLength === fileSize && validOfficePackage(complete, family) ? complete : null +} + +async function validatesPreviewKind( + fileSystem: ResearchPreviewFileSystem, + targetPath: string, + fileSize: number, + kind: PreviewKind, + rootPreview: boolean +): Promise { + if (rootPreview && kind.rootMaxBytes !== undefined && fileSize > kind.rootMaxBytes) return false + if (rootPreview && kind.officeFamily !== undefined) { + return await readValidOfficePackage(fileSystem, targetPath, fileSize, kind.officeFamily) !== null + } + if (kind.validateComplete !== undefined && fileSize > MAX_JSON_VALIDATION_BYTES) return false + const prefix = await fileSystem.readSlice( + targetPath, + 0, + Math.min(Math.max(0, fileSize - 1), MAGIC_PREFIX_BYTES - 1) + ) + if (!kind.validateMagic(prefix)) return false + const validateRoot = rootPreview ? kind.validateRootComplete : undefined + if (validateRoot === undefined && kind.validateComplete === undefined) return true + const complete = await fileSystem.readSlice(targetPath, 0, Math.max(0, fileSize - 1)) + return (validateRoot?.(complete) ?? true) && (kind.validateComplete?.(complete) ?? true) +} + +function isRootPreviewKind(kind: PreviewKind | undefined): kind is PreviewKind { + return kind?.rootPreview === true +} + +export function researchPreviewHtmlCsp(capabilityToken: string, frameAncestor: string): string { + const source = `${RESEARCH_PREVIEW_SCHEME}://${capabilityToken}` + return [ + "default-src 'none'", + `img-src ${source} data: blob: http: https:`, + `style-src ${source} 'unsafe-inline' http: https:`, + `script-src ${source} http: https:`, + `font-src ${source} data: http: https:`, + `media-src ${source} blob: http: https:`, + `connect-src ${source} http: https: ws: wss:`, + "object-src 'none'", + "frame-src 'none'", + "child-src 'none'", + "worker-src 'none'", + "manifest-src 'none'", + "base-uri 'none'", + 'form-action http: https:', + `frame-ancestors ${frameAncestor}` + ].join('; ') +} + +function securityHeaders( + contentType?: string, + corsOrigin?: string, + htmlCapability?: { token: string; frameAncestor: string } +): Headers { + const headers = new Headers({ + 'Cache-Control': 'no-store', + 'Content-Security-Policy': htmlCapability + ? researchPreviewHtmlCsp(htmlCapability.token, htmlCapability.frameAncestor) + : RESEARCH_PREVIEW_CSP, + 'Referrer-Policy': 'no-referrer', + 'X-Content-Type-Options': 'nosniff' + }) + if (contentType) headers.set('Content-Type', contentType) + if (corsOrigin) { + headers.set('Access-Control-Allow-Origin', corsOrigin) + headers.set('Access-Control-Expose-Headers', CORS_EXPOSE_HEADERS) + headers.set('Vary', 'Origin') + } + return headers +} + +function errorResponse( + status: number, + message: string, + extra?: Record, + corsOrigin?: string +): Response { + const headers = securityHeaders('text/plain; charset=utf-8', corsOrigin) + for (const [key, value] of Object.entries(extra ?? {})) headers.set(key, value) + return new Response(message, { status, headers }) +} + +function parseRange(value: string, size: number): { start: number; end: number } | null { + const match = /^bytes=(\d*)-(\d*)$/.exec(value) + if (!match || (match[1] === '' && match[2] === '')) return null + if (match[1] === '') { + const suffix = Number(match[2]) + if (!Number.isSafeInteger(suffix) || suffix <= 0 || size <= 0) return null + return { start: Math.max(0, size - suffix), end: size - 1 } + } + const start = Number(match[1]) + if (!Number.isSafeInteger(start) || start < 0 || start >= size) return null + const requestedEnd = match[2] === '' ? size - 1 : Number(match[2]) + if (!Number.isSafeInteger(requestedEnd) || requestedEnd < start) return null + return { start, end: Math.min(requestedEnd, size - 1) } +} + +function encodedPathAttack(rawUrl: string): boolean { + const authorityEnd = rawUrl.indexOf('/', `${RESEARCH_PREVIEW_SCHEME}://`.length) + const rawPath = authorityEnd === -1 ? '' : rawUrl.slice(authorityEnd) + return /%(?:00|2e|2f|5c)/i.test(rawPath) || rawPath.includes('\\') || rawPath.includes('\0') +} + +function requestResource(requestUrl: string): { token: string; relativePath: string } | null { + if (encodedPathAttack(requestUrl)) return null + try { + const parsed = new URL(requestUrl) + if (parsed.protocol !== `${RESEARCH_PREVIEW_SCHEME}:` || parsed.username || parsed.password || + parsed.port || parsed.search || parsed.hash || !opaqueId(parsed.hostname)) return null + const decoded = decodeURIComponent(parsed.pathname) + if (decoded.includes('\0') || decoded.includes('\\')) return null + const segments = decoded.split('/').filter(Boolean) + if (segments.some((segment) => segment === '.' || segment === '..')) return null + return { token: parsed.hostname, relativePath: segments.join(path.sep) } + } catch { + return null + } +} + +function isMissingFileError(error: unknown): boolean { + return typeof error === 'object' && error !== null && + 'code' in error && (error.code === 'ENOENT' || error.code === 'ENOTDIR') +} + +export class ResearchFilePreviewRegistry { + private readonly authorizations = new Map() + private readonly capabilities = new Map() + private readonly fileSystem: ResearchPreviewFileSystem + private readonly randomId: () => string + private readonly now: () => number + private readonly capabilityTtlMs: number + private admissionQueue: Promise = Promise.resolve() + private readonly inFlightAdmissionRevocations = new Set<{ + sessionId: string + nodeId: string + revoked: boolean + }>() + + constructor(private readonly options: ResearchFilePreviewRegistryOptions) { + this.fileSystem = options.fileSystem ?? defaultFileSystem + this.randomId = options.randomId ?? defaultRandomId + this.now = options.now ?? Date.now + this.capabilityTtlMs = options.capabilityTtlMs ?? DEFAULT_CAPABILITY_TTL_MS + for (const record of options.storage.load().slice(0, MAX_AUTHORIZATIONS)) { + if (validRecord(record)) this.authorizations.set(record.authorizationId, record) + } + } + + async admitFinder(value: unknown): Promise { + if (!this.validFinderAdmission(value)) return null + const revocation = this.beginAdmissionRevocation(value.sessionId, value.nodeId) + try { + return await this.admit({ + source: 'finder', + targetPath: value.path, + authorizedRoot: path.dirname(value.path), + sessionId: value.sessionId, + nodeId: value.nodeId + }, revocation) + } finally { + this.inFlightAdmissionRevocations.delete(revocation) + } + } + + async admitSidebar(value: unknown): Promise { + if (!this.validSidebarAdmission(value) || !this.options.workspaceResolver) return null + const revocation = this.beginAdmissionRevocation(value.sessionId, value.nodeId) + try { + const workspacePath = await this.options.workspaceResolver.resolveRoot(value.sessionId) + if (!boundedAbsolutePath(workspacePath)) return null + const nativeRelativePath = value.relativePath.replace(/[\\/]/g, path.sep) + return await this.admit({ + source: 'sidebar', + targetPath: path.resolve(workspacePath, nativeRelativePath), + authorizedRoot: workspacePath, + sessionId: value.sessionId, + nodeId: value.nodeId + }, revocation) + } finally { + this.inFlightAdmissionRevocations.delete(revocation) + } + } + + async restore(value: unknown): Promise { + if (!this.validRestoreRequest(value)) return null + const record = this.authorizations.get(value.authorizationId) + if (!record || record.sessionId !== value.sessionId || record.nodeId !== value.nodeId) return null + const verified = await this.verifyRecord(record) + return verified ? this.issue(record) : null + } + + async resolveExportSource(value: unknown): Promise<{ path: string; name: string } | null> { + if (!this.validRestoreRequest(value) || Object.keys(value).length !== 3) return null + const record = this.authorizations.get(value.authorizationId) + if (!record || record.sessionId !== value.sessionId || record.nodeId !== value.nodeId) return null + if (!await this.verifyRecord(record)) return null + try { + const target = await this.fileSystem.realpath(record.path) + const root = await this.fileSystem.realpath(record.root) + const file = await this.fileSystem.stat(target) + return file.isFile() && isContained(root, target) + ? { path: target, name: record.name } + : null + } catch { + return null + } + } + + releaseCapability(value: unknown): boolean { + if (!this.validReleaseRequest(value)) return false + const capability = this.capabilities.get(value.capabilityToken) + const authorization = this.authorizations.get(value.authorizationId) + if (!capability || !authorization || + capability.authorizationId !== value.authorizationId || + authorization.sessionId !== value.sessionId || authorization.nodeId !== value.nodeId) { + return false + } + this.capabilities.delete(value.capabilityToken) + return true + } + + revokeAuthorization(authorizationId: unknown): boolean { + if (!opaqueId(authorizationId) || !this.authorizations.has(authorizationId)) return false + return this.commitRevocations(new Set([authorizationId])) + } + + revokeNode(sessionId: unknown, nodeId: unknown): boolean { + if (!boundedId(sessionId) || !boundedId(nodeId)) return false + for (const admission of this.inFlightAdmissionRevocations) { + if (admission.sessionId === sessionId && admission.nodeId === nodeId) { + admission.revoked = true + } + } + return this.revokeWhere((record) => record.sessionId === sessionId && record.nodeId === nodeId) + } + + revokeSession(sessionId: unknown): boolean { + if (!boundedId(sessionId)) return false + for (const admission of this.inFlightAdmissionRevocations) { + if (admission.sessionId === sessionId) admission.revoked = true + } + return this.revokeWhere((record) => record.sessionId === sessionId) + } + + async handle(request: Request, allowedOrigin: string | null = null): Promise { + const requestOrigin = request.headers.get('Origin') + + if (request.method !== 'GET' && request.method !== 'HEAD' && request.method !== 'OPTIONS') { + return errorResponse(405, 'Method not allowed.', { Allow: 'GET, HEAD, OPTIONS' }) + } + const resource = requestResource(request.url) + if (!resource) return errorResponse(403, 'Preview capability denied.') + const capability = this.capabilities.get(resource.token) + if (!capability || capability.expiresAt <= this.now()) { + this.capabilities.delete(resource.token) + return errorResponse(403, 'Preview capability denied.') + } + const authorization = this.authorizations.get(capability.authorizationId) + if (!authorization) { + this.capabilities.delete(resource.token) + return errorResponse(403, 'Preview capability denied.') + } + const capabilityOrigin = `${RESEARCH_PREVIEW_SCHEME}://${resource.token}` + if ( + requestOrigin !== null && requestOrigin !== allowedOrigin && + (!authorization.allowSubresources || requestOrigin !== capabilityOrigin) + ) { + return errorResponse(403, 'Preview origin denied.') + } + const corsOrigin = requestOrigin ?? undefined + const fail = (status: number, message: string, extra?: Record) => + errorResponse(status, message, extra, corsOrigin) + + if (request.method === 'OPTIONS') { + if (!corsOrigin || request.headers.get('Access-Control-Request-Method') === null) { + return fail(403, 'Preview preflight denied.') + } + const requestedMethod = request.headers.get('Access-Control-Request-Method')?.toUpperCase() + if (requestedMethod !== 'GET' && requestedMethod !== 'HEAD') { + return fail(403, 'Preview preflight denied.') + } + const requestedHeaders = (request.headers.get('Access-Control-Request-Headers') ?? '') + .split(',') + .map((value) => value.trim().toLowerCase()) + .filter(Boolean) + if (requestedHeaders.some((header) => header !== 'range')) { + return fail(403, 'Preview preflight denied.') + } + const headers = securityHeaders(undefined, corsOrigin) + headers.set('Access-Control-Allow-Headers', 'Range') + headers.set('Access-Control-Allow-Methods', 'GET, HEAD, OPTIONS') + return new Response(null, { status: 204, headers }) + } + + try { + const root = await this.fileSystem.realpath(authorization.root) + const authorizedTarget = await this.fileSystem.realpath(authorization.path) + if (!isContained(root, authorizedTarget)) return fail(403, 'Preview path denied.') + const resourceRoot = authorization.allowSubresources + ? await this.fileSystem.realpath(path.dirname(authorization.path)) + : path.dirname(authorizedTarget) + if (!isContained(root, resourceRoot)) return fail(403, 'Preview path denied.') + + let candidate = authorizedTarget + if (resource.relativePath !== '') { + if (!authorization.allowSubresources) return fail(403, 'Preview path denied.') + candidate = await this.fileSystem.realpath(path.resolve(resourceRoot, resource.relativePath)) + if (!isContained(root, candidate) || !isContained(resourceRoot, candidate)) { + return fail(403, 'Preview path denied.') + } + } + const file = await this.fileSystem.stat(candidate) + if (!file.isFile()) return fail(404, 'Preview file not found.') + const rootPreview = resource.relativePath === '' && !authorization.allowSubresources + const kind = rootPreview ? rootKindForPath(candidate) : kindForPath(candidate) + if (!kind || (!authorization.allowSubresources && kind.contentType !== authorization.contentType)) { + return fail(415, 'Unsupported preview type.') + } + const officeBytes = rootPreview && kind.officeFamily !== undefined + ? await readValidOfficePackage(this.fileSystem, candidate, file.size, kind.officeFamily) + : undefined + if (officeBytes === null || (officeBytes === undefined && + !await validatesPreviewKind(this.fileSystem, candidate, file.size, kind, rootPreview))) { + return fail(415, 'Preview type mismatch.') + } + + const htmlCapability = authorization.allowSubresources && + kind.contentType === 'text/html; charset=utf-8' && allowedOrigin + ? { token: resource.token, frameAncestor: allowedOrigin } + : undefined + const headers = securityHeaders(kind.contentType, corsOrigin, htmlCapability) + headers.set('Accept-Ranges', 'bytes') + const rangeHeader = request.headers.get('range') + const range = rangeHeader === null ? null : parseRange(rangeHeader, file.size) + if (rangeHeader !== null && range === null) { + headers.set('Content-Range', `bytes */${file.size}`) + headers.set('Content-Length', '0') + return new Response(null, { status: 416, headers }) + } + const start = range?.start ?? 0 + const end = range?.end ?? Math.max(0, file.size - 1) + const length = file.size === 0 ? 0 : end - start + 1 + headers.set('Content-Length', String(length)) + if (range) headers.set('Content-Range', `bytes ${start}-${end}/${file.size}`) + const responseBody = request.method === 'HEAD' || length === 0 + ? null + : officeBytes === undefined + ? this.fileSystem.stream(candidate, start, end) as BodyInit + : Buffer.from(officeBytes.subarray(start, end + 1)) + return new Response(responseBody, { status: range ? 206 : 200, headers }) + } catch (error) { + return isMissingFileError(error) + ? fail(404, 'Preview file not found.') + : fail(403, 'Preview path denied.') + } + } + + private async admit(input: { + source: ResearchPreviewSource + targetPath: string + authorizedRoot: string + sessionId: string + nodeId: string + }, revocation: { revoked: boolean }): Promise { + const result = this.admissionQueue.then(() => this.performAdmission(input, revocation)) + this.admissionQueue = result.then(() => undefined, () => undefined) + return result + } + + private async performAdmission(input: { + source: ResearchPreviewSource + targetPath: string + authorizedRoot: string + sessionId: string + nodeId: string + }, revocation: { revoked: boolean }): Promise { + try { + const root = await this.fileSystem.realpath(input.authorizedRoot) + const target = await this.fileSystem.realpath(input.targetPath) + if (!isContained(root, target)) return null + const file = await this.fileSystem.stat(target) + if (!file.isFile()) return null + const kind = rootKindForPath(target) + if (!isRootPreviewKind(kind)) return null + if (!await validatesPreviewKind(this.fileSystem, target, file.size, kind, true)) return null + const replaced = new Set() + for (const [authorizationId, existing] of this.authorizations) { + if (existing.sessionId === input.sessionId && existing.nodeId === input.nodeId) { + replaced.add(authorizationId) + } + } + if (this.authorizations.size - replaced.size >= MAX_AUTHORIZATIONS) return null + const authorizationId = this.nextOpaqueId() + const record: ResearchPreviewAuthorizationRecord = { + authorizationId, + source: input.source, + path: target, + root, + sessionId: input.sessionId, + nodeId: input.nodeId, + contentType: kind.contentType, + name: path.basename(target), + allowSubresources: kind.contentType === 'text/html; charset=utf-8', + createdAt: this.now() + } + const retained = [...this.authorizations.values()].filter( + (value) => !replaced.has(value.authorizationId) + ) + if (revocation.revoked) return null + if (!this.options.storage.save([...retained, record])) return null + for (const previous of replaced) this.authorizations.delete(previous) + this.authorizations.set(authorizationId, record) + this.revokeCapabilities((capability) => replaced.has(capability.authorizationId)) + return this.issue(record) + } catch { + return null + } + } + + private async verifyRecord(record: ResearchPreviewAuthorizationRecord): Promise { + try { + const root = await this.fileSystem.realpath(record.root) + const target = await this.fileSystem.realpath(record.path) + if (!isContained(root, target)) return false + const file = await this.fileSystem.stat(target) + if (!file.isFile()) return false + const kind = rootKindForPath(target) + if (!isRootPreviewKind(kind) || kind.contentType !== record.contentType) return false + return validatesPreviewKind(this.fileSystem, target, file.size, kind, true) + } catch { + return false + } + } + + private issue(record: ResearchPreviewAuthorizationRecord): ResearchFilePreviewDescriptor { + const token = this.nextOpaqueId() + this.capabilities.set(token, { + authorizationId: record.authorizationId, + expiresAt: this.now() + this.capabilityTtlMs + }) + return { + authorizationId: record.authorizationId, + capabilityToken: token, + url: `${RESEARCH_PREVIEW_SCHEME}://${token}/`, + contentType: record.contentType, + name: record.name + } + } + + private nextOpaqueId(): string { + for (let attempt = 0; attempt < 8; attempt += 1) { + const value = this.randomId() + if (opaqueId(value) && !this.authorizations.has(value) && !this.capabilities.has(value)) { + return value + } + } + throw new Error('Unable to issue a unique Research preview identity.') + } + + private persist(): boolean { + return this.options.storage.save([...this.authorizations.values()]) + } + + private revokeWhere(predicate: (record: ResearchPreviewAuthorizationRecord) => boolean): boolean { + const removed = new Set() + for (const [authorizationId, record] of this.authorizations) { + if (!predicate(record)) continue + removed.add(authorizationId) + } + if (removed.size === 0) return true + return this.commitRevocations(removed) + } + + private beginAdmissionRevocation(sessionId: string, nodeId: string): { + sessionId: string + nodeId: string + revoked: boolean + } { + const revocation = { sessionId, nodeId, revoked: false } + this.inFlightAdmissionRevocations.add(revocation) + return revocation + } + + private commitRevocations(removed: ReadonlySet): boolean { + const retained = [...this.authorizations.values()].filter( + (record) => !removed.has(record.authorizationId) + ) + if (!this.options.storage.save(retained)) return false + for (const authorizationId of removed) this.authorizations.delete(authorizationId) + this.revokeCapabilities((capability) => removed.has(capability.authorizationId)) + return true + } + + private revokeCapabilities(predicate: (capability: Capability) => boolean): void { + for (const [token, capability] of this.capabilities) { + if (predicate(capability)) this.capabilities.delete(token) + } + } + + private validFinderAdmission(value: unknown): value is FinderAdmission { + if (typeof value !== 'object' || value === null || Array.isArray(value)) return false + const input = value as Partial + return boundedAbsolutePath(input.path) && boundedId(input.sessionId) && boundedId(input.nodeId) + } + + private validReleaseRequest(value: unknown): value is ReleaseCapabilityRequest { + if (typeof value !== 'object' || value === null || Array.isArray(value)) return false + const input = value as Partial + return opaqueId(input.authorizationId) && opaqueId(input.capabilityToken) && + boundedId(input.sessionId) && boundedId(input.nodeId) + } + + private validSidebarAdmission(value: unknown): value is SidebarAdmission { + if (typeof value !== 'object' || value === null || Array.isArray(value)) return false + const input = value as Partial + return validRelativePath(input.relativePath) && boundedId(input.sessionId) && boundedId(input.nodeId) + } + + private validRestoreRequest(value: unknown): value is RestoreRequest { + if (typeof value !== 'object' || value === null || Array.isArray(value)) return false + const input = value as Partial + return opaqueId(input.authorizationId) && boundedId(input.sessionId) && boundedId(input.nodeId) + } +} + +type ResearchPreviewProtocolWindow = { + isDestroyed(): boolean + webContents: { + getURL(): string + } +} + +export function researchPreviewOriginForWindow( + window: ResearchPreviewProtocolWindow | undefined +): string | null { + if (!window || window.isDestroyed()) return null + try { + const currentUrl = window.webContents.getURL() + const parsed = new URL(currentUrl) + if (parsed.protocol !== 'http:' || parsed.username || parsed.password || + !isTrustedAppUrl(currentUrl)) return null + return parsed.origin + } catch { + return null + } +} + +export function handleResearchFilePreviewProtocolRequest( + registry: ResearchFilePreviewRegistry, + getMainWindow: () => ResearchPreviewProtocolWindow | undefined, + request: Request +): Promise { + const allowedOrigin = researchPreviewOriginForWindow(getMainWindow()) + if (!allowedOrigin) { + return Promise.resolve(errorResponse(403, 'Preview window denied.')) + } + return registry.handle(request, allowedOrigin) +} + +type ResearchPreviewIpcMain = { + removeHandler(channel: string): void + handle(channel: string, handler: (event: any, value: unknown) => unknown): unknown +} + +export function registerResearchFilePreviewHandlers(options: { + ipcMain: ResearchPreviewIpcMain + getMainWindow(): TrustedWindow | undefined + registry: ResearchFilePreviewRegistry +}): void { + const handlers: Array<[ + string, + (value: unknown) => unknown + ]> = [ + ['research:preview:admit-finder', (value) => options.registry.admitFinder(value)], + ['research:preview:admit-sidebar', (value) => options.registry.admitSidebar(value)], + ['research:preview:restore', (value) => options.registry.restore(value)], + ['research:preview:release', (value) => ({ ok: options.registry.releaseCapability(value) })], + ['research:preview:revoke-node', (value) => { + const input = value as { sessionId?: unknown; nodeId?: unknown } | null + return { ok: options.registry.revokeNode(input?.sessionId, input?.nodeId) } + }], + ['research:preview:revoke-session', (value) => { + const input = value as { sessionId?: unknown } | null + return { ok: options.registry.revokeSession(input?.sessionId) } + }] + ] + + for (const [channel, handler] of handlers) { + options.ipcMain.removeHandler(channel) + registerTrustedMainWindowHandler( + options.ipcMain, + channel, + options.getMainWindow, + (_event, value: unknown) => handler(value) + ) + } +} diff --git a/src/main/state/research-link-frame.ts b/src/main/state/research-link-frame.ts new file mode 100644 index 000000000..798a2bc3d --- /dev/null +++ b/src/main/state/research-link-frame.ts @@ -0,0 +1,241 @@ +import { randomBytes } from 'node:crypto' +import type { WebFrameMain } from 'electron' +import { registerTrustedMainWindowHandler, type TrustedWindow } from '../ipc-trust' + +const MAX_ID_LENGTH = 256 +const MAX_URL_LENGTH = 8_192 + +type ResearchLinkIdentity = { + sessionId: string + nodeId: string +} + +export type ResearchLinkAuthorization = ResearchLinkIdentity & { + url: string + frameName: string +} + +export type ResearchLinkFrameInspection = { + url: string + title: string + scrollWidth: number + clientWidth: number +} + +type ResearchLinkFrameIpcMain = { + removeHandler(channel: string): void + handle(channel: string, handler: (event: any, value: unknown) => unknown): unknown +} + +function boundedId(value: unknown): string | null { + return typeof value === 'string' && value.length > 0 && value.length <= MAX_ID_LENGTH + ? value + : null +} + +function exactRecord(value: unknown, keys: readonly string[]): Record | null { + if (typeof value !== 'object' || value === null || Array.isArray(value)) return null + const record = value as Record + const actual = Object.keys(record) + return actual.length === keys.length && actual.every((key) => keys.includes(key)) + ? record + : null +} + +function researchLinkIdentity(value: unknown): ResearchLinkIdentity { + const record = exactRecord(value, ['sessionId', 'nodeId']) + const sessionId = boundedId(record?.sessionId) + const nodeId = boundedId(record?.nodeId) + if (sessionId === null || nodeId === null) { + throw new TypeError('Research link frame identity is invalid.') + } + return { sessionId, nodeId } +} + +function researchLinkAuthorization( + value: unknown, + frameName: string +): ResearchLinkAuthorization { + const record = exactRecord(value, ['sessionId', 'nodeId', 'url']) + const sessionId = boundedId(record?.sessionId) + const nodeId = boundedId(record?.nodeId) + const url = normalizeResearchLinkUrl(record?.url) + if (sessionId === null || nodeId === null) { + throw new TypeError('Research link frame identity is invalid.') + } + if (url === null) throw new TypeError('Research link URL is invalid.') + return { sessionId, nodeId, url, frameName } +} + +const RESEARCH_LINK_INSPECTION_SCRIPT = `(() => ({ + title: document.title, + scrollWidth: Math.max(document.documentElement?.scrollWidth ?? 0, document.body?.scrollWidth ?? 0), + clientWidth: Math.max(document.documentElement?.clientWidth ?? 0, window.innerWidth ?? 0) +}))()` + +function boundedInspectionMetric(value: unknown): number | null { + return typeof value === 'number' && Number.isFinite(value) && value >= 0 && value <= 100_000 + ? Math.round(value) + : null +} + +function inspectionTitle(value: unknown): string { + return typeof value === 'string' + ? value.replace(/[\u0000-\u001f\u007f]+/g, ' ').replace(/\s+/g, ' ').trim().slice(0, 512) + : '' +} + +export function normalizeResearchLinkUrl(value: unknown): string | null { + if (typeof value !== 'string') return null + const source = value.trim().replace( + /^(https?:\/\/)(?:(?:%0[9a-d])|%20|[\u0009-\u000d\u0020])+/i, + '$1' + ) + if (source.length === 0 || source.length > MAX_URL_LENGTH) return null + try { + const parsed = new URL(source) + if ( + (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') || + parsed.username.length > 0 || + parsed.password.length > 0 + ) { + return null + } + parsed.hostname = parsed.hostname.toLowerCase() + if ( + (parsed.protocol === 'https:' && parsed.port === '443') || + (parsed.protocol === 'http:' && parsed.port === '80') + ) { + parsed.port = '' + } + return parsed.href + } catch { + return null + } +} + +export class ResearchLinkFrameRegistry { + private readonly nodes = new Map() + + constructor( + private readonly randomId: () => string = () => randomBytes(16).toString('hex') + ) {} + + private key(value: ResearchLinkIdentity): string { + return `${value.sessionId}\u0000${value.nodeId}` + } + + authorize(value: unknown): { url: string; frameName: string } { + const token = this.randomId() + if (!/^[a-f0-9]{32}$/i.test(token)) throw new TypeError('Research link frame token is invalid.') + const authorization = researchLinkAuthorization( + value, + `sherlock-research-link-${token.toLowerCase()}` + ) + this.nodes.set(this.key(authorization), authorization) + return { url: authorization.url, frameName: authorization.frameName } + } + + resolve(value: unknown): ResearchLinkAuthorization | null { + const identity = researchLinkIdentity(value) + return this.nodes.get(this.key(identity)) ?? null + } + + async inspect( + value: unknown, + frames: readonly WebFrameMain[] + ): Promise { + const authorization = this.resolve(value) + if (authorization === null) return null + const authorizedOrigin = new URL(authorization.url).origin + const frame = frames.find((candidate) => { + if (candidate.name !== authorization.frameName || candidate.isDestroyed()) return false + const currentUrl = normalizeResearchLinkUrl(candidate.url) + return currentUrl !== null && new URL(currentUrl).origin === authorizedOrigin + }) + if (frame === undefined) return null + const url = normalizeResearchLinkUrl(frame.url) + if (url === null) return null + try { + const result = await frame.executeJavaScript(RESEARCH_LINK_INSPECTION_SCRIPT) + if (typeof result !== 'object' || result === null || Array.isArray(result)) return null + const record = result as Record + const scrollWidth = boundedInspectionMetric(record.scrollWidth) + const clientWidth = boundedInspectionMetric(record.clientWidth) + if (scrollWidth === null || clientWidth === null) return null + return { + url, + title: inspectionTitle(record.title), + scrollWidth, + clientWidth + } + } catch { + return null + } + } + + release(value: unknown): boolean { + const identity = researchLinkIdentity(value) + return this.nodes.delete(this.key(identity)) + } + + releaseSession(value: unknown): number { + const record = exactRecord(value, ['sessionId']) + const sessionId = boundedId(record?.sessionId ?? value) + if (sessionId === null) throw new TypeError('Research session id is invalid.') + let removed = 0 + for (const [key, authorization] of this.nodes) { + if (authorization.sessionId === sessionId && this.nodes.delete(key)) removed += 1 + } + return removed + } + + allows(value: unknown): boolean { + const url = normalizeResearchLinkUrl(value) + if (url === null) return false + const origin = new URL(url).origin + return [...this.nodes.values()].some((authorization) => ( + authorization.url === url || new URL(authorization.url).origin === origin + )) + } + + clear(): number { + const removed = this.nodes.size + this.nodes.clear() + return removed + } +} + +export function registerResearchLinkFrameHandlers(options: { + ipcMain: ResearchLinkFrameIpcMain + getMainWindow(): TrustedWindow | undefined + registry: ResearchLinkFrameRegistry +}): void { + const handlers: Array<[string, (value: unknown) => unknown]> = [ + ['research:link-frame:authorize', (value) => options.registry.authorize(value)], + ['research:link-frame:inspect', (value) => { + const window = options.getMainWindow() as (TrustedWindow & { + webContents: { + mainFrame: TrustedWindow['webContents']['mainFrame'] & { + framesInSubtree?: WebFrameMain[] + } + } + }) | undefined + return options.registry.inspect(value, window?.webContents.mainFrame.framesInSubtree ?? []) + }], + ['research:link-frame:release', (value) => ({ ok: options.registry.release(value) })], + ['research:link-frame:release-session', (value) => ({ + ok: true, + removed: options.registry.releaseSession(value) + })] + ] + for (const [channel, handler] of handlers) { + options.ipcMain.removeHandler(channel) + registerTrustedMainWindowHandler( + options.ipcMain, + channel, + options.getMainWindow, + (_event, value: unknown) => handler(value) + ) + } +} diff --git a/src/main/state/research-web-reader.ts b/src/main/state/research-web-reader.ts new file mode 100644 index 000000000..d95b4cb6b --- /dev/null +++ b/src/main/state/research-web-reader.ts @@ -0,0 +1,289 @@ +import { load } from 'cheerio' +import sanitizeHtml from 'sanitize-html' +import { registerTrustedMainWindowHandler, type TrustedWindow } from '../ipc-trust' +import { normalizeResearchLinkUrl, type ResearchLinkFrameRegistry } from './research-link-frame' + +const MAX_RESPONSE_BYTES = 6 * 1024 * 1024 +const MAX_BODY_BYTES = 4 * 1024 * 1024 +const MAX_REDIRECTS = 3 +const READER_TIMEOUT_MS = 12_000 +const MAX_TITLE_LENGTH = 160 +const MAX_DESCRIPTION_LENGTH = 500 +const MAX_AUTHOR_LENGTH = 120 +const MAX_PUBLISH_TIME_LENGTH = 80 + +export type ResearchWebReaderResult = + | { + status: 'ready' + url: string + title: string + description?: string + author?: string + publishTime?: string + bodyHtml: string + } + | { + status: 'unavailable' + reason: 'unsupported' | 'network' | 'response' | 'content' | 'too-large' | 'timeout' + } + +export type ResearchWebReaderDependencies = { + fetch(input: string, init: RequestInit): Promise + createTimeoutSignal(milliseconds: number): AbortSignal +} + +type ResearchWebReaderInput = { + url: string +} + +type ResearchWebReaderRequest = ResearchWebReaderInput & { + sessionId: string + nodeId: string +} + +const defaultDependencies: ResearchWebReaderDependencies = { + fetch: (input, init) => globalThis.fetch(input, init), + createTimeoutSignal: (milliseconds) => AbortSignal.timeout(milliseconds) +} + +function boundedText(value: unknown, limit: number): string | undefined { + if (typeof value !== 'string') return undefined + const normalized = value.replace(/[\u0000-\u001f\u007f]+/g, ' ').replace(/\s+/g, ' ').trim() + return normalized.length === 0 ? undefined : normalized.slice(0, limit) +} + +export function isResearchWechatArticleUrl(rawUrl: string): boolean { + const normalized = normalizeResearchLinkUrl(rawUrl) + if (normalized === null) return false + const url = new URL(normalized) + return url.protocol === 'https:' && url.hostname === 'mp.weixin.qq.com' && + (url.pathname === '/s' || url.pathname.startsWith('/s/')) +} + +function contentLengthTooLarge(response: Response): boolean { + const raw = response.headers.get('content-length') + if (raw === null) return false + const length = Number(raw) + return Number.isFinite(length) && length > MAX_RESPONSE_BYTES +} + +async function boundedResponseText(response: Response): Promise { + if (contentLengthTooLarge(response)) return null + if (response.body === null) return '' + const reader = response.body.getReader() + const chunks: Uint8Array[] = [] + let bytes = 0 + try { + while (true) { + let chunk: ReadableStreamReadResult + try { + chunk = await reader.read() + } catch (error) { + // Some WeChat article responses close the long trailing script payload early + // after the complete article markup has already arrived. Preserve those bytes; + // the strict article parser below still rejects incomplete or malformed content. + if (bytes === 0) throw error + break + } + if (chunk.done) break + bytes += chunk.value.byteLength + if (bytes > MAX_RESPONSE_BYTES) { + await reader.cancel() + return null + } + chunks.push(chunk.value) + } + } finally { + reader.releaseLock() + } + const body = new Uint8Array(bytes) + let offset = 0 + for (const chunk of chunks) { + body.set(chunk, offset) + offset += chunk.byteLength + } + return new TextDecoder('utf-8', { fatal: false }).decode(body) +} + +function sanitizedArticleBody(html: string): { + title?: string + description?: string + author?: string + publishTime?: string + bodyHtml?: string + tooLarge: boolean +} { + const $ = load(html) + const article = $('#js_content').first() + if (article.length === 0) return { tooLarge: false } + + article.find('img').each((_index, element) => { + const image = $(element) + const deferredSource = image.attr('data-src') + if (deferredSource !== undefined) image.attr('src', deferredSource) + image.removeAttr('data-src') + }) + article.find('script,style,iframe,frame,object,embed,form,input,button,textarea,select,option,video,audio,canvas,template,noscript').remove() + + const fragment = article.html() ?? '' + const bodyHtml = sanitizeHtml(fragment, { + allowedTags: [ + 'p', 'br', 'strong', 'b', 'em', 'i', 'u', 's', 'blockquote', 'pre', 'code', + 'ul', 'ol', 'li', 'h1', 'h2', 'h3', 'h4', 'table', 'thead', 'tbody', 'tr', + 'th', 'td', 'a', 'img', 'hr', 'div', 'span' + ], + allowedAttributes: { + a: ['href', 'title'], + img: ['src', 'alt', 'width', 'height'] + }, + allowedSchemes: ['http', 'https'], + allowedSchemesByTag: { img: ['https'] }, + allowProtocolRelative: false, + disallowedTagsMode: 'discard' + }).trim() + + const bodyBytes = new TextEncoder().encode(bodyHtml).byteLength + return { + title: boundedText($('meta[property="og:title"]').attr('content'), MAX_TITLE_LENGTH), + description: boundedText( + $('meta[property="og:description"]').attr('content') ?? + $('meta[name="description"]').attr('content'), + MAX_DESCRIPTION_LENGTH + ), + author: boundedText($('#js_name').first().text(), MAX_AUTHOR_LENGTH), + publishTime: boundedText($('#publish_time').first().text(), MAX_PUBLISH_TIME_LENGTH), + bodyHtml, + tooLarge: bodyBytes > MAX_BODY_BYTES + } +} + +export async function readResearchWechatArticle( + input: ResearchWebReaderInput, + dependencies: ResearchWebReaderDependencies = defaultDependencies +): Promise { + const normalized = normalizeResearchLinkUrl(input?.url) + if (normalized === null || !isResearchWechatArticleUrl(normalized)) { + return { status: 'unavailable', reason: 'unsupported' } + } + + const signal = dependencies.createTimeoutSignal(READER_TIMEOUT_MS) + let currentUrl = normalized + try { + for (let redirect = 0; redirect <= MAX_REDIRECTS; redirect += 1) { + const response = await dependencies.fetch(currentUrl, { + method: 'GET', + redirect: 'manual', + credentials: 'omit', + referrerPolicy: 'no-referrer', + signal, + headers: { + Accept: 'text/html,application/xhtml+xml;q=0.9', + 'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 Chrome/128.0.0.0 Safari/537.36' + } + }) + + if (response.status >= 300 && response.status < 400) { + const location = response.headers.get('location') + if (location === null || redirect === MAX_REDIRECTS) { + return { status: 'unavailable', reason: 'response' } + } + const redirected = normalizeResearchLinkUrl(new URL(location, currentUrl).href) + if (redirected === null || !isResearchWechatArticleUrl(redirected)) { + return { status: 'unavailable', reason: 'response' } + } + currentUrl = redirected + continue + } + + if (!response.ok || !/^text\/html(?:\s*;|$)/i.test(response.headers.get('content-type') ?? '')) { + return { status: 'unavailable', reason: 'response' } + } + if (contentLengthTooLarge(response)) { + return { status: 'unavailable', reason: 'too-large' } + } + const html = await boundedResponseText(response) + if (html === null) return { status: 'unavailable', reason: 'too-large' } + const article = sanitizedArticleBody(html) + if (article.tooLarge) return { status: 'unavailable', reason: 'too-large' } + if (article.title === undefined || article.bodyHtml === undefined || article.bodyHtml === '') { + return { status: 'unavailable', reason: 'content' } + } + return { + status: 'ready', + url: currentUrl, + title: article.title, + ...(article.description === undefined ? {} : { description: article.description }), + ...(article.author === undefined ? {} : { author: article.author }), + ...(article.publishTime === undefined ? {} : { publishTime: article.publishTime }), + bodyHtml: article.bodyHtml + } + } + } catch { + return { + status: 'unavailable', + reason: signal.aborted ? 'timeout' : 'network' + } + } + return { status: 'unavailable', reason: 'response' } +} + +type ResearchWebReaderIpcMain = { + removeHandler(channel: string): void + handle(channel: string, handler: (event: any, value: unknown) => unknown): unknown +} + +function exactReaderRequest(value: unknown): ResearchWebReaderRequest | null { + if (typeof value !== 'object' || value === null || Array.isArray(value)) return null + const record = value as Record + const keys = Object.keys(record) + if (keys.length !== 3 || !['sessionId', 'nodeId', 'url'].every((key) => keys.includes(key))) { + return null + } + if ( + typeof record.sessionId !== 'string' || record.sessionId.length === 0 || record.sessionId.length > 256 || + typeof record.nodeId !== 'string' || record.nodeId.length === 0 || record.nodeId.length > 256 || + typeof record.url !== 'string' + ) { + return null + } + const url = normalizeResearchLinkUrl(record.url) + return url === null ? null : { + sessionId: record.sessionId, + nodeId: record.nodeId, + url + } +} + +export function registerResearchWebReaderHandlers(options: { + ipcMain: ResearchWebReaderIpcMain + getMainWindow(): TrustedWindow | undefined + registry: ResearchLinkFrameRegistry + readArticle?(input: ResearchWebReaderInput): Promise + dependencies?: ResearchWebReaderDependencies +}): void { + options.ipcMain.removeHandler('research:web-reader:read') + registerTrustedMainWindowHandler( + options.ipcMain, + 'research:web-reader:read', + options.getMainWindow, + async (_event, value: unknown) => { + const request = exactReaderRequest(value) + if (request === null) return { status: 'unavailable', reason: 'unsupported' } + let authorization + try { + authorization = options.registry.resolve({ + sessionId: request.sessionId, + nodeId: request.nodeId + }) + } catch { + return { status: 'unavailable', reason: 'unsupported' } + } + if (authorization === null || authorization.url !== request.url) { + return { status: 'unavailable', reason: 'unsupported' } + } + const readArticle = options.readArticle ?? ((input: ResearchWebReaderInput) => + readResearchWechatArticle(input, options.dependencies)) + return readArticle({ url: request.url }) + } + ) +} diff --git a/src/main/update/update-manager.ts b/src/main/update/update-manager.ts index cb5a5c054..5a2ae8bb9 100644 --- a/src/main/update/update-manager.ts +++ b/src/main/update/update-manager.ts @@ -13,6 +13,10 @@ import { reduceUpdateStatus, type UpdateStateEvent } from './update-state' +import { + assertTrustedMainWindowEvent, + type TrustedWindow +} from '../ipc-trust' const { autoUpdater } = electronUpdater const TRANSIENT_STATUS_MS = 8_000 @@ -32,11 +36,25 @@ export function getUpdateStatus(): UpdateStatus { return { ...status } } -export function registerUpdateHandlers(): void { +export function registerUpdateHandlers(getMainWindow: () => TrustedWindow | undefined): void { if (handlersRegistered) return handlersRegistered = true - ipcMain.handle('updates:status', () => getUpdateStatus()) - ipcMain.handle('updates:install', () => installDownloadedUpdate()) + ipcMain.handle('updates:status', (event) => { + assertTrustedMainWindowEvent(event, getMainWindow()) + return getUpdateStatus() + }) + ipcMain.handle('updates:check', (event) => { + assertTrustedMainWindowEvent(event, getMainWindow()) + return checkForUpdates(true) + }) + ipcMain.handle('updates:download', (event) => { + assertTrustedMainWindowEvent(event, getMainWindow()) + return downloadAvailableUpdate() + }) + ipcMain.handle('updates:install', (event) => { + assertTrustedMainWindowEvent(event, getMainWindow()) + return installDownloadedUpdate() + }) } export function startUpdateManager(options: { prepareToInstall: () => Promise }): void { @@ -108,6 +126,18 @@ export async function installDownloadedUpdate(): Promise { } } +export async function downloadAvailableUpdate(): Promise { + if (status.phase !== 'available') return getUpdateStatus() + + try { + await autoUpdater.downloadUpdate() + } catch (error) { + transition({ type: 'error', message: errorMessage(error) }, true) + } + + return getUpdateStatus() +} + export function stopUpdateManager(): void { if (startupTimer) clearTimeout(startupTimer) if (intervalTimer) clearInterval(intervalTimer) @@ -119,7 +149,7 @@ export function stopUpdateManager(): void { } function configureUpdater(): void { - autoUpdater.autoDownload = true + autoUpdater.autoDownload = false autoUpdater.autoInstallOnAppQuit = true autoUpdater.allowPrerelease = false autoUpdater.logger = { @@ -142,9 +172,10 @@ function configureUpdater(): void { transition({ type: 'not-available' }) scheduleReset() }) - autoUpdater.on('update-downloaded', (info) => + autoUpdater.on('update-downloaded', (info) => { transition({ type: 'downloaded', version: info.version }) - ) + void installDownloadedUpdate() + }) autoUpdater.on('error', (error) => { transition({ type: 'error', message: errorMessage(error) }) if (status.manual) scheduleReset() diff --git a/src/preload/about-info.ts b/src/preload/about-info.ts new file mode 100644 index 000000000..02c426788 --- /dev/null +++ b/src/preload/about-info.ts @@ -0,0 +1,223 @@ +export type SherlockAboutLocale = 'zh' | 'en' + +export type SherlockReleaseNote = { + version: string + date: string + items: string[] +} + +export type SherlockAboutInfo = { + productName: 'Sherlock' + version: string + releaseNotes: SherlockReleaseNote[] +} + +type UpdateVersionReader = () => Promise<{ currentVersion: string }> +type ManualUpdateChecker = () => Promise + +const releaseNotes: Record = { + zh: [ + { + version: '0.7.6', + date: '2026-09-02', + items: [ + '研究组件新增“思维导图”和“总结提炼”工具：可在所选内容旁生成新组件，思维导图提供简要、常规和详细三种模式', + '画布生成任务改为在目标组件内独立展示进度与失败重试，支持最多四路并发，并与右侧对话互不占用', + '统一思维导图为适合直接粘贴到 PPT 的横向白底样式，优化节点宽度、换行、对齐、连线和画布比例；支持双击编辑节点', + '总结提炼组件支持双击编辑；消息和输入框中的研究标签采用紧凑布局、补全类型图标，并可点击定位到对应画布组件', + '修复侧栏收起时点击搜索无法显示输入框的问题，展开后会直接聚焦搜索框', + '画布空白处右键新增“整理画布”，按内容尺寸混合平铺组件；“全选”会选择画布中的全部组件', + '画布底部新增“链接”和“容器”：链接组件可自动读取网页标题、自适应显示页面，并为微信文章提供安全阅读视图；智能容器可生成 KPI、图表、表格或文字内容', + '所有研究组件新增下载入口，思维导图支持 SVG、PNG 和 JPG；同时优化底栏间距和画布缩放下限', + '修复从 PowerPoint 组件生成思维导图失败、网页与微信链接读取竞态及智能容器生成失败等问题' + ] + }, + { + version: '0.7.5', + date: '2026-08-31', + items: [ + '侧栏新增并排的“新对话”和“新研究”入口，“新研究”可直接创建并进入研究模式', + '优化研究组件引用标签：选择组件后先以半透明状态提示，取消选择会自动移除，点击输入区后则固定保留', + '进一步放宽研究画布的缩小范围，并在视口偏离内容时提供快速回到内容的入口', + '新增简洁的 Sherlock 启动动画，改善客户端启动时的视觉衔接', + '修复“新研究”首屏画布、顶栏和右侧对话区布局异常，并使用专用研究图标', + '修复研究画布中 PDF 已加载但页面显示为空白的问题', + '完善空白研究右侧引导，在首条消息发送前显示品牌标题；工作区和模式选择固定显示在输入框上方，并确保新对话不再丢失模式入口', + '修复空白研究会话复用时点击“新对话”无响应的问题，可直接切回新对话页面', + '优化加入画布的助手回复组件尺寸，减少瘦长排版并保留自适应与手动缩放' + ] + }, + { + version: '0.7.4', + date: '2026-08-31', + items: [ + '统一 Sherlock Agent 品牌表述，并修正部分会话中用户消息与助手回复的显示顺序', + '修复退出客户端时访问已销毁窗口导致的 JavaScript 报错', + '完善研究画布引用交互：点击文件、PPT 或助手回复组件即可选中并作为输入标签引用，PPT 组件不再显示下载按钮', + '优化研究输入标签：支持在标签之间准确放置光标，清晰显示输入位置，并消除选中时的抖动和位移', + '输入框可随内容行数自适应增高，画布中的助手回复内容支持直接编辑', + '对话和研究模式统一使用文件标签：按类型显示图标，悬停可查看包含后缀的完整文件名，并在发送时保留完整路径', + '完整汉化权限菜单，并优化研究组件、侧栏和输入框的交互细节' + ] + }, + { + version: '0.7.3', + date: '2026-08-28', + items: [ + '新增完整研究模式：中央画布与右侧固定对话协同工作，支持文件拖入、框选、多选、移动和删除', + '文件标签可与输入文字混合编辑，支持拖动排序、选中、键盘删除并随消息发送', + '升级画布可视化组件：支持图片、PDF 连续滚动、HTML 交互以及 Word、Excel、PPT、Markdown 和代码预览', + '支持调整画布组件尺寸与名称，并同步更新输入框中的附件标签', + '优化对话、研究与轨迹页的输入框、滚动、菜单层级、加载状态和响应式布局', + '修复旧对话模型选择丢失，并移除 Memory Evolve 与 Hindsight 记忆插件及其工具调用' + ] + }, + { + version: '0.7.2', + date: '2026-08-26', + items: [ + '新增关于页手动检查更新，并在下载完成后自动退出终端、安装和重启', + '优化侧栏更新按钮的悬停提示与圆环下载进度', + '汉化权限菜单，并支持为模型标记视觉输入能力' + ] + }, + { + version: '0.7.1', + date: '2026-08-26', + items: [ + '新增跨模型联网搜索，在模型原生搜索不可用时自动回退到本地浏览器搜索', + '内置 PPT Skill 升级至 1.0.6，并自动备份替换过期官方副本', + '新增正式构建 Git 门禁，防止遗漏其他会话的已提交改动' + ] + }, + { + version: '0.7.0', + date: '2026-08-25', + items: [ + '新增研究画布，与对话和轨迹并列切换', + '新增关于页面，可查看当前版本和更新日志', + '正式安装包内置 Memory、附件上传与工作区插件', + '内部记忆、技能与待办页面仅在开发者模式显示' + ] + } + ], + en: [ + { + version: '0.7.6', + date: '2026-09-02', + items: [ + 'Added Mind Map and Summary tools for Research components, creating new components beside the selected source with concise, standard, and detailed mind-map modes', + 'Canvas generation jobs now show progress and retry states inside their target components, support up to four concurrent jobs, and no longer occupy the right-side conversation', + 'Standardized mind maps as landscape, white-background layouts ready for PowerPoint, with improved node widths, wrapping, alignment, connectors, aspect ratio, and double-click text editing', + 'Added double-click editing for summaries, compact Research tags with complete type icons in messages and the composer, and click-to-locate navigation back to canvas components', + 'Fixed the collapsed-sidebar Search action so it expands the sidebar, shows the search field, and focuses it immediately', + 'Added Arrange Canvas to the empty-canvas context menu with content-aware mixed tiling, while Select All now selects every canvas component', + 'Added Link and Container tools to the canvas toolbar: Link components resolve real page titles, resize web content responsively, and use a safe reader for WeChat articles, while smart containers can generate KPI panels, charts, tables, or text', + 'Added downloads to every Research component, including SVG, PNG, and JPG for mind maps, and refined the bottom toolbar spacing and canvas zoom floor', + 'Fixed mind-map generation from PowerPoint components, web and WeChat reader races, and failed smart-container generation' + ] + }, + { + version: '0.7.5', + date: '2026-08-31', + items: [ + 'Added separate New Chat and New Research sidebar actions, with New Research opening directly in Research mode', + 'Refined Research reference tags with a provisional translucent state, automatic removal on deselection, and persistent tags after focusing the composer', + 'Expanded the Research canvas zoom-out range and added a quick way to return to content when the viewport drifts away', + 'Added a restrained Sherlock launch animation for a smoother transition into the client', + 'Fixed the New Research first-screen canvas, header, and right-side conversation layout, and added a dedicated Research icon', + 'Fixed blank PDF pages in the Research canvas after successful document loading', + 'Improved blank Research guidance with the Sherlock headline, kept workspace and mode controls above the composer, and prevented the mode control from disappearing in New Chat', + 'Fixed New Chat doing nothing when reusing a blank Research session, so it now switches directly to the New Chat screen', + 'Widened assistant reply components added to the Research canvas while preserving adaptive sizing and manual resize controls' + ] + }, + { + version: '0.7.4', + date: '2026-08-31', + items: [ + 'Standardized Sherlock Agent branding and fixed the display order of user messages and assistant replies in affected conversations', + 'Fixed a JavaScript error caused by accessing a destroyed window while quitting the client', + 'Improved Research canvas references: click a file, PowerPoint, or assistant reply component to select and cite it as an input tag, while PowerPoint components no longer show a download button', + 'Improved Research input tags with precise caret placement between tags, a clearly visible insertion point, and stable selection without jitter or displacement', + 'Made the composer grow with its content and added direct editing for assistant reply components on the canvas', + 'Unified file tags across Chat and Research with file-type icons, delayed full-name tooltips including extensions, and preserved full paths on send', + 'Completed permission-menu localization and refined Research components, the sidebar, and composer interactions' + ] + }, + { + version: '0.7.3', + date: '2026-08-28', + items: [ + 'Added a complete Research mode with a central canvas, fixed right-side conversation, file drops, marquee selection, multi-select, movement, and deletion', + 'File tags now mix naturally with typed text and support drag reordering, selection, keyboard deletion, and message attachments', + 'Expanded visual canvas components with images, continuous PDF scrolling, interactive HTML, and Word, Excel, PowerPoint, Markdown, and code previews', + 'Added resizable and renameable canvas components with synchronized attachment tag names', + 'Improved composer layout, scrolling, menu layering, loading states, and responsive behavior across Chat, Research, and Trajectory', + 'Fixed missing model selections in existing conversations and removed Memory Evolve, Hindsight, and their memory tool calls' + ] + }, + { + version: '0.7.2', + date: '2026-08-26', + items: [ + 'Added manual update checks in About, with automatic terminal shutdown, installation, and restart after download', + 'Improved the sidebar update control with a hover label and circular download progress', + 'Localized permission modes and added per-model Vision capability settings' + ] + }, + { + version: '0.7.1', + date: '2026-08-26', + items: [ + 'Added cross-model web search with automatic local-browser fallback when native search is unavailable', + 'Updated the bundled PPT Skill to 1.0.6 and added automatic backup and replacement of stale official copies', + 'Added formal-build Git gates to prevent committed work from other sessions being omitted' + ] + }, + { + version: '0.7.0', + date: '2026-08-25', + items: [ + 'Added a Research canvas alongside Chat and Trajectory', + 'Added an About page for the current version and release notes', + 'Bundled Memory, file upload, and workspace plugins in the formal installer', + 'Limited internal Memory, Skills, and Todos pages to developer mode' + ] + } + ] +} + +export function buildSherlockAboutInfo( + version: string, + locale: SherlockAboutLocale +): SherlockAboutInfo { + return { + productName: 'Sherlock', + version, + releaseNotes: releaseNotes[locale].map((note) => ({ + ...note, + items: [...note.items] + })) + } +} + +export function createSherlockAboutBridge( + readUpdateStatus: UpdateVersionReader, + checkForUpdates: ManualUpdateChecker, + locale: SherlockAboutLocale +): { + getInfo(): Promise + checkForUpdates(): Promise +} { + return Object.freeze({ + async getInfo(): Promise { + const status = await readUpdateStatus() + return buildSherlockAboutInfo(status.currentVersion, locale) + }, + checkForUpdates(): Promise { + return checkForUpdates() + } + }) +} +import type { UpdateStatus } from '../shared/contracts' diff --git a/src/preload/developer-mode.ts b/src/preload/developer-mode.ts new file mode 100644 index 000000000..b06da7c69 --- /dev/null +++ b/src/preload/developer-mode.ts @@ -0,0 +1,166 @@ +export const DEVELOPER_MODE_STORAGE_KEY = 'sherlock.developerMode' + +const MAX_CONSECUTIVE_CLICK_GAP_MS = 2_000 +const REQUIRED_LOGO_CLICKS = 5 +export const DEVELOPER_SETTINGS_SECTION_IDS = [ + 'plugins', + 'agent-presets', + 'dsh-update-checker', + 'market', + 'better-sidebar' +] as const +export const DEVELOPER_CONVERSATION_VIEW_IDS = [ + 'memory-files', + 'skills-hub', + 'todos-hub', + 'coi-hub', + 'broadcast-hub', + 'prompt-hub', + 'canvas-hub', + 'memory-sync-hub', + 'models-hub', + 'bookmarks-hub', + 'ui-settings-hub', + 'settings-hub' +] as const + +const developerSettingsSectionIds = new Set(DEVELOPER_SETTINGS_SECTION_IDS) +const developerConversationViewIds = new Set(DEVELOPER_CONVERSATION_VIEW_IDS) + +type DeveloperModeStorage = { + getItem(key: string): string | null + setItem(key: string, value: string): void +} + +type PendingClick = { + status: 'pending' + remaining: number +} + +type LogoClickResult = PendingClick | { status: 'activated' } | { status: 'deactivated' } + +type SettingsSectionRow = { + dataset: { + settingsSectionId?: string + } + hidden: boolean +} + +type ConversationViewTab = { + dataset: { + conversationViewId?: string + sherlockDeveloperTab?: string + } + hidden: boolean + textContent?: string | null + getAttribute?(name: string): string | null + click?(): void +} + +const developerConversationTabLabels = [ + /^(?:🔴\s*)?(?:记忆|Memory)(?:\s*\(\d+\))?$/u, + /^(?:🔴\s*)?(?:技能|Skills)(?:\s*\(\d+\))?$/u, + /^(?:🔴\s*)?(?:待办|Todos)(?:\s*\(\d+\))?$/u +] + +function normalizedTabLabel(tab: ConversationViewTab): string { + return (tab.textContent ?? '').replace(/\s+/gu, ' ').trim() +} + +function isConversationChatTab(tab: ConversationViewTab): boolean { + return tab.dataset.conversationViewId === 'chat' || /^(?:对话|Chat)$/u.test(normalizedTabLabel(tab)) +} + +function isDeveloperConversationTab(tab: ConversationViewTab): boolean { + const id = tab.dataset.conversationViewId + if (id !== undefined && developerConversationViewIds.has(id)) return true + const label = normalizedTabLabel(tab) + return developerConversationTabLabels.some((pattern) => pattern.test(label)) +} + +export class DeveloperModeController { + private enabled: boolean + private clickCount = 0 + private lastClickAt: number | undefined + + constructor(private readonly storage: DeveloperModeStorage) { + this.enabled = this.readPersistedMode() + } + + isEnabled(): boolean { + return this.enabled + } + + logoClick(clickedAt: number): LogoClickResult { + if ( + this.lastClickAt === undefined || + clickedAt < this.lastClickAt || + clickedAt - this.lastClickAt > MAX_CONSECUTIVE_CLICK_GAP_MS + ) { + this.clickCount = 0 + } + + this.lastClickAt = clickedAt + this.clickCount += 1 + + if (this.clickCount < REQUIRED_LOGO_CLICKS) { + return { + status: 'pending', + remaining: REQUIRED_LOGO_CLICKS - this.clickCount + } + } + + this.enabled = !this.enabled + this.clickCount = 0 + this.lastClickAt = undefined + try { + this.storage.setItem(DEVELOPER_MODE_STORAGE_KEY, String(this.enabled)) + } catch (error) { + console.warn('[developer-mode] unable to persist developer mode', error) + } + return { status: this.enabled ? 'activated' : 'deactivated' } + } + + private readPersistedMode(): boolean { + try { + return this.storage.getItem(DEVELOPER_MODE_STORAGE_KEY) === 'true' + } catch (error) { + console.warn('[developer-mode] unable to read developer mode', error) + return false + } + } +} + +export function setDeveloperSettingsVisibility( + rows: Iterable, + developerModeEnabled: boolean +): void { + for (const row of rows) { + const id = row.dataset.settingsSectionId + row.hidden = !developerModeEnabled && id !== undefined && developerSettingsSectionIds.has(id) + } +} + +export function setDeveloperConversationTabsVisibility( + tabs: Iterable, + developerModeEnabled: boolean +): void { + const conversationTabs = [...tabs] + const developerTabs = conversationTabs.filter(isDeveloperConversationTab) + if ( + !developerModeEnabled && + developerTabs.some((tab) => tab.getAttribute?.('aria-selected') === 'true') + ) { + conversationTabs.find(isConversationChatTab)?.click?.() + } + + for (const tab of developerTabs) { + tab.dataset.sherlockDeveloperTab = 'true' + tab.hidden = !developerModeEnabled + } +} + +export function developerModeNoticeText(locale: 'zh' | 'en', enabled: boolean): string { + if (enabled) return locale === 'zh' ? '已进入开发者模式' : 'Developer mode enabled' + return locale === 'zh' ? '已退出开发者模式' : 'Developer mode disabled' +} diff --git a/src/preload/index.ts b/src/preload/index.ts index bb26bb3c3..96ac7018d 100644 --- a/src/preload/index.ts +++ b/src/preload/index.ts @@ -1,30 +1,55 @@ -import { contextBridge, ipcRenderer } from 'electron' +import { contextBridge, ipcRenderer, webUtils } from 'electron' import type { UpdateStatus } from '../shared/contracts' +import { developerModeEnabledFromArguments } from '../shared/developer-mode' +import { appVersionFromArguments } from '../shared/app-info' +import { createSherlockAboutBridge } from './about-info' import { - isUpdateDismissed, - shouldShowUpdate, - updateMessage, - type UpdateLocale -} from './update-view' + DEVELOPER_CONVERSATION_VIEW_IDS, + DEVELOPER_SETTINGS_SECTION_IDS, + DeveloperModeController, + developerModeNoticeText, + setDeveloperConversationTabsVisibility, + setDeveloperSettingsVisibility +} from './developer-mode' import { isPluginLoadError } from './plugin-error-view' -import { mountWindowsTitlebar } from './windows-titlebar' - -const ROOT_ID = 'dsh-desktop-update-root' -const MOBILE_BUTTON_ID = 'dsh-desktop-mobile-button' -const locale: UpdateLocale = navigator.language.toLowerCase().startsWith('zh') ? 'zh' : 'en' - -let host: HTMLDivElement | undefined -let content: HTMLDivElement | undefined -let currentStatus: UpdateStatus | undefined -let dismissedVersion: string | null = null -let dismissedTransientPhase: UpdateStatus['phase'] | null = null -let installing = false -let receivedStatusEvent = false -let phoneConnected = false -let mobileStatusTimer: number | undefined +import { mountDesktopShellStyles } from './shell-style' +import { SidebarUpdateControl } from './sidebar-update-control' +import { mountNativeThemeSync, mountWindowsTitlebar } from './windows-titlebar' +import { + createResearchPreviewBridge, + safePathForFile +} from './research-file-path' +import { createResearchCanvasWheelBridge } from './research-canvas-wheel' +import { createResearchLinkFrameBridge } from './research-link-frame' +import { createResearchWebReaderBridge } from './research-web-reader' +import { createResearchCanvasExportBridge } from './research-canvas-export' + +if (process.isMainFrame) { +const DEVELOPER_MODE_STYLE_ID = 'sherlock-developer-mode-style' +const DEVELOPER_MODE_NOTICE_ID = 'sherlock-developer-mode-notice' +const locale = navigator.language.toLowerCase().startsWith('zh') ? 'zh' : 'en' + +const initialDeveloperMode = developerModeEnabledFromArguments(process.argv) +const developerMode = new DeveloperModeController({ + getItem: () => (initialDeveloperMode ? 'true' : null), + setItem: (_key, value) => { + void ipcRenderer + .invoke('developer-mode:set-enabled', value === 'true') + .catch((error: unknown) => + console.warn('[developer-mode] unable to persist desktop developer mode', error) + ) + } +}) +const sidebarUpdateControl = new SidebarUpdateControl(document, locale, { + download: () => ipcRenderer.invoke('updates:download'), + install: () => ipcRenderer.invoke('updates:install'), + retry: () => ipcRenderer.invoke('desktop-menu:execute', 'check-for-updates') +}) +let receivedStatusEvent = false let bootFailureTriggered = false let bootFailureTimer: number | undefined +let developerModeNoticeTimer: number | undefined const pendingBootFailureMessages: string[] = [] const BOOT_FAILURE_SETTLE_MS = 400 @@ -83,77 +108,29 @@ function checkBootFailureInDom(): void { } const domObserver = new MutationObserver(() => { - mountMobileButton() checkBootFailureInDom() + syncDeveloperModeVisibility() + sidebarUpdateControl.mount() }) contextBridge.exposeInMainWorld('dshDesktopDirectoryPicker', { pick: (): Promise => ipcRenderer.invoke('directory-picker:open') }) -function mountMobileButton(): void { - let style = document.getElementById(`${MOBILE_BUTTON_ID}-style`) - if (!style) { - style = document.createElement('style') - style.id = `${MOBILE_BUTTON_ID}-style` - style.textContent = mobileButtonStyles - document.head.appendChild(style) - } - const footer = document.querySelector('[data-dsh-sidebar-footer]') - if (!footer) return - let button = document.getElementById(MOBILE_BUTTON_ID) as HTMLButtonElement | null - if (!button) { - button = document.createElement('button') - button.id = MOBILE_BUTTON_ID - button.type = 'button' - button.innerHTML = `${phoneIcon}` - button.addEventListener('click', () => { - void ipcRenderer.invoke('mobile:open-pairing').catch((error: unknown) => { - console.error('[mobile] unable to open pairing window', error) - }) - }) - } - if (button.parentElement !== footer) footer.appendChild(button) - renderMobileButton() -} - -function renderMobileButton(): void { - const button = document.getElementById(MOBILE_BUTTON_ID) as HTMLButtonElement | null - const root = document.querySelector('[data-dsh-sidebar-root]') - if (!button || !root) return - const wide = root.dataset.dshSidebarWide === 'true' - button.hidden = !wide && !phoneConnected - button.classList.toggle('is-connected', phoneConnected) - const label = phoneConnected - ? locale === 'zh' ? '管理手机连接' : 'Manage phone connection' - : locale === 'zh' ? '连接手机' : 'Connect phone' - button.setAttribute('aria-label', label) - button.title = label -} - -async function refreshMobileStatus(): Promise { - try { - const status = (await ipcRenderer.invoke('mobile:status')) as { connected?: boolean } - phoneConnected = status.connected === true - mountMobileButton() - } catch (error) { - console.warn('[mobile] unable to read connection status', error) - } -} - function initializeUi(): void { + mountDeveloperModeUi() if (process.platform === 'win32') { mountWindowsTitlebar({ document, ipcRenderer, locale }) + } else if (process.platform === 'darwin') { + mountNativeThemeSync({ document, ipcRenderer }) + mountDesktopShellStyles(document) } - mount() - mountMobileButton() + sidebarUpdateControl.mount() checkBootFailureInDom() domObserver.observe(document.documentElement, { childList: true, subtree: true }) - void refreshMobileStatus() - mobileStatusTimer ??= window.setInterval(() => void refreshMobileStatus(), 1000) } window.addEventListener('error', (event) => { @@ -172,13 +149,60 @@ window.addEventListener('unhandledrejection', (event) => { } }) +contextBridge.exposeInMainWorld( + 'sherlockDesktopInfo', + Object.freeze({ + name: 'Sherlock', + version: appVersionFromArguments(process.argv) + }) +) + contextBridge.exposeInMainWorld( 'dshDesktop', Object.freeze({ - restartHarness: (): Promise<{ ok: boolean }> => ipcRenderer.invoke('harness:restart') + restartHarness: (): Promise<{ ok: boolean }> => ipcRenderer.invoke('harness:restart'), + showItemInFolder: (path: string): Promise<{ ok: boolean }> => + ipcRenderer.invoke('filesystem:show-item-in-folder', path), + researchFilesAvailable: (paths: string[]): Promise => + ipcRenderer.invoke('research:files-available', paths), + researchCanvasStorage: Object.freeze({ + getItem: (key: string): string | null => { + const value = ipcRenderer.sendSync('research:canvas-storage:get', key) as unknown + return typeof value === 'string' ? value : null + }, + setItem: (key: string, value: string): boolean => + ipcRenderer.sendSync('research:canvas-storage:set', key, value) === true + }), + researchCanvasWheel: createResearchCanvasWheelBridge(ipcRenderer), + researchLinkFrame: createResearchLinkFrameBridge( + (channel, value) => ipcRenderer.invoke(channel, value) + ), + researchWebReader: createResearchWebReaderBridge( + (channel, value) => ipcRenderer.invoke(channel, value) + ), + researchCanvasExport: createResearchCanvasExportBridge( + (channel, value) => ipcRenderer.invoke(channel, value) + ), + researchPreview: createResearchPreviewBridge( + webUtils.getPathForFile, + (channel, value) => ipcRenderer.invoke(channel, value) + ), + // Compatibility for the existing attachment submission path. Preview + // callers must use researchPreview so raw filesystem paths never become + // preview credentials or protocol URLs. + getPathForFile: (file: File): string => safePathForFile(file, webUtils.getPathForFile) }) ) +contextBridge.exposeInMainWorld( + 'sherlockAbout', + createSherlockAboutBridge( + () => ipcRenderer.invoke('updates:status') as Promise, + () => ipcRenderer.invoke('updates:check') as Promise, + locale + ) +) + contextBridge.exposeInMainWorld( 'dshRecovery', Object.freeze({ @@ -186,285 +210,90 @@ contextBridge.exposeInMainWorld( }) ) -function mount(): void { - if (document.getElementById(ROOT_ID)) return - - host = document.createElement('div') - host.id = ROOT_ID - host.style.cssText = [ - 'position:fixed', - 'right:20px', - 'bottom:20px', - 'z-index:2147483646', - 'display:none', - 'width:min(384px,calc(100vw - 40px))', - 'font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif' - ].join(';') - - const shadow = host.attachShadow({ mode: 'closed' }) - const style = document.createElement('style') - style.textContent = styles - content = document.createElement('div') - shadow.append(style, content) - document.documentElement.appendChild(host) - render() -} - -function applyStatus(status: UpdateStatus): void { - currentStatus = status - if (host) { - host.dataset.updatePhase = status.phase - host.dataset.updateManual = String(status.manual) - } - if (status.phase === 'error') installing = false - render() -} - -function render(): void { - if (!host || !content || !currentStatus) return - - if ( - !shouldShowUpdate(currentStatus) || - isUpdateDismissed(currentStatus, dismissedVersion, dismissedTransientPhase) - ) { - host.style.display = 'none' - content.replaceChildren() - return - } - - host.style.display = 'block' - const status = currentStatus - const card = element('aside', 'card') - card.setAttribute('aria-live', 'polite') - card.setAttribute('aria-label', locale === 'zh' ? 'DSH Desktop 更新' : 'DSH Desktop update') - - const row = element('div', 'row') - const indicator = element('span', isBusy(status) ? 'spinner' : 'dot') - indicator.setAttribute('aria-hidden', 'true') - row.appendChild(indicator) - - const body = element('div', 'body') - const message = element('p', 'message') - message.textContent = updateMessage(status, locale) - body.appendChild(message) - - if (status.phase === 'error' && status.message) { - const detail = element('p', 'detail') - detail.textContent = status.message - body.appendChild(detail) - } - - if (status.phase === 'downloading') { - const progress = element('div', 'progress') - progress.setAttribute('role', 'progressbar') - progress.setAttribute('aria-valuemin', '0') - progress.setAttribute('aria-valuemax', '100') - progress.setAttribute('aria-valuenow', String(Math.round(status.percent ?? 0))) - const value = element('div', 'progressValue') - value.style.width = `${status.percent ?? 0}%` - progress.appendChild(value) - body.appendChild(progress) - } - - if (status.phase === 'downloaded') { - const actions = element('div', 'actions') - const install = button( - installing - ? locale === 'zh' - ? '正在重启…' - : 'Restarting…' - : locale === 'zh' - ? '重新启动并安装' - : 'Restart and install', - 'primary' - ) - install.disabled = installing - install.addEventListener('click', () => { - installing = true - render() - void ipcRenderer.invoke('updates:install').catch((error: unknown) => { - installing = false - console.error('[updater] unable to install update', error) - render() - }) - }) - const later = button(locale === 'zh' ? '稍后' : 'Later', 'secondary') - later.addEventListener('click', dismissCurrent) - actions.append(install, later) - body.appendChild(actions) - } - - row.appendChild(body) +contextBridge.exposeInMainWorld( + 'sherlockDeveloperMode', + Object.freeze({ + logoClick: (): void => { + const result = developerMode.logoClick(Date.now()) + if (result.status === 'pending') return + + const enabled = result.status === 'activated' + document.documentElement.dataset.sherlockDeveloperMode = String(enabled) + syncDeveloperModeVisibility() + showDeveloperModeNotice(enabled) + } + }) +) - if (status.phase !== 'downloaded') { - const close = button('×', 'close') - close.setAttribute('aria-label', locale === 'zh' ? '关闭' : 'Close') - close.addEventListener('click', dismissCurrent) - row.appendChild(close) +function mountDeveloperModeUi(): void { + document.documentElement.dataset.sherlockDeveloperMode = String(developerMode.isEnabled()) + + if (!document.getElementById(DEVELOPER_MODE_STYLE_ID)) { + const style = document.createElement('style') + style.id = DEVELOPER_MODE_STYLE_ID + style.textContent = `${[ + ...DEVELOPER_SETTINGS_SECTION_IDS.map( + (id) => + `html:not([data-sherlock-developer-mode="true"]) [data-settings-section-id="${id}"]` + ), + ...DEVELOPER_CONVERSATION_VIEW_IDS.map( + (id) => + `html:not([data-sherlock-developer-mode="true"]) [data-conversation-view-id="${id}"]` + ), + 'html:not([data-sherlock-developer-mode="true"]) [data-sherlock-developer-tab="true"]' + ].join(',\n')} { display: none !important; }` + document.documentElement.appendChild(style) } - card.appendChild(row) - content.replaceChildren(card) + syncDeveloperModeVisibility() } -function dismissCurrent(): void { - if (!currentStatus) return - if (currentStatus.availableVersion) { - dismissedVersion = currentStatus.availableVersion - } else { - dismissedTransientPhase = currentStatus.phase - } - render() +function syncDeveloperModeVisibility(): void { + const settingsRows = document.querySelectorAll('[data-settings-section-id]') + setDeveloperSettingsVisibility(settingsRows, developerMode.isEnabled()) + setDeveloperConversationTabsVisibility( + document.querySelectorAll( + '[data-conversation-view-id], [role="tablist"] > [role="tab"]' + ), + developerMode.isEnabled() + ) } -function isBusy(status: UpdateStatus): boolean { - return status.phase === 'checking' || status.phase === 'downloading' -} +function showDeveloperModeNotice(enabled: boolean): void { + window.clearTimeout(developerModeNoticeTimer) + document.getElementById(DEVELOPER_MODE_NOTICE_ID)?.remove() -function element( - tag: K, - className: string -): HTMLElementTagNameMap[K] { - const node = document.createElement(tag) - node.className = className - return node -} + const notice = document.createElement('div') + notice.id = DEVELOPER_MODE_NOTICE_ID + notice.role = 'status' + notice.setAttribute('aria-live', 'polite') + notice.textContent = developerModeNoticeText(locale, enabled) + notice.style.cssText = [ + 'position:fixed', + 'left:50%', + 'bottom:28px', + 'z-index:2147483647', + 'transform:translateX(-50%)', + 'pointer-events:none', + 'padding:10px 16px', + 'border:1px solid var(--dsw-alias-border-l2,rgba(255,255,255,.14))', + 'border-radius:10px', + 'color:var(--dsw-alias-label-primary,#f5f5f5)', + 'background:var(--dsw-alias-bg-layer-2,rgba(38,38,41,.96))', + 'box-shadow:0 10px 30px rgba(0,0,0,.28)', + 'font:500 13px/20px -apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif' + ].join(';') + document.documentElement.appendChild(notice) -function button(label: string, className: string): HTMLButtonElement { - const node = element('button', className) - node.type = 'button' - node.textContent = label - return node + developerModeNoticeTimer = window.setTimeout(() => { + developerModeNoticeTimer = undefined + notice.remove() + }, 2_400) } -const styles = ` - :host { color-scheme: light dark; } - * { box-sizing: border-box; } - .card { - color: var(--dsw-alias-label-primary, #202124); - background: var(--dsw-alias-bg-layer-1, rgba(255, 255, 255, 0.98)); - border: 1px solid var(--dsw-alias-border-l2, rgba(32, 33, 36, 0.14)); - border-radius: 14px; - padding: 15px 16px; - box-shadow: 0 14px 38px rgba(0, 0, 0, 0.18), 0 2px 8px rgba(0, 0, 0, 0.08); - backdrop-filter: blur(18px); - } - .row { display: flex; align-items: flex-start; gap: 12px; } - .body { min-width: 0; flex: 1; } - .message { margin: 0; font-size: 14px; font-weight: 600; line-height: 20px; } - .detail { - margin: 5px 0 0; - color: var(--dsw-alias-label-secondary, #666b73); - font-size: 12px; - line-height: 17px; - display: -webkit-box; - overflow: hidden; - -webkit-box-orient: vertical; - -webkit-line-clamp: 2; - } - .dot { - width: 10px; - height: 10px; - margin-top: 5px; - flex: none; - border-radius: 999px; - background: #4d6bfe; - box-shadow: 0 0 0 4px rgba(77, 107, 254, 0.12); - } - .dot.warning { - background: #f59e0b; - box-shadow: 0 0 0 4px rgba(245, 158, 11, 0.18); - } - .spinner { - width: 17px; - height: 17px; - margin-top: 1px; - flex: none; - border: 2px solid rgba(77, 107, 254, 0.22); - border-top-color: #4d6bfe; - border-radius: 999px; - animation: spin 0.75s linear infinite; - } - .progress { - height: 6px; - margin-top: 10px; - overflow: hidden; - border-radius: 999px; - background: var(--dsw-alias-bg-layer-2, rgba(32, 33, 36, 0.1)); - } - .progressValue { - height: 100%; - min-width: 2px; - border-radius: inherit; - background: #4d6bfe; - transition: width 180ms ease; - } - .actions { display: flex; gap: 8px; margin-top: 12px; } - button { - appearance: none; - border: 0; - font: inherit; - cursor: pointer; - } - button:focus-visible { outline: 2px solid #4d6bfe; outline-offset: 2px; } - button:disabled { cursor: default; opacity: 0.55; } - .primary, .secondary { - min-height: 30px; - padding: 5px 11px; - border-radius: 8px; - font-size: 12px; - font-weight: 600; - } - .primary { color: #fff; background: #4d6bfe; } - .primary:hover:not(:disabled) { background: #3e5de7; } - .secondary { - color: var(--dsw-alias-label-primary, #202124); - background: var(--dsw-alias-bg-layer-2, rgba(32, 33, 36, 0.08)); - } - .secondary:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(32, 33, 36, 0.13)); } - .close { - width: 24px; - height: 24px; - margin: -4px -6px 0 0; - flex: none; - color: var(--dsw-alias-label-secondary, #73777f); - background: transparent; - border-radius: 7px; - font-size: 20px; - line-height: 20px; - } - .close:hover { color: var(--dsw-alias-label-primary, #202124); background: rgba(127, 127, 127, 0.1); } - @keyframes spin { to { transform: rotate(360deg); } } - @media (prefers-color-scheme: dark) { - .card { - color: var(--dsw-alias-label-primary, #f3f4f6); - background: var(--dsw-alias-bg-layer-1, rgba(31, 32, 35, 0.98)); - border-color: var(--dsw-alias-border-l2, rgba(255, 255, 255, 0.14)); - box-shadow: 0 16px 42px rgba(0, 0, 0, 0.42), 0 2px 8px rgba(0, 0, 0, 0.25); - } - .detail { color: var(--dsw-alias-label-secondary, #a9adb5); } - .secondary { color: var(--dsw-alias-label-primary, #f3f4f6); background: rgba(255, 255, 255, 0.1); } - } - @media (prefers-reduced-motion: reduce) { - .spinner { animation: none; } - .progressValue { transition: none; } - } -` - -const phoneIcon = `` - -const mobileButtonStyles = ` - [data-dsh-sidebar-footer] { position: relative; } - [data-dsh-sidebar-root][data-dsh-sidebar-wide="true"] [data-dsh-sidebar-footer] > [class*="settingsArea"] { padding-right: 38px; } - #${MOBILE_BUTTON_ID} { appearance:none; position:relative; width:32px; height:32px; color:var(--dsw-alias-label-secondary,#73777f); background:transparent; border:0; border-radius:9px; display:inline-flex; align-items:center; justify-content:center; cursor:pointer; } - [data-dsh-sidebar-root][data-dsh-sidebar-wide="true"] #${MOBILE_BUTTON_ID} { position:absolute; right:0; top:50%; transform:translateY(-50%); } - [data-dsh-sidebar-root][data-dsh-sidebar-wide="false"] #${MOBILE_BUTTON_ID} { margin-top:5px; } - #${MOBILE_BUTTON_ID}:hover { color:var(--dsw-alias-label-primary,#202124); background:var(--dsw-alias-interactive-bg-hover,rgba(32,33,36,.08)); } - #${MOBILE_BUTTON_ID}:focus-visible { outline:2px solid #4d6bfe; outline-offset:1px; } - #${MOBILE_BUTTON_ID}[hidden] { display:none; } - #${MOBILE_BUTTON_ID} > span { position:absolute; top:4px; right:4px; width:7px; height:7px; border:1.5px solid var(--dsw-specific-sidebar-fill,#fff); border-radius:50%; background:#4da66d; opacity:0; } - #${MOBILE_BUTTON_ID}.is-connected > span { opacity:1; } -` +function applyStatus(status: UpdateStatus): void { + sidebarUpdateControl.render(status) +} ipcRenderer.on('updates:status-changed', (_event, status: UpdateStatus) => { receivedStatusEvent = true @@ -483,3 +312,4 @@ if (document.readyState === 'loading') { } else { initializeUi() } +} diff --git a/src/preload/research-canvas-export.ts b/src/preload/research-canvas-export.ts new file mode 100644 index 000000000..f89f14794 --- /dev/null +++ b/src/preload/research-canvas-export.ts @@ -0,0 +1,14 @@ +import type { + ResearchCanvasExportRequest, + ResearchCanvasExportResult +} from '../main/state/research-canvas-export' + +type ResearchCanvasExportInvoke = (channel: string, value: unknown) => Promise + +export function createResearchCanvasExportBridge(invoke: ResearchCanvasExportInvoke) { + return Object.freeze({ + save(value: ResearchCanvasExportRequest) { + return invoke('research:canvas-export:save', value) as Promise + } + }) +} diff --git a/src/preload/research-canvas-wheel.ts b/src/preload/research-canvas-wheel.ts new file mode 100644 index 000000000..9f9b04dc4 --- /dev/null +++ b/src/preload/research-canvas-wheel.ts @@ -0,0 +1,40 @@ +import { + RESEARCH_CANVAS_WHEEL_EVENT_CHANNEL, + RESEARCH_CANVAS_WHEEL_REGION_CHANNEL, + type ResearchCanvasNativeWheel, + type ResearchCanvasWheelRegionUpdate +} from '../shared/research-canvas-wheel' + +type IpcRendererLike = { + sendSync(channel: string, value: unknown): unknown + on(channel: string, listener: (event: unknown, value: unknown) => void): unknown + removeListener(channel: string, listener: (event: unknown, value: unknown) => void): unknown +} + +export type ResearchCanvasWheelBridge = Readonly<{ + setRegion(value: ResearchCanvasWheelRegionUpdate): boolean + subscribe(listener: (value: ResearchCanvasNativeWheel) => void): () => void +}> + +export function createResearchCanvasWheelBridge( + ipcRenderer: IpcRendererLike +): ResearchCanvasWheelBridge { + return Object.freeze({ + setRegion(value: ResearchCanvasWheelRegionUpdate): boolean { + return ipcRenderer.sendSync(RESEARCH_CANVAS_WHEEL_REGION_CHANNEL, value) === true + }, + subscribe(listener: (value: ResearchCanvasNativeWheel) => void): () => void { + if (typeof listener !== 'function') throw new TypeError('Research canvas wheel listener required.') + let active = true + const onWheel = (_event: unknown, value: unknown) => { + if (active) listener(value as ResearchCanvasNativeWheel) + } + ipcRenderer.on(RESEARCH_CANVAS_WHEEL_EVENT_CHANNEL, onWheel) + return () => { + if (!active) return + active = false + ipcRenderer.removeListener(RESEARCH_CANVAS_WHEEL_EVENT_CHANNEL, onWheel) + } + } + }) +} diff --git a/src/preload/research-file-path.ts b/src/preload/research-file-path.ts new file mode 100644 index 000000000..80a59fa4e --- /dev/null +++ b/src/preload/research-file-path.ts @@ -0,0 +1,75 @@ +export type ElectronFilePathResolver = (file: File) => unknown + +export type ResearchPreviewIdentity = { + sessionId: string + nodeId: string +} + +export type ResearchPreviewDescriptor = { + authorizationId: string + capabilityToken: string + url: string + contentType: string + name: string +} + +type ResearchPreviewInvoke = (channel: string, value: unknown) => Promise + +export function safePathForFile(file: File, resolve: ElectronFilePathResolver): string { + try { + const value = resolve(file) + return typeof value === 'string' ? value : '' + } catch { + return '' + } +} + +function validIdentity(value: ResearchPreviewIdentity): boolean { + return typeof value?.sessionId === 'string' && value.sessionId.length > 0 && + typeof value.nodeId === 'string' && value.nodeId.length > 0 +} + +export function researchFinderAdmissionRequest( + file: File, + identity: ResearchPreviewIdentity, + resolve: ElectronFilePathResolver +): { path: string; sessionId: string; nodeId: string } | null { + if (!validIdentity(identity)) return null + const path = safePathForFile(file, resolve) + if (path.length === 0) return null + return { path, sessionId: identity.sessionId, nodeId: identity.nodeId } +} + +export function createResearchPreviewBridge( + resolve: ElectronFilePathResolver, + invoke: ResearchPreviewInvoke +) { + return Object.freeze({ + async admitFinderFile( + file: File, + identity: ResearchPreviewIdentity + ): Promise { + const request = researchFinderAdmissionRequest(file, identity, resolve) + if (request === null) return null + return invoke('research:preview:admit-finder', request) as Promise + }, + admitSidebarFile(value: ResearchPreviewIdentity & { relativePath: string }) { + return invoke('research:preview:admit-sidebar', value) as Promise + }, + restore(value: ResearchPreviewIdentity & { authorizationId: string }) { + return invoke('research:preview:restore', value) as Promise + }, + release(value: ResearchPreviewIdentity & { + authorizationId: string + capabilityToken: string + }) { + return invoke('research:preview:release', value) as Promise<{ ok: boolean }> + }, + revokeNode(identity: ResearchPreviewIdentity) { + return invoke('research:preview:revoke-node', identity) as Promise<{ ok: boolean }> + }, + revokeSession(sessionId: string) { + return invoke('research:preview:revoke-session', { sessionId }) as Promise<{ ok: boolean }> + } + }) +} diff --git a/src/preload/research-link-frame.ts b/src/preload/research-link-frame.ts new file mode 100644 index 000000000..d99e8e39f --- /dev/null +++ b/src/preload/research-link-frame.ts @@ -0,0 +1,38 @@ +type ResearchLinkFrameInvoke = (channel: string, value: unknown) => Promise + +export type ResearchLinkFrameIdentity = { + sessionId: string + nodeId: string +} + +export type ResearchLinkFrameAuthorization = ResearchLinkFrameIdentity & { + url: string +} + +export function createResearchLinkFrameBridge(invoke: ResearchLinkFrameInvoke) { + return Object.freeze({ + authorize(value: ResearchLinkFrameAuthorization) { + return invoke('research:link-frame:authorize', value) as Promise<{ + url: string + frameName: string + }> + }, + inspect(value: ResearchLinkFrameIdentity) { + return invoke('research:link-frame:inspect', value) as Promise<{ + url: string + title: string + scrollWidth: number + clientWidth: number + } | null> + }, + release(value: ResearchLinkFrameIdentity) { + return invoke('research:link-frame:release', value) as Promise<{ ok: boolean }> + }, + releaseSession(sessionId: string) { + return invoke('research:link-frame:release-session', { sessionId }) as Promise<{ + ok: boolean + removed: number + }> + } + }) +} diff --git a/src/preload/research-web-reader.ts b/src/preload/research-web-reader.ts new file mode 100644 index 000000000..8212a02c6 --- /dev/null +++ b/src/preload/research-web-reader.ts @@ -0,0 +1,17 @@ +import type { ResearchWebReaderResult } from '../main/state/research-web-reader' + +type ResearchWebReaderInvoke = (channel: string, value: unknown) => Promise + +export type ResearchWebReaderRequest = { + sessionId: string + nodeId: string + url: string +} + +export function createResearchWebReaderBridge(invoke: ResearchWebReaderInvoke) { + return Object.freeze({ + read(value: ResearchWebReaderRequest) { + return invoke('research:web-reader:read', value) as Promise + } + }) +} diff --git a/src/preload/shell-style.ts b/src/preload/shell-style.ts new file mode 100644 index 000000000..dd9617d2a --- /dev/null +++ b/src/preload/shell-style.ts @@ -0,0 +1,16 @@ +const DESKTOP_SHELL_STYLE_ID = 'sherlock-desktop-shell-style' + +const desktopShellStyles = ` + .t8lSSG_toggleCluster { + top: calc(8px + env(safe-area-inset-top)) !important; + } +` + +export function mountDesktopShellStyles(document: Document): void { + if (document.getElementById(DESKTOP_SHELL_STYLE_ID)) return + + const style = document.createElement('style') + style.id = DESKTOP_SHELL_STYLE_ID + style.textContent = desktopShellStyles + document.documentElement.appendChild(style) +} diff --git a/src/preload/sidebar-update-control.ts b/src/preload/sidebar-update-control.ts new file mode 100644 index 000000000..350373826 --- /dev/null +++ b/src/preload/sidebar-update-control.ts @@ -0,0 +1,338 @@ +import type { UpdateStatus } from '../shared/contracts' +import { updateAction, updateMessage, type UpdateLocale } from './update-view' + +const BUTTON_ID = 'sherlock-sidebar-update-button' +const PANEL_ID = 'sherlock-sidebar-update-panel' +const STYLE_ID = 'sherlock-sidebar-update-style' +const FOOTER_SELECTOR = '[data-dsh-sidebar-footer]' +const SETTINGS_SLOT_SELECTOR = + '[data-dsh-sidebar-root] [data-slot="sidebar.settings"]' +const UPDATE_FOOTER_ATTRIBUTE = 'data-sherlock-update-footer' + +export interface SidebarUpdateCallbacks { + download(): void | Promise + install(): void | Promise + retry(): void | Promise +} + +export class SidebarUpdateControl { + private button?: HTMLButtonElement + private panel?: HTMLElement + private status?: UpdateStatus + + constructor( + private readonly document: Document, + private readonly locale: UpdateLocale, + private readonly callbacks: SidebarUpdateCallbacks + ) {} + + mount(): boolean { + const footer = this.resolveFooter() + if (!footer) return false + + if (this.button?.isConnected && this.button.parentElement === footer) return true + + this.button?.remove() + this.panel?.remove() + this.ensureStyles() + + const button = this.document.createElement('button') + button.id = BUTTON_ID + button.type = 'button' + button.className = 'sherlock-sidebar-update-button' + button.hidden = true + button.addEventListener('click', () => this.activate()) + + const panel = this.document.createElement('aside') + panel.id = PANEL_ID + panel.className = 'sherlock-sidebar-update-panel' + panel.hidden = true + panel.setAttribute('aria-live', 'polite') + + footer.append(panel, button) + this.button = button + this.panel = panel + + if (this.status) this.render(this.status) + return true + } + + private resolveFooter(): HTMLElement | null { + const explicitFooter = this.document.querySelector(FOOTER_SELECTOR) + if (explicitFooter) { + explicitFooter.setAttribute(UPDATE_FOOTER_ATTRIBUTE, '') + return explicitFooter + } + + const settingsSlot = this.document.querySelector( + SETTINGS_SLOT_SELECTOR + ) + const settingsArea = settingsSlot?.parentElement + if (!settingsArea) return null + + settingsArea.setAttribute(UPDATE_FOOTER_ATTRIBUTE, '') + return settingsArea + } + + render(status: UpdateStatus): void { + this.status = status + if (!this.mount() || !this.button || !this.panel) return + + const action = updateAction(status) + const button = this.button + const panel = this.panel + + button.hidden = action.kind === 'hidden' + button.disabled = false + button.dataset.action = action.kind + button.removeAttribute('role') + button.removeAttribute('aria-valuemin') + button.removeAttribute('aria-valuemax') + button.removeAttribute('aria-valuenow') + button.style.removeProperty('--sherlock-update-progress') + panel.hidden = true + panel.replaceChildren() + + switch (action.kind) { + case 'hidden': + button.removeAttribute('aria-label') + button.replaceChildren() + return + case 'download': + button.dataset.action = 'download' + button.setAttribute( + 'aria-label', + this.locale === 'zh' + ? `下载 Sherlock ${action.version} 更新` + : `Download Sherlock ${action.version} update` + ) + button.innerHTML = `${downloadIcon}${ + this.locale === 'zh' ? '下载更新' : 'Download' + }` + return + case 'progress': { + const percent = Math.max(0, Math.min(100, Math.round(action.percent))) + button.dataset.action = 'progress' + button.disabled = true + button.setAttribute('role', 'progressbar') + button.setAttribute('aria-valuemin', '0') + button.setAttribute('aria-valuemax', '100') + button.setAttribute('aria-valuenow', String(percent)) + button.setAttribute( + 'aria-label', + this.locale === 'zh' ? `正在下载更新 ${percent}%` : `Downloading update ${percent}%` + ) + button.style.setProperty('--sherlock-update-progress', `${percent}%`) + button.innerHTML = progressRing(percent) + return + } + case 'install': + button.dataset.action = 'install' + button.setAttribute( + 'aria-label', + this.locale === 'zh' + ? `安装 Sherlock ${action.version} 更新` + : `Install Sherlock ${action.version} update` + ) + button.innerHTML = downloadIcon + this.renderInstallPanel(status) + return + case 'retry': + button.dataset.action = 'retry' + button.setAttribute( + 'aria-label', + this.locale === 'zh' ? '重新检查 Sherlock 更新' : 'Check for Sherlock updates again' + ) + button.innerHTML = retryIcon + return + } + } + + private activate(): void { + const action = this.button?.dataset.action + if (action === 'download') { + this.invoke(this.callbacks.download) + } else if (action === 'install') { + if (this.panel) this.panel.hidden = !this.panel.hidden + } else if (action === 'retry') { + this.invoke(this.callbacks.retry) + } + } + + private renderInstallPanel(status: UpdateStatus): void { + if (!this.panel) return + + const message = this.document.createElement('p') + message.className = 'sherlock-sidebar-update-message' + message.textContent = updateMessage(status, this.locale) + + const actions = this.document.createElement('div') + actions.className = 'sherlock-sidebar-update-actions' + + const confirm = this.document.createElement('button') + confirm.type = 'button' + confirm.dataset.updateConfirm = 'true' + confirm.textContent = this.locale === 'zh' ? '重新启动并安装' : 'Restart and install' + confirm.addEventListener('click', () => { + confirm.disabled = true + confirm.textContent = this.locale === 'zh' ? '正在重启…' : 'Restarting…' + this.invoke(this.callbacks.install) + }) + + const later = this.document.createElement('button') + later.type = 'button' + later.dataset.updateLater = 'true' + later.textContent = this.locale === 'zh' ? '稍后' : 'Later' + later.addEventListener('click', () => { + if (this.panel) this.panel.hidden = true + }) + + actions.append(confirm, later) + this.panel.append(message, actions) + } + + private invoke(callback: () => void | Promise): void { + try { + void Promise.resolve(callback()).catch((error: unknown) => { + console.error('[updater] sidebar update action failed', error) + }) + } catch (error) { + console.error('[updater] sidebar update action failed', error) + } + } + + private ensureStyles(): void { + if (this.document.getElementById(STYLE_ID)) return + const style = this.document.createElement('style') + style.id = STYLE_ID + style.textContent = styles + ;(this.document.head || this.document.documentElement).appendChild(style) + } +} + +const downloadIcon = ` + ` + +const retryIcon = ` + ` + +function progressRing(percent: number): string { + return ` + ` +} + +const styles = ` + #${BUTTON_ID}[hidden], #${PANEL_ID}[hidden] { display: none !important; } + [${UPDATE_FOOTER_ATTRIBUTE}] { + display: flex !important; + align-items: center; + position: relative; + } + #${BUTTON_ID} { + appearance: none; + box-sizing: border-box; + width: 28px; + height: 28px; + position: absolute; + right: 0; + top: 50%; + transform: translateY(-50%); + z-index: 1; + display: grid; + place-items: center; + border: 0; + border-radius: 8px; + color: #fff; + background: #1677ff; + box-shadow: none; + cursor: pointer; + overflow: hidden; + white-space: nowrap; + transition: width 160ms ease, transform 150ms ease, background-color 150ms ease; + } + #${BUTTON_ID}[data-action="download"]:hover:not(:disabled) { width: 88px; } + #${BUTTON_ID}:hover:not(:disabled) { + transform: translateY(calc(-50% - 1px)); + background: #0f6fe8; + } + #${BUTTON_ID}:active:not(:disabled) { transform: translateY(-50%) scale(.96); } + #${BUTTON_ID}:focus-visible { outline: 2px solid #69a7ff; outline-offset: 2px; } + #${BUTTON_ID}:disabled { cursor: default; } + #${BUTTON_ID}[data-action="progress"] { + border: 0; + background: #1677ff; + } + #${BUTTON_ID} svg { + width: 15px; + height: 15px; + fill: none; + stroke: currentColor; + stroke-width: 1.9; + stroke-linecap: round; + stroke-linejoin: round; + } + #${BUTTON_ID} .sherlock-sidebar-update-label { + display: none; + padding: 0 10px; + font: 600 12px/18px -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; + } + #${BUTTON_ID}[data-action="download"]:hover svg { display: none; } + #${BUTTON_ID}[data-action="download"]:hover .sherlock-sidebar-update-label { display: inline; } + #${BUTTON_ID} [data-update-progress-ring] { + width: 17px; + height: 17px; + transform: rotate(-90deg); + } + #${BUTTON_ID} [data-update-progress-ring] circle { + fill: none; + stroke-width: 3; + } + #${BUTTON_ID} .sherlock-update-ring-track { stroke: rgba(255,255,255,.28); } + #${BUTTON_ID} .sherlock-update-ring-value { + stroke: #fff; + stroke-linecap: round; + transition: stroke-dashoffset 120ms linear; + } + #${PANEL_ID} { + box-sizing: border-box; + position: absolute; + right: 0; + bottom: 48px; + z-index: 2147483646; + width: 260px; + padding: 13px; + color: var(--dsw-alias-label-primary, #f3f4f6); + background: var(--dsw-alias-bg-layer-2, rgba(38, 38, 41, .98)); + border: 1px solid var(--dsw-alias-border-l2, rgba(255, 255, 255, .14)); + border-radius: 12px; + box-shadow: 0 14px 34px rgba(0, 0, 0, .3); + font: 500 13px/19px -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; + } + .sherlock-sidebar-update-message { margin: 0; } + .sherlock-sidebar-update-actions { display: flex; gap: 8px; margin-top: 11px; } + .sherlock-sidebar-update-actions button { + appearance: none; + min-height: 30px; + padding: 5px 10px; + border: 0; + border-radius: 8px; + font: 600 12px/18px inherit; + cursor: pointer; + } + .sherlock-sidebar-update-actions [data-update-confirm] { color: #fff; background: #1677ff; } + .sherlock-sidebar-update-actions [data-update-later] { + color: inherit; + background: rgba(127, 127, 127, .15); + } + @media (prefers-reduced-motion: reduce) { + #${BUTTON_ID} { transition: none; } + } +` diff --git a/src/preload/update-view.ts b/src/preload/update-view.ts index 731aa684d..3fe76e7bf 100644 --- a/src/preload/update-view.ts +++ b/src/preload/update-view.ts @@ -2,9 +2,31 @@ import type { UpdateStatus } from '../shared/contracts' export type UpdateLocale = 'en' | 'zh' +export type UpdateAction = + | { kind: 'hidden' } + | { kind: 'download'; version: string } + | { kind: 'progress'; percent: number } + | { kind: 'install'; version: string } + | { kind: 'retry'; message: string } + +export function updateAction(status: UpdateStatus): UpdateAction { + if (status.phase === 'available' && status.availableVersion) { + return { kind: 'download', version: status.availableVersion } + } + if (status.phase === 'downloading') { + return { kind: 'progress', percent: status.percent ?? 0 } + } + if (status.phase === 'downloaded') { + return { kind: 'progress', percent: 100 } + } + if (status.manual && status.phase === 'error') { + return { kind: 'retry', message: status.message ?? '' } + } + return { kind: 'hidden' } +} + export function shouldShowUpdate(status: UpdateStatus): boolean { - if (['available', 'downloading', 'downloaded'].includes(status.phase)) return true - return status.manual && ['checking', 'up-to-date', 'error', 'unsupported'].includes(status.phase) + return updateAction(status).kind !== 'hidden' } export function isUpdateDismissed( @@ -30,9 +52,9 @@ export function updateMessage(status: UpdateStatus, locale: UpdateLocale): strin return zh ? `正在下载更新 ${percent}%` : `Downloading update ${percent}%` } case 'downloaded': - return zh ? `DSH Desktop${version} 已下载完成` : `DSH Desktop${version} is ready to install` + return zh ? `Sherlock${version} 已下载完成` : `Sherlock${version} is ready to install` case 'up-to-date': - return zh ? 'DSH Desktop 已是最新版本' : 'DSH Desktop is up to date' + return zh ? 'Sherlock 已是最新版本' : 'Sherlock is up to date' case 'unsupported': return zh ? '当前版本不支持自动更新' : 'Automatic updates are unavailable in this build' case 'error': diff --git a/src/preload/windows-titlebar.ts b/src/preload/windows-titlebar.ts index faca1d357..9e6da7f99 100644 --- a/src/preload/windows-titlebar.ts +++ b/src/preload/windows-titlebar.ts @@ -20,6 +20,26 @@ interface TitlebarMountOptions { locale: 'en' | 'zh' } +const nativeThemeSyncedDocuments = new WeakSet() + +export function mountNativeThemeSync( + options: Pick +): void { + const { document, ipcRenderer } = options + if (!document.body || nativeThemeSyncedDocuments.has(document)) return + nativeThemeSyncedDocuments.add(document) + + syncTheme(document, ipcRenderer) + const themeObserver = new MutationObserver(() => syncTheme(document, ipcRenderer)) + themeObserver.observe(document.body, { + attributes: true, + attributeFilter: ['data-ds-dark-theme'] + }) + window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => { + syncTheme(document, ipcRenderer) + }) +} + export function mountWindowsTitlebar(options: TitlebarMountOptions): void { const { document, ipcRenderer, locale } = options if (!document.body || document.getElementById(HOST_ID)) return @@ -29,7 +49,7 @@ export function mountWindowsTitlebar(options: TitlebarMountOptions): void { const host = document.createElement('div') host.id = HOST_ID - host.setAttribute('aria-label', locale === 'zh' ? 'DSH Desktop 标题栏' : 'DSH Desktop title bar') + host.setAttribute('aria-label', locale === 'zh' ? 'Sherlock 标题栏' : 'Sherlock title bar') const shadow = host.attachShadow({ mode: 'closed' }) const style = document.createElement('style') style.textContent = titlebarStyles @@ -96,16 +116,7 @@ export function mountWindowsTitlebar(options: TitlebarMountOptions): void { bar.appendChild(safeArea) shadow.append(style, bar) document.body.appendChild(host) - syncTheme(document, ipcRenderer) - - const themeObserver = new MutationObserver(() => syncTheme(document, ipcRenderer)) - themeObserver.observe(document.body, { - attributes: true, - attributeFilter: ['data-ds-dark-theme', 'class', 'style'] - }) - window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => { - syncTheme(document, ipcRenderer) - }) + mountNativeThemeSync({ document, ipcRenderer }) } function installLayout(document: Document): void { @@ -260,12 +271,6 @@ function menuEntries(locale: 'en' | 'zh'): MenuEntry[] { const zh = locale === 'zh' return [ { kind: 'label', label: 'HARNESS' }, - { - kind: 'command', - command: 'connect-phone', - label: zh ? '连接手机…' : 'Connect Phone…', - shortcut: 'Ctrl+Shift+M' - }, { kind: 'command', command: 'restart-harness', @@ -316,7 +321,7 @@ function menuEntries(locale: 'en' | 'zh'): MenuEntry[] { { kind: 'command', command: 'about', - label: zh ? '关于 DSH Desktop' : 'About DSH Desktop' + label: zh ? '关于 Sherlock' : 'About Sherlock' }, { kind: 'command', command: 'quit', label: zh ? '退出' : 'Exit' } ] diff --git a/src/shared/app-info.ts b/src/shared/app-info.ts new file mode 100644 index 000000000..e617d31a2 --- /dev/null +++ b/src/shared/app-info.ts @@ -0,0 +1,16 @@ +const APP_VERSION_ARGUMENT = '--sherlock-app-version=' + +export function appVersionArgument(version: string): string { + return `${APP_VERSION_ARGUMENT}${encodeURIComponent(version)}` +} + +export function appVersionFromArguments(arguments_: readonly string[]): string { + const argument = arguments_.find((value) => value.startsWith(APP_VERSION_ARGUMENT)) + if (!argument) return '—' + + try { + return decodeURIComponent(argument.slice(APP_VERSION_ARGUMENT.length)) || '—' + } catch { + return '—' + } +} diff --git a/src/shared/desktop-menu.ts b/src/shared/desktop-menu.ts index 76523ed39..44c2c9266 100644 --- a/src/shared/desktop-menu.ts +++ b/src/shared/desktop-menu.ts @@ -1,7 +1,6 @@ export const WINDOWS_TITLEBAR_HEIGHT = 36 export const desktopMenuCommands = [ - 'connect-phone', 'restart-harness', 'show-harness-log', 'check-for-updates', diff --git a/src/shared/developer-mode.ts b/src/shared/developer-mode.ts new file mode 100644 index 000000000..c2178f489 --- /dev/null +++ b/src/shared/developer-mode.ts @@ -0,0 +1,9 @@ +const DEVELOPER_MODE_ARGUMENT = '--sherlock-developer-mode' + +export function developerModeArgument(enabled: boolean): string { + return `${DEVELOPER_MODE_ARGUMENT}=${String(enabled)}` +} + +export function developerModeEnabledFromArguments(arguments_: readonly string[]): boolean { + return arguments_.includes(developerModeArgument(true)) +} diff --git a/src/shared/research-canvas-wheel.ts b/src/shared/research-canvas-wheel.ts new file mode 100644 index 000000000..e3a410068 --- /dev/null +++ b/src/shared/research-canvas-wheel.ts @@ -0,0 +1,28 @@ +export const RESEARCH_CANVAS_WHEEL_REGION_CHANNEL = 'research:canvas-wheel:set-region' +export const RESEARCH_CANVAS_WHEEL_EVENT_CHANNEL = 'research:canvas-wheel:native' + +export type ResearchCanvasWheelRegionUpdate = + | { + active: false + generation: number + ownerId: string + } + | { + active: true + generation: number + ownerId: string + left: number + top: number + width: number + height: number + } + +export type ResearchCanvasNativeWheel = { + generation: number + ownerId: string + clientX: number + clientY: number + deltaX: number + deltaY: number + deltaMode: 0 +} diff --git a/test/active-integration-lease.test.ts b/test/active-integration-lease.test.ts new file mode 100644 index 000000000..8f58257c1 --- /dev/null +++ b/test/active-integration-lease.test.ts @@ -0,0 +1,314 @@ +import fs, { chmodSync, existsSync, mkdirSync, readFileSync, statSync, unlinkSync, writeFileSync } from 'node:fs' +import { createHash } from 'node:crypto' +import { spawn } from 'node:child_process' +import { syncBuiltinESMExports } from 'node:module' +import path from 'node:path' +import { pathToFileURL } from 'node:url' +import { afterEach, describe, expect, it } from 'vitest' +import { + acquireActiveBatchLease, + archiveActiveBatchLease, + markActiveBatchAccepted, + readActiveBatchLease, + recoverActiveBatchOwnership, + updateActiveBatchTip +} from '../scripts/lib/sherlock-active-batch.mjs' +import { resolveRepositoryContext } from '../scripts/lib/sherlock-git-state.mjs' +import { createGitWorkflowFixture, type GitWorkflowFixture } from './helpers/git-workflow-fixture' + +const fixtures: GitWorkflowFixture[] = [] +const sha = (character: string) => character.repeat(40) +const digest = (character: string) => character.repeat(64) + +function fixture(): GitWorkflowFixture { + const value = createGitWorkflowFixture() + fixtures.push(value) + return value +} + +function setup(batchId = '20260831-01') { + const repository = fixture() + const integration = repository.createWorktree(`integration-${batchId}`, `codex/integration/${batchId}`) + const baseMainCommit = repository.git(repository.main, 'rev-parse', 'HEAD') + const manifestPath = `config/sherlock-integration-batches/${batchId}.json` + repository.write(integration, manifestPath, `{"batchId":"${batchId}"}\n`) + const currentTip = repository.commit(integration, '创建集成批次清单') + const ownerToken = `owner-${batchId}-secret` + const lease = { + batchId, + branch: `codex/integration/${batchId}`, + manifestPath, + baseMainCommit, + currentTip, + createdAt: '2026-08-31T04:00:00.000Z', + updatedAt: '2026-08-31T04:00:00.000Z' + } + return { repository, integration, ownerToken, lease, manifestPath, currentTip } +} + +function manifestDigest(repository: string, manifestPath: string): string { + return createHash('sha256').update(readFileSync(path.join(repository, manifestPath))).digest('hex') +} + +function acquireInWorker(options: Parameters[0]) { + const moduleUrl = pathToFileURL(path.join(import.meta.dirname, '..', 'scripts', 'lib', 'sherlock-active-batch.mjs')).href + const program = [ + `import { acquireActiveBatchLease } from ${JSON.stringify(moduleUrl)}`, + `const options = ${JSON.stringify(options)}`, + 'try { process.stdout.write(JSON.stringify({ created: acquireActiveBatchLease(options).created })) } catch (error) { process.stderr.write(error instanceof Error ? error.message : String(error)); process.exitCode = 1 }' + ].join('\n') + return new Promise<{ status: number | null; stdout: string; stderr: string }>((resolve, reject) => { + const child = spawn(process.execPath, ['--input-type=module', '--eval', program], { stdio: ['ignore', 'pipe', 'pipe'] }) + let stdout = '' + let stderr = '' + child.stdout.setEncoding('utf8') + child.stderr.setEncoding('utf8') + child.stdout.on('data', (chunk) => { stdout += chunk }) + child.stderr.on('data', (chunk) => { stderr += chunk }) + child.on('error', reject) + child.on('close', (status) => resolve({ status, stdout, stderr })) + }) +} + +function archiveInWorker(options: Parameters[0]) { + const moduleUrl = pathToFileURL(path.join(import.meta.dirname, '..', 'scripts', 'lib', 'sherlock-active-batch.mjs')).href + const program = [ + `import { archiveActiveBatchLease } from ${JSON.stringify(moduleUrl)}`, + `const options = ${JSON.stringify(options)}`, + 'try { archiveActiveBatchLease(options); process.stdout.write("archived") } catch (error) { process.stderr.write(error instanceof Error ? error.message : String(error)); process.exitCode = 1 }' + ].join('\n') + return new Promise<{ status: number | null; stdout: string; stderr: string }>((resolve, reject) => { + const child = spawn(process.execPath, ['--input-type=module', '--eval', program], { stdio: ['ignore', 'pipe', 'pipe'] }) + let stdout = '' + let stderr = '' + child.stdout.setEncoding('utf8') + child.stderr.setEncoding('utf8') + child.stdout.on('data', (chunk) => { stdout += chunk }) + child.stderr.on('data', (chunk) => { stderr += chunk }) + child.on('error', reject) + child.on('close', (status) => resolve({ status, stdout, stderr })) + }) +} + +afterEach(() => { + for (const value of fixtures.splice(0)) value.dispose() +}) + +describe('durable active integration lease', () => { + it('lets exactly one common-directory racer acquire a populated active lease', async () => { + const first = setup('20260831-01') + const second = first.repository.createWorktree('integration-racer', 'codex/integration/20260831-02') + const competingLease = { + ...first.lease, + batchId: '20260831-02', + branch: 'codex/integration/20260831-02', + manifestPath: 'config/sherlock-integration-batches/20260831-02.json', + currentTip: first.repository.git(second, 'rev-parse', 'HEAD') + } + + const [firstResult, secondResult] = await Promise.all([ + acquireInWorker({ repository: first.integration, lease: first.lease, ownerToken: first.ownerToken }), + acquireInWorker({ repository: second, lease: competingLease, ownerToken: 'other-secret' }) + ]) + + expect([firstResult.status, secondResult.status].filter((status) => status === 0), `${firstResult.stderr}\n${secondResult.stderr}`).toHaveLength(1) + expect([firstResult.stdout, secondResult.stdout].filter((stdout) => stdout === '{"created":true}')).toHaveLength(1) + const active = path.join(first.repository.commonDirectory, 'sherlock-integration', 'active') + expect(readFileSync(path.join(active, 'lease.json'), 'utf8')).toMatch(/20260831-0[12]/) + }) + + it('is idempotent only for the same owner and exact lease state', () => { + const value = setup() + const first = acquireActiveBatchLease({ repository: value.integration, lease: value.lease, ownerToken: value.ownerToken }) + const second = acquireActiveBatchLease({ repository: value.integration, lease: value.lease, ownerToken: value.ownerToken }) + + expect(first.created).toBe(true) + expect(second).toEqual({ lease: first.lease, created: false }) + expect(() => acquireActiveBatchLease({ repository: value.integration, lease: { ...value.lease, updatedAt: '2026-08-31T04:00:01.000Z' }, ownerToken: value.ownerToken })).toThrow(/不一致|匹配|租约/) + expect(() => acquireActiveBatchLease({ repository: value.integration, lease: value.lease, ownerToken: 'wrong-owner' })).toThrow(/不匹配|不一致|owner|所有者|令牌/) + }) + + it('stores only an owner digest in common storage and keeps the raw token mode 0600 in the integration git directory', () => { + const value = setup() + const result = acquireActiveBatchLease({ repository: value.integration, lease: value.lease, ownerToken: value.ownerToken }) + const context = resolveRepositoryContext(value.integration) + const ownerPath = path.join(context.gitDirectory, 'sherlock-integration-owner.json') + const commonLeasePath = path.join(value.repository.commonDirectory, 'sherlock-integration', 'active', 'lease.json') + + expect(result.lease.ownerTokenHash).toMatch(/^[0-9a-f]{64}$/) + expect(readFileSync(commonLeasePath, 'utf8')).not.toContain(value.ownerToken) + expect(readFileSync(ownerPath, 'utf8')).toContain(value.ownerToken) + expect(statSync(ownerPath).mode & 0o777).toBe(0o600) + expect(readActiveBatchLease(value.integration)).toEqual(result.lease) + }) + + it('requires owner, revision, and exact tip for CAS updates, then invalidates acceptance after a tip change', () => { + const value = setup() + const acquired = acquireActiveBatchLease({ repository: value.integration, lease: value.lease, ownerToken: value.ownerToken }).lease + const accepted = markActiveBatchAccepted({ + repository: value.integration, + ownerToken: value.ownerToken, + expectedRevision: acquired.revision, + acceptedTip: value.currentTip, + acceptedManifestDigest: manifestDigest(value.integration, value.manifestPath), + acceptedAt: '2026-08-31T04:01:00.000Z' + }) + value.repository.write(value.integration, 'src/after-accept.ts', 'export const afterAccept = true\n') + const nextTip = value.repository.commit(value.integration, '验收后继续修改') + + expect(() => updateActiveBatchTip({ repository: value.integration, ownerToken: 'wrong-owner', expectedRevision: accepted.revision, expectedTip: value.currentTip, nextTip, updatedAt: '2026-08-31T04:02:00.000Z' })).toThrow(/owner|所有者|令牌/) + expect(() => updateActiveBatchTip({ repository: value.integration, ownerToken: value.ownerToken, expectedRevision: accepted.revision - 1, expectedTip: value.currentTip, nextTip, updatedAt: '2026-08-31T04:02:00.000Z' })).toThrow(/revision|版本|过期/) + expect(() => updateActiveBatchTip({ repository: value.integration, ownerToken: value.ownerToken, expectedRevision: accepted.revision, expectedTip: sha('f'), nextTip, updatedAt: '2026-08-31T04:02:00.000Z' })).toThrow(/tip|提交|过期/) + + const updated = updateActiveBatchTip({ repository: value.integration, ownerToken: value.ownerToken, expectedRevision: accepted.revision, expectedTip: value.currentTip, nextTip, updatedAt: '2026-08-31T04:02:00.000Z' }) + expect(updated).toMatchObject({ revision: accepted.revision + 1, currentTip: nextTip }) + expect(updated.acceptedTip).toBeUndefined() + expect(updated.acceptedManifestDigest).toBeUndefined() + expect(updated.acceptedAt).toBeUndefined() + }) + + it('validates owner recovery without mutating the lease when every persisted identity matches', () => { + const value = setup() + const acquired = acquireActiveBatchLease({ repository: value.integration, lease: value.lease, ownerToken: value.ownerToken }).lease + const beforeRefs = value.repository.git(value.repository.main, 'for-each-ref', '--format=%(refname) %(objectname)') + const beforeWorktrees = value.repository.git(value.repository.main, 'worktree', 'list', '--porcelain') + const beforeStatus = value.repository.git(value.integration, 'status', '--porcelain=v1') + const result = recoverActiveBatchOwnership({ + repository: value.integration, + expectedBatchId: value.lease.batchId, + expectedTip: value.currentTip, + expectedManifestDigest: manifestDigest(value.integration, value.manifestPath) + }) + + expect(result.lease).toEqual(acquired) + expect(result.ownerTokenFile).toBe(path.join(resolveRepositoryContext(value.integration).gitDirectory, 'sherlock-integration-owner.json')) + expect(value.repository.git(value.repository.main, 'for-each-ref', '--format=%(refname) %(objectname)')).toBe(beforeRefs) + expect(value.repository.git(value.repository.main, 'worktree', 'list', '--porcelain')).toBe(beforeWorktrees) + expect(value.repository.git(value.integration, 'status', '--porcelain=v1')).toBe(beforeStatus) + }) + + it('refuses owner recovery on missing token, batch, tip, or tracked manifest mismatch while preserving the lease', () => { + const value = setup() + acquireActiveBatchLease({ repository: value.integration, lease: value.lease, ownerToken: value.ownerToken }) + const activePath = path.join(value.repository.commonDirectory, 'sherlock-integration', 'active', 'lease.json') + const original = readFileSync(activePath, 'utf8') + const options = { repository: value.integration, expectedBatchId: value.lease.batchId, expectedTip: value.currentTip, expectedManifestDigest: manifestDigest(value.integration, value.manifestPath) } + const ownerPath = path.join(resolveRepositoryContext(value.integration).gitDirectory, 'sherlock-integration-owner.json') + + unlinkSync(ownerPath) + expect(() => recoverActiveBatchOwnership(options)).toThrow(/token|令牌/) + writeFileSync(ownerPath, JSON.stringify({ schemaVersion: 1, batchId: '20260831-99', ownerToken: value.ownerToken })) + chmodSync(ownerPath, 0o600) + expect(() => recoverActiveBatchOwnership(options)).toThrow(/不匹配|batch|批次/) + writeFileSync(ownerPath, JSON.stringify({ schemaVersion: 1, batchId: value.lease.batchId, ownerToken: value.ownerToken })) + chmodSync(ownerPath, 0o600) + expect(() => recoverActiveBatchOwnership({ ...options, expectedTip: sha('e') })).toThrow(/Tip|提交/) + expect(() => recoverActiveBatchOwnership({ ...options, expectedManifestDigest: digest('d') })).toThrow(/ManifestDigest|摘要/) + expect(readFileSync(activePath, 'utf8')).toBe(original) + }) + + it('archives only the lease atomically and requires explicit cancellation when no valid owner is supplied', () => { + const value = setup() + const acquired = acquireActiveBatchLease({ repository: value.integration, lease: value.lease, ownerToken: value.ownerToken }).lease + const beforeRefs = value.repository.git(value.repository.main, 'for-each-ref', '--format=%(refname) %(objectname)') + const beforeWorktrees = value.repository.git(value.repository.main, 'worktree', 'list', '--porcelain') + const beforeStatus = value.repository.git(value.integration, 'status', '--porcelain=v1') + const manifestContents = readFileSync(path.join(value.integration, value.manifestPath), 'utf8') + + expect(() => archiveActiveBatchLease({ repository: value.integration, expectedBatchId: value.lease.batchId, outcome: 'cancelled', archivedAt: '2026-08-31T04:03:00.000Z' })).toThrow(/取消|cancellation|确认/) + expect(() => archiveActiveBatchLease({ repository: value.integration, ownerToken: 'wrong-owner', expectedBatchId: value.lease.batchId, outcome: 'promoted', archivedAt: '2026-08-31T04:03:00.000Z' })).toThrow(/owner|所有者|令牌/) + const archived = archiveActiveBatchLease({ repository: value.integration, expectedBatchId: value.lease.batchId, outcome: 'cancelled', archivedAt: '2026-08-31T04:03:00.000Z', explicitCancellation: true }) + + expect(archived.lease).toEqual(acquired) + expect(archived.archivePath).toBe(path.join(value.repository.commonDirectory, 'sherlock-integration', 'history', '20260831-01-cancelled-2026-08-31T04-03-00.000Z', 'lease.json')) + expect(existsSync(archived.archivePath)).toBe(true) + expect(readActiveBatchLease(value.integration)).toBeNull() + expect(value.repository.git(value.repository.main, 'for-each-ref', '--format=%(refname) %(objectname)')).toBe(beforeRefs) + expect(value.repository.git(value.repository.main, 'worktree', 'list', '--porcelain')).toBe(beforeWorktrees) + expect(value.repository.git(value.integration, 'status', '--porcelain=v1')).toBe(beforeStatus) + expect(readFileSync(path.join(value.integration, value.manifestPath), 'utf8')).toBe(manifestContents) + }) + + it('allows one same-destination archive contender and preserves its lease bytes without changing Git state', async () => { + const value = setup() + acquireActiveBatchLease({ repository: value.integration, lease: value.lease, ownerToken: value.ownerToken }) + const activeLeasePath = path.join(value.repository.commonDirectory, 'sherlock-integration', 'active', 'lease.json') + const leaseBytes = readFileSync(activeLeasePath) + const beforeRefs = value.repository.git(value.repository.main, 'for-each-ref', '--format=%(refname) %(objectname)') + const beforeWorktrees = value.repository.git(value.repository.main, 'worktree', 'list', '--porcelain') + const beforeStatus = value.repository.git(value.integration, 'status', '--porcelain=v1') + const options = { repository: value.integration, expectedBatchId: value.lease.batchId, outcome: 'cancelled' as const, archivedAt: '2026-08-31T04:04:00.000Z', explicitCancellation: true } + const [first, second] = await Promise.all([archiveInWorker(options), archiveInWorker(options)]) + const archivePath = path.join(value.repository.commonDirectory, 'sherlock-integration', 'history', '20260831-01-cancelled-2026-08-31T04-04-00.000Z', 'lease.json') + + expect([first.status, second.status].filter((status) => status === 0), `${first.stderr}\n${second.stderr}`).toHaveLength(1) + expect([first.stdout, second.stdout].filter((stdout) => stdout === 'archived')).toHaveLength(1) + expect(readFileSync(archivePath)).toEqual(leaseBytes) + expect(value.repository.git(value.repository.main, 'for-each-ref', '--format=%(refname) %(objectname)')).toBe(beforeRefs) + expect(value.repository.git(value.repository.main, 'worktree', 'list', '--porcelain')).toBe(beforeWorktrees) + expect(value.repository.git(value.integration, 'status', '--porcelain=v1')).toBe(beforeStatus) + expect(readFileSync(path.join(value.integration, value.manifestPath), 'utf8')).toBe(`{"batchId":"20260831-01"}\n`) + }) + + it('uses the final destination rather than an obsolete adjacent claim as the archive authority', () => { + const value = setup() + acquireActiveBatchLease({ repository: value.integration, lease: value.lease, ownerToken: value.ownerToken }) + const activeLeasePath = path.join(value.repository.commonDirectory, 'sherlock-integration', 'active', 'lease.json') + const leaseBytes = readFileSync(activeLeasePath) + const claim = 'sherlock-integration/history/20260831-01-cancelled-2026-08-31T04-05-00.000Z.claim' + value.repository.writeCommonIntegrationFile(claim, 'interrupted archive claim\n') + + const archived = archiveActiveBatchLease({ repository: value.integration, expectedBatchId: value.lease.batchId, outcome: 'cancelled', archivedAt: '2026-08-31T04:05:00.000Z', explicitCancellation: true }) + expect(readFileSync(archived.archivePath)).toEqual(leaseBytes) + expect(existsSync(activeLeasePath)).toBe(false) + expect(readFileSync(path.join(value.repository.commonDirectory, claim), 'utf8')).toBe('interrupted archive claim\n') + }) + + it('fails closed when the final archive directory or its lease file already exists', () => { + const value = setup() + acquireActiveBatchLease({ repository: value.integration, lease: value.lease, ownerToken: value.ownerToken }) + const activeLeasePath = path.join(value.repository.commonDirectory, 'sherlock-integration', 'active', 'lease.json') + const leaseBytes = readFileSync(activeLeasePath) + const archiveDirectory = 'sherlock-integration/history/20260831-01-cancelled-2026-08-31T04-06-00.000Z' + value.repository.writeCommonIntegrationFile(`${archiveDirectory}/lease.json`, 'preexisting final lease\n') + + expect(() => archiveActiveBatchLease({ repository: value.integration, expectedBatchId: value.lease.batchId, outcome: 'cancelled', archivedAt: '2026-08-31T04:06:00.000Z', explicitCancellation: true })).toThrow(/归档|存在|覆盖/) + expect(readFileSync(activeLeasePath)).toEqual(leaseBytes) + expect(readFileSync(path.join(value.repository.commonDirectory, archiveDirectory, 'lease.json'), 'utf8')).toBe('preexisting final lease\n') + }) + + it('does not replace a preexisting empty final archive directory', () => { + const value = setup() + acquireActiveBatchLease({ repository: value.integration, lease: value.lease, ownerToken: value.ownerToken }) + const activeLeasePath = path.join(value.repository.commonDirectory, 'sherlock-integration', 'active', 'lease.json') + const leaseBytes = readFileSync(activeLeasePath) + const archiveDirectory = path.join(value.repository.commonDirectory, 'sherlock-integration', 'history', '20260831-01-cancelled-2026-08-31T04-08-00.000Z') + mkdirSync(archiveDirectory, { recursive: true }) + + expect(() => archiveActiveBatchLease({ repository: value.integration, expectedBatchId: value.lease.batchId, outcome: 'cancelled', archivedAt: '2026-08-31T04:08:00.000Z', explicitCancellation: true })).toThrow(/归档|存在|覆盖/) + expect(readFileSync(activeLeasePath)).toEqual(leaseBytes) + expect(existsSync(archiveDirectory)).toBe(true) + expect(existsSync(path.join(archiveDirectory, 'lease.json'))).toBe(false) + }) + + it('preserves active lease bytes and leaves a reserved final directory when publication fails', () => { + const value = setup() + acquireActiveBatchLease({ repository: value.integration, lease: value.lease, ownerToken: value.ownerToken }) + const activeLeasePath = path.join(value.repository.commonDirectory, 'sherlock-integration', 'active', 'lease.json') + const leaseBytes = readFileSync(activeLeasePath) + const archiveDirectory = path.join(value.repository.commonDirectory, 'sherlock-integration', 'history', '20260831-01-cancelled-2026-08-31T04-07-00.000Z') + const originalLink = fs.linkSync + fs.linkSync = () => { throw new Error('controlled link publication failure') } + syncBuiltinESMExports() + try { + expect(() => archiveActiveBatchLease({ repository: value.integration, expectedBatchId: value.lease.batchId, outcome: 'cancelled', archivedAt: '2026-08-31T04:07:00.000Z', explicitCancellation: true })).toThrow(/发布失败|恢复/) + } finally { + fs.linkSync = originalLink + syncBuiltinESMExports() + } + + expect(readFileSync(activeLeasePath)).toEqual(leaseBytes) + expect(existsSync(archiveDirectory)).toBe(true) + expect(existsSync(path.join(archiveDirectory, 'lease.json'))).toBe(false) + }) +}) diff --git a/test/app-identity.test.ts b/test/app-identity.test.ts new file mode 100644 index 000000000..effeb24e4 --- /dev/null +++ b/test/app-identity.test.ts @@ -0,0 +1,100 @@ +import { mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises' +import { tmpdir } from 'node:os' +import { join } from 'node:path' +import { afterEach, describe, expect, it } from 'vitest' +import { resolveDesktopIdentity } from '../src/main/app-identity' +import { migrateLegacyUserData } from '../src/main/app-data-migration' + +const temporaryDirectories: string[] = [] + +afterEach(async () => { + await Promise.all( + temporaryDirectories.splice(0).map((directory) => + rm(directory, { force: true, recursive: true }) + ) + ) +}) + +describe('desktop app identity', () => { + it('keeps old legacy data isolated while the bridge and notarized app share Sherlock data', () => { + expect( + resolveDesktopIdentity('/Users/test/Library/Application Support', 'legacy', '') + ).toEqual({ + name: 'Sherlock', + userData: '/Users/test/Library/Application Support/dsh-desktop' + }) + expect( + resolveDesktopIdentity('/Users/test/Library/Application Support', 'legacy-bridge', '') + ).toEqual({ + name: 'Sherlock', + userData: '/Users/test/Library/Application Support/sherlock-desktop' + }) + expect( + resolveDesktopIdentity('/Users/test/Library/Application Support', 'notarized', '') + ).toEqual({ + name: 'Sherlock', + userData: '/Users/test/Library/Application Support/sherlock-desktop' + }) + expect( + resolveDesktopIdentity('/Users/test/Library/Application Support', 'development', '') + ).toEqual({ + name: 'Sherlock Dev', + userData: '/Users/test/Library/Application Support/dsh-desktop-dev' + }) + }) + + it('allows only an absolute explicit user-data path for an isolated launch', () => { + expect( + resolveDesktopIdentity('/Applications', 'legacy', '/tmp/sherlock-update-fixture').userData + ).toBe('/tmp/sherlock-update-fixture') + expect(() => resolveDesktopIdentity('/Applications', 'notarized', 'relative/path')).toThrow( + 'absolute' + ) + }) + + it('migrates durable legacy data once without copying singleton locks or caches', async () => { + const root = await mkdtemp(join(tmpdir(), 'sherlock-app-data-')) + temporaryDirectories.push(root) + const legacyUserData = join(root, 'dsh-desktop') + const targetUserData = join(root, 'sherlock-desktop') + await mkdir(join(legacyUserData, 'harness'), { recursive: true }) + await mkdir(join(legacyUserData, 'Cache'), { recursive: true }) + await writeFile(join(legacyUserData, 'harness', 'session-sentinel.txt'), 'preserved') + await writeFile(join(legacyUserData, 'SingletonLock'), 'stale-lock') + await writeFile(join(legacyUserData, 'Cache', 'cache-entry'), 'volatile') + + expect(migrateLegacyUserData(legacyUserData, targetUserData)).toBe(true) + await expect(readFile(join(targetUserData, 'harness', 'session-sentinel.txt'), 'utf8')).resolves.toBe( + 'preserved' + ) + await expect(readFile(join(targetUserData, 'SingletonLock'), 'utf8')).rejects.toThrow() + await expect(readFile(join(targetUserData, 'Cache', 'cache-entry'), 'utf8')).rejects.toThrow() + + await writeFile(join(legacyUserData, 'harness', 'session-sentinel.txt'), 'changed') + expect(migrateLegacyUserData(legacyUserData, targetUserData)).toBe(false) + await expect(readFile(join(targetUserData, 'harness', 'session-sentinel.txt'), 'utf8')).resolves.toBe( + 'preserved' + ) + }) + + it('finishes an interrupted migration into an existing target without overwriting new data', async () => { + const root = await mkdtemp(join(tmpdir(), 'sherlock-app-data-recovery-')) + temporaryDirectories.push(root) + const legacyUserData = join(root, 'dsh-desktop') + const targetUserData = join(root, 'sherlock-desktop') + await mkdir(join(legacyUserData, 'harness'), { recursive: true }) + await mkdir(join(targetUserData, 'harness'), { recursive: true }) + await writeFile(join(legacyUserData, 'harness', 'legacy-session.txt'), 'legacy') + await writeFile(join(legacyUserData, 'harness', 'settings.yaml'), 'old settings') + await writeFile(join(targetUserData, 'harness', 'settings.yaml'), 'new settings') + + expect(migrateLegacyUserData(legacyUserData, targetUserData)).toBe(true) + await expect(readFile(join(targetUserData, 'harness', 'legacy-session.txt'), 'utf8')).resolves.toBe( + 'legacy' + ) + await expect(readFile(join(targetUserData, 'harness', 'settings.yaml'), 'utf8')).resolves.toBe( + 'new settings' + ) + expect(migrateLegacyUserData(legacyUserData, targetUserData)).toBe(false) + }) +}) diff --git a/test/app-info.test.ts b/test/app-info.test.ts new file mode 100644 index 000000000..891cd54ee --- /dev/null +++ b/test/app-info.test.ts @@ -0,0 +1,16 @@ +import { describe, expect, it } from 'vitest' +import { appVersionArgument, appVersionFromArguments } from '../src/shared/app-info' + +describe('Sherlock app info renderer argument', () => { + it('passes the packaged app version into the isolated renderer', () => { + expect(appVersionArgument('0.6.6')).toBe('--sherlock-app-version=0.6.6') + expect(appVersionFromArguments([ + '/path/to/renderer', + '--sherlock-app-version=0.6.6' + ])).toBe('0.6.6') + }) + + it('uses an unavailable marker when no version was provided', () => { + expect(appVersionFromArguments(['/path/to/renderer'])).toBe('—') + }) +}) diff --git a/test/brand-migration.test.ts b/test/brand-migration.test.ts new file mode 100644 index 000000000..dd80c69bf --- /dev/null +++ b/test/brand-migration.test.ts @@ -0,0 +1,155 @@ +import { readFile } from 'node:fs/promises' +import path from 'node:path' +import { describe, expect, it } from 'vitest' + +const projectRoot = path.resolve(import.meta.dirname, '..') + +async function projectFile(relativePath: string): Promise { + return readFile(path.join(projectRoot, relativePath), 'utf8') +} + +describe('Sherlock client brand migration', () => { + it('ships Sherlock application and installer display names', async () => { + const packageJson = JSON.parse(await projectFile('package.json')) as { + description: string + scripts: Record + build: { + productName: string + artifactName: string + nsis: { artifactName: string } + } + } + const developmentConfig = await projectFile('electron-builder.dev.cjs') + + expect(packageJson.description).toBe('Sherlock local-first desktop knowledge assistant.') + expect(packageJson.build.productName).toBe('Sherlock') + expect(packageJson.build.artifactName).toBe('sherlock-${os}-${arch}.${ext}') + expect(packageJson.build.nsis.artifactName).toBe('sherlock-windows-${arch}-setup.${ext}') + expect(packageJson.scripts.build).toContain('node scripts/install-brand-assets.mjs') + expect(packageJson.scripts['package:mac:arm64']).toContain('dist/mac-arm64/Sherlock.app') + expect(packageJson.scripts['package:mac:x64']).toContain('dist/mac/Sherlock.app') + expect(developmentConfig).toContain("productName: 'Sherlock Dev'") + expect(developmentConfig).toContain("artifactName: 'sherlock-dev-windows-${arch}-setup.${ext}'") + }) + + it('uses the formal Sherlock identity for everyday build and run', async () => { + const packageJson = JSON.parse(await projectFile('package.json')) as { + scripts: Record + } + const buildAndRun = await projectFile('script/build_and_run.sh') + + expect(packageJson.scripts['package:formal:dir']).toContain( + '--config electron-builder.notarized.cjs' + ) + expect(buildAndRun).toContain('dist-notarized/mac-arm64/Sherlock.app') + expect(buildAndRun).toContain('build_formal_app') + expect(buildAndRun).toContain("echo 'Sherlock is running.'") + expect(buildAndRun).toContain('codesign --verify --deep --strict') + expect(buildAndRun).toContain('stable_checks=0') + expect(buildAndRun).toContain('[ "$stable_checks" -ge 4 ]') + expect(buildAndRun).not.toContain('package:dev:dir') + expect(buildAndRun).not.toContain('Sherlock Dev is running.') + }) + + it('uses Sherlock across Electron-owned user interfaces', async () => { + const files = await Promise.all([ + 'src/main/index.ts', + 'src/main/runtime/harness-runtime.ts', + 'src/main/runtime/profile-plugin-command.ts', + 'src/main/plugin-recovery-view.ts', + 'src/preload/index.ts', + 'src/preload/update-view.ts', + 'src/preload/windows-titlebar.ts', + 'src/main/mobile/lan-mobile-pages.ts', + 'build/splash.html', + 'build/plugin-recovery.html' + ].map(projectFile)) + const ownedSurfaces = files.join('\n') + + expect(ownedSurfaces).toContain('Sherlock') + expect(ownedSurfaces).not.toMatch(/DSH Desktop|DSH Mobile|DeepSeek Harness/) + expect(ownedSurfaces).not.toMatch(/compatible DSH plugin|兼容的 DSH 插件/) + }) + + it('owns a product About section instead of relabeling the update plugin', async () => { + const [settingsGeneral, preload] = await Promise.all([ + projectFile('node_modules/@deepseek-ai/dsh-client-ui-settings-general/lib/client.js'), + projectFile('src/preload/index.ts') + ]) + + expect(settingsGeneral).toContain('id: "about"') + expect(settingsGeneral).toContain('function SherlockAboutContent({ info, t })') + expect(settingsGeneral).toContain('className: "sherlock-about-changelog"') + expect(settingsGeneral).toContain('"about.nav": "关于"') + expect(settingsGeneral).toContain('"about.changelog": "更新日志"') + expect(settingsGeneral).not.toContain('本地优先的桌面知识助手') + expect(preload).toContain("'sherlockAbout'") + expect(preload).toContain('createSherlockAboutBridge(') + expect(preload).not.toContain('publicSettingsSectionLabel') + }) + + it('mounts public-mode visibility before optional shell styling', async () => { + const preload = await projectFile('src/preload/index.ts') + const initialize = preload.slice( + preload.indexOf('function initializeUi()'), + preload.indexOf("window.addEventListener('error'") + ) + + expect(initialize.indexOf('mountDeveloperModeUi()')).toBeGreaterThan(-1) + expect(initialize.indexOf('mountDeveloperModeUi()')).toBeLessThan( + initialize.indexOf('mountDesktopShellStyles(document)') + ) + }) + + it('brands the embedded web shell and patched visible copy as Sherlock', async () => { + const [index, manifest, installer, settings, pluginSettings, presets, directoryPicker, workspace] = + await Promise.all([ + projectFile('node_modules/@deepseek-ai/dsh-web-frontend/dist/index.html'), + projectFile('node_modules/@deepseek-ai/dsh-web-frontend/dist/manifest.webmanifest'), + projectFile('packages/dsh-desktop-market-installer/client.js'), + projectFile('node_modules/@deepseek-ai/dsh-client-ui-settings-models/lib/client.js'), + projectFile('node_modules/@deepseek-ai/dsh-client-ui-settings-plugins/lib/client.js'), + projectFile('node_modules/@deepseek-ai/dsh-client-ui-agent-preset/lib/client.js'), + projectFile('node_modules/@deepseek-ai/dsh-client-ui-directory-picker-native/lib/client.js'), + projectFile('node_modules/@deepseek-ai/dsh-client-ui-workspace/lib/client.js') + ]) + + expect(index).toContain('Sherlock') + expect(manifest).toContain('"name": "Sherlock"') + expect(manifest).toContain('"short_name": "Sherlock"') + expect(installer).not.toContain('DSH Desktop') + expect(installer).toContain('inside Sherlock') + + expect(settings).not.toContain('displayName: "DeepSeek"') + expect(settings).not.toMatch(/DSH will|DSH 会/) + expect(settings).not.toMatch(/DeepSeek Harness|DSH plugin ecosystem|DSH 插件生态/) + expect(settings).toMatch(/Sherlock will|Sherlock 会/) + expect(settings).toContain('useState)("openai")') + expect(pluginSettings).not.toMatch(/The DeepSeek search provider|DeepSeek 搜索提供方/) + expect(pluginSettings).toMatch( + /free local browser fallback|免费的本地浏览器/ + ) + + expect(presets).not.toMatch(/Created with DSH|another DSH version|由 DSH|另一个 DSH 版本/) + expect(presets).toContain('Created with Sherlock') + expect(presets).toContain('children: "Sherlock"') + expect(directoryPicker).not.toContain('DSH Desktop directory picker') + expect(workspace).not.toContain('acknowledged by DSH Desktop') + }) + + it('keeps compatibility identifiers while hiding them from product copy', async () => { + const [main, appIdentity, runtime, packageJson] = await Promise.all([ + projectFile('src/main/index.ts'), + projectFile('src/main/app-identity.ts'), + projectFile('src/main/runtime/harness-runtime.ts'), + projectFile('package.json') + ]) + + expect(main).toContain('resolveDesktopIdentity(') + expect(appIdentity).toContain("channel === 'notarized'") + expect(appIdentity).toContain("'sherlock-desktop'") + expect(appIdentity).toContain("'dsh-desktop'") + expect(runtime).toContain('DSH_BUNDLED_SKILL_DIR') + expect(packageJson).toContain('"@deepseek-ai/dsh"') + }) +}) diff --git a/test/branding-patch.test.ts b/test/branding-patch.test.ts index 68b2eaf4b..312f792c2 100644 --- a/test/branding-patch.test.ts +++ b/test/branding-patch.test.ts @@ -4,7 +4,7 @@ import { describe, expect, it } from 'vitest' const projectRoot = path.resolve(import.meta.dirname, '..') -describe('DSH Desktop sidebar branding', () => { +describe('Sherlock sidebar branding', () => { it('matches the native window surface to the initial Harness theme', async () => { const main = await readFile(path.join(projectRoot, 'src', 'main', 'index.ts'), 'utf8') @@ -19,33 +19,61 @@ describe('DSH Desktop sidebar branding', () => { expect(main).toContain("dragRegion.id = 'dsh-desktop-drag-region'") expect(main).toContain("dragRegion.style.setProperty('-webkit-app-region', 'drag')") expect(main).toContain("left: '80px'") - expect(main).toContain("right: '220px'") + expect(main).toContain("right: 'max(220px, var(--dsh-sidebar-width, 0px))'") expect(main).toContain("height: '24px'") }) - it('pairs the DSH logo with the original Harness wordmark in the expanded sidebar', async () => { + it('uses the supplied Sherlock vector wordmark in the expanded sidebar', async () => { const patch = await readFile( path.join(projectRoot, 'patches', '@deepseek-ai+dsh-client-ui-sidebar+0.1.0-rc.7.patch'), 'utf8' ) - expect(patch).toContain('DshDesktopLogo') - expect(patch).toContain('DshDesktopBrand') - expect(patch).toContain('BrandWordmark') - expect(patch).toContain('/dsh-desktop-logo-light.png') - expect(patch).toContain('/dsh-desktop-logo-dark.png') - expect(patch).toContain('brandWordmark') - expect(patch).toContain('gap:4px') - expect(patch).toContain('transform:translateX(-24px)') + expect(patch).toContain('SherlockLogo') + expect(patch).toContain('/sherlock-logo.svg') + expect(patch).toContain('-webkit-mask:') + expect(patch).toContain('width:120px;height:17px') + expect(patch).toContain('"aria-label": "Sherlock"') + expect(patch).not.toContain('DshDesktopLogo') + expect(patch).not.toContain('/dsh-desktop-logo-light.png') + expect(patch).not.toContain('/dsh-desktop-logo-dark.png') expect(patch).not.toContain('children: "DSH Desktop"') - expect(patch).toContain('height = 20') - expect(patch).toContain('height: 18') expect(patch).toContain('.hHd-Xa_brand:hover') expect(patch).toContain('padding-top:32px') expect(patch).toContain('navigator.userAgent.includes("Macintosh")') expect(patch).toContain('.hHd-Xa_root.hHd-Xa_collapsed{padding:46px 22px 6px}') - expect(patch).toContain('body[data-ds-dark-theme] .dshDesktopLogoLight') - expect(patch).toContain('body[data-ds-dark-theme] .dshDesktopLogoDark') + }) + + it('keeps the Dock icon artwork within the standard macOS visual bounds', async () => { + const { default: sharp } = await import('sharp') + const { info } = await sharp(path.join(projectRoot, 'build', 'app-icon.png')) + .trim({ background: { r: 0, g: 0, b: 0, alpha: 0 } }) + .toBuffer({ resolveWithObject: true }) + + expect(info.width).toBe(824) + expect(info.height).toBe(824) + }) + + it('shows the new truth-seeking headline without the whale mark', async () => { + const client = await readFile( + path.join( + projectRoot, + 'node_modules', + '@deepseek-ai', + 'dsh-client-ui-conversation', + 'lib', + 'client.js' + ), + 'utf8' + ) + const heroStart = client.indexOf('function HeroShell({ t, children })') + const heroEnd = client.indexOf('//#endregion', heroStart) + const hero = client.slice(heroStart, heroEnd) + + expect(client).toContain('"hero.headline": "迷雾之中，洞见真相"') + expect(client).toContain('"hero.headline": "Through the Mist, See the Truth"') + expect(hero).not.toContain('FishLogo') + expect(hero).toContain('children: t("hero.preview")') }) it('uses an 80px macOS rail that clears the traffic lights', async () => { @@ -58,7 +86,7 @@ describe('DSH Desktop sidebar branding', () => { expect(patch).toContain('sidebar === 0 ? COLLAPSED_SIDEBAR_WIDTH') }) - it('provides a sidebar phone entry that follows expanded and connected state', async () => { + it('does not expose or initialize the retired phone pairing feature', async () => { const patch = await readFile( path.join(projectRoot, 'patches', '@deepseek-ai+dsh-client-ui-sidebar+0.1.0-rc.7.patch'), 'utf8' @@ -68,12 +96,12 @@ describe('DSH Desktop sidebar branding', () => { expect(patch).toContain('data-dsh-sidebar-root') expect(patch).toContain('data-dsh-sidebar-wide') - expect(patch).toContain('data-dsh-sidebar-footer') - expect(preload).toContain("button.hidden = !wide && !phoneConnected") - expect(preload).toContain("button.classList.toggle('is-connected', phoneConnected)") - expect(preload).toContain("ipcRenderer.invoke('mobile:open-pairing')") - expect(main).toContain("ipcMain.handle('mobile:open-pairing'") - expect(main).toContain("ipcMain.handle('mobile:status'") + expect(patch).not.toContain('data-dsh-sidebar-footer') + expect(preload).not.toContain('dsh-desktop-mobile-button') + expect(preload).not.toContain("ipcRenderer.invoke('mobile:") + expect(main).not.toContain('LanMobileBridge') + expect(main).not.toContain('showMobilePairing') + expect(main).not.toContain("ipcMain.handle('mobile:") }) it('installs the source logo into the Harness static frontend', async () => { @@ -87,12 +115,30 @@ describe('DSH Desktop sidebar branding', () => { expect(packageJson.scripts.postinstall).toContain('node scripts/install-brand-assets.mjs') expect(installer).toContain("'build', 'icon.png'") - expect(installer).toContain("'dsh-desktop-logo.png'") - expect(installer).toContain("'build', 'logo-light.png'") - expect(installer).toContain("'dsh-desktop-logo-light.png'") - expect(installer).toContain("'build', 'logo-dark.png'") - expect(installer).toContain("'dsh-desktop-logo-dark.png'") - expect(installer).toContain('') - expect(installer).toContain('"src": "/dsh-desktop-logo.png"') + expect(installer).toContain("'sherlock-icon.png'") + expect(installer).toContain("'build', 'sherlock-logo.svg'") + expect(installer).toContain("'sherlock-logo.svg'") + expect(installer).toContain('') + expect(installer).toContain('"src": "/sherlock-icon.png"') + expect(installer).toContain('Sherlock') + expect(installer).toContain('"name": "Sherlock"') + + const logo = await readFile(path.join(projectRoot, 'build', 'sherlock-logo.svg'), 'utf8') + expect(logo).toContain('viewBox="275 334 1317 180"') + expect(logo).not.toContain('transform="matrix(') + }) + + it('installs the dedicated Research action icon into the static frontend', async () => { + const source = await readFile(path.join(projectRoot, 'build', 'sherlock-research.svg'), 'utf8') + const installed = await readFile(path.join( + projectRoot, + 'node_modules', + '@deepseek-ai', + 'dsh-web-frontend', + 'dist', + 'sherlock-research.svg' + ), 'utf8') + + expect(installed).toBe(source) }) }) diff --git a/test/browser-search-controller.test.ts b/test/browser-search-controller.test.ts new file mode 100644 index 000000000..d6abc9374 --- /dev/null +++ b/test/browser-search-controller.test.ts @@ -0,0 +1,302 @@ +import { describe, expect, it } from 'vitest' +import { + BrowserSearchController, + browserSearchWindowOptions, + configureBrowserSearchSecurity, + type BrowserSearchWindow +} from '../src/main/search/browser-search-controller' + +type PageState = { url: string; title: string; text: string } + +class FakeSearchWindow implements BrowserSearchWindow { + readonly loaded: string[] = [] + readonly webContents: BrowserSearchWindow['webContents'] + visible = false + destroyed = false + stopped = false + title = '' + activeLoads = 0 + maxActiveLoads = 0 + currentUrl = '' + pageStates: PageState[] = [] + results = new Map() + loadBarrier?: Promise + + constructor() { + this.webContents = { + executeJavaScript: async (script) => { + if (script.includes('document.body?.innerText')) { + return ( + this.pageStates.shift() ?? { + url: this.currentUrl, + title: 'Search results', + text: 'ordinary results' + } + ) + } + const engine = this.currentUrl.includes('bing.com') ? 'bing' : 'duckduckgo' + return this.results.get(engine) ?? [] + }, + getURL: () => this.currentUrl, + stop: () => { + if (this.destroyed) throw new Error('Object has been destroyed') + this.stopped = true + } + } + } + + async loadURL(url: string): Promise { + this.loaded.push(url) + this.currentUrl = url + this.activeLoads += 1 + this.maxActiveLoads = Math.max(this.maxActiveLoads, this.activeLoads) + await this.loadBarrier + this.activeLoads -= 1 + } + + show(): void { + this.visible = true + } + + hide(): void { + this.visible = false + } + + setTitle(title: string): void { + this.title = title + } + + isDestroyed(): boolean { + return this.destroyed + } + + destroy(): void { + this.destroyed = true + } +} + +describe('BrowserSearchController', () => { + it('requests a hidden sandboxed window in a non-persistent partition', () => { + expect(browserSearchWindowOptions()).toMatchObject({ + show: false, + title: 'Sherlock Web Search', + webPreferences: { + partition: 'sherlock-web-search', + nodeIntegration: false, + contextIsolation: true, + sandbox: true, + webSecurity: true + } + }) + expect(browserSearchWindowOptions().webPreferences?.preload).toBeUndefined() + }) + + it('denies permissions, popups, downloads, and audio in the search session', async () => { + let permissionDecision: ((allowed: boolean) => void) | undefined + let permissionCheck: (() => boolean) | undefined + let downloadHandler: ((event: { preventDefault(): void }) => void) | undefined + let popupHandler: (() => { action: string }) | undefined + let audioMuted = false + const searchSession = { + setPermissionRequestHandler: ( + handler: (_webContents: unknown, _permission: string, decide: (allowed: boolean) => void) => void + ) => { + handler(undefined, 'geolocation', (allowed) => { + permissionDecision?.(allowed) + }) + }, + setPermissionCheckHandler: (handler: () => boolean) => { + permissionCheck = handler + }, + on: (_event: 'will-download', handler: (event: { preventDefault(): void }) => void) => { + downloadHandler = handler + } + } + const window = { + webContents: { + setWindowOpenHandler: (handler: () => { action: string }) => { + popupHandler = handler + }, + setAudioMuted: (muted: boolean) => { + audioMuted = muted + } + } + } + const permissionResult = new Promise((resolve) => { + permissionDecision = resolve + }) + + configureBrowserSearchSecurity(window, searchSession) + + let downloadPrevented = false + downloadHandler?.({ preventDefault: () => (downloadPrevented = true) }) + await expect(permissionResult).resolves.toBe(false) + expect(permissionCheck?.()).toBe(false) + expect(popupHandler?.()).toEqual({ action: 'deny' }) + expect(downloadPrevented).toBe(true) + expect(audioMuted).toBe(true) + }) + + it('tries the secondary engine when the first page has no usable sources', async () => { + const window = new FakeSearchWindow() + window.results.set('duckduckgo', []) + window.results.set('bing', [ + { title: 'Bing result', url: 'https://example.com/result', snippet: 'summary' } + ]) + const controller = new BrowserSearchController({ createWindow: () => window }) + + await expect(controller.search('latest earnings', 5)).resolves.toEqual({ + sources: [ + { title: 'Bing result', url: 'https://example.com/result', snippet: 'summary' } + ], + truncated: false + }) + expect(window.loaded).toEqual([ + 'https://html.duckduckgo.com/html/?q=latest+earnings', + 'https://www.bing.com/search?q=latest+earnings' + ]) + }) + + it('stops a stalled navigation and tries the secondary engine', async () => { + const window = new FakeSearchWindow() + const normalLoad = window.loadURL.bind(window) + let firstLoad = true + window.loadURL = async (url: string) => { + if (firstLoad) { + firstLoad = false + window.loaded.push(url) + window.currentUrl = url + await new Promise(() => undefined) + } + await normalLoad(url) + } + window.results.set('bing', [ + { title: 'Fallback result', url: 'https://example.com/fallback', snippet: 'summary' } + ]) + const controller = new BrowserSearchController({ + createWindow: () => window, + navigationTimeoutMs: 5 + }) + + await expect(controller.search('stalled first engine', 5)).resolves.toEqual({ + sources: [ + { + title: 'Fallback result', + url: 'https://example.com/fallback', + snippet: 'summary' + } + ], + truncated: false + }) + expect(window.stopped).toBe(true) + expect(window.loaded).toEqual([ + 'https://html.duckduckgo.com/html/?q=stalled+first+engine', + 'https://www.bing.com/search?q=stalled+first+engine' + ]) + }) + + it('shows the isolated window only while human verification is required', async () => { + const window = new FakeSearchWindow() + window.pageStates = [ + { + url: 'https://www.bing.com/turing/captcha/challenge', + title: 'Human Verification', + text: 'verify you are a human' + }, + { + url: 'https://www.bing.com/search?q=%E8%8B%B9%E6%9E%9C', + title: '苹果 - Search', + text: 'ordinary results' + } + ] + window.results.set('bing', [ + { title: 'Result', url: 'https://example.cn/result', snippet: 'summary' } + ]) + const visibility: boolean[] = [] + const controller = new BrowserSearchController({ + createWindow: () => window, + sleep: async () => { + visibility.push(window.visible) + } + }) + + await controller.search('苹果', 5) + + expect(visibility).toEqual([true]) + expect(window.title).toBe('完成搜索验证') + expect(window.visible).toBe(false) + }) + + it('stops before navigation when the caller is already aborted', async () => { + const window = new FakeSearchWindow() + const controller = new BrowserSearchController({ createWindow: () => window }) + const abort = new AbortController() + abort.abort(new Error('cancelled')) + + await expect(controller.search('cancel me', 5, abort.signal)).rejects.toMatchObject({ + name: 'AbortError' + }) + expect(window.loaded).toEqual([]) + }) + + it('serializes concurrent searches through one browser session', async () => { + const window = new FakeSearchWindow() + let releaseFirst!: () => void + window.loadBarrier = new Promise((resolve) => { + releaseFirst = resolve + }) + window.results.set('duckduckgo', [ + { title: 'Result', url: 'https://example.com/result', snippet: 'summary' } + ]) + const controller = new BrowserSearchController({ createWindow: () => window }) + + const first = controller.search('first query', 5) + const second = controller.search('second query', 5) + await Promise.resolve() + releaseFirst() + await Promise.all([first, second]) + + expect(window.maxActiveLoads).toBe(1) + expect(window.loaded).toEqual([ + 'https://html.duckduckgo.com/html/?q=first+query', + 'https://html.duckduckgo.com/html/?q=second+query' + ]) + }) + + it('destroys its isolated window when disposed', () => { + const window = new FakeSearchWindow() + const controller = new BrowserSearchController({ createWindow: () => window }) + controller.dispose() + expect(window.destroyed).toBe(true) + }) + + it('can be disposed after its isolated window was already destroyed', () => { + const window = new FakeSearchWindow() + const controller = new BrowserSearchController({ createWindow: () => window }) + window.destroy() + + expect(() => controller.dispose()).not.toThrow() + }) + + it('recreates the isolated window after the main-window lifecycle destroys it', async () => { + const firstWindow = new FakeSearchWindow() + const secondWindow = new FakeSearchWindow() + for (const window of [firstWindow, secondWindow]) { + window.results.set('duckduckgo', [ + { title: 'Result', url: 'https://example.com/result', snippet: 'summary' } + ]) + } + const windows = [firstWindow, secondWindow] + const controller = new BrowserSearchController({ + createWindow: () => windows.shift()! + }) + + await controller.search('first', 5) + firstWindow.destroy() + await controller.search('second', 5) + + expect(secondWindow.loaded).toEqual([ + 'https://html.duckduckgo.com/html/?q=second' + ]) + }) +}) diff --git a/test/build-and-run.test.ts b/test/build-and-run.test.ts new file mode 100644 index 000000000..04c1903be --- /dev/null +++ b/test/build-and-run.test.ts @@ -0,0 +1,157 @@ +import { spawnSync } from 'node:child_process' +import { chmod, mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises' +import { tmpdir } from 'node:os' +import path from 'node:path' +import { afterEach, describe, expect, it } from 'vitest' + +const fixtures: string[] = [] + +async function executable(filePath: string, contents: string): Promise { + await writeFile(filePath, contents, 'utf8') + await chmod(filePath, 0o755) +} + +afterEach(async () => { + await Promise.all(fixtures.splice(0).map((fixture) => rm(fixture, { recursive: true }))) +}) + +describe('formal Sherlock build and run', () => { + it('embeds the notarized update feed in local directory builds', async () => { + const builderConfig = await readFile( + path.resolve('electron-builder.notarized.cjs'), + 'utf8' + ) + const updateConfig = await readFile( + path.resolve('build/app-update-notarized.yml'), + 'utf8' + ) + + expect(builderConfig).toContain("from: 'build/app-update-notarized.yml'") + expect(builderConfig).toContain("to: 'app-update.yml'") + expect(updateConfig).toContain('provider: generic') + expect(updateConfig).toContain( + 'url: https://updates.evanarts.com/notarized/latest/' + ) + expect(updateConfig).toContain('updaterCacheDirName: sherlock-updater') + }) + + it('repairs a missing workspace Node runtime before packaging a local test app', async () => { + const fixture = await mkdtemp(path.join(tmpdir(), 'sherlock-build-and-run-repair-')) + fixtures.push(fixture) + + const scriptDirectory = path.join(fixture, 'script') + const fakeBinDirectory = path.join(fixture, 'fake-bin') + const packagedApp = path.join( + fixture, + 'dist-notarized/mac-arm64/Sherlock.app' + ) + await mkdir(scriptDirectory) + await mkdir(fakeBinDirectory) + await writeFile( + path.join(scriptDirectory, 'build_and_run.sh'), + await readFile(path.resolve('script/build_and_run.sh'), 'utf8'), + 'utf8' + ) + + await executable(path.join(fakeBinDirectory, 'uname'), '#!/bin/sh\necho arm64\n') + await executable(path.join(fakeBinDirectory, 'pkill'), '#!/bin/sh\nexit 0\n') + await executable( + path.join(fakeBinDirectory, 'npm'), + `#!/bin/sh +case "$*" in + "rebuild node") + mkdir -p "${fixture}/node_modules/node/bin" + touch "${fixture}/node_modules/node/bin/node" + chmod +x "${fixture}/node_modules/node/bin/node" + ;; + "run package:formal:dir") + mkdir -p "${packagedApp}/Contents/MacOS" + touch "${packagedApp}/Contents/MacOS/Sherlock" + chmod +x "${packagedApp}/Contents/MacOS/Sherlock" + if [ -x "${fixture}/node_modules/node/bin/node" ]; then + mkdir -p "${packagedApp}/Contents/Resources/app/node_modules/node/bin" + cp "${fixture}/node_modules/node/bin/node" \ + "${packagedApp}/Contents/Resources/app/node_modules/node/bin/node" + fi + ;; + *) + exit 2 + ;; +esac +` + ) + await executable(path.join(fakeBinDirectory, 'codesign'), '#!/bin/sh\nexit 0\n') + await executable( + path.join(fakeBinDirectory, 'open'), + `#!/bin/sh +printf '%s\n' "$*" > "${fixture}/opened-app.txt" +` + ) + + const result = spawnSync( + '/bin/bash', + [path.join(scriptDirectory, 'build_and_run.sh'), '--run'], + { + encoding: 'utf8', + env: { + ...process.env, + PATH: `${fakeBinDirectory}:/usr/bin:/bin` + } + } + ) + + expect(result.status, result.stderr).toBe(0) + expect(await readFile(path.join(fixture, 'opened-app.txt'), 'utf8')).toContain( + packagedApp + ) + }) + + it('refuses to launch a package whose bundled Node runtime is missing', async () => { + const fixture = await mkdtemp(path.join(tmpdir(), 'sherlock-build-and-run-')) + fixtures.push(fixture) + + const scriptDirectory = path.join(fixture, 'script') + const fakeBinDirectory = path.join(fixture, 'fake-bin') + await mkdir(scriptDirectory) + await mkdir(fakeBinDirectory) + await writeFile( + path.join(scriptDirectory, 'build_and_run.sh'), + await readFile(path.resolve('script/build_and_run.sh'), 'utf8'), + 'utf8' + ) + + await executable(path.join(fakeBinDirectory, 'uname'), '#!/bin/sh\necho arm64\n') + await executable(path.join(fakeBinDirectory, 'pkill'), '#!/bin/sh\nexit 0\n') + await executable( + path.join(fakeBinDirectory, 'npm'), + `#!/bin/sh +if [ "$*" = "rebuild node" ]; then + mkdir -p "${fixture}/node_modules/node/bin" + touch "${fixture}/node_modules/node/bin/node" + chmod +x "${fixture}/node_modules/node/bin/node" +else + mkdir -p "${fixture}/dist-notarized/mac-arm64/Sherlock.app/Contents/MacOS" + touch "${fixture}/dist-notarized/mac-arm64/Sherlock.app/Contents/MacOS/Sherlock" + chmod +x "${fixture}/dist-notarized/mac-arm64/Sherlock.app/Contents/MacOS/Sherlock" +fi +` + ) + await executable(path.join(fakeBinDirectory, 'codesign'), '#!/bin/sh\nexit 0\n') + await executable(path.join(fakeBinDirectory, 'open'), '#!/bin/sh\nexit 0\n') + + const result = spawnSync( + '/bin/bash', + [path.join(scriptDirectory, 'build_and_run.sh'), '--run'], + { + encoding: 'utf8', + env: { + ...process.env, + PATH: `${fakeBinDirectory}:/usr/bin:/bin` + } + } + ) + + expect(result.status).toBe(1) + expect(result.stderr).toContain('Bundled Node.js runtime was not built') + }) +}) diff --git a/test/bundled-plugin-profile.test.ts b/test/bundled-plugin-profile.test.ts new file mode 100644 index 000000000..52410db94 --- /dev/null +++ b/test/bundled-plugin-profile.test.ts @@ -0,0 +1,561 @@ +import { existsSync, readFileSync, rmSync, writeFileSync } from 'node:fs' +import { mkdir, mkdtemp, readFile, writeFile } from 'node:fs/promises' +import { tmpdir } from 'node:os' +import path from 'node:path' +import { afterEach, describe, expect, it } from 'vitest' + +import { installBundledPluginProfile } from '../src/main/bundled-plugin-profile' +import { patchBetterSidebarClient } from '../scripts/lib/patch-sherlock-better-sidebar.mjs' +import { patchSherlockOfficePreviewClient } from '../scripts/lib/patch-sherlock-office-preview.mjs' + +const temporaryDirectories: string[] = [] + +async function temporaryDirectory(label: string): Promise { + const directory = await mkdtemp(path.join(tmpdir(), `${label}-`)) + temporaryDirectories.push(directory) + return directory +} + +async function makeBundledProfile(root: string): Promise { + const profile = path.join(root, 'sherlock-plugin-profile') + await mkdir(path.join(profile, 'modules', 'dsh-file-drop'), { recursive: true }) + await writeFile( + path.join(profile, 'package.json'), + `${JSON.stringify( + { + name: 'dsh-profile-web', + private: true, + dependencies: { 'dsh-file-drop': 'file:vendor/dsh-file-drop' }, + dsh: { + profile: { + bundles: ['@deepseek-ai/dsh-base', '@deepseek-ai/dsh-web-app', 'dsh-file-drop'] + }, + sherlock: { + retiredPlugins: [ + '@vectorize-io/hindsight-coding-agents', + 'dsh-memory-evolve' + ] + } + } + }, + null, + 2 + )}\n`, + 'utf8' + ) + await writeFile(path.join(profile, 'cordis.patch.yml'), '- id: product-policy\n', 'utf8') + await writeFile(path.join(profile, 'pnpm-lock.yaml'), 'lockfileVersion: 9\n', 'utf8') + await writeFile( + path.join(profile, 'modules', 'dsh-file-drop', 'index.js'), + 'export default true\n', + 'utf8' + ) + return profile +} + +afterEach(() => { + for (const directory of temporaryDirectories.splice(0)) { + if (existsSync(directory)) { + // Test cleanup is intentionally limited to directories created under os.tmpdir(). + rmSync(directory, { recursive: true, force: true }) + } + } +}) + +describe('bundled Sherlock plugin profile', () => { + it('prepares the bundled Office adapter reproducibly and fails closed on a drifted bundle', async () => { + const source = await readFile( + path.resolve( + import.meta.dirname, + '..', + 'build', + 'sherlock-plugin-profile', + 'vendor', + '@huanlin', + 'dsh-plugin-better-sidebar-plugin-office', + 'lib', + 'client.js' + ), + 'utf8' + ) + const patched = patchSherlockOfficePreviewClient(source) + + expect(patchSherlockOfficePreviewClient(patched)).toBe(patched) + expect(() => patchSherlockOfficePreviewClient(`${source}\n/* sherlock:office-preview-service:v1 */`)) + .toThrow(/Office preview .*integrity/u) + expect(() => patchSherlockOfficePreviewClient(patched.replace( + '\t\texports.officePreviewService = officePreviewService;', + '' + ))).toThrow(/Office preview .*integrity/u) + for (const [label, incomplete] of [ + ['duplicate marker', `${patched}\n/* sherlock:office-preview-service:v1 */`], + ['missing component definition', patched.replace( + '\t\tfunction OfficePreviewComponent(props) {', + '\t\tfunction BrokenOfficePreviewComponent(props) {' + )], + ['missing service definition', patched.replace( + '\t\tconst officePreviewService = Object.freeze({', + '\t\tconst brokenOfficePreviewService = Object.freeze({' + )], + ['damaged sidebar registration', patched.replace( + 'betterSidebar.registerFileViewer(viewer)', + 'betterSidebar.registerFileViewer()' + )], + ['reverted lifecycle cancellation', patched.replace( + 'if (lifecycle.signal.aborted) return;', + 'if (cancelled) return;' + )], + ['missing apply export', patched.replace('\t\texports.apply = apply;', '')], + ['missing viewer export', patched.replace('\t\texports.officeViewers = officeViewers;', '')] + ] as const) { + expect( + () => patchSherlockOfficePreviewClient(incomplete), + `marker branch must reject ${label}` + ).toThrow(/Office preview .*integrity/u) + } + if (source.includes('/* sherlock:office-preview-service:v1 */')) { + expect(() => patchSherlockOfficePreviewClient(source.replace( + 'ctx.inject(["betterSidebar"]', + 'ctx.inject(["unexpected-office-api"]' + ))).toThrow(/Office preview patch integrity/u) + } else { + expect(() => patchSherlockOfficePreviewClient(source.replace( + 'const inject = ["betterSidebar"];', + 'const inject = ["unexpected-office-api"];' + ))).toThrow(/Office preview .*expected 1, found 0/u) + } + }) + + it('keeps Sherlock pinned sidebar tabs first, fixed, and session-targetable', async () => { + const source = await readFile( + path.resolve( + import.meta.dirname, + '..', + 'build', + 'sherlock-plugin-profile', + 'vendor', + 'dsh-better-sidebar', + 'lib', + 'client.js' + ), + 'utf8' + ) + + const patched = patchBetterSidebarClient(source) + + expect(patchBetterSidebarClient(patched)).toBe(patched) + expect(patched).toContain('const pinned = tab.meta?.sherlockPinned === true;') + expect(patched).toContain('/* sherlock:pinned-sidebar-edge:v1 */') + expect(patched).toContain('/* sherlock:pinned-sidebar-reconcile:v1 */') + expect(patched).toContain( + 'return openTabInActivePane(closeTab(state, leaf.id, existing.id), reconciled)' + ) + expect(patched).toContain('if (moving?.meta?.sherlockPinned === true) return state;') + expect(patched).toContain('draggable: !pinned') + expect(patched).toContain('candidate?.meta?.sherlockClosable === false') + expect(patched).toContain('const setPanelState = (patch, scope) =>') + expect(patched).toContain('targetsInactiveSession ? store.reduceFor(scope.sessionId, reducer) : store.reduce(reducer)') + expect(patched).toContain('setPanelState') + }) + + it('restores committed sidebar surface sizes after imperative drag cleanup', async () => { + const source = await readFile( + path.resolve( + import.meta.dirname, + '..', + 'build', + 'sherlock-plugin-profile', + 'vendor', + 'dsh-better-sidebar', + 'lib', + 'client.js' + ), + 'utf8' + ) + + const patched = patchBetterSidebarClient(source) + + expect(patched).toContain('/* sherlock:panel-surface-sync:v1 */') + expect(patched).toContain( + 'if (width > 0) panelRef.current?.style.setProperty("width", `${width}px`);' + ) + expect(patched).toContain( + 'if (height > 0) bottomRef.current?.style.setProperty("height", `${height}px`);' + ) + expect(patched).toContain('(0, react.useLayoutEffect)(() => {') + expect(patched).toContain( + 'bottomRef.current?.style.setProperty("height", `${Math.min(committed.bottomHeight, window.innerHeight)}px`);' + ) + expect(patched).toContain('snapshot.state?.bottomOpen,') + expect(patchBetterSidebarClient(patched)).toBe(patched) + }) + + it('publishes file drags from Files rows and search results without making folders draggable', async () => { + const source = await readFile( + path.resolve( + import.meta.dirname, + '..', + 'build', + 'sherlock-plugin-profile', + 'vendor', + 'dsh-better-sidebar', + 'lib', + 'client.js' + ), + 'utf8' + ) + + const patched = patchBetterSidebarClient(source) + const fileRowStart = patched.indexOf('title: entry.broken ?') + const fileRowEnd = patched.indexOf('children: [', fileRowStart) + const folderRowStart = patched.indexOf('className: clsx(sidebar_module_css_default.explorerRow, sidebar_module_css_default.explorerDir') + const folderRowEnd = patched.indexOf('children: [', folderRowStart) + const searchResultStart = patched.indexOf('results.matches.map((rel) =>') + const searchResultEnd = patched.indexOf('children: rel', searchResultStart) + + expect(patched).toContain('/* sherlock:files-to-research-canvas:v2 */') + expect(fileRowStart).toBeGreaterThanOrEqual(0) + expect(fileRowEnd).toBeGreaterThan(fileRowStart) + expect(patched.slice(fileRowStart, fileRowEnd)).toContain('draggable: true') + expect(patched.slice(fileRowStart, fileRowEnd)).toContain( + '"data-sherlock-file-drag-source": entry.path' + ) + expect(patched.slice(fileRowStart, fileRowEnd)).toContain( + 'writeSherlockSidebarFileDrag(event, entry.path, entry.name, sessionId, cwd)' + ) + expect(folderRowStart).toBeGreaterThanOrEqual(0) + expect(folderRowEnd).toBeGreaterThan(folderRowStart) + expect(patched.slice(folderRowStart, folderRowEnd)).not.toContain('draggable: true') + expect(searchResultStart).toBeGreaterThanOrEqual(0) + expect(searchResultEnd).toBeGreaterThan(searchResultStart) + expect(patched.slice(searchResultStart, searchResultEnd)).toContain('draggable: true') + expect(patched.slice(searchResultStart, searchResultEnd)).toContain( + 'writeSherlockSidebarFileDrag(event, absolutePath, baseName$1(absolutePath), sessionId, cwd, rel)' + ) + expect(patched).toContain( + '? { path: filePath, name, sessionId, relativePath } : { path: filePath, name })' + ) + expect(patched).toContain('safeSherlockSidebarRelativePath(filePath, cwd, relativePathHint)') + expect(patched).toContain( + 'const previewEligible = relativePath !== null && relativePath.length <= 512 && typeof sessionId === "string" && sessionId.length > 0 && sessionId.length <= 512;' + ) + expect(patchBetterSidebarClient(patched)).toBe(patched) + }) + + it('uses the formal profile without either retired memory plugin', async () => { + const appManifest = JSON.parse( + await readFile(path.resolve(import.meta.dirname, '..', 'package.json'), 'utf8') + ) as { version: string } + const policy = JSON.parse( + await readFile( + path.resolve(import.meta.dirname, '..', 'build', 'sherlock-bundled-plugins.json'), + 'utf8' + ) + ) as { + plugins: string[] + runtimePackages: string[] + excludedPlugins: string[] + excludedEntryIds: string[] + bundles: string[] + } + const preparation = await readFile( + path.resolve(import.meta.dirname, '..', 'scripts', 'prepare-bundled-plugin-profile.mjs'), + 'utf8' + ) + const researchRuntimeManifest = JSON.parse( + await readFile( + path.resolve( + import.meta.dirname, + '..', + 'packages', + 'dsh-research-task-runtime', + 'package.json' + ), + 'utf8' + ) + ) as { dependencies?: Record } + + expect(appManifest.version).toMatch(/^\d+\.\d+\.\d+$/u) + expect(policy.plugins).toEqual([ + '@huanlin/dsh-plugin-better-sidebar-plugin-office', + 'dsh-better-sidebar', + 'dsh-file-drop', + 'dshmarket' + ]) + expect(policy.plugins).not.toContain('dsh-update-checker') + expect(policy.plugins).not.toContain('dsh-memory-evolve') + expect(policy.plugins).not.toContain('@vectorize-io/hindsight-coding-agents') + expect(policy.excludedPlugins).toEqual([ + '@vectorize-io/hindsight-coding-agents', + 'dsh-memory-evolve' + ]) + expect(policy.excludedEntryIds).toEqual(['hindsight', 'dsh-memory-evolve']) + expect(policy.bundles).not.toContain('dsh-memory-evolve') + expect(policy.bundles).not.toContain('@vectorize-io/hindsight-coding-agents') + expect(policy.runtimePackages).toEqual([ + 'dsh-desktop-market-installer', + 'dsh-research-task-runtime', + 'dsh-web-search-session-model' + ]) + expect(researchRuntimeManifest.dependencies?.['pdfjs-dist']).toBe('4.10.38') + expect( + existsSync( + path.resolve( + import.meta.dirname, + '..', + 'build', + 'sherlock-plugin-profile', + 'modules', + 'pdfjs-dist', + 'package.json' + ) + ) + ).toBe(true) + expect(preparation).toContain("'sherlock-desktop'") + expect(preparation).not.toContain("'dsh-desktop-dev'") + expect(preparation).toContain("path.join(projectRoot, 'packages', packageName)") + expect(preparation).toContain('runtimePackages') + expect(preparation).toContain('excludedPlugins') + expect(preparation).toContain('retiredPlugins') + expect(preparation).toContain('stripExcludedProfileEntries') + expect(preparation).toContain('sourceManifest.dsh?.sherlock?.plugins') + expect(preparation).toContain("'.credentials.yaml'") + expect(preparation).toContain("'settings.yaml'") + expect(preparation).toContain("part.startsWith('.env.')") + expect(preparation).toContain('patchBetterSidebarPackage(vendorPath)') + expect(preparation).toContain('patchSherlockOfficePreviewPackage(vendorPath)') + expect(preparation).not.toContain('patchMemoryEvolvePackage') + expect( + await readFile( + path.resolve( + import.meta.dirname, + '..', + 'build', + 'sherlock-plugin-profile', + 'cordis.patch.yml' + ), + 'utf8' + ) + ).not.toMatch(/^- id: (?:hindsight|dsh-memory-evolve)$/mu) + }) + + it('installs the packaged profile for a fresh user without touching model credentials', async () => { + const root = await temporaryDirectory('sherlock-bundled-profile-fresh') + const bundledProfilePath = await makeBundledProfile(root) + const userDataPath = path.join(root, 'user-data') + const harness = path.join(userDataPath, 'harness') + await mkdir(harness, { recursive: true }) + await writeFile(path.join(harness, '.credentials.yaml'), 'OPENAI_API_KEY: user-owned\n') + + const result = installBundledPluginProfile({ + userDataPath, + bundledProfilePath, + appVersion: '0.6.7', + now: new Date('2026-08-25T09:00:00.000Z') + }) + + const installedProfile = path.join(harness, 'profiles', 'web') + expect(result.installed).toBe(true) + expect(result.plugins).toEqual(['dsh-file-drop']) + expect(readFileSync(path.join(installedProfile, 'cordis.patch.yml'), 'utf8')).toBe( + '- id: product-policy\n' + ) + expect(existsSync(path.join(installedProfile, 'node_modules', 'dsh-file-drop', 'index.js'))).toBe( + true + ) + expect(existsSync(path.join(installedProfile, 'modules'))).toBe(false) + expect(await readFile(path.join(harness, '.credentials.yaml'), 'utf8')).toBe( + 'OPENAI_API_KEY: user-owned\n' + ) + expect(existsSync(path.join(installedProfile, '.credentials.yaml'))).toBe(false) + }) + + it('upgrades an older profile by uninstalling both memory plugins and preserving user data', async () => { + const root = await temporaryDirectory('sherlock-bundled-profile-upgrade') + const bundledProfilePath = await makeBundledProfile(root) + const userDataPath = path.join(root, 'user-data') + const harness = path.join(userDataPath, 'harness') + const oldProfile = path.join(harness, 'profiles', 'web') + await mkdir(path.join(oldProfile, 'node_modules', 'dsh-memory-evolve'), { recursive: true }) + await mkdir( + path.join(oldProfile, 'node_modules', '@vectorize-io', 'hindsight-coding-agents'), + { recursive: true } + ) + await mkdir(path.join(harness, 'custom-plugins', 'dsh-memory-evolve'), { recursive: true }) + await mkdir( + path.join(harness, 'custom-plugins', '@vectorize-io', 'hindsight-coding-agents'), + { recursive: true } + ) + await writeFile( + path.join(oldProfile, 'package.json'), + '{"dependencies":{"old-plugin":"1.0.0","dsh-update-checker":"1.4.16","dsh-memory-evolve":"0.1.0","@vectorize-io/hindsight-coding-agents":"0.4.2"}}\n', + 'utf8' + ) + await writeFile( + path.join(oldProfile, 'node_modules', 'dsh-memory-evolve', 'package.json'), + '{"name":"dsh-memory-evolve","version":"0.1.0"}\n', + 'utf8' + ) + await writeFile( + path.join( + oldProfile, + 'node_modules', + '@vectorize-io', + 'hindsight-coding-agents', + 'package.json' + ), + '{"name":"@vectorize-io/hindsight-coding-agents","version":"0.4.2"}\n', + 'utf8' + ) + await writeFile( + path.join(harness, 'custom-plugins', 'dsh-memory-evolve', 'package.json'), + '{"name":"dsh-memory-evolve","version":"0.1.0"}\n', + 'utf8' + ) + await writeFile( + path.join( + harness, + 'custom-plugins', + '@vectorize-io', + 'hindsight-coding-agents', + 'package.json' + ), + '{"name":"@vectorize-io/hindsight-coding-agents","version":"0.4.2"}\n', + 'utf8' + ) + await writeFile(path.join(oldProfile, 'cordis.patch.yml'), '- id: old-profile\n', 'utf8') + await writeFile(path.join(harness, 'settings.yaml'), 'models: user-owned\n', 'utf8') + + const result = installBundledPluginProfile({ + userDataPath, + bundledProfilePath, + appVersion: '0.7.3', + now: new Date('2026-08-25T09:01:02.000Z') + }) + + expect(result.installed).toBe(true) + expect(result.backupDirectory).toBeDefined() + expect( + JSON.parse(readFileSync(path.join(oldProfile, 'package.json'), 'utf8')).dependencies + ).toEqual({ 'dsh-file-drop': 'file:vendor/dsh-file-drop' }) + expect(readFileSync(path.join(oldProfile, 'cordis.patch.yml'), 'utf8')).toBe( + '- id: product-policy\n' + ) + expect(existsSync(path.join(oldProfile, 'node_modules', 'dsh-memory-evolve'))).toBe(false) + expect( + existsSync( + path.join(oldProfile, 'node_modules', '@vectorize-io', 'hindsight-coding-agents') + ) + ).toBe(false) + expect(existsSync(path.join(harness, 'custom-plugins', 'dsh-memory-evolve'))).toBe(false) + expect( + existsSync( + path.join(harness, 'custom-plugins', '@vectorize-io', 'hindsight-coding-agents') + ) + ).toBe(false) + expect( + readFileSync(path.join(result.backupDirectory!, 'package.json'), 'utf8') + ).toContain('dsh-memory-evolve') + expect( + existsSync(path.join(result.backupDirectory!, 'node_modules', 'dsh-memory-evolve')) + ).toBe(true) + expect( + existsSync( + path.join( + result.backupDirectory!, + 'node_modules', + '@vectorize-io', + 'hindsight-coding-agents' + ) + ) + ).toBe(true) + expect(await readFile(path.join(harness, 'settings.yaml'), 'utf8')).toBe( + 'models: user-owned\n' + ) + }) + + it('is idempotent for the same packaged plugin fingerprint', async () => { + const root = await temporaryDirectory('sherlock-bundled-profile-idempotent') + const bundledProfilePath = await makeBundledProfile(root) + const userDataPath = path.join(root, 'user-data') + const options = { + userDataPath, + bundledProfilePath, + appVersion: '0.6.7', + now: new Date('2026-08-25T09:02:00.000Z') + } + + expect(installBundledPluginProfile(options).installed).toBe(true) + writeFileSync( + path.join(userDataPath, 'harness', 'profiles', 'web', 'runtime-marker'), + 'keep me\n', + 'utf8' + ) + const second = installBundledPluginProfile(options) + + expect(second.installed).toBe(false) + expect( + readFileSync( + path.join(userDataPath, 'harness', 'profiles', 'web', 'runtime-marker'), + 'utf8' + ) + ).toBe('keep me\n') + }) + + it('removes a retired custom memory plugin even when the bundled profile is current', async () => { + const root = await temporaryDirectory('sherlock-bundled-profile-retired-idempotent') + const bundledProfilePath = await makeBundledProfile(root) + const userDataPath = path.join(root, 'user-data') + const options = { userDataPath, bundledProfilePath, appVersion: '0.7.3' } + + expect(installBundledPluginProfile(options).installed).toBe(true) + const retiredPath = path.join( + userDataPath, + 'harness', + 'custom-plugins', + 'dsh-memory-evolve' + ) + await mkdir(retiredPath, { recursive: true }) + await writeFile( + path.join(retiredPath, 'package.json'), + '{"name":"dsh-memory-evolve","version":"0.1.0"}\n', + 'utf8' + ) + + expect(installBundledPluginProfile(options).installed).toBe(false) + expect(existsSync(retiredPath)).toBe(false) + }) + + it('does nothing in unpackaged development when no bundled profile exists', async () => { + const root = await temporaryDirectory('sherlock-bundled-profile-absent') + const result = installBundledPluginProfile({ + userDataPath: path.join(root, 'user-data'), + bundledProfilePath: path.join(root, 'missing-profile'), + appVersion: 'dev' + }) + + expect(result).toEqual({ installed: false, plugins: [] }) + }) + + it('reinstalls when bundled plugin code changes without a manifest or version change', async () => { + const root = await temporaryDirectory('sherlock-bundled-profile-code-change') + const bundledProfilePath = await makeBundledProfile(root) + const userDataPath = path.join(root, 'user-data') + const options = { userDataPath, bundledProfilePath, appVersion: '0.6.6' } + + expect(installBundledPluginProfile(options).installed).toBe(true) + await writeFile( + path.join(bundledProfilePath, 'modules', 'dsh-file-drop', 'index.js'), + 'export default "patched"\n', + 'utf8' + ) + + expect(installBundledPluginProfile(options).installed).toBe(true) + expect( + await readFile( + path.join(userDataPath, 'harness', 'profiles', 'web', 'node_modules', 'dsh-file-drop', 'index.js'), + 'utf8' + ) + ).toBe('export default "patched"\n') + }) +}) diff --git a/test/bundled-ppt-skill.test.ts b/test/bundled-ppt-skill.test.ts new file mode 100644 index 000000000..7db27c2c2 --- /dev/null +++ b/test/bundled-ppt-skill.test.ts @@ -0,0 +1,55 @@ +import path from 'node:path' +import { describe, expect, it, vi } from 'vitest' +import { FileSystemSkillProvider } from '@deepseek-ai/dsh-skill-filesystem' + +const projectRoot = path.resolve(import.meta.dirname, '..') +const bundledSkillRoot = path.join(projectRoot, 'skills') + +function createProvider() { + return new FileSystemSkillProvider( + { + get: () => undefined, + logger: { warn: vi.fn() } + } as never, + { + signal: new AbortController().signal, + invalidate: vi.fn() + }, + { + includeDefaultRoots: false, + bundledSkillDir: bundledSkillRoot, + watch: false + } + ) +} + +describe('Sherlock bundled PowerPoint skill', () => { + it('is discoverable through the real DSH bundled-skill provider', async () => { + const provider = createProvider() + + try { + const observation = await provider.list({}) + const candidates = Array.isArray(observation) + ? observation + : observation.candidates + const candidate = candidates.find((entry) => entry.name === 'efund-ppt-maker') + + expect(candidate).toMatchObject({ + name: 'efund-ppt-maker', + source: 'bundled', + resourceBase: { + kind: 'directory', + path: path.join(bundledSkillRoot, 'efund-ppt-maker') + } + }) + expect(candidate?.description).toContain('PowerPoint') + + if (!candidate) return + const loaded = await provider.get(candidate, {}) + expect(loaded?.content).toContain('assets/efund-template-v6.pptx') + expect(loaded?.content).toContain('assets/efund-master-skeleton.pptx') + } finally { + await provider.dispose() + } + }) +}) diff --git a/test/bundled-skill-parity.test.ts b/test/bundled-skill-parity.test.ts new file mode 100644 index 000000000..edf646e2b --- /dev/null +++ b/test/bundled-skill-parity.test.ts @@ -0,0 +1,66 @@ +import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs' +import os from 'node:os' +import path from 'node:path' +import { afterEach, describe, expect, it } from 'vitest' +import { verifyBundledSkillParity } from '../scripts/bundled-skill-parity.mjs' + +const scratchDirectories: string[] = [] + +function scratchDirectory(): string { + const directory = mkdtempSync(path.join(os.tmpdir(), 'sherlock-skill-parity-')) + scratchDirectories.push(directory) + return directory +} + +function writeSkill(directory: string, version: string, body: string): void { + mkdirSync(directory, { recursive: true }) + writeFileSync( + path.join(directory, '_meta.json'), + `${JSON.stringify({ + slug: 'efund-ppt-maker', + cnName: 'PPT制作助手', + version, + source: 'eSkill' + })}\n`, + 'utf8' + ) + writeFileSync(path.join(directory, 'SKILL.md'), body, 'utf8') +} + +afterEach(() => { + for (const directory of scratchDirectories.splice(0)) { + rmSync(directory, { recursive: true, force: true }) + } +}) + +describe('packaged bundled skill parity', () => { + it('reports the verified version when source and packaged contents match', () => { + const root = scratchDirectory() + const source = path.join(root, 'source') + const packaged = path.join(root, 'packaged') + writeSkill(source, 'v1.0.6', 'same-content') + writeSkill(packaged, 'v1.0.6', 'same-content') + + expect( + verifyBundledSkillParity({ + sourceSkillDirectory: source, + packagedSkillDirectory: packaged + }) + ).toMatchObject({ slug: 'efund-ppt-maker', version: 'v1.0.6' }) + }) + + it('rejects a packaged copy whose files differ from the source', () => { + const root = scratchDirectory() + const source = path.join(root, 'source') + const packaged = path.join(root, 'packaged') + writeSkill(source, 'v1.0.6', 'current-content') + writeSkill(packaged, 'v1.0.6', 'stale-content') + + expect(() => + verifyBundledSkillParity({ + sourceSkillDirectory: source, + packagedSkillDirectory: packaged + }) + ).toThrow('packaged bundled skill content does not match source') + }) +}) diff --git a/test/bundled-skill-upgrade.test.ts b/test/bundled-skill-upgrade.test.ts new file mode 100644 index 000000000..d0bf69629 --- /dev/null +++ b/test/bundled-skill-upgrade.test.ts @@ -0,0 +1,117 @@ +import { + mkdirSync, + mkdtempSync, + readFileSync, + rmSync, + writeFileSync +} from 'node:fs' +import os from 'node:os' +import path from 'node:path' +import { afterEach, describe, expect, it } from 'vitest' +import { synchronizeBundledESkillOverrides } from '../src/main/bundled-skill-sync' + +const scratchDirectories: string[] = [] + +function scratchDirectory(): string { + const directory = mkdtempSync(path.join(os.tmpdir(), 'sherlock-skill-sync-')) + scratchDirectories.push(directory) + return directory +} + +function writeSkill( + root: string, + version: string, + body: string, + source = 'eSkill' +): string { + const skillDirectory = path.join(root, 'efund-ppt-maker') + mkdirSync(skillDirectory, { recursive: true }) + writeFileSync( + path.join(skillDirectory, '_meta.json'), + `${JSON.stringify({ + slug: 'efund-ppt-maker', + cnName: 'PPT制作助手', + version, + source + })}\n`, + 'utf8' + ) + writeFileSync( + path.join(skillDirectory, 'SKILL.md'), + `---\nname: efund-ppt-maker\ndescription: PowerPoint maker\n---\n\n${body}\n`, + 'utf8' + ) + return skillDirectory +} + +afterEach(() => { + for (const directory of scratchDirectories.splice(0)) { + rmSync(directory, { recursive: true, force: true }) + } +}) + +describe('bundled eSkill synchronization', () => { + it('backs up and replaces an older official user skill before Harness discovery', () => { + const root = scratchDirectory() + const bundledRoot = path.join(root, 'bundled') + const userRoot = path.join(root, 'user-agents') + writeSkill(bundledRoot, 'v1.0.6', 'bundled-v1.0.6') + const userSkill = writeSkill(userRoot, 'v1.0.5', 'user-v1.0.5') + + const result = synchronizeBundledESkillOverrides({ + bundledSkillDirectory: bundledRoot, + overrideSkillDirectories: [userRoot], + now: new Date('2026-08-26T04:00:00.000Z') + }) + + expect(result.upgraded).toHaveLength(1) + expect(result.upgraded[0]).toMatchObject({ + slug: 'efund-ppt-maker', + fromVersion: 'v1.0.5', + toVersion: 'v1.0.6', + targetDirectory: userSkill + }) + expect(readFileSync(path.join(userSkill, '_meta.json'), 'utf8')).toContain('"v1.0.6"') + expect(readFileSync(path.join(userSkill, 'SKILL.md'), 'utf8')).toContain( + 'bundled-v1.0.6' + ) + expect( + readFileSync(path.join(result.upgraded[0]!.backupDirectory, 'SKILL.md'), 'utf8') + ).toContain('user-v1.0.5') + }) + + it('preserves a user-authored skill with the same name', () => { + const root = scratchDirectory() + const bundledRoot = path.join(root, 'bundled') + const userRoot = path.join(root, 'user-agents') + writeSkill(bundledRoot, 'v1.0.6', 'bundled-v1.0.6') + const userSkill = writeSkill(userRoot, 'v9.9.9', 'custom-content', 'user') + + const result = synchronizeBundledESkillOverrides({ + bundledSkillDirectory: bundledRoot, + overrideSkillDirectories: [userRoot] + }) + + expect(result.upgraded).toEqual([]) + expect(readFileSync(path.join(userSkill, 'SKILL.md'), 'utf8')).toContain('custom-content') + }) + + it('repairs an official same-version copy when its content differs from the bundle', () => { + const root = scratchDirectory() + const bundledRoot = path.join(root, 'bundled') + const userRoot = path.join(root, 'user-agents') + writeSkill(bundledRoot, 'v1.0.6', 'bundled-current-content') + const userSkill = writeSkill(userRoot, 'v1.0.6', 'stale-same-version-content') + + const result = synchronizeBundledESkillOverrides({ + bundledSkillDirectory: bundledRoot, + overrideSkillDirectories: [userRoot], + now: new Date('2026-08-26T04:00:00.000Z') + }) + + expect(result.upgraded).toHaveLength(1) + expect(readFileSync(path.join(userSkill, 'SKILL.md'), 'utf8')).toContain( + 'bundled-current-content' + ) + }) +}) diff --git a/test/cloudflare-release-retention.test.ts b/test/cloudflare-release-retention.test.ts new file mode 100644 index 000000000..6aafd9ce5 --- /dev/null +++ b/test/cloudflare-release-retention.test.ts @@ -0,0 +1,102 @@ +import { describe, expect, it } from 'vitest' +import { + buildReleaseRetentionPlan, + validateReleaseInventory +} from '../scripts/cloudflare-release-retention.mjs' +import type { ReleaseInventory } from '../scripts/cloudflare-release-retention.mjs' + +const inventory: ReleaseInventory = { + schemaVersion: 1, + releases: { + '0.6.0': [ + 'releases/v0.6.0/sherlock-mac-arm64.zip', + 'releases/v0.6.0/sherlock-mac-arm64.zip.blockmap', + 'releases/v0.6.0/sherlock-mac-arm64.dmg' + ], + '0.6.1': [ + 'releases/v0.6.1/sherlock-mac-arm64.zip', + 'releases/v0.6.1/sherlock-mac-arm64.zip.blockmap', + 'releases/v0.6.1/sherlock-mac-arm64.dmg' + ] + } +} + +describe('Cloudflare release retention', () => { + it('deletes exactly the oldest immutable version after recording the verified current release', () => { + const plan = buildReleaseRetentionPlan({ + inventory, + currentVersion: '0.6.2', + currentKeys: [ + 'releases/v0.6.2/sherlock-mac-arm64.zip', + 'releases/v0.6.2/sherlock-mac-arm64.zip.blockmap', + 'releases/v0.6.2/sherlock-mac-arm64.dmg' + ] + }) + + expect(plan.deletedVersion).toBe('0.6.0') + expect(plan.deleteKeys).toEqual(inventory.releases['0.6.0']) + expect(Object.keys(plan.nextInventory.releases)).toEqual(['0.6.1', '0.6.2']) + expect(plan.nextInventory.releases['0.6.2']).toEqual([ + 'releases/v0.6.2/sherlock-mac-arm64.dmg', + 'releases/v0.6.2/sherlock-mac-arm64.zip', + 'releases/v0.6.2/sherlock-mac-arm64.zip.blockmap' + ]) + }) + + it('sorts semantic versions numerically instead of lexicographically', () => { + const plan = buildReleaseRetentionPlan({ + inventory: { + schemaVersion: 1, + releases: { + '0.6.9': ['releases/v0.6.9/app.zip'], + '0.6.10': ['releases/v0.6.10/app.zip'] + } + }, + currentVersion: '0.7.0', + currentKeys: ['releases/v0.7.0/app.zip'] + }) + + expect(plan.deletedVersion).toBe('0.6.9') + }) + + it('rejects mutable aliases, foreign versions, duplicate keys, and current-version reuse', () => { + expect(() => + validateReleaseInventory({ + schemaVersion: 1, + releases: { '0.6.0': ['latest/latest-mac.yml'] } + }) + ).toThrow('immutable release key') + + expect(() => + validateReleaseInventory({ + schemaVersion: 1, + releases: { '0.6.0': ['releases/v0.6.1/app.zip'] } + }) + ).toThrow('does not belong') + + expect(() => + validateReleaseInventory({ + schemaVersion: 1, + releases: { '0.6.0': ['releases/v0.6.0/app.zip', 'releases/v0.6.0/app.zip'] } + }) + ).toThrow('duplicate') + + expect(() => + buildReleaseRetentionPlan({ + inventory, + currentVersion: '0.6.1', + currentKeys: ['releases/v0.6.1/app.zip'] + }) + ).toThrow('already exists') + }) + + it('refuses to prune when fewer than two versions would exist', () => { + expect(() => + buildReleaseRetentionPlan({ + inventory: { schemaVersion: 1, releases: {} }, + currentVersion: '0.6.0', + currentKeys: ['releases/v0.6.0/app.zip'] + }) + ).toThrow('No older release') + }) +}) diff --git a/test/cloudflare-release.test.ts b/test/cloudflare-release.test.ts new file mode 100644 index 000000000..1de37c34c --- /dev/null +++ b/test/cloudflare-release.test.ts @@ -0,0 +1,458 @@ +import { execFile as execFileCallback } from 'node:child_process' +import { createHash } from 'node:crypto' +import { mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises' +import { tmpdir } from 'node:os' +import path from 'node:path' +import { promisify } from 'node:util' +import { afterEach, describe, expect, it } from 'vitest' +import { parse, stringify } from 'yaml' +import { buildCloudflareReleasePlan } from '../scripts/cloudflare-release-plan.mjs' +import { + WRANGLER_MAX_UPLOAD_BYTES, + assertMultipartReleaseKey, + copyR2Object, + selectUploadTransport, + uploadFileMultipart, + validateExistingImmutableResponse +} from '../scripts/cloudflare-r2-multipart-client.mjs' +import { refreshMacUpdateMetadata } from '../scripts/refresh-mac-update-metadata.mjs' +import multipartWorker from '../scripts/cloudflare-r2-multipart-worker.mjs' + +const temporaryRoots: string[] = [] +const execFile = promisify(execFileCallback) +const projectRoot = path.resolve(import.meta.dirname, '..') + +afterEach(async () => { + await Promise.all(temporaryRoots.splice(0).map((root) => rm(root, { recursive: true }))) +}) + +async function fixture(): Promise<{ assets: string; prepared: string }> { + const root = await mkdtemp(path.join(tmpdir(), 'sherlock-cloudflare-release-')) + temporaryRoots.push(root) + const assets = path.join(root, 'release-assets') + const prepared = path.join(root, 'release-cloudflare') + await mkdir(assets) + + await Promise.all([ + writeFile(path.join(assets, 'sherlock-mac-arm64.zip'), 'arm zip'), + writeFile(path.join(assets, 'sherlock-mac-arm64.zip.blockmap'), 'arm blockmap'), + writeFile(path.join(assets, 'sherlock-mac-arm64.dmg'), 'arm dmg'), + writeFile(path.join(assets, 'sherlock-windows-x64-setup.exe'), 'windows exe'), + writeFile(path.join(assets, 'sherlock-windows-x64-setup.exe.blockmap'), 'windows blockmap'), + writeFile( + path.join(assets, 'latest-mac.yml'), + stringify({ + version: '0.6.0', + files: [{ url: 'sherlock-mac-arm64.zip', sha512: 'arm-sha', size: 7 }], + path: 'sherlock-mac-arm64.zip', + sha512: 'arm-sha' + }) + ), + writeFile( + path.join(assets, 'latest.yml'), + stringify({ + version: '0.6.0', + files: [ + { url: 'sherlock-windows-x64-setup.exe', sha512: 'win-sha', size: 11 } + ], + path: 'sherlock-windows-x64-setup.exe', + sha512: 'win-sha' + }) + ) + ]) + return { assets, prepared } +} + +describe('Cloudflare release plan', () => { + it('routes only files above Wranglers 300 MiB limit through multipart upload', () => { + expect(selectUploadTransport(WRANGLER_MAX_UPLOAD_BYTES)).toBe('wrangler') + expect(selectUploadTransport(WRANGLER_MAX_UPLOAD_BYTES + 1)).toBe('multipart') + }) + + it('limits multipart writes to the current release payloads and stable DMG', () => { + expect(() => + assertMultipartReleaseKey('releases/v0.6.8/sherlock-mac-arm64.zip', '0.6.8') + ).not.toThrow() + expect(() => + assertMultipartReleaseKey('releases/v0.6.8/sherlock-mac-arm64-legacy.zip', '0.6.8') + ).not.toThrow() + expect(() => + assertMultipartReleaseKey('download/sherlock-mac-arm64.dmg', '0.6.8') + ).not.toThrow() + expect(() => + assertMultipartReleaseKey('releases/v0.6.7/sherlock-mac-arm64.zip', '0.6.8') + ).toThrow('current release') + expect(() => assertMultipartReleaseKey('latest/latest-mac.yml', '0.6.8')).toThrow( + 'release payload' + ) + }) + + it('resumes only byte-identical immutable objects with immutable caching', () => { + const matching = new Response(null, { + status: 200, + headers: { + 'content-length': '442072706', + 'cache-control': 'public, max-age=31536000, immutable' + } + }) + expect(() => + validateExistingImmutableResponse({ + key: 'releases/v0.6.8/sherlock-mac-arm64-legacy.zip', + localSize: 442072706, + response: matching + }) + ).not.toThrow() + expect(() => + validateExistingImmutableResponse({ + key: 'releases/v0.6.8/sherlock-mac-arm64-legacy.zip', + localSize: 1, + response: matching + }) + ).toThrow('size mismatch') + expect(() => + validateExistingImmutableResponse({ + key: 'releases/v0.6.8/sherlock-mac-arm64-legacy.zip', + localSize: 442072706, + response: new Response(null, { + status: 200, + headers: { 'content-length': '442072706', 'cache-control': 'no-cache' } + }) + }) + ).toThrow('unsafe cache') + }) + + it('creates, uploads, and completes multipart objects in deterministic part order', async () => { + const root = await mkdtemp(path.join(tmpdir(), 'sherlock-multipart-upload-')) + temporaryRoots.push(root) + const source = path.join(root, 'payload.zip') + await writeFile(source, 'abcdefghijk') + const calls: Array<{ method: string; path: string; body?: string }> = [] + + const fetchImpl: typeof fetch = async (input, init = {}) => { + const url = new URL(String(input)) + const body = init.body ? Buffer.from(init.body as ArrayBuffer).toString('utf8') : undefined + calls.push({ method: init.method ?? 'GET', path: `${url.pathname}${url.search}`, body }) + if (url.pathname.endsWith('/create')) { + return Response.json({ uploadId: 'upload-123' }) + } + if (url.pathname.endsWith('/part')) { + return Response.json({ etag: `etag-${url.searchParams.get('partNumber')}` }) + } + return Response.json({ ok: true }) + } + + await uploadFileMultipart({ + endpoint: 'http://127.0.0.1:9786', + token: 'ephemeral-token', + version: '0.6.8', + key: 'releases/v0.6.8/sherlock-mac-arm64.zip', + source, + contentType: 'application/zip', + cacheControl: 'public, max-age=31536000, immutable', + partSize: 5, + concurrency: 1, + fetchImpl + }) + + expect(calls.map((call) => call.method)).toEqual(['POST', 'PUT', 'PUT', 'PUT', 'POST']) + expect(calls.filter((call) => call.method === 'PUT').map((call) => call.body)).toEqual([ + 'abcde', + 'fghij', + 'k' + ]) + expect(calls.at(-1)?.body).toContain('etag-3') + }) + + it('retries a failed multipart part without restarting the whole object', async () => { + const root = await mkdtemp(path.join(tmpdir(), 'sherlock-multipart-retry-')) + temporaryRoots.push(root) + const source = path.join(root, 'payload.zip') + await writeFile(source, 'retry-me') + let partAttempts = 0 + const fetchImpl: typeof fetch = async (input) => { + const url = new URL(String(input)) + if (url.pathname.endsWith('/create')) return Response.json({ uploadId: 'upload-123' }) + if (url.pathname.endsWith('/part')) { + partAttempts += 1 + if (partAttempts === 1) return new Response('temporary', { status: 503 }) + return Response.json({ etag: 'etag-1' }) + } + return Response.json({ ok: true }) + } + await uploadFileMultipart({ + endpoint: 'http://127.0.0.1:9786', + token: 'ephemeral-token', + version: '0.6.8', + key: 'releases/v0.6.8/sherlock-mac-arm64.zip', + source, + contentType: 'application/zip', + cacheControl: 'public, max-age=31536000, immutable', + partSize: 16, + concurrency: 1, + maxPartAttempts: 2, + retryDelayMs: 0, + fetchImpl + }) + expect(partAttempts).toBe(2) + }) + + it('keeps the temporary multipart Worker token- and version-scoped', async () => { + const created: string[] = [] + const env = { + RELEASE_UPLOAD_TOKEN: 'ephemeral-token', + RELEASE_VERSION: '0.6.8', + SHERLOCK_RELEASES: { + async createMultipartUpload(key: string) { + created.push(key) + return { uploadId: 'upload-123' } + } + } + } + const create = (key: string, token = 'ephemeral-token') => + multipartWorker.fetch( + new Request('https://release-uploader.invalid/multipart/create', { + method: 'POST', + headers: { + authorization: `Bearer ${token}`, + 'content-type': 'application/json' + }, + body: JSON.stringify({ + key, + version: '0.6.8', + contentType: 'application/zip', + cacheControl: 'public, max-age=31536000, immutable' + }) + }), + env + ) + + expect((await create('releases/v0.6.8/sherlock-mac-arm64.zip', 'wrong')).status).toBe(401) + expect((await create('releases/v0.6.7/sherlock-mac-arm64.zip')).status).toBe(400) + expect((await create('latest/latest-mac.yml')).status).toBe(400) + expect((await create('releases/v0.6.8/sherlock-mac-arm64.zip')).status).toBe(200) + expect(created).toEqual(['releases/v0.6.8/sherlock-mac-arm64.zip']) + }) + + it('promotes only the current immutable DMG to the stable download key', async () => { + const requests: Array> = [] + await copyR2Object({ + endpoint: 'http://127.0.0.1:9786', + token: 'ephemeral-token', + version: '0.6.8', + sourceKey: 'releases/v0.6.8/sherlock-mac-arm64.dmg', + targetKey: 'download/sherlock-mac-arm64.dmg', + contentType: 'application/x-apple-diskimage', + cacheControl: 'no-cache, max-age=0, must-revalidate', + fetchImpl: async (_input, init) => { + requests.push(JSON.parse(String(init?.body))) + return Response.json({ ok: true }) + } + }) + expect(requests).toEqual([ + expect.objectContaining({ + sourceKey: 'releases/v0.6.8/sherlock-mac-arm64.dmg', + targetKey: 'download/sherlock-mac-arm64.dmg' + }) + ]) + await expect( + copyR2Object({ + endpoint: 'http://127.0.0.1:9786', + token: 'ephemeral-token', + version: '0.6.8', + sourceKey: 'releases/v0.6.7/sherlock-mac-arm64.dmg', + targetKey: 'download/sherlock-mac-arm64.dmg', + contentType: 'application/x-apple-diskimage', + cacheControl: 'no-cache', + fetchImpl: async () => Response.json({ ok: true }) + }) + ).rejects.toThrow('current release') + }) + + it('refreshes the signed DMG hash and size before publishing metadata', async () => { + const root = await mkdtemp(path.join(tmpdir(), 'sherlock-mac-metadata-')) + temporaryRoots.push(root) + const dmg = path.join(root, 'sherlock-mac-arm64.dmg') + const metadataPath = path.join(root, 'latest-mac.yml') + const signedDmg = Buffer.from('signed dmg contents') + await writeFile(dmg, signedDmg) + await writeFile( + metadataPath, + stringify({ + version: '0.6.0', + files: [ + { url: 'sherlock-mac-arm64.zip', sha512: 'zip-sha', size: 7 }, + { url: 'sherlock-mac-arm64.dmg', sha512: 'pre-signing-sha', size: 1 } + ], + path: 'sherlock-mac-arm64.zip', + sha512: 'zip-sha' + }) + ) + + await refreshMacUpdateMetadata({ metadataPath, dmgPath: dmg }) + + const metadata = parse(await readFile(metadataPath, 'utf8')) as { + files: Array<{ url: string; sha512: string; size: number }> + } + expect(metadata.files[0]).toEqual({ + url: 'sherlock-mac-arm64.zip', + sha512: 'zip-sha', + size: 7 + }) + expect(metadata.files[1]).toEqual({ + url: 'sherlock-mac-arm64.dmg', + sha512: createHash('sha512').update(signedDmg).digest('base64'), + size: signedDmg.length + }) + }) + + it('uploads immutable assets before stable downloads and metadata promotion', async () => { + const { assets, prepared } = await fixture() + const plan = await buildCloudflareReleasePlan({ + version: '0.6.0', + tag: 'v0.6.0', + assetDirectory: assets, + outputDirectory: prepared + }) + + expect(plan.filter((item) => item.phase === 'immutable').map((item) => item.key)).toContain( + 'releases/v0.6.0/sherlock-mac-arm64.zip' + ) + expect(plan.filter((item) => item.phase === 'stable').map((item) => item.key)).toContain( + 'download/sherlock-mac-arm64.dmg' + ) + + const metadata = parse(await readFile(path.join(prepared, 'latest-mac.yml'), 'utf8')) as { + files: Array<{ url: string }> + path: string + } + expect(metadata.files[0]?.url).toBe( + '../releases/v0.6.0/sherlock-mac-arm64.zip' + ) + expect(metadata.path).toBe('../releases/v0.6.0/sherlock-mac-arm64.zip') + expect(plan.map((item) => item.phase)).toEqual([ + 'immutable', + 'immutable', + 'immutable', + 'immutable', + 'immutable', + 'stable', + 'metadata', + 'metadata' + ]) + expect(plan.at(-1)?.key).toBe('latest/latest-mac.yml') + expect(plan.at(-1)?.cacheControl).toBe('no-cache, max-age=0, must-revalidate') + }) + + it('publishes an independent notarized macOS channel while keeping the legacy channel', async () => { + const { assets, prepared } = await fixture() + await Promise.all([ + writeFile(path.join(assets, 'sherlock-mac-arm64-notarized.zip'), 'notarized zip'), + writeFile( + path.join(assets, 'latest-mac-notarized.yml'), + stringify({ + version: '0.6.0', + files: [ + { + url: 'sherlock-mac-arm64-notarized.zip', + sha512: 'notarized-sha', + size: 14 + } + ], + path: 'sherlock-mac-arm64-notarized.zip', + sha512: 'notarized-sha' + }) + ) + ]) + + const plan = await buildCloudflareReleasePlan({ + version: '0.6.0', + assetDirectory: assets, + outputDirectory: prepared + }) + + expect(plan.filter((item) => item.phase === 'metadata').map((item) => item.key)).toEqual([ + 'latest/latest.yml', + 'latest/latest-mac.yml', + 'notarized/latest/latest-mac.yml' + ]) + expect(plan.filter((item) => item.phase === 'stable').map((item) => item.key)).toEqual([ + 'download/sherlock-mac-arm64.dmg' + ]) + const notarized = parse( + await readFile(path.join(prepared, 'latest-mac-notarized.yml'), 'utf8') + ) as { path: string } + expect(notarized.path).toBe( + '../../releases/v0.6.0/sherlock-mac-arm64-notarized.zip' + ) + }) + + it('rejects missing referenced files and empty hashes', async () => { + const missing = await fixture() + await rm(path.join(missing.assets, 'sherlock-mac-arm64.zip')) + await expect( + buildCloudflareReleasePlan({ + version: '0.6.0', + assetDirectory: missing.assets, + outputDirectory: missing.prepared + }) + ).rejects.toThrow('missing') + + const hashless = await fixture() + const metadataPath = path.join(hashless.assets, 'latest-mac.yml') + const metadata = parse(await readFile(metadataPath, 'utf8')) + metadata.files[0].sha512 = '' + await writeFile(metadataPath, stringify(metadata)) + await expect( + buildCloudflareReleasePlan({ + version: '0.6.0', + assetDirectory: hashless.assets, + outputDirectory: hashless.prepared + }) + ).rejects.toThrow('sha512') + }) + + it('rejects tag/version mismatches and path traversal', async () => { + const mismatch = await fixture() + await expect( + buildCloudflareReleasePlan({ + version: '0.6.0', + tag: 'v0.6.1', + assetDirectory: mismatch.assets, + outputDirectory: mismatch.prepared + }) + ).rejects.toThrow('tag') + + const traversal = await fixture() + const metadataPath = path.join(traversal.assets, 'latest-mac.yml') + const metadata = parse(await readFile(metadataPath, 'utf8')) + metadata.files[0].url = '../private.key' + await writeFile(metadataPath, stringify(metadata)) + await expect( + buildCloudflareReleasePlan({ + version: '0.6.0', + assetDirectory: traversal.assets, + outputDirectory: traversal.prepared + }) + ).rejects.toThrow('safe asset filename') + }) + + it('supports a credential-free dry run through the pinned publisher CLI', async () => { + const { assets, prepared } = await fixture() + const { stdout } = await execFile(process.execPath, [ + path.join(projectRoot, 'scripts', 'publish-cloudflare-release.mjs'), + '--bucket', + 'sherlock-releases', + '--version', + '0.6.0', + '--assets', + assets, + '--prepared', + prepared, + '--dry-run' + ]) + + const plan = JSON.parse(stdout) as Array<{ phase: string; key: string }> + expect(plan[0]?.phase).toBe('immutable') + expect(plan.at(-1)?.key).toBe('latest/latest-mac.yml') + }) +}) diff --git a/test/compact-execution-status.test.ts b/test/compact-execution-status.test.ts new file mode 100644 index 000000000..a7ed21178 --- /dev/null +++ b/test/compact-execution-status.test.ts @@ -0,0 +1,1262 @@ +import { readFile } from 'node:fs/promises' +import { createRequire } from 'node:module' +import { runInNewContext } from 'node:vm' +import { describe, expect, it } from 'vitest' + +type ClientBundle = Record + +type BundleDescriptor = { + factory(require: (id: string) => unknown): ClientBundle +} + +function fakeModule(): unknown { + let fake: unknown + const target = function () {} + fake = new Proxy(target, { + get: () => fake, + apply: () => fake, + construct: () => ({}) + }) + return fake +} + +async function loadConversationBundle(styleTexts?: string[]): Promise { + const source = await readFile( + 'node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js', + 'utf8' + ) + const requireModule = createRequire(import.meta.url) + const react = requireModule('react') + const jsxRuntime = requireModule('react/jsx-runtime') + let descriptor: BundleDescriptor | undefined + + const document = styleTexts === undefined + ? undefined + : { + querySelector: () => null, + createElement: () => ({ dataset: {}, textContent: '' }), + head: { + appendChild(tag: { textContent?: string }) { + styleTexts.push(tag.textContent ?? '') + } + } + } + + runInNewContext(source, { + ...(document === undefined ? {} : { document }), + window: { + __ModuleLoader__: { + load(value: BundleDescriptor) { + descriptor = value + } + } + } + }) + if (descriptor === undefined) throw new Error('conversation bundle did not register') + + return descriptor.factory((id) => { + if (id === 'react') return react + if (id === 'react/jsx-runtime') return jsxRuntime + return fakeModule() + }) +} + +function turnLocation(turn: number) { + return { kind: 'turn', turn: { turn } } +} + +function statusTranslator(key: string, values: Record = {}) { + const labels: Record = { + 'execution.status.analyzing': '正在分析任务…', + 'execution.status.context': '正在准备任务上下文…', + 'execution.status.planning': '正在制定任务计划…', + 'execution.status.reading': '正在读取相关内容…', + 'execution.status.searching': '正在检索项目内容…', + 'execution.status.updating': '正在更新文件…', + 'execution.status.verifying': '正在验证运行结果…', + 'execution.status.researching': '正在使用互联网搜索…', + 'execution.status.webSearchTopic': `正在使用互联网搜索“${String(values.topic ?? '')}”…`, + 'execution.status.currentTask': `正在${String(values.task ?? '')}…`, + 'execution.status.pptRendering': '正在渲染 PPT 预览…', + 'execution.status.pptVerifying': '正在校验 PPT 文件…', + 'execution.status.executing': '正在执行检查…', + 'execution.status.compacting': '正在自动压缩上下文…', + 'execution.status.manualCompacting': '正在压缩上下文…', + 'execution.status.working': '正在执行任务…', + 'execution.status.history': '执行过程', + 'execution.progress.completed': `阶段进展：${String(values.task ?? '')}。`, + 'execution.progress.researched': `资料检索进展：${String(values.task ?? '')}。`, + 'execution.progress.researchReady': '资料检索与信息整理取得阶段进展。', + 'execution.progress.draftReady': '内容编写与文件更新取得阶段进展。', + 'execution.progress.previewReady': '预览渲染与视觉检查取得阶段进展。', + 'execution.progress.verificationReady': '方案检查与结果校验取得阶段进展。' + } + return labels[key] ?? key +} + +describe('compact execution status', () => { + it('shows automatic context compaction as soon as its real lifecycle starts', async () => { + const client = await loadConversationBundle() + expect(client.compactionDefinition).toBeTypeOf('object') + if (typeof client.compactionDefinition !== 'object' || client.compactionDefinition === null) return + const executionStatusForNodes = client.executionStatusForNodes + expect(executionStatusForNodes).toBeTypeOf('function') + if (typeof executionStatusForNodes !== 'function') return + + const definition = client.compactionDefinition as { + match(event: unknown): { id: string; role: string } | null + start(context: unknown, match: unknown): unknown + update(context: { state: unknown }, match: unknown): unknown + buildViewNode(context: unknown): { + kind: string + anchorSeq: number + data: { running?: boolean } + } | null + } + const event = { + type: 'compaction/start', + seq: 41, + time: 1_725_000_000_000, + data: { compactionId: 'compact-1', turn: 9 } + } + const matchResult = definition.match(event) + expect(matchResult).toEqual({ id: 'compact-1', role: 'start' }) + + const match = { + event, + role: 'start', + location: turnLocation(9) + } + const state = definition.start({}, match) + const node = definition.buildViewNode({ + key: 'compaction:compact-1', + kind: 'compaction', + id: 'compact-1', + matches: [match], + start: match, + state, + current: new Map() + }) + + expect(node).toMatchObject({ + kind: 'compaction', + anchorSeq: 41, + data: { kind: 'compaction', seq: 41, running: true } + }) + expect(executionStatusForNodes([node], statusTranslator)).toBe( + '正在自动压缩上下文…' + ) + + const endMatch = { + event: { + type: 'compaction/end', + seq: 42, + time: 1_725_000_001_000, + data: { compactionId: 'compact-1', turn: 9, error: 'summary failed' } + }, + role: 'update', + location: turnLocation(9) + } + const endedState = definition.update({ state }, endMatch) + expect( + definition.buildViewNode({ + key: 'compaction:compact-1', + kind: 'compaction', + id: 'compact-1', + matches: [match, endMatch], + start: match, + state: endedState, + current: new Map() + }) + ).toBeNull() + }) + + it('keeps an explicit compact command distinct from automatic context pressure', async () => { + const client = await loadConversationBundle() + expect(client.executionActivityLabel).toBeTypeOf('function') + if (typeof client.executionActivityLabel !== 'function') return + + expect( + client.executionActivityLabel( + { + kind: 'manual-compaction', + data: { command: { outcome: null }, compaction: null } + }, + statusTranslator + ) + ).toBe('正在压缩上下文…') + }) + + it('collapses internal work into one expandable entry while keeping only the final answer visible', async () => { + const client = await loadConversationBundle() + expect(client.compactConversationFlow).toBeTypeOf('function') + if (typeof client.compactConversationFlow !== 'function') return + + const nodes = new Map([ + ['user', { key: 'user', kind: 'user', location: turnLocation(7), data: {} }], + ['context', { key: 'context', kind: 'context', location: turnLocation(7), data: {} }], + [ + 'process-copy', + { + key: 'process-copy', + kind: 'assistant-step', + location: turnLocation(7), + data: { finalNode: { seq: 20 }, blocks: [{ kind: 'text', text: 'I will inspect files.' }] } + } + ], + [ + 'tool', + { + key: 'tool', + kind: 'tool-call', + location: turnLocation(7), + data: { root: { callId: 'call-1', name: 'read', subCalls: [] } } + } + ], + [ + 'answer', + { + key: 'answer', + kind: 'assistant-step', + location: turnLocation(7), + data: { finalNode: { seq: 40 }, blocks: [{ kind: 'text', text: '完成。' }] } + } + ], + [ + 'tail', + { + key: 'tail', + kind: 'turn-tail', + location: turnLocation(7), + data: { turn: 7, closing: { finalNode: { seq: 40 } } } + } + ] + ]) + + expect( + client.compactConversationFlow( + ['user', 'context', 'process-copy', 'tool', 'answer', 'tail'], + nodes, + null + ) + ).toEqual([ + { kind: 'node', key: 'user' }, + { + kind: 'execution', + key: 'execution:7', + turn: 7, + nodeKeys: ['context', 'process-copy', 'tool'], + running: false + }, + { kind: 'node', key: 'answer' }, + { kind: 'node', key: 'tail' } + ]) + }) + + it('keeps a substantial answer visible when a later closing message only summarizes it', async () => { + const client = await loadConversationBundle() + expect(client.compactConversationFlow).toBeTypeOf('function') + if (typeof client.compactConversationFlow !== 'function') return + + const substantialAnswer = [ + '这张图片的描述如下：', + '', + '**图片内容**：这是一张黑白铜版雕刻风格的三人肖像合成图，横幅构图，纯白背景。', + '', + '1. **左侧：海明威**——花白短发和络腮白胡子，穿高领针织毛衣。', + '2. **中间：莎士比亚**——高额秃顶、两侧长发，佩戴宽大的白色拉夫领。', + '3. **右侧：巴尔扎克**——深色蓬松卷发，穿黑色外套配白色衬衫领巾。' + ].join('\n') + const nodes = new Map([ + ['user', { key: 'user', kind: 'user', location: turnLocation(12), data: {} }], + ['context', { key: 'context', kind: 'context', location: turnLocation(12), data: {} }], + [ + 'progress', + { + key: 'progress', + kind: 'assistant-step', + location: turnLocation(12), + data: { finalNode: { seq: 10 }, blocks: [{ kind: 'text', text: '我先读取这张图片。' }] } + } + ], + [ + 'read-tool', + { + key: 'read-tool', + kind: 'tool-call', + location: turnLocation(12), + data: { root: { name: 'read_image', argsRaw: '{}' } } + } + ], + [ + 'substantial-answer', + { + key: 'substantial-answer', + kind: 'assistant-step', + location: turnLocation(12), + data: { finalNode: { seq: 20 }, blocks: [{ kind: 'text', text: substantialAnswer }] } + } + ], + [ + 'followup-tool', + { + key: 'followup-tool', + kind: 'tool-call', + location: turnLocation(12), + data: { root: { name: 'memory', argsRaw: '{}' } } + } + ], + [ + 'closing', + { + key: 'closing', + kind: 'assistant-step', + location: turnLocation(12), + data: { + finalNode: { seq: 30 }, + blocks: [{ kind: 'text', text: '图片描述已完成（见上方详细回复）。' }] + } + } + ], + [ + 'tail', + { + key: 'tail', + kind: 'turn-tail', + location: turnLocation(12), + data: { + turn: 12, + closing: { + finalNode: { seq: 30 }, + blocks: [{ kind: 'text', text: '图片描述已完成（见上方详细回复）。' }] + } + } + } + ] + ]) + + expect( + client.compactConversationFlow( + ['user', 'context', 'progress', 'read-tool', 'substantial-answer', 'followup-tool', 'closing', 'tail'], + nodes, + null + ) + ).toEqual([ + { kind: 'node', key: 'user' }, + { + kind: 'execution', + key: 'execution:12', + turn: 12, + nodeKeys: ['context', 'progress', 'read-tool'], + running: false + }, + { kind: 'node', key: 'substantial-answer' }, + { + kind: 'execution', + key: 'execution:12:1', + turn: 12, + nodeKeys: ['followup-tool'], + running: false + }, + { kind: 'node', key: 'closing' }, + { kind: 'node', key: 'tail' } + ]) + }) + + it('finds the latest sent user message even when internal nodes append in the same render', async () => { + const client = await loadConversationBundle() + expect(client.latestDirectUserKey).toBeTypeOf('function') + if (typeof client.latestDirectUserKey !== 'function') return + + const nodes = new Map([ + ['old-user', { key: 'old-user', kind: 'user' }], + ['new-user', { key: 'new-user', kind: 'user' }], + ['context', { key: 'context', kind: 'context' }], + ['assistant', { key: 'assistant', kind: 'assistant-step' }] + ]) + + expect( + client.latestDirectUserKey( + ['old-user', 'new-user', 'context', 'assistant'], + nodes + ) + ).toBe('new-user') + }) + + it('settles the conversation at the new bottom after portal layout grows', async () => { + const client = await loadConversationBundle() + expect(client.settleConversationScrollBottom).toBeTypeOf('function') + if (typeof client.settleConversationScrollBottom !== 'function') return + + const scrollport = { scrollTop: 0, scrollHeight: 120 } + const scheduled: Array<() => void> = [] + const observed: number[] = [] + + client.settleConversationScrollBottom( + scrollport, + (callback: () => void) => { + scheduled.push(callback) + }, + () => observed.push(scrollport.scrollTop) + ) + + expect(scrollport.scrollTop).toBe(120) + scrollport.scrollHeight = 280 + expect(scheduled).toHaveLength(1) + scheduled[0]?.() + + expect(scrollport.scrollTop).toBe(280) + expect(observed).toEqual([120, 280]) + }) + + it('follows a newly started turn even when the reader was scrolled upward', async () => { + const client = await loadConversationBundle() + expect(client.shouldFollowConversationBottom).toBeTypeOf('function') + if (typeof client.shouldFollowConversationBottom !== 'function') return + + expect( + client.shouldFollowConversationBottom({ + appendedUser: false, + appendedSteering: false, + runningStarted: true, + tipMoved: true, + atBottom: false + }) + ).toBe(true) + expect( + client.shouldFollowConversationBottom({ + appendedUser: false, + appendedSteering: false, + runningStarted: false, + tipMoved: true, + atBottom: false + }) + ).toBe(false) + }) + + it('recognizes keyboard and button composer submissions for direct scroll follow', async () => { + const client = await loadConversationBundle() + expect(client.isComposerSubmitKey).toBeTypeOf('function') + expect(client.isComposerSendButton).toBeTypeOf('function') + expect(client.composerScrollTargets).toBeTypeOf('function') + expect(client.scheduleComposerBottomSettles).toBeTypeOf('function') + if ( + typeof client.isComposerSubmitKey !== 'function' || + typeof client.isComposerSendButton !== 'function' || + typeof client.composerScrollTargets !== 'function' || + typeof client.scheduleComposerBottomSettles !== 'function' + ) return + + expect(client.isComposerSubmitKey({ key: 'Enter', shiftKey: false, isComposing: false })).toBe(true) + expect(client.isComposerSubmitKey({ key: 'Enter', shiftKey: true, isComposing: false })).toBe(false) + expect(client.isComposerSubmitKey({ key: 'Enter', shiftKey: false, isComposing: true })).toBe(false) + + const sendButton = { + type: 'button', + getAttribute: (name: string) => (name === 'aria-label' ? '发送消息' : null) + } + expect(client.isComposerSendButton({ closest: () => sendButton })).toBe(true) + expect(client.isComposerSendButton({ closest: () => null })).toBe(false) + + const innerScrollport = { id: 'inner' } + const hostScrollport = { + id: 'host', + querySelector: () => ({ parentElement: innerScrollport }) + } + expect(client.composerScrollTargets({ closest: () => hostScrollport })).toEqual([ + hostScrollport, + innerScrollport + ]) + + const frames: Array<() => void> = [] + const delays: number[] = [] + let settleCount = 0 + client.scheduleComposerBottomSettles( + () => { + settleCount += 1 + }, + (callback: () => void) => frames.push(callback), + (_callback: () => void, delay: number) => delays.push(delay) + ) + expect(settleCount).toBe(1) + expect(frames).toHaveLength(1) + expect(delays).toEqual([120, 360, 720, 1200]) + }) + + it('keeps assistant actions and timing metadata on one responsive row', async () => { + const styles: string[] = [] + await loadConversationBundle(styles) + const researchPanelStyles = styles.join('\n') + const wrappingRule = + '.sRp_root .p-xYUq_timeEnd,.sRp_root .p-xYUq_timeStart{flex:1 1 100%' + const oneRowRule = + '.sRp_root .p-xYUq_timeEnd{flex:1 1 auto;padding-left:2px;' + + expect(researchPanelStyles).toContain( + '.sRp_root .p-xYUq_actions{min-width:0;max-width:100%;height:auto;flex-wrap:nowrap;gap:4px}' + ) + expect(researchPanelStyles).toContain(oneRowRule) + expect(researchPanelStyles.lastIndexOf(oneRowRule)).toBeGreaterThan( + researchPanelStyles.lastIndexOf(wrappingRule) + ) + }) + + it('keeps a running turn represented by one status entry even before internal nodes arrive', async () => { + const client = await loadConversationBundle() + expect(client.compactConversationFlow).toBeTypeOf('function') + if (typeof client.compactConversationFlow !== 'function') return + + const nodes = new Map([ + ['user', { key: 'user', kind: 'user', location: turnLocation(8), data: {} }] + ]) + + expect(client.compactConversationFlow(['user'], nodes, 8)).toEqual([ + { kind: 'node', key: 'user' }, + { + kind: 'execution', + key: 'execution:8', + turn: 8, + nodeKeys: [], + running: true + } + ]) + }) + + it('places pending steering before later reply nodes and splits their execution group', async () => { + const client = await loadConversationBundle() + expect(client.mergePendingSteeringFlow).toBeTypeOf('function') + if (typeof client.mergePendingSteeringFlow !== 'function') return + + const nodes = new Map([ + [ + 'before-input', + { + key: 'before-input', + kind: 'assistant-step', + anchorSeq: 40, + location: turnLocation(7), + data: {} + } + ], + [ + 'after-input', + { + key: 'after-input', + kind: 'assistant-step', + anchorSeq: 80, + location: turnLocation(7), + data: {} + } + ] + ]) + const flow = [ + { + kind: 'execution', + key: 'execution:7', + turn: 7, + nodeKeys: ['before-input', 'after-input'], + running: true + } + ] + const pending = [ + { + id: 'pending-input', + anchorSeq: 66, + placement: 'steering', + content: [{ type: 'text', text: '先回答这个问题' }] + } + ] + + const merged = (client.mergePendingSteeringFlow as ( + flow: unknown[], + pending: unknown[], + nodes: Map + ) => Array>)(flow, pending, nodes) + + expect(merged.map((entry) => ({ + kind: entry.kind, + nodeKeys: entry.nodeKeys, + running: entry.running, + itemId: (entry.item as { id?: string } | undefined)?.id + }))).toEqual([ + { + kind: 'execution', + nodeKeys: ['before-input'], + running: false, + itemId: undefined + }, + { + kind: 'pending-steering', + nodeKeys: undefined, + running: undefined, + itemId: 'pending-input' + }, + { + kind: 'execution', + nodeKeys: ['after-input'], + running: true, + itemId: undefined + } + ]) + }) + + it('keeps an unanchored reconnect queue row at the visible conversation tail', async () => { + const client = await loadConversationBundle() + expect(client.mergePendingSteeringFlow).toBeTypeOf('function') + if (typeof client.mergePendingSteeringFlow !== 'function') return + + const flow = [{ kind: 'node', key: 'answer' }] + const pending = [{ id: 'pending-input', placement: 'steering', content: [] }] + const merged = (client.mergePendingSteeringFlow as ( + flow: unknown[], + pending: unknown[], + nodes: Map + ) => Array>)( + flow, + pending, + new Map([['answer', { key: 'answer', kind: 'assistant-step', anchorSeq: 80 }]]) + ) + + expect(merged.map((entry) => entry.kind)).toEqual(['node', 'pending-steering']) + }) + + it('moves the live execution indicator below steering that arrives after current progress', async () => { + const client = await loadConversationBundle() + expect(client.mergePendingSteeringFlow).toBeTypeOf('function') + if (typeof client.mergePendingSteeringFlow !== 'function') return + + const merged = (client.mergePendingSteeringFlow as ( + flow: unknown[], + pending: unknown[], + nodes: Map + ) => Array>)( + [{ + kind: 'execution', + key: 'execution:7', + turn: 7, + nodeKeys: ['current-progress'], + running: true + }], + [{ id: 'pending-input', anchorSeq: 66, placement: 'steering', content: [] }], + new Map([ + [ + 'current-progress', + { key: 'current-progress', kind: 'assistant-step', anchorSeq: 40 } + ] + ]) + ) + + expect(merged.map((entry) => ({ + kind: entry.kind, + nodeKeys: entry.nodeKeys, + running: entry.running + }))).toEqual([ + { kind: 'execution', nodeKeys: ['current-progress'], running: false }, + { kind: 'pending-steering', nodeKeys: undefined, running: undefined }, + { kind: 'execution', nodeKeys: [], running: true } + ]) + }) + + it('keeps automatic compaction visibly running when the runtime turn signal is briefly absent', async () => { + const client = await loadConversationBundle() + expect(client.compactConversationFlow).toBeTypeOf('function') + if (typeof client.compactConversationFlow !== 'function') return + + const nodes = new Map([ + ['user', { key: 'user', kind: 'user', location: turnLocation(9), data: {} }], + [ + 'compaction', + { + key: 'compaction', + kind: 'compaction', + location: turnLocation(9), + data: { running: true } + } + ] + ]) + + expect(client.compactConversationFlow(['user', 'compaction'], nodes, null)).toEqual([ + { kind: 'node', key: 'user' }, + { + kind: 'execution', + key: 'execution:9', + turn: 9, + nodeKeys: ['compaction'], + running: true + } + ]) + }) + + it('extracts only user-facing assistant text into progress updates', async () => { + const client = await loadConversationBundle() + expect(client.executionProgressUpdates).toBeTypeOf('function') + if (typeof client.executionProgressUpdates !== 'function') return + + const updates = client.executionProgressUpdates([ + { + key: 'assistant-progress', + kind: 'assistant-step', + data: { + status: 'complete', + blocks: [ + { kind: 'reasoning', text: 'private chain of thought' }, + { kind: 'text', text: '资料范围已经确认，接下来整理核心证据。' }, + { kind: 'tool-call', name: 'bash', argsRaw: 'secret command' } + ] + } + }, + { + key: 'tool-detail', + kind: 'tool-call', + data: { root: { name: 'bash', argsRaw: 'secret command' } } + } + ]) + + expect(updates).toEqual([ + { + key: 'assistant-progress', + blocks: [{ kind: 'text', text: '资料范围已经确认，接下来整理核心证据。' }], + streaming: false + } + ]) + }) + + it('keeps the six latest distinct progress updates', async () => { + const client = await loadConversationBundle() + expect(client.executionProgressUpdates).toBeTypeOf('function') + if (typeof client.executionProgressUpdates !== 'function') return + + const progressNode = (key: string, text: string) => ({ + key, + kind: 'assistant-step', + data: { status: 'complete', blocks: [{ kind: 'text', text }] } + }) + const updates = client.executionProgressUpdates([ + progressNode('step-1', '第一段过程反馈'), + progressNode('step-2', '第二段过程反馈'), + progressNode('step-3', '第二段过程反馈'), + progressNode('step-4', '第三段过程反馈'), + progressNode('step-5', '第四段过程反馈'), + progressNode('step-6', '第五段过程反馈'), + progressNode('step-7', '第六段过程反馈'), + progressNode('step-8', '第七段过程反馈') + ]) + + expect(updates.map((update: { key: string }) => update.key)).toEqual([ + 'step-3', + 'step-4', + 'step-5', + 'step-6', + 'step-7', + 'step-8' + ]) + }) + + it('derives high-level progress from settled plan milestones when commentary is absent', async () => { + const client = await loadConversationBundle() + expect(client.executionProgressUpdates).toBeTypeOf('function') + if (typeof client.executionProgressUpdates !== 'function') return + + const updates = client.executionProgressUpdates( + [ + { + key: 'settled-plan', + kind: 'tool-call', + data: { + root: { + kind: 'result', + call: { + name: 'todo_write', + argsRaw: JSON.stringify({ + todos: [ + { content: '核验权威资料与关键数字', status: 'completed' }, + { content: '构建并导出演示文稿', status: 'completed' }, + { content: '执行逐页版式质检', status: 'in_progress' } + ] + }) + }, + content: [] + } + } + } + ], + { t: statusTranslator } + ) + + expect(updates.map((update: { blocks: Array<{ text: string }> }) => update.blocks[0]?.text)).toEqual( + ['阶段进展：核验权威资料与关键数字。', '阶段进展：构建并导出演示文稿。'] + ) + }) + + it('derives localized stage milestones from settled tools in older task history', async () => { + const client = await loadConversationBundle() + expect(client.executionProgressUpdates).toBeTypeOf('function') + if (typeof client.executionProgressUpdates !== 'function') return + + const settledTool = (key: string, name: string, args: Record) => ({ + key, + kind: 'tool-call', + data: { + root: { + kind: 'result', + call: { name, argsRaw: JSON.stringify(args) }, + content: [] + } + } + }) + const updates = client.executionProgressUpdates( + [ + settledTool('research', 'web_search', { query: 'future of software development' }), + settledTool('draft', 'bash', { description: 'Build presentation deck' }), + settledTool('preview', 'read_image', { path: '/private/contact-sheet.png' }), + settledTool('verify', 'bash', { description: 'Verify final structure and typography' }) + ], + { t: statusTranslator } + ) + + expect(updates.map((update: { blocks: Array<{ text: string }> }) => update.blocks[0]?.text)).toEqual( + [ + '资料检索与信息整理取得阶段进展。', + '内容编写与文件更新取得阶段进展。', + '预览渲染与视觉检查取得阶段进展。', + '方案检查与结果校验取得阶段进展。' + ] + ) + }) + + it('uses a neutral process label after an execution turn settles', async () => { + const client = await loadConversationBundle() + expect(client.executionSummaryStatus).toBeTypeOf('function') + if (typeof client.executionSummaryStatus !== 'function') return + + expect(client.executionSummaryStatus([], false, statusTranslator)).toBe('执行过程') + }) + + it('injects left alignment for assistant text and wrapped file links', async () => { + const styles: string[] = [] + await loadConversationBundle(styles) + const assistantStyles = styles.find((text) => text.includes('.Sxvs8a_root')) ?? '' + + expect(assistantStyles).toContain('.Sxvs8a_root{text-align:left;') + expect(assistantStyles).toContain('.Sxvs8a_body code>button{text-align:left}') + }) + + it('shows progress only for a running or explicitly expanded execution', async () => { + const client = await loadConversationBundle() + expect(client.executionProgressSurface).toBeTypeOf('function') + if (typeof client.executionProgressSurface !== 'function') return + + const nodes = [ + { + key: 'assistant-progress', + kind: 'assistant-step', + data: { + status: 'complete', + blocks: [{ kind: 'text', text: '页面结构已经完成，正在校验版式。' }] + } + }, + { + key: 'tool-detail', + kind: 'tool-call', + data: { root: { name: 'bash', argsRaw: 'secret command' } } + } + ] + + expect(client.executionProgressSurface(nodes, true, false)).toMatchObject({ + showProgress: true, + detailNodeKeys: ['tool-detail'] + }) + expect(client.executionProgressSurface(nodes, false, false)).toMatchObject({ + showProgress: false, + detailNodeKeys: ['tool-detail'] + }) + expect(client.executionProgressSurface(nodes, false, true)).toMatchObject({ + showProgress: true, + detailNodeKeys: ['tool-detail'] + }) + }) + + it('keeps user-facing body text visible in a steering-split execution without expanding details', async () => { + const client = await loadConversationBundle() + expect(client.executionProgressSurface).toBeTypeOf('function') + if (typeof client.executionProgressSurface !== 'function') return + + const surface = client.executionProgressSurface( + [ + { + key: 'assistant-before-steering', + kind: 'assistant-step', + data: { + status: 'complete', + blocks: [{ kind: 'text', text: '规范已确认，接下来进入逐页制作。' }] + } + }, + { + key: 'tool-detail', + kind: 'tool-call', + data: { root: { name: 'skill', argsRaw: '{}' } } + } + ], + false, + false, + { preserveProgress: true } + ) + + expect(surface).toMatchObject({ + showProgress: true, + updates: [ + { + key: 'assistant-before-steering', + blocks: [{ kind: 'text', text: '规范已确认，接下来进入逐页制作。' }] + } + ], + detailNodeKeys: ['tool-detail'] + }) + }) + + it('omits context-injection nodes from every execution detail group', async () => { + const client = await loadConversationBundle() + expect(client.executionDetailGroups).toBeTypeOf('function') + if (typeof client.executionDetailGroups !== 'function') return + + const groups = client.executionDetailGroups([ + { key: 'context', kind: 'context', data: { form: 'instructions' } }, + { + key: 'read', + kind: 'tool-call', + data: { root: { name: 'read', argsRaw: '{"path":"AGENTS.md"}' } } + } + ]) as Array<{ nodeKeys: string[] }> + + expect(groups.flatMap((group) => group.nodeKeys)).toEqual(['read']) + }) + + it('groups execution details by user-facing activity while preserving item order', async () => { + const client = await loadConversationBundle() + expect(client.executionDetailGroups).toBeTypeOf('function') + if (typeof client.executionDetailGroups !== 'function') return + + const tool = (key: string, name: string) => ({ + key, + kind: 'tool-call', + data: { root: { name, argsRaw: '{}' } } + }) + const groups = client.executionDetailGroups([ + tool('read-1', 'read'), + tool('skill-1', 'skill'), + tool('search-1', 'web_search'), + tool('bash-1', 'bash'), + tool('patch-1', 'apply_patch'), + tool('plan-1', 'todo_write'), + tool('verify-1', 'playwright'), + { key: 'retry-1', kind: 'model-retry', data: {} }, + tool('read-2', 'read_file') + ]) + + expect(groups).toEqual([ + { + id: 'tools-skills', + titleKey: 'execution.details.group.toolsSkills', + nodeKeys: ['skill-1'], + errorCount: 0 + }, + { + id: 'read-search', + titleKey: 'execution.details.group.readSearch', + nodeKeys: ['read-1', 'search-1', 'read-2'], + errorCount: 0 + }, + { + id: 'run-change', + titleKey: 'execution.details.group.runChange', + nodeKeys: ['bash-1', 'patch-1'], + errorCount: 0 + }, + { + id: 'task-verify', + titleKey: 'execution.details.group.taskVerify', + nodeKeys: ['plan-1', 'verify-1'], + errorCount: 0 + }, + { + id: 'other', + titleKey: 'execution.details.group.other', + nodeKeys: ['retry-1'], + errorCount: 0 + } + ]) + }) + + it('counts failed tool calls on their execution category summary', async () => { + const client = await loadConversationBundle() + expect(client.executionDetailGroups).toBeTypeOf('function') + if (typeof client.executionDetailGroups !== 'function') return + + const groups = client.executionDetailGroups([ + { + key: 'failed-search', + kind: 'tool-call', + data: { + root: { + kind: 'tool-result', + call: { name: 'web_search', argsRaw: '{}' }, + isError: true, + subCalls: [] + } + } + }, + { + key: 'successful-search', + kind: 'tool-call', + data: { + root: { + kind: 'tool-result', + call: { name: 'web_search', argsRaw: '{}' }, + isError: false, + subCalls: [] + } + } + } + ]) + + expect(groups).toEqual([ + { + id: 'read-search', + titleKey: 'execution.details.group.readSearch', + nodeKeys: ['failed-search', 'successful-search'], + errorCount: 1 + } + ]) + }) + + it('derives privacy-safe live copy from the actual latest activity', async () => { + const client = await loadConversationBundle() + expect(client.executionActivityLabel).toBeTypeOf('function') + if (typeof client.executionActivityLabel !== 'function') return + + const labels: Record = { + 'execution.status.analyzing': '正在分析任务…', + 'execution.status.context': '正在准备任务上下文…', + 'execution.status.reading': '正在读取相关内容…', + 'execution.status.searching': '正在检索项目内容…', + 'execution.status.updating': '正在更新文件…', + 'execution.status.verifying': '正在验证运行结果…' + } + const t = (key: string) => labels[key] ?? key + + expect( + client.executionActivityLabel( + { kind: 'assistant-step', data: { blocks: [{ kind: 'reasoning', text: '/private/path' }] } }, + t + ) + ).toBe('正在分析任务…') + expect( + client.executionActivityLabel( + { + kind: 'tool-call', + data: { root: { name: 'read', argsRaw: '{"path":"/Users/private/secret.md"}' } } + }, + t + ) + ).toBe('正在读取相关内容…') + expect( + client.executionActivityLabel( + { + kind: 'tool-call', + data: { root: { name: 'apply_patch', argsRaw: 'password=do-not-show' } } + }, + t + ) + ).toBe('正在更新文件…') + expect( + client.executionActivityLabel( + { kind: 'tool-call', data: { root: { name: 'playwright', argsRaw: 'token=hidden' } } }, + t + ) + ).toBe('正在验证运行结果…') + }) + + it('names the live web-search subject from structured tool arguments', async () => { + const client = await loadConversationBundle() + expect(client.executionActivityLabel).toBeTypeOf('function') + if (typeof client.executionActivityLabel !== 'function') return + + expect( + client.executionActivityLabel( + { + kind: 'tool-call', + data: { + root: { + name: 'web_search', + argsRaw: JSON.stringify({ query: '人工智能发展史权威资料' }) + } + } + }, + statusTranslator + ) + ).toBe('正在使用互联网搜索“人工智能发展史权威资料”…') + }) + + it('shows a safe model-authored Chinese command intent instead of a generic shell label', async () => { + const client = await loadConversationBundle() + expect(client.executionActivityLabel).toBeTypeOf('function') + if (typeof client.executionActivityLabel !== 'function') return + + expect( + client.executionActivityLabel( + { + kind: 'tool-call', + data: { + root: { + name: 'bash', + argsRaw: JSON.stringify({ + command: 'node scripts/build-slides.mjs', + description: '整理人工智能发展史时间线' + }) + } + } + }, + statusTranslator + ) + ).toBe('正在整理人工智能发展史时间线…') + }) + + it('uses the current plan item when a command description is not localized', async () => { + const client = await loadConversationBundle() + expect(client.executionStatusForNodes).toBeTypeOf('function') + if (typeof client.executionStatusForNodes !== 'function') return + + const nodes = [ + { + kind: 'tool-call', + data: { + root: { + name: 'todo_write', + argsRaw: JSON.stringify({ + todos: [ + { content: '检查参考资料', status: 'completed' }, + { content: '撰写人工智能发展史 PPT 文件', status: 'in_progress' } + ] + }) + } + } + }, + { + kind: 'tool-call', + data: { + root: { + name: 'bash', + argsRaw: JSON.stringify({ + command: 'node scripts/build-slides.mjs', + description: 'Run the presentation generator' + }) + } + } + } + ] + + expect(client.executionStatusForNodes(nodes, statusTranslator)).toBe( + '正在撰写人工智能发展史 PPT 文件…' + ) + }) + + it('stops showing planning after todo_write settles and names the active task', async () => { + const client = await loadConversationBundle() + expect(client.executionStatusForNodes).toBeTypeOf('function') + if (typeof client.executionStatusForNodes !== 'function') return + + const settledTodo = { + kind: 'tool-call', + data: { + root: { + kind: 'result', + call: { + name: 'todo_write', + argsRaw: JSON.stringify({ + todos: [ + { content: '研究 Vibecoding 现状与证据', status: 'completed' }, + { content: '基于唯一品牌源构建并导出 PPTX', status: 'in_progress' }, + { content: '执行版式质检', status: 'pending' } + ] + }) + }, + content: [] + } + } + } + + expect(client.executionStatusForNodes([settledTodo], statusTranslator)).toBe( + '正在基于唯一品牌源构建并导出 PPTX…' + ) + }) + + it('derives PPT render and verification phases from the command that is actually running', async () => { + const client = await loadConversationBundle() + const executionActivityLabel = client.executionActivityLabel + expect(executionActivityLabel).toBeTypeOf('function') + if (typeof executionActivityLabel !== 'function') return + + const activity = (description: string) => + executionActivityLabel( + { + kind: 'tool-call', + data: { + root: { + name: 'bash', + argsRaw: JSON.stringify({ command: 'node task.mjs', description }) + } + } + }, + statusTranslator + ) + + expect(activity('Render PPT preview images')).toBe('正在渲染 PPT 预览…') + expect(activity('Validate PPT layout and fonts')).toBe('正在校验 PPT 文件…') + }) + + it('never exposes secrets, commands, paths, or malformed raw arguments in live status', async () => { + const client = await loadConversationBundle() + expect(client.executionActivityLabel).toBeTypeOf('function') + if (typeof client.executionActivityLabel !== 'function') return + + const sensitive = client.executionActivityLabel( + { + kind: 'tool-call', + data: { + root: { + name: 'bash', + argsRaw: JSON.stringify({ + command: 'curl -H "Authorization: Bearer abc" https://private.example', + description: '检查 /Users/private/token.txt 中的 API_KEY' + }) + } + } + }, + statusTranslator + ) + const malformed = client.executionActivityLabel( + { kind: 'tool-call', data: { root: { name: 'bash', argsRaw: '{not-json' } } }, + statusTranslator + ) + + expect(sensitive).toBe('正在执行检查…') + expect(sensitive).not.toMatch(/private|token|API_KEY|Bearer|curl/i) + expect(malformed).toBe('正在执行检查…') + }) + + it('removes reasoning and tool-call blocks from the completed answer surface', async () => { + const client = await loadConversationBundle() + expect(client.finalAnswerBlocks).toBeTypeOf('function') + if (typeof client.finalAnswerBlocks !== 'function') return + + const image = { kind: 'image', attachmentId: 'image-1' } + expect( + client.finalAnswerBlocks([ + { kind: 'reasoning', text: 'private chain of thought' }, + { kind: 'tool-call', callId: 'call-1', name: 'bash', argsRaw: 'secret command' }, + { kind: 'text', text: '这是最终回答。' }, + image + ]) + ).toEqual([{ kind: 'text', text: '这是最终回答。' }, image]) + }) +}) diff --git a/test/context-menu.test.ts b/test/context-menu.test.ts index ad76bb921..ec4dff328 100644 --- a/test/context-menu.test.ts +++ b/test/context-menu.test.ts @@ -1,4 +1,5 @@ import { describe, expect, it, vi } from 'vitest' +import * as contextMenuModule from '../src/main/context-menu-template' import { buildContextMenuTemplate, isExternalWebUrl, @@ -6,7 +7,7 @@ import { type ContextMenuState } from '../src/main/context-menu-template' -function state(overrides: Partial = {}): ContextMenuState { +function state(overrides: Partial & { finderPath?: string } = {}): ContextMenuState { return { isEditable: false, selectionText: '', @@ -20,16 +21,18 @@ function state(overrides: Partial = {}): ContextMenuState { canPaste: false, canSelectAll: true }, + finderPath: '', ...overrides - } + } as ContextMenuState } -function actions(): ContextMenuActions { +function actions(): ContextMenuActions & { revealItem: ReturnType } { return { openLink: vi.fn(), copyLink: vi.fn(), - copyImage: vi.fn() - } + copyImage: vi.fn(), + revealItem: vi.fn() + } as ContextMenuActions & { revealItem: ReturnType } } describe('conversation context menu', () => { @@ -115,6 +118,34 @@ describe('conversation context menu', () => { expect(callbacks.copyImage).toHaveBeenCalledOnce() }) + it('offers Finder reveal for a recognized local path and invokes the exact item', () => { + const callbacks = actions() + const template = buildContextMenuTemplate( + state({ selectionText: 'report.pdf', finderPath: '/tmp/project/report.pdf' }), + 'zh', + callbacks + ) + + expect(template[0]?.label).toBe('在 Finder 中显示') + template[0]?.click?.({} as never, undefined, {} as never) + expect(callbacks.revealItem).toHaveBeenCalledWith('/tmp/project/report.pdf') + }) + + it('resolves only existing absolute paths from selected text or clicked-element metadata', () => { + const resolver = (contextMenuModule as Record).resolveFinderPath + expect(resolver).toBeTypeOf('function') + const exists = (candidate: string): boolean => candidate === '/Users/me/Project/index.html' + + expect((resolver as (values: string[], exists: (path: string) => boolean) => string)([ + 'index.html', + '打开 /Users/me/Project/index.html', + ], exists)).toBe('/Users/me/Project/index.html') + expect((resolver as (values: string[], exists: (path: string) => boolean) => string)([ + 'index.html', + 'https://example.com/index.html', + ], exists)).toBe('') + }) + it('recognizes only HTTP and HTTPS as external web URLs', () => { expect(isExternalWebUrl('https://example.com')).toBe(true) expect(isExternalWebUrl('http://example.com')).toBe(true) diff --git a/test/credentials-layout-compatibility.test.ts b/test/credentials-layout-compatibility.test.ts new file mode 100644 index 000000000..51b4a6e34 --- /dev/null +++ b/test/credentials-layout-compatibility.test.ts @@ -0,0 +1,93 @@ +import { describe, expect, it } from 'vitest' +import * as credentialsModule from '@deepseek-ai/dsh-credentials-local' + +const { parseCredentialsDocument } = credentialsModule +const renderCredentialsDocument = ( + credentialsModule as typeof credentialsModule & { + renderCredentialsDocument(text: string | undefined, ref: string, value: string | undefined): string + } +).renderCredentialsDocument + +describe('Harness credential layout compatibility', () => { + it('reads version-1 credentials written by newer Harness builds', () => { + const credentials = parseCredentialsDocument( + [ + 'version: 1', + 'refs:', + ' DEEPSEEK_API_KEY: sk-compatible', + ' OPENAI_API_KEY: sk-openai', + 'records:', + ' llm-pi-ai/openai-codex:', + ' kind: grant', + ' payload:', + ' type: oauth', + ' access: opaque-token', + '' + ].join('\n'), + '/tmp/.credentials.yaml' + ) + + expect([...credentials]).toEqual([ + ['DEEPSEEK_API_KEY', 'sk-compatible'], + ['OPENAI_API_KEY', 'sk-openai'] + ]) + }) + + it('updates refs without flattening or damaging version-1 credential records', () => { + const source = [ + 'version: 1', + 'refs:', + ' # Keep the user annotation.', + ' DEEPSEEK_API_KEY: sk-compatible', + 'records:', + ' llm-pi-ai/openai-codex:', + ' kind: grant', + ' payload:', + ' type: oauth', + ' access: opaque-token', + '' + ].join('\n') + + const updated = renderCredentialsDocument(source, 'OPENAI_API_KEY', 'sk-openai') + + expect(updated).toContain(' # Keep the user annotation.') + expect(updated).toContain(' OPENAI_API_KEY: sk-openai') + expect(updated).toContain(' access: opaque-token') + expect(() => parseCredentialsDocument(updated, '/tmp/.credentials.yaml')).not.toThrow() + expect([...parseCredentialsDocument(updated, '/tmp/.credentials.yaml')]).toEqual([ + ['DEEPSEEK_API_KEY', 'sk-compatible'], + ['OPENAI_API_KEY', 'sk-openai'] + ]) + }) + + it('keeps valid flat credentials named version, refs, or records backward compatible', () => { + const source = ['version: "legacy-value"', 'refs: "legacy-ref"', 'records: "legacy-record"', ''].join( + '\n' + ) + + expect([...parseCredentialsDocument(source, '/tmp/.credentials.yaml')]).toEqual([ + ['version', 'legacy-value'], + ['refs', 'legacy-ref'], + ['records', 'legacy-record'] + ]) + + const updated = renderCredentialsDocument(source, 'OPENAI_API_KEY', 'sk-openai') + expect(updated).toContain('OPENAI_API_KEY: sk-openai') + expect(updated).not.toContain('\nrefs:\n') + }) + + it('rejects unknown versioned layouts instead of silently dropping credentials', () => { + expect(() => + parseCredentialsDocument('version: 2\nrefs:\n OPENAI_API_KEY: sk-openai\n', '/tmp/.credentials.yaml') + ).toThrow('unsupported credentials document version') + expect(() => + parseCredentialsDocument('version: 1\nrefs: not-a-mapping\n', '/tmp/.credentials.yaml') + ).toThrow('must be a mapping') + expect(() => + parseCredentialsDocument( + 'version: 1\nrefs:\n OPENAI_API_KEY: sk-openai\nunexpected: secret\n', + '/tmp/.credentials.yaml' + ) + ).toThrow('unknown top-level key') + }) +}) diff --git a/test/desktop-shell-controls.test.ts b/test/desktop-shell-controls.test.ts new file mode 100644 index 000000000..682a0a275 --- /dev/null +++ b/test/desktop-shell-controls.test.ts @@ -0,0 +1,151 @@ +import { readFile } from 'node:fs/promises' +import { createRequire } from 'node:module' +import { runInNewContext } from 'node:vm' +import { Window } from 'happy-dom' +import { describe, expect, it } from 'vitest' + +const requireModule = createRequire(import.meta.url) +const { createElement } = requireModule('react') as { + createElement: (type: unknown, props?: unknown, ...children: unknown[]) => unknown +} +const { act } = requireModule('react') as { + act: (callback: () => void | Promise) => Promise +} +const { createRoot } = requireModule('react-dom/client') as { + createRoot: (container: unknown) => { + render(node: unknown): void + unmount(): void + } +} + +type ClientBundle = Record + +async function loadLayoutBundle(browserWindow: Window): Promise { + const source = await readFile( + 'node_modules/@deepseek-ai/dsh-client-ui-layout/lib/client.js', + 'utf8' + ) + let descriptor: { + factory(require: (id: string) => unknown): ClientBundle + } | undefined + Object.assign(browserWindow, { + __ModuleLoader__: { + load(value: typeof descriptor) { + descriptor = value + } + } + }) + runInNewContext(source, { + window: browserWindow, + document: browserWindow.document, + navigator: browserWindow.navigator, + localStorage: browserWindow.localStorage, + ResizeObserver: browserWindow.ResizeObserver, + requestAnimationFrame: browserWindow.requestAnimationFrame.bind(browserWindow), + cancelAnimationFrame: browserWindow.cancelAnimationFrame.bind(browserWindow) + }) + if (descriptor === undefined) throw new Error('layout bundle did not register') + const react = requireModule('react') + const jsxRuntime = requireModule('react/jsx-runtime') + return descriptor.factory((id) => { + if (id === 'react') return react + if (id === 'react/jsx-runtime') return jsxRuntime + if (id === '@deepseek-ai/dsh-client-runtime/client') { + return { defineStore: (definition: unknown) => definition } + } + return {} + }) +} + +describe('Sherlock desktop shell controls', () => { + it('centers the Better Sidebar panel toggles lower in the macOS titlebar', async () => { + const preload = await readFile('src/preload/index.ts', 'utf8') + const shellStyles = await readFile('src/preload/shell-style.ts', 'utf8') + + expect(preload).toContain('mountDesktopShellStyles(document)') + expect(shellStyles).toContain('.t8lSSG_toggleCluster') + expect(shellStyles).toContain('top: calc(8px + env(safe-area-inset-top)) !important') + }) + + it('keeps Research out of the native Details layout controller', async () => { + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + const client = await loadLayoutBundle(browserWindow) + const LayoutController = client.LayoutController as new () => { + attachPanels(actions: Record void>): void + toggleSidebar(): void + openDetails(): void + closeDetails(): void + } + const layout = new LayoutController() + const writes: unknown[][] = [] + layout.attachPanels({ + toggleSidebar: () => writes.push(['toggleSidebar']), + openDetails: () => writes.push(['openDetails']), + closeDetails: () => writes.push(['closeDetails']) + }) + + layout.toggleSidebar() + layout.openDetails() + layout.closeDetails() + expect(writes).toEqual([['toggleSidebar'], ['openDetails'], ['closeDetails']]) + expect('enterResearch' in layout).toBe(false) + expect('leaveResearch' in layout).toBe(false) + }) + + it('renders the native Details column without a Research-owned portal host', async () => { + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + const client = await loadLayoutBundle(browserWindow) + expect(client.AppFrame).toBeTypeOf('function') + if (typeof client.AppFrame !== 'function') return + + const previousEnvironment = { + window: Object.getOwnPropertyDescriptor(globalThis, 'window'), + document: Object.getOwnPropertyDescriptor(globalThis, 'document'), + navigator: Object.getOwnPropertyDescriptor(globalThis, 'navigator'), + act: Object.getOwnPropertyDescriptor(globalThis, 'IS_REACT_ACT_ENVIRONMENT') + } + Object.defineProperties(globalThis, { + window: { configurable: true, value: browserWindow }, + document: { configurable: true, value: browserWindow.document }, + navigator: { configurable: true, value: browserWindow.navigator }, + IS_REACT_ACT_ENVIRONMENT: { configurable: true, value: true } + }) + const host = browserWindow.document.createElement('div') + browserWindow.document.body.appendChild(host) + const root = createRoot(host) + const panels = { sidebar: 280, details: 360, narrow: false, narrowExpanded: false } + try { + await act(async () => { + root.render(createElement(client.AppFrame, { + useStore: (select: (state: typeof panels) => unknown) => select(panels), + useSessions: (select: (state: unknown) => unknown) => select({ + current: 'session-1', + byId: { 'session-1': { blank: false } } + }), + actions: { + setNarrow: () => undefined, + closeDetails: () => undefined, + setSidebar: () => undefined, + setDetails: () => undefined + }, + renderSlot: (name: string) => createElement('div', { 'data-slot-name': name }) + })) + }) + + const portal = host.querySelector('[data-details-portal-host]') + expect(portal).toBeNull() + expect(host.querySelector('[data-slot-name="details"]')).not.toBeNull() + expect(host.querySelector('[data-dsh-frame]')).not.toBeNull() + expect( + host.querySelector('[data-dsh-frame] > [data-pane="conversation"]') + ).not.toBeNull() + } finally { + await act(async () => { root.unmount() }) + for (const [key, descriptor] of Object.entries(previousEnvironment)) { + const name = key === 'act' ? 'IS_REACT_ACT_ENVIRONMENT' : key + if (descriptor === undefined) delete (globalThis as Record)[name] + else Object.defineProperty(globalThis, name, descriptor) + } + } + }) +}) diff --git a/test/developer-mode-state.test.ts b/test/developer-mode-state.test.ts new file mode 100644 index 000000000..0371d7e6e --- /dev/null +++ b/test/developer-mode-state.test.ts @@ -0,0 +1,69 @@ +import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs' +import { tmpdir } from 'node:os' +import path from 'node:path' +import { afterEach, describe, expect, it } from 'vitest' +import { + developerModeStatePath, + isDeveloperModeEnabled, + setDeveloperModeEnabled +} from '../src/main/developer-mode-state' +import { + developerModeArgument, + developerModeEnabledFromArguments +} from '../src/shared/developer-mode' + +const temporaryDirectories: string[] = [] + +function temporaryUserData(): string { + const directory = mkdtempSync(path.join(tmpdir(), 'sherlock-developer-mode-')) + temporaryDirectories.push(directory) + return directory +} + +afterEach(() => { + for (const directory of temporaryDirectories.splice(0)) { + rmSync(directory, { recursive: true, force: true }) + } +}) + +describe('desktop-scoped developer mode state', () => { + it('survives a new reader such as a Harness restart on a different port', () => { + const userData = temporaryUserData() + + expect(isDeveloperModeEnabled(userData)).toBe(false) + setDeveloperModeEnabled(userData, true) + + expect(isDeveloperModeEnabled(userData)).toBe(true) + }) + + it('persists an explicit disabled state after developer mode is turned off', () => { + const userData = temporaryUserData() + + setDeveloperModeEnabled(userData, true) + setDeveloperModeEnabled(userData, false) + + expect(isDeveloperModeEnabled(userData)).toBe(false) + expect(JSON.parse(readFileSync(developerModeStatePath(userData), 'utf8'))).toEqual({ + enabled: false + }) + }) + + it('treats a malformed state file as disabled', () => { + const userData = temporaryUserData() + writeFileSync(developerModeStatePath(userData), '{not-json', 'utf8') + + expect(isDeveloperModeEnabled(userData)).toBe(false) + }) + + it('passes the desktop state into the isolated renderer without depending on its URL', () => { + expect(developerModeArgument(true)).toBe('--sherlock-developer-mode=true') + expect( + developerModeEnabledFromArguments([ + '/path/to/helper', + '--sherlock-developer-mode=true', + '--other=value' + ]) + ).toBe(true) + expect(developerModeEnabledFromArguments(['/path/to/helper'])).toBe(false) + }) +}) diff --git a/test/developer-mode.test.ts b/test/developer-mode.test.ts new file mode 100644 index 000000000..a2ed66274 --- /dev/null +++ b/test/developer-mode.test.ts @@ -0,0 +1,160 @@ +import { describe, expect, it } from 'vitest' +import { + DEVELOPER_CONVERSATION_VIEW_IDS, + DEVELOPER_MODE_STORAGE_KEY, + DeveloperModeController, + developerModeNoticeText, + setDeveloperConversationTabsVisibility, + setDeveloperSettingsVisibility +} from '../src/preload/developer-mode' + +class MemoryStorage { + private readonly values = new Map() + + getItem(key: string): string | null { + return this.values.get(key) ?? null + } + + setItem(key: string, value: string): void { + this.values.set(key, value) + } +} + +function settingsRow(id: string): { dataset: { settingsSectionId: string }; hidden: boolean } { + return { + dataset: { settingsSectionId: id }, + hidden: false + } +} + +function conversationTab(id: string): { + dataset: { conversationViewId: string } + hidden: boolean +} { + return { + dataset: { conversationViewId: id }, + hidden: false + } +} + +function localizedConversationTab(label: string, selected = false) { + return { + dataset: {} as { conversationViewId?: string; sherlockDeveloperTab?: string }, + hidden: false, + textContent: label, + clicks: 0, + getAttribute(name: string): string | null { + return name === 'aria-selected' ? String(selected) : null + }, + click(): void { + this.clicks += 1 + } + } +} + +describe('Sherlock developer mode', () => { + it('activates only on the fifth consecutive logo click and persists the mode', () => { + const storage = new MemoryStorage() + const controller = new DeveloperModeController(storage) + + expect(controller.logoClick(0)).toEqual({ status: 'pending', remaining: 4 }) + expect(controller.logoClick(200)).toEqual({ status: 'pending', remaining: 3 }) + expect(controller.logoClick(400)).toEqual({ status: 'pending', remaining: 2 }) + expect(controller.logoClick(600)).toEqual({ status: 'pending', remaining: 1 }) + expect(controller.isEnabled()).toBe(false) + + expect(controller.logoClick(800)).toEqual({ status: 'activated' }) + expect(controller.isEnabled()).toBe(true) + expect(storage.getItem(DEVELOPER_MODE_STORAGE_KEY)).toBe('true') + }) + + it('restarts the sequence when adjacent clicks are more than two seconds apart', () => { + const controller = new DeveloperModeController(new MemoryStorage()) + + controller.logoClick(0) + controller.logoClick(300) + controller.logoClick(600) + controller.logoClick(900) + + expect(controller.logoClick(3_001)).toEqual({ status: 'pending', remaining: 4 }) + expect(controller.isEnabled()).toBe(false) + }) + + it('deactivates an already enabled mode only on the fifth consecutive click', () => { + const storage = new MemoryStorage() + storage.setItem(DEVELOPER_MODE_STORAGE_KEY, 'true') + const controller = new DeveloperModeController(storage) + + expect(controller.isEnabled()).toBe(true) + expect(controller.logoClick(0)).toEqual({ status: 'pending', remaining: 4 }) + expect(controller.logoClick(200)).toEqual({ status: 'pending', remaining: 3 }) + expect(controller.logoClick(400)).toEqual({ status: 'pending', remaining: 2 }) + expect(controller.logoClick(600)).toEqual({ status: 'pending', remaining: 1 }) + expect(controller.isEnabled()).toBe(true) + + expect(controller.logoClick(800)).toEqual({ status: 'deactivated' }) + expect(controller.isEnabled()).toBe(false) + expect(storage.getItem(DEVELOPER_MODE_STORAGE_KEY)).toBe('false') + }) + + it('keeps About visible while hiding only developer settings rows', () => { + const rows = [ + settingsRow('general'), + settingsRow('models'), + settingsRow('plugins'), + settingsRow('agent-presets'), + settingsRow('dsh-update-checker'), + settingsRow('market'), + settingsRow('better-sidebar') + ] + + setDeveloperSettingsVisibility(rows, false) + expect(rows.filter((row) => row.hidden).map((row) => row.dataset.settingsSectionId)).toEqual([ + 'plugins', + 'agent-presets', + 'dsh-update-checker', + 'market', + 'better-sidebar' + ]) + + setDeveloperSettingsVisibility(rows, true) + expect(rows.some((row) => row.hidden)).toBe(false) + }) + + it('falls back to localized developer labels and returns to Chat', () => { + const chat = localizedConversationTab('对话') + const memory = localizedConversationTab('🔴 记忆 (2)') + const skills = localizedConversationTab('技能') + const todos = localizedConversationTab('待办', true) + + setDeveloperConversationTabsVisibility([chat, memory, skills, todos], false) + + expect(chat.clicks).toBe(1) + expect([memory, skills, todos].every((tab) => tab.hidden)).toBe(true) + }) + + it('hides developer conversation tabs outside developer mode', () => { + const tabs = [ + conversationTab('chat'), + conversationTab('research'), + conversationTab('trajectory'), + ...DEVELOPER_CONVERSATION_VIEW_IDS.map(conversationTab) + ] + + setDeveloperConversationTabsVisibility(tabs, false) + expect(tabs.filter((tab) => tab.hidden).map((tab) => tab.dataset.conversationViewId)) + .toEqual([...DEVELOPER_CONVERSATION_VIEW_IDS]) + expect(tabs.filter((tab) => !tab.hidden).map((tab) => tab.dataset.conversationViewId)) + .toEqual(['chat', 'research', 'trajectory']) + + setDeveloperConversationTabsVisibility(tabs, true) + expect(tabs.some((tab) => tab.hidden)).toBe(false) + }) + + it('describes both entering and exiting developer mode in each supported locale', () => { + expect(developerModeNoticeText('zh', true)).toBe('已进入开发者模式') + expect(developerModeNoticeText('zh', false)).toBe('已退出开发者模式') + expect(developerModeNoticeText('en', true)).toBe('Developer mode enabled') + expect(developerModeNoticeText('en', false)).toBe('Developer mode disabled') + }) +}) diff --git a/test/directory-picker.test.ts b/test/directory-picker.test.ts index 6aad42cc5..2e7bf05a7 100644 --- a/test/directory-picker.test.ts +++ b/test/directory-picker.test.ts @@ -8,10 +8,8 @@ describe('desktop Electron directory picker', () => { expect(preload).toContain("contextBridge.exposeInMainWorld('dshDesktopDirectoryPicker'") expect(preload).toContain("ipcRenderer.invoke('directory-picker:open')") - expect(main).toContain("ipcMain.handle('directory-picker:open'") - expect(main).toContain('event.senderFrame !== mainWindow.webContents.mainFrame') - expect(main).toContain('dialog.showOpenDialog(mainWindow') - expect(main).toContain("properties: ['openDirectory']") + expect(main).toContain('dialog.showOpenDialog(window') + expect(main).toContain("properties: ['openDirectory', 'createDirectory']") expect(main).toContain("app.commandLine.appendSwitch('lang', harnessLocale() === 'zh' ? 'zh-CN' : 'en-US')") }) @@ -39,7 +37,7 @@ describe('desktop Electron directory picker', () => { ) expect(dependencyPatch).toContain('window.dshDesktopDirectoryPicker') - expect(dependencyPatch).toContain('DSH Desktop directory picker bridge is unavailable') + expect(dependencyPatch).toContain('Sherlock directory picker bridge is unavailable') }) it('keeps the Host API proxy active when the legacy picker service is absent', async () => { diff --git a/test/dsh-file-drop-compat.test.ts b/test/dsh-file-drop-compat.test.ts new file mode 100644 index 000000000..d8955b751 --- /dev/null +++ b/test/dsh-file-drop-compat.test.ts @@ -0,0 +1,434 @@ +import { + lstat, + mkdir, + mkdtemp, + readFile, + rm, + symlink, + writeFile +} from 'node:fs/promises' +import { readFileSync } from 'node:fs' +import { tmpdir } from 'node:os' +import { join } from 'node:path' +import { runInNewContext } from 'node:vm' +import { afterEach, describe, expect, it } from 'vitest' +import { + Window, + type Element as HappyDOMElement, + type Event as HappyDOMEvent +} from 'happy-dom' +import { + DSH_FILE_DROP_INLINE_REFERENCE_MARKER, + DSH_FILE_DROP_QUIET_SUCCESS_MARKER, + DSH_FILE_DROP_RESEARCH_CANVAS_MARKER, + ensureDshFileDropResearchCanvasCompatibility +} from '../src/main/state/dsh-file-drop-compat' +import { HarnessRuntime } from '../src/main/runtime/harness-runtime' + +const temporaryDirectories: string[] = [] +const PRISTINE_CLIENT_FIXTURE = new URL( + './fixtures/dsh-file-drop-1.0.0-client.js', + import.meta.url +) + +afterEach(async () => { + await Promise.all( + temporaryDirectories.splice(0).map((directory) => + rm(directory, { recursive: true, force: true }) + ) + ) +}) + +async function pristineClientSource(): Promise { + return readFile(PRISTINE_CLIENT_FIXTURE, 'utf8') +} + +async function writePlugin(pluginDirectory: string, clientSource: string): Promise { + await mkdir(pluginDirectory, { recursive: true }) + await writeFile( + join(pluginDirectory, 'package.json'), + `${JSON.stringify({ name: 'dsh-file-drop', version: '1.0.0' }, null, 2)}\n`, + 'utf8' + ) + await writeFile(join(pluginDirectory, 'client.js'), clientSource, 'utf8') +} + +async function makeDshHome(clientSource?: string): Promise<{ + dshHome: string + pluginDirectory: string + clientPath: string +}> { + const root = await mkdtemp(join(tmpdir(), 'sherlock-dsh-file-drop-')) + temporaryDirectories.push(root) + const dshHome = join(root, 'harness') + const pluginDirectory = join( + dshHome, + 'profiles', + 'web', + 'node_modules', + 'dsh-file-drop' + ) + const clientPath = join(pluginDirectory, 'client.js') + await writePlugin(pluginDirectory, clientSource ?? await pristineClientSource()) + return { dshHome, pluginDirectory, clientPath } +} + +function installCaptureClient( + browserWindow: Window, + source: string, + onFilePaths: (paths: string[]) => void, + onDragState: (active: boolean) => void +): () => void { + let descriptor: { + factory(require: (id: string) => unknown): Record + } | undefined + const cleanups: Array<() => void> = [] + Object.assign(browserWindow, { + dshDesktop: { + getPathForFile: () => '/tmp/report.pdf' + }, + __ModuleLoader__: { + load(value: typeof descriptor) { + descriptor = value + } + } + }) + runInNewContext(source, { + window: browserWindow, + document: browserWindow.document, + setTimeout: () => 1, + clearTimeout: () => undefined + }) + if (!descriptor) throw new Error('capture fixture did not register') + const client = descriptor.factory((id) => { + if (id !== 'react') throw new Error(`unexpected fixture module: ${id}`) + return { + Fragment: Symbol('Fragment'), + createElement: (type: unknown, props?: unknown) => + typeof type === 'function' + ? (type as (value: unknown) => unknown)(props ?? {}) + : null, + useState: (value: unknown) => [ + value, + typeof value === 'boolean' ? onDragState : () => undefined + ], + useRef: (value: unknown) => ({ current: value }), + useEffect: (effect: () => void | (() => void)) => { + const cleanup = effect() + if (cleanup) cleanups.push(cleanup) + } + } + }) + const bundle = client as unknown as { + apply(ctx: { + effect(effect: () => void | (() => void)): void + slots: { + inject(name: string, register: () => void): void + register( + options: { id: string }, + render: (props: unknown) => unknown + ): void + } + }): void + } + bundle.apply({ + effect(effect) { + const cleanup = effect() + if (cleanup) cleanups.push(cleanup) + }, + slots: { + inject(_name, register) { + register() + }, + register(options, render) { + if (options.id !== 'file-drop') return + render({ + sessionId: 'session-1', + input: { draft: '' }, + inputActions: { + setDraft: () => undefined, + insertFilePaths: onFilePaths + } + }) + } + } + }) + return () => cleanups.splice(0).forEach((cleanup) => cleanup()) +} + +function dispatchFileDrag( + browserWindow: Window, + target: HappyDOMElement, + type: string +): HappyDOMEvent { + const event = new browserWindow.Event(type, { bubbles: true, cancelable: true }) + Object.defineProperty(event, 'dataTransfer', { + value: { + types: ['Files'], + files: [{ name: 'report.pdf', type: 'application/pdf' }], + dropEffect: 'none' + } + }) + target.dispatchEvent(event) + return event +} + +describe('dsh-file-drop Research canvas compatibility', () => { + it('lets all file-drag events reach Research while preserving the ordinary window capture drop', async () => { + const { dshHome, clientPath } = await makeDshHome() + + expect(await ensureDshFileDropResearchCanvasCompatibility(dshHome)).toEqual({ + status: 'patched', + clientPath + }) + const patched = await readFile(clientPath, 'utf8') + expect(patched).toContain(DSH_FILE_DROP_RESEARCH_CANVAS_MARKER) + expect(patched).toContain(DSH_FILE_DROP_INLINE_REFERENCE_MARKER) + expect(patched).toContain(DSH_FILE_DROP_QUIET_SUCCESS_MARKER) + expect(patched).not.toContain('✓ 已获取') + expect(patched).not.toContain('个文件已上传') + expect(patched).toContain("errs.length > 0 ? '✗ '") + expect(await ensureDshFileDropResearchCanvasCompatibility(dshHome)).toEqual({ + status: 'already-compatible', + clientPath + }) + + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + const composerFilePaths: string[][] = [] + const dragStates: boolean[] = [] + const cleanup = installCaptureClient( + browserWindow, + patched, + (paths) => { composerFilePaths.push(paths) }, + (active) => { dragStates.push(active) } + ) + const canvas = browserWindow.document.createElement('div') + canvas.setAttribute('data-research-canvas', '') + const canvasChild = browserWindow.document.createElement('span') + canvas.appendChild(canvasChild) + browserWindow.document.body.appendChild(canvas) + const reachedResearch: string[] = [] + for (const type of ['dragenter', 'dragover', 'dragleave', 'drop']) { + canvas.addEventListener(type, (event) => { + reachedResearch.push(type) + event.preventDefault() + event.stopPropagation() + }) + } + + try { + const outsideEnterTarget = browserWindow.document.createElement('div') + browserWindow.document.body.appendChild(outsideEnterTarget) + dispatchFileDrag(browserWindow, outsideEnterTarget, 'dragenter') + expect(dragStates.at(-1)).toBe(true) + + for (const type of ['dragenter', 'dragover', 'dragleave', 'drop']) { + dispatchFileDrag(browserWindow, canvasChild, type) + } + expect(reachedResearch).toEqual(['dragenter', 'dragover', 'dragleave', 'drop']) + expect(composerFilePaths).toEqual([]) + expect(dragStates.at(-1)).toBe(false) + + const outside = browserWindow.document.createElement('div') + browserWindow.document.body.appendChild(outside) + let outsideTargetDrops = 0 + outside.addEventListener('drop', () => { outsideTargetDrops += 1 }) + const outsideDrop = dispatchFileDrag(browserWindow, outside, 'drop') + + expect(outsideDrop.defaultPrevented).toBe(true) + expect(outsideTargetDrops).toBe(0) + expect(composerFilePaths).toEqual([['/tmp/report.pdf']]) + } finally { + cleanup() + } + }) + + it('applies the named compatibility before Harness launches the installed profile', async () => { + const { dshHome, clientPath } = await makeDshHome() + const root = join(dshHome, '..') + const dshEntryPath = join(root, 'dsh-entry.js') + const nodeExecutablePath = join(root, 'node') + const nodeEntryPath = join(root, 'node-entry.mjs') + const dshPatchPath = join(root, 'desktop.patch.yml') + await Promise.all([ + writeFile(dshEntryPath, '', 'utf8'), + writeFile(nodeExecutablePath, '', 'utf8'), + writeFile(nodeEntryPath, '', 'utf8'), + writeFile(dshPatchPath, '[]\n', 'utf8') + ]) + let sawCompatibilityAtLaunch = false + const runtime = new HarnessRuntime({ + dshEntryPath, + nodeExecutablePath, + nodeEntryPath, + dshPatchPath, + bundledSkillDirectory: root, + bundledWebSearchEntry: 'file:///tmp/session-model.js', + bundledMarketInstallerEntry: 'file:///tmp/market-installer.js', + bundledResearchTaskEntry: 'file:///tmp/research-task.js', + localSearchUrl: 'http://127.0.0.1:43123', + localSearchToken: 'test-search-token', + dshHome, + logPath: join(root, 'harness.log'), + launchProcess: () => { + sawCompatibilityAtLaunch = readFileSync(clientPath, 'utf8').includes( + DSH_FILE_DROP_RESEARCH_CANVAS_MARKER + ) + throw new Error('stop after compatibility assertion') + }, + onChanged: () => undefined + }) + + await runtime.start(root) + + expect(sawCompatibilityAtLaunch).toBe(true) + expect(runtime.snapshot().phase).toBe('failed') + }) + + it('upgrades the previous Research-only compatibility patch in place', async () => { + const { dshHome, clientPath } = await makeDshHome() + expect((await ensureDshFileDropResearchCanvasCompatibility(dshHome)).status) + .toBe('patched') + const current = await readFile(clientPath, 'utf8') + const legacy = current.replace( + ` if (!inputActions || !Array.isArray(paths) || paths.length === 0) return + // ${DSH_FILE_DROP_INLINE_REFERENCE_MARKER} + if (typeof inputActions.insertFilePaths === 'function') { + inputActions.insertFilePaths(paths) + return + }`, + ' if (!inputActions) return' + ).replace( + ` // ${DSH_FILE_DROP_QUIET_SUCCESS_MARKER} + statusStore.set(null)`, + " statusStore.set('✓ 已获取 ' + direct.length + ' 个原始路径（桌面壳）')" + ).replace( + ` const text = errs.length > 0 ? '✗ ' + errs.join('；') : '' + statusStore.set(text || null)`, + ` const text = [ + ok.length > 0 ? '✓ ' + ok.length + ' 个文件已上传' : '', + errs.length > 0 ? '✗ ' + errs.join('；') : '', + ].filter(Boolean).join('　') + statusStore.set(text || '没有文件被处理')` + ).replace( + ' statusStore.set(null)', + " statusStore.set('✓ 已获取 ' + shellPaths.length + ' 个原始路径（桌面壳）')" + ).replace( + ' statusStore.set(null)', + " statusStore.set('✓ 已获取 ' + paths.length + ' 个文件路径')" + ) + expect(legacy).not.toBe(current) + await writeFile(clientPath, legacy, 'utf8') + + expect(await ensureDshFileDropResearchCanvasCompatibility(dshHome)).toEqual({ + status: 'patched', + clientPath + }) + expect(await readFile(clientPath, 'utf8')).toBe(current) + }) + + it('does not guess when the named plugin client has an unknown capture shape', async () => { + const { dshHome, clientPath } = await makeDshHome('window.addEventListener("drop", unknown)\n') + + const result = await ensureDshFileDropResearchCanvasCompatibility(dshHome) + + expect(result).toEqual({ + status: 'unsupported', + clientPath, + reason: 'The dsh-file-drop 1.0.0 client source identity did not match.' + }) + expect(await readFile(clientPath, 'utf8')).toBe( + 'window.addEventListener("drop", unknown)\n' + ) + }) + + it('rejects a marked client when part of the known helper was deleted', async () => { + const { dshHome, clientPath } = await makeDshHome() + expect((await ensureDshFileDropResearchCanvasCompatibility(dshHome)).status) + .toBe('patched') + const patched = await readFile(clientPath, 'utf8') + const corrupt = patched.replace( + ' depthRef.current = 0\n setDrag(false)\n return true', + ' setDrag(false)\n return true' + ) + expect(corrupt).not.toBe(patched) + await writeFile(clientPath, corrupt, 'utf8') + + const result = await ensureDshFileDropResearchCanvasCompatibility(dshHome) + + expect(result.status).toBe('unsupported') + expect(await readFile(clientPath, 'utf8')).toBe(corrupt) + }) + + it('rejects a partially corrupted compatibility marker', async () => { + const { dshHome, clientPath } = await makeDshHome() + expect((await ensureDshFileDropResearchCanvasCompatibility(dshHome)).status) + .toBe('patched') + const patched = await readFile(clientPath, 'utf8') + const corrupt = patched.replace( + DSH_FILE_DROP_RESEARCH_CANVAS_MARKER, + 'Sherlock dsh-file-drop compatibility: Research owns its canvas' + ) + expect(corrupt).not.toBe(patched) + await writeFile(clientPath, corrupt, 'utf8') + + const result = await ensureDshFileDropResearchCanvasCompatibility(dshHome) + + expect(result.status).toBe('unsupported') + expect(await readFile(clientPath, 'utf8')).toBe(corrupt) + }) + + it('rejects semantic drift even when every capture anchor still matches', async () => { + const pristine = await pristineClientSource() + const drifted = pristine.replace( + 'const MAX_BYTES = 25 * 1024 * 1024', + 'const MAX_BYTES = 25 * 1024 * 1024 + 1' + ) + expect(drifted).not.toBe(pristine) + const { dshHome, clientPath } = await makeDshHome(drifted) + + const result = await ensureDshFileDropResearchCanvasCompatibility(dshHome) + + expect(result.status).toBe('unsupported') + expect(await readFile(clientPath, 'utf8')).toBe(drifted) + }) + + it('refuses a symlinked named plugin directory without mutating its target', async () => { + const root = await mkdtemp(join(tmpdir(), 'sherlock-dsh-file-drop-link-')) + temporaryDirectories.push(root) + const dshHome = join(root, 'harness') + const realPluginDirectory = join(root, 'outside-plugin') + const pristine = await pristineClientSource() + await writePlugin(realPluginDirectory, pristine) + const nodeModules = join(dshHome, 'profiles', 'web', 'node_modules') + const pluginDirectory = join(nodeModules, 'dsh-file-drop') + const clientPath = join(pluginDirectory, 'client.js') + await mkdir(nodeModules, { recursive: true }) + await symlink( + realPluginDirectory, + pluginDirectory, + process.platform === 'win32' ? 'junction' : 'dir' + ) + + const result = await ensureDshFileDropResearchCanvasCompatibility(dshHome) + + expect(result.status).toBe('unsupported') + expect((await lstat(pluginDirectory)).isSymbolicLink()).toBe(true) + expect(await readFile(join(realPluginDirectory, 'client.js'), 'utf8')).toBe(pristine) + }) + + it('refuses a symlinked client file without replacing the link or target', async () => { + const pristine = await pristineClientSource() + const { dshHome, clientPath } = await makeDshHome() + const outsideClient = join(dshHome, '..', 'outside-client.js') + await writeFile(outsideClient, pristine, 'utf8') + await rm(clientPath) + await symlink(outsideClient, clientPath, 'file') + + const result = await ensureDshFileDropResearchCanvasCompatibility(dshHome) + + expect(result.status).toBe('unsupported') + expect((await lstat(clientPath)).isSymbolicLink()).toBe(true) + expect(await readFile(outsideClient, 'utf8')).toBe(pristine) + }) +}) diff --git a/test/efund-ppt-layout-lint.test.ts b/test/efund-ppt-layout-lint.test.ts new file mode 100644 index 000000000..7a6f8ba22 --- /dev/null +++ b/test/efund-ppt-layout-lint.test.ts @@ -0,0 +1,377 @@ +import { spawnSync } from 'node:child_process' +import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs' +import { tmpdir } from 'node:os' +import path from 'node:path' +import { afterEach, describe, expect, it } from 'vitest' + +const projectRoot = path.resolve(import.meta.dirname, '..') +const lintScript = path.join( + projectRoot, + 'skills/efund-ppt-maker/scripts/lint_efund_layouts.py' +) +const scratchDirectories: string[] = [] + +type LayoutElement = Record + +const footerElements: LayoutElement[] = [ + { + id: 'footer-rule', + name: 'footer-divider', + kind: 'shape', + geometry: 'line', + scope: 'slide', + bbox: [38, 496, 885, 1] + }, + { + id: 'footer-company', + name: 'footer-company', + kind: 'text', + scope: 'slide', + bbox: [38, 504, 220, 12], + text: '易方达基金管理有限公司', + resolvedFontSize: 10.7, + textLayout: { lineCount: 1 } + }, + { + id: 'footer-confidentiality', + name: 'footer-confidentiality', + kind: 'text', + scope: 'slide', + bbox: [390, 504, 230, 12], + text: '仅供内部交流讨论，禁止外传', + resolvedFontSize: 10.7, + textLayout: { lineCount: 1 } + }, + { + id: 'footer-page-number', + name: 'page-number', + kind: 'text', + scope: 'slide', + bbox: [900, 504, 20, 12], + text: '3', + resolvedFontSize: 10.7, + textLayout: { lineCount: 1 } + } +] + +function title(overrides: LayoutElement = {}): LayoutElement { + return { + id: 'page-title', + name: 'page-title', + kind: 'text', + textRole: 'page-title', + scope: 'slide', + bbox: [38, 22, 650, 28], + text: '软件供给扩大后，验证与责任成为共同约束', + resolvedFontSize: 23, + resolvedTextStyle: { alignment: 'left' }, + textLayout: { lineCount: 1 }, + ...overrides + } +} + +function visual(overrides: LayoutElement = {}): LayoutElement { + return { + id: 'visual', + name: 'primary-visual', + kind: 'shape', + scope: 'slide', + bbox: [520, 160, 300, 180], + fillColor: '#DFF3F8', + lineWidth: 0, + ...overrides + } +} + +function runLint( + elements: LayoutElement[], + entryOverrides: Record = {}, + includeFooter = true +) { + const root = mkdtempSync(path.join(tmpdir(), 'efund-layout-lint-')) + scratchDirectories.push(root) + const layoutDir = path.join(root, 'layouts') + const reportPath = path.join(root, 'report.json') + const layoutPath = path.join(layoutDir, 'slide-001.layout.json') + const mapPath = path.join(root, 'template-frame-map.json') + const allElements = includeFooter ? [...elements, ...footerElements] : elements + mkdirSync(layoutDir) + + writeFileSync( + layoutPath, + `${JSON.stringify( + { + slide: { slide: 1, frame: { left: 0, top: 0, width: 960, height: 540 } }, + elements: allElements + }, + null, + 2 + )}\n`, + { encoding: 'utf8', flag: 'wx' } + ) + writeFileSync( + mapPath, + `${JSON.stringify( + { + schemaVersion: '1.0', + singleSourcePptx: 'assets/efund-ai-platform-v21.pptx', + outputSlides: [ + { + outputSlide: 1, + buildMode: 'original-in-brand-shell', + moduleCount: 1, + layoutDecision: { + contentStructure: '证据', + readingOrder: '左侧解释到右侧证据', + primaryVisual: '右侧主视觉', + geometryPlan: '解释区与证据区组成非对称双区', + caseInfluence: ['V21 第3页：证据双区语法'], + whyNotDirectReuse: '内容模块与源页不同', + originalityEvidence: ['列宽由当前证据量决定'] + }, + visualTextBinding: { + visualType: 'diagram', + supportsClaim: '验证与责任需要同步进入软件供给体系', + textAnchor: '页面标题与左侧解释', + sourceOrGeneration: '本页可编辑矢量图形', + whyThisVisual: '关系图同时呈现供给扩张与约束机制', + informationCarried: '供给扩大后约束同步增强的关系', + visualObjectIds: ['visual'] + }, + editTargets: [], + ...entryOverrides + } + ] + }, + null, + 2 + )}\n`, + 'utf8' + ) + + const result = spawnSync( + 'python3', + [lintScript, layoutDir, '--map', mapPath, '--json-output', reportPath], + { cwd: projectRoot, encoding: 'utf8' } + ) + const report = JSON.parse(readFileSync(reportPath, 'utf8')) as { + issues: Array<{ code: string }> + } + return { + status: result.status, + codes: report.issues.map((item) => item.code), + stdout: result.stdout, + stderr: result.stderr + } +} + +afterEach(() => { + while (scratchDirectories.length) { + rmSync(scratchDirectories.pop()!, { recursive: true, force: true }) + } +}) + +describe('efund PowerPoint layout lint hard gates', () => { + it('rejects a wrapped top-bar title even when the runtime reports points', () => { + const result = runLint([ + title({ + bbox: [38, 18, 650, 52], + text: 'AI开发工具已进入多数使用阶段，Agent仍处于\n早期扩张', + textLayout: { lineCount: 2 } + }), + visual() + ]) + + expect(result.codes, result.stdout).toContain('wrapped-title') + }) + + it('rejects a normal content slide that drops the complete brand footer', () => { + const result = runLint([title(), visual()], {}, false) + + expect(result.codes, result.stdout).toContain('missing-brand-footer-furniture') + }) + + it('rejects centered explanatory body text', () => { + const result = runLint([ + title(), + visual(), + { + id: 'body-copy', + name: 'narrative-explanation', + kind: 'text', + textRole: 'body', + scope: 'slide', + bbox: [60, 140, 360, 90], + text: '任务属性决定采用顺序；失败后果有限的场景更容易进入日常。', + resolvedFontSize: 16, + resolvedTextStyle: { alignment: 'center' }, + textLayout: { lineCount: 2 }, + paragraphs: [{ resolvedTextStyle: { alignment: 'center' }, runs: [] }] + } + ]) + + expect(result.codes, result.stdout).toContain('body-text-not-left-aligned') + }) + + it('rejects a connector that enters the text safety envelope', () => { + const result = runLint([ + title(), + visual(), + { + id: 'relationship-connector', + name: 'relationship-connector', + kind: 'shape', + geometry: 'line', + scope: 'slide', + bbox: [300, 250, 220, 1], + lineStart: [300, 250], + lineEnd: [520, 250] + }, + { + id: 'relationship-label', + name: 'relationship-label', + kind: 'text', + textRole: 'body', + scope: 'slide', + bbox: [390, 235, 110, 30], + text: '岗位与教育', + resolvedFontSize: 16, + resolvedTextStyle: { alignment: 'left' }, + textLayout: { lineCount: 1 } + } + ]) + + expect(result.codes, result.stdout).toContain('connector-text-clearance') + }) + + it('rejects repeated modules that violate their declared alignment grid', () => { + const result = runLint( + [ + title(), + visual({ id: 'm1', name: 'peer-module-1', bbox: [100, 180, 150, 100] }), + visual({ id: 'm2', name: 'peer-module-2', bbox: [300, 183, 145, 100] }), + visual({ id: 'm3', name: 'peer-module-3', bbox: [505, 180, 150, 96] }) + ], + { + moduleCount: 3, + visualTextBinding: { + visualType: 'diagram', + supportsClaim: '三项控制共同约束软件供给', + textAnchor: '页面标题', + sourceOrGeneration: '三个可编辑同级模块', + whyThisVisual: '并列模块用于比较三项同级控制', + informationCarried: '三项控制的同级关系', + visualObjectIds: ['m1', 'm2', 'm3'] + }, + alignmentGroups: [ + { + name: '三项同级控制', + objectIds: ['m1', 'm2', 'm3'], + checks: ['top', 'width', 'height', 'horizontal-gap'], + tolerancePx: 2 + } + ] + } + ) + + expect(result.codes, result.stdout).toContain('alignment-group-violation') + }) + + it('rejects text-bearing shapes without the minimum inner safe distance', () => { + const result = runLint([ + title(), + visual(), + { + id: 'tight-body-shape', + name: 'body-container', + kind: 'shape', + geometry: 'rect', + textRole: 'body', + scope: 'slide', + bbox: [80, 170, 260, 90], + text: '说明文字与图形边缘必须留出安全距离', + textInsets: { left: 4, right: 4, top: 4, bottom: 4 }, + resolvedFontSize: 16, + resolvedTextStyle: { alignment: 'left' }, + textLayout: { lineCount: 2 }, + fillColor: '#DFF3F8', + lineWidth: 0 + } + ]) + + expect(result.codes, result.stdout).toContain('text-inset-clearance') + }) + + it('allows deliberate centering for short node labels on a clean grid', () => { + const result = runLint( + [ + title(), + { + id: 'node-a', + name: 'node-label-a', + kind: 'shape', + geometry: 'rect', + textRole: 'node-label', + scope: 'slide', + bbox: [100, 180, 100, 60], + text: '输入', + resolvedFontSize: 16, + resolvedTextStyle: { alignment: 'center' }, + textLayout: { lineCount: 1 }, + fillColor: '#DFF3F8', + lineWidth: 0 + }, + { + id: 'node-b', + name: 'node-label-b', + kind: 'shape', + geometry: 'rect', + textRole: 'node-label', + scope: 'slide', + bbox: [500, 180, 100, 60], + text: '输出', + resolvedFontSize: 16, + resolvedTextStyle: { alignment: 'center' }, + textLayout: { lineCount: 1 }, + fillColor: '#005096', + lineWidth: 0 + }, + { + id: 'node-connector', + name: 'relationship-connector', + kind: 'shape', + geometry: 'line', + scope: 'slide', + bbox: [200, 210, 300, 0], + lineStart: [200, 210], + lineEnd: [500, 210], + fromId: 'node-a', + toId: 'node-b' + } + ], + { + moduleCount: 2, + visualTextBinding: { + visualType: 'diagram', + supportsClaim: '输入经过治理后形成输出', + textAnchor: '页面标题', + sourceOrGeneration: '两个节点和一条可编辑连接线', + whyThisVisual: '节点关系直接表达输入到输出的方向', + informationCarried: '输入、输出及两者之间的方向', + visualObjectIds: ['node-a', 'node-b', 'node-connector'] + }, + alignmentGroups: [ + { + name: '输入输出节点', + objectIds: ['node-a', 'node-b'], + checks: ['top', 'width', 'height'], + tolerancePx: 2 + } + ] + } + ) + + expect(result.status, `${result.stdout}\n${result.stderr}`).toBe(0) + expect(result.codes).toEqual([]) + }) +}) diff --git a/test/fixtures/dsh-file-drop-1.0.0-client.js b/test/fixtures/dsh-file-drop-1.0.0-client.js new file mode 100644 index 000000000..1f63470c4 --- /dev/null +++ b/test/fixtures/dsh-file-drop-1.0.0-client.js @@ -0,0 +1,438 @@ +// dsh-file-drop · Client half（DSH web __ModuleLoader__ 格式） +// 两个入口共用同一套处理逻辑（壳直取原始路径 → uri-list → 上传兜底）： +// 1. 回形针按钮（conversation.input.left）：点击弹文件选择器 +// 2. 拖拽（window 捕获阶段拦截，先于 DSH 自带图片拖拽处理）： +// - 桌面壳 preload 已解析路径 → 直接取 +// - DataTransfer 自带路径（uri-list）→ 直接取 +// - 普通文件 → POST /api/dsh-file-drop 上传到工作区 +window.__ModuleLoader__.load({ + id: 'dsh-file-drop', + factory: (require) => { + const module = { exports: {} } + const exports = module.exports + Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' }) + + const React = require('react') + + const TEXT_EXT = new Set([ + 'md', 'markdown', 'txt', 'text', 'json', 'csv', 'tsv', 'ts', 'tsx', 'js', 'jsx', 'mjs', 'cjs', + 'py', 'pyw', 'yaml', 'yml', 'toml', 'ini', 'cfg', 'conf', 'log', 'xml', 'html', 'htm', 'css', + 'scss', 'sass', 'less', 'sh', 'bash', 'zsh', 'fish', 'sql', 'go', 'rs', 'java', 'kt', 'kts', + 'c', 'h', 'cpp', 'hpp', 'cc', 'hh', 'rb', 'php', 'lua', 'r', 'swift', 'vue', 'svelte', 'env', + 'properties', 'gitignore', 'dockerfile', 'makefile', 'gradle', 'lock', + ]) + const TEXT_MIME = new Set([ + 'application/json', 'application/xml', 'application/javascript', 'application/x-yaml', + 'application/sql', 'application/x-sh', 'application/x-httpd-php', 'application/ecmascript', + ]) + const MAX_BYTES = 25 * 1024 * 1024 + const API_PATH = '/api/dsh-file-drop' + + // ---- 文件识别与读取 ---- + + function looksText(file) { + if (file.type && file.type.startsWith('text/')) return true + if (file.type && TEXT_MIME.has(file.type)) return true + const dot = file.name.lastIndexOf('.') + if (dot < 0) return false + return TEXT_EXT.has(file.name.slice(dot + 1).toLowerCase()) + } + + function fileToBase64(file) { + return new Promise((resolve, reject) => { + const reader = new FileReader() + reader.onerror = () => reject(reader.error || new Error('读取文件失败')) + reader.onload = () => { + try { + const bytes = new Uint8Array(reader.result) + let bin = '' + const CHUNK = 0x8000 + for (let i = 0; i < bytes.length; i += CHUNK) { + bin += String.fromCharCode.apply(null, bytes.subarray(i, i + CHUNK)) + } + resolve(btoa(bin)) + } catch (e) { reject(e) } + } + reader.readAsArrayBuffer(file) + }) + } + + // ---- 桌面壳 ---- + + // 拖拽场景：preload 在捕获阶段已用 webUtils.getPathForFile 解析好路径 + function drainShellPaths() { + try { + if (typeof window === 'undefined' || !window.dshDesktop) return [] + if (typeof window.dshDesktop.drainDroppedPaths === 'function') { + const p = window.dshDesktop.drainDroppedPaths() + return Array.isArray(p) ? p : [] + } + } catch { /* 忽略 */ } + return [] + } + + // 按钮/兜底场景：直接映射单个 File（preload 暴露的备用 API） + function shellPathOf(file) { + try { + if (typeof window === 'undefined' || !window.dshDesktop) return null + if (typeof window.dshDesktop.getPathForFile === 'function') { + const p = window.dshDesktop.getPathForFile(file) + return (typeof p === 'string' && p.length > 0) ? p : null + } + } catch { /* 忽略 */ } + return null + } + + // 拖拽自带路径（Obsidian / 文件管理器拖拽常带 uri-list） + function extractPaths(e) { + const paths = [] + try { + const uris = (e.dataTransfer.getData('text/uri-list') || '').split('\n') + for (const line of uris) { + const t = line.trim() + if (!t || t.startsWith('#')) continue + if (t.startsWith('file://')) { + try { + paths.push(decodeURIComponent(t.slice('file://'.length).replace(/^localhost/, ''))) + } catch { paths.push(t.slice(7)) } + } else if (t.startsWith('/')) { + paths.push(t) + } + } + } catch { /* 某些浏览器/事件阶段读不了，忽略 */ } + if (paths.length === 0) { + try { + const plain = (e.dataTransfer.getData('text/plain') || '').trim() + if (plain && (plain.startsWith('/') || /^[A-Za-z]:[\\/]/.test(plain)) && !plain.includes('\n')) { + paths.push(plain) + } + } catch { /* 忽略 */ } + } + return paths + } + + // ---- 共享状态（按钮上传与拖拽共用一个状态条） ---- + + const statusStore = { + value: null, + listeners: new Set(), + timer: null, + set(text) { + this.value = text + for (const l of [...this.listeners]) l() + if (this.timer) clearTimeout(this.timer) + this.timer = setTimeout(() => { + this.value = null + for (const l of [...this.listeners]) l() + }, 3500) + }, + subscribe(fn) { + this.listeners.add(fn) + return () => this.listeners.delete(fn) + }, + } + + function useStatus() { + const [value, setValue] = React.useState(statusStore.value) + React.useEffect(() => statusStore.subscribe(() => setValue(statusStore.value)), []) + return value + } + + function appendToDraft(inputActions, draft, paths) { + if (!inputActions) return + const lines = paths.map((p) => '📎 文件：`' + p + '`') + const nl = draft === '' ? '' : '\n' + inputActions.setDraft(draft + nl + lines.join('\n')) + } + + // 共用处理：壳路径优先，其余走上传兜底 + async function processFiles(files, opts) { + if (!files.length) return + const { sessionId, inputActions, getDraft } = opts + const direct = [] + const rest = [] + for (const f of files) { + const p = shellPathOf(f) + if (p) direct.push(p) + else rest.push(f) + } + if (direct.length > 0) { + appendToDraft(inputActions, getDraft(), direct) + statusStore.set('✓ 已获取 ' + direct.length + ' 个原始路径（桌面壳）') + } + if (rest.length === 0) return + + statusStore.set('正在上传 ' + rest.length + ' 个文件…') + const ok = [] + const errs = [] + for (const f of rest) { + if (f.size > MAX_BYTES) { errs.push(f.name + '（超过 25MB 限制）'); continue } + try { + const payload = looksText(f) + ? { kind: 'text', content: await f.text() } + : { kind: 'binary', base64: await fileToBase64(f) } + const response = await fetch(API_PATH, { + method: 'POST', + headers: { 'content-type': 'application/json' }, + body: JSON.stringify({ + sessionId: sessionId, + name: f.name, + size: f.size, + type: f.type || '', + ...payload, + }), + }) + const data = await response.json().catch(() => ({})) + if (response.ok && data.path) ok.push(data.path) + else errs.push(f.name + '：' + (data.error || '保存失败')) + } catch (err) { + errs.push(f.name + '：' + String((err && err.message) || err)) + } + } + if (ok.length > 0) appendToDraft(inputActions, getDraft(), ok) + const text = [ + ok.length > 0 ? '✓ ' + ok.length + ' 个文件已上传' : '', + errs.length > 0 ? '✗ ' + errs.join('；') : '', + ].filter(Boolean).join('　') + statusStore.set(text || '没有文件被处理') + } + + // ---- 组件 ---- + + // 输入框工具行：回形针按钮（点开文件选择器） + function PaperclipButton(props) { + const pickRef = React.useRef(null) + const optsRef = React.useRef({}) + optsRef.current = { + sessionId: props.sessionId, + inputActions: props.inputActions, + getDraft: () => (props.input && props.input.draft) || '', + } + const onClick = () => { if (pickRef.current) pickRef.current.click() } + const onChange = (e) => { + const files = Array.from(e.target.files || []) + e.target.value = '' + if (files.length > 0) void processFiles(files, optsRef.current) + } + return React.createElement(React.Fragment, null, + React.createElement('div', { className: 'dsh-paperclip-wrap' }, + React.createElement('button', { + type: 'button', + className: 'dsh-paperclip', + 'aria-label': '上传文件', + onClick: onClick, + }, + React.createElement('svg', { viewBox: '0 0 16 16', width: 14, height: 14, fill: 'none', 'aria-hidden': true }, + React.createElement('path', { + d: 'M5.5498 9.75V5H6.9502V9.75C6.9502 10.3299 7.4201 10.7998 8 10.7998C8.5799 10.7998 9.0498 10.3299 9.0498 9.75V4.5C9.0498 2.9536 7.7964 1.7002 6.25 1.7002C4.7036 1.7002 3.4502 2.9536 3.4502 4.5V9.75C3.4502 12.2629 5.4871 14.2998 8 14.2998C10.5129 14.2998 12.5498 12.2629 12.5498 9.75V4H13.9502V9.75C13.9502 13.0361 11.2861 15.7002 8 15.7002C4.71391 15.7002 2.0498 13.0361 2.0498 9.75V4.5C2.04981 2.1804 3.9304 0.299806 6.25 0.299805C8.5696 0.299805 10.4502 2.1804 10.4502 4.5V9.75C10.4502 11.1031 9.3531 12.2002 8 12.2002C6.6469 12.2002 5.5498 11.1031 5.5498 9.75Z', + fill: 'currentColor', + }) + ) + ), + React.createElement('div', { className: 'dsh-paperclip-tip' }, + '点击选择文件 · 也可把文件拖到窗口任意位置' + ) + ), + React.createElement('input', { + ref: pickRef, + type: 'file', + multiple: true, + style: { display: 'none' }, + onChange: onChange, + }) + ) + } + + // 输入框上方 dock：拖拽监听 + 浮层 + 状态条 + function DropZone(props) { + const [drag, setDrag] = React.useState(false) + const statusText = useStatus() + const depthRef = React.useRef(0) + const busyRef = React.useRef(false) + const optsRef = React.useRef({}) + optsRef.current = { + sessionId: props.sessionId, + inputActions: props.inputActions, + getDraft: () => (props.input && props.input.draft) || '', + } + + React.useEffect(() => { + // 全部挂在 window 捕获阶段：事件流的第一个节点，先于 DSH 自带的 + // document 级拖拽图片处理（InputBar intakeImages / DropOverlay）。 + const hasFiles = (e) => e.dataTransfer && Array.from(e.dataTransfer.types || []).includes('Files') + const onDragEnter = (e) => { + if (!hasFiles(e)) return + e.preventDefault() + e.stopPropagation() + depthRef.current += 1 + setDrag(true) + } + const onDragOver = (e) => { + if (!hasFiles(e)) return + e.preventDefault() + e.stopPropagation() + if (e.dataTransfer) e.dataTransfer.dropEffect = 'copy' + } + const onDragLeave = (e) => { + e.stopPropagation() + depthRef.current -= 1 + if (depthRef.current <= 0) { depthRef.current = 0; setDrag(false) } + } + const onDrop = (e) => { + if (!hasFiles(e)) return + e.preventDefault() + e.stopPropagation() + depthRef.current = 0 + setDrag(false) + void handleDrop(e) + } + window.addEventListener('dragenter', onDragEnter, true) + window.addEventListener('dragover', onDragOver, true) + window.addEventListener('dragleave', onDragLeave, true) + window.addEventListener('drop', onDrop, true) + return () => { + window.removeEventListener('dragenter', onDragEnter, true) + window.removeEventListener('dragover', onDragOver, true) + window.removeEventListener('dragleave', onDragLeave, true) + window.removeEventListener('drop', onDrop, true) + } + }, []) + + async function handleDrop(e) { + if (busyRef.current) return + const files = Array.from((e.dataTransfer && e.dataTransfer.files) || []) + + // 桌面壳（preload 捕获阶段已解析好磁盘原始路径） + const shellPaths = drainShellPaths() + if (shellPaths.length > 0) { + appendToDraft(optsRef.current.inputActions, optsRef.current.getDraft(), shellPaths) + statusStore.set('✓ 已获取 ' + shellPaths.length + ' 个原始路径（桌面壳）') + return + } + + // 拖拽自带路径 → 直接取地址，零上传 + const paths = extractPaths(e) + if (paths.length > 0) { + appendToDraft(optsRef.current.inputActions, optsRef.current.getDraft(), paths) + statusStore.set('✓ 已获取 ' + paths.length + ' 个文件路径') + return + } + + // 普通文件 → 上传兜底 + if (files.length === 0) return + busyRef.current = true + try { + await processFiles(files, optsRef.current) + } finally { + busyRef.current = false + } + } + + return React.createElement(React.Fragment, null, + statusText ? React.createElement('div', { className: 'dsh-drop-status' }, statusText) : null, + drag ? React.createElement('div', { className: 'dsh-drop-overlay' }, + React.createElement('div', { className: 'dsh-drop-overlay-inner' }, '松开鼠标，获取文件') + ) : null + ) + } + + const CSS = ` + .dsh-paperclip-wrap { + position: relative; + display: inline-flex; + } + .dsh-paperclip-wrap .dsh-paperclip-tip { + position: absolute; + bottom: calc(100% + 8px); + left: 50%; + transform: translateX(-50%); + z-index: 50; + white-space: nowrap; + font-size: 12px; + line-height: 1.4; + color: #dce1e8; + background: rgba(20, 22, 28, 0.92); + border: 1px solid rgba(255, 255, 255, 0.08); + border-radius: 8px; + padding: 6px 10px; + box-shadow: 0 6px 24px rgba(0, 0, 0, 0.35); + opacity: 0; + pointer-events: none; + } + /* 每次 hover 都重新播放：淡入 → 停留 → 自动淡出 */ + .dsh-paperclip-wrap:hover .dsh-paperclip-tip { + animation: dshTipCycle 1.5s ease forwards; + } + @keyframes dshTipCycle { + 0% { opacity: 0; } + 10% { opacity: 1; } + 85% { opacity: 1; } + 100% { opacity: 0; } + } + .dsh-paperclip { + display: grid; place-items: center; flex: none; + width: 28px; height: 28px; + border: none; border-radius: 999px; + background: var(--dsw-specific-selector, rgba(128, 128, 128, 0.14)); + color: var(--dsw-alias-label-primary, inherit); + cursor: pointer; + transition: background 0.15s ease; + } + .dsh-paperclip:hover:not(:disabled) { + background: var(--dsw-alias-interactive-bg-hover-solid, rgba(128, 128, 128, 0.24)); + } + .dsh-drop-status { + position: fixed; bottom: 110px; left: 50%; transform: translateX(-50%); + z-index: 9998; pointer-events: none; + max-width: 70vw; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + font-size: 12px; line-height: 1.5; color: #dce1e8; + background: rgba(20, 22, 28, 0.85); border: 1px solid rgba(255, 255, 255, 0.08); + border-radius: 999px; padding: 6px 14px; + box-shadow: 0 6px 24px rgba(0, 0, 0, 0.35); + animation: dshDropStatusIn 0.18s ease-out; + } + @keyframes dshDropStatusIn { + from { opacity: 0; transform: translateX(-50%) translateY(6px); } + to { opacity: 1; transform: translateX(-50%) translateY(0); } + } + .dsh-drop-overlay { + position: fixed; inset: 0; z-index: 9999; + background: rgba(24, 118, 255, 0.08); + border: 2px dashed rgba(24, 118, 255, 0.7); + display: flex; align-items: center; justify-content: center; + pointer-events: none; + } + .dsh-drop-overlay-inner { + background: #1876ff; color: #fff; border-radius: 10px; + padding: 14px 28px; font-size: 15px; font-weight: 600; + box-shadow: 0 8px 30px rgba(0, 0, 0, 0.25); + } + ` + + const inject = ['slots'] + + function apply(ctx) { + ctx.effect(() => { + const style = document.createElement('style') + style.dataset.plugin = 'dsh-file-drop' + style.textContent = CSS + document.head.appendChild(style) + return () => style.remove() + }, 'dsh-file-drop: styles') + + ctx.slots.inject('conversation.input.left', () => ctx.slots.register( + { name: 'conversation.input.left', id: 'file-drop-pick', order: 0 }, + (props) => React.createElement(PaperclipButton, props) + )) + + ctx.slots.inject('conversation.input.dock', () => ctx.slots.register( + { name: 'conversation.input.dock', id: 'file-drop', order: 30 }, + (props) => React.createElement(DropZone, props) + )) + } + + exports.inject = inject + exports.apply = apply + return module.exports + }, +}) diff --git a/test/formal-git-state.test.ts b/test/formal-git-state.test.ts new file mode 100644 index 000000000..55180fd50 --- /dev/null +++ b/test/formal-git-state.test.ts @@ -0,0 +1,206 @@ +import { execFileSync, spawnSync } from 'node:child_process' +import { mkdirSync, mkdtempSync, renameSync, rmSync, writeFileSync } from 'node:fs' +import os from 'node:os' +import path from 'node:path' +import { afterEach, describe, expect, it } from 'vitest' + +const projectRoot = path.resolve(import.meta.dirname, '..') +const verifier = path.join(projectRoot, 'scripts', 'verify-formal-git-state.mjs') +const scratchDirectories: string[] = [] + +function runGit(repository: string, ...args: string[]): string { + return execFileSync('git', args, { cwd: repository, encoding: 'utf8' }).trim() +} + +function createRepository(version = '0.6.8'): string { + const repository = mkdtempSync(path.join(os.tmpdir(), 'sherlock-formal-git-')) + scratchDirectories.push(repository) + runGit(repository, 'init', '-b', 'main') + runGit(repository, 'config', 'user.name', 'Sherlock Test') + runGit(repository, 'config', 'user.email', 'sherlock-test@example.com') + writeFileSync( + path.join(repository, 'package.json'), + `${JSON.stringify({ name: 'sherlock-test', version }, null, 2)}\n`, + 'utf8' + ) + writeFileSync(path.join(repository, 'tracked.txt'), 'baseline\n', 'utf8') + runGit(repository, 'add', 'package.json', 'tracked.txt') + runGit(repository, 'commit', '-m', '基线提交') + return repository +} + +function verify(repository: string) { + return spawnSync(process.execPath, [verifier, '--repo', repository], { + encoding: 'utf8' + }) +} + +afterEach(() => { + for (const directory of scratchDirectories.splice(0)) { + rmSync(directory, { recursive: true, force: true }) + } +}) + +describe('formal Git source gate', () => { + it('accepts a clean patch release committed on main', () => { + const repository = createRepository() + + const result = verify(repository) + + expect(result.status).toBe(0) + expect(result.stdout).toContain('正式构建源码检查通过') + }) + + it('rejects tracked changes that have not been committed', () => { + const repository = createRepository() + writeFileSync(path.join(repository, 'tracked.txt'), 'dirty\n', 'utf8') + + const result = verify(repository) + + expect(result.status).toBe(1) + expect(result.stderr).toContain('存在尚未提交的代码改动') + }) + + it('rejects untracked source files that would be omitted from the formal build commit', () => { + const repository = createRepository() + mkdirSync(path.join(repository, 'src')) + writeFileSync(path.join(repository, 'src', 'new-feature.ts'), 'export const value = 1\n') + + const result = verify(repository) + + expect(result.status).toBe(1) + expect(result.stderr).toContain('未纳入 Git 的源码文件') + expect(result.stderr).toContain('src/new-feature.ts') + }) + + it('ignores allowed generated output but rejects an unknown untracked root file', () => { + const repository = createRepository() + mkdirSync(path.join(repository, 'dist-local-integration')) + writeFileSync(path.join(repository, 'dist-local-integration', 'generated.js'), 'generated\n') + + expect(verify(repository).status).toBe(0) + + writeFileSync(path.join(repository, 'unexpected-root-file'), 'not generated\n') + const result = verify(repository) + + expect(result.status).toBe(1) + expect(result.stderr).toContain('未纳入 Git 的源码文件') + expect(result.stderr).toContain('unexpected-root-file') + }) + + it('rejects an unarchived integration branch with commits missing from main', () => { + const repository = createRepository() + runGit(repository, 'switch', '-c', 'codex/integration/20260831-02') + writeFileSync(path.join(repository, 'session.txt'), 'unmerged\n', 'utf8') + runGit(repository, 'add', 'session.txt') + runGit(repository, 'commit', '-m', '另一个会话的修改') + runGit(repository, 'switch', 'main') + + const result = verify(repository) + + expect(result.status).toBe(1) + expect(result.stderr).toContain('codex/integration/20260831-02') + expect(result.stderr).toContain('尚未合并到 main') + }) + + it('ignores an integration branch whose exact batch was explicitly cancelled and archived', () => { + const repository = createRepository() + const baseMainCommit = runGit(repository, 'rev-parse', 'HEAD') + const branch = 'codex/integration/20260831-01' + runGit(repository, 'switch', '-c', branch) + writeFileSync(path.join(repository, 'cancelled-batch.txt'), 'not for release\n', 'utf8') + runGit(repository, 'add', 'cancelled-batch.txt') + runGit(repository, 'commit', '-m', '已取消的集成批次') + const cancelledTip = runGit(repository, 'rev-parse', 'HEAD') + runGit(repository, 'switch', 'main') + + const historyDirectory = path.join( + repository, + runGit(repository, 'rev-parse', '--git-common-dir'), + 'sherlock-integration', + 'history', + '20260831-01-cancelled-2026-08-31T08-30-00.000Z' + ) + mkdirSync(historyDirectory, { recursive: true }) + writeFileSync(path.join(historyDirectory, 'lease.json'), `${JSON.stringify({ + schemaVersion: 1, + revision: 2, + batchId: '20260831-01', + branch, + manifestPath: 'config/sherlock-integration-batches/20260831-01.json', + baseMainCommit, + currentTip: cancelledTip, + ownerTokenHash: 'a'.repeat(64), + createdAt: '2026-08-31T08:00:00.000Z', + updatedAt: '2026-08-31T08:15:00.000Z' + })}\n`, 'utf8') + + const result = verify(repository) + + expect(result.status, result.stderr).toBe(0) + }) + + it('rejects uncommitted changes left in another session worktree', () => { + const repository = createRepository() + const worktreeParent = mkdtempSync(path.join(os.tmpdir(), 'sherlock-session-worktree-')) + scratchDirectories.push(worktreeParent) + const worktree = path.join(worktreeParent, 'worktree') + runGit(repository, 'worktree', 'add', worktree, '-b', 'codex/dirty-session') + writeFileSync(path.join(worktree, 'tracked.txt'), 'dirty session change\n', 'utf8') + + const result = verify(repository) + + expect(result.status).toBe(1) + expect(result.stderr).toContain('codex/dirty-session') + expect(result.stderr).toContain('另一个 worktree 存在尚未提交的改动') + }) + + it('rejects an active integration lease before a formal build can start', () => { + const repository = createRepository() + const head = runGit(repository, 'rev-parse', 'HEAD') + const leaseDirectory = path.join(repository, runGit(repository, 'rev-parse', '--git-common-dir'), 'sherlock-integration', 'active') + mkdirSync(leaseDirectory, { recursive: true }) + writeFileSync(path.join(leaseDirectory, 'lease.json'), `${JSON.stringify({ + schemaVersion: 1, + revision: 1, + batchId: '20260831-01', + branch: 'codex/integration/20260831-01', + manifestPath: 'config/sherlock-integration-batches/20260831-01.json', + baseMainCommit: head, + currentTip: head, + ownerTokenHash: 'a'.repeat(64), + createdAt: '2026-08-31T08:00:00.000Z', + updatedAt: '2026-08-31T08:00:00.000Z' + })}\n`, 'utf8') + + const result = verify(repository) + + expect(result.status).toBe(1) + expect(result.stderr).toContain('活动集成租约') + }) + + it('ignores a missing registered worktree while checking formal source state', () => { + const repository = createRepository() + const worktreeParent = mkdtempSync(path.join(os.tmpdir(), 'sherlock-stale-worktree-')) + scratchDirectories.push(worktreeParent) + const worktree = path.join(worktreeParent, 'worktree') + runGit(repository, 'worktree', 'add', worktree, '-b', 'codex/stale-session') + renameSync(worktree, `${worktree}-moved`) + + const result = verify(repository) + + expect(result.status).toBe(0) + }) + + it('requires an annotated Vx.0.0 tag on a major release commit', () => { + const repository = createRepository('1.0.0') + + const withoutTag = verify(repository) + expect(withoutTag.status).toBe(1) + expect(withoutTag.stderr).toContain('V1.0.0') + + runGit(repository, 'tag', '-a', 'V1.0.0', '-m', 'Sherlock V1.0.0') + const withTag = verify(repository) + expect(withTag.status).toBe(0) + }) +}) diff --git a/test/git-local-policy.test.ts b/test/git-local-policy.test.ts new file mode 100644 index 000000000..4d8d7f1ba --- /dev/null +++ b/test/git-local-policy.test.ts @@ -0,0 +1,58 @@ +import { execFileSync, spawnSync } from 'node:child_process' +import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs' +import os from 'node:os' +import path from 'node:path' +import { afterEach, describe, expect, it } from 'vitest' + +const projectRoot = path.resolve(import.meta.dirname, '..') +const commitMessageHook = path.join(projectRoot, '.githooks', 'commit-msg') +const installer = path.join(projectRoot, 'scripts', 'install-local-git-policy.mjs') +const scratchDirectories: string[] = [] + +function checkMessage(message: string) { + const directory = mkdtempSync(path.join(os.tmpdir(), 'sherlock-commit-message-')) + scratchDirectories.push(directory) + const messagePath = path.join(directory, 'COMMIT_EDITMSG') + writeFileSync(messagePath, `${message}\n`, 'utf8') + return spawnSync(commitMessageHook, [messagePath], { encoding: 'utf8' }) +} + +afterEach(() => { + for (const directory of scratchDirectories.splice(0)) { + rmSync(directory, { recursive: true, force: true }) + } +}) + +describe('local Git commit policy', () => { + it('rejects a commit message without a Chinese explanation', () => { + const result = checkMessage('fix: update bundled skill') + + expect(result.status).toBe(1) + expect(result.stderr).toContain('中文') + }) + + it('accepts a commit message that explains the change in Chinese', () => { + const result = checkMessage('修复：同步正式版内置 Skill') + + expect(result.status).toBe(0) + }) + + it('installs the repository-owned hooks path into local Git configuration', () => { + const repository = mkdtempSync(path.join(os.tmpdir(), 'sherlock-git-policy-')) + scratchDirectories.push(repository) + execFileSync('git', ['init', '-b', 'main'], { cwd: repository }) + mkdirSync(path.join(repository, '.githooks')) + + const result = spawnSync(process.execPath, [installer, '--repo', repository], { + encoding: 'utf8' + }) + + expect(result.status).toBe(0) + expect( + execFileSync('git', ['config', '--local', '--get', 'core.hooksPath'], { + cwd: repository, + encoding: 'utf8' + }).trim() + ).toBe('.githooks') + }) +}) diff --git a/test/git-workflow-state.test.ts b/test/git-workflow-state.test.ts new file mode 100644 index 000000000..60bbcf8cd --- /dev/null +++ b/test/git-workflow-state.test.ts @@ -0,0 +1,206 @@ +import { spawnSync } from 'node:child_process' +import { + existsSync, + mkdtempSync, + mkdirSync, + renameSync, + rmSync, + symlinkSync, + writeFileSync +} from 'node:fs' +import os from 'node:os' +import path from 'node:path' +import { afterEach, describe, expect, it } from 'vitest' +import { + diffNameStatus, + isAncestor, + listRangeCommits, + listRegisteredWorktrees, + readRepositoryStatus, + resolveCommit, + resolveRepositoryContext, + runGit +} from '../scripts/lib/sherlock-git-state.mjs' +import { createGitWorkflowFixture, type GitWorkflowFixture } from './helpers/git-workflow-fixture' + +const projectRoot = path.resolve(import.meta.dirname, '..') +const vitestExecutable = path.join(projectRoot, 'node_modules', 'vitest', 'vitest.mjs') +const scratchDirectories: string[] = [] +const fixtures: GitWorkflowFixture[] = [] + +function fixture(): GitWorkflowFixture { + const value = createGitWorkflowFixture() + fixtures.push(value) + return value +} + +afterEach(() => { + for (const value of fixtures.splice(0)) value.dispose() + for (const directory of scratchDirectories.splice(0)) { + rmSync(directory, { recursive: true, force: true }) + } +}) + +describe('shared Git workflow state', () => { + it('resolves linked worktree and common-directory paths as absolute paths', () => { + const repository = fixture() + const linkedWorktree = repository.createWorktree('linked-space', 'codex/linked-space') + + const context = resolveRepositoryContext(linkedWorktree) + const worktrees = listRegisteredWorktrees(linkedWorktree) + + expect(context.worktreeRoot).toBe(linkedWorktree) + expect(context.commonDirectory).toBe(repository.commonDirectory) + expect(context.gitDirectory).not.toBe(context.commonDirectory) + expect(context.linkedWorktree).toBe(true) + expect(worktrees).toEqual( + expect.arrayContaining([ + expect.objectContaining({ path: repository.main, branch: 'main' }), + expect.objectContaining({ path: linkedWorktree, branch: 'codex/linked-space' }) + ]) + ) + }) + + it('preserves a linked worktree path ending in a space', () => { + const repository = fixture() + const linkedWorktree = repository.createWorktree('linked path ', 'codex/linked-path-space') + + expect(linkedWorktree.endsWith(' ')).toBe(true) + expect(resolveRepositoryContext(linkedWorktree).worktreeRoot).toBe(linkedWorktree) + }) + + it('returns a recorded missing worktree path without resolving it', () => { + const repository = fixture() + const linkedWorktree = repository.createWorktree('stale-worktree', 'codex/stale-worktree') + renameSync(linkedWorktree, `${linkedWorktree}-moved`) + + const stale = listRegisteredWorktrees(repository.main).find( + (worktree) => worktree.branch === 'codex/stale-worktree' + ) + + expect(stale).toMatchObject({ path: linkedWorktree, prunable: true }) + expect(existsSync(stale?.path ?? '')).toBe(false) + }) + + it('reports a detached HEAD without inventing a branch name', () => { + const repository = fixture() + repository.git(repository.main, 'switch', '--detach') + + expect(resolveRepositoryContext(repository.main).branch).toBeNull() + }) + + it('parses NUL-delimited renamed and copied paths containing spaces', () => { + const repository = fixture() + repository.write(repository.main, 'src/original name.ts', 'export const copied = true\n') + repository.write(repository.main, 'src/copy source.ts', 'export const copy = true\n') + const base = repository.commit(repository.main, '添加带空格的源码') + repository.git(repository.main, 'mv', 'src/original name.ts', 'src/renamed value.ts') + repository.write(repository.main, 'src/copied value.ts', 'export const copy = true\n') + const tip = repository.commit(repository.main, '重命名并复制源码') + + expect(diffNameStatus(repository.main, base, tip)).toEqual( + expect.arrayContaining([ + expect.objectContaining({ + status: expect.stringMatching(/^R/), + previousPath: 'src/original name.ts', + path: 'src/renamed value.ts' + }), + expect.objectContaining({ + status: expect.stringMatching(/^C/), + previousPath: 'src/copy source.ts', + path: 'src/copied value.ts' + }) + ]) + ) + }) + + it('fails closed for unknown untracked paths while preserving exact generated-output exceptions', () => { + const repository = fixture() + repository.write(repository.main, 'src/new.ts', 'export const value = 1\n') + repository.write(repository.main, 'dist-local-integration/generated.js', 'generated\n') + repository.write(repository.main, 'dist', 'root file\n') + repository.write(repository.main, 'dist-unknown/generated.js', 'unknown output\n') + symlinkSync('dist-local-integration', path.join(repository.main, 'output')) + + expect(readRepositoryStatus(repository.main)).toMatchObject({ + untrackedSources: ['dist', 'dist-unknown/generated.js', 'output', 'src/new.ts'], + untrackedOutputs: ['dist-local-integration/generated.js'], + sourceClean: false + }) + }) + + it('keeps Git allowed failures explicit and exposes commit ancestry and range history', () => { + const repository = fixture() + const base = resolveCommit(repository.main, 'HEAD') + repository.write(repository.main, 'src/change.ts', 'export const value = 1\n') + const tip = repository.commit(repository.main, '增加一个源码提交') + + expect(runGit(repository.main, ['rev-parse', '--verify', 'missing-ref'], { allowFailure: true })) + .toMatchObject({ status: 128 }) + expect(isAncestor(repository.main, base, tip)).toBe(true) + expect(listRangeCommits(repository.main, base, tip)).toEqual([ + { commit: tip, parents: [base], subject: '增加一个源码提交' } + ]) + }) + + it('rejects option-shaped revisions before Git can create an output file', () => { + const repository = fixture() + const base = resolveCommit(repository.main, 'HEAD') + repository.write(repository.main, 'src/change.ts', 'export const value = 1\n') + const tip = repository.commit(repository.main, '增加变更用于注入回归') + const outputPath = path.join(repository.root, 'injected-output') + const injectedRevision = `--output=${outputPath}` + + for (const call of [ + () => resolveCommit(repository.main, injectedRevision), + () => isAncestor(repository.main, injectedRevision, tip), + () => listRangeCommits(repository.main, injectedRevision, tip), + () => diffNameStatus(repository.main, injectedRevision, tip) + ]) { + expect(call).toThrow('Git 修订版本不能以 - 开头。') + expect(existsSync(outputPath)).toBe(false) + } + + expect(isAncestor(repository.main, base, tip)).toBe(true) + }) + + it('preserves an empty commit subject in NUL-delimited range history', () => { + const repository = fixture() + const base = resolveCommit(repository.main, 'HEAD') + repository.git(repository.main, 'commit', '--allow-empty', '--allow-empty-message', '-m', '') + const tip = resolveCommit(repository.main, 'HEAD') + + expect(listRangeCommits(repository.main, base, tip)).toEqual([ + { commit: tip, parents: [base], subject: '' } + ]) + }) + + it('does not collect tests nested under .worktrees', () => { + const collectionRoot = mkdtempSync(path.join(os.tmpdir(), 'vitest-collection-')) + scratchDirectories.push(collectionRoot) + const worktreesDirectory = path.join(collectionRoot, '.worktrees') + mkdirSync(worktreesDirectory, { recursive: true }) + const marker = 'nested-worktree-test-was-collected' + writeFileSync( + path.join(worktreesDirectory, 'nested.test.ts'), + `throw new Error(${JSON.stringify(marker)})\n`, + 'utf8' + ) + + const child = spawnSync( + process.execPath, + [ + vitestExecutable, + 'run', + '--config', + path.join(projectRoot, 'vitest.config.ts'), + '--root', + collectionRoot + ], + { cwd: projectRoot, encoding: 'utf8' } + ) + + expect(`${child.stdout}\n${child.stderr}`).not.toContain(marker) + expect(`${child.stdout}\n${child.stderr}`).toContain('No test files found') + }) +}) diff --git a/test/harness-bundled-package-resolution.test.ts b/test/harness-bundled-package-resolution.test.ts new file mode 100644 index 000000000..bc6d293da --- /dev/null +++ b/test/harness-bundled-package-resolution.test.ts @@ -0,0 +1,111 @@ +import { spawnSync } from 'node:child_process' +import { mkdtemp, mkdir, rm, writeFile } from 'node:fs/promises' +import { tmpdir } from 'node:os' +import { join, resolve } from 'node:path' +import { pathToFileURL } from 'node:url' +import { describe, expect, it } from 'vitest' + +describe('bundled Harness package resolution', () => { + it('maps the session-model search package to Sherlock app resources', async () => { + const fixture = await mkdtemp(join(tmpdir(), 'sherlock-bundled-search-')) + try { + const providerEntry = join(fixture, 'bundled-provider.mjs') + const profileDirectory = join(fixture, 'profile') + const dshEntry = join(profileDirectory, 'runner.mjs') + await mkdir(profileDirectory) + await writeFile(providerEntry, "export const source = 'bundled-sherlock'\n", 'utf8') + await writeFile( + dshEntry, + "import { source } from 'dsh-web-search-session-model'\nprocess.stdout.write(`provider=${source}\\n`)\n", + 'utf8' + ) + + const result = spawnSync( + resolve('node_modules/node/bin/node'), + [ + '--expose-internals', + resolve('build/harness-node-entry.mjs'), + dshEntry + ], + { + encoding: 'utf8', + env: { + ...process.env, + DSH_DESKTOP_WEB_SEARCH_ENTRY: pathToFileURL(providerEntry).href + } + } + ) + + expect(result.status, result.stderr).toBe(0) + expect(result.stdout).toContain('provider=bundled-sherlock') + } finally { + await rm(fixture, { recursive: true, force: true }) + } + }) + + it('maps the market installer package to Sherlock app resources', async () => { + const fixture = await mkdtemp(join(tmpdir(), 'sherlock-bundled-market-installer-')) + try { + const installerEntry = join(fixture, 'bundled-installer.mjs') + const profileDirectory = join(fixture, 'profile') + const dshEntry = join(profileDirectory, 'runner.mjs') + await mkdir(profileDirectory) + await writeFile(installerEntry, "export const source = 'bundled-installer'\n", 'utf8') + await writeFile( + dshEntry, + "import { source } from 'dsh-desktop-market-installer'\nprocess.stdout.write(`installer=${source}\\n`)\n", + 'utf8' + ) + + const result = spawnSync( + resolve('node_modules/node/bin/node'), + ['--expose-internals', resolve('build/harness-node-entry.mjs'), dshEntry], + { + encoding: 'utf8', + env: { + ...process.env, + DSH_DESKTOP_MARKET_INSTALLER_ENTRY: pathToFileURL(installerEntry).href + } + } + ) + + expect(result.status, result.stderr).toBe(0) + expect(result.stdout).toContain('installer=bundled-installer') + } finally { + await rm(fixture, { recursive: true, force: true }) + } + }) + + it('maps the Research task runtime package to Sherlock app resources', async () => { + const fixture = await mkdtemp(join(tmpdir(), 'sherlock-bundled-research-task-')) + try { + const runtimeEntry = join(fixture, 'bundled-research-task.mjs') + const profileDirectory = join(fixture, 'profile') + const dshEntry = join(profileDirectory, 'runner.mjs') + await mkdir(profileDirectory) + await writeFile(runtimeEntry, "export const source = 'bundled-research-task'\n", 'utf8') + await writeFile( + dshEntry, + "import { source } from 'dsh-research-task-runtime'\nprocess.stdout.write(`research=${source}\\n`)\n", + 'utf8' + ) + + const result = spawnSync( + resolve('node_modules/node/bin/node'), + ['--expose-internals', resolve('build/harness-node-entry.mjs'), dshEntry], + { + encoding: 'utf8', + env: { + ...process.env, + DSH_DESKTOP_RESEARCH_TASK_ENTRY: pathToFileURL(runtimeEntry).href + } + } + ) + + expect(result.status, result.stderr).toBe(0) + expect(result.stdout).toContain('research=bundled-research-task') + } finally { + await rm(fixture, { recursive: true, force: true }) + } + }) +}) diff --git a/test/helpers/git-workflow-fixture.ts b/test/helpers/git-workflow-fixture.ts new file mode 100644 index 000000000..c85369f93 --- /dev/null +++ b/test/helpers/git-workflow-fixture.ts @@ -0,0 +1,134 @@ +import { execFileSync } from 'node:child_process' +import { existsSync, mkdirSync, mkdtempSync, readdirSync, readFileSync, realpathSync, rmSync, writeFileSync } from 'node:fs' +import os from 'node:os' +import path from 'node:path' + +const gitEnvironment = { + ...process.env, + GIT_CONFIG_GLOBAL: '/dev/null', + GIT_TERMINAL_PROMPT: '0' +} + +function git(repository: string, args: readonly string[]): string { + return execFileSync('git', ['-C', repository, ...args], { + encoding: 'utf8', + env: gitEnvironment + }).trim() +} + +function gitBytes(repository: string, args: readonly string[]): Buffer { + return execFileSync('git', ['-C', repository, ...args], { + encoding: 'buffer', + env: gitEnvironment + }) +} + +function resolveGitPath(repository: string, value: string): string { + return path.resolve(repository, value) +} + +function encodeSnapshotPart(label: string, value: Buffer): Buffer { + return Buffer.concat([Buffer.from(`${label}\0${value.length}\0`, 'utf8'), value, Buffer.from('\0', 'utf8')]) +} + +function integrationFiles(directory: string, prefix = ''): [string, Buffer][] { + if (!existsSync(directory)) return [] + + return readdirSync(directory, { withFileTypes: true }).flatMap((entry) => { + const relativePath = path.join(prefix, entry.name) + const absolutePath = path.join(directory, entry.name) + if (entry.isDirectory()) return integrationFiles(absolutePath, relativePath) + if (!entry.isFile() || !relativePath.includes('sherlock-integration')) return [] + return [[relativePath, readFileSync(absolutePath)] as [string, Buffer]] + }) +} + +export interface GitWorkflowFixture { + root: string + main: string + commonDirectory: string + git(repository: string, ...args: string[]): string + write(repository: string, relativePath: string, content: string | Buffer): void + commit(repository: string, message: string): string + createWorktree(name: string, branch?: string): string + writeCommonIntegrationFile(relativePath: string, content: string | Buffer): void + snapshot(): Buffer + dispose(): void +} + +export function createGitWorkflowFixture(): GitWorkflowFixture { + const root = mkdtempSync(path.join(os.tmpdir(), 'sherlock-git-workflow-')) + const mainDirectory = path.join(root, 'main') + mkdirSync(mainDirectory) + git(mainDirectory, ['init', '-b', 'main']) + const main = realpathSync(mainDirectory) + git(main, ['config', 'user.name', 'Sherlock Workflow Test']) + git(main, ['config', 'user.email', 'sherlock-workflow-test@example.com']) + git(main, ['config', 'commit.gpgSign', 'false']) + writeFileSync(path.join(main, 'README.md'), 'baseline\n', 'utf8') + git(main, ['add', 'README.md']) + git(main, ['commit', '-m', '基线提交']) + + const commonDirectory = realpathSync( + resolveGitPath(main, git(main, ['rev-parse', '--git-common-dir'])) + ) + const worktrees = new Map() + + return { + root, + main, + commonDirectory, + git(repository, ...args) { + return git(repository, args) + }, + write(repository, relativePath, content) { + const destination = path.join(repository, relativePath) + mkdirSync(path.dirname(destination), { recursive: true }) + writeFileSync(destination, content) + }, + commit(repository, message) { + git(repository, ['add', '-A']) + git(repository, ['commit', '-m', message]) + return git(repository, ['rev-parse', 'HEAD']) + }, + createWorktree(name, branch = `codex/${name}`) { + const worktree = path.join(root, 'worktrees', name) + mkdirSync(path.dirname(worktree), { recursive: true }) + git(main, ['worktree', 'add', worktree, '-b', branch]) + worktrees.set(name, worktree) + return realpathSync(worktree) + }, + writeCommonIntegrationFile(relativePath, content) { + const destination = path.join(commonDirectory, relativePath) + mkdirSync(path.dirname(destination), { recursive: true }) + writeFileSync(destination, content) + }, + snapshot() { + const registered = gitBytes(main, ['worktree', 'list', '--porcelain', '-z']) + const refs = gitBytes(main, ['for-each-ref', '--format=%(refname)%00%(objectname)']) + const statuses = [main, ...worktrees.values()] + .sort() + .map((worktree) => + encodeSnapshotPart( + `status:${worktree}`, + gitBytes(worktree, ['status', '--porcelain=v1', '-z', '--untracked-files=all']) + ) + ) + const commonFiles = integrationFiles(commonDirectory) + .sort(([left], [right]) => left.localeCompare(right)) + .flatMap(([relativePath, contents]) => + encodeSnapshotPart(`common:${relativePath}`, contents) + ) + + return Buffer.concat([ + encodeSnapshotPart('refs', refs), + encodeSnapshotPart('worktrees', registered), + ...statuses, + ...commonFiles + ]) + }, + dispose() { + rmSync(root, { recursive: true, force: true }) + } + } +} diff --git a/test/integration-batch.test.ts b/test/integration-batch.test.ts new file mode 100644 index 000000000..85f5c0464 --- /dev/null +++ b/test/integration-batch.test.ts @@ -0,0 +1,286 @@ +import { spawnSync } from 'node:child_process' +import { writeFileSync } from 'node:fs' +import path from 'node:path' +import { afterEach, describe, expect, it } from 'vitest' +import { + buildFeatureHandoff, + createIntegrationBatchManifest, + validateIntegrationBatchManifest +} from '../scripts/lib/sherlock-integration-model.mjs' +import type { FeatureHandoff } from '../scripts/lib/sherlock-integration-model.mjs' +import { preflightIntegrationAction } from '../scripts/lib/sherlock-integration-preflight.mjs' +import { createGitWorkflowFixture, type GitWorkflowFixture } from './helpers/git-workflow-fixture' + +const projectRoot = path.resolve(import.meta.dirname, '..') +const preflightCli = path.join(projectRoot, 'scripts', 'verify-sherlock-integration.mjs') +const fixtures: GitWorkflowFixture[] = [] + +function fixture(): GitWorkflowFixture { + const value = createGitWorkflowFixture() + fixtures.push(value) + return value +} + +function metadata(tipCommit: string) { + return { + featureName: '集成批次验证', + checks: [{ + argv: ['npx', 'vitest', 'run', 'test/integration-batch.test.ts'], + outcome: 'passed' as const, + summary: 'feature handoff check', + verifiedCommit: tipCommit, + completedAt: '2026-08-31T03:00:00.000Z', + timeoutMs: 120000 + }], + uiVerification: { outcome: 'not-applicable' as const, summary: 'Git workflow tooling has no client UI.' }, + acceptanceCriteria: ['功能历史与文件清单匹配 live Git 状态'], + risks: ['feature ref must remain pinned'], + } +} + +function createFeature(repository: GitWorkflowFixture, name: string) { + const feature = repository.createWorktree(name, `codex/feat/${name}-20260831`) + const base = repository.git(feature, 'rev-parse', 'HEAD') + repository.write(feature, `src/${name}-one.ts`, 'export const one = true\n') + const first = repository.commit(feature, '增加第一项功能') + repository.write(feature, `src/${name}-two.ts`, 'export const two = true\n') + const tip = repository.commit(feature, '增加第二项功能') + const handoff = buildFeatureHandoff({ + repository: feature, + baseCommit: base, + metadata: metadata(tip), + generatedAt: '2026-08-31T03:01:00.000Z' + }) + return { feature, base, first, tip, handoff } +} + +function writeManifest(repository: GitWorkflowFixture, value: unknown): string { + const manifestPath = path.join(repository.root, 'batch.json') + writeFileSync(manifestPath, `${JSON.stringify(value, null, 2)}\n`, 'utf8') + return manifestPath +} + +function preflightWithoutMutation(options: Parameters[0], repository: GitWorkflowFixture) { + const before = repository.snapshot() + const report = preflightIntegrationAction(options) + expect(repository.snapshot().equals(before)).toBe(true) + return report +} + +afterEach(() => { + for (const value of fixtures.splice(0)) value.dispose() +}) + +describe('tracked integration batch manifests and read-only preflight', () => { + it('requires an exact batch identity, exact derived branch, unique feature tips, acceptance criteria, safe paths, argv arrays, and full SHAs', () => { + const tip = 'b'.repeat(40) + const handoff: FeatureHandoff = { + schemaVersion: 1, + featureName: '静态功能', + branch: 'codex/feat/static-20260831', + baseCommit: 'a'.repeat(40), + tipCommit: tip, + commits: [{ commit: tip, parents: ['a'.repeat(40)], subject: '功能提交' }], + files: [{ status: 'M', path: 'src/static.ts' }], + checks: [{ argv: ['npm', 'run', 'typecheck'], outcome: 'passed', summary: 'typecheck', verifiedCommit: tip, completedAt: '2026-08-31T03:00:00.000Z', timeoutMs: 120000 }], + uiVerification: { outcome: 'not-applicable', summary: 'no UI' }, + acceptanceCriteria: ['可追溯'], + risks: [], + generatedAt: '2026-08-31T03:00:00.000Z' + } + const manifest = createIntegrationBatchManifest({ + batchId: '20260831-01', + branch: 'codex/integration/20260831-01', + baseMainCommit: 'a'.repeat(40), + handoffs: [handoff], + integrationChecks: [{ argv: ['npx', 'vitest', 'run', 'test/integration-batch.test.ts'], timeoutMs: 120000 }], + createdAt: '2026-08-31T03:02:00.000Z' + }) + + expect(manifest).toMatchObject({ batchId: '20260831-01', branch: 'codex/integration/20260831-01', expectedMainCommit: 'a'.repeat(40) }) + expect(() => validateIntegrationBatchManifest({ ...manifest, batchId: '20260831-1' })).toThrow(/batchId|批次/) + expect(() => validateIntegrationBatchManifest({ ...manifest, branch: 'codex/integration/20260831-02' })).toThrow(/branch|分支/) + expect(() => validateIntegrationBatchManifest({ ...manifest, features: [{ handoff }, { handoff }] })).toThrow(/重复|unique|branch|tip/) + expect(() => validateIntegrationBatchManifest({ ...manifest, features: [{ handoff: { ...handoff, acceptanceCriteria: [] } }] })).toThrow(/acceptance|验收|非空/) + expect(() => validateIntegrationBatchManifest({ ...manifest, features: [{ handoff: { ...handoff, files: [{ status: 'M', path: '../outside.ts' }] } }] })).toThrow(/路径|path/) + expect(() => validateIntegrationBatchManifest({ ...manifest, integrationChecks: [{ argv: 'npm test', timeoutMs: 120000 }] })).toThrow(/argv|参数/) + expect(() => validateIntegrationBatchManifest({ ...manifest, expectedMainCommit: 'A'.repeat(40) })).toThrow(/SHA|提交/) + }) + + it('collects moved-ref, dirty-worktree, undeclared-history, stale-evidence, partial-merge, and ancestry findings without mutating the fixture', () => { + const repository = fixture() + const { feature, base, first, handoff } = createFeature(repository, 'preflight') + const integration = repository.createWorktree('integration', 'codex/integration/20260831-01') + repository.git(integration, 'cherry-pick', first) + repository.write(feature, 'src/uncommitted.ts', 'export const dirtyAgain = true\n') + repository.write(feature, 'src/third.ts', 'export const moved = true\n') + repository.commit(feature, '移动功能引用') + repository.write(feature, 'src/uncommitted.ts', 'export const dirty = true\n') + const unrelated = repository.createWorktree('unrelated', 'codex/feat/unrelated-20260831') + repository.write(unrelated, 'src/unrelated.ts', 'export const unrelated = true\n') + const unrelatedBase = repository.commit(unrelated, '无关基准') + const staleAndUnrelated = { + ...handoff, + baseCommit: unrelatedBase, + commits: handoff.commits.map((commit, index) => index === 0 ? { ...commit, parents: [unrelatedBase] } : commit), + checks: handoff.checks.map((check) => ({ ...check, verifiedCommit: handoff.tipCommit })) + } + const manifest = createIntegrationBatchManifest({ + batchId: '20260831-01', + branch: 'codex/integration/20260831-01', + baseMainCommit: base, + handoffs: [staleAndUnrelated], + integrationChecks: [{ argv: ['npm', 'run', 'typecheck'], timeoutMs: 120000 }], + createdAt: '2026-08-31T03:02:00.000Z' + }) + const report = preflightWithoutMutation({ repository: integration, phase: 'merge', manifestPath: writeManifest(repository, manifest), featureBranch: handoff.branch }, repository) + const codes = report.findings.map((finding) => finding.code) + + expect(report.ok).toBe(false) + expect(codes).toEqual(expect.arrayContaining([ + 'feature-ref-moved', + 'feature-worktree-dirty', + 'feature-history-mismatch', + 'feature-check-stale', + 'feature-base-not-ancestor', + 'feature-partially-merged' + ])) + }) + + it('reports a fully merged feature as idempotent information and emits one JSON report or a stable human result token', () => { + const repository = fixture() + const { base, handoff } = createFeature(repository, 'merged') + const integration = repository.createWorktree('integration-merged', 'codex/integration/20260831-02') + repository.git(integration, 'merge', '--no-ff', '--no-edit', handoff.branch) + const manifest = createIntegrationBatchManifest({ + batchId: '20260831-02', + branch: 'codex/integration/20260831-02', + baseMainCommit: base, + handoffs: [handoff], + integrationChecks: [{ argv: ['npm', 'run', 'typecheck'], timeoutMs: 120000 }], + createdAt: '2026-08-31T03:02:00.000Z' + }) + const manifestPath = writeManifest(repository, manifest) + const report = preflightWithoutMutation({ repository: integration, phase: 'merge', manifestPath, featureBranch: handoff.branch }, repository) + + expect(report.findings).toEqual(expect.arrayContaining([ + expect.objectContaining({ code: 'feature-already-merged', severity: 'info' }) + ])) + const before = repository.snapshot() + const json = spawnSync(process.execPath, [preflightCli, '--repo', integration, '--phase', 'merge', '--manifest', manifestPath, '--feature', handoff.branch, '--json'], { cwd: projectRoot, encoding: 'utf8' }) + expect(repository.snapshot().equals(before)).toBe(true) + expect(json.status).toBe(0) + expect(json.stderr).toBe('') + expect(JSON.parse(json.stdout)).toMatchObject({ schemaVersion: 1, phase: 'merge' }) + const textBefore = repository.snapshot() + const text = spawnSync(process.execPath, [preflightCli, '--repo', integration, '--phase', 'merge', '--manifest', manifestPath, '--feature', handoff.branch], { cwd: projectRoot, encoding: 'utf8' }) + expect(repository.snapshot().equals(textBefore)).toBe(true) + expect(text.stdout).toMatch(/^PREFLIGHT (PASSED|BLOCKED)\b/) + expect(text.stderr).toBe('') + const invalidPhase = spawnSync(process.execPath, [preflightCli, '--repo', integration, '--phase', 'invalid', '--json'], { cwd: projectRoot, encoding: 'utf8' }) + expect(invalidPhase.status).toBe(2) + expect(invalidPhase.stdout).toBe('') + expect(invalidPhase.stderr).toMatch(/phase|阶段/) + }) + + it('fails closed with distinct phase actions when each of the eight phases lacks or receives a forbidden prerequisite', () => { + const repository = fixture() + const { base, handoff } = createFeature(repository, 'phase-gates') + const integration = repository.createWorktree('integration-phase-gates', 'codex/integration/20260831-03') + const manifest = createIntegrationBatchManifest({ + batchId: '20260831-03', + branch: 'codex/integration/20260831-03', + baseMainCommit: base, + handoffs: [handoff], + integrationChecks: [{ argv: ['npm', 'run', 'typecheck'], timeoutMs: 120000 }], + createdAt: '2026-08-31T03:02:00.000Z' + }) + const manifestPath = writeManifest(repository, manifest) + const cases: Array<{ + phase: Parameters[0]['phase'] + options: Omit[0], 'repository' | 'phase'> + action: string + finding: string + }> = [ + { phase: 'prepare', options: { manifestPath }, action: 'prepare-batch', finding: 'phase-input-forbidden' }, + { phase: 'merge', options: { manifestPath }, action: 'merge-feature', finding: 'phase-input-required' }, + { phase: 'continue', options: { manifestPath }, action: 'continue-merge', finding: 'phase-input-required' }, + { phase: 'recover-owner', options: { manifestPath }, action: 'recover-owner', finding: 'phase-input-required' }, + { phase: 'sync-main', options: { manifestPath }, action: 'synchronize-main', finding: 'phase-input-required' }, + { phase: 'accept', options: { manifestPath }, action: 'accept-batch', finding: 'phase-input-required' }, + { phase: 'promote', options: { manifestPath }, action: 'promote-fast-forward', finding: 'phase-input-required' }, + { phase: 'cancel', options: { manifestPath, featureBranch: handoff.branch }, action: 'cancel-batch', finding: 'phase-input-forbidden' } + ] + + const actionKinds = new Set() + for (const testCase of cases) { + const before = repository.snapshot() + const report = preflightIntegrationAction({ repository: integration, phase: testCase.phase, ...testCase.options }) + expect(repository.snapshot().equals(before)).toBe(true) + expect(report.ok).toBe(false) + expect(report.plannedActions).toEqual([ + expect.objectContaining({ kind: testCase.action }) + ]) + expect(report.findings).toEqual(expect.arrayContaining([ + expect.objectContaining({ code: testCase.finding, severity: 'error' }) + ])) + actionKinds.add(report.plannedActions[0]!.kind) + } + expect(actionKinds.size).toBe(8) + }) + + it('rejects fabricated merged records for accept and promote when the feature is not integrated', () => { + const repository = fixture() + const { base, handoff } = createFeature(repository, 'fabricated-merged') + const integration = repository.createWorktree('integration-fabricated-merged', 'codex/integration/20260831-04') + const fakeMergeCommit = 'c'.repeat(40) + const fakeVerificationCommit = 'd'.repeat(40) + const manifest = { + ...createIntegrationBatchManifest({ + batchId: '20260831-04', + branch: 'codex/integration/20260831-04', + baseMainCommit: base, + handoffs: [handoff], + integrationChecks: [{ argv: ['npm', 'run', 'typecheck'], timeoutMs: 120000 }], + createdAt: '2026-08-31T03:02:00.000Z' + }), + features: [{ + handoff, + merged: { + mergeCommit: fakeMergeCommit, + verificationCommit: fakeVerificationCommit, + checks: [{ + argv: ['npm', 'run', 'typecheck'], + outcome: 'passed', + summary: 'fabricated evidence', + verifiedCommit: fakeVerificationCommit, + completedAt: '2026-08-31T03:03:00.000Z', + timeoutMs: 120000 + }], + recordedAt: '2026-08-31T03:03:00.000Z' + } + }] + } + const manifestPath = writeManifest(repository, manifest) + const integrationHead = repository.git(integration, 'rev-parse', 'HEAD') + const cases: Array<{ + phase: 'accept' | 'promote' + options: Omit[0], 'repository' | 'phase'> + }> = [ + { phase: 'accept', options: { manifestPath, expectedAcceptedTip: integrationHead } }, + { phase: 'promote', options: { manifestPath, mainWorktree: repository.main, expectedAcceptedTip: integrationHead } } + ] + + for (const testCase of cases) { + const before = repository.snapshot() + const report = preflightIntegrationAction({ repository: integration, phase: testCase.phase, ...testCase.options }) + expect(repository.snapshot().equals(before)).toBe(true) + expect(report.ok).toBe(false) + expect(report.findings).toEqual(expect.arrayContaining([ + expect.objectContaining({ code: 'merged-merge-commit-unresolved', severity: 'error' }), + expect.objectContaining({ code: 'merged-verification-commit-unresolved', severity: 'error' }), + expect.objectContaining({ code: 'merged-live-feature-not-integrated', severity: 'error' }) + ])) + } + }) +}) diff --git a/test/integration-cli-contract.test.ts b/test/integration-cli-contract.test.ts new file mode 100644 index 000000000..c7f32341e --- /dev/null +++ b/test/integration-cli-contract.test.ts @@ -0,0 +1,101 @@ +import { spawnSync } from 'node:child_process' +import path from 'node:path' +import { afterEach, describe, expect, it } from 'vitest' +import { createGitWorkflowFixture, type GitWorkflowFixture } from './helpers/git-workflow-fixture' +import { formatIntegrationError, formatIntegrationOutcome } from '../scripts/lib/sherlock-integration-cli-outcome.mjs' + +const projectRoot = path.resolve(import.meta.dirname, '..') +const handoffCli = path.join(projectRoot, 'scripts', 'create-sherlock-session-handoff.mjs') +const preflightCli = path.join(projectRoot, 'scripts', 'verify-sherlock-integration.mjs') +const integrationCli = path.join(projectRoot, 'scripts', 'manage-sherlock-integration.mjs') +const fixtures: GitWorkflowFixture[] = [] + +function fixture() { + const value = createGitWorkflowFixture() + fixtures.push(value) + return value +} + +function run(script: string, args: string[]) { + return spawnSync(process.execPath, [script, ...args], { encoding: 'utf8' }) +} + +describe('Sherlock integration CLI contract', () => { + afterEach(() => { + for (const value of fixtures.splice(0)) value.dispose() + }) + + it('advertises the executable handoff, preflight, and lifecycle command surfaces without diagnostics', () => { + const handoff = run(handoffCli, ['--help']) + const preflight = run(preflightCli, ['--help']) + const lifecycle = run(integrationCli, ['--help']) + + expect(handoff).toMatchObject({ status: 0, stderr: '' }) + expect(handoff.stdout).toContain('--repo ') + expect(handoff.stdout).toContain('--format text|json') + expect(preflight).toMatchObject({ status: 0, stderr: '' }) + expect(preflight.stdout).toContain('--repo ') + expect(preflight.stdout).toContain('--phase ') + expect(preflight.stdout).toContain('--commit ') + expect(lifecycle).toMatchObject({ status: 0, stderr: '' }) + expect(lifecycle.stdout).toContain('recover-owner') + expect(lifecycle.stdout).toContain('sync-main') + expect(lifecycle.stdout).toContain('accept') + expect(lifecycle.stdout).toContain('promote') + expect(lifecycle.stdout).toContain('cancel') + }) + + it('keeps invalid input on stderr with exit 2 instead of mixing it into machine output', () => { + for (const [script, args] of [ + [handoffCli, ['--unknown']], + [preflightCli, ['--unknown']], + [integrationCli, ['unknown']] + ] as Array<[string, string[]]>) { + const result = run(script, args) + expect(result.status).toBe(2) + expect(result.stdout).toBe('') + expect(result.stderr).not.toBe('') + } + }) + + it('reports preflight blocks as exit 1 with a stable human token', () => { + const repository = fixture() + const result = run(preflightCli, ['--repo', repository.main, '--phase', 'merge']) + + expect(result).toMatchObject({ status: 1, stderr: '' }) + expect(result.stdout).toContain('PREFLIGHT BLOCKED phase=merge') + }) + + it('keeps successful JSON preflight output machine-readable and diagnostics-free', () => { + const repository = fixture() + const result = run(preflightCli, ['--repo', repository.main, '--phase', 'prepare', '--json']) + + expect(result).toMatchObject({ status: 0, stderr: '' }) + expect(JSON.parse(result.stdout)).toMatchObject({ ok: true, phase: 'prepare', branch: 'main' }) + }) + + it('forwards preflight accepted-tip and canonical-main inputs to every phase that requires them', () => { + const repository = fixture() + const missingManifest = path.join(repository.root, 'missing-manifest.json') + const commit = 'a'.repeat(40) + const phases = [ + { phase: 'recover-owner', args: ['--commit', commit] }, + { phase: 'accept', args: ['--commit', commit] }, + { phase: 'promote', args: ['--commit', commit, '--main-worktree', repository.main] } + ] + + for (const { phase, args } of phases) { + const result = run(preflightCli, ['--repo', repository.main, '--phase', phase, '--manifest', missingManifest, ...args, '--json']) + const report = JSON.parse(result.stdout) + expect(result).toMatchObject({ status: 1, stderr: '' }) + expect(report.findings.some((finding: { code: string }) => finding.code === 'phase-input-required')).toBe(false) + } + }) + + it('maps lifecycle rejection, conflict, and recovery outcomes to their public exit code and output channel', () => { + expect(formatIntegrationError({ integrationExit: 1 })).toEqual({ exitCode: 1, channel: 'stderr' }) + expect(formatIntegrationError(new Error('invalid input'))).toEqual({ exitCode: 2, channel: 'stderr' }) + expect(formatIntegrationOutcome({ status: 'conflict', batchId: '20260831-01', branch: 'codex/integration/20260831-01', beforeCommit: 'a'.repeat(40), afterCommit: 'b'.repeat(40) })).toMatchObject({ exitCode: 3, channel: 'stdout', output: expect.stringContaining('INTEGRATION CONFLICT') }) + expect(formatIntegrationOutcome({ status: 'recovery-required', batchId: '20260831-01', branch: 'codex/integration/20260831-01', beforeCommit: 'a'.repeat(40), afterCommit: 'b'.repeat(40) })).toMatchObject({ exitCode: 4, channel: 'stdout', output: expect.stringContaining('INTEGRATION RECOVERY_REQUIRED') }) + }) +}) diff --git a/test/integration-executor.test.ts b/test/integration-executor.test.ts new file mode 100644 index 000000000..9d2c75173 --- /dev/null +++ b/test/integration-executor.test.ts @@ -0,0 +1,827 @@ +import { createHash } from 'node:crypto' +import fs, { chmodSync, existsSync, readFileSync, writeFileSync } from 'node:fs' +import { spawnSync } from 'node:child_process' +import { syncBuiltinESMExports } from 'node:module' +import path from 'node:path' +import { afterEach, describe, expect, it } from 'vitest' +import { buildFeatureHandoff } from '../scripts/lib/sherlock-integration-model.mjs' +import { acquireActiveBatchLease, readActiveBatchLease, updateActiveBatchTip } from '../scripts/lib/sherlock-active-batch.mjs' +import { resolveRepositoryContext } from '../scripts/lib/sherlock-git-state.mjs' +import { + adoptIntegrationBatch, + acceptIntegrationBatch, + cancelIntegrationBatch, + continueIntegrationFeature, + createIntegrationBatch, + formatIntegrationRecoveryCommand, + mergeIntegrationFeature, + promoteIntegrationBatch, + recoverIntegrationOwnership, + synchronizeIntegrationMain +} from '../scripts/lib/sherlock-integration-executor.mjs' +import { createGitWorkflowFixture, type GitWorkflowFixture } from './helpers/git-workflow-fixture' + +const fixtures: GitWorkflowFixture[] = [] +const projectRoot = path.resolve(import.meta.dirname, '..') +const integrationCli = path.join(projectRoot, 'scripts', 'manage-sherlock-integration.mjs') + +function fixture(): GitWorkflowFixture { + const value = createGitWorkflowFixture() + fixtures.push(value) + return value +} + +function checks(): Array<{ argv: [string, ...string[]]; timeoutMs: number }> { + return [{ argv: ['npx', 'vitest', 'run', 'test/integration-executor.test.ts'], timeoutMs: 120000 }] +} + +function prepareIntegrationRoot(repository: GitWorkflowFixture) { + repository.write(repository.main, '.gitignore', '.worktrees/\n') + repository.commit(repository.main, '忽略集成 worktree') +} + +function handoffFile(repository: GitWorkflowFixture, name: string): string { + const feature = repository.createWorktree(name, `codex/feat/${name}-20260831`) + const base = repository.git(feature, 'rev-parse', 'HEAD') + repository.write(feature, `src/${name}.ts`, 'export const integration = true\n') + const tip = repository.commit(feature, '增加可集成功能') + const handoff = buildFeatureHandoff({ + repository: feature, + baseCommit: base, + metadata: { + featureName: '集成执行器', + checks: [{ + argv: ['npx', 'vitest', 'run', 'test/session-handoff.test.ts'], + outcome: 'passed', + summary: 'feature handoff check', + verifiedCommit: tip, + completedAt: '2026-08-31T05:00:00.000Z', + timeoutMs: 120000 + }], + uiVerification: { outcome: 'not-applicable', summary: 'Git workflow tooling has no client UI.' }, + acceptanceCriteria: ['交接卡绑定当前功能提交'], + risks: ['功能引用必须保持不变'] + }, + generatedAt: '2026-08-31T05:01:00.000Z' + }) + const card = path.join(repository.root, `${name}.json`) + writeFileSync(card, `${JSON.stringify(handoff, null, 2)}\n`, 'utf8') + return card +} + +function acceptedPromotion(repository: GitWorkflowFixture, name: string, batchId: string) { + prepareIntegrationRoot(repository) + const handoff = handoffFile(repository, name) + const integration = repository.createWorktree(`integration-${name}`, `codex/integration/${batchId}`) + const integrationChecks = [{ argv: [process.execPath, '-e', 'process.exit(0)'], timeoutMs: 1000 }] as [{ argv: [string, ...string[]]; timeoutMs: number }] + adoptIntegrationBatch({ integrationRepository: integration, batchId, handoffPaths: [handoff], integrationChecks, dryRun: false, now: '2026-08-31T06:00:00.000Z' }) + const context = resolveRepositoryContext(integration) + const ownerToken = JSON.parse(readFileSync(path.join(context.gitDirectory, 'sherlock-integration-owner.json'), 'utf8')).ownerToken + const manifestPath = path.join(integration, 'config', 'sherlock-integration-batches', `${batchId}.json`) + const merged = mergeIntegrationFeature({ integrationRepository: integration, manifestPath, featureBranch: `codex/feat/${name}-20260831`, ownerToken, dryRun: false, now: '2026-08-31T06:01:00.000Z' }) + acceptIntegrationBatch({ integrationRepository: integration, manifestPath, commit: merged.afterCommit, confirmBatchId: batchId, ownerToken, now: '2026-08-31T06:02:00.000Z' }) + return { integration, manifestPath, ownerToken, tip: merged.afterCommit, branch: `codex/feat/${name}-20260831` } +} + +afterEach(() => { + for (const value of fixtures.splice(0)) value.dispose() +}) + +describe('integration batch executor', () => { + it('creates a clean canonical-main batch, records the first manifest commit, and owns its lease', () => { + const repository = fixture() + prepareIntegrationRoot(repository) + const handoff = handoffFile(repository, 'create') + const before = repository.git(repository.main, 'rev-parse', 'HEAD') + const worktree = path.join(repository.main, '.worktrees', 'integration-20260831-01') + + const result = createIntegrationBatch({ + mainRepository: repository.main, + worktreePath: worktree, + batchId: '20260831-01', + handoffPaths: [handoff], + integrationChecks: checks(), + dryRun: false, + now: '2026-08-31T05:02:00.000Z' + }) + + const manifestPath = path.join(worktree, 'config', 'sherlock-integration-batches', '20260831-01.json') + expect(result).toMatchObject({ status: 'prepared', batchId: '20260831-01', beforeCommit: before }) + expect(result.afterCommit).toMatch(/^[0-9a-f]{40}$/) + expect(repository.git(worktree, 'branch', '--show-current')).toBe('codex/integration/20260831-01') + expect(repository.git(worktree, 'rev-parse', 'HEAD^')).toBe(before) + expect(repository.git(worktree, 'show', '--format=%s', '--no-patch', 'HEAD')).toMatch(/^集成：创建批次 20260831-01$/) + expect(repository.git(worktree, 'diff-tree', '--no-commit-id', '--name-only', '-r', 'HEAD')).toBe('config/sherlock-integration-batches/20260831-01.json') + expect(JSON.parse(readFileSync(manifestPath, 'utf8'))).toMatchObject({ batchId: '20260831-01', baseMainCommit: before }) + expect(readActiveBatchLease(worktree)).toMatchObject({ batchId: '20260831-01', currentTip: result.afterCommit }) + }) + + it('adopts a clean linked integration worktree at the exact main tip without moving it', () => { + const repository = fixture() + prepareIntegrationRoot(repository) + const handoff = handoffFile(repository, 'adopt') + const integration = repository.createWorktree('integration-adopt', 'codex/integration/20260831-02') + const before = repository.git(integration, 'rev-parse', 'HEAD') + + const result = adoptIntegrationBatch({ + integrationRepository: integration, + batchId: '20260831-02', + handoffPaths: [handoff], + integrationChecks: checks(), + dryRun: false, + now: '2026-08-31T05:03:00.000Z' + }) + + expect(result).toMatchObject({ status: 'prepared', beforeCommit: before }) + expect(repository.git(integration, 'rev-parse', 'HEAD^')).toBe(before) + expect(repository.git(integration, 'branch', '--show-current')).toBe('codex/integration/20260831-02') + }) + + it('rejects noncanonical or dirty create inputs, stale adopt heads, malformed handoffs, and existing target state before mutation', () => { + const repository = fixture() + prepareIntegrationRoot(repository) + const handoff = handoffFile(repository, 'reject') + const worktree = path.join(repository.main, '.worktrees', 'integration-20260831-03') + const before = repository.snapshot() + const options = { worktreePath: worktree, batchId: '20260831-03', handoffPaths: [handoff], integrationChecks: checks(), dryRun: false, now: '2026-08-31T05:04:00.000Z' } + + expect(() => createIntegrationBatch({ ...options, mainRepository: path.dirname(repository.main) })).toThrow(/main|主|规范/) + expect(() => createIntegrationBatch({ ...options, mainRepository: repository.main, worktreePath: path.join(repository.root, 'outside-integration') })).toThrow(/\.worktrees|worktree 路径/) + repository.write(repository.main, 'src/dirty.ts', 'export const dirty = true\n') + expect(() => createIntegrationBatch({ ...options, mainRepository: repository.main })).toThrow(/干净|未提交/) + expect(existsSync(worktree)).toBe(false) + expect(readActiveBatchLease(repository.main)).toBeNull() + expect(repository.snapshot().equals(before)).toBe(false) + + const clean = fixture() + prepareIntegrationRoot(clean) + const cleanHandoff = handoffFile(clean, 'reject-clean') + const cleanBefore = clean.snapshot() + expect(() => createIntegrationBatch({ ...options, mainRepository: clean.main, worktreePath: path.join(clean.main, '.worktrees', 'integration-20260831-03'), handoffPaths: [path.join(clean.root, 'missing.json')] })).toThrow(/交接|handoff|ENOENT/) + expect(clean.snapshot().equals(cleanBefore)).toBe(true) + const integration = clean.createWorktree('integration-stale', 'codex/integration/20260831-04') + clean.write(clean.main, 'src/main-advanced.ts', 'export const advanced = true\n') + clean.commit(clean.main, '推进 main') + expect(() => adoptIntegrationBatch({ integrationRepository: integration, batchId: '20260831-04', handoffPaths: [cleanHandoff], integrationChecks: checks(), dryRun: false, now: '2026-08-31T05:04:00.000Z' })).toThrow(/main|HEAD|精确/) + }) + + it('plans create and adopt byte-identically without temporary lease or worktree side effects', () => { + const repository = fixture() + prepareIntegrationRoot(repository) + const handoff = handoffFile(repository, 'dry-run') + const worktree = path.join(repository.main, '.worktrees', 'integration-20260831-05') + const beforeCreate = repository.snapshot() + const plannedCreate = createIntegrationBatch({ mainRepository: repository.main, worktreePath: worktree, batchId: '20260831-05', handoffPaths: [handoff], integrationChecks: checks(), dryRun: true, now: '2026-08-31T05:05:00.000Z' }) + expect(plannedCreate).toMatchObject({ status: 'planned', beforeCommit: repository.git(repository.main, 'rev-parse', 'HEAD') }) + expect(repository.snapshot().equals(beforeCreate)).toBe(true) + expect(existsSync(worktree)).toBe(false) + + const integration = repository.createWorktree('integration-dry-adopt', 'codex/integration/20260831-06') + const beforeAdopt = repository.snapshot() + const plannedAdopt = adoptIntegrationBatch({ integrationRepository: integration, batchId: '20260831-06', handoffPaths: [handoff], integrationChecks: checks(), dryRun: true, now: '2026-08-31T05:06:00.000Z' }) + expect(plannedAdopt).toMatchObject({ status: 'planned', beforeCommit: repository.git(integration, 'rev-parse', 'HEAD') }) + expect(repository.snapshot().equals(beforeAdopt)).toBe(true) + expect(existsSync(path.join(resolveRepositoryContext(integration).gitDirectory, 'sherlock-integration-owner.json'))).toBe(false) + }) + + it('refuses an incompatible active lease before creating another branch or worktree', () => { + const repository = fixture() + prepareIntegrationRoot(repository) + const handoff = handoffFile(repository, 'lease-conflict') + const blocker = repository.createWorktree('integration-blocker', 'codex/integration/20260831-07') + const base = repository.git(blocker, 'rev-parse', 'HEAD') + acquireActiveBatchLease({ + repository: blocker, + ownerToken: 'owner-token-for-conflict', + lease: { + batchId: '20260831-07', + branch: 'codex/integration/20260831-07', + manifestPath: 'config/sherlock-integration-batches/20260831-07.json', + baseMainCommit: base, + currentTip: base, + createdAt: '2026-08-31T05:07:00.000Z', + updatedAt: '2026-08-31T05:07:00.000Z' + } + }) + const target = path.join(repository.main, '.worktrees', 'integration-20260831-08') + const before = repository.snapshot() + + expect(() => createIntegrationBatch({ mainRepository: repository.main, worktreePath: target, batchId: '20260831-08', handoffPaths: [handoff], integrationChecks: checks(), dryRun: false, now: '2026-08-31T05:08:00.000Z' })).toThrow(/活动集成租约/) + expect(repository.snapshot().equals(before)).toBe(true) + expect(existsSync(target)).toBe(false) + }) + + it('retains a newly created worktree when an incompatible lease appears before acquisition', () => { + const repository = fixture() + prepareIntegrationRoot(repository) + const handoff = handoffFile(repository, 'create-race') + const worktree = path.join(repository.main, '.worktrees', 'integration-20260831-11') + const base = repository.git(repository.main, 'rev-parse', 'HEAD') + const activeLease = path.join(repository.commonDirectory, 'sherlock-integration', 'active', 'lease.json') + const originalRealpath = fs.realpathSync + let injected = false + fs.realpathSync = ((...args: any[]) => { + const resolved = (originalRealpath as (...values: any[]) => string)(...args) + if (!injected && path.resolve(resolved) === worktree) { + injected = true + fs.mkdirSync(path.dirname(activeLease), { recursive: true }) + writeFileSync(activeLease, `${JSON.stringify({ + schemaVersion: 1, + revision: 1, + batchId: '20260831-99', + branch: 'codex/integration/20260831-99', + manifestPath: 'config/sherlock-integration-batches/20260831-99.json', + baseMainCommit: base, + currentTip: base, + ownerTokenHash: 'a'.repeat(64), + createdAt: '2026-08-31T05:10:00.000Z', + updatedAt: '2026-08-31T05:10:00.000Z' + })}\n`, 'utf8') + } + return resolved + }) as typeof fs.realpathSync + syncBuiltinESMExports() + let result + try { + result = createIntegrationBatch({ mainRepository: repository.main, worktreePath: worktree, batchId: '20260831-11', handoffPaths: [handoff], integrationChecks: checks(), dryRun: false, now: '2026-08-31T05:10:00.000Z' }) + } finally { + fs.realpathSync = originalRealpath + syncBuiltinESMExports() + } + + expect(injected).toBe(true) + expect(result).toMatchObject({ status: 'recovery-required', batchId: '20260831-11', beforeCommit: base, afterCommit: base }) + expect(repository.git(worktree, 'branch', '--show-current')).toBe('codex/integration/20260831-11') + expect(repository.git(worktree, 'rev-parse', 'HEAD')).toBe(base) + expect(repository.git(worktree, 'status', '--porcelain=v1')).toBe('') + expect(readActiveBatchLease(worktree)).toMatchObject({ batchId: '20260831-99' }) + expect(existsSync(path.join(worktree, 'config', 'sherlock-integration-batches', '20260831-11.json'))).toBe(false) + expect(JSON.stringify(result)).not.toContain(worktree) + expect(JSON.stringify(result)).not.toMatch(/npm run|recover-owner|--repo|\$\(|`/) + }) + + it('exits 4 from the CLI for the create/acquire race without emitting an executable recovery command', () => { + const repository = fixture() + prepareIntegrationRoot(repository) + const handoff = handoffFile(repository, 'cli-race') + const checksPath = path.join(repository.root, 'checks.json') + writeFileSync(checksPath, `${JSON.stringify(checks())}\n`, 'utf8') + const worktree = path.join(repository.main, '.worktrees', 'integration-20260831-12') + const base = repository.git(repository.main, 'rev-parse', 'HEAD') + const helper = path.join(repository.root, 'inject-lease.mjs') + const shim = path.join(repository.root, 'git') + const realGit = spawnSync('which', ['git'], { encoding: 'utf8' }).stdout.trim() + writeFileSync(helper, `#!/usr/bin/env node +import { mkdirSync, writeFileSync } from 'node:fs' +import path from 'node:path' +const common = process.env.SHERLOCK_RACE_COMMON +const base = process.env.SHERLOCK_RACE_BASE +const active = path.join(common, 'sherlock-integration', 'active') +mkdirSync(active, { recursive: true }) +writeFileSync(path.join(active, 'lease.json'), JSON.stringify({ schemaVersion: 1, revision: 1, batchId: '20260831-99', branch: 'codex/integration/20260831-99', manifestPath: 'config/sherlock-integration-batches/20260831-99.json', baseMainCommit: base, currentTip: base, ownerTokenHash: 'a'.repeat(64), createdAt: '2026-08-31T05:11:00.000Z', updatedAt: '2026-08-31T05:11:00.000Z' }) + '\\n') +`, 'utf8') + writeFileSync(shim, `#!/bin/sh +"$SHERLOCK_REAL_GIT" "$@" +status=$? +if [ "$status" -eq 0 ] && [ "$1" = "-C" ] && [ "$3" = "worktree" ] && [ "$4" = "add" ] && [ "$5" = "-b" ]; then + "$SHERLOCK_RACE_HELPER" +fi +exit "$status" +`, 'utf8') + chmodSync(helper, 0o755) + chmodSync(shim, 0o755) + + const result = spawnSync(process.execPath, [integrationCli, 'create', '--repo', repository.main, '--worktree', worktree, '--batch', '20260831-12', '--handoff', handoff, '--checks', checksPath, '--json'], { + cwd: projectRoot, + encoding: 'utf8', + env: { + ...process.env, + PATH: `${repository.root}${path.delimiter}${process.env.PATH}`, + SHERLOCK_REAL_GIT: realGit, + SHERLOCK_RACE_HELPER: helper, + SHERLOCK_RACE_COMMON: repository.commonDirectory, + SHERLOCK_RACE_BASE: base + } + }) + + expect(result.status).toBe(4) + expect(result.stderr).toBe('') + expect(JSON.parse(result.stdout)).toMatchObject({ status: 'recovery-required', batchId: '20260831-12' }) + expect(result.stdout).not.toMatch(/npm run|recover-owner|--repo|\$\(|`|integration-20260831-12/) + expect(repository.git(worktree, 'branch', '--show-current')).toBe('codex/integration/20260831-12') + expect(repository.git(worktree, 'rev-parse', 'HEAD')).toBe(base) + }) + + it('returns recovery-required after lease acquisition and preserves the worktree, branch, lease, and absent manifest for explicit recovery', () => { + const repository = fixture() + prepareIntegrationRoot(repository) + const handoff = handoffFile(repository, 'recovery') + const worktree = path.join(repository.main, '.worktrees', 'integration-20260831-09') + const originalWrite = fs.writeFileSync + fs.writeFileSync = ((file: fs.PathOrFileDescriptor, data: string | NodeJS.ArrayBufferView, options?: fs.WriteFileOptions) => { + if (typeof file === 'string' && file.endsWith('/config/sherlock-integration-batches/20260831-09.json')) { + throw new Error('controlled manifest write failure') + } + return originalWrite(file, data, options) + }) as typeof fs.writeFileSync + syncBuiltinESMExports() + let result + try { + result = createIntegrationBatch({ mainRepository: repository.main, worktreePath: worktree, batchId: '20260831-09', handoffPaths: [handoff], integrationChecks: checks(), dryRun: false, now: '2026-08-31T05:09:00.000Z' }) + } finally { + fs.writeFileSync = originalWrite + syncBuiltinESMExports() + } + + expect(result).toMatchObject({ status: 'recovery-required', batchId: '20260831-09', branch: 'codex/integration/20260831-09' }) + expect(result).not.toHaveProperty('recoveryCommand') + expect(result.actions).toEqual(expect.arrayContaining([ + expect.objectContaining({ kind: 'recovery-state-preserved' }) + ])) + expect(result.actions.find((item) => item.kind === 'recovery-state-preserved')).not.toHaveProperty('argv') + expect(repository.git(worktree, 'branch', '--show-current')).toBe('codex/integration/20260831-09') + expect(readActiveBatchLease(worktree)).toMatchObject({ batchId: '20260831-09' }) + expect(existsSync(path.join(worktree, 'config', 'sherlock-integration-batches', '20260831-09.json'))).toBe(false) + }) + + it('emits exactly one JSON execution result for a dry-run CLI invocation', () => { + const repository = fixture() + prepareIntegrationRoot(repository) + const handoff = handoffFile(repository, 'cli') + const checksPath = path.join(repository.root, 'checks.json') + writeFileSync(checksPath, `${JSON.stringify(checks())}\n`, 'utf8') + const target = path.join(repository.main, '.worktrees', 'integration-20260831-10') + const before = repository.snapshot() + const result = spawnSync(process.execPath, [integrationCli, 'create', '--repo', repository.main, '--worktree', target, '--batch', '20260831-10', '--handoff', handoff, '--checks', checksPath, '--dry-run', '--json'], { cwd: projectRoot, encoding: 'utf8' }) + + expect(result.status).toBe(0) + expect(result.stderr).toBe('') + expect(result.stdout.split('\n').filter(Boolean)).toHaveLength(1) + expect(JSON.parse(result.stdout)).toMatchObject({ status: 'planned', batchId: '20260831-10' }) + expect(repository.snapshot().equals(before)).toBe(true) + }) + + it('merges the declared complete feature history, runs checks before the boundary commit, and records evidence', () => { + const repository = fixture() + prepareIntegrationRoot(repository) + const handoff = handoffFile(repository, 'merge-complete') + const integration = repository.createWorktree('integration-merge-complete', 'codex/integration/20260831-13') + adoptIntegrationBatch({ + integrationRepository: integration, + batchId: '20260831-13', + handoffPaths: [handoff], + integrationChecks: [{ argv: [process.execPath, '-e', "process.exit(0)"], timeoutMs: 1000 }], + dryRun: false, + now: '2026-08-31T05:13:00.000Z' + }) + const context = resolveRepositoryContext(integration) + const ownerToken = JSON.parse(readFileSync(path.join(context.gitDirectory, 'sherlock-integration-owner.json'), 'utf8')).ownerToken + const manifestPath = path.join(integration, 'config', 'sherlock-integration-batches', '20260831-13.json') + + const result = mergeIntegrationFeature({ + integrationRepository: integration, + manifestPath, + featureBranch: 'codex/feat/merge-complete-20260831', + ownerToken, + dryRun: false, + now: '2026-08-31T05:14:00.000Z' + }) + + const manifest = JSON.parse(readFileSync(manifestPath, 'utf8')) + const mergeCommit = manifest.features[0].merged.mergeCommit + expect(result).toMatchObject({ status: 'merged', beforeCommit: context.head }) + expect(repository.git(integration, 'merge-base', '--is-ancestor', 'codex/feat/merge-complete-20260831', mergeCommit)).toBe('') + expect(repository.git(integration, 'show', '-s', '--format=%P', mergeCommit).split(' ')).toHaveLength(2) + expect(repository.git(integration, 'show', '-s', '--format=%s', mergeCommit)).toBe('集成：合并功能 codex/feat/merge-complete-20260831') + expect(manifest.features[0].merged.checks[0]).toMatchObject({ + argv: [process.execPath, '-e', "process.exit(0)"], + verifiedCommit: mergeCommit + }) + expect(readActiveBatchLease(integration)).toMatchObject({ currentTip: result.afterCommit }) + }) + + it('aborts only the staged merge when a declared check fails and restores the pre-merge snapshot', () => { + const repository = fixture() + prepareIntegrationRoot(repository) + const handoff = handoffFile(repository, 'merge-check-failure') + const integration = repository.createWorktree('integration-merge-check-failure', 'codex/integration/20260831-14') + adoptIntegrationBatch({ + integrationRepository: integration, + batchId: '20260831-14', + handoffPaths: [handoff], + integrationChecks: [{ argv: [process.execPath, '-e', 'process.exit(9)'], timeoutMs: 1000 }], + dryRun: false, + now: '2026-08-31T05:14:00.000Z' + }) + const context = resolveRepositoryContext(integration) + const ownerToken = JSON.parse(readFileSync(path.join(context.gitDirectory, 'sherlock-integration-owner.json'), 'utf8')).ownerToken + const before = repository.snapshot() + + expect(() => mergeIntegrationFeature({ + integrationRepository: integration, + manifestPath: path.join(integration, 'config', 'sherlock-integration-batches', '20260831-14.json'), + featureBranch: 'codex/feat/merge-check-failure-20260831', + ownerToken, + dryRun: false, + now: '2026-08-31T05:15:00.000Z' + })).toThrow(/检查失败|check/) + expect(repository.snapshot().equals(before)).toBe(true) + expect(spawnSync('git', ['-C', integration, 'rev-parse', '-q', '--verify', 'MERGE_HEAD'], { encoding: 'utf8' }).status).toBe(1) + }) + + it('continues an unrecorded exact boundary merge without creating a duplicate merge commit', () => { + const repository = fixture() + prepareIntegrationRoot(repository) + const handoff = handoffFile(repository, 'merge-recovery') + const integration = repository.createWorktree('integration-merge-recovery', 'codex/integration/20260831-15') + adoptIntegrationBatch({ + integrationRepository: integration, + batchId: '20260831-15', + handoffPaths: [handoff], + integrationChecks: [{ argv: [process.execPath, '-e', 'process.exit(0)'], timeoutMs: 1000 }], + dryRun: false, + now: '2026-08-31T05:15:00.000Z' + }) + const context = resolveRepositoryContext(integration) + const ownerToken = JSON.parse(readFileSync(path.join(context.gitDirectory, 'sherlock-integration-owner.json'), 'utf8')).ownerToken + repository.git(integration, 'merge', '--no-ff', '--no-edit', 'codex/feat/merge-recovery-20260831') + const boundary = repository.git(integration, 'rev-parse', 'HEAD') + const result = continueIntegrationFeature({ + integrationRepository: integration, + manifestPath: path.join(integration, 'config', 'sherlock-integration-batches', '20260831-15.json'), + featureBranch: 'codex/feat/merge-recovery-20260831', + ownerToken, + dryRun: false, + now: '2026-08-31T05:16:00.000Z' + }) + + expect(repository.git(integration, 'rev-parse', `${result.afterCommit}^`)).toBe(boundary) + expect(repository.git(integration, 'show', '-s', '--format=%P', boundary).split(' ')).toHaveLength(2) + }) + + it('commits only an exact staged manifest record after a boundary merge interruption', () => { + const repository = fixture() + prepareIntegrationRoot(repository) + const handoff = handoffFile(repository, 'staged-record') + const integration = repository.createWorktree('integration-staged-record', 'codex/integration/20260831-16') + adoptIntegrationBatch({ integrationRepository: integration, batchId: '20260831-16', handoffPaths: [handoff], integrationChecks: [{ argv: [process.execPath, '-e', 'process.exit(0)'], timeoutMs: 1000 }], dryRun: false, now: '2026-08-31T05:16:00.000Z' }) + const context = resolveRepositoryContext(integration) + const ownerToken = JSON.parse(readFileSync(path.join(context.gitDirectory, 'sherlock-integration-owner.json'), 'utf8')).ownerToken + const manifestPath = path.join(integration, 'config', 'sherlock-integration-batches', '20260831-16.json') + repository.git(integration, 'merge', '--no-ff', '--no-edit', 'codex/feat/staged-record-20260831') + const boundary = repository.git(integration, 'rev-parse', 'HEAD') + const manifest = JSON.parse(readFileSync(manifestPath, 'utf8')) + manifest.features[0].merged = { + mergeCommit: boundary, + verificationCommit: boundary, + checks: [{ argv: [process.execPath, '-e', 'process.exit(0)'], outcome: 'passed', summary: `已在暂存合并树执行：${process.execPath} -e process.exit(0)`, verifiedCommit: boundary, completedAt: '2026-08-31T05:17:00.000Z', timeoutMs: 1000 }], + recordedAt: '2026-08-31T05:17:00.000Z' + } + writeFileSync(manifestPath, `${JSON.stringify(manifest, null, 2)}\n`, 'utf8') + repository.git(integration, 'add', '--', 'config/sherlock-integration-batches/20260831-16.json') + + const result = continueIntegrationFeature({ integrationRepository: integration, manifestPath, featureBranch: 'codex/feat/staged-record-20260831', ownerToken, dryRun: false, now: '2026-08-31T05:18:00.000Z' }) + + expect(repository.git(integration, 'rev-parse', `${result.afterCommit}^`)).toBe(boundary) + expect(repository.git(integration, 'status', '--porcelain=v1')).toBe('') + expect(readActiveBatchLease(integration)).toMatchObject({ currentTip: result.afterCommit }) + }) + + it('performs only the outstanding lease CAS after an exact manifest record commit', () => { + const repository = fixture() + prepareIntegrationRoot(repository) + const handoff = handoffFile(repository, 'record-cas') + const integration = repository.createWorktree('integration-record-cas', 'codex/integration/20260831-17') + adoptIntegrationBatch({ integrationRepository: integration, batchId: '20260831-17', handoffPaths: [handoff], integrationChecks: [{ argv: [process.execPath, '-e', 'process.exit(0)'], timeoutMs: 1000 }], dryRun: false, now: '2026-08-31T05:17:00.000Z' }) + const context = resolveRepositoryContext(integration) + const ownerToken = JSON.parse(readFileSync(path.join(context.gitDirectory, 'sherlock-integration-owner.json'), 'utf8')).ownerToken + const manifestPath = path.join(integration, 'config', 'sherlock-integration-batches', '20260831-17.json') + const before = context.head + repository.git(integration, 'merge', '--no-ff', '--no-edit', 'codex/feat/record-cas-20260831') + const boundary = repository.git(integration, 'rev-parse', 'HEAD') + const lease = readActiveBatchLease(integration)! + updateActiveBatchTip({ repository: integration, ownerToken, expectedRevision: lease.revision, expectedTip: before, nextTip: boundary, updatedAt: '2026-08-31T05:18:00.000Z' }) + const manifest = JSON.parse(readFileSync(manifestPath, 'utf8')) + manifest.features[0].merged = { + mergeCommit: boundary, + verificationCommit: boundary, + checks: [{ argv: [process.execPath, '-e', 'process.exit(0)'], outcome: 'passed', summary: `已在暂存合并树执行：${process.execPath} -e process.exit(0)`, verifiedCommit: boundary, completedAt: '2026-08-31T05:18:00.000Z', timeoutMs: 1000 }], + recordedAt: '2026-08-31T05:18:00.000Z' + } + writeFileSync(manifestPath, `${JSON.stringify(manifest, null, 2)}\n`, 'utf8') + repository.git(integration, 'add', '--', 'config/sherlock-integration-batches/20260831-17.json') + repository.git(integration, 'commit', '-m', '集成：记录功能 codex/feat/record-cas-20260831 合并验证') + const record = repository.git(integration, 'rev-parse', 'HEAD') + + const result = continueIntegrationFeature({ integrationRepository: integration, manifestPath, featureBranch: 'codex/feat/record-cas-20260831', ownerToken, dryRun: false, now: '2026-08-31T05:19:00.000Z' }) + + expect(result.afterCommit).toBe(record) + expect(repository.git(integration, 'rev-parse', 'HEAD')).toBe(record) + expect(readActiveBatchLease(integration)).toMatchObject({ currentTip: record }) + }) + + it('retains a real conflict and prints both-side commit context with CLI exit 3', () => { + const repository = fixture() + prepareIntegrationRoot(repository) + const handoff = handoffFile(repository, 'conflict-output') + const integration = repository.createWorktree('integration-conflict-output', 'codex/integration/20260831-18') + adoptIntegrationBatch({ integrationRepository: integration, batchId: '20260831-18', handoffPaths: [handoff], integrationChecks: [{ argv: [process.execPath, '-e', 'process.exit(0)'], timeoutMs: 1000 }], dryRun: false, now: '2026-08-31T05:18:00.000Z' }) + const context = resolveRepositoryContext(integration) + const ownerToken = JSON.parse(readFileSync(path.join(context.gitDirectory, 'sherlock-integration-owner.json'), 'utf8')).ownerToken + const manifestPath = path.join(integration, 'config', 'sherlock-integration-batches', '20260831-18.json') + const lease = readActiveBatchLease(integration)! + repository.write(integration, 'src/conflict-output.ts', 'export const integrationSide = true\n') + const integrationTip = repository.commit(integration, '集成侧冲突') + updateActiveBatchTip({ repository: integration, ownerToken, expectedRevision: lease.revision, expectedTip: lease.currentTip, nextTip: integrationTip, updatedAt: '2026-08-31T05:19:00.000Z' }) + const manifestBytes = readFileSync(manifestPath) + const leaseBefore = JSON.stringify(readActiveBatchLease(integration)) + + const result = spawnSync(process.execPath, [integrationCli, 'merge', '--repo', integration, '--manifest', manifestPath, '--feature', 'codex/feat/conflict-output-20260831'], { cwd: projectRoot, encoding: 'utf8' }) + + expect(result.status).toBe(3) + expect(result.stdout).toContain(`integrationTip=${integrationTip}`) + expect(result.stdout).toMatch(/featureTip=[0-9a-f]{40} featureBase=[0-9a-f]{40}/) + expect(spawnSync('git', ['-C', integration, 'rev-parse', '-q', '--verify', 'MERGE_HEAD'], { encoding: 'utf8' }).status).toBe(0) + expect(readFileSync(manifestPath)).toEqual(manifestBytes) + expect(JSON.stringify(readActiveBatchLease(integration))).toBe(leaseBefore) + }) + + it('aborts and restores when a declared argv check times out', () => { + const repository = fixture() + prepareIntegrationRoot(repository) + const handoff = handoffFile(repository, 'timeout-check') + const integration = repository.createWorktree('integration-timeout-check', 'codex/integration/20260831-19') + adoptIntegrationBatch({ integrationRepository: integration, batchId: '20260831-19', handoffPaths: [handoff], integrationChecks: [{ argv: [process.execPath, '-e', 'setInterval(() => {}, 1000)'], timeoutMs: 25 }], dryRun: false, now: '2026-08-31T05:19:00.000Z' }) + const context = resolveRepositoryContext(integration) + const ownerToken = JSON.parse(readFileSync(path.join(context.gitDirectory, 'sherlock-integration-owner.json'), 'utf8')).ownerToken + const before = repository.snapshot() + + expect(() => mergeIntegrationFeature({ integrationRepository: integration, manifestPath: path.join(integration, 'config', 'sherlock-integration-batches', '20260831-19.json'), featureBranch: 'codex/feat/timeout-check-20260831', ownerToken, dryRun: false, now: '2026-08-31T05:20:00.000Z' })).toThrow(/检查失败/) + expect(repository.snapshot().equals(before)).toBe(true) + }) + + it('rejects a moved feature ref and a wrong owner token before mutating the integration batch', () => { + const repository = fixture() + prepareIntegrationRoot(repository) + const handoff = handoffFile(repository, 'owner-and-ref') + const integration = repository.createWorktree('integration-owner-and-ref', 'codex/integration/20260831-20') + adoptIntegrationBatch({ integrationRepository: integration, batchId: '20260831-20', handoffPaths: [handoff], integrationChecks: [{ argv: [process.execPath, '-e', 'process.exit(0)'], timeoutMs: 1000 }], dryRun: false, now: '2026-08-31T05:20:00.000Z' }) + const context = resolveRepositoryContext(integration) + const manifestPath = path.join(integration, 'config', 'sherlock-integration-batches', '20260831-20.json') + const beforeWrongOwner = repository.snapshot() + expect(() => mergeIntegrationFeature({ integrationRepository: integration, manifestPath, featureBranch: 'codex/feat/owner-and-ref-20260831', ownerToken: 'wrong-owner', dryRun: false, now: '2026-08-31T05:21:00.000Z' })).toThrow(/owner token/) + expect(repository.snapshot().equals(beforeWrongOwner)).toBe(true) + + const worktreeList = repository.git(integration, 'worktree', 'list', '--porcelain') + const featurePath = /worktree ([^\n]+)\nHEAD [^\n]+\nbranch refs\/heads\/codex\/feat\/owner-and-ref-20260831/.exec(worktreeList)?.[1] + expect(featurePath).toBeTruthy() + repository.write(featurePath!, 'src/moved.ts', 'export const moved = true\n') + repository.commit(featurePath!, '移动功能引用') + const beforeMovedRef = repository.snapshot() + const ownerToken = JSON.parse(readFileSync(path.join(context.gitDirectory, 'sherlock-integration-owner.json'), 'utf8')).ownerToken + expect(() => mergeIntegrationFeature({ integrationRepository: integration, manifestPath, featureBranch: 'codex/feat/owner-and-ref-20260831', ownerToken, dryRun: false, now: '2026-08-31T05:22:00.000Z' })).toThrow(/预检|移动|tip/) + expect(repository.snapshot().equals(beforeMovedRef)).toBe(true) + }) + + it('renders a usable recovery command with POSIX quoting for hostile paths and branches', () => { + expect(formatIntegrationRecoveryCommand({ + repository: "/tmp/owner's repo/$(nope)", + manifestPath: "/tmp/owner's repo/config/a b.json", + featureBranch: "codex/feat/odd'branch-20260831" + })).toBe("npm run git:integration -- continue --repo '/tmp/owner'\"'\"'s repo/$(nope)' --manifest '/tmp/owner'\"'\"'s repo/config/a b.json' --feature 'codex/feat/odd'\"'\"'branch-20260831'") + }) + + it('recovers the exact persisted owner without changing the batch, Git state, or lease bytes', () => { + const repository = fixture() + prepareIntegrationRoot(repository) + const handoff = handoffFile(repository, 'recover-owner') + const integration = repository.createWorktree('integration-recover-owner', 'codex/integration/20260831-21') + adoptIntegrationBatch({ integrationRepository: integration, batchId: '20260831-21', handoffPaths: [handoff], integrationChecks: checks(), dryRun: false, now: '2026-08-31T05:21:00.000Z' }) + const manifestPath = path.join(integration, 'config', 'sherlock-integration-batches', '20260831-21.json') + const lease = readActiveBatchLease(integration)! + const before = repository.snapshot() + + const result = recoverIntegrationOwnership({ + integrationRepository: integration, + manifestPath, + confirmBatchId: '20260831-21', + confirmTip: lease.currentTip + }) + + expect(result).toMatchObject({ status: 'ownership-recovered', afterCommit: lease.currentTip }) + expect(repository.snapshot()).toEqual(before) + }) + + it('synchronizes advanced main, invalidates acceptance, then accepts the exact manifest bytes without a Git commit', () => { + const repository = fixture() + prepareIntegrationRoot(repository) + const handoff = handoffFile(repository, 'sync-main') + const integration = repository.createWorktree('integration-sync-main', 'codex/integration/20260831-22') + adoptIntegrationBatch({ integrationRepository: integration, batchId: '20260831-22', handoffPaths: [handoff], integrationChecks: [{ argv: [process.execPath, '-e', 'process.exit(0)'], timeoutMs: 1000 }], dryRun: false, now: '2026-08-31T05:22:00.000Z' }) + const context = resolveRepositoryContext(integration) + const ownerToken = JSON.parse(readFileSync(path.join(context.gitDirectory, 'sherlock-integration-owner.json'), 'utf8')).ownerToken + const manifestPath = path.join(integration, 'config', 'sherlock-integration-batches', '20260831-22.json') + const expectedMainBefore = JSON.parse(readFileSync(manifestPath, 'utf8')).expectedMainCommit + mergeIntegrationFeature({ integrationRepository: integration, manifestPath, featureBranch: 'codex/feat/sync-main-20260831', ownerToken, dryRun: false, now: '2026-08-31T05:23:00.000Z' }) + const acceptedTip = repository.git(integration, 'rev-parse', 'HEAD') + acceptIntegrationBatch({ integrationRepository: integration, manifestPath, commit: acceptedTip, confirmBatchId: '20260831-22', ownerToken, now: '2026-08-31T05:24:00.000Z' }) + repository.write(repository.main, 'src/main-advance.ts', 'export const mainAdvance = true\n') + const mainTip = repository.commit(repository.main, '推进 main') + + const synchronized = synchronizeIntegrationMain({ integrationRepository: integration, manifestPath, ownerToken, dryRun: false, now: '2026-08-31T05:25:00.000Z' }) + const manifest = JSON.parse(readFileSync(manifestPath, 'utf8')) + const lease = readActiveBatchLease(integration)! + expect(synchronized).toMatchObject({ status: 'main-synchronized' }) + expect(manifest.expectedMainCommit).toBe(mainTip) + expect(manifest.mainSynchronizations).toHaveLength(1) + expect(manifest.mainSynchronizations[0]).toMatchObject({ previousMainCommit: expectedMainBefore, mainCommit: mainTip }) + expect(lease).toMatchObject({ currentTip: synchronized.afterCommit }) + expect(lease.acceptedTip).toBeUndefined() + const beforeAcceptHead = repository.git(integration, 'rev-parse', 'HEAD') + const digest = createHash('sha256').update(readFileSync(manifestPath)).digest('hex') + + const accepted = acceptIntegrationBatch({ integrationRepository: integration, manifestPath, commit: beforeAcceptHead, confirmBatchId: '20260831-22', ownerToken, now: '2026-08-31T05:26:00.000Z' }) + expect(accepted).toMatchObject({ status: 'accepted', beforeCommit: beforeAcceptHead, afterCommit: beforeAcceptHead }) + expect(repository.git(integration, 'rev-parse', 'HEAD')).toBe(beforeAcceptHead) + expect(readActiveBatchLease(integration)).toMatchObject({ acceptedTip: beforeAcceptHead, acceptedManifestDigest: digest }) + }, 10000) + + it('fast-forwards only an accepted exact integration tip into canonical clean main and archives the lease', () => { + const repository = fixture() + prepareIntegrationRoot(repository) + const handoff = handoffFile(repository, 'promote') + const integration = repository.createWorktree('integration-promote', 'codex/integration/20260831-23') + adoptIntegrationBatch({ integrationRepository: integration, batchId: '20260831-23', handoffPaths: [handoff], integrationChecks: [{ argv: [process.execPath, '-e', 'process.exit(0)'], timeoutMs: 1000 }], dryRun: false, now: '2026-08-31T05:27:00.000Z' }) + const context = resolveRepositoryContext(integration) + const ownerToken = JSON.parse(readFileSync(path.join(context.gitDirectory, 'sherlock-integration-owner.json'), 'utf8')).ownerToken + const manifestPath = path.join(integration, 'config', 'sherlock-integration-batches', '20260831-23.json') + const merged = mergeIntegrationFeature({ integrationRepository: integration, manifestPath, featureBranch: 'codex/feat/promote-20260831', ownerToken, dryRun: false, now: '2026-08-31T05:28:00.000Z' }) + acceptIntegrationBatch({ integrationRepository: integration, manifestPath, commit: merged.afterCommit, confirmBatchId: '20260831-23', ownerToken, now: '2026-08-31T05:29:00.000Z' }) + + const promoted = promoteIntegrationBatch({ integrationRepository: integration, manifestPath, mainWorktree: repository.main, confirmBatchId: '20260831-23', confirmTip: merged.afterCommit, ownerToken, dryRun: false, now: '2026-08-31T05:30:00.000Z' }) + expect(promoted).toMatchObject({ status: 'promoted', afterCommit: merged.afterCommit }) + expect(repository.git(repository.main, 'rev-parse', 'HEAD')).toBe(merged.afterCommit) + expect(repository.git(repository.main, 'merge-base', '--is-ancestor', 'codex/feat/promote-20260831', 'HEAD')).toBe('') + expect(readActiveBatchLease(integration)).toBeNull() + expect(existsSync(path.join(repository.commonDirectory, 'sherlock-integration', 'history'))).toBe(true) + }, 10000) + + it('retains the active lease after post-FF confirmation fails and retries the exact promoted state without another merge', () => { + const repository = fixture() + prepareIntegrationRoot(repository) + const handoff = handoffFile(repository, 'promote-confirmation') + const integration = repository.createWorktree('integration-promote-confirmation', 'codex/integration/20260831-25') + const confirmation = path.join(repository.root, 'confirmation.mjs') + writeFileSync(confirmation, 'process.exit(0)\n', 'utf8') + const integrationChecks = [{ argv: [process.execPath, confirmation], timeoutMs: 1000 }] as [{ argv: [string, ...string[]]; timeoutMs: number }] + adoptIntegrationBatch({ integrationRepository: integration, batchId: '20260831-25', handoffPaths: [handoff], integrationChecks, dryRun: false, now: '2026-08-31T05:34:00.000Z' }) + const context = resolveRepositoryContext(integration) + const ownerToken = JSON.parse(readFileSync(path.join(context.gitDirectory, 'sherlock-integration-owner.json'), 'utf8')).ownerToken + const manifestPath = path.join(integration, 'config', 'sherlock-integration-batches', '20260831-25.json') + const merged = mergeIntegrationFeature({ integrationRepository: integration, manifestPath, featureBranch: 'codex/feat/promote-confirmation-20260831', ownerToken, dryRun: false, now: '2026-08-31T05:35:00.000Z' }) + acceptIntegrationBatch({ integrationRepository: integration, manifestPath, commit: merged.afterCommit, confirmBatchId: '20260831-25', ownerToken, now: '2026-08-31T05:36:00.000Z' }) + writeFileSync(confirmation, 'process.exit(9)\n', 'utf8') + + const first = promoteIntegrationBatch({ integrationRepository: integration, manifestPath, mainWorktree: repository.main, confirmBatchId: '20260831-25', confirmTip: merged.afterCommit, ownerToken, dryRun: false, now: '2026-08-31T05:37:00.000Z' }) + expect(first).toMatchObject({ status: 'recovery-required', afterCommit: merged.afterCommit }) + expect(repository.git(repository.main, 'rev-parse', 'HEAD')).toBe(merged.afterCommit) + expect(readActiveBatchLease(integration)).toMatchObject({ currentTip: merged.afterCommit, acceptedTip: merged.afterCommit }) + + writeFileSync(confirmation, 'process.exit(0)\n', 'utf8') + const retried = promoteIntegrationBatch({ integrationRepository: integration, manifestPath, mainWorktree: repository.main, confirmBatchId: '20260831-25', confirmTip: merged.afterCommit, ownerToken, dryRun: false, now: '2026-08-31T05:38:00.000Z' }) + expect(retried).toMatchObject({ status: 'promoted', beforeCommit: merged.afterCommit, afterCommit: merged.afterCommit }) + expect(repository.git(repository.main, 'rev-parse', 'HEAD')).toBe(merged.afterCommit) + expect(readActiveBatchLease(integration)).toBeNull() + }, 15000) + + it('retains the active lease after archive publication fails following FF and archives on a later exact retry', () => { + const repository = fixture() + prepareIntegrationRoot(repository) + const handoff = handoffFile(repository, 'promote-archive') + const integration = repository.createWorktree('integration-promote-archive', 'codex/integration/20260831-26') + const integrationChecks = [{ argv: [process.execPath, '-e', 'process.exit(0)'], timeoutMs: 1000 }] as [{ argv: [string, ...string[]]; timeoutMs: number }] + adoptIntegrationBatch({ integrationRepository: integration, batchId: '20260831-26', handoffPaths: [handoff], integrationChecks, dryRun: false, now: '2026-08-31T05:39:00.000Z' }) + const context = resolveRepositoryContext(integration) + const ownerToken = JSON.parse(readFileSync(path.join(context.gitDirectory, 'sherlock-integration-owner.json'), 'utf8')).ownerToken + const manifestPath = path.join(integration, 'config', 'sherlock-integration-batches', '20260831-26.json') + const merged = mergeIntegrationFeature({ integrationRepository: integration, manifestPath, featureBranch: 'codex/feat/promote-archive-20260831', ownerToken, dryRun: false, now: '2026-08-31T05:40:00.000Z' }) + acceptIntegrationBatch({ integrationRepository: integration, manifestPath, commit: merged.afterCommit, confirmBatchId: '20260831-26', ownerToken, now: '2026-08-31T05:41:00.000Z' }) + fs.mkdirSync(path.join(repository.commonDirectory, 'sherlock-integration', 'history', '20260831-26-promoted-2026-08-31T05-42-00.000Z'), { recursive: true }) + + const first = promoteIntegrationBatch({ integrationRepository: integration, manifestPath, mainWorktree: repository.main, confirmBatchId: '20260831-26', confirmTip: merged.afterCommit, ownerToken, dryRun: false, now: '2026-08-31T05:42:00.000Z' }) + expect(first).toMatchObject({ status: 'recovery-required' }) + expect(repository.git(repository.main, 'rev-parse', 'HEAD')).toBe(merged.afterCommit) + expect(readActiveBatchLease(integration)).toMatchObject({ acceptedTip: merged.afterCommit }) + + const retried = promoteIntegrationBatch({ integrationRepository: integration, manifestPath, mainWorktree: repository.main, confirmBatchId: '20260831-26', confirmTip: merged.afterCommit, ownerToken, dryRun: false, now: '2026-08-31T05:43:00.000Z' }) + expect(retried).toMatchObject({ status: 'promoted' }) + expect(readActiveBatchLease(integration)).toBeNull() + }, 15000) + + const promotionRejectionScenarios = [ + { + name: 'dirty-promote', batchId: '20260831-27', + mutate: (repository: GitWorkflowFixture) => repository.write(repository.main, 'src/dirty-promote.ts', 'export const dirty = true\n'), + mainWorktree: (repository: GitWorkflowFixture, integration: string) => repository.main + }, + { + name: 'wrong-main-path', batchId: '20260831-28', + mutate: () => {}, + mainWorktree: (_repository: GitWorkflowFixture, integration: string) => integration + }, + { + name: 'stale-expected-main', batchId: '20260831-29', + mutate: (repository: GitWorkflowFixture) => { repository.write(repository.main, 'src/stale-main.ts', 'export const stale = true\n'); repository.commit(repository.main, '推进 main') }, + mainWorktree: (repository: GitWorkflowFixture) => repository.main + }, + { + name: 'stale-accepted-tip', batchId: '20260831-30', + mutate: (repository: GitWorkflowFixture, state: ReturnType) => { + const leasePath = path.join(repository.commonDirectory, 'sherlock-integration', 'active', 'lease.json') + const lease = JSON.parse(readFileSync(leasePath, 'utf8')) + lease.acceptedTip = '0'.repeat(40) + writeFileSync(leasePath, `${JSON.stringify(lease, null, 2)}\n`, 'utf8') + }, + mainWorktree: (repository: GitWorkflowFixture) => repository.main + }, + { + name: 'stale-accepted-digest', batchId: '20260831-31', + mutate: (repository: GitWorkflowFixture) => { + const leasePath = path.join(repository.commonDirectory, 'sherlock-integration', 'active', 'lease.json') + const lease = JSON.parse(readFileSync(leasePath, 'utf8')) + lease.acceptedManifestDigest = 'f'.repeat(64) + writeFileSync(leasePath, `${JSON.stringify(lease, null, 2)}\n`, 'utf8') + }, + mainWorktree: (repository: GitWorkflowFixture) => repository.main + }, + { + name: 'non-ff-history', batchId: '20260831-32', + mutate: (repository: GitWorkflowFixture, state: ReturnType) => { + repository.write(repository.main, 'src/non-ff.ts', 'export const nonFastForward = true\n') + const mainTip = repository.commit(repository.main, '制造非 fast-forward main') + const manifest = JSON.parse(readFileSync(state.manifestPath, 'utf8')) + manifest.expectedMainCommit = mainTip + writeFileSync(state.manifestPath, `${JSON.stringify(manifest, null, 2)}\n`, 'utf8') + const nextTip = repository.commit(state.integration, '记录非快进测试状态') + const lease = readActiveBatchLease(state.integration)! + updateActiveBatchTip({ repository: state.integration, ownerToken: state.ownerToken, expectedRevision: lease.revision, expectedTip: lease.currentTip, nextTip, updatedAt: '2026-08-31T06:03:00.000Z' }) + const leasePath = path.join(repository.commonDirectory, 'sherlock-integration', 'active', 'lease.json') + const acceptedLease = JSON.parse(readFileSync(leasePath, 'utf8')) + acceptedLease.acceptedTip = nextTip + acceptedLease.acceptedManifestDigest = createHash('sha256').update(readFileSync(state.manifestPath)).digest('hex') + acceptedLease.acceptedAt = '2026-08-31T06:03:01.000Z' + writeFileSync(leasePath, `${JSON.stringify(acceptedLease, null, 2)}\n`, 'utf8') + state.tip = nextTip + }, + mainWorktree: (repository: GitWorkflowFixture) => repository.main + }, + { + name: 'missing-feature-ancestor', batchId: '20260831-33', + mutate: (repository: GitWorkflowFixture, state: ReturnType) => { + const listing = repository.git(state.integration, 'worktree', 'list', '--porcelain') + const featurePath = new RegExp(`worktree ([^\\n]+)\\nHEAD [^\\n]+\\nbranch refs/heads/${state.branch.replaceAll('/', '\\/')}`).exec(listing)?.[1] + if (!featurePath) throw new Error('missing feature fixture worktree') + repository.write(featurePath, 'src/feature-advanced.ts', 'export const advancedFeature = true\n') + repository.commit(featurePath, '移动 feature tip') + }, + mainWorktree: (repository: GitWorkflowFixture) => repository.main + } + ] + for (const scenario of promotionRejectionScenarios) { + it(`rejects ${scenario.name} before FF without moving refs, worktrees, files, or leases`, () => { + const repository = fixture() + const state = acceptedPromotion(repository, scenario.name, scenario.batchId) + scenario.mutate(repository, state) + const before = repository.snapshot() + expect(() => promoteIntegrationBatch({ integrationRepository: state.integration, manifestPath: state.manifestPath, mainWorktree: scenario.mainWorktree(repository, state.integration), confirmBatchId: scenario.batchId, confirmTip: state.tip, ownerToken: state.ownerToken, dryRun: false, now: '2026-08-31T06:04:00.000Z' })).toThrow() + expect(repository.snapshot()).toEqual(before) + }, 10000) + } + + it('requires explicit matching cancellation and archives only the lease while preserving batch files and refs', () => { + const repository = fixture() + prepareIntegrationRoot(repository) + const handoff = handoffFile(repository, 'cancel') + const integration = repository.createWorktree('integration-cancel', 'codex/integration/20260831-24') + adoptIntegrationBatch({ integrationRepository: integration, batchId: '20260831-24', handoffPaths: [handoff], integrationChecks: checks(), dryRun: false, now: '2026-08-31T05:31:00.000Z' }) + const manifestPath = path.join(integration, 'config', 'sherlock-integration-batches', '20260831-24.json') + repository.write(integration, 'notes/untracked.txt', 'retain me\n') + const refs = repository.git(integration, 'for-each-ref', '--format=%(refname) %(objectname)') + const worktrees = repository.git(integration, 'worktree', 'list', '--porcelain') + const manifest = readFileSync(manifestPath) + const untracked = readFileSync(path.join(integration, 'notes', 'untracked.txt')) + const before = repository.snapshot() + + expect(() => cancelIntegrationBatch({ integrationRepository: integration, manifestPath, confirmBatchId: 'wrong-batch', explicitCancellation: true, dryRun: false, now: '2026-08-31T05:32:00.000Z' })).toThrow(/batch|批次/) + expect(() => cancelIntegrationBatch({ integrationRepository: integration, manifestPath, confirmBatchId: '20260831-24', explicitCancellation: false, dryRun: false, now: '2026-08-31T05:32:00.000Z' })).toThrow(/取消|确认/) + expect(repository.snapshot()).toEqual(before) + + const cancelled = cancelIntegrationBatch({ integrationRepository: integration, manifestPath, confirmBatchId: '20260831-24', explicitCancellation: true, dryRun: false, now: '2026-08-31T05:33:00.000Z' }) + expect(cancelled).toMatchObject({ status: 'cancelled' }) + expect(readActiveBatchLease(integration)).toBeNull() + expect(repository.git(integration, 'for-each-ref', '--format=%(refname) %(objectname)')).toBe(refs) + expect(repository.git(integration, 'worktree', 'list', '--porcelain')).toBe(worktrees) + expect(readFileSync(manifestPath)).toEqual(manifest) + expect(readFileSync(path.join(integration, 'notes', 'untracked.txt'))).toEqual(untracked) + }) +}) diff --git a/test/ipc-trust.test.ts b/test/ipc-trust.test.ts new file mode 100644 index 000000000..7235976b1 --- /dev/null +++ b/test/ipc-trust.test.ts @@ -0,0 +1,141 @@ +import { describe, expect, it, vi } from 'vitest' +import { + assertTrustedMainWindowEvent, + isTrustedMainWindowEvent, + registerPrivilegedMainWindowHandlers +} from '../src/main/ipc-trust' + +function trustedFixture() { + const webContents = { mainFrame: { processId: 7, routingId: 41 } } + const window = { + isDestroyed: () => false, + webContents + } + return { webContents, window } +} + +describe('main-window IPC trust', () => { + it('accepts a new WebFrameMain wrapper for the same routed main frame', () => { + const { webContents, window } = trustedFixture() + + expect(isTrustedMainWindowEvent({ + sender: webContents, + senderFrame: { processId: 7, routingId: 41 } + }, window)).toBe(true) + }) + + it('rejects subframes, other webContents, missing frames, and destroyed windows', () => { + const { webContents, window } = trustedFixture() + + expect(isTrustedMainWindowEvent({ + sender: webContents, + senderFrame: { processId: 7, routingId: 42 } + }, window)).toBe(false) + expect(isTrustedMainWindowEvent({ + sender: {}, + senderFrame: { processId: 7, routingId: 41 } + }, window)).toBe(false) + expect(isTrustedMainWindowEvent({ + sender: webContents, + senderFrame: null + }, window)).toBe(false) + expect(isTrustedMainWindowEvent({ + sender: webContents, + senderFrame: { processId: 7, routingId: 41 } + }, { + ...window, + isDestroyed: () => true + })).toBe(false) + }) + + it('prevents a child frame from reaching a privileged handler', () => { + const { webContents, window } = trustedFixture() + const childEvent = { + sender: webContents, + senderFrame: { processId: 7, routingId: 42 } + } + + expect(() => assertTrustedMainWindowEvent(childEvent, window)).toThrow( + 'main Sherlock window' + ) + }) + + it('rejects child frames through the production privileged handler registration', async () => { + const { webContents, window } = trustedFixture() + const childEvent = { + sender: webContents, + senderFrame: { processId: 7, routingId: 42 } + } + const invokeHandlers = new Map< + string, + (event: typeof childEvent, ...args: unknown[]) => unknown + >() + type SyncEvent = typeof childEvent & { returnValue: unknown } + const syncHandlers = new Map< + string, + (event: SyncEvent, ...args: unknown[]) => void + >() + const ipcMain = { + removeHandler: vi.fn(), + removeAllListeners: vi.fn(), + handle: ( + channel: string, + handler: (event: typeof childEvent, ...args: unknown[]) => unknown + ) => invokeHandlers.set(channel, handler), + on: ( + channel: string, + handler: (event: SyncEvent, ...args: unknown[]) => void + ) => syncHandlers.set(channel, handler) + } + const dependencies = { + showHarnessLog: vi.fn(), + openDirectory: vi.fn(async () => '/workspace'), + showItemInFolder: vi.fn(() => ({ ok: true })), + researchFilesAvailable: vi.fn(async () => [true]), + researchCanvasStorageGet: vi.fn(() => 'stored'), + researchCanvasStorageSet: vi.fn(() => true), + onStorageReadRejected: vi.fn(), + onStorageWriteRejected: vi.fn() + } + registerPrivilegedMainWindowHandlers({ + ipcMain, + getMainWindow: () => window, + ...dependencies + }) + + for (const [channel, args] of [ + ['harness:show-log', []], + ['directory-picker:open', []], + ['filesystem:show-item-in-folder', ['/workspace/report.pdf']], + ['research:files-available', [['/workspace/report.pdf']]] + ] as const) { + const handler = invokeHandlers.get(channel) + expect(handler, channel).toBeTypeOf('function') + await expect(Promise.resolve().then(() => handler?.(childEvent, ...args))).rejects.toThrow( + 'main Sherlock window' + ) + } + + for (const [channel, rejectedValue] of [ + ['research:canvas-storage:get', null], + ['research:canvas-storage:set', false] + ] as const) { + const event = { + sender: webContents, + senderFrame: { processId: 7, routingId: 42 }, + returnValue: undefined as unknown + } + const handler = syncHandlers.get(channel) + expect(handler, channel).toBeTypeOf('function') + handler?.(event) + expect(event.returnValue, channel).toBe(rejectedValue) + } + + expect(dependencies.showHarnessLog).not.toHaveBeenCalled() + expect(dependencies.openDirectory).not.toHaveBeenCalled() + expect(dependencies.showItemInFolder).not.toHaveBeenCalled() + expect(dependencies.researchFilesAvailable).not.toHaveBeenCalled() + expect(dependencies.researchCanvasStorageGet).not.toHaveBeenCalled() + expect(dependencies.researchCanvasStorageSet).not.toHaveBeenCalled() + }) +}) diff --git a/test/lan-mobile-pages.test.ts b/test/lan-mobile-pages.test.ts index 50043dd2f..7e7c057b5 100644 --- a/test/lan-mobile-pages.test.ts +++ b/test/lan-mobile-pages.test.ts @@ -13,7 +13,7 @@ describe('LAN mobile page', () => { for (const script of scripts) expect(() => new Function(script)).not.toThrow() }) - it('uses the DSH brand color and follows system dark mode', () => { + it('uses the Sherlock brand color and follows system dark mode', () => { const html = renderMobilePage({ locale: 'en' }) expect(html).toContain('--brand:#4d6bfe') expect(html).toContain('prefers-color-scheme:dark') @@ -64,7 +64,7 @@ describe('LAN mobile page', () => { expect(html).toContain('!archived.has(s.sessionId)') }) - it('uses DSH styling on both pairing surfaces', () => { + it('uses Sherlock styling on both pairing surfaces', () => { const desktop = renderDesktopPairingPage({ qrSvg: '', pairingUrl: 'http://192.168.1.2/pair?token=test', @@ -106,7 +106,7 @@ describe('LAN mobile page', () => { expect(desktop).toContain('断开连接') expect(desktop).toContain('现在可以关闭此窗口。') expect(desktop).toContain('onclick="window.close()">完成') - expect(phone).toContain('请在 DSH Desktop 中确认连接请求。') + expect(phone).toContain('请在 Sherlock 中确认连接请求。') }) it('renders a compact management state when a phone is already connected', () => { @@ -119,7 +119,7 @@ describe('LAN mobile page', () => { }) expect(desktop).toContain('class="phone-connected manage-connected"') expect(desktop).toContain('Manage phone connection') - expect(desktop).toContain('Your phone is currently connected to DSH Desktop.') + expect(desktop).toContain('Your phone is currently connected to Sherlock.') expect(desktop).toContain('.manage-connected .connection-hint,.manage-connected .done{display:none}') }) }) diff --git a/test/loading-indicator.test.ts b/test/loading-indicator.test.ts new file mode 100644 index 000000000..40bd962bf --- /dev/null +++ b/test/loading-indicator.test.ts @@ -0,0 +1,125 @@ +import { readFile } from 'node:fs/promises' +import { createRequire } from 'node:module' +import { runInNewContext } from 'node:vm' +import { describe, expect, it } from 'vitest' + +type StateDotComponent = (props: { + state: 'done' | 'warning' | 'ongoing' | 'error' + size?: number + className?: string +}) => unknown + +const requireModule = createRequire(import.meta.url) +const { createElement } = requireModule('react') as { + createElement: (type: unknown, props?: unknown) => unknown +} +const { Fragment, jsx, jsxs } = requireModule('react/jsx-runtime') as { + Fragment: unknown + jsx: (type: unknown, props: unknown, key?: string) => unknown + jsxs: (type: unknown, props: unknown, key?: string) => unknown +} +const { renderToStaticMarkup } = requireModule('react-dom/server') as { + renderToStaticMarkup: (node: unknown) => string +} +const clsx = requireModule('clsx') as (...values: unknown[]) => string + +const IconLoadingOutline16 = ({ + size = 16, + className +}: { + size?: number + className?: string +}) => + jsx('svg', { + width: size, + height: size, + className, + viewBox: '0 0 16 16', + children: jsx('path', { + d: 'M2.871 13.1286C0.0387669 10.2962 0.0387669 5.70383 2.871 2.87141C5.70341 0.0390029 10.2957 0.0391154 13.1282 2.87141L12.1387 3.86094C9.85292 1.57538 6.1469 1.57596 3.86123 3.86163C1.57573 6.14732 1.57573 9.85269 3.86123 12.1384C6.1469 14.424 9.85292 14.4246 12.1387 12.1391L13.1282 13.1286C10.2957 15.9609 5.70341 15.961 2.871 13.1286Z', + fill: 'currentColor' + }) + }) + +async function loadStateDot(): Promise { + const source = await readFile( + 'node_modules/@deepseek-ai/dsh-client-ui-primitives/lib/index.js', + 'utf8' + ) + const start = source.indexOf('//#region lib/types/StateDot.js') + const end = source.indexOf('//#endregion', start) + if (start === -1 || end === -1) throw new Error('StateDot source region is missing') + + const context: { StateDot?: StateDotComponent } = {} + runInNewContext( + `${source.slice(start, end)}\n;globalThis.StateDot = StateDot;`, + { + ...context, + globalThis: context, + Fragment, + jsx, + jsxs, + clsx, + IconLoadingOutline16, + StateDot_module_css_default: {} + } + ) + if (context.StateDot === undefined) throw new Error('StateDot did not load') + return context.StateDot +} + +describe('Sherlock loading indicator', () => { + it('renders the ongoing state as the same open white ring used by Codex', async () => { + const StateDot = await loadStateDot() + const html = renderToStaticMarkup( + createElement(StateDot, { + state: 'ongoing', + size: 12, + className: 'status-slot' + }) + ) + + expect(html).toContain(' { + const [frontendJs, frontendCss, frontendPatcher, packageJson] = await Promise.all([ + readFile( + 'node_modules/@deepseek-ai/dsh-web-frontend/dist/assets/index-C-1AiF3k.js', + 'utf8' + ), + readFile( + 'node_modules/@deepseek-ai/dsh-web-frontend/dist/assets/index-CSGf6Qzd.css', + 'utf8' + ), + readFile('scripts/patch-web-frontend-loading.mjs', 'utf8'), + readFile('package.json', 'utf8') + ]) + + for (const source of [frontendJs, frontendPatcher]) { + expect(source).toContain( + 'n==="ongoing"?f.jsx(v9,{size:r,className:ye(yl.matrix,i)})' + ) + expect(source).not.toContain('shapeRendering:"crispEdges"') + } + for (const source of [frontendCss, frontendPatcher]) { + expect(source).toContain( + '._matrix_10orb_4{flex:none;color:var(--dsw-alias-label-secondary);animation:_spin_9gj4p_34 1s linear infinite}' + ) + expect(source).toContain('@media(prefers-reduced-motion:reduce){._matrix_10orb_4{animation:none}}') + } + + expect(frontendPatcher).toContain('dsh-client-ui-primitives') + expect(JSON.parse(packageJson).scripts.build).toContain( + 'node scripts/patch-web-frontend-loading.mjs' + ) + }) +}) diff --git a/test/local-path-links.test.ts b/test/local-path-links.test.ts index a9650de50..fabb4e10a 100644 --- a/test/local-path-links.test.ts +++ b/test/local-path-links.test.ts @@ -1,24 +1,83 @@ import { readFile } from 'node:fs/promises' -import path from 'node:path' -import { describe, expect, it } from 'vitest' +import { createRequire } from 'node:module' +import { runInNewContext } from 'node:vm' +import { describe, expect, it, vi } from 'vitest' -const projectRoot = path.resolve(import.meta.dirname, '..') +type Bundle = Record +type BundleDescriptor = { factory(require: (id: string) => unknown): Bundle } + +const requireModule = createRequire(import.meta.url) + +function fakeModule(): unknown { + let fake: unknown + const target = function () {} + fake = new Proxy(target, { + get: () => fake, + apply: () => fake, + construct: () => ({}), + }) + return fake +} + +async function loadDeliverables(): Promise { + const source = await readFile( + 'node_modules/@deepseek-ai/dsh-client-ui-deliverables/lib/client.js', + 'utf8', + ) + let descriptor: BundleDescriptor | undefined + runInNewContext(source, { + window: { + __ModuleLoader__: { + load(value: BundleDescriptor) { descriptor = value }, + }, + }, + }) + if (descriptor === undefined) throw new Error('deliverables bundle did not register') + return descriptor.factory((id) => { + if (id === 'react') return requireModule('react') + if (id === 'react/jsx-runtime') return requireModule('react/jsx-runtime') + return fakeModule() + }) +} describe('assistant local path links', () => { - it('links Codex-style path references even when they are not turn deliverables', async () => { - const patch = await readFile( - path.join( - projectRoot, - 'patches', - '@deepseek-ai+dsh-client-ui-deliverables+0.1.0-rc.7.patch' - ), - 'utf8' - ) + it('exposes the absolute backing path for a relative file mention in the current workspace', async () => { + const client = await loadDeliverables() + expect(client.apply).toBeTypeOf('function') + const provided: Record = {} + const ctx = { + get: () => ({ isLoopback: true }), + conversationEvents: { register: () => {} }, + effect: (callback: () => void) => { callback() }, + locale: { + register: () => {}, + bind: () => (_key: string, values: { name: string }) => `Open ${values.name}`, + }, + slots: { + inject: (_name: string, callback: () => void) => { callback() }, + register: () => () => {}, + }, + provide: (name: string, value: unknown) => { provided[name] = value }, + } + ;(client.apply as (ctx: unknown) => void)(ctx) + + const openFile = vi.fn() + const service = provided.chatFileMentions as { + forClosing(owner: unknown): { + resolve(value: string): { title: string; label: string; open(): void } | undefined + } + } + const mentions = service.forClosing({ + turn: { data: new Map() }, + seq: 12, + cwd: '/Users/me/Project', + openFile, + }) + const mention = mentions.resolve('index.html') - expect(patch).toContain('localPathReference(value)') - expect(patch).toContain('paths ?? []') - expect(patch).toContain('#L\\d+') - expect(patch).toContain('[A-Za-z]:[\\\\/]') - expect(patch).toContain('owner.openFile') + expect(mention?.title).toBe('/Users/me/Project/index.html') + expect(mention?.label).toBe('Open index.html') + mention?.open() + expect(openFile).toHaveBeenCalledWith('index.html') }) }) diff --git a/test/local-search-bridge.test.ts b/test/local-search-bridge.test.ts new file mode 100644 index 000000000..84fe37d8c --- /dev/null +++ b/test/local-search-bridge.test.ts @@ -0,0 +1,192 @@ +import { describe, expect, it } from 'vitest' +import { LocalSearchBridge } from '../src/main/search/local-search-bridge' + +async function postSearch( + endpoint: { url: string; token: string }, + body: unknown, + token = endpoint.token, + init: RequestInit = {} +): Promise { + return fetch(`${endpoint.url}/search`, { + method: 'POST', + headers: { + authorization: `Bearer ${token}`, + 'content-type': 'application/json' + }, + body: JSON.stringify(body), + ...init + }) +} + +describe('LocalSearchBridge', () => { + it('binds to a random loopback port and keeps the random token out of the URL', async () => { + const bridge = new LocalSearchBridge({ + search: async () => ({ sources: [], truncated: false }) + }) + const endpoint = await bridge.start() + try { + const parsed = new URL(endpoint.url) + expect(parsed.hostname).toBe('127.0.0.1') + expect(Number(parsed.port)).toBeGreaterThan(0) + expect(endpoint.token).toMatch(/^[a-f0-9]{64}$/u) + expect(endpoint.url).not.toContain(endpoint.token) + } finally { + await bridge.stop() + } + }) + + it('rejects requests without the exact bearer token', async () => { + const bridge = new LocalSearchBridge({ + search: async () => ({ sources: [], truncated: false }) + }) + const endpoint = await bridge.start() + try { + expect((await postSearch(endpoint, { query: 'test' }, 'wrong-token')).status).toBe(401) + expect( + ( + await fetch(`${endpoint.url}/search`, { + method: 'POST', + headers: { 'content-type': 'application/json' }, + body: JSON.stringify({ query: 'test' }) + }) + ).status + ).toBe(401) + } finally { + await bridge.stop() + } + }) + + it('accepts only POST JSON on the search route', async () => { + const bridge = new LocalSearchBridge({ + search: async () => ({ sources: [], truncated: false }) + }) + const endpoint = await bridge.start() + try { + expect( + ( + await fetch(`${endpoint.url}/search`, { + headers: { authorization: `Bearer ${endpoint.token}` } + }) + ).status + ).toBe(405) + expect( + ( + await fetch(`${endpoint.url}/search`, { + method: 'POST', + headers: { + authorization: `Bearer ${endpoint.token}`, + 'content-type': 'text/plain' + }, + body: 'test' + }) + ).status + ).toBe(415) + expect( + ( + await fetch(`${endpoint.url}/other`, { + method: 'POST', + headers: { + authorization: `Bearer ${endpoint.token}`, + 'content-type': 'application/json' + }, + body: '{}' + }) + ).status + ).toBe(404) + } finally { + await bridge.stop() + } + }) + + it('validates a bounded query and clamps the result count before searching', async () => { + const calls: Array<{ query: string; maxResults: number }> = [] + const bridge = new LocalSearchBridge({ + search: async (query, maxResults) => { + calls.push({ query, maxResults }) + return { + sources: [{ url: 'https://example.com/result', title: 'Result' }], + truncated: false + } + } + }) + const endpoint = await bridge.start() + try { + expect((await postSearch(endpoint, { query: ' quarterly results ', maxResults: 99 })).status).toBe(200) + expect(calls).toEqual([{ query: 'quarterly results', maxResults: 8 }]) + expect((await postSearch(endpoint, { query: '' })).status).toBe(400) + expect((await postSearch(endpoint, { query: 'x'.repeat(513) })).status).toBe(400) + expect((await postSearch(endpoint, { query: 'x', maxResults: 0 })).status).toBe(400) + } finally { + await bridge.stop() + } + }) + + it('rejects bodies larger than 16 KiB', async () => { + const bridge = new LocalSearchBridge({ + search: async () => ({ sources: [], truncated: false }) + }) + const endpoint = await bridge.start() + try { + const response = await fetch(`${endpoint.url}/search`, { + method: 'POST', + headers: { + authorization: `Bearer ${endpoint.token}`, + 'content-type': 'application/json' + }, + body: JSON.stringify({ query: 'x', padding: 'y'.repeat(17 * 1024) }) + }) + expect(response.status).toBe(413) + } finally { + await bridge.stop() + } + }) + + it('aborts the in-flight browser operation when the client disconnects', async () => { + let searchStarted!: () => void + const started = new Promise((resolve) => { + searchStarted = resolve + }) + let searchAborted!: () => void + const aborted = new Promise((resolve) => { + searchAborted = resolve + }) + const bridge = new LocalSearchBridge({ + search: async (_query, _maxResults, signal) => { + searchStarted() + return new Promise((_resolve, reject) => { + signal.addEventListener( + 'abort', + () => { + searchAborted() + reject(new DOMException('aborted', 'AbortError')) + }, + { once: true } + ) + }) + } + }) + const endpoint = await bridge.start() + const controller = new AbortController() + try { + const request = postSearch(endpoint, { query: 'slow query' }, endpoint.token, { + signal: controller.signal + }) + await started + controller.abort() + await expect(request).rejects.toMatchObject({ name: 'AbortError' }) + await aborted + } finally { + await bridge.stop() + } + }) + + it('closes the loopback listener on stop', async () => { + const bridge = new LocalSearchBridge({ + search: async () => ({ sources: [], truncated: false }) + }) + const endpoint = await bridge.start() + await bridge.stop() + + await expect(postSearch(endpoint, { query: 'test' })).rejects.toBeInstanceOf(TypeError) + }) +}) diff --git a/test/local-search-runtime.test.ts b/test/local-search-runtime.test.ts new file mode 100644 index 000000000..5d68691eb --- /dev/null +++ b/test/local-search-runtime.test.ts @@ -0,0 +1,65 @@ +import { describe, expect, it } from 'vitest' +import type { BrowserSearchWindow } from '../src/main/search/browser-search-controller' +import { startLocalSearchRuntime } from '../src/main/search/local-search-runtime' + +function fakeWindow(): BrowserSearchWindow & { destroyed: boolean } { + let url = '' + const value = { + destroyed: false, + webContents: { + executeJavaScript: async (script: string) => + script.includes('document.body?.innerText') + ? { url, title: 'Search results', text: 'ordinary results' } + : [{ title: 'Local result', url: 'https://example.com/local', snippet: 'summary' }], + getURL: () => url, + stop: () => undefined + }, + loadURL: async (nextUrl: string) => { + url = nextUrl + }, + show: () => undefined, + hide: () => undefined, + setTitle: () => undefined, + isDestroyed: () => value.destroyed, + destroy: () => { + value.destroyed = true + } + } + return value +} + +describe('local search main-process runtime', () => { + it('serves browser results through its authenticated endpoint and disposes both resources', async () => { + const window = fakeWindow() + const runtime = await startLocalSearchRuntime({ createWindow: () => window }) + const response = await fetch(`${runtime.endpoint.url}/search`, { + method: 'POST', + headers: { + authorization: `Bearer ${runtime.endpoint.token}`, + 'content-type': 'application/json' + }, + body: JSON.stringify({ query: 'local query', maxResults: 3 }) + }) + + expect(response.status).toBe(200) + await expect(response.json()).resolves.toEqual({ + sources: [ + { title: 'Local result', url: 'https://example.com/local', snippet: 'summary' } + ], + truncated: false + }) + + await runtime.stop() + expect(window.destroyed).toBe(true) + await expect( + fetch(`${runtime.endpoint.url}/search`, { + method: 'POST', + headers: { + authorization: `Bearer ${runtime.endpoint.token}`, + 'content-type': 'application/json' + }, + body: JSON.stringify({ query: 'after stop' }) + }) + ).rejects.toBeInstanceOf(TypeError) + }) +}) diff --git a/test/macos-package-runtime.test.ts b/test/macos-package-runtime.test.ts new file mode 100644 index 000000000..9755aff04 --- /dev/null +++ b/test/macos-package-runtime.test.ts @@ -0,0 +1,27 @@ +import { spawnSync } from 'node:child_process' +import path from 'node:path' +import { describe, expect, it } from 'vitest' + +const projectRoot = path.resolve(import.meta.dirname, '..') + +describe('macOS package runtime verification', () => { + it('loads the Wiki database peer dependencies with the packaged Node runtime', () => { + const result = spawnSync( + process.execPath, + [ + 'scripts/verify-packaged-macos.mjs', + '--runtime-root', + projectRoot, + '--runtime-node', + process.execPath + ], + { + cwd: projectRoot, + encoding: 'utf8' + } + ) + + expect(result.status, result.stderr).toBe(0) + expect(result.stdout).toContain('apache-arrow: loadable') + }) +}) diff --git a/test/macos-self-signed-update.test.ts b/test/macos-self-signed-update.test.ts new file mode 100644 index 000000000..c2ac89db7 --- /dev/null +++ b/test/macos-self-signed-update.test.ts @@ -0,0 +1,21 @@ +import { execFile as execFileCallback } from 'node:child_process' +import path from 'node:path' +import { promisify } from 'node:util' +import { describe, expect, it } from 'vitest' + +const execFile = promisify(execFileCallback) +const projectRoot = path.resolve(import.meta.dirname, '..') + +describe.skipIf(process.platform !== 'darwin')('macOS self-signed update identity', () => { + it('accepts a replacement signed by the same non-Apple designated requirement', async () => { + const before = await execFile('/usr/bin/security', ['list-keychains', '-d', 'user']) + const { stdout, stderr } = await execFile(process.execPath, [ + path.join(projectRoot, 'scripts', 'verify-self-signed-update-identity.mjs') + ]) + const after = await execFile('/usr/bin/security', ['list-keychains', '-d', 'user']) + + expect(stderr).toBe('') + expect(stdout).toContain('SELF_SIGNED_UPDATE_IDENTITY_OK') + expect(after.stdout).toBe(before.stdout) + }, 30_000) +}) diff --git a/test/market-installer.test.js b/test/market-installer.test.js index 64226c30d..6a55c7fd5 100644 --- a/test/market-installer.test.js +++ b/test/market-installer.test.js @@ -17,6 +17,34 @@ import { } from '../packages/dsh-desktop-market-installer/index.js' describe('desktop plugin market installer', () => { + it('keeps the installer package name aligned with the Harness dependency closure', async () => { + const [desktopManifest, harnessManifest, installerManifest, desktopPatch, clientBundle] = await Promise.all([ + readFile(join(process.cwd(), 'package.json'), 'utf8').then(JSON.parse), + readFile( + join(process.cwd(), 'node_modules', '@deepseek-ai', 'dsh', 'package.json'), + 'utf8' + ).then(JSON.parse), + readFile( + join(process.cwd(), 'packages', 'dsh-desktop-market-installer', 'package.json'), + 'utf8' + ).then(JSON.parse), + readFile(join(process.cwd(), 'build', 'dsh-desktop.patch.yml'), 'utf8'), + readFile( + join(process.cwd(), 'packages', 'dsh-desktop-market-installer', 'client.js'), + 'utf8' + ) + ]) + const compatibilityPackageName = 'dsh-desktop-market-installer' + + expect(harnessManifest.dependencies[compatibilityPackageName]).toBeDefined() + expect(installerManifest.name).toBe(compatibilityPackageName) + expect(desktopManifest.dependencies[compatibilityPackageName]).toBe( + 'file:packages/dsh-desktop-market-installer' + ) + expect(desktopPatch).toContain(`name: ${compatibilityPackageName}`) + expect(clientBundle).toContain(`id: '${compatibilityPackageName}'`) + }) + it('pins the only install target accepted by the host', () => { expect(buildInstallArguments('/app/dsh/bin.js')).toEqual([ '/app/dsh/bin.js', @@ -29,9 +57,9 @@ describe('desktop plugin market installer', () => { ]) expect(MARKET_PACKAGE).toBe('dshmarket') expect(RECOMMENDED_MARKET_VERSION).toBe('1.9.0') - expect(STATUS_PATH).toBe('/dsh-desktop/market-installer/status') - expect(INSTALL_PATH).toBe('/dsh-desktop/market-installer/install') - expect(UNINSTALL_PATH).toBe('/dsh-desktop/market-installer/uninstall') + expect(STATUS_PATH).toBe('/sherlock/market-installer/status') + expect(INSTALL_PATH).toBe('/sherlock/market-installer/install') + expect(UNINSTALL_PATH).toBe('/sherlock/market-installer/uninstall') expect(buildUninstallArguments('/app/dsh/bin.js')).toEqual([ '/app/dsh/bin.js', 'plugin', diff --git a/test/model-multimodal-settings.test.ts b/test/model-multimodal-settings.test.ts new file mode 100644 index 000000000..ac7533189 --- /dev/null +++ b/test/model-multimodal-settings.test.ts @@ -0,0 +1,118 @@ +import { createRequire } from 'node:module' +import { readFile } from 'node:fs/promises' +import { runInNewContext } from 'node:vm' +import { describe, expect, it } from 'vitest' + +type ClientBundle = Record +type BundleDescriptor = { + factory(require: (id: string) => unknown): ClientBundle +} + +const requireModule = createRequire(import.meta.url) +const react = requireModule('react') as { + createElement(type: unknown, props?: unknown, ...children: unknown[]): unknown +} +const { renderToStaticMarkup } = requireModule('react-dom/server') as { + renderToStaticMarkup(node: unknown): string +} + +function fakeModule(): unknown { + let fake: unknown + const target = function () {} + fake = new Proxy(target, { + get: () => fake, + apply: () => fake, + construct: () => ({}) + }) + return fake +} + +async function loadModelsBundle(): Promise { + const source = await readFile( + 'node_modules/@deepseek-ai/dsh-client-ui-settings-models/lib/client.js', + 'utf8' + ) + let descriptor: BundleDescriptor | undefined + runInNewContext(source, { + window: { + __ModuleLoader__: { + load(value: BundleDescriptor) { + descriptor = value + } + } + } + }) + if (descriptor === undefined) throw new Error('models bundle did not register') + + const primitives = new Proxy( + {}, + { get: () => () => null } + ) + return descriptor.factory((id) => { + if (id === 'react') return react + if (id === 'react/jsx-runtime') return requireModule('react/jsx-runtime') + if (id === '@deepseek-ai/dsh-client-ui-primitives') return primitives + return fakeModule() + }) +} + +describe('multimodal model settings', () => { + it('persists the image modality and renders a checked Vision control', async () => { + const bundle = await loadModelsBundle() + const modelInputForVision = bundle.modelInputForVision + const ModelListEditor = bundle.ModelListEditor + expect(modelInputForVision).toBeTypeOf('function') + expect(ModelListEditor).toBeTypeOf('function') + if (typeof modelInputForVision !== 'function' || typeof ModelListEditor !== 'function') return + + const enabled = modelInputForVision({ id: 'vision-test' }, true) as string[] + const disabled = modelInputForVision( + { id: 'vision-test', input: ['text', 'image'] }, + false + ) as string[] + expect(Array.from(enabled)).toEqual(['text', 'image']) + expect(Array.from(disabled)).toEqual(['text']) + + const { Config } = requireModule('@deepseek-ai/dsh-llm-pi-ai') as { + Config(value: unknown): { + providers: Record }> + } + } + const harnessConfig = Config({ + providers: { + custom: { + api: 'openai-responses', + baseURL: 'https://example.test/v1', + models: [{ id: 'vision-test', input: enabled }] + } + } + }) + expect(harnessConfig.providers.custom?.models[0]?.input).toEqual(['text', 'image']) + + const copy: Record = { + models: '模型目录', + modelsCustomized: '已自定义模型目录', + modelId: '模型 ID', + modelName: '显示名称', + modelVision: '视觉', + modelAdvanced: '容量', + removeModel: '删除模型', + addModel: '添加模型', + fetchModels: '获取可用模型' + } + const html = renderToStaticMarkup( + react.createElement(ModelListEditor, { + models: [{ id: 'vision-test', name: 'Vision Test', input: enabled }], + onChange: () => undefined, + probe: { provider: 'custom' }, + api: { llm: { discoverModels: async () => undefined } }, + t: (key: string) => copy[key] ?? key, + disabled: false, + overridden: true + }) + ) + expect(html).toContain('data-model-vision="true"') + expect(html).toContain('checked=""') + expect(html).toContain('视觉') + }) +}) diff --git a/test/model-provider-policy.test.ts b/test/model-provider-policy.test.ts new file mode 100644 index 000000000..0a69cc394 --- /dev/null +++ b/test/model-provider-policy.test.ts @@ -0,0 +1,40 @@ +import { composeEntries, loadOverlayPatches } from '@deepseek-ai/dsh-app-boot' +import { describe, expect, it } from 'vitest' + +describe('desktop model provider policy', () => { + it('disables the bundled DeepSeek model adapter in the effective desktop profile', () => { + const base = loadOverlayPatches( + 'dsh-desktop-test', + 'node_modules/@deepseek-ai/dsh-base/cordis.patch.yml' + ) + const desktop = loadOverlayPatches('dsh-desktop-test', 'build/dsh-desktop.patch.yml') + const effective = composeEntries([base, desktop]) + + expect(effective.find((entry) => entry.id === 'llm-deepseek')).toMatchObject({ + id: 'llm-deepseek', + disabled: true + }) + }) + + it('routes web search through the current session model instead of DeepSeek', () => { + const base = loadOverlayPatches( + 'dsh-desktop-test', + 'node_modules/@deepseek-ai/dsh-base/cordis.patch.yml' + ) + const desktop = loadOverlayPatches('dsh-desktop-test', 'build/dsh-desktop.patch.yml') + const effective = composeEntries([base, desktop]) + + expect(effective.find((entry) => entry.id === 'web')).toMatchObject({ + id: 'web', + config: { searchProvider: 'sherlock-session-model' } + }) + expect(effective.find((entry) => entry.id === 'web-search-deepseek')).toMatchObject({ + id: 'web-search-deepseek', + disabled: true + }) + expect(effective.find((entry) => entry.id === 'web-search-session-model')).toMatchObject({ + id: 'web-search-session-model', + name: 'dsh-web-search-session-model' + }) + }) +}) diff --git a/test/model-session-selection.test.ts b/test/model-session-selection.test.ts new file mode 100644 index 000000000..7f134ed8a --- /dev/null +++ b/test/model-session-selection.test.ts @@ -0,0 +1,246 @@ +import { + createBoundedSessionModelSelectionStore, + createApiProxy, + resolveSessionModelSelection, + type DurableSessionModelSelection +} from '@deepseek-ai/dsh-host-apiproxy' +import type { ModelSelection } from '@deepseek-ai/dsh-agent' +import { ReasoningEffortId } from '@deepseek-ai/dsh-llm' +import { describe, expect, it } from 'vitest' + +type Selection = ModelSelection +type WireSelection = { provider: string, model: string, reasoningEffort?: string } +type RpcResult = { result: { ok: true, value: T } | { ok: false, error: { message: string } } } + +function selection(provider: string, model: string, reasoningEffort?: string): Selection { + return { + provider, + model, + ...(reasoningEffort === undefined ? {} : { reasoningEffort: ReasoningEffortId(reasoningEffort) }) + } +} + +function rpc(payload: T, id = 'rpc-test') { + return { rpcId: id, payload } as never +} + +function modelResult(response: RpcResult<{ current: WireSelection | null, routable: boolean }>) { + if (!response.result.ok) throw new Error(response.result.error.message) + return response.result.value +} + +function createSettingsFixture() { + let value: { selections: DurableSessionModelSelection[] } = { selections: [] } + let rejectWrites = false + const registered: string[] = [] + return { + settings: { + register(namespace: unknown) { + registered.push(String(namespace)) + return { + get: () => value, + replace: async (next: { selections: DurableSessionModelSelection[] }) => { + if (rejectWrites) throw new Error('settings disk unavailable') + value = { selections: next.selections.map((entry) => ({ ...entry })) } + } + } + } + }, + registered, + setRejectWrites(next: boolean) { + rejectWrites = next + } + } +} + +function createApiProxyFixture( + settingsFixture: ReturnType, + defaultSelection: Selection, + sessionId = 'proxy-session', + options: { + providers?: Array<{ id: string, name: string }> + requestSelection?: Selection + } = {} +) { + const session = { + id: sessionId, + header: {}, + requestHeader: () => options.requestSelection === undefined + ? undefined + : { config: options.requestSelection }, + deriveMessages: () => [] + } + const agent = { + id: sessionId, + session, + ctx: { on: () => () => undefined }, + inbox: { nextTurn: [], nextStep: [] } + } + const providers = options.providers ?? [ + { id: 'openai', name: 'OpenAI' }, + { id: 'anthropic', name: 'Anthropic' } + ] + const ctx = { + settings: settingsFixture.settings, + agents: { + get: (id: string) => id === sessionId ? agent : undefined, + isOwnedBy: () => false + }, + sessions: { get: (id: string) => id === sessionId ? session : undefined }, + llm: { + listProviders: () => providers, + listModels: async (provider: string) => [{ id: `${provider}-model`, name: `${provider} model` }], + resolveModelInfo: async () => ({}), + resolveCallConfig: async (requested: Selection) => requested + }, + userQuestions: { registerProvider: () => () => undefined }, + workspaceRegistry: {}, + logger: { warn: () => undefined }, + get(name: string) { + if (name === 'settings') return this.settings + if (name === 'llm') return this.llm + return undefined + }, + inject(names: string[], callback: (next: unknown) => void) { + if (names.every((name) => this.get(name) !== undefined)) callback(this) + }, + effect(callback: () => unknown) { + callback() + }, + on: () => () => undefined + } + return { + api: createApiProxy(ctx as never, { cwd: '/tmp', defaultModelSelection: () => defaultSelection }), + agent + } +} + +describe('durable per-session model selection', () => { + it('resolves the restart matrix without silently substituting an unavailable provider', async () => { + let persisted: DurableSessionModelSelection[] = [] + const createStore = () => createBoundedSessionModelSelectionStore({ + load: () => persisted, + persist: async (next) => { + persisted = next.map((entry) => ({ ...entry })) + } + }) + const fallback = selection('deepseek-official', 'deepseek-v4-flash') + const requested = selection('openai', 'gpt-5.6-sol') + const chosen = selection('anthropic', 'claude-sonnet-4-5', 'high') + + const firstHost = createStore() + await firstHost.save('selected-without-send', chosen) + + const restartedHost = createStore() + const routeServed = (provider: string) => provider !== 'deepseek-official' && provider !== 'offline-provider' + const resolve = (sessionId: string, request?: Selection) => resolveSessionModelSelection({ + live: undefined, + durable: restartedHost.get(sessionId), + request, + defaultSelection: fallback, + routeServed + }) + + expect(resolve('blank')).toEqual({ current: undefined, routable: false }) + expect(resolve('previously-requested', requested)).toEqual({ current: requested, routable: true }) + expect(resolve('selected-without-send', requested)).toEqual({ current: chosen, routable: true }) + + await restartedHost.save('provider-no-longer-registered', selection('offline-provider', 'gone-model')) + expect(resolve('provider-no-longer-registered', requested)).toEqual({ + current: selection('offline-provider', 'gone-model'), + routable: false + }) + }) + + it('persists an isolated session selection before continuing and bounds the durable table', async () => { + let persisted: DurableSessionModelSelection[] = [] + const store = createBoundedSessionModelSelectionStore({ + load: () => persisted, + persist: async (next) => { + persisted = next.map((entry) => ({ ...entry })) + } + }) + + await store.save('session-a', selection('openai', 'gpt-5.6-sol')) + await store.save('session-b', selection('anthropic', 'claude-sonnet-4-5')) + expect(store.get('session-a')).toEqual(selection('openai', 'gpt-5.6-sol')) + expect(store.get('session-b')).toEqual(selection('anthropic', 'claude-sonnet-4-5')) + + await expect(createBoundedSessionModelSelectionStore({ + load: () => persisted, + persist: async () => { + throw new Error('disk unavailable') + } + }).save('not-acknowledged', selection('openai', 'gpt-5.6-sol'))).rejects.toThrow('disk unavailable') + + await Promise.all(Array.from({ length: 257 }, (_, index) => store.save( + `bounded-${index}`, + selection('openai', `model-${index}`) + ))) + expect(persisted).toHaveLength(256) + expect(store.get('bounded-0')).toBeUndefined() + expect(store.get('bounded-256')).toEqual(selection('openai', 'model-256')) + + expect(() => createBoundedSessionModelSelectionStore({ + limit: 0, + load: () => persisted, + persist: async () => undefined + })).toThrow('positive finite integer') + }) + + it('uses the real session handlers to block an invalid default and preserve a selection across restart', async () => { + const settingsFixture = createSettingsFixture() + const blocked = createApiProxyFixture( + settingsFixture, + selection('deepseek-official', 'deepseek-v4-flash') + ) + const blockedModels = modelResult(await blocked.api.sessions.models(rpc({ sessionId: 'proxy-session' }))) + expect(blockedModels).toEqual(expect.objectContaining({ current: null, routable: false })) + + const firstHost = createApiProxyFixture(settingsFixture, selection('openai', 'openai-model')) + settingsFixture.setRejectWrites(true) + const rejected = await firstHost.api.sessions.selectModel(rpc({ + sessionId: 'proxy-session', + provider: 'anthropic', + model: 'anthropic-model' + })) + expect(rejected.result.ok).toBe(false) + expect(modelResult(await firstHost.api.sessions.models(rpc({ sessionId: 'proxy-session' }, 'after-reject')))) + .toEqual(expect.objectContaining({ current: selection('openai', 'openai-model'), routable: true })) + + settingsFixture.setRejectWrites(false) + const selected = await firstHost.api.sessions.selectModel(rpc({ + sessionId: 'proxy-session', + provider: 'anthropic', + model: 'anthropic-model' + }, 'persist-selection')) + expect(selected.result).toEqual(expect.objectContaining({ ok: true })) + + const restarted = createApiProxyFixture(settingsFixture, selection('openai', 'openai-model')) + expect(settingsFixture.registered).toEqual([ + 'session-model-selection', + 'session-model-selection', + 'session-model-selection' + ]) + expect(modelResult(await restarted.api.sessions.models(rpc({ sessionId: 'proxy-session' }, 'after-restart')))) + .toEqual(expect.objectContaining({ current: selection('anthropic', 'anthropic-model'), routable: true })) + }) + + it('adopts the routable current default when a legacy session only records an unavailable request model', async () => { + const legacy = createApiProxyFixture( + createSettingsFixture(), + selection('anthropic', 'anthropic-model', 'high'), + 'legacy-session', + { + providers: [{ id: 'anthropic', name: 'Anthropic' }], + requestSelection: selection('openai', 'retired-openai-model') + } + ) + + expect(modelResult(await legacy.api.sessions.models(rpc({ sessionId: 'legacy-session' })))) + .toEqual(expect.objectContaining({ + current: selection('anthropic', 'anthropic-model', 'high'), + routable: true + })) + }) +}) diff --git a/test/onboarding-patch.test.ts b/test/onboarding-patch.test.ts index 59a423d94..d46a32847 100644 --- a/test/onboarding-patch.test.ts +++ b/test/onboarding-patch.test.ts @@ -36,7 +36,9 @@ describe('desktop provider onboarding patch', () => { expect(installed).toContain('providerSearch: "搜索提供方"') expect(installed).toContain('.dshProviderCard[aria-pressed=true]{border-color:var(--dsw-alias-border-l1)') expect(installed).toContain('SETTINGS_PROVIDER_PRIORITY') - expect(installed.indexOf('"deepseek-official"')).toBeLessThan(installed.indexOf('"openai"')) + expect(installed).not.toContain('displayName: "DeepSeek"') + expect(installed).toContain('(0, react.useState)("openai")') + expect(installed).toContain('Sherlock will enable that provider') expect(installed).toContain('left.entry.displayName.localeCompare(right.entry.displayName)') }) }) diff --git a/test/patch-integrity.test.ts b/test/patch-integrity.test.ts new file mode 100644 index 000000000..efe8f0044 --- /dev/null +++ b/test/patch-integrity.test.ts @@ -0,0 +1,28 @@ +import { spawnSync } from 'node:child_process' +import { readdir } from 'node:fs/promises' +import path from 'node:path' +import { describe, expect, it } from 'vitest' + +const projectRoot = path.resolve(import.meta.dirname, '..') + +describe('dependency patch integrity', () => { + it('keeps every checked-in dependency patch structurally parseable', async () => { + const patchDirectory = path.join(projectRoot, 'patches') + const patchFiles = (await readdir(patchDirectory)) + .filter((file) => file.endsWith('.patch')) + .sort() + + const malformed = patchFiles.flatMap((file) => { + const result = spawnSync('git', ['apply', '--numstat', path.join(patchDirectory, file)], { + cwd: projectRoot, + encoding: 'utf8' + }) + + return result.status === 0 + ? [] + : [`${file}: ${(result.stderr || result.stdout).trim()}`] + }) + + expect(malformed).toEqual([]) + }) +}) diff --git a/test/pdfjs-assets.test.ts b/test/pdfjs-assets.test.ts new file mode 100644 index 000000000..1694e2d41 --- /dev/null +++ b/test/pdfjs-assets.test.ts @@ -0,0 +1,180 @@ +import { createHash } from 'node:crypto' +import { execFile as execFileCallback } from 'node:child_process' +import { mkdir, mkdtemp, readFile, readdir, rm, stat, writeFile } from 'node:fs/promises' +import { createServer } from 'node:http' +import { tmpdir } from 'node:os' +import path from 'node:path' +import { promisify } from 'node:util' +import { afterEach, describe, expect, it } from 'vitest' + +const execFile = promisify(execFileCallback) +const projectRoot = path.resolve(import.meta.dirname, '..') +const temporaryDirectories: string[] = [] + +async function temporaryDirectory(): Promise { + const directory = await mkdtemp(path.join(tmpdir(), 'sherlock-pdfjs-assets-')) + temporaryDirectories.push(directory) + return directory +} + +async function treeHash(root: string): Promise { + const digest = createHash('sha256') + async function visit(directory: string): Promise { + for (const entry of (await readdir(directory, { withFileTypes: true })) + .sort((left, right) => left.name.localeCompare(right.name))) { + const absolute = path.join(directory, entry.name) + const relative = path.relative(root, absolute) + digest.update(relative) + if (entry.isDirectory()) await visit(absolute) + else digest.update(await readFile(absolute)) + } + } + await visit(root) + return digest.digest('hex') +} + +async function ownedStagingDirectories(destination: string): Promise { + const prefix = `${path.basename(destination)}.staging-` + return (await readdir(path.dirname(destination), { withFileTypes: true })) + .filter((entry) => entry.isDirectory() && entry.name.startsWith(prefix) && + /^\d+$/.test(entry.name.slice(prefix.length))) + .map((entry) => entry.name) + .sort() +} + +afterEach(async () => { + await Promise.all(temporaryDirectories.splice(0).map((directory) => + rm(directory, { recursive: true, force: true }) + )) +}) + +describe('PDF.js packaged assets', () => { + it('stages stable library, worker, CMap, and standard-font paths idempotently', async () => { + const root = await temporaryDirectory() + const source = path.join(root, 'pdfjs-dist') + const destination = path.join(root, 'web', 'sherlock-pdfjs') + await mkdir(path.join(source, 'build'), { recursive: true }) + await mkdir(path.join(source, 'cmaps'), { recursive: true }) + await mkdir(path.join(source, 'standard_fonts'), { recursive: true }) + await writeFile(path.join(source, 'build', 'pdf.min.mjs'), 'export const getDocument = () => {}') + await writeFile(path.join(source, 'build', 'pdf.worker.min.mjs'), 'export const WorkerMessageHandler = {}') + await writeFile(path.join(source, 'cmaps', 'Adobe-GB1.bcmap'), 'cmap') + await writeFile(path.join(source, 'standard_fonts', 'FoxitSans.pfb'), 'font') + await writeFile(path.join(source, 'LICENSE'), 'Apache License 2.0') + const staleOwned = `${destination}.staging-123456` + const similarlyNamed = `${destination}.staging-user-data` + await mkdir(staleOwned, { recursive: true }) + await mkdir(similarlyNamed, { recursive: true }) + + const command = [ + path.join(projectRoot, 'scripts', 'install-pdfjs-assets.mjs'), + '--source', source, + '--destination', destination + ] + await execFile(process.execPath, command, { cwd: projectRoot }) + await expect(stat(staleOwned)).rejects.toMatchObject({ code: 'ENOENT' }) + expect((await stat(similarlyNamed)).isDirectory()).toBe(true) + const firstHash = await treeHash(destination) + await writeFile(path.join(destination, 'stale.js'), 'stale') + await execFile(process.execPath, command, { cwd: projectRoot }) + + expect(await treeHash(destination)).toBe(firstHash) + expect(await readFile(path.join(destination, 'pdf.min.js'), 'utf8')) + .toContain('getDocument') + expect(await readFile(path.join(destination, 'pdf.worker.min.js'), 'utf8')) + .toContain('WorkerMessageHandler') + expect(await readFile(path.join(destination, 'cmaps', 'Adobe-GB1.bcmap'), 'utf8')) + .toBe('cmap') + expect(await readFile(path.join(destination, 'standard_fonts', 'FoxitSans.pfb'), 'utf8')) + .toBe('font') + expect(await readFile(path.join(destination, 'LICENSE'), 'utf8')) + .toBe('Apache License 2.0') + const loader = await readFile(path.join(destination, 'loader.js'), 'utf8') + expect(loader).toContain("from './pdf.min.js'") + expect(loader).toContain("workerSrc = '/sherlock-pdfjs/pdf.worker.min.js'") + }) + + it('removes its current staging directory when asset copying fails', async () => { + const root = await temporaryDirectory() + const source = path.join(root, 'incomplete-pdfjs-dist') + const destination = path.join(root, 'web', 'sherlock-pdfjs') + await mkdir(path.join(source, 'build'), { recursive: true }) + await mkdir(path.join(source, 'cmaps'), { recursive: true }) + await mkdir(path.join(source, 'standard_fonts'), { recursive: true }) + await writeFile(path.join(source, 'build', 'pdf.min.mjs'), 'export const getDocument = () => {}') + await writeFile(path.join(source, 'cmaps', 'Adobe-GB1.bcmap'), 'cmap') + await writeFile(path.join(source, 'standard_fonts', 'FoxitSans.pfb'), 'font') + await writeFile(path.join(source, 'LICENSE'), 'Apache License 2.0') + + await expect(execFile(process.execPath, [ + path.join(projectRoot, 'scripts', 'install-pdfjs-assets.mjs'), + '--source', source, + '--destination', destination + ], { cwd: projectRoot })).rejects.toBeDefined() + + expect(await ownedStagingDirectories(destination)).toEqual([]) + }) + + it('pins and stages the real PDF.js package into the packaged web input', async () => { + const packageJson = JSON.parse(await readFile(path.join(projectRoot, 'package.json'), 'utf8')) as { + dependencies: Record + devDependencies: Record + scripts: Record + build: { files: string[] } + } + expect(packageJson.dependencies['pdfjs-dist']).toBeUndefined() + expect(packageJson.devDependencies['pdfjs-dist']).toBe('4.10.38') + expect(packageJson.scripts.postinstall).toContain('node scripts/install-pdfjs-assets.mjs') + expect(packageJson.scripts.build).toContain('node scripts/install-pdfjs-assets.mjs') + expect(packageJson.build.files).toContain('!node_modules/pdfjs-dist/**') + expect(packageJson.build.files).toContain('!node_modules/@napi-rs/canvas/**') + expect(packageJson.build.files).toContain('!node_modules/@napi-rs/canvas-*/**') + + await execFile(process.execPath, [ + path.join(projectRoot, 'scripts', 'install-pdfjs-assets.mjs') + ], { cwd: projectRoot }) + const destination = path.join( + projectRoot, 'node_modules', '@deepseek-ai', 'dsh-web-frontend', 'dist', 'sherlock-pdfjs' + ) + for (const relative of ['loader.js', 'pdf.min.js', 'pdf.worker.min.js', 'LICENSE']) { + expect((await stat(path.join(destination, relative))).size).toBeGreaterThan(0) + } + expect((await readdir(path.join(destination, 'cmaps'))).length).toBeGreaterThan(100) + expect((await readdir(path.join(destination, 'standard_fonts'))).length).toBeGreaterThan(10) + }) + + it('serves the staged module and worker as JavaScript bytes instead of SPA fallback HTML', async () => { + const { serveStatic } = await import('@deepseek-ai/dsh-host-frontend-static') + const distRoot = path.join( + projectRoot, 'node_modules', '@deepseek-ai', 'dsh-web-frontend', 'dist' + ) + const distIndex = path.join(distRoot, 'index.html') + const server = createServer((request, response) => { + void serveStatic( + new URL(request.url ?? '/', 'http://127.0.0.1').pathname, + response, + distRoot, + distIndex, + () => readFile(distIndex, 'utf8') + ) + }) + await new Promise((resolve) => server.listen(0, '127.0.0.1', resolve)) + try { + const address = server.address() + if (address === null || typeof address === 'string') throw new Error('HTTP test server unavailable') + for (const relative of ['loader.js', 'pdf.min.js', 'pdf.worker.min.js']) { + const response = await fetch( + `http://127.0.0.1:${address.port}/sherlock-pdfjs/${relative}` + ) + const bytes = Buffer.from(await response.arrayBuffer()) + expect(response.status, relative).toBe(200) + expect(response.headers.get('content-type'), relative) + .toBe('text/javascript; charset=utf-8') + expect(bytes, relative).toEqual(await readFile(path.join(distRoot, 'sherlock-pdfjs', relative))) + expect(bytes.subarray(0, 64).toString('utf8'), relative).not.toContain('') + } + } finally { + await new Promise((resolve, reject) => server.close((error) => error ? reject(error) : resolve())) + } + }) +}) diff --git a/test/permission-localization.test.ts b/test/permission-localization.test.ts new file mode 100644 index 000000000..6f562cffa --- /dev/null +++ b/test/permission-localization.test.ts @@ -0,0 +1,184 @@ +import { createRequire } from 'node:module' +import { readFile } from 'node:fs/promises' +import { runInNewContext } from 'node:vm' +import { describe, expect, it } from 'vitest' + +type ClientBundle = Record +type BundleDescriptor = { + factory(require: (id: string) => unknown): ClientBundle +} + +function fakeModule(): unknown { + let fake: unknown + const target = function () {} + fake = new Proxy(target, { + get: () => fake, + apply: () => fake, + construct: () => ({}) + }) + return fake +} + +async function loadConversationBundle(): Promise { + const source = await readFile( + 'node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js', + 'utf8' + ) + const requireModule = createRequire(import.meta.url) + let descriptor: BundleDescriptor | undefined + runInNewContext(source, { + window: { + __ModuleLoader__: { + load(value: BundleDescriptor) { + descriptor = value + } + } + } + }) + if (descriptor === undefined) throw new Error('conversation bundle did not register') + return descriptor.factory((id) => { + if (id === 'react') return requireModule('react') + if (id === 'react/jsx-runtime') return requireModule('react/jsx-runtime') + return fakeModule() + }) +} + +async function loadPermissionPresetBundle( + primitives: Record +): Promise { + const source = await readFile( + 'node_modules/@deepseek-ai/dsh-client-ui-permission-presets/lib/client.js', + 'utf8' + ) + const requireModule = createRequire(import.meta.url) + let descriptor: BundleDescriptor | undefined + runInNewContext(source, { + window: { + __ModuleLoader__: { + load(value: BundleDescriptor) { + descriptor = value + } + } + } + }) + if (descriptor === undefined) throw new Error('permission preset bundle did not register') + return descriptor.factory((id) => { + if (id === 'react') return requireModule('react') + if (id === 'react/jsx-runtime') return requireModule('react/jsx-runtime') + if (id === '@deepseek-ai/dsh-client-ui-primitives') return primitives + return fakeModule() + }) +} + +describe('permission menu localization', () => { + it('uses localized product copy for every built-in permission mode', async () => { + const bundle = await loadConversationBundle() + const permissionOptionLabel = bundle.permissionOptionLabel + expect(permissionOptionLabel).toBeTypeOf('function') + if (typeof permissionOptionLabel !== 'function') return + + const zh: Record = { + 'access.mode.readOnly': '只读', + 'access.mode.workspaceWrite': '工作区写入', + 'access.mode.fullAccess': '完全访问' + } + const en: Record = { + 'access.mode.readOnly': 'Read Only', + 'access.mode.workspaceWrite': 'Workspace Write', + 'access.mode.fullAccess': 'Full access' + } + const options = [ + { value: 'read-only', name: 'read-only' }, + { value: 'workspace-write', name: 'workspace-write' }, + { value: 'danger-full-access', name: 'danger-full-access' } + ] + + expect(options.map((option) => permissionOptionLabel(option, (key: string) => zh[key] ?? key))) + .toEqual(['只读', '工作区写入', '完全访问']) + expect(options.map((option) => permissionOptionLabel(option, (key: string) => en[key] ?? key))) + .toEqual(['Read Only', 'Workspace Write', 'Full access']) + }) + + it('renders the permission menu outside clipped composer containers', async () => { + const source = await readFile( + 'node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js', + 'utf8' + ) + const start = source.indexOf('function PermissionSelect(') + const end = source.indexOf('\n\t\t//#endregion', start) + + expect(start).toBeGreaterThanOrEqual(0) + expect(end).toBeGreaterThan(start) + expect(source.slice(start, end)).toContain('portal: true') + }) + + it('renders built-in Settings permission choices in Chinese while preserving custom names', async () => { + const requireModule = createRequire(import.meta.url) + const { createElement } = requireModule('react') as { + createElement(type: unknown, props?: unknown, ...children: unknown[]): unknown + } + const { renderToStaticMarkup } = requireModule('react-dom/server') as { + renderToStaticMarkup(node: unknown): string + } + const primitives = { + IconChevronDownOutline14: () => null, + RiskConfirmation: () => null, + Menu: ({ anchor, items }: { + anchor: unknown + items: Array<{ id: string; label: string }> + }) => createElement('div', {}, anchor, ...items.map((item) => + createElement('span', { 'data-permission-option': item.id }, item.label) + )) + } + const bundle = await loadPermissionPresetBundle(primitives) + let PermissionRow: unknown + const slots = { + inject(_name: string, register: () => void) { register() }, + register(_options: unknown, component: unknown) { PermissionRow = component } + } + ;(bundle.apply as ((context: Record) => void) | undefined)?.({ + effect() {}, + get() { return fakeModule() }, + locale: { bind: () => () => '', register() {} }, + on() {}, + remote: { $on() {} }, + sessions: {}, + slots + }) + expect(PermissionRow).toBeTypeOf('function') + if (typeof PermissionRow !== 'function') return + + const translations: Record = { + title: '权限', + description: '选择新会话的默认权限模式', + 'mode.readOnly': '只读', + 'mode.workspaceWrite': '工作区写入', + 'mode.fullAccess': '完全访问' + } + const html = renderToStaticMarkup(createElement(PermissionRow, { + load() {}, + select() {}, + t: (key: string) => translations[key] ?? key, + usePermission: () => ({ + status: 'ready', + error: null, + writable: true, + currentValue: 'danger-full-access', + options: [ + { id: 'read-only', label: 'Read Only' }, + { id: 'workspace-write', label: 'Workspace Write' }, + { id: 'danger-full-access', label: 'Full access' }, + { id: 'team-review', label: '团队审核' } + ] + }) + })) + + expect(html).toContain('data-permission-option="read-only">只读') + expect(html).toContain('data-permission-option="workspace-write">工作区写入') + expect(html).toContain('data-permission-option="danger-full-access">完全访问') + expect(html).toContain('data-permission-option="team-review">团队审核') + expect(html).not.toContain('>Read Only') + expect(html).not.toContain('>Workspace Write') + expect(html).not.toContain('>Full access') + }) +}) diff --git a/test/plugin-profile-sync.test.js b/test/plugin-profile-sync.test.js new file mode 100644 index 000000000..ae9af8bea --- /dev/null +++ b/test/plugin-profile-sync.test.js @@ -0,0 +1,164 @@ +import { mkdtemp, mkdir, readFile, readlink, symlink, writeFile } from 'node:fs/promises' +import { tmpdir } from 'node:os' +import path from 'node:path' +import { afterEach, describe, expect, it } from 'vitest' +import { rm } from 'node:fs/promises' + +import { + resolveSyncEndpoints, + rewriteLocalPluginReferences, + syncHarnessPluginProfile +} from '../scripts/sync-plugin-profile.mjs' + +const testDirectories = [] + +afterEach(async () => { + await Promise.all( + testDirectories.splice(0).map((directory) => + rm(directory, { recursive: true, force: true }) + ) + ) +}) + +async function makeUserData(name) { + const root = await mkdtemp(path.join(tmpdir(), `sherlock-plugin-sync-${name}-`)) + testDirectories.push(root) + return root +} + +async function writeJson(filePath, value) { + await mkdir(path.dirname(filePath), { recursive: true }) + await writeFile(filePath, `${JSON.stringify(value, null, 2)}\n`, 'utf8') +} + +describe('rewriteLocalPluginReferences', () => { + it('moves file and link dependencies rooted in the source custom-plugin directory', () => { + const source = '/formal/harness/custom-plugins' + const target = '/dev/harness/custom-plugins' + const manifest = { + dependencies: { + local: `file:${source}/local-plugin`, + linked: `link:${source}/linked-plugin`, + remote: '^1.2.3' + } + } + + expect(rewriteLocalPluginReferences(manifest, source, target)).toEqual({ + dependencies: { + local: `file:${target}/local-plugin`, + linked: `link:${target}/linked-plugin`, + remote: '^1.2.3' + } + }) + expect(manifest.dependencies.local).toBe(`file:${source}/local-plugin`) + }) + + it('treats sherlock-desktop as the single formal profile', () => { + expect(resolveSyncEndpoints('dev-to-formal', '/app-data')).toEqual({ + sourceUserData: path.join('/app-data', 'dsh-desktop-dev'), + targetUserData: path.join('/app-data', 'sherlock-desktop') + }) + }) +}) + +describe('syncHarnessPluginProfile', () => { + it('copies the plugin profile and custom sources without touching other Dev data', async () => { + const sourceUserData = await makeUserData('formal') + const targetUserData = await makeUserData('dev') + const sourceHarness = path.join(sourceUserData, 'harness') + const targetHarness = path.join(targetUserData, 'harness') + const sourceProfile = path.join(sourceHarness, 'profiles', 'web') + const targetProfile = path.join(targetHarness, 'profiles', 'web') + const sourceCustom = path.join(sourceHarness, 'custom-plugins') + const targetCustom = path.join(targetHarness, 'custom-plugins') + + await writeJson(path.join(sourceProfile, 'package.json'), { + name: 'dsh-profile-web', + dependencies: { + 'local-sidebar': `file:${sourceCustom}/local-sidebar`, + dshmarket: '1.17.0' + }, + dsh: { + profile: { + bundles: ['@deepseek-ai/dsh-base', '@deepseek-ai/dsh-web-app', 'dshmarket', 'local-sidebar'] + } + } + }) + await writeFile( + path.join(sourceProfile, 'pnpm-lock.yaml'), + `specifier: file:${sourceCustom}/local-sidebar\nresolution: file:../../custom-plugins/local-sidebar\n`, + 'utf8' + ) + await mkdir(path.join(sourceProfile, 'node_modules', 'dshmarket'), { recursive: true }) + await writeFile(path.join(sourceProfile, 'node_modules', 'dshmarket', 'index.js'), 'formal-market\n') + await mkdir(path.join(sourceCustom, 'local-sidebar', 'lib'), { recursive: true }) + await writeFile(path.join(sourceCustom, 'local-sidebar', 'lib', 'index.js'), 'optimized-sidebar\n') + await symlink( + path.join(sourceCustom, 'local-sidebar'), + path.join(sourceProfile, 'node_modules', 'local-sidebar'), + 'dir' + ) + + await writeJson(path.join(targetProfile, 'package.json'), { + dependencies: {}, + dsh: { profile: { bundles: ['@deepseek-ai/dsh-base', '@deepseek-ai/dsh-web-app'] } } + }) + await mkdir(path.join(targetCustom, 'old-plugin'), { recursive: true }) + await writeFile(path.join(targetCustom, 'old-plugin', 'index.js'), 'old-dev-plugin\n') + await mkdir(targetHarness, { recursive: true }) + await writeFile(path.join(targetHarness, 'settings.yaml'), 'locale:\n preference: zh\n') + + const result = await syncHarnessPluginProfile({ + sourceUserData, + targetUserData, + direction: 'formal-to-dev', + now: new Date('2026-08-21T09:30:00.000Z') + }) + + const targetManifest = JSON.parse( + await readFile(path.join(targetProfile, 'package.json'), 'utf8') + ) + expect(targetManifest.dependencies).toEqual({ + 'local-sidebar': `file:${targetCustom}/local-sidebar`, + dshmarket: '1.17.0' + }) + expect(await readFile(path.join(targetProfile, 'node_modules', 'dshmarket', 'index.js'), 'utf8')) + .toBe('formal-market\n') + expect(await readFile(path.join(targetCustom, 'local-sidebar', 'lib', 'index.js'), 'utf8')) + .toBe('optimized-sidebar\n') + expect(await readlink(path.join(targetProfile, 'node_modules', 'local-sidebar'))) + .toBe(path.join(targetCustom, 'local-sidebar')) + expect(await readFile(path.join(targetHarness, 'settings.yaml'), 'utf8')) + .toBe('locale:\n preference: zh\n') + expect( + await readFile(path.join(result.backupDirectory, 'profiles', 'web', 'package.json'), 'utf8') + ).toContain('"dependencies": {}') + expect( + await readFile(path.join(result.backupDirectory, 'custom-plugins', 'old-plugin', 'index.js'), 'utf8') + ).toBe('old-dev-plugin\n') + expect(result.plugins).toEqual(['local-sidebar', 'dshmarket']) + }) + + it('refuses to overwrite a target when a local source dependency is missing', async () => { + const sourceUserData = await makeUserData('missing-source') + const targetUserData = await makeUserData('safe-target') + const sourceCustom = path.join(sourceUserData, 'harness', 'custom-plugins') + const sourceManifest = path.join(sourceUserData, 'harness', 'profiles', 'web', 'package.json') + const targetManifest = path.join(targetUserData, 'harness', 'profiles', 'web', 'package.json') + + await writeJson(sourceManifest, { + dependencies: { missing: `file:${sourceCustom}/missing` }, + dsh: { profile: { bundles: ['missing'] } } + }) + await writeJson(targetManifest, { marker: 'keep-me' }) + + await expect( + syncHarnessPluginProfile({ + sourceUserData, + targetUserData, + direction: 'formal-to-dev' + }) + ).rejects.toThrow('missing') + expect(JSON.parse(await readFile(targetManifest, 'utf8'))).toEqual({ marker: 'keep-me' }) + }) +}) diff --git a/test/plugin-recovery-view.test.ts b/test/plugin-recovery-view.test.ts index 7ecdb314e..14c5535d4 100644 --- a/test/plugin-recovery-view.test.ts +++ b/test/plugin-recovery-view.test.ts @@ -37,7 +37,7 @@ describe('plugin recovery view model', () => { it.each([ ['cannot resolve profile bundle example', '插件没有完整安装'], - ['package declares no dsh.bundle', '安装的包不是兼容的 DSH 插件'], + ['package declares no dsh.bundle', '安装的包不是兼容的 Sherlock 插件'], ['failed to import loader entry example', '插件代码加载失败'], ['duplicate loader entry id: storage', '插件注册了重复的服务组件'], ['single slot "conversation.hero.workspace.directoryFlow" already has a registration at priority 0', '插件存在界面插槽冲突'] diff --git a/test/preload-main-frame.test.ts b/test/preload-main-frame.test.ts new file mode 100644 index 000000000..b89149d03 --- /dev/null +++ b/test/preload-main-frame.test.ts @@ -0,0 +1,109 @@ +import { Window } from 'happy-dom' +import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' + +const electronFakes = vi.hoisted(() => ({ + exposeInMainWorld: vi.fn(), + invoke: vi.fn(async () => ({ + phase: 'idle', + currentVersion: '0.7.3', + manual: false + })), + on: vi.fn(), + removeListener: vi.fn(), + sendSync: vi.fn() +})) + +vi.mock('electron', () => ({ + contextBridge: { exposeInMainWorld: electronFakes.exposeInMainWorld }, + ipcRenderer: { + invoke: electronFakes.invoke, + on: electronFakes.on, + removeListener: electronFakes.removeListener, + sendSync: electronFakes.sendSync + }, + webUtils: { getPathForFile: () => '/tmp/preview.html' } +})) + +const originalIsMainFrame = Object.getOwnPropertyDescriptor(process, 'isMainFrame') +let browserWindow: Window + +beforeEach(() => { + vi.resetModules() + vi.clearAllMocks() + browserWindow = new Window({ url: 'http://127.0.0.1:4310/' }) + browserWindow.document.body.innerHTML = '
' + vi.stubGlobal('window', browserWindow) + vi.stubGlobal('document', browserWindow.document) + vi.stubGlobal('navigator', browserWindow.navigator) + vi.stubGlobal('MutationObserver', browserWindow.MutationObserver) + vi.stubGlobal('File', browserWindow.File) + Object.defineProperty(process, 'isMainFrame', { + configurable: true, + value: false + }) +}) + +afterEach(() => { + vi.unstubAllGlobals() + if (originalIsMainFrame) { + Object.defineProperty(process, 'isMainFrame', originalIsMainFrame) + } else { + Reflect.deleteProperty(process, 'isMainFrame') + } +}) + +describe('preload frame boundary', () => { + it('does not expose application bridges or mount application UI in a child frame', async () => { + await import('../src/preload/index') + browserWindow.document.dispatchEvent(new browserWindow.Event('DOMContentLoaded')) + await Promise.resolve() + + expect(electronFakes.exposeInMainWorld).not.toHaveBeenCalled() + expect(electronFakes.on).not.toHaveBeenCalled() + expect(electronFakes.invoke).not.toHaveBeenCalled() + expect(electronFakes.sendSync).not.toHaveBeenCalled() + expect(browserWindow.document.querySelector('#sherlock-sidebar-update-button')).toBeNull() + expect(browserWindow.document.querySelector('#sherlock-developer-mode-style')).toBeNull() + }) + + it('exposes the frozen research canvas wheel bridge only in the trusted main frame', async () => { + Object.defineProperty(process, 'isMainFrame', { + configurable: true, + value: true + }) + electronFakes.sendSync.mockReturnValue(true) + await import('../src/preload/index') + + const desktopExposure = electronFakes.exposeInMainWorld.mock.calls.find( + ([name]) => name === 'dshDesktop' + ) + expect(desktopExposure).toBeDefined() + const desktop = desktopExposure?.[1] as { + researchCanvasWheel: { + setRegion(value: unknown): boolean + subscribe(listener: (value: unknown) => void): () => void + } + } + expect(Object.isFrozen(desktop)).toBe(true) + expect(Object.isFrozen(desktop.researchCanvasWheel)).toBe(true) + const update = { + active: true, generation: 1, ownerId: 'canvas-1', + left: 10, top: 20, width: 500, height: 400 + } + expect(desktop.researchCanvasWheel.setRegion(update)).toBe(true) + expect(electronFakes.sendSync).toHaveBeenCalledWith( + 'research:canvas-wheel:set-region', + update + ) + const unsubscribe = desktop.researchCanvasWheel.subscribe(vi.fn()) + expect(electronFakes.on).toHaveBeenCalledWith( + 'research:canvas-wheel:native', + expect.any(Function) + ) + unsubscribe() + expect(electronFakes.removeListener).toHaveBeenCalledWith( + 'research:canvas-wheel:native', + expect.any(Function) + ) + }) +}) diff --git a/test/preset-transfer-patch.test.ts b/test/preset-transfer-patch.test.ts index 6444d7db5..613e4e217 100644 --- a/test/preset-transfer-patch.test.ts +++ b/test/preset-transfer-patch.test.ts @@ -80,61 +80,6 @@ describe('agent preset package transfer', () => { expect(patch).toContain('absolute-paths') }) - it('adds import preview, conflict rename, trust warning, and custom-card export controls', async () => { - const patch = await readFile( - path.join( - projectRoot, - 'patches', - '@deepseek-ai+dsh-client-ui-agent-preset+0.1.0-rc.7.patch' - ), - 'utf8' - ) - - expect(patch).toContain('ImportDialog') - expect(patch).toContain('previewImport(file)') - expect(patch).toContain('confirmImport()') - expect(patch).toContain('exportPreset(id)') - expect(patch).toContain('IconArchiveOutline20') - expect(patch).toContain('IconDownloadOutline16') - expect(patch).toContain('Custom presets can run tools and commands') - expect(patch).toContain('自定义预设可以使用与 Agent 相同权限的工具和命令') - expect(patch).toContain('draft.conflict ? "idTaken"') - expect(patch).toContain('.dshpreset') - expect(patch).toContain('importPreset: "Import"') - expect(patch).toContain('awesomePreset: "Awesome preset"') - expect(patch).toContain('https://www.dshdesktop.com/preset/') - expect(patch).toContain('"_blank", "noopener,noreferrer"') - expect(patch).toContain('AgentPresetSection_module_css_default.sectionActions') - }) - - it('keeps a large mode roster searchable, grouped, compact, and connected to Awesome Presets', async () => { - const patch = await readFile( - path.join( - projectRoot, - 'patches', - '@deepseek-ai+dsh-client-ui-agent-preset+0.1.0-rc.7.patch' - ), - 'utf8' - ) - - expect(patch).toContain('searchPresets: "Search modes…"') - expect(patch).toContain('recentPresets: "Recent"') - expect(patch).toContain('RECENT_PRESETS_KEY') - expect(patch).toContain('option.trust === "system"') - expect(patch).toContain('option.trust === "user"') - expect(patch).toContain('text-overflow:ellipsis') - expect(patch).toContain('IconSearchOutline16') - expect(patch).toContain('IconSparkle16') - expect(patch).toContain('selectedItem') - expect(patch).toContain(':focus-within') - expect(patch).toContain('[role=menu]:has(') - expect(patch).toContain('max-height:min(360px') - expect(patch).toContain('side: "bottom"') - expect(patch).toContain('footer: [{') - expect(patch).toContain('id: AWESOME_PRESETS_ID') - expect(patch).toContain('browseAwesomePresets: "浏览 Awesome Presets…"') - }) - it('keeps the loopback API discoverable by an explicitly requested online Skill', async () => { const webApp = await readFile( path.join(projectRoot, 'node_modules', '@deepseek-ai', 'dsh-web-app', 'lib', 'index.js'), diff --git a/test/release.test.ts b/test/release.test.ts index 9d87ea7ae..afc94fa82 100644 --- a/test/release.test.ts +++ b/test/release.test.ts @@ -5,9 +5,9 @@ import { describe, expect, it } from 'vitest' const projectRoot = path.resolve(import.meta.dirname, '..') const releaseAssets = [ - 'dsh-desktop-mac-arm64.dmg', - 'dsh-desktop-mac-x64.dmg', - 'dsh-desktop-windows-x64-setup.exe' + 'sherlock-mac-arm64.dmg', + 'sherlock-mac-x64.dmg', + 'sherlock-windows-x64-setup.exe' ] describe('GitHub release contract', () => { @@ -55,7 +55,7 @@ describe('GitHub release contract', () => { } } - expect(packageJson.build.artifactName).toBe('dsh-desktop-${os}-${arch}.${ext}') + expect(packageJson.build.artifactName).toBe('sherlock-${os}-${arch}.${ext}') expect(packageJson.build.extraResources).toContainEqual({ from: 'build/app-icon.png', to: 'icon.png' @@ -65,6 +65,10 @@ describe('GitHub release contract', () => { to: 'splash.html' }) expect(packageJson.build.extraResources).toContainEqual({ + from: 'build/sherlock-logo.svg', + to: 'sherlock-logo.svg' + }) + expect(packageJson.build.extraResources).not.toContainEqual({ from: 'build/dsh-loader.gif', to: 'dsh-loader.gif' }) @@ -73,7 +77,7 @@ describe('GitHub release contract', () => { to: 'dsh-desktop.patch.yml' }) expect(packageJson.build.nsis.artifactName).toBe( - 'dsh-desktop-windows-${arch}-setup.${ext}' + 'sherlock-windows-${arch}-setup.${ext}' ) expect(packageJson.build.nsis.include).toBe('build/installer.nsh') expect(packageJson.build.win.target).toEqual([{ target: 'nsis', arch: ['x64'] }]) @@ -103,14 +107,33 @@ describe('GitHub release contract', () => { expect(main).toContain("desktopResourcePath('splash.html')") expect(main).toContain('await showSplash()') - expect(splash).toContain('Starting DSH Desktop') - expect(splash).toContain('src="dsh-loader.gif"') + expect(splash).toContain('Starting…') + expect(splash.match(/src="sherlock-logo\.svg"/g)).toHaveLength(2) + expect(splash).toContain('class="logo-sheen"') + expect(splash).toContain('class="keyhole-pulse"') + expect(splash).toContain('width: min(212px, 42vw)') + expect(splash).toContain('logo-sheen 5.6s') + expect(splash).toContain("document.documentElement.lang = 'zh-CN'") + expect(splash).not.toContain('mask: url(') + expect(splash).toContain('@media (prefers-reduced-motion: reduce)') + expect(splash).not.toContain('dsh-loader.gif') + expect(splash).not.toContain('class="title"') expect(splash).not.toContain('class="track"') expect(patch).toMatch(/id: directory-picker\r?\n disabled: true/) + expect(patch).not.toContain('dsh-update-checker') expect(patch).not.toContain("name: '@deepseek-ai/dsh-host-directory-picker-native'") expect(patch).toContain("name: '@deepseek-ai/dsh-client-ui-directory-picker-native'") }) + it('does not ship the community plugin update checker', async () => { + const policy = JSON.parse( + await readFile(path.join(projectRoot, 'build', 'sherlock-bundled-plugins.json'), 'utf8') + ) as { plugins: string[]; bundles: string[] } + + expect(policy.plugins).not.toContain('dsh-update-checker') + expect(policy.bundles).not.toContain('dsh-update-checker') + }) + it('routes manual restarts through the active plugin recovery flow', async () => { const main = await readFile(path.join(projectRoot, 'src', 'main', 'index.ts'), 'utf8') @@ -137,7 +160,7 @@ describe('GitHub release contract', () => { expect(packageJson.dependencies['electron-updater']).toBeTruthy() expect(packageJson.build.publish).toEqual([ - { provider: 'generic', url: 'https://dshdesktop.com/updates/latest/' } + { provider: 'generic', url: 'https://updates.evanarts.com/latest/' } ]) expect(packageJson.build.win.verifyUpdateCodeSignature).toBe(false) for (const asset of [ @@ -145,9 +168,9 @@ describe('GitHub release contract', () => { 'latest-mac-x64.yml', 'latest-mac.yml', 'latest.yml', - 'dsh-desktop-mac-arm64.zip.blockmap', - 'dsh-desktop-mac-x64.zip.blockmap', - 'dsh-desktop-windows-x64-setup.exe.blockmap' + 'sherlock-mac-arm64.zip.blockmap', + 'sherlock-mac-x64.zip.blockmap', + 'sherlock-windows-x64-setup.exe.blockmap' ]) { expect(workflow).toContain(asset) } @@ -169,6 +192,79 @@ describe('GitHub release contract', () => { } }) + it('builds a legacy updater bridge and an Apple-notarized public installer', async () => { + const buildAndRun = await readFile( + path.join(projectRoot, 'script', 'build_and_run.sh'), + 'utf8' + ) + + const [legacyBridgeBuilder, legacyBridgeSource, notarizedConfig] = await Promise.all([ + readFile(path.join(projectRoot, 'scripts', 'build-legacy-migration-bridge.mjs'), 'utf8'), + readFile(path.join(projectRoot, 'scripts', 'macos', 'legacy-migration-bridge.swift'), 'utf8'), + readFile(path.join(projectRoot, 'electron-builder.notarized.cjs'), 'utf8') + ]) + + expect(buildAndRun).toContain("security find-identity -v -p codesigning") + expect(buildAndRun).toContain('Sherlock Desktop Update Signing') + expect(buildAndRun).toContain('Developer ID Application') + expect(buildAndRun).toContain('8B8FCCFB659D94D5C9A9CE2B735EB0FAE457CC7B') + expect(buildAndRun).toContain('DDFBC7F4DA5EC49721E454BB06329C6D1E8A7B9F') + expect(buildAndRun).toContain('notarytool submit') + expect(buildAndRun).toContain('stapler staple') + expect(buildAndRun).toContain('spctl --assess') + expect(buildAndRun).toContain('dist-notarized/sherlock-mac-arm64.dmg') + expect(buildAndRun).toContain('scripts/refresh-mac-update-metadata.mjs') + expect(buildAndRun).toContain('scripts/build-legacy-migration-bridge.mjs') + expect(buildAndRun.indexOf('package:mac:notarized:arm64')).toBeLessThan( + buildAndRun.indexOf('scripts/build-legacy-migration-bridge.mjs') + ) + expect(legacyBridgeBuilder).toContain("bundleIdentifier: 'io.dsh.desktop'") + expect(legacyBridgeBuilder).toContain("embeddedBundleIdentifier: 'com.evanarts.sherlock'") + expect(legacyBridgeBuilder).toContain('Sherlock Desktop Update Signing') + expect(legacyBridgeBuilder).toContain('buildBlockMap') + expect(legacyBridgeBuilder).toContain('sherlock-mac-arm64-legacy.zip') + expect(legacyBridgeBuilder).toContain('Squirrel.framework') + expect(legacyBridgeBuilder).toContain('Mantle.framework') + expect(legacyBridgeBuilder).toContain('ReactiveObjC.framework') + expect(legacyBridgeSource).toContain('Contents/Resources/Sherlock.app') + expect(legacyBridgeSource).toContain('com.evanarts.sherlock') + expect(legacyBridgeSource).toContain('io.dsh.desktop') + expect(legacyBridgeSource).toContain('moveItem') + expect(legacyBridgeSource).toContain('/usr/bin/open') + expect(legacyBridgeSource).toContain('"-na"') + expect(notarizedConfig).toContain("appId: 'com.evanarts.sherlock'") + expect(notarizedConfig).toContain("dshDesktopChannel: 'notarized'") + expect(notarizedConfig).toContain("from: 'build/sherlock-plugin-profile'") + expect(notarizedConfig).toContain("to: 'sherlock-plugin-profile'") + expect(notarizedConfig).toContain('https://updates.evanarts.com/notarized/latest/') + expect(notarizedConfig).toContain('notarize: true') + expect(notarizedConfig).toMatch(/dmg:\s*\{[\s\S]*sign:\s*true/) + expect(notarizedConfig).toContain("from: 'build/sherlock-plugin-profile'") + expect(notarizedConfig).toContain("to: 'sherlock-plugin-profile'") + + expect(legacyBridgeBuilder).toMatch(/'--identifier',[\s\S]*'io\.dsh\.desktop'/) + expect(legacyBridgeBuilder).toMatch(/'\/usr\/bin\/codesign',[\s\S]*'--verify'/) + }) + + it('prepares the same embedded plugin profile for local formal and release packages', async () => { + const packageJson = JSON.parse( + await readFile(path.join(projectRoot, 'package.json'), 'utf8') + ) as { scripts: Record } + const main = await readFile(path.join(projectRoot, 'src', 'main', 'index.ts'), 'utf8') + + expect(packageJson.scripts['prepare:bundled-plugin-profile']).toContain( + 'prepare-bundled-plugin-profile.mjs' + ) + expect(packageJson.scripts['package:formal:dir']).toContain( + 'npm run prepare:bundled-plugin-profile' + ) + expect(packageJson.scripts['package:mac:notarized:arm64']).toContain( + 'npm run prepare:bundled-plugin-profile' + ) + expect(main).toContain('installBundledPluginProfile({') + expect(main).toContain("join(process.resourcesPath, 'sherlock-plugin-profile')") + }) + it('packages an isolated development channel from the current workspace', async () => { const packageJson = JSON.parse( await readFile(path.join(projectRoot, 'package.json'), 'utf8') @@ -185,14 +281,16 @@ describe('GitHub release contract', () => { expect(packageJson.scripts['package:dev:win']).toContain('electron-builder.dev.cjs') expect(packageJson.scripts['package:dev:win']).toContain('--publish never') expect(developmentConfig).toContain("appId: 'io.dsh.desktop.dev'") - expect(developmentConfig).toContain("productName: 'DSH Desktop Dev'") + expect(developmentConfig).toContain("productName: 'Sherlock Dev'") expect(developmentConfig).toContain("output: 'dist-dev'") expect(developmentConfig).toContain("dshDesktopChannel: 'development'") expect(developmentConfig).toContain( - "artifactName: 'dsh-desktop-dev-windows-${arch}-setup.${ext}'" + "artifactName: 'sherlock-dev-windows-${arch}-setup.${ext}'" ) - expect(main).toContain("app.setPath('userData', join(app.getPath('appData'), 'dsh-desktop-dev'))") - expect(main).toContain("app.setPath('userData', join(app.getPath('appData'), 'dsh-desktop'))") + expect(main).toContain('resolveDesktopIdentity(') + expect(main).toContain("app.commandLine.getSwitchValue('sherlock-user-data-dir')") + expect(main).toContain("app.commandLine.getSwitchValue('sherlock-app-data-dir')") + expect(main).toContain("app.setPath('userData', identity.userData)") expect(main).toContain('if (!developmentBuild)') }) @@ -207,7 +305,7 @@ describe('GitHub release contract', () => { expect(workflow).toContain('runs-on: windows-2022') expect(workflow).toContain('npm run package:dev:win') expect(workflow).toContain('Smoke test packaged Windows Harness') - expect(workflow).toContain("$executable = 'dist-dev\\win-unpacked\\DSH Desktop Dev.exe'") + expect(workflow).toContain("$executable = 'dist-dev\\win-unpacked\\Sherlock Dev.exe'") expect(workflow).toContain('Packaged Windows Harness smoke test passed.') expect(workflow).toContain("Invoke-HarnessRpc 'workspace.create'") expect(workflow).toContain("Invoke-HarnessRpc 'session.create'") @@ -217,7 +315,7 @@ describe('GitHub release contract', () => { expect(workflow).toContain('gh release create $env:PRERELEASE_TAG') expect(workflow).toContain('--prerelease') expect(workflow).toContain('name: windows-x64-dev') - expect(workflow).toContain('dist-dev/dsh-desktop-dev-windows-x64-setup.exe') + expect(workflow).toContain('dist-dev/sherlock-dev-windows-x64-setup.exe') for (const asset of releaseAssets) expect(workflow).toContain(asset) expect( workflow.match( @@ -226,26 +324,35 @@ describe('GitHub release contract', () => { ).toHaveLength(3) }) - it('signs and notarizes both macOS architectures on tag releases', async () => { + it('signs both macOS architectures without Apple services and atomically publishes Cloudflare', async () => { const workflow = await readFile( path.join(projectRoot, '.github', 'workflows', 'release.yml'), 'utf8' ) for (const secret of [ - 'DESKTOP_CSC_LINK', - 'DESKTOP_CSC_KEY_PASSWORD', - 'DESKTOP_APPLE_API_KEY', - 'DESKTOP_APPLE_API_KEY_ID', - 'DESKTOP_APPLE_API_ISSUER', - 'DESKTOP_APPLE_TEAM_ID' + 'SHERLOCK_MACOS_CSC_LINK', + 'SHERLOCK_MACOS_CSC_KEY_PASSWORD', + 'CLOUDFLARE_API_TOKEN', + 'CLOUDFLARE_ACCOUNT_ID' ]) { expect(workflow).toContain(`secrets.${secret}`) } expect(workflow.match(/Prepare macOS signing keychain/g)).toHaveLength(2) - expect(workflow.match(/xcrun stapler validate/g)).toHaveLength(4) - expect(workflow.match(/xcrun notarytool submit/g)).toHaveLength(2) + expect(workflow.match(/CSC_NAME: \$\{\{ steps\.signing_keychain\.outputs\.identity \}\}/g)).toHaveLength(2) + expect(workflow.match(/codesign --verify --deep --strict/g)).toHaveLength(2) + expect(workflow.match(/codesign --keychain .*--timestamp=none --force/g)).toHaveLength(2) + expect(workflow.match(/refresh-mac-update-metadata\.mjs/g)).toHaveLength(2) expect(workflow.match(/CSC_IDENTITY_AUTO_DISCOVERY: 'false'/g)).toHaveLength(2) + expect(workflow).toContain('npm run release:cloudflare') + expect(workflow).toContain('--bucket sherlock-releases') + expect(workflow).toContain('https://updates.evanarts.com/latest/latest-mac.yml') + expect(workflow).toContain('Mirror release assets to ModelScope') + expect(workflow).not.toContain('notarytool') + expect(workflow).not.toContain('stapler') + expect(workflow).not.toContain('spctl --assess') + expect(workflow).not.toContain('DESKTOP_APPLE_') + expect(workflow).not.toContain('Developer ID Application') expect(workflow).not.toContain("CSC_LINK: ''") expect(workflow).toMatch( /macos-apple-silicon:\r?\n name: macOS Apple Silicon\r?\n runs-on: macos-15\r?\n steps:/ diff --git a/test/research-canvas-export.test.ts b/test/research-canvas-export.test.ts new file mode 100644 index 000000000..810366e5b --- /dev/null +++ b/test/research-canvas-export.test.ts @@ -0,0 +1,159 @@ +import path from 'node:path' +import { describe, expect, it, vi } from 'vitest' +import { + registerResearchCanvasExportHandlers, + saveResearchCanvasExport, + type ResearchCanvasExportDependencies +} from '../src/main/state/research-canvas-export' + +function dependencies(options: { + cancelled?: boolean + filePath?: string + source?: { path: string; name: string } | null + writeError?: Error +} = {}) { + const showSaveDialog = vi.fn(async () => options.cancelled + ? { canceled: true } + : { canceled: false, filePath: options.filePath ?? '/tmp/export-result' }) + const writeFile = vi.fn(async () => { + if (options.writeError !== undefined) throw options.writeError + }) + const copyFile = vi.fn(async () => { + if (options.writeError !== undefined) throw options.writeError + }) + const resolveExportSource = vi.fn(async () => options.source ?? null) + const value: ResearchCanvasExportDependencies = { + showSaveDialog, + writeFile, + copyFile, + resolveExportSource + } + return { value, showSaveDialog, writeFile, copyFile, resolveExportSource } +} + +describe('Research canvas export service', () => { + it('validates exact text requests, cleans names, and enforces the selected extension', async () => { + const fixture = dependencies({ filePath: '/tmp/user-choice.bad' }) + await expect(saveResearchCanvasExport({ + kind: 'text', format: 'md', suggestedName: ' %20研究/结论?.md ', + content: '# 结论\n\n内容' + }, fixture.value)).resolves.toEqual({ status: 'saved' }) + + expect(fixture.showSaveDialog).toHaveBeenCalledWith(expect.objectContaining({ + defaultPath: '研究结论.md', + filters: [{ name: 'Markdown', extensions: ['md'] }] + })) + expect(fixture.writeFile).toHaveBeenCalledWith( + path.join('/tmp', 'user-choice.md'), '# 结论\n\n内容', expect.anything() + ) + + const invalid = dependencies() + await expect(saveResearchCanvasExport({ + kind: 'text', format: 'txt', suggestedName: 'x.txt', content: 'x', extra: true + } as never, invalid.value)).resolves.toMatchObject({ status: 'error' }) + expect(invalid.showSaveDialog).not.toHaveBeenCalled() + }) + + it('bounds text and binary payloads and decodes valid PNG/JPG data only after validation', async () => { + const oversized = dependencies() + await expect(saveResearchCanvasExport({ + kind: 'text', format: 'txt', suggestedName: 'large.txt', + content: 'x'.repeat(8 * 1024 * 1024 + 1) + }, oversized.value)).resolves.toMatchObject({ status: 'error' }) + expect(oversized.showSaveDialog).not.toHaveBeenCalled() + + const png = dependencies({ filePath: '/tmp/image.jpeg' }) + await expect(saveResearchCanvasExport({ + kind: 'binary', format: 'png', suggestedName: '导图.png', + base64: Buffer.from([0x89, 0x50, 0x4e, 0x47]).toString('base64') + }, png.value)).resolves.toEqual({ status: 'saved' }) + expect(png.writeFile).toHaveBeenCalledWith( + '/tmp/image.png', Buffer.from([0x89, 0x50, 0x4e, 0x47]), expect.anything() + ) + + const invalidBase64 = dependencies() + await expect(saveResearchCanvasExport({ + kind: 'binary', format: 'jpg', suggestedName: '导图.jpg', base64: '%%%' + }, invalidBase64.value)).resolves.toMatchObject({ status: 'error' }) + expect(invalidBase64.showSaveDialog).not.toHaveBeenCalled() + }) + + it('normalizes safe web locations into a webloc and rejects other protocols', async () => { + const fixture = dependencies({ filePath: '/tmp/research-link' }) + await expect(saveResearchCanvasExport({ + kind: 'webloc', suggestedName: '研究链接', url: 'https://Example.com/report' + }, fixture.value)).resolves.toEqual({ status: 'saved' }) + expect(fixture.writeFile).toHaveBeenCalledWith( + '/tmp/research-link.webloc', + expect.stringContaining('https://example.com/report'), + expect.anything() + ) + + const rejected = dependencies() + await expect(saveResearchCanvasExport({ + kind: 'webloc', suggestedName: '危险链接', url: 'file:///etc/passwd' + }, rejected.value)).resolves.toMatchObject({ status: 'error' }) + expect(rejected.showSaveDialog).not.toHaveBeenCalled() + }) + + it('copies only the original resolved by exact preview authorization', async () => { + const fixture = dependencies({ + filePath: '/tmp/chosen-name', + source: { path: '/private/report.pdf', name: 'report.pdf' } + }) + await expect(saveResearchCanvasExport({ + kind: 'original', sessionId: 'session-1', nodeId: 'node-1', + authorizationId: 'authorization-1', suggestedName: '研究报告' + }, fixture.value)).resolves.toEqual({ status: 'saved' }) + expect(fixture.resolveExportSource).toHaveBeenCalledWith({ + sessionId: 'session-1', nodeId: 'node-1', authorizationId: 'authorization-1' + }) + expect(fixture.copyFile).toHaveBeenCalledWith('/private/report.pdf', '/tmp/chosen-name.pdf') + + const denied = dependencies({ source: null }) + await expect(saveResearchCanvasExport({ + kind: 'original', sessionId: 'session-1', nodeId: 'node-1', + authorizationId: 'wrong', suggestedName: '研究报告.pdf' + }, denied.value)).resolves.toMatchObject({ status: 'error' }) + expect(denied.showSaveDialog).not.toHaveBeenCalled() + }) + + it('returns cancellation and bounded write errors without exposing paths', async () => { + const cancelled = dependencies({ cancelled: true }) + await expect(saveResearchCanvasExport({ + kind: 'text', format: 'svg', suggestedName: '图表.svg', content: '' + }, cancelled.value)).resolves.toEqual({ status: 'cancelled' }) + expect(cancelled.writeFile).not.toHaveBeenCalled() + + const failed = dependencies({ writeError: new Error('/private/secret denied') }) + await expect(saveResearchCanvasExport({ + kind: 'text', format: 'csv', suggestedName: '表格.csv', content: 'a,b\r\n' + }, failed.value)).resolves.toEqual({ status: 'error', message: '保存失败，请重试。' }) + }) + + it('registers a trusted-main-frame-only IPC handler', async () => { + const handlers = new Map unknown>() + const fixture = dependencies({ cancelled: true }) + const mainFrame = { processId: 7, routingId: 11 } + const webContents = { mainFrame } + registerResearchCanvasExportHandlers({ + ipcMain: { + removeHandler: vi.fn(), + handle(channel, handler) { handlers.set(channel, handler) } + }, + getMainWindow: () => ({ + isDestroyed: () => false, + webContents + }), + dependencies: fixture.value + }) + const handler = handlers.get('research:canvas-export:save') + expect(handler).toBeTypeOf('function') + expect(() => handler?.({ sender: webContents, senderFrame: { processId: 7, routingId: 12 } }, { + kind: 'text', format: 'txt', suggestedName: 'x.txt', content: 'x' + })).toThrow() + await expect(handler?.({ sender: webContents, senderFrame: mainFrame }, { + kind: 'text', format: 'txt', suggestedName: 'x.txt', content: 'x' + })).resolves.toEqual({ status: 'cancelled' }) + }) +}) diff --git a/test/research-canvas-storage.test.ts b/test/research-canvas-storage.test.ts new file mode 100644 index 000000000..729e440a7 --- /dev/null +++ b/test/research-canvas-storage.test.ts @@ -0,0 +1,117 @@ +import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs' +import { tmpdir } from 'node:os' +import path from 'node:path' +import { afterEach, describe, expect, it } from 'vitest' +import { + RESEARCH_CANVAS_STORAGE_MAX_VALUE_LENGTH, + ResearchCanvasStorage, + researchCanvasStoragePath +} from '../src/main/state/research-canvas-storage' +import { registerPrivilegedMainWindowHandlers } from '../src/main/ipc-trust' + +const temporaryDirectories: string[] = [] + +function temporaryUserData(): string { + const directory = mkdtempSync(path.join(tmpdir(), 'sherlock-research-canvas-')) + temporaryDirectories.push(directory) + return directory +} + +afterEach(() => { + for (const directory of temporaryDirectories.splice(0)) { + rmSync(directory, { recursive: true, force: true }) + } +}) + +describe('desktop Research canvas storage', () => { + it('survives a new reader such as a Harness restart on a different port', () => { + const userData = temporaryUserData() + const key = 'sherlock.research.canvas.files.v1:session-1' + const value = '[{"id":"file-1"}]' + + expect(new ResearchCanvasStorage(userData).getItem(key)).toBeNull() + expect(new ResearchCanvasStorage(userData).setItem(key, value)).toBe(true) + expect(new ResearchCanvasStorage(userData).getItem(key)).toBe(value) + }) + + it('persists the preview revocation outbox through production IPC and a storage restart', () => { + const userData = temporaryUserData() + const key = 'sherlock.research.canvas.preview-revocations.v1:session-restart' + const value = '["orphan-node"]' + const webContents = { mainFrame: { processId: 7, routingId: 41 } } + const window = { isDestroyed: () => false, webContents } + const event = () => ({ + sender: webContents, + senderFrame: { processId: 7, routingId: 41 }, + returnValue: undefined as unknown + }) + const register = (storage: ResearchCanvasStorage) => { + const handlers = new Map, ...args: unknown[]) => void>() + registerPrivilegedMainWindowHandlers({ + ipcMain: { + removeHandler() {}, + removeAllListeners() {}, + handle() {}, + on(channel, handler) { handlers.set(channel, handler) } + }, + getMainWindow: () => window, + showHarnessLog() {}, + async openDirectory() { return null }, + showItemInFolder() { return { ok: false } }, + async researchFilesAvailable() { return [] }, + researchCanvasStorageGet: (storageKey) => storage.getItem(storageKey), + researchCanvasStorageSet: (storageKey, storageValue) => + storage.setItem(storageKey, storageValue) + }) + return handlers + } + + const firstHandlers = register(new ResearchCanvasStorage(userData)) + const setEvent = event() + firstHandlers.get('research:canvas-storage:set')?.(setEvent, key, value) + expect(setEvent.returnValue).toBe(true) + + const restartedHandlers = register(new ResearchCanvasStorage(userData)) + const getEvent = event() + restartedHandlers.get('research:canvas-storage:get')?.(getEvent, key) + expect(getEvent.returnValue).toBe(value) + }) + + it('keeps only bounded Research-owned keys and values', () => { + const userData = temporaryUserData() + const storage = new ResearchCanvasStorage(userData) + const validKey = 'sherlock.research.canvas.selection.v1:session-2' + + expect(storage.setItem('unrelated:key', '{}')).toBe(false) + expect(storage.setItem(validKey, 'x'.repeat(RESEARCH_CANVAS_STORAGE_MAX_VALUE_LENGTH + 1))) + .toBe(false) + expect(storage.getItem('unrelated:key')).toBeNull() + expect(storage.getItem(validKey)).toBeNull() + }) + + it('accepts the aggregate artifact capacity without allowing unbounded values', () => { + const userData = temporaryUserData() + const storage = new ResearchCanvasStorage(userData) + const key = 'sherlock.research.canvas.artifacts.v1:capacity' + const value = 'x'.repeat(RESEARCH_CANVAS_STORAGE_MAX_VALUE_LENGTH) + + expect(storage.setItem(key, value)).toBe(true) + expect(new ResearchCanvasStorage(userData).getItem(key)).toBe(value) + expect(storage.setItem(key, `${value}x`)).toBe(false) + }) + + it('ignores malformed persisted state without exposing arbitrary values', () => { + const userData = temporaryUserData() + const key = 'sherlock.research.canvas.artifacts.v1:session-3' + const filePath = researchCanvasStoragePath(userData, key) + mkdirSync(path.dirname(filePath), { recursive: true }) + writeFileSync(filePath, JSON.stringify({ key: 'unrelated:key', value: 'private' })) + + const storage = new ResearchCanvasStorage(userData) + expect(storage.getItem('unrelated:key')).toBeNull() + expect(storage.getItem(key)).toBeNull() + expect(JSON.parse(readFileSync(filePath, 'utf8'))).toEqual({ + key: 'unrelated:key', value: 'private' + }) + }) +}) diff --git a/test/research-canvas-wheel-preload.test.ts b/test/research-canvas-wheel-preload.test.ts new file mode 100644 index 000000000..78ac82e98 --- /dev/null +++ b/test/research-canvas-wheel-preload.test.ts @@ -0,0 +1,39 @@ +import { describe, expect, it, vi } from 'vitest' +import { createResearchCanvasWheelBridge } from '../src/preload/research-canvas-wheel' +import { + RESEARCH_CANVAS_WHEEL_EVENT_CHANNEL, + RESEARCH_CANVAS_WHEEL_REGION_CHANNEL +} from '../src/shared/research-canvas-wheel' + +describe('research canvas preload wheel bridge', () => { + it('exposes a frozen synchronous region publisher and disposable native-wheel subscription', () => { + const listeners = new Map void>() + const ipc = { + sendSync: vi.fn(() => true), + on: vi.fn((channel: string, listener: (event: unknown, value: unknown) => void) => { + listeners.set(channel, listener) + }), + removeListener: vi.fn((channel: string, listener: (event: unknown, value: unknown) => void) => { + if (listeners.get(channel) === listener) listeners.delete(channel) + }) + } + const bridge = createResearchCanvasWheelBridge(ipc) + expect(Object.isFrozen(bridge)).toBe(true) + const region = { active: true as const, generation: 4, ownerId: 'canvas-1', left: 10, top: 20, width: 500, height: 400 } + expect(bridge.setRegion(region)).toBe(true) + expect(ipc.sendSync).toHaveBeenCalledWith(RESEARCH_CANVAS_WHEEL_REGION_CHANNEL, region) + + const values: unknown[] = [] + const unsubscribe = bridge.subscribe((value) => values.push(value)) + const value = { + generation: 4, ownerId: 'canvas-1', clientX: 30, clientY: 40, + deltaX: 0, deltaY: -100, deltaMode: 0 as const + } + listeners.get(RESEARCH_CANVAS_WHEEL_EVENT_CHANNEL)?.({}, value) + expect(values).toEqual([value]) + unsubscribe() + unsubscribe() + expect(ipc.removeListener).toHaveBeenCalledTimes(1) + expect(listeners.has(RESEARCH_CANVAS_WHEEL_EVENT_CHANNEL)).toBe(false) + }) +}) diff --git a/test/research-canvas-wheel.test.ts b/test/research-canvas-wheel.test.ts new file mode 100644 index 000000000..ecac70264 --- /dev/null +++ b/test/research-canvas-wheel.test.ts @@ -0,0 +1,208 @@ +import { EventEmitter } from 'node:events' +import { describe, expect, it, vi } from 'vitest' +import type { BrowserWindow } from 'electron' +import { + installResearchCanvasWheelRouter, + registerResearchCanvasWheelIpc, + type ResearchCanvasWheelRouter +} from '../src/main/state/research-canvas-wheel' +import { + RESEARCH_CANVAS_WHEEL_EVENT_CHANNEL, + RESEARCH_CANVAS_WHEEL_REGION_CHANNEL +} from '../src/shared/research-canvas-wheel' + +function fixture() { + const contents = new EventEmitter() as EventEmitter & { + mainFrame: { processId: number; routingId: number } + send: ReturnType + } + contents.mainFrame = { processId: 7, routingId: 41 } + contents.send = vi.fn() + let destroyed = false + const window = new EventEmitter() as EventEmitter & { + isDestroyed(): boolean + readonly webContents: typeof contents + } + window.isDestroyed = () => destroyed + Object.defineProperty(window, 'webContents', { + get: () => { + if (destroyed) throw new Error('Object has been destroyed') + return contents + } + }) + const router = installResearchCanvasWheelRouter(window as unknown as BrowserWindow) + const destroyWindow = (): void => { + destroyed = true + window.emit('closed') + } + return { contents, destroyWindow, window, router } +} + +function wheelEvent() { + return { preventDefault: vi.fn() } +} + +describe('research canvas native wheel router', () => { + it('does not access the destroyed BrowserWindow while handling its closed event', () => { + const { destroyWindow, router } = fixture() + expect(router.setRegion({ + active: true, generation: 1, + ownerId: 'canvas-1', + left: 0, top: 0, width: 500, height: 400 + })).toBe(true) + + expect(destroyWindow).not.toThrow() + expect(router.setRegion({ + active: true, generation: 2, + ownerId: 'canvas-1', + left: 0, top: 0, width: 500, height: 400 + })).toBe(false) + }) + + it('routes only bounded Command-wheel inside the current active content-DIP region', () => { + const { contents, router } = fixture() + expect(router.setRegion({ + active: true, generation: 1, + ownerId: 'canvas-1', + left: 100, top: 50, width: 500, height: 400 + })).toBe(true) + + for (const mouse of [ + { type: 'mouseWheel', modifiers: [], x: 120, y: 80, deltaX: 0, deltaY: -100 }, + { type: 'mouseWheel', modifiers: ['control'], x: 120, y: 80, deltaX: 0, deltaY: -100 }, + { type: 'mouseMove', modifiers: ['meta'], x: 120, y: 80, deltaX: 0, deltaY: -100 }, + { type: 'mouseWheel', modifiers: ['meta'], x: 99, y: 80, deltaX: 0, deltaY: -100 }, + { type: 'mouseWheel', modifiers: ['meta'], x: 600, y: 80, deltaX: 0, deltaY: -100 }, + { type: 'mouseWheel', modifiers: ['meta'], x: 120, y: 450, deltaX: 0, deltaY: -100 }, + { type: 'mouseWheel', modifiers: ['meta'], x: 120, y: 80, deltaX: 0, deltaY: Number.NaN }, + { type: 'mouseWheel', modifiers: ['meta'], x: 120, y: 80, deltaX: 0, deltaY: 4_097 }, + { type: 'mouseWheel', modifiers: ['meta'], x: 120, y: 80, deltaX: 0, deltaY: 0 } + ]) { + const event = wheelEvent() + contents.emit('before-mouse-event', event, mouse) + expect(event.preventDefault).not.toHaveBeenCalled() + } + expect(contents.send).not.toHaveBeenCalled() + + for (const modifier of ['meta', 'command', 'cmd']) { + const event = wheelEvent() + contents.emit('before-mouse-event', event, { + type: 'mouseWheel', modifiers: [modifier], + x: 350, y: 250, deltaX: 3.5, deltaY: -120 + }) + expect(event.preventDefault).toHaveBeenCalledOnce() + } + expect(contents.send).toHaveBeenCalledTimes(3) + expect(contents.send).toHaveBeenLastCalledWith(RESEARCH_CANVAS_WHEEL_EVENT_CHANNEL, { + generation: 1, + ownerId: 'canvas-1', + clientX: 350, + clientY: 250, + deltaX: 3.5, + deltaY: -120, + deltaMode: 0 + }) + }) + + it('rejects malformed and stale regions, clears only for main-frame lifecycle changes, and fails open on send error', () => { + const { contents, window, router } = fixture() + expect(router.setRegion({ active: true, generation: 1, ownerId: 'canvas-1', left: 0, top: 0, width: 500, height: 400 })).toBe(true) + expect(router.setRegion({ active: true, generation: 1, ownerId: 'canvas-1', left: 0, top: 0, width: 1, height: 1 })).toBe(false) + expect(router.setRegion({ active: true, generation: 2, ownerId: 'canvas-1', left: 0, top: 0, width: Infinity, height: 1 })).toBe(false) + + const emitCommandWheel = () => { + const event = wheelEvent() + contents.emit('before-mouse-event', event, { + type: 'mouseWheel', modifiers: ['meta'], x: 100, y: 100, deltaX: 0, deltaY: -100 + }) + return event + } + contents.emit('did-start-navigation', { isMainFrame: false, isSameDocument: false }, 'sherlock-preview://child/', false, false) + expect(emitCommandWheel().preventDefault).toHaveBeenCalledOnce() + + contents.emit('did-start-navigation', { isMainFrame: true, isSameDocument: true }, 'http://127.0.0.1:4310/#next', true, true) + expect(emitCommandWheel().preventDefault).toHaveBeenCalledOnce() + contents.emit('did-start-navigation', { isMainFrame: true, isSameDocument: false }, 'http://127.0.0.1:4310/', false, true) + expect(emitCommandWheel().preventDefault).not.toHaveBeenCalled() + expect(router.setRegion({ active: true, generation: 1, ownerId: 'canvas-2', left: 0, top: 0, width: 500, height: 400 })).toBe(true) + contents.send.mockImplementationOnce(() => { throw new Error('renderer unavailable') }) + expect(emitCommandWheel().preventDefault).not.toHaveBeenCalled() + expect(emitCommandWheel().preventDefault).not.toHaveBeenCalled() + + expect(router.setRegion({ active: true, generation: 1, ownerId: 'canvas-2', left: 0, top: 0, width: 500, height: 400 })).toBe(false) + expect(router.setRegion({ active: true, generation: 2, ownerId: 'canvas-2', left: 0, top: 0, width: 500, height: 400 })).toBe(true) + expect(router.setRegion({ active: false, generation: 3, ownerId: 'canvas-2' })).toBe(true) + expect(emitCommandWheel().preventDefault).not.toHaveBeenCalled() + window.emit('closed') + expect(router.setRegion({ active: true, generation: 4, ownerId: 'canvas-2', left: 0, top: 0, width: 500, height: 400 })).toBe(false) + expect(emitCommandWheel().preventDefault).not.toHaveBeenCalled() + expect(contents.listenerCount('before-mouse-event')).toBe(0) + expect(window.listenerCount('closed')).toBe(0) + }) + + it('keeps generation monotonic across owners and bounds recently retired owner state', () => { + const { router } = fixture() + expect(router.setRegion({ + active: true, generation: 5, ownerId: 'canvas-0', + left: 0, top: 0, width: 500, height: 400 + })).toBe(true) + expect(router.setRegion({ + active: true, generation: 4, ownerId: 'new-but-stale', + left: 0, top: 0, width: 500, height: 400 + })).toBe(false) + + for (let index = 1; index <= 80; index += 1) { + expect(router.setRegion({ + active: true, generation: 5 + index, ownerId: `canvas-${index}`, + left: index, top: index, width: 500, height: 400 + })).toBe(true) + } + const internal = router as unknown as { retiredOwnerIds: Set } + expect(internal.retiredOwnerIds.size).toBeLessThanOrEqual(64) + expect(internal.retiredOwnerIds.has('canvas-79')).toBe(true) + expect(router.setRegion({ + active: true, generation: 86, ownerId: 'canvas-79', + left: 0, top: 0, width: 500, height: 400 + })).toBe(false) + }) + + it('accepts synchronous region updates only from the current trusted main frame', () => { + const { contents, window, router } = fixture() + const listeners = new Map void>() + const ipcMain = { + removeAllListeners: vi.fn((channel: string) => listeners.delete(channel)), + on: vi.fn((channel: string, listener: (event: any, value: unknown) => void) => { + listeners.set(channel, listener) + }) + } + registerResearchCanvasWheelIpc({ + ipcMain: ipcMain as unknown as Electron.IpcMain, + getMainWindow: () => window as unknown as BrowserWindow, + getRouter: () => router + }) + expect(ipcMain.removeAllListeners).toHaveBeenCalledWith(RESEARCH_CANVAS_WHEEL_REGION_CHANNEL) + const listener = listeners.get(RESEARCH_CANVAS_WHEEL_REGION_CHANNEL) + expect(listener).toBeTypeOf('function') + + const child = { + sender: contents, + senderFrame: { processId: 7, routingId: 42 }, + returnValue: undefined + } + listener?.(child, { active: true, generation: 1, ownerId: 'canvas-1', left: 0, top: 0, width: 500, height: 400 }) + expect(child.returnValue).toBe(false) + + const trusted = { + sender: contents, + senderFrame: { processId: 7, routingId: 41 }, + returnValue: undefined + } + listener?.(trusted, { active: true, generation: 1, ownerId: 'canvas-1', left: 0, top: 0, width: 500, height: 400 }) + expect(trusted.returnValue).toBe(true) + const event = wheelEvent() + contents.emit('before-mouse-event', event, { + type: 'mouseWheel', modifiers: ['meta'], x: 10, y: 10, deltaX: 0, deltaY: -10 + }) + expect(event.preventDefault).toHaveBeenCalledOnce() + }) +}) diff --git a/test/research-file-drop.test.ts b/test/research-file-drop.test.ts new file mode 100644 index 000000000..480475b21 --- /dev/null +++ b/test/research-file-drop.test.ts @@ -0,0 +1,2661 @@ +import { readFile } from 'node:fs/promises' +import { createRequire } from 'node:module' +import { runInNewContext } from 'node:vm' +import { describe, expect, it, vi } from 'vitest' +import { + createResearchPreviewBridge, + researchFinderAdmissionRequest, + safePathForFile +} from '../src/preload/research-file-path' + +type ClientBundle = Record +type BundleDescriptor = { + factory(require: (id: string) => unknown): ClientBundle +} + +const requireModule = createRequire(import.meta.url) + +function fakeModule(): unknown { + let fake: unknown + const target = function () {} + fake = new Proxy(target, { + get: () => fake, + apply: () => fake, + construct: () => ({}) + }) + return fake +} + +async function loadClientBundle( + packageName: string, + modules: Record = {}, + dshDesktop?: { + researchFilesAvailable?(paths: string[]): Promise + researchCanvasStorage?: { + getItem(key: string): string | null + setItem(key: string, value: string): boolean + } + } +): Promise { + const source = await readFile( + `node_modules/@deepseek-ai/${packageName}/lib/client.js`, + 'utf8' + ) + const react = requireModule('react') + const jsxRuntime = requireModule('react/jsx-runtime') + let descriptor: BundleDescriptor | undefined + + runInNewContext(source, { + AbortController: globalThis.AbortController, + window: { + dshDesktop, + __ModuleLoader__: { + load(value: BundleDescriptor) { + descriptor = value + } + } + }, + btoa: globalThis.btoa, + document: undefined, + URL: globalThis.URL + }) + if (descriptor === undefined) throw new Error(`${packageName} did not register`) + + return descriptor.factory((id) => { + if (modules[id] !== undefined) return modules[id] + if (id === 'react') return react + if (id === 'react/jsx-runtime') return jsxRuntime + return fakeModule() + }) +} + +const loadConversationClient = () => + loadClientBundle('dsh-client-ui-conversation') + +function memoryStorage(values: Record) { + const data = new Map(Object.entries(values)) + return { + getItem: (key: string) => data.get(key) ?? null, + setItem: (key: string, value: string) => { data.set(key, value) } + } +} + +function deferred() { + let resolve!: (value: T) => void + let reject!: (reason?: unknown) => void + const promise = new Promise((resolvePromise, rejectPromise) => { + resolve = resolvePromise + reject = rejectPromise + }) + return { promise, reject, resolve } +} + +async function serializedResearchReferences( + client: ClientBundle, + files: Array<{ id: string; name: string; path?: string }>, + text = '' +) { + const signal = new AbortController().signal + const markers = await Promise.all(files.map((file) => { + const reference = client.researchFileReference(file) + return client.researchFileReferenceCodec.serialize(reference.ref, signal) + })) + return `${markers.join('')}${text}` +} + +function createSnapshotStore(initial: T) { + let value = initial + const listeners = new Set<() => void>() + return { + getSnapshot: () => value, + set(next: T) { + value = next + listeners.forEach((listener) => listener()) + }, + subscribe(listener: () => void) { + listeners.add(listener) + return () => listeners.delete(listener) + } + } +} + +describe('Research canvas file drops', () => { + it('preserves bounded assistant-result Markdown while excerpts keep normalized semantics', async () => { + const client = await loadConversationClient() + expect(client.ResearchWorkspaceRegistry).toBeTypeOf('function') + if (typeof client.ResearchWorkspaceRegistry !== 'function') return + const storage = memoryStorage({}) + const markdown = '\n# Finding\n\n- first\n- second\n\n```ts\nconst value = 1\n```\n' + const workspace = new client.ResearchWorkspaceRegistry(storage).for('markdown-session') + + workspace.addAssistantResult({ messageId: 'message-1', text: markdown, at: { x: 10, y: 20 } }) + workspace.addExcerpt('message-2', ' margin\n\n expanded ', { x: 30, y: 40 }) + + expect(workspace.getSnapshot().artifacts).toMatchObject([ + { + kind: 'assistant-result', messageId: 'message-1', excerpt: markdown, + width: 520, sizeMode: 'auto' + }, + { + kind: 'assistant-excerpt', messageId: 'message-2', excerpt: 'margin expanded' + } + ]) + expect(new client.ResearchWorkspaceRegistry(storage) + .for('markdown-session').getSnapshot().artifacts[0]?.excerpt).toBe(markdown) + + const bounded = 'x'.repeat(16_384) + workspace.addAssistantResult({ messageId: 'message-max', text: bounded, at: { x: 0, y: 0 } }) + workspace.addAssistantResult({ messageId: 'message-too-long', text: `${bounded}x`, at: { x: 0, y: 0 } }) + workspace.addAssistantResult({ messageId: 'message-whitespace', text: ' \n\t ', at: { x: 0, y: 0 } }) + expect(workspace.getSnapshot().artifacts.some( + (node: { messageId: string }) => node.messageId === 'message-max' + )).toBe(true) + expect(workspace.getSnapshot().artifacts.some( + (node: { messageId: string }) => node.messageId === 'message-too-long' + )).toBe(false) + expect(workspace.getSnapshot().artifacts.some( + (node: { messageId: string }) => node.messageId === 'message-whitespace' + )).toBe(false) + }) + + it('publishes and persists canonical auto geometry through the workspace action', async () => { + const client = await loadConversationClient() + const storage = memoryStorage({ + 'sherlock.research.canvas.files.v1:geometry-session': JSON.stringify([{ + id: 'image-1', name: 'chart.png', source: 'computer', + authorizationId: 'authorization-1', contentType: 'image/png', + x: 100, y: 100, width: 320, height: 272, sizeMode: 'auto', aspectRatio: 4 / 3 + }]) + }) + const workspace = new client.ResearchWorkspaceRegistry(storage).for('geometry-session') + expect(workspace.updateNodeGeometry).toBeTypeOf('function') + + workspace.updateNodeGeometry('image-1', { + width: 320, height: 212, sizeMode: 'auto', aspectRatio: 16 / 9 + }) + + expect(workspace.getSnapshot().files[0]).toMatchObject({ + width: 320, height: 212, sizeMode: 'auto', aspectRatio: 16 / 9 + }) + expect(new client.ResearchWorkspaceRegistry(storage) + .for('geometry-session').getSnapshot().files[0]).toMatchObject({ + width: 320, height: 212, sizeMode: 'auto', aspectRatio: 16 / 9 + }) + }) + + it('strictly validates optional sidebar preview identity without trusting its absolute path', async () => { + const client = await loadConversationClient() + expect(client.parseSherlockFileDrag).toBeTypeOf('function') + if (typeof client.parseSherlockFileDrag !== 'function') return + const payload = { + path: '/workspace/charts/revenue.png', name: 'revenue.png', + sessionId: 'session-1', relativePath: 'charts/revenue.png' + } + + expect(client.parseSherlockFileDrag(JSON.stringify(payload))).toEqual({ + ...payload, source: 'sherlock' + }) + expect(client.parseSherlockFileDrag(JSON.stringify({ + ...payload, relativePath: '../secret.png' + }))).toBeNull() + expect(client.parseSherlockFileDrag(JSON.stringify({ + ...payload, relativePath: '/absolute.png' + }))).toBeNull() + expect(client.parseSherlockFileDrag(JSON.stringify({ + ...payload, sessionId: 'x'.repeat(513) + }))).toBeNull() + expect(client.parseSherlockFileDrag(JSON.stringify({ + path: payload.path, name: payload.name + }))).toEqual({ path: payload.path, name: payload.name, source: 'sherlock' }) + }) + + it('computes rich-node viewport proximity at 0.5x, 1x, and 2x without changing node geometry', async () => { + const client = await loadConversationClient() + expect(client.researchNodeNearViewport).toBeTypeOf('function') + if (typeof client.researchNodeNearViewport !== 'function') return + const node = { + id: 'image-1', name: 'chart.png', contentType: 'image/png', + authorizationId: 'authorization-1', source: 'computer', + x: 1_100, y: 300, width: 320, height: 272, aspectRatio: 4 / 3 + } + const canvas = { width: 800, height: 600 } + + expect(client.researchNodeNearViewport(node, { scale: 0.5, x: 0, y: 0 }, canvas, 80)).toBe(true) + expect(client.researchNodeNearViewport(node, { scale: 1, x: 0, y: 0 }, canvas, 80)).toBe(false) + expect(client.researchNodeNearViewport(node, { scale: 2, x: -1_800, y: 0 }, canvas, 80)).toBe(true) + expect(node).toMatchObject({ x: 1_100, y: 300, width: 320, height: 272 }) + }) + + it('keeps pointer-anchored Research zoom available down to 10 percent', async () => { + const client = await loadConversationClient() + expect(client.nextResearchCanvasViewport).toBeTypeOf('function') + if (typeof client.nextResearchCanvasViewport !== 'function') return + + const zoomed = client.nextResearchCanvasViewport( + { scale: 1, x: 40, y: -20 }, + { metaKey: true, deltaY: 10_000, pointerX: 300, pointerY: 200 } + ) + + expect(zoomed.scale).toBe(0.1) + expect((300 - zoomed.x) / zoomed.scale).toBeCloseTo(260, 8) + expect((200 - zoomed.y) / zoomed.scale).toBeCloseTo(220, 8) + }) + + it('reports an empty Research viewport only when every component is outside it', async () => { + const client = await loadConversationClient() + expect(client.researchCanvasHasVisibleNodes).toBeTypeOf('function') + if (typeof client.researchCanvasHasVisibleNodes !== 'function') return + const nodes = [ + { id: 'near', name: 'near.pdf', source: 'computer', x: 100, y: 100 }, + { id: 'far', name: 'far.pdf', source: 'computer', x: 2_000, y: 2_000 } + ] + const canvasSize = { width: 800, height: 600 } + + expect(client.researchCanvasHasVisibleNodes( + nodes, { scale: 1, x: 0, y: 0 }, canvasSize + )).toBe(true) + expect(client.researchCanvasHasVisibleNodes( + nodes, { scale: 1, x: -4_000, y: -4_000 }, canvasSize + )).toBe(false) + expect(client.researchCanvasHasVisibleNodes( + [], { scale: 1, x: -4_000, y: -4_000 }, canvasSize + )).toBe(false) + }) + + it('returns to the nearest Research component with a moderate zoom instead of fitting all', async () => { + const client = await loadConversationClient() + expect(client.researchCanvasReturnViewport).toBeTypeOf('function') + if (typeof client.researchCanvasReturnViewport !== 'function') return + const nodes = [ + { + id: 'nearest', name: 'nearest.pptx', source: 'computer', x: 3_000, y: 2_000, + width: 480, height: 360, sizeMode: 'manual' + }, + { + id: 'distant', name: 'distant.pptx', source: 'computer', x: -5_000, y: -5_000, + width: 480, height: 360, sizeMode: 'manual' + } + ] + const canvasSize = { width: 800, height: 600 } + + expect(client.researchCanvasReturnViewport( + nodes, { scale: 1, x: -2_500, y: -1_700 }, canvasSize + )).toEqual({ scale: 0.8, x: -2_000, y: -1_300 }) + expect(client.researchCanvasReturnViewport( + nodes, { scale: 0.5, x: -2_500, y: -1_700 }, canvasSize + )).toEqual({ scale: 0.5, x: -1_100, y: -700 }) + }) + + it('normalizes natural image ratio against the existing 32px titled-frame geometry', async () => { + const client = await loadConversationClient() + expect(client.researchImageGeometryForNaturalSize).toBeTypeOf('function') + if (typeof client.researchImageGeometryForNaturalSize !== 'function') return + + expect(client.researchImageGeometryForNaturalSize({ + id: 'image-1', name: 'chart.png', contentType: 'image/png', + authorizationId: 'authorization-1', source: 'computer', x: 0, y: 0, + width: 320, height: 272, sizeMode: 'auto' + }, 1600, 900)).toMatchObject({ + width: 320, height: 212, sizeMode: 'auto', aspectRatio: 16 / 9 + }) + expect(client.researchImageGeometryForNaturalSize({}, 0, 900)).toBeNull() + }) + it('serializes only the exact bounded Research-owned prompt prefix at offset zero', async () => { + const client = await loadConversationClient() + expect(client.serializeResearchPrompt).toBeTypeOf('function') + expect(client.parseResearchPrompt).toBeTypeOf('function') + if (typeof client.serializeResearchPrompt !== 'function' || + typeof client.parseResearchPrompt !== 'function') return + + const files = [{ id: 'f1', name: 'report.pdf', path: '/w/report.pdf' }] + const prefix = '␞SHERLOCK_RESEARCH_FILES_V1 {"files":[{"id":"f1","name":"report.pdf","path":"/w/report.pdf"}]}␟' + const prompt = client.serializeResearchPrompt(files, 'compare these') + + expect(prompt).toBe(`${prefix}compare these`) + expect(client.parseResearchPrompt(prompt)).toEqual({ + text: 'compare these', + files + }) + expect(client.parseResearchPrompt(`before ${prefix}compare these`)).toEqual({ + text: `before ${prefix}compare these`, + files: [] + }) + expect(client.parseResearchPrompt( + 'SHERLOCK_RESEARCH_FILES_V1 {"files":[{"path":"/w/report.pdf"}]}\nordinary prose' + )).toEqual({ + text: 'SHERLOCK_RESEARCH_FILES_V1 {"files":[{"path":"/w/report.pdf"}]}\nordinary prose', + files: [] + }) + + const invalidPrefixes = [ + `␞SHERLOCK_RESEARCH_FILES_V1 {"files":[]}␟text`, + `␞SHERLOCK_RESEARCH_FILES_V1 {"files":[{"id":"","name":"report.pdf","path":"/w/report.pdf"}]}␟text`, + `␞SHERLOCK_RESEARCH_FILES_V1 {"files":[{"id":"f1","name":"report.pdf","path":"${'x'.repeat(513)}"}]}␟text`, + `␞SHERLOCK_RESEARCH_FILES_V1 ${JSON.stringify({ + files: Array.from({ length: 65 }, (_, index) => ({ + id: `f${index}`, name: `${index}.pdf`, path: `/w/${index}.pdf` + })) + })}␟text`, + '␞SHERLOCK_RESEARCH_FILES_V1 {bad-json}␟text' + ] + for (const value of invalidPrefixes) { + expect(client.parseResearchPrompt(value)).toEqual({ text: value, files: [] }) + } + }) + + it('round-trips the Research prompt sentinel inside file descriptor values', async () => { + const client = await loadConversationClient() + expect(client.serializeResearchPrompt).toBeTypeOf('function') + expect(client.parseResearchPrompt).toBeTypeOf('function') + if (typeof client.serializeResearchPrompt !== 'function' || + typeof client.parseResearchPrompt !== 'function') return + + const files = [{ + id: 'f-sentinel', + name: 'private␟report.pdf', + path: '/w/private␟report.pdf' + }] + const prompt = client.serializeResearchPrompt(files, 'inspect this') as string + + expect(prompt).toContain('\\u241f') + expect(client.parseResearchPrompt(prompt)).toEqual({ + text: 'inspect this', + files + }) + }) + + it('round-trips inline Research file positions without exposing internal markers', async () => { + const client = await loadConversationClient() + expect(client.serializeResearchPrompt).toBeTypeOf('function') + expect(client.parseResearchPrompt).toBeTypeOf('function') + if (typeof client.serializeResearchPrompt !== 'function' || + typeof client.parseResearchPrompt !== 'function') return + + const files = [ + { id: 'f1', name: 'logo.svg', path: '/w/logo.svg' }, + { id: 'f2', name: 'brief.pdf', path: '/w/brief.pdf' } + ] + const occurrences = [ + { fileId: 'f1', offset: 2 }, + { fileId: 'f2', offset: 5 } + ] + const prompt = client.serializeResearchPrompt(files, '请参考和设计', occurrences) as string + + expect(client.parseResearchPrompt(prompt)).toEqual({ + text: '请参考和设计', + files, + occurrences + }) + expect(prompt).not.toContain('SHERLOCK_RESEARCH_FILE_REFERENCE_V1') + }) + + it('inserts selected Research files into the native text flow and keeps deletion user-owned', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation', { + '@deepseek-ai/dsh-client-runtime/client': { createSnapshotStore } + }) + expect(client.SessionInputShell).toBeTypeOf('function') + expect(client.syncResearchFileReferences).toBeTypeOf('function') + if (typeof client.SessionInputShell !== 'function' || + typeof client.syncResearchFileReferences !== 'function') return + + const shell = new client.SessionInputShell({ + actx: {}, + defaultSink: () => undefined + }) + shell.setDraft('我有一个需求') + const seen = new Set() + const files = [ + { id: 'f1', name: '/w/logo.svg', path: '/w/logo.svg', source: 'computer' }, + { id: 'f2', name: 'brief.pdf', path: '/w/brief.pdf', source: 'computer' } + ] + + const first = client.syncResearchFileReferences( + shell, files, seen, { start: 2, end: 2 }, true + ) + expect(first.inserted).toEqual(['f1', 'f2']) + expect(shell.snapshot.occurrences.map((item: { source: string; ref: string }) => ({ + source: item.source, + file: JSON.parse(item.ref).id + }))).toEqual([ + { source: 'research-file', file: 'f1' }, + { source: 'research-file', file: 'f2' } + ]) + expect(shell.snapshot.draft.startsWith('我有')).toBe(true) + expect(shell.snapshot.draft).toContain('\uFFFC') + expect(shell.snapshot.draft.endsWith('一个需求')).toBe(true) + + const removed = shell.snapshot.occurrences[0] + shell.setDraft( + shell.snapshot.draft.slice(0, removed.offset) + shell.snapshot.draft.slice(removed.offset + 1), + { start: removed.offset, end: removed.offset + 1, insertedLength: 0 } + ) + client.syncResearchFileReferences( + shell, files, seen, + { start: shell.snapshot.draft.length, end: shell.snapshot.draft.length }, true + ) + expect(shell.snapshot.occurrences.map((item: { ref: string }) => JSON.parse(item.ref).id)) + .toEqual(['f2']) + + client.syncResearchFileReferences( + shell, [], seen, + { start: shell.snapshot.draft.length, end: shell.snapshot.draft.length }, false + ) + expect(shell.snapshot.occurrences).toEqual([]) + expect(shell.snapshot.draft).not.toContain('\uFFFC') + + const second = client.syncResearchFileReferences( + shell, [files[0]], seen, + { start: shell.snapshot.draft.length, end: shell.snapshot.draft.length }, true + ) + expect(second.inserted).toEqual(['f1']) + }) + + it('reconciles renamed Research references in place without changing draft history identity', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation', { + '@deepseek-ai/dsh-client-runtime/client': { createSnapshotStore } + }) + expect(client.SessionInputShell).toBeTypeOf('function') + expect(client.syncResearchFileReferences).toBeTypeOf('function') + if (typeof client.SessionInputShell !== 'function' || + typeof client.syncResearchFileReferences !== 'function' || + typeof client.researchFileReference !== 'function') return + + const shell = new client.SessionInputShell({ + actx: {}, + defaultSink: () => undefined + }) + const sourceFile = { + id: 'f1', name: 'report.pdf', path: '/w/report.pdf', source: 'computer' + } + shell.setDraft('前后') + shell.insertReference(client.researchFileReference(sourceFile), { + start: 1, end: 1, draftRev: shell.snapshot.draftRev + }) + shell.insertReference(client.researchFileReference(sourceFile), { + start: shell.snapshot.draft.length, + end: shell.snapshot.draft.length, + draftRev: shell.snapshot.draftRev + }) + const before = shell.snapshot + const identity = before.occurrences.map((occurrence: { + occurrenceId: number; source: string; offset: number + }) => ({ + occurrenceId: occurrence.occurrenceId, + source: occurrence.source, + offset: occurrence.offset + })) + const seen = new Set(['f1']) + + const result = client.syncResearchFileReferences(shell, [{ + ...sourceFile, + displayName: '季度结论.pdf' + }], seen, { start: 1, end: 2 }, true) + + expect(result.inserted).toEqual([]) + expect(shell.snapshot.draft).toBe(before.draft) + expect(shell.snapshot.draftRev).toBe(before.draftRev) + expect(shell.snapshot.occurrences.map((occurrence: { + occurrenceId: number; source: string; offset: number + }) => ({ + occurrenceId: occurrence.occurrenceId, + source: occurrence.source, + offset: occurrence.offset + }))).toEqual(identity) + expect(shell.snapshot.occurrences).toHaveLength(2) + expect(shell.snapshot.occurrences.every((occurrence: { + label: string; clipboardText: string; ref: string + }) => occurrence.label === '季度结论.pdf' && + occurrence.clipboardText === '季度结论.pdf' && + JSON.parse(occurrence.ref).name === '季度结论.pdf' && + JSON.parse(occurrence.ref).path === '/w/report.pdf')).toBe(true) + + shell.undo() + expect(shell.snapshot.occurrences).toHaveLength(1) + expect(shell.snapshot.occurrences[0]).toMatchObject({ + occurrenceId: identity[0]?.occurrenceId, + label: '季度结论.pdf', + clipboardText: '季度结论.pdf' + }) + shell.redo() + expect(shell.snapshot.occurrences).toHaveLength(2) + expect(shell.snapshot.occurrences.map((occurrence: { label: string }) => occurrence.label)) + .toEqual(['季度结论.pdf', '季度结论.pdf']) + + const removed = shell.snapshot.occurrences[0] + shell.setDraft( + shell.snapshot.draft.slice(0, removed.offset) + shell.snapshot.draft.slice(removed.offset + 1), + { start: removed.offset, end: removed.offset + 1, insertedLength: 0 } + ) + client.syncResearchFileReferences(shell, [{ + ...sourceFile, + displayName: '再次改名.pdf' + }], seen, { start: 0, end: 0 }, true) + expect(shell.snapshot.occurrences).toHaveLength(1) + expect(shell.snapshot.occurrences[0]).toMatchObject({ label: '再次改名.pdf' }) + + shell.restoreDraftState({ + draft: shell.snapshot.draft, + occurrences: shell.snapshot.occurrences.map((occurrence: Record) => ({ + ...occurrence, + invalid: true + })) + }) + const invalidBefore = shell.snapshot + client.syncResearchFileReferences(shell, [{ + ...sourceFile, + displayName: '保留无效状态.pdf' + }], seen, { start: 0, end: 0 }, true) + expect(shell.snapshot.draft).toBe(invalidBefore.draft) + expect(shell.snapshot.draftRev).toBe(invalidBefore.draftRev) + expect(shell.snapshot.occurrences[0]).toMatchObject({ + occurrenceId: invalidBefore.occurrences[0]?.occurrenceId, + offset: invalidBefore.occurrences[0]?.offset, + invalid: true, + label: '保留无效状态.pdf' + }) + }) + + it.each([ + { label: 'the only occurrence', copies: 1 }, + { label: 'one of two occurrences', copies: 2 } + ])('keeps $label deleted while rename follows its stable Research identity through undo history', async ({ copies }) => { + const client = await loadClientBundle('dsh-client-ui-conversation', { + '@deepseek-ai/dsh-client-runtime/client': { createSnapshotStore } + }) + expect(client.SessionInputShell).toBeTypeOf('function') + expect(client.syncResearchFileReferences).toBeTypeOf('function') + if (typeof client.SessionInputShell !== 'function' || + typeof client.syncResearchFileReferences !== 'function' || + typeof client.researchFileReference !== 'function') return + + const shell = new client.SessionInputShell({ + actx: {}, + defaultSink: () => undefined + }) + const sourceFile = { + id: 'history-file', name: 'history.pdf', path: '/w/history.pdf', source: 'computer' + } + shell.setDraft('正文') + for (let index = 0; index < copies; index += 1) { + shell.insertReference(client.researchFileReference(sourceFile), { + start: shell.snapshot.draft.length, + end: shell.snapshot.draft.length, + draftRev: shell.snapshot.draftRev + }) + } + const beforeDelete = shell.snapshot + const deleted = beforeDelete.occurrences[0] + const preservedIdentity = beforeDelete.occurrences.map((occurrence: { + occurrenceId: number; source: string; offset: number; invalid?: boolean + }) => ({ + occurrenceId: occurrence.occurrenceId, + source: occurrence.source, + offset: occurrence.offset, + invalid: occurrence.invalid + })) + + shell.setDraft( + beforeDelete.draft.slice(0, deleted.offset) + beforeDelete.draft.slice(deleted.offset + 1), + { start: deleted.offset, end: deleted.offset + 1, insertedLength: 0 } + ) + const deletedSnapshot = shell.snapshot + const seen = new Set(['history-file']) + client.syncResearchFileReferences(shell, [{ + ...sourceFile, + displayName: '历史同步新名字.pdf' + }], seen, { start: deletedSnapshot.draft.length, end: deletedSnapshot.draft.length }, true) + + expect(shell.snapshot.draft).toBe(deletedSnapshot.draft) + expect(shell.snapshot.draftRev).toBe(deletedSnapshot.draftRev) + expect(shell.snapshot.occurrences).toHaveLength(copies - 1) + expect(shell.snapshot.occurrences.some((occurrence: { occurrenceId: number }) => + occurrence.occurrenceId === deleted.occurrenceId)).toBe(false) + expect(shell.snapshot.occurrences.every((occurrence: { label: string }) => + occurrence.label === '历史同步新名字.pdf')).toBe(true) + + shell.undo() + expect(shell.snapshot.occurrences).toHaveLength(copies) + expect(shell.snapshot.occurrences.map((occurrence: { + occurrenceId: number; source: string; offset: number; invalid?: boolean + }) => ({ + occurrenceId: occurrence.occurrenceId, + source: occurrence.source, + offset: occurrence.offset, + invalid: occurrence.invalid + }))).toEqual(preservedIdentity) + expect(shell.snapshot.occurrences.every((occurrence: { + ref: string; label: string; clipboardText: string + }) => occurrence.label === '历史同步新名字.pdf' && + occurrence.clipboardText === '历史同步新名字.pdf' && + JSON.parse(occurrence.ref).id === 'history-file' && + JSON.parse(occurrence.ref).name === '历史同步新名字.pdf')).toBe(true) + + shell.redo() + expect(shell.snapshot.draft).toBe(deletedSnapshot.draft) + expect(shell.snapshot.occurrences).toHaveLength(copies - 1) + expect(shell.snapshot.occurrences.some((occurrence: { occurrenceId: number }) => + occurrence.occurrenceId === deleted.occurrenceId)).toBe(false) + expect(shell.snapshot.occurrences.every((occurrence: { label: string }) => + occurrence.label === '历史同步新名字.pdf')).toBe(true) + }) + + it('serializes and extracts bounded inline Research reference markers in occurrence order', async () => { + const client = await loadConversationClient() + expect(client.researchFileReference).toBeTypeOf('function') + expect(client.researchFileReferenceCodec?.serialize).toBeTypeOf('function') + expect(client.extractResearchFileReferences).toBeTypeOf('function') + if (typeof client.researchFileReference !== 'function' || + typeof client.researchFileReferenceCodec?.serialize !== 'function' || + typeof client.extractResearchFileReferences !== 'function') return + + const file = { id: 'f1', name: '/w/report.pdf', path: '/w/report.pdf', source: 'computer' } + const reference = client.researchFileReference(file) + expect(reference).toMatchObject({ + source: 'research-file', + label: 'report.pdf', + clipboardText: 'report.pdf' + }) + const marker = await client.researchFileReferenceCodec.serialize( + reference.ref, new AbortController().signal + ) + const extracted = client.extractResearchFileReferences(`前文${marker}后文`) + + expect(extracted).toEqual({ + text: '前文后文', + files: [{ id: 'f1', name: 'report.pdf', path: '/w/report.pdf' }], + occurrences: [{ fileId: 'f1', offset: 2 }] + }) + }) + + it('wires a bounded boolean-only Research file availability bridge to the trusted window', async () => { + const [preload, main] = await Promise.all([ + readFile('src/preload/index.ts', 'utf8'), + readFile('src/main/index.ts', 'utf8') + ]) + + expect(preload).toContain( + 'researchFilesAvailable: (paths: string[]): Promise =>' + ) + expect(preload).toContain( + "ipcRenderer.invoke('research:files-available', paths)" + ) + expect(main).toContain('const values = Array.isArray(paths) ? Array.from(paths) : []') + expect(main).toContain('values.length > 64') + expect(main).toContain('path.length > 512') + expect(main).toContain('Promise.all(values.map((path) =>') + expect(main).toContain('value.isFile()') + expect(main).not.toContain('readdir(') + expect(main).not.toContain('readFile(path') + }) + + it('wires stable Research canvas storage through the trusted desktop bridge', async () => { + const [preload, main] = await Promise.all([ + readFile('src/preload/index.ts', 'utf8'), + readFile('src/main/index.ts', 'utf8') + ]) + + expect(preload).toContain('researchCanvasStorage: Object.freeze({') + expect(preload).toContain("ipcRenderer.sendSync('research:canvas-storage:get', key)") + expect(preload).toContain("ipcRenderer.sendSync('research:canvas-storage:set', key, value)") + expect(main).toContain("new ResearchCanvasStorage(app.getPath('userData'))") + }) + + it('derives Finder preview admission inside preload without exposing a path reader', async () => { + const calls: Array<{ channel: string; value: unknown }> = [] + const bridge = createResearchPreviewBridge( + () => '/electron/derived.pdf', + async (channel, value) => { + calls.push({ channel, value }) + return { + authorizationId: 'authorization_0000000000000001', + url: 'sherlock-preview://capability_0000000000000001/', + contentType: 'application/pdf', + name: 'report.pdf' + } + } + ) + + const result = await bridge.admitFinderFile( + { name: 'report.pdf', path: '/renderer/forged.pdf' } as unknown as File, + { sessionId: 'session-1', nodeId: 'node-1' } + ) + expect(result).toMatchObject({ + authorizationId: 'authorization_0000000000000001', + contentType: 'application/pdf' + }) + expect(calls).toEqual([{ + channel: 'research:preview:admit-finder', + value: { + path: '/electron/derived.pdf', + sessionId: 'session-1', + nodeId: 'node-1' + } + }]) + await bridge.release({ + sessionId: 'session-1', nodeId: 'node-1', + authorizationId: 'authorization_0000000000000001', + capabilityToken: 'capability_0000000000000001' + }) + expect(calls.at(-1)).toEqual({ + channel: 'research:preview:release', + value: { + sessionId: 'session-1', nodeId: 'node-1', + authorizationId: 'authorization_0000000000000001', + capabilityToken: 'capability_0000000000000001' + } + }) + expect('read' in bridge).toBe(false) + expect('admitFinderPath' in bridge).toBe(false) + }) + + it('returns a resolved Electron file path and safely absorbs resolver failures', () => { + const file = { name: 'report.pdf' } as File + + expect(safePathForFile(file, () => '/tmp/report.pdf')).toBe('/tmp/report.pdf') + expect(safePathForFile(file, () => undefined)).toBe('') + expect(safePathForFile(file, () => { throw new Error('unavailable') })).toBe('') + }) + + it('ignores synthetic File path properties and rejects empty Electron resolution', () => { + const synthetic = { name: 'report.pdf', path: '/renderer/forged.pdf' } as unknown as File + const identity = { sessionId: 'session-1', nodeId: 'node-1' } + + expect(researchFinderAdmissionRequest(synthetic, identity, () => '')).toBeNull() + expect(researchFinderAdmissionRequest( + synthetic, + identity, + () => '/electron/derived.pdf' + )).toEqual({ + path: '/electron/derived.pdf', + sessionId: 'session-1', + nodeId: 'node-1' + }) + }) + + it('does not invoke IPC when Electron cannot resolve a real Finder File', async () => { + const invoke = vi.fn() + const bridge = createResearchPreviewBridge(() => '', invoke) + + await expect(bridge.admitFinderFile( + { name: 'synthetic.pdf', path: '/renderer/forged.pdf' } as unknown as File, + { sessionId: 'session-1', nodeId: 'node-1' } + )).resolves.toBeNull() + expect(invoke).not.toHaveBeenCalled() + }) + + it('parses only bounded Sherlock file drag payloads', async () => { + const client = await loadConversationClient() + expect(client.parseSherlockFileDrag).toBeTypeOf('function') + if (typeof client.parseSherlockFileDrag !== 'function') return + + expect(client.parseSherlockFileDrag( + '{"path":"/w/report.pdf","name":"report.pdf"}' + )).toEqual({ path: '/w/report.pdf', name: 'report.pdf', source: 'sherlock' }) + expect(client.parseSherlockFileDrag('not-json')).toBeNull() + expect(client.parseSherlockFileDrag('{"path":42,"name":"x"}')).toBeNull() + expect(client.parseSherlockFileDrag(JSON.stringify({ name: 'x'.repeat(513) }))).toBeNull() + }) + + it('rejects an oversized raw Sherlock file drag payload before parsing', async () => { + const client = await loadConversationClient() + expect(client.parseSherlockFileDrag).toBeTypeOf('function') + if (typeof client.parseSherlockFileDrag !== 'function') return + + expect(client.parseSherlockFileDrag(JSON.stringify({ + name: 'x', + ignored: 'x'.repeat(2_048) + }))).toBeNull() + }) + + it('reads Finder files and gives the Sherlock MIME payload precedence', async () => { + const client = await loadConversationClient() + expect(client.researchCanvasDropFiles).toBeTypeOf('function') + if (typeof client.researchCanvasDropFiles !== 'function') return + const transfer = { + files: [{ name: 'finder.pdf', type: 'application/pdf' }], + getData: (type: string) => type === 'application/x-sherlock-file' + ? '{"path":"/w/internal.md","name":"internal.md"}' + : '', + types: ['Files', 'application/x-sherlock-file'] + } + + expect(client.researchCanvasDropFiles(transfer, () => '/tmp/finder.pdf')).toEqual([ + { path: '/w/internal.md', name: 'internal.md', source: 'sherlock' } + ]) + + const finderTransfer = { + files: [ + { name: 'local.pdf', type: 'application/pdf' }, + { name: 'README', type: '' } + ], + getData: () => '', + types: ['Files'] + } + const paths = ['/tmp/local.pdf', ''] + expect(client.researchCanvasDropFiles( + finderTransfer, + () => paths.shift() ?? '' + )).toEqual([ + { + path: '/tmp/local.pdf', name: 'local.pdf', + mediaType: 'application/pdf', source: 'computer' + }, + { name: 'README', source: 'computer' } + ]) + }) + + it('bounds Finder descriptors before resolution and keeps unusable metadata name-only', async () => { + const client = await loadConversationClient() + expect(client.RESEARCH_CANVAS_MAX_FILES_PER_DROP).toBe(64) + expect(client.RESEARCH_CANVAS_MAX_FILES_PER_SESSION).toBe(256) + if (typeof client.researchCanvasDropFiles !== 'function') return + + const files = Array.from( + { length: client.RESEARCH_CANVAS_MAX_FILES_PER_DROP + 1 }, + (_, index) => ({ name: `file-${index}.txt`, type: 'text/plain' }) + ) + const resolved: string[] = [] + const dropped = client.researchCanvasDropFiles({ files, getData: () => '' }, (file: File) => { + resolved.push(file.name) + return `/tmp/${file.name}` + }) + + expect(dropped).toHaveLength(client.RESEARCH_CANVAS_MAX_FILES_PER_DROP) + expect(resolved).toHaveLength(client.RESEARCH_CANVAS_MAX_FILES_PER_DROP) + expect(dropped.at(-1)).toMatchObject({ name: 'file-63.txt', source: 'computer' }) + expect(client.researchCanvasDropFiles({ + files: [{ name: 'fallback.txt', type: 'x'.repeat(513) }], + getData: () => '' + }, () => '/'.repeat(513))).toEqual([ + { name: 'fallback.txt', source: 'computer' } + ]) + expect(client.researchCanvasDropFiles({ + files: [ + { name: 'overlong-path.txt', type: 'text/plain' }, + { name: 'overlong-media.txt', type: 'x'.repeat(513) } + ], + getData: () => '' + }, (file: File) => file.name === 'overlong-path.txt' + ? '/'.repeat(513) + : '/tmp/overlong-media.txt')).toEqual([ + { name: 'overlong-path.txt', source: 'computer' }, + { name: 'overlong-media.txt', source: 'computer' } + ]) + }) + + it('never enumerates a Finder FileList beyond the per-drop cap', async () => { + const client = await loadConversationClient() + expect(client.RESEARCH_CANVAS_MAX_FILES_PER_DROP).toBe(64) + if (typeof client.researchCanvasDropFiles !== 'function') return + const limit = client.RESEARCH_CANVAS_MAX_FILES_PER_DROP + const sourceAccesses: number[] = [] + const makeFile = (index: number) => ({ name: `lazy-${index}.txt`, type: 'text/plain' }) + const files = new Proxy({ length: limit + 1 }, { + get(_target, property) { + if (property === 'length') return limit + 1 + if (property === 'item') return (index: number) => { + if (index >= limit) throw new Error('accessed FileList item past cap') + sourceAccesses.push(index) + return makeFile(index) + } + if (property === Symbol.iterator) return function * () { + for (let index = 0; ; index += 1) { + if (index >= limit) throw new Error('iterated FileList past cap') + sourceAccesses.push(index) + yield makeFile(index) + } + } + if (typeof property === 'string' && /^\d+$/.test(property)) { + const index = Number(property) + if (index >= limit) throw new Error('accessed FileList index past cap') + sourceAccesses.push(index) + return makeFile(index) + } + } + }) + const resolverCalls: string[] = [] + + const dropped = client.researchCanvasDropFiles({ files, getData: () => '' }, (file: File) => { + resolverCalls.push(file.name) + return `/tmp/${file.name}` + }) + + expect(dropped).toHaveLength(limit) + expect(sourceAccesses).toEqual(Array.from({ length: limit }, (_, index) => index)) + expect(resolverCalls).toEqual(Array.from({ length: limit }, (_, index) => `lazy-${index}.txt`)) + }) + + it('owns only Finder files and the exact Sherlock MIME type', async () => { + const client = await loadConversationClient() + expect(client.researchCanvasOwnsFileDrag).toBeTypeOf('function') + if (typeof client.researchCanvasOwnsFileDrag !== 'function') return + + expect(client.researchCanvasOwnsFileDrag(['Files'])).toBe(true) + expect(client.researchCanvasOwnsFileDrag([ + 'application/x-sherlock-file' + ])).toBe(true) + expect(client.researchCanvasOwnsFileDrag(['text/plain'])).toBe(false) + }) + + it('places dropped files in world coordinates and repositions a repeated path', async () => { + const client = await loadConversationClient() + expect(client.researchCanvasWorldPoint).toBeTypeOf('function') + expect(client.placeResearchCanvasFiles).toBeTypeOf('function') + if (typeof client.researchCanvasWorldPoint !== 'function' || + typeof client.placeResearchCanvasFiles !== 'function') return + const point = client.researchCanvasWorldPoint( + { scale: 2, x: 40, y: -20 }, + { x: 240, y: 180 } + ) + expect(point).toEqual({ x: 100, y: 100 }) + + const nodes = client.placeResearchCanvasFiles( + [{ id: 'old', path: '/w/a.pdf', name: 'a.pdf', source: 'computer', x: 1, y: 2 }], + [ + { path: '/w/a.pdf', name: 'a.pdf', source: 'computer' }, + { path: '/w/b.md', name: 'b.md', source: 'computer' } + ], + point, + (() => { let n = 0; return () => `new-${++n}` })() + ) + + expect(nodes).toEqual([ + { id: 'old', path: '/w/a.pdf', name: 'a.pdf', source: 'computer', x: 100, y: 100 }, + { id: 'new-1', path: '/w/b.md', name: 'b.md', source: 'computer', x: 118, y: 118 } + ]) + }) + + it('bounds session placement while preserving stable repeated-path placement', async () => { + const client = await loadConversationClient() + expect(client.RESEARCH_CANVAS_MAX_FILES_PER_DROP).toBe(64) + expect(client.RESEARCH_CANVAS_MAX_FILES_PER_SESSION).toBe(256) + if (typeof client.placeResearchCanvasFiles !== 'function') return + const sessionLimit = client.RESEARCH_CANVAS_MAX_FILES_PER_SESSION + const dropLimit = client.RESEARCH_CANVAS_MAX_FILES_PER_DROP + const existing = Array.from({ length: sessionLimit }, (_, index) => ({ + id: `old-${index}`, path: `/w/${index}.txt`, name: `old-${index}.txt`, + source: 'computer', x: index, y: index + })) + const files = [ + ...Array.from({ length: dropLimit - 1 }, (_, index) => ({ + path: `/w/new-${index}.txt`, name: `new-${index}.txt`, source: 'computer' + })), + { path: '/w/255.txt', name: 'moved.txt', source: 'computer' }, + { path: '/w/254.txt', name: 'ignored-after-limit.txt', source: 'computer' } + ] + const created: string[] = [] + const placed = client.placeResearchCanvasFiles(existing, files, { x: 100, y: 200 }, () => { + const id = `new-${created.length}` + created.push(id) + return id + }) + + expect(placed).toHaveLength(sessionLimit) + expect(created).toEqual([]) + expect(placed[255]).toMatchObject({ + id: 'old-255', name: 'moved.txt', x: 100 + (dropLimit - 1) * 18, + y: 200 + (dropLimit - 1) * 18 + }) + expect(placed[254]).toMatchObject({ + id: 'old-254', name: 'old-254.txt', x: 254, y: 254 + }) + }) + + it('loads only finite, well-shaped persisted file nodes', async () => { + const client = await loadConversationClient() + expect(client.researchCanvasStorageKey).toBeTypeOf('function') + expect(client.parseResearchCanvasFileNodes).toBeTypeOf('function') + if (typeof client.researchCanvasStorageKey !== 'function' || + typeof client.parseResearchCanvasFileNodes !== 'function') return + const valid = [{ id: '1', name: 'a.pdf', source: 'computer', x: 12, y: 24 }] + + expect(client.researchCanvasStorageKey('session-7')).toBe( + 'sherlock.research.canvas.files.v1:session-7' + ) + expect(client.parseResearchCanvasFileNodes(JSON.stringify(valid))).toEqual([{ + ...valid[0], width: 320, height: 320 / (17 / 22) + 32, + sizeMode: 'auto', aspectRatio: 17 / 22 + }]) + expect(client.parseResearchCanvasFileNodes('[{"id":"1","name":"a","source":"computer","x":null,"y":2}]')).toEqual([]) + expect(client.parseResearchCanvasFileNodes('bad-json')).toEqual([]) + }) + + it('canonicalizes persisted nodes and retains only first unique ids and paths', async () => { + const client = await loadConversationClient() + expect(client.parseResearchCanvasFileNodes).toBeTypeOf('function') + if (typeof client.parseResearchCanvasFileNodes !== 'function') return + + expect(client.parseResearchCanvasFileNodes(JSON.stringify([ + { + id: 'first', path: '/w/first.txt', name: 'first.txt', mediaType: 'text/plain', + source: 'computer', x: 1, y: 2, ignored: 'discard me' + }, + { id: 'first', name: 'duplicate-id.txt', source: 'computer', x: 3, y: 4 }, + { id: 'second', path: '/w/first.txt', name: 'duplicate-path.txt', source: 'computer', x: 5, y: 6 }, + { id: 'invalid', name: 'invalid.txt', source: 'computer', x: null, y: 8 }, + { id: 'name-only', name: 'name-only.txt', source: 'sherlock', x: 9, y: 10, ignored: true } + ]))).toEqual([ + { + id: 'first', path: '/w/first.txt', name: 'first.txt', mediaType: 'text/plain', + source: 'computer', x: 1, y: 2, width: 420, height: 320, sizeMode: 'auto' + }, + { + id: 'name-only', name: 'name-only.txt', source: 'sherlock', x: 9, y: 10, + width: 220, height: 64, sizeMode: 'auto' + } + ]) + }) + + it('normalizes persisted display names and renames nodes without mutating file identity', async () => { + const client = await loadConversationClient() + expect(client.parseResearchCanvasFileNodes).toBeTypeOf('function') + expect(client.ResearchWorkspaceRegistry).toBeTypeOf('function') + if (typeof client.parseResearchCanvasFileNodes !== 'function' || + typeof client.ResearchWorkspaceRegistry !== 'function') return + + const base = { + id: 'file-1', path: '/w/original.pdf', name: 'original.pdf', + mediaType: 'application/pdf', source: 'computer', + authorizationId: 'authorization-1', contentType: 'application/pdf', + x: 12, y: 24 + } + expect(client.parseResearchCanvasFileNodes(JSON.stringify([ + { ...base, displayName: ' 季度报告 ' }, + { ...base, id: 'same', path: '/w/same.pdf', name: 'same.pdf', displayName: 'same.pdf' }, + { ...base, id: 'control', path: '/w/control.pdf', displayName: 'bad\u0085title' }, + { ...base, id: 'max', path: '/w/max.pdf', displayName: 'x'.repeat(256) }, + { ...base, id: 'long', path: '/w/long.pdf', displayName: 'x'.repeat(257) } + ]))).toMatchObject([ + { id: 'file-1', name: 'original.pdf', displayName: '季度报告' }, + { id: 'same', name: 'same.pdf' }, + { id: 'control', name: 'original.pdf' }, + { id: 'max', name: 'original.pdf', displayName: 'x'.repeat(256) }, + { id: 'long', name: 'original.pdf' } + ]) + + const storage = memoryStorage({}) + const workspace = new client.ResearchWorkspaceRegistry(storage).for('rename-session') + workspace.setFiles([base]) + const sourceIdentity = { + name: base.name, + path: base.path, + mediaType: base.mediaType, + authorizationId: base.authorizationId, + contentType: base.contentType + } + workspace.renameNode('file-1', ' 审阅版本 ') + expect(workspace.getSnapshot().files[0]).toMatchObject({ + ...sourceIdentity, + displayName: '审阅版本' + }) + expect(new client.ResearchWorkspaceRegistry(storage) + .for('rename-session').getSnapshot().files[0]).toMatchObject({ + ...sourceIdentity, + displayName: '审阅版本' + }) + + workspace.renameNode('file-1', 'bad\u0007title') + expect(workspace.getSnapshot().files[0]?.displayName).toBe('审阅版本') + workspace.renameNode('file-1', '章节/最终结论.pdf') + const renamedReference = client.researchFileReference( + workspace.getSnapshot().files[0] + ) + expect(renamedReference).toMatchObject({ + label: '章节/最终结论.pdf', + clipboardText: '章节/最终结论.pdf' + }) + expect(JSON.parse(renamedReference.ref)).toEqual({ + id: 'file-1', name: '章节/最终结论.pdf', path: '/w/original.pdf' + }) + workspace.renameNode('file-1', base.name) + expect(workspace.getSnapshot().files[0]).not.toHaveProperty('displayName') + + workspace.setArtifacts([{ + id: 'artifact-1', kind: 'assistant-result', messageId: 'message-1', + title: '助手回复', excerpt: '第一版内容', x: 50, y: 60 + }]) + workspace.renameNode('artifact-1', ' 结论摘要 ') + workspace.renameNode('artifact-1', 'bad\u009ftitle') + workspace.renameNode('artifact-1', ' ') + expect(workspace.getSnapshot().artifacts[0]).toMatchObject({ + id: 'artifact-1', title: '结论摘要' + }) + expect(new client.ResearchWorkspaceRegistry(storage) + .for('rename-session').getSnapshot().artifacts[0]).toMatchObject({ + id: 'artifact-1', title: '结论摘要' + }) + + expect(workspace.updateArtifactContent('artifact-1', '# 修订结论\n\n- 第一条')).toBe(true) + expect(workspace.getSnapshot().artifacts[0]?.excerpt).toBe('# 修订结论\n\n- 第一条') + expect(new client.ResearchWorkspaceRegistry(storage) + .for('rename-session').getSnapshot().artifacts[0]?.excerpt) + .toBe('# 修订结论\n\n- 第一条') + expect(workspace.updateArtifactContent('artifact-1', ' \n\t ')).toBe(false) + expect(workspace.getSnapshot().artifacts[0]?.excerpt).toBe('# 修订结论\n\n- 第一条') + }) + + it('restores no more than the bounded session node count', async () => { + const client = await loadConversationClient() + expect(client.RESEARCH_CANVAS_MAX_FILES_PER_SESSION).toBe(256) + expect(client.parseResearchCanvasFileNodes).toBeTypeOf('function') + if (typeof client.parseResearchCanvasFileNodes !== 'function') return + const nodes = Array.from( + { length: client.RESEARCH_CANVAS_MAX_FILES_PER_SESSION + 1 }, + (_, index) => ({ + id: `node-${index}`, path: `/w/node-${index}.txt`, name: `node-${index}.txt`, + source: 'computer', x: index, y: index + }) + ) + + const restored = client.parseResearchCanvasFileNodes(JSON.stringify(nodes)) + expect(restored).toHaveLength(client.RESEARCH_CANVAS_MAX_FILES_PER_SESSION) + expect(restored.at(-1)).toMatchObject({ id: 'node-255', path: '/w/node-255.txt' }) + }) + + it('persists the full supported file set even when escaped paths exceed the legacy raw limit', async () => { + const client = await loadConversationClient() + expect(client.ResearchWorkspaceRegistry).toBeTypeOf('function') + if (typeof client.ResearchWorkspaceRegistry !== 'function') return + const values = new Map() + const storage = { + getItem: (key: string) => values.get(key) ?? null, + setItem: (key: string, value: string) => { + if (value.length <= 8 * 1024 * 1024) values.set(key, value) + } + } + const component = '"'.repeat(240) + const nodes = Array.from({ length: 256 }, (_, index) => ({ + id: `file-${index}`, + path: `/research/${component}-${index}/${component}-${index}.png`, + name: `${component}-${index}.png`, + source: 'sherlock', + x: index, + y: index + })) + expect(JSON.stringify(nodes).length).toBeGreaterThan(262_144) + + const workspace = new client.ResearchWorkspaceRegistry(storage).for('escaped-files') + workspace.setFiles(nodes) + + expect(workspace.getSnapshot().files).toHaveLength(256) + expect(new client.ResearchWorkspaceRegistry(storage) + .for('escaped-files').getSnapshot().files).toHaveLength(256) + }) + + it('round-trips nodes and keeps them usable when Research storage is unavailable', async () => { + const client = await loadConversationClient() + expect(client.loadResearchCanvasFiles).toBeTypeOf('function') + expect(client.saveResearchCanvasFiles).toBeTypeOf('function') + if (typeof client.loadResearchCanvasFiles !== 'function' || + typeof client.saveResearchCanvasFiles !== 'function') return + const values = new Map() + const memoryStorage = { + getItem: (key: string) => values.get(key) ?? null, + setItem: (key: string, value: string) => { values.set(key, value) } + } + const nodes = [{ + id: '1', name: 'a.pdf', source: 'computer', x: 1, y: 2 + }] + + client.saveResearchCanvasFiles(memoryStorage, 's1', nodes) + expect(client.loadResearchCanvasFiles(memoryStorage, 's1')).toEqual([{ + ...nodes[0], width: 320, height: 320 / (17 / 22) + 32, + sizeMode: 'auto', aspectRatio: 17 / 22 + }]) + + const storage = { + getItem: () => { throw new Error('denied') }, + setItem: () => { throw new Error('full') } + } + + expect(client.loadResearchCanvasFiles(storage, 's1')).toEqual([]) + expect(() => client.saveResearchCanvasFiles(storage, 's1', [ + { id: '1', name: 'a.pdf', source: 'computer', x: 1, y: 2 } + ])).not.toThrow() + }) + + it('uses desktop-scoped storage for the default registry across renderer origins', async () => { + const sessionId = 'session-stable-storage' + const key = `sherlock.research.canvas.files.v1:${sessionId}` + const values = new Map([[key, JSON.stringify([{ + id: 'stable-file', path: '/w/stable.pdf', name: 'stable.pdf', + source: 'sherlock', x: 12, y: 34 + }])]]) + const client = await loadClientBundle('dsh-client-ui-conversation', {}, { + researchCanvasStorage: { + getItem: (storageKey) => values.get(storageKey) ?? null, + setItem: (storageKey, value) => { values.set(storageKey, value); return true } + } + }) + + const workspace = new client.ResearchWorkspaceRegistry().for(sessionId) + expect(workspace.getSnapshot().files).toEqual([{ + id: 'stable-file', path: '/w/stable.pdf', name: 'stable.pdf', + source: 'sherlock', x: 12, y: 34, width: 320, + height: 320 / (17 / 22) + 32, sizeMode: 'auto', aspectRatio: 17 / 22 + }]) + + workspace.setFiles([{ + id: 'next-file', path: '/w/next.pdf', name: 'next.pdf', + source: 'sherlock', x: 56, y: 78 + }]) + expect(JSON.parse(values.get(key) ?? '[]')).toEqual([{ + id: 'next-file', path: '/w/next.pdf', name: 'next.pdf', + source: 'sherlock', x: 56, y: 78, width: 320, + height: 320 / (17 / 22) + 32, sizeMode: 'auto', aspectRatio: 17 / 22 + }]) + }) + + it('does not report a desktop-rejected orphan outbox write as durable', async () => { + const writes: Array<{ key: string; value: string }> = [] + let acceptsWrites = false + const client = await loadClientBundle('dsh-client-ui-conversation', {}, { + researchCanvasStorage: { + getItem: () => null, + setItem: (key, value) => { writes.push({ key, value }); return acceptsWrites } + } + }) + const workspace = new client.ResearchWorkspaceRegistry().for('session-rejected-outbox') + + expect(workspace.queueOrphanRevocations(['orphan-node'])).toBe(false) + expect(workspace.pendingOrphanRevocations()).toEqual(['orphan-node']) + acceptsWrites = true + expect(workspace.queueOrphanRevocations(['orphan-node'])).toBe(true) + expect(writes).toEqual([{ + key: 'sherlock.research.canvas.preview-revocations.v1:session-rejected-outbox', + value: '["orphan-node"]' + }, { + key: 'sherlock.research.canvas.preview-revocations.v1:session-rejected-outbox', + value: '["orphan-node"]' + }]) + }) + + it('rejects an oversized raw persisted file payload before parsing', async () => { + const client = await loadConversationClient() + expect(client.parseResearchCanvasFileNodes).toBeTypeOf('function') + if (typeof client.parseResearchCanvasFileNodes !== 'function') return + + expect(client.parseResearchCanvasFileNodes(JSON.stringify([{ + id: '1', name: 'a.pdf', source: 'computer', x: 12, y: 24, + ignored: 'x'.repeat(8 * 1024 * 1024) + }]))).toEqual([]) + }) + + it('normalizes marquee geometry and intersects cards in viewport coordinates', async () => { + const client = await loadConversationClient() + expect(client.normalizeResearchRect).toBeTypeOf('function') + expect(client.researchNodesInMarquee).toBeTypeOf('function') + if (typeof client.normalizeResearchRect !== 'function' || + typeof client.researchNodesInMarquee !== 'function') return + + expect(client.normalizeResearchRect({ x: 180, y: 160 }, { x: 80, y: 60 })) + .toEqual({ left: 80, top: 60, right: 180, bottom: 160, width: 100, height: 100 }) + const nodes = [ + { id: 'a', name: 'a.txt', source: 'computer', x: 50, y: 50 }, + { id: 'b', name: 'b.txt', source: 'computer', x: 220, y: 220 } + ] + expect(client.researchNodesInMarquee( + nodes, + { scale: 2, x: 10, y: 20 }, + { left: 0, top: 0, right: 130, bottom: 140, width: 130, height: 140 } + )).toEqual(['a']) + }) + + it('scales marquee card bounds with the canvas viewport', async () => { + const client = await loadConversationClient() + expect(client.researchNodeViewportRect).toBeTypeOf('function') + if (typeof client.researchNodeViewportRect !== 'function') return + + expect(client.researchNodeViewportRect( + { id: 'a', name: 'a.txt', source: 'computer', x: 50, y: 50 }, + { scale: 2, x: 10, y: 20 } + )).toEqual({ left: -110, top: 56, right: 330, bottom: 184, width: 440, height: 128 }) + }) + + it('normalizes legacy rich and generic node geometry from one type policy', async () => { + const client = await loadConversationClient() + expect(client.normalizeResearchCanvasNodeGeometry).toBeTypeOf('function') + if (typeof client.normalizeResearchCanvasNodeGeometry !== 'function') return + + expect(client.normalizeResearchCanvasNodeGeometry({ + id: 'generic', name: 'archive.doc', previewEligible: false, source: 'computer', x: 0, y: 0 + })).toEqual({ width: 220, height: 64, sizeMode: 'auto', resizable: false }) + expect(client.normalizeResearchCanvasNodeGeometry({ + id: 'text', name: 'notes.txt', contentType: 'text/plain; charset=utf-8', + source: 'computer', x: 0, y: 0 + })).toEqual({ width: 420, height: 320, sizeMode: 'auto', resizable: true }) + expect(client.normalizeResearchCanvasNodeGeometry({ + id: 'markdown', name: 'notes.md', contentType: 'text/markdown; charset=utf-8', + source: 'computer', x: 0, y: 0 + })).toEqual({ width: 420, height: 320, sizeMode: 'auto', resizable: true }) + expect(client.normalizeResearchCanvasNodeGeometry({ + id: 'icon', name: 'favicon.ico', contentType: 'image/x-icon', + source: 'computer', x: 0, y: 0 + })).toEqual({ width: 320, height: 272, sizeMode: 'auto', aspectRatio: 4 / 3, resizable: true }) + expect(client.normalizeResearchCanvasNodeGeometry({ + id: 'assistant', kind: 'assistant-result', messageId: 'm1', title: 'Answer', + excerpt: 'Evidence', x: 0, y: 0 + })).toEqual({ width: 520, height: 300, sizeMode: 'auto', resizable: true }) + expect(client.normalizeResearchCanvasNodeGeometry({ + id: 'image', name: 'chart.png', mediaType: 'image/png', source: 'computer', x: 0, y: 0 + })).toEqual({ width: 320, height: 272, sizeMode: 'auto', aspectRatio: 4 / 3, resizable: true }) + expect(client.normalizeResearchCanvasNodeGeometry({ + id: 'pdf', name: 'filing.pdf', mediaType: 'application/pdf', source: 'computer', x: 0, y: 0 + })).toEqual({ width: 320, height: 320 / (17 / 22) + 32, sizeMode: 'auto', aspectRatio: 17 / 22, resizable: true }) + expect(client.normalizeResearchCanvasNodeGeometry({ + id: 'html', name: 'model.html', mediaType: 'text/html', source: 'computer', x: 0, y: 0 + })).toEqual({ width: 480, height: 360, sizeMode: 'auto', resizable: true }) + }) + + it('repairs invalid geometry and clamps finite manual sizes to the shared ceiling', async () => { + const client = await loadConversationClient() + expect(client.normalizeResearchCanvasNodeGeometry).toBeTypeOf('function') + if (typeof client.normalizeResearchCanvasNodeGeometry !== 'function') return + + expect(client.normalizeResearchCanvasNodeGeometry({ + id: 'assistant', kind: 'assistant-result', width: -1, height: Number.NaN, + sizeMode: 'broken', x: 0, y: 0 + })).toEqual({ width: 520, height: 300, sizeMode: 'auto', resizable: true }) + expect(client.normalizeResearchCanvasNodeGeometry({ + id: 'assistant', kind: 'assistant-result', width: 9000, height: 8000, + sizeMode: 'manual', x: 0, y: 0 + })).toEqual({ width: 2400, height: 2400, sizeMode: 'manual', resizable: true }) + }) + + it('uses normalized node dimensions for viewport rectangles at 0.5x and 2x', async () => { + const client = await loadConversationClient() + expect(client.researchNodeViewportRect).toBeTypeOf('function') + if (typeof client.researchNodeViewportRect !== 'function') return + const node = { + id: 'html', name: 'model.html', mediaType: 'text/html', source: 'computer', + x: 100, y: 80, width: 480, height: 360, sizeMode: 'manual' + } + + expect(client.researchNodeViewportRect(node, { scale: 0.5, x: 10, y: 20 })) + .toEqual({ left: -60, top: -30, right: 180, bottom: 150, width: 240, height: 180 }) + expect(client.researchNodeViewportRect(node, { scale: 2, x: 10, y: 20 })) + .toEqual({ left: -270, top: -180, right: 690, bottom: 540, width: 960, height: 720 }) + }) + + it('resizes freely from all corners in world units while fixing the opposite corner', async () => { + const client = await loadConversationClient() + expect(client.resizeResearchCanvasNode).toBeTypeOf('function') + if (typeof client.resizeResearchCanvasNode !== 'function') return + const node = { + id: 'assistant', kind: 'assistant-result', x: 0, y: 0, + width: 360, height: 240, sizeMode: 'auto' + } + + expect(client.resizeResearchCanvasNode(node, 'se', { x: 80, y: 40 }, 2)) + .toMatchObject({ x: 20, y: 10, width: 400, height: 260, sizeMode: 'manual' }) + expect(client.resizeResearchCanvasNode({ ...node, x: 100, y: 100 }, 'nw', { x: 40, y: 20 }, 2)) + .toMatchObject({ x: 100, y: 105, width: 360, height: 230, sizeMode: 'manual' }) + expect(client.resizeResearchCanvasNode(node, 'ne', { x: 80, y: -40 }, 2)) + .toMatchObject({ x: 20, y: -10, width: 400, height: 260, sizeMode: 'manual' }) + expect(client.resizeResearchCanvasNode(node, 'sw', { x: -80, y: 40 }, 2)) + .toMatchObject({ x: -20, y: 10, width: 400, height: 260, sizeMode: 'manual' }) + }) + + it('selects a bounded continuous PDF render window around the visible page stream', async () => { + const client = await loadConversationClient() + expect(client.researchPdfPageLayout).toBeTypeOf('function') + expect(client.researchPdfRenderWindow).toBeTypeOf('function') + if (typeof client.researchPdfPageLayout !== 'function' || + typeof client.researchPdfRenderWindow !== 'function') return + + const layout = client.researchPdfPageLayout({ + cssWidth: 318, + gap: 12, + pages: [ + { width: 600, height: 800 }, + { width: 1_000, height: 500 }, + { width: 600, height: 1_200 } + ] + }) + expect(layout).toEqual([ + { page: 1, top: 0, height: 424, bottom: 424 }, + { page: 2, top: 436, height: 159, bottom: 595 }, + { page: 3, top: 607, height: 636, bottom: 1243 } + ]) + expect(client.researchPdfRenderWindow({ + layout, scrollTop: 610, viewportHeight: 200, overscan: 0 + })).toEqual([3]) + expect(client.researchPdfRenderWindow({ + layout, scrollTop: 180, viewportHeight: 200, overscan: 240 + })).toEqual([1, 2, 3]) + expect(client.researchPdfRenderWindow({ + layout, scrollTop: Number.POSITIVE_INFINITY, viewportHeight: 0, overscan: -1 + })).toEqual([1]) + }) + + it('caps PDF canvas backing pixels while preserving the page aspect ratio', async () => { + const client = await loadConversationClient() + expect(client.researchPdfBackingStore).toBeTypeOf('function') + if (typeof client.researchPdfBackingStore !== 'function') return + + const backing = client.researchPdfBackingStore({ + pageWidth: 612, + pageHeight: 792, + cssWidth: 2_000, + devicePixelRatio: 3, + maxPixels: 4_000_000 + }) + expect(backing.cssWidth).toBe(2_000) + expect(backing.cssHeight).toBeCloseTo(2_588.235294, 5) + expect(backing.outputScale).toBeLessThan(1) + expect(backing.backingWidth * backing.backingHeight).toBeLessThanOrEqual(4_000_000) + expect(backing.backingWidth / backing.backingHeight).toBeCloseTo(612 / 792, 2) + + const tinyBudget = client.researchPdfBackingStore({ + pageWidth: 1_000, + pageHeight: 1_000, + cssWidth: 1_000, + devicePixelRatio: 4, + maxPixels: 100 + }) + expect(tinyBudget.outputScale).toBeCloseTo(0.01, 8) + expect(tinyBudget.backingWidth * tinyBudget.backingHeight).toBeLessThanOrEqual(100) + + const invalid = client.researchPdfBackingStore({ + pageWidth: Number.POSITIVE_INFINITY, + pageHeight: Number.NaN, + cssWidth: Number.POSITIVE_INFINITY, + devicePixelRatio: Number.NaN, + maxPixels: 1 + }) + expect(invalid).toEqual({ + cssWidth: 1, cssHeight: 1, outputScale: 1, backingWidth: 1, backingHeight: 1 + }) + }) + + it('persists the first PDF page ratio only for an auto node that still has the default ratio', async () => { + const client = await loadConversationClient() + expect(client.researchPdfGeometryForPage).toBeTypeOf('function') + if (typeof client.researchPdfGeometryForPage !== 'function') return + + const initial = { + id: 'pdf', name: 'filing.pdf', contentType: 'application/pdf', source: 'computer', + x: 0, y: 0, width: 320, height: 320 / (17 / 22) + 32, + sizeMode: 'auto', aspectRatio: 17 / 22 + } + expect(client.researchPdfGeometryForPage(initial, 600, 800)).toEqual({ + width: 320, height: 320 / 0.75 + 32, sizeMode: 'auto', aspectRatio: 0.75 + }) + expect(client.researchPdfGeometryForPage({ + ...initial, height: 320 / 0.75 + 32, aspectRatio: 0.75 + }, 612, 792)).toBeNull() + expect(client.researchPdfGeometryForPage({ + ...initial, width: 540, height: 540 / 1.4 + 32, + sizeMode: 'manual', aspectRatio: 1.4 + }, 600, 800)).toBeNull() + }) + + it('clamps free and aspect-locked resize with title height outside the content ratio', async () => { + const client = await loadConversationClient() + expect(client.resizeResearchCanvasNode).toBeTypeOf('function') + if (typeof client.resizeResearchCanvasNode !== 'function') return + + expect(client.resizeResearchCanvasNode({ + id: 'html', name: 'model.html', mediaType: 'text/html', source: 'computer', + x: 0, y: 0, width: 480, height: 360, sizeMode: 'auto' + }, 'nw', { x: 4000, y: 4000 }, 1)).toMatchObject({ + x: 80, y: 60, width: 320, height: 240, sizeMode: 'manual' + }) + expect(client.resizeResearchCanvasNode({ + id: 'assistant', kind: 'assistant-result', x: 0, y: 0, + width: 360, height: 240, sizeMode: 'manual' + }, 'se', { x: 9000, y: 9000 }, 1)).toMatchObject({ + x: 1020, y: 1080, width: 2400, height: 2400 + }) + expect(client.resizeResearchCanvasNode({ + id: 'image', name: 'chart.png', mediaType: 'image/png', source: 'computer', + x: 0, y: 0, width: 320, height: 272, sizeMode: 'auto', aspectRatio: 4 / 3 + }, 'se', { x: 80, y: 40 }, 2)).toMatchObject({ + x: 20, y: 15, width: 360, height: 302, sizeMode: 'manual', aspectRatio: 4 / 3 + }) + }) + + it('enforces both type minimum dimensions for non-default locked aspect ratios', async () => { + const client = await loadConversationClient() + expect(client.normalizeResearchCanvasNodeGeometry).toBeTypeOf('function') + expect(client.resizeResearchCanvasNode).toBeTypeOf('function') + if (typeof client.normalizeResearchCanvasNodeGeometry !== 'function' || + typeof client.resizeResearchCanvasNode !== 'function') return + const wideImage = { + id: 'wide-image', name: 'wide.png', mediaType: 'image/png', source: 'computer', + x: 0, y: 0, width: 160, height: 52, sizeMode: 'manual', aspectRatio: 8 + } + + expect(client.normalizeResearchCanvasNodeGeometry(wideImage)).toEqual({ + width: 960, height: 152, sizeMode: 'manual', aspectRatio: 8, resizable: true + }) + expect(client.resizeResearchCanvasNode( + wideImage, 'se', { x: -5000, y: -5000 }, 1 + )).toMatchObject({ + x: 0, y: 0, width: 960, height: 152, + sizeMode: 'manual', aspectRatio: 8 + }) + expect(client.normalizeResearchCanvasNodeGeometry({ + ...wideImage, id: 'tall-image', width: 120, aspectRatio: 0.25 + })).toEqual({ + width: 160, height: 672, sizeMode: 'manual', aspectRatio: 0.25, resizable: true + }) + }) + + it('persists normalized manual geometry and reloads repaired legacy JSON', async () => { + const client = await loadConversationClient() + expect(client.ResearchWorkspaceRegistry).toBeTypeOf('function') + if (typeof client.ResearchWorkspaceRegistry !== 'function') return + const sessionId = 'geometry-round-trip' + const storage = memoryStorage({ + [`sherlock.research.canvas.files.v1:${sessionId}`]: JSON.stringify([{ + id: 'html', name: 'model.html', mediaType: 'text/html', source: 'computer', + x: 20, y: 30, width: -4, height: null, sizeMode: 'broken' + }]) + }) + const workspace = new client.ResearchWorkspaceRegistry(storage).for(sessionId) + expect(workspace.getSnapshot().files[0]).toMatchObject({ + width: 480, height: 360, sizeMode: 'auto' + }) + + workspace.resizeNode('html', 'se', { x: 40, y: 20 }, 1) + workspace.persist() + expect(new client.ResearchWorkspaceRegistry(storage).for(sessionId) + .getSnapshot().files[0]).toMatchObject({ + x: 40, y: 40, width: 520, height: 380, sizeMode: 'manual' + }) + }) + + it('keeps stable selection order and derives ordered files only', async () => { + const client = await loadConversationClient() + expect(client.updateResearchSelection).toBeTypeOf('function') + if (typeof client.updateResearchSelection !== 'function') return + const files = [ + { id: 'f1', name: 'one.pdf', path: '/w/one.pdf', source: 'computer', x: 80, y: 20 }, + { id: 'f2', name: 'two.pdf', path: '/w/two.pdf', source: 'computer', x: 20, y: 20 } + ] + const first = client.updateResearchSelection( + { selectedNodeIds: [], orderedFileIds: [] }, + ['f2', 'f1'], + 'replace', + files + ) + expect(first).toEqual({ selectedNodeIds: ['f2', 'f1'], orderedFileIds: ['f2', 'f1'] }) + expect(client.updateResearchSelection(first, ['f2'], 'toggle', files)) + .toEqual({ selectedNodeIds: ['f1'], orderedFileIds: ['f1'] }) + }) + + it('moves selected files and artifacts by screen delta divided by zoom', async () => { + const client = await loadConversationClient() + expect(client.moveResearchCanvasNodes).toBeTypeOf('function') + if (typeof client.moveResearchCanvasNodes !== 'function') return + const moved = client.moveResearchCanvasNodes( + [{ id: 'f1', name: 'a', source: 'computer', x: 10, y: 20 }], + [{ id: 'a1', kind: 'assistant-result', messageId: 'm1', title: 'Answer', excerpt: 'Text', x: 30, y: 40 }], + ['f1', 'a1'], + { x: 20, y: -10 }, + 2 + ) + expect(moved.files[0]).toMatchObject({ x: 20, y: 15 }) + expect(moved.artifacts[0]).toMatchObject({ x: 40, y: 35 }) + }) + + it('removes the requested canvas nodes without touching unrelated files or artifacts', async () => { + const client = await loadConversationClient() + expect(client.removeResearchCanvasNodes).toBeTypeOf('function') + if (typeof client.removeResearchCanvasNodes !== 'function') return + + const removed = client.removeResearchCanvasNodes( + [ + { id: 'f1', name: 'one.pdf', path: '/w/one.pdf', source: 'computer', x: 10, y: 20 }, + { id: 'f2', name: 'two.pdf', path: '/w/two.pdf', source: 'computer', x: 30, y: 40 } + ], + [ + { id: 'a1', kind: 'assistant-result', messageId: 'm1', title: 'One', excerpt: 'A', x: 50, y: 60 }, + { id: 'a2', kind: 'assistant-result', messageId: 'm2', title: 'Two', excerpt: 'B', x: 70, y: 80 } + ], + ['f2', 'a1'] + ) + + expect(removed).toEqual({ + files: [ + { id: 'f1', name: 'one.pdf', path: '/w/one.pdf', source: 'computer', x: 10, y: 20 } + ], + artifacts: [ + { id: 'a2', kind: 'assistant-result', messageId: 'm2', title: 'Two', excerpt: 'B', x: 70, y: 80 } + ] + }) + }) + + it('uses exact per-session keys and canonicalizes bounded persisted artifacts and selection', async () => { + const client = await loadConversationClient() + expect(client.researchCanvasSelectionStorageKey).toBeTypeOf('function') + expect(client.researchCanvasArtifactsStorageKey).toBeTypeOf('function') + expect(client.parseResearchCanvasArtifactNodes).toBeTypeOf('function') + expect(client.parseResearchCanvasSelection).toBeTypeOf('function') + if (typeof client.researchCanvasSelectionStorageKey !== 'function' || + typeof client.researchCanvasArtifactsStorageKey !== 'function' || + typeof client.parseResearchCanvasArtifactNodes !== 'function' || + typeof client.parseResearchCanvasSelection !== 'function') return + + expect(client.researchCanvasSelectionStorageKey('session-7')).toBe( + 'sherlock.research.canvas.selection.v1:session-7' + ) + expect(client.researchCanvasArtifactsStorageKey('session-7')).toBe( + 'sherlock.research.canvas.artifacts.v1:session-7' + ) + const artifacts = client.parseResearchCanvasArtifactNodes(JSON.stringify([ + { id: 'a1', kind: 'assistant-result', messageId: 'm1', title: 'Answer', excerpt: 'Text', x: 1, y: 2 }, + { id: 'a1', kind: 'assistant-result', messageId: 'm2', title: 'Duplicate id', excerpt: 'Text', x: 3, y: 4 }, + { id: 'a2', kind: 'assistant-result', messageId: 'm1', title: 'Duplicate source', excerpt: 'Text', x: 5, y: 6 } + ])) + expect(artifacts).toEqual([ + { + id: 'a1', kind: 'assistant-result', messageId: 'm1', title: 'Answer', + excerpt: 'Text', x: 1, y: 2, width: 520, height: 300, sizeMode: 'auto' + } + ]) + expect(client.parseResearchCanvasArtifactNodes('bad-json')).toEqual([]) + expect(client.parseResearchCanvasArtifactNodes(JSON.stringify(Array.from({ length: 257 }, (_, index) => ({ + id: `a-${index}`, kind: 'assistant-result', messageId: `m-${index}`, + title: 'Answer', excerpt: 'Text', x: index, y: index + }))))).toHaveLength(256) + expect(client.parseResearchCanvasArtifactNodes(JSON.stringify([{ + id: 'long-title', kind: 'assistant-result', messageId: 'm-title', + title: 'x'.repeat(257), excerpt: 'Text', x: 1, y: 2 + }]))).toEqual([]) + expect(client.parseResearchCanvasArtifactNodes(JSON.stringify([{ + id: 'long-excerpt', kind: 'assistant-result', messageId: 'm-excerpt', + title: 'Answer', excerpt: 'x'.repeat(16_385), x: 1, y: 2 + }]))).toEqual([]) + expect(client.parseResearchCanvasArtifactNodes(JSON.stringify([{ + id: 'oversized', kind: 'assistant-result', messageId: 'm-oversized', + title: 'Answer', excerpt: 'x'.repeat(300_000), x: 1, y: 2 + }]))).toEqual([]) + + const files = [{ id: 'f1', name: 'one.pdf', source: 'computer', x: 1, y: 2 }] + expect(client.parseResearchCanvasSelection(JSON.stringify({ + selectedNodeIds: ['a1', 'f1', 'missing', 'a1'], orderedFileIds: ['f1', 'missing'] + }), files, artifacts)).toEqual({ selectedNodeIds: ['a1', 'f1'], orderedFileIds: ['f1'] }) + expect(client.parseResearchCanvasSelection('bad-json', files, artifacts)) + .toEqual({ selectedNodeIds: [], orderedFileIds: [] }) + }) + + it('accepts only the exact bounded Sherlock Research artifact drag shape', async () => { + const client = await loadConversationClient() + expect(client.parseResearchArtifactDrag).toBeTypeOf('function') + if (typeof client.parseResearchArtifactDrag !== 'function') return + + const payload = { + sessionId: 's1', messageId: 'm1', kind: 'assistant-result', title: 'Answer', excerpt: 'Text' + } + expect(client.parseResearchArtifactDrag(JSON.stringify(payload))).toEqual(payload) + expect(client.parseResearchArtifactDrag(JSON.stringify({ ...payload, id: 'untrusted' }))).toBeNull() + expect(client.parseResearchArtifactDrag(JSON.stringify({ + ...payload, html: 'Text' + }))).toBeNull() + expect(client.parseResearchArtifactDrag(JSON.stringify({ + ...payload, kind: 'assistant-html' + }))).toBeNull() + expect(client.parseResearchArtifactDrag(JSON.stringify({ ...payload, title: 'x'.repeat(257) }))).toBeNull() + expect(client.parseResearchArtifactDrag(JSON.stringify({ ...payload, excerpt: 'x'.repeat(16_385) }))).toBeNull() + const maximallyEscaped = { + sessionId: '\u0001'.repeat(512), + messageId: '\u0002'.repeat(512), + kind: 'assistant-excerpt', + title: '\u0003'.repeat(256), + excerpt: '\u0004'.repeat(16_384) + } + const maximallyEscapedRaw = JSON.stringify(maximallyEscaped) + expect(client.parseResearchArtifactDrag(maximallyEscapedRaw)).toEqual(maximallyEscaped) + expect(client.parseResearchArtifactDrag( + `${' '.repeat(256)}${maximallyEscapedRaw}` + )).toBeNull() + expect(client.parseResearchArtifactDrag('not-json')).toBeNull() + }) + + it('places and repositions a research artifact by its durable source identity', async () => { + const client = await loadConversationClient() + expect(client.placeResearchCanvasArtifact).toBeTypeOf('function') + if (typeof client.placeResearchCanvasArtifact !== 'function') return + const payload = { + sessionId: 's1', messageId: 'm1', kind: 'assistant-result', + title: 'Answer', excerpt: 'Evidence' + } + const placed = client.placeResearchCanvasArtifact( + [], payload, { x: 120, y: 80 }, () => 'artifact-1' + ) + expect(placed).toEqual([{ + id: 'artifact-1', messageId: 'm1', kind: 'assistant-result', + title: 'Answer', excerpt: 'Evidence', x: 120, y: 80, + width: 520, height: 300, sizeMode: 'auto' + }]) + expect(client.placeResearchCanvasArtifact( + placed, { ...payload, title: 'Revised' }, { x: 240, y: 160 }, () => 'unused' + )).toEqual([{ + id: 'artifact-1', messageId: 'm1', kind: 'assistant-result', + title: 'Answer', excerpt: 'Evidence', x: 240, y: 160, + width: 520, height: 300, sizeMode: 'auto' + }]) + }) + + it('keeps manual artifact geometry when dedupe repositions the same assistant result', async () => { + const client = await loadConversationClient() + expect(client.placeResearchCanvasArtifact).toBeTypeOf('function') + if (typeof client.placeResearchCanvasArtifact !== 'function') return + const manual = [{ + id: 'artifact-manual', messageId: 'm-manual', kind: 'assistant-result', + title: 'Original', excerpt: 'Original evidence', x: 20, y: 30, + width: 720, height: 480, sizeMode: 'manual' + }] + + expect(client.placeResearchCanvasArtifact( + manual, + { + sessionId: 's1', messageId: 'm-manual', kind: 'assistant-result', + title: 'Updated', excerpt: 'Updated evidence' + }, + { x: 240, y: 160 }, + () => 'unused' + )).toEqual([{ + id: 'artifact-manual', messageId: 'm-manual', kind: 'assistant-result', + title: 'Original', excerpt: 'Updated evidence', x: 240, y: 160, + width: 720, height: 480, sizeMode: 'manual' + }]) + }) + + it('keeps delimiter-bearing excerpt identities distinct during placement', async () => { + const client = await loadConversationClient() + expect(client.placeResearchCanvasArtifact).toBeTypeOf('function') + if (typeof client.placeResearchCanvasArtifact !== 'function') return + const first = { + sessionId: 's1', messageId: 'm:a', kind: 'assistant-excerpt', + title: '助手摘录', excerpt: 'b' + } + const second = { + sessionId: 's1', messageId: 'm', kind: 'assistant-excerpt', + title: '助手摘录', excerpt: 'a:b' + } + const placed = client.placeResearchCanvasArtifact( + [], first, { x: 10, y: 20 }, () => 'artifact-1' + ) + const together = client.placeResearchCanvasArtifact( + placed, second, { x: 30, y: 40 }, () => 'artifact-2' + ) + + expect(together).toMatchObject([ + { id: 'artifact-1', messageId: 'm:a', excerpt: 'b', x: 10, y: 20 }, + { id: 'artifact-2', messageId: 'm', excerpt: 'a:b', x: 30, y: 40 } + ]) + }) + + it('restores delimiter-bearing excerpt identities independently from persistence', async () => { + const client = await loadConversationClient() + expect(client.ResearchWorkspaceRegistry).toBeTypeOf('function') + if (typeof client.ResearchWorkspaceRegistry !== 'function') return + const storage = memoryStorage({ + 'sherlock.research.canvas.artifacts.v1:s1': JSON.stringify([ + { + id: 'artifact-1', kind: 'assistant-excerpt', messageId: 'm:a', + title: '助手摘录', excerpt: 'b', x: 10, y: 20 + }, + { + id: 'artifact-2', kind: 'assistant-excerpt', messageId: 'm', + title: '助手摘录', excerpt: 'a:b', x: 30, y: 40 + } + ]) + }) + const workspace = new client.ResearchWorkspaceRegistry(storage).for('s1') + + expect(workspace.getSnapshot().artifacts).toMatchObject([ + { id: 'artifact-1', messageId: 'm:a', excerpt: 'b' }, + { id: 'artifact-2', messageId: 'm', excerpt: 'a:b' } + ]) + }) + + it('rejects unsupported artifact kinds on set and localStorage restore', async () => { + const client = await loadConversationClient() + expect(client.ResearchWorkspaceRegistry).toBeTypeOf('function') + if (typeof client.ResearchWorkspaceRegistry !== 'function') return + const invalid = { + id: 'artifact-html', kind: 'assistant-html', messageId: 'm1', + title: 'HTML', excerpt: 'unsafe', x: 10, y: 20 + } + const restoredStorage = memoryStorage({ + 'sherlock.research.canvas.artifacts.v1:restored': JSON.stringify([invalid]) + }) + const restored = new client.ResearchWorkspaceRegistry(restoredStorage).for('restored') + expect(restored.getSnapshot().artifacts).toEqual([]) + + const setStorage = memoryStorage({}) + const setWorkspace = new client.ResearchWorkspaceRegistry(setStorage).for('set') + setWorkspace.setArtifacts([invalid]) + expect(setWorkspace.getSnapshot().artifacts).toEqual([]) + expect(JSON.parse(setStorage.getItem( + 'sherlock.research.canvas.artifacts.v1:set' + ) ?? 'null')).toEqual([]) + }) + + it('keeps one assistant result while normalized excerpts dedupe independently', async () => { + const client = await loadConversationClient() + expect(client.ResearchWorkspaceRegistry).toBeTypeOf('function') + if (typeof client.ResearchWorkspaceRegistry !== 'function') return + const values = new Map() + const storage = { + getItem: (key: string) => values.get(key) ?? null, + setItem: (key: string, value: string) => { values.set(key, value) } + } + const Registry = client.ResearchWorkspaceRegistry as new ( + storage: { + getItem(key: string): string | null + setItem(key: string, value: string): void + } + ) => { + for(id: string): { + getSnapshot(): { + artifacts: Array> + viewport: { scale: number; x: number; y: number } + canvasSize: { width: number; height: number } + } + addAssistantResult(input: { + messageId: string + text: string + at: { x: number; y: number } + }): void + addExcerpt( + messageId: string, + excerpt: string, + at: { x: number; y: number } + ): void + } + } + const workspace = new Registry(storage).for('s1') + + workspace.addAssistantResult({ + messageId: 'm1', text: 'Revenue improved.', at: { x: 120, y: 80 } + }) + workspace.addAssistantResult({ + messageId: 'm1', text: 'Revenue improved.', at: { x: 240, y: 160 } + }) + workspace.addExcerpt('m1', ' Margin expanded. ', { x: 300, y: 200 }) + workspace.addExcerpt('m1', 'Margin expanded.', { x: 340, y: 220 }) + workspace.addExcerpt('m1', 'Cash flow improved.', { x: 380, y: 240 }) + + expect(workspace.getSnapshot().artifacts).toMatchObject([ + { + kind: 'assistant-result', messageId: 'm1', excerpt: 'Revenue improved.', + x: 240, y: 160 + }, + { + kind: 'assistant-excerpt', messageId: 'm1', excerpt: 'Margin expanded.', + x: 340, y: 220 + }, + { + kind: 'assistant-excerpt', messageId: 'm1', excerpt: 'Cash flow improved.', + x: 380, y: 240 + } + ]) + expect(JSON.parse(values.get( + 'sherlock.research.canvas.artifacts.v1:s1' + ) ?? '[]')).toHaveLength(3) + }) + + it('persists the full supported set of ordinary maximum-length artifacts', async () => { + const client = await loadConversationClient() + expect(client.ResearchWorkspaceRegistry).toBeTypeOf('function') + if (typeof client.ResearchWorkspaceRegistry !== 'function') return + const values = new Map() + const storage = { + getItem: (key: string) => values.get(key) ?? null, + setItem: (key: string, value: string) => { + if (value.length <= 8 * 1024 * 1024) values.set(key, value) + } + } + const workspace = new client.ResearchWorkspaceRegistry(storage).for('capacity') + + workspace.setArtifacts(Array.from({ length: 256 }, (_, index) => ({ + id: `artifact-${index}`, + kind: 'assistant-excerpt', + messageId: `message-${index}`, + title: '助手摘录', + excerpt: `${index}:${'x'.repeat(16_374)}`, + x: index, + y: index + }))) + + expect(workspace.getSnapshot().artifacts).toHaveLength(256) + expect(new client.ResearchWorkspaceRegistry(storage) + .for('capacity').getSnapshot().artifacts).toHaveLength(256) + }) + + it('keeps existing artifacts when escaped content reaches the aggregate cap', async () => { + const client = await loadConversationClient() + expect(client.ResearchWorkspaceRegistry).toBeTypeOf('function') + expect(client.placeResearchCanvasArtifact).toBeTypeOf('function') + if (typeof client.ResearchWorkspaceRegistry !== 'function' || + typeof client.placeResearchCanvasArtifact !== 'function') return + const values = new Map() + const storage = { + getItem: (key: string) => values.get(key) ?? null, + setItem: (key: string, value: string) => { + if (value.length <= 8 * 1024 * 1024) values.set(key, value) + } + } + const workspace = new client.ResearchWorkspaceRegistry(storage).for('escaped') + + workspace.setArtifacts([ + { + id: 'result-id', kind: 'assistant-result', messageId: 'result', + title: '助手回复', excerpt: 'short', x: -1, y: -1 + }, + ...Array.from({ length: 255 }, (_, index) => ({ + id: `artifact-${index}`, + kind: 'assistant-excerpt', + messageId: `message-${index}`, + title: '助手摘录', + excerpt: `${index}:${'\u0001'.repeat(16_374)}`, + x: index, + y: index + })) + ]) + const before = workspace.getSnapshot().artifacts + expect(before.length).toBeGreaterThan(0) + expect(before.length).toBeLessThan(256) + + const next = client.placeResearchCanvasArtifact( + before, + { + sessionId: 'escaped', messageId: 'dragged', kind: 'assistant-excerpt', + title: '助手摘录', excerpt: 'short' + }, + { x: 0, y: 0 }, + () => 'dragged' + ) + workspace.setArtifacts(next) + + expect(workspace.getSnapshot().artifacts.length).toBeGreaterThanOrEqual(before.length) + expect(workspace.getSnapshot().artifacts[0]).toEqual(before[0]) + expect(new client.ResearchWorkspaceRegistry(storage) + .for('escaped').getSnapshot().artifacts[0]).toEqual(before[0]) + + const beforeUpdate = workspace.getSnapshot().artifacts + const beforeIds = new Set(beforeUpdate.map((artifact: { id: string }) => artifact.id)) + workspace.addAssistantResult({ + messageId: 'result', text: '\u0001'.repeat(16_384), at: { x: 1, y: 1 } + }) + const afterUpdate = workspace.getSnapshot().artifacts + expect(afterUpdate).toHaveLength(beforeUpdate.length) + expect(afterUpdate.every((artifact: { id: string }) => beforeIds.has(artifact.id))).toBe(true) + expect(afterUpdate.find((artifact: { messageId: string }) => artifact.messageId === 'result')) + .toMatchObject({ excerpt: 'short', x: -1, y: -1 }) + }, 15_000) + + it('publishes deeply immutable file and artifact nodes from a workspace snapshot', async () => { + const client = await loadConversationClient() + expect(client.ResearchWorkspaceRegistry).toBeTypeOf('function') + if (typeof client.ResearchWorkspaceRegistry !== 'function') return + const storage = { + getItem(key: string) { + if (key === 'sherlock.research.canvas.files.v1:s1') return JSON.stringify([ + { id: 'f1', name: 'one.pdf', source: 'computer', x: 1, y: 2 } + ]) + if (key === 'sherlock.research.canvas.artifacts.v1:s1') return JSON.stringify([ + { id: 'a1', kind: 'assistant-result', messageId: 'm1', title: 'Answer', excerpt: 'Text', x: 3, y: 4 } + ]) + return null + }, + setItem() {} + } + const snapshot = new client.ResearchWorkspaceRegistry(storage).for('s1').getSnapshot() + + expect(Object.isFrozen(snapshot.files[0])).toBe(true) + expect(Object.isFrozen(snapshot.artifacts[0])).toBe(true) + expect(() => { snapshot.files[0].name = 'mutated.pdf' }).toThrow(TypeError) + expect(() => { snapshot.artifacts[0].title = 'Mutated' }).toThrow(TypeError) + expect(snapshot.files[0].name).toBe('one.pdf') + expect(snapshot.artifacts[0].title).toBe('Answer') + }) + + it('releases every transient source state while preserving persisted Research state', async () => { + const client = await loadConversationClient() + expect(client.ResearchWorkspaceRegistry).toBeTypeOf('function') + if (typeof client.ResearchWorkspaceRegistry !== 'function') return + const storage = memoryStorage({ + 'sherlock.research.canvas.files.v1:s1': JSON.stringify([ + { id: 'f1', path: '/w/one.pdf', name: 'one.pdf', source: 'computer', x: 1, y: 2 } + ]), + 'sherlock.research.canvas.artifacts.v1:s1': JSON.stringify([ + { id: 'a1', kind: 'assistant-result', messageId: 'm1', title: 'Answer', excerpt: 'Text', x: 3, y: 4 } + ]), + 'sherlock.research.canvas.selection.v1:s1': JSON.stringify({ + selectedNodeIds: ['f1', 'a1'], orderedFileIds: ['f1'] + }) + }) + const registry = new client.ResearchWorkspaceRegistry(storage) + const workspace = registry.for('s1') + workspace.setPendingMessageJump('m1') + workspace.setSourceAvailability('m1', false) + const before = workspace.getSnapshot() + expect(before.unavailableSourceMessageIds).toEqual(['m1']) + + registry.release('s1') + + const after = workspace.getSnapshot() + expect(after.pendingMessageJump).toBeNull() + expect(after.unavailableSourceMessageIds).toEqual([]) + expect(after.files).toEqual(before.files) + expect(after.artifacts).toEqual(before.artifacts) + expect(after.selection).toEqual(before.selection) + expect(JSON.parse(storage.getItem( + 'sherlock.research.canvas.selection.v1:s1' + ) ?? 'null')).toEqual({ + selectedNodeIds: ['f1', 'a1'], orderedFileIds: ['f1'] + }) + }) + + it('submits ordered Research files with images and restores one rejected attempt atomically', async () => { + const available = vi.fn(async (paths: string[]) => paths.map(() => true)) + const client = await loadClientBundle( + 'dsh-client-ui-conversation', + {}, + { researchFilesAvailable: available } + ) + expect(client.InputHub).toBeTypeOf('function') + expect(client.ResearchWorkspaceRegistry).toBeTypeOf('function') + if (typeof client.InputHub !== 'function' || + typeof client.ResearchWorkspaceRegistry !== 'function') return + + const storage = memoryStorage({ + 'sherlock.research.canvas.files.v1:s1': JSON.stringify([ + { id: 'f1', path: '/w/one.pdf', name: 'one.pdf', source: 'computer', x: 10, y: 20 }, + { id: 'f2', path: '/w/two.pdf', name: 'two.pdf', source: 'computer', x: 30, y: 40 } + ]), + 'sherlock.research.canvas.selection.v1:s1': JSON.stringify({ + selectedNodeIds: ['f1', 'f2'], orderedFileIds: ['f2', 'f1'] + }) + }) + const registry = new client.ResearchWorkspaceRegistry(storage) + const sendGate = deferred() + const sendSession = vi.fn(() => sendGate.promise) + const released: string[] = [] + const conversation = { + sendSession, + releaseDraftImage: (id: string) => { released.push(id) } + } + const rootCtx = { + get: (name: string) => name === 'conversation' ? conversation : undefined + } + const hub = new client.InputHub(rootCtx, (key: string) => key, registry) + expect(hub.setResearchActive).toBeTypeOf('function') + hub.setResearchActive('s1', true) + + const referencedFiles = [ + { id: 'f2', name: 'two.pdf', path: '/w/two.pdf' }, + { id: 'f1', name: 'one.pdf', path: '/w/one.pdf' } + ] + const serializedDraft = await serializedResearchReferences( + client, referencedFiles, 'compare these' + ) + let draft = '\uFFFC\uFFFCcompare these' + let draftRev = 1 + let occurrences = referencedFiles.map((file, index) => ({ + occurrenceId: index + 1, + source: 'research-file', + ref: JSON.stringify(file), + offset: index, + label: file.name, + clipboardText: file.name + })) + let imageIds = ['i1'] + const notices: string[] = [] + const shell = { + get snapshot() { return { draft, draftRev, occurrences, imageIds: [...imageIds] } }, + commitSend(admitted: string[]) { + const sent = new Set(admitted) + imageIds = imageIds.filter((id) => !sent.has(id)) + draft = '' + occurrences = [] + draftRev += 1 + }, + restoreImages(admitted: string[]) { + const sent = new Set(admitted) + imageIds = [...admitted, ...imageIds.filter((id) => !sent.has(id))] + }, + restoreDraftState(state: { draft: string; occurrences: typeof occurrences }) { + draft = state.draft + occurrences = state.occurrences + draftRev += 1 + }, + notify(_level: string, text: string) { notices.push(text) } + } + hub.shells.set('s1', shell) + const session = { sessionId: 's1' } + + const operation = hub.sink(session, serializedDraft, [...imageIds], 'queue') + await vi.waitFor(() => { expect(sendSession).toHaveBeenCalledTimes(1) }) + + expect(available).toHaveBeenCalledWith(['/w/two.pdf', '/w/one.pdf']) + const [, prompt, admittedImages, mode] = sendSession.mock.calls[0] as unknown as [ + unknown, string, string[], string + ] + expect(client.parseResearchPrompt(prompt).files.map((file: { id: string }) => file.id)) + .toEqual(['f2', 'f1']) + expect(client.parseResearchPrompt(prompt).text).toBe('compare these') + expect(admittedImages).toEqual(['i1']) + expect(mode).toBe('queue') + expect((sendSession.mock.calls as unknown[][])[0]?.[0]).toBe(session) + expect(draft).toBe('') + expect(imageIds).toEqual([]) + expect(registry.for('s1').selectionSnapshot()).toEqual({ + selectedNodeIds: [], orderedFileIds: [] + }) + + imageIds = ['i2', 'i1'] + sendGate.reject(new Error('send failed')) + await operation + + expect(draft).toBe('\uFFFC\uFFFCcompare these') + expect(occurrences).toHaveLength(2) + expect(imageIds).toEqual(['i1', 'i2']) + expect(registry.for('s1').selectionSnapshot()).toEqual({ + selectedNodeIds: ['f1', 'f2'], orderedFileIds: ['f2', 'f1'] + }) + expect(registry.for('s1').getSnapshot().files).toMatchObject([ + { id: 'f1', x: 10, y: 20 }, + { id: 'f2', x: 30, y: 40 } + ]) + expect(released).toEqual([]) + expect(notices).toEqual([]) + }) + + it('admits file-only Research sends and blocks pathless or unavailable files without clearing', async () => { + const availability = vi.fn(async (paths: string[]) => paths.map((path) => !path.includes('missing'))) + const client = await loadClientBundle( + 'dsh-client-ui-conversation', + {}, + { researchFilesAvailable: availability } + ) + expect(client.InputHub).toBeTypeOf('function') + if (typeof client.InputHub !== 'function') return + + const cases = [ + { id: 'valid', path: '/w/report.pdf', sends: 1, cleared: true, draft: '', images: [] }, + { id: 'pathless', path: undefined, sends: 0, cleared: false, draft: 'keep me', images: ['i1'] }, + { id: 'missing', path: '/w/missing.pdf', sends: 0, cleared: false, draft: 'keep me', images: ['i1'] } + ] as const + for (const fixture of cases) { + const sessionId = `session-${fixture.id}` + const storage = memoryStorage({ + [`sherlock.research.canvas.files.v1:${sessionId}`]: JSON.stringify([{ + id: 'f1', name: 'report.pdf', source: 'computer', x: 1, y: 2, + ...(fixture.path === undefined ? {} : { path: fixture.path }) + }]), + [`sherlock.research.canvas.selection.v1:${sessionId}`]: JSON.stringify({ + selectedNodeIds: ['f1'], orderedFileIds: ['f1'] + }) + }) + const registry = new client.ResearchWorkspaceRegistry(storage) + const sendSession = vi.fn(async () => undefined) + const hub = new client.InputHub({ + get: (name: string) => name === 'conversation' + ? { sendSession, releaseDraftImage: () => undefined } + : undefined + }, (key: string) => key, registry) + hub.setResearchActive(sessionId, true) + const file = { + id: 'f1', name: 'report.pdf', + ...(fixture.path === undefined ? {} : { path: fixture.path }) + } + const serializedDraft = await serializedResearchReferences(client, [file], fixture.draft) + const admittedDraft = `\uFFFC${fixture.draft}` + let draft: string = admittedDraft + let draftRev = 1 + let occurrences = [{ + occurrenceId: 1, + source: 'research-file', + ref: JSON.stringify(file), + offset: 0, + label: file.name, + clipboardText: file.name + }] + let imageIds: string[] = [...fixture.images] + const notices: string[] = [] + const shell = { + get snapshot() { return { draft, draftRev, occurrences, imageIds } }, + commitSend() { draft = ''; occurrences = []; imageIds = []; draftRev += 1 }, + restoreImages() {}, + restoreDraftState(state: { draft: string; occurrences: typeof occurrences }) { + draft = state.draft + occurrences = state.occurrences + draftRev += 1 + }, + notify(_level: string, text: string) { notices.push(text) } + } + hub.shells.set(sessionId, shell) + + await hub.sink({ sessionId }, serializedDraft, [...imageIds], 'queue') + + expect(sendSession).toHaveBeenCalledTimes(fixture.sends) + expect(registry.for(sessionId).selectionSnapshot().orderedFileIds) + .toEqual(fixture.cleared ? [] : ['f1']) + expect(draft).toBe(fixture.cleared ? '' : admittedDraft) + expect(imageIds).toEqual(fixture.cleared ? [] : fixture.images) + expect(notices.length > 0).toBe(!fixture.cleared) + } + }) + + it('does not overwrite a draft edited after an optimistic Research clear', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation') + const registry = new client.ResearchWorkspaceRegistry(memoryStorage({})) + const gate = deferred() + const hub = new client.InputHub({ + get: (name: string) => name === 'conversation' + ? { sendSession: () => gate.promise, releaseDraftImage: () => undefined } + : undefined + }, (key: string) => key, registry) + const session = { sessionId: 's-edited' } + let draft = 'first draft' + let draftRev = 1 + const shell = { + get snapshot() { return { draft, draftRev, occurrences: [], imageIds: [] } }, + commitSend() { draft = ''; draftRev += 1 }, + restoreImages() {}, + restoreDraftState(state: { draft: string }) { draft = state.draft; draftRev += 1 }, + notify() {} + } + hub.shells.set(session.sessionId, shell) + + const operation = hub.sink(session, draft, [], 'queue') + await vi.waitFor(() => { expect(draft).toBe('') }) + draft = 'new untouched work' + gate.reject(new Error('send failed')) + await operation + + expect(draft).toBe('new untouched work') + }) + + it('does not resurrect a submitted draft after the user types and clears before rejection', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation') + const registry = new client.ResearchWorkspaceRegistry(memoryStorage({})) + const gate = deferred() + const hub = new client.InputHub({ + get: (name: string) => name === 'conversation' + ? { sendSession: () => gate.promise, releaseDraftImage: () => undefined } + : undefined + }, (key: string) => key, registry) + const session = { sessionId: 's-edited-then-cleared' } + let draft = 'first draft' + let draftRev = 1 + const shell = { + get snapshot() { return { draft, draftRev, occurrences: [], imageIds: [] } }, + commitSend() { draft = ''; draftRev += 1 }, + restoreImages() {}, + setDraft(text: string) { draft = text; draftRev += 1 }, + restoreDraftState(state: { draft: string }) { draft = state.draft; draftRev += 1 }, + notify() {} + } + hub.shells.set(session.sessionId, shell) + + const operation = hub.sink(session, draft, [], 'queue') + await vi.waitFor(() => { expect(draft).toBe('') }) + shell.setDraft('new work') + shell.setDraft('') + gate.reject(new Error('send failed')) + await operation + + expect(draft).toBe('') + }) + + it('lets the input shell submit a file-only native Research reference', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation', { + '@deepseek-ai/dsh-client-runtime/client': { createSnapshotStore } + }) + expect(client.SessionInputShell).toBeTypeOf('function') + if (typeof client.SessionInputShell !== 'function') return + const sends: Array<{ text: string, images: string[], mode: string }> = [] + const shell = new client.SessionInputShell({ + actx: {}, + inputTriggers: () => ({ + adjudicate: async () => undefined, + serializeReference: (_source: string, ref: string, signal: AbortSignal) => + client.researchFileReferenceCodec.serialize(ref, signal), + dismiss: () => undefined, + track: () => undefined + }), + defaultSink: (text: string, images: string[], mode: string) => { + sends.push({ text, images, mode }) + } + }) + + shell.insertReference( + client.researchFileReference({ id: 'f1', name: 'report.pdf', path: '/w/report.pdf' }), + { start: 0, end: 0, draftRev: shell.snapshot.draftRev } + ) + + shell.submit('queue') + + await vi.waitFor(() => { expect(sends).toHaveLength(1) }) + expect(client.extractResearchFileReferences(sends[0]?.text)).toEqual({ + text: '', + files: [{ id: 'f1', name: 'report.pdf', path: '/w/report.pdf' }], + occurrences: [{ fileId: 'f1', offset: 0 }] + }) + expect(sends[0]).toMatchObject({ images: [], mode: 'queue' }) + expect(shell.snapshot.draft).toContain('\uFFFC') + expect(shell.snapshot.imageIds).toEqual([]) + }) + + it('restores admitted image order before concurrent images without duplicates', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation', { + '@deepseek-ai/dsh-client-runtime/client': { createSnapshotStore } + }) + const shell = new client.SessionInputShell({ actx: {}, defaultSink: () => undefined }) + shell.addImages(['i1']) + shell.commitSend(['i1']) + shell.addImages(['i2', 'i1']) + shell.restoreImages(['i1']) + + expect(shell.snapshot.imageIds).toEqual(['i1', 'i2']) + }) + + it('keeps image blocks before one serialized Research text block and releases only admitted images', async () => { + class Service { + ctx: unknown + constructor(ctx: unknown) { this.ctx = ctx } + } + const client = await loadClientBundle('dsh-client-ui-conversation', { + '@deepseek-ai/cordis': { Service } + }) + expect(client.ConversationController).toBeTypeOf('function') + if (typeof client.ConversationController !== 'function') return + const ctx = { effect: () => undefined } + const controller = new client.ConversationController(ctx, { input: {}, blocks: {} }) + controller.draftAttachments.set('i1', { + id: 'i1', previewUrl: 'blob:i1', kind: 'image', + file: { + name: 'chart.png', type: 'image/png', + arrayBuffer: async () => Uint8Array.of(1, 2).buffer + } + }) + controller.draftAttachments.set('i2', { + id: 'i2', previewUrl: 'blob:i2', kind: 'image', + file: { + name: 'later.png', type: 'image/png', + arrayBuffer: async () => Uint8Array.of(3).buffer + } + }) + const prompt = client.serializeResearchPrompt([ + { id: 'f2', name: 'two.pdf', path: '/w/two.pdf' }, + { id: 'f1', name: 'one.pdf', path: '/w/one.pdf' } + ], 'compare these') + const calls: Array<{ content: Array>, mode: string }> = [] + const session = { + prompt: async (content: Array>, mode: string) => { + calls.push({ content, mode }) + return { ok: true } + } + } + + await controller.sendSession(session, prompt, ['i1'], 'queue') + + expect(calls).toHaveLength(1) + expect(calls[0]?.content.map((block) => block.type)).toEqual(['image', 'text']) + const text = calls[0]?.content[1]?.text as string + expect(client.parseResearchPrompt(text).files.map((file: { id: string }) => file.id)) + .toEqual(['f2', 'f1']) + expect(controller.draftImages(['i1'])).toEqual([]) + expect(controller.draftImages(['i2']).map((attachment: { id: string }) => attachment.id)) + .toEqual(['i2']) + }) + + it('writes the exact Sherlock file MIME payload with copy semantics', async () => { + const client = await loadClientBundle('dsh-client-ui-tool') + expect(client.writeSherlockFileDrag).toBeTypeOf('function') + if (typeof client.writeSherlockFileDrag !== 'function') return + const writes: Array<[string, string]> = [] + const transfer = { + effectAllowed: 'none', + setData(type: string, value: string) { writes.push([type, value]) } + } + + client.writeSherlockFileDrag(transfer, { + path: '/w/report.pdf', + name: 'report.pdf' + }) + + expect(transfer.effectAllowed).toBe('copy') + expect(writes).toEqual([[ + 'application/x-sherlock-file', + '{"path":"/w/report.pdf","name":"report.pdf"}' + ]]) + }) + + it('resolves right-details relative paths before dragging', async () => { + const client = await loadClientBundle('dsh-client-ui-tool', { + '@deepseek-ai/dsh-client-runtime/client': { + resolveWorkspacePath: (cwd: string, path: string) => `${cwd}/${path}`, + shallowEqual: Object.is + } + }) + expect(client.sherlockDetailsFileDescriptor).toBeTypeOf('function') + if (typeof client.sherlockDetailsFileDescriptor !== 'function') return + + expect(client.sherlockDetailsFileDescriptor('outputs/report.pdf', '/w')).toEqual({ + path: '/w/outputs/report.pdf', + name: 'report.pdf' + }) + }) + + it('renders a draggable file chip for a file-bearing details block', async () => { + const client = await loadClientBundle('dsh-client-ui-tool', { + '@deepseek-ai/dsh-client-runtime/client': { + resolveWorkspacePath: (cwd: string, path: string) => `${cwd}/${path}`, + shallowEqual: Object.is + } + }) + expect(client.ToolDetails).toBeTypeOf('function') + if (typeof client.ToolDetails !== 'function') return + const react = requireModule('react') as { + createElement: (type: unknown, props?: unknown, ...children: unknown[]) => unknown + } + const { renderToStaticMarkup } = requireModule('react-dom/server') as { + renderToStaticMarkup(node: unknown): string + } + + const html = renderToStaticMarkup(react.createElement(client.ToolDetails, { + block: { + callId: 'call-read', + name: 'read', + argsRaw: '{"path":"outputs/report.pdf"}' + }, + cwd: '/w', + t: (key: string) => key + })) + + expect(html).toContain('draggable="true"') + expect(html).toContain('data-sherlock-file-drag-source="/w/outputs/report.pdf"') + expect(html).toContain('>report.pdf') + }) + + it('canonicalizes only safe web component URLs', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation') + expect(client.normalizeResearchWebUrl).toBeTypeOf('function') + if (typeof client.normalizeResearchWebUrl !== 'function') return + + expect(client.normalizeResearchWebUrl(' HTTPS://Example.com:443/dashboard ')) + .toBe('https://example.com/dashboard') + expect(client.normalizeResearchWebUrl('http://Example.com:80/path')) + .toBe('http://example.com/path') + expect(client.normalizeResearchWebUrl(' http:// www.baidu.com ')) + .toBe('http://www.baidu.com/') + expect(client.normalizeResearchWebUrl('http://%20www.baidu.com/')) + .toBe('http://www.baidu.com/') + for (const value of [ + 'file:///tmp/report.html', + 'javascript:alert(1)', + 'data:text/html,hello', + 'https://user:pass@example.com/', + `https://example.com/${'x'.repeat(8_192)}` + ]) { + expect(client.normalizeResearchWebUrl(value), value).toBeNull() + } + }) + + it('accepts five exact bounded native container schemas and rejects executable or malformed output', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation') + expect(client.parseResearchContainerSpec).toBeTypeOf('function') + if (typeof client.parseResearchContainerSpec !== 'function') return + + const fixtures = [ + { + version: 1, type: 'web', title: '市场监控', + url: 'https://example.com/market', description: '公开市场页面' + }, + { + version: 1, type: 'chart', title: '收入趋势', variant: 'bar', + labels: ['一月', '二月'], series: [{ name: '收入', values: [10, 12] }] + }, + { + version: 1, type: 'table', title: '产品数据', + columns: ['产品', '规模'], rows: [['A', 10], ['B', 12]] + }, + { + version: 1, type: 'kpi', title: '核心指标', + items: [{ label: '收入', value: '12 亿', change: '+8%' }] + }, + { + version: 1, type: 'markdown', title: '研究结论', + content: '## 结论\n\n增长保持稳定。' + } + ] + for (const fixture of fixtures) { + expect(client.parseResearchContainerSpec(JSON.stringify(fixture))) + .toEqual(fixture) + } + expect(client.parseResearchContainerSpec('```json\n' + JSON.stringify(fixtures[1]) + '\n```')) + .toEqual(fixtures[1]) + expect(client.parseResearchContainerSpec(JSON.stringify({ + version: 1, type: 'markdown', title: '危险内容', content: '', + script: 'alert(1)' + }))).toBeNull() + expect(client.parseResearchContainerSpec({ + version: 1, type: 'chart', title: '错误图表', variant: 'line', + labels: ['一月'], series: [{ name: '收入', values: [Number.POSITIVE_INFINITY] }] + })).toBeNull() + expect(client.parseResearchContainerSpec('{"version":1,"type":"script"}')).toBeNull() + }) + + it('persists bounded web-link and container draft artifacts while rejecting invalid fields', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation') + expect(client.parseResearchCanvasArtifactNodes).toBeTypeOf('function') + if (typeof client.parseResearchCanvasArtifactNodes !== 'function') return + const nodes = [{ + id: 'link-1', kind: 'web-link', messageId: 'link-1', title: 'example.com', + excerpt: 'https://example.com/dashboard', url: 'https://example.com/dashboard', + x: 200, y: 180, width: 720, height: 480, sizeMode: 'auto' + }, { + id: 'container-1', kind: 'generated-container', messageId: 'container-1', + title: '智能容器', excerpt: '描述想创建的内容', generationStatus: 'draft', + containerPrompt: '', refreshMinutes: 0, + x: 500, y: 180, width: 520, height: 300, sizeMode: 'auto' + }] + + expect(client.parseResearchCanvasArtifactNodes(JSON.stringify(nodes))) + .toMatchObject(nodes) + expect(client.parseResearchCanvasArtifactNodes(JSON.stringify([{ + ...nodes[0], url: 'javascript:alert(1)' + }]))).toEqual([]) + expect(client.parseResearchCanvasArtifactNodes(JSON.stringify([{ + ...nodes[1], refreshMinutes: 2 + }]))).toEqual([]) + }) + + it('places new global-toolbar nodes at the visible center with a bounded cascade', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation') + expect(client.researchCanvasViewportPlacement).toBeTypeOf('function') + if (typeof client.researchCanvasViewportPlacement !== 'function') return + const snapshot = { + viewport: { scale: 0.5, x: -100, y: -50 }, + canvasSize: { width: 800, height: 600 } + } + + expect(client.researchCanvasViewportPlacement(snapshot, 'web-link', 0)) + .toEqual({ x: 1_000, y: 700, width: 720, height: 480, sizeMode: 'auto' }) + expect(client.researchCanvasViewportPlacement(snapshot, 'generated-container', 8)) + .toEqual({ x: 1_144, y: 844, width: 520, height: 300, sizeMode: 'auto' }) + expect(client.researchCanvasViewportPlacement(snapshot, 'unknown', 0)).toBeNull() + }) + + it('allows scheduled container refresh only while the completed component is active and due', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation') + expect(client.researchContainerRefreshDue).toBeTypeOf('function') + if (typeof client.researchContainerRefreshDue !== 'function') return + const node = { + kind: 'generated-container', generationStatus: 'completed', refreshMinutes: 1, + lastSuccessfulAt: 1_000, containerSpec: { version: 1, type: 'markdown' } + } + + expect(client.researchContainerRefreshDue(node, { + visible: true, documentVisible: true, inert: false, now: 61_000 + })).toBe(true) + for (const state of [ + { visible: false, documentVisible: true, inert: false, now: 61_000 }, + { visible: true, documentVisible: false, inert: false, now: 61_000 }, + { visible: true, documentVisible: true, inert: true, now: 61_000 }, + { visible: true, documentVisible: true, inert: false, now: 60_999 } + ]) { + expect(client.researchContainerRefreshDue(node, state)).toBe(false) + } + expect(client.researchContainerRefreshDue({ + ...node, generationStatus: 'running' + }, { + visible: true, documentVisible: true, inert: false, now: 120_000 + })).toBe(false) + }) + + it('creates, updates, selects, and restores global-toolbar artifacts through the workspace', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation') + const storage = memoryStorage({}) + const registry = new client.ResearchWorkspaceRegistry(storage) + const workspace = registry.for('global-toolbar-session') + workspace.setCanvasSize({ width: 800, height: 600 }) + workspace.setViewport({ scale: 1, x: 0, y: 0 }) + + expect(workspace.createWebLink).toBeTypeOf('function') + expect(workspace.createContainerDraft).toBeTypeOf('function') + expect(workspace.updateWebLink).toBeTypeOf('function') + expect(workspace.updateContainerDraft).toBeTypeOf('function') + expect(workspace.setContainerRefresh).toBeTypeOf('function') + if (typeof workspace.createWebLink !== 'function') return + + const link = workspace.createWebLink('https://Example.com/dashboard') + expect(link).toMatchObject({ + kind: 'web-link', title: 'example.com', url: 'https://example.com/dashboard', + x: 400, y: 300, width: 720, height: 480 + }) + expect(workspace.getSnapshot().selection.selectedNodeIds).toEqual([link.id]) + expect(workspace.updateWebLink(link.id, 'javascript:alert(1)')).toBe(false) + expect(workspace.updateWebLink(link.id, 'https://example.org/next')).toBe(true) + + const container = workspace.createContainerDraft() + expect(container).toMatchObject({ + kind: 'generated-container', generationStatus: 'draft', + containerPrompt: '', refreshMinutes: 0, + x: 424, y: 324, width: 520, height: 300 + }) + expect(workspace.updateContainerDraft(container.id, ' ')).toBe(false) + expect(workspace.updateContainerDraft(container.id, '制作月度收入柱状图')).toBe(true) + expect(workspace.setContainerRefresh(container.id, 2)).toBe(false) + expect(workspace.setContainerRefresh(container.id, 5)).toBe(true) + + const restored = new client.ResearchWorkspaceRegistry(storage) + .for('global-toolbar-session').getSnapshot() + expect(restored.artifacts).toMatchObject([{ + id: link.id, kind: 'web-link', url: 'https://example.org/next' + }, { + id: container.id, kind: 'generated-container', + containerPrompt: '制作月度收入柱状图', refreshMinutes: 5 + }]) + expect(restored.selection.selectedNodeIds).toEqual([container.id]) + }) +}) diff --git a/test/research-file-preview.test.ts b/test/research-file-preview.test.ts new file mode 100644 index 000000000..6ecdf1e71 --- /dev/null +++ b/test/research-file-preview.test.ts @@ -0,0 +1,1696 @@ +import { + chmod, + lstat, + mkdir, + mkdtemp, + open, + readFile, + realpath, + rename, + rm, + stat, + symlink, + writeFile +} from 'node:fs/promises' +import { createReadStream } from 'node:fs' +import { tmpdir } from 'node:os' +import path from 'node:path' +import { Readable } from 'node:stream' +import { afterEach, describe, expect, it, vi } from 'vitest' +import { strToU8, zipSync } from 'fflate' +import { + FileResearchPreviewAuthorizationStorage, + HarnessWorkspaceFileResolver, + RESEARCH_PREVIEW_CSP, + ResearchFilePreviewRegistry, + handleResearchFilePreviewProtocolRequest, + registerResearchFilePreviewHandlers, + researchPreviewAuthorizationStoragePath, + type ResearchPreviewAuthorizationStorage, + type ResearchPreviewFileSystem, + type ResearchPreviewAuthorizationRecord, + type ResearchFilePreviewDescriptor +} from '../src/main/state/research-file-preview' + +const temporaryDirectories: string[] = [] + +async function temporaryDirectory(): Promise { + const directory = await mkdtemp(path.join(tmpdir(), 'sherlock-preview-')) + temporaryDirectories.push(directory) + return directory +} + +afterEach(async () => { + await Promise.all(temporaryDirectories.splice(0).map((directory) => + rm(directory, { recursive: true, force: true }) + )) +}) + +const pngBytes = Buffer.from([ + 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, + 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52 +]) + +const icoBytes = Buffer.concat([ + Buffer.from([ + 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, + 0x10, 0x10, 0x00, 0x00, 0x01, 0x00, 0x20, 0x00, + pngBytes.length, 0x00, 0x00, 0x00, + 0x16, 0x00, 0x00, 0x00 + ]), + pngBytes +]) + +const avifBytes = Buffer.from([ + 0x00, 0x00, 0x00, 0x18, + 0x66, 0x74, 0x79, 0x70, + 0x61, 0x76, 0x69, 0x66, + 0x00, 0x00, 0x00, 0x00, + 0x6d, 0x69, 0x66, 0x31, + 0x61, 0x76, 0x69, 0x66 +]) + +type OfficeFamily = 'docx' | 'xlsx' | 'pptx' + +const officeFamilyMarker: Record = { + docx: 'word/document.xml', + xlsx: 'xl/workbook.xml', + pptx: 'ppt/presentation.xml' +} + +const officeContentType: Record = { + docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', + xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', + pptx: 'application/vnd.openxmlformats-officedocument.presentationml.presentation' +} + +function minimalOfficeZip(family: OfficeFamily, extra: Record = {}): Buffer { + return Buffer.from(zipSync({ + '[Content_Types].xml': strToU8(''), + '_rels/.rels': strToU8(''), + [officeFamilyMarker[family]]: strToU8(''), + ...extra + }, { level: 0 })) +} + +function findZipSignature(value: Buffer, signature: number, from = 0): number { + for (let offset = from; offset <= value.length - 4; offset += 1) { + if (value.readUInt32LE(offset) === signature) return offset + } + return -1 +} + +function mutateZip(value: Buffer, mutate: (copy: Buffer, eocd: number, central: number) => void): Buffer { + const copy = Buffer.from(value) + const eocd = findZipSignature(copy, 0x06054b50) + const central = findZipSignature(copy, 0x02014b50) + if (eocd < 0 || central < 0) throw new Error('Expected a conventional ZIP fixture.') + mutate(copy, eocd, central) + return copy +} + +function withFirstEntryFlag( + value: Buffer, + flag: number, + target: 'both' | 'local' | 'central' = 'both' +): Buffer { + return mutateZip(value, (copy, _eocd, central) => { + const local = copy.readUInt32LE(central + 42) + if (target !== 'central') copy.writeUInt16LE(copy.readUInt16LE(local + 6) | flag, local + 6) + if (target !== 'local') copy.writeUInt16LE(copy.readUInt16LE(central + 8) | flag, central + 8) + }) +} + +function withFirstEntryDeclaredMetadata( + value: Buffer, + metadata: { crc32?: number; uncompressedSize?: number } +): Buffer { + return mutateZip(value, (copy, _eocd, central) => { + const local = copy.readUInt32LE(central + 42) + if (metadata.crc32 !== undefined) { + copy.writeUInt32LE(metadata.crc32 >>> 0, local + 14) + copy.writeUInt32LE(metadata.crc32 >>> 0, central + 16) + } + if (metadata.uncompressedSize !== undefined) { + copy.writeUInt32LE(metadata.uncompressedSize >>> 0, local + 22) + copy.writeUInt32LE(metadata.uncompressedSize >>> 0, central + 24) + } + }) +} + +function withZipComment(value: Buffer, comment: string): Buffer { + const eocd = findZipSignature(value, 0x06054b50) + if (eocd < 0) throw new Error('Expected ZIP EOCD.') + const bytes = Buffer.from(comment, 'utf8') + const result = Buffer.concat([value, bytes]) + result.writeUInt16LE(bytes.length, eocd + 20) + return result +} + +function withCentralDirectorySignature(value: Buffer): Buffer { + const eocd = findZipSignature(value, 0x06054b50) + if (eocd < 0) throw new Error('Expected ZIP EOCD.') + const signature = Buffer.alloc(9) + signature.writeUInt32LE(0x05054b50, 0) + signature.writeUInt16LE(3, 4) + signature.set(Buffer.from('sig'), 6) + const result = Buffer.concat([value.subarray(0, eocd), signature, value.subarray(eocd)]) + const nextEocd = eocd + signature.length + result.writeUInt32LE(value.readUInt32LE(eocd + 12) + signature.length, nextEocd + 12) + return result +} + +function withLastDataDescriptor(value: Buffer, signed: boolean): Buffer { + const eocd = findZipSignature(value, 0x06054b50) + if (eocd < 0) throw new Error('Expected ZIP EOCD.') + const centralOffset = value.readUInt32LE(eocd + 16) + const totalEntries = value.readUInt16LE(eocd + 10) + let central = centralOffset + let lastCentral = -1 + for (let index = 0; index < totalEntries; index += 1) { + lastCentral = central + central += 46 + value.readUInt16LE(central + 28) + value.readUInt16LE(central + 30) + + value.readUInt16LE(central + 32) + } + const local = value.readUInt32LE(lastCentral + 42) + const descriptor = Buffer.alloc(signed ? 16 : 12) + let cursor = 0 + if (signed) { + descriptor.writeUInt32LE(0x08074b50, cursor) + cursor += 4 + } + descriptor.writeUInt32LE(value.readUInt32LE(lastCentral + 16), cursor) + descriptor.writeUInt32LE(value.readUInt32LE(lastCentral + 20), cursor + 4) + descriptor.writeUInt32LE(value.readUInt32LE(lastCentral + 24), cursor + 8) + const result = Buffer.concat([ + value.subarray(0, centralOffset), + descriptor, + value.subarray(centralOffset) + ]) + const shiftedCentral = lastCentral + descriptor.length + const shiftedEocd = eocd + descriptor.length + result.writeUInt16LE(result.readUInt16LE(local + 6) | 0x0008, local + 6) + result.writeUInt32LE(0, local + 14) + result.writeUInt32LE(0, local + 18) + result.writeUInt32LE(0, local + 22) + result.writeUInt16LE(result.readUInt16LE(shiftedCentral + 8) | 0x0008, shiftedCentral + 8) + result.writeUInt32LE(centralOffset + descriptor.length, shiftedEocd + 16) + return result +} + +function withUnsignedSignatureCrcDataDescriptor(value: Buffer): Buffer { + const result = withLastDataDescriptor(value, false) + const eocd = findZipSignature(result, 0x06054b50) + if (eocd < 0) throw new Error('Expected ZIP EOCD.') + const centralOffset = result.readUInt32LE(eocd + 16) + const totalEntries = result.readUInt16LE(eocd + 10) + let central = centralOffset + let lastCentral = -1 + for (let index = 0; index < totalEntries; index += 1) { + lastCentral = central + central += 46 + result.readUInt16LE(central + 28) + result.readUInt16LE(central + 30) + + result.readUInt16LE(central + 32) + } + const local = result.readUInt32LE(lastCentral + 42) + const dataStart = local + 30 + result.readUInt16LE(local + 26) + result.readUInt16LE(local + 28) + const descriptor = dataStart + result.readUInt32LE(lastCentral + 20) + if (result.readUInt32LE(lastCentral + 16) !== 0x08074b50 || + result.readUInt32LE(descriptor) !== 0x08074b50) { + throw new Error('Expected fixture data whose real CRC matches the descriptor signature.') + } + return result +} + +function deterministicIds(...ids: string[]): () => string { + const values = [...ids] + return () => { + const value = values.shift() + if (value === undefined) throw new Error('Test random id sequence exhausted.') + return value + } +} + +function deferred() { + let resolve!: (value: T | PromiseLike) => void + let reject!: (reason?: unknown) => void + const promise = new Promise((promiseResolve, promiseReject) => { + resolve = promiseResolve + reject = promiseReject + }) + return { promise, reject, resolve } +} + +async function fixture(options?: { now?: () => number; ttlMs?: number }) { + const root = await temporaryDirectory() + const userData = path.join(root, 'user-data') + const dshHome = path.join(root, 'harness') + const workspace = path.join(root, 'workspace') + await mkdir(workspace, { recursive: true }) + await mkdir(path.join(dshHome, 'storages'), { recursive: true }) + await writeFile(path.join(dshHome, 'storages', 'workspace.json'), JSON.stringify({ + unit: { name: 'workspace', version: 2 }, + global: { initialized: true, workspaceIds: ['workspace-1'], archivedSessionIds: [] }, + tables: { + workspaces: { + 'workspace-1': { + path: workspace, + title: 'Research', + sessionIds: ['session-1'] + } + } + } + })) + const registry = new ResearchFilePreviewRegistry({ + storage: new FileResearchPreviewAuthorizationStorage(userData), + workspaceResolver: new HarnessWorkspaceFileResolver(dshHome), + randomId: deterministicIds( + 'authorization_0000000000000001', + 'capability_0000000000000001', + 'authorization_0000000000000002', + 'capability_0000000000000002', + 'authorization_0000000000000003', + 'capability_0000000000000003', + 'authorization_0000000000000004', + 'capability_0000000000000004' + ), + now: options?.now, + capabilityTtlMs: options?.ttlMs + }) + return { dshHome, registry, root, userData, workspace } +} + +async function body(response: Response): Promise { + return Buffer.from(await response.arrayBuffer()) +} + +function expectDescriptor(value: ResearchFilePreviewDescriptor | null): asserts value is ResearchFilePreviewDescriptor { + expect(value).not.toBeNull() + expect(value?.authorizationId).toMatch(/^authorization_/) + expect(value?.url).toMatch(/^sherlock-preview:\/\/capability_[a-z0-9_]+\/$/) +} + +class ControllableAuthorizationStorage implements ResearchPreviewAuthorizationStorage { + records: ResearchPreviewAuthorizationRecord[] = [] + failWrites = false + + load(): ResearchPreviewAuthorizationRecord[] { + return this.records.map((record) => ({ ...record })) + } + + save(records: readonly ResearchPreviewAuthorizationRecord[]): boolean { + if (this.failWrites) return false + this.records = records.map((record) => ({ ...record })) + return true + } +} + +function revocationBookkeepingSize(registry: ResearchFilePreviewRegistry): number { + return Object.entries(registry as unknown as Record) + .filter(([key, value]) => /revocation/i.test(key) && (value instanceof Map || value instanceof Set)) + .reduce((size, [, value]) => size + (value as Map | Set).size, 0) +} + +function countingRealFileSystem() { + let reads = 0 + const fileSystem: ResearchPreviewFileSystem = { + async realpath(targetPath) { + reads += 1 + return realpath(targetPath) + }, + async stat(targetPath) { + reads += 1 + return stat(targetPath) + }, + async readSlice(targetPath, start, endInclusive) { + reads += 1 + const handle = await open(targetPath, 'r') + try { + const result = Buffer.allocUnsafe(Math.max(0, endInclusive - start + 1)) + const { bytesRead } = await handle.read(result, 0, result.length, start) + return result.subarray(0, bytesRead) + } finally { + await handle.close() + } + }, + stream(targetPath, start, endInclusive) { + reads += 1 + return Readable.toWeb(createReadStream(targetPath, { + start, + end: endInclusive + })) as ReadableStream + } + } + return { + fileSystem, + reads: () => reads, + reset: () => { reads = 0 } + } +} + +describe('Research file preview authorization registry', () => { + it('resolves only an exact active original file for export and revalidates its path', async () => { + const { registry, root } = await fixture() + const sourceDirectory = path.join(root, 'exports') + const outsideDirectory = path.join(root, 'outside') + const filePath = path.join(sourceDirectory, 'report.pdf') + const outsidePath = path.join(outsideDirectory, 'outside.pdf') + await mkdir(sourceDirectory, { recursive: true }) + await mkdir(outsideDirectory, { recursive: true }) + await writeFile(filePath, Buffer.from('%PDF-1.7\n')) + await writeFile(outsidePath, Buffer.from('%PDF-1.7\n')) + + const admitted = await registry.admitFinder({ + path: filePath, sessionId: 'session-1', nodeId: 'node-export' + }) + expectDescriptor(admitted) + const request = { + sessionId: 'session-1', nodeId: 'node-export', + authorizationId: admitted.authorizationId + } + await expect(registry.resolveExportSource(request)).resolves.toEqual({ + path: await realpath(filePath), name: 'report.pdf' + }) + await expect(registry.resolveExportSource({ ...request, nodeId: 'other-node' })) + .resolves.toBeNull() + + await rm(filePath) + await symlink(outsidePath, filePath) + await expect(registry.resolveExportSource(request)).resolves.toBeNull() + await rm(filePath) + await mkdir(filePath) + await expect(registry.resolveExportSource(request)).resolves.toBeNull() + + expect(registry.revokeAuthorization(admitted.authorizationId)).toBe(true) + await expect(registry.resolveExportSource(request)).resolves.toBeNull() + }) + + it('releases only the exact ephemeral capability and keeps durable authorization restorable', async () => { + const { registry, root } = await fixture() + const filePath = path.join(root, 'ephemeral.png') + await writeFile(filePath, pngBytes) + const admitted = await registry.admitFinder({ + path: filePath, sessionId: 'session-1', nodeId: 'node-ephemeral' + }) + expectDescriptor(admitted) + expect(admitted.capabilityToken).toBe('capability_0000000000000001') + + expect(registry.releaseCapability({ + sessionId: 'session-1', nodeId: 'node-ephemeral', + authorizationId: admitted.authorizationId, + capabilityToken: admitted.capabilityToken + })).toBe(true) + expect((await registry.handle(new Request(admitted.url))).status).toBe(403) + + const restored = await registry.restore({ + sessionId: 'session-1', nodeId: 'node-ephemeral', + authorizationId: admitted.authorizationId + }) + expect(restored).not.toBeNull() + if (restored === null) return + expect(restored.capabilityToken).not.toBe(admitted.capabilityToken) + expect((await registry.handle(new Request(restored.url))).status).toBe(200) + expect(registry.releaseCapability({ + sessionId: 'wrong-session', nodeId: 'node-ephemeral', + authorizationId: restored.authorizationId, + capabilityToken: restored.capabilityToken + })).toBe(false) + expect((await registry.handle(new Request(restored.url))).status).toBe(200) + }) + it('admits a real Finder file and exposes only opaque authorization data', async () => { + const { registry, root } = await fixture() + const filePath = path.join(root, 'private', 'portrait.png') + await mkdir(path.dirname(filePath), { recursive: true }) + await writeFile(filePath, pngBytes) + + const descriptor = await registry.admitFinder({ + path: filePath, + sessionId: 'session-1', + nodeId: 'node-1' + }) + + expectDescriptor(descriptor) + expect(descriptor).toEqual({ + authorizationId: 'authorization_0000000000000001', + capabilityToken: 'capability_0000000000000001', + url: 'sherlock-preview://capability_0000000000000001/', + contentType: 'image/png', + name: 'portrait.png' + }) + expect(JSON.stringify(descriptor)).not.toContain(root) + expect(JSON.stringify(descriptor)).not.toContain('portrait.png/') + }) + + it.each(['docx', 'xlsx', 'pptx'])( + 'admits a minimal valid %s package and serves bounded ranges with the exact OOXML MIME', + async (family) => { + const { registry, root } = await fixture() + const bytes = minimalOfficeZip(family) + const filePath = path.join(root, `report.${family}`) + await writeFile(filePath, bytes) + + const descriptor = await registry.admitFinder({ + path: filePath, + sessionId: 'session-1', + nodeId: `office-${family}` + }) + + expectDescriptor(descriptor) + expect(descriptor.contentType).toBe(officeContentType[family]) + const response = await registry.handle(new Request(descriptor.url, { + headers: { Range: 'bytes=0-7' } + })) + expect(response.status).toBe(206) + expect(response.headers.get('content-type')).toBe(officeContentType[family]) + expect(await body(response)).toEqual(bytes.subarray(0, 8)) + } + ) + + it.each([ + ['EOCD comment', withZipComment(minimalOfficeZip('docx'), 'Sherlock')], + ['central directory signature', withCentralDirectorySignature(minimalOfficeZip('docx'))], + ['signed data descriptor', withLastDataDescriptor(minimalOfficeZip('docx'), true)], + ['unsigned data descriptor', withLastDataDescriptor(minimalOfficeZip('docx'), false)], + ['unsigned descriptor with signature-shaped CRC', withUnsignedSignatureCrcDataDescriptor( + minimalOfficeZip('docx', { + 'word/document.xml': Uint8Array.from([0xac, 0x0a, 0x7a, 0xd5]) + }) + )], + ['deflate option bits 1 and 2', withFirstEntryFlag(Buffer.from(zipSync({ + '[Content_Types].xml': strToU8(''.repeat(30)), + '_rels/.rels': strToU8(''.repeat(30)), + 'word/document.xml': strToU8('compressible'.repeat(30)) + }, { level: 6 })), 0x0006)], + ['deflate and UTF-8 entry', Buffer.from(zipSync({ + '[Content_Types].xml': strToU8(''), + '_rels/.rels': strToU8(''), + 'word/document.xml': strToU8('compressible compressible compressible'), + 'word/备注.xml': strToU8('') + }, { level: 6 }))] + ])('accepts conventional DOCX ZIP compatibility: %s', async (_label, bytes) => { + const { registry, root } = await fixture() + const filePath = path.join(root, 'compatible.docx') + await writeFile(filePath, bytes) + expectDescriptor(await registry.admitFinder({ + path: filePath, + sessionId: 'session-1', + nodeId: 'compatible-office' + })) + }) + + it.each([ + ['PK prefix without a central directory', Buffer.from('PK\u0003\u0004not-an-office-package')], + ['wrong OOXML family', minimalOfficeZip('xlsx')], + ['mixed OOXML families', minimalOfficeZip('docx', { + 'xl/workbook.xml': strToU8('') + })], + ['traversal entry', minimalOfficeZip('docx', { + '../escape.bin': strToU8('escape') + })], + ['absolute entry', minimalOfficeZip('docx', { + '/escape.bin': strToU8('escape') + })], + ['backslash entry', minimalOfficeZip('docx', { + 'word\\escape.bin': strToU8('escape') + })], + ['encrypted entry', mutateZip(minimalOfficeZip('docx'), (copy, _eocd, central) => { + copy.writeUInt16LE(copy.readUInt16LE(central + 8) | 0x0001, central + 8) + })], + ['stored entry with deflate-only flag', withFirstEntryFlag(minimalOfficeZip('docx'), 0x0002)], + ['reserved flag in LOCAL and CEN', withFirstEntryFlag(minimalOfficeZip('docx'), 0x0010)], + ['reserved flag in LOCAL only', withFirstEntryFlag(minimalOfficeZip('docx'), 0x0010, 'local')], + ['reserved flag in CEN only', withFirstEntryFlag(minimalOfficeZip('docx'), 0x0010, 'central')], + ['multi-disk archive', mutateZip(minimalOfficeZip('docx'), (copy, eocd) => { + copy.writeUInt16LE(1, eocd + 4) + })], + ['ZIP64 sentinel', mutateZip(minimalOfficeZip('docx'), (copy, eocd) => { + copy.writeUInt16LE(0xffff, eocd + 10) + })], + ['too many entries', mutateZip(minimalOfficeZip('docx'), (copy, eocd) => { + copy.writeUInt16LE(4097, eocd + 8) + copy.writeUInt16LE(4097, eocd + 10) + })], + ['oversized central directory', mutateZip(minimalOfficeZip('docx'), (copy, eocd) => { + copy.writeUInt32LE(8 * 1024 * 1024 + 1, eocd + 12) + })], + ['oversized entry declaration', mutateZip(minimalOfficeZip('docx'), (copy, _eocd, central) => { + copy.writeUInt32LE(64 * 1024 * 1024 + 1, central + 24) + })], + ['excessive expansion ratio', mutateZip(minimalOfficeZip('docx'), (copy, _eocd, central) => { + copy.writeUInt32LE(1, central + 20) + copy.writeUInt32LE(201, central + 24) + })], + ['LOCAL/CEN CRC mismatch', mutateZip(minimalOfficeZip('docx'), (copy, _eocd, central) => { + const local = copy.readUInt32LE(central + 42) + copy.writeUInt32LE(copy.readUInt32LE(local + 14) ^ 1, local + 14) + })], + ['bad data descriptor', mutateZip( + withLastDataDescriptor(minimalOfficeZip('docx'), true), + (copy, eocd) => { + const centralOffset = copy.readUInt32LE(eocd + 16) + copy.writeUInt32LE(0, centralOffset - 12) + } + )] + ])('rejects unsafe DOCX structure: %s', async (_label, bytes) => { + const { registry, root } = await fixture() + const filePath = path.join(root, 'unsafe.docx') + await writeFile(filePath, bytes) + + expect(await registry.admitFinder({ + path: filePath, + sessionId: 'session-1', + nodeId: 'unsafe-office' + })).toBeNull() + }) + + it.each([ + [ + 'deflate data whose actual expansion exceeds its declared size', + withFirstEntryDeclaredMetadata(Buffer.from(zipSync({ + '[Content_Types].xml': new Uint8Array(256 * 1024).fill(0x41), + '_rels/.rels': strToU8(''), + 'word/document.xml': strToU8('') + }, { level: 9 })), { uncompressedSize: 1 }) + ], + [ + 'stored data whose bytes do not match the declared CRC', + withFirstEntryDeclaredMetadata(minimalOfficeZip('docx'), { crc32: 0 }) + ], + [ + 'deflate data whose bytes do not match the declared CRC', + withFirstEntryDeclaredMetadata(Buffer.from(zipSync({ + '[Content_Types].xml': strToU8(''.repeat(30)), + '_rels/.rels': strToU8(''.repeat(30)), + 'word/document.xml': strToU8(''.repeat(30)) + }, { level: 6 })), { crc32: 0 }) + ] + ])('rejects OOXML ZIP content that contradicts trusted metadata: %s', async (_label, bytes) => { + const { registry, root } = await fixture() + const filePath = path.join(root, 'contradictory.docx') + await writeFile(filePath, bytes) + + expect(await registry.admitFinder({ + path: filePath, + sessionId: 'session-1', + nodeId: 'contradictory-office' + })).toBeNull() + }) + + it('revalidates the OOXML family on restore and serving after the authorized file changes', async () => { + const { registry, root } = await fixture() + const filePath = path.join(root, 'mutable.docx') + await writeFile(filePath, minimalOfficeZip('docx')) + const descriptor = await registry.admitFinder({ + path: filePath, + sessionId: 'session-1', + nodeId: 'mutable-office' + }) + expectDescriptor(descriptor) + + await writeFile(filePath, minimalOfficeZip('xlsx')) + + expect((await registry.handle(new Request(descriptor.url))).status).toBe(415) + expect(await registry.restore({ + sessionId: 'session-1', + nodeId: 'mutable-office', + authorizationId: descriptor.authorizationId + })).toBeNull() + }) + + it('rejects empty, relative, directory, and magic-mismatched Finder paths', async () => { + const { registry, root } = await fixture() + const directory = path.join(root, 'folder') + const disguised = path.join(root, 'fake.png') + await mkdir(directory) + await writeFile(disguised, 'not a png') + + for (const candidate of ['', 'relative.png', directory, disguised]) { + await expect(registry.admitFinder({ + path: candidate, + sessionId: 'session-1', + nodeId: 'node-1' + })).resolves.toBeNull() + } + }) + + it('admits ICO and AVIF only when their binary signatures match', async () => { + for (const fixtureFile of [ + { name: 'favicon.ico', bytes: icoBytes, contentType: 'image/x-icon' }, + { name: 'cover.avif', bytes: avifBytes, contentType: 'image/avif' } + ]) { + const { registry, root } = await fixture() + const filePath = path.join(root, fixtureFile.name) + await writeFile(filePath, fixtureFile.bytes) + const descriptor = await registry.admitFinder({ + path: filePath, + sessionId: 'session-1', + nodeId: `node-${fixtureFile.name}` + }) + expectDescriptor(descriptor) + expect(descriptor.contentType).toBe(fixtureFile.contentType) + const response = await registry.handle(new Request(descriptor.url)) + expect(response.status).toBe(200) + expect(response.headers.get('content-type')).toBe(fixtureFile.contentType) + expect(await body(response)).toEqual(fixtureFile.bytes) + } + + for (const fixtureFile of [ + { name: 'forged.ico', bytes: Buffer.from('not-an-icon') }, + { name: 'empty.ico', bytes: Buffer.from([0x00, 0x00, 0x01, 0x00, 0x00, 0x00]) }, + { name: 'truncated-directory.ico', bytes: Buffer.from([0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x10, 0x10]) }, + { name: 'forged.avif', bytes: Buffer.from('\0\0\0\x18ftypfake\0\0\0\0mif1') }, + { name: 'minor-version-brand.avif', bytes: Buffer.from('\0\0\0\x10ftypmif1avif') }, + { name: 'unaligned-ftyp.avif', bytes: Buffer.from('\0\0\0\x12ftypavif\0\0\0\0\0\0') }, + { name: 'truncated.avif', bytes: Buffer.from('\0\0\x01\0ftypavif\0\0\0\0') } + ]) { + const { registry, root } = await fixture() + const filePath = path.join(root, fixtureFile.name) + await writeFile(filePath, fixtureFile.bytes) + await expect(registry.admitFinder({ + path: filePath, + sessionId: 'session-1', + nodeId: `node-${fixtureFile.name}` + })).resolves.toBeNull() + } + }) + + it('admits bounded Markdown, code, and unknown-extension UTF-8 roots with explicit MIME types', async () => { + const cases = [ + { name: 'thesis.markdown', text: '# 结论\n\n[来源](https://example.com)', contentType: 'text/markdown; charset=utf-8' }, + { name: 'analysis.ts', text: 'export const answer: number = 42\n', contentType: 'text/plain; charset=utf-8' }, + { name: 'research.custom', text: '第一行\nsecond line \n', contentType: 'text/plain; charset=utf-8' } + ] + + for (const fixtureFile of cases) { + const { registry, root } = await fixture() + const filePath = path.join(root, fixtureFile.name) + const bytes = Buffer.from(fixtureFile.text, 'utf8') + await writeFile(filePath, bytes) + const descriptor = await registry.admitFinder({ + path: filePath, + sessionId: 'session-1', + nodeId: `node-${fixtureFile.name}` + }) + expectDescriptor(descriptor) + expect(descriptor.contentType).toBe(fixtureFile.contentType) + const response = await registry.handle(new Request(descriptor.url)) + expect(response.status).toBe(200) + expect(response.headers.get('content-type')).toBe(fixtureFile.contentType) + expect(await body(response)).toEqual(bytes) + } + }) + + it('rejects native text roots containing NUL, invalid UTF-8, or more than two MiB', async () => { + for (const fixtureFile of [ + { name: 'nul.txt', bytes: Buffer.from([0x61, 0x00, 0x62]) }, + { name: 'invalid.code', bytes: Buffer.from([0x61, 0xc3, 0x28]) }, + { name: 'oversized.md', bytes: Buffer.alloc(2 * 1024 * 1024 + 1, 0x61) }, + { + name: 'oversized.json', + bytes: Buffer.from(JSON.stringify({ payload: 'j'.repeat(2 * 1024 * 1024) })) + } + ]) { + const { registry, root } = await fixture() + const filePath = path.join(root, fixtureFile.name) + await writeFile(filePath, fixtureFile.bytes) + await expect(registry.admitFinder({ + path: filePath, + sessionId: 'session-1', + nodeId: `node-${fixtureFile.name}` + })).resolves.toBeNull() + } + }) + + it('invalidates a text capability after its source is moved, deleted, or becomes binary', async () => { + for (const mutation of ['move', 'delete', 'binary'] as const) { + const { registry, root } = await fixture() + const filePath = path.join(root, `${mutation}.txt`) + await writeFile(filePath, 'trusted text') + const descriptor = await registry.admitFinder({ + path: filePath, + sessionId: 'session-1', + nodeId: `node-${mutation}` + }) + expectDescriptor(descriptor) + + if (mutation === 'move') await rename(filePath, `${filePath}.moved`) + if (mutation === 'delete') await rm(filePath) + if (mutation === 'binary') await writeFile(filePath, Buffer.from([0x61, 0x00, 0x62])) + + expect((await registry.handle(new Request(descriptor.url))).status) + .toBe(mutation === 'binary' ? 415 : 404) + await expect(registry.restore({ + authorizationId: descriptor.authorizationId, + sessionId: 'session-1', + nodeId: `node-${mutation}` + })).resolves.toBeNull() + } + }) + + it('resolves sidebar identity from the main-owned workspace map and fences it by realpath', async () => { + const { registry, root, workspace } = await fixture() + const image = path.join(workspace, 'assets', 'chart.png') + const outside = path.join(root, 'private.png') + await mkdir(path.dirname(image), { recursive: true }) + await writeFile(image, pngBytes) + await writeFile(outside, pngBytes) + + const descriptor = await registry.admitSidebar({ + sessionId: 'session-1', + nodeId: 'node-sidebar', + relativePath: 'assets/chart.png' + }) + expectDescriptor(descriptor) + + await expect(registry.admitSidebar({ + sessionId: 'session-1', + nodeId: 'node-traversal', + relativePath: '../private.png' + })).resolves.toBeNull() + await expect(registry.admitSidebar({ + sessionId: 'session-1', + nodeId: 'node-absolute', + relativePath: outside + })).resolves.toBeNull() + await expect(registry.admitSidebar({ + sessionId: 'missing-session', + nodeId: 'node-missing-session', + relativePath: 'assets/chart.png' + })).resolves.toBeNull() + + const escape = path.join(workspace, 'assets', 'escape.png') + await symlink(outside, escape) + await expect(registry.admitSidebar({ + sessionId: 'session-1', + nodeId: 'node-symlink', + relativePath: 'assets/escape.png' + })).resolves.toBeNull() + }) + + it('persists bounded authorizations with mode 0600 and restores with a fresh capability', async () => { + const root = await temporaryDirectory() + const userData = path.join(root, 'user-data') + const filePath = path.join(root, 'portrait.png') + await writeFile(filePath, pngBytes) + const storage = new FileResearchPreviewAuthorizationStorage(userData) + const first = new ResearchFilePreviewRegistry({ + storage, + randomId: deterministicIds( + 'authorization_0000000000000001', + 'capability_0000000000000001' + ) + }) + const admitted = await first.admitFinder({ + path: filePath, + sessionId: 'session-1', + nodeId: 'node-1' + }) + expectDescriptor(admitted) + + const storagePath = researchPreviewAuthorizationStoragePath(userData) + expect((await lstat(storagePath)).mode & 0o777).toBe(0o600) + const persisted = await readFile(storagePath, 'utf8') + expect(persisted.length).toBeLessThan(1024 * 1024) + expect(persisted).not.toContain('capability_') + + const restoredRegistry = new ResearchFilePreviewRegistry({ + storage: new FileResearchPreviewAuthorizationStorage(userData), + randomId: deterministicIds('capability_0000000000000002') + }) + const restored = await restoredRegistry.restore({ + authorizationId: admitted.authorizationId, + sessionId: 'session-1', + nodeId: 'node-1' + }) + expectDescriptor(restored) + expect(restored.authorizationId).toBe(admitted.authorizationId) + expect(restored.url).toBe('sherlock-preview://capability_0000000000000002/') + expect(restored.url).not.toBe(admitted.url) + await expect(restoredRegistry.restore({ + authorizationId: admitted.authorizationId, + sessionId: 'session-other', + nodeId: 'node-1' + })).resolves.toBeNull() + }) + + it('fails closed on an oversized or world-readable authorization registry', async () => { + const root = await temporaryDirectory() + const userData = path.join(root, 'user-data') + const storagePath = researchPreviewAuthorizationStoragePath(userData) + await mkdir(path.dirname(storagePath), { recursive: true }) + await writeFile(storagePath, 'x'.repeat(1024 * 1024 + 1), { mode: 0o644 }) + + const registry = new ResearchFilePreviewRegistry({ + storage: new FileResearchPreviewAuthorizationStorage(userData), + randomId: deterministicIds('capability_0000000000000001') + }) + await expect(registry.restore({ + authorizationId: 'authorization_0000000000000001', + sessionId: 'session-1', + nodeId: 'node-1' + })).resolves.toBeNull() + + await writeFile(storagePath, JSON.stringify({ version: 1, authorizations: [] }), { mode: 0o644 }) + await chmod(storagePath, 0o644) + const secureReload = new FileResearchPreviewAuthorizationStorage(userData) + expect((await lstat(storagePath)).mode & 0o777).toBe(0o600) + expect(secureReload.load()).toEqual([]) + }) + + it('expires ephemeral tokens and revokes capabilities by authorization, node, and session', async () => { + let now = 10_000 + const { registry, root } = await fixture({ now: () => now, ttlMs: 100 }) + const firstPath = path.join(root, 'first.png') + const secondPath = path.join(root, 'second.png') + const thirdPath = path.join(root, 'third.png') + await Promise.all([ + writeFile(firstPath, pngBytes), + writeFile(secondPath, pngBytes), + writeFile(thirdPath, pngBytes) + ]) + const first = await registry.admitFinder({ path: firstPath, sessionId: 'session-1', nodeId: 'node-1' }) + const second = await registry.admitFinder({ path: secondPath, sessionId: 'session-1', nodeId: 'node-2' }) + const third = await registry.admitFinder({ path: thirdPath, sessionId: 'session-2', nodeId: 'node-3' }) + expectDescriptor(first) + expectDescriptor(second) + expectDescriptor(third) + + expect((await registry.handle(new Request(first.url))).status).toBe(200) + now = 10_101 + expect((await registry.handle(new Request(first.url))).status).toBe(403) + + registry.revokeAuthorization(second.authorizationId) + expect((await registry.handle(new Request(second.url))).status).toBe(403) + await expect(registry.restore({ + authorizationId: second.authorizationId, + sessionId: 'session-1', + nodeId: 'node-2' + })).resolves.toBeNull() + + const fourth = await registry.admitFinder({ + path: firstPath, + sessionId: 'session-1', + nodeId: 'node-4' + }) + expectDescriptor(fourth) + registry.revokeNode('session-1', 'node-4') + expect((await registry.handle(new Request(fourth.url))).status).toBe(403) + + registry.revokeSession('session-2') + expect((await registry.handle(new Request(third.url))).status).toBe(403) + }) + + it('atomically replaces stale durable authorization when the same node is re-admitted', async () => { + const root = await temporaryDirectory() + const firstPath = path.join(root, 'first.png') + const secondPath = path.join(root, 'second.png') + await Promise.all([writeFile(firstPath, pngBytes), writeFile(secondPath, pngBytes)]) + const storage = new ControllableAuthorizationStorage() + const registry = new ResearchFilePreviewRegistry({ + storage, + randomId: deterministicIds( + 'authorization_0000000000000001', 'capability_0000000000000001', + 'authorization_0000000000000002', 'capability_0000000000000002', + 'capability_0000000000000003' + ) + }) + const first = await registry.admitFinder({ + path: firstPath, sessionId: 'session-1', nodeId: 'node-1' + }) + const second = await registry.admitFinder({ + path: secondPath, sessionId: 'session-1', nodeId: 'node-1' + }) + expectDescriptor(first) + expectDescriptor(second) + expect(storage.records).toHaveLength(1) + expect(storage.records[0]?.authorizationId).toBe(second.authorizationId) + expect((await registry.handle(new Request(first.url))).status).toBe(403) + await expect(registry.restore({ + sessionId: 'session-1', nodeId: 'node-1', authorizationId: first.authorizationId + })).resolves.toBeNull() + await expect(registry.restore({ + sessionId: 'session-1', nodeId: 'node-1', authorizationId: second.authorizationId + })).resolves.not.toBeNull() + }) + + it('serializes concurrent admission replacement for the same durable node identity', async () => { + const root = await temporaryDirectory() + const firstPath = path.join(root, 'first.png') + const secondPath = path.join(root, 'second.png') + await Promise.all([writeFile(firstPath, pngBytes), writeFile(secondPath, pngBytes)]) + const firstTargetReached = deferred() + const releaseFirstTarget = deferred() + const realFiles = countingRealFileSystem().fileSystem + const fileSystem: ResearchPreviewFileSystem = { + ...realFiles, + async realpath(targetPath) { + if (targetPath === firstPath) { + firstTargetReached.resolve() + await releaseFirstTarget.promise + } + return realFiles.realpath(targetPath) + } + } + const storage = new ControllableAuthorizationStorage() + const registry = new ResearchFilePreviewRegistry({ + storage, + fileSystem, + randomId: deterministicIds( + 'authorization_0000000000000001', 'capability_0000000000000001', + 'authorization_0000000000000002', 'capability_0000000000000002', + 'capability_0000000000000003' + ) + }) + + const firstAdmission = registry.admitFinder({ + path: firstPath, sessionId: 'session-1', nodeId: 'node-1' + }) + await firstTargetReached.promise + const secondAdmission = registry.admitFinder({ + path: secondPath, sessionId: 'session-1', nodeId: 'node-1' + }) + releaseFirstTarget.resolve() + + const [first, second] = await Promise.all([firstAdmission, secondAdmission]) + expectDescriptor(first) + expectDescriptor(second) + expect(storage.records).toHaveLength(1) + expect(storage.records[0]).toMatchObject({ + authorizationId: second.authorizationId, + path: await realpath(secondPath), + sessionId: 'session-1', + nodeId: 'node-1' + }) + expect((await registry.handle(new Request(first.url))).status).toBe(403) + + const restarted = new ResearchFilePreviewRegistry({ + storage, + fileSystem, + randomId: deterministicIds('capability_0000000000000003') + }) + await expect(restarted.restore({ + sessionId: 'session-1', nodeId: 'node-1', authorizationId: first.authorizationId + })).resolves.toBeNull() + await expect(restarted.restore({ + sessionId: 'session-1', nodeId: 'node-1', authorizationId: second.authorizationId + })).resolves.toMatchObject({ + authorizationId: second.authorizationId, + url: 'sherlock-preview://capability_0000000000000003/' + }) + }) + + it.each([ + { + label: 'node', + revoke: (registry: ResearchFilePreviewRegistry) => + registry.revokeNode('session-race', 'node-race') + }, + { + label: 'session', + revoke: (registry: ResearchFilePreviewRegistry) => + registry.revokeSession('session-race') + } + ])('does not resurrect an authorization when $label revocation races deferred admission', async ({ revoke }) => { + const root = await temporaryDirectory() + const filePath = path.join(root, 'racing.png') + await writeFile(filePath, pngBytes) + const targetReached = deferred() + const releaseTarget = deferred() + const realFiles = countingRealFileSystem().fileSystem + const fileSystem: ResearchPreviewFileSystem = { + ...realFiles, + async realpath(targetPath) { + if (targetPath === filePath) { + targetReached.resolve() + await releaseTarget.promise + } + return realFiles.realpath(targetPath) + } + } + const storage = new ControllableAuthorizationStorage() + const registry = new ResearchFilePreviewRegistry({ + storage, + fileSystem, + randomId: deterministicIds( + 'authorization_0000000000000001', + 'capability_0000000000000001' + ) + }) + + const admission = registry.admitFinder({ + path: filePath, sessionId: 'session-race', nodeId: 'node-race' + }) + await targetReached.promise + expect(revoke(registry)).toBe(true) + releaseTarget.resolve() + + await expect(admission).resolves.toBeNull() + expect(storage.records).toEqual([]) + const restarted = new ResearchFilePreviewRegistry({ + storage, + fileSystem, + randomId: deterministicIds('capability_0000000000000002') + }) + await expect(restarted.restore({ + authorizationId: 'authorization_0000000000000001', + sessionId: 'session-race', + nodeId: 'node-race' + })).resolves.toBeNull() + }) + + it('treats a valid already-absent node revocation as idempotent success', () => { + const registry = new ResearchFilePreviewRegistry({ + storage: new ControllableAuthorizationStorage() + }) + + expect(registry.revokeNode('session-idempotent', 'node-idempotent')).toBe(true) + expect(registry.revokeSession('session-idempotent')).toBe(true) + expect(registry.revokeNode('', 'node-idempotent')).toBe(false) + expect(registry.revokeNode('session-idempotent', '')).toBe(false) + }) + + it('does not retain revocation bookkeeping for absent nodes or sessions', () => { + const registry = new ResearchFilePreviewRegistry({ + storage: new ControllableAuthorizationStorage() + }) + + for (let index = 0; index < 5_000; index += 1) { + expect(registry.revokeNode(`session-${index}`, `node-${index}`)).toBe(true) + expect(registry.revokeSession(`absent-session-${index}`)).toBe(true) + } + + expect(revocationBookkeepingSize(registry)).toBe(0) + }) + + it('captures sidebar revocation before the asynchronous workspace lookup', async () => { + const root = await temporaryDirectory() + const filePath = path.join(root, 'sidebar-racing.png') + await writeFile(filePath, pngBytes) + const resolverReached = deferred() + const releaseResolver = deferred() + const storage = new ControllableAuthorizationStorage() + const registry = new ResearchFilePreviewRegistry({ + storage, + workspaceResolver: { + async resolveRoot() { + resolverReached.resolve() + await releaseResolver.promise + return root + } + }, + randomId: deterministicIds( + 'authorization_0000000000000001', + 'capability_0000000000000001' + ) + }) + + const admission = registry.admitSidebar({ + sessionId: 'session-sidebar-race', + nodeId: 'node-sidebar-race', + relativePath: path.basename(filePath) + }) + await resolverReached.promise + expect(registry.revokeNode('session-sidebar-race', 'node-sidebar-race')).toBe(true) + releaseResolver.resolve() + + await expect(admission).resolves.toBeNull() + expect(storage.records).toEqual([]) + }) + + it.each([ + { + label: 'authorization', + revoke: (registry: ResearchFilePreviewRegistry, descriptor: ResearchFilePreviewDescriptor) => + registry.revokeAuthorization(descriptor.authorizationId) + }, + { + label: 'node', + revoke: (registry: ResearchFilePreviewRegistry) => + registry.revokeNode('session-1', 'node-1') + }, + { + label: 'session', + revoke: (registry: ResearchFilePreviewRegistry) => + registry.revokeSession('session-1') + } + ])('keeps $label revocation transactional across storage failure and restart', async ({ revoke }) => { + const root = await temporaryDirectory() + const filePath = path.join(root, 'portrait.png') + await writeFile(filePath, pngBytes) + const storage = new ControllableAuthorizationStorage() + const registry = new ResearchFilePreviewRegistry({ + storage, + randomId: deterministicIds( + 'authorization_0000000000000001', + 'capability_0000000000000001' + ) + }) + const descriptor = await registry.admitFinder({ + path: filePath, + sessionId: 'session-1', + nodeId: 'node-1' + }) + expectDescriptor(descriptor) + expect(storage.records).toHaveLength(1) + + storage.failWrites = true + expect(revoke(registry, descriptor)).toBe(false) + expect(storage.records).toHaveLength(1) + expect((await registry.handle(new Request(descriptor.url))).status).toBe(200) + + const restartAfterFailure = new ResearchFilePreviewRegistry({ + storage, + randomId: deterministicIds('capability_0000000000000002') + }) + await expect(restartAfterFailure.restore({ + authorizationId: descriptor.authorizationId, + sessionId: 'session-1', + nodeId: 'node-1' + })).resolves.toMatchObject({ + authorizationId: descriptor.authorizationId, + url: 'sherlock-preview://capability_0000000000000002/' + }) + + storage.failWrites = false + expect(revoke(registry, descriptor)).toBe(true) + expect(storage.records).toHaveLength(0) + expect((await registry.handle(new Request(descriptor.url))).status).toBe(403) + + const restartAfterSuccess = new ResearchFilePreviewRegistry({ + storage, + randomId: deterministicIds('unused_capability_0000000000000003') + }) + await expect(restartAfterSuccess.restore({ + authorizationId: descriptor.authorizationId, + sessionId: 'session-1', + nodeId: 'node-1' + })).resolves.toBeNull() + }) +}) + +describe('sherlock-preview protocol responses', () => { + it('serves GET and HEAD with immutable security headers and accurate content metadata', async () => { + const { registry, root } = await fixture() + const filePath = path.join(root, 'report.pdf') + const bytes = Buffer.from('%PDF-1.7\nbody\n%%EOF') + await writeFile(filePath, bytes) + const descriptor = await registry.admitFinder({ path: filePath, sessionId: 'session-1', nodeId: 'pdf-1' }) + expectDescriptor(descriptor) + + const response = await registry.handle(new Request(descriptor.url)) + expect(response.status).toBe(200) + expect(await body(response)).toEqual(bytes) + expect(response.headers.get('content-type')).toBe('application/pdf') + expect(response.headers.get('content-length')).toBe(String(bytes.length)) + expect(response.headers.get('accept-ranges')).toBe('bytes') + expect(response.headers.get('cache-control')).toBe('no-store') + expect(response.headers.get('x-content-type-options')).toBe('nosniff') + expect(response.headers.get('content-security-policy')).toBe(RESEARCH_PREVIEW_CSP) + + const head = await registry.handle(new Request(descriptor.url, { method: 'HEAD' })) + expect(head.status).toBe(200) + expect(head.headers.get('content-length')).toBe(String(bytes.length)) + expect(await body(head)).toHaveLength(0) + }) + + it('serves valid byte ranges and rejects malformed, multiple, or unsatisfiable ranges', async () => { + const { registry, root } = await fixture() + const filePath = path.join(root, 'report.pdf') + const bytes = Buffer.from('%PDF-1234567890') + await writeFile(filePath, bytes) + const descriptor = await registry.admitFinder({ path: filePath, sessionId: 'session-1', nodeId: 'pdf-1' }) + expectDescriptor(descriptor) + + const first = await registry.handle(new Request(descriptor.url, { + headers: { Range: 'bytes=0-3' } + })) + expect(first.status).toBe(206) + expect(first.headers.get('content-range')).toBe(`bytes 0-3/${bytes.length}`) + expect(first.headers.get('content-length')).toBe('4') + expect(await body(first)).toEqual(bytes.subarray(0, 4)) + + const openEnded = await registry.handle(new Request(descriptor.url, { + headers: { Range: 'bytes=5-' } + })) + expect(openEnded.status).toBe(206) + expect(openEnded.headers.get('content-range')).toBe(`bytes 5-${bytes.length - 1}/${bytes.length}`) + expect(await body(openEnded)).toEqual(bytes.subarray(5)) + + const suffix = await registry.handle(new Request(descriptor.url, { + headers: { Range: 'bytes=-4' } + })) + expect(suffix.status).toBe(206) + expect(await body(suffix)).toEqual(bytes.subarray(-4)) + + for (const range of ['bytes=999-', 'bytes=8-3', 'bytes=0-1,3-4', 'items=0-1']) { + const invalid = await registry.handle(new Request(descriptor.url, { + headers: { Range: range } + })) + expect(invalid.status, range).toBe(416) + expect(invalid.headers.get('content-range'), range).toBe(`bytes */${bytes.length}`) + } + }) + + it('fails closed for unknown URLs, unsupported methods, missing files, directories, and changed magic bytes', async () => { + const { registry, root } = await fixture() + const filePath = path.join(root, 'portrait.png') + await writeFile(filePath, pngBytes) + const descriptor = await registry.admitFinder({ path: filePath, sessionId: 'session-1', nodeId: 'image-1' }) + expectDescriptor(descriptor) + + expect((await registry.handle(new Request('sherlock-preview://unknown_capability/'))).status) + .toBe(403) + expect((await registry.handle(new Request(descriptor.url, { method: 'POST' }))).status) + .toBe(405) + + await writeFile(filePath, 'not a png') + expect((await registry.handle(new Request(descriptor.url))).status).toBe(415) + + await rm(filePath) + expect((await registry.handle(new Request(descriptor.url))).status).toBe(404) + await mkdir(filePath) + expect((await registry.handle(new Request(descriptor.url))).status).toBe(404) + }) + + it('serves HTML capability-origin modules and practical local resources inside one realpath-fenced root', async () => { + const { registry, root } = await fixture() + const site = path.join(root, 'site') + const outside = path.join(root, 'outside.js') + const largeJson = JSON.stringify({ payload: 'j'.repeat(2 * 1024 * 1024) }) + const largeSourceMap = JSON.stringify({ version: 3, sources: ['source.ts'], mappings: 'AAAA;'.repeat(128) }) + await mkdir(path.join(site, 'assets'), { recursive: true }) + await mkdir(path.join(site, 'modules'), { recursive: true }) + await mkdir(path.join(site, 'data'), { recursive: true }) + await mkdir(path.join(site, 'fonts'), { recursive: true }) + await mkdir(path.join(site, 'media'), { recursive: true }) + const htmlSource = '' + await writeFile(path.join(site, 'index.html'), htmlSource) + await writeFile(path.join(site, 'fragment.html'), '
HTML fragment without a doctype or head
') + await writeFile(path.join(site, 'assets', 'site.css'), 'body { color: black; }') + await writeFile(path.join(site, 'assets', 'site.js'), 'document.body.dataset.ready = "yes"') + await writeFile(path.join(site, 'assets', 'logo.png'), pngBytes) + await writeFile(path.join(site, 'modules', 'bootstrap.mjs'), 'export const ready = true') + await writeFile(path.join(site, 'data', 'config.json'), largeJson) + await writeFile(path.join(site, 'data', 'config.json.map'), largeSourceMap) + await writeFile(path.join(site, 'data', 'malformed.json'), `{"payload":"${'unterminated-'.repeat(64)}`) + await writeFile(path.join(site, 'data', 'binary.map'), Buffer.from([0x7b, 0x22, 0x78, 0x22, 0x3a, 0xff, 0x7d])) + await writeFile(path.join(site, 'fonts', 'display.woff2'), Buffer.from('wOF2\u0000\u0001')) + await writeFile(path.join(site, 'media', 'demo.mp4'), Buffer.from('\u0000\u0000\u0000\u0018ftypisom')) + await writeFile(path.join(site, 'modules', 'codec.wasm'), Buffer.from([0, 0x61, 0x73, 0x6d, 1, 0, 0, 0])) + await writeFile(outside, 'window.secret = true') + await symlink(outside, path.join(site, 'assets', 'escape.js')) + + const descriptor = await registry.admitFinder({ + path: path.join(site, 'index.html'), + sessionId: 'session-1', + nodeId: 'html-1' + }) + expectDescriptor(descriptor) + + const harnessOrigin = 'http://127.0.0.1:43123' + const html = await registry.handle(new Request(descriptor.url), harnessOrigin) + expect(html.status).toBe(200) + expect(html.headers.get('content-type')).toBe('text/html; charset=utf-8') + const csp = html.headers.get('content-security-policy') ?? '' + const capabilitySource = 'sherlock-preview://capability_0000000000000001' + expect(csp).toContain(`script-src ${capabilitySource} http: https:`) + expect(csp).toContain(`style-src ${capabilitySource} 'unsafe-inline' http: https:`) + expect(csp).toContain(`img-src ${capabilitySource} data: blob: http: https:`) + expect(csp).toContain(`font-src ${capabilitySource} data: http: https:`) + expect(csp).toContain(`media-src ${capabilitySource} blob: http: https:`) + expect(csp).toContain(`frame-ancestors ${harnessOrigin}`) + expect(csp).not.toContain("'unsafe-eval'") + expect(csp).not.toContain("script-src 'unsafe-inline'") + expect(csp).toContain(`connect-src ${capabilitySource} http: https: ws: wss:`) + expect(csp).toContain("frame-src 'none'") + expect(csp).toContain("worker-src 'none'") + expect(csp).toContain("manifest-src 'none'") + expect(csp).toContain('form-action http: https:') + expect(csp).toContain("base-uri 'none'") + expect(html.headers.get('content-length')).toBe(String(Buffer.byteLength(htmlSource))) + expect((await body(html)).toString()).toBe(htmlSource) + expect(htmlSource).not.toContain('__sherlock/research-wheel-bridge') + + const range = await registry.handle(new Request(descriptor.url, { + headers: { Range: 'bytes=0-15' } + }), harnessOrigin) + expect(range.status).toBe(206) + expect(range.headers.get('content-range')).toBe(`bytes 0-15/${Buffer.byteLength(htmlSource)}`) + expect(range.headers.get('content-length')).toBe('16') + expect((await body(range)).toString()).toBe(htmlSource.slice(0, 16)) + const head = await registry.handle(new Request(descriptor.url, { method: 'HEAD' }), harnessOrigin) + expect(head.status).toBe(200) + expect(head.headers.get('content-length')).toBe(String(Buffer.byteLength(htmlSource))) + expect(await body(head)).toHaveLength(0) + const removedBridge = await registry.handle(new Request( + new URL('__sherlock/research-wheel-bridge-v1.js', descriptor.url) + ), harnessOrigin) + expect(removedBridge.status).toBe(404) + + const fragment = await registry.admitFinder({ + path: path.join(site, 'fragment.html'), + sessionId: 'session-1', + nodeId: 'html-fragment' + }) + expectDescriptor(fragment) + const fragmentResponse = await registry.handle(new Request(fragment.url), harnessOrigin) + expect(fragmentResponse.status).toBe(200) + expect((await body(fragmentResponse)).toString()) + .toBe('
HTML fragment without a doctype or head
') + + const css = await registry.handle(new Request(new URL('assets/site.css', descriptor.url)), harnessOrigin) + expect(css.status).toBe(200) + expect(css.headers.get('content-type')).toBe('text/css; charset=utf-8') + const image = await registry.handle(new Request(new URL('assets/logo.png', descriptor.url)), harnessOrigin) + expect(image.status).toBe(200) + expect(image.headers.get('content-type')).toBe('image/png') + const script = await registry.handle(new Request(new URL('assets/site.js', descriptor.url)), harnessOrigin) + expect(script.status).toBe(200) + expect(script.headers.get('content-type')).toBe('text/javascript; charset=utf-8') + const module = await registry.handle(new Request(new URL('modules/bootstrap.mjs', descriptor.url)), harnessOrigin) + expect(module.status).toBe(200) + expect(module.headers.get('content-type')).toBe('text/javascript; charset=utf-8') + const json = await registry.handle(new Request(new URL('data/config.json', descriptor.url)), harnessOrigin) + expect(Buffer.byteLength(largeJson)).toBeGreaterThan(2 * 1024 * 1024) + expect(Buffer.byteLength(largeJson)).toBeLessThan(4 * 1024 * 1024) + expect(json.status).toBe(200) + expect(json.headers.get('content-type')).toBe('application/json; charset=utf-8') + const sourceMap = await registry.handle(new Request(new URL('data/config.json.map', descriptor.url)), harnessOrigin) + expect(Buffer.byteLength(largeSourceMap)).toBeGreaterThan(512) + expect(sourceMap.status).toBe(200) + expect(sourceMap.headers.get('content-type')).toBe('application/json; charset=utf-8') + const malformedJson = await registry.handle(new Request(new URL('data/malformed.json', descriptor.url)), harnessOrigin) + expect(malformedJson.status).toBe(415) + const binarySourceMap = await registry.handle(new Request(new URL('data/binary.map', descriptor.url)), harnessOrigin) + expect(binarySourceMap.status).toBe(415) + const font = await registry.handle(new Request(new URL('fonts/display.woff2', descriptor.url)), harnessOrigin) + expect(font.status).toBe(200) + expect(font.headers.get('content-type')).toBe('font/woff2') + const media = await registry.handle(new Request(new URL('media/demo.mp4', descriptor.url)), harnessOrigin) + expect(media.status).toBe(200) + expect(media.headers.get('content-type')).toBe('video/mp4') + const wasm = await registry.handle(new Request(new URL('modules/codec.wasm', descriptor.url)), harnessOrigin) + expect(wasm.status).toBe(200) + expect(wasm.headers.get('content-type')).toBe('application/wasm') + const escaped = await registry.handle(new Request(new URL('assets/escape.js', descriptor.url)), harnessOrigin) + expect(escaped.status).toBe(403) + const unsupported = await registry.handle(new Request(new URL('assets/notes.txt', descriptor.url)), harnessOrigin) + expect(unsupported.status).toBe(404) + + for (const suffix of [ + '%2e%2e%2foutside.js', + '%2Fetc%2Fpasswd', + 'assets%5cescape.js', + 'assets/%00site.js' + ]) { + const malformed = await registry.handle({ + url: `${descriptor.url}${suffix}`, + method: 'GET', + headers: new Headers() + } as Request, harnessOrigin) + expect(malformed.status, suffix).toBe(403) + } + + const other = await registry.admitFinder({ + path: path.join(site, 'index.html'), + sessionId: 'session-1', + nodeId: 'html-2' + }) + expectDescriptor(other) + expect(csp).not.toContain('sherlock-preview://capability_0000000000000002') + const capabilityModuleRequest = await registry.handle(new Request( + new URL('assets/site.js', descriptor.url), + { headers: { Origin: capabilitySource } } + ), harnessOrigin) + expect(capabilityModuleRequest.status).toBe(200) + expect(capabilityModuleRequest.headers.get('access-control-allow-origin')).toBe(capabilitySource) + const otherCapabilityModuleRequest = await registry.handle(new Request( + new URL('assets/site.js', descriptor.url), + { headers: { Origin: 'sherlock-preview://capability_0000000000000002' } } + ), harnessOrigin) + expect(otherCapabilityModuleRequest.status).toBe(403) + }) + + it('allows only the current trusted main-window origin and rejects other origins before file access', async () => { + const root = await temporaryDirectory() + const filePath = path.join(root, 'portrait.png') + await writeFile(filePath, pngBytes) + const access = countingRealFileSystem() + const registry = new ResearchFilePreviewRegistry({ + storage: new ControllableAuthorizationStorage(), + fileSystem: access.fileSystem, + randomId: deterministicIds( + 'authorization_0000000000000001', + 'capability_0000000000000001' + ) + }) + const descriptor = await registry.admitFinder({ + path: filePath, + sessionId: 'session-1', + nodeId: 'node-1' + }) + expectDescriptor(descriptor) + + let mainWindowUrl = 'http://127.0.0.1:45821/research' + const getMainWindow = () => ({ + isDestroyed: () => false, + webContents: { getURL: () => mainWindowUrl } + }) + const request = (origin?: string) => handleResearchFilePreviewProtocolRequest( + registry, + getMainWindow, + new Request(descriptor.url, origin ? { headers: { Origin: origin } } : undefined) + ) + + access.reset() + const allowed = await request('http://127.0.0.1:45821') + expect(allowed.status).toBe(200) + expect(allowed.headers.get('access-control-allow-origin')).toBe('http://127.0.0.1:45821') + expect(allowed.headers.get('vary')).toBe('Origin') + expect(allowed.headers.get('access-control-expose-headers')).toBe( + 'Accept-Ranges, Content-Length, Content-Range, Content-Type' + ) + expect(await body(allowed)).toEqual(pngBytes) + + for (const deniedOrigin of [ + 'http://127.0.0.1:45822', + 'https://attacker.example' + ]) { + access.reset() + const denied = await request(deniedOrigin) + expect(denied.status, deniedOrigin).toBe(403) + expect(denied.headers.get('access-control-allow-origin'), deniedOrigin).toBeNull() + expect(access.reads(), deniedOrigin).toBe(0) + } + + access.reset() + const navigation = await request() + expect(navigation.status).toBe(200) + expect(navigation.headers.get('access-control-allow-origin')).toBeNull() + expect(await body(navigation)).toEqual(pngBytes) + + mainWindowUrl = 'https://attacker.example/research' + access.reset() + expect((await request('https://attacker.example')).status).toBe(403) + expect(access.reads()).toBe(0) + }) + + it.each([ + { + label: 'missing main window', + method: 'GET', + window: undefined + }, + { + label: 'destroyed main window', + method: 'HEAD', + window: { + isDestroyed: () => true, + webContents: { getURL: () => 'http://127.0.0.1:45821/research' } + } + }, + { + label: 'external HTTP page', + method: 'GET', + window: { + isDestroyed: () => false, + webContents: { getURL: () => 'http://example.com/research' } + } + }, + { + label: 'local file page', + method: 'GET', + window: { + isDestroyed: () => false, + webContents: { getURL: () => 'file:///Applications/Sherlock/splash.html' } + } + }, + { + label: 'recovery page', + method: 'HEAD', + window: { + isDestroyed: () => false, + webContents: { getURL: () => 'dsh-recovery://plugin-error/' } + } + }, + { + label: 'non-Harness HTTPS page', + method: 'HEAD', + window: { + isDestroyed: () => false, + webContents: { getURL: () => 'https://127.0.0.1:45821/research' } + } + } + ])('rejects a no-Origin $method before file access for $label', async ({ method, window }) => { + const root = await temporaryDirectory() + const filePath = path.join(root, 'portrait.png') + await writeFile(filePath, pngBytes) + const access = countingRealFileSystem() + const registry = new ResearchFilePreviewRegistry({ + storage: new ControllableAuthorizationStorage(), + fileSystem: access.fileSystem, + randomId: deterministicIds( + 'authorization_0000000000000001', + 'capability_0000000000000001' + ) + }) + const descriptor = await registry.admitFinder({ + path: filePath, + sessionId: 'session-1', + nodeId: 'node-1' + }) + expectDescriptor(descriptor) + + access.reset() + const response = await handleResearchFilePreviewProtocolRequest( + registry, + () => window, + new Request(descriptor.url, { method }) + ) + expect(response.status).toBe(403) + expect(access.reads()).toBe(0) + }) + + it('answers a narrow Range preflight and exposes range metadata to the allowed origin', async () => { + const { registry, root } = await fixture() + const filePath = path.join(root, 'report.pdf') + const bytes = Buffer.from('%PDF-1234567890') + await writeFile(filePath, bytes) + const descriptor = await registry.admitFinder({ + path: filePath, + sessionId: 'session-1', + nodeId: 'pdf-1' + }) + expectDescriptor(descriptor) + const getMainWindow = () => ({ + isDestroyed: () => false, + webContents: { getURL: () => 'http://localhost:46317/research' } + }) + + const preflight = await handleResearchFilePreviewProtocolRequest( + registry, + getMainWindow, + new Request(descriptor.url, { + method: 'OPTIONS', + headers: { + Origin: 'http://localhost:46317', + 'Access-Control-Request-Method': 'GET', + 'Access-Control-Request-Headers': 'Range' + } + }) + ) + expect(preflight.status).toBe(204) + expect(preflight.headers.get('access-control-allow-origin')).toBe('http://localhost:46317') + expect(preflight.headers.get('access-control-allow-methods')).toBe('GET, HEAD, OPTIONS') + expect(preflight.headers.get('access-control-allow-headers')).toBe('Range') + expect(preflight.headers.get('vary')).toBe('Origin') + + const range = await handleResearchFilePreviewProtocolRequest( + registry, + getMainWindow, + new Request(descriptor.url, { + headers: { + Origin: 'http://localhost:46317', + Range: 'bytes=0-3' + } + }) + ) + expect(range.status).toBe(206) + expect(range.headers.get('content-range')).toBe(`bytes 0-3/${bytes.length}`) + expect(range.headers.get('access-control-allow-origin')).toBe('http://localhost:46317') + expect(range.headers.get('access-control-expose-headers')).toContain('Content-Range') + expect(await body(range)).toEqual(bytes.subarray(0, 4)) + }) +}) + +describe('Research preview privileged IPC registration', () => { + it('invokes the production handlers only for the trusted main frame', async () => { + const { registry, root } = await fixture() + const filePath = path.join(root, 'portrait.png') + await writeFile(filePath, pngBytes) + const mainFrame = { processId: 9, routingId: 12 } + const webContents = { mainFrame } + const window = { isDestroyed: () => false, webContents } + const handlers = new Map unknown>() + const ipcMain = { + removeHandler: vi.fn(), + handle(channel: string, handler: (event: any, value: unknown) => unknown) { + handlers.set(channel, handler) + } + } + registerResearchFilePreviewHandlers({ + ipcMain, + getMainWindow: () => window, + registry + }) + + const finder = handlers.get('research:preview:admit-finder') + expect(finder).toBeTypeOf('function') + const trusted = { sender: webContents, senderFrame: mainFrame } + const child = { sender: webContents, senderFrame: { processId: 9, routingId: 13 } } + await expect(Promise.resolve().then(() => finder?.(child, { + path: filePath, + sessionId: 'session-1', + nodeId: 'node-1' + }))).rejects.toThrow('main Sherlock window') + const descriptor = await finder?.(trusted, { + path: filePath, + sessionId: 'session-1', + nodeId: 'node-1' + }) as ResearchFilePreviewDescriptor + expect(descriptor).toMatchObject({ + authorizationId: 'authorization_0000000000000001', + contentType: 'image/png' + }) + const release = handlers.get('research:preview:release') + expect(release).toBeTypeOf('function') + await expect(Promise.resolve().then(() => release?.(child, { + sessionId: 'session-1', nodeId: 'node-1', + authorizationId: descriptor.authorizationId, + capabilityToken: descriptor.capabilityToken + }))).rejects.toThrow('main Sherlock window') + expect(await release?.(trusted, { + sessionId: 'session-1', nodeId: 'node-1', + authorizationId: descriptor.authorizationId, + capabilityToken: descriptor.capabilityToken + })).toEqual({ ok: true }) + expect(await registry.restore({ + sessionId: 'session-1', nodeId: 'node-1', + authorizationId: descriptor.authorizationId + })).not.toBeNull() + const revokeNode = handlers.get('research:preview:revoke-node') + expect(revokeNode).toBeTypeOf('function') + expect(await revokeNode?.(trusted, { + sessionId: 'session-1', nodeId: 'node-1' + })).toEqual({ ok: true }) + expect(await revokeNode?.(trusted, { + sessionId: 'session-1', nodeId: 'node-1' + })).toEqual({ ok: true }) + expect(await revokeNode?.(trusted, { + sessionId: '', nodeId: 'node-1' + })).toEqual({ ok: false }) + expect(await registry.restore({ + sessionId: 'session-1', nodeId: 'node-1', + authorizationId: descriptor.authorizationId + })).toBeNull() + }) +}) diff --git a/test/research-link-frame.test.ts b/test/research-link-frame.test.ts new file mode 100644 index 000000000..6e15dceb7 --- /dev/null +++ b/test/research-link-frame.test.ts @@ -0,0 +1,168 @@ +import { describe, expect, it, vi } from 'vitest' +import { + ResearchLinkFrameRegistry, + normalizeResearchLinkUrl, + registerResearchLinkFrameHandlers +} from '../src/main/state/research-link-frame' +import { createResearchLinkFrameBridge } from '../src/preload/research-link-frame' + +describe('research link frame authorization', () => { + it('canonicalizes only bounded credential-free HTTP URLs', () => { + expect(normalizeResearchLinkUrl(' HTTPS://Example.com:443/report#part ')) + .toBe('https://example.com/report#part') + expect(normalizeResearchLinkUrl('http://Example.com:80/path')) + .toBe('http://example.com/path') + expect(normalizeResearchLinkUrl(' http:// www.baidu.com ')) + .toBe('http://www.baidu.com/') + expect(normalizeResearchLinkUrl('http://%20www.baidu.com/')) + .toBe('http://www.baidu.com/') + for (const value of [ + 'javascript:alert(1)', + 'data:text/html,hello', + 'file:///tmp/report.html', + 'https://user:pass@example.com/', + '', + `https://example.com/${'x'.repeat(8_192)}` + ]) { + expect(normalizeResearchLinkUrl(value), value).toBeNull() + } + }) + + it('allows only active node URLs and same-origin redirects until the last owner releases', () => { + const registry = new ResearchLinkFrameRegistry(() => 'a'.repeat(32)) + expect(registry.authorize({ + sessionId: 'session-1', nodeId: 'node-1', url: 'https://example.com/report' + })).toEqual({ + url: 'https://example.com/report', + frameName: `sherlock-research-link-${'a'.repeat(32)}` + }) + registry.authorize({ + sessionId: 'session-1', nodeId: 'node-2', url: 'https://example.com/other' + }) + + expect(registry.allows('https://example.com/report')).toBe(true) + expect(registry.allows('https://example.com/redirected')).toBe(true) + expect(registry.allows('https://other.example.com/report')).toBe(false) + expect(registry.release({ sessionId: 'session-1', nodeId: 'node-1' })).toBe(true) + expect(registry.allows('https://example.com/report')).toBe(true) + expect(registry.release({ sessionId: 'session-1', nodeId: 'node-2' })).toBe(true) + expect(registry.allows('https://example.com/report')).toBe(false) + }) + + it('releases exactly one session and rejects malformed identities', () => { + const registry = new ResearchLinkFrameRegistry() + registry.authorize({ sessionId: 'session-a', nodeId: 'node-1', url: 'https://a.example/' }) + registry.authorize({ sessionId: 'session-a', nodeId: 'node-2', url: 'https://b.example/' }) + registry.authorize({ sessionId: 'session-b', nodeId: 'node-3', url: 'https://c.example/' }) + + expect(registry.releaseSession('session-a')).toBe(2) + expect(registry.allows('https://a.example/')).toBe(false) + expect(registry.allows('https://c.example/')).toBe(true) + expect(() => registry.authorize({ sessionId: '', nodeId: 'node', url: 'https://a.example/' })) + .toThrow('Research link frame identity is invalid.') + expect(() => registry.release({ sessionId: 'session-b', nodeId: '' })) + .toThrow('Research link frame identity is invalid.') + }) + + it('exposes a frozen preload bridge with exact IPC channels', async () => { + const invoke = vi.fn(async () => ({ ok: true })) + const bridge = createResearchLinkFrameBridge(invoke) + expect(Object.isFrozen(bridge)).toBe(true) + + await bridge.authorize({ sessionId: 's1', nodeId: 'n1', url: 'https://example.com/' }) + await bridge.inspect({ sessionId: 's1', nodeId: 'n1' }) + await bridge.release({ sessionId: 's1', nodeId: 'n1' }) + await bridge.releaseSession('s1') + + expect(invoke.mock.calls).toEqual([ + ['research:link-frame:authorize', { + sessionId: 's1', nodeId: 'n1', url: 'https://example.com/' + }], + ['research:link-frame:inspect', { sessionId: 's1', nodeId: 'n1' }], + ['research:link-frame:release', { sessionId: 's1', nodeId: 'n1' }], + ['research:link-frame:release-session', { sessionId: 's1' }] + ]) + }) + + it('inspects only the exact authorized live frame with a fixed script', async () => { + const registry = new ResearchLinkFrameRegistry(() => 'b'.repeat(32)) + const authorization = registry.authorize({ + sessionId: 'session-1', nodeId: 'node-1', url: 'https://example.com/report' + }) + const executeJavaScript = vi.fn(async (script: string) => ({ + title: ` ${'真实标题'.repeat(80)} `, + scrollWidth: 1_280, + clientWidth: 720 + })) + const frame = { + name: authorization.frameName, + url: 'https://example.com/redirected', + isDestroyed: () => false, + executeJavaScript + } + + await expect(registry.inspect( + { sessionId: 'session-1', nodeId: 'node-1' }, + [frame] as never + )).resolves.toEqual({ + url: 'https://example.com/redirected', + title: '真实标题'.repeat(80).slice(0, 512), + scrollWidth: 1_280, + clientWidth: 720 + }) + expect(executeJavaScript).toHaveBeenCalledOnce() + expect(executeJavaScript.mock.calls[0]?.[0]).toContain('document.title') + expect(executeJavaScript.mock.calls[0]?.[0]).not.toContain('session-1') + expect(executeJavaScript.mock.calls[0]?.[0]).not.toContain('node-1') + + for (const invalid of [ + { ...frame, name: 'other-frame' }, + { ...frame, url: 'https://other.example/report' }, + { ...frame, isDestroyed: () => true } + ]) { + await expect(registry.inspect( + { sessionId: 'session-1', nodeId: 'node-1' }, + [invalid] as never + )).resolves.toBeNull() + } + await expect(registry.inspect( + { sessionId: 'session-1', nodeId: 'missing' }, + [frame] as never + )).resolves.toBeNull() + }) + + it('registers handlers that accept only the trusted main frame', async () => { + const handlers = new Map unknown>() + const ipcMain = { + removeHandler: vi.fn((channel: string) => handlers.delete(channel)), + handle: vi.fn((channel: string, handler: (event: any, value: unknown) => unknown) => { + handlers.set(channel, handler) + }) + } + const mainFrame = { processId: 7, routingId: 41, framesInSubtree: [] } + const webContents = { mainFrame } + const window = { isDestroyed: () => false, webContents } + const registry = new ResearchLinkFrameRegistry() + registerResearchLinkFrameHandlers({ + ipcMain, + getMainWindow: () => window, + registry + }) + + const authorize = handlers.get('research:link-frame:authorize') + expect(authorize).toBeTypeOf('function') + const payload = { sessionId: 's1', nodeId: 'n1', url: 'https://example.com/' } + expect(() => authorize?.({ + sender: webContents, + senderFrame: { processId: 7, routingId: 42 } + }, payload)).toThrow('main Sherlock window') + await expect(Promise.resolve(authorize?.({ + sender: webContents, + senderFrame: { ...mainFrame } + }, payload))).resolves.toMatchObject({ + url: 'https://example.com/', + frameName: expect.stringMatching(/^sherlock-research-link-[a-f0-9]{32}$/) + }) + expect(registry.allows('https://example.com/next')).toBe(true) + }) +}) diff --git a/test/research-reference-update-contract.typecheck.ts b/test/research-reference-update-contract.typecheck.ts new file mode 100644 index 000000000..6953d88d3 --- /dev/null +++ b/test/research-reference-update-contract.typecheck.ts @@ -0,0 +1,28 @@ +import type { ReferenceInsert } from '@deepseek-ai/dsh-client-ui-input-trigger/client' +import type { + ComposerKeyboard, + InputEvent +} from '../node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/input/contract' +import type { SessionInputShell } from '../node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/types/client/input/facade' + +declare const reference: ReferenceInsert +declare const keyboard: ComposerKeyboard +declare const shell: SessionInputShell + +const updateResearchReferenceEvent: InputEvent = { + type: 'update-research-ref', + fileId: 'research-node-id', + reference +} +const keyboardChanged: boolean = keyboard.updateResearchReferenceOccurrences( + 'research-node-id', + reference +) +const shellChanged: boolean = shell.updateResearchReferenceOccurrences( + 'research-node-id', + reference +) + +void updateResearchReferenceEvent +void keyboardChanged +void shellChanged diff --git a/test/research-task-runtime.test.js b/test/research-task-runtime.test.js new file mode 100644 index 000000000..d316bd115 --- /dev/null +++ b/test/research-task-runtime.test.js @@ -0,0 +1,1035 @@ +import { mkdtemp, readFile, rm, writeFile } from 'node:fs/promises' +import { tmpdir } from 'node:os' +import { join } from 'node:path' +import { Readable } from 'node:stream' +import { strToU8, zipSync } from 'fflate' +import { describe, expect, it, vi } from 'vitest' + +const runtimeModule = () => import('../packages/dsh-research-task-runtime/index.js') + +function briefMindMapRequest(overrides = {}) { + return { + parentSessionId: 'parent-1', + canvasNodeId: 'node-1', + kind: 'mind-map', + detail: 'brief', + sources: [ + { + id: 'file-1', + type: 'file', + title: '黄金研究报告.pdf', + path: '/workspace/黄金研究报告.pdf' + }, + { + id: 'artifact-1', + type: 'artifact', + title: '已有结论', + text: '金价的核心驱动包括实际利率、美元和央行购金。' + } + ], + ...overrides + } +} + +function assistantChunk(type, text) { + return { + type: 'assistant/chunk', + seq: 8, + time: 1_000, + data: { + turn: 0, + step: 0, + chunk: { type, index: 0, text } + } + } +} + +function summaryRequest(canvasNodeId, parentSessionId = 'parent-1') { + return { + parentSessionId, + canvasNodeId, + kind: 'summary', + sources: [{ + id: `source-${canvasNodeId}`, + type: 'artifact', + title: `来源 ${canvasNodeId}`, + text: `用于 ${canvasNodeId} 的不可变内容` + }] + } +} + +function containerRequest(canvasNodeId = 'container-1', parentSessionId = 'parent-1') { + return { + parentSessionId, + canvasNodeId, + kind: 'container', + prompt: '制作一张展示月度收入趋势的柱状图' + } +} + +function memoryTaskStorage(initial = { version: 1, tasks: [] }) { + let document = structuredClone(initial) + return { + async load() { + return structuredClone(document) + }, + async save(next) { + document = structuredClone(next) + }, + snapshot() { + return structuredClone(document) + } + } +} + +async function eventually(assertion, timeoutMs = 1_000) { + const deadline = Date.now() + timeoutMs + let error + while (Date.now() < deadline) { + try { + return assertion() + } catch (failure) { + error = failure + await new Promise((resolve) => setTimeout(resolve, 0)) + } + } + throw error +} + +function deferredTaskAdapter() { + const starts = [] + const byTask = new Map() + const cancelCounts = new Map() + return { + adapter: { + async start(request) { + const deferred = Promise.withResolvers() + const handle = { + childSessionId: `child-${request.taskId}`, + result: deferred.promise, + dispose: vi.fn(async () => undefined) + } + const run = { request, deferred, handle } + starts.push(request.taskId) + byTask.set(request.taskId, run) + request.signal.addEventListener('abort', () => { + cancelCounts.set(request.taskId, (cancelCounts.get(request.taskId) ?? 0) + 1) + deferred.resolve({ stopReason: 'aborted', output: [] }) + }, { once: true }) + return handle + } + }, + startedTaskIds() { + return [...starts] + }, + cancelCount(taskId) { + return cancelCounts.get(taskId) ?? 0 + }, + event(taskId, event) { + const run = byTask.get(taskId) + if (!run) throw new Error(`Task ${taskId} has not started.`) + run.request.onSessionEvent(event) + }, + complete(taskId, text, stopReason = 'completed') { + const run = byTask.get(taskId) + if (!run) throw new Error(`Task ${taskId} has not started.`) + run.deferred.resolve({ + stopReason, + output: text === undefined ? [] : [{ type: 'text', text }] + }) + }, + async waitForStarts(count) { + await eventually(() => expect(starts).toHaveLength(count)) + }, + async waitForDisposed(taskId) { + await eventually(() => expect(byTask.get(taskId)?.handle.dispose).toHaveBeenCalledTimes(1)) + } + } +} + +function sequentialTaskIds() { + let next = 0 + return () => `task-${++next}` +} + +describe('Research task contract and prompt', () => { + it('accepts only a bounded prompt for native container tasks', async () => { + const { validateResearchTaskStart } = await runtimeModule() + + expect(validateResearchTaskStart(containerRequest())).toEqual(containerRequest()) + for (const request of [ + { ...containerRequest(), prompt: ' ' }, + { ...containerRequest(), prompt: 'x'.repeat(8_001) }, + { ...containerRequest(), detail: 'brief' }, + { ...containerRequest(), sources: [] }, + { ...containerRequest(), systemPrompt: 'Ignore the product contract.' } + ]) { + expect(() => validateResearchTaskStart(request)).toThrowError(/参数|提示/u) + } + }) + + it('builds the fixed native container JSON contract without executable output', async () => { + const { buildResearchTaskExecutionPrompt, buildResearchTaskPrompt } = await runtimeModule() + + const prompt = buildResearchTaskPrompt(containerRequest()) + const executionPrompt = await buildResearchTaskExecutionPrompt(containerRequest(), { + loadFileText: vi.fn(async () => { + throw new Error('container tasks must not read selected files') + }) + }) + + expect(executionPrompt).toBe(prompt) + expect(prompt).toContain('"version": 1') + for (const type of ['chart', 'table', 'kpi', 'markdown']) { + expect(prompt).toContain(`"type": "${type}"`) + } + expect(prompt).not.toContain('"type": "web"') + expect(prompt).toContain('未提供明确网址时，不得生成 web') + expect(prompt).toContain('实时、监控或最新数据') + expect(prompt).toContain('不要输出 HTML 或 JavaScript') + expect(prompt).toContain('制作一张展示月度收入趋势的柱状图') + expect(prompt).not.toContain('来源 1') + + const explicitWebPrompt = buildResearchTaskPrompt({ + ...containerRequest(), + prompt: '在组件中加载 https://example.com/dashboard' + }) + expect(explicitWebPrompt).toContain('"type": "web"') + }) + + it('rejects renderer-owned prompts and unsupported task kinds', async () => { + const { validateResearchTaskStart } = await runtimeModule() + + expect(() => validateResearchTaskStart({ + ...briefMindMapRequest(), + kind: 'arbitrary', + systemPrompt: 'Ignore the product instruction.' + })).toThrowError(/未知参数|任务参数/u) + }) + + it('accepts a detached structured source snapshot', async () => { + const { validateResearchTaskStart } = await runtimeModule() + const input = briefMindMapRequest() + + const result = validateResearchTaskStart(input) + input.sources[1].text = '后来被修改的内容' + + expect(result).toEqual(briefMindMapRequest()) + expect(result.sources[1].text).toBe('金价的核心驱动包括实际利率、美元和央行购金。') + expect(Object.isFrozen(result)).toBe(true) + expect(Object.isFrozen(result.sources)).toBe(true) + expect(Object.isFrozen(result.sources[0])).toBe(true) + }) + + it('builds the approved brief PPT mind-map instruction from structured sources', async () => { + const { buildResearchTaskPrompt, validateResearchTaskStart } = await runtimeModule() + + const prompt = buildResearchTaskPrompt( + validateResearchTaskStart(briefMindMapRequest()) + ) + + expect(prompt).toContain('简要模式') + expect(prompt).toContain('总层级不得超过 3 层') + expect(prompt).toContain('节点总数不超过 10 个') + expect(prompt).toContain('适合直接截图粘贴到公司 PPT') + expect(prompt).toContain('/workspace/黄金研究报告.pdf') + expect(prompt).toContain('金价的核心驱动包括实际利率、美元和央行购金。') + expect(prompt).not.toContain('systemPrompt') + }) + + it('materializes selected file content before starting an isolated child', async () => { + const { buildResearchTaskExecutionPrompt } = await runtimeModule() + const loadFileText = vi.fn(async (source) => { + expect(source).toMatchObject({ + type: 'file', + title: '黄金研究报告.pdf', + path: '/workspace/黄金研究报告.pdf' + }) + return '报告正文：美元、实际利率与央行购金共同影响金价。' + }) + + const prompt = await buildResearchTaskExecutionPrompt(briefMindMapRequest(), { + loadFileText + }) + + expect(loadFileText).toHaveBeenCalledTimes(1) + expect(prompt).toContain('报告正文：美元、实际利率与央行购金共同影响金价。') + expect(prompt).not.toContain('/workspace/黄金研究报告.pdf') + expect(prompt).toContain('金价的核心驱动包括实际利率、美元和央行购金。') + }) + + it('extracts PPTX slide text in presentation order', async () => { + const { loadResearchFileText } = await runtimeModule() + const directory = await mkdtemp(join(tmpdir(), 'research-task-pptx-')) + const path = join(directory, '企业 AI 平台.pptx') + const archive = zipSync({ + '[Content_Types].xml': strToU8(''), + 'ppt/slides/slide2.xml': strToU8([ + '', + '', + '能力积累 & 持续迭代', + '' + ].join('')), + 'ppt/slides/slide1.xml': strToU8([ + '', + '', + '企业 AI 应用', + '研究体系', + '' + ].join('')), + 'ppt/slideLayouts/slideLayout1.xml': strToU8('不应提取的版式文字') + }) + await writeFile(path, archive) + + try { + await expect(loadResearchFileText({ path })).resolves.toBe([ + '第 1 页', + '企业 AI 应用', + '研究体系', + '', + '第 2 页', + '能力积累 & 持续迭代' + ].join('\n')) + } finally { + await rm(directory, { recursive: true, force: true }) + } + }) + + it('keeps standard and detailed mind maps free of a fixed level cap', async () => { + const { buildResearchTaskPrompt, validateResearchTaskStart } = await runtimeModule() + + const standard = buildResearchTaskPrompt(validateResearchTaskStart( + briefMindMapRequest({ detail: 'standard' }) + )) + const detailed = buildResearchTaskPrompt(validateResearchTaskStart( + briefMindMapRequest({ detail: 'detailed' }) + )) + + expect(standard).toContain('常规模式') + expect(standard).toContain('不设置固定层级上限') + expect(detailed).toContain('详细模式') + expect(detailed).toContain('不设置固定层级上限') + expect(detailed).toContain('避免末行仅剩单个汉字') + expect(detailed).toContain('完整句子左对齐，短语或词语居中') + }) +}) + +describe('Research task public event sanitization', () => { + it('emits assistant text deltas without private reasoning', async () => { + const { publicEventFromSessionEvent } = await runtimeModule() + + expect(publicEventFromSessionEvent(assistantChunk('text-delta', '正在生成'))) + .toEqual({ type: 'assistant-delta', text: '正在生成' }) + expect(publicEventFromSessionEvent(assistantChunk('reasoning-delta', 'private chain'))) + .toBeNull() + }) + + it('maps tool calls to bounded public labels without arguments or result bodies', async () => { + const { publicEventFromSessionEvent } = await runtimeModule() + + const started = publicEventFromSessionEvent({ + type: 'tool/call', + seq: 9, + time: 1_001, + data: { + turn: 0, + step: 0, + callId: 'call-1', + name: 'read', + arguments: '{"path":"/workspace/private.pdf"}' + } + }) + const finished = publicEventFromSessionEvent({ + type: 'tool/result', + seq: 10, + time: 1_002, + data: { + turn: 0, + step: 0, + message: { + role: 'tool', + toolCallId: 'call-1', + content: [{ type: 'text', text: 'sensitive raw body' }], + isError: false + } + } + }) + + expect(started).toEqual({ type: 'tool-started', tool: '读取资料' }) + expect(JSON.stringify(started)).not.toContain('/workspace/private.pdf') + expect(finished).toEqual({ type: 'tool-finished', failed: false }) + expect(JSON.stringify(finished)).not.toContain('sensitive raw body') + }) +}) + +describe('Research task four-slot scheduling', () => { + it('shares the same four slots between selection and native container tasks', async () => { + const { ResearchTaskRuntime } = await runtimeModule() + const launches = deferredTaskAdapter() + const runtime = new ResearchTaskRuntime({ + adapter: launches.adapter, + storage: memoryTaskStorage(), + createId: sequentialTaskIds() + }) + + const receipts = await Promise.all([ + runtime.start(summaryRequest('summary-1')), + runtime.start(containerRequest('container-1')), + runtime.start(containerRequest('container-2')), + runtime.start(summaryRequest('summary-2')), + runtime.start(containerRequest('container-3')) + ]) + await launches.waitForStarts(4) + + expect(new Set(launches.startedTaskIds())).toEqual( + new Set(['task-1', 'task-2', 'task-3', 'task-4']) + ) + expect(runtime.inspect({ + parentSessionId: 'parent-1', taskId: receipts[4].taskId, afterSeq: 0 + }).state).toBe('queued') + + launches.complete(receipts[0].taskId, '总结完成') + await launches.waitForStarts(5) + expect(new Set(launches.startedTaskIds())).toEqual( + new Set(['task-1', 'task-2', 'task-3', 'task-4', 'task-5']) + ) + }) + + it('runs four tasks for one parent and admits the fifth in FIFO order', async () => { + const { ResearchTaskRuntime } = await runtimeModule() + const launches = deferredTaskAdapter() + const runtime = new ResearchTaskRuntime({ + adapter: launches.adapter, + storage: memoryTaskStorage(), + createId: sequentialTaskIds(), + now: () => 1_000 + }) + + const receipts = await Promise.all( + ['node-1', 'node-2', 'node-3', 'node-4', 'node-5'] + .map((nodeId) => runtime.start(summaryRequest(nodeId))) + ) + await launches.waitForStarts(4) + + expect(launches.startedTaskIds()).toEqual(['task-1', 'task-2', 'task-3', 'task-4']) + const queued = runtime.inspect({ + parentSessionId: 'parent-1', + taskId: receipts[4].taskId, + afterSeq: 0 + }) + expect(queued).toMatchObject({ state: 'queued' }) + expect(queued).not.toHaveProperty('childSessionId') + + launches.complete(receipts[0].taskId, '任务一结果') + await launches.waitForDisposed(receipts[0].taskId) + await launches.waitForStarts(5) + + expect(launches.startedTaskIds()).toEqual([ + 'task-1', 'task-2', 'task-3', 'task-4', 'task-5' + ]) + }) + + it('uses independent four-slot capacity for different parent sessions', async () => { + const { ResearchTaskRuntime } = await runtimeModule() + const launches = deferredTaskAdapter() + const runtime = new ResearchTaskRuntime({ + adapter: launches.adapter, + storage: memoryTaskStorage(), + createId: sequentialTaskIds() + }) + + await Promise.all([ + ...Array.from({ length: 4 }, (_, index) => + runtime.start(summaryRequest(`a-${index}`, 'parent-a'))), + ...Array.from({ length: 4 }, (_, index) => + runtime.start(summaryRequest(`b-${index}`, 'parent-b'))) + ]) + + await launches.waitForStarts(8) + expect(launches.startedTaskIds()).toHaveLength(8) + }) + + it('routes out-of-order terminal output by task and canvas node identity', async () => { + const { ResearchTaskRuntime } = await runtimeModule() + const launches = deferredTaskAdapter() + const runtime = new ResearchTaskRuntime({ + adapter: launches.adapter, + storage: memoryTaskStorage(), + createId: sequentialTaskIds() + }) + const taskA = await runtime.start(summaryRequest('node-a')) + const taskB = await runtime.start(summaryRequest('node-b')) + await launches.waitForStarts(2) + + launches.complete(taskB.taskId, '结果 B') + launches.complete(taskA.taskId, '结果 A') + await Promise.all([ + launches.waitForDisposed(taskA.taskId), + launches.waitForDisposed(taskB.taskId) + ]) + + expect(runtime.inspect({ + parentSessionId: 'parent-1', taskId: taskA.taskId, afterSeq: 0 + })).toMatchObject({ canvasNodeId: 'node-a', finalOutput: '结果 A' }) + expect(runtime.inspect({ + parentSessionId: 'parent-1', taskId: taskB.taskId, afterSeq: 0 + })).toMatchObject({ canvasNodeId: 'node-b', finalOutput: '结果 B' }) + }) + + it('hides task existence from a different parent session', async () => { + const { ResearchTaskRuntime } = await runtimeModule() + const runtime = new ResearchTaskRuntime({ + adapter: deferredTaskAdapter().adapter, + storage: memoryTaskStorage(), + createId: sequentialTaskIds() + }) + const receipt = await runtime.start(summaryRequest('node-a', 'parent-a')) + + expect(() => runtime.inspect({ + parentSessionId: 'parent-b', taskId: receipt.taskId, afterSeq: 0 + })).toThrowError(expect.objectContaining({ code: 'TASK_NOT_FOUND' })) + await expect(runtime.cancel({ + parentSessionId: 'parent-b', taskId: receipt.taskId + })).rejects.toMatchObject({ code: 'TASK_NOT_FOUND' }) + }) +}) + +describe('Research task cancellation and terminal cleanup', () => { + it('preserves safe source extraction errors without starting a child', async () => { + const { ResearchTaskRuntime } = await runtimeModule() + const launches = deferredTaskAdapter() + const runtime = new ResearchTaskRuntime({ + adapter: launches.adapter, + storage: memoryTaskStorage(), + createId: sequentialTaskIds() + }) + const receipt = await runtime.start(briefMindMapRequest({ + sources: [{ + id: 'unsupported-file', + type: 'file', + title: '暂不支持的表格.xlsx', + path: '/workspace/暂不支持的表格.xlsx' + }] + })) + + await eventually(() => expect(runtime.inspect({ + parentSessionId: 'parent-1', taskId: receipt.taskId, afterSeq: 0 + })).toMatchObject({ + state: 'failed', + error: '暂不支持读取所选文件类型' + })) + expect(launches.startedTaskIds()).toEqual([]) + }) + + it('cancels queued work without launching it', async () => { + const { ResearchTaskRuntime } = await runtimeModule() + const launches = deferredTaskAdapter() + const runtime = new ResearchTaskRuntime({ + adapter: launches.adapter, + storage: memoryTaskStorage(), + createId: sequentialTaskIds() + }) + const receipts = await Promise.all( + ['node-1', 'node-2', 'node-3', 'node-4', 'node-5'] + .map((nodeId) => runtime.start(summaryRequest(nodeId))) + ) + await launches.waitForStarts(4) + + await runtime.cancel({ parentSessionId: 'parent-1', taskId: receipts[4].taskId }) + launches.complete(receipts[0].taskId, '完成') + await launches.waitForDisposed(receipts[0].taskId) + + expect(launches.startedTaskIds()).not.toContain(receipts[4].taskId) + expect(runtime.inspect({ + parentSessionId: 'parent-1', taskId: receipts[4].taskId, afterSeq: 0 + })).toMatchObject({ state: 'cancelled', error: '任务已取消，可重试。' }) + }) + + it('cancels a running task idempotently and releases its slot after disposal', async () => { + const { ResearchTaskRuntime } = await runtimeModule() + const launches = deferredTaskAdapter() + const runtime = new ResearchTaskRuntime({ + adapter: launches.adapter, + storage: memoryTaskStorage(), + createId: sequentialTaskIds() + }) + const receipt = await runtime.start(summaryRequest('node-1')) + await launches.waitForStarts(1) + + await runtime.cancel({ parentSessionId: 'parent-1', taskId: receipt.taskId }) + await runtime.cancel({ parentSessionId: 'parent-1', taskId: receipt.taskId }) + await launches.waitForDisposed(receipt.taskId) + + expect(launches.cancelCount(receipt.taskId)).toBe(1) + expect(runtime.inspect({ + parentSessionId: 'parent-1', taskId: receipt.taskId, afterSeq: 0 + })).toMatchObject({ state: 'cancelled', error: '任务已取消，可重试。' }) + }) + + it('returns only events after the task-local cursor while running', async () => { + const { ResearchTaskRuntime } = await runtimeModule() + const launches = deferredTaskAdapter() + const runtime = new ResearchTaskRuntime({ + adapter: launches.adapter, + storage: memoryTaskStorage(), + createId: sequentialTaskIds(), + now: () => 1_000 + }) + const receipt = await runtime.start(summaryRequest('node-1')) + await launches.waitForStarts(1) + launches.event(receipt.taskId, assistantChunk('text-delta', '第一段')) + launches.event(receipt.taskId, assistantChunk('text-delta', '第二段')) + + const all = runtime.inspect({ + parentSessionId: 'parent-1', taskId: receipt.taskId, afterSeq: 0 + }) + const tail = runtime.inspect({ + parentSessionId: 'parent-1', taskId: receipt.taskId, afterSeq: all.events[2].seq + }) + + expect(all.events.map((event) => event.type)).toEqual([ + 'queued', 'started', 'assistant-delta', 'assistant-delta' + ]) + expect(tail.events).toEqual([expect.objectContaining({ + type: 'assistant-delta', text: '第二段' + })]) + }) + + it('drops transient events after committing a completed result', async () => { + const { ResearchTaskRuntime } = await runtimeModule() + const launches = deferredTaskAdapter() + const storage = memoryTaskStorage() + const runtime = new ResearchTaskRuntime({ + adapter: launches.adapter, + storage, + createId: sequentialTaskIds() + }) + const receipt = await runtime.start(summaryRequest('node-1')) + await launches.waitForStarts(1) + launches.event(receipt.taskId, assistantChunk('text-delta', '流式草稿')) + const runningSeq = runtime.inspect({ + parentSessionId: 'parent-1', taskId: receipt.taskId, afterSeq: 0 + }).lastSeq + launches.complete(receipt.taskId, '最终结果') + await launches.waitForDisposed(receipt.taskId) + + const completed = runtime.inspect({ + parentSessionId: 'parent-1', taskId: receipt.taskId, afterSeq: 0 + }) + expect(completed).toMatchObject({ state: 'completed', finalOutput: '最终结果', events: [] }) + expect(completed.lastSeq).toBeGreaterThan(runningSeq) + expect(JSON.stringify(storage.snapshot())).not.toContain('流式草稿') + }) +}) + +function sessionEventContext(parent, child, run) { + const listeners = new Set() + return { + agents: { get: vi.fn((id) => id === parent.id ? parent : undefined) }, + subagents: { start: vi.fn(async () => run) }, + on(name, listener) { + expect(name).toBe('session/event') + listeners.add(listener) + return () => listeners.delete(listener) + }, + emit(session, event) { + for (const listener of listeners) listener(session, event) + }, + child + } +} + +function requestStream(body, options = {}) { + const request = Readable.from([Buffer.from(body)]) + request.method = options.method ?? 'POST' + request.headers = options.headers ?? {} + request.socket = { remoteAddress: options.remoteAddress ?? '127.0.0.1' } + return request +} + +describe('Research task Subagent adapter', () => { + it('keeps child events emitted while the adapter is still starting', async () => { + const { ResearchTaskRuntime } = await runtimeModule() + const result = Promise.withResolvers() + const runtime = new ResearchTaskRuntime({ + adapter: { + async start(request) { + request.onSessionEvent(assistantChunk('text-delta', '启动阶段消息')) + return { + childSessionId: 'child-1', + result: result.promise, + dispose: async () => undefined + } + } + }, + storage: memoryTaskStorage(), + createId: () => 'task-1' + }) + const receipt = await runtime.start(summaryRequest('node-1')) + + await eventually(() => expect(runtime.inspect({ + parentSessionId: 'parent-1', taskId: receipt.taskId, afterSeq: 0 + }).state).toBe('running')) + expect(runtime.inspect({ + parentSessionId: 'parent-1', taskId: receipt.taskId, afterSeq: 0 + }).events).toContainEqual(expect.objectContaining({ + type: 'assistant-delta', text: '启动阶段消息' + })) + + result.resolve({ stopReason: 'completed', output: [{ type: 'text', text: '完成' }] }) + }) + + it('starts a fresh local child from the exact live parent without external tools', async () => { + const { createSubagentAdapter } = await runtimeModule() + const parent = { id: 'parent-1', session: { events: [] } } + const first = assistantChunk('text-delta', '已读取材料') + const child = { id: 'child-1', session: { id: 'child-1', events: [first] } } + const dispose = vi.fn(async () => undefined) + const run = { + id: child.id, + localAgent: child, + result: Promise.resolve({ stopReason: 'completed', output: [{ type: 'text', text: '完成' }] }), + dispose + } + const ctx = sessionEventContext(parent, child, run) + const onSessionEvent = vi.fn() + + const handle = await createSubagentAdapter(ctx).start({ + parentSessionId: parent.id, + kind: 'summary', + prompt: '产品固定提示词', + signal: new AbortController().signal, + onSessionEvent + }) + ctx.emit(child.session, first) + const second = { ...assistantChunk('text-delta', '正在生成'), seq: 9 } + ctx.emit(child.session, second) + + expect(ctx.subagents.start).toHaveBeenCalledWith('spawn', expect.objectContaining({ + parent, + prompt: [{ type: 'text', text: '产品固定提示词' }], + maxDepth: 1, + toolFilter: { allow: [] } + })) + expect(ctx.subagents.start.mock.calls[0][1].persona).toContain('画布') + expect(parent.session.events).toHaveLength(0) + expect(onSessionEvent).toHaveBeenCalledTimes(2) + expect(onSessionEvent).toHaveBeenNthCalledWith(1, first) + expect(onSessionEvent).toHaveBeenNthCalledWith(2, second) + expect(handle.childSessionId).toBe(child.id) + + await handle.dispose() + expect(dispose).toHaveBeenCalledTimes(1) + }) + + it('allows only read-only web lookup tools for native container tasks', async () => { + const { createSubagentAdapter } = await runtimeModule() + const parent = { + id: 'parent-1', + session: { events: [] }, + ctx: { + tools: { + get: vi.fn((name) => ['web_search', 'web_fetch'].includes(name) ? { name } : undefined) + } + } + } + const child = { id: 'child-1', session: { id: 'child-1', events: [] } } + const run = { + id: child.id, + localAgent: child, + result: Promise.resolve({ stopReason: 'completed', output: [{ type: 'text', text: '完成' }] }), + dispose: vi.fn(async () => undefined) + } + const ctx = sessionEventContext(parent, child, run) + + const handle = await createSubagentAdapter(ctx).start({ + parentSessionId: parent.id, + kind: 'container', + prompt: '生成比特币价格监控', + signal: new AbortController().signal, + onSessionEvent: vi.fn() + }) + + expect(ctx.subagents.start).toHaveBeenCalledWith('spawn', expect.objectContaining({ + toolFilter: { allow: ['web_search', 'web_fetch'] } + })) + await handle.dispose() + }) + + it('starts native container tasks without naming unavailable global web tools', async () => { + const { createSubagentAdapter } = await runtimeModule() + const parent = { id: 'parent-1', session: { events: [] } } + const child = { id: 'child-1', session: { id: 'child-1', events: [] } } + const run = { + id: child.id, + localAgent: child, + result: Promise.resolve({ stopReason: 'completed', output: [{ type: 'text', text: '完成' }] }), + dispose: vi.fn(async () => undefined) + } + const ctx = sessionEventContext(parent, child, run) + + const handle = await createSubagentAdapter(ctx).start({ + parentSessionId: parent.id, + kind: 'container', + prompt: '生成比特币价格监控', + signal: new AbortController().signal, + onSessionEvent: vi.fn() + }) + + expect(ctx.subagents.start).toHaveBeenCalledWith('spawn', expect.objectContaining({ + toolFilter: { allow: [] }, + prompt: [expect.objectContaining({ + text: expect.stringContaining('当前任务未提供网页检索工具') + })] + })) + await handle.dispose() + }) + + it('passes the validated task kind to the isolated task adapter', async () => { + const { ResearchTaskRuntime } = await runtimeModule() + const start = vi.fn(async () => ({ + childSessionId: 'child-container', + result: Promise.resolve({ + stopReason: 'completed', + output: [{ + type: 'text', + text: '{"version":1,"type":"kpi","title":"比特币监控","items":[{"label":"价格","value":"待更新"}]}' + }] + }), + dispose: async () => undefined + })) + const runtime = new ResearchTaskRuntime({ + adapter: { start }, + storage: memoryTaskStorage(), + createId: () => 'task-container-kind' + }) + + await runtime.start({ ...containerRequest(), prompt: '生成比特币价格监控' }) + await eventually(() => expect(start).toHaveBeenCalledTimes(1)) + + expect(start).toHaveBeenCalledWith(expect.objectContaining({ kind: 'container' })) + }) + + it('fails without mutating the parent when the exact parent is no longer live', async () => { + const { createSubagentAdapter } = await runtimeModule() + const ctx = sessionEventContext( + { id: 'different-parent', session: { events: [] } }, + { id: 'child-1', session: { id: 'child-1', events: [] } }, + {} + ) + + await expect(createSubagentAdapter(ctx).start({ + parentSessionId: 'parent-1', + prompt: '提示词', + signal: new AbortController().signal, + onSessionEvent: vi.fn() + })).rejects.toMatchObject({ code: 'PARENT_NOT_LIVE' }) + expect(ctx.subagents.start).not.toHaveBeenCalled() + }) + + it('resolves an idle persisted parent through the configured Host lookup', async () => { + const { createSubagentAdapter } = await runtimeModule() + const parent = { id: 'parent-1', session: { events: [] } } + const child = { id: 'child-1', session: { id: 'child-1', events: [] } } + const childDispose = vi.fn(async () => undefined) + const run = { + id: child.id, + localAgent: child, + result: Promise.resolve({ + stopReason: 'completed', output: [{ type: 'text', text: '完成' }] + }), + dispose: childDispose + } + let liveParent + const ctx = sessionEventContext(parent, child, run) + ctx.agents.get = vi.fn((id) => id === parent.id ? liveParent : undefined) + const resolve = vi.fn(async (sessionId) => { + expect(sessionId).toBe(parent.id) + liveParent = parent + return parent + }) + ctx.typert = { lookups: { get: vi.fn((key) => key === 'agent' ? { resolve } : undefined) } } + const adapter = createSubagentAdapter(ctx) + + const handle = await adapter.start({ + parentSessionId: parent.id, + prompt: '产品固定提示词', + signal: new AbortController().signal, + onSessionEvent: vi.fn() + }) + + expect(resolve).toHaveBeenCalledTimes(1) + expect(ctx.typert.lookups.get).toHaveBeenCalledWith('agent') + expect(ctx.subagents.start).toHaveBeenCalledWith('spawn', expect.objectContaining({ + parent + })) + await handle.dispose() + await adapter.dispose() + }) +}) + +describe('Research task persistence and restart recovery', () => { + it('persists and restores native container prompts without selected sources', async () => { + const { ResearchTaskRuntime } = await runtimeModule() + const storage = memoryTaskStorage({ + version: 1, + tasks: [{ + ...containerRequest(), + taskId: 'container-task', + state: 'completed', + finalOutput: '{"version":1,"type":"kpi","title":"收入","items":[]}', + createdAt: 100, + completedAt: 120 + }] + }) + const runtime = new ResearchTaskRuntime({ + adapter: { start: vi.fn(async () => { throw new Error('must not relaunch') }) }, + storage, + now: () => 500 + }) + + await runtime.restore() + + expect(runtime.inspect({ + parentSessionId: 'parent-1', taskId: 'container-task', afterSeq: 0 + })).toMatchObject({ + state: 'completed', + finalOutput: '{"version":1,"type":"kpi","title":"收入","items":[]}' + }) + expect(storage.snapshot().tasks[0]).toMatchObject(containerRequest()) + expect(storage.snapshot().tasks[0]).not.toHaveProperty('sources') + }) + + it('restores terminal output and converts non-terminal tasks to interrupted', async () => { + const { ResearchTaskRuntime } = await runtimeModule() + const document = { + version: 1, + tasks: [ + { + ...summaryRequest('complete-node'), + taskId: 'complete-task', + state: 'completed', + finalOutput: '最终总结', + createdAt: 100, + startedAt: 110, + completedAt: 120 + }, + { + ...summaryRequest('running-node'), + taskId: 'running-task', + childSessionId: 'old-child', + state: 'running', + createdAt: 200, + startedAt: 210 + } + ] + } + const storage = memoryTaskStorage(document) + const adapter = { start: vi.fn(async () => { throw new Error('must not relaunch') }) } + const runtime = new ResearchTaskRuntime({ adapter, storage, now: () => 500 }) + + await runtime.restore() + + expect(runtime.inspect({ + parentSessionId: 'parent-1', taskId: 'complete-task', afterSeq: 0 + })).toMatchObject({ state: 'completed', finalOutput: '最终总结' }) + const interrupted = runtime.inspect({ + parentSessionId: 'parent-1', taskId: 'running-task', afterSeq: 0 + }) + expect(interrupted).toMatchObject({ + state: 'interrupted', error: '任务因应用重启而中断，请重试。', completedAt: 500 + }) + expect(interrupted).not.toHaveProperty('childSessionId') + expect(adapter.start).not.toHaveBeenCalled() + }) + + it('writes atomic JSON and retains only the newest 200 terminal tasks', async () => { + const { JsonResearchTaskStorage } = await runtimeModule() + const directory = await mkdtemp(join(tmpdir(), 'research-task-storage-')) + const filePath = join(directory, 'tasks.json') + const storage = new JsonResearchTaskStorage(filePath) + const tasks = Array.from({ length: 205 }, (_, index) => ({ + ...summaryRequest(`node-${index}`), + taskId: `task-${index}`, + state: 'completed', + finalOutput: `结果 ${index}`, + createdAt: index, + completedAt: index + })) + + await storage.save({ version: 1, tasks }) + + const saved = JSON.parse(await readFile(filePath, 'utf8')) + expect(saved.tasks).toHaveLength(200) + expect(saved.tasks[0].taskId).toBe('task-5') + expect(saved.tasks.at(-1).taskId).toBe('task-204') + await expect(storage.load()).resolves.toEqual(saved) + }) +}) + +describe('Research task trusted HTTP surface', () => { + it('rejects remote, forwarded, cross-origin, wrong-method, and oversized requests', async () => { + const { + CANCEL_PATH, + INSPECT_PATH, + START_PATH, + isTrustedRequest, + readJsonBody, + routeMethodStatus + } = await runtimeModule() + const trustedHeaders = { + origin: 'http://127.0.0.1:43127', + host: '127.0.0.1:43127' + } + + expect(isTrustedRequest(requestStream('{}', { remoteAddress: '10.0.0.2' }), true)).toBe(false) + expect(isTrustedRequest(requestStream('{}', { + headers: { ...trustedHeaders, forwarded: 'for=10.0.0.2' } + }), true)).toBe(false) + expect(isTrustedRequest(requestStream('{}', { + headers: { ...trustedHeaders, origin: 'https://evil.test' } + }), true)).toBe(false) + expect(isTrustedRequest(requestStream('{}', { headers: trustedHeaders }), true)).toBe(true) + await expect(readJsonBody(requestStream('x'.repeat(384 * 1024 + 1)))) + .rejects.toMatchObject({ code: 'BODY_TOO_LARGE' }) + expect(routeMethodStatus(START_PATH, 'GET')).toBe(405) + expect(routeMethodStatus(INSPECT_PATH, 'PUT')).toBe(405) + expect(routeMethodStatus(CANCEL_PATH, 'DELETE')).toBe(405) + }) + + it('registers only exact routes and returns no-store JSON', async () => { + const { START_PATH, registerResearchTaskRoutes } = await runtimeModule() + const routes = new Map() + const webServer = { + register: vi.fn((route) => { + routes.set(route.path, route) + return () => routes.delete(route.path) + }) + } + const runtime = { + start: vi.fn(async (body) => ({ taskId: 'task-1', ...body, state: 'queued' })), + inspect: vi.fn(), + cancel: vi.fn() + } + const dispose = registerResearchTaskRoutes(webServer, runtime) + const request = requestStream(JSON.stringify(summaryRequest('node-1')), { + headers: { origin: 'http://127.0.0.1:43127', host: '127.0.0.1:43127' } + }) + const response = { + status: undefined, + headers: undefined, + body: '', + writeHead(status, headers) { this.status = status; this.headers = headers }, + end(body) { this.body = body } + } + + expect([...routes.values()].every((route) => route.kind === 'exact')).toBe(true) + await routes.get(START_PATH).handler(request, response) + expect(response.status).toBe(202) + expect(response.headers['cache-control']).toBe('no-store') + expect(JSON.parse(response.body)).toMatchObject({ taskId: 'task-1', state: 'queued' }) + + dispose() + expect(routes).toHaveLength(0) + }) +}) diff --git a/test/research-web-reader.test.ts b/test/research-web-reader.test.ts new file mode 100644 index 000000000..6852f8429 --- /dev/null +++ b/test/research-web-reader.test.ts @@ -0,0 +1,292 @@ +import { describe, expect, it, vi } from 'vitest' +import { + isResearchWechatArticleUrl, + readResearchWechatArticle, + registerResearchWebReaderHandlers, + type ResearchWebReaderDependencies +} from '../src/main/state/research-web-reader' +import { ResearchLinkFrameRegistry } from '../src/main/state/research-link-frame' +import { createResearchWebReaderBridge } from '../src/preload/research-web-reader' + +function fixtureDependencies( + fetch: ResearchWebReaderDependencies['fetch'] +): ResearchWebReaderDependencies { + return { + fetch, + createTimeoutSignal: () => new AbortController().signal + } +} + +function htmlResponse(html: string, init: ResponseInit = {}): Response { + return new Response(html, { + status: init.status ?? 200, + headers: { + 'content-type': 'text/html; charset=utf-8', + ...Object.fromEntries(new Headers(init.headers).entries()) + } + }) +} + +describe('Research WeChat article reader', () => { + it('accepts only public HTTPS mp.weixin.qq.com article paths', () => { + expect(isResearchWechatArticleUrl('https://mp.weixin.qq.com/s/abc')).toBe(true) + expect(isResearchWechatArticleUrl('https://mp.weixin.qq.com/s?__biz=abc')).toBe(true) + + for (const url of [ + 'http://mp.weixin.qq.com/s/abc', + 'https://mp.weixin.qq.com/cgi-bin/home', + 'https://mp.weixin.qq.com.evil.example/s/abc', + 'https://user:pass@mp.weixin.qq.com/s/abc', + 'file:///tmp/article.html' + ]) { + expect(isResearchWechatArticleUrl(url), url).toBe(false) + } + }) + + it('extracts bounded metadata and sanitizes the responsive article body', async () => { + const fetch = vi.fn(async () => htmlResponse(` + + + + 科技作者2026年9月1日 +
+

正文重点

+ + 坏链接 + +
+ `)) + + const result = await readResearchWechatArticle( + { url: 'https://mp.weixin.qq.com/s/article-id' }, + fixtureDependencies(fetch) + ) + + expect(result).toMatchObject({ + status: 'ready', + url: 'https://mp.weixin.qq.com/s/article-id', + title: '英伟达豪掷70亿，下场做开放大模型了', + description: '公开文章描述', + author: '科技作者', + publishTime: '2026年9月1日' + }) + if (result.status !== 'ready') return + expect(result.bodyHtml).toContain('

正文重点

') + expect(result.bodyHtml).toContain('src="https://mmbiz.qpic.cn/a.png"') + expect(result.bodyHtml).not.toMatch(/script|iframe|onclick|onerror|javascript:/i) + expect(fetch).toHaveBeenCalledWith( + 'https://mp.weixin.qq.com/s/article-id', + expect.objectContaining({ + redirect: 'manual', + credentials: 'omit', + referrerPolicy: 'no-referrer' + }) + ) + }) + + it('keeps a complete WeChat article when the server closes the trailing response early', async () => { + const html = ` + +

文章正文已经完整到达。

` + const bytes = new TextEncoder().encode(html) + let delivered = false + const response = new Response(new ReadableStream({ + pull(controller) { + if (!delivered) { + delivered = true + controller.enqueue(bytes) + return + } + controller.error(new TypeError('terminated')) + } + }), { + status: 200, + headers: { 'content-type': 'text/html; charset=utf-8' } + }) + + await expect(readResearchWechatArticle( + { url: 'https://mp.weixin.qq.com/s/article-id' }, + fixtureDependencies(vi.fn(async () => response)) + )).resolves.toMatchObject({ + status: 'ready', + title: '英伟达豪掷70亿，下场做开放大模型了', + bodyHtml: '

文章正文已经完整到达。

' + }) + }) + + it('fails closed when a redirect leaves the public WeChat article allowlist', async () => { + const fetch = vi.fn(async () => htmlResponse('', { + status: 302, + headers: { location: 'https://evil.example/article' } + })) + + await expect(readResearchWechatArticle( + { url: 'https://mp.weixin.qq.com/s/article-id' }, + fixtureDependencies(fetch) + )).resolves.toEqual({ status: 'unavailable', reason: 'response' }) + expect(fetch).toHaveBeenCalledTimes(1) + }) + + it('rejects oversized, non-HTML, and bodyless responses', async () => { + const cases: Array<{ + response: Response + reason: 'too-large' | 'response' | 'content' + }> = [ + { + response: htmlResponse('
too large
', { + headers: { 'content-length': String(6 * 1024 * 1024 + 1) } + }), + reason: 'too-large' + }, + { + response: new Response('plain', { + status: 200, + headers: { 'content-type': 'text/plain' } + }), + reason: 'response' + }, + { + response: htmlResponse('missing article'), + reason: 'content' + } + ] + + for (const { response, reason } of cases) { + const result = await readResearchWechatArticle( + { url: 'https://mp.weixin.qq.com/s/article-id' }, + fixtureDependencies(vi.fn(async () => response.clone())) + ) + expect(result).toEqual({ status: 'unavailable', reason }) + } + }) + + it('distinguishes timeouts from ordinary network failures', async () => { + const aborted = new AbortController() + aborted.abort() + const timeout = fixtureDependencies(vi.fn(async () => { + throw new DOMException('aborted', 'AbortError') + })) + timeout.createTimeoutSignal = () => aborted.signal + + await expect(readResearchWechatArticle( + { url: 'https://mp.weixin.qq.com/s/article-id' }, + timeout + )).resolves.toEqual({ status: 'unavailable', reason: 'timeout' }) + + await expect(readResearchWechatArticle( + { url: 'https://mp.weixin.qq.com/s/article-id' }, + fixtureDependencies(vi.fn(async () => { throw new Error('offline') })) + )).resolves.toEqual({ status: 'unavailable', reason: 'network' }) + }) + + it('exposes a frozen preload bridge with one exact IPC channel', async () => { + const invoke = vi.fn(async () => ({ status: 'unavailable', reason: 'content' })) + const bridge = createResearchWebReaderBridge(invoke) + expect(Object.isFrozen(bridge)).toBe(true) + + await bridge.read({ + sessionId: 'session-1', nodeId: 'node-1', + url: 'https://mp.weixin.qq.com/s/article-id' + }) + + expect(invoke).toHaveBeenCalledWith('research:web-reader:read', { + sessionId: 'session-1', nodeId: 'node-1', + url: 'https://mp.weixin.qq.com/s/article-id' + }) + }) + + it('uses the injected Chromium fetch dependency at the trusted IPC boundary', async () => { + const handlers = new Map unknown>() + const ipcMain = { + removeHandler: vi.fn((channel: string) => handlers.delete(channel)), + handle: vi.fn((channel: string, handler: (event: any, value: unknown) => unknown) => { + handlers.set(channel, handler) + }) + } + const mainFrame = { processId: 7, routingId: 41 } + const webContents = { mainFrame } + const window = { isDestroyed: () => false, webContents } + const registry = new ResearchLinkFrameRegistry(() => 'd'.repeat(32)) + const url = 'https://mp.weixin.qq.com/s/8KsqPVeAfMMev43BXwvCFA' + registry.authorize({ sessionId: 'session-1', nodeId: 'node-1', url }) + const chromiumFetch = vi.fn(async () => htmlResponse(` + +

文章正文

`)) + const defaultFetch = vi.spyOn(globalThis, 'fetch').mockRejectedValue( + new Error('Node certificate chain rejected') + ) + try { + registerResearchWebReaderHandlers({ + ipcMain, + getMainWindow: () => window, + registry, + dependencies: fixtureDependencies(chromiumFetch) + }) + + const read = handlers.get('research:web-reader:read') + await expect(Promise.resolve(read?.({ + sender: webContents, + senderFrame: { ...mainFrame } + }, { sessionId: 'session-1', nodeId: 'node-1', url }))).resolves.toMatchObject({ + status: 'ready', + title: '英伟达豪掷70亿，下场做开放大模型了' + }) + expect(chromiumFetch).toHaveBeenCalledTimes(1) + } finally { + defaultFetch.mockRestore() + } + }) + + it('allows only the trusted main frame to read the currently authorized article URL', async () => { + const handlers = new Map unknown>() + const ipcMain = { + removeHandler: vi.fn((channel: string) => handlers.delete(channel)), + handle: vi.fn((channel: string, handler: (event: any, value: unknown) => unknown) => { + handlers.set(channel, handler) + }) + } + const mainFrame = { processId: 7, routingId: 41 } + const webContents = { mainFrame } + const window = { isDestroyed: () => false, webContents } + const registry = new ResearchLinkFrameRegistry(() => 'c'.repeat(32)) + registry.authorize({ + sessionId: 'session-1', nodeId: 'node-1', + url: 'https://mp.weixin.qq.com/s/article-id' + }) + const readArticle = vi.fn(async () => ({ + status: 'ready' as const, + url: 'https://mp.weixin.qq.com/s/article-id', + title: '文章标题', + bodyHtml: '

正文

' + })) + registerResearchWebReaderHandlers({ + ipcMain, + getMainWindow: () => window, + registry, + readArticle + }) + + const read = handlers.get('research:web-reader:read') + const payload = { + sessionId: 'session-1', nodeId: 'node-1', + url: 'https://mp.weixin.qq.com/s/article-id' + } + expect(() => read?.({ + sender: webContents, + senderFrame: { processId: 7, routingId: 42 } + }, payload)).toThrow('main Sherlock window') + await expect(Promise.resolve(read?.({ + sender: webContents, + senderFrame: { ...mainFrame } + }, payload))).resolves.toMatchObject({ status: 'ready', title: '文章标题' }) + expect(readArticle).toHaveBeenCalledWith({ url: payload.url }) + + await expect(Promise.resolve(read?.({ + sender: webContents, + senderFrame: { ...mainFrame } + }, { ...payload, url: 'https://mp.weixin.qq.com/s/other' }))).resolves.toEqual({ + status: 'unavailable', reason: 'unsupported' + }) + expect(readArticle).toHaveBeenCalledTimes(1) + }) +}) diff --git a/test/runtime.test.ts b/test/runtime.test.ts index 5ec3a0b15..62f4a42a8 100644 --- a/test/runtime.test.ts +++ b/test/runtime.test.ts @@ -77,6 +77,92 @@ describe('Harness launch contract', () => { expect(options.env).not.toHaveProperty('ELECTRON_RUN_AS_NODE') }) + it('exposes Sherlock bundled skills to the Harness process', () => { + const options = buildHarnessSpawnOptions( + '/Users/tester/Library/Application Support/dsh-desktop/launch-root', + '/Users/tester/Library/Application Support/dsh-desktop/harness', + 'darwin', + { PATH: '/usr/bin' }, + '/Applications/Sherlock.app/Contents/Resources/sherlock-skills' + ) + + expect(options.env).toMatchObject({ + DSH_BUNDLED_SKILL_DIR: + '/Applications/Sherlock.app/Contents/Resources/sherlock-skills' + }) + }) + + it('exposes the bundled session-model web search entry to Harness', () => { + const options = buildHarnessSpawnOptions( + '/Users/tester/Library/Application Support/dsh-desktop/launch-root', + '/Users/tester/Library/Application Support/dsh-desktop/harness', + 'darwin', + { PATH: '/usr/bin' }, + '/Applications/Sherlock.app/Contents/Resources/sherlock-skills', + 'file:///Applications/Sherlock.app/Contents/Resources/app/node_modules/dsh-web-search-session-model/index.js' + ) + + expect(options.env).toMatchObject({ + DSH_DESKTOP_WEB_SEARCH_ENTRY: + 'file:///Applications/Sherlock.app/Contents/Resources/app/node_modules/dsh-web-search-session-model/index.js' + }) + }) + + it('exposes the bundled market installer entry to Harness', () => { + const options = buildHarnessSpawnOptions( + '/Users/tester/Library/Application Support/dsh-desktop/launch-root', + '/Users/tester/Library/Application Support/dsh-desktop/harness', + 'darwin', + { PATH: '/usr/bin' }, + '/Applications/Sherlock.app/Contents/Resources/sherlock-skills', + undefined, + undefined, + 'file:///Applications/Sherlock.app/Contents/Resources/app/node_modules/dsh-desktop-market-installer/index.js' + ) + + expect(options.env).toMatchObject({ + DSH_DESKTOP_MARKET_INSTALLER_ENTRY: + 'file:///Applications/Sherlock.app/Contents/Resources/app/node_modules/dsh-desktop-market-installer/index.js' + }) + }) + + it('exposes the bundled Research task runtime entry to Harness', () => { + const options = buildHarnessSpawnOptions( + '/Users/tester/Library/Application Support/dsh-desktop/launch-root', + '/Users/tester/Library/Application Support/dsh-desktop/harness', + 'darwin', + { PATH: '/usr/bin' }, + '/Applications/Sherlock.app/Contents/Resources/sherlock-skills', + undefined, + undefined, + undefined, + 'file:///Applications/Sherlock.app/Contents/Resources/app/node_modules/dsh-research-task-runtime/index.js' + ) + + expect(options.env).toMatchObject({ + DSH_DESKTOP_RESEARCH_TASK_ENTRY: + 'file:///Applications/Sherlock.app/Contents/Resources/app/node_modules/dsh-research-task-runtime/index.js' + }) + }) + + it('passes the authenticated local-search endpoint only to the Harness environment', () => { + const options = buildHarnessSpawnOptions( + '/Users/tester/Library/Application Support/dsh-desktop/launch-root', + '/Users/tester/Library/Application Support/dsh-desktop/harness', + 'darwin', + { PATH: '/usr/bin' }, + '/Applications/Sherlock.app/Contents/Resources/sherlock-skills', + 'file:///Applications/Sherlock.app/Contents/Resources/app/node_modules/dsh-web-search-session-model/index.js', + { url: 'http://127.0.0.1:45123', token: 'ephemeral-token' } + ) + + expect(options.env).toMatchObject({ + SHERLOCK_LOCAL_SEARCH_URL: 'http://127.0.0.1:45123', + SHERLOCK_LOCAL_SEARCH_TOKEN: 'ephemeral-token' + }) + expect(JSON.stringify(options)).not.toContain('authorization') + }) + it('passes the internal-loader flag directly to bundled Node.js', () => { expect( buildNodeArguments( diff --git a/test/search-engines.test.ts b/test/search-engines.test.ts new file mode 100644 index 000000000..707fa8d96 --- /dev/null +++ b/test/search-engines.test.ts @@ -0,0 +1,146 @@ +import { Window } from 'happy-dom' +import { describe, expect, it } from 'vitest' +import { + buildSearchUrl, + extractSearchResults, + isAllowedSearchLocation, + isSearchChallenge, + normalizeSearchResults, + orderedSearchEngines, + searchExtractionScript +} from '../src/main/search/search-engines' + +describe('local browser search engines', () => { + it('builds encoded Bing and DuckDuckGo search URLs without carrying user state', () => { + expect(buildSearchUrl('bing', '英伟达 2026 财报')).toBe( + 'https://www.bing.com/search?q=%E8%8B%B1%E4%BC%9F%E8%BE%BE+2026+%E8%B4%A2%E6%8A%A5' + ) + expect(buildSearchUrl('duckduckgo', 'open source AI')).toBe( + 'https://html.duckduckgo.com/html/?q=open+source+AI' + ) + }) + + it('allows only the configured engine hosts over HTTPS', () => { + expect(isAllowedSearchLocation('bing', 'https://www.bing.com/search?q=test')).toBe(true) + expect(isAllowedSearchLocation('bing', 'https://cn.bing.com/search?q=test')).toBe(true) + expect(isAllowedSearchLocation('duckduckgo', 'https://html.duckduckgo.com/html/?q=test')).toBe(true) + expect(isAllowedSearchLocation('duckduckgo', 'https://duckduckgo.com/verify')).toBe(true) + expect(isAllowedSearchLocation('bing', 'http://www.bing.com/search?q=test')).toBe(false) + expect(isAllowedSearchLocation('bing', 'https://bing.com.example.test/search')).toBe(false) + expect(isAllowedSearchLocation('duckduckgo', 'https://example.test/')).toBe(false) + }) + + it('normalizes safe public results, removes duplicates, and honors the limit', () => { + expect( + normalizeSearchResults( + [ + { + title: ' First result ', + url: 'https://example.com/report', + snippet: ' Useful summary. ' + }, + { + title: 'Duplicate', + url: 'https://example.com/report', + snippet: 'ignored' + }, + { title: 'Unsafe', url: 'javascript:alert(1)', snippet: 'ignored' }, + { title: '', url: 'https://example.org/news', snippet: '' }, + { title: 'Third', url: 'https://third.example/item', snippet: 'third' } + ], + 2 + ) + ).toEqual([ + { + title: 'First result', + url: 'https://example.com/report', + snippet: 'Useful summary.' + }, + { url: 'https://example.org/news' } + ]) + }) + + it('detects verification pages from the URL, title, or visible page marker', () => { + expect( + isSearchChallenge({ + url: 'https://www.bing.com/turing/captcha/challenge', + title: 'Bing', + text: '' + }) + ).toBe(true) + expect( + isSearchChallenge({ + url: 'https://html.duckduckgo.com/html/?q=test', + title: 'Human Verification', + text: '' + }) + ).toBe(true) + expect( + isSearchChallenge({ + url: 'https://www.bing.com/search?q=test', + title: 'test - Search', + text: 'Please verify you are a human before continuing.' + }) + ).toBe(true) + expect( + isSearchChallenge({ + url: 'https://www.bing.com/search?q=test', + title: 'test - Search', + text: 'Ordinary search results' + }) + ).toBe(false) + }) + + it('prefers Bing for Chinese queries and DuckDuckGo otherwise', () => { + expect(orderedSearchEngines('苹果公司最新财报')).toEqual(['bing', 'duckduckgo']) + expect(orderedSearchEngines('Apple latest earnings')).toEqual(['duckduckgo', 'bing']) + }) + + it('extracts Bing result titles, links, and snippets from the rendered page', () => { + const window = new Window({ url: 'https://www.bing.com/search?q=test' }) + window.document.body.innerHTML = ` +
    +
  1. +

    Result A

    +

    Summary A

    +
    2. +
+ ` + + expect(extractSearchResults('bing', window.document as unknown as Document)).toEqual([ + { title: 'Result A', url: 'https://example.com/a', snippet: 'Summary A' } + ]) + }) + + it('extracts DuckDuckGo result titles, links, and snippets from the rendered page', () => { + const window = new Window({ url: 'https://html.duckduckgo.com/html/?q=test' }) + window.document.body.innerHTML = ` +
+

+ Result B +

+ Summary B +
+ ` + + expect( + extractSearchResults('duckduckgo', window.document as unknown as Document) + ).toEqual([{ title: 'Result B', url: 'https://example.org/b', snippet: 'Summary B' }]) + }) + + it('provides a self-contained extraction script for Electron web contents', () => { + const window = new Window({ url: 'https://www.bing.com/search?q=test' }) + window.document.body.innerHTML = ` +
    +
  1. +

    Result C

    +

    Summary C

    +
    2. +
+ ` + + expect(window.eval(searchExtractionScript('bing'))).toEqual([ + { title: 'Result C', url: 'https://example.net/c', snippet: 'Summary C' } + ]) + }) +}) diff --git a/test/security.test.ts b/test/security.test.ts new file mode 100644 index 000000000..f0c3e136d --- /dev/null +++ b/test/security.test.ts @@ -0,0 +1,182 @@ +import { readFile } from 'node:fs/promises' +import { beforeEach, describe, expect, it, vi } from 'vitest' + +const shellOpenExternal = vi.hoisted(() => vi.fn()) + +vi.mock('electron', () => ({ + shell: { openExternal: shellOpenExternal } +})) + +import { secureWindow } from '../src/main/security' + +beforeEach(() => shellOpenExternal.mockClear()) + +type NavigationEvent = { + preventDefault(): void + url?: string + isMainFrame?: boolean + initiator?: { processId: number; routingId: number } | null +} + +function secureWindowFixture(allowsResearchFrameUrl: (url: string) => boolean = () => false) { + const listeners = new Map void>() + const permissionCheck = vi.fn() + const permissionRequest = vi.fn() + const mainFrame = { processId: 7, routingId: 41 } + const webContents = { + mainFrame, + on: vi.fn((event: string, listener: (event: NavigationEvent, url?: string) => void) => { + listeners.set(event, listener) + }), + setWindowOpenHandler: vi.fn(), + session: { + setPermissionCheckHandler: permissionCheck, + setPermissionRequestHandler: permissionRequest + } + } + secureWindow({ webContents } as never, { allowsResearchFrameUrl }) + return { listeners, mainFrame, webContents } +} + +describe('main-window navigation security', () => { + it('keeps the application preload and Node integration out of HTML child frames', async () => { + const main = await readFile('src/main/index.ts', 'utf8') + + expect(main).toContain('nodeIntegration: false') + expect(main).toContain('nodeIntegrationInSubFrames: false') + expect(main).toContain('contextIsolation: true') + expect(main).toContain('sandbox: true') + }) + + it('blocks child-frame HTTP navigation without spawning the system browser', () => { + const { listeners } = secureWindowFixture() + const willFrameNavigate = listeners.get('will-frame-navigate') + for (const url of [ + 'https://example.com/report', + 'https://example.com/second', + 'http://example.com/third' + ]) { + const preventDefault = vi.fn() + willFrameNavigate?.({ url, isMainFrame: false, preventDefault }) + expect(preventDefault, url).toHaveBeenCalledOnce() + } + + expect(shellOpenExternal).not.toHaveBeenCalled() + }) + + it('allows only research child-frame URLs approved by the active registry', () => { + const allowsResearchFrameUrl = vi.fn((url: string) => + new URL(url).origin === 'https://approved.example' + ) + const { listeners } = secureWindowFixture(allowsResearchFrameUrl) + const willFrameNavigate = listeners.get('will-frame-navigate') + const allowed = vi.fn() + const blocked = vi.fn() + + willFrameNavigate?.({ + url: 'https://approved.example/dashboard', + isMainFrame: false, + preventDefault: allowed + }) + willFrameNavigate?.({ + url: 'https://blocked.example/dashboard', + isMainFrame: false, + preventDefault: blocked + }) + + expect(allowsResearchFrameUrl).toHaveBeenCalledTimes(2) + expect(allowed).not.toHaveBeenCalled() + expect(blocked).toHaveBeenCalledOnce() + expect(shellOpenExternal).not.toHaveBeenCalled() + }) + + it('cancels child-frame navigation outside the preview protocol', () => { + const { listeners } = secureWindowFixture() + const willFrameNavigate = listeners.get('will-frame-navigate') + expect(willFrameNavigate).toBeTypeOf('function') + + for (const url of [ + 'file:///Users/example/private.txt', + 'http://example.com/', + 'http://127.0.0.1:4310/settings', + 'dsh-recovery://plugin-error/' + ]) { + const preventDefault = vi.fn() + willFrameNavigate?.({ url, isMainFrame: false, preventDefault }) + expect(preventDefault, url).toHaveBeenCalledOnce() + } + + const allowPreview = vi.fn() + willFrameNavigate?.({ + url: 'sherlock-preview://opaque-token/index.html', + isMainFrame: false, + preventDefault: allowPreview + }) + expect(allowPreview).not.toHaveBeenCalled() + }) + + it('cancels child-initiated navigation of the main frame', () => { + const { listeners } = secureWindowFixture() + const willFrameNavigate = listeners.get('will-frame-navigate') + const childFrame = { processId: 7, routingId: 42 } + + for (const url of [ + 'file:///Applications/Sherlock.app/Contents/Resources/plugin-recovery.html', + 'http://127.0.0.1:4310/research', + 'dsh-recovery://show-log/' + ]) { + const preventDefault = vi.fn() + willFrameNavigate?.({ + url, + isMainFrame: true, + initiator: childFrame, + preventDefault + }) + expect(preventDefault, url).toHaveBeenCalledOnce() + } + }) + + it('allows trusted main-frame navigation initiated by its routed main frame', () => { + const { listeners, mainFrame } = secureWindowFixture() + const willFrameNavigate = listeners.get('will-frame-navigate') + const preventDefault = vi.fn() + + willFrameNavigate?.({ + url: 'http://127.0.0.1:4310/research', + isMainFrame: true, + initiator: { ...mainFrame }, + preventDefault + }) + + expect(preventDefault).not.toHaveBeenCalled() + }) + + it.each([ + { label: 'null', initiator: null }, + { label: 'undefined', initiator: undefined } + ])('fails closed for a $label initiator targeting the main frame', ({ initiator }) => { + const { listeners } = secureWindowFixture() + const willFrameNavigate = listeners.get('will-frame-navigate') + const preventDefault = vi.fn() + + willFrameNavigate?.({ + url: 'http://127.0.0.1:4310/research', + isMainFrame: true, + initiator, + preventDefault + }) + + expect(preventDefault).toHaveBeenCalledOnce() + }) + + it('leaves trusted main-frame navigation on the existing policy', () => { + const { listeners } = secureWindowFixture() + const willNavigate = listeners.get('will-navigate') + const preventDefault = vi.fn() + + willNavigate?.({ preventDefault }, 'http://127.0.0.1:4310/research') + + expect(preventDefault).not.toHaveBeenCalled() + expect(shellOpenExternal).not.toHaveBeenCalled() + }) +}) diff --git a/test/session-handoff.test.ts b/test/session-handoff.test.ts new file mode 100644 index 000000000..5b2ecabda --- /dev/null +++ b/test/session-handoff.test.ts @@ -0,0 +1,322 @@ +import { execFileSync, spawnSync } from 'node:child_process' +import { existsSync, readFileSync, writeFileSync } from 'node:fs' +import path from 'node:path' +import { afterEach, describe, expect, it } from 'vitest' +import { + buildFeatureHandoff, + validateFeatureHandoff +} from '../scripts/lib/sherlock-integration-model.mjs' +import { listRangeCommits } from '../scripts/lib/sherlock-git-state.mjs' +import { createGitWorkflowFixture, type GitWorkflowFixture } from './helpers/git-workflow-fixture' + +const projectRoot = path.resolve(import.meta.dirname, '..') +const handoffCli = path.join(projectRoot, 'scripts', 'create-sherlock-session-handoff.mjs') +const fixtures: GitWorkflowFixture[] = [] + +function fixture(): GitWorkflowFixture { + const value = createGitWorkflowFixture() + fixtures.push(value) + return value +} + +function metadata(tipCommit: string) { + return { + featureName: '会话交接卡', + checks: [ + { + argv: ['npx', 'vitest', 'run', 'test/session-handoff.test.ts'], + outcome: 'passed', + summary: 'handoff contract', + verifiedCommit: tipCommit, + completedAt: '2026-08-31T01:02:03.000Z', + timeoutMs: 120000 + }, + { + argv: ['npm', 'run', 'typecheck'], + outcome: 'passed', + summary: 'type declarations', + verifiedCommit: tipCommit, + completedAt: '2026-08-31T01:03:04.000Z', + timeoutMs: 120000 + } + ], + uiVerification: { outcome: 'not-applicable', summary: 'Git workflow tooling has no client UI.' }, + acceptanceCriteria: ['完整提交历史可追溯', '验证证据绑定当前提交'], + risks: ['依赖 feature 分支引用保持不变'], + generatedAt: '2026-08-31T01:04:05.000Z' + } +} + +function handoffValue(tipCommit: string) { + return { + schemaVersion: 1, + featureName: '会话交接卡', + branch: 'codex/feat/handoff-card-20260831', + baseCommit: 'a'.repeat(40), + tipCommit, + commits: [{ commit: tipCommit, parents: ['a'.repeat(40)], subject: '增加交接卡' }], + files: [{ status: 'M', path: 'src/session.ts' }], + checks: metadata(tipCommit).checks, + uiVerification: metadata(tipCommit).uiVerification, + acceptanceCriteria: metadata(tipCommit).acceptanceCriteria, + risks: metadata(tipCommit).risks, + generatedAt: '2026-08-31T01:04:05.000Z' + } +} + +function commitWithTimestamp(repository: string, message: string, timestamp: string): string { + execFileSync('git', ['-C', repository, 'add', '-A'], { encoding: 'utf8' }) + execFileSync('git', ['-C', repository, 'commit', '-m', message], { + encoding: 'utf8', + env: { ...process.env, GIT_AUTHOR_DATE: timestamp, GIT_COMMITTER_DATE: timestamp } + }) + return execFileSync('git', ['-C', repository, 'rev-parse', 'HEAD'], { encoding: 'utf8' }).trim() +} + +afterEach(() => { + for (const value of fixtures.splice(0)) value.dispose() +}) + +describe('feature session handoffs', () => { + it('builds a deterministic card for the exact branch with ordered commits, rename records, and check argv', () => { + const repository = fixture() + repository.write(repository.main, 'src/original.ts', 'export const original = true\n') + repository.commit(repository.main, '添加待重命名源码') + const feature = repository.createWorktree('handoff-card', 'codex/feat/handoff-card-20260831') + const base = repository.git(feature, 'rev-parse', 'HEAD') + repository.write(feature, 'src/first.ts', 'export const first = true\n') + const first = repository.commit(feature, '增加交接卡源码') + repository.git(feature, 'mv', 'src/original.ts', 'src/renamed.ts') + repository.write(feature, 'src/second.ts', 'export const second = true\n') + const tip = repository.commit(feature, '重命名交接卡源码') + + const firstCard = buildFeatureHandoff({ + repository: feature, + baseCommit: base, + metadata: metadata(tip), + generatedAt: '2026-08-31T01:04:05.000Z' + }) + const secondCard = buildFeatureHandoff({ + repository: feature, + baseCommit: base, + metadata: metadata(tip), + generatedAt: '2026-08-31T01:04:05.000Z' + }) + + expect(firstCard).toEqual(secondCard) + expect(firstCard).toMatchObject({ + branch: 'codex/feat/handoff-card-20260831', + baseCommit: base, + tipCommit: tip, + commits: [ + { commit: first, parents: [base], subject: '增加交接卡源码' }, + { commit: tip, parents: [first], subject: '重命名交接卡源码' } + ], + checks: metadata(tip).checks + }) + expect(firstCard.files).toEqual( + expect.arrayContaining([ + expect.objectContaining({ status: expect.stringMatching(/^R/), previousPath: 'src/original.ts', path: 'src/renamed.ts' }), + { status: 'A', path: 'src/second.ts' } + ]) + ) + expect(firstCard.commits.every((commit) => /^[0-9a-f]{40}$/.test(commit.commit))).toBe(true) + }) + + it('rejects source-dirty, detached, non-feature, non-ancestral, and empty feature ranges', () => { + const repository = fixture() + const feature = repository.createWorktree('handoff-rejections', 'codex/feat/handoff-rejections-20260831') + const base = repository.git(feature, 'rev-parse', 'HEAD') + repository.write(feature, 'src/feature.ts', 'export const value = true\n') + const tip = repository.commit(feature, '增加功能') + const options = { repository: feature, baseCommit: base, metadata: metadata(tip), generatedAt: '2026-08-31T01:04:05.000Z' } + + repository.write(feature, 'src/dirty.ts', 'dirty\n') + expect(() => buildFeatureHandoff(options)).toThrow(/未提交|clean|干净/) + + const detachedRepository = fixture() + const detachedFeature = detachedRepository.createWorktree('handoff-detached', 'codex/feat/handoff-detached-20260831') + const detachedBase = detachedRepository.git(detachedFeature, 'rev-parse', 'HEAD') + detachedRepository.write(detachedFeature, 'src/feature.ts', 'export const value = true\n') + const detachedTip = detachedRepository.commit(detachedFeature, '增加功能') + const detachedOptions = { repository: detachedFeature, baseCommit: detachedBase, metadata: metadata(detachedTip), generatedAt: '2026-08-31T01:04:05.000Z' } + + detachedRepository.git(detachedFeature, 'switch', '--detach') + expect(() => buildFeatureHandoff(detachedOptions)).toThrow(/feature|分支|branch/) + + const wrongBranchRepository = fixture() + const wrongBranch = wrongBranchRepository.createWorktree('handoff-wrong-branch', 'codex/not-a-feature') + const wrongBase = wrongBranchRepository.git(wrongBranch, 'rev-parse', 'HEAD') + wrongBranchRepository.write(wrongBranch, 'src/feature.ts', 'export const value = true\n') + const wrongTip = wrongBranchRepository.commit(wrongBranch, '增加功能') + expect(() => buildFeatureHandoff({ repository: wrongBranch, baseCommit: wrongBase, metadata: metadata(wrongTip), generatedAt: '2026-08-31T01:04:05.000Z' })).toThrow(/feature|分支|branch/) + + const validRepository = fixture() + const validFeature = validRepository.createWorktree('handoff-range', 'codex/feat/handoff-range-20260831') + const validBase = validRepository.git(validFeature, 'rev-parse', 'HEAD') + validRepository.write(validFeature, 'src/feature.ts', 'export const value = true\n') + const validTip = validRepository.commit(validFeature, '增加功能') + const validOptions = { repository: validFeature, baseCommit: validBase, metadata: metadata(validTip), generatedAt: '2026-08-31T01:04:05.000Z' } + expect(() => buildFeatureHandoff({ ...validOptions, baseCommit: validTip })).toThrow(/范围|range|empty|提交/) + const unrelatedFeature = validRepository.createWorktree('handoff-unrelated', 'codex/feat/handoff-unrelated-20260831') + validRepository.write(unrelatedFeature, 'src/unrelated.ts', 'export const unrelated = true\n') + const unrelatedBase = validRepository.commit(unrelatedFeature, '增加无关提交') + expect(() => buildFeatureHandoff({ ...validOptions, baseCommit: unrelatedBase })).toThrow(/祖先|ancestor|base/) + }) + + it('rejects check evidence from another tip, command strings, unsafe paths, and duplicate commits', () => { + const tip = 'b'.repeat(40) + const value = handoffValue(tip) + + expect(() => validateFeatureHandoff({ ...value, checks: [{ ...value.checks[0], verifiedCommit: 'c'.repeat(40) }] })).toThrow(/verifiedCommit|提交/) + expect(() => validateFeatureHandoff({ ...value, checks: [{ ...value.checks[0], argv: 'npm test' }] })).toThrow(/argv|命令/) + for (const unsafePath of ['/absolute.ts', '../outside.ts', 'src/../outside.ts', '', 'src\u0000bad.ts', 'src//double.ts']) { + expect(() => validateFeatureHandoff({ ...value, files: [{ status: 'M', path: unsafePath }] })).toThrow(/路径|path/) + } + expect(() => validateFeatureHandoff({ ...value, files: [{ status: 'R100', path: 'src/new.ts', previousPath: '../old.ts' }] })).toThrow(/路径|path/) + expect(() => validateFeatureHandoff({ ...value, commits: [value.commits[0], value.commits[0]] })).toThrow(/重复|duplicate|提交/) + expect(() => validateFeatureHandoff({ + ...value, + commits: [ + { commit: tip, parents: ['a'.repeat(40)], subject: 'tip before parent' }, + { commit: 'd'.repeat(40), parents: ['a'.repeat(40)], subject: 'wrong final commit' } + ] + })).toThrow(/范围顺序|tipCommit|提交/) + }) + + it('rejects reordered, mutated, and disconnected commit topology', () => { + const repository = fixture() + const feature = repository.createWorktree('handoff-topology', 'codex/feat/handoff-topology-20260831') + const base = repository.git(feature, 'rev-parse', 'HEAD') + repository.write(feature, 'src/one.ts', 'export const one = true\n') + const first = repository.commit(feature, '第一个提交') + repository.write(feature, 'src/two.ts', 'export const two = true\n') + const second = repository.commit(feature, '第二个提交') + repository.write(feature, 'src/three.ts', 'export const three = true\n') + const tip = repository.commit(feature, '第三个提交') + const card = buildFeatureHandoff({ repository: feature, baseCommit: base, metadata: metadata(tip), generatedAt: '2026-08-31T01:04:05.000Z' }) + + expect(() => validateFeatureHandoff({ ...card, commits: [card.commits[1], card.commits[0], card.commits[2]] })).toThrow(/拓扑|父提交|顺序/) + expect(() => validateFeatureHandoff({ + ...card, + commits: card.commits.map((commit) => commit.commit === second ? { ...commit, parents: ['f'.repeat(40)] } : commit) + })).toThrow(/父提交|拓扑|范围|孤立/) + expect(() => validateFeatureHandoff({ + ...card, + commits: [ + { commit: 'e'.repeat(40), parents: [base], subject: '孤立提交' }, + ...card.commits + ] + })).toThrow(/孤立|拓扑|范围/) + expect(first).not.toBe(second) + }) + + it('keeps merge parents before their skewed-timestamp merge child', () => { + const repository = fixture() + const feature = repository.createWorktree('handoff-merge', 'codex/feat/handoff-merge-20260831') + const side = repository.createWorktree('handoff-side', 'codex/feat/handoff-side-20260831') + const base = repository.git(feature, 'rev-parse', 'HEAD') + repository.write(feature, 'src/feature.ts', 'export const feature = true\n') + const featureCommit = commitWithTimestamp(feature, '未来的功能提交', '2030-01-01T00:00:00 +0000') + repository.write(side, 'src/side.ts', 'export const side = true\n') + const sideCommit = commitWithTimestamp(side, '过去的分支提交', '2000-01-01T00:00:00 +0000') + execFileSync('git', ['-C', feature, 'merge', '--no-ff', '--no-edit', 'codex/feat/handoff-side-20260831'], { + encoding: 'utf8', + env: { ...process.env, GIT_AUTHOR_DATE: '2010-01-01T00:00:00 +0000', GIT_COMMITTER_DATE: '2010-01-01T00:00:00 +0000' } + }) + const tip = repository.git(feature, 'rev-parse', 'HEAD') + const card = buildFeatureHandoff({ repository: feature, baseCommit: base, metadata: metadata(tip), generatedAt: '2026-08-31T01:04:05.000Z' }) + const positions = new Map(card.commits.map((commit, index) => [commit.commit, index])) + + expect(card.commits).toEqual(listRangeCommits(feature, base, tip)) + expect(positions.get(featureCommit)).toBeLessThan(positions.get(tip)!) + expect(positions.get(sideCommit)).toBeLessThan(positions.get(tip)!) + for (const commit of card.commits) { + for (const parent of commit.parents) { + if (positions.has(parent)) expect(positions.get(parent)).toBeLessThan(positions.get(commit.commit)!) + } + } + }) + + it('rejects extra schema keys, portable-unsafe paths, fabricated status records, and unsafe check shapes', () => { + const tip = 'b'.repeat(40) + const value = handoffValue(tip) + + expect(() => validateFeatureHandoff({ ...value, injected: true })).toThrow(/未知字段|字段/) + expect(() => validateFeatureHandoff({ ...value, commits: [{ ...value.commits[0], extra: true }] })).toThrow(/未知字段|字段/) + expect(() => validateFeatureHandoff({ ...value, files: [{ ...value.files[0], extra: true }] })).toThrow(/未知字段|字段/) + expect(() => validateFeatureHandoff({ ...value, checks: [{ ...value.checks[0], extra: true }] })).toThrow(/未知字段|字段/) + expect(() => validateFeatureHandoff({ ...value, uiVerification: { ...value.uiVerification, extra: true } })).toThrow(/未知字段|字段/) + for (const unsafePath of ['..\\outside.ts', 'C:outside.ts', 'src\\portable.ts']) { + expect(() => validateFeatureHandoff({ ...value, files: [{ status: 'M', path: unsafePath }] })).toThrow(/路径|path/) + } + expect(() => validateFeatureHandoff({ ...value, files: [{ status: 'R101', path: 'src/new.ts', previousPath: 'src/old.ts' }] })).toThrow(/status|状态/) + for (const status of ['R', 'C']) { + expect(() => validateFeatureHandoff({ ...value, files: [{ status, path: 'src/new.ts', previousPath: 'src/old.ts' }] })).toThrow(/status|状态/) + } + expect(() => validateFeatureHandoff({ ...value, files: [{ status: 'M', path: 'src/file.ts', previousPath: 'src/old.ts' }] })).toThrow(/previousPath|路径/) + expect(() => validateFeatureHandoff({ ...value, checks: [{ ...value.checks[0], argv: ['npm', 'run\u0000typecheck'] }] })).toThrow(/argv|参数/) + expect(() => validateFeatureHandoff({ ...value, checks: [{ ...value.checks[0], command: 'npm test' }] })).toThrow(/未知字段|command|字段/) + expect(validateFeatureHandoff({ ...value, files: [{ status: 'C100', path: 'src/copied.ts', previousPath: 'src/source.ts' }] }).files).toEqual([ + { status: 'C100', path: 'src/copied.ts', previousPath: 'src/source.ts' } + ]) + for (const status of ['R0', 'R100', 'C0', 'C100']) { + expect(validateFeatureHandoff({ ...value, files: [{ status, path: 'src/new.ts', previousPath: 'src/old.ts' }] }).files).toEqual([ + { status, path: 'src/new.ts', previousPath: 'src/old.ts' } + ]) + } + }) + + it('fails closed when metadata access dirties the feature worktree after the initial status check', () => { + const repository = fixture() + const feature = repository.createWorktree('handoff-toctou', 'codex/feat/handoff-toctou-20260831') + const base = repository.git(feature, 'rev-parse', 'HEAD') + repository.write(feature, 'src/feature.ts', 'export const value = true\n') + const tip = repository.commit(feature, '增加功能') + const raceMetadata = metadata(tip) + Object.defineProperty(raceMetadata, 'risks', { + enumerable: true, + get() { + repository.write(feature, 'src/dirtied-during-build.ts', 'export const race = true\n') + return ['metadata access dirtied the worktree'] + } + }) + + expect(() => buildFeatureHandoff({ repository: feature, baseCommit: base, metadata: raceMetadata, generatedAt: '2026-08-31T01:04:05.000Z' })).toThrow(/未提交|clean|干净/) + }) + + it('writes only an idempotent default card and never overwrites differing content', () => { + const repository = fixture() + const feature = repository.createWorktree('handoff-cli', 'codex/feat/handoff-cli-20260831') + const base = repository.git(feature, 'rev-parse', 'HEAD') + repository.write(feature, 'src/cli.ts', 'export const cli = true\n') + const tip = repository.commit(feature, '增加交接命令') + const metadataPath = path.join(repository.root, 'metadata.json') + writeFileSync(metadataPath, `${JSON.stringify(metadata(tip))}\n`, 'utf8') + const expectedPath = path.join( + repository.commonDirectory, + 'sherlock-integration', + 'handoffs', + `codex-feat-handoff-cli-20260831-${tip.slice(0, 12)}.json` + ) + const argv = [handoffCli, '--repo', feature, '--base', base, '--metadata', metadataPath, '--format', 'json'] + + const initial = spawnSync(process.execPath, argv, { cwd: projectRoot, encoding: 'utf8' }) + const repeated = spawnSync(process.execPath, argv, { cwd: projectRoot, encoding: 'utf8' }) + + expect(initial.status).toBe(0) + expect(initial.stderr).toBe('') + expect(JSON.parse(initial.stdout)).toMatchObject({ tipCommit: tip }) + expect(existsSync(expectedPath)).toBe(true) + expect(readFileSync(expectedPath, 'utf8')).toBe(initial.stdout) + expect(repeated.status).toBe(0) + expect(readFileSync(expectedPath, 'utf8')).toBe(initial.stdout) + + writeFileSync(expectedPath, '{"different":true}\n', 'utf8') + const conflict = spawnSync(process.execPath, argv, { cwd: projectRoot, encoding: 'utf8' }) + expect(conflict.status).not.toBe(0) + expect(conflict.stdout).toBe('') + expect(conflict.stderr).toMatch(/覆盖|already exists|不同/) + expect(readFileSync(expectedPath, 'utf8')).toBe('{"different":true}\n') + }) +}) diff --git a/test/session-model-web-search.test.js b/test/session-model-web-search.test.js new file mode 100644 index 000000000..b9a23bb62 --- /dev/null +++ b/test/session-model-web-search.test.js @@ -0,0 +1,393 @@ +import { createServer } from 'node:http' +import { afterEach, describe, expect, it } from 'vitest' +import { KNOWN_SESSION_EVENT_TYPES, Session } from '@deepseek-ai/dsh-session' +import { PersistenceCoordinator } from '@deepseek-ai/dsh-session-persistence' +import { + SessionModelSearchProvider, + resolveSessionSearchOptions, + resolveSessionSearchRoute, + searchLocalBrowser +} from '../packages/dsh-web-search-session-model/index.js' + +const servers = new Set() + +afterEach(async () => { + await Promise.all( + [...servers].map( + (server) => + new Promise((resolve) => { + server.close(() => resolve()) + }) + ) + ) + servers.clear() +}) + +async function listen(handler) { + const server = createServer(handler) + servers.add(server) + await new Promise((resolve) => server.listen(0, '127.0.0.1', resolve)) + const address = server.address() + if (!address || typeof address === 'string') throw new Error('test server did not bind') + return `http://127.0.0.1:${address.port}` +} + +function fakeContext({ + baseURL, + credential = 'user-model-key', + provider = 'openai', + model = 'gpt-5.6-sol', + api = 'openai-responses', + includeProfile = true +}) { + const credentialRefs = [] + const ctx = { + agents: { + currentInitiator() { + return { + session: { + requestHeader() { + return { + config: { provider, model } + } + }, + append() {} + } + } + } + }, + settings: { + get(namespace) { + if (namespace !== 'llm-pi-ai') return undefined + return { + providers: includeProfile + ? { + [provider]: { + ...(baseURL ? { baseURL: `${baseURL}/llmapi/v1` } : {}), + api, + apiKeyEnv: `${provider.toUpperCase().replaceAll('-', '_')}_API_KEY` + } + } + : {} + } + } + }, + credentials: { + async resolve(ref) { + credentialRefs.push(ref) + return credential ? { value: credential } : undefined + } + }, + get(name) { + return this[name] + } + } + return { ctx, credentialRefs } +} + +describe('current-session model web search', () => { + it('replays legacy session-model search events from persisted sessions', async () => { + const id = 'session-web-search-legacy-replay-test' + const meta = Session.create(id).header + const events = [ + { + type: 'web/session-model-search-llm-request', + seq: 0, + time: 1, + data: { + endpoint: 'https://example.com/responses', + provider: 'openai', + model: 'gpt-5.6-sol', + apiKeyRef: 'OPENAI_API_KEY', + body: { model: 'gpt-5.6-sol', input: 'current facts' } + } + } + ] + const ctx = { + effect() {}, + on() {}, + sessions: { + list: () => [] + } + } + const backend = { + name: 'legacy-search-event-fixture', + async loadStored() { + return { meta, events, revision: 'fixture-revision' } + } + } + const persistence = new PersistenceCoordinator(ctx, backend) + + await expect(persistence.readFrom(id, 0)).resolves.toMatchObject({ + events: [{ type: 'web/session-model-search-llm-request', seq: 0 }] + }) + }) + + it('keeps persisted search diagnostics replayable after a Harness restart', async () => { + const session = Session.create('session-web-search-replay-test') + session.append('request/header', { + header: { + config: { provider: 'openai', model: 'gpt-5.6-sol' } + }, + reason: 'initial' + }) + const { ctx } = fakeContext({ baseURL: 'https://example.com' }) + ctx.agents.currentInitiator = () => ({ session }) + const options = await resolveSessionSearchOptions(ctx) + + options.recordRequest?.({ + endpoint: 'https://example.com/responses', + provider: 'openai', + model: 'gpt-5.6-sol', + apiKeyRef: 'OPENAI_API_KEY', + body: { model: 'gpt-5.6-sol', input: 'current facts' } + }) + + expect( + session.events.every( + (event) => KNOWN_SESSION_EVENT_TYPES.has(event.type) || event.ignorable === true + ) + ).toBe(true) + }) + + it('uses the selected model endpoint and credential and maps Responses citations', async () => { + const requests = [] + const baseURL = await listen(async (request, response) => { + let body = '' + for await (const chunk of request) body += chunk + requests.push({ + url: request.url, + authorization: request.headers.authorization, + body: JSON.parse(body) + }) + response.writeHead(200, { 'content-type': 'application/json' }) + response.end( + JSON.stringify({ + output: [ + { + type: 'web_search_call', + action: { + sources: [ + { url: 'https://example.com/a', title: 'Source A' }, + { url: 'https://example.com/b', title: 'Source B' } + ] + } + }, + { + type: 'message', + content: [ + { + type: 'output_text', + text: 'A concise sourced answer.', + annotations: [ + { + type: 'url_citation', + url: 'https://example.com/a', + title: 'Source A duplicate' + }, + { + type: 'url_citation', + url: 'https://example.com/c', + title: 'Source C' + } + ] + } + ] + } + ] + }) + ) + }) + const { ctx, credentialRefs } = fakeContext({ baseURL }) + const provider = new SessionModelSearchProvider(() => resolveSessionSearchOptions(ctx)) + + const result = await provider.search({ query: 'current facts', maxResults: 8 }) + + expect(requests).toHaveLength(1) + expect(requests[0]).toMatchObject({ + url: '/llmapi/v1/responses', + authorization: 'Bearer user-model-key', + body: { + model: 'gpt-5.6-sol', + tools: [{ type: 'web_search' }], + include: ['web_search_call.action.sources'] + } + }) + expect(requests[0].body.input).toContain('current facts') + expect(credentialRefs).toEqual(['OPENAI_API_KEY']) + expect(result).toEqual({ + content: 'A concise sourced answer.', + sources: [ + { url: 'https://example.com/a', title: 'Source A' }, + { url: 'https://example.com/b', title: 'Source B' }, + { url: 'https://example.com/c', title: 'Source C' } + ], + truncated: false + }) + }) + + it('uses the authenticated local browser for Kimi Coding without resolving its model key', async () => { + const localRequests = [] + const localURL = await listen(async (request, response) => { + let body = '' + for await (const chunk of request) body += chunk + localRequests.push({ + url: request.url, + authorization: request.headers.authorization, + body: JSON.parse(body) + }) + response.writeHead(200, { 'content-type': 'application/json' }) + response.end( + JSON.stringify({ + sources: [ + { + url: 'https://example.com/kimi-result', + title: 'Kimi local result', + snippet: 'Current information' + } + ], + truncated: false + }) + ) + }) + const { ctx, credentialRefs } = fakeContext({ + baseURL: 'https://api.kimi.com/coding', + provider: 'kimi-coding', + model: 'kimi-for-coding', + api: 'anthropic-messages' + }) + const provider = new SessionModelSearchProvider({ + mode: () => 'auto', + resolveRoute: () => resolveSessionSearchRoute(ctx), + resolveNativeOptions: () => resolveSessionSearchOptions(ctx), + searchLocal: (request, signal) => + searchLocalBrowser(request, signal, { + url: localURL, + token: 'local-only-token' + }) + }) + + await expect(provider.search({ query: 'current facts', maxResults: 4 })).resolves.toEqual({ + sources: [ + { + url: 'https://example.com/kimi-result', + title: 'Kimi local result', + snippet: 'Current information' + } + ], + truncated: false + }) + expect(localRequests).toEqual([ + { + url: '/search', + authorization: 'Bearer local-only-token', + body: { query: 'current facts', maxResults: 4 } + } + ]) + expect(credentialRefs).toEqual([]) + }) + + it('falls back locally when a native Responses route rejects web search', async () => { + const baseURL = await listen((_request, response) => { + response.writeHead(404, { 'content-type': 'application/json' }) + response.end(JSON.stringify({ error: { message: 'unknown web_search tool' } })) + }) + const { ctx } = fakeContext({ baseURL }) + let localCalls = 0 + const provider = new SessionModelSearchProvider({ + mode: () => 'auto', + resolveRoute: () => resolveSessionSearchRoute(ctx), + resolveNativeOptions: () => resolveSessionSearchOptions(ctx), + searchLocal: async () => { + localCalls += 1 + return { + sources: [{ url: 'https://example.com/fallback', title: 'Fallback' }], + truncated: false + } + } + }) + + await expect(provider.search({ query: 'fallback query', maxResults: 5 })).resolves.toEqual({ + sources: [{ url: 'https://example.com/fallback', title: 'Fallback' }], + truncated: false + }) + expect(localCalls).toBe(1) + }) + + it('uses local search for an unknown provider profile instead of demanding an API route', async () => { + const { ctx, credentialRefs } = fakeContext({ + provider: 'custom-model', + model: 'private-model', + includeProfile: false + }) + const provider = new SessionModelSearchProvider({ + mode: () => 'auto', + resolveRoute: () => resolveSessionSearchRoute(ctx), + resolveNativeOptions: () => resolveSessionSearchOptions(ctx), + searchLocal: async () => ({ + sources: [{ url: 'https://example.com/custom' }], + truncated: false + }) + }) + + await expect(provider.search({ query: 'custom route', maxResults: 5 })).resolves.toMatchObject({ + sources: [{ url: 'https://example.com/custom' }] + }) + expect(credentialRefs).toEqual([]) + }) + + it('does not fall back after cancellation', async () => { + const { ctx } = fakeContext({ + provider: 'kimi-coding', + model: 'kimi-for-coding', + api: 'anthropic-messages' + }) + let localCalls = 0 + const provider = new SessionModelSearchProvider({ + mode: () => 'auto', + resolveRoute: () => resolveSessionSearchRoute(ctx), + resolveNativeOptions: () => resolveSessionSearchOptions(ctx), + searchLocal: async () => { + localCalls += 1 + return { sources: [], truncated: false } + } + }) + const abort = new AbortController() + abort.abort(new Error('cancelled')) + + await expect(provider.search({ query: 'cancelled', maxResults: 5 }, abort.signal)).rejects.toMatchObject({ + code: 'WEB_ABORTED' + }) + expect(localCalls).toBe(0) + }) + + it('honors native-only and off modes without silently using the browser', async () => { + const { ctx } = fakeContext({ + provider: 'kimi-coding', + model: 'kimi-for-coding', + api: 'anthropic-messages' + }) + let localCalls = 0 + const dependencies = { + resolveRoute: () => resolveSessionSearchRoute(ctx), + resolveNativeOptions: () => resolveSessionSearchOptions(ctx), + searchLocal: async () => { + localCalls += 1 + return { sources: [], truncated: false } + } + } + const nativeOnly = new SessionModelSearchProvider({ + ...dependencies, + mode: () => 'native-only' + }) + const off = new SessionModelSearchProvider({ ...dependencies, mode: () => 'off' }) + + await expect(nativeOnly.search({ query: 'native only', maxResults: 5 })).rejects.toMatchObject({ + code: 'WEB_NATIVE_SEARCH_REQUIRED' + }) + await expect(off.search({ query: 'off', maxResults: 5 })).rejects.toMatchObject({ + code: 'WEB_SEARCH_DISABLED' + }) + expect(localCalls).toBe(0) + }) +}) diff --git a/test/settings-about.test.ts b/test/settings-about.test.ts new file mode 100644 index 000000000..337afbb50 --- /dev/null +++ b/test/settings-about.test.ts @@ -0,0 +1,341 @@ +import { createRequire } from 'node:module' +import { readFile } from 'node:fs/promises' +import { runInNewContext } from 'node:vm' +import { Window } from 'happy-dom' +import { describe, expect, it, vi } from 'vitest' + +type ClientBundle = Record +type ComponentType = (props: Props) => unknown + +type AboutInfo = { + productName: string + version: string + releaseNotes: Array<{ + version: string + date: string + items: string[] + }> +} + +type BundleDescriptor = { + factory(require: (id: string) => unknown): ClientBundle +} + +const requireModule = createRequire(import.meta.url) +const react = requireModule('react') as { + createElement(type: unknown, props?: unknown, ...children: unknown[]): unknown + act(callback: () => void | Promise): Promise +} +const jsxRuntime = requireModule('react/jsx-runtime') +const { createElement } = react +const { act } = react +const { createRoot } = requireModule('react-dom/client') as { + createRoot(container: unknown): { render(node: unknown): void; unmount(): void } +} +const { renderToStaticMarkup } = requireModule('react-dom/server') as { + renderToStaticMarkup(node: unknown): string +} + +function fakeModule(): unknown { + let fake: unknown + const target = function () {} + fake = new Proxy(target, { + get: () => fake, + apply: () => fake, + construct: () => ({}) + }) + return fake +} + +type AboutBridge = { + getInfo(): Promise + checkForUpdates(): Promise<{ + phase: string + currentVersion: string + availableVersion?: string + manual: boolean + }> +} + +async function loadSettingsBundle(options?: { + browserWindow?: Window + aboutBridge?: AboutBridge +}): Promise { + const source = await readFile( + 'node_modules/@deepseek-ai/dsh-client-ui-settings-general/lib/client.js', + 'utf8' + ) + let descriptor: BundleDescriptor | undefined + const document = options?.browserWindow?.document ?? { + querySelector: () => null, + createElement: () => ({ dataset: {} as Record, textContent: '' }), + head: { appendChild: () => undefined } + } + const bundleWindow = options?.browserWindow ?? {} + Object.assign(bundleWindow, { + sherlockAbout: options?.aboutBridge ?? { + getInfo: async (): Promise => ({ + productName: 'Sherlock', + version: '0.6.7', + releaseNotes: [] + }), + checkForUpdates: async () => ({ + phase: 'up-to-date', + currentVersion: '0.6.7', + manual: true + }) + }, + __ModuleLoader__: { + load(value: BundleDescriptor) { + descriptor = value + } + } + }) + + runInNewContext(source, { + document, + window: bundleWindow + }) + if (descriptor === undefined) throw new Error('settings bundle did not register') + + const primitives = new Proxy( + { + IconQuestionOutline14: (props: Record) => + createElement('svg', { ...props, 'data-icon': 'about' }) + }, + { + get(target, property) { + return Reflect.get(target, property) ?? (() => null) + } + } + ) + + return descriptor.factory((id) => { + if (id === 'react') return react + if (id === 'react/jsx-runtime') return jsxRuntime + if (id === '@deepseek-ai/dsh-client-ui-primitives') return primitives + return fakeModule() + }) +} + +function installBrowserGlobals(browserWindow: Window): () => void { + const keys = ['window', 'document', 'navigator', 'IS_REACT_ACT_ENVIRONMENT'] as const + const descriptors = new Map( + keys.map((key) => [key, Object.getOwnPropertyDescriptor(globalThis, key)]) + ) + Object.defineProperties(globalThis, { + window: { configurable: true, value: browserWindow }, + document: { configurable: true, value: browserWindow.document }, + navigator: { configurable: true, value: browserWindow.navigator }, + IS_REACT_ACT_ENVIRONMENT: { configurable: true, value: true } + }) + return () => { + for (const key of keys) { + const descriptor = descriptors.get(key) + if (descriptor === undefined) delete (globalThis as Record)[key] + else Object.defineProperty(globalThis, key, descriptor) + } + } +} + +describe('Sherlock About settings', () => { + it('builds localized release notes around the real runtime version', async () => { + const aboutModule = await import('../src/preload/about-info').catch(() => null) + + expect(aboutModule).not.toBeNull() + if (aboutModule === null) return + + const zh = aboutModule.buildSherlockAboutInfo('9.8.7', 'zh') + const en = aboutModule.buildSherlockAboutInfo('9.8.7', 'en') + + expect(zh.productName).toBe('Sherlock') + expect(zh.version).toBe('9.8.7') + expect(zh.releaseNotes[0]).toEqual({ + version: '0.7.6', + date: '2026-09-02', + items: [ + '研究组件新增“思维导图”和“总结提炼”工具：可在所选内容旁生成新组件，思维导图提供简要、常规和详细三种模式', + '画布生成任务改为在目标组件内独立展示进度与失败重试，支持最多四路并发，并与右侧对话互不占用', + '统一思维导图为适合直接粘贴到 PPT 的横向白底样式，优化节点宽度、换行、对齐、连线和画布比例；支持双击编辑节点', + '总结提炼组件支持双击编辑；消息和输入框中的研究标签采用紧凑布局、补全类型图标，并可点击定位到对应画布组件', + '修复侧栏收起时点击搜索无法显示输入框的问题，展开后会直接聚焦搜索框', + '画布空白处右键新增“整理画布”，按内容尺寸混合平铺组件；“全选”会选择画布中的全部组件', + '画布底部新增“链接”和“容器”：链接组件可自动读取网页标题、自适应显示页面，并为微信文章提供安全阅读视图；智能容器可生成 KPI、图表、表格或文字内容', + '所有研究组件新增下载入口，思维导图支持 SVG、PNG 和 JPG；同时优化底栏间距和画布缩放下限', + '修复从 PowerPoint 组件生成思维导图失败、网页与微信链接读取竞态及智能容器生成失败等问题' + ] + }) + expect(zh.releaseNotes[1]?.version).toBe('0.7.5') + expect(en.version).toBe('9.8.7') + expect(en.releaseNotes[0]?.items[1]).toBe( + 'Canvas generation jobs now show progress and retry states inside their target components, support up to four concurrent jobs, and no longer occupy the right-side conversation' + ) + expect(en.releaseNotes[0]?.items).toContain( + 'Added Link and Container tools to the canvas toolbar: Link components resolve real page titles, resize web content responsively, and use a safe reader for WeChat articles, while smart containers can generate KPI panels, charts, tables, or text' + ) + expect(en.releaseNotes[0]?.items).toContain( + 'Added downloads to every Research component, including SVG, PNG, and JPG for mind maps, and refined the bottom toolbar spacing and canvas zoom floor' + ) + expect(en.releaseNotes[0]?.items).toContain( + 'Fixed mind-map generation from PowerPoint components, web and WeChat reader races, and failed smart-container generation' + ) + + const manualCheck = vi.fn(async () => ({ + phase: 'up-to-date' as const, + currentVersion: '7.6.5', + manual: true + })) + const bridge = aboutModule.createSherlockAboutBridge( + async () => ({ currentVersion: '7.6.5' }), + manualCheck, + 'zh' + ) + expect((await bridge.getInfo()).version).toBe('7.6.5') + await expect(bridge.checkForUpdates()).resolves.toMatchObject({ phase: 'up-to-date' }) + expect(manualCheck).toHaveBeenCalledOnce() + }) + + it('checks for updates from About and reports the result in place', async () => { + const browserWindow = new Window({ url: 'https://sherlock.local/settings/about' }) + const restoreGlobals = installBrowserGlobals(browserWindow) + const checkForUpdates = vi.fn(async () => ({ + phase: 'up-to-date', + currentVersion: '0.7.2', + manual: true + })) + const bundle = await loadSettingsBundle({ + browserWindow, + aboutBridge: { + getInfo: async () => ({ + productName: 'Sherlock', + version: '0.7.2', + releaseNotes: [] + }), + checkForUpdates + } + }) + const AboutSection = bundle.SherlockAboutSection + expect(AboutSection).toBeTypeOf('function') + if (typeof AboutSection !== 'function') { + restoreGlobals() + return + } + + const host = browserWindow.document.createElement('div') + browserWindow.document.body.appendChild(host) + const root = createRoot(host) + const copy: Record = { + 'about.version': '当前版本', + 'about.changelog': '更新日志', + 'about.empty': '暂无更新日志', + 'about.loading': '正在读取版本信息…', + 'about.error': '暂时无法读取版本信息', + 'about.check': '检查更新', + 'about.checking': '正在检查更新…', + 'about.upToDate': 'Sherlock 已是最新版本', + 'about.updateAvailable': '发现新版本 {version}', + 'about.checkFailed': '检查更新失败' + } + + try { + await act(async () => { + root.render( + createElement(AboutSection as ComponentType<{ t(key: string): string }>, { + t: (key: string) => copy[key] ?? key + }) + ) + }) + const button = host.querySelector('[data-about-check-update]') as { + textContent: string | null + click(): void + } | null + expect(button?.textContent).toBe('检查更新') + + await act(async () => { + button?.click() + }) + expect(checkForUpdates).toHaveBeenCalledOnce() + expect(host.textContent).toContain('Sherlock 已是最新版本') + } finally { + await act(async () => root.unmount()) + restoreGlobals() + } + }) + + it('registers About immediately after Models in the settings navigation', async () => { + const bundle = await loadSettingsBundle() + const registrations: Array<{ options: Record; component: unknown }> = [] + const translate = (key: string) => + ({ 'about.nav': '关于', 'general.nav': '通用设置' })[key] ?? key + const ctx = { + effect: (factory: () => unknown) => factory(), + on: () => () => undefined, + get: () => ({ isLoopback: false }), + locale: { + register: () => () => undefined, + bind: () => translate, + getSnapshot: () => ({ revision: 0 }), + subscribe: () => () => undefined + }, + slots: { + inject: (_name: string, factory: () => unknown) => factory(), + register: (options: Record, component: unknown) => { + registrations.push({ options, component }) + return () => undefined + }, + getVersion: () => 0, + entries: () => [], + subscribe: () => () => undefined + } + } + + const apply = bundle.apply + expect(apply).toBeTypeOf('function') + if (typeof apply !== 'function') return + apply(ctx) + + const about = registrations.find(({ options }) => options.id === 'about') + expect(about?.options).toMatchObject({ + name: 'settings.section', + id: 'about', + order: 11, + label: expect.any(Function) + }) + expect((about?.options.label as (() => string) | undefined)?.()).toBe('关于') + }) + + it('renders the current version and every supplied release-note item', async () => { + const bundle = await loadSettingsBundle() + const AboutContent = bundle.SherlockAboutContent + expect(AboutContent).toBeTypeOf('function') + if (typeof AboutContent !== 'function') return + + const info: AboutInfo = { + productName: 'Sherlock', + version: '0.7.0', + releaseNotes: [ + { + version: '0.7.0', + date: '2026-08-25', + items: ['新增研究画布', '隐藏开发者标签页'] + } + ] + } + const html = renderToStaticMarkup( + createElement(AboutContent as ComponentType<{ info: AboutInfo; t(key: string): string }>, { + info, + t: (key: string) => + ({ + 'about.version': '当前版本', + 'about.changelog': '更新日志' + })[key] ?? key + }) + ) + + expect(html).toContain('Sherlock') + expect(html).toContain('当前版本 0.7.0') + expect(html).toContain('更新日志') + expect(html).toContain('新增研究画布') + expect(html).toContain('隐藏开发者标签页') + }) +}) diff --git a/test/shared-source-gate.test.ts b/test/shared-source-gate.test.ts new file mode 100644 index 000000000..750e17d98 --- /dev/null +++ b/test/shared-source-gate.test.ts @@ -0,0 +1,205 @@ +import { createHash } from 'node:crypto' +import { readFileSync } from 'node:fs' +import path from 'node:path' +import { afterEach, describe, expect, it } from 'vitest' +import { acquireActiveBatchLease } from '../scripts/lib/sherlock-active-batch.mjs' +import { buildFeatureHandoff, createIntegrationBatchManifest } from '../scripts/lib/sherlock-integration-model.mjs' +import { + assertSharedBuildSourceUnchanged, + verifySharedBuildSource, + type SharedSourceSnapshot +} from '../scripts/lib/sherlock-shared-source-gate.mjs' +import { createGitWorkflowFixture, type GitWorkflowFixture } from './helpers/git-workflow-fixture' + +const fixtures: GitWorkflowFixture[] = [] + +function fixture(): GitWorkflowFixture { + const value = createGitWorkflowFixture() + fixtures.push(value) + return value +} + +function digest(file: string): string { + return createHash('sha256').update(readFileSync(file)).digest('hex') +} + +function ownedIntegration(repository: GitWorkflowFixture) { + const feature = repository.createWorktree('source-feature', 'codex/feat/source-feature-20260831') + const base = repository.git(feature, 'rev-parse', 'HEAD') + repository.write(feature, 'src/source-feature.ts', 'export const sourceFeature = true\n') + const featureTip = repository.commit(feature, '增加构建来源功能') + const handoff = buildFeatureHandoff({ + repository: feature, + baseCommit: base, + metadata: { + featureName: '构建来源功能', + checks: [{ + argv: [process.execPath, '-e', 'process.exit(0)'], + outcome: 'passed', + summary: 'feature verification', + verifiedCommit: featureTip, + completedAt: '2026-08-31T08:00:00.000Z', + timeoutMs: 1000 + }], + uiVerification: { outcome: 'not-applicable', summary: 'Git workflow only.' }, + acceptanceCriteria: ['功能引用固定到交接提交'], + risks: [] + }, + generatedAt: '2026-08-31T08:00:00.000Z' + }) + const integration = repository.createWorktree('source-integration', 'codex/integration/20260831-01') + const manifestPath = 'config/sherlock-integration-batches/20260831-01.json' + const mainTip = repository.git(repository.main, 'rev-parse', 'HEAD') + const manifest = createIntegrationBatchManifest({ + batchId: '20260831-01', + branch: 'codex/integration/20260831-01', + baseMainCommit: mainTip, + handoffs: [handoff], + integrationChecks: [], + createdAt: '2026-08-31T08:00:00.000Z' + }) + repository.write(integration, manifestPath, `${JSON.stringify(manifest, null, 2)}\n`) + repository.commit(integration, '集成：创建来源批次清单') + repository.git(integration, 'merge', '--no-ff', '--no-edit', handoff.branch) + const currentTip = repository.git(integration, 'rev-parse', 'HEAD') + const ownerToken = 'source-gate-owner-token' + const lease = acquireActiveBatchLease({ + repository: integration, + ownerToken, + lease: { + batchId: '20260831-01', + branch: 'codex/integration/20260831-01', + manifestPath, + baseMainCommit: mainTip, + currentTip, + createdAt: '2026-08-31T08:00:00.000Z', + updatedAt: '2026-08-31T08:00:00.000Z' + } + }).lease + return { integration, ownerToken, lease, manifestPath, feature, featureTip, featureBranch: handoff.branch } +} + +afterEach(() => { + for (const value of fixtures.splice(0)) value.dispose() +}) + +describe('shared build source gate', () => { + it('accepts only the canonical clean main worktree and ignores a clean unmerged feature worktree', () => { + const repository = fixture() + repository.createWorktree('clean-feature', 'codex/feat/clean-feature-20260831') + + expect(verifySharedBuildSource({ repository: repository.main })).toEqual({ + mode: 'local-main', + worktreeRoot: repository.main, + branch: 'main', + commit: repository.git(repository.main, 'rev-parse', 'HEAD'), + mainCommit: repository.git(repository.main, 'rev-parse', 'refs/heads/main'), + sourceClean: true, + batchId: null, + manifestPath: null, + manifestDigest: null, + features: [], + leaseRevision: null + }) + }) + + it('accepts an owning integration source only when its lease, tracked manifest, feature refs, and main ancestry remain exact', () => { + const repository = fixture() + const state = ownedIntegration(repository) + + expect(verifySharedBuildSource({ repository: state.integration, ownerToken: state.ownerToken })).toEqual({ + mode: 'local-integration', + worktreeRoot: state.integration, + branch: state.lease.branch, + commit: state.lease.currentTip, + mainCommit: repository.git(repository.main, 'rev-parse', 'refs/heads/main'), + sourceClean: true, + batchId: state.lease.batchId, + manifestPath: state.manifestPath, + manifestDigest: digest(path.join(state.integration, state.manifestPath)), + features: [{ branch: state.featureBranch, commit: state.featureTip }], + leaseRevision: state.lease.revision + }) + }) + + it('blocks main and every non-owning integration source while a lease remains active', () => { + const repository = fixture() + const state = ownedIntegration(repository) + const competing = repository.createWorktree('competing-integration', 'codex/integration/20260831-02') + + expect(() => verifySharedBuildSource({ repository: repository.main })).toThrow(/活动集成租约|租约/) + expect(() => verifySharedBuildSource({ repository: competing, ownerToken: state.ownerToken })).toThrow(/活动集成租约|租约/) + expect(() => verifySharedBuildSource({ repository: state.integration })).toThrow(/ownerToken|owner|令牌/) + expect(() => verifySharedBuildSource({ repository: state.integration, ownerToken: 'wrong-token' })).toThrow(/owner|令牌|不匹配/) + }) + + it('rejects changed source dirt, feature refs, and local main ancestry for an active integration source', () => { + const dirtyRepository = fixture() + const dirty = ownedIntegration(dirtyRepository) + dirtyRepository.write(dirty.integration, 'src/uncommitted.ts', 'export const dirty = true\n') + expect(() => verifySharedBuildSource({ repository: dirty.integration, ownerToken: dirty.ownerToken })).toThrow(/未提交源码改动/) + + const movedRepository = fixture() + const moved = ownedIntegration(movedRepository) + movedRepository.write(moved.feature, 'src/moved.ts', 'export const moved = true\n') + movedRepository.commit(moved.feature, '移动功能引用') + expect(() => verifySharedBuildSource({ repository: moved.integration, ownerToken: moved.ownerToken })).toThrow(/功能分支引用/) + + const mainRepository = fixture() + const mainAdvanced = ownedIntegration(mainRepository) + mainRepository.write(mainRepository.main, 'main-advanced.txt', 'advance\n') + mainRepository.commit(mainRepository.main, '推进 main') + expect(() => verifySharedBuildSource({ repository: mainAdvanced.integration, ownerToken: mainAdvanced.ownerToken })).toThrow(/local main.*祖先/) + }) + + it('reports the first changed scalar or ordered feature entry with before and after values', () => { + const before: SharedSourceSnapshot = { + mode: 'local-integration', + worktreeRoot: '/tmp/integration', + branch: 'codex/integration/20260831-01', + commit: 'a'.repeat(40), + mainCommit: 'b'.repeat(40), + sourceClean: true, + batchId: '20260831-01', + manifestPath: 'config/sherlock-integration-batches/20260831-01.json', + manifestDigest: 'c'.repeat(64), + features: [{ branch: 'codex/feat/one-20260831', commit: 'd'.repeat(40) }], + leaseRevision: 1 + } + const after = { ...before, features: [{ branch: 'codex/feat/one-20260831', commit: 'e'.repeat(40) }] } + + expect(() => assertSharedBuildSourceUnchanged(before, after)).toThrow(/features\[0\]\.commit.*d{40}.*e{40}/) + }) + + it('detects HEAD, manifest, lease, and ordered feature snapshot changes', () => { + const before: SharedSourceSnapshot = { + mode: 'local-main', + worktreeRoot: '/tmp/main', + branch: 'main', + commit: 'a'.repeat(40), + mainCommit: 'a'.repeat(40), + sourceClean: true, + batchId: null, + manifestPath: null, + manifestDigest: null, + features: [], + leaseRevision: null + } + const changes: Array<[string, SharedSourceSnapshot]> = [ + ['mode', { ...before, mode: 'local-integration' }], + ['worktreeRoot', { ...before, worktreeRoot: '/tmp/other' }], + ['branch', { ...before, branch: 'codex/integration/20260831-01' }], + ['commit', { ...before, commit: 'b'.repeat(40) }], // HEAD or lease currentTip movement + ['mainCommit', { ...before, mainCommit: 'b'.repeat(40) }], + ['batchId', { ...before, batchId: '20260831-01' }], + ['manifestPath', { ...before, manifestPath: 'config/sherlock-integration-batches/20260831-01.json' }], + ['manifestDigest', { ...before, manifestDigest: 'b'.repeat(64) }], // raw-byte manifest edit + ['leaseRevision', { ...before, leaseRevision: 2 }], // lease CAS revision change + ['features[0]', { ...before, features: [{ branch: 'codex/feat/one-20260831', commit: 'b'.repeat(40) }] }] + ] + + for (const [field, after] of changes) { + expect(() => assertSharedBuildSourceUnchanged(before, after)).toThrow(new RegExp(field.replaceAll('[', '\\[').replaceAll(']', '\\]'))) + } + }) +}) diff --git a/test/sherlock-agent-branding.test.ts b/test/sherlock-agent-branding.test.ts new file mode 100644 index 000000000..896afe138 --- /dev/null +++ b/test/sherlock-agent-branding.test.ts @@ -0,0 +1,101 @@ +import { Context } from '@deepseek-ai/cordis' +import { addHarnessSourceSection } from '@deepseek-ai/dsh-app-boot' +import { apply as applyWebApp } from '@deepseek-ai/dsh-web-app' +import { + SystemPrompt, + renderPrompt +} from '@deepseek-ai/dsh-system-prompt' +import { describe, expect, it } from 'vitest' + +type PromptSection = { + name: string + order: number + text: string | (() => string) +} + +function renderedSectionText(section: PromptSection): string { + return typeof section.text === 'function' ? section.text() : section.text +} + +describe('Sherlock Agent model-facing identity', () => { + it('assembles the fixed identity as Sherlock Agent', async () => { + const prompt = new SystemPrompt(new Context(), {}) + + const rendered = renderPrompt(await prompt.assemble()) + + expect(rendered).toContain('You are Sherlock Agent.') + expect(rendered).not.toContain('DeepSeek Harness') + }) + + it('describes the implementation checkout as Sherlock Agent', () => { + const sections: PromptSection[] = [] + addHarnessSourceSection( + { + get(name: string) { + if (name !== 'systemPrompt') return undefined + return { + section(section: PromptSection) { + sections.push(section) + return () => undefined + } + } + } + } as never, + '/Applications/Sherlock.app/Contents/Resources/app' + ) + + const rendered = sections.map(renderedSectionText).join('\n') + expect(rendered).toContain('Sherlock Agent implementation checkout') + expect(rendered).not.toContain('DeepSeek Harness') + }) + + it('describes the active desktop surface as Sherlock', () => { + const sections: PromptSection[] = [] + const promptContext = { + get(name: string) { + if (name === 'webServer') return { port: 49559 } + if (name === 'systemPrompt') { + return { + section(section: PromptSection) { + sections.push(section) + return () => undefined + } + } + } + return undefined + }, + systemPrompt: { + section(section: PromptSection) { + sections.push(section) + return () => undefined + } + } + } + const shellContext = { + shellEnv: { register: () => () => undefined }, + get(name: string) { + return name === 'webServer' ? { port: 49559 } : undefined + } + } + const webContext = { + webServer: { host: '127.0.0.1', port: 49559 }, + provide: () => undefined, + plugin: () => undefined, + inject(names: string[], callback: (context: never) => void) { + if (names.includes('systemPrompt')) callback(promptContext as never) + if (names.includes('shellEnv')) callback(shellContext as never) + }, + get: () => undefined + } + + applyWebApp(webContext as never, { + printUrl: false, + surfaceContext: true, + trustedHosts: [] + }) + + const rendered = sections.map(renderedSectionText).join('\n') + expect(rendered).toContain('Sherlock desktop interface') + expect(rendered).not.toContain('DeepSeek Harness') + }) +}) diff --git a/test/sherlock-composer-workspace-ui.test.ts b/test/sherlock-composer-workspace-ui.test.ts new file mode 100644 index 000000000..3d77ac480 --- /dev/null +++ b/test/sherlock-composer-workspace-ui.test.ts @@ -0,0 +1,11380 @@ +import { readFile } from 'node:fs/promises' +import { createRequire } from 'node:module' +import { runInNewContext } from 'node:vm' +import { + Window, + type CSSStyleRule as HappyDOMCSSStyleRule, + type Element as HappyDOMElement, + type Event as HappyDOMEvent, + type HTMLElement as HappyDOMHTMLElement +} from 'happy-dom' +import { describe, expect, it, vi } from 'vitest' + +type ClientBundle = Record +type ComponentType = (props: Props) => unknown +type ReactNode = unknown + +const requireModule = createRequire(import.meta.url) +const { createElement, StrictMode, useEffect, useLayoutEffect, useSyncExternalStore } = requireModule('react') as { + createElement: (type: unknown, props?: unknown, ...children: unknown[]) => unknown + StrictMode: unknown + useLayoutEffect: (effect: () => void | (() => void), dependencies: unknown[]) => void + useEffect: (effect: () => void | (() => void), dependencies: unknown[]) => void + useSyncExternalStore: ( + subscribe: (listener: () => void) => () => void, + getSnapshot: () => T, + getServerSnapshot?: () => T + ) => T +} +const { renderToStaticMarkup } = requireModule('react-dom/server') as { + renderToStaticMarkup: (node: unknown) => string +} +const { act } = requireModule('react') as { + act: (callback: () => void | Promise) => Promise +} +const { createRoot } = requireModule('react-dom/client') as { + createRoot: (container: unknown) => { + render(node: unknown): void + unmount(): void + } +} + +type BundleDescriptor = { + factory(require: (id: string) => unknown): ClientBundle +} + +type InjectedStyle = { + pluginCss?: string + textContent: string +} + +class MemoryStorage implements Storage { + private readonly values = new Map() + get length() { return this.values.size } + clear() { this.values.clear() } + getItem(key: string) { return this.values.get(key) ?? null } + key(index: number) { return [...this.values.keys()][index] ?? null } + removeItem(key: string) { this.values.delete(key) } + setItem(key: string, value: string) { this.values.set(key, value) } +} + +function fakeModule(): unknown { + let fake: unknown + const target = function () {} + fake = new Proxy(target, { + get: () => fake, + apply: () => fake, + construct: () => ({}) + }) + return fake +} + +async function loadClientBundle( + packageName: string, + dshDesktop?: { + showItemInFolder?(path: string): Promise<{ ok: boolean }> + getPathForFile?(file: File): string + researchCanvasStorage?: { + getItem(key: string): string | null + setItem(key: string, value: string): boolean + } + researchCanvasWheel?: { + setRegion(value: Record): boolean + subscribe(listener: (value: Record) => void): () => void + } + researchLinkFrame?: { + authorize(value: { sessionId: string; nodeId: string; url: string }): Promise<{ url: string; frameName?: string }> + inspect?(value: { sessionId: string; nodeId: string }): Promise | null> + release(value: { sessionId: string; nodeId: string }): Promise<{ ok: boolean }> + releaseSession(sessionId: string): Promise<{ ok: boolean; removed: number }> + } + researchWebReader?: { + read(value: { sessionId: string; nodeId: string; url: string }): Promise> + } + researchCanvasExport?: { + save(value: Record): Promise> + } + researchPreview?: { + admitFinderFile?(file: File, identity: { sessionId: string; nodeId: string }): Promise | null> + admitSidebarFile?(value: { sessionId: string; nodeId: string; relativePath: string }): Promise | null> + restore?(value: { sessionId: string; nodeId: string; authorizationId: string }): Promise | null> + release?(value: { sessionId: string; nodeId: string; authorizationId: string; capabilityToken: string }): Promise<{ ok: boolean }> + revokeNode?(value: { sessionId: string; nodeId: string }): Promise<{ ok: boolean }> + revokeSession?(sessionId: string): Promise<{ ok: boolean }> + } + }, + options?: { + document?: unknown + window?: Window + modules?: Record + styles?: InjectedStyle[] + exposeInputBar?: boolean + transformSource?: (source: string) => string + json?: JSON + } +): Promise { + const bundleSource = await readFile( + `node_modules/@deepseek-ai/${packageName}/lib/client.js`, + 'utf8' + ) + const transformedSource = options?.transformSource?.(bundleSource) ?? bundleSource + const source = options?.exposeInputBar + ? transformedSource.replace( + ' exports.apply = apply;', + ' exports.apply = apply;\n exports.__testInputBar = InputBar;' + ) + : transformedSource + const react = requireModule('react') + const jsxRuntime = requireModule('react/jsx-runtime') + let descriptor: BundleDescriptor | undefined + + const styleDocument = options?.document ?? (options?.styles === undefined + ? undefined + : { + querySelector: () => null, + createElement: () => ({ + dataset: {} as Record, + textContent: '' + }), + head: { + appendChild(tag: { + dataset: { pluginCss?: string } + textContent: string + }) { + options.styles?.push({ + pluginCss: tag.dataset.pluginCss, + textContent: tag.textContent + }) + } + } + }) + + const bundleWindow = options?.window ?? {} + Object.assign(bundleWindow, { + dshDesktop, + __ModuleLoader__: { + load(value: BundleDescriptor) { + descriptor = value + } + } + }) + + runInNewContext(source, { + AbortController: globalThis.AbortController, + TextDecoder: globalThis.TextDecoder, + window: bundleWindow, + document: styleDocument, + localStorage: options?.window?.localStorage, + navigator: options?.window?.navigator, + HTMLElement: options?.window?.HTMLElement, + HTMLTextAreaElement: options?.window?.HTMLTextAreaElement, + Text: options?.window?.Text, + ResizeObserver: options?.window?.ResizeObserver, + requestAnimationFrame: options?.window?.requestAnimationFrame?.bind(options.window), + cancelAnimationFrame: options?.window?.cancelAnimationFrame?.bind(options.window), + setTimeout, + clearTimeout, + JSON: options?.json ?? globalThis.JSON + }) + if (descriptor === undefined) throw new Error(`${packageName} did not register its client bundle`) + + return descriptor.factory((id) => { + if (options?.modules?.[id] !== undefined) return options.modules[id] + if (id === 'react') return react + if (id === 'react/jsx-runtime') return jsxRuntime + if (id === 'react-dom') return requireModule('react-dom') + if (id === '@deepseek-ai/dsh-client-ui-primitives') { + const fallback = fakeModule() as object + return new Proxy({ + MarkdownText: ({ text }: { text: string }) => createElement('div', null, text), + IconBranchOutline16: () => createElement('span', { 'data-test-icon': 'branch' }), + IconChevronDownOutline14: () => createElement('span', { 'data-test-icon': 'chevron-down' }), + IconListPenOutline16: () => createElement('span', { 'data-test-icon': 'list-pen' }), + IconRefreshOutline16: () => createElement('span', { 'data-test-icon': 'refresh' }) + }, { + get(target, property) { + return Reflect.get(target, property) ?? Reflect.get(fallback, property) + } + }) + } + return fakeModule() + }) +} + +function createSelectorStore(initial: State) { + let state = initial + const listeners = new Set<() => void>() + const subscribe = (listener: () => void) => { + listeners.add(listener) + return () => listeners.delete(listener) + } + return { + useSelector: (select: (state: State) => Selected): Selected => + useSyncExternalStore( + subscribe, + () => select(state), + () => select(state) + ), + get: () => state, + update(patch: Partial) { + state = { ...state, ...patch } + listeners.forEach((listener) => listener()) + } + } +} + +function createSnapshotStore(initial: T) { + let value = initial + const listeners = new Set<() => void>() + return { + getSnapshot: () => value, + set(next: T) { + value = next + listeners.forEach((listener) => listener()) + }, + subscribe(listener: () => void) { + listeners.add(listener) + return () => listeners.delete(listener) + } + } +} + +async function mountConversationRoot( + initialView: 'chat' | 'research' | 'trajectory' = 'research', + assistantMessage?: { messageId: string; text: string; settled?: boolean }, + lifecycle?: { + enterResearch(): void + leaveResearch(): void + }, + composerOptions: { + overlay?: ReactNode + model?: ReactNode + composer?: ReactNode + composerHeight?: number + sidebarWidth?: number + userMessagePrompt?: string + } = {} +) { + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + if (composerOptions.composerHeight !== undefined) { + const composerHeight = composerOptions.composerHeight + Object.defineProperty(browserWindow.HTMLElement.prototype, 'offsetHeight', { + configurable: true, + get() { + return this.hasAttribute?.('data-composer-seat') ? composerHeight : 0 + } + }) + Object.defineProperty(browserWindow, 'ResizeObserver', { + configurable: true, + value: class TestResizeObserver { + private readonly callback: () => void + constructor(callback: () => void) { this.callback = callback } + observe() { this.callback() } + disconnect() {} + } + }) + } + const sessionId = 'session-research-right-panel' + browserWindow.localStorage.setItem( + `sherlock.research.canvas.files.v1:${sessionId}`, + JSON.stringify([ + { + id: 'file-a', + path: '/tmp/research/evidence.pdf', + name: 'evidence.pdf', + mediaType: 'application/pdf', + source: 'computer', + x: 100, + y: 80 + }, + { + id: 'file-b', + name: 'unresolved.txt', + source: 'sherlock', + x: 150, + y: 120 + } + ]) + ) + browserWindow.localStorage.setItem( + `sherlock.research.canvas.selection.v1:${sessionId}`, + JSON.stringify({ + selectedNodeIds: ['file-a', 'file-b'], + orderedFileIds: ['file-b', 'file-a'] + }) + ) + const restoreGlobals = installBrowserGlobals(browserWindow) + const primitives = new Proxy({ + Tooltip: ({ children }: { children: unknown }) => children + }, { + get(target, property) { + return Reflect.get(target, property) ?? (() => null) + } + }) + const client = await loadClientBundle('dsh-client-ui-conversation', undefined, { + document: browserWindow.document, + window: browserWindow, + modules: { + '@deepseek-ai/dsh-client-ui-primitives': primitives, + '@deepseek-ai/dsh-client-ui-attachment': { ImageGallery: () => null } + } + }) + expect(client.ConversationRoot).toBeTypeOf('function') + if (typeof client.ConversationRoot !== 'function') { + restoreGlobals() + throw new Error('ConversationRoot is not exported') + } + const Registry = client.ResearchWorkspaceRegistry as new (storage: Storage) => { + for(id: string): { + subscribe(listener: () => void): () => void + getSnapshot(): { + files: Array> + artifacts: Array> + selection: { selectedNodeIds: string[]; orderedFileIds: string[] } + viewport: { scale: number; x: number; y: number } + canvasSize: { width: number; height: number } + pendingMessageJump: string | null + } + assistantActionsActive(): boolean + focusNode(nodeId: string): boolean + removeSelectedFile(fileId: string): void + removeNodes(nodeIds: string[]): void + setArtifacts(artifacts: Array>): void + updateArtifactContent(artifactId: string, content: string): boolean + setSelection(selection: { selectedNodeIds: string[]; orderedFileIds: string[] }): void + setViewport(viewport: { scale: number; x: number; y: number }): void + setCanvasSize(size: { width: number; height: number }): void + } + } + const researchWorkspaces = new Registry(browserWindow.localStorage as Storage) + type ResearchChatState = { + selection: Record | null + draft: string + view: string | null + inspect: { callId: string } | null + researchRightTab: 'conversation' | 'files' | 'details' + researchFilesTabOpen: boolean + researchConversationUnread: boolean + } + const createSessionBinding = (overrides: Partial = {}) => { + const chat = createSelectorStore({ + selection: { + callId: 'call-1', toolName: 'Web Search', turnSeq: 1 + }, + draft: '研究草稿', + view: initialView, + inspect: null, + researchRightTab: 'details', + researchFilesTabOpen: true, + researchConversationUnread: false, + ...overrides + }) + const actions = { + select: (selection: Record | null) => chat.update({ selection }), + setView: (view: string) => chat.update({ view }), + setInspect: (inspect: { callId: string } | null) => chat.update({ inspect }), + setResearchRightTab: (researchRightTab: 'conversation' | 'files' | 'details') => + chat.update({ researchRightTab }), + setResearchFilesTabOpen: (researchFilesTabOpen: boolean) => + chat.update({ researchFilesTabOpen }), + setResearchConversationUnread: (researchConversationUnread: boolean) => + chat.update({ researchConversationUnread }) + } + return { actions, chat } + } + const initialBinding = createSessionBinding() + const { actions, chat } = initialBinding + const session = createSelectorStore({ + openState: 'open', + composerPhase: 'active', + pending: [] as unknown[], + blank: false, + chat: { order: ['message-1'] }, + running: false + }) + const input = createSelectorStore({ + draft: '研究草稿', + images: [{ id: 'image-a' }, { id: 'image-b' }] + }) + const detailsPortalHost = browserWindow.document.createElement('div') + detailsPortalHost.setAttribute('data-details-portal-host', '') + detailsPortalHost.style.width = `${composerOptions.sidebarWidth ?? 438}px` + browserWindow.document.body.appendChild(detailsPortalHost) + const host = browserWindow.document.createElement('div') + browserWindow.document.body.appendChild(host) + const root = createRoot(host) + const sidebarRoot = createRoot(detailsPortalHost) + const transitions = { enter: 0, leave: 0 } + const translate = (key: string) => ({ + 'hero.headline': '迷雾之中，洞见真相', + 'hero.preview': '预览版', + 'research.right.conversation': '对话', + 'research.right.files': '文件', + 'research.right.add': '添加标签页', + 'research.right.closeFiles': '关闭文件', + 'research.right.closeDetails': '关闭详情', + 'research.right.pathUnavailable': '路径不可用', + 'research.right.source.computer': '本地电脑', + 'research.right.source.sherlock': 'Sherlock' + }[key] ?? key) + let activeSidebarSessionId = sessionId + let sidebarDescriptor: Record | undefined + const sidebarStates = new Map + bottomSplits: Record + }>() + const sidebarStateFor = (id: string) => { + let value = sidebarStates.get(id) + if (value === undefined) { + value = { + panelOpen: false, + width: composerOptions.sidebarWidth ?? 438, + activePane: 'pane-1', + splits: { + kind: 'leaf', id: 'pane-1', active: 'files-tab', + tabs: [{ id: 'files-tab', type: 'editor', title: 'Files' }] + }, + bottomSplits: { kind: 'leaf', id: 'pane-2', active: null, tabs: [] } + } + sidebarStates.set(id, value) + } + return value + } + const researchSidebar = new (client.ResearchSidebarCoordinator as new () => { + attach(service: Record, t: (key: string) => string): () => void + })() + const detachResearchSidebar = researchSidebar.attach({ + registerTab(descriptor: Record) { + sidebarDescriptor = descriptor + return () => { sidebarDescriptor = undefined } + }, + getSnapshot: () => ({ + sessionId: activeSidebarSessionId, + state: sidebarStateFor(activeSidebarSessionId) + }), + openTab(seed: Record, scope: { sessionId: string }) { + const state = sidebarStateFor(scope.sessionId) + state.panelOpen = true + state.splits = { + kind: 'leaf', id: 'pane-1', active: seed.id, + tabs: [seed, { id: 'files-tab', type: 'editor', title: 'Files' }] + } + transitions.enter += 1 + lifecycle?.enterResearch() + }, + updateTab: () => undefined, + closeTab(_tabId: string, scope: { sessionId: string }) { + sidebarStateFor(scope.sessionId).panelOpen = false + transitions.leave += 1 + lifecycle?.leaveResearch() + }, + activateTab: () => undefined, + setPanelState(patch: { open?: boolean; width?: number }, scope: { sessionId: string }) { + Object.assign(sidebarStateFor(scope.sessionId), { + ...(patch.open === undefined ? {} : { panelOpen: patch.open }), + ...(patch.width === undefined ? {} : { width: patch.width }) + }) + } + }, translate) + const renderSidebar = (activeSessionId: string) => { + const Component = sidebarDescriptor?.component as ComponentType> + sidebarRoot.render(createElement(Component, { + scope: { sessionId: activeSessionId }, + visible: true + })) + } + const renderChatView = (activeSessionId = sessionId) => createElement('div', { 'data-chat-view': '' }, + assistantMessage === undefined + ? composerOptions.userMessagePrompt === undefined + ? 'message-1' + : createElement(client.UserStyleBubble as ComponentType>, { + content: [{ type: 'text', text: composerOptions.userMessagePrompt }], + imageLoader: async () => '', + t: translate + }) + : createElement('div', { + 'data-assistant-message-id': assistantMessage.messageId, + 'data-assistant-message-settled': assistantMessage.settled === false + ? undefined + : '' + }, + createElement('span', null, assistantMessage.text), + createElement(client.ResearchAssistantCanvasAction as ComponentType>, { + messageId: assistantMessage.messageId, + text: assistantMessage.text, + workspace: researchWorkspaces.for(activeSessionId) + })) + ) + const TestSessionBridge = ({ onResearchPresentation, chatStore, sessionActions, activeSessionId }: { + onResearchPresentation?: (value: Record | null) => void + chatStore: typeof chat + sessionActions: typeof actions + activeSessionId: string + }) => { + const snapshot = chatStore.useSelector((state) => state) + useLayoutEffect(() => { + onResearchPresentation?.({ + ...snapshot, + actions: sessionActions, + conversationView: renderChatView(activeSessionId) + }) + return () => onResearchPresentation?.(null) + }, [activeSessionId, onResearchPresentation, sessionActions, snapshot]) + return createElement('div', { + className: 'wSkVaW_viewArea', + 'data-center-session-view': snapshot.view ?? 'chat' + }, snapshot.view === 'trajectory' + ? createElement('div', { + className: 'qBU-ya_root', + 'data-conversation-composer-overlay': '', + 'data-test-trajectory-view': '' + }) + : null) + } + const createRenderSlot = ( + activeSessionId: string, + chatStore: typeof chat, + sessionActions: typeof actions + ) => (name: string, owner?: unknown, options?: { only?: string }) => { + if (name === 'conversation.session.header') { + return createElement('div', { 'data-session-header': '' }) + } + if (name === 'conversation.session') { + return createElement(TestSessionBridge, { + ...(owner as Record), + activeSessionId, + chatStore, + sessionActions + }) + } + if (name === 'conversation.composer.bar') { + const composerOwner = owner as { + accessory?: unknown + overlay?: unknown + researchFileReferences?: Array<{ id: string; name: string; path?: string }> + researchArtifactReferences?: Array<{ + id: string + messageId: string + title: string + excerpt: string + label: string + }> + footer?: unknown + variant?: 'hero' | 'composer' + } | undefined + const references = composerOwner?.researchFileReferences ?? [] + const artifactReferences = composerOwner?.researchArtifactReferences ?? [] + const draft = input.get().draft + const rootClass = composerOwner?.variant === 'hero' + ? 'uV2eYG_root uV2eYG_hero' + : 'uV2eYG_root' + return createElement('div', { + 'data-test-composer-bar': '', + 'data-test-composer-has-accessory': composerOwner?.accessory === undefined + ? 'false' + : 'true', + className: rootClass + }, + composerOwner?.accessory, + createElement('div', { className: 'uV2eYG_card' }, + composerOwner?.overlay === undefined + ? null + : createElement('div', { className: 'uV2eYG_overlayAnchor' }, composerOwner.overlay), + createElement('div', { className: 'uV2eYG_scroll' }, + createElement('div', { className: 'uV2eYG_grow' }, + createElement('div', { + className: 'uV2eYG_backdrop', + 'data-input-backdrop': '', + 'data-test-inline-reference-layer': '' + }, + ...draft.split('\n').flatMap((line, index) => [ + index > 0 ? '\n' : '', + line, + ...(index === draft.split('\n').length - 1 ? [ + ...references.map((file) => createElement('span', { + key: `${file.id}-${index}`, + 'data-research-file-tag': file.id, + 'data-research-reference-node-id': file.id, + 'data-reference-source': 'research-file', + 'aria-invalid': file.path === undefined ? 'true' : undefined + }, file.name.split(/[\\/]/).at(-1))), + ...artifactReferences.map((artifact) => createElement('span', { + key: `${artifact.id}-${index}`, + 'data-research-artifact-tag': artifact.id, + 'data-research-reference-node-id': artifact.id, + 'data-reference-source': 'research-artifact' + }, artifact.label)) + ] : []) + ]) + ), + createElement('textarea', { + className: 'uV2eYG_input', + defaultValue: draft, + 'data-input-machine-snapshot': draft + }), + createElement('div', { + className: 'uV2eYG_mirror', + 'data-input-mirror': '' + }, `${draft}\n`) + ) + ), + createElement('div', { className: 'uV2eYG_row' }, + createElement('span', null, + ...input.get().images.map((image) => createElement('span', { + key: image.id, + 'data-composer-image-id': image.id + })) + ), + composerOptions.model + ) + ), + composerOwner?.footer + ) + } + if (name === 'conversation.input.dock') { + return createElement('div', null, + createElement('div', { 'data-queue-strip': '' }), + createElement('div', { 'data-task-dock': '' }) + ) + } + if (name === 'conversation.composer.dock') { + return createElement('div', { 'data-stats-footer': '' }) + } + if (name === 'conversation.input.overlay') { + return composerOptions.overlay + } + if (name === 'conversation.view' && options?.only === 'chat') { + return renderChatView(activeSessionId) + } + return null + } + const renderConversation = ( + activeSessionId: string, + binding = initialBinding + ) => createElement(client.ConversationRoot, { + sessionId: activeSessionId, + useSession: session.useSelector, + useSessions: (select: (state: unknown) => unknown) => select({ + current: activeSessionId, + byId: { + [sessionId]: { cwd: '/tmp/research', blank: false }, + [activeSessionId]: { cwd: '/tmp/research', blank: false } + } + }), + useWorkspaces: (select: (state: unknown) => unknown) => select({ + phase: 'ready', + items: [] + }), + useInput: input.useSelector, + useComposerBlock: (select: (block: undefined) => unknown) => select(undefined), + useStore: binding.chat.useSelector, + actions: binding.actions, + researchWorkspaces, + researchSidebar, + renderSlot: createRenderSlot(activeSessionId, binding.chat, binding.actions), + renderSlotChain: (_name: string, _owner: unknown, options: { fallback: unknown }) => + composerOptions.composer ?? options.fallback, + selectWorkspace: async () => undefined, + t: translate + }) + await act(async () => { + renderSidebar(sessionId) + root.render(renderConversation(sessionId)) + }) + return { + actions, + browserWindow, + chat, + client, + createSessionBinding, + detailsPortalHost, + host, + input, + researchWorkspaces, + session, + sessionId, + transitions, + workspace: researchWorkspaces.for(sessionId), + async rerenderSession( + activeSessionId: string, + binding = initialBinding + ) { + activeSidebarSessionId = activeSessionId + await act(async () => { + renderSidebar(activeSessionId) + root.render(renderConversation(activeSessionId, binding)) + }) + }, + async cleanup() { + await act(async () => { + root.unmount() + sidebarRoot.unmount() + }) + detachResearchSidebar() + restoreGlobals() + } + } +} + +function installBrowserGlobals(browserWindow: Window): () => void { + const keys = ['window', 'document', 'navigator', 'IS_REACT_ACT_ENVIRONMENT'] as const + const descriptors = new Map(keys.map((key) => [ + key, + Object.getOwnPropertyDescriptor(globalThis, key) + ])) + Object.defineProperties(globalThis, { + window: { configurable: true, value: browserWindow }, + document: { configurable: true, value: browserWindow.document }, + navigator: { configurable: true, value: browserWindow.navigator }, + IS_REACT_ACT_ENVIRONMENT: { configurable: true, value: true } + }) + return () => { + for (const key of keys) { + const descriptor = descriptors.get(key) + if (descriptor === undefined) delete (globalThis as Record)[key] + else Object.defineProperty(globalThis, key, descriptor) + } + } +} + +function dispatchDrag( + browserWindow: Window, + target: HappyDOMElement, + type: string, + dataTransfer: { + types: string[] + files: Array<{ name: string; type: string }> + getData(type: string): string + dropEffect: string + }, + point = { x: 120, y: 90 } +): HappyDOMEvent { + const event = new browserWindow.Event(type, { bubbles: true, cancelable: true }) + Object.defineProperties(event, { + dataTransfer: { value: dataTransfer }, + clientX: { value: point.x }, + clientY: { value: point.y } + }) + target.dispatchEvent(event) + return event +} + +function pointer( + browserWindow: Window, + type: string, + options: { + pointerId: number + x: number + y: number + button?: number + metaKey?: boolean + shiftKey?: boolean + } +): HappyDOMEvent { + const event = new browserWindow.Event(type, { bubbles: true, cancelable: true }) + Object.defineProperties(event, { + pointerId: { value: options.pointerId }, + clientX: { value: options.x }, + clientY: { value: options.y }, + button: { value: options.button ?? 0 }, + metaKey: { value: options.metaKey ?? false }, + shiftKey: { value: options.shiftKey ?? false } + }) + return event +} + +function click(browserWindow: Window, target: HappyDOMElement | null): void { + target?.dispatchEvent(new browserWindow.Event('click', { bubbles: true, cancelable: true })) +} + +function deferred() { + let resolve!: (value: T | PromiseLike) => void + let reject!: (reason?: unknown) => void + const promise = new Promise((promiseResolve, promiseReject) => { + resolve = promiseResolve + reject = promiseReject + }) + return { promise, reject, resolve } +} + +function createPdfJsHarness(options: { + pageCount?: number + pageWidth?: number + pageHeight?: number + pageSizes?: Array<{ width: number; height: number }> + deferPageRequests?: (page: number) => boolean + getPageError?: Error + deferRenders?: boolean + resolveCancelledLate?: boolean + rejectDestroy?: boolean +} = {}) { + const pageCount = options.pageCount ?? 3 + const pageWidth = options.pageWidth ?? 600 + const pageHeight = options.pageHeight ?? 800 + const loadingTasks: Array<{ destroyed: number; teardownThenCalls: number }> = [] + const documents: Array<{ destroyed: number; teardownThenCalls: number }> = [] + const renders: Array<{ + page: number + cancelled: number + viewport: { width: number; height: number } + resolve(): void + }> = [] + const getDocumentInputs: Array> = [] + const pages: Array<{ page: number; cleanups: number }> = [] + const getPageCalls: number[] = [] + const deferredPageRequests: Array<{ + page: number + resolved: boolean + resolve(): void + }> = [] + const pdfjs = { + getDocument(input: Record) { + getDocumentInputs.push(input) + const teardown = { destroyed: 0, thenCalls: 0 } + const destroy = () => { + teardown.destroyed += 1 + if (!options.rejectDestroy) return undefined + return { + then(_resolve: (value: unknown) => void, reject: (reason: unknown) => void) { + teardown.thenCalls += 1 + reject(new Error('teardown rejected')) + } + } + } + const loading = { + get destroyed() { return teardown.destroyed }, + get teardownThenCalls() { return teardown.thenCalls }, + destroy + } + loadingTasks.push(loading) + const document = { + numPages: pageCount, + get destroyed() { return teardown.destroyed }, + get teardownThenCalls() { return teardown.thenCalls }, + destroy, + async getPage(page: number) { + getPageCalls.push(page) + if (options.getPageError !== undefined) throw options.getPageError + if (options.deferPageRequests?.(page) === true) { + const pending = deferred() + const request = { + page, + resolved: false, + resolve() { + if (request.resolved) return + request.resolved = true + pending.resolve() + } + } + deferredPageRequests.push(request) + await pending.promise + } + const pageSize = options.pageSizes?.[page - 1] ?? { width: pageWidth, height: pageHeight } + const pageRecord = { page, cleanups: 0 } + pages.push(pageRecord) + return { + cleanup() { pageRecord.cleanups += 1 }, + getViewport({ scale }: { scale: number }) { + return { width: pageSize.width * scale, height: pageSize.height * scale } + }, + render({ viewport }: { viewport: { width: number; height: number } }) { + const pending = deferred() + const record = { + page, + cancelled: 0, + viewport, + resolve() { pending.resolve() } + } + renders.push(record) + if (!options.deferRenders) pending.resolve() + return { + promise: pending.promise, + cancel() { + record.cancelled += 1 + if (!options.resolveCancelledLate) { + pending.reject(Object.assign(new Error('cancelled'), { name: 'RenderingCancelledException' })) + } + } + } + } + } + } + } + documents.push(document) + return { + get destroyed() { return teardown.destroyed }, + get teardownThenCalls() { return teardown.thenCalls }, + destroy, + promise: Promise.resolve(document) + } + } + } + return { + deferredPageRequests, + documents, + getDocumentInputs, + getPageCalls, + loadingTasks, + pages, + pdfjs, + renders + } +} + +async function mountResearchCanvas(options: { + sessionId: string + files?: Array> + artifacts?: Array> + selection?: { selectedNodeIds: string[]; orderedFileIds: string[] } + viewport?: { scale: number; x: number; y: number } + storage?: { + getItem(key: string): string | null + setItem(key: string, value: string): void + } + dshDesktop?: { + getPathForFile?(file: File): string + researchCanvasWheel?: { + setRegion(value: Record): boolean + subscribe(listener: (value: Record) => void): () => void + } + researchLinkFrame?: { + authorize(value: { sessionId: string; nodeId: string; url: string }): Promise<{ url: string; frameName?: string }> + inspect?(value: { sessionId: string; nodeId: string }): Promise | null> + release(value: { sessionId: string; nodeId: string }): Promise<{ ok: boolean }> + releaseSession(sessionId: string): Promise<{ ok: boolean; removed: number }> + } + researchWebReader?: { + read(value: { sessionId: string; nodeId: string; url: string }): Promise> + } + researchCanvasExport?: { + save(value: Record): Promise> + } + researchPreview?: { + admitFinderFile?(file: File, identity: { sessionId: string; nodeId: string }): Promise | null> + admitSidebarFile?(value: { sessionId: string; nodeId: string; relativePath: string }): Promise | null> + restore?(value: { sessionId: string; nodeId: string; authorizationId: string }): Promise | null> + release?(value: { sessionId: string; nodeId: string; authorizationId: string; capabilityToken: string }): Promise<{ ok: boolean }> + revokeNode?(value: { sessionId: string; nodeId: string }): Promise<{ ok: boolean }> + revokeSession?(sessionId: string): Promise<{ ok: boolean }> + } + } + modules?: Record + pdfjs?: Record + pdfBodySize?: { width: number; height: number } + resizeObserverCallbacks?: Array<() => void> + intersectionObserverCallbacks?: Array<(entries: Array<{ target: HappyDOMElement; isIntersecting: boolean }>) => void> + animationFrames?: { + callbacks: Map + cancelled: number[] + } + strictMode?: boolean + officePreview?: { + Component: ComponentType<{ sourceUrl: string; kind: string; title: string }> + supports(kind: string): boolean + } + selectionGeneration?: { + disabled?: boolean + generate(request: Record): Promise<{ ok: boolean; error?: string }> + inspect?(request: Record): Promise> + cancel?(request: Record): Promise> + } + fetch?: (input: string, init?: RequestInit) => Promise +}) { + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + const { sessionId } = options + const storage = options.storage ?? browserWindow.localStorage + storage.setItem( + `sherlock.research.canvas.files.v1:${sessionId}`, + JSON.stringify(options.files ?? []) + ) + storage.setItem( + `sherlock.research.canvas.artifacts.v1:${sessionId}`, + JSON.stringify(options.artifacts ?? []) + ) + storage.setItem( + `sherlock.research.canvas.selection.v1:${sessionId}`, + JSON.stringify(options.selection ?? { selectedNodeIds: [], orderedFileIds: [] }) + ) + const restoreGlobals = installBrowserGlobals(browserWindow) + if (options.fetch !== undefined) { + Object.defineProperty(browserWindow, 'fetch', { + configurable: true, + value: options.fetch + }) + } + Object.defineProperty(browserWindow, '__sherlockPdfjs', { + configurable: true, + value: options.pdfjs + }) + Object.defineProperty(browserWindow.HTMLCanvasElement.prototype, 'getContext', { + configurable: true, + value: () => ({}) + }) + if (options.pdfBodySize !== undefined) { + const pdfBodySize = options.pdfBodySize + Object.defineProperties(browserWindow.HTMLElement.prototype, { + clientWidth: { + configurable: true, + get() { return this.hasAttribute?.('data-research-pdf-scroll') ? pdfBodySize.width : 0 } + }, + clientHeight: { + configurable: true, + get() { return this.hasAttribute?.('data-research-pdf-scroll') ? pdfBodySize.height : 0 } + }, + scrollWidth: { + configurable: true, + get() { + if (!this.hasAttribute?.('data-research-pdf-scroll')) return 0 + const canvas = this.querySelector?.('canvas') as HTMLCanvasElement | null + return Math.max(pdfBodySize.width, Math.ceil(Number.parseFloat(canvas?.style.width ?? '0') || 0)) + } + }, + scrollHeight: { + configurable: true, + get() { + if (!this.hasAttribute?.('data-research-pdf-scroll')) return 0 + const canvas = this.querySelector?.('canvas') as HTMLCanvasElement | null + return Math.max(pdfBodySize.height, Math.ceil(Number.parseFloat(canvas?.style.height ?? '0') || 0)) + } + } + }) + } + if (options.resizeObserverCallbacks !== undefined) { + const callbacks = options.resizeObserverCallbacks + Object.defineProperty(browserWindow, 'ResizeObserver', { + configurable: true, + value: class TestResizeObserver { + constructor(callback: () => void) { callbacks.push(callback) } + observe() {} + disconnect() {} + } + }) + } + if (options.intersectionObserverCallbacks !== undefined) { + const callbacks = options.intersectionObserverCallbacks + Object.defineProperty(browserWindow, 'IntersectionObserver', { + configurable: true, + value: class TestIntersectionObserver { + constructor(callback: (entries: Array<{ target: HappyDOMElement; isIntersecting: boolean }>) => void) { + callbacks.push(callback) + } + observe() {} + unobserve() {} + disconnect() {} + } + }) + } + if (options.animationFrames !== undefined) { + const animationFrames = options.animationFrames + let nextFrameId = 0 + Object.defineProperties(browserWindow, { + requestAnimationFrame: { + configurable: true, + value(callback: FrameRequestCallback) { + nextFrameId += 1 + animationFrames.callbacks.set(nextFrameId, callback) + return nextFrameId + } + }, + cancelAnimationFrame: { + configurable: true, + value(frameId: number) { + animationFrames.cancelled.push(frameId) + animationFrames.callbacks.delete(frameId) + } + } + }) + } + const client = await loadClientBundle('dsh-client-ui-conversation', options.dshDesktop, { + document: browserWindow.document, + window: browserWindow, + modules: options.modules + }) + const OfficeCoordinator = client.ResearchOfficePreviewCoordinator as new () => { + attach(service: unknown): () => void + } + const researchOfficePreview = new OfficeCoordinator() + const detachOfficePreview = options.officePreview === undefined + ? () => {} + : researchOfficePreview.attach(options.officePreview) + const Registry = client.ResearchWorkspaceRegistry as new (storage: Storage) => { + for(id: string): { + getSnapshot(): { + files: Array> + artifacts: Array> + selection: { selectedNodeIds: string[]; orderedFileIds: string[] } + viewport: { scale: number; x: number; y: number } + pendingMessageJump: string | null + } + setViewport(viewport: { scale: number; x: number; y: number }): void + setCanvasSize(value: { width: number; height: number }): void + setSelection(value: { selectedNodeIds: string[]; orderedFileIds: string[] }): void + selectedFiles(): Array> + pendingOrphanRevocations(): string[] + createWebLink(url: string, placement?: Record): Record | null + updateWebLink(nodeId: string, url: string): boolean + applyWebLinkInspection(nodeId: string, expectedUrl: string, inspection: Record): boolean + renameNode(nodeId: string, title: string): boolean + createContainerDraft(placement?: Record): Record | null + beginContainerGeneration(nodeId: string, prompt: string): Record | null + setContainerRefresh(nodeId: string, minutes: number): boolean + beginGeneration(kind: string, sourceNodeIds: string[], placement: Record, detail?: string): Record | null + attachGenerationTask(nodeId: string, receipt: Record): boolean + applyGenerationInspection(nodeId: string, inspection: Record): boolean + retryGeneration(nodeId: string): Record | null + removeNodes(nodeIds: string[]): void + setGenerationCancelSink(sink?: (request: Record) => unknown): void + } + } + const researchWorkspaces = new Registry(storage as Storage) + const workspace = researchWorkspaces.for(sessionId) + if (options.viewport !== undefined) workspace.setViewport(options.viewport) + const ResearchCanvas = client.ResearchCanvas as ComponentType<{ + sessionId: string + t: (key: string) => string + researchWorkspaces: InstanceType + researchOfficePreview: InstanceType + selectionGeneration?: { + disabled?: boolean + generate(request: Record): Promise<{ ok: boolean; error?: string }> + inspect?(request: Record): Promise> + cancel?(request: Record): Promise> + } + }> + const host = browserWindow.document.createElement('div') + browserWindow.document.body.appendChild(host) + const root = createRoot(host) + await act(async () => { + const canvasNode = createElement(ResearchCanvas, { + sessionId, + researchWorkspaces, + researchOfficePreview, + selectionGeneration: options.selectionGeneration, + t: () => '研究画布' + }) + root.render(options.strictMode ? createElement(StrictMode, null, canvasNode) : canvasNode) + }) + const canvas = host.querySelector('[data-research-canvas]') as HappyDOMElement | null + expect(canvas).not.toBeNull() + if (canvas === null) throw new Error('Research canvas did not render') + Object.defineProperty(canvas, 'getBoundingClientRect', { + configurable: true, + value: () => ({ left: 0, top: 0, right: 800, bottom: 600, width: 800, height: 600 }) + }) + return { + browserWindow, + canvas, + client, + host, + workspace, + researchWorkspaces, + detachOfficePreview, + researchOfficePreview, + async cleanup() { + await act(async () => { root.unmount() }) + detachOfficePreview() + restoreGlobals() + } + } +} + +describe('Sherlock workspace and composer controls', () => { + it('opens details for the selected Inspect call while preserving trajectory', async () => { + const source = await readFile( + 'node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js', + 'utf8' + ) + + expect(source).toContain(`inspectCall: (callId) => { +\t\t\t\t\t\t\tactions.select({ callId }); +\t\t\t\t\t\t\tlayout.openDetails(); +\t\t\t\t\t\t\tactions.setInspect({ callId }); +\t\t\t\t\t\t\tactions.setView("trajectory"); +\t\t\t\t\t\t}`) + }) + + it('omits the Session log button from the conversation header', async () => { + const primitives = new Proxy( + { + Modal: () => null + }, + { + get(target, property) { + return Reflect.get(target, property) ?? (() => null) + } + } + ) + const client = await loadClientBundle('dsh-session-log-export', undefined, { + modules: { + '@deepseek-ai/dsh-client-ui-primitives': primitives + } + }) + expect(client.SessionLogDownloadHeaderAction).toBeTypeOf('function') + if (typeof client.SessionLogDownloadHeaderAction !== 'function') return + + const SessionLogDownloadHeaderAction = + client.SessionLogDownloadHeaderAction as ComponentType<{ + sessionId: string + useSessionLogDownload: (selector: (state: unknown) => unknown) => unknown + request: (sessionId: string) => void + dismiss: (sessionId: string) => void + t: (key: string) => string + }> + const html = renderToStaticMarkup( + createElement(SessionLogDownloadHeaderAction, { + sessionId: 'session-1', + useSessionLogDownload: ( + selector: (state: { bySession: Record }) => unknown + ) => selector({ bySession: {} }), + request: () => undefined, + dismiss: () => undefined, + t: (key: string) => key + }) + ) + + expect(html).not.toContain('Session log') + expect(html).not.toContain(' { + const styles: InjectedStyle[] = [] + await loadClientBundle('dsh-client-ui-conversation', undefined, { styles }) + const inputBarCss = styles.find(({ pluginCss }) => + pluginCss?.endsWith('/InputBar.module.css') + )?.textContent + + expect(inputBarCss).toContain('.uV2eYG_primary{background:#0f1115}') + expect(inputBarCss).toContain( + '.uV2eYG_primary:hover:not(:disabled){background:#23262b}' + ) + expect(inputBarCss).toContain( + 'body[data-ds-dark-theme] .uV2eYG_primary{background:#f5f5f5;color:#202124}' + ) + expect(inputBarCss).toContain( + 'body[data-ds-dark-theme] .uV2eYG_primary:hover:not(:disabled){background:#fff}' + ) + }) + + it('reserves a large inline cell for readable Research file tags', async () => { + const styles: InjectedStyle[] = [] + await loadClientBundle('dsh-client-ui-conversation', undefined, { styles }) + const inputBarCss = styles.find(({ pluginCss }) => + pluginCss?.endsWith('/InputBar.module.css') + )?.textContent ?? '' + const encodedFont = inputBarCss.match( + /font-family:DshChipCellLarge;src:url\(data:font\/ttf;base64,([^)]*)\)/ + )?.[1] + expect(encodedFont).toBeTypeOf('string') + if (encodedFont === undefined) return + + const font = Buffer.from(encodedFont, 'base64') + const tableCount = font.readUInt16BE(4) + let horizontalMetricsOffset = -1 + for (let index = 0; index < tableCount; index += 1) { + const directoryOffset = 12 + index * 16 + if (font.toString('ascii', directoryOffset, directoryOffset + 4) === 'hmtx') { + horizontalMetricsOffset = font.readUInt32BE(directoryOffset + 8) + break + } + } + expect(horizontalMetricsOffset).toBeGreaterThanOrEqual(0) + expect(font.readUInt16BE(horizontalMetricsOffset + 4)).toBeGreaterThanOrEqual(8000) + expect(inputBarCss).toContain( + '.uV2eYG_chip{box-sizing:border-box;display:inline-block;width:136px;min-width:136px;max-width:136px;height:24px;line-height:24px;vertical-align:middle}' + ) + expect(inputBarCss).toContain( + '.uV2eYG_chipLabel{width:calc(100% - 12px);height:22px;gap:6px' + ) + expect(inputBarCss).toContain('font-size:14px;line-height:22px') + expect(inputBarCss).toContain( + '.uV2eYG_chipLabelText{min-width:0;text-overflow:ellipsis;overflow:hidden}' + ) + }) + + it('renders Research file tags with readable light-theme colors', async () => { + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + await loadClientBundle('dsh-client-ui-conversation', undefined, { + document: browserWindow.document, + window: browserWindow + }) + browserWindow.document.body.style.setProperty( + '--dsw-alias-bg-module-platform', + 'rgb(245, 246, 247)' + ) + browserWindow.document.body.style.setProperty( + '--dsw-alias-label-primary', + 'rgb(15, 17, 21)' + ) + browserWindow.document.body.innerHTML = [ + '', + '', + 'report.pdf', + '', + '' + ].join('') + + const chip = browserWindow.document.querySelector('[data-reference-source="research-file"]') + const label = browserWindow.document.querySelector('.uV2eYG_chipLabel') + expect(chip).not.toBeNull() + expect(label).not.toBeNull() + if (chip === null || label === null) return + + expect(browserWindow.getComputedStyle(chip).backgroundColor).toBe( + 'rgb(245, 246, 247)' + ) + expect(browserWindow.getComputedStyle(label).color).toBe('rgb(15, 17, 21)') + }) + + it('renders light-theme user messages with a neutral surface and dark text', async () => { + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + await loadClientBundle('dsh-client-ui-conversation', undefined, { + document: browserWindow.document, + window: browserWindow + }) + browserWindow.document.body.style.setProperty( + '--dsw-alias-bg-module-platform', + 'rgb(245, 246, 247)' + ) + browserWindow.document.body.style.setProperty( + '--dsw-alias-label-primary', + 'rgb(15, 17, 21)' + ) + browserWindow.document.body.innerHTML = [ + '
', + '
Research /efund-ppt-maker request
', + '
' + ].join('') + + const bubble = browserWindow.document.querySelector('.gdEzaW_bubble') + const text = browserWindow.document.querySelector('._text_1pfhk_1') + const inlineCode = browserWindow.document.querySelector('code') + expect(bubble).not.toBeNull() + expect(text).not.toBeNull() + expect(inlineCode).not.toBeNull() + if (bubble === null || text === null || inlineCode === null) return + + expect(browserWindow.getComputedStyle(bubble).backgroundColor).toBe( + 'rgb(245, 246, 247)' + ) + expect(browserWindow.getComputedStyle(text).color).toBe('rgb(15, 17, 21)') + expect(browserWindow.getComputedStyle(inlineCode).color).toBe('rgb(15, 17, 21)') + }) + + it('keeps sent Research tags in the same compact inline rhythm as the composer', async () => { + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + await loadClientBundle('dsh-client-ui-conversation', undefined, { + document: browserWindow.document, + window: browserWindow + }) + browserWindow.document.body.innerHTML = [ + '
', + '
', + '', + '总结提炼', + '助手回复 · 黄金研究', + '你好', + '', + '
', + '
' + ].join('') + + const stack = browserWindow.document.querySelector('.gdEzaW_userStack') + const bubble = browserWindow.document.querySelector('.gdEzaW_bubble') + const chip = browserWindow.document.querySelector('.gdEzaW_refChip') + const inlineReferences = browserWindow.document.querySelector( + '[data-research-message-files="inline"]' + ) + expect(stack).not.toBeNull() + expect(bubble).not.toBeNull() + expect(chip).not.toBeNull() + expect(inlineReferences).not.toBeNull() + if ( + stack === null || + bubble === null || + chip === null || + inlineReferences === null + ) + return + + const stackStyle = browserWindow.getComputedStyle(stack) + const bubbleStyle = browserWindow.getComputedStyle(bubble) + const chipStyle = browserWindow.getComputedStyle(chip) + const inlineReferencesStyle = browserWindow.getComputedStyle(inlineReferences) + expect(stackStyle.width).toBe('92%') + expect(stackStyle.maxWidth).toBe('640px') + expect(bubbleStyle.width).toBe('max-content') + expect(bubbleStyle.padding).toBe('8px 12px') + expect(inlineReferencesStyle.display).toBe('inline-flex') + expect(inlineReferencesStyle.flexWrap).toBe('wrap') + expect(inlineReferencesStyle.alignItems).toBe('center') + expect(inlineReferencesStyle.gap).toBe('4px') + expect(chipStyle.display).toBe('inline-flex') + expect(chipStyle.width).toBe('136px') + expect(chipStyle.minWidth).toBe('136px') + expect(chipStyle.maxWidth).toBe('136px') + expect(chipStyle.height).toBe('24px') + expect(chipStyle.alignItems).toBe('center') + expect(chipStyle.overflow).toBe('hidden') + expect(chipStyle.textOverflow).toBe('ellipsis') + }) + + it('focuses workspace search after the collapsed sidebar remounts as expanded', async () => { + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + const restoreGlobals = installBrowserGlobals(browserWindow) + const primitives = new Proxy( + { + Tooltip: ({ children }: { children: ReactNode }) => children, + Menu: ({ anchor }: { anchor: ReactNode }) => anchor, + Modal: () => null, + Button: ({ children }: { children: ReactNode }) => + createElement('button', null, children), + IconSearchOutline16: () => createElement('svg', { 'data-icon': 'search' }), + IconPersonalizationOutline16: () => null, + IconProjectAddOutline16: () => null, + IconCloseFill14: () => null + }, + { + get(target, property) { + return Reflect.get(target, property) ?? (() => null) + } + } + ) + const client = await loadClientBundle('dsh-client-ui-workspace', undefined, { + document: browserWindow.document, + window: browserWindow, + modules: { + '@deepseek-ai/dsh-client-ui-primitives': primitives, + clsx: requireModule('clsx') + }, + transformSource: (source) => source.replace( + '\t\texports.apply = apply;', + '\t\texports.apply = apply;\n\t\texports.__testWorkspaceBrowser = WorkspaceBrowser;' + ) + }) + expect(client.__testWorkspaceBrowser).toBeTypeOf('function') + if (typeof client.__testWorkspaceBrowser !== 'function') { + restoreGlobals() + return + } + + const WorkspaceBrowser = client.__testWorkspaceBrowser as ComponentType> + const container = browserWindow.document.createElement('div') + browserWindow.document.body.appendChild(container) + const root = createRoot(container) + const workspaceSnapshot = { + items: [], + phase: 'loading', + archivedSessionIds: [] + } + const sessionSnapshot = { + ids: [], + byId: {}, + phase: 'loading' + } + const storeSnapshot = { + groupBy: 'flat', + orderBy: 'manual', + groupExpansion: [], + sessionOrderByAccount: {}, + sessionUpdatedAtByAccount: {} + } + const props: Record = { + useSessions: (selector: (state: typeof sessionSnapshot) => unknown) => + selector(sessionSnapshot), + useWorkspaces: (selector: (state: typeof workspaceSnapshot) => unknown) => + selector(workspaceSnapshot), + useStore: (selector: (state: typeof storeSnapshot) => unknown) => + selector(storeSnapshot), + useDirectoryFlow: (selector: (occupied: boolean) => unknown) => selector(false), + actions: { + retainAccountKeys: () => {}, + setGroupBy: () => {}, + setOrderBy: () => {}, + syncSessionOrderAccount: () => {}, + setSessionOrder: () => {}, + setGroupExpanded: () => {} + }, + startSession: () => {}, + open: () => {}, + openWorkspacePath: async () => {}, + renameSession: async () => {}, + forkSession: async () => {}, + renameWorkspace: async () => {}, + deleteWorkspace: async () => {}, + insertWorkspaceBefore: async () => {}, + archiveSession: async () => {}, + insertSessionBefore: async () => {}, + createWorkspace: async () => ({ workspaceId: 'workspace-new' }), + searchSessions: async () => ({ items: [], hasMore: false }), + searchResultLimit: 20, + renderSlot: () => null, + t: (key: string) => key + } + const renderBrowser = (wide: boolean) => root.render(createElement( + WorkspaceBrowser, + { + ...props, + key: wide ? 'wide' : 'rail', + wide, + expandSidebar: () => renderBrowser(true) + } + )) + + try { + await act(async () => { + renderBrowser(false) + }) + const searchButton = container.querySelector( + 'button[aria-label="search.sessions.aria"]' + ) as HappyDOMHTMLElement | null + expect(searchButton).not.toBeNull() + if (searchButton === null) return + + await act(async () => { + searchButton.click() + }) + await act(async () => { + await new Promise((resolve) => setTimeout(resolve, 350)) + }) + + const searchInput = container.querySelector( + 'input[placeholder="search.placeholder"]' + ) as HappyDOMHTMLElement | null + expect(searchInput).not.toBeNull() + expect(searchInput?.tabIndex).toBe(0) + expect(browserWindow.document.activeElement).toBe(searchInput) + } finally { + await act(async () => { + root.unmount() + }) + restoreGlobals() + } + }) + + it('does not dismiss the visible search while the rail expansion click is still in flight', async () => { + const workspaceClient = await readFile( + 'node_modules/@deepseek-ai/dsh-client-ui-workspace/lib/client.js', + 'utf8' + ) + const workspacePatch = await readFile( + 'patches/@deepseek-ai+dsh-client-ui-workspace+0.1.0-rc.7.patch', + 'utf8' + ) + + for (const source of [workspaceClient, workspacePatch]) { + expect(source).toContain( + 'if (!wide || !searchExpanded || searchOnExpand) return;' + ) + } + }) + + it('uses a gray outline icon for the expanded current workspace', async () => { + const primitives = new Proxy( + { + IconFolderOpenOutline16: () => + createElement('svg', { 'data-icon': 'folder-open-outline' }), + IconFolderClose16: () => + createElement('svg', { 'data-icon': 'folder-close' }) + }, + { + get(target, property) { + return Reflect.get(target, property) ?? (() => null) + } + } + ) + const styles: InjectedStyle[] = [] + const client = await loadClientBundle('dsh-client-ui-workspace', undefined, { + modules: { + '@deepseek-ai/dsh-client-ui-primitives': primitives + }, + styles + }) + expect(client.WorkspaceFolderIcon).toBeTypeOf('function') + if (typeof client.WorkspaceFolderIcon !== 'function') return + + const WorkspaceFolderIcon = client.WorkspaceFolderIcon as ComponentType<{ + expanded: boolean + }> + const html = renderToStaticMarkup( + createElement(WorkspaceFolderIcon, { expanded: true }) + ) + const rowsCss = styles.find(({ pluginCss }) => + pluginCss?.endsWith('/Rows.module.css') + )?.textContent + + expect(html).toContain('data-icon="folder-open-outline"') + expect(rowsCss).toContain( + '.YDXeBa_folderActive{color:var(--dsw-alias-label-secondary)}' + ) + }) + + it('offers Finder before rename and delete in the workspace menu', async () => { + const client = await loadClientBundle('dsh-client-ui-workspace') + expect(client.workspaceMenuItems).toBeTypeOf('function') + if (typeof client.workspaceMenuItems !== 'function') return + + const labels: Record = { + 'openInFinder': '在 Finder 中显示', + 'rename': '重命名', + 'delete.workspace': '删除工作区' + } + const items = client.workspaceMenuItems((key: string) => labels[key] ?? key) as Array<{ + id: string + label: string + }> + + expect(items.map(({ id, label }) => ({ id, label }))).toEqual([ + { id: 'finder', label: '在 Finder 中显示' }, + { id: 'rename', label: '重命名' }, + { id: 'delete', label: '删除工作区' } + ]) + }) + + it('opens the workspace path when the Finder menu item is selected', async () => { + const client = await loadClientBundle('dsh-client-ui-workspace') + expect(client.runWorkspaceMenuAction).toBeTypeOf('function') + if (typeof client.runWorkspaceMenuAction !== 'function') return + + let selected = '' + client.runWorkspaceMenuAction('finder', { + open: () => { + selected = 'finder' + }, + rename: () => { + selected = 'rename' + }, + delete: () => { + selected = 'delete' + } + }) + + expect(selected).toBe('finder') + }) + + it('uses the native desktop bridge to reveal a workspace in Finder', async () => { + const revealed: string[] = [] + const client = await loadClientBundle('dsh-client-ui-workspace', { + async showItemInFolder(path: string) { + revealed.push(path) + return { ok: true } + } + }) + expect(client.showWorkspaceInFinder).toBeTypeOf('function') + if (typeof client.showWorkspaceInFinder !== 'function') return + + let usedFallback = false + await client.showWorkspaceInFinder('/Users/example/project', async () => { + usedFallback = true + }) + + expect(revealed).toEqual(['/Users/example/project']) + expect(usedFallback).toBe(false) + }) + + it('exposes the behavior-verified Finder reveal channel through the desktop bridge', async () => { + const preload = await readFile('src/preload/index.ts', 'utf8') + + expect(preload).toContain( + "showItemInFolder: (path: string): Promise<{ ok: boolean }> =>" + ) + expect(preload).toContain( + "ipcRenderer.invoke('filesystem:show-item-in-folder', path)" + ) + }) + + it('renders the command launcher as an equal-sided rounded rectangle containing a slash', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation') + expect(client.CommandLauncherButton).toBeTypeOf('function') + if (typeof client.CommandLauncherButton !== 'function') return + + const CommandLauncherButton = client.CommandLauncherButton as ComponentType<{ + label: string + expanded: boolean + disabled: boolean + }> + const html = renderToStaticMarkup( + createElement(CommandLauncherButton, { + label: '命令', + expanded: false, + disabled: false + }) + ) + + expect(html).toContain('style="width:32px;height:32px;border-radius:9px"') + expect(html).toContain('>/') + }) + + it('places attachment extensions immediately before permission controls', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation') + expect(client.ComposerLeadingControls).toBeTypeOf('function') + if (typeof client.ComposerLeadingControls !== 'function') return + + const ComposerLeadingControls = client.ComposerLeadingControls as ComponentType<{ + command: ReactNode + attachments: ReactNode + permissions: ReactNode + }> + const html = renderToStaticMarkup( + createElement(ComposerLeadingControls, { + command: createElement('span', null, 'slash'), + attachments: createElement('span', null, 'attachment'), + permissions: createElement('span', null, 'permission') + }) + ) + + expect(html).toBe( + 'slashattachmentpermission' + ) + }) + + it('registers Research between Chat and Trajectory', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation') + expect(client.registerResearchCanvasView).toBeTypeOf('function') + if (typeof client.registerResearchCanvasView !== 'function') return + + const registrations: Array<{ + options: { id: string; order: number; label: () => string; store?: unknown } + component: unknown + }> = [] + client.registerResearchCanvasView({ + register( + options: { id: string; order: number; label: () => string }, + component: unknown + ) { + registrations.push({ options, component }) + } + }, (key: string) => key === 'view.research' ? '研究' : key) + + expect(registrations).toHaveLength(1) + expect(registrations[0]?.options.id).toBe('research') + expect(registrations[0]?.options.order).toBe(5) + expect(registrations[0]?.options.label()).toBe('研究') + expect('store' in (registrations[0]?.options ?? {})).toBe(false) + expect(registrations[0]?.component).toBe(client.ResearchCanvas) + }) + + it('keeps the optional Conversation root free of the session-scoped chat store', async () => { + const source = await readFile( + 'node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js', + 'utf8' + ) + const rootStart = source.indexOf('name: "conversation"') + const sessionStart = source.indexOf('name: "conversation.session"', rootStart + 1) + expect(rootStart).toBeGreaterThan(-1) + expect(sessionStart).toBeGreaterThan(rootStart) + expect(source.slice(rootStart, sessionStart)).not.toContain('store: chatStore') + + const panelStart = source.indexOf('function ResearchConversationPanel') + const rootFunctionStart = source.indexOf('function ConversationRoot', panelStart) + expect(panelStart).toBeGreaterThan(-1) + expect(rootFunctionStart).toBeGreaterThan(panelStart) + expect(source.slice(panelStart, rootFunctionStart)).not.toContain( + 'renderSlot("conversation.view"' + ) + + const sessionEnd = source.indexOf('}, ConversationSession);', sessionStart) + expect(sessionEnd).toBeGreaterThan(sessionStart) + const sessionRegistration = source.slice(sessionStart, sessionEnd) + expect(sessionRegistration).toContain('releaseResearchWorkspace:') + expect(sessionRegistration).toContain('researchWorkspaces.release(id)') + }) + + it('attaches the optional global sidebar only after every shared chat-store seat is mounted', async () => { + const source = await readFile( + 'node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js', + 'utf8' + ) + const sessionStart = source.indexOf('name: "conversation.session"') + const detailsStart = source.indexOf('name: "details"', sessionStart) + const detailsEnd = source.indexOf('}, DetailsPanel);', detailsStart) + const sidebarInjectStart = source.indexOf('ctx.inject(["betterSidebar"]') + + expect(sessionStart).toBeGreaterThan(-1) + expect(detailsStart).toBeGreaterThan(sessionStart) + expect(detailsEnd).toBeGreaterThan(detailsStart) + expect(sidebarInjectStart).toBeGreaterThan(detailsEnd) + }) + + it('registers Research conversation as the pinned first tab in the global sidebar', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation') + expect(client.ResearchSidebarCoordinator).toBeTypeOf('function') + if (typeof client.ResearchSidebarCoordinator !== 'function') return + + let descriptor: Record | undefined + const calls: Array<{ name: string; args: unknown[] }> = [] + const state = { + panelOpen: false, + width: 438, + activePane: 'pane-1', + splits: { + kind: 'leaf', id: 'pane-1', active: 'files-tab', + tabs: [{ id: 'files-tab', type: 'editor', title: 'Files' }] + }, + bottomSplits: { kind: 'leaf', id: 'pane-2', active: null, tabs: [] } + } + const service = { + registerTab(value: Record) { + descriptor = value + return () => { descriptor = undefined } + }, + getSnapshot: () => ({ sessionId: 'research-session', state }), + subscribeState: () => () => undefined, + openTab: (...args: unknown[]) => { calls.push({ name: 'openTab', args }) }, + updateTab: (...args: unknown[]) => { calls.push({ name: 'updateTab', args }) }, + closeTab: (...args: unknown[]) => { calls.push({ name: 'closeTab', args }) }, + activateTab: (...args: unknown[]) => { calls.push({ name: 'activateTab', args }) }, + setPanelState: (...args: unknown[]) => { calls.push({ name: 'setPanelState', args }) } + } + const Coordinator = client.ResearchSidebarCoordinator as new () => { + attach(service: Record, t: (key: string) => string): () => void + enter(sessionId: string): void + leave(sessionId: string): void + } + const coordinator = new Coordinator() + coordinator.attach(service, (key: string) => key === 'research.right.conversation' ? '对话' : key) + + expect(descriptor).toMatchObject({ + id: 'sherlock-research-conversation', + hidden: true, + single: true + }) + expect((descriptor?.title as () => string)()).toBe('对话') + + coordinator.enter('research-session') + expect(calls[0]).toEqual({ + name: 'openTab', + args: [{ + id: 'sherlock-research-conversation', + type: 'sherlock-research-conversation', + title: '对话', + path: 'sherlock://research/conversation', + meta: { sherlockPinned: true, sherlockClosable: false } + }, { sessionId: 'research-session' }] + }) + expect(calls[1]).toEqual({ + name: 'setPanelState', + args: [{ open: true }, { sessionId: 'research-session' }] + }) + + coordinator.leave('research-session') + expect(calls.slice(2)).toEqual([ + { + name: 'updateTab', + args: ['sherlock-research-conversation', { + meta: { sherlockPinned: false, sherlockClosable: true } + }, { sessionId: 'research-session' }] + }, + { + name: 'closeTab', + args: ['sherlock-research-conversation', { sessionId: 'research-session' }] + }, + { + name: 'activateTab', + args: ['files-tab', { sessionId: 'research-session' }] + }, + { + name: 'setPanelState', + args: [{ open: false, width: 438 }, { sessionId: 'research-session' }] + } + ]) + }) + + it('renders the Research sidebar content without its own duplicate tab strip', async () => { + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + const restoreGlobals = installBrowserGlobals(browserWindow) + const client = await loadClientBundle('dsh-client-ui-conversation', undefined, { + document: browserWindow.document, + window: browserWindow + }) + expect(client.ResearchConversationPanel).toBeTypeOf('function') + if (typeof client.ResearchConversationPanel !== 'function') { + restoreGlobals() + return + } + const Registry = client.ResearchWorkspaceRegistry as new (storage: Storage) => { + for(id: string): { + subscribe(listener: () => void): () => void + getSnapshot(): Record + } + } + const registry = new Registry(browserWindow.localStorage as Storage) + try { + const html = renderToStaticMarkup(createElement(client.ResearchConversationPanel, { + active: true, + sessionId: 'research-session', + useSession: (select: (state: Record) => unknown) => select({ + running: false, chat: { order: [] } + }), + presentation: { + researchRightTab: 'conversation', researchFilesTabOpen: true, + researchConversationUnread: false, selection: null, + conversationView: createElement('div', null, 'answer') + }, + actions: { + setResearchRightTab: () => undefined, + setResearchFilesTabOpen: () => undefined, + setResearchConversationUnread: () => undefined + }, + renderSlot: () => null, + researchWorkspaces: registry, + composerHostRef: { current: null }, + t: (key: string) => key + })) + + expect(html).toContain('data-research-conversation-panel') + expect(html).toContain('data-research-conversation-host') + expect(html).not.toContain('answer') + expect(html).not.toContain('role="tablist"') + expect(html).not.toContain('data-research-right-tab') + } finally { + restoreGlobals() + } + }) + + it('deduplicates and bounds the per-session orphan revocation outbox', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation') + const Registry = client.ResearchWorkspaceRegistry as new (storage: Storage) => { + for(id: string): { + queueOrphanRevocations(nodeIds: string[]): void + pendingOrphanRevocations(): string[] + } + } + const storage = new MemoryStorage() + const workspace = new Registry(storage).for('session-bounded-outbox') + const nodeIds = Array.from({ length: 300 }, (_, index) => `orphan-${index}`) + + workspace.queueOrphanRevocations([...nodeIds, 'orphan-0', '', 'orphan-1']) + + expect(workspace.pendingOrphanRevocations()).toEqual(nodeIds.slice(0, 256)) + expect(JSON.parse(storage.getItem( + 'sherlock.research.canvas.preview-revocations.v1:session-bounded-outbox' + ) ?? '[]')).toEqual(nodeIds.slice(0, 256)) + + const maximumIds = Array.from({ length: 256 }, (_, index) => + `maximum-orphan-${index}`.padEnd(512, 'x') + ) + new Registry(storage).for('session-maximum-outbox') + .queueOrphanRevocations(maximumIds) + expect(new Registry(storage).for('session-maximum-outbox').pendingOrphanRevocations()) + .toEqual(maximumIds) + }) + + it('rejects malformed and oversized orphan outbox payloads and filters bounded ids', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation') + const Registry = client.ResearchWorkspaceRegistry as new (storage: Storage) => { + for(id: string): { pendingOrphanRevocations(): string[] } + } + const raw = new Map([ + ['malformed', '{'], + ['object', '{"0":"node"}'], + ['oversized', JSON.stringify(['x'.repeat(800_000)])], + ['mixed', JSON.stringify(['node-a', 'node-a', '', 7, 'x'.repeat(513), 'node-b'])] + ]) + const storage = { + getItem(key: string) { + const sessionId = key.split(':').at(-1) ?? '' + return raw.get(sessionId) ?? null + }, + setItem() {} + } as unknown as Storage + const registry = new Registry(storage) + + expect(registry.for('malformed').pendingOrphanRevocations()).toEqual([]) + expect(registry.for('object').pendingOrphanRevocations()).toEqual([]) + expect(registry.for('oversized').pendingOrphanRevocations()).toEqual([]) + expect(registry.for('mixed').pendingOrphanRevocations()).toEqual(['node-a', 'node-b']) + }) + + it('stops parsing a large in-limit orphan outbox after 256 ids without indexOf scans', async () => { + let indexOfReads = 0 + let itemReads = 0 + const observedJson: JSON = { + [Symbol.toStringTag]: 'JSON', + parse(text, reviver) { + const parsed = globalThis.JSON.parse(text, reviver) + if (!Array.isArray(parsed)) return parsed + const firstIndexes = new Map() + parsed.forEach((value, index) => { + if (!firstIndexes.has(value)) firstIndexes.set(value, index) + }) + return new Proxy(parsed, { + get(target, property, receiver) { + if (property === 'indexOf') { + indexOfReads += 1 + return (value: unknown) => firstIndexes.get(value) ?? -1 + } + if (typeof property === 'string' && /^\d+$/.test(property)) itemReads += 1 + return Reflect.get(target, property, receiver) + } + }) + }, + stringify: globalThis.JSON.stringify + } + const nodeIds = Array.from({ length: 5_000 }, (_, index) => `large-orphan-${index}`) + const key = 'sherlock.research.canvas.preview-revocations.v1:session-large-outbox' + const client = await loadClientBundle('dsh-client-ui-conversation', undefined, { + json: observedJson + }) + const Registry = client.ResearchWorkspaceRegistry as new (storage: Storage) => { + for(id: string): { pendingOrphanRevocations(): string[] } + } + const workspace = new Registry({ + getItem(storageKey: string) { return storageKey === key ? JSON.stringify(nodeIds) : null }, + setItem() {} + } as unknown as Storage).for('session-large-outbox') + + const pending = workspace.pendingOrphanRevocations() + expect(pending).toHaveLength(256) + expect(pending[0]).toBe('large-orphan-0') + expect(pending[255]).toBe('large-orphan-255') + expect(indexOfReads).toBe(0) + expect(itemReads).toBeLessThanOrEqual(256) + }) + + it('does not create another durable preview admission while orphan revocation is pending', async () => { + const storage = new MemoryStorage() + const sessionId = 'session-pending-orphan' + storage.setItem( + `sherlock.research.canvas.preview-revocations.v1:${sessionId}`, + JSON.stringify(['pending-orphan']) + ) + const admissions: Array> = [] + const mounted = await mountResearchCanvas({ + sessionId, + storage, + dshDesktop: { + getPathForFile: () => '/workspace/new.png', + researchPreview: { + admitFinderFile(_file, identity) { + admissions.push(identity) + return Promise.resolve({ + authorizationId: 'unexpected-authorization', + capabilityToken: 'unexpected-capability', + url: 'sherlock-preview://unexpected-capability/', + contentType: 'image/png', + name: 'new.png' + }) + }, + async release() { return { ok: true } }, + async restore() { return null }, + async revokeNode() { return { ok: false } } + } + } + }) + try { + await act(async () => { + dispatchDrag(mounted.browserWindow, mounted.canvas, 'drop', { + types: ['Files'], + files: [{ name: 'new.png', type: 'image/png' } as File], + dropEffect: 'none', + getData: () => '' + }) + await Promise.resolve() + await Promise.resolve() + await Promise.resolve() + }) + + expect(admissions).toEqual([]) + expect(mounted.workspace.getSnapshot().files).toHaveLength(1) + expect(mounted.workspace.getSnapshot().files[0]).toMatchObject({ + path: '/workspace/new.png', + name: 'new.png', + previewEligible: false + }) + expect(JSON.parse(storage.getItem( + `sherlock.research.canvas.preview-revocations.v1:${sessionId}` + ) ?? '[]')).toEqual(['pending-orphan']) + } finally { + await mounted.cleanup() + } + }) + + it('keeps a rejected legacy outbox migration volatile until desktop persistence succeeds', async () => { + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + const sessionId = 'session-rejected-outbox-migration' + const key = `sherlock.research.canvas.preview-revocations.v1:${sessionId}` + browserWindow.localStorage.setItem(key, '["legacy-orphan"]') + let writeAttempts = 0 + const client = await loadClientBundle('dsh-client-ui-conversation', { + researchCanvasStorage: { + getItem: () => null, + setItem: () => { writeAttempts += 1; return false } + } + }, { + window: browserWindow + }) + const Registry = client.ResearchWorkspaceRegistry as new () => { + for(id: string): { + pendingOrphanRevocations(): string[] + queueOrphanRevocations(nodeIds: string[]): boolean + } + } + const workspace = new Registry().for(sessionId) + + expect(workspace.pendingOrphanRevocations()).toEqual(['legacy-orphan']) + expect(workspace.queueOrphanRevocations(['legacy-orphan'])).toBe(false) + expect(writeAttempts).toBeGreaterThanOrEqual(2) + }) + + it('publishes the session-scoped Research presentation to the optional root owner', async () => { + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + const restoreGlobals = installBrowserGlobals(browserWindow) + const client = await loadClientBundle('dsh-client-ui-conversation', undefined, { + document: browserWindow.document, + window: browserWindow + }) + expect(client.ConversationSession).toBeTypeOf('function') + if (typeof client.ConversationSession !== 'function') { + restoreGlobals() + return + } + const host = browserWindow.document.createElement('div') + browserWindow.document.body.appendChild(host) + const root = createRoot(host) + const chat = createSelectorStore({ + view: 'research', + selection: { callId: 'call-bridge', toolName: 'Bridge', turnSeq: 1 }, + inspect: null, + draft: '', + researchRightTab: 'files', + researchFilesTabOpen: true, + researchConversationUnread: true + }) + const presentations: Array | null> = [] + const actions = { + select: () => undefined, + setDraft: () => undefined, + setView: () => undefined, + setInspect: () => undefined, + setResearchRightTab: () => undefined, + setResearchFilesTabOpen: () => undefined, + setResearchConversationUnread: () => undefined + } + const releasedImages: string[] = [] + const releasedResearchWorkspaces: string[] = [] + const researchViewOwners: Array> = [] + const generateResearchSelection = vi.fn(async () => ({ ok: true })) + const renderSession = (sessionId: string) => createElement( + client.ConversationSession as ComponentType>, + { + sessionId, + useSession: (select: (state: Record) => unknown) => select({ + composerPhase: 'active', blank: false, running: false + }), + useInput: (select: (state: Record) => unknown) => select({ + draft: '', queue: [] + }), + inputActions: { setDraft: () => undefined, generateResearchSelection }, + useStore: chat.useSelector, + actions, + renderSlot: (_name: string, owner: Record, options: { only?: string }) => { + if (options?.only === 'research') researchViewOwners.push(owner) + return createElement('div', { 'data-bridged-view': '' }) + }, + views: { + subscribe: () => () => undefined, + version: () => 1, + list: () => [ + { id: 'chat', label: '对话' }, + { id: 'research', label: '研究' } + ] + }, + bindDraftMirror: () => () => undefined, + releaseSessionImages: (id: string) => { releasedImages.push(id) }, + releaseResearchWorkspace: (id: string) => { + releasedResearchWorkspaces.push(id) + }, + onResearchPresentation: (value: Record | null) => { + presentations.push(value) + } + } + ) + try { + await act(async () => { + root.render(renderSession('session-bridge')) + }) + expect(presentations.at(-1)).toMatchObject({ + view: 'research', + selection: { callId: 'call-bridge' }, + researchRightTab: 'files', + researchFilesTabOpen: true, + researchConversationUnread: true, + actions + }) + expect(renderToStaticMarkup( + (presentations.at(-1)?.conversationView ?? null) as ReactNode + )).toContain('data-bridged-view') + expect(researchViewOwners.at(-1)?.selectionGeneration).toMatchObject({ + disabled: false, + generate: generateResearchSelection + }) + + await act(async () => { + root.render(renderSession('session-bridge-next')) + }) + expect(releasedImages).toEqual(['session-bridge']) + expect(releasedResearchWorkspaces).toEqual(['session-bridge']) + } finally { + await act(async () => { root.unmount() }) + restoreGlobals() + } + }) + + it('keeps the session header mounted in Research so Chat and Trajectory remain reachable', async () => { + const mounted = await mountConversationRoot('research') + try { + expect(mounted.host.querySelectorAll('[data-session-header]')).toHaveLength(1) + expect(mounted.host.querySelector('[data-center-session-view]')?.getAttribute( + 'data-center-session-view' + )).toBe('research') + } finally { + await mounted.cleanup() + } + }) + + it('adds a finalized assistant response only through the explicit action strip', async () => { + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + const restoreGlobals = installBrowserGlobals(browserWindow) + const primitives = new Proxy({ + Tooltip: ({ children }: { children: unknown }) => children, + IconCheckOutline16: () => createElement('span'), + IconCopyOutline16: () => createElement('span'), + IconBranchOutline16: () => createElement('span'), + writeClipboard: async () => true + }, { + get(target, property) { + return Reflect.get(target, property) ?? (() => null) + } + }) + try { + const client = await loadClientBundle('dsh-client-ui-conversation', undefined, { + document: browserWindow.document, + window: browserWindow, + modules: { '@deepseek-ai/dsh-client-ui-primitives': primitives } + }) + expect(client.registerResearchAssistantActions).toBeTypeOf('function') + expect(client.TurnTailNodeView).toBeTruthy() + expect(client.ResearchWorkspaceRegistry).toBeTypeOf('function') + if (typeof client.registerResearchAssistantActions !== 'function' || + client.TurnTailNodeView === undefined || + typeof client.ResearchWorkspaceRegistry !== 'function') return + + const Registry = client.ResearchWorkspaceRegistry as new (storage: Storage) => { + for(id: string): { + getSnapshot(): { + artifacts: Array> + } + assistantActionsActive(): boolean + setAssistantActionsActive(active: boolean): void + setCanvasSize(size: { width: number; height: number }): void + setViewport(viewport: { scale: number; x: number; y: number }): void + } + } + const registry = new Registry(browserWindow.localStorage as Storage) + const workspace = registry.for('session-action') + expect(workspace.assistantActionsActive).toBeTypeOf('function') + expect(workspace.setAssistantActionsActive).toBeTypeOf('function') + if (typeof workspace.assistantActionsActive !== 'function' || + typeof workspace.setAssistantActionsActive !== 'function') return + workspace.setCanvasSize({ width: 800, height: 600 }) + let registration: { + options: { + name: string + id: string + order: number + inject(sessionId: string): Record + } + component: ComponentType> + } | undefined + client.registerResearchAssistantActions({ + register( + options: { + name: string + id: string + order: number + inject(sessionId: string): Record + }, + component: ComponentType> + ) { + registration = { options, component } + return undefined + } + }, registry) + expect(registration?.options).toMatchObject({ + name: 'conversation.chat.assistant-actions', + id: 'research-add-to-canvas' + }) + if (registration === undefined) return + + const host = browserWindow.document.createElement('div') + browserWindow.document.body.appendChild(host) + const root = createRoot(host) + const actionProps = registration.options.inject('session-action') + const owners: Array> = [] + await act(async () => { + root.render(createElement( + client.TurnTailNodeView as ComponentType>, + { + node: { + key: 'tail-1', + location: { kind: 'turn', turn: {} }, + data: { + turn: 1, + seq: 2, + closing: { + finalNode: { seq: 2, messageId: 'm1' }, + blocks: [{ kind: 'text', text: 'Revenue improved.' }] + } + } + }, + openFile: () => undefined, + forkAt: () => undefined, + renderSlot: (name: string, owner: Record) => { + if (name !== 'conversation.chat.assistant-actions') return null + owners.push(owner) + return createElement(registration?.component as ComponentType>, { + ...owner, + ...actionProps + }) + }, + renderSlotChain: () => null, + t: (key: string) => key, + useSession: (select: (state: unknown) => unknown) => select({ + chat: { locations: { getTurn: () => ['tail-1'] } } + }) + } + )) + }) + + expect(owners).toEqual([{ + messageId: 'm1', text: 'Revenue improved.' + }]) + expect(workspace.getSnapshot().artifacts).toEqual([]) + expect(workspace.assistantActionsActive()).toBe(false) + expect(host.querySelector('button[aria-label="添加到画布"]')).toBeNull() + + await act(async () => { workspace.setAssistantActionsActive(true) }) + const add = host.querySelector('button[aria-label="添加到画布"]') + expect(add).not.toBeNull() + await act(async () => { click(browserWindow, add) }) + expect(workspace.getSnapshot().artifacts).toMatchObject([{ + messageId: 'm1', kind: 'assistant-result', excerpt: 'Revenue improved.', + x: 400, y: 300 + }]) + + workspace.setViewport({ scale: 1, x: 100, y: 50 }) + await act(async () => { click(browserWindow, add) }) + expect(workspace.getSnapshot().artifacts).toMatchObject([{ + messageId: 'm1', kind: 'assistant-result', + x: 300, y: 250 + }]) + expect(workspace.getSnapshot().artifacts).toHaveLength(1) + await act(async () => { workspace.setAssistantActionsActive(false) }) + expect(host.querySelector('button[aria-label="添加到画布"]')).toBeNull() + await act(async () => { root.unmount() }) + } finally { + restoreGlobals() + } + }) + + it('keeps a queued generated component isolated from right-conversation assistant results', async () => { + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + const restoreGlobals = installBrowserGlobals(browserWindow) + try { + const client = await loadClientBundle('dsh-client-ui-conversation', undefined, { + document: browserWindow.document, + window: browserWindow + }) + expect(client.ResearchAssistantCanvasAction).toBeTypeOf('function') + expect(client.ResearchWorkspaceRegistry).toBeTypeOf('function') + if (typeof client.ResearchAssistantCanvasAction !== 'function' || + typeof client.ResearchWorkspaceRegistry !== 'function') return + const Registry = client.ResearchWorkspaceRegistry as new (storage: Storage) => { + for(id: string): { + setFiles(files: Array>): void + beginGeneration(kind: string, sourceNodeIds: string[], placement: Record): Record | null + getSnapshot(): { artifacts: Array> } + subscribeAssistantActions(listener: () => void): () => void + assistantActionsActive(): boolean + } + } + const registry = new Registry(browserWindow.localStorage) + const workspace = registry.for('session-generated-assistant-result') + workspace.setFiles([{ + id: 'source-file', path: '/w/source.pdf', name: 'source.pdf', source: 'computer', + x: 100, y: 100, width: 480, height: 360, sizeMode: 'manual' + }]) + const target = workspace.beginGeneration('summary', ['source-file'], { + x: 620, y: 100, width: 380, height: 240, sizeMode: 'manual' + }) + expect(target).not.toBeNull() + const host = browserWindow.document.createElement('div') + browserWindow.document.body.appendChild(host) + const root = createRoot(host) + try { + await act(async () => { + root.render(createElement(client.ResearchAssistantCanvasAction, { + messageId: 'generated-message', + text: '收入增长，但成本压力仍需继续验证。', + workspace + })) + }) + expect(workspace.getSnapshot().artifacts).toMatchObject([{ + id: target?.id, + messageId: target?.id, + generationStatus: 'queued', + excerpt: '正在准备任务…' + }]) + } finally { + await act(async () => { root.unmount() }) + } + } finally { + restoreGlobals() + } + }) + + it('shows 添加到画布 only in the active Research right Conversation', async () => { + const mounted = await mountConversationRoot('chat', { + messageId: 'm-research-only', text: 'Research-only result.' + }) + try { + const { actions, browserWindow, detailsPortalHost, host, workspace } = mounted + await act(async () => { workspace.setCanvasSize({ width: 800, height: 600 }) }) + expect(host.querySelector('button[aria-label="添加到画布"]')).toBeNull() + + await act(async () => { actions.setView('research') }) + const add = detailsPortalHost.querySelector('button[aria-label="添加到画布"]') + expect(add).not.toBeNull() + await act(async () => { click(browserWindow, add) }) + expect(workspace.getSnapshot().artifacts).toMatchObject([{ + messageId: 'm-research-only', kind: 'assistant-result', + x: 400, y: 300 + }]) + + await act(async () => { actions.setResearchRightTab('files') }) + expect(detailsPortalHost.querySelector('button[aria-label="添加到画布"]')).not.toBeNull() + await act(async () => { actions.setView('chat') }) + expect(host.querySelector('button[aria-label="添加到画布"]')).toBeNull() + } finally { + await mounted.cleanup() + } + }) + + it('marks the real settled assistant wrapper with its durable message identity', async () => { + const primitives = new Proxy({ + MarkdownText: ({ text }: { text: string }) => createElement('span', null, text) + }, { + get(target, property) { + return Reflect.get(target, property) ?? (() => null) + } + }) + const client = await loadClientBundle('dsh-client-ui-conversation', undefined, { + modules: { '@deepseek-ai/dsh-client-ui-primitives': primitives } + }) + expect(client.AssistantNodeView).toBeTruthy() + if (client.AssistantNodeView === undefined) return + + const html = renderToStaticMarkup(createElement( + client.AssistantNodeView as ComponentType>, + { + node: { + location: { kind: 'turn', turn: { status: 'closed' } }, + data: { + status: 'complete', + finalNode: { seq: 2, messageId: 'm1' }, + blocks: [{ kind: 'text', text: 'Revenue improved.' }] + } + }, + useTurnData: () => ({ closing: { finalNode: { seq: 2 } } }), + openFile: () => undefined, + loadImage: async () => '', + fileMentions: () => undefined, + t: (key: string) => key + } + )) + + expect(html).toContain('data-assistant-message-id="m1"') + expect(html).toContain('data-assistant-message-settled=""') + expect(html).toContain('Revenue improved.') + }) + + it('marks conversation tabs with their stable view id for desktop visibility gates', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation') + expect(client.conversationViewTabProps).toBeTypeOf('function') + if (typeof client.conversationViewTabProps !== 'function') return + + const selected: string[] = [] + const props = client.conversationViewTabProps( + { id: 'memory-files', label: '记忆' }, + 'research', + (id: string) => selected.push(id) + ) as Record + + expect(props['data-conversation-view-id']).toBe('memory-files') + expect(props['aria-selected']).toBe(false) + expect(props.children).toBe('记忆') + expect(props.onClick).toBeTypeOf('function') + if (typeof props.onClick === 'function') props.onClick() + expect(selected).toEqual(['memory-files']) + }) + + it('renders theme-aware light and dark dotted research surfaces', async () => { + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + const client = await loadClientBundle('dsh-client-ui-conversation', undefined, { + document: browserWindow.document + }) + expect(client.ResearchCanvas).toBeTypeOf('function') + if (typeof client.ResearchCanvas !== 'function') return + + const ResearchCanvas = client.ResearchCanvas as ComponentType<{ + t: (key: string) => string + }> + browserWindow.document.body.innerHTML = renderToStaticMarkup( + createElement(ResearchCanvas, { + t: (key: string) => key === 'research.canvas' ? '研究画布' : key + }) + ) + const canvas = browserWindow.document.querySelector('[data-research-canvas]') + expect(canvas).not.toBeNull() + if (canvas === null) return + + expect(canvas.getAttribute('tabindex')).toBe('0') + expect(browserWindow.getComputedStyle(canvas).backgroundPosition).toBe( + '-10px -10px' + ) + expect(browserWindow.getComputedStyle(canvas).backgroundColor).toBe( + 'rgb(247, 248, 250)' + ) + browserWindow.document.body.setAttribute('data-ds-dark-theme', '') + expect(browserWindow.getComputedStyle(canvas).backgroundColor).toBe( + 'rgb(23, 25, 29)' + ) + }) + + it('renders a compact file card inside the transformed Research world layer', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation') + expect(client.ResearchCanvasFileCard).toBeTypeOf('function') + expect(client.researchCanvasContentTransform).toBeTypeOf('function') + if (typeof client.ResearchCanvasFileCard !== 'function' || + typeof client.researchCanvasContentTransform !== 'function') return + const FileCard = client.ResearchCanvasFileCard as ComponentType<{ + node: { + id: string + path: string + name: string + mediaType: string + source: string + x: number + y: number + } + }> + + const html = renderToStaticMarkup(createElement(FileCard, { + node: { + id: 'file-1', path: '/w/report.pdf', name: 'report.pdf', + mediaType: 'application/pdf', source: 'computer', x: 120, y: 80 + } + })) + + expect(html).toContain('data-research-file-card="file-1"') + expect(html).toContain('data-research-node-id="file-1"') + expect(html).toContain('role="option"') + expect(html).toContain('tabindex="0"') + expect(html).toContain('aria-selected="false"') + expect(html).toContain('report.pdf') + expect(html).not.toContain('/w/report.pdf { + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + const observed: Array<{ target: HappyDOMElement; callback: () => void; disconnected: boolean }> = [] + class TestResizeObserver { + private readonly record: { target: HappyDOMElement; callback: () => void; disconnected: boolean } + constructor(callback: () => void) { + this.record = { target: browserWindow.document.body, callback, disconnected: false } + observed.push(this.record) + } + observe(target: HappyDOMElement) { this.record.target = target } + disconnect() { this.record.disconnected = true } + } + Object.defineProperty(browserWindow, 'ResizeObserver', { + configurable: true, + value: TestResizeObserver + }) + const markdown = '\n## Finding\n\n- one\n- two\n\n```js\nanswer()\n```\n' + const renderedMarkdown: string[] = [] + const primitives = new Proxy({ + MarkdownText: ({ text }: { text: string }) => { + renderedMarkdown.push(text) + return createElement('div', { 'data-production-markdown': '' }, text) + } + }, { + get(target, property) { + return Reflect.get(target, property) ?? (() => null) + } + }) + const restoreGlobals = installBrowserGlobals(browserWindow) + try { + const client = await loadClientBundle('dsh-client-ui-conversation', undefined, { + document: browserWindow.document, + window: browserWindow, + modules: { '@deepseek-ai/dsh-client-ui-primitives': primitives } + }) + const Card = client.ResearchCanvasArtifactCard as ComponentType> + const host = browserWindow.document.createElement('div') + browserWindow.document.body.appendChild(host) + const root = createRoot(host) + const heights: number[] = [] + const autoNode = { + id: 'artifact-markdown', kind: 'assistant-result', messageId: 'm1', + title: '助手回复', excerpt: markdown, x: 100, y: 100, + width: 360, height: 240, sizeMode: 'auto' + } + await act(async () => { + root.render(createElement(Card, { + node: autoNode, + onAutoHeight: (_node: unknown, height: number) => heights.push(height) + })) + }) + const body = host.querySelector('[data-research-artifact-content]') as HappyDOMElement | null + expect(body).not.toBeNull() + if (body === null) return + Object.defineProperty(body, 'scrollHeight', { configurable: true, value: 301.4 }) + await act(async () => { observed.at(-1)?.callback() }) + + expect(renderedMarkdown).toContain(markdown) + expect(host.querySelector('[data-production-markdown]')?.textContent).toBe(markdown) + expect(heights.at(-1)).toBe(333) + + await act(async () => { + root.render(createElement(Card, { + node: { ...autoNode, height: 160, sizeMode: 'manual' }, + onAutoHeight: (_node: unknown, height: number) => heights.push(height) + })) + }) + expect(observed.at(-1)?.disconnected).toBe(true) + expect(browserWindow.getComputedStyle( + host.querySelector('[data-research-preview-body]') as HappyDOMElement + ).overflowY).toBe('auto') + expect(host.querySelector('[data-production-markdown]')?.textContent).toBe(markdown) + await act(async () => { root.unmount() }) + } finally { + restoreGlobals() + } + }) + + it('mounts only near-viewport capability images, restores on re-entry, and releases the exact token offscreen', async () => { + const releases: Array> = [] + const restores: Array> = [] + const revocations: Array> = [] + let tokenSequence = 0 + let cleaned = false + const mounted = await mountResearchCanvas({ + sessionId: 'session-image-lifecycle', + files: [{ + id: 'image-1', name: 'revenue.png', source: 'computer', + authorizationId: 'authorization-1', contentType: 'image/png', + x: 200, y: 200, width: 320, height: 272, sizeMode: 'auto', aspectRatio: 4 / 3 + }], + dshDesktop: { + researchPreview: { + async restore(value) { + restores.push(value) + tokenSequence += 1 + return { + authorizationId: value.authorizationId, + capabilityToken: `capability-${tokenSequence}`, + url: `sherlock-preview://capability-${tokenSequence}/revenue.png`, + contentType: 'image/png', + name: 'revenue.png' + } + }, + async release(value) { + releases.push(value) + return { ok: true } + }, + async revokeNode(value) { revocations.push(value); return { ok: true } }, + async revokeSession(sessionId) { + revocations.push({ sessionId, nodeId: 'session-revocation' }) + return { ok: true } + } + } + } + }) + try { + const { host, workspace } = mounted + await act(async () => { + ;(workspace as unknown as { setCanvasSize(value: { width: number; height: number }): void }) + .setCanvasSize({ width: 800, height: 600 }) + await Promise.resolve() + }) + const image = host.querySelector('[data-research-image-preview]') as HappyDOMElement | null + expect(image).not.toBeNull() + expect(image?.getAttribute('src')).toBe('sherlock-preview://capability-1/revenue.png') + if (image === null) return + const viewportBeforeWheel = workspace.getSnapshot().viewport + image.dispatchEvent(new mounted.browserWindow.WheelEvent('wheel', { + bubbles: true, cancelable: true, deltaY: 120 + })) + expect(workspace.getSnapshot().viewport).toEqual(viewportBeforeWheel) + Object.defineProperties(image, { + naturalWidth: { configurable: true, value: 1600 }, + naturalHeight: { configurable: true, value: 900 } + }) + await act(async () => { + image.dispatchEvent(new mounted.browserWindow.Event('load', { bubbles: false })) + }) + expect(workspace.getSnapshot().files[0]).toMatchObject({ + authorizationId: 'authorization-1', contentType: 'image/png', + width: 320, height: 212, aspectRatio: 16 / 9 + }) + + await act(async () => { workspace.setViewport({ scale: 1, x: -2_000, y: 0 }) }) + expect(host.querySelector('[data-research-image-preview]')).toBeNull() + expect(host.querySelector('[data-research-offscreen-placeholder]')).not.toBeNull() + expect(releases).toEqual([{ + sessionId: 'session-image-lifecycle', nodeId: 'image-1', + authorizationId: 'authorization-1', capabilityToken: 'capability-1' + }]) + + await act(async () => { + workspace.setViewport({ scale: 1, x: 0, y: 0 }) + await Promise.resolve() + }) + expect(restores).toHaveLength(2) + expect(host.querySelector('[data-research-image-preview]')?.getAttribute('src')) + .toBe('sherlock-preview://capability-2/revenue.png') + const restoredImage = host.querySelector('[data-research-image-preview]') as HappyDOMElement | null + expect(restoredImage).not.toBeNull() + await act(async () => { + expect(() => restoredImage?.dispatchEvent( + new mounted.browserWindow.Event('error', { bubbles: false }) + )).not.toThrow() + await Promise.resolve() + }) + expect(host.querySelector('[data-research-preview-unavailable]')).not.toBeNull() + expect(releases).toHaveLength(2) + expect(releases.at(-1)).toEqual({ + sessionId: 'session-image-lifecycle', nodeId: 'image-1', + authorizationId: 'authorization-1', capabilityToken: 'capability-2' + }) + await mounted.cleanup() + cleaned = true + expect(releases).toHaveLength(2) + expect(revocations).toEqual([]) + } finally { + if (!cleaned) await mounted.cleanup() + } + }) + + it('routes DOCX, XLSX, and PPTX canvas nodes through the injected Office component only after restore', async () => { + const rendered: Array<{ sourceUrl: string; kind: string; title: string }> = [] + const restores: Array> = [] + const files = ([ + ['docx', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'], + ['xlsx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'], + ['pptx', 'application/vnd.openxmlformats-officedocument.presentationml.presentation'] + ] as const).map(([kind, contentType], index) => ({ + id: `office-${kind}`, + name: `report.${kind}`, + source: 'computer', + authorizationId: `authorization-${kind}`, + contentType, + x: 160 + index * 190, + y: 200, + width: 480, + height: 360, + sizeMode: 'manual' + })) + const mounted = await mountResearchCanvas({ + sessionId: 'session-office-routing', + files, + officePreview: { + supports: (kind) => ['docx', 'xlsx', 'pptx'].includes(kind), + Component(props) { + rendered.push(props) + return createElement('div', { + 'data-test-office-kind': props.kind, + 'data-test-office-url': props.sourceUrl + }) + } + }, + dshDesktop: { researchPreview: { + async restore(value) { + restores.push(value) + const file = files.find((candidate) => candidate.id === value.nodeId) + if (file === undefined) return null + return { + authorizationId: value.authorizationId, + capabilityToken: `capability-${value.nodeId}`, + url: `sherlock-preview://capability-${value.nodeId}/`, + contentType: file.contentType, + name: file.name + } + }, + async release() { return { ok: true } } + } } + }) + try { + await act(async () => { + mounted.workspace.setCanvasSize({ width: 900, height: 600 }) + await Promise.resolve(); await Promise.resolve() + }) + expect(restores.map((value) => value.nodeId).sort()).toEqual( + ['office-docx', 'office-pptx', 'office-xlsx'] + ) + expect([...new Set(rendered.map((value) => value.kind))].sort()).toEqual( + ['docx', 'pptx', 'xlsx'] + ) + expect(rendered.every((value) => value.sourceUrl.startsWith('sherlock-preview://'))).toBe(true) + expect(mounted.host.querySelectorAll('[data-research-office-preview]')).toHaveLength(3) + expect(mounted.host.textContent).not.toContain('/Users/') + + const office = mounted.host.querySelector( + '[data-research-office-preview="docx"]' + ) as HappyDOMElement | null + expect(office).not.toBeNull() + if (office !== null) { + const initialViewport = mounted.workspace.getSnapshot().viewport + const plainWheel = new mounted.browserWindow.WheelEvent('wheel', { + bubbles: true, cancelable: true, deltaY: 48 + }) + office.dispatchEvent(plainWheel) + expect(plainWheel.defaultPrevented).toBe(false) + expect(mounted.workspace.getSnapshot().viewport).toEqual(initialViewport) + + const metaWheel = new mounted.browserWindow.WheelEvent('wheel', { + bubbles: true, cancelable: true, deltaY: -100 + }) + Object.defineProperties(metaWheel, { + metaKey: { value: true }, + clientX: { value: 280 }, + clientY: { value: 190 } + }) + office.dispatchEvent(metaWheel) + const zoomed = mounted.workspace.getSnapshot().viewport + expect(metaWheel.defaultPrevented).toBe(true) + expect(zoomed.scale).toBeCloseTo(1.105170918, 8) + expect((280 - zoomed.x) / zoomed.scale).toBeCloseTo(280, 7) + expect((190 - zoomed.y) / zoomed.scale).toBeCloseTo(190, 7) + } + } finally { + await mounted.cleanup() + } + }) + + it('unmounts the Office engine and releases its exact capability offscreen, then restores fresh on return and adapter detach', async () => { + const releases: Array> = [] + const mountedKinds: string[] = [] + const disposedKinds: string[] = [] + let sequence = 0 + const mounted = await mountResearchCanvas({ + sessionId: 'session-office-lifecycle', + files: [{ + id: 'office-docx', name: 'report.docx', source: 'computer', + authorizationId: 'authorization-docx', + contentType: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', + x: 200, y: 200, width: 480, height: 360, sizeMode: 'manual' + }], + officePreview: { + supports: (kind) => kind === 'docx', + Component(props) { + useEffect(() => { + mountedKinds.push(props.kind) + return () => { disposedKinds.push(props.kind) } + }, [props.kind, props.sourceUrl]) + return createElement('div', { 'data-test-office-kind': props.kind }) + } + }, + dshDesktop: { researchPreview: { + async restore(value) { + sequence += 1 + return { + authorizationId: value.authorizationId, + capabilityToken: `capability-office-${sequence}`, + url: `sherlock-preview://capability-office-${sequence}/`, + contentType: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', + name: 'report.docx' + } + }, + async release(value) { releases.push(value); return { ok: true } } + } } + }) + try { + await act(async () => { + mounted.workspace.setCanvasSize({ width: 800, height: 600 }) + await Promise.resolve(); await Promise.resolve() + }) + expect(sequence).toBe(1) + expect(mountedKinds).toEqual(['docx']) + + await act(async () => { mounted.workspace.setViewport({ scale: 1, x: -2_000, y: 0 }) }) + expect(disposedKinds).toEqual(['docx']) + expect(releases.at(-1)).toMatchObject({ capabilityToken: 'capability-office-1' }) + expect(mounted.host.querySelector('[data-research-offscreen-placeholder]')).not.toBeNull() + + await act(async () => { + mounted.workspace.setViewport({ scale: 1, x: 0, y: 0 }) + await Promise.resolve(); await Promise.resolve() + }) + expect(sequence).toBe(2) + expect(mountedKinds).toEqual(['docx', 'docx']) + + await act(async () => { mounted.detachOfficePreview() }) + expect(disposedKinds).toEqual(['docx', 'docx']) + expect(releases.at(-1)).toMatchObject({ capabilityToken: 'capability-office-2' }) + expect(mounted.host.querySelector('[data-research-preview-unavailable]')).not.toBeNull() + } finally { + await mounted.cleanup() + } + }) + + it('never restores without an Office adapter and releases a restore that resolves after the node leaves view', async () => { + let missingAdapterRestores = 0 + const missing = await mountResearchCanvas({ + sessionId: 'session-office-missing', + files: [{ + id: 'office-missing', name: 'report.docx', source: 'computer', + authorizationId: 'authorization-missing', + contentType: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', + x: 200, y: 200 + }], + dshDesktop: { researchPreview: { + async restore() { missingAdapterRestores += 1; return null } + } } + }) + try { + await act(async () => { missing.workspace.setCanvasSize({ width: 800, height: 600 }) }) + expect(missingAdapterRestores).toBe(0) + expect(missing.host.querySelector('[data-research-preview-unavailable]')).not.toBeNull() + } finally { + await missing.cleanup() + } + + const pending = deferred | null>() + const releases: Array> = [] + let renders = 0 + const late = await mountResearchCanvas({ + sessionId: 'session-office-late', + files: [{ + id: 'office-late', name: 'late.xlsx', source: 'computer', + authorizationId: 'authorization-late', + contentType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', + x: 200, y: 200, width: 480, height: 360 + }], + officePreview: { + supports: (kind) => kind === 'xlsx', + Component() { renders += 1; return createElement('div') } + }, + dshDesktop: { researchPreview: { + restore: async () => pending.promise, + async release(value) { releases.push(value); return { ok: true } } + } } + }) + try { + await act(async () => { late.workspace.setCanvasSize({ width: 800, height: 600 }) }) + await act(async () => { late.workspace.setViewport({ scale: 1, x: -2_000, y: 0 }) }) + await act(async () => { + pending.resolve({ + authorizationId: 'authorization-late', + capabilityToken: 'capability-late', + url: 'sherlock-preview://capability-late/', + contentType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', + name: 'late.xlsx' + }) + await pending.promise + }) + expect(renders).toBe(0) + expect(releases).toEqual([{ + sessionId: 'session-office-late', nodeId: 'office-late', + authorizationId: 'authorization-late', capabilityToken: 'capability-late' + }]) + } finally { + await late.cleanup() + } + }) + + it('keeps the titled Office card alive when adapter supports or component rendering throws', async () => { + const makeFile = () => ({ + id: 'office-error', name: 'error.pptx', source: 'computer', + authorizationId: 'authorization-error', + contentType: 'application/vnd.openxmlformats-officedocument.presentationml.presentation', + x: 200, y: 200, width: 480, height: 360 + }) + let supportsRestore = 0 + const supportsError = await mountResearchCanvas({ + sessionId: 'session-office-supports-error', + files: [makeFile()], + officePreview: { + supports() { throw new Error('adapter unavailable') }, + Component() { return createElement('div') } + }, + dshDesktop: { researchPreview: { + async restore() { supportsRestore += 1; return null } + } } + }) + try { + await act(async () => { supportsError.workspace.setCanvasSize({ width: 800, height: 600 }) }) + expect(supportsRestore).toBe(0) + expect(supportsError.host.querySelector('[data-research-node-title]')?.textContent) + .toContain('error.pptx') + expect(supportsError.host.querySelector('[data-research-preview-unavailable]')).not.toBeNull() + } finally { + await supportsError.cleanup() + } + + const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {}) + const componentError = await mountResearchCanvas({ + sessionId: 'session-office-component-error', + files: [makeFile()], + officePreview: { + supports: () => true, + Component() { throw new Error('engine render failed') } + }, + dshDesktop: { researchPreview: { + async restore(value) { + return { + authorizationId: value.authorizationId, + capabilityToken: 'capability-error', + url: 'sherlock-preview://capability-error/', + contentType: 'application/vnd.openxmlformats-officedocument.presentationml.presentation', + name: 'error.pptx' + } + }, + async release() { return { ok: true } } + } } + }) + try { + await act(async () => { + componentError.workspace.setCanvasSize({ width: 800, height: 600 }) + await Promise.resolve(); await Promise.resolve() + }) + expect(componentError.host.querySelector('[data-research-node-title]')?.textContent) + .toContain('error.pptx') + expect(componentError.host.querySelector('[data-research-preview-unavailable]')).not.toBeNull() + } finally { + await componentError.cleanup() + consoleError.mockRestore() + } + }) + + it('fetches bounded Markdown only near the viewport, renders through MarkdownText, and aborts offscreen', async () => { + const markdown = '# 结论\n\n- 第一项\n- [来源](https://example.com)\n' + const renderedMarkdown: string[] = [] + const fetches: Array<{ url: string; signal?: AbortSignal }> = [] + const releases: Array> = [] + const primitives = new Proxy({ + MarkdownText: ({ text }: { text: string }) => { + renderedMarkdown.push(text) + return createElement('div', { 'data-production-markdown': '' }, text) + } + }, { + get(target, property) { + return Reflect.get(target, property) ?? (() => null) + } + }) + const mounted = await mountResearchCanvas({ + sessionId: 'session-markdown-lifecycle', + files: [{ + id: 'markdown-1', name: 'finding.md', source: 'computer', + authorizationId: 'authorization-markdown', contentType: 'text/markdown; charset=utf-8', + x: 200, y: 200, width: 420, height: 320, sizeMode: 'auto' + }], + modules: { '@deepseek-ai/dsh-client-ui-primitives': primitives }, + async fetch(url, init) { + fetches.push({ url, signal: init?.signal ?? undefined }) + return new Response(markdown, { + headers: { + 'Content-Type': 'text/markdown; charset=utf-8', + 'Content-Length': String(Buffer.byteLength(markdown)) + } + }) + }, + dshDesktop: { researchPreview: { + async restore(value) { + return { + authorizationId: value.authorizationId, + capabilityToken: 'capability-markdown', + url: 'sherlock-preview://capability-markdown/', + contentType: 'text/markdown; charset=utf-8', name: 'finding.md' + } + }, + async release(value) { releases.push(value); return { ok: true } } + } } + }) + try { + await act(async () => { + mounted.workspace.setCanvasSize({ width: 800, height: 600 }) + await Promise.resolve(); await Promise.resolve(); await Promise.resolve() + }) + expect(fetches.map((entry) => entry.url)).toEqual([ + 'sherlock-preview://capability-markdown/' + ]) + expect(renderedMarkdown).toContain(markdown) + expect(mounted.host.querySelector('[data-research-markdown-preview]')?.textContent) + .toBe(markdown) + expect(mounted.host.querySelector('[data-research-node-title]')?.textContent) + .toContain('finding.md') + expect(mounted.browserWindow.getComputedStyle( + mounted.host.querySelector('[data-research-markdown-scroll]') as HappyDOMElement + ).overflowY).toBe('auto') + + await act(async () => { mounted.workspace.setViewport({ scale: 1, x: -2_000, y: 0 }) }) + expect(fetches[0]?.signal?.aborted).toBe(true) + expect(mounted.host.querySelector('[data-research-markdown-preview]')).toBeNull() + expect(mounted.host.querySelector('[data-research-offscreen-placeholder]')).not.toBeNull() + expect(releases).toEqual([{ + sessionId: 'session-markdown-lifecycle', nodeId: 'markdown-1', + authorizationId: 'authorization-markdown', capabilityToken: 'capability-markdown' + }]) + } finally { + await mounted.cleanup() + } + }) + + it('cancels a pending native text body read and releases its exact capability when offscreen', async () => { + const pendingRead = deferred<{ done: boolean; value?: Uint8Array }>() + const releases: Array> = [] + let readCalls = 0 + let cancelCalls = 0 + let fetchSignal: AbortSignal | undefined + const mounted = await mountResearchCanvas({ + sessionId: 'session-text-pending-read', + files: [{ + id: 'text-pending', name: 'pending.txt', source: 'computer', + authorizationId: 'authorization-pending', contentType: 'text/plain; charset=utf-8', + x: 200, y: 200 + }], + async fetch(_url, init) { + fetchSignal = init?.signal ?? undefined + return { + ok: true, + headers: new Headers(), + body: { getReader() { return { + read() { readCalls += 1; return pendingRead.promise }, + async cancel() { cancelCalls += 1 } + } } } + } as unknown as Response + }, + dshDesktop: { researchPreview: { + async restore(value) { + return { + authorizationId: value.authorizationId, + capabilityToken: 'capability-pending', + url: 'sherlock-preview://capability-pending/', + contentType: 'text/plain; charset=utf-8', name: 'pending.txt' + } + }, + async release(value) { releases.push(value); return { ok: true } } + } } + }) + try { + await act(async () => { + mounted.workspace.setCanvasSize({ width: 800, height: 600 }) + await Promise.resolve(); await Promise.resolve(); await Promise.resolve() + }) + expect(readCalls).toBe(1) + + await act(async () => { + mounted.workspace.setViewport({ scale: 1, x: -2_000, y: 0 }) + await Promise.resolve() + }) + const cancelCallsWhileReadWasPending = cancelCalls + expect(fetchSignal?.aborted).toBe(true) + expect(releases).toEqual([{ + sessionId: 'session-text-pending-read', nodeId: 'text-pending', + authorizationId: 'authorization-pending', capabilityToken: 'capability-pending' + }]) + + pendingRead.resolve({ done: true }) + await act(async () => { await Promise.resolve(); await Promise.resolve() }) + expect(cancelCallsWhileReadWasPending).toBe(1) + expect(cancelCalls).toBe(1) + expect(mounted.host.querySelector('[data-research-text-preview]')).toBeNull() + expect(mounted.host.querySelector('[data-research-offscreen-placeholder]')).not.toBeNull() + } finally { + pendingRead.resolve({ done: true }) + await mounted.cleanup() + } + }) + + it('releases a native text restore that resolves after offscreen without fetching or reviving it', async () => { + const pendingRestore = deferred | null>() + const releases: Array> = [] + let fetches = 0 + const mounted = await mountResearchCanvas({ + sessionId: 'session-text-late-restore', + files: [{ + id: 'text-late', name: 'late.log', source: 'computer', + authorizationId: 'authorization-late', contentType: 'text/plain; charset=utf-8', + x: 200, y: 200 + }], + async fetch() { + fetches += 1 + return new Response('must not be fetched') + }, + dshDesktop: { researchPreview: { + async restore() { return pendingRestore.promise }, + async release(value) { releases.push(value); return { ok: true } } + } } + }) + try { + await act(async () => { + mounted.workspace.setCanvasSize({ width: 800, height: 600 }) + await Promise.resolve() + }) + await act(async () => { + mounted.workspace.setViewport({ scale: 1, x: -2_000, y: 0 }) + await Promise.resolve() + }) + pendingRestore.resolve({ + authorizationId: 'authorization-late', capabilityToken: 'capability-late', + url: 'sherlock-preview://capability-late/', contentType: 'text/plain; charset=utf-8', + name: 'late.log' + }) + await act(async () => { await Promise.resolve(); await Promise.resolve() }) + expect(fetches).toBe(0) + expect(releases).toEqual([{ + sessionId: 'session-text-late-restore', nodeId: 'text-late', + authorizationId: 'authorization-late', capabilityToken: 'capability-late' + }]) + expect(mounted.host.querySelector('[data-research-text-preview]')).toBeNull() + expect(mounted.host.querySelector('[data-research-offscreen-placeholder]')).not.toBeNull() + } finally { + pendingRestore.resolve(null) + await mounted.cleanup() + } + }) + + it('renders escaped text/code with a language hint and keeps wheel scrolling inside the component', async () => { + const source = '\nconst answer: number = 42 & 1\n' + const fetches: Array<{ signal?: AbortSignal }> = [] + const releases: Array> = [] + const mounted = await mountResearchCanvas({ + sessionId: 'session-text-lifecycle', + files: [{ + id: 'text-1', name: 'analysis.ts', source: 'computer', + authorizationId: 'authorization-text', contentType: 'text/plain; charset=utf-8', + x: 200, y: 200, width: 420, height: 320, sizeMode: 'manual' + }], + async fetch(_url, init) { + fetches.push({ signal: init?.signal ?? undefined }) + return new Response(source, { + headers: { 'Content-Length': String(Buffer.byteLength(source)) } + }) + }, + dshDesktop: { researchPreview: { + async restore(value) { + return { + authorizationId: value.authorizationId, + capabilityToken: 'capability-text', + url: 'sherlock-preview://capability-text/', + contentType: 'text/plain; charset=utf-8', name: 'analysis.ts' + } + }, + async release(value) { releases.push(value); return { ok: true } } + } } + }) + try { + await act(async () => { + mounted.workspace.setCanvasSize({ width: 800, height: 600 }) + await Promise.resolve(); await Promise.resolve(); await Promise.resolve() + }) + const preview = mounted.host.querySelector('[data-research-text-preview]') as HappyDOMElement | null + expect(preview).not.toBeNull() + expect(preview?.textContent).toBe(source) + expect(preview?.querySelector('script')).toBeNull() + expect(preview?.querySelector('code')?.getAttribute('class')).toBe('language-ts') + expect(mounted.host.querySelector('[data-research-file-card="text-1"]')?.getAttribute('style')) + .toContain('width: 420px') + const viewportBeforeWheel = mounted.workspace.getSnapshot().viewport + preview?.dispatchEvent(new mounted.browserWindow.WheelEvent('wheel', { + bubbles: true, cancelable: true, deltaY: 120 + })) + expect(mounted.workspace.getSnapshot().viewport).toEqual(viewportBeforeWheel) + + await act(async () => { mounted.workspace.setViewport({ scale: 1, x: -2_000, y: 0 }) }) + expect(fetches[0]?.signal?.aborted).toBe(true) + expect(releases).toHaveLength(1) + } finally { + await mounted.cleanup() + } + }) + + it('fails closed before reading oversized native text and keeps the titled component available', async () => { + let bodyReads = 0 + const mounted = await mountResearchCanvas({ + sessionId: 'session-text-oversized', + files: [{ + id: 'text-large', name: 'large.custom', source: 'computer', + authorizationId: 'authorization-large', contentType: 'text/plain; charset=utf-8', + x: 200, y: 200 + }], + async fetch() { + return { + ok: true, + headers: new Headers({ 'Content-Length': String(2 * 1024 * 1024 + 1) }), + body: { getReader() { bodyReads += 1; throw new Error('body must not be read') } } + } as unknown as Response + }, + dshDesktop: { researchPreview: { + async restore(value) { + return { + authorizationId: value.authorizationId, + capabilityToken: 'capability-large', + url: 'sherlock-preview://capability-large/', + contentType: 'text/plain; charset=utf-8', name: 'large.custom' + } + }, + async release() { return { ok: true } } + } } + }) + try { + await act(async () => { + mounted.workspace.setCanvasSize({ width: 800, height: 600 }) + await Promise.resolve(); await Promise.resolve(); await Promise.resolve() + }) + expect(bodyReads).toBe(0) + expect(mounted.host.querySelector('[data-research-preview-unavailable]')).not.toBeNull() + expect(mounted.host.querySelector('[data-research-node-title]')?.textContent) + .toContain('large.custom') + } finally { + await mounted.cleanup() + } + }) + + it('cancels a native text stream that exceeds two MiB without a Content-Length header', async () => { + const chunks = [new Uint8Array(1024 * 1024), new Uint8Array(1024 * 1024 + 1)] + const releases: Array> = [] + let reads = 0 + let cancelCalls = 0 + const mounted = await mountResearchCanvas({ + sessionId: 'session-text-stream-oversized', + files: [{ + id: 'text-stream-large', name: 'large.txt', source: 'computer', + authorizationId: 'authorization-stream-large', contentType: 'text/plain; charset=utf-8', + x: 200, y: 200 + }], + async fetch() { + return { + ok: true, + headers: new Headers(), + body: { getReader() { return { + async read() { + const value = chunks[reads] + reads += 1 + return value === undefined ? { done: true } : { done: false, value } + }, + async cancel() { cancelCalls += 1 } + } } } + } as unknown as Response + }, + dshDesktop: { researchPreview: { + async restore(value) { + return { + authorizationId: value.authorizationId, + capabilityToken: 'capability-stream-large', + url: 'sherlock-preview://capability-stream-large/', + contentType: 'text/plain; charset=utf-8', name: 'large.txt' + } + }, + async release(value) { releases.push(value); return { ok: true } } + } } + }) + try { + await act(async () => { + mounted.workspace.setCanvasSize({ width: 800, height: 600 }) + await Promise.resolve(); await Promise.resolve(); await Promise.resolve(); await Promise.resolve() + }) + expect(reads).toBe(2) + expect(cancelCalls).toBe(1) + expect(releases).toEqual([{ + sessionId: 'session-text-stream-oversized', nodeId: 'text-stream-large', + authorizationId: 'authorization-stream-large', capabilityToken: 'capability-stream-large' + }]) + expect(mounted.host.querySelector('[data-research-preview-unavailable]')).not.toBeNull() + } finally { + await mounted.cleanup() + } + }) + + it('keeps a missing native text source as a titled unavailable component', async () => { + let fetches = 0 + const mounted = await mountResearchCanvas({ + sessionId: 'session-text-missing', + files: [{ + id: 'text-missing', name: 'moved.py', source: 'computer', + authorizationId: 'authorization-missing', contentType: 'text/plain; charset=utf-8', + x: 200, y: 200 + }], + async fetch() { + fetches += 1 + return new Response('must not be fetched') + }, + dshDesktop: { researchPreview: { + async restore() { return null }, + async release() { return { ok: true } } + } } + }) + try { + await act(async () => { + mounted.workspace.setCanvasSize({ width: 800, height: 600 }) + await Promise.resolve(); await Promise.resolve(); await Promise.resolve() + }) + expect(fetches).toBe(0) + expect(mounted.host.querySelector('[data-research-preview-unavailable]')).not.toBeNull() + expect(mounted.host.querySelector('[data-research-node-title]')?.textContent) + .toContain('moved.py') + } finally { + await mounted.cleanup() + } + }) + + it('fails closed before requesting pages when a PDF exceeds the supported page limit', async () => { + const harness = createPdfJsHarness({ + pageCount: 4_097, + getPageError: new Error('an oversized PDF must not request page proxies') + }) + const mounted = await mountResearchCanvas({ + sessionId: 'session-pdf-page-limit', + files: [{ + id: 'pdf-page-limit', name: 'oversized.pdf', source: 'computer', + authorizationId: 'authorization-page-limit', contentType: 'application/pdf', + x: 200, y: 200, width: 320, height: 446, sizeMode: 'auto', aspectRatio: 17 / 22 + }], + pdfjs: harness.pdfjs, + pdfBodySize: { width: 318, height: 425 }, + dshDesktop: { researchPreview: { + async restore(value) { + return { + authorizationId: value.authorizationId, + capabilityToken: 'capability-page-limit', + url: 'sherlock-preview://capability-page-limit/', + contentType: 'application/pdf', name: 'oversized.pdf' + } + }, + async release() { return { ok: true } } + } } + }) + try { + await act(async () => { + mounted.workspace.setCanvasSize({ width: 800, height: 600 }) + await Promise.resolve(); await Promise.resolve(); await Promise.resolve() + }) + expect(mounted.host.querySelector('[data-research-pdf-error]')).not.toBeNull() + expect(harness.getPageCalls).toEqual([]) + expect(harness.pages).toEqual([]) + expect(harness.documents[0]?.destroyed).toBe(1) + } finally { + await mounted.cleanup() + } + }) + + it('shows a long PDF after page one and measures later placeholders with bounded concurrency', async () => { + const harness = createPdfJsHarness({ + pageCount: 240, + pageSizes: [ + { width: 600, height: 800 }, + { width: 1_000, height: 500 } + ], + deferPageRequests: (page) => page > 1 + }) + const mounted = await mountResearchCanvas({ + sessionId: 'session-pdf-progressive-metrics', + files: [{ + id: 'pdf-progressive-metrics', name: 'long-report.pdf', source: 'computer', + authorizationId: 'authorization-progressive-metrics', contentType: 'application/pdf', + x: 200, y: 200, width: 320, height: 446, sizeMode: 'auto', aspectRatio: 17 / 22 + }], + pdfjs: harness.pdfjs, + pdfBodySize: { width: 318, height: 425 }, + dshDesktop: { researchPreview: { + async restore(value) { + return { + authorizationId: value.authorizationId, + capabilityToken: 'capability-progressive-metrics', + url: 'sherlock-preview://capability-progressive-metrics/', + contentType: 'application/pdf', name: 'long-report.pdf' + } + }, + async release() { return { ok: true } } + } } + }) + let cleaned = false + try { + await act(async () => { + mounted.workspace.setCanvasSize({ width: 800, height: 600 }) + await Promise.resolve(); await Promise.resolve(); await Promise.resolve(); await Promise.resolve() + }) + + expect(mounted.host.querySelector('[data-research-preview-loading]')).toBeNull() + expect(mounted.host.querySelector('[data-research-pdf-scroll]')).not.toBeNull() + const pageElements = Array.from(mounted.host.querySelectorAll('[data-research-pdf-page]')) + expect(pageElements).toHaveLength(240) + expect((pageElements[1] as HappyDOMHTMLElement).style.height).toBe('424px') + expect((pageElements[239] as HappyDOMHTMLElement).style.height).toBe('424px') + + const initiallyRequestedLaterPages = new Set( + harness.getPageCalls.filter((page) => page > 1) + ) + expect([...initiallyRequestedLaterPages]).toEqual([2, 3, 4, 5]) + + harness.deferredPageRequests + .filter((request) => request.page === 2) + .forEach((request) => request.resolve()) + await act(async () => { + await Promise.resolve(); await Promise.resolve(); await Promise.resolve(); await Promise.resolve() + }) + expect((mounted.host.querySelector('[data-research-pdf-page="2"]') as HappyDOMHTMLElement).style.height) + .toBe('159px') + + const lateRequests = harness.deferredPageRequests.filter((request) => !request.resolved) + await mounted.cleanup() + cleaned = true + lateRequests.forEach((request) => request.resolve()) + await Promise.resolve(); await Promise.resolve(); await Promise.resolve() + const latePages = harness.pages.filter((page) => lateRequests.some((request) => request.page === page.page)) + expect(latePages.length).toBeGreaterThan(0) + expect(latePages.every((page) => page.cleanups === 1)).toBe(true) + } finally { + if (!cleaned) await mounted.cleanup() + } + }) + + it('renders a continuous PDF stream, keeps wheel scrolling native, and cleans up pages outside the viewport', async () => { + const harness = createPdfJsHarness({ + deferRenders: true, resolveCancelledLate: true, rejectDestroy: true + }) + const releases: Array> = [] + const bodySize = { width: 318, height: 425 } + const resizeObserverCallbacks: Array<() => void> = [] + let restoreSequence = 0 + let cleaned = false + const mounted = await mountResearchCanvas({ + sessionId: 'session-pdf-lifecycle', + files: [{ + id: 'pdf-1', name: 'filing.pdf', source: 'computer', + authorizationId: 'authorization-pdf', contentType: 'application/pdf', + x: 200, y: 200, width: 320, height: 446, sizeMode: 'auto', aspectRatio: 17 / 22 + }], + pdfjs: harness.pdfjs, + pdfBodySize: bodySize, + resizeObserverCallbacks, + dshDesktop: { researchPreview: { + async restore(value) { + restoreSequence += 1 + return { + authorizationId: value.authorizationId, + capabilityToken: `capability-pdf-${restoreSequence}`, + url: `sherlock-preview://capability-pdf-${restoreSequence}/`, + contentType: 'application/pdf', name: 'filing.pdf' + } + }, + async release(value) { releases.push(value); return { ok: true } } + } } + }) + try { + await act(async () => { + mounted.workspace.setCanvasSize({ width: 800, height: 600 }) + await Promise.resolve(); await Promise.resolve(); await Promise.resolve() + }) + + const pdfBody = mounted.host.querySelector('[data-research-pdf-scroll]') as HappyDOMElement | null + const pdfCanvases = Array.from(mounted.host.querySelectorAll( + '[data-research-pdf-preview]' + )) as unknown as HTMLCanvasElement[] + expect(pdfBody).not.toBeNull() + expect(mounted.host.querySelectorAll('[data-research-pdf-page]')).toHaveLength(3) + expect(pdfCanvases).toHaveLength(2) + await act(async () => { + await Promise.resolve(); await Promise.resolve(); await Promise.resolve() + }) + expect(mounted.host.querySelector('[data-research-node-title]')?.textContent) + .toContain('filing.pdf') + expect(mounted.host.querySelector('[data-research-node-title]')?.textContent) + .toContain('1 / 3') + expect(mounted.workspace.getSnapshot().files[0]).toMatchObject({ + width: 320, height: 320 / 0.75 + 32, aspectRatio: 0.75, sizeMode: 'auto' + }) + expect(harness.getDocumentInputs[0]).toEqual({ + url: 'sherlock-preview://capability-pdf-1/', + cMapUrl: '/sherlock-pdfjs/cmaps/', + cMapPacked: true, + standardFontDataUrl: '/sherlock-pdfjs/standard_fonts/', + isEvalSupported: false, + useWasm: false, + maxImageSize: 8_000_000 + }) + expect(harness.renders.map(({ page }) => page)).toEqual([1, 2]) + expect(pdfCanvases.every((canvas) => canvas.width * canvas.height <= 8_000_000)).toBe(true) + if (pdfBody === null) return + const viewportBeforeWheel = mounted.workspace.getSnapshot().viewport + let bubbledWheels = 0 + mounted.browserWindow.document.addEventListener('wheel', () => { bubbledWheels += 1 }) + const plainWheel = new mounted.browserWindow.WheelEvent('wheel', { + bubbles: true, cancelable: true, deltaY: 80, deltaMode: 0 + }) + await act(async () => { + pdfBody.dispatchEvent(plainWheel) + await Promise.resolve(); await Promise.resolve() + }) + expect(plainWheel.defaultPrevented).toBe(false) + expect(bubbledWheels).toBe(0) + expect(mounted.workspace.getSnapshot().viewport).toEqual(viewportBeforeWheel) + + const metaWheel = new mounted.browserWindow.WheelEvent('wheel', { + bubbles: true, cancelable: true, deltaY: -100, deltaMode: 0 + }) + Object.defineProperties(metaWheel, { + metaKey: { value: true }, + clientX: { value: 320 }, + clientY: { value: 240 } + }) + await act(async () => { + pdfBody.dispatchEvent(metaWheel) + await Promise.resolve(); await Promise.resolve() + }) + const zoomed = mounted.workspace.getSnapshot().viewport + expect(metaWheel.defaultPrevented).toBe(true) + expect(bubbledWheels).toBe(1) + expect(zoomed.scale).toBeCloseTo(1.105170918, 8) + expect((320 - zoomed.x) / zoomed.scale).toBeCloseTo(320, 7) + expect((240 - zoomed.y) / zoomed.scale).toBeCloseTo(240, 7) + pdfBody.scrollTop = 872 + await act(async () => { + pdfBody.dispatchEvent(new mounted.browserWindow.Event('scroll', { bubbles: true })) + await Promise.resolve(); await Promise.resolve() + }) + expect(mounted.host.querySelector('[data-research-node-title]')?.textContent) + .toContain('3 / 3') + expect(harness.renders.map(({ page }) => page)).toEqual([1, 2, 3]) + expect(harness.renders[0]!.cancelled).toBe(1) + await act(async () => { + harness.renders[0]!.resolve() + await Promise.resolve(); await Promise.resolve() + }) + expect(mounted.host.querySelector('[data-research-pdf-preview][data-research-pdf-rendered-page="1"]')).toBeNull() + + await act(async () => { + bodySize.width = 398 + bodySize.height = 531 + ;(mounted.workspace as unknown as { + updateNodeGeometry(id: string, geometry: Record): void + }).updateNodeGeometry('pdf-1', { width: 400, height: 400 / 0.75 + 32 }) + resizeObserverCallbacks.at(-1)?.() + await Promise.resolve(); await Promise.resolve() + }) + expect(harness.renders.filter(({ page }) => page === 2 || page === 3).some(({ cancelled }) => cancelled >= 1)).toBe(true) + expect(harness.renders.at(-1)?.viewport.width).toBeCloseTo(398, 5) + + await act(async () => { mounted.workspace.setViewport({ scale: 1, x: -2_000, y: 0 }) }) + expect(mounted.host.querySelector('[data-research-pdf-preview]')).toBeNull() + expect(mounted.host.querySelector('[data-research-offscreen-placeholder]')).not.toBeNull() + expect(harness.loadingTasks[0]!.destroyed).toBe(1) + expect(harness.documents[0]!.destroyed).toBe(1) + expect(harness.loadingTasks[0]!.teardownThenCalls).toBe(1) + expect(harness.pages.every(({ cleanups }) => cleanups >= 1)).toBe(true) + expect(pdfCanvases.every((canvas) => canvas.width === 0 && canvas.height === 0)).toBe(true) + expect(releases).toEqual([{ + sessionId: 'session-pdf-lifecycle', nodeId: 'pdf-1', + authorizationId: 'authorization-pdf', capabilityToken: 'capability-pdf-1' + }]) + + await act(async () => { + mounted.workspace.setViewport({ scale: 1, x: 0, y: 0 }) + await Promise.resolve(); await Promise.resolve(); await Promise.resolve() + }) + expect(restoreSequence).toBe(2) + expect(mounted.host.querySelectorAll('[data-research-pdf-page]')).toHaveLength(3) + expect(mounted.workspace.getSnapshot().files[0]).toMatchObject({ + width: 400, height: 400 / 0.75 + 32, aspectRatio: 0.75, sizeMode: 'auto' + }) + await mounted.cleanup() + cleaned = true + expect(harness.loadingTasks[1]!.destroyed).toBe(1) + expect(harness.documents[1]!.destroyed).toBe(1) + expect(harness.loadingTasks[1]!.teardownThenCalls).toBe(1) + expect(releases.at(-1)).toEqual({ + sessionId: 'session-pdf-lifecycle', nodeId: 'pdf-1', + authorizationId: 'authorization-pdf', capabilityToken: 'capability-pdf-2' + }) + } finally { + if (!cleaned) await mounted.cleanup() + } + }) + + it('uses cached mixed-page dimensions and IntersectionObserver without changing placeholder offsets', async () => { + const harness = createPdfJsHarness({ + deferRenders: true, + pageSizes: [ + { width: 600, height: 800 }, + { width: 1_000, height: 500 }, + { width: 600, height: 1_200 } + ] + }) + const intersectionObserverCallbacks: Array<( + entries: Array<{ target: HappyDOMElement; isIntersecting: boolean }> + ) => void> = [] + const mounted = await mountResearchCanvas({ + sessionId: 'session-pdf-mixed-pages', + files: [{ + id: 'pdf-mixed', name: 'mixed.pdf', source: 'computer', + authorizationId: 'authorization-mixed', contentType: 'application/pdf', + x: 200, y: 200, width: 320, height: 446, sizeMode: 'auto', aspectRatio: 17 / 22 + }], + pdfjs: harness.pdfjs, + pdfBodySize: { width: 318, height: 200 }, + intersectionObserverCallbacks, + dshDesktop: { researchPreview: { + async restore(value) { + return { + authorizationId: value.authorizationId, capabilityToken: 'capability-mixed', + url: 'sherlock-preview://capability-mixed/', contentType: 'application/pdf', name: 'mixed.pdf' + } + }, + async release() { return { ok: true } } + } } + }) + try { + await act(async () => { + mounted.workspace.setCanvasSize({ width: 800, height: 600 }) + await Promise.resolve(); await Promise.resolve(); await Promise.resolve(); await Promise.resolve() + }) + const body = mounted.host.querySelector('[data-research-pdf-scroll]') as HappyDOMElement | null + const pages = Array.from(mounted.host.querySelectorAll( + '[data-research-pdf-page]' + )) as unknown as HappyDOMHTMLElement[] + expect(body).not.toBeNull() + expect(pages.map((page) => page.style.minHeight)).toEqual(['424px', '159px', '636px']) + expect(pages.map((page) => page.style.marginBottom)).toEqual(['12px', '12px', '0px']) + expect(intersectionObserverCallbacks).toHaveLength(1) + const stableHeights = pages.map((page) => page.style.minHeight) + await act(async () => { + intersectionObserverCallbacks[0]?.([ + { target: pages[0]!, isIntersecting: false }, + { target: pages[1]!, isIntersecting: false }, + { target: pages[2]!, isIntersecting: true } + ]) + await Promise.resolve(); await Promise.resolve() + }) + expect(mounted.host.querySelectorAll('[data-research-pdf-preview]')).toHaveLength(1) + expect(mounted.host.querySelector('[data-research-pdf-preview]')?.getAttribute('aria-label')).toContain('第 3 页') + if (body === null) return + body.scrollTop = 610 + await act(async () => { + body.dispatchEvent(new mounted.browserWindow.Event('scroll', { bubbles: true })) + await Promise.resolve(); await Promise.resolve() + }) + expect(mounted.host.querySelector('[data-research-node-title]')?.textContent).toContain('3 / 3') + expect(pages.map((page) => page.style.minHeight)).toEqual(stableHeights) + } finally { + await mounted.cleanup() + } + }) + + it('keeps a malformed PDF as a titled unavailable node without changing manual geometry', async () => { + const releases: Array> = [] + const mounted = await mountResearchCanvas({ + sessionId: 'session-pdf-error', + files: [{ + id: 'pdf-error', name: 'encrypted.pdf', source: 'computer', + authorizationId: 'authorization-error', contentType: 'application/pdf', + x: 200, y: 200, width: 540, height: 420, sizeMode: 'manual', aspectRatio: 1.4 + }], + pdfjs: { + getDocument() { + return { + destroy() {}, + promise: Promise.reject(new Error('PasswordException')) + } + } + }, + dshDesktop: { researchPreview: { + async restore(value) { + return { + authorizationId: value.authorizationId, capabilityToken: 'capability-error', + url: 'sherlock-preview://capability-error/', contentType: 'application/pdf', + name: 'encrypted.pdf' + } + }, + async release(value) { releases.push(value); return { ok: true } } + } } + }) + try { + await act(async () => { + mounted.workspace.setCanvasSize({ width: 800, height: 600 }) + await Promise.resolve(); await Promise.resolve(); await Promise.resolve() + }) + expect(mounted.host.querySelector('[data-research-node-title]')?.textContent) + .toContain('encrypted.pdf') + expect(mounted.host.querySelector('[data-research-pdf-error]')).not.toBeNull() + expect(mounted.workspace.getSnapshot().files[0]).toMatchObject({ + width: 540, height: 540 / 1.4 + 32, sizeMode: 'manual', aspectRatio: 1.4 + }) + expect(releases).toHaveLength(1) + } finally { + await mounted.cleanup() + } + }) + + it('sizes PDF backing from the bordered preview body across selection and manual resize', async () => { + const bodySize = { width: 318, height: 425 } + const resizeObserverCallbacks: Array<() => void> = [] + const harness = createPdfJsHarness({ pageCount: 1, pageWidth: 600, pageHeight: 800 }) + const mounted = await mountResearchCanvas({ + sessionId: 'session-pdf-body-size', + files: [{ + id: 'pdf-body-size', name: 'body-size.pdf', source: 'computer', + authorizationId: 'authorization-body-size', contentType: 'application/pdf', + x: 200, y: 200, width: 320, height: 320 / 0.75 + 32, + sizeMode: 'auto', aspectRatio: 0.75 + }], + pdfjs: harness.pdfjs, + pdfBodySize: bodySize, + resizeObserverCallbacks, + dshDesktop: { researchPreview: { + async restore(value) { + return { + authorizationId: value.authorizationId, + capabilityToken: 'capability-body-size', + url: 'sherlock-preview://capability-body-size/', + contentType: 'application/pdf', name: 'body-size.pdf' + } + }, + async release() { return { ok: true } } + } } + }) + try { + await act(async () => { + mounted.workspace.setCanvasSize({ width: 800, height: 600 }) + await Promise.resolve(); await Promise.resolve(); await Promise.resolve() + }) + const body = mounted.host.querySelector('[data-research-pdf-scroll]') as HappyDOMHTMLElement + const canvas = mounted.host.querySelector( + '[data-research-pdf-preview]' + ) as unknown as HTMLCanvasElement + expect(canvas.style.width).toBe('318px') + expect(canvas.width).toBeGreaterThan(0) + expect(canvas.height).toBeGreaterThan(0) + expect(body.scrollWidth).toBe(body.clientWidth) + expect(body.scrollHeight).toBe(body.clientHeight) + + bodySize.width = 316 + bodySize.height = 423 + await act(async () => { + mounted.workspace.setSelection({ + selectedNodeIds: ['pdf-body-size'], orderedFileIds: ['pdf-body-size'] + }) + resizeObserverCallbacks.at(-1)?.() + await Promise.resolve(); await Promise.resolve() + }) + expect(canvas.style.width).toBe('316px') + expect(body.scrollWidth).toBe(body.clientWidth) + expect(body.scrollHeight).toBe(body.clientHeight) + + bodySize.width = 396 + bodySize.height = 529 + await act(async () => { + ;(mounted.workspace as unknown as { + updateNodeGeometry(id: string, geometry: Record): void + }).updateNodeGeometry('pdf-body-size', { + width: 400, height: 400 / 0.75 + 32, sizeMode: 'manual' + }) + resizeObserverCallbacks.at(-1)?.() + await Promise.resolve(); await Promise.resolve() + }) + expect(canvas.style.width).toBe('396px') + expect(body.scrollWidth).toBe(body.clientWidth) + expect(body.scrollHeight).toBe(body.clientHeight) + } finally { + await mounted.cleanup() + } + }) + + it('waits for measured body bounds and fits landscape PDF pages in both dimensions', async () => { + const bodySize = { width: 0, height: 0 } + const resizeObserverCallbacks: Array<() => void> = [] + const harness = createPdfJsHarness({ pageCount: 1, pageWidth: 1_000, pageHeight: 500 }) + const mounted = await mountResearchCanvas({ + sessionId: 'session-pdf-landscape-body-size', + files: [{ + id: 'pdf-landscape', name: 'landscape.pdf', source: 'computer', + authorizationId: 'authorization-landscape', contentType: 'application/pdf', + x: 200, y: 200, width: 320, height: 192, + sizeMode: 'auto', aspectRatio: 2 + }], + pdfjs: harness.pdfjs, + pdfBodySize: bodySize, + resizeObserverCallbacks, + dshDesktop: { researchPreview: { + async restore(value) { + return { + authorizationId: value.authorizationId, + capabilityToken: 'capability-landscape', + url: 'sherlock-preview://capability-landscape/', + contentType: 'application/pdf', name: 'landscape.pdf' + } + }, + async release() { return { ok: true } } + } } + }) + try { + await act(async () => { + mounted.workspace.setCanvasSize({ width: 800, height: 600 }) + await Promise.resolve(); await Promise.resolve(); await Promise.resolve() + }) + expect(harness.pages).toEqual([{ page: 1, cleanups: 1 }]) + expect(harness.renders).toEqual([]) + + const body = mounted.host.querySelector('[data-research-pdf-scroll]') as HappyDOMHTMLElement + const canvas = mounted.host.querySelector( + '[data-research-pdf-preview]' + ) as unknown as HTMLCanvasElement + bodySize.width = 318 + bodySize.height = 158 + await act(async () => { + resizeObserverCallbacks.at(-1)?.() + await Promise.resolve(); await Promise.resolve() + }) + expect(canvas.style.width).toBe('316px') + expect(canvas.style.height).toBe('158px') + expect(body.scrollWidth).toBe(body.clientWidth) + expect(body.scrollHeight).toBe(body.clientHeight) + + bodySize.width = 316 + bodySize.height = 156 + await act(async () => { + mounted.workspace.setSelection({ + selectedNodeIds: ['pdf-landscape'], orderedFileIds: ['pdf-landscape'] + }) + resizeObserverCallbacks.at(-1)?.() + await Promise.resolve(); await Promise.resolve() + }) + expect(canvas.style.width).toBe('312px') + expect(canvas.style.height).toBe('156px') + expect(body.scrollWidth).toBe(body.clientWidth) + expect(body.scrollHeight).toBe(body.clientHeight) + + bodySize.width = 396 + bodySize.height = 196 + await act(async () => { + ;(mounted.workspace as unknown as { + updateNodeGeometry(id: string, geometry: Record): void + }).updateNodeGeometry('pdf-landscape', { + width: 400, height: 232, sizeMode: 'manual' + }) + resizeObserverCallbacks.at(-1)?.() + await Promise.resolve(); await Promise.resolve() + }) + expect(canvas.style.width).toBe('392px') + expect(canvas.style.height).toBe('196px') + expect(body.scrollWidth).toBe(body.clientWidth) + expect(body.scrollHeight).toBe(body.clientHeight) + expect(harness.renders.map(({ viewport }) => viewport.width)).toEqual([316, 312, 392]) + + await act(async () => { + mounted.workspace.setViewport({ scale: 1, x: -2_000, y: 0 }) + await Promise.resolve(); await Promise.resolve() + }) + expect(mounted.host.querySelector('[data-research-pdf-scroll]')).toBeNull() + const pagesBeforeReentry = harness.pages.length + const rendersBeforeReentry = harness.renders.length + bodySize.width = 0 + bodySize.height = 0 + await act(async () => { + mounted.workspace.setSelection({ selectedNodeIds: [], orderedFileIds: [] }) + ;(mounted.workspace as unknown as { + updateNodeGeometry(id: string, geometry: Record): void + }).updateNodeGeometry('pdf-landscape', { + width: 440, height: 252, sizeMode: 'manual' + }) + mounted.workspace.setViewport({ scale: 1, x: 0, y: 0 }) + await Promise.resolve(); await Promise.resolve(); await Promise.resolve() + }) + expect(mounted.host.querySelector('[data-research-pdf-scroll]')).not.toBeNull() + expect(harness.pages).toHaveLength(pagesBeforeReentry + 1) + expect(harness.pages.at(-1)).toMatchObject({ page: 1, cleanups: 1 }) + expect(harness.renders).toHaveLength(rendersBeforeReentry) + + bodySize.width = 438 + bodySize.height = 218 + await act(async () => { + resizeObserverCallbacks.at(-1)?.() + await Promise.resolve(); await Promise.resolve() + }) + const restoredBody = mounted.host.querySelector( + '[data-research-pdf-scroll]' + ) as HappyDOMHTMLElement + expect(harness.renders.map(({ viewport }) => viewport.width)).toEqual([316, 312, 392, 436]) + expect(restoredBody.scrollWidth).toBe(restoredBody.clientWidth) + expect(restoredBody.scrollHeight).toBe(restoredBody.clientHeight) + } finally { + await mounted.cleanup() + } + }) + + it('removes a failed PDF.js loader so a later visible retry can install a fresh module script', async () => { + const mounted = await mountResearchCanvas({ + sessionId: 'session-pdf-loader-retry', + files: [{ + id: 'pdf-loader', name: 'loader.pdf', source: 'computer', + authorizationId: 'authorization-loader', contentType: 'application/pdf', + x: 200, y: 200, width: 320, height: 446, sizeMode: 'auto', aspectRatio: 17 / 22 + }], + dshDesktop: { researchPreview: { + async restore(value) { + return { + authorizationId: value.authorizationId, capabilityToken: 'capability-loader', + url: 'sherlock-preview://capability-loader/', contentType: 'application/pdf', + name: 'loader.pdf' + } + }, + async release() { return { ok: true } } + } } + }) + try { + await act(async () => { + mounted.workspace.setCanvasSize({ width: 800, height: 600 }) + await Promise.resolve(); await Promise.resolve() + }) + const failedLoader = mounted.browserWindow.document.querySelector( + 'script[data-sherlock-pdfjs-loader]' + ) as HappyDOMElement | null + expect(failedLoader).not.toBeNull() + await act(async () => { + failedLoader?.dispatchEvent(new mounted.browserWindow.Event('error')) + await Promise.resolve(); await Promise.resolve() + }) + expect(mounted.host.querySelector('[data-research-pdf-error]')).not.toBeNull() + expect(mounted.browserWindow.document.querySelector( + 'script[data-sherlock-pdfjs-loader]' + )).toBeNull() + } finally { + await mounted.cleanup() + } + }) + + it('mounts interactive HTML only from a capability URL with the exact browser sandbox and releases it offscreen', async () => { + const releases: Array> = [] + let restoreSequence = 0 + const mounted = await mountResearchCanvas({ + sessionId: 'session-html-lifecycle', + files: [{ + id: 'html-1', name: 'model.html', source: 'computer', + authorizationId: 'authorization-html', contentType: 'text/html; charset=utf-8', + x: 200, y: 200, width: 480, height: 360, sizeMode: 'auto' + }], + dshDesktop: { researchPreview: { + async restore(value) { + restoreSequence += 1 + return { + authorizationId: value.authorizationId, + capabilityToken: `capability-html-${restoreSequence}`, + url: `sherlock-preview://capability-html-${restoreSequence}/`, + contentType: 'text/html; charset=utf-8', name: 'model.html' + } + }, + async release(value) { releases.push(value); return { ok: true } } + } } + }) + try { + await act(async () => { + mounted.workspace.setCanvasSize({ width: 800, height: 600 }) + await Promise.resolve(); await Promise.resolve() + }) + const frame = mounted.host.querySelector('[data-research-html-preview]') as HappyDOMElement | null + expect(frame).not.toBeNull() + expect(frame?.getAttribute('src')).toBe('sherlock-preview://capability-html-1/') + expect(frame?.getAttribute('srcdoc')).toBeNull() + expect(frame?.getAttribute('sandbox')).toBe('allow-scripts allow-same-origin allow-forms') + expect(frame?.getAttribute('referrerpolicy')).toBe('no-referrer') + expect(frame?.getAttribute('loading')).toBe('lazy') + expect(frame?.getAttribute('allow')).toBe( + "camera 'none'; microphone 'none'; geolocation 'none'; clipboard-read 'none'; clipboard-write 'none'; fullscreen 'none'; autoplay 'none'; payment 'none'; usb 'none'; serial 'none'; hid 'none'" + ) + expect(mounted.host.querySelector('[data-research-node-title]')?.textContent) + .toContain('model.html') + const card = mounted.host.querySelector('[data-research-file-card="html-1"]') as HappyDOMHTMLElement + expect(card.style.width).toBe('480px') + expect(card.style.height).toBe('360px') + expect(card.querySelector('[data-research-preview-shield]')).not.toBeNull() + const viewportBeforeWheel = mounted.workspace.getSnapshot().viewport + const htmlWheel = new mounted.browserWindow.WheelEvent('wheel', { + bubbles: true, cancelable: true, deltaY: 120 + }) + frame?.dispatchEvent(htmlWheel) + expect(htmlWheel.defaultPrevented).toBe(false) + expect(mounted.workspace.getSnapshot().viewport).toEqual(viewportBeforeWheel) + + await act(async () => { + mounted.workspace.setSelection({ selectedNodeIds: ['html-1'], orderedFileIds: ['html-1'] }) + }) + expect(mounted.host.querySelector('[data-research-html-preview]')).toBe(frame) + + ;(mounted.canvas as unknown as { focus(): void }).focus() + const shield = card.querySelector('[data-research-preview-shield]') as HappyDOMElement + await act(async () => { + mounted.browserWindow.dispatchEvent(new mounted.browserWindow.KeyboardEvent('keydown', { + code: 'Space', key: ' ', bubbles: true, cancelable: true + })) + }) + expect(mounted.browserWindow.getComputedStyle(shield).pointerEvents).toBe('auto') + await act(async () => { + mounted.browserWindow.dispatchEvent(new mounted.browserWindow.KeyboardEvent('keyup', { + code: 'Space', key: ' ', bubbles: true + })) + }) + expect(mounted.canvas.hasAttribute('data-space-pressed')).toBe(false) + + await act(async () => { mounted.workspace.setViewport({ scale: 1, x: -2_000, y: 0 }) }) + expect(mounted.host.querySelector('[data-research-html-preview]')).toBeNull() + expect(mounted.host.querySelector('[data-research-offscreen-placeholder]')).not.toBeNull() + expect(releases).toEqual([{ + sessionId: 'session-html-lifecycle', nodeId: 'html-1', + authorizationId: 'authorization-html', capabilityToken: 'capability-html-1' + }]) + await act(async () => { + mounted.workspace.setViewport({ scale: 1, x: 0, y: 0 }) + await Promise.resolve(); await Promise.resolve() + }) + expect(restoreSequence).toBe(2) + const restoredFrame = mounted.host.querySelector('[data-research-html-preview]') as HappyDOMElement | null + expect(restoredFrame?.getAttribute('src')) + .toBe('sherlock-preview://capability-html-2/') + } finally { + await mounted.cleanup() + } + }) + + it('releases an exact HTML capability whose restore resolves after unmount', async () => { + const pending = deferred | null>() + const releases: Array> = [] + const mounted = await mountResearchCanvas({ + sessionId: 'session-html-late-restore', + files: [{ + id: 'html-late', name: 'late.html', source: 'computer', + authorizationId: 'authorization-html-late', contentType: 'text/html; charset=utf-8', + x: 200, y: 200 + }], + dshDesktop: { researchPreview: { + async restore() { return pending.promise }, + async release(value) { releases.push(value); return { ok: true } } + } } + }) + await act(async () => { + mounted.workspace.setCanvasSize({ width: 800, height: 600 }) + await Promise.resolve() + }) + await mounted.cleanup() + pending.resolve({ + authorizationId: 'authorization-html-late', capabilityToken: 'capability-html-late', + url: 'sherlock-preview://capability-html-late/', contentType: 'text/html; charset=utf-8', + name: 'late.html' + }) + await Promise.resolve(); await Promise.resolve() + expect(releases).toEqual([{ + sessionId: 'session-html-late-restore', nodeId: 'html-late', + authorizationId: 'authorization-html-late', capabilityToken: 'capability-html-late' + }]) + }) + + it('admits only matching Better Sidebar preview identities and leaves mismatches generic', async () => { + const admissions: Array> = [] + const releases: Array> = [] + const mounted = await mountResearchCanvas({ + sessionId: 'session-sidebar-drop', + dshDesktop: { + researchPreview: { + async admitSidebarFile(value) { + admissions.push(value) + return { + authorizationId: 'authorization-sidebar', capabilityToken: 'capability-sidebar', + url: 'sherlock-preview://capability-sidebar/', contentType: 'image/png', + name: 'chart.png' + } + }, + async release(value) { releases.push(value); return { ok: true } }, + async restore() { return null } + } + } + }) + try { + const transfer = (sessionId: string, name = 'chart.png') => ({ + types: ['application/x-sherlock-file'], files: [], dropEffect: 'none', + getData: () => JSON.stringify({ + path: `/workspace/charts/${name}`, name, + sessionId, relativePath: `charts/${name}` + }) + }) + await act(async () => { + dispatchDrag(mounted.browserWindow, mounted.canvas, 'drop', transfer('session-sidebar-drop')) + await Promise.resolve() + await Promise.resolve() + }) + const admittedNode = mounted.workspace.getSnapshot().files[0] + expect(admissions).toEqual([{ + sessionId: 'session-sidebar-drop', nodeId: admittedNode?.id, + relativePath: 'charts/chart.png' + }]) + expect(admittedNode).toMatchObject({ + authorizationId: 'authorization-sidebar', contentType: 'image/png', + path: '/workspace/charts/chart.png', width: 320 + }) + expect(releases[0]).toEqual({ + sessionId: 'session-sidebar-drop', nodeId: admittedNode?.id, + authorizationId: 'authorization-sidebar', capabilityToken: 'capability-sidebar' + }) + + await act(async () => { + dispatchDrag(mounted.browserWindow, mounted.canvas, 'drop', { + types: ['application/x-sherlock-file'], files: [], dropEffect: 'none', + getData: () => JSON.stringify({ + path: '/workspace/charts/chart.png', name: 'forged.svg', + sessionId: 'other-session', relativePath: 'charts/chart.png' + }) + }, { x: 480, y: 180 }) + await Promise.resolve() + await Promise.resolve() + }) + expect(mounted.workspace.getSnapshot().files[0]).toMatchObject({ + id: admittedNode?.id, name: 'chart.png', path: '/workspace/charts/chart.png', + authorizationId: 'authorization-sidebar', contentType: 'image/png', + width: 320, x: 480, y: 180 + }) + expect(mounted.workspace.getSnapshot().files[0]).not.toHaveProperty('previewEligible') + + await act(async () => { + dispatchDrag(mounted.browserWindow, mounted.canvas, 'drop', { + types: ['application/x-sherlock-file'], files: [], dropEffect: 'none', + getData: () => JSON.stringify({ + path: '/workspace/charts/chart.png', name: 'legacy-forged.png' + }) + }, { x: 520, y: 220 }) + await Promise.resolve() + await Promise.resolve() + }) + expect(mounted.workspace.getSnapshot().files[0]).toMatchObject({ + id: admittedNode?.id, name: 'chart.png', + authorizationId: 'authorization-sidebar', contentType: 'image/png', + width: 320, x: 520, y: 220 + }) + + await act(async () => { + dispatchDrag(mounted.browserWindow, mounted.canvas, 'drop', transfer('session-sidebar-drop'), { x: 560, y: 260 }) + await Promise.resolve() + await Promise.resolve() + }) + expect(admissions).toHaveLength(1) + expect(mounted.workspace.getSnapshot().files[0]).toMatchObject({ + id: admittedNode?.id, name: 'chart.png', authorizationId: 'authorization-sidebar', + contentType: 'image/png', width: 320, x: 560, y: 260 + }) + + await act(async () => { + dispatchDrag(mounted.browserWindow, mounted.canvas, 'drop', transfer('other-session', 'other.png'), { x: 700, y: 200 }) + await Promise.resolve() + }) + expect(admissions).toHaveLength(1) + const mismatch = mounted.workspace.getSnapshot().files.find( + (node: Record) => node.x === 700 + ) + expect(mismatch).toMatchObject({ name: 'other.png', width: 220, height: 64 }) + expect(mismatch).not.toHaveProperty('authorizationId') + + await act(async () => { + dispatchDrag(mounted.browserWindow, mounted.canvas, 'drop', { + types: ['application/x-sherlock-file'], files: [], dropEffect: 'none', + getData: () => JSON.stringify({ + path: '/workspace/charts/legacy.png', name: 'legacy.png' + }) + }, { x: 800, y: 200 }) + await Promise.resolve() + }) + expect(admissions).toHaveLength(1) + const legacy = mounted.workspace.getSnapshot().files.find( + (node: Record) => node.x === 800 + ) + expect(legacy).toMatchObject({ name: 'legacy.png', width: 220, height: 64 }) + expect(legacy).not.toHaveProperty('authorizationId') + } finally { + await mounted.cleanup() + } + }) + + it('generates a Finder node id before admission and durably revokes that node on Delete', async () => { + const admissions: Array<{ file: File; identity: Record }> = [] + const revocations: Array> = [] + const mounted = await mountResearchCanvas({ + sessionId: 'session-finder-drop', + dshDesktop: { + getPathForFile: () => '/workspace/diagram.svg', + researchPreview: { + async admitFinderFile(file, identity) { + admissions.push({ file, identity }) + return { + authorizationId: 'authorization-finder', capabilityToken: 'capability-finder', + url: 'sherlock-preview://capability-finder/', contentType: 'image/svg+xml', + name: 'diagram.svg' + } + }, + async release() { return { ok: true } }, + async restore() { return null }, + async revokeNode(value) { revocations.push(value); return { ok: true } } + } + } + }) + try { + const file = { name: 'diagram.svg', type: 'image/svg+xml' } as File + await act(async () => { + dispatchDrag(mounted.browserWindow, mounted.canvas, 'drop', { + types: ['Files'], files: [file], dropEffect: 'none', getData: () => '' + }) + await Promise.resolve() + await Promise.resolve() + }) + const node = mounted.workspace.getSnapshot().files[0] + expect(node?.id).toBeTypeOf('string') + if (typeof node?.id !== 'string') return + expect(admissions).toEqual([{ file, identity: { + sessionId: 'session-finder-drop', nodeId: node.id + } }]) + expect(node).toMatchObject({ + name: 'diagram.svg', authorizationId: 'authorization-finder', + contentType: 'image/svg+xml', width: 320 + }) + expect(node).toMatchObject({ path: '/workspace/diagram.svg' }) + mounted.workspace.setSelection({ selectedNodeIds: [node.id], orderedFileIds: [node.id] }) + expect(mounted.workspace.selectedFiles()).toMatchObject([{ + id: node?.id, name: 'diagram.svg', path: '/workspace/diagram.svg' + }]) + const prompt = (mounted.client.serializeResearchPrompt as ( + files: Array>, text: string + ) => string)(mounted.workspace.selectedFiles(), 'inspect') + expect((mounted.client.parseResearchPrompt as (value: string) => { + files: Array> + })(prompt).files).toMatchObject([{ + id: node?.id, name: 'diagram.svg', path: '/workspace/diagram.svg' + }]) + + await act(async () => { + dispatchDrag(mounted.browserWindow, mounted.canvas, 'drop', { + types: ['Files'], files: [file], dropEffect: 'none', getData: () => '' + }, { x: 640, y: 260 }) + await Promise.resolve() + await Promise.resolve() + }) + const redropped = mounted.workspace.getSnapshot().files[0] + expect(redropped?.id).toBeTypeOf('string') + if (typeof redropped?.id !== 'string') return + expect(admissions).toHaveLength(1) + expect(mounted.workspace.getSnapshot().files).toHaveLength(1) + expect(redropped).toMatchObject({ + id: node?.id, authorizationId: 'authorization-finder', + x: 640, y: 260 + }) + + mounted.workspace.setSelection({ selectedNodeIds: [redropped.id], orderedFileIds: [redropped.id] }) + ;(mounted.canvas as unknown as { focus(): void }).focus() + await act(async () => { + mounted.browserWindow.dispatchEvent(new mounted.browserWindow.KeyboardEvent('keydown', { + key: 'Delete', code: 'Delete', bubbles: true, cancelable: true + })) + }) + expect(revocations).toEqual([{ + sessionId: 'session-finder-drop', nodeId: redropped?.id + }]) + expect(mounted.workspace.getSnapshot().files).toEqual([]) + } finally { + await mounted.cleanup() + } + }) + + it.each(['finder', 'sidebar'] as const)( + 'durably journals a %s node before admission and clears it only after rich persistence', + async (source) => { + const storage = new MemoryStorage() + const sessionId = `session-prejournal-${source}` + const outboxKey = `sherlock.research.canvas.preview-revocations.v1:${sessionId}` + const admissions: Array> = [] + const revocations: Array> = [] + const admit = async (identity: Record) => { + admissions.push(identity) + expect(JSON.parse(storage.getItem(outboxKey) ?? '[]')).toEqual([identity.nodeId]) + return { + authorizationId: `authorization-${source}`, + capabilityToken: `capability-${source}`, + url: `sherlock-preview://capability-${source}/`, + contentType: 'image/png', + name: `${source}.png` + } + } + const mounted = await mountResearchCanvas({ + sessionId, + storage, + dshDesktop: { + getPathForFile: () => `/workspace/${source}.png`, + researchPreview: { + admitFinderFile: (_file, identity) => admit(identity), + admitSidebarFile: (value) => admit(value), + async release() { return { ok: true } }, + async restore() { return null }, + async revokeNode(value) { revocations.push(value); return { ok: true } } + } + } + }) + try { + const transfer = source === 'finder' + ? { + types: ['Files'], files: [{ name: 'finder.png', type: 'image/png' } as File], + dropEffect: 'none', getData: () => '' + } + : { + types: ['application/x-sherlock-file'], files: [], dropEffect: 'none', + getData: () => JSON.stringify({ + path: '/workspace/sidebar.png', name: 'sidebar.png', sessionId, + relativePath: 'sidebar.png' + }) + } + await act(async () => { + dispatchDrag(mounted.browserWindow, mounted.canvas, 'drop', transfer) + await Promise.resolve() + await Promise.resolve() + await Promise.resolve() + }) + + expect(admissions).toHaveLength(1) + expect(mounted.workspace.getSnapshot().files[0]).toMatchObject({ + id: admissions[0]?.nodeId, + authorizationId: `authorization-${source}`, + contentType: 'image/png' + }) + expect(JSON.parse(storage.getItem(outboxKey) ?? '[]')).toEqual([]) + expect(revocations).toEqual([]) + } finally { + await mounted.cleanup() + } + } + ) + + it('does not call preview admission when the durable pre-journal write fails', async () => { + const values = new Map() + const sessionId = 'session-prejournal-rejected' + const storage = { + getItem: (key: string) => values.get(key) ?? null, + setItem(key: string, value: string) { + if (key.startsWith('sherlock.research.canvas.preview-revocations.v1:')) return false + values.set(key, value) + return true + } + } + let admissions = 0 + const mounted = await mountResearchCanvas({ + sessionId, + storage, + dshDesktop: { + getPathForFile: () => '/workspace/rejected.png', + researchPreview: { + async admitFinderFile() { admissions += 1; return null }, + async release() { return { ok: true } }, + async restore() { return null }, + async revokeNode() { return { ok: true } } + } + } + }) + try { + await act(async () => { + dispatchDrag(mounted.browserWindow, mounted.canvas, 'drop', { + types: ['Files'], files: [{ name: 'rejected.png', type: 'image/png' } as File], + dropEffect: 'none', getData: () => '' + }) + await Promise.resolve() + await Promise.resolve() + }) + + expect(admissions).toBe(0) + expect(mounted.workspace.pendingOrphanRevocations()).toEqual([]) + expect(mounted.workspace.getSnapshot().files[0]).toMatchObject({ + name: 'rejected.png', previewEligible: false + }) + } finally { + await mounted.cleanup() + } + }) + + it('keeps the later rich authorization when one batch repeats a path after a lost response', async () => { + const storage = new MemoryStorage() + const sessionId = 'session-batch-same-path-journal' + const admissions: Array> = [] + const revocations: Array> = [] + const mounted = await mountResearchCanvas({ + sessionId, + storage, + dshDesktop: { + getPathForFile: () => '/workspace/repeated.png', + researchPreview: { + async admitFinderFile(_file, identity) { + admissions.push(identity) + if (admissions.length === 1) throw new Error('first response lost') + return { + authorizationId: 'authorization-repeated', + capabilityToken: 'capability-repeated', + url: 'sherlock-preview://capability-repeated/', + contentType: 'image/png', name: 'repeated.png' + } + }, + async release() { return { ok: true } }, + async restore() { return null }, + async revokeNode(value) { revocations.push(value); return { ok: true } } + } + } + }) + try { + const files = [ + { name: 'repeated.png', type: 'image/png' } as File, + { name: 'repeated.png', type: 'image/png' } as File + ] + await act(async () => { + dispatchDrag(mounted.browserWindow, mounted.canvas, 'drop', { + types: ['Files'], files, dropEffect: 'none', getData: () => '' + }) + await Promise.resolve() + await Promise.resolve() + await Promise.resolve() + }) + + expect(admissions).toHaveLength(2) + expect(admissions[0]?.nodeId).toBe(admissions[1]?.nodeId) + expect(mounted.workspace.getSnapshot().files).toMatchObject([{ + id: admissions[0]?.nodeId, + authorizationId: 'authorization-repeated', + contentType: 'image/png' + }]) + expect(revocations).toEqual([]) + expect(mounted.workspace.pendingOrphanRevocations()).toEqual([]) + } finally { + await mounted.cleanup() + } + }) + + it('keeps the current drop lifecycle active after StrictMode effect replay', async () => { + const revocations: Array> = [] + const mounted = await mountResearchCanvas({ + sessionId: 'session-strict-lifecycle', + strictMode: true, + dshDesktop: { + getPathForFile: () => '/workspace/strict.png', + researchPreview: { + async admitFinderFile() { + return { + authorizationId: 'authorization-strict', capabilityToken: 'capability-strict', + url: 'sherlock-preview://capability-strict/', contentType: 'image/png', + name: 'strict.png' + } + }, + async release() { return { ok: true } }, + async restore() { return null }, + async revokeNode(value) { revocations.push(value); return { ok: true } } + } + } + }) + try { + await act(async () => { + dispatchDrag(mounted.browserWindow, mounted.canvas, 'drop', { + types: ['Files'], files: [{ name: 'strict.png', type: 'image/png' } as File], + dropEffect: 'none', getData: () => '' + }) + await Promise.resolve() + await Promise.resolve() + }) + + expect(mounted.workspace.getSnapshot().files[0]).toMatchObject({ + authorizationId: 'authorization-strict', contentType: 'image/png' + }) + expect(revocations).toEqual([]) + } finally { + await mounted.cleanup() + } + }) + + it('revokes a journaled admission when the rich files write is rejected before restart', async () => { + const values = new Map() + const events: string[] = [] + const sessionId = 'session-files-partial-write' + const filesKey = `sherlock.research.canvas.files.v1:${sessionId}` + const outboxKey = `sherlock.research.canvas.preview-revocations.v1:${sessionId}` + let rejectRichFiles = false + const storage = { + getItem: (key: string) => values.get(key) ?? null, + setItem(key: string, value: string) { + if (key === filesKey && rejectRichFiles && value.includes('authorization-files-failed')) { + events.push('files:rejected') + return false + } + values.set(key, value) + if (key === outboxKey) events.push(`outbox:${value}`) + return true + } + } + const revocations: Array> = [] + const firstMount = await mountResearchCanvas({ + sessionId, + storage, + dshDesktop: { + getPathForFile: () => '/workspace/files-failed.png', + researchPreview: { + async admitFinderFile() { + return { + authorizationId: 'authorization-files-failed', + capabilityToken: 'capability-files-failed', + url: 'sherlock-preview://capability-files-failed/', + contentType: 'image/png', name: 'files-failed.png' + } + }, + async release() { return { ok: true } }, + async restore() { return null }, + async revokeNode(value) { + revocations.push(value) + events.push('revoke') + return { ok: true } + } + } + } + }) + let firstCleaned = false + try { + rejectRichFiles = true + await act(async () => { + dispatchDrag(firstMount.browserWindow, firstMount.canvas, 'drop', { + types: ['Files'], + files: [{ name: 'files-failed.png', type: 'image/png' } as File], + dropEffect: 'none', getData: () => '' + }) + await Promise.resolve() + await Promise.resolve() + await Promise.resolve() + }) + + expect(revocations).toHaveLength(1) + expect(JSON.parse(values.get(filesKey) ?? '[]')).toEqual([]) + expect(JSON.parse(values.get(outboxKey) ?? '[]')).toEqual([]) + expect(events.indexOf('revoke')).toBeGreaterThan(events.indexOf('files:rejected')) + expect(events.indexOf('outbox:[]')).toBeGreaterThan(events.indexOf('revoke')) + await firstMount.cleanup() + firstCleaned = true + + const restartRevocations: Array> = [] + const secondMount = await mountResearchCanvas({ + sessionId, + files: JSON.parse(values.get(filesKey) ?? '[]'), + storage, + dshDesktop: { researchPreview: { + async restore() { return null }, + async release() { return { ok: true } }, + async revokeNode(value) { restartRevocations.push(value); return { ok: true } } + } } + }) + try { + await act(async () => { await Promise.resolve(); await Promise.resolve() }) + expect(secondMount.workspace.getSnapshot().files).toEqual([]) + expect(secondMount.workspace.pendingOrphanRevocations()).toEqual([]) + expect(restartRevocations).toEqual([]) + } finally { + await secondMount.cleanup() + } + } finally { + if (!firstCleaned) await firstMount.cleanup() + } + }) + + it('retries journal completion without revoking a durable rich file after restart', async () => { + const values = new Map() + const sessionId = 'session-outbox-clear-partial-write' + const filesKey = `sherlock.research.canvas.files.v1:${sessionId}` + const outboxKey = `sherlock.research.canvas.preview-revocations.v1:${sessionId}` + let remainingClearFailures = 2 + let clearAttempts = 0 + const storage = { + getItem: (key: string) => values.get(key) ?? null, + setItem(key: string, value: string) { + if (key === outboxKey && value === '[]') { + clearAttempts += 1 + if (remainingClearFailures > 0) { + remainingClearFailures -= 1 + return false + } + } + values.set(key, value) + return true + } + } + const firstRevocations: Array> = [] + const firstMount = await mountResearchCanvas({ + sessionId, + storage, + dshDesktop: { + getPathForFile: () => '/workspace/durable.png', + researchPreview: { + async admitFinderFile() { + return { + authorizationId: 'authorization-durable', capabilityToken: 'capability-durable', + url: 'sherlock-preview://capability-durable/', contentType: 'image/png', + name: 'durable.png' + } + }, + async release() { return { ok: true } }, + async restore() { return null }, + async revokeNode(value) { firstRevocations.push(value); return { ok: true } } + } + } + }) + let firstCleaned = false + try { + await act(async () => { + dispatchDrag(firstMount.browserWindow, firstMount.canvas, 'drop', { + types: ['Files'], files: [{ name: 'durable.png', type: 'image/png' } as File], + dropEffect: 'none', getData: () => '' + }) + await Promise.resolve() + await Promise.resolve() + await Promise.resolve() + }) + const durableNode = JSON.parse(values.get(filesKey) ?? '[]')[0] as Record + expect(durableNode).toMatchObject({ + authorizationId: 'authorization-durable', contentType: 'image/png' + }) + expect(JSON.parse(values.get(outboxKey) ?? '[]')).toEqual([durableNode.id]) + expect(firstRevocations).toEqual([]) + await firstMount.cleanup() + firstCleaned = true + + const restartRevocations: Array> = [] + const secondMount = await mountResearchCanvas({ + sessionId, + files: [durableNode], + storage, + dshDesktop: { researchPreview: { + async restore() { return null }, + async release() { return { ok: true } }, + async revokeNode(value) { restartRevocations.push(value); return { ok: true } } + } } + }) + try { + await act(async () => { await Promise.resolve(); await Promise.resolve() }) + expect(clearAttempts).toBe(2) + expect(restartRevocations).toEqual([]) + expect(JSON.parse(values.get(outboxKey) ?? '[]')).toEqual([durableNode.id]) + expect(secondMount.workspace.getSnapshot().files[0]).toMatchObject({ + id: durableNode.id, authorizationId: 'authorization-durable' + }) + } finally { + await secondMount.cleanup() + } + } finally { + if (!firstCleaned) await firstMount.cleanup() + } + }) + + it('retries a pre-journaled admission whose IPC response was lost on the next mount', async () => { + const storage = new MemoryStorage() + const sessionId = 'session-prejournal-lost-response' + const outboxKey = `sherlock.research.canvas.preview-revocations.v1:${sessionId}` + const firstRevocations: Array> = [] + const firstMount = await mountResearchCanvas({ + sessionId, + storage, + dshDesktop: { + getPathForFile: () => '/workspace/lost.png', + researchPreview: { + async admitFinderFile() { throw new Error('response lost') }, + async release() { return { ok: true } }, + async restore() { return null }, + async revokeNode(value) { firstRevocations.push(value); return { ok: false } } + } + } + }) + let firstCleaned = false + try { + await act(async () => { + dispatchDrag(firstMount.browserWindow, firstMount.canvas, 'drop', { + types: ['Files'], files: [{ name: 'lost.png', type: 'image/png' } as File], + dropEffect: 'none', getData: () => '' + }) + await Promise.resolve() + await Promise.resolve() + await Promise.resolve() + }) + const orphanNodeId = firstRevocations[0]?.nodeId + expect(orphanNodeId).toBeTypeOf('string') + expect(JSON.parse(storage.getItem(outboxKey) ?? '[]')).toEqual([orphanNodeId]) + const persistedFiles = firstMount.workspace.getSnapshot().files + await firstMount.cleanup() + firstCleaned = true + + const retryCalls: Array> = [] + const secondMount = await mountResearchCanvas({ + sessionId, + files: persistedFiles, + storage, + dshDesktop: { researchPreview: { + async restore() { return null }, + async release() { return { ok: true } }, + async revokeNode(value) { retryCalls.push(value); return { ok: true } } + } } + }) + try { + await act(async () => { + await Promise.resolve() + await Promise.resolve() + }) + expect(retryCalls).toEqual([{ sessionId, nodeId: orphanNodeId }]) + expect(JSON.parse(storage.getItem(outboxKey) ?? '[]')).toEqual([]) + } finally { + await secondMount.cleanup() + } + } finally { + if (!firstCleaned) await firstMount.cleanup() + } + }) + + it('blocks a second mount admission while the first mount response is still deferred', async () => { + const storage = new MemoryStorage() + const sessionId = 'session-prejournal-cross-mount' + const outboxKey = `sherlock.research.canvas.preview-revocations.v1:${sessionId}` + const firstAdmission = deferred | null>() + const secondRevocation = deferred<{ ok: boolean }>() + const firstAdmissions: Array> = [] + const firstRevocations: Array> = [] + const firstMount = await mountResearchCanvas({ + sessionId, + storage, + dshDesktop: { + getPathForFile: () => '/workspace/first.png', + researchPreview: { + admitFinderFile(_file, identity) { + firstAdmissions.push(identity) + return firstAdmission.promise + }, + async release() { return { ok: true } }, + async restore() { return null }, + async revokeNode(value) { firstRevocations.push(value); return { ok: true } } + } + } + }) + await act(async () => { + dispatchDrag(firstMount.browserWindow, firstMount.canvas, 'drop', { + types: ['Files'], files: [{ name: 'first.png', type: 'image/png' } as File], + dropEffect: 'none', getData: () => '' + }) + await Promise.resolve() + }) + expect(firstAdmissions).toHaveLength(1) + expect(JSON.parse(storage.getItem(outboxKey) ?? '[]')).toEqual([ + firstAdmissions[0]?.nodeId + ]) + await firstMount.cleanup() + + const secondAdmissions: Array> = [] + const secondRevocations: Array> = [] + const secondMount = await mountResearchCanvas({ + sessionId, + storage, + dshDesktop: { + getPathForFile: () => '/workspace/second.png', + researchPreview: { + async admitFinderFile(_file, identity) { secondAdmissions.push(identity); return null }, + async release() { return { ok: true } }, + async restore() { return null }, + revokeNode(value) { secondRevocations.push(value); return secondRevocation.promise } + } + } + }) + try { + await act(async () => { + dispatchDrag(secondMount.browserWindow, secondMount.canvas, 'drop', { + types: ['Files'], files: [{ name: 'second.png', type: 'image/png' } as File], + dropEffect: 'none', getData: () => '' + }) + await Promise.resolve() + await Promise.resolve() + }) + expect(secondRevocations).toEqual([{ + sessionId, nodeId: firstAdmissions[0]?.nodeId + }]) + expect(secondAdmissions).toEqual([]) + expect(secondMount.workspace.getSnapshot().files[0]).toMatchObject({ + path: '/workspace/second.png', previewEligible: false + }) + + firstAdmission.resolve({ + authorizationId: 'authorization-first', capabilityToken: 'capability-first', + url: 'sherlock-preview://capability-first/', contentType: 'image/png', name: 'first.png' + }) + await act(async () => { + await firstAdmission.promise + await Promise.resolve() + await Promise.resolve() + }) + expect(firstRevocations).toEqual([{ + sessionId, nodeId: firstAdmissions[0]?.nodeId + }]) + expect(JSON.parse( + storage.getItem(`sherlock.research.canvas.files.v1:${sessionId}`) ?? '[]' + )).toMatchObject([{ + path: '/workspace/second.png', previewEligible: false + }]) + } finally { + secondRevocation.resolve({ ok: false }) + await secondMount.cleanup() + } + }) + + it('serializes simultaneous Finder drops so a same-path node keeps one durable identity', async () => { + const admission = deferred | null>() + const admissions: Array<{ file: File; identity: Record }> = [] + const mounted = await mountResearchCanvas({ + sessionId: 'session-concurrent-finder', + dshDesktop: { + getPathForFile: () => '/workspace/chart.png', + researchPreview: { + admitFinderFile(file, identity) { + admissions.push({ file, identity }) + return admission.promise + }, + async release() { return { ok: true } }, + async restore() { return null }, + async revokeNode() { return { ok: true } } + } + } + }) + try { + const file = { name: 'chart.png', type: 'image/png' } as File + await act(async () => { + dispatchDrag(mounted.browserWindow, mounted.canvas, 'drop', { + types: ['Files'], files: [file], dropEffect: 'none', getData: () => '' + }, { x: 100, y: 120 }) + dispatchDrag(mounted.browserWindow, mounted.canvas, 'drop', { + types: ['Files'], files: [file], dropEffect: 'none', getData: () => '' + }, { x: 460, y: 280 }) + await Promise.resolve() + }) + expect(admissions).toHaveLength(1) + admission.resolve({ + authorizationId: 'authorization-stable', capabilityToken: 'capability-stable', + url: 'sherlock-preview://capability-stable/', contentType: 'image/png', name: 'chart.png' + }) + await act(async () => { + await admission.promise + await Promise.resolve() + await Promise.resolve() + await Promise.resolve() + }) + + expect(admissions).toHaveLength(1) + expect(mounted.workspace.getSnapshot().files).toHaveLength(1) + expect(mounted.workspace.getSnapshot().files[0]).toMatchObject({ + id: admissions[0]?.identity.nodeId, + authorizationId: 'authorization-stable', + path: '/workspace/chart.png', + x: 460, + y: 280 + }) + } finally { + await mounted.cleanup() + } + }) + + it('admits only remaining canvas capacity and revokes an admitted node that loses its slot', async () => { + const admission = deferred | null>() + const admissions: Array> = [] + const revocations: Array> = [] + const initialFiles = Array.from({ length: 255 }, (_, index) => ({ + id: `existing-${index}`, path: `/workspace/existing-${index}.txt`, + name: `existing-${index}.txt`, source: 'computer', x: index, y: index + })) + const mounted = await mountResearchCanvas({ + sessionId: 'session-capacity-finder', + files: initialFiles, + dshDesktop: { + getPathForFile: (file) => `/workspace/${file.name}`, + researchPreview: { + admitFinderFile(_file, identity) { + admissions.push(identity) + return admission.promise + }, + async release() { return { ok: true } }, + async restore() { return null }, + async revokeNode(value) { revocations.push(value); return { ok: true } } + } + } + }) + try { + const first = { name: 'first.png', type: 'image/png' } as File + const second = { name: 'second.png', type: 'image/png' } as File + await act(async () => { + dispatchDrag(mounted.browserWindow, mounted.canvas, 'drop', { + types: ['Files'], files: [first, second], dropEffect: 'none', getData: () => '' + }) + await Promise.resolve() + }) + expect(admissions).toHaveLength(1) + + await act(async () => { + ;(mounted.workspace as unknown as { setFiles(files: Array>): void }) + .setFiles([...mounted.workspace.getSnapshot().files, { + id: 'fills-final-slot', path: '/workspace/fill.txt', name: 'fill.txt', + source: 'computer', x: 0, y: 0 + }]) + }) + admission.resolve({ + authorizationId: 'authorization-orphan', capabilityToken: 'capability-orphan', + url: 'sherlock-preview://capability-orphan/', contentType: 'image/png', name: 'first.png' + }) + await act(async () => { + await admission.promise + await Promise.resolve() + await Promise.resolve() + await Promise.resolve() + }) + + expect(admissions).toHaveLength(1) + expect(mounted.workspace.getSnapshot().files).toHaveLength(256) + expect(mounted.workspace.getSnapshot().files.some( + (node: Record) => node.authorizationId === 'authorization-orphan' + )).toBe(false) + expect(revocations).toEqual([{ + sessionId: 'session-capacity-finder', nodeId: admissions[0]?.nodeId + }]) + } finally { + await mounted.cleanup() + } + }) + + it('persists failed orphan cleanup and retries it on the next canvas mount without resurrecting a node', async () => { + const storage = new MemoryStorage() + const admission = deferred | null>() + const cleanupAttempt = deferred<{ ok: boolean }>() + const admissions: Array> = [] + const revocations: Array> = [] + const initialFiles = Array.from({ length: 255 }, (_, index) => ({ + id: `outbox-existing-${index}`, path: `/workspace/outbox-existing-${index}.txt`, + name: `outbox-existing-${index}.txt`, source: 'computer', x: index, y: index + })) + const sessionId = 'session-orphan-outbox' + const outboxKey = `sherlock.research.canvas.preview-revocations.v1:${sessionId}` + const firstMount = await mountResearchCanvas({ + sessionId, + files: initialFiles, + storage, + dshDesktop: { + getPathForFile: () => '/workspace/orphan.png', + researchPreview: { + admitFinderFile(_file, identity) { admissions.push(identity); return admission.promise }, + async release() { return { ok: true } }, + async restore() { return null }, + revokeNode(value) { revocations.push(value); return cleanupAttempt.promise } + } + } + }) + let firstCleaned = false + try { + const file = { name: 'orphan.png', type: 'image/png' } as File + await act(async () => { + dispatchDrag(firstMount.browserWindow, firstMount.canvas, 'drop', { + types: ['Files'], files: [file], dropEffect: 'none', getData: () => '' + }) + await Promise.resolve() + }) + expect(admissions).toHaveLength(1) + await act(async () => { + ;(firstMount.workspace as unknown as { setFiles(files: Array>): void }) + .setFiles([...firstMount.workspace.getSnapshot().files, { + id: 'outbox-fills-final-slot', path: '/workspace/outbox-fill.txt', + name: 'outbox-fill.txt', source: 'computer', x: 0, y: 0 + }]) + }) + admission.resolve({ + authorizationId: 'authorization-outbox', capabilityToken: 'capability-outbox', + url: 'sherlock-preview://capability-outbox/', contentType: 'image/png', name: 'orphan.png' + }) + await act(async () => { + await admission.promise + await Promise.resolve() + await Promise.resolve() + await Promise.resolve() + }) + const orphanNodeId = revocations[0]?.nodeId + expect(orphanNodeId).toBeTypeOf('string') + expect(JSON.parse(storage.getItem(outboxKey) ?? '[]')).toEqual([orphanNodeId]) + expect(firstMount.workspace.getSnapshot().files.some( + (node: Record) => node.authorizationId === 'authorization-outbox' + )).toBe(false) + + cleanupAttempt.resolve({ ok: false }) + await act(async () => { await cleanupAttempt.promise; await Promise.resolve() }) + expect(JSON.parse(storage.getItem(outboxKey) ?? '[]')).toEqual([orphanNodeId]) + await firstMount.cleanup() + firstCleaned = true + + const persistedFiles = JSON.parse( + storage.getItem(`sherlock.research.canvas.files.v1:${sessionId}`) ?? '[]' + ) as Array> + const retryCalls: Array> = [] + const secondMount = await mountResearchCanvas({ + sessionId, + files: persistedFiles, + storage, + dshDesktop: { researchPreview: { + async restore() { return null }, + async release() { return { ok: true } }, + async revokeNode(value) { retryCalls.push(value); return { ok: true } } + } } + }) + try { + await act(async () => { + await Promise.resolve() + await Promise.resolve() + await Promise.resolve() + }) + expect(retryCalls).toEqual([{ sessionId, nodeId: orphanNodeId }]) + expect(JSON.parse(storage.getItem(outboxKey) ?? '[]')).toEqual([]) + expect(secondMount.workspace.getSnapshot().files).toHaveLength(256) + expect(secondMount.workspace.getSnapshot().files.some( + (node: Record) => node.id === orphanNodeId || + node.authorizationId === 'authorization-outbox' + )).toBe(false) + } finally { + await secondMount.cleanup() + } + } finally { + if (!firstCleaned) { + cleanupAttempt.resolve({ ok: false }) + await firstMount.cleanup() + } + } + }) + + it('keeps an authorized node visible until durable revocation succeeds and allows retry after remount', async () => { + const storage = new MemoryStorage() + const previewFile = { + id: 'authorized-file', path: '/workspace/authorized.png', name: 'authorized.png', + source: 'computer', authorizationId: 'authorization-delete', contentType: 'image/png', + x: 100, y: 100, width: 320, height: 272 + } + const firstAttempt = deferred<{ ok: boolean }>() + const firstCalls: Array> = [] + const firstMount = await mountResearchCanvas({ + sessionId: 'session-delete-retry', files: [previewFile], storage, + dshDesktop: { researchPreview: { + async restore() { return null }, + async release() { return { ok: true } }, + revokeNode(value) { firstCalls.push(value); return firstAttempt.promise } + } } + }) + try { + firstMount.workspace.setSelection({ + selectedNodeIds: ['authorized-file'], orderedFileIds: ['authorized-file'] + }) + ;(firstMount.canvas as unknown as { focus(): void }).focus() + await act(async () => { + firstMount.browserWindow.dispatchEvent(new firstMount.browserWindow.KeyboardEvent('keydown', { + key: 'Delete', code: 'Delete', bubbles: true, cancelable: true + })) + firstMount.browserWindow.dispatchEvent(new firstMount.browserWindow.KeyboardEvent('keydown', { + key: 'Delete', code: 'Delete', bubbles: true, cancelable: true + })) + await Promise.resolve() + }) + expect(firstCalls).toEqual([{ sessionId: 'session-delete-retry', nodeId: 'authorized-file' }]) + expect(firstMount.workspace.getSnapshot().files).toHaveLength(1) + firstAttempt.resolve({ ok: false }) + await act(async () => { await firstAttempt.promise; await Promise.resolve() }) + expect(firstMount.workspace.getSnapshot().files).toHaveLength(1) + } finally { + await firstMount.cleanup() + } + + const persistedFiles = JSON.parse( + storage.getItem('sherlock.research.canvas.files.v1:session-delete-retry') ?? '[]' + ) as Array> + const outcomes: Array<'reject' | 'success'> = ['reject', 'success'] + const retryCalls: Array> = [] + const secondMount = await mountResearchCanvas({ + sessionId: 'session-delete-retry', files: persistedFiles, storage, + dshDesktop: { researchPreview: { + async restore() { return null }, + async release() { return { ok: true } }, + async revokeNode(value) { + retryCalls.push(value) + if (outcomes.shift() === 'reject') throw new Error('temporary IPC failure') + return { ok: true } + } + } } + }) + try { + const deleteSelected = async () => { + secondMount.workspace.setSelection({ + selectedNodeIds: ['authorized-file'], orderedFileIds: ['authorized-file'] + }) + ;(secondMount.canvas as unknown as { focus(): void }).focus() + await act(async () => { + secondMount.browserWindow.dispatchEvent(new secondMount.browserWindow.KeyboardEvent('keydown', { + key: 'Delete', code: 'Delete', bubbles: true, cancelable: true + })) + await Promise.resolve() + await Promise.resolve() + }) + } + await deleteSelected() + expect(secondMount.workspace.getSnapshot().files).toHaveLength(1) + await deleteSelected() + expect(retryCalls).toHaveLength(2) + expect(secondMount.workspace.getSnapshot().files).toEqual([]) + } finally { + await secondMount.cleanup() + } + }) + + it('removes a persisted node after retrying a revoke whose first successful main mutation lost its IPC response', async () => { + const storage = new MemoryStorage() + const previewFile = { + id: 'lost-response-file', path: '/workspace/lost-response.png', name: 'lost-response.png', + source: 'computer', authorizationId: 'authorization-lost-response', contentType: 'image/png', + x: 100, y: 100, width: 320, height: 272 + } + let durableAuthorizationPresent = true + const firstMount = await mountResearchCanvas({ + sessionId: 'session-lost-revoke-response', files: [previewFile], storage, + dshDesktop: { researchPreview: { + async restore() { return null }, + async release() { return { ok: true } }, + async revokeNode() { + durableAuthorizationPresent = false + throw new Error('response lost after durable revoke') + } + } } + }) + try { + firstMount.workspace.setSelection({ + selectedNodeIds: ['lost-response-file'], orderedFileIds: ['lost-response-file'] + }) + ;(firstMount.canvas as unknown as { focus(): void }).focus() + await act(async () => { + firstMount.browserWindow.dispatchEvent(new firstMount.browserWindow.KeyboardEvent('keydown', { + key: 'Delete', code: 'Delete', bubbles: true, cancelable: true + })) + await Promise.resolve() + await Promise.resolve() + }) + expect(durableAuthorizationPresent).toBe(false) + expect(firstMount.workspace.getSnapshot().files).toHaveLength(1) + } finally { + await firstMount.cleanup() + } + + const persistedFiles = JSON.parse( + storage.getItem('sherlock.research.canvas.files.v1:session-lost-revoke-response') ?? '[]' + ) as Array> + const retryCalls: Array> = [] + const secondMount = await mountResearchCanvas({ + sessionId: 'session-lost-revoke-response', files: persistedFiles, storage, + dshDesktop: { researchPreview: { + async restore() { return null }, + async release() { return { ok: true } }, + async revokeNode(value) { + retryCalls.push(value) + return { ok: !durableAuthorizationPresent } + } + } } + }) + try { + secondMount.workspace.setSelection({ + selectedNodeIds: ['lost-response-file'], orderedFileIds: ['lost-response-file'] + }) + ;(secondMount.canvas as unknown as { focus(): void }).focus() + await act(async () => { + secondMount.browserWindow.dispatchEvent(new secondMount.browserWindow.KeyboardEvent('keydown', { + key: 'Delete', code: 'Delete', bubbles: true, cancelable: true + })) + await Promise.resolve() + await Promise.resolve() + }) + expect(retryCalls).toEqual([{ + sessionId: 'session-lost-revoke-response', nodeId: 'lost-response-file' + }]) + expect(secondMount.workspace.getSnapshot().files).toEqual([]) + } finally { + await secondMount.cleanup() + } + }) + + it('selects the focused Research file card with Enter', async () => { + const mounted = await mountResearchCanvas({ + sessionId: 'session-keyboard-file', + files: [ + { id: 'file-a', path: '/w/a.pdf', name: 'a.pdf', source: 'computer', x: 100, y: 100 }, + { id: 'file-b', path: '/w/b.pdf', name: 'b.pdf', source: 'computer', x: 300, y: 100 } + ], + selection: { selectedNodeIds: ['file-b'], orderedFileIds: ['file-b'] } + }) + try { + const { browserWindow, host, workspace } = mounted + const cardA = host.querySelector( + '[data-research-file-card="file-a"]' + ) as HappyDOMElement | null + expect(cardA).not.toBeNull() + if (cardA === null) return + ;(cardA as unknown as { focus(): void }).focus() + + await act(async () => { + cardA.dispatchEvent(new browserWindow.KeyboardEvent('keydown', { + key: 'Enter', code: 'Enter', bubbles: true, cancelable: true + })) + }) + + expect(workspace.getSnapshot().selection).toEqual({ + selectedNodeIds: ['file-a'], orderedFileIds: ['file-a'] + }) + expect(cardA.getAttribute('aria-selected')).toBe('true') + expect(host.querySelector('[data-research-file-card="file-b"]') + ?.getAttribute('aria-selected')).toBe('false') + } finally { + await mounted.cleanup() + } + }) + + it('projects only basenames from the owned Research prefix in sent user messages', async () => { + const primitives = new Proxy({ + MessageText: ({ text }: { text: string }) => createElement('span', null, text) + }, { + get(target, property) { + return Reflect.get(target, property) ?? (() => null) + } + }) + const attachment = new Proxy({ + ImageGallery: () => null + }, { + get(target, property) { + return Reflect.get(target, property) ?? (() => null) + } + }) + const client = await loadClientBundle('dsh-client-ui-conversation', undefined, { + modules: { + '@deepseek-ai/dsh-client-ui-primitives': primitives, + '@deepseek-ai/dsh-client-ui-attachment': attachment + } + }) + expect(client.UserStyleBubble).toBeTypeOf('function') + expect(client.serializeResearchPrompt).toBeTypeOf('function') + if (typeof client.UserStyleBubble !== 'function' || + typeof client.serializeResearchPrompt !== 'function') return + const rawPath = '/w/private␟report.pdf' + const prompt = client.serializeResearchPrompt([ + { id: 'f1', name: rawPath, path: rawPath } + ], 'compare these', [{ fileId: 'f1', offset: 8 }]) as string + + const html = renderToStaticMarkup(createElement(client.UserStyleBubble, { + content: [{ type: 'text', text: prompt }], + imageLoader: async () => '', + t: (key: string) => key + })) + + expect(html).toContain('data-research-message-file="f1"') + expect(html).toContain('data-research-reference-node-id="f1"') + expect(html).toContain('data-file-reference-icon=""') + expect(html).toContain('data-file-kind="pdf"') + expect(html).toContain('data-research-message-files="inline"') + expect(html).toContain('private␟report.pdf') + expect(html).toContain('compare ') + expect(html).toContain('these') + expect(html.indexOf('compare ')).toBeLessThan(html.lastIndexOf('private␟report.pdf')) + expect(html.lastIndexOf('private␟report.pdf')).toBeLessThan(html.lastIndexOf('these')) + expect(html).not.toContain(rawPath) + expect(html).not.toContain('SHERLOCK_RESEARCH_FILES_V1') + }) + + it('serializes the complete selected assistant reply while projecting only its inline label', async () => { + const primitives = new Proxy({ + MessageText: ({ text }: { text: string }) => createElement('span', null, text) + }, { + get(target, property) { + return Reflect.get(target, property) ?? (() => null) + } + }) + const attachment = new Proxy({ ImageGallery: () => null }, { + get(target, property) { + return Reflect.get(target, property) ?? (() => null) + } + }) + const client = await loadClientBundle('dsh-client-ui-conversation', undefined, { + modules: { + '@deepseek-ai/dsh-client-ui-primitives': primitives, + '@deepseek-ai/dsh-client-ui-attachment': attachment + } + }) + expect(client.researchArtifactReference).toBeTypeOf('function') + expect(client.researchArtifactReferenceCodec).toBeTypeOf('object') + expect(client.extractResearchReferences).toBeTypeOf('function') + if (typeof client.researchArtifactReference !== 'function' || + typeof client.extractResearchReferences !== 'function') return + + const artifact = { + id: 'assistant-result-1', + messageId: 'message-1', + title: '助手回复', + excerpt: '营收同比增长 28%。\n第二段是完整分析。' + } + const reference = client.researchArtifactReference(artifact) as { + ref: string + label: string + } + expect(reference.label).toBe('助手回复 · 营收同比增长 28%。') + const marker = await (client.researchArtifactReferenceCodec as { + serialize(ref: string, signal: AbortSignal): Promise + }).serialize(reference.ref, new AbortController().signal) + const extracted = client.extractResearchReferences(`重点分析${marker}的风险`) as { + text: string + files: unknown[] + occurrences: unknown[] + artifacts: Array> + artifactOccurrences: Array<{ artifactId: string; offset: number }> + } + expect(extracted).toMatchObject({ + text: '重点分析的风险', + files: [], + occurrences: [], + artifacts: [artifact], + artifactOccurrences: [{ artifactId: artifact.id, offset: 4 }] + }) + const prompt = (client.serializeResearchPrompt as (...args: unknown[]) => string)( + extracted.files, + extracted.text, + extracted.occurrences, + extracted.artifacts, + extracted.artifactOccurrences + ) + const parsed = (client.parseResearchPrompt as (text: string) => Record)(prompt) + expect(parsed).toMatchObject({ + text: extracted.text, + artifacts: [artifact], + artifactOccurrences: extracted.artifactOccurrences + }) + + const html = renderToStaticMarkup(createElement(client.UserStyleBubble, { + content: [{ type: 'text', text: prompt }], + imageLoader: async () => '', + t: (key: string) => key + })) + expect(html).toContain('data-research-message-artifact="assistant-result-1"') + expect(html).toContain('data-research-reference-node-id="assistant-result-1"') + expect(html).toContain('data-research-artifact-icon=""') + expect(html).toContain('data-artifact-kind="assistant-reply"') + expect(html).toContain('助手回复 · 营收同比增长 28%。') + expect(html).not.toContain('第二段是完整分析') + expect(prompt).toContain('第二段是完整分析') + }) + + it('renders a corresponding type icon for every Research artifact tag', async () => { + const primitives = new Proxy({ + MessageText: ({ text }: { text: string }) => createElement('span', null, text) + }, { + get(target, property) { + return Reflect.get(target, property) ?? (() => null) + } + }) + const client = await loadClientBundle('dsh-client-ui-conversation', undefined, { + modules: { + '@deepseek-ai/dsh-client-ui-primitives': primitives, + '@deepseek-ai/dsh-client-ui-attachment': { ImageGallery: () => null } + } + }) + expect(client.serializeResearchPrompt).toBeTypeOf('function') + expect(client.UserStyleBubble).toBeTypeOf('function') + if (typeof client.serializeResearchPrompt !== 'function' || + typeof client.UserStyleBubble !== 'function') return + + const artifacts = [ + { id: 'reply', kind: 'assistant-result', messageId: 'm1', title: '助手回复', excerpt: '完整回复' }, + { id: 'excerpt', kind: 'assistant-excerpt', messageId: 'm2', title: '助手摘录', excerpt: '关键摘录' }, + { id: 'summary', kind: 'generated-summary', messageId: 'm3', title: '核心总结', excerpt: '总结内容' }, + { id: 'mind-map', kind: 'generated-mind-map', messageId: 'm4', title: '我的导图', excerpt: '# 中心主题' }, + { id: 'generic', messageId: 'm5', title: '研究组件', excerpt: '其他内容' } + ] + const prompt = (client.serializeResearchPrompt as (...args: unknown[]) => string)( + [], '', [], artifacts, [] + ) + const html = renderToStaticMarkup(createElement(client.UserStyleBubble, { + content: [{ type: 'text', text: prompt }], + imageLoader: async () => '', + t: (key: string) => key + })) + + for (const [id, kind] of [ + ['reply', 'assistant-reply'], + ['excerpt', 'assistant-excerpt'], + ['summary', 'summary'], + ['mind-map', 'mind-map'], + ['generic', 'artifact'] + ]) { + expect(html).toContain(`data-research-message-artifact="${id}"`) + expect(html).toContain(`data-research-reference-node-id="${id}"`) + expect(html).toContain(`data-artifact-kind="${kind}"`) + } + expect(html.match(/data-research-artifact-icon=""/g)).toHaveLength(artifacts.length) + }) + + it('moves inline Research tags through the composer clipboard without arrow controls', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation', undefined, { + modules: { '@deepseek-ai/dsh-client-runtime/client': { createSnapshotStore } } + }) + expect(client.ResearchFileTags).toBeUndefined() + expect(client.serializeInputReferenceClipboard).toBeTypeOf('function') + expect(client.parseInputReferenceClipboard).toBeTypeOf('function') + if (typeof client.SessionInputShell !== 'function' || + typeof client.researchFileReference !== 'function' || + typeof client.serializeInputReferenceClipboard !== 'function' || + typeof client.parseInputReferenceClipboard !== 'function') return + + const SessionInputShell = client.SessionInputShell as new (deps: Record) => any + const shell = new SessionInputShell({ actx: {}, defaultSink: () => undefined }) + shell.setDraft('前后') + shell.insertReference( + client.researchFileReference({ id: 'f1', path: '/w/one.pdf', name: '/w/one.pdf' }), + { start: 1, end: 1, draftRev: shell.snapshot.draftRev } + ) + const copied = client.serializeInputReferenceClipboard( + shell.snapshot.draft, + shell.snapshot.occurrences, + { start: 1, end: 2 } + ) + expect(copied.text).toBe('one.pdf') + expect(copied.payload).toBeTypeOf('string') + + shell.setDraft('前后', { start: 1, end: 2, insertedLength: 0 }) + const components = client.parseInputReferenceClipboard(copied.payload, copied.text) + shell.pasteBegin(copied.text, { start: 2, end: 2 }, components) + + expect(shell.snapshot.draft).toBe('前后\uFFFC') + expect(shell.snapshot.occurrences).toMatchObject([ + { source: 'research-file', offset: 2, label: 'one.pdf' } + ]) + }) + + it('inserts ordinary Chat uploads as native file tags while serializing their full paths', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation', undefined, { + modules: { '@deepseek-ai/dsh-client-runtime/client': { createSnapshotStore } } + }) + expect(client.SessionInputShell).toBeTypeOf('function') + expect(client.chatFileReferenceCodec).toBeTypeOf('object') + if (typeof client.SessionInputShell !== 'function' || + typeof client.chatFileReferenceCodec !== 'object' || + client.chatFileReferenceCodec === null) return + + const SessionInputShell = client.SessionInputShell as new (deps: Record) => any + const shell = new SessionInputShell({ actx: {}, defaultSink: () => undefined }) + shell.setDraft('请分析') + shell.actions.insertFilePaths([ + '/Users/test/Documents/年度报告.pdf', + '/Users/test/Documents/董事会材料.pptx' + ]) + + expect(shell.snapshot.draft).toBe('请分析 \uFFFC \uFFFC ') + expect(shell.snapshot.occurrences).toMatchObject([ + { + source: 'chat-file', + offset: 4, + label: '年度报告.pdf', + clipboardText: '年度报告.pdf' + }, + { + source: 'chat-file', + offset: 6, + label: '董事会材料.pptx', + clipboardText: '董事会材料.pptx' + } + ]) + + const codec = client.chatFileReferenceCodec as { + serialize(ref: string, signal: AbortSignal): Promise + } + await expect(codec.serialize( + shell.snapshot.occurrences[0].ref, + new AbortController().signal + )).resolves.toBe('📎 文件：`/Users/test/Documents/年度报告.pdf`') + + const chatOccurrence = shell.snapshot.occurrences[0] + const selectedReferenceOccurrenceId = client.selectedResearchReferenceOccurrenceId as ( + occurrences: Array>, + selection: { start: number; end: number } + ) => number | null + const deleteReferenceOccurrence = client.deleteResearchReferenceOccurrence as ( + keyboard: Record, + occurrenceId: number + ) => number | null + expect(selectedReferenceOccurrenceId( + shell.snapshot.occurrences, + { start: chatOccurrence.offset, end: chatOccurrence.offset + 1 } + )).toBe(chatOccurrence.occurrenceId) + expect(deleteReferenceOccurrence(shell, chatOccurrence.occurrenceId)) + .toBe(chatOccurrence.offset) + expect(shell.snapshot.occurrences.some( + (occurrence: { occurrenceId: number }) => + occurrence.occurrenceId === chatOccurrence.occurrenceId + )).toBe(false) + + const fileReferenceKind = client.fileReferenceKind as (name: string) => string + expect([ + 'report.pdf', 'brief.docx', 'deck.pptx', 'notes.txt', 'chart.png', 'data.xlsx' + ].map(fileReferenceKind)).toEqual([ + 'pdf', 'word', 'presentation', 'text', 'image', 'spreadsheet' + ]) + }) + + it('shows file-type icons and delayed full-name tooltips for Chat and Research tags', async () => { + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + const restoreGlobals = installBrowserGlobals(browserWindow) + const client = await loadClientBundle('dsh-client-ui-conversation', undefined, { + document: browserWindow.document, + window: browserWindow, + exposeInputBar: true, + modules: { + '@deepseek-ai/dsh-client-runtime/client': { createSnapshotStore }, + '@deepseek-ai/dsh-client-ui-primitives': { + Tooltip: ({ children, delayMs, label, side }: Record) => + createElement('span', { + 'data-file-tooltip': label, + 'data-file-tooltip-delay': delayMs, + 'data-file-tooltip-side': side + }, children), + IconPaperclipOutline16: () => createElement('span', { 'data-paperclip-icon': '' }) + }, + '@deepseek-ai/dsh-client-ui-attachment': { + DropOverlay: () => null, + AttachmentRail: () => null + } + } + }) + const InputBar = client.__testInputBar as ComponentType> + const SessionInputShell = client.SessionInputShell as new (deps: Record) => any + expect(InputBar).toBeTypeOf('function') + expect(SessionInputShell).toBeTypeOf('function') + if (typeof InputBar !== 'function' || typeof SessionInputShell !== 'function' || + typeof client.researchFileReference !== 'function') { + restoreGlobals() + return + } + + const shell = new SessionInputShell({ actx: {}, defaultSink: () => undefined }) + const researchFile = { + id: 'research-pdf', + path: '/workspace/完整年度报告.pdf', + name: '完整年度报告.pdf', + displayName: '年报' + } + shell.actions.insertFilePaths(['/workspace/董事会材料.PPTX']) + shell.insertReference( + client.researchFileReference(researchFile), + { + start: shell.snapshot.draft.length, + end: shell.snapshot.draft.length, + draftRev: shell.snapshot.draftRev + } + ) + + const host = browserWindow.document.createElement('div') + browserWindow.document.body.appendChild(host) + const root = createRoot(host) + const props: Record = { + useSession: (select: (state: Record) => unknown) => select({ + running: false, promptError: null, subagent: null, removed: false + }), + useInput: (select: (state: Record) => unknown) => + useSyncExternalStore( + shell.state.subscribe, + () => select(shell.snapshot), + () => select(shell.snapshot) + ), + inputActions: shell.actions, + keyboard: shell, + renderSlot: () => null, + useNotices: (select: (state: null) => unknown) => select(null), + useLexicon: (select: (state: Map) => unknown) => select(new Map()), + useMenuLauncher: (select: (state: null) => unknown) => select(null), + useProjection: (_name: string, select?: (value: undefined) => unknown) => + select === undefined ? undefined : select(undefined), + researchFileReferences: [researchFile], + sessionId: 'file-tag-session', + t: (key: string) => key, + variant: 'composer' + } + + try { + await act(async () => { root.render(createElement(InputBar, props)); await Promise.resolve() }) + const chatTag = host.querySelector('[data-reference-source="chat-file"]') as HappyDOMElement | null + const researchTag = host.querySelector('[data-reference-source="research-file"]') as HappyDOMElement | null + expect(chatTag?.querySelector('[data-file-reference-icon]')?.getAttribute('data-file-kind')) + .toBe('presentation') + expect(chatTag?.querySelector('[data-file-tooltip]')?.getAttribute('data-file-tooltip')) + .toBe('董事会材料.PPTX') + expect(researchTag?.querySelector('[data-file-reference-icon]')?.getAttribute('data-file-kind')) + .toBe('pdf') + expect(researchTag?.getAttribute('data-research-reference-node-id')) + .toBe('research-pdf') + expect(researchTag?.querySelector('[data-file-tooltip]')?.getAttribute('data-file-tooltip')) + .toBe('完整年度报告.pdf') + expect(researchTag?.querySelector('[data-file-tooltip]')?.getAttribute('data-file-tooltip-delay')) + .toBe('500') + expect(researchTag?.querySelector('[data-file-tooltip]')?.getAttribute('data-file-tooltip-side')) + .toBe('top') + + await act(async () => { + chatTag?.dispatchEvent(new browserWindow.MouseEvent('click', { bubbles: true })) + await Promise.resolve() + }) + expect(host.querySelector('[data-reference-source="chat-file"]')?.getAttribute('data-selected')) + .toBe('true') + + } finally { + await act(async () => { root.unmount() }) + host.remove() + restoreGlobals() + } + }) + + it('accepts pasted Research tags only when their exact file identity belongs to the active InputBar session', async () => { + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + const restoreGlobals = installBrowserGlobals(browserWindow) + const client = await loadClientBundle('dsh-client-ui-conversation', undefined, { + document: browserWindow.document, + window: browserWindow, + exposeInputBar: true, + modules: { + '@deepseek-ai/dsh-client-runtime/client': { createSnapshotStore }, + '@deepseek-ai/dsh-client-ui-primitives': { + Tooltip: ({ children }: { children: unknown }) => children, + IconPaperclipOutline16: () => createElement('span', { 'data-paperclip-icon': '' }) + }, + '@deepseek-ai/dsh-client-ui-attachment': { + DropOverlay: () => null, + AttachmentRail: () => null + } + } + }) + const InputBar = client.__testInputBar as ComponentType> + const SessionInputShell = client.SessionInputShell as new (deps: Record) => any + const researchFileReference = client.researchFileReference as (( + file: { id: string; path: string; name: string } + ) => Record) | undefined + expect(InputBar).toBeTypeOf('function') + expect(SessionInputShell).toBeTypeOf('function') + expect(researchFileReference).toBeTypeOf('function') + if (typeof InputBar !== 'function' || typeof SessionInputShell !== 'function' || + typeof researchFileReference !== 'function') { + restoreGlobals() + return + } + const activeFile = { + id: 'file-active', path: '/workspace/report.pdf', name: 'report.pdf', + displayName: '章节/报告.pdf' + } + + const paste = async (candidate: { id: string; path: string; name: string }) => { + const host = browserWindow.document.createElement('div') + browserWindow.document.body.appendChild(host) + const root = createRoot(host) + const shell = new SessionInputShell({ actx: {}, defaultSink: () => undefined }) + shell.insertReference(researchFileReference(activeFile), { + start: 0, end: 0, draftRev: shell.snapshot.draftRev + }) + const payload = JSON.stringify({ + text: candidate.name, + components: [{ + start: 0, + end: candidate.name.length, + reference: { + source: 'research-file', + ref: JSON.stringify(candidate), + label: candidate.name, + clipboardText: candidate.name + } + }] + }) + const baseProps: Record = { + useSession: (select: (state: Record) => unknown) => select({ + running: false, promptError: null, subagent: null, removed: false + }), + useInput: (select: (state: Record) => unknown) => select(shell.snapshot), + inputActions: { pruneImages: () => undefined }, + keyboard: shell, + renderSlot: () => null, + useNotices: (select: (state: null) => unknown) => select(null), + useLexicon: (select: (state: Record) => unknown) => select({}), + useMenuLauncher: (select: (state: string | null) => unknown) => select(null), + useProjection: (_name: string, select?: (value: undefined) => unknown) => + select === undefined ? undefined : select(undefined), + researchFileReferences: [activeFile], + sessionId: 'active-session', + t: (key: string) => key, + variant: 'composer' + } + try { + await act(async () => { root.render(createElement(InputBar, baseProps)) }) + const textarea = host.querySelector('textarea') as HappyDOMHTMLElement | null + expect(textarea).not.toBeNull() + if (textarea === null) return shell.snapshot + ;(textarea as unknown as HTMLTextAreaElement).setSelectionRange( + shell.snapshot.draft.length, + shell.snapshot.draft.length + ) + const event = new browserWindow.Event('paste', { bubbles: true, cancelable: true }) + Object.defineProperty(event, 'clipboardData', { value: { + items: [], + getData(type: string) { + if (type === 'text/plain') return candidate.name + if (type === 'application/x-sherlock-input-references') return payload + return '' + } + } }) + await act(async () => { textarea.dispatchEvent(event); await Promise.resolve() }) + return shell.snapshot + } finally { + await act(async () => { root.unmount() }) + host.remove() + } + } + + try { + const sameSession = await paste({ + id: activeFile.id, path: activeFile.path, name: activeFile.displayName + }) + expect(sameSession.occurrences).toHaveLength(2) + expect(sameSession.occurrences).toMatchObject([ + { source: 'research-file', label: '章节/报告.pdf' }, + { source: 'research-file', label: '章节/报告.pdf' } + ]) + + const forged = await paste({ + id: 'forged-id', path: '/workspace/report.pdf', name: activeFile.displayName + }) + expect(forged.occurrences).toHaveLength(1) + expect(forged.draft).toContain(activeFile.displayName) + + const crossSession = await paste({ + id: 'file-active', path: '/other-session/report.pdf', name: activeFile.displayName + }) + expect(crossSession.occurrences).toHaveLength(1) + expect(crossSession.draft).toContain(activeFile.displayName) + } finally { + restoreGlobals() + } + }) + + it('moves an inline Research tag as one undoable drag transaction', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation', undefined, { + modules: { '@deepseek-ai/dsh-client-runtime/client': { createSnapshotStore } } + }) + expect(client.SessionInputShell).toBeTypeOf('function') + expect(client.researchFileReference).toBeTypeOf('function') + if (typeof client.SessionInputShell !== 'function' || + typeof client.researchFileReference !== 'function') return + + const SessionInputShell = client.SessionInputShell as new (deps: Record) => any + const shell = new SessionInputShell({ actx: {}, defaultSink: () => undefined }) + shell.setDraft('AB') + shell.insertReference( + client.researchFileReference({ id: 'f1', path: '/w/one.pdf', name: '/w/one.pdf' }), + { start: 1, end: 1, draftRev: shell.snapshot.draftRev } + ) + const before = shell.snapshot + const occurrenceId = before.occurrences[0].occurrenceId + + expect(shell.moveReferenceOccurrence).toBeTypeOf('function') + expect(shell.moveReferenceOccurrence(occurrenceId, before.draft.length)).toBe(true) + expect(shell.snapshot.draft).toBe('A B\uFFFC') + expect(shell.snapshot.occurrences).toMatchObject([ + { occurrenceId, source: 'research-file', offset: 3, label: 'one.pdf' } + ]) + + shell.undo() + expect(shell.snapshot.draft).toBe(before.draft) + expect(shell.snapshot.occurrences).toEqual(before.occurrences) + }) + + it('selects and deletes exactly one inline Research tag with the keyboard', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation', undefined, { + modules: { '@deepseek-ai/dsh-client-runtime/client': { createSnapshotStore } } + }) + expect(client.selectedResearchReferenceOccurrenceId).toBeTypeOf('function') + expect(client.deleteResearchReferenceOccurrence).toBeTypeOf('function') + if (typeof client.SessionInputShell !== 'function' || + typeof client.researchFileReference !== 'function' || + typeof client.selectedResearchReferenceOccurrenceId !== 'function' || + typeof client.deleteResearchReferenceOccurrence !== 'function') return + + const SessionInputShell = client.SessionInputShell as new (deps: Record) => any + const shell = new SessionInputShell({ actx: {}, defaultSink: () => undefined }) + shell.setDraft('AB') + shell.insertReference( + client.researchFileReference({ id: 'f1', path: '/w/one.pdf', name: '/w/one.pdf' }), + { start: 1, end: 1, draftRev: shell.snapshot.draftRev } + ) + const before = shell.snapshot + const occurrenceId = before.occurrences[0].occurrenceId + + expect(client.selectedResearchReferenceOccurrenceId(before.occurrences, { + start: 1, end: 2 + })).toBe(occurrenceId) + expect(client.selectedResearchReferenceOccurrenceId(before.occurrences, { + start: 1, end: 1 + })).toBeNull() + expect(client.deleteResearchReferenceOccurrence(shell, occurrenceId)).toBe(1) + expect(shell.snapshot.draft).toBe('A B') + expect(shell.snapshot.occurrences).toEqual([]) + + shell.undo() + expect(shell.snapshot.draft).toBe(before.draft) + expect(shell.snapshot.occurrences).toEqual(before.occurrences) + }) + + it('lets Chat file tags receive pointer events and draws selected file tags with the business-primary outline', async () => { + const styles: InjectedStyle[] = [] + await loadClientBundle('dsh-client-ui-conversation', undefined, { styles }) + const inputBarCss = styles.find(({ pluginCss }) => + pluginCss?.endsWith('/InputBar.module.css') + )?.textContent ?? '' + + expect(inputBarCss).toContain( + '.uV2eYG_chip[data-reference-source=research-file][data-selected=true]{outline:2px solid var(--dsw-alias-state-business-primary);outline-offset:-1px}' + ) + expect(inputBarCss).toContain( + '.uV2eYG_chip[data-reference-source=chat-file]{pointer-events:auto;cursor:grab;z-index:2}' + ) + expect(inputBarCss).toContain( + '.uV2eYG_chip[data-reference-source=chat-file][data-selected=true]{outline:2px solid var(--dsw-alias-state-business-primary);outline-offset:-1px}' + ) + }) + + it('syncs a selected assistant reply into a removable inline tag without deleting its canvas node', async () => { + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + const restoreGlobals = installBrowserGlobals(browserWindow) + const client = await loadClientBundle('dsh-client-ui-conversation', undefined, { + document: browserWindow.document, + window: browserWindow, + exposeInputBar: true, + modules: { + '@deepseek-ai/dsh-client-runtime/client': { createSnapshotStore }, + '@deepseek-ai/dsh-client-ui-primitives': { + Tooltip: ({ children }: { children: unknown }) => children, + IconPaperclipOutline16: () => createElement('span', { 'data-paperclip-icon': '' }) + }, + '@deepseek-ai/dsh-client-ui-attachment': { + DropOverlay: () => null, + AttachmentRail: () => null + } + } + }) + const InputBar = client.__testInputBar as ComponentType> + const SessionInputShell = client.SessionInputShell as new (deps: Record) => any + expect(InputBar).toBeTypeOf('function') + expect(SessionInputShell).toBeTypeOf('function') + if (typeof InputBar !== 'function' || typeof SessionInputShell !== 'function') { + restoreGlobals() + return + } + const artifact = { + id: 'assistant-result-tag', messageId: 'message-tag', title: '助手回复', + excerpt: '利润率提升，现金流同步改善。' + } + const canvasArtifacts = [artifact] + const shell = new SessionInputShell({ actx: {}, defaultSink: () => undefined }) + const host = browserWindow.document.createElement('div') + browserWindow.document.body.appendChild(host) + const root = createRoot(host) + const props: Record = { + useSession: (select: (state: Record) => unknown) => select({ + running: false, promptError: null, subagent: null, removed: false + }), + useInput: (select: (state: Record) => unknown) => + useSyncExternalStore( + shell.state.subscribe, + () => select(shell.snapshot), + () => select(shell.snapshot) + ), + inputActions: { pruneImages: () => undefined, submit: () => undefined }, + keyboard: shell, + renderSlot: () => null, + useNotices: (select: (state: null) => unknown) => select(null), + useLexicon: (select: (state: Map) => unknown) => select(new Map()), + useMenuLauncher: (select: (state: null) => unknown) => select(null), + useProjection: (_name: string, select?: (value: undefined) => unknown) => + select === undefined ? undefined : select(undefined), + researchFileReferences: [], + researchArtifactReferences: [artifact], + sessionId: 'artifact-tag-session', + t: (key: string) => key, + variant: 'composer' + } + try { + await act(async () => { root.render(createElement(InputBar, props)); await Promise.resolve() }) + const tag = host.querySelector( + '[data-research-artifact-tag="assistant-result-tag"]' + ) as HappyDOMElement | null + const textarea = host.querySelector('textarea') as HappyDOMElement | null + expect(tag?.textContent).toBe('助手回复 · 利润率提升，现金流同步改善。') + expect(tag?.getAttribute('data-research-reference-node-id')) + .toBe('assistant-result-tag') + expect(tag?.querySelector('[data-research-artifact-icon]') + ?.getAttribute('data-artifact-kind')).toBe('assistant-reply') + expect(textarea).not.toBeNull() + if (tag === null || textarea === null) return + + await act(async () => { click(browserWindow, tag) }) + expect(tag.getAttribute('data-selected')).toBe('true') + await act(async () => { + textarea.dispatchEvent(new browserWindow.KeyboardEvent('keydown', { + key: 'Backspace', code: 'Backspace', bubbles: true, cancelable: true + })) + await Promise.resolve() + }) + + expect(shell.snapshot.occurrences).toEqual([]) + expect(host.querySelector('[data-research-artifact-tag]')).toBeNull() + expect(canvasArtifacts).toEqual([artifact]) + } finally { + await act(async () => { root.unmount() }) + host.remove() + restoreGlobals() + } + }) + + it('keeps canvas-selected Research tags provisional until the user clicks the editable composer', async () => { + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + const restoreGlobals = installBrowserGlobals(browserWindow) + const client = await loadClientBundle('dsh-client-ui-conversation', undefined, { + document: browserWindow.document, + window: browserWindow, + exposeInputBar: true, + modules: { + '@deepseek-ai/dsh-client-runtime/client': { createSnapshotStore }, + '@deepseek-ai/dsh-client-ui-primitives': { + Tooltip: ({ children }: { children: unknown }) => children, + IconPaperclipOutline16: () => createElement('span', { 'data-paperclip-icon': '' }) + }, + '@deepseek-ai/dsh-client-ui-attachment': { + DropOverlay: () => null, + AttachmentRail: () => null + } + } + }) + const InputBar = client.__testInputBar as ComponentType> + const SessionInputShell = client.SessionInputShell as new (deps: Record) => any + expect(InputBar).toBeTypeOf('function') + expect(SessionInputShell).toBeTypeOf('function') + if (typeof InputBar !== 'function' || typeof SessionInputShell !== 'function') { + restoreGlobals() + return + } + + const file = { + id: 'provisional-file', path: '/workspace/selection.pdf', name: 'selection.pdf', + source: 'computer' + } + const artifact = { + id: 'provisional-artifact', messageId: 'message-selection', title: '助手回复', + excerpt: '这段结论需要重点引用。' + } + const shell = new SessionInputShell({ actx: {}, defaultSink: () => undefined }) + shell.setDraft('继续分析') + const host = browserWindow.document.createElement('div') + browserWindow.document.body.appendChild(host) + const root = createRoot(host) + const render = async (selected: boolean) => { + const props: Record = { + useSession: (select: (state: Record) => unknown) => select({ + running: false, promptError: null, subagent: null, removed: false + }), + useInput: (select: (state: Record) => unknown) => + useSyncExternalStore( + shell.state.subscribe, + () => select(shell.snapshot), + () => select(shell.snapshot) + ), + inputActions: { pruneImages: () => undefined, submit: () => undefined }, + keyboard: shell, + renderSlot: () => null, + useNotices: (select: (state: null) => unknown) => select(null), + useLexicon: (select: (state: Map) => unknown) => select(new Map()), + useMenuLauncher: (select: (state: null) => unknown) => select(null), + useProjection: (_name: string, select?: (value: undefined) => unknown) => + select === undefined ? undefined : select(undefined), + researchFileReferences: selected ? [file] : [], + researchArtifactReferences: selected ? [artifact] : [], + sessionId: 'provisional-tag-session', + t: (key: string) => key, + variant: 'composer' + } + await act(async () => { + root.render(createElement(InputBar, props)) + await Promise.resolve() + }) + } + + try { + await render(true) + const provisionalFile = host.querySelector( + '[data-research-file-tag="provisional-file"]' + ) as HappyDOMElement | null + const provisionalArtifact = host.querySelector( + '[data-research-artifact-tag="provisional-artifact"]' + ) as HappyDOMElement | null + expect(provisionalFile).not.toBeNull() + expect(provisionalArtifact).not.toBeNull() + if (provisionalFile === null || provisionalArtifact === null) return + expect(provisionalFile.getAttribute('data-provisional')).toBe('true') + expect(provisionalArtifact.getAttribute('data-provisional')).toBe('true') + expect(Number(browserWindow.getComputedStyle(provisionalFile).opacity)).toBe(0.52) + + await render(false) + expect(host.querySelector('[data-research-file-tag]')).toBeNull() + expect(host.querySelector('[data-research-artifact-tag]')).toBeNull() + expect(shell.snapshot.draft).toBe('继续分析') + + await render(true) + const textarea = host.querySelector('textarea') as HappyDOMElement | null + expect(textarea).not.toBeNull() + if (textarea === null) return + await act(async () => { + textarea.dispatchEvent(new browserWindow.MouseEvent('click', { + bubbles: true, cancelable: true, clientX: 0, clientY: 0, detail: 1 + })) + await Promise.resolve() + }) + + expect(host.querySelector('[data-research-file-tag]')?.getAttribute('data-provisional')) + .toBeNull() + expect(host.querySelector('[data-research-artifact-tag]')?.getAttribute('data-provisional')) + .toBeNull() + + await render(false) + expect(host.querySelector('[data-research-file-tag="provisional-file"]')).not.toBeNull() + expect(host.querySelector( + '[data-research-artifact-tag="provisional-artifact"]' + )).not.toBeNull() + } finally { + await act(async () => { root.unmount() }) + host.remove() + restoreGlobals() + } + }) + + it('rerenders a renamed selected Research tag in place without moving the caret', async () => { + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + const restoreGlobals = installBrowserGlobals(browserWindow) + const client = await loadClientBundle('dsh-client-ui-conversation', undefined, { + document: browserWindow.document, + window: browserWindow, + exposeInputBar: true, + modules: { + '@deepseek-ai/dsh-client-runtime/client': { createSnapshotStore }, + '@deepseek-ai/dsh-client-ui-primitives': { + Tooltip: ({ children }: { children: unknown }) => children, + IconPaperclipOutline16: () => createElement('span', { 'data-paperclip-icon': '' }) + }, + '@deepseek-ai/dsh-client-ui-attachment': { + DropOverlay: () => null, + AttachmentRail: () => null + } + } + }) + const InputBar = client.__testInputBar as ComponentType> + const SessionInputShell = client.SessionInputShell as new (deps: Record) => any + expect(InputBar).toBeTypeOf('function') + expect(SessionInputShell).toBeTypeOf('function') + if (typeof InputBar !== 'function' || typeof SessionInputShell !== 'function' || + typeof client.researchFileReference !== 'function') { + restoreGlobals() + return + } + const shell = new SessionInputShell({ actx: {}, defaultSink: () => undefined }) + const sourceFile = { + id: 'file-rename', path: '/workspace/source.pdf', name: 'source.pdf', source: 'computer' + } + shell.setDraft('前后') + shell.insertReference(client.researchFileReference(sourceFile), { + start: 1, end: 1, draftRev: shell.snapshot.draftRev + }) + const occurrenceId = shell.snapshot.occurrences[0].occurrenceId + const host = browserWindow.document.createElement('div') + browserWindow.document.body.appendChild(host) + const root = createRoot(host) + const render = async (file: Record) => { + const props: Record = { + useSession: (select: (state: Record) => unknown) => select({ + running: false, promptError: null, subagent: null, removed: false + }), + useInput: (select: (state: Record) => unknown) => + useSyncExternalStore( + shell.state.subscribe, + () => select(shell.snapshot), + () => select(shell.snapshot) + ), + inputActions: { pruneImages: () => undefined, submit: () => undefined }, + keyboard: shell, + renderSlot: () => null, + useNotices: (select: (state: null) => unknown) => select(null), + useLexicon: (select: (state: Map) => unknown) => select(new Map()), + useMenuLauncher: (select: (state: null) => unknown) => select(null), + useProjection: (_name: string, select?: (value: undefined) => unknown) => + select === undefined ? undefined : select(undefined), + researchFileReferences: [file], + sessionId: 'rename-session', + t: (key: string) => key, + variant: 'composer' + } + await act(async () => { root.render(createElement(InputBar, props)) }) + } + + try { + await render(sourceFile) + const initialChip = host.querySelector( + `[data-occurrence="${occurrenceId}"]` + ) as HappyDOMElement | null + const textarea = host.querySelector('textarea') as HappyDOMHTMLElement | null + expect(initialChip).not.toBeNull() + expect(textarea).not.toBeNull() + if (initialChip === null || textarea === null) return + await act(async () => { click(browserWindow, initialChip) }) + expect(initialChip.getAttribute('data-selected')).toBe('true') + const selection = { + start: (textarea as unknown as HTMLTextAreaElement).selectionStart, + end: (textarea as unknown as HTMLTextAreaElement).selectionEnd + } + const draft = shell.snapshot.draft + const draftRev = shell.snapshot.draftRev + + await render({ ...sourceFile, displayName: '审阅版.pdf' }) + + const renamedChip = host.querySelector( + `[data-occurrence="${occurrenceId}"]` + ) as HappyDOMElement | null + expect(renamedChip?.getAttribute('data-selected')).toBe('true') + expect(renamedChip?.querySelector('.uV2eYG_chipLabelText')?.textContent).toBe('审阅版.pdf') + expect(shell.snapshot.draft).toBe(draft) + expect(shell.snapshot.draftRev).toBe(draftRev) + expect((textarea as unknown as HTMLTextAreaElement).selectionStart).toBe(selection.start) + expect((textarea as unknown as HTMLTextAreaElement).selectionEnd).toBe(selection.end) + } finally { + await act(async () => { root.unmount() }) + host.remove() + restoreGlobals() + } + }) + + it('deletes selected canvas cards with Delete and the right-click menu', async () => { + const mounted = await mountResearchCanvas({ + sessionId: 'session-delete-canvas-cards', + files: [ + { id: 'file-a', path: '/w/a.pdf', name: 'a.pdf', source: 'computer', x: 100, y: 100 }, + { id: 'file-b', path: '/w/b.pdf', name: 'b.pdf', source: 'computer', x: 350, y: 100 } + ], + artifacts: [ + { id: 'artifact-a', kind: 'assistant-result', messageId: 'm1', title: 'Answer', excerpt: 'Evidence', x: 550, y: 100 } + ], + selection: { + selectedNodeIds: ['file-a', 'file-b'], + orderedFileIds: ['file-a', 'file-b'] + } + }) + try { + const { browserWindow, canvas, host, workspace } = mounted + ;(canvas as unknown as { focus(): void }).focus() + + await act(async () => { + browserWindow.dispatchEvent(new browserWindow.KeyboardEvent('keydown', { + key: 'Delete', code: 'Delete', bubbles: true, cancelable: true + })) + }) + expect(workspace.getSnapshot().files).toEqual([]) + expect(workspace.getSnapshot().artifacts).toHaveLength(1) + expect(workspace.getSnapshot().selection).toEqual({ + selectedNodeIds: [], orderedFileIds: [] + }) + + const artifact = host.querySelector('[data-research-artifact-card="artifact-a"]') + expect(artifact).not.toBeNull() + if (artifact === null) return + await act(async () => { + artifact.dispatchEvent(new browserWindow.MouseEvent('contextmenu', { + bubbles: true, cancelable: true, clientX: 420, clientY: 160 + })) + }) + const remove = host.querySelector('[data-research-context-remove]') + expect(remove?.textContent).toBe('从画布删除') + await act(async () => { + remove?.dispatchEvent(new browserWindow.PointerEvent('pointerdown', { + bubbles: true, cancelable: true, button: 0, pointerId: 17 + })) + }) + expect(remove?.isConnected).toBe(true) + await act(async () => { + click(browserWindow, remove as HappyDOMElement | null) + }) + expect(workspace.getSnapshot().artifacts).toEqual([]) + expect(workspace.getSnapshot().selection).toEqual({ + selectedNodeIds: [], orderedFileIds: [] + }) + } finally { + await mounted.cleanup() + } + }) + + it('offers context download for every canvas node family and mind map format choices', async () => { + const save = vi.fn(async () => ({ status: 'saved' })) + const mounted = await mountResearchCanvas({ + sessionId: 'session-context-download-all', + files: [{ + id: 'file-pdf', name: 'report.pdf', source: 'computer', + authorizationId: 'authorization-pdf', contentType: 'application/pdf', + x: 120, y: 100 + }], + artifacts: [{ + id: 'assistant', kind: 'assistant-result', messageId: 'assistant-message', + title: '助手回复', excerpt: 'Evidence', x: 380, y: 100 + }, { + id: 'excerpt', kind: 'assistant-excerpt', messageId: 'excerpt-message', + title: '回复摘录', excerpt: 'Excerpt', x: 640, y: 100 + }, { + id: 'summary', kind: 'generated-summary', messageId: 'summary-message', + title: '总结提炼', excerpt: 'Summary', generationStatus: 'completed', + sourceNodeIds: ['assistant'], x: 120, y: 360 + }, { + id: 'map', kind: 'generated-mind-map', messageId: 'map-message', + title: '思维导图', excerpt: '# 中心\n- 分支', generationStatus: 'completed', + generationDetail: 'brief', sourceNodeIds: ['assistant'], x: 380, y: 360 + }, { + id: 'web', kind: 'web-link', messageId: 'web-message', title: '研究页面', + titleMode: 'custom', excerpt: 'https://example.com/', url: 'https://example.com/', + x: 640, y: 360, width: 520, height: 300, sizeMode: 'manual' + }, { + id: 'container', kind: 'generated-container', messageId: 'container-message', + title: '关键指标', excerpt: 'kpi', generationStatus: 'completed', + generationLastSeq: 1, sourceNodeIds: [], containerPrompt: '生成关键指标', + refreshMinutes: 0, containerSpec: { + version: 1, type: 'kpi', title: '关键指标', + items: [{ label: '收入', value: '12 亿' }] + }, x: 900, y: 360, width: 520, height: 300, sizeMode: 'manual' + }], + dshDesktop: { researchCanvasExport: { save } } + }) + try { + const { browserWindow, host } = mounted + const selectors = [ + '[data-research-file-card="file-pdf"]', + '[data-research-artifact-card="assistant"]', + '[data-research-artifact-card="excerpt"]', + '[data-research-artifact-card="summary"]', + '[data-research-artifact-card="map"]', + '[data-research-artifact-card="web"]', + '[data-research-artifact-card="container"]' + ] + for (const [index, selector] of selectors.entries()) { + const target = host.querySelector(selector) + expect(target).not.toBeNull() + await act(async () => { + target?.dispatchEvent(new browserWindow.MouseEvent('contextmenu', { + bubbles: true, cancelable: true, clientX: 180 + index, clientY: 140 + index + })) + }) + expect(host.querySelector('[data-research-context-download]')?.textContent) + .toContain('下载') + } + + const map = host.querySelector('[data-research-artifact-card="map"]') + await act(async () => { + map?.dispatchEvent(new browserWindow.MouseEvent('contextmenu', { + bubbles: true, cancelable: true, clientX: 360, clientY: 260 + })) + }) + await act(async () => { + click(browserWindow, host.querySelector('[data-research-context-download]')) + }) + expect(['svg', 'png', 'jpg'].map((format) => + host.querySelector(`[data-research-download-format="${format}"]`)?.textContent + )).toEqual(['SVG', 'PNG', 'JPG']) + } finally { + await mounted.cleanup() + } + }) + + it('downloads the right-clicked node only and reports save success or retryable errors', async () => { + const save = vi.fn() + .mockResolvedValueOnce({ status: 'saved' }) + .mockResolvedValueOnce({ status: 'error', message: '保存失败，请重试。' }) + .mockResolvedValueOnce({ status: 'saved' }) + const artifacts = [{ + id: 'assistant-a', kind: 'assistant-result', messageId: 'message-a', + title: '结论 A', excerpt: '内容 A', x: 220, y: 180 + }, { + id: 'assistant-b', kind: 'assistant-result', messageId: 'message-b', + title: '结论 B', excerpt: '内容 B', x: 560, y: 180 + }] + const mounted = await mountResearchCanvas({ + sessionId: 'session-context-download-status', + artifacts, + selection: { selectedNodeIds: ['assistant-a', 'assistant-b'], orderedFileIds: [] }, + dshDesktop: { researchCanvasExport: { save } } + }) + try { + const { browserWindow, host, workspace } = mounted + const before = JSON.stringify(workspace.getSnapshot()) + const openAndDownload = async (nodeId: string) => { + const target = host.querySelector(`[data-research-artifact-card="${nodeId}"]`) + await act(async () => { + target?.dispatchEvent(new browserWindow.MouseEvent('contextmenu', { + bubbles: true, cancelable: true, clientX: 240, clientY: 180 + })) + }) + await act(async () => { + click(browserWindow, host.querySelector('[data-research-context-download]')) + await Promise.resolve(); await Promise.resolve() + }) + } + + await openAndDownload('assistant-b') + expect(save).toHaveBeenNthCalledWith(1, { + kind: 'text', format: 'md', suggestedName: '结论 B.md', + content: '# 结论 B\n\n内容 B\n' + }) + expect(host.querySelector('[data-research-download-feedback="assistant-b"]')?.textContent) + .toContain('已下载') + + await openAndDownload('assistant-a') + const alert = host.querySelector('[data-research-download-feedback="assistant-a"]') + expect(alert?.getAttribute('role')).toBe('alert') + expect(alert?.textContent).toContain('保存失败，请重试。') + const retry = alert?.querySelector('[data-research-download-retry]') + expect(retry).not.toBeNull() + await act(async () => { + click(browserWindow, retry as HappyDOMElement | null) + await Promise.resolve(); await Promise.resolve() + }) + expect(save).toHaveBeenCalledTimes(3) + expect(JSON.stringify(workspace.getSnapshot())).toBe(before) + } finally { + await mounted.cleanup() + } + }) + + it('opens a canvas context menu and selects every file and artifact from the menu or Command-A', async () => { + const mounted = await mountResearchCanvas({ + sessionId: 'session-canvas-context-select-all', + files: [ + { id: 'file-b', path: '/w/b.pdf', name: 'b.pdf', source: 'computer', x: 420, y: 120 }, + { id: 'file-a', path: '/w/a.pptx', name: 'a.pptx', source: 'computer', x: 120, y: 120 } + ], + artifacts: [ + { id: 'summary', kind: 'generated-summary', messageId: 'summary-message', title: '总结提炼', excerpt: 'Summary', generationStatus: 'completed', sourceNodeIds: ['file-a'], x: 180, y: 420 }, + { id: 'assistant', kind: 'assistant-result', messageId: 'assistant-message', title: '助手回复', excerpt: 'Evidence', x: 620, y: 240 } + ], + selection: { selectedNodeIds: ['file-b'], orderedFileIds: ['file-b'] } + }) + try { + const { browserWindow, canvas, host, workspace } = mounted + let blankMenuEvent: HappyDOMEvent | undefined + await act(async () => { + blankMenuEvent = new browserWindow.MouseEvent('contextmenu', { + bubbles: true, cancelable: true, clientX: 360, clientY: 260 + }) + canvas.dispatchEvent(blankMenuEvent) + }) + + expect(blankMenuEvent?.defaultPrevented).toBe(true) + expect(host.querySelector('[data-research-context-arrange]')?.textContent) + .toBe('整理画布') + const selectAll = host.querySelector('[data-research-context-select-all]') + expect(selectAll?.textContent).toContain('全选') + await act(async () => { click(browserWindow, selectAll as HappyDOMElement | null) }) + expect(workspace.getSnapshot().selection).toEqual({ + selectedNodeIds: ['file-a', 'file-b', 'assistant', 'summary'], + orderedFileIds: ['file-a', 'file-b'] + }) + + workspace.setSelection({ selectedNodeIds: [], orderedFileIds: [] }) + ;(canvas as unknown as { focus(): void }).focus() + await act(async () => { + browserWindow.dispatchEvent(new browserWindow.KeyboardEvent('keydown', { + key: 'a', code: 'KeyA', metaKey: true, bubbles: true, cancelable: true + })) + }) + expect(workspace.getSnapshot().selection).toEqual({ + selectedNodeIds: ['file-a', 'file-b', 'assistant', 'summary'], + orderedFileIds: ['file-a', 'file-b'] + }) + } finally { + await mounted.cleanup() + } + }) + + it('organizes mixed canvas components into a compact content-aware layout that fits the viewport', async () => { + const storage = new MemoryStorage() + const mounted = await mountResearchCanvas({ + sessionId: 'session-organize-canvas', + storage, + artifacts: [ + { id: 'assistant-b', kind: 'assistant-result', messageId: 'assistant-b-message', title: '助手回复 B', excerpt: 'Evidence B', x: 2100, y: -800, width: 300, height: 200, sizeMode: 'manual' }, + { id: 'map', kind: 'generated-mind-map', messageId: 'map-message', title: '思维导图', excerpt: '# Map', generationStatus: 'completed', generationDetail: 'brief', sourceNodeIds: ['assistant-a'], x: -1800, y: 1400, width: 400, height: 300, sizeMode: 'manual' }, + { id: 'assistant-a', kind: 'assistant-result', messageId: 'assistant-a-message', title: '助手回复 A', excerpt: 'Evidence A', x: -1200, y: -900, width: 300, height: 200, sizeMode: 'manual' }, + { id: 'summary-short', kind: 'generated-summary', messageId: 'summary-short-message', title: '简短总结', excerpt: '一句话总结。', generationStatus: 'completed', sourceNodeIds: ['assistant-a'], x: 1600, y: 1200, width: 320, height: 180, sizeMode: 'manual' }, + { id: 'summary-long', kind: 'generated-summary', messageId: 'summary-long-message', title: '详细总结', excerpt: '这是一段需要保留更多阅读空间的详细总结。'.repeat(48), generationStatus: 'completed', sourceNodeIds: ['assistant-a'], x: 1900, y: 1500, width: 320, height: 180, sizeMode: 'manual' } + ], + selection: { selectedNodeIds: ['assistant-b'], orderedFileIds: [] }, + viewport: { scale: 1.8, x: -900, y: 500 } + }) + try { + const { browserWindow, canvas, host, workspace } = mounted + await act(async () => { workspace.setCanvasSize({ width: 1000, height: 700 }) }) + const before = workspace.getSnapshot() + + await act(async () => { + canvas.dispatchEvent(new browserWindow.MouseEvent('contextmenu', { + bubbles: true, cancelable: true, clientX: 460, clientY: 320 + })) + }) + const arrange = host.querySelector('[data-research-context-arrange]') + expect(arrange?.textContent).toBe('整理画布') + await act(async () => { click(browserWindow, arrange as HappyDOMElement | null) }) + + const after = workspace.getSnapshot() + expect(after.selection).toEqual({ selectedNodeIds: ['assistant-b'], orderedFileIds: [] }) + + const byId = new Map(after.artifacts.map((node) => [node.id, node])) + const rect = (id: string) => { + const node = byId.get(id) + expect(node).toBeDefined() + if (node === undefined) throw new Error(`Missing ${id}`) + const width = Number(node.width) + const height = Number(node.height) + return { + left: Number(node.x) - width / 2, + top: Number(node.y) - height / 2, + right: Number(node.x) + width / 2, + bottom: Number(node.y) + height / 2 + } + } + const assistantA = rect('assistant-a') + const assistantB = rect('assistant-b') + const summaryShort = rect('summary-short') + const summaryLong = rect('summary-long') + const map = rect('map') + + expect(Number(byId.get('summary-long')?.height)) + .toBeGreaterThan(Number(byId.get('summary-short')?.height)) + expect(Number(byId.get('map')?.width) / Number(byId.get('map')?.height)) + .toBeCloseTo(1.2, 1) + expect(after.artifacts.some((node) => { + const previous = before.artifacts.find((candidate) => candidate.id === node.id) + return previous !== undefined && ( + Number(node.width) !== Number(previous.width) + || Number(node.height) !== Number(previous.height) + ) + })).toBe(true) + + const differentTypesShareABand = [assistantA, assistantB].some((assistant) => + [summaryShort, summaryLong, map].some((other) => + Math.min(assistant.bottom, other.bottom) > Math.max(assistant.top, other.top) + ) + ) + expect(differentTypesShareABand).toBe(true) + + const rectangles = [assistantA, assistantB, summaryShort, summaryLong, map] + for (const [index, first] of rectangles.entries()) { + for (const second of rectangles.slice(index + 1)) { + expect( + first.right + 24 <= second.left + || second.right + 24 <= first.left + || first.bottom + 24 <= second.top + || second.bottom + 24 <= first.top + ).toBe(true) + } + } + + for (const node of after.artifacts) { + const width = Number(node.width) * after.viewport.scale + const height = Number(node.height) * after.viewport.scale + const centerX = Number(node.x) * after.viewport.scale + after.viewport.x + const centerY = Number(node.y) * after.viewport.scale + after.viewport.y + expect(centerX - width / 2).toBeGreaterThanOrEqual(47) + expect(centerX + width / 2).toBeLessThanOrEqual(953) + expect(centerY - height / 2).toBeGreaterThanOrEqual(47) + expect(centerY + height / 2).toBeLessThanOrEqual(653) + } + expect(after.viewport.scale).toBeLessThanOrEqual(1) + expect(after.viewport).not.toEqual(before.viewport) + + const persisted = JSON.parse( + storage.getItem('sherlock.research.canvas.artifacts.v1:session-organize-canvas') ?? '[]' + ) as Array> + expect(persisted.map(({ id, x, y }) => ({ id, x, y }))) + .toEqual(after.artifacts.map(({ id, x, y }) => ({ id, x, y }))) + } finally { + await mounted.cleanup() + } + }) + + it('renames generic files and artifacts inline with Enter, Escape, and blur', async () => { + const storage = new MemoryStorage() + const mounted = await mountResearchCanvas({ + sessionId: 'session-rename-canvas-cards', + storage, + files: [{ + id: 'file-a', path: '/w/source.txt', name: 'source.txt', + source: 'computer', x: 120, y: 100 + }], + artifacts: [{ + id: 'artifact-a', kind: 'assistant-result', messageId: 'm1', + title: '助手回复', excerpt: 'Evidence', x: 500, y: 180 + }] + }) + try { + const { browserWindow, host, workspace } = mounted + const rename = async (target: HappyDOMElement | null) => { + expect(target).not.toBeNull() + if (target === null) return null + await act(async () => { + target.dispatchEvent(new browserWindow.MouseEvent('contextmenu', { + bubbles: true, cancelable: true, clientX: 200, clientY: 120 + })) + }) + const action = host.querySelector('[data-research-context-rename]') + expect(action?.textContent).toBe('修改名称') + await act(async () => { click(browserWindow, action) }) + return host.querySelector('[data-research-title-input]') as HappyDOMHTMLElement | null + } + + const fileInput = await rename(host.querySelector('.rScV5Q_fileName')) + expect(fileInput?.getAttribute('data-research-title-input')).toBe('file-a') + expect(browserWindow.document.activeElement).toBe(fileInput) + expect((fileInput as unknown as HTMLInputElement | null)?.selectionStart).toBe(0) + expect((fileInput as unknown as HTMLInputElement | null)?.selectionEnd).toBe('source.txt'.length) + if (fileInput === null) return + await act(async () => { + fileInput.dispatchEvent(new browserWindow.MouseEvent('contextmenu', { + bubbles: true, cancelable: true, clientX: 220, clientY: 130 + })) + }) + expect(host.querySelector('[data-research-context-rename]')).toBeNull() + Object.getOwnPropertyDescriptor( + browserWindow.HTMLInputElement.prototype, 'value' + )?.set?.call(fileInput, ' 研究资料 ') + await act(async () => { + fileInput.dispatchEvent(new browserWindow.Event('input', { bubbles: true })) + fileInput.dispatchEvent(new browserWindow.KeyboardEvent('keydown', { + key: 'Enter', code: 'Enter', bubbles: true, cancelable: true + })) + }) + expect(workspace.getSnapshot().files[0]).toMatchObject({ + name: 'source.txt', path: '/w/source.txt', displayName: '研究资料' + }) + expect(host.querySelector('.rScV5Q_fileName')?.textContent).toBe('研究资料') + + const cancelled = await rename(host.querySelector('[data-research-node-title]')) + expect(cancelled?.getAttribute('data-research-title-input')).toBe('artifact-a') + if (cancelled === null) return + Object.getOwnPropertyDescriptor( + browserWindow.HTMLInputElement.prototype, 'value' + )?.set?.call(cancelled, '不应保存') + await act(async () => { + cancelled.dispatchEvent(new browserWindow.Event('input', { bubbles: true })) + cancelled.dispatchEvent(new browserWindow.KeyboardEvent('keydown', { + key: 'Escape', code: 'Escape', bubbles: true, cancelable: true + })) + cancelled.blur() + }) + expect(workspace.getSnapshot().artifacts[0]).toMatchObject({ title: '助手回复' }) + + const blurred = await rename(host.querySelector('[data-research-node-title]')) + if (blurred === null) return + Object.getOwnPropertyDescriptor( + browserWindow.HTMLInputElement.prototype, 'value' + )?.set?.call(blurred, '最终结论') + await act(async () => { + blurred.dispatchEvent(new browserWindow.Event('input', { bubbles: true })) + blurred.blur() + }) + expect(workspace.getSnapshot().artifacts[0]).toMatchObject({ title: '最终结论' }) + expect(JSON.parse(storage.getItem( + 'sherlock.research.canvas.artifacts.v1:session-rename-canvas-cards' + ) ?? '[]')[0]).toMatchObject({ title: '最终结论' }) + } finally { + await mounted.cleanup() + } + }) + + it('edits assistant reply content from the canvas context menu and persists Markdown', async () => { + const storage = new MemoryStorage() + const mounted = await mountResearchCanvas({ + sessionId: 'session-edit-assistant-content', + storage, + artifacts: [{ + id: 'artifact-a', kind: 'assistant-result', messageId: 'm1', + title: '助手回复', excerpt: '# 原结论\n\n原始内容', x: 500, y: 180 + }] + }) + try { + const { browserWindow, host, workspace } = mounted + const body = host.querySelector('[data-research-artifact-content]') + expect(body).not.toBeNull() + if (body === null) return + await act(async () => { + body.dispatchEvent(new browserWindow.MouseEvent('contextmenu', { + bubbles: true, cancelable: true, clientX: 260, clientY: 180 + })) + }) + const edit = host.querySelector('[data-research-context-edit-content]') + expect(edit?.textContent).toBe('编辑内容') + await act(async () => { click(browserWindow, edit) }) + + const editor = host.querySelector( + '[data-research-content-input="artifact-a"]' + ) as HappyDOMHTMLElement | null + expect(editor).not.toBeNull() + expect(browserWindow.document.activeElement).toBe(editor) + if (editor === null) return + const revised = '# 新结论\n\n- 支持删改\n- 保留 Markdown' + Object.getOwnPropertyDescriptor( + browserWindow.HTMLTextAreaElement.prototype, 'value' + )?.set?.call(editor, revised) + await act(async () => { + editor.dispatchEvent(new browserWindow.Event('input', { bubbles: true })) + editor.dispatchEvent(new browserWindow.KeyboardEvent('keydown', { + key: 'Enter', code: 'Enter', metaKey: true, bubbles: true, cancelable: true + })) + }) + + expect(workspace.getSnapshot().artifacts[0]?.excerpt).toBe(revised) + expect(JSON.parse(storage.getItem( + 'sherlock.research.canvas.artifacts.v1:session-edit-assistant-content' + ) ?? '[]')[0]?.excerpt).toBe(revised) + expect(host.querySelector('[data-research-content-input]')).toBeNull() + expect(host.querySelector('[data-research-artifact-content]')?.textContent) + .toContain('支持删改') + } finally { + await mounted.cleanup() + } + }) + + it('opens assistant reply editing by double-clicking its body and cancels with Escape', async () => { + const mounted = await mountResearchCanvas({ + sessionId: 'session-cancel-assistant-content', + artifacts: [{ + id: 'artifact-a', kind: 'assistant-result', messageId: 'm1', + title: '助手回复', excerpt: '保留原内容', x: 500, y: 180 + }] + }) + try { + const { browserWindow, host, workspace } = mounted + const body = host.querySelector('[data-research-artifact-content]') + expect(body).not.toBeNull() + if (body === null) return + await act(async () => { + body.dispatchEvent(new browserWindow.MouseEvent('dblclick', { + bubbles: true, cancelable: true + })) + }) + const editor = host.querySelector( + '[data-research-content-input="artifact-a"]' + ) as HappyDOMHTMLElement | null + expect(editor).not.toBeNull() + if (editor === null) return + Object.getOwnPropertyDescriptor( + browserWindow.HTMLTextAreaElement.prototype, 'value' + )?.set?.call(editor, '不应保存') + await act(async () => { + editor.dispatchEvent(new browserWindow.Event('input', { bubbles: true })) + editor.dispatchEvent(new browserWindow.KeyboardEvent('keydown', { + key: 'Escape', code: 'Escape', bubbles: true, cancelable: true + })) + editor.blur() + }) + expect(workspace.getSnapshot().artifacts[0]?.excerpt).toBe('保留原内容') + expect(workspace.getSnapshot().pendingMessageJump).toBeNull() + expect(host.querySelector('[data-research-content-input]')).toBeNull() + } finally { + await mounted.cleanup() + } + }) + + it('edits a completed generated summary in place and persists multiline content with Command-Enter', async () => { + const storage = new MemoryStorage() + const mounted = await mountResearchCanvas({ + sessionId: 'session-edit-generated-summary', + storage, + artifacts: [{ + id: 'summary-a', kind: 'generated-summary', messageId: 'summary-message', + title: '总结提炼', excerpt: '原总结内容', generationStatus: 'completed', + sourceNodeIds: ['source-a'], x: 500, y: 180 + }] + }) + try { + const { browserWindow, host, workspace } = mounted + const body = host.querySelector('[data-research-artifact-content]') + expect(body).not.toBeNull() + if (body === null) return + await act(async () => { + body.dispatchEvent(new browserWindow.MouseEvent('dblclick', { + bubbles: true, cancelable: true + })) + }) + const editor = host.querySelector( + '[data-research-content-input="summary-a"]' + ) as HappyDOMHTMLElement | null + expect(editor).not.toBeNull() + expect(browserWindow.document.activeElement).toBe(editor) + if (editor === null) return + + const revised = '第一段总结\n\n第二段补充关系' + Object.getOwnPropertyDescriptor( + browserWindow.HTMLTextAreaElement.prototype, 'value' + )?.set?.call(editor, revised) + await act(async () => { + editor.dispatchEvent(new browserWindow.Event('input', { bubbles: true })) + editor.dispatchEvent(new browserWindow.KeyboardEvent('keydown', { + key: 'Enter', code: 'Enter', bubbles: true, cancelable: true + })) + }) + expect(host.querySelector('[data-research-content-input="summary-a"]')).not.toBeNull() + expect(workspace.getSnapshot().artifacts[0]?.excerpt).toBe('原总结内容') + + await act(async () => { + editor.dispatchEvent(new browserWindow.KeyboardEvent('keydown', { + key: 'Enter', code: 'Enter', metaKey: true, bubbles: true, cancelable: true + })) + }) + expect(workspace.getSnapshot().artifacts[0]?.excerpt).toBe(revised) + expect(JSON.parse(storage.getItem( + 'sherlock.research.canvas.artifacts.v1:session-edit-generated-summary' + ) ?? '[]')[0]?.excerpt).toBe(revised) + expect(host.querySelector('[data-research-content-input]')).toBeNull() + expect(host.querySelector('[data-research-artifact-content]')?.textContent) + .toContain('第二段补充关系') + } finally { + await mounted.cleanup() + } + }) + + it('cancels completed summary editing with Escape and does not edit an active summary', async () => { + const mounted = await mountResearchCanvas({ + sessionId: 'session-summary-edit-boundary', + artifacts: [ + { + id: 'summary-complete', kind: 'generated-summary', messageId: 'complete-message', + title: '总结提炼', excerpt: '保留总结', generationStatus: 'completed', + sourceNodeIds: ['source-a'], x: 300, y: 180 + }, + { + id: 'summary-active', kind: 'generated-summary', messageId: 'active-message', + title: '总结提炼', excerpt: '正在准备任务…', generationStatus: 'queued', + sourceNodeIds: ['source-a'], x: 760, y: 180 + } + ] + }) + try { + const { browserWindow, host, workspace } = mounted + const complete = host.querySelector('[data-research-artifact-card="summary-complete"] [data-research-artifact-content]') + const active = host.querySelector('[data-research-artifact-card="summary-active"] [data-research-artifact-content]') + expect(complete).not.toBeNull() + expect(active).not.toBeNull() + if (complete === null || active === null) return + + await act(async () => { + active.dispatchEvent(new browserWindow.MouseEvent('dblclick', { + bubbles: true, cancelable: true + })) + }) + expect(host.querySelector('[data-research-content-input="summary-active"]')).toBeNull() + + await act(async () => { + complete.dispatchEvent(new browserWindow.MouseEvent('dblclick', { + bubbles: true, cancelable: true + })) + }) + const editor = host.querySelector( + '[data-research-content-input="summary-complete"]' + ) as HappyDOMHTMLElement | null + expect(editor).not.toBeNull() + if (editor === null) return + Object.getOwnPropertyDescriptor( + browserWindow.HTMLTextAreaElement.prototype, 'value' + )?.set?.call(editor, '不应保存') + await act(async () => { + editor.dispatchEvent(new browserWindow.Event('input', { bubbles: true })) + editor.dispatchEvent(new browserWindow.KeyboardEvent('keydown', { + key: 'Escape', code: 'Escape', bubbles: true, cancelable: true + })) + editor.blur() + }) + expect(workspace.getSnapshot().artifacts.find((node) => node.id === 'summary-complete')?.excerpt) + .toBe('保留总结') + expect(host.querySelector('[data-research-content-input]')).toBeNull() + } finally { + await mounted.cleanup() + } + }) + + it('owns accepted drops at the canvas root and restores their cards by session', async () => { + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + const restoreGlobals = installBrowserGlobals(browserWindow) + const client = await loadClientBundle('dsh-client-ui-conversation', { + getPathForFile: () => '/tmp/report.pdf' + }, { + document: browserWindow.document, + window: browserWindow + }) + expect(client.ResearchCanvas).toBeTypeOf('function') + if (typeof client.ResearchCanvas !== 'function') { + restoreGlobals() + return + } + const ResearchCanvas = client.ResearchCanvas as ComponentType<{ + sessionId: string + t: (key: string) => string + }> + const host = browserWindow.document.createElement('div') + browserWindow.document.body.appendChild(host) + const root = createRoot(host) + let documentDragovers = 0 + let documentDrops = 0 + browserWindow.document.addEventListener('dragover', () => { documentDragovers += 1 }) + browserWindow.document.addEventListener('drop', () => { documentDrops += 1 }) + + try { + await act(async () => { + root.render(createElement(ResearchCanvas, { + sessionId: 'session-drop', + t: () => '研究画布' + })) + }) + const canvas = host.querySelector('[data-research-canvas]') + expect(canvas).not.toBeNull() + if (canvas === null) return + const unrecognized = { + types: ['text/plain'], files: [], getData: () => '', dropEffect: 'none' + } + const invalidFiles = { + types: ['Files'], files: [], getData: () => '', dropEffect: 'none' + } + const accepted = { + types: ['Files'], + files: [{ name: 'report.pdf', type: 'application/pdf' }], + getData: () => '', + dropEffect: 'none' + } + + const unrecognizedOver = dispatchDrag( + browserWindow, canvas, 'dragover', unrecognized + ) + expect(unrecognizedOver.defaultPrevented).toBe(false) + expect(documentDragovers).toBe(1) + + const acceptedEnter = dispatchDrag( + browserWindow, canvas, 'dragenter', accepted + ) + expect(acceptedEnter.defaultPrevented).toBe(true) + expect(canvas.getAttribute('data-file-drop-active')).toBe('true') + const acceptedOver = dispatchDrag( + browserWindow, canvas, 'dragover', accepted + ) + expect(acceptedOver.defaultPrevented).toBe(true) + expect(accepted.dropEffect).toBe('copy') + expect(documentDragovers).toBe(1) + + const invalidDrop = dispatchDrag( + browserWindow, canvas, 'drop', invalidFiles + ) + expect(invalidDrop.defaultPrevented).toBe(false) + expect(documentDrops).toBe(1) + + await act(async () => { + const acceptedDrop = dispatchDrag( + browserWindow, canvas, 'drop', accepted + ) + expect(acceptedDrop.defaultPrevented).toBe(true) + }) + expect(documentDrops).toBe(1) + expect(canvas.hasAttribute('data-file-drop-active')).toBe(false) + expect(host.querySelector('[data-research-file-card]')?.textContent) + .toContain('report.pdf') + + await act(async () => { root.unmount() }) + const remount = createRoot(host) + await act(async () => { + remount.render(createElement(ResearchCanvas, { + sessionId: 'session-drop', + t: () => '研究画布' + })) + }) + expect(host.querySelector('[data-research-file-card]')?.textContent) + .toContain('report.pdf') + await act(async () => { remount.unmount() }) + } finally { + restoreGlobals() + } + }) + + it('claims and isolates proprietary drag types but validates their payloads on drop', async () => { + const mounted = await mountResearchCanvas({ sessionId: 'session-drag-ownership' }) + try { + const { browserWindow, canvas, workspace } = mounted + const bubbled = { dragenter: 0, dragover: 0, drop: 0 } + browserWindow.document.addEventListener('dragenter', () => { bubbled.dragenter += 1 }) + browserWindow.document.addEventListener('dragover', () => { bubbled.dragover += 1 }) + browserWindow.document.addEventListener('drop', () => { bubbled.drop += 1 }) + const transfer = (type: string, raw: string) => ({ + types: [type], + files: [], + getData: (requested: string) => requested === type ? raw : '', + dropEffect: 'none' + }) + const mixedArtifactTransfer = (raw: string) => ({ + types: ['Files', 'application/x-sherlock-research-artifact'], + files: [{ name: 'fallback.pdf', type: 'application/pdf' }], + getData: (requested: string) => + requested === 'application/x-sherlock-research-artifact' ? raw : '', + dropEffect: 'none' + }) + const invalid = [ + transfer('application/x-sherlock-file', '{bad-json'), + transfer('application/x-sherlock-research-artifact', '{bad-json'), + transfer('application/x-sherlock-research-artifact', JSON.stringify({ + sessionId: 'another-session', messageId: 'm1', kind: 'assistant-result', + title: 'Answer', excerpt: 'Evidence' + })), + mixedArtifactTransfer('{bad-json'), + mixedArtifactTransfer(JSON.stringify({ + sessionId: 'another-session', messageId: 'm1', kind: 'assistant-result', + title: 'Answer', excerpt: 'Evidence' + })) + ] + + for (const dataTransfer of invalid) { + for (const type of ['dragenter', 'dragover'] as const) { + const before = bubbled[type] + const event = dispatchDrag(browserWindow, canvas, type, dataTransfer) + expect(event.defaultPrevented).toBe(true) + expect(bubbled[type]).toBe(before) + } + const beforeDrop = bubbled.drop + const drop = dispatchDrag(browserWindow, canvas, 'drop', dataTransfer) + expect(drop.defaultPrevented).toBe(true) + expect(bubbled.drop).toBe(beforeDrop) + } + + const protectedFileDrag = { + types: ['application/x-sherlock-file'], + files: [], + getData: () => '', + dropEffect: 'none' + } + for (const type of ['dragenter', 'dragover'] as const) { + const before = bubbled[type] + const event = dispatchDrag(browserWindow, canvas, type, protectedFileDrag) + expect(event.defaultPrevented).toBe(true) + expect(bubbled[type]).toBe(before) + } + + const valid = [ + transfer('application/x-sherlock-file', JSON.stringify({ + path: '/w/report.pdf', name: 'report.pdf' + })), + transfer('application/x-sherlock-research-artifact', JSON.stringify({ + sessionId: 'session-drag-ownership', messageId: 'm1', + kind: 'assistant-result', title: 'Answer', excerpt: 'Evidence' + })) + ] + for (const dataTransfer of valid) { + for (const type of ['dragenter', 'dragover'] as const) { + const before = bubbled[type] + const event = dispatchDrag(browserWindow, canvas, type, dataTransfer) + expect(event.defaultPrevented).toBe(true) + expect(bubbled[type]).toBe(before) + } + } + + const validMixed = mixedArtifactTransfer(JSON.stringify({ + sessionId: 'session-drag-ownership', messageId: 'm-mixed', + kind: 'assistant-result', title: 'Mixed answer', excerpt: 'Artifact wins' + })) + await act(async () => { + const drop = dispatchDrag(browserWindow, canvas, 'drop', validMixed) + expect(drop.defaultPrevented).toBe(true) + }) + expect(workspace.getSnapshot().artifacts).toMatchObject([ + { messageId: 'm-mixed', title: 'Mixed answer' } + ]) + expect(workspace.getSnapshot().files).toEqual([]) + } finally { + await mounted.cleanup() + } + }) + + it('isolates valid Research file and artifact drops from the global composer listener', async () => { + const mounted = await mountResearchCanvas({ sessionId: 'session-drop-isolation' }) + try { + const { browserWindow, canvas } = mounted + const composerDrops: string[] = [] + browserWindow.document.addEventListener('drop', (event) => { + const transfer = (event as unknown as { dataTransfer?: { types?: string[] } }) + .dataTransfer + if (transfer?.types?.includes('Files')) composerDrops.push('files') + else composerDrops.push('unrelated') + }) + const transfer = (types: string[], data: Record, files: Array<{ + name: string + type: string + }> = []) => ({ + types, + files, + getData: (type: string) => data[type] ?? '', + dropEffect: 'none' + }) + + await act(async () => { + const fileDrop = dispatchDrag(browserWindow, canvas, 'drop', transfer( + ['application/x-sherlock-file'], + { + 'application/x-sherlock-file': JSON.stringify({ + path: '/tmp/research/drop.pdf', name: 'drop.pdf' + }) + } + )) + expect(fileDrop.defaultPrevented).toBe(true) + + const artifactDrop = dispatchDrag(browserWindow, canvas, 'drop', transfer( + ['application/x-sherlock-research-artifact'], + { + 'application/x-sherlock-research-artifact': JSON.stringify({ + sessionId: 'session-drop-isolation', messageId: 'message-drop', + kind: 'assistant-result', title: 'Answer', excerpt: 'Evidence' + }) + } + )) + expect(artifactDrop.defaultPrevented).toBe(true) + }) + expect(composerDrops).toEqual([]) + + const textDrop = dispatchDrag(browserWindow, canvas, 'drop', transfer( + ['text/plain'], { 'text/plain': 'ordinary dragged text' } + )) + expect(textDrop.defaultPrevented).toBe(false) + expect(composerDrops).toEqual(['unrelated']) + } finally { + await mounted.cleanup() + } + }) + + it('selects a persisted card and marquee-selects two cards', async () => { + const generate = vi.fn(async (_request: Record) => ({ ok: true })) + const mounted = await mountResearchCanvas({ + sessionId: 'session-marquee', + files: [ + { id: 'file-a', path: '/w/a.pdf', name: 'a.pdf', source: 'computer', x: 100, y: 100 }, + { id: 'file-b', path: '/w/b.pdf', name: 'b.pdf', source: 'computer', x: 300, y: 130 } + ], + selectionGeneration: { generate } + }) + try { + const { browserWindow, canvas, host } = mounted + const cardA = host.querySelector('[data-research-file-card="file-a"]') + expect(cardA).not.toBeNull() + if (cardA === null) return + + expect(cardA.getAttribute('aria-selected')).toBe('false') + await act(async () => { + cardA.dispatchEvent(pointer(browserWindow, 'pointerdown', { + pointerId: 1, x: 100, y: 100 + })) + }) + expect(cardA.getAttribute('aria-selected')).toBe('true') + + await act(async () => { + canvas.dispatchEvent(pointer(browserWindow, 'pointerdown', { + pointerId: 2, x: 20, y: 20 + })) + canvas.dispatchEvent(pointer(browserWindow, 'pointermove', { + pointerId: 2, x: 360, y: 180 + })) + }) + expect(canvas.querySelector('[data-research-marquee]')).not.toBeNull() + await act(async () => { + canvas.dispatchEvent(pointer(browserWindow, 'pointerup', { + pointerId: 2, x: 360, y: 180 + })) + }) + expect(canvas.querySelectorAll('[aria-selected="true"]')).toHaveLength(2) + expect(canvas.querySelector('[data-research-selection-actions]')).not.toBeNull() + + await act(async () => { + canvas.dispatchEvent(pointer(browserWindow, 'pointerdown', { + pointerId: 3, x: 760, y: 560 + })) + canvas.dispatchEvent(pointer(browserWindow, 'pointerup', { + pointerId: 3, x: 760, y: 560 + })) + }) + expect(canvas.querySelector('[data-research-selection-actions]')).toBeNull() + } finally { + await mounted.cleanup() + } + }) + + it('computes one selection envelope and places generated components beside it', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation') + const nodes = [ + { id: 'file-a', kind: 'assistant-result', x: 100, y: 200, width: 400, height: 200, sizeMode: 'manual' }, + { id: 'artifact-b', kind: 'assistant-result', x: 400, y: 300, width: 500, height: 300, sizeMode: 'manual' } + ] + + expect(client.researchCanvasSelectionBounds).toBeTypeOf('function') + expect(client.researchCanvasGeneratedPlacement).toBeTypeOf('function') + if (typeof client.researchCanvasSelectionBounds !== 'function' || + typeof client.researchCanvasGeneratedPlacement !== 'function') return + + expect(client.researchCanvasSelectionBounds(nodes, ['file-a', 'artifact-b'])).toEqual({ + left: -100, + top: 100, + right: 650, + bottom: 450, + width: 750, + height: 350 + }) + expect(client.researchCanvasGeneratedPlacement( + nodes, + ['file-a', 'artifact-b'], + 'mind-map', + 'brief' + )).toEqual({ x: 942, y: 275, width: 520, height: 300, sizeMode: 'auto' }) + expect(client.researchCanvasGeneratedPlacement( + nodes, + ['file-a', 'artifact-b'], + 'mind-map', + 'standard' + )).toEqual({ x: 942, y: 275, width: 520, height: 300, sizeMode: 'auto' }) + expect(client.researchCanvasGeneratedPlacement( + nodes, + ['file-a', 'artifact-b'], + 'mind-map', + 'detailed' + )).toEqual({ x: 942, y: 275, width: 520, height: 300, sizeMode: 'auto' }) + expect(client.researchCanvasGeneratedPlacement( + nodes, + ['missing'], + 'summary' + )).toBeNull() + }) + + it('keeps selection actions visible with the context menu and starts the chosen mind-map detail', async () => { + const generate = vi.fn(async (_request: Record) => ({ ok: true })) + const mounted = await mountResearchCanvas({ + sessionId: 'session-selection-actions', + files: [ + { id: 'file-a', path: '/w/a.dat', name: 'a.dat', source: 'computer', x: 100, y: 100 }, + { id: 'file-b', path: '/w/b.dat', name: 'b.dat', source: 'computer', x: 360, y: 100 } + ], + selection: { + selectedNodeIds: ['file-a', 'file-b'], + orderedFileIds: ['file-a', 'file-b'] + }, + selectionGeneration: { generate } + }) + try { + const { browserWindow, host, workspace } = mounted + await act(async () => { workspace.setCanvasSize({ width: 800, height: 600 }) }) + + const toolbar = host.querySelector('[data-research-selection-actions]') + const mindMap = host.querySelector('button[aria-label="思维导图"]') + const summary = host.querySelector('button[aria-label="总结提炼"]') + expect(toolbar).not.toBeNull() + expect(mindMap?.textContent).toContain('思维导图') + expect(summary?.textContent).toContain('总结提炼') + if (mindMap === null) return + + const selectedCard = host.querySelector('[data-research-file-card="file-a"]') + expect(selectedCard).not.toBeNull() + await act(async () => { + selectedCard?.dispatchEvent(new browserWindow.MouseEvent('contextmenu', { + bubbles: true, cancelable: true, clientX: 180, clientY: 120 + })) + }) + expect(host.querySelector('[role="menu"]')).not.toBeNull() + expect(host.querySelector('[data-research-selection-actions]')).not.toBeNull() + + await act(async () => { click(browserWindow, mindMap) }) + expect(mindMap.getAttribute('aria-expanded')).toBe('true') + const detailMenu = host.querySelector('[data-research-mind-map-menu]') + expect(detailMenu?.getAttribute('role')).toBe('menu') + expect(Array.from(detailMenu?.querySelectorAll('[role="menuitem"]') ?? []) + .map((item) => item.textContent)).toEqual([ + '简要不超过 3 层，高度概括', + '常规平衡阅读效率与内容理解', + '详细充分展开内容关系细节' + ]) + const brief = host.querySelector('[data-research-mind-map-detail="brief"]') + expect(brief).not.toBeNull() + await act(async () => { click(browserWindow, brief as HappyDOMElement | null) }) + + expect(generate).toHaveBeenCalledTimes(1) + expect(generate).toHaveBeenCalledWith(expect.objectContaining({ + sessionId: 'session-selection-actions', + kind: 'mind-map', + detail: 'brief', + selectedNodeIds: ['file-a', 'file-b'], + targetNodeId: expect.any(String) + })) + expect(workspace.getSnapshot().artifacts).toMatchObject([{ + kind: 'generated-mind-map', + generationStatus: 'queued', + generationDetail: 'brief', + sourceNodeIds: ['file-a', 'file-b'], + title: '思维导图', + x: 762, + y: 100, + width: 520, + height: 300, + sizeMode: 'auto' + }]) + expect(workspace.getSnapshot().selection.selectedNodeIds).toEqual([ + workspace.getSnapshot().artifacts[0]?.id + ]) + } finally { + await mounted.cleanup() + } + }) + + it('persists an immutable bounded source snapshot and task identity', async () => { + const mounted = await mountResearchCanvas({ + sessionId: 'session-generation-snapshot', + files: [{ + id: 'file-source', path: '/w/source.pdf', name: 'source.pdf', + source: 'computer', x: 100, y: 100 + }], + artifacts: [{ + id: 'artifact-source', kind: 'assistant-result', messageId: 'message-source', + title: '已有结论', excerpt: '不可变的原始结论', x: 300, y: 100 + }] + }) + try { + const target = mounted.workspace.beginGeneration( + 'summary', + ['file-source', 'artifact-source'], + { x: 700, y: 100, width: 520, height: 300, sizeMode: 'auto' } + ) + expect(target).toMatchObject({ + generationStatus: 'queued', + generationSources: [ + { id: 'file-source', type: 'file', title: 'source.pdf', path: '/w/source.pdf' }, + { id: 'artifact-source', type: 'artifact', title: '已有结论', text: '不可变的原始结论' } + ] + }) + expect(Object.isFrozen((target as { generationSources: unknown[] }).generationSources)).toBe(true) + expect(mounted.workspace.attachGenerationTask(String(target?.id), { + taskId: 'task-snapshot', canvasNodeId: target?.id, + state: 'running', childSessionId: 'child-snapshot', lastSeq: 2, events: [] + })).toBe(true) + + const restored = JSON.parse(mounted.browserWindow.localStorage.getItem( + 'sherlock.research.canvas.artifacts.v1:session-generation-snapshot' + ) ?? '[]') + expect(restored.find((node: { generationTaskId?: string }) => + node.generationTaskId === 'task-snapshot')).toMatchObject({ + generationTaskId: 'task-snapshot', + generationChildSessionId: 'child-snapshot', + generationStatus: 'running', + generationSources: (target as { generationSources: unknown[] }).generationSources + }) + expect(JSON.stringify(restored)).not.toContain('generationEvents') + expect(JSON.stringify(restored)).not.toContain('generationPartialText') + } finally { + await mounted.cleanup() + } + }) + + it('routes task inspection by node and task id and retries from the saved snapshot', async () => { + const mounted = await mountResearchCanvas({ + sessionId: 'session-generation-routing', + files: [{ + id: 'file-source', path: '/w/source.pdf', name: 'source.pdf', + source: 'computer', x: 100, y: 100 + }] + }) + try { + const target = mounted.workspace.beginGeneration( + 'mind-map', ['file-source'], + { x: 700, y: 100, width: 520, height: 300, sizeMode: 'auto' }, 'brief' + ) as Record + expect(mounted.workspace.attachGenerationTask(String(target.id), { + taskId: 'task-a', canvasNodeId: target.id, state: 'running', + childSessionId: 'child-a', lastSeq: 2, events: [] + })).toBe(true) + expect(mounted.workspace.applyGenerationInspection(String(target.id), { + taskId: 'task-b', canvasNodeId: target.id, state: 'completed', + lastSeq: 4, finalOutput: '# 错误任务', events: [] + })).toBe(false) + expect(mounted.workspace.applyGenerationInspection(String(target.id), { + taskId: 'task-a', canvasNodeId: 'different-node', state: 'completed', + lastSeq: 4, finalOutput: '# 错误节点', events: [] + })).toBe(false) + expect(mounted.workspace.applyGenerationInspection(String(target.id), { + taskId: 'task-a', canvasNodeId: target.id, state: 'failed', + lastSeq: 4, error: '生成失败，请重试。', events: [] + })).toBe(true) + + const retry = mounted.workspace.retryGeneration(String(target.id)) + expect(retry).toMatchObject({ + id: target.id, kind: 'mind-map', detail: 'brief', + generationSources: [{ + id: 'file-source', type: 'file', title: 'source.pdf', path: '/w/source.pdf' + }] + }) + expect(mounted.workspace.getSnapshot().artifacts[0]).not.toHaveProperty('generationTaskId') + expect(mounted.workspace.getSnapshot().artifacts[0]).toMatchObject({ + generationStatus: 'queued', generationDetail: 'brief' + }) + } finally { + await mounted.cleanup() + } + }) + + it('cancels an active task when its destination component is deleted', async () => { + const mounted = await mountResearchCanvas({ + sessionId: 'session-generation-delete', + files: [{ + id: 'file-source', path: '/w/source.pdf', name: 'source.pdf', + source: 'computer', x: 100, y: 100 + }] + }) + try { + const target = mounted.workspace.beginGeneration( + 'summary', ['file-source'], + { x: 700, y: 100, width: 520, height: 300, sizeMode: 'auto' } + ) as Record + mounted.workspace.attachGenerationTask(String(target.id), { + taskId: 'task-delete', canvasNodeId: target.id, state: 'running', + childSessionId: 'child-delete', lastSeq: 2, events: [] + }) + const cancel = vi.fn() + mounted.workspace.setGenerationCancelSink(cancel) + + mounted.workspace.removeNodes([String(target.id)]) + + expect(cancel).toHaveBeenCalledWith({ + parentSessionId: 'session-generation-delete', taskId: 'task-delete' + }) + expect(mounted.workspace.getSnapshot().artifacts).toEqual([]) + } finally { + await mounted.cleanup() + } + }) + + it('does not settle generated components from right-conversation assistant replies', async () => { + const generate = vi.fn(async (_request: Record) => ({ ok: true })) + const mounted = await mountResearchCanvas({ + sessionId: 'session-selection-generation-result', + artifacts: [{ + id: 'source-artifact', kind: 'assistant-result', messageId: 'message-source', + title: '助手回复', excerpt: '原始研究内容', x: 180, y: 180 + }], + selection: { selectedNodeIds: ['source-artifact'], orderedFileIds: [] }, + selectionGeneration: { generate } + }) + try { + const { browserWindow, host, workspace } = mounted + await act(async () => { + workspace.setCanvasSize({ width: 900, height: 700 }) + }) + const mindMap = host.querySelector('button[aria-label="思维导图"]') + expect(mindMap).not.toBeNull() + if (mindMap === null) return + + await act(async () => { click(browserWindow, mindMap) }) + const standard = host.querySelector('[data-research-mind-map-detail="standard"]') + expect(standard).not.toBeNull() + await act(async () => { click(browserWindow, standard as HappyDOMElement | null) }) + const targetId = generate.mock.calls[0]?.[0]?.targetNodeId as string + expect(targetId).toBeTypeOf('string') + expect(workspace.getSnapshot().artifacts.find((node) => node.id === targetId)) + .toMatchObject({ generationStatus: 'queued' }) + + expect(workspace).not.toHaveProperty('observeAssistantResult') + expect(workspace.getSnapshot().artifacts.find((node) => node.id === targetId)) + .toMatchObject({ generationStatus: 'queued' }) + } finally { + await mounted.cleanup() + } + }) + + it('recovers a legacy pending generation as an interrupted state', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation') + expect(client.ResearchWorkspaceRegistry).toBeTypeOf('function') + if (typeof client.ResearchWorkspaceRegistry !== 'function') return + const storage = new MemoryStorage() + const sessionId = 'session-interrupted-generation' + storage.setItem(`sherlock.research.canvas.files.v1:${sessionId}`, JSON.stringify([{ + id: 'source-file', path: '/w/source.pdf', name: 'source.pdf', source: 'computer', + x: 100, y: 100 + }])) + storage.setItem(`sherlock.research.canvas.artifacts.v1:${sessionId}`, JSON.stringify([{ + id: 'generated-summary', kind: 'generated-summary', messageId: 'generated-summary', + title: '总结提炼', excerpt: '正在总结选中内容…', generationStatus: 'pending', + sourceNodeIds: ['source-file'], x: 600, y: 100, width: 380, height: 240, + sizeMode: 'manual' + }])) + + const Registry = client.ResearchWorkspaceRegistry as new (storage: Storage) => { + for(id: string): { + getSnapshot(): { artifacts: Array> } + } + } + const workspace = new Registry(storage).for(sessionId) + + expect(workspace.getSnapshot().artifacts).toMatchObject([{ + id: 'generated-summary', + generationStatus: 'interrupted', + generationError: '任务已中断，请重试。', + excerpt: '正在总结选中内容…' + }]) + expect(workspace.getSnapshot().artifacts[0]?.generationSources).toBeUndefined() + }) + + it('retries a failed generated component in place', async () => { + const generate = vi.fn() + .mockResolvedValueOnce({ ok: false, error: '模型暂时不可用' }) + .mockResolvedValueOnce({ ok: true }) + const mounted = await mountResearchCanvas({ + sessionId: 'session-generation-retry', + files: [{ + id: 'source-file', path: '/w/source.dat', name: 'source.dat', + source: 'computer', x: 100, y: 100 + }], + selection: { selectedNodeIds: ['source-file'], orderedFileIds: ['source-file'] }, + selectionGeneration: { generate } + }) + try { + const { browserWindow, host, workspace } = mounted + await act(async () => { workspace.setCanvasSize({ width: 900, height: 700 }) }) + const summary = host.querySelector('button[aria-label="总结提炼"]') + expect(summary).not.toBeNull() + if (summary === null) return + + await act(async () => { click(browserWindow, summary) }) + const targetId = generate.mock.calls[0]?.[0]?.targetNodeId as string + expect(workspace.getSnapshot().artifacts).toMatchObject([{ + id: targetId, + generationStatus: 'failed', + generationError: '模型暂时不可用' + }]) + const retry = host.querySelector( + `[data-research-artifact-card="${targetId}"] button[aria-label="重试生成"]` + ) + expect(retry).not.toBeNull() + if (retry === null) return + + await act(async () => { click(browserWindow, retry) }) + expect(generate).toHaveBeenCalledTimes(2) + expect(generate.mock.calls[1]?.[0]).toMatchObject({ + sessionId: 'session-generation-retry', + kind: 'summary', + selectedNodeIds: ['source-file'], + targetNodeId: targetId + }) + expect(workspace.getSnapshot().artifacts).toHaveLength(1) + expect(workspace.getSnapshot().artifacts[0]).toMatchObject({ + id: targetId, + generationStatus: 'queued' + }) + } finally { + await mounted.cleanup() + } + }) + + it('renders generation progress in the destination component and removes it after completion', async () => { + const mounted = await mountResearchCanvas({ + sessionId: 'session-generation-process', + files: [{ + id: 'source-file', path: '/w/source.pdf', name: 'source.pdf', + source: 'computer', x: 100, y: 100 + }] + }) + try { + let target!: Record + await act(async () => { + target = mounted.workspace.beginGeneration( + 'mind-map', ['source-file'], + { x: 700, y: 100, width: 520, height: 300, sizeMode: 'auto' }, 'brief' + ) as Record + mounted.workspace.attachGenerationTask(String(target.id), { + taskId: 'task-process', canvasNodeId: target.id, state: 'running', + childSessionId: 'child-process', lastSeq: 4, + events: [ + { taskId: 'task-process', canvasNodeId: target.id, seq: 1, type: 'queued' }, + { taskId: 'task-process', canvasNodeId: target.id, seq: 2, type: 'started' }, + { taskId: 'task-process', canvasNodeId: target.id, seq: 3, type: 'tool-started', tool: '读取文件' }, + { taskId: 'task-process', canvasNodeId: target.id, seq: 4, type: 'assistant-delta', text: '正在归纳关键关系' } + ] + }) + }) + + const cardSelector = `[data-research-artifact-card="${String(target.id)}"]` + const runningCard = mounted.host.querySelector(cardSelector) + expect(runningCard?.getAttribute('data-research-generation-state')).toBe('running') + expect(runningCard?.querySelector('[data-research-node-title]')?.textContent).toBe('思维导图') + expect(runningCard?.querySelector('[data-research-generation-process]')?.textContent) + .toContain('正在读取文件') + expect(runningCard?.querySelector('[data-research-generation-process]')?.textContent) + .toContain('正在归纳关键关系') + expect(runningCard?.querySelector('[data-research-generation-cancel]')?.textContent).toBe('停止') + expect(runningCard?.hasAttribute('data-research-generated-mind-map')).toBe(false) + + await act(async () => { + mounted.workspace.applyGenerationInspection(String(target.id), { + taskId: 'task-process', canvasNodeId: target.id, state: 'failed', + lastSeq: 5, error: '模型暂时不可用', events: [] + }) + }) + const failedCard = mounted.host.querySelector(cardSelector) + expect(failedCard?.querySelector('[data-research-generation-process]')).toBeNull() + expect(failedCard?.querySelector('[data-research-generation-failure]')?.textContent) + .toContain('模型暂时不可用') + expect(failedCard?.querySelector('button[aria-label="重试生成"]')).not.toBeNull() + + await act(async () => { + mounted.workspace.retryGeneration(String(target.id)) + mounted.workspace.attachGenerationTask(String(target.id), { + taskId: 'task-process-retry', canvasNodeId: target.id, state: 'running', + childSessionId: 'child-process-retry', lastSeq: 1, events: [] + }) + mounted.workspace.applyGenerationInspection(String(target.id), { + taskId: 'task-process-retry', canvasNodeId: target.id, state: 'completed', + lastSeq: 2, finalOutput: '# 核心结论\n- 收益来源\n - 经营改善', events: [] + }) + }) + const completedCard = mounted.host.querySelector(cardSelector) + expect(completedCard?.getAttribute('data-research-generation-state')).toBe('completed') + expect(completedCard?.hasAttribute('data-research-generated-mind-map')).toBe(true) + expect(completedCard?.querySelector('[data-research-generation-process]')).toBeNull() + expect(completedCard?.querySelector('[data-research-generation-failure]')).toBeNull() + expect(completedCard?.querySelector('[data-research-mind-map]')).not.toBeNull() + expect(mounted.workspace.getSnapshot().artifacts[0]).toMatchObject({ + width: 840, height: 700, sizeMode: 'auto' + }) + } finally { + await mounted.cleanup() + } + }) + + it('auto-sizes generation progress within bounds and preserves manual geometry', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation') + expect(client.researchGenerationAutoGeometry).toBeTypeOf('function') + expect(client.researchGenerationFinalGeometry).toBeTypeOf('function') + if (typeof client.researchGenerationAutoGeometry !== 'function' || + typeof client.researchGenerationFinalGeometry !== 'function') return + + const active = { + kind: 'generated-mind-map', sizeMode: 'auto', generationDetail: 'brief', + generationEvents: Array.from({ length: 12 }, (_, index) => ({ + type: index % 2 === 0 ? 'tool-started' : 'tool-finished' + })), + generationPartialText: '内容'.repeat(6000) + } + expect(client.researchGenerationAutoGeometry(active)).toEqual({ width: 640, height: 560 }) + expect(client.researchGenerationAutoGeometry({ ...active, sizeMode: 'manual' })).toBeNull() + expect(client.researchGenerationFinalGeometry(active, '# 简要导图')).toEqual({ + width: 840, height: 700 + }) + expect(840 / 700).toBeCloseTo(1.2, 5) + expect(client.researchGenerationFinalGeometry({ + kind: 'generated-summary', sizeMode: 'auto' + }, '总结'.repeat(6000))).toEqual({ width: 520, height: 640 }) + expect(client.researchGenerationFinalGeometry({ ...active, sizeMode: 'manual' }, '# 导图')) + .toBeNull() + }) + + it('reattaches and independently applies concurrent persisted task results', async () => { + const pendingA = deferred>() + const pendingB = deferred>() + const inspect = vi.fn((request: Record) => + request.taskId === 'task-a' ? pendingA.promise : pendingB.promise) + const sources = [{ + id: 'source-file', type: 'file', title: 'source.pdf', path: '/w/source.pdf' + }] + const mounted = await mountResearchCanvas({ + sessionId: 'session-generation-concurrent-poll', + files: [{ + id: 'source-file', path: '/w/source.pdf', name: 'source.pdf', + source: 'computer', x: 100, y: 100 + }], + artifacts: [ + { + id: 'node-a', kind: 'generated-summary', messageId: 'node-a', title: '总结提炼', + excerpt: '正在准备任务…', generationStatus: 'running', sourceNodeIds: ['source-file'], + generationSources: sources, generationTaskId: 'task-a', generationChildSessionId: 'child-a', + generationLastSeq: 1, x: 600, y: 100, width: 520, height: 300, sizeMode: 'auto' + }, + { + id: 'node-b', kind: 'generated-summary', messageId: 'node-b', title: '总结提炼', + excerpt: '正在准备任务…', generationStatus: 'running', sourceNodeIds: ['source-file'], + generationSources: sources, generationTaskId: 'task-b', generationChildSessionId: 'child-b', + generationLastSeq: 1, x: 600, y: 450, width: 520, height: 300, sizeMode: 'auto' + } + ], + selectionGeneration: { + generate: vi.fn(async () => ({ ok: true })), inspect + } + }) + try { + expect(inspect).toHaveBeenCalledTimes(2) + expect(inspect.mock.calls.map(([request]) => request)).toEqual(expect.arrayContaining([ + { parentSessionId: 'session-generation-concurrent-poll', taskId: 'task-a', afterSeq: 1 }, + { parentSessionId: 'session-generation-concurrent-poll', taskId: 'task-b', afterSeq: 1 } + ])) + + await act(async () => { + pendingB.resolve({ + taskId: 'task-b', canvasNodeId: 'node-b', state: 'completed', + lastSeq: 2, finalOutput: '第二个任务先完成', events: [] + }) + await Promise.resolve() + }) + expect(mounted.workspace.getSnapshot().artifacts.find((node) => node.id === 'node-b')) + .toMatchObject({ generationStatus: 'completed', excerpt: '第二个任务先完成' }) + expect(mounted.workspace.getSnapshot().artifacts.find((node) => node.id === 'node-a')) + .toMatchObject({ generationStatus: 'running', excerpt: '正在准备任务…' }) + + await act(async () => { + pendingA.resolve({ + taskId: 'task-a', canvasNodeId: 'node-a', state: 'completed', + lastSeq: 2, finalOutput: '第一个任务随后完成', events: [] + }) + await Promise.resolve() + }) + expect(mounted.workspace.getSnapshot().artifacts).toEqual(expect.arrayContaining([ + expect.objectContaining({ id: 'node-a', generationStatus: 'completed', excerpt: '第一个任务随后完成' }), + expect.objectContaining({ id: 'node-b', generationStatus: 'completed', excerpt: '第二个任务先完成' }) + ])) + } finally { + await mounted.cleanup() + } + }) + + it('starts polling when a task is attached after the canvas has mounted', async () => { + let targetId = '' + const inspect = vi.fn(async (request: Record) => ({ + taskId: request.taskId, + canvasNodeId: targetId, + state: 'failed', + lastSeq: 2, + error: '生成失败，请重试。', + events: [] + })) + const mounted = await mountResearchCanvas({ + sessionId: 'session-generation-late-poll', + files: [{ + id: 'source-file', path: '/w/source.pdf', name: 'source.pdf', + source: 'computer', x: 100, y: 100 + }], + selectionGeneration: { + generate: vi.fn(async () => ({ ok: true })), inspect + } + }) + try { + expect(inspect).not.toHaveBeenCalled() + await act(async () => { + const target = mounted.workspace.beginGeneration( + 'summary', ['source-file'], + { x: 600, y: 100, width: 520, height: 300, sizeMode: 'auto' } + ) as Record + targetId = String(target.id) + mounted.workspace.attachGenerationTask(targetId, { + taskId: 'task-late', canvasNodeId: targetId, state: 'queued', + lastSeq: 1, events: [] + }) + await new Promise((resolve) => setTimeout(resolve, 20)) + }) + + expect(inspect).toHaveBeenCalledWith({ + parentSessionId: 'session-generation-late-poll', + taskId: 'task-late', + afterSeq: 1 + }) + expect(mounted.workspace.getSnapshot().artifacts[0]).toMatchObject({ + id: targetId, generationStatus: 'failed', + generationError: '生成失败，请重试。' + }) + } finally { + await mounted.cleanup() + } + }) + + it('turns a missing persisted task into a component-local interrupted state', async () => { + const missing = Object.assign(new Error('not found'), { status: 404 }) + const inspect = vi.fn(async () => { throw missing }) + const mounted = await mountResearchCanvas({ + sessionId: 'session-generation-missing-task', + files: [{ + id: 'source-file', path: '/w/source.pdf', name: 'source.pdf', + source: 'computer', x: 100, y: 100 + }], + artifacts: [{ + id: 'node-missing', kind: 'generated-summary', messageId: 'node-missing', title: '总结提炼', + excerpt: '正在准备任务…', generationStatus: 'running', sourceNodeIds: ['source-file'], + generationSources: [{ + id: 'source-file', type: 'file', title: 'source.pdf', path: '/w/source.pdf' + }], + generationTaskId: 'task-missing', generationChildSessionId: 'child-missing', + generationLastSeq: 3, x: 600, y: 100, width: 520, height: 300, sizeMode: 'auto' + }], + selectionGeneration: { + generate: vi.fn(async () => ({ ok: true })), inspect + } + }) + try { + await act(async () => { await Promise.resolve() }) + expect(mounted.workspace.getSnapshot().artifacts[0]).toMatchObject({ + id: 'node-missing', generationStatus: 'interrupted', + generationError: '任务已中断，请重试。' + }) + expect(mounted.host.querySelector('[data-research-generation-failure]')?.textContent) + .toContain('任务已中断，请重试。') + } finally { + await mounted.cleanup() + } + }) + + it('keeps brief mind maps screenshot-ready while preserving deeper regular maps', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation') + expect(client.parseResearchMindMap).toBeTypeOf('function') + if (typeof client.parseResearchMindMap !== 'function') return + + expect(client.parseResearchMindMap( + '# 增长质量\n- 收入\n - 海外业务\n- 利润\n - 毛利率' + )).toEqual({ + label: '增长质量', + children: [ + { label: '收入', children: [{ label: '海外业务', children: [] }] }, + { label: '利润', children: [{ label: '毛利率', children: [] }] } + ] + }) + const deepOutline = '# 经营质量\n- 增长\n - 收入\n - 海外\n - 东南亚' + expect(client.parseResearchMindMap(deepOutline, 'brief')).toEqual({ + label: '经营质量', + children: [{ + label: '增长', + children: [ + { label: '收入', children: [] }, + { label: '海外', children: [] } + ] + }] + }) + const denseOutline = [ + '# 黄金多因子模型', + '- 核心结论', + ' - 收益来源', + ' - 风险边界', + ' - 失效条件', + '- 因子筛选', + ' - 价值', + ' - 质量', + ' - 动量', + '- 模型构建', + ' - 权重', + ' - 再平衡', + ' - 约束', + '- 改进方向', + ' - 宏观状态', + ' - 交易成本' + ].join('\n') + expect(client.parseResearchMindMap(denseOutline, 'brief')).toEqual({ + label: '黄金多因子模型', + children: [ + { label: '核心结论', children: [ + { label: '收益来源', children: [] }, + { label: '风险边界', children: [] } + ] }, + { label: '因子筛选', children: [ + { label: '价值', children: [] }, + { label: '质量', children: [] } + ] }, + { label: '模型构建', children: [ + { label: '权重', children: [] }, + { label: '再平衡', children: [] } + ] } + ] + }) + expect(client.parseResearchMindMap(deepOutline, 'standard')) + .toMatchObject({ children: [{ children: [{ children: [{ children: [ + { label: '东南亚' } + ] }] }] }] }) + expect(client.parseResearchMindMap(deepOutline, 'detailed')) + .toMatchObject({ children: [{ children: [{ children: [{ children: [ + { label: '东南亚' } + ] }] }] }] }) + expect(client.parseResearchMindMap('')).toBeNull() + }) + + it('renders a settled generated mind map as connected hierarchy nodes', async () => { + const mounted = await mountResearchCanvas({ + sessionId: 'session-rendered-mind-map', + files: [{ + id: 'source-file', path: '/w/source.dat', name: 'source.dat', + source: 'computer', x: 100, y: 100 + }], + artifacts: [{ + id: 'generated-map', kind: 'generated-mind-map', messageId: 'message-map', + title: '思维导图', excerpt: [ + '# 增长质量', + '- Agent 编排与画布工作台', + ' - 海外业务', + '- 数据来源：行情接口与财报数据必须交叉验证。', + ' - 毛利率' + ].join('\n'), + generationStatus: 'completed', generationDetail: 'detailed', sourceNodeIds: ['source-file'], + x: 600, y: 260, width: 840, height: 700, sizeMode: 'manual' + }] + }) + try { + const mindMap = mounted.host.querySelector('[data-research-mind-map]') + expect(mindMap).not.toBeNull() + expect(mindMap?.getAttribute('data-research-mind-map-detail')).toBe('detailed') + expect(mounted.host.querySelector('[data-research-generated-mind-map]')).not.toBeNull() + expect(mounted.host.querySelector( + '[data-research-generated-mind-map] > [data-research-node-title][data-research-node-move-handle]' + )?.textContent).toBe('思维导图') + expect(Array.from( + mounted.host.querySelectorAll('[data-research-mind-map-node]') + ).map((node) => node.textContent)).toEqual([ + '增长质量', 'Agent 编排与画布工作台', '海外业务', + '数据来源：行情接口与财报数据必须交叉验证。', '毛利率' + ]) + const renderedNodes = Array.from( + mounted.host.querySelectorAll('[data-research-mind-map-node]') + ) + expect(renderedNodes.find((node) => + node.textContent === 'Agent 编排与画布工作台' + )?.getAttribute('data-research-mind-map-copy')).toBe('phrase') + expect(renderedNodes.find((node) => + node.textContent === '数据来源：行情接口与财报数据必须交叉验证。' + )?.getAttribute('data-research-mind-map-copy')).toBe('sentence') + expect(mounted.host.querySelectorAll('[data-research-mind-map-branch]')).toHaveLength(4) + } finally { + await mounted.cleanup() + } + }) + + it('edits one generated mind-map node in place and persists the existing hierarchy', async () => { + const storage = new MemoryStorage() + const original = [ + '# 宏观变量', + '- 市场指标', + ' - 美元指数：负向R²21%', + ' - WTI原油' + ].join('\n') + const mounted = await mountResearchCanvas({ + sessionId: 'session-edit-mind-map-node', + storage, + artifacts: [{ + id: 'generated-map', kind: 'generated-mind-map', messageId: 'message-map', + title: '思维导图', excerpt: original, + generationStatus: 'completed', generationDetail: 'standard', sourceNodeIds: ['source-file'], + x: 600, y: 260, width: 840, height: 700, sizeMode: 'manual' + }] + }) + try { + const { browserWindow, host, workspace } = mounted + const metric = Array.from( + host.querySelectorAll('[data-research-mind-map-node]') + ).find((node) => node.textContent === '美元指数：负向R²21%') + expect(metric).not.toBeUndefined() + if (metric === undefined) return + + await act(async () => { + metric.dispatchEvent(new browserWindow.MouseEvent('dblclick', { + bubbles: true, cancelable: true + })) + }) + const editor = host.querySelector( + '[data-research-mind-map-node-input="generated-map:2"]' + ) as HappyDOMHTMLElement | null + expect(editor).not.toBeNull() + expect(browserWindow.document.activeElement).toBe(editor) + expect(workspace.getSnapshot().pendingMessageJump).toBeNull() + if (editor === null) return + + Object.getOwnPropertyDescriptor( + browserWindow.HTMLTextAreaElement.prototype, 'value' + )?.set?.call(editor, '美元指数：负向R²25%') + await act(async () => { + editor.dispatchEvent(new browserWindow.Event('input', { bubbles: true })) + editor.dispatchEvent(new browserWindow.KeyboardEvent('keydown', { + key: 'Enter', code: 'Enter', bubbles: true, cancelable: true + })) + }) + + const revised = [ + '# 宏观变量', + '- 市场指标', + ' - 美元指数：负向R²25%', + ' - WTI原油' + ].join('\n') + expect(workspace.getSnapshot().artifacts[0]?.excerpt).toBe(revised) + expect(JSON.parse(storage.getItem( + 'sherlock.research.canvas.artifacts.v1:session-edit-mind-map-node' + ) ?? '[]')[0]?.excerpt).toBe(revised) + expect(host.querySelector('[data-research-mind-map-node-input]')).toBeNull() + expect(Array.from(host.querySelectorAll('[data-research-mind-map-node]')) + .map((node) => node.textContent)).toContain('美元指数：负向R²25%') + } finally { + await mounted.cleanup() + } + }) + + it('cancels generated mind-map node editing with Escape', async () => { + const original = '# 核心结论\n- 原始结论' + const mounted = await mountResearchCanvas({ + sessionId: 'session-cancel-mind-map-node-edit', + artifacts: [{ + id: 'generated-map', kind: 'generated-mind-map', messageId: 'message-map', + title: '思维导图', excerpt: original, + generationStatus: 'completed', generationDetail: 'brief', sourceNodeIds: ['source-file'], + x: 600, y: 260, width: 840, height: 700, sizeMode: 'manual' + }] + }) + try { + const { browserWindow, host, workspace } = mounted + const conclusion = Array.from( + host.querySelectorAll('[data-research-mind-map-node]') + ).find((node) => node.textContent === '原始结论') + expect(conclusion).not.toBeUndefined() + if (conclusion === undefined) return + await act(async () => { + conclusion.dispatchEvent(new browserWindow.MouseEvent('dblclick', { + bubbles: true, cancelable: true + })) + }) + const editor = host.querySelector( + '[data-research-mind-map-node-input="generated-map:1"]' + ) as HappyDOMHTMLElement | null + expect(editor).not.toBeNull() + if (editor === null) return + Object.getOwnPropertyDescriptor( + browserWindow.HTMLTextAreaElement.prototype, 'value' + )?.set?.call(editor, '不应保存') + await act(async () => { + editor.dispatchEvent(new browserWindow.Event('input', { bubbles: true })) + editor.dispatchEvent(new browserWindow.KeyboardEvent('keydown', { + key: 'Escape', code: 'Escape', bubbles: true, cancelable: true + })) + editor.blur() + }) + expect(workspace.getSnapshot().artifacts[0]?.excerpt).toBe(original) + expect(host.querySelector('[data-research-mind-map-node-input]')).toBeNull() + } finally { + await mounted.cleanup() + } + }) + + it('keeps compact metric labels centered while left-aligning explanatory sentences', async () => { + const mounted = await mountResearchCanvas({ + sessionId: 'session-mind-map-copy-alignment', + artifacts: [{ + id: 'generated-map', kind: 'generated-mind-map', messageId: 'message-map', + title: '思维导图', excerpt: [ + '# 宏观变量', + '- 美元指数：负向R²21%', + '- 实际利率：正向R²7.4%', + '- 数据来源：行情接口与财报数据必须交叉验证。' + ].join('\n'), + generationStatus: 'completed', generationDetail: 'standard', sourceNodeIds: ['source-file'], + x: 600, y: 260, width: 840, height: 700, sizeMode: 'manual' + }] + }) + try { + const nodes = Array.from( + mounted.host.querySelectorAll('[data-research-mind-map-node]') + ) + const copyKind = (label: string) => nodes.find((node) => + node.textContent === label + )?.getAttribute('data-research-mind-map-copy') + expect(copyKind('美元指数：负向R²21%')).toBe('phrase') + expect(copyKind('实际利率：正向R²7.4%')).toBe('phrase') + expect(copyKind('数据来源：行情接口与财报数据必须交叉验证。')).toBe('sentence') + } finally { + await mounted.cleanup() + } + }) + + it('starts a selection generation without replacing the unsent composer draft', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation', undefined, { + modules: { '@deepseek-ai/dsh-client-runtime/client': { createSnapshotStore } } + }) + expect(client.SessionInputShell).toBeTypeOf('function') + if (typeof client.SessionInputShell !== 'function') return + const requests: Array> = [] + const shell = new (client.SessionInputShell as new (deps: Record) => any)({ + actx: {}, + defaultSink: () => undefined, + generationSink: async (request: Record) => { + requests.push(request) + return { ok: true } + } + }) + shell.setDraft('这是尚未发送的研究草稿') + + expect(shell.actions.generateResearchSelection).toBeTypeOf('function') + const result = await shell.actions.generateResearchSelection({ + sessionId: 'session-generation-draft', + kind: 'summary', + selectedNodeIds: ['source-a'], + targetNodeId: 'generated-summary-a' + }) + + expect(JSON.parse(JSON.stringify(result))).toEqual({ ok: true }) + expect(JSON.parse(JSON.stringify(requests))).toEqual([{ + sessionId: 'session-generation-draft', + kind: 'summary', + selectedNodeIds: ['source-a'], + targetNodeId: 'generated-summary-a' + }]) + expect(shell.snapshot.draft).toBe('这是尚未发送的研究草稿') + }) + + it('builds a visible generation request with the complete selected component references', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation') + expect(client.researchSelectionGenerationPrompt).toBeTypeOf('function') + if (typeof client.researchSelectionGenerationPrompt !== 'function' || + typeof client.parseResearchPrompt !== 'function') return + const snapshot = { + files: [{ + id: 'file-source', path: '/w/source.pdf', name: 'source.pdf', + source: 'computer', x: 100, y: 100 + }], + artifacts: [{ + id: 'artifact-source', kind: 'assistant-result', messageId: 'message-source', + title: '助手回复', excerpt: '完整的历史研究结论。', x: 300, y: 100 + }] + } + + const prompt = client.researchSelectionGenerationPrompt( + snapshot, + ['artifact-source', 'file-source'], + 'mind-map', + 'brief' + ) + expect(prompt).toBeTypeOf('string') + const parsed = client.parseResearchPrompt(prompt) as Record + expect(parsed).toMatchObject({ + files: [{ id: 'file-source', path: '/w/source.pdf', name: 'source.pdf' }], + artifacts: [{ + id: 'artifact-source', messageId: 'message-source', + title: '助手回复', excerpt: '完整的历史研究结论。' + }] + }) + expect(parsed.text).toContain('简要模式') + expect(parsed.text).toContain('总层级不得超过 3 层') + expect(parsed.text).toContain('节点总数不超过 10 个') + expect(parsed.text).toContain('适合直接截图粘贴到公司 PPT') + const standardPrompt = client.parseResearchPrompt( + client.researchSelectionGenerationPrompt( + snapshot, ['artifact-source'], 'mind-map', 'standard' + ) + ) as Record + const detailedPrompt = client.parseResearchPrompt( + client.researchSelectionGenerationPrompt( + snapshot, ['artifact-source'], 'mind-map', 'detailed' + ) + ) as Record + expect(standardPrompt.text).toContain('常规模式') + expect(standardPrompt.text).toContain('不设置固定层级上限') + expect(detailedPrompt.text).toContain('详细模式') + expect(detailedPrompt.text).toContain('不设置固定层级上限') + expect(detailedPrompt.text).toContain('避免末行仅剩单个汉字') + expect(detailedPrompt.text).toContain('完整句子左对齐，短语或词语居中') + expect(client.researchSelectionGenerationPrompt(snapshot, ['missing'], 'summary')) + .toBeNull() + }) + + it('uses the approved PPT-ready white canvas, square nodes, palette, and connectors', async () => { + const styles: InjectedStyle[] = [] + await loadClientBundle('dsh-client-ui-conversation', undefined, { styles }) + const css = styles.find(({ pluginCss }) => + pluginCss?.endsWith('/ResearchCanvas.module.css') + )?.textContent ?? '' + + expect(css).not.toContain('[data-research-generated-mind-map]{background:#fff;border-radius:0;box-shadow:none}') + expect(css).not.toContain('[data-research-generated-mind-map]>.rScV5Q_nodeTitle{display:none}') + expect(css).not.toContain('[data-research-generated-mind-map]>.rScV5Q_nodeTitle{') + expect(css).toContain('[data-research-generated-mind-map]>.rScV5Q_previewBody{background:#fff}') + expect(css).toContain('font-family:STHeiti_YFD,"STHeiti SC","PingFang SC",sans-serif') + expect(css).toContain('[data-research-mind-map-depth="0"]{background:rgb(0,80,150)}') + expect(css).toContain('[data-research-mind-map-depth="1"]{background:rgb(0,120,180)}') + expect(css).toContain('[data-research-mind-map-depth="2"]{background:rgb(30,185,225)}') + expect(css).toContain('border-radius:0;box-shadow:none') + expect(css).toContain('background:rgb(150,150,150)') + expect(css).toContain('width:200px;min-height:54px;max-width:200px') + expect(css).toContain('word-break:normal;overflow-wrap:break-word') + expect(css).toContain('[data-research-mind-map-copy="phrase"]{text-align:center;text-wrap:balance}') + expect(css).toContain('[data-research-mind-map-copy="sentence"]{justify-content:flex-start;text-align:left;text-wrap:pretty}') + expect(css).not.toContain('.rScV5Q_mindMapChildren:before') + expect(css).toContain('.rScV5Q_mindMapRoot+.rScV5Q_mindMapChildren:after{display:none}') + expect(css).toContain('.rScV5Q_mindMapRoot:after') + expect(css).toContain('left:100%;top:50%;width:20px;height:1px') + expect(css).toContain('.rScV5Q_mindMapBranch:after') + expect(css).toContain('.rScV5Q_mindMapBranch:first-child:after{top:50%}') + expect(css).toContain('.rScV5Q_mindMapBranch:last-child:after{bottom:50%}') + expect(css).toContain('.rScV5Q_mindMapBranch:only-child:after{display:none}') + }) + + it('starts selected-component generation through the isolated task service', async () => { + const fetchMock = vi.fn<(input: string, init?: RequestInit) => Promise>(async () => ({ + ok: true, + status: 202, + async json() { + return { + taskId: 'task-isolated', canvasNodeId: 'generated-summary', + state: 'running', childSessionId: 'child-isolated', lastSeq: 2, events: [] + } + } + } as Response)) + const mounted = await mountResearchCanvas({ + sessionId: 'session-selection-generation-isolated', + files: [{ + id: 'source-file', path: '/w/source.pdf', name: 'source.pdf', + source: 'computer', x: 100, y: 100 + }], + fetch: fetchMock + }) + try { + const target = mounted.workspace.beginGeneration( + 'summary', ['source-file'], + { x: 500, y: 100, width: 520, height: 300, sizeMode: 'auto' } + ) as Record + const generatedId = String(target.id) + fetchMock.mockImplementationOnce(async () => ({ + ok: true, + status: 202, + async json() { + return { + taskId: 'task-isolated', canvasNodeId: generatedId, + state: 'running', childSessionId: 'child-isolated', lastSeq: 2, events: [] + } + } + } as Response)) + const prompt = vi.fn() + const session = { sessionId: 'session-selection-generation-isolated', prompt } + const Hub = mounted.client.InputHub as new ( + rootCtx: Record, + t: (key: string) => string, + researchWorkspaces: typeof mounted.researchWorkspaces + ) => { + generateResearchSelection(session: Record, request: Record): Promise> + } + const hub = new Hub({}, (key: string) => key, mounted.researchWorkspaces) + + const result = await hub.generateResearchSelection(session, { + sessionId: session.sessionId, + kind: 'summary', + selectedNodeIds: ['source-file'], + targetNodeId: generatedId + }) + + expect(result).toMatchObject({ ok: true, taskId: 'task-isolated' }) + expect(prompt).not.toHaveBeenCalled() + expect(fetchMock).toHaveBeenCalledWith( + '/sherlock/research-tasks/start', + expect.objectContaining({ method: 'POST', cache: 'no-store', credentials: 'same-origin' }) + ) + const payload = JSON.parse(String(fetchMock.mock.calls.at(-1)?.[1]?.body)) + expect(payload).toEqual({ + parentSessionId: session.sessionId, + canvasNodeId: generatedId, + kind: 'summary', + sources: [{ + id: 'source-file', type: 'file', title: 'source.pdf', path: '/w/source.pdf' + }] + }) + expect(mounted.workspace.getSnapshot().artifacts.find((node) => node.id === generatedId)) + .toMatchObject({ + generationTaskId: 'task-isolated', + generationChildSessionId: 'child-isolated', + generationStatus: 'running' + }) + } finally { + await mounted.cleanup() + } + }) + + it('migrates legacy URL-like web titles to clean automatic titles', async () => { + const mounted = await mountResearchCanvas({ sessionId: 'session-web-title-migration' }) + try { + const parse = mounted.client.parseResearchCanvasArtifactNodes as ( + raw: string + ) => Array> + expect(parse).toBeTypeOf('function') + + const make = (id: string, title: string, url: string) => ({ + id, + kind: 'web-link', + messageId: id, + title, + excerpt: url, + url, + x: 100, + y: 100 + }) + const parsed = parse(JSON.stringify([ + make('legacy-percent', '%20www.baidu.com', 'https://www.baidu.com/'), + make('legacy-url', 'https://example.com/report', 'https://example.com/report'), + make('legacy-empty', '', 'https://empty.example/path'), + make('legacy-custom', '我的监控页面', 'https://custom.example/path') + ])) + + expect(parsed).toMatchObject([ + { id: 'legacy-percent', title: 'www.baidu.com', titleMode: 'auto' }, + { id: 'legacy-url', title: 'example.com', titleMode: 'auto' }, + { id: 'legacy-empty', title: 'empty.example', titleMode: 'auto' }, + { id: 'legacy-custom', title: '我的监控页面', titleMode: 'custom' } + ]) + } finally { + await mounted.cleanup() + } + }) + + it('updates only current automatic web titles and preserves a user rename', async () => { + const mounted = await mountResearchCanvas({ sessionId: 'session-web-title-mode' }) + try { + let node: Record | null = null + await act(async () => { + mounted.workspace.setCanvasSize({ width: 800, height: 600 }) + node = mounted.workspace.createWebLink('https://example.com/report') + }) + expect(node).toMatchObject({ + title: 'example.com', + titleMode: 'auto', + url: 'https://example.com/report' + }) + if (node === null) return + const nodeId = String(mounted.workspace.getSnapshot().artifacts[0]?.id) + + let changed = false + await act(async () => { + changed = mounted.workspace.applyWebLinkInspection( + nodeId, + 'https://example.com/report', + { title: '真实页面标题' } + ) + }) + expect(changed).toBe(true) + expect(mounted.workspace.getSnapshot().artifacts[0]).toMatchObject({ + title: '真实页面标题', + titleMode: 'auto' + }) + + await act(async () => { + changed = mounted.workspace.renameNode(nodeId, '我的标题') + }) + expect(changed).toBe(true) + expect(mounted.workspace.applyWebLinkInspection( + nodeId, + 'https://example.com/report', + { title: '不应覆盖' } + )).toBe(false) + expect(mounted.workspace.getSnapshot().artifacts[0]).toMatchObject({ + title: '我的标题', + titleMode: 'custom' + }) + + await act(async () => { + changed = mounted.workspace.updateWebLink(nodeId, 'https://next.example/dashboard') + }) + expect(changed).toBe(true) + expect(mounted.workspace.applyWebLinkInspection( + nodeId, + 'https://example.com/report', + { title: '过期响应' } + )).toBe(false) + expect(mounted.workspace.getSnapshot().artifacts[0]).toMatchObject({ + title: 'next.example', + titleMode: 'auto', + url: 'https://next.example/dashboard' + }) + } finally { + await mounted.cleanup() + } + }) + + it('keeps responsive web viewport scaling between sixty-five and one hundred percent', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation') + const layout = client.researchWebFrameLayout as ( + containerWidth: number, + scrollWidth: number + ) => { logicalWidth: number; scale: number } + expect(layout).toBeTypeOf('function') + expect(layout(720, 720)).toEqual({ logicalWidth: 720, scale: 1 }) + expect(layout(720, 1_200)).toEqual({ logicalWidth: 1_108, scale: 0.65 }) + expect(layout(400, 4_000)).toEqual({ logicalWidth: 615, scale: 0.65 }) + expect(layout(900, 1_000)).toEqual({ logicalWidth: 1_000, scale: 0.9 }) + }) + + it('uses the authorized frame name, applies inspected titles, and rescales after resize', async () => { + const resizeObserverCallbacks: Array<() => void> = [] + const inspect = vi.fn(async () => ({ + url: 'https://example.com/report', + title: '真实页面标题', + scrollWidth: 1_200, + clientWidth: 720 + })) + const mounted = await mountResearchCanvas({ + sessionId: 'session-web-frame-inspection', + artifacts: [{ + id: 'web-frame', kind: 'web-link', messageId: 'web-frame', + title: 'example.com', titleMode: 'auto', excerpt: 'https://example.com/report', + url: 'https://example.com/report', x: 400, y: 300, + width: 720, height: 480, sizeMode: 'manual' + }], + resizeObserverCallbacks, + dshDesktop: { + researchLinkFrame: { + authorize: vi.fn(async (value) => ({ + url: value.url, + frameName: 'sherlock-research-link-0123456789abcdef0123456789abcdef' + })), + inspect, + release: vi.fn(async () => ({ ok: true })), + releaseSession: vi.fn(async () => ({ ok: true, removed: 0 })) + } + } + }) + try { + await act(async () => { await Promise.resolve(); await Promise.resolve() }) + const iframe = mounted.host.querySelector('[data-research-web-frame]') as HTMLIFrameElement | null + const viewport = mounted.host.querySelector('[data-research-web-frame-viewport]') as HTMLElement | null + expect(iframe?.getAttribute('name')) + .toBe('sherlock-research-link-0123456789abcdef0123456789abcdef') + expect(viewport).not.toBeNull() + if (iframe === null || viewport === null) return + + let viewportWidth = 720 + Object.defineProperty(viewport, 'clientWidth', { + configurable: true, + get: () => viewportWidth + }) + await act(async () => { + iframe.dispatchEvent( + new mounted.browserWindow.Event('load') as unknown as Event + ) + await Promise.resolve(); await Promise.resolve() + }) + expect(inspect).toHaveBeenCalledWith({ + sessionId: 'session-web-frame-inspection', nodeId: 'web-frame' + }) + expect(mounted.workspace.getSnapshot().artifacts[0]).toMatchObject({ + title: '真实页面标题', titleMode: 'auto' + }) + expect(iframe.style.width).toBe('1108px') + expect(iframe.style.transform).toBe('scale(0.65)') + + viewportWidth = 900 + await act(async () => { resizeObserverCallbacks.forEach((callback) => callback()) }) + expect(iframe.style.width).toBe('1200px') + expect(iframe.style.transform).toBe('scale(0.75)') + } finally { + await mounted.cleanup() + } + }) + + it('renders public WeChat articles through the scriptless safe reader', async () => { + const read = vi.fn(async () => ({ + status: 'ready', + url: 'https://mp.weixin.qq.com/s/8KsqPVeAfMMev43BXwvCFA', + title: '英伟达豪掷70亿，下场做开放大模型了', + author: '示例作者', + publishTime: '2026年9月1日', + bodyHtml: '

文章正文

' + })) + const authorize = vi.fn(async (value: { url: string }) => ({ url: value.url })) + const mounted = await mountResearchCanvas({ + sessionId: 'session-wechat-safe-reader', + artifacts: [{ + id: 'wechat-link', kind: 'web-link', messageId: 'wechat-link', + title: 'mp.weixin.qq.com', titleMode: 'auto', + excerpt: 'https://mp.weixin.qq.com/s/8KsqPVeAfMMev43BXwvCFA', + url: 'https://mp.weixin.qq.com/s/8KsqPVeAfMMev43BXwvCFA', + x: 400, y: 300, width: 720, height: 480, sizeMode: 'manual' + }], + dshDesktop: { + researchWebReader: { read }, + researchLinkFrame: { + authorize, + release: vi.fn(async () => ({ ok: true })), + releaseSession: vi.fn(async () => ({ ok: true, removed: 0 })) + } + } + }) + try { + await act(async () => { await Promise.resolve(); await Promise.resolve() }) + const iframe = mounted.host.querySelector('[data-research-wechat-reader]') as HTMLIFrameElement | null + expect(read).toHaveBeenCalledWith({ + sessionId: 'session-wechat-safe-reader', nodeId: 'wechat-link', + url: 'https://mp.weixin.qq.com/s/8KsqPVeAfMMev43BXwvCFA' + }) + expect(authorize).toHaveBeenCalledWith({ + sessionId: 'session-wechat-safe-reader', nodeId: 'wechat-link', + url: 'https://mp.weixin.qq.com/s/8KsqPVeAfMMev43BXwvCFA' + }) + expect(authorize).toHaveBeenCalledTimes(1) + expect(read).toHaveBeenCalledTimes(1) + expect(iframe).not.toBeNull() + expect(iframe?.getAttribute('sandbox')).toBe('') + expect(iframe?.srcdoc).toContain('文章正文') + expect(iframe?.srcdoc).not.toContain(' { + const mounted = await mountResearchCanvas({ sessionId: 'session-export-descriptors' }) + try { + const descriptor = mounted.client.researchCanvasExportDescriptor as ( + node: Record, sessionId: string + ) => Record | null + const fileName = mounted.client.researchCanvasExportFileName as ( + title: string, extension: string + ) => string + expect(descriptor).toBeTypeOf('function') + expect(fileName('%20研究/结论?.md', 'md')).toBe('研究结论.md') + + expect(descriptor({ + id: 'pdf-1', name: 'report.pdf', source: 'computer', + authorizationId: 'authorization_1', x: 0, y: 0 + }, 'session-1')).toEqual({ + kind: 'original', sessionId: 'session-1', nodeId: 'pdf-1', + authorizationId: 'authorization_1', suggestedName: 'report.pdf' + }) + expect(descriptor({ + id: 'missing-file', name: 'missing.pdf', source: 'computer', x: 0, y: 0 + }, 'session-1')).toMatchObject({ kind: 'text', format: 'txt' }) + expect(descriptor({ + id: 'assistant', kind: 'assistant-result', title: '研究结论', excerpt: '正文' + }, 'session-1')).toMatchObject({ + kind: 'text', format: 'md', suggestedName: '研究结论.md', + content: '# 研究结论\n\n正文\n' + }) + expect(descriptor({ + id: 'web', kind: 'web-link', title: '研究页面', + url: 'https://example.com/report', excerpt: 'https://example.com/report' + }, 'session-1')).toMatchObject({ + kind: 'webloc', suggestedName: '研究页面.webloc', + url: 'https://example.com/report' + }) + expect(descriptor({ + id: 'mind-map', kind: 'generated-mind-map', title: '逻辑图', + excerpt: '# 中心\n- 分支', generationStatus: 'completed', generationDetail: 'brief' + }, 'session-1')).toMatchObject({ + kind: 'mind-map', suggestedName: '逻辑图', detail: 'brief' + }) + expect(descriptor({ + id: 'failed-map', kind: 'generated-mind-map', title: '失败导图', + excerpt: '生成失败', generationStatus: 'failed', generationError: '请求超时' + }, 'session-1')).toMatchObject({ kind: 'text', format: 'txt' }) + + const table = descriptor({ + id: 'table', kind: 'generated-container', title: '对比表', + generationStatus: 'completed', + containerSpec: { + version: 1, type: 'table', title: '对比表', + columns: ['名称', '备注'], + rows: [['A,产品', '包含"引号"'], ['B', '两行\n文字']] + } + }, 'session-1') + expect(table).toMatchObject({ kind: 'text', format: 'csv' }) + expect(String(table?.content)).toBe( + '名称,备注\r\n"A,产品","包含""引号"""\r\nB,"两行\n文字"\r\n' + ) + expect(descriptor({ + id: 'kpi', kind: 'generated-container', title: '核心指标', + generationStatus: 'completed', containerSpec: { + version: 1, type: 'kpi', title: '核心指标', + items: [{ label: '收入', value: '12 亿', change: '+8%' }] + } + }, 'session-1')).toMatchObject({ kind: 'text', format: 'md' }) + expect(descriptor({ + id: 'draft', kind: 'generated-container', title: '待生成容器', + generationStatus: 'draft', containerPrompt: '做一张表格' + }, 'session-1')).toMatchObject({ kind: 'text', format: 'txt' }) + } finally { + await mounted.cleanup() + } + }) + + it('builds a standalone literal-color chart SVG for download', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation') + const build = client.buildResearchContainerChartSvg as ( + spec: Record + ) => string | null + expect(build).toBeTypeOf('function') + const svg = build({ + version: 1, type: 'chart', title: '收入趋势', variant: 'line', + labels: ['一月', '二月'], + series: [{ name: '收入', values: [10, 12] }] + }) + expect(svg).toContain(' { + const client = await loadClientBundle('dsh-client-ui-conversation') + const build = client.buildResearchMindMapSvg as ( + text: string, + detail: string, + measureText: (text: string) => number + ) => { svg: string; width: number; height: number } | null + expect(build).toBeTypeOf('function') + const result = build([ + '# 中心主题', + '- 四件事可直接迁移', + ' - 这是一个需要左对齐显示的完整句子，便于用户快速理解。', + '- 三个不同层级的差异', + ' - 产品定位', + '- 路径已做市场验证' + ].join('\n'), 'brief', (text) => Array.from(text).length * 14) + + expect(result).not.toBeNull() + if (result === null) return + expect(result.width / result.height).toBeCloseTo(1.2, 1) + expect(result.svg).toContain(']*>[。，；！？]<\/tspan>/) + expect(result.svg).toMatch(/ { + const client = await loadClientBundle('dsh-client-ui-conversation') + const rasterize = client.rasterizeResearchMindMapSvg as ( + svg: string, + width: number, + height: number, + format: 'png' | 'jpg', + environment: Record + ) => Promise<{ base64: string; width: number; height: number }> + expect(rasterize).toBeTypeOf('function') + const events: string[] = [] + const formats: Array<{ type: string; quality?: number }> = [] + const canvas = { + getContext: () => ({ + set fillStyle(value: string) { events.push(`fillStyle:${value}`) }, + fillRect: (...values: number[]) => events.push(`fillRect:${values.join(',')}`), + drawImage: () => events.push('drawImage') + }), + toBlob(callback: (blob: unknown) => void, type: string, quality?: number) { + formats.push({ type, quality }) + callback({ type }) + } + } + const sizes: Array<[number, number]> = [] + const environment = { + createCanvas(width: number, height: number) { + sizes.push([width, height]) + return canvas + }, + createImage() { + return { + onload: null as null | (() => void), + onerror: null as null | (() => void), + set src(_value: string) { queueMicrotask(() => this.onload?.()) } + } + }, + createSvgUrl: () => 'blob:mind-map', + revokeSvgUrl: (url: string) => events.push(`revoke:${url}`), + blobToBase64: async () => 'ZmFrZQ==' + } + + await expect(rasterize('', 640, 360, 'png', environment)) + .resolves.toEqual({ base64: 'ZmFrZQ==', width: 1280, height: 720 }) + await expect(rasterize('', 640, 360, 'jpg', environment)) + .resolves.toEqual({ base64: 'ZmFrZQ==', width: 1280, height: 720 }) + expect(sizes).toEqual([[1280, 720], [1280, 720]]) + expect(formats).toEqual([ + { type: 'image/png', quality: undefined }, + { type: 'image/jpeg', quality: 0.92 } + ]) + expect(events.indexOf('fillRect:0,0,1280,720')).toBeLessThan(events.indexOf('drawImage')) + expect(events).toContain('fillStyle:#ffffff') + expect(events).toContain('revoke:blob:mind-map') + }) + + it('keeps a bottom global toolbar for links and native container drafts', async () => { + const authorize = vi.fn(async (value: { url: string }) => ({ url: value.url })) + const release = vi.fn(async () => ({ ok: true })) + const generate = vi.fn(async (_request: Record) => ({ ok: true })) + const mounted = await mountResearchCanvas({ + sessionId: 'session-global-toolbar-ui', + dshDesktop: { + researchLinkFrame: { + authorize, + release, + releaseSession: vi.fn(async () => ({ ok: true, removed: 0 })) + } + }, + selectionGeneration: { generate } + }) + try { + const { browserWindow, host, workspace } = mounted + const createWebLink = vi.spyOn(workspace, 'createWebLink') + const toolbar = host.querySelector('[data-research-global-toolbar]') + const linkButton = host.querySelector('[data-research-global-link]') + const containerButton = host.querySelector('[data-research-global-container]') + expect(toolbar?.getAttribute('role')).toBe('toolbar') + expect(linkButton?.textContent).toContain('链接') + expect(containerButton?.textContent).toContain('容器') + + await act(async () => { click(browserWindow, linkButton) }) + const linkInput = host.querySelector('[data-research-link-input]') as HTMLInputElement | null + expect(host.querySelector('[data-research-link-popover]')).not.toBeNull() + expect(browserWindow.document.activeElement).toBe(linkInput) + if (linkInput === null) return + Object.getOwnPropertyDescriptor( + browserWindow.HTMLInputElement.prototype, 'value' + )?.set?.call(linkInput, 'https://Example.com/dashboard') + await act(async () => { + linkInput.dispatchEvent(new browserWindow.Event('input', { bubbles: true }) as unknown as Event) + }) + expect(linkInput.value).toBe('https://Example.com/dashboard') + await act(async () => { + click(browserWindow, host.querySelector('[data-research-link-submit]')) + await Promise.resolve() + }) + expect(createWebLink).toHaveBeenCalledWith('https://Example.com/dashboard') + expect(host.querySelector('[role="alert"]')?.textContent ?? null).toBeNull() + const linkNode = workspace.getSnapshot().artifacts.find((node) => node.kind === 'web-link') + expect(linkNode).toMatchObject({ + title: 'example.com', + url: 'https://example.com/dashboard', + width: 720, + height: 480 + }) + expect(authorize).toHaveBeenCalledWith({ + sessionId: 'session-global-toolbar-ui', + nodeId: linkNode?.id, + url: 'https://example.com/dashboard' + }) + expect(host.querySelector('[data-research-web-frame]')?.getAttribute('src')) + .toBe('https://example.com/dashboard') + + await act(async () => { click(browserWindow, containerButton) }) + const prompt = host.querySelector('[data-research-container-prompt]') as HTMLTextAreaElement | null + expect(prompt).not.toBeNull() + expect(browserWindow.document.activeElement).toBe(prompt) + if (prompt === null) return + Object.getOwnPropertyDescriptor( + browserWindow.HTMLTextAreaElement.prototype, 'value' + )?.set?.call(prompt, '制作月度收入柱状图') + await act(async () => { + prompt.dispatchEvent(new browserWindow.Event('input', { bubbles: true }) as unknown as Event) + }) + await act(async () => { + prompt.dispatchEvent(new browserWindow.KeyboardEvent('keydown', { + key: 'Enter', code: 'Enter', metaKey: true, bubbles: true, cancelable: true + }) as unknown as Event) + await Promise.resolve() + }) + expect(generate).toHaveBeenCalledWith(expect.objectContaining({ + sessionId: 'session-global-toolbar-ui', + kind: 'container', + targetNodeId: expect.any(String), + prompt: '制作月度收入柱状图' + })) + expect(generate.mock.calls.at(-1)?.[0]).not.toHaveProperty('selectedNodeIds') + expect(workspace.getSnapshot().artifacts.find((node) => node.kind === 'generated-container')) + .toMatchObject({ + generationStatus: 'queued', + containerPrompt: '制作月度收入柱状图' + }) + } finally { + await mounted.cleanup() + } + }) + + it('starts native container generation through the isolated task service and applies validated output', async () => { + const fetchMock = vi.fn<(input: string, init?: RequestInit) => Promise>(async () => ({ + ok: true, + status: 202, + async json() { + return { + taskId: 'task-container', canvasNodeId: 'container-placeholder', + state: 'running', childSessionId: 'child-container', lastSeq: 2, events: [] + } + } + } as Response)) + const mounted = await mountResearchCanvas({ + sessionId: 'session-container-generation-isolated', + fetch: fetchMock + }) + try { + const draft = mounted.workspace.createContainerDraft({ + x: 500, y: 300, width: 520, height: 300, sizeMode: 'auto' + }) as Record + const target = mounted.workspace.beginContainerGeneration( + String(draft.id), + '制作收入、利润和现金流三项核心指标' + ) as Record + const generatedId = String(target.id) + fetchMock.mockImplementationOnce(async () => ({ + ok: true, + status: 202, + async json() { + return { + taskId: 'task-container', canvasNodeId: generatedId, + state: 'running', childSessionId: 'child-container', lastSeq: 2, events: [] + } + } + } as Response)) + const session = { sessionId: 'session-container-generation-isolated' } + const Hub = mounted.client.InputHub as new ( + rootCtx: Record, + t: (key: string) => string, + researchWorkspaces: typeof mounted.researchWorkspaces + ) => { + generateResearchSelection(session: Record, request: Record): Promise> + } + const hub = new Hub({}, (key: string) => key, mounted.researchWorkspaces) + + const result = await hub.generateResearchSelection(session, { + sessionId: session.sessionId, + kind: 'container', + targetNodeId: generatedId, + prompt: target.prompt + }) + + expect(result).toMatchObject({ ok: true, taskId: 'task-container' }) + const payload = JSON.parse(String(fetchMock.mock.calls.at(-1)?.[1]?.body)) + expect(payload).toEqual({ + parentSessionId: session.sessionId, + canvasNodeId: generatedId, + kind: 'container', + prompt: '制作收入、利润和现金流三项核心指标' + }) + expect(mounted.workspace.applyGenerationInspection(generatedId, { + taskId: 'task-container', canvasNodeId: generatedId, state: 'completed', + lastSeq: 3, completedAt: 1_000, events: [], + finalOutput: JSON.stringify({ + version: 1, type: 'kpi', title: '核心经营指标', + items: [ + { label: '收入', value: '12 亿', change: '+8%' }, + { label: '利润', value: '2.6 亿' }, + { label: '现金流', value: '3.1 亿' } + ] + }) + })).toBe(true) + expect(mounted.workspace.getSnapshot().artifacts[0]).toMatchObject({ + id: generatedId, + kind: 'generated-container', + title: '核心经营指标', + generationStatus: 'completed', + width: 640, + height: 420, + lastSuccessfulAt: 1_000, + containerSpec: { + version: 1, + type: 'kpi', + items: [ + { label: '收入', value: '12 亿', change: '+8%' }, + { label: '利润', value: '2.6 亿' }, + { label: '现金流', value: '3.1 亿' } + ] + } + }) + expect(mounted.workspace.getSnapshot().artifacts[0]).not.toHaveProperty('generationEvents') + expect(mounted.workspace.getSnapshot().artifacts[0]).not.toHaveProperty('generationPartialText') + } finally { + await mounted.cleanup() + } + }) + + it('fails malformed native container output and retries from the saved prompt', async () => { + const mounted = await mountResearchCanvas({ sessionId: 'session-container-invalid-output' }) + try { + const draft = mounted.workspace.createContainerDraft({ + x: 400, y: 240, width: 520, height: 300, sizeMode: 'auto' + }) as Record + const target = mounted.workspace.beginContainerGeneration( + String(draft.id), '制作一张可执行脚本' + ) as Record + expect(mounted.workspace.attachGenerationTask(String(target.id), { + taskId: 'task-invalid-container', canvasNodeId: target.id, + state: 'running', childSessionId: 'child-invalid-container', lastSeq: 1, events: [] + })).toBe(true) + + expect(mounted.workspace.applyGenerationInspection(String(target.id), { + taskId: 'task-invalid-container', canvasNodeId: target.id, + state: 'completed', lastSeq: 2, + finalOutput: '{"version":1,"type":"script","code":"alert(1)"}', events: [] + })).toBe(true) + expect(mounted.workspace.getSnapshot().artifacts[0]).toMatchObject({ + generationStatus: 'failed', + generationError: '生成内容格式无效，请重试。', + containerPrompt: '制作一张可执行脚本' + }) + expect(mounted.workspace.retryGeneration(String(target.id))).toMatchObject({ + id: target.id, + kind: 'container', + prompt: '制作一张可执行脚本' + }) + } finally { + await mounted.cleanup() + } + }) + + it('renders all five native container types without executable HTML', async () => { + const authorize = vi.fn(async (value: { url: string }) => ({ url: value.url })) + const base = { + kind: 'generated-container', generationStatus: 'completed', + generationLastSeq: 3, sourceNodeIds: [], refreshMinutes: 0, + sizeMode: 'manual', width: 640, height: 420 + } + const specs = [{ + id: 'container-web', title: '市场页面', containerPrompt: '创建市场网页', + excerpt: 'web', containerSpec: { + version: 1, type: 'web', title: '市场页面', url: 'https://example.com/market' + } + }, { + id: 'container-chart', title: '收入趋势', containerPrompt: '创建收入图', + excerpt: 'chart', containerSpec: { + version: 1, type: 'chart', title: '收入趋势', variant: 'line', + labels: ['一月', '二月'], series: [{ name: '收入', values: [10, 12] }] + } + }, { + id: 'container-table', title: '产品数据', containerPrompt: '创建产品表', + excerpt: 'table', containerSpec: { + version: 1, type: 'table', title: '产品数据', + columns: ['产品', '规模'], rows: [['A', 10], ['B', 12]] + } + }, { + id: 'container-kpi', title: '关键指标', containerPrompt: '创建关键指标', + excerpt: 'kpi', containerSpec: { + version: 1, type: 'kpi', title: '关键指标', + items: [{ label: '收入', value: '12 亿', change: '+8%' }] + } + }, { + id: 'container-markdown', title: '研究结论', containerPrompt: '创建研究结论', + excerpt: 'markdown', containerSpec: { + version: 1, type: 'markdown', title: '研究结论', + content: '## 结论\n\n 增长保持稳定。' + } + }].map((item, index) => ({ + ...base, ...item, messageId: item.id, + x: 400 + index * 40, y: 300 + index * 40 + })) + const mounted = await mountResearchCanvas({ + sessionId: 'session-container-native-renderers', + artifacts: specs, + dshDesktop: { + researchLinkFrame: { + authorize, + release: vi.fn(async () => ({ ok: true })), + releaseSession: vi.fn(async () => ({ ok: true, removed: 0 })) + } + } + }) + try { + await act(async () => { await Promise.resolve() }) + expect(mounted.host.querySelector('[data-research-container-chart="line"]')).not.toBeNull() + expect(mounted.host.querySelector('[data-research-container-table]')?.textContent) + .toContain('产品') + expect(mounted.host.querySelector('[data-research-container-kpi]')?.textContent) + .toContain('12 亿') + expect(mounted.host.querySelector('[data-research-container-markdown]')?.textContent) + .toContain('') + expect(mounted.host.querySelector('script')).toBeNull() + expect(authorize).toHaveBeenCalledWith(expect.objectContaining({ + sessionId: 'session-container-native-renderers', + nodeId: 'container-web', + url: 'https://example.com/market' + })) + expect(mounted.host.querySelector('[data-research-web-frame]')).not.toBeNull() + } finally { + await mounted.cleanup() + } + }) + + it('keeps prior container content visible while a manual refresh runs', async () => { + const generate = vi.fn(async () => ({ ok: true })) + const mounted = await mountResearchCanvas({ + sessionId: 'session-container-refresh-ui', + artifacts: [{ + id: 'container-refresh', kind: 'generated-container', messageId: 'container-refresh', + title: '关键指标', excerpt: 'kpi', generationStatus: 'completed', generationLastSeq: 3, + sourceNodeIds: [], containerPrompt: '刷新关键经营指标', refreshMinutes: 0, + lastSuccessfulAt: 1_000, + containerSpec: { + version: 1, type: 'kpi', title: '关键指标', + items: [{ label: '收入', value: '12 亿', change: '+8%' }] + }, + x: 400, y: 300, width: 640, height: 420, sizeMode: 'manual' + }], + selectionGeneration: { generate } + }) + try { + const { browserWindow, host, workspace } = mounted + expect(host.querySelector('[data-research-container-kpi]')?.textContent).toContain('12 亿') + await act(async () => { + click(browserWindow, host.querySelector('[data-research-container-refresh]')) + await Promise.resolve() + }) + + expect(generate).toHaveBeenCalledWith({ + sessionId: 'session-container-refresh-ui', + kind: 'container', + targetNodeId: 'container-refresh', + prompt: '刷新关键经营指标' + }) + expect(workspace.getSnapshot().artifacts[0]).toMatchObject({ + generationStatus: 'queued', + containerSpec: { type: 'kpi' } + }) + expect(host.querySelector('[data-research-container-kpi]')?.textContent).toContain('12 亿') + expect(host.querySelector('[data-research-container-refreshing]')).not.toBeNull() + + const interval = host.querySelector('[data-research-container-refresh-interval]') as HTMLSelectElement | null + expect(interval).not.toBeNull() + if (interval !== null) { + Object.getOwnPropertyDescriptor( + browserWindow.HTMLSelectElement.prototype, 'value' + )?.set?.call(interval, '5') + await act(async () => { + interval.dispatchEvent(new browserWindow.Event('change', { bubbles: true }) as unknown as Event) + }) + expect(workspace.getSnapshot().artifacts[0]).toMatchObject({ refreshMinutes: 5 }) + } + } finally { + await mounted.cleanup() + } + }) + + it('offers a bottom-center return control when the Research viewport has no components', async () => { + const mounted = await mountResearchCanvas({ + sessionId: 'session-return-to-content', + viewport: { scale: 1, x: 0, y: 0 }, + files: [{ + id: 'file-far', path: '/w/far.pptx', name: 'far.pptx', source: 'computer', + x: 3_000, y: 2_000, width: 480, height: 360, sizeMode: 'manual' + }] + }) + try { + const { browserWindow, host, workspace } = mounted + await act(async () => { + workspace.setCanvasSize({ width: 800, height: 600 }) + }) + + const notice = host.querySelector('[data-research-empty-viewport]') + const button = host.querySelector('[data-research-return-to-content]') + expect(notice?.textContent).toContain('视口内无内容') + expect(button?.textContent).toBe('回到内容') + expect(button).not.toBeNull() + const toolbar = host.querySelector( + '[data-research-global-toolbar]' + ) as unknown as HappyDOMElement + const noticeStyle = browserWindow.getComputedStyle(notice as unknown as HappyDOMElement) + const toolbarStyle = browserWindow.getComputedStyle(toolbar) + const toolbarButton = toolbar.querySelector('button') as unknown as HappyDOMElement + const toolbarIcon = toolbar.querySelector('svg') as unknown as HappyDOMElement + expect(noticeStyle.bottom).toBe('90px') + expect(toolbarStyle.bottom).toBe('20px') + expect(toolbarStyle.height).toBe('38px') + expect(browserWindow.getComputedStyle(toolbarButton).height).toBe('32px') + expect(browserWindow.getComputedStyle(toolbarIcon).width).toBe('16px') + expect(Number.parseFloat(noticeStyle.bottom) - ( + Number.parseFloat(toolbarStyle.bottom) + Number.parseFloat(toolbarStyle.height) + )).toBe(32) + if (button === null) return + + await act(async () => { + button.dispatchEvent(new browserWindow.MouseEvent('click', { + bubbles: true, cancelable: true + })) + }) + + expect(workspace.getSnapshot().viewport) + .toEqual({ scale: 0.8, x: -2_000, y: -1_300 }) + expect(host.querySelector('[data-research-empty-viewport]')).toBeNull() + } finally { + await mounted.cleanup() + } + }) + + it('supports Command-toggle, Shift-add, blank clear, and Escape clear', async () => { + const mounted = await mountResearchCanvas({ + sessionId: 'session-selection-modes', + files: [ + { id: 'file-a', path: '/w/a.pdf', name: 'a.pdf', source: 'computer', x: 100, y: 100 }, + { id: 'file-b', path: '/w/b.pdf', name: 'b.pdf', source: 'computer', x: 350, y: 100 } + ] + }) + try { + const { browserWindow, canvas, host } = mounted + const cardA = host.querySelector('[data-research-file-card="file-a"]') + const cardB = host.querySelector('[data-research-file-card="file-b"]') + expect(cardA).not.toBeNull() + expect(cardB).not.toBeNull() + if (cardA === null || cardB === null) return + + await act(async () => { + cardA.dispatchEvent(pointer(browserWindow, 'pointerdown', { + pointerId: 1, x: 100, y: 100, metaKey: true + })) + }) + expect(cardA.getAttribute('aria-selected')).toBe('true') + await act(async () => { + cardA.dispatchEvent(pointer(browserWindow, 'pointerdown', { + pointerId: 2, x: 100, y: 100, metaKey: true + })) + }) + expect(cardA.getAttribute('aria-selected')).toBe('false') + + await act(async () => { + cardA.dispatchEvent(pointer(browserWindow, 'pointerdown', { + pointerId: 3, x: 100, y: 100 + })) + cardB.dispatchEvent(pointer(browserWindow, 'pointerdown', { + pointerId: 4, x: 350, y: 100, shiftKey: true + })) + }) + expect(canvas.querySelectorAll('[aria-selected="true"]')).toHaveLength(2) + + await act(async () => { + canvas.dispatchEvent(pointer(browserWindow, 'pointerdown', { + pointerId: 5, x: 700, y: 500 + })) + canvas.dispatchEvent(pointer(browserWindow, 'pointerup', { + pointerId: 5, x: 700, y: 500 + })) + }) + expect(canvas.querySelectorAll('[aria-selected="true"]')).toHaveLength(0) + + await act(async () => { + cardA.dispatchEvent(pointer(browserWindow, 'pointerdown', { + pointerId: 6, x: 100, y: 100 + })) + browserWindow.dispatchEvent(new browserWindow.KeyboardEvent('keydown', { + code: 'Escape', key: 'Escape', bubbles: true, cancelable: true + })) + }) + expect(canvas.querySelectorAll('[aria-selected="true"]')).toHaveLength(0) + } finally { + await mounted.cleanup() + } + }) + + it('selects files and artifacts with Command-A only while the canvas owns focus', async () => { + const mounted = await mountResearchCanvas({ + sessionId: 'session-command-a', + files: [ + { id: 'file-a', path: '/w/a.pdf', name: 'a.pdf', source: 'computer', x: 100, y: 100 } + ], + artifacts: [ + { id: 'artifact-a', kind: 'assistant-result', messageId: 'm1', title: 'Answer', excerpt: 'Evidence', x: 350, y: 100 } + ] + }) + try { + const { browserWindow, canvas, host } = mounted + const outside = browserWindow.document.createElement('button') + browserWindow.document.body.appendChild(outside) + outside.focus() + await act(async () => { + browserWindow.dispatchEvent(new browserWindow.KeyboardEvent('keydown', { + code: 'KeyA', key: 'a', metaKey: true, bubbles: true, cancelable: true + })) + }) + expect(canvas.querySelectorAll('[aria-selected="true"]')).toHaveLength(0) + + ;(canvas as unknown as { focus(): void }).focus() + await act(async () => { + browserWindow.dispatchEvent(new browserWindow.KeyboardEvent('keydown', { + code: 'KeyA', key: 'a', metaKey: true, bubbles: true, cancelable: true + })) + }) + expect(canvas.querySelectorAll('[aria-selected="true"]')).toHaveLength(2) + expect(host.querySelector('[data-research-artifact-card="artifact-a"]')).not.toBeNull() + } finally { + await mounted.cleanup() + } + }) + + it('gives Space-pan priority over node selection and movement', async () => { + const mounted = await mountResearchCanvas({ + sessionId: 'session-space-pan', + files: [ + { id: 'file-a', path: '/w/a.pdf', name: 'a.pdf', source: 'computer', x: 100, y: 100 } + ] + }) + try { + const { browserWindow, canvas, host, workspace } = mounted + const cardA = host.querySelector('[data-research-file-card="file-a"]') + expect(cardA).not.toBeNull() + if (cardA === null) return + const capturedPointers = new Set() + Object.defineProperties(canvas, { + setPointerCapture: { + configurable: true, + value: (pointerId: number) => capturedPointers.add(pointerId) + }, + hasPointerCapture: { + configurable: true, + value: (pointerId: number) => capturedPointers.has(pointerId) + }, + releasePointerCapture: { + configurable: true, + value: (pointerId: number) => capturedPointers.delete(pointerId) + } + }) + ;(canvas as unknown as { focus(): void }).focus() + await act(async () => { + browserWindow.dispatchEvent(new browserWindow.KeyboardEvent('keydown', { + code: 'Space', key: ' ', bubbles: true, cancelable: true + })) + cardA.dispatchEvent(pointer(browserWindow, 'pointerdown', { + pointerId: 1, x: 100, y: 100 + })) + }) + expect(canvas.getAttribute('data-space-pressed')).toBe('true') + expect(canvas.getAttribute('data-research-operation')).toBe('pan') + expect(canvas.getAttribute('data-dragging')).toBe('true') + expect(capturedPointers.has(1)).toBe(true) + + await act(async () => { + canvas.dispatchEvent(pointer(browserWindow, 'pointerleave', { + pointerId: 1, x: 90, y: 90 + })) + }) + expect(canvas.hasAttribute('data-space-pressed')).toBe(false) + expect(canvas.getAttribute('data-research-operation')).toBe('pan') + expect(canvas.getAttribute('data-dragging')).toBe('true') + expect(capturedPointers.has(1)).toBe(true) + + await act(async () => { + canvas.dispatchEvent(pointer(browserWindow, 'pointermove', { + pointerId: 1, x: 120, y: 110 + })) + canvas.dispatchEvent(pointer(browserWindow, 'pointerenter', { + pointerId: 1, x: 120, y: 110 + })) + }) + expect(canvas.getAttribute('data-space-pressed')).toBe('true') + + await act(async () => { + canvas.dispatchEvent(pointer(browserWindow, 'pointerup', { + pointerId: 1, x: 120, y: 110 + })) + browserWindow.dispatchEvent(new browserWindow.KeyboardEvent('keyup', { + code: 'Space', key: ' ', bubbles: true + })) + }) + + expect(workspace.getSnapshot().selection.selectedNodeIds).toEqual([]) + expect(workspace.getSnapshot().files[0]).toMatchObject({ x: 100, y: 100 }) + expect(workspace.getSnapshot().viewport).toEqual({ scale: 1, x: 20, y: 10 }) + expect(capturedPointers.has(1)).toBe(false) + } finally { + await mounted.cleanup() + } + }) + + it('shows the canvas frame only while Space is held and clears it on keyup or blur', async () => { + const mounted = await mountResearchCanvas({ sessionId: 'session-space-frame' }) + try { + const { browserWindow, canvas } = mounted + ;(canvas as unknown as { focus(): void }).focus() + expect(canvas.matches(':focus')).toBe(true) + expect(canvas.hasAttribute('data-space-pressed')).toBe(false) + + await act(async () => { + browserWindow.dispatchEvent(new browserWindow.KeyboardEvent('keydown', { + code: 'Space', key: ' ', bubbles: true, cancelable: true + })) + }) + expect(canvas.getAttribute('data-space-pressed')).toBe('true') + + await act(async () => { + browserWindow.dispatchEvent(new browserWindow.KeyboardEvent('keyup', { + code: 'Space', key: ' ', bubbles: true + })) + }) + expect(canvas.hasAttribute('data-space-pressed')).toBe(false) + + await act(async () => { + browserWindow.dispatchEvent(new browserWindow.KeyboardEvent('keydown', { + code: 'Space', key: ' ', bubbles: true, cancelable: true + })) + browserWindow.dispatchEvent(new browserWindow.Event('blur')) + }) + expect(canvas.hasAttribute('data-space-pressed')).toBe(false) + } finally { + await mounted.cleanup() + } + }) + + it('keeps Command-wheel pointer anchoring on a blank canvas target', async () => { + const mounted = await mountResearchCanvas({ sessionId: 'session-blank-wheel' }) + try { + const { browserWindow, canvas, workspace } = mounted + const wheel = new browserWindow.WheelEvent('wheel', { + bubbles: true, cancelable: true, deltaY: -100 + }) + Object.defineProperties(wheel, { + metaKey: { value: true }, + clientX: { value: 360 }, + clientY: { value: 260 } + }) + await act(async () => { canvas.dispatchEvent(wheel) }) + const zoomed = workspace.getSnapshot().viewport + expect(wheel.defaultPrevented).toBe(true) + expect(zoomed.scale).toBeCloseTo(1.105170918, 8) + expect((360 - zoomed.x) / zoomed.scale).toBeCloseTo(360, 7) + expect((260 - zoomed.y) / zoomed.scale).toBeCloseTo(260, 7) + } finally { + await mounted.cleanup() + } + }) + + it('registers a monotonic native wheel region and rejects stale, outside, or malformed native events', async () => { + const regionUpdates: Array> = [] + const nativeListeners = new Set<(value: Record) => void>() + const resizeCallbacks: Array<() => void> = [] + const animationFrames = { + callbacks: new Map(), + cancelled: [] as number[] + } + const releases: Array> = [] + let unsubscribes = 0 + const mounted = await mountResearchCanvas({ + sessionId: 'session-native-wheel', + strictMode: true, + files: [{ + id: 'native-html', name: 'native.html', source: 'computer', + authorizationId: 'authorization-native-html', contentType: 'text/html', + x: 100, y: 100, width: 480, height: 360, sizeMode: 'manual' + }], + resizeObserverCallbacks: resizeCallbacks, + animationFrames, + dshDesktop: { + researchCanvasWheel: { + setRegion(value) { + regionUpdates.push({ ...value }) + return true + }, + subscribe(listener) { + nativeListeners.add(listener) + return () => { + if (nativeListeners.delete(listener)) unsubscribes += 1 + } + } + }, + researchPreview: { + async restore(value) { + return { + authorizationId: value.authorizationId, + capabilityToken: 'capability-native-html', + url: 'sherlock-preview://capability-native-html/', + contentType: 'text/html', + name: 'native.html' + } + }, + async release(value) { + releases.push(value) + return { ok: true } + } + } + } + }) + try { + const { canvas, workspace } = mounted + const flushAnimationFrames = async () => { + const callbacks = [...animationFrames.callbacks.values()] + animationFrames.callbacks.clear() + await act(async () => { callbacks.forEach((callback) => callback(0)) }) + } + await act(async () => { resizeCallbacks.forEach((callback) => callback()) }) + expect(animationFrames.callbacks.size).toBe(1) + await flushAnimationFrames() + const initialUpdateCount = regionUpdates.length + await act(async () => { + resizeCallbacks.forEach((callback) => callback()) + resizeCallbacks.forEach((callback) => callback()) + mounted.browserWindow.dispatchEvent(new mounted.browserWindow.Event('resize')) + }) + expect(animationFrames.callbacks.size).toBe(1) + expect(regionUpdates).toHaveLength(initialUpdateCount) + await flushAnimationFrames() + expect(regionUpdates).toHaveLength(initialUpdateCount) + await act(async () => { await Promise.resolve(); await Promise.resolve() }) + expect(mounted.host.querySelector('[data-research-html-preview]')).not.toBeNull() + const currentRegion = [...regionUpdates].reverse().find((value) => value.active === true) + expect(currentRegion).toMatchObject({ + active: true, left: 0, top: 0, width: 800, height: 600 + }) + expect(currentRegion?.ownerId).toMatch(/^research-canvas-/) + expect(currentRegion?.generation).toEqual(expect.any(Number)) + const generation = currentRegion?.generation as number + const ownerId = currentRegion?.ownerId as string + expect(regionUpdates.every((value, index, values) => + index === 0 || Number(value.generation) > Number(values[index - 1]?.generation) + )).toBe(true) + expect(nativeListeners.size).toBe(1) + + const initial = workspace.getSnapshot().viewport + const sendNative = async (value: Record) => { + await act(async () => { nativeListeners.forEach((listener) => listener(value)) }) + } + const valid = { + generation, + ownerId, + clientX: 300, + clientY: 150, + deltaX: 0, + deltaY: -100, + deltaMode: 0 + } + for (const invalid of [ + { ...valid, generation: generation - 1 }, + { ...valid, ownerId: 'retired-canvas' }, + { ...valid, clientX: 800 }, + { ...valid, clientY: Number.NaN }, + { ...valid, deltaY: 4_097 }, + { ...valid, deltaMode: 1 }, + { ...valid, unexpected: true } + ]) { + await sendNative(invalid) + expect(workspace.getSnapshot().viewport).toEqual(initial) + } + + await sendNative(valid) + const zoomed = workspace.getSnapshot().viewport + expect(zoomed.scale).toBeCloseTo(1.105170918, 8) + expect((300 - zoomed.x) / zoomed.scale).toBeCloseTo(300, 7) + expect((150 - zoomed.y) / zoomed.scale).toBeCloseTo(150, 7) + + Object.defineProperty(canvas, 'getBoundingClientRect', { + configurable: true, + value: () => ({ left: 100, top: 50, right: 700, bottom: 550, width: 600, height: 500 }) + }) + await act(async () => { + resizeCallbacks.forEach((callback) => callback()) + mounted.browserWindow.dispatchEvent(new mounted.browserWindow.Event('resize')) + }) + expect(animationFrames.callbacks.size).toBe(1) + await flushAnimationFrames() + const resizedRegion = [...regionUpdates].reverse().find((value) => value.active === true) + expect(resizedRegion).toMatchObject({ + active: true, ownerId, left: 100, top: 50, width: 600, height: 500 + }) + expect(Number(resizedRegion?.generation)).toBeGreaterThan(generation) + await sendNative(valid) + expect(workspace.getSnapshot().viewport).toEqual(zoomed) + } finally { + const lastActive = [...regionUpdates].reverse().find((value) => value.active === true) + await act(async () => { resizeCallbacks.forEach((callback) => callback()) }) + expect(animationFrames.callbacks.size).toBe(1) + await mounted.cleanup() + expect(animationFrames.callbacks.size).toBe(0) + expect(animationFrames.cancelled.length).toBeGreaterThan(0) + expect(unsubscribes).toBeGreaterThan(0) + expect(nativeListeners.size).toBe(0) + expect(regionUpdates.at(-1)).toMatchObject({ + active: false, + ownerId: lastActive?.ownerId + }) + expect(Number(regionUpdates.at(-1)?.generation)) + .toBeGreaterThan(Number(lastActive?.generation)) + expect(releases).toContainEqual({ + sessionId: 'session-native-wheel', nodeId: 'native-html', + authorizationId: 'authorization-native-html', capabilityToken: 'capability-native-html' + }) + } + }) + + it('replaces selection before dragging an unselected node', async () => { + const mounted = await mountResearchCanvas({ + sessionId: 'session-unselected-drag', + files: [ + { id: 'file-a', path: '/w/a.pdf', name: 'a.pdf', source: 'computer', x: 100, y: 100 }, + { id: 'file-b', path: '/w/b.pdf', name: 'b.pdf', source: 'computer', x: 350, y: 100 } + ], + selection: { selectedNodeIds: ['file-b'], orderedFileIds: ['file-b'] } + }) + try { + const { browserWindow, canvas, host, workspace } = mounted + const cardA = host.querySelector('[data-research-file-card="file-a"]') + expect(cardA).not.toBeNull() + if (cardA === null) return + await act(async () => { + cardA.dispatchEvent(pointer(browserWindow, 'pointerdown', { + pointerId: 1, x: 100, y: 100 + })) + canvas.dispatchEvent(pointer(browserWindow, 'pointermove', { + pointerId: 1, x: 120, y: 100 + })) + canvas.dispatchEvent(pointer(browserWindow, 'pointerup', { + pointerId: 1, x: 120, y: 100 + })) + }) + + expect(workspace.getSnapshot().selection.selectedNodeIds).toEqual(['file-a']) + expect(workspace.getSnapshot().files).toMatchObject([ + { id: 'file-a', x: 120, y: 100 }, + { id: 'file-b', x: 350, y: 100 } + ]) + } finally { + await mounted.cleanup() + } + }) + + it('moves a selected group in world units at 2x zoom', async () => { + const mounted = await mountResearchCanvas({ + sessionId: 'session-group-drag', + files: [ + { id: 'file-a', path: '/w/a.pdf', name: 'a.pdf', source: 'computer', x: 100, y: 100 }, + { id: 'file-b', path: '/w/b.pdf', name: 'b.pdf', source: 'computer', x: 350, y: 100 } + ], + selection: { + selectedNodeIds: ['file-a', 'file-b'], orderedFileIds: ['file-a', 'file-b'] + }, + viewport: { scale: 2, x: 0, y: 0 } + }) + try { + const { browserWindow, canvas, host, workspace } = mounted + const cardA = host.querySelector('[data-research-file-card="file-a"]') + expect(cardA).not.toBeNull() + if (cardA === null) return + await act(async () => { + cardA.dispatchEvent(pointer(browserWindow, 'pointerdown', { + pointerId: 1, x: 200, y: 200 + })) + canvas.dispatchEvent(pointer(browserWindow, 'pointermove', { + pointerId: 1, x: 220, y: 200 + })) + }) + expect(canvas.querySelectorAll('[data-node-dragging="true"]')).toHaveLength(2) + await act(async () => { + canvas.dispatchEvent(pointer(browserWindow, 'pointerup', { + pointerId: 1, x: 220, y: 200 + })) + }) + + expect(workspace.getSnapshot().files).toMatchObject([ + { id: 'file-a', x: 110, y: 100 }, + { id: 'file-b', x: 360, y: 100 } + ]) + expect(canvas.querySelector('[data-node-dragging="true"]')).toBeNull() + } finally { + await mounted.cleanup() + } + }) + + it('renders four corner handles only for selected rich nodes at their normalized size', async () => { + const mounted = await mountResearchCanvas({ + sessionId: 'session-rich-resize-handles', + files: [ + { id: 'generic', path: '/w/archive.doc', name: 'archive.doc', previewEligible: false, source: 'computer', x: 100, y: 100 } + ], + artifacts: [ + { id: 'assistant', kind: 'assistant-result', messageId: 'm1', title: 'Answer', excerpt: 'Evidence', x: 400, y: 200 } + ], + selection: { + selectedNodeIds: ['generic', 'assistant'], orderedFileIds: ['generic'] + } + }) + try { + const { host } = mounted + const generic = host.querySelector('[data-research-file-card="generic"]') + const assistant = host.querySelector('[data-research-artifact-card="assistant"]') + expect(generic).not.toBeNull() + expect(assistant).not.toBeNull() + expect(generic?.querySelector('[data-research-resize-handle]')).toBeNull() + expect(assistant?.querySelectorAll('[data-research-resize-handle]')).toHaveLength(4) + expect(Array.from(assistant?.querySelectorAll('[data-research-resize-handle]') ?? []) + .map((handle) => handle.getAttribute('data-research-resize-handle')).sort()) + .toEqual(['ne', 'nw', 'se', 'sw']) + expect((generic as HappyDOMHTMLElement | null)?.style.width).toBe('220px') + expect((generic as HappyDOMHTMLElement | null)?.style.height).toBe('64px') + expect((assistant as HappyDOMHTMLElement | null)?.style.width).toBe('520px') + expect((assistant as HappyDOMHTMLElement | null)?.style.height).toBe('300px') + expect(assistant?.querySelector('[data-research-node-title]')?.textContent).toBe('Answer') + } finally { + await mounted.cleanup() + } + }) + + it('gives resize priority over group move and updates only its node live through zoom', async () => { + const mounted = await mountResearchCanvas({ + sessionId: 'session-live-rich-resize', + artifacts: [ + { id: 'assistant-a', kind: 'assistant-result', messageId: 'm1', title: 'Answer A', excerpt: 'Evidence A', x: 200, y: 200 }, + { id: 'assistant-b', kind: 'assistant-result', messageId: 'm2', title: 'Answer B', excerpt: 'Evidence B', x: 600, y: 200 } + ], + selection: { selectedNodeIds: ['assistant-a', 'assistant-b'], orderedFileIds: [] }, + viewport: { scale: 2, x: 0, y: 0 } + }) + try { + const { browserWindow, canvas, host, workspace } = mounted + const card = host.querySelector('[data-research-artifact-card="assistant-a"]') + expect(card).not.toBeNull() + if (card === null) return + const handle = card.querySelector('[data-research-resize-handle="se"]') + const shield = card.querySelector('[data-research-preview-shield]') + expect(handle).not.toBeNull() + expect(shield).not.toBeNull() + if (handle === null || shield === null) return + + await act(async () => { + handle.dispatchEvent(pointer(browserWindow, 'pointerdown', { + pointerId: 31, x: 760, y: 640 + })) + canvas.dispatchEvent(pointer(browserWindow, 'pointermove', { + pointerId: 31, x: 840, y: 680 + })) + }) + + expect(canvas.getAttribute('data-dragging')).toBe('true') + expect(canvas.getAttribute('data-research-operation')).toBe('resize') + expect(browserWindow.getComputedStyle(shield).pointerEvents).toBe('auto') + expect(canvas.querySelector('[data-node-dragging="true"]')).toBeNull() + expect(workspace.getSnapshot().artifacts).toMatchObject([ + { id: 'assistant-a', x: 220, y: 210, width: 560, height: 320, sizeMode: 'manual' }, + { id: 'assistant-b', x: 600, y: 200, width: 520, height: 300, sizeMode: 'auto' } + ]) + expect((card as HappyDOMHTMLElement).style.width).toBe('560px') + expect((card as HappyDOMHTMLElement).style.height).toBe('320px') + } finally { + await mounted.cleanup() + } + }) + + it('selects interactive rich preview bodies without stealing their pointer interactions', async () => { + const mounted = await mountResearchCanvas({ + sessionId: 'session-rich-preview-ownership', + files: [ + { id: 'html', path: '/w/model.html', name: 'model.html', mediaType: 'text/html', source: 'computer', x: 300, y: 220 } + ], + selection: { selectedNodeIds: [], orderedFileIds: [] } + }) + try { + const { browserWindow, canvas, host, workspace } = mounted + const body = host.querySelector('[data-research-preview-body]') + expect(body).not.toBeNull() + expect(host.querySelector('[data-research-resize-handle="se"]')).toBeNull() + if (body === null) return + + let previewWheel: HappyDOMEvent | undefined + await act(async () => { + previewWheel = new browserWindow.WheelEvent('wheel', { + bubbles: true, cancelable: true, deltaY: 30 + }) + body.dispatchEvent(previewWheel) + }) + expect(previewWheel?.defaultPrevented).toBe(false) + expect(workspace.getSnapshot().viewport).toEqual({ scale: 1, x: 0, y: 0 }) + + await act(async () => { + body.dispatchEvent(pointer(browserWindow, 'pointerdown', { + pointerId: 41, x: 300, y: 220 + })) + canvas.dispatchEvent(pointer(browserWindow, 'pointermove', { + pointerId: 41, x: 340, y: 240 + })) + canvas.dispatchEvent(pointer(browserWindow, 'pointerup', { + pointerId: 41, x: 340, y: 240 + })) + }) + expect(workspace.getSnapshot().selection.selectedNodeIds).toEqual(['html']) + expect(workspace.getSnapshot().files[0]).toMatchObject({ x: 300, y: 220 }) + expect(canvas.querySelector('[data-research-marquee]')).toBeNull() + + const handle = host.querySelector('[data-research-resize-handle="se"]') + expect(handle).not.toBeNull() + if (handle === null) return + + ;(canvas as unknown as { focus(): void }).focus() + await act(async () => { + browserWindow.dispatchEvent(new browserWindow.KeyboardEvent('keydown', { + code: 'Space', key: ' ', bubbles: true, cancelable: true + })) + handle.dispatchEvent(pointer(browserWindow, 'pointerdown', { + pointerId: 42, x: 300, y: 220 + })) + canvas.dispatchEvent(pointer(browserWindow, 'pointermove', { + pointerId: 42, x: 330, y: 230 + })) + canvas.dispatchEvent(pointer(browserWindow, 'pointerup', { + pointerId: 42, x: 330, y: 230 + })) + browserWindow.dispatchEvent(new browserWindow.KeyboardEvent('keyup', { + code: 'Space', key: ' ', bubbles: true + })) + }) + expect(workspace.getSnapshot().viewport).toEqual({ scale: 1, x: 30, y: 10 }) + expect(workspace.getSnapshot().selection.selectedNodeIds).toEqual(['html']) + expect(workspace.getSnapshot().files[0]).toMatchObject({ + x: 300, y: 220, width: 480, height: 360, sizeMode: 'auto' + }) + } finally { + await mounted.cleanup() + } + }) + + it('persists one live resize at every pointer finish boundary', async () => { + const finishModes = ['pointerup', 'pointercancel', 'blur', 'cleanup'] as const + for (const finishMode of finishModes) { + const values = new Map() + const writes: Array<{ key: string; value: string }> = [] + const storage = { + getItem: (key: string) => values.get(key) ?? null, + setItem(key: string, value: string) { + values.set(key, value) + writes.push({ key, value }) + } + } + const sessionId = `session-deferred-resize-${finishMode}` + const mounted = await mountResearchCanvas({ + sessionId, + storage, + artifacts: [ + { id: 'assistant', kind: 'assistant-result', messageId: 'm1', title: 'Answer', excerpt: 'Evidence', x: 200, y: 200 } + ], + selection: { selectedNodeIds: ['assistant'], orderedFileIds: [] } + }) + let cleaned = false + try { + const { browserWindow, canvas, host, workspace } = mounted + const handle = host.querySelector('[data-research-resize-handle="se"]') + expect(handle).not.toBeNull() + if (handle === null) return + writes.length = 0 + + await act(async () => { + handle.dispatchEvent(pointer(browserWindow, 'pointerdown', { + pointerId: 51, x: 380, y: 320 + })) + canvas.dispatchEvent(pointer(browserWindow, 'pointermove', { + pointerId: 51, x: 400, y: 330 + })) + canvas.dispatchEvent(pointer(browserWindow, 'pointermove', { + pointerId: 51, x: 420, y: 340 + })) + }) + expect(workspace.getSnapshot().artifacts[0]).toMatchObject({ + x: 220, y: 210, width: 560, height: 320, sizeMode: 'manual' + }) + expect(JSON.parse(values.get(`sherlock.research.canvas.artifacts.v1:${sessionId}`) ?? '[]')[0]) + .not.toMatchObject({ width: 560, height: 320 }) + expect(writes).toEqual([]) + + if (finishMode === 'cleanup') { + await mounted.cleanup() + cleaned = true + } else { + await act(async () => { + if (finishMode === 'blur') { + browserWindow.dispatchEvent(new browserWindow.Event('blur')) + } else { + canvas.dispatchEvent(pointer(browserWindow, finishMode, { + pointerId: 51, x: 420, y: 340 + })) + } + }) + } + + expect(writes.map(({ key }) => key)).toEqual([ + `sherlock.research.canvas.files.v1:${sessionId}`, + `sherlock.research.canvas.artifacts.v1:${sessionId}`, + `sherlock.research.canvas.selection.v1:${sessionId}` + ]) + expect(JSON.parse(values.get(`sherlock.research.canvas.artifacts.v1:${sessionId}`) ?? '[]')[0]) + .toMatchObject({ x: 220, y: 210, width: 560, height: 320, sizeMode: 'manual' }) + } finally { + if (!cleaned) await mounted.cleanup() + } + } + }) + + it('persists a moved group once at every pointer finish boundary', async () => { + const finishModes = ['pointerup', 'pointercancel', 'blur', 'cleanup'] as const + for (const finishMode of finishModes) { + const values = new Map() + const writes: Array<{ key: string; value: string }> = [] + const storage = { + getItem: (key: string) => values.get(key) ?? null, + setItem(key: string, value: string) { + values.set(key, value) + writes.push({ key, value }) + } + } + const sessionId = `session-deferred-move-${finishMode}` + const mounted = await mountResearchCanvas({ + sessionId, + storage, + files: [ + { id: 'file-a', path: '/w/a.pdf', name: 'a.pdf', source: 'computer', x: 100, y: 100 } + ], + selection: { selectedNodeIds: ['file-a'], orderedFileIds: ['file-a'] } + }) + let cleaned = false + try { + const { browserWindow, canvas, host, workspace } = mounted + const cardA = host.querySelector('[data-research-file-card="file-a"]') + expect(cardA).not.toBeNull() + if (cardA === null) return + writes.length = 0 + + await act(async () => { + cardA.dispatchEvent(pointer(browserWindow, 'pointerdown', { + pointerId: 1, x: 100, y: 100 + })) + canvas.dispatchEvent(pointer(browserWindow, 'pointermove', { + pointerId: 1, x: 110, y: 100 + })) + canvas.dispatchEvent(pointer(browserWindow, 'pointermove', { + pointerId: 1, x: 130, y: 100 + })) + }) + expect(workspace.getSnapshot().files[0]).toMatchObject({ x: 130, y: 100 }) + expect(JSON.parse(values.get(`sherlock.research.canvas.files.v1:${sessionId}`) ?? '[]')[0]) + .toMatchObject({ x: 100, y: 100 }) + expect(writes).toEqual([]) + + if (finishMode === 'cleanup') { + await mounted.cleanup() + cleaned = true + } else { + await act(async () => { + if (finishMode === 'blur') { + browserWindow.dispatchEvent(new browserWindow.Event('blur')) + } else { + canvas.dispatchEvent(pointer(browserWindow, finishMode, { + pointerId: 1, x: 130, y: 100 + })) + } + }) + } + + expect(writes.map(({ key }) => key)).toEqual([ + `sherlock.research.canvas.files.v1:${sessionId}`, + `sherlock.research.canvas.artifacts.v1:${sessionId}`, + `sherlock.research.canvas.selection.v1:${sessionId}` + ]) + expect(JSON.parse(values.get(`sherlock.research.canvas.files.v1:${sessionId}`) ?? '[]')[0]) + .toMatchObject({ x: 130, y: 100 }) + } finally { + if (!cleaned) await mounted.cleanup() + } + } + }) + + it('places a same-session research artifact through the shared workspace drop path', async () => { + const mounted = await mountResearchCanvas({ + sessionId: 'session-artifact-drop', + viewport: { scale: 2, x: 50, y: 20 } + }) + try { + const { browserWindow, canvas, host, workspace } = mounted + const transfer = { + types: ['application/x-sherlock-research-artifact'], + files: [], + getData: (type: string) => type === 'application/x-sherlock-research-artifact' + ? JSON.stringify({ + sessionId: 'session-artifact-drop', messageId: 'm1', + kind: 'assistant-result', title: 'Answer', excerpt: 'Evidence' + }) + : '', + dropEffect: 'none' + } + await act(async () => { + const drop = dispatchDrag(browserWindow, canvas, 'drop', transfer, { x: 250, y: 180 }) + expect(drop.defaultPrevented).toBe(true) + }) + + expect(workspace.getSnapshot().artifacts).toMatchObject([ + { messageId: 'm1', kind: 'assistant-result', x: 100, y: 80 } + ]) + expect(host.querySelector('[data-research-artifact-card]')?.textContent) + .toContain('Answer') + } finally { + await mounted.cleanup() + } + }) + + it.each([ + { theme: 'light', width: 480, menu: 'slash' }, + { theme: 'dark', width: 352, menu: 'model' } + ] as const)( + 'keeps the $menu menu above mounted Research messages at $width px in $theme mode', + async ({ menu, theme, width }) => { + const menuAction = vi.fn() + const menuNode = createElement('div', { + className: menu === 'slash' ? '_3e4SsG_menu' : '_7KE1Ra_menu', + 'data-test-composer-menu': menu + }, createElement('button', { + type: 'button', + onClick: menuAction + }, menu === 'slash' ? '命令' : '选择模型')) + const mounted = await mountConversationRoot( + 'chat', + { messageId: `m-${menu}`, text: '一条会与菜单重叠的消息。' }, + undefined, + { + sidebarWidth: width, + ...(menu === 'slash' + ? { overlay: menuNode } + : { model: createElement('div', { 'data-test-model-selector': '' }, menuNode) }) + } + ) + try { + const { actions, browserWindow, detailsPortalHost, host } = mounted + if (theme === 'dark') { + browserWindow.document.body.setAttribute('data-ds-dark-theme', '') + } + + const chatSeat = host.querySelector('[data-composer-seat]') + const chatCard = host.querySelector('.uV2eYG_card') + expect(chatSeat).not.toBeNull() + expect(chatCard).not.toBeNull() + if (chatSeat === null || chatCard === null) return + const chatStyle = browserWindow.getComputedStyle(chatSeat) + expect(chatStyle.position).toBe('sticky') + expect(chatStyle.bottom).toBe('0px') + expect(chatStyle.zIndex).toBe('7') + expect(chatStyle.backgroundImage).toBe('none') + expect(browserWindow.getComputedStyle(chatCard).background).not.toBe('none') + + await act(async () => { actions.setView('research') }) + const conversation = detailsPortalHost.querySelector('.sRp_conversation') + const messages = detailsPortalHost.querySelector('.sRp_messages') + const composer = detailsPortalHost.querySelector('.sRp_composer') + const researchSeat = detailsPortalHost.querySelector('[data-composer-seat]') + const researchCard = detailsPortalHost.querySelector('.uV2eYG_card') + const mountedMenu = detailsPortalHost.querySelector('[data-test-composer-menu]') + expect(conversation).not.toBeNull() + expect(messages).not.toBeNull() + expect(composer).not.toBeNull() + expect(researchSeat).not.toBeNull() + expect(researchCard).not.toBeNull() + expect(mountedMenu).not.toBeNull() + if (conversation === null || messages === null || composer === null || + researchSeat === null || researchCard === null || mountedMenu === null) return + + const composerStyle = browserWindow.getComputedStyle(composer) + expect(composerStyle.position).toBe('sticky') + expect(composerStyle.bottom).toBe('0px') + expect(composerStyle.width).toBe('100%') + expect(composerStyle.maxWidth).toBe('100%') + expect(composerStyle.overflow).toBe('visible') + expect(composerStyle.zIndex).toBe('21') + expect(composerStyle.backgroundImage).toBe('none') + expect(browserWindow.getComputedStyle(researchCard).background).not.toBe('none') + expect(composer.closest('[data-conversation-scroll]')).toBe(conversation) + expect(messages.contains(composer)).toBe(false) + expect(composer.contains(researchSeat)).toBe(true) + expect(detailsPortalHost.style.width).toBe(`${width}px`) + + if (menu === 'slash') { + const overlay = detailsPortalHost.querySelector('.uV2eYG_overlayAnchor') + expect(overlay).not.toBeNull() + if (overlay !== null) { + expect(browserWindow.getComputedStyle(overlay).zIndex).toBe('2') + } + } + const menuButton = mountedMenu.querySelector('button') + expect(menuButton).not.toBeNull() + await act(async () => { click(browserWindow, menuButton) }) + expect(menuAction).toHaveBeenCalledOnce() + } finally { + await mounted.cleanup() + } + } + ) + + it('overlays the active Chat composer without reserving an opaque full-width footer row', async () => { + const mounted = await mountConversationRoot('chat', { + messageId: 'm-composer-overlay', text: '输入框后方仍应显示对话内容。' + }, undefined, { + composerHeight: 168 + }) + try { + const { browserWindow, host } = mounted + const root = host.querySelector('.wSkVaW_root') + const scroll = host.querySelector('.wSkVaW_scrollBody') + const centerHost = host.querySelector('[data-center-composer-host]') + const portalHost = host.querySelector('[data-composer-portal-host]') + const seat = host.querySelector('[data-composer-seat]') + const card = host.querySelector('.uV2eYG_card') + expect(root).not.toBeNull() + expect(scroll).not.toBeNull() + expect(centerHost).not.toBeNull() + expect(portalHost).not.toBeNull() + expect(seat).not.toBeNull() + if (root === null || scroll === null || centerHost === null || + portalHost === null || seat === null) return + + const centerStyle = browserWindow.getComputedStyle(centerHost) + expect(centerHost.parentElement).toBe(root) + expect(scroll.parentElement).toBe(root) + expect(centerStyle.position).toBe('absolute') + expect(centerStyle.left).toBe('0px') + expect(centerStyle.right).toBe('0px') + expect(centerStyle.bottom).toBe('0px') + expect(centerStyle.backgroundImage).toBe('none') + expect(centerStyle.pointerEvents).toBe('none') + expect(browserWindow.getComputedStyle(portalHost).pointerEvents).toBe('none') + expect(card).not.toBeNull() + if (card !== null) { + expect(browserWindow.getComputedStyle(card).pointerEvents).toBe('auto') + } + expect(browserWindow.getComputedStyle(seat).backgroundImage).toBe('none') + expect((scroll as HappyDOMHTMLElement).style + .getPropertyValue('--dsh-composer-height')).toBe('168px') + expect(browserWindow.getComputedStyle(scroll).scrollPaddingBottom).toBe('168px') + + } finally { + await mounted.cleanup() + } + }) + + it('lets Trajectory continue behind the floating composer without the Chat tail spacer', async () => { + const mounted = await mountConversationRoot('trajectory', undefined, undefined, { + composerHeight: 168 + }) + try { + const { browserWindow, host } = mounted + const scroll = host.querySelector('.wSkVaW_scrollBody') + const trajectory = host.querySelector( + '[data-test-trajectory-view][data-conversation-composer-overlay]' + ) + const centerHost = host.querySelector('[data-center-composer-host]') + expect(scroll).not.toBeNull() + expect(trajectory).not.toBeNull() + expect(centerHost).not.toBeNull() + if (scroll === null || trajectory === null || centerHost === null) return + + expect(browserWindow.getComputedStyle(centerHost).backgroundImage).toBe('none') + expect(browserWindow.getComputedStyle(scroll).scrollPaddingBottom).toBe('') + } finally { + await mounted.cleanup() + } + }) + + it('keeps bounded composer takeover surfaces interactive above the click-through host', async () => { + const action = vi.fn() + const mounted = await mountConversationRoot('chat', undefined, undefined, { + composer: createElement('div', null, + createElement('div', { className: 'Mbwy4a_frame' }, + createElement('button', { onClick: action }, '回答问题')), + createElement('div', { className: 'LVzXQa_frame' }, + createElement('button', { onClick: action }, '确认计划')), + createElement('div', { className: 'bqrRRG_root' }, + createElement('button', { onClick: action }, '批准命令')) + ) + }) + try { + const { browserWindow, host } = mounted + const takeoverSurfaces = [ + host.querySelector('.Mbwy4a_frame'), + host.querySelector('.LVzXQa_frame'), + host.querySelector('.bqrRRG_root') + ] + for (const surface of takeoverSurfaces) { + expect(surface).not.toBeNull() + if (surface !== null) { + expect(browserWindow.getComputedStyle(surface).pointerEvents).toBe('auto') + await act(async () => { click(browserWindow, surface.querySelector('button')) }) + } + } + expect(action).toHaveBeenCalledTimes(3) + } finally { + await mounted.cleanup() + } + }) + + it('observes the conversation scrollport so a pinned tail follows bottom-panel resizing', async () => { + const source = await readFile( + 'node_modules/@deepseek-ai/dsh-client-ui-conversation/lib/client.js', + 'utf8' + ) + expect(source).toMatch( + /const el = scrollerOf\(local\);[\s\S]*?observer\.observe\(column\);\s*observer\.observe\(el\);/ + ) + }) + + it('keeps Research message actions clickable when no composer menu is mounted', async () => { + const mounted = await mountConversationRoot('research', { + messageId: 'm-without-menu', text: '可以加入画布的有效回复。' + }) + try { + const { browserWindow, detailsPortalHost, workspace } = mounted + await act(async () => { workspace.setCanvasSize({ width: 800, height: 600 }) }) + expect(detailsPortalHost.querySelector('.uV2eYG_overlayAnchor')).toBeNull() + const add = detailsPortalHost.querySelector('button[aria-label="添加到画布"]') + expect(add).not.toBeNull() + await act(async () => { click(browserWindow, add) }) + expect(workspace.getSnapshot().artifacts).toMatchObject([{ + messageId: 'm-without-menu', kind: 'assistant-result', x: 400, y: 300 + }]) + } finally { + await mounted.cleanup() + } + }) + + it('places the Research divider chrome directly on the canvas edge', async () => { + const styles: InjectedStyle[] = [] + await loadClientBundle('dsh-client-ui-conversation', undefined, { styles }) + const researchCss = styles.find(({ pluginCss }) => + pluginCss?.endsWith('/ResearchCanvas.module.css') + )?.textContent + + expect(researchCss).toContain( + '.wSkVaW_root:has(.rScV5Q_root) .wSkVaW_header:after{bottom:0}' + ) + expect(researchCss).toContain( + '.wSkVaW_root:has(.rScV5Q_root) .wSkVaW_tab:after{bottom:0}' + ) + expect(researchCss).toMatch( + /\.rScV5Q_root\{[^}]*overflow:clip[^}]*contain:paint[^}]*isolation:isolate[^}]*\}/ + ) + expect(researchCss).toMatch( + /\.rScV5Q_root\[data-space-pressed=true\]:after\{[^}]*z-index:100[^}]*pointer-events:none[^}]*\}/ + ) + expect(researchCss).toMatch(/\.rScV5Q_contentLayer\{[^}]*z-index:0[^}]*\}/) + expect(researchCss).not.toContain('.rScV5Q_root:focus-visible') + expect(researchCss).not.toMatch(/\.rScV5Q_root\[data-file-drop-active=true\]\{[^}]*box-shadow/) + expect(researchCss).toContain('.rScV5Q_fileCard') + expect(researchCss).toContain('body[data-ds-dark-theme] .rScV5Q_fileCard') + expect(researchCss).toContain('[data-selected=true]') + expect(researchCss).toContain('[data-path-unavailable=true]') + expect(researchCss).toContain('.rScV5Q_marquee') + expect(researchCss).toContain('.rScV5Q_artifactCard') + expect(researchCss).toContain('[data-node-dragging=true]') + expect(researchCss).toContain(':focus-visible') + expect(researchCss).toContain('body[data-ds-dark-theme] .rScV5Q_artifactCard') + }) + + it('keeps Research component geometry stable while selected', async () => { + const styles: InjectedStyle[] = [] + await loadClientBundle('dsh-client-ui-conversation', undefined, { styles }) + const researchCss = styles.find(({ pluginCss }) => + pluginCss?.endsWith('/ResearchCanvas.module.css') + )?.textContent ?? '' + + expect(researchCss).toContain( + '.rScV5Q_fileCard[data-selected=true],.rScV5Q_artifactCard[data-selected=true]{border-color:var(--dsw-alias-state-business-primary);box-shadow:' + ) + expect(researchCss).toContain( + '.rScV5Q_richNode[data-selected=true]{border-color:var(--dsw-alias-state-business-primary);box-shadow:' + ) + expect(researchCss).not.toMatch(/\[data-selected=true\]\{border:2px/) + }) + + it('keeps the global Research conversation tab fluid at narrow sidebar widths', async () => { + const styles: InjectedStyle[] = [] + await loadClientBundle('dsh-client-ui-conversation', undefined, { styles }) + const panelCss = styles + .filter(({ textContent }) => textContent.includes('.sRp_root') || textContent.includes('.sRp_composer')) + .map(({ textContent }) => textContent) + .join('\n') + + expect(panelCss).toContain('.sRp_root{') + expect(panelCss).toContain('container-type:inline-size') + expect(panelCss).toContain('.sRp_conversation{min-width:0') + expect(panelCss).toContain('.sRp_messages{min-width:0') + expect(panelCss).toContain('.sRp_composer{') + expect(panelCss).toContain('max-width:100%') + expect(panelCss).toContain('overflow-wrap:anywhere') + expect(panelCss).toContain('@container (max-width:360px)') + + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + const style = browserWindow.document.createElement('style') + style.textContent = panelCss ?? '' + browserWindow.document.head.append(style) + browserWindow.document.body.innerHTML = [ + '
', + '
', + '
', + '
', + '
', + '
', + '
', + '
', + '
' + ].join('') + + const composer = browserWindow.document.querySelector('.sRp_composer') + const attachmentWrap = browserWindow.document.querySelector('.dsh-paperclip-wrap') + const attachmentTip = browserWindow.document.querySelector('.dsh-paperclip-tip') + expect(composer).not.toBeNull() + expect(attachmentWrap).not.toBeNull() + expect(attachmentTip).not.toBeNull() + if (composer === null || attachmentWrap === null || attachmentTip === null) return + + expect(browserWindow.getComputedStyle(composer).overflow).toBe('visible') + expect(browserWindow.getComputedStyle(attachmentWrap).position).toBe('static') + expect(browserWindow.getComputedStyle(attachmentTip).left).toBe('12px') + expect(browserWindow.getComputedStyle(attachmentTip).transform).toBe('none') + }) + + it('keeps an inactive global Research conversation tab inert', async () => { + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + await loadClientBundle('dsh-client-ui-conversation', undefined, { + document: browserWindow.document, + window: browserWindow + }) + browserWindow.document.body.innerHTML = [ + '
', + '', + '
' + ].join('') + const panel = browserWindow.document.querySelector('.sRp_root') + const inactiveControl = browserWindow.document.querySelector('.sRp_root button') + expect(panel).not.toBeNull() + expect(inactiveControl).not.toBeNull() + if (panel === null || inactiveControl === null) return + + expect(browserWindow.getComputedStyle(inactiveControl).pointerEvents).toBe('none') + }) + + it('removes the mounted Research panel from keyboard and accessibility navigation outside Research', async () => { + const mounted = await mountConversationRoot('research') + try { + const { actions, browserWindow, detailsPortalHost, workspace } = mounted + const panel = detailsPortalHost.querySelector('[data-research-conversation-panel]') + const conversationTab = () => detailsPortalHost.querySelector( + '[data-research-right-tab="conversation"]' + ) as unknown as HTMLElement | null + const sequentiallyReachable = () => Array.from(panel?.querySelectorAll( + 'button, textarea, input, select, a[href], [tabindex]' + ) ?? []).filter((node) => { + const element = node as unknown as HTMLElement + return element.tabIndex >= 0 && element.closest('[inert]') === null + }) + + expect(panel).not.toBeNull() + expect(panel?.hasAttribute('inert')).toBe(false) + expect(panel?.getAttribute('aria-hidden')).toBeNull() + expect(workspace.assistantActionsActive()).toBe(true) + + await act(async () => { actions.setView('chat') }) + expect(panel?.hasAttribute('inert')).toBe(true) + expect(panel?.getAttribute('aria-hidden')).toBe('true') + expect(sequentiallyReachable()).toHaveLength(0) + expect(workspace.assistantActionsActive()).toBe(false) + + await act(async () => { actions.setView('trajectory') }) + expect(panel?.hasAttribute('inert')).toBe(true) + expect(panel?.getAttribute('aria-hidden')).toBe('true') + expect(sequentiallyReachable()).toHaveLength(0) + expect(workspace.assistantActionsActive()).toBe(false) + + await act(async () => { actions.setView('research') }) + expect(panel?.hasAttribute('inert')).toBe(false) + expect(panel?.getAttribute('aria-hidden')).toBeNull() + expect(workspace.assistantActionsActive()).toBe(true) + } finally { + await mounted.cleanup() + } + }) + + it('moves the complete composer into the single global Research conversation tab', async () => { + const mounted = await mountConversationRoot('research') + try { + const { browserWindow, chat, detailsPortalHost, host, transitions } = mounted + expect(transitions.enter).toBe(1) + expect(chat.get().researchRightTab).toBe('conversation') + + const composerSeats = browserWindow.document.querySelectorAll('[data-composer-seat]') + expect(composerSeats).toHaveLength(1) + expect(composerSeats[0]?.closest('[data-research-conversation-panel]')).not.toBeNull() + + const center = host.querySelector('[data-research-center]') + expect(center).not.toBeNull() + expect(center?.querySelector('[data-composer-seat]')).toBeNull() + expect(center?.querySelector('[data-queue-strip]')).toBeNull() + expect(center?.querySelector('[data-task-dock]')).toBeNull() + expect(center?.querySelector('[data-stats-footer]')).toBeNull() + const rightComposer = detailsPortalHost.querySelector('[data-research-composer-host]') + expect(rightComposer?.querySelector('[data-queue-strip]')).not.toBeNull() + expect(rightComposer?.querySelector('[data-task-dock]')).not.toBeNull() + expect(rightComposer?.querySelector('[data-stats-footer]')).not.toBeNull() + expect(rightComposer?.querySelector('textarea')?.getAttribute('data-input-machine-snapshot')) + .toBe('研究草稿') + + expect(detailsPortalHost.querySelector('[data-research-conversation-panel]')).not.toBeNull() + expect(detailsPortalHost.querySelector('[role="tablist"]')).toBeNull() + expect(detailsPortalHost.querySelector('[data-research-file-row]')).toBeNull() + } finally { + await mounted.cleanup() + } + }) + + it('captures and drags only a plain selection contained by one settled assistant message', async () => { + const mounted = await mountConversationRoot('research', { + messageId: 'm1', text: 'Margin expanded.' + }) + try { + const { browserWindow, detailsPortalHost, sessionId, workspace } = mounted + const wrapper = detailsPortalHost.querySelector( + '[data-assistant-message-id="m1"]' + ) + const text = wrapper?.querySelector('span')?.firstChild + const chatView = detailsPortalHost.querySelector('[data-chat-view]') + expect(wrapper).not.toBeNull() + expect(text).toBeDefined() + expect(chatView).not.toBeNull() + if (wrapper === null || text == null || chatView === null) return + + const outside = browserWindow.document.createElement('span') + outside.textContent = 'Outside' + chatView.appendChild(outside) + const outsideText = outside.firstChild + expect(outsideText).toBeDefined() + if (outsideText === null) return + const invalid = browserWindow.document.createRange() + invalid.setStart(text, 0) + invalid.setEnd(outsideText, 3) + browserWindow.getSelection()?.removeAllRanges() + browserWindow.getSelection()?.addRange(invalid) + await act(async () => { + wrapper.dispatchEvent(new browserWindow.Event('mouseup', { bubbles: true })) + }) + expect(detailsPortalHost.querySelector('button[aria-label="加入画布"]')).toBeNull() + + const selection = browserWindow.document.createRange() + selection.setStart(text, 0) + selection.setEnd(text, 15) + browserWindow.getSelection()?.removeAllRanges() + browserWindow.getSelection()?.addRange(selection) + await act(async () => { + wrapper.dispatchEvent(new browserWindow.Event('mouseup', { bubbles: true })) + }) + const add = detailsPortalHost.querySelector('button[aria-label="加入画布"]') + expect(add).not.toBeNull() + + const payloads = new Map() + const outsidePayloads = new Map() + const outsideDrag = new browserWindow.Event('dragstart', { + bubbles: true, cancelable: true + }) + Object.defineProperty(outsideDrag, 'dataTransfer', { + value: { + effectAllowed: 'none', + setData(type: string, value: string) { outsidePayloads.set(type, value) } + } + }) + outside.dispatchEvent(outsideDrag) + expect(outsidePayloads.has( + 'application/x-sherlock-research-artifact' + )).toBe(false) + + const transfer = { + effectAllowed: 'none', + setData(type: string, value: string) { payloads.set(type, value) } + } + const dragStart = new browserWindow.Event('dragstart', { + bubbles: true, cancelable: true + }) + Object.defineProperty(dragStart, 'dataTransfer', { value: transfer }) + wrapper.dispatchEvent(dragStart) + const payload = JSON.parse(payloads.get( + 'application/x-sherlock-research-artifact' + ) ?? '{}') + expect(Object.keys(payload).sort()).toEqual([ + 'excerpt', 'kind', 'messageId', 'sessionId', 'title' + ]) + expect(payload).toEqual({ + sessionId, + messageId: 'm1', + kind: 'assistant-excerpt', + title: '助手摘录', + excerpt: 'Margin expanded' + }) + expect(transfer.effectAllowed).toBe('copy') + + await act(async () => { click(browserWindow, add) }) + expect(workspace.getSnapshot().artifacts).toMatchObject([{ + messageId: 'm1', kind: 'assistant-excerpt', + title: '助手摘录', excerpt: 'Margin expanded' + }]) + + const passage = wrapper.querySelector('span') + if (passage === null) return + passage.textContent = 'x'.repeat(16_434) + const longText = passage.firstChild + if (longText === null) return + const longSelection = browserWindow.document.createRange() + longSelection.setStart(longText, 0) + longSelection.setEnd(longText, 16_434) + browserWindow.getSelection()?.removeAllRanges() + browserWindow.getSelection()?.addRange(longSelection) + await act(async () => { + wrapper.dispatchEvent(new browserWindow.Event('mouseup', { bubbles: true })) + }) + const boundedPayloads = new Map() + const boundedDrag = new browserWindow.Event('dragstart', { + bubbles: true, cancelable: true + }) + Object.defineProperty(boundedDrag, 'dataTransfer', { + value: { + effectAllowed: 'none', + setData(type: string, value: string) { boundedPayloads.set(type, value) } + } + }) + wrapper.dispatchEvent(boundedDrag) + expect(JSON.parse(boundedPayloads.get( + 'application/x-sherlock-research-artifact' + ) ?? '{}').excerpt).toHaveLength(16_384) + } finally { + await mounted.cleanup() + } + }) + + it('clears the saved excerpt action when Conversation is hidden or the session changes', async () => { + const mounted = await mountConversationRoot('research', { + messageId: 'm-selection', text: 'Selection belongs to one session.' + }) + try { + const { actions, browserWindow, detailsPortalHost } = mounted + const selectExcerpt = async () => { + const wrapper = detailsPortalHost.querySelector( + '[data-assistant-message-id="m-selection"]' + ) + const text = wrapper?.querySelector('span')?.firstChild + expect(wrapper).not.toBeNull() + expect(text).toBeDefined() + if (wrapper === null || text == null) return + const range = browserWindow.document.createRange() + range.setStart(text, 0) + range.setEnd(text, 9) + browserWindow.getSelection()?.removeAllRanges() + browserWindow.getSelection()?.addRange(range) + await act(async () => { + wrapper.dispatchEvent(new browserWindow.Event('mouseup', { bubbles: true })) + }) + } + + await selectExcerpt() + expect(detailsPortalHost.querySelector('button[aria-label="加入画布"]')).not.toBeNull() + + await act(async () => { actions.setView('chat') }) + expect(detailsPortalHost.querySelector('button[aria-label="加入画布"]')).toBeNull() + + await act(async () => { actions.setView('research') }) + expect(detailsPortalHost.querySelector('button[aria-label="加入画布"]')).toBeNull() + + await selectExcerpt() + expect(detailsPortalHost.querySelector('button[aria-label="加入画布"]')).not.toBeNull() + await mounted.rerenderSession('session-research-second') + expect(detailsPortalHost.querySelector('button[aria-label="加入画布"]')).toBeNull() + } finally { + await mounted.cleanup() + } + }) + + it('opens an artifact source safely and reports a missing source without removing its snapshot', async () => { + const sourceMessageId = 'm1"][data-owned="false' + const mounted = await mountConversationRoot('research', { + messageId: sourceMessageId, text: 'Revenue improved.' + }) + const canvasHost = mounted.browserWindow.document.createElement('div') + mounted.browserWindow.document.body.appendChild(canvasHost) + const canvasRoot = createRoot(canvasHost) + try { + const { + actions, browserWindow, chat, client, detailsPortalHost, + researchWorkspaces, sessionId, workspace + } = mounted + await act(async () => { + workspace.setArtifacts([ + { + id: 'artifact-source', kind: 'assistant-result', messageId: sourceMessageId, + title: '助手回复', excerpt: 'Revenue improved.', x: 100, y: 80 + }, + { + id: 'artifact-missing', kind: 'assistant-excerpt', messageId: 'm-missing', + title: '助手摘录', excerpt: 'Missing snapshot', x: 300, y: 160 + } + ]) + }) + await act(async () => { + canvasRoot.render(createElement(client.ResearchCanvas as ComponentType>, { + sessionId, + researchWorkspaces, + t: (key: string) => key === 'research.canvas' ? '研究画布' : key + })) + }) + const source = detailsPortalHost.querySelector( + '[data-assistant-message-id]' + ) as HappyDOMElement | null + expect(source).not.toBeNull() + expect(source?.getAttribute('data-assistant-message-id')).toBe(sourceMessageId) + if (source === null) return + let scrolls = 0 + Object.defineProperty(source, 'scrollIntoView', { + configurable: true, + value: () => { scrolls += 1 } + }) + + const sourceCard = canvasHost.querySelector( + '[data-research-artifact-card="artifact-source"]' + ) + expect(sourceCard?.textContent).toContain('助手回复') + expect(sourceCard?.textContent).toContain('来源消息') + await act(async () => { + sourceCard?.dispatchEvent(new browserWindow.Event('dblclick', { + bubbles: true, cancelable: true + })) + }) + expect(scrolls).toBe(1) + expect(browserWindow.document.activeElement).toBe(source) + expect(workspace.getSnapshot().pendingMessageJump).toBeNull() + + const missingCard = canvasHost.querySelector( + '[data-research-artifact-card="artifact-missing"]' + ) + await act(async () => { + missingCard?.dispatchEvent(new browserWindow.KeyboardEvent('keydown', { + key: 'Enter', code: 'Enter', bubbles: true, cancelable: true + })) + }) + expect(workspace.getSnapshot().pendingMessageJump).toBeNull() + expect(detailsPortalHost.querySelector('[role="status"]')?.textContent) + .toContain('来源消息不可用') + const missingSnapshot = canvasHost.querySelector( + '[data-research-artifact-card="artifact-missing"]' + ) + expect(missingSnapshot).not.toBeNull() + expect(missingSnapshot?.textContent).toContain('来源消息不可用') + + await act(async () => { actions.setView('chat') }) + expect(detailsPortalHost.querySelector('[role="status"]')).toBeNull() + + await act(async () => { actions.setView('research') }) + + await act(async () => { + missingCard?.dispatchEvent(new browserWindow.KeyboardEvent('keydown', { + key: 'Enter', code: 'Enter', bubbles: true, cancelable: true + })) + }) + expect(detailsPortalHost.querySelector('[role="status"]')?.textContent) + .toContain('来源消息不可用') + await act(async () => { actions.setView('chat') }) + expect(detailsPortalHost.querySelector('[role="status"]')).toBeNull() + + await mounted.rerenderSession('session-research-second') + expect(detailsPortalHost.querySelector('[role="status"]')).toBeNull() + } finally { + await act(async () => { canvasRoot.unmount() }) + await mounted.cleanup() + } + }) + + it('shows the workspace-backed file tags only while the top-level Research view is active', async () => { + const mounted = await mountConversationRoot('research') + try { + const { actions, browserWindow } = mounted + const tags = () => browserWindow.document.querySelectorAll('[data-research-file-tag]') + + expect(Array.from(tags()).map((tag) => tag.getAttribute('data-research-file-tag'))) + .toEqual(['file-b', 'file-a']) + expect(browserWindow.document.querySelector('[data-research-file-tag="file-b"]') + ?.getAttribute('aria-invalid')).toBe('true') + + await act(async () => { actions.setView('chat') }) + expect(tags()).toHaveLength(0) + + await act(async () => { actions.setView('research') }) + expect(Array.from(tags()).map((tag) => tag.getAttribute('data-research-file-tag'))) + .toEqual(['file-b', 'file-a']) + } finally { + await mounted.cleanup() + } + }) + + it('provides selected assistant replies to the Research composer as quote tags', async () => { + const mounted = await mountConversationRoot('research') + try { + const { browserWindow, workspace } = mounted + await act(async () => { + workspace.setArtifacts([{ + id: 'assistant-result-composer', + kind: 'assistant-result', + messageId: 'message-composer', + title: '助手回复', + excerpt: '行业景气度正在回升。', + x: 300, + y: 180 + }]) + workspace.setSelection({ + selectedNodeIds: ['assistant-result-composer'], + orderedFileIds: [] + }) + }) + + const tag = browserWindow.document.querySelector( + '[data-research-artifact-tag="assistant-result-composer"]' + ) + expect(tag?.textContent).toBe('助手回复 · 行业景气度正在回升。') + await act(async () => { + workspace.updateArtifactContent( + 'assistant-result-composer', + '行业景气度已经确认回升。' + ) + }) + expect(browserWindow.document.querySelector( + '[data-research-artifact-tag="assistant-result-composer"]' + )?.textContent).toBe('助手回复 · 行业景气度已经确认回升。') + } finally { + await mounted.cleanup() + } + }) + + it('never reserves a separate accessory row for inline Research file tags', async () => { + const mounted = await mountConversationRoot('research') + try { + const { browserWindow, workspace } = mounted + const composer = () => browserWindow.document.querySelector('[data-test-composer-bar]') + + expect(composer()?.getAttribute('data-test-composer-has-accessory')).toBe('false') + await act(async () => { + workspace.removeSelectedFile('file-b') + workspace.removeSelectedFile('file-a') + }) + + expect(browserWindow.document.querySelectorAll('[data-research-file-tag]')).toHaveLength(0) + expect(composer()?.getAttribute('data-test-composer-has-accessory')).toBe('false') + } finally { + await mounted.cleanup() + } + }) + + it('moves one composer host without remounting the textarea or losing IME state', async () => { + const mounted = await mountConversationRoot('chat') + try { + const { actions, browserWindow, host, transitions } = mounted + const initialScroll = host.querySelector('[data-conversation-scroll]') + const textarea = host.querySelector('textarea') + expect(initialScroll).not.toBeNull() + expect(textarea).not.toBeNull() + if (!(textarea instanceof browserWindow.HTMLTextAreaElement)) return + textarea.value = '研究中的中文输入' + textarea.focus() + textarea.setSelectionRange(2, 6) + const compositionStart = new browserWindow.CompositionEvent('compositionstart', { + bubbles: true + }) + Object.defineProperty(compositionStart, 'data', { value: '研究' }) + textarea.dispatchEvent(compositionStart) + + await act(async () => { actions.setView('research') }) + const researchTextarea = browserWindow.document.querySelector('textarea') + expect(researchTextarea).toBe(textarea) + expect(browserWindow.document.activeElement).toBe(textarea) + expect(textarea.selectionStart).toBe(2) + expect(textarea.selectionEnd).toBe(6) + expect(textarea.value).toBe('研究中的中文输入') + expect(textarea.closest('[data-research-conversation-panel]')).not.toBeNull() + expect(host.querySelector('[data-conversation-scroll]')).toBe(initialScroll) + expect(transitions.enter).toBe(1) + + await act(async () => { + actions.select({ callId: 'research-call', turnSeq: 2 }) + actions.setView('chat') + }) + expect(host.querySelector('textarea')).toBe(textarea) + expect(browserWindow.document.activeElement).toBe(textarea) + expect(textarea.selectionStart).toBe(2) + expect(textarea.selectionEnd).toBe(6) + expect(textarea.value).toBe('研究中的中文输入') + expect(host.querySelector('[data-conversation-scroll]')).toBe(initialScroll) + expect(transitions.leave).toBe(1) + expect(mounted.chat.get().selection).toEqual({ + callId: 'call-1', toolName: 'Web Search', turnSeq: 1 + }) + expect(browserWindow.document.querySelectorAll('[data-composer-seat]')).toHaveLength(1) + } finally { + await mounted.cleanup() + } + }) + + it('keeps shared composer height and horizontal geometry across Chat and Research portals', async () => { + const mounted = await mountConversationRoot('chat') + try { + const { actions, browserWindow, host, input, detailsPortalHost } = mounted + const textarea = host.querySelector('textarea') + const backdrop = host.querySelector('[data-input-backdrop]') + const mirror = host.querySelector('[data-input-mirror]') + expect(textarea).not.toBeNull() + expect(backdrop).not.toBeNull() + expect(mirror).not.toBeNull() + if (!(textarea instanceof browserWindow.HTMLTextAreaElement) || + backdrop === null || mirror === null) return + const centerComposerHost = host.querySelector('[data-center-composer-host]') + const composerPortalHost = host.querySelector('[data-composer-portal-host]') + const composerSeat = host.querySelector('[data-composer-seat]') + const composerRoot = host.querySelector('.uV2eYG_root') + const composerCard = host.querySelector('.uV2eYG_card') + const composerRow = host.querySelector('.uV2eYG_row') + expect(centerComposerHost).not.toBeNull() + expect(composerPortalHost).not.toBeNull() + expect(composerSeat).not.toBeNull() + expect(composerRoot).not.toBeNull() + expect(composerCard).not.toBeNull() + expect(composerRow).not.toBeNull() + if (centerComposerHost === null || composerPortalHost === null || + composerSeat === null || composerRoot === null || + composerCard === null || composerRow === null) return + expect(centerComposerHost.contains(composerPortalHost)).toBe(true) + expect(composerPortalHost.contains(composerSeat)).toBe(true) + expect(composerSeat.contains(composerRoot)).toBe(true) + expect(composerRoot.contains(composerCard)).toBe(true) + expect(composerCard.contains(composerRow)).toBe(true) + expect(composerCard.contains(textarea)).toBe(true) + + await act(async () => { input.update({ draft: '第一行\n第二行' }) }) + + const initialStyle = browserWindow.getComputedStyle(textarea) + const horizontalGeometry = { + width: initialStyle.width, + maxWidth: initialStyle.maxWidth, + paddingLeft: initialStyle.paddingLeft, + paddingRight: initialStyle.paddingRight + } + expect(initialStyle.paddingBottom).toBe('8px') + expect(browserWindow.getComputedStyle(backdrop).paddingBottom).toBe('8px') + expect(browserWindow.getComputedStyle(mirror).paddingBottom).toBe('8px') + + await act(async () => { actions.setView('research') }) + const researchTextarea = browserWindow.document.querySelector('textarea') + expect(researchTextarea).toBe(textarea) + const researchPortalHost = detailsPortalHost.querySelector('[data-composer-portal-host]') + const researchSeat = detailsPortalHost.querySelector('[data-composer-seat]') + const researchRoot = detailsPortalHost.querySelector('.uV2eYG_root') + const researchCard = detailsPortalHost.querySelector('.uV2eYG_card') + const researchRow = detailsPortalHost.querySelector('.uV2eYG_row') + expect(researchPortalHost).toBe(composerPortalHost) + expect(researchSeat).not.toBeNull() + expect(researchRoot).not.toBeNull() + expect(researchCard).not.toBeNull() + expect(researchRow).not.toBeNull() + if (researchPortalHost === null || researchSeat === null || researchRoot === null || + researchCard === null || researchRow === null) return + expect(detailsPortalHost.contains(researchPortalHost)).toBe(true) + expect(researchPortalHost.contains(researchSeat)).toBe(true) + expect(researchSeat.contains(researchRoot)).toBe(true) + expect(researchRoot.contains(researchCard)).toBe(true) + expect(researchCard.contains(researchRow)).toBe(true) + expect(researchCard.contains(textarea)).toBe(true) + expect(detailsPortalHost.querySelector('[data-input-backdrop]')).not.toBeNull() + expect(detailsPortalHost.querySelector('[data-input-mirror]')).not.toBeNull() + const researchBackdrop = detailsPortalHost.querySelector('[data-input-backdrop]') + const researchMirror = detailsPortalHost.querySelector('[data-input-mirror]') + if (researchBackdrop === null || researchMirror === null) return + expect(researchBackdrop?.querySelectorAll('[data-research-file-tag]')).toHaveLength(2) + expect(researchBackdrop?.textContent).toContain('第二行') + expect(researchBackdrop?.textContent).toContain('evidence.pdf') + expect(researchBackdrop?.textContent).toContain('unresolved.txt') + const researchStyle = browserWindow.getComputedStyle(textarea) + expect({ + width: researchStyle.width, + maxWidth: researchStyle.maxWidth, + paddingLeft: researchStyle.paddingLeft, + paddingRight: researchStyle.paddingRight + }).toEqual(horizontalGeometry) + expect(researchStyle.paddingBottom).toBe('8px') + expect(browserWindow.getComputedStyle(researchBackdrop).paddingBottom).toBe('8px') + expect(browserWindow.getComputedStyle(researchMirror).paddingBottom).toBe('8px') + } finally { + await mounted.cleanup() + } + }) + + it('renders the dependency InputBar layers with synchronized shared spacing', async () => { + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + const restoreGlobals = installBrowserGlobals(browserWindow) + const primitives = { + Tooltip: ({ children }: { children: unknown }) => children, + IconPaperclipOutline16: () => null + } + const attachments = { + DropOverlay: () => null, + AttachmentRail: () => null + } + const client = await loadClientBundle('dsh-client-ui-conversation', undefined, { + document: browserWindow.document, + window: browserWindow, + exposeInputBar: true, + modules: { + '@deepseek-ai/dsh-client-ui-primitives': primitives, + '@deepseek-ai/dsh-client-ui-attachment': attachments + } + }) + const InputBar = client.__testInputBar as ComponentType> + expect(InputBar).toBeTypeOf('function') + if (typeof InputBar !== 'function') { + restoreGlobals() + return + } + const host = browserWindow.document.createElement('div') + browserWindow.document.body.appendChild(host) + const root = createRoot(host) + const referenceFiles = Array.from({ length: 4 }, (_, index) => ({ + id: `measure-file-${index + 1}`, + path: `/w/measure-${index + 1}.pdf`, + name: `measure-${index + 1}.pdf` + })) + const referencePrefix = '第一行\n' + const referenceGap = ' ' + const inputState = { + draft: `${referencePrefix}${referenceFiles.map(() => '\uFFFC').join(referenceGap)}第二行`, + imageIds: [], + occurrences: referenceFiles.map((file, index) => ({ + occurrenceId: `measure-occurrence-${index + 1}`, + offset: referencePrefix.length + index * 2, + source: 'research-file', + ref: JSON.stringify(file), + label: file.name, + clipboardText: file.name + })), + phase: 'idle', + queue: [] + } + const baseProps: Record = { + useSession: (select: (state: Record) => unknown) => select({ + running: false, + promptError: null, + subagent: null, + removed: false + }), + useInput: (select: (state: typeof inputState) => unknown) => select(inputState), + inputActions: {}, + keyboard: { + snapshot: inputState, + updateResearchReferenceOccurrences: () => false + }, + researchFileReferences: referenceFiles, + renderSlot: () => null, + useNotices: (select: (state: null) => unknown) => select(null), + useLexicon: (select: (state: Record) => unknown) => select({}), + useMenuLauncher: (select: (state: string | null) => unknown) => select(null), + useProjection: ( + _name: string, + select?: (value: undefined) => unknown + ) => select === undefined ? undefined : select(undefined), + sessionId: 'session-inputbar-integration', + t: (key: string) => key, + variant: 'composer' + } + try { + await act(async () => { + root.render(createElement(InputBar, baseProps)) + }) + const rootLayer = host.querySelector('.uV2eYG_root') + const cardLayer = host.querySelector('.uV2eYG_card') + const backdropLayer = host.querySelector('[data-input-backdrop]') + const mirrorLayer = host.querySelector('[data-input-mirror]') + const textarea = host.querySelector('textarea') + const rowLayer = host.querySelector('.uV2eYG_row') + expect(rootLayer).not.toBeNull() + expect(cardLayer).not.toBeNull() + expect(backdropLayer).not.toBeNull() + expect(mirrorLayer).not.toBeNull() + expect(textarea).not.toBeNull() + expect(rowLayer).not.toBeNull() + if (rootLayer === null || cardLayer === null || backdropLayer === null || + mirrorLayer === null || textarea === null || rowLayer === null) return + expect(rootLayer.contains(cardLayer)).toBe(true) + expect(cardLayer.contains(backdropLayer)).toBe(true) + expect(cardLayer.contains(textarea)).toBe(true) + expect(cardLayer.contains(mirrorLayer)).toBe(true) + expect(cardLayer.contains(rowLayer)).toBe(true) + const textareaStyle = browserWindow.getComputedStyle(textarea) + const sharedStyle = browserWindow.getComputedStyle(backdropLayer) + const mirrorStyle = browserWindow.getComputedStyle(mirrorLayer) + expect(textareaStyle.paddingBottom).toBe('8px') + expect(sharedStyle.paddingBottom).toBe('8px') + expect(mirrorStyle.paddingBottom).toBe('8px') + expect(sharedStyle.paddingLeft).toBe(textareaStyle.paddingLeft) + expect(sharedStyle.paddingRight).toBe(textareaStyle.paddingRight) + const measureChips = mirrorLayer.querySelectorAll('[data-input-measure-chip]') + expect(backdropLayer.querySelectorAll('[data-research-file-tag]')).toHaveLength(4) + expect(measureChips).toHaveLength(4) + expect(Array.from(measureChips).map((chip) => + browserWindow.getComputedStyle(chip).width + )).toEqual(['136px', '136px', '136px', '136px']) + expect(mirrorLayer.querySelector('[data-research-file-tag]')).toBeNull() + expect(mirrorLayer.querySelector('[data-research-artifact-tag]')).toBeNull() + + const firstTag = backdropLayer.querySelector( + '[data-research-file-tag="measure-file-1"]' + ) + expect(firstTag).not.toBeNull() + if (firstTag === null) return + Object.defineProperty(firstTag, 'getBoundingClientRect', { + configurable: true, + value: () => new browserWindow.DOMRect(100, 20, 136, 24) + }) + await act(async () => { + firstTag.dispatchEvent(new browserWindow.MouseEvent('click', { + bubbles: true, + cancelable: true, + clientX: 220, + clientY: 32 + })) + }) + expect(textarea.selectionStart).toBe(referencePrefix.length) + expect(textarea.selectionEnd).toBe(referencePrefix.length + 1) + expect(firstTag.getAttribute('data-selected')).toBe('true') + const visibleCaret = backdropLayer.querySelector('[data-input-visible-caret]') + expect(visibleCaret).not.toBeNull() + expect(firstTag.previousElementSibling).toBe(visibleCaret) + expect(browserWindow.getComputedStyle(visibleCaret as HappyDOMElement).width) + .toBe('0px') + + const secondTag = backdropLayer.querySelector( + '[data-research-file-tag="measure-file-2"]' + ) + const gapSegment = firstTag.nextElementSibling + expect(secondTag).not.toBeNull() + expect(gapSegment?.textContent).toBe(referenceGap) + const gapTextNode = gapSegment?.firstChild + expect(gapTextNode).not.toBeNull() + if (secondTag === null || gapTextNode === null || gapTextNode === undefined) return + Object.defineProperty(browserWindow.document, 'caretPositionFromPoint', { + configurable: true, + value: () => ({ offsetNode: gapTextNode, offset: 1 }) + }) + textarea.setSelectionRange(inputState.draft.length, inputState.draft.length) + await act(async () => { + textarea.dispatchEvent(new browserWindow.MouseEvent('click', { + bubbles: true, + cancelable: true, + clientX: 240, + clientY: 32, + detail: 1 + })) + }) + expect(textarea.selectionStart).toBe(referencePrefix.length + 2) + expect(textarea.selectionEnd).toBe(referencePrefix.length + 2) + expect(firstTag.getAttribute('data-selected')).toBeNull() + expect(secondTag.previousElementSibling?.hasAttribute('data-input-visible-caret')) + .toBe(true) + + await act(async () => { + root.render(createElement(InputBar, { ...baseProps, variant: 'hero' })) + }) + const heroMirror = host.querySelector('.uV2eYG_hero [data-input-mirror]') + expect(heroMirror).not.toBeNull() + const heroRule = Array.from(browserWindow.document.styleSheets) + .flatMap((sheet) => Array.from(sheet.cssRules)) + .find((rule): rule is HappyDOMCSSStyleRule => + rule instanceof browserWindow.CSSStyleRule && + rule.cssText.includes('.uV2eYG_hero .uV2eYG_mirror') + ) + expect(heroRule?.style.getPropertyValue('min-height')) + .toBe('60px') + } finally { + await act(async () => { root.unmount() }) + restoreGlobals() + } + }) + + it('keeps the Hero mirror tall enough for the shared multiline decoration', async () => { + const styles: InjectedStyle[] = [] + await loadClientBundle('dsh-client-ui-conversation', undefined, { styles }) + const inputBarCss = styles.find(({ pluginCss }) => + pluginCss?.endsWith('/InputBar.module.css') + )?.textContent ?? '' + expect(inputBarCss).toContain( + '.uV2eYG_input,.uV2eYG_mirror,.uV2eYG_backdrop{box-sizing:border-box;font-family:\"DshChipCell\", var(--dsw-font-family);font-size:inherit;line-height:inherit;white-space:pre-wrap;word-break:break-word;overflow-wrap:anywhere;padding:4px 12px 8px 16px}' + ) + expect(inputBarCss).toContain('.uV2eYG_hero .uV2eYG_mirror{min-height:60px}') + }) + + it('keeps the main Chat composer outside the scrolling message region', async () => { + const mounted = await mountConversationRoot('chat') + try { + const { host } = mounted + const scroll = host.querySelector('[data-conversation-scroll]') + const centerComposerHost = host.querySelector('[data-center-composer-host]') + const composerSeat = host.querySelector('[data-composer-seat]') + + expect(scroll).not.toBeNull() + expect(centerComposerHost).not.toBeNull() + expect(composerSeat).not.toBeNull() + if (scroll === null || centerComposerHost === null || composerSeat === null) return + expect(scroll.contains(centerComposerHost)).toBe(false) + expect(centerComposerHost.parentElement).toBe(scroll.parentElement) + expect(centerComposerHost.contains(composerSeat)).toBe(true) + } finally { + await mounted.cleanup() + } + }) + + it('keeps the blank new-conversation composer centered after docking active chats', async () => { + const styles: InjectedStyle[] = [] + await loadClientBundle('dsh-client-ui-conversation', undefined, { styles }) + const layoutCss = styles + .map(({ textContent }) => textContent) + .filter((textContent) => + textContent.includes('.wSkVaW_composerHero') || + textContent.includes('[data-center-composer-host]') + ) + .join('\n') + + expect(layoutCss).toContain( + '.wSkVaW_root[data-phase=hero]>[data-center-composer-host]{position:absolute;inset:0;display:flex;align-items:center;justify-content:center}' + ) + expect(layoutCss).toContain( + '.wSkVaW_root[data-phase=hero]>[data-center-composer-host]>[data-composer-portal-host]{width:100%}' + ) + expect(layoutCss).toContain( + '.wSkVaW_root[data-phase=hero] .wSkVaW_composerHero{box-sizing:border-box;width:100%;max-width:812px}' + ) + }) + + it('keeps a blank Research session in the full canvas layout with a docked composer', async () => { + const mounted = await mountConversationRoot('research') + try { + await act(async () => { + mounted.session.update({ composerPhase: 'blank', blank: true }) + }) + + const shell = mounted.host.querySelector('[data-phase]') + const composer = mounted.browserWindow.document.querySelector('[data-test-composer-bar]') + expect(shell?.getAttribute('data-phase')).toBe('active') + expect(mounted.host.querySelector('[data-research-center]')).not.toBeNull() + expect(composer?.classList.contains('uV2eYG_hero')).toBe(false) + } finally { + await mounted.cleanup() + } + }) + + it('shows the Research empty-state headline and workspace controls until the first message', async () => { + const mounted = await mountConversationRoot('research') + try { + await act(async () => { + mounted.session.update({ + composerPhase: 'blank', + blank: true, + chat: { order: [] } + }) + }) + + const emptyState = mounted.detailsPortalHost.querySelector('[data-research-empty-state]') + const workspaceRow = mounted.detailsPortalHost.querySelector('[data-research-empty-workspace-row]') + const composer = mounted.detailsPortalHost.querySelector('[data-test-composer-bar]') + expect(emptyState?.textContent).toContain('迷雾之中，洞见真相') + expect(emptyState?.textContent).toContain('预览版') + expect(workspaceRow).not.toBeNull() + expect(composer).not.toBeNull() + if (workspaceRow === null || composer === null) return + expect(workspaceRow?.parentElement).not.toBe(composer) + expect(workspaceRow?.parentElement).toBe(composer?.parentElement) + const composerStackChildren = Array.from(workspaceRow?.parentElement?.children ?? []) + expect(composerStackChildren.indexOf(workspaceRow)) + .toBeLessThan(composerStackChildren.indexOf(composer)) + expect(composer?.getAttribute('data-test-composer-has-accessory')).toBe('false') + + await act(async () => { + mounted.session.update({ + composerPhase: 'active', + blank: false, + chat: { order: ['message-1'] } + }) + }) + + expect(mounted.detailsPortalHost.querySelector('[data-research-empty-state]')).toBeNull() + expect(mounted.detailsPortalHost.querySelector('[data-research-empty-workspace-row]')).toBeNull() + expect(composer?.getAttribute('data-test-composer-has-accessory')).toBe('false') + } finally { + await mounted.cleanup() + } + }) + + it('restores each session own Details selection when switching Research sessions before leaving', async () => { + const mounted = await mountConversationRoot('research') + try { + const { actions: actionsA, chat: chatA, createSessionBinding } = mounted + await act(async () => { + actionsA.select({ callId: 'research-a', toolName: 'Research A', turnSeq: 11 }) + }) + const bindingB = createSessionBinding({ + view: 'research', + selection: { callId: 'call-b', toolName: 'Search B', turnSeq: 21 } + }) + + await mounted.rerenderSession('session-research-b', bindingB) + expect(bindingB.chat.get().selection).toEqual({ + callId: 'call-b', toolName: 'Search B', turnSeq: 21 + }) + await act(async () => { + bindingB.actions.select({ callId: 'research-b', toolName: 'Research B', turnSeq: 22 }) + bindingB.actions.setView('chat') + }) + + expect(bindingB.chat.get().selection).toEqual({ + callId: 'call-b', toolName: 'Search B', turnSeq: 21 + }) + expect(chatA.get().selection).toEqual({ + callId: 'research-a', toolName: 'Research A', turnSeq: 11 + }) + } finally { + await mounted.cleanup() + } + }) + + it('keeps one draft lifecycle across Chat, Research, Trajectory, and Research re-entry', async () => { + const mounted = await mountConversationRoot('chat') + try { + const { actions, browserWindow, chat, detailsPortalHost, host, input, transitions, workspace } = mounted + const textarea = host.querySelector('textarea') + expect(textarea).not.toBeNull() + expect(browserWindow.document.querySelectorAll('[data-composer-seat]')).toHaveLength(1) + + await act(async () => { actions.setView('research') }) + expect(transitions.enter).toBe(1) + expect(chat.get().researchRightTab).toBe('conversation') + expect(browserWindow.document.querySelectorAll('[data-composer-seat]')).toHaveLength(1) + expect(browserWindow.document.querySelector('textarea')).toBe(textarea) + expect(detailsPortalHost.querySelector('[data-research-conversation-panel]')).not.toBeNull() + expect(detailsPortalHost.querySelector('[role="tablist"]')).toBeNull() + expect(input.get()).toEqual({ + draft: '研究草稿', images: [{ id: 'image-a' }, { id: 'image-b' }] + }) + expect(Array.from(browserWindow.document.querySelectorAll('[data-composer-image-id]')) + .map((node) => node.getAttribute('data-composer-image-id'))) + .toEqual(['image-a', 'image-b']) + expect(Array.from(browserWindow.document.querySelectorAll('[data-research-file-tag]')) + .map((node) => node.getAttribute('data-research-file-tag'))) + .toEqual(['file-b', 'file-a']) + + await act(async () => { + actions.select({ callId: 'research-call', toolName: 'Research', turnSeq: 2 }) + actions.setView('trajectory') + }) + expect(transitions.leave).toBe(1) + expect(chat.get().selection).toEqual({ + callId: 'call-1', toolName: 'Web Search', turnSeq: 1 + }) + expect(host.querySelector('textarea')).toBe(textarea) + + await act(async () => { actions.setView('research') }) + expect(transitions.enter).toBe(2) + expect(browserWindow.document.querySelector('textarea')).toBe(textarea) + expect(Array.from(browserWindow.document.querySelectorAll('[data-research-file-tag]')) + .map((node) => node.getAttribute('data-research-file-tag'))) + .toEqual(['file-b', 'file-a']) + expect(workspace.getSnapshot().artifacts).toEqual([]) + expect(workspace.getSnapshot().files).toHaveLength(2) + } finally { + await mounted.cleanup() + } + }) + + it('keeps the single Research conversation panel active while messages update', async () => { + const mounted = await mountConversationRoot('research') + try { + const { detailsPortalHost, session, workspace } = mounted + const panel = detailsPortalHost.querySelector('[data-research-conversation-panel]') + expect(panel).not.toBeNull() + expect(detailsPortalHost.querySelector('[role="tablist"]')).toBeNull() + + await act(async () => { + session.update({ chat: { order: ['message-1', 'message-2'] }, running: true }) + }) + + expect(detailsPortalHost.querySelector('[data-research-conversation-panel]')).toBe(panel) + expect(panel?.getAttribute('aria-hidden')).toBeNull() + expect(workspace.assistantActionsActive()).toBe(true) + } finally { + await mounted.cleanup() + } + }) + + it('centers the canvas from composer and sent Research tags while preserving zoom', async () => { + const promptPayload = JSON.stringify({ + files: [{ id: 'file-a', name: 'evidence.pdf', path: '/tmp/research/evidence.pdf' }], + occurrences: [{ fileId: 'file-a', offset: 0 }] + }) + const mounted = await mountConversationRoot('research', undefined, undefined, { + userMessagePrompt: `␞SHERLOCK_RESEARCH_FILES_V1 ${promptPayload}␟继续分析` + }) + try { + const { browserWindow, detailsPortalHost, host, workspace } = mounted + await act(async () => { + workspace.setCanvasSize({ width: 800, height: 600 }) + workspace.setViewport({ scale: 0.75, x: 12, y: 23 }) + }) + + const composerTag = browserWindow.document.querySelector( + '[data-research-file-tag="file-b"]' + ) as HappyDOMElement | null + expect(composerTag).not.toBeNull() + await act(async () => { composerTag?.dispatchEvent(new browserWindow.MouseEvent('click', { bubbles: true })) }) + expect(workspace.getSnapshot().selection).toEqual({ + selectedNodeIds: ['file-b'], orderedFileIds: ['file-b'] + }) + expect(workspace.getSnapshot().viewport).toEqual({ + scale: 0.75, x: 287.5, y: 210 + }) + + await act(async () => { + workspace.setViewport({ scale: 0.75, x: -30, y: -40 }) + }) + const sentTag = detailsPortalHost.querySelector( + '[data-research-message-file="file-a"]' + ) as HappyDOMElement | null + expect(sentTag?.getAttribute('data-research-reference-node-id')).toBe('file-a') + await act(async () => { sentTag?.dispatchEvent(new browserWindow.MouseEvent('click', { bubbles: true })) }) + expect(workspace.getSnapshot().selection).toEqual({ + selectedNodeIds: ['file-a'], orderedFileIds: ['file-a'] + }) + expect(workspace.getSnapshot().viewport).toEqual({ + scale: 0.75, x: 325, y: 240 + }) + + const viewportBeforeMissingClick = workspace.getSnapshot().viewport + await act(async () => { workspace.removeNodes(['file-a']) }) + await act(async () => { sentTag?.dispatchEvent(new browserWindow.MouseEvent('click', { bubbles: true })) }) + expect(workspace.getSnapshot().viewport).toEqual(viewportBeforeMissingClick) + expect(host.querySelector('[data-research-reference-status]')?.textContent) + .toContain('组件已删除或不可用') + } finally { + await mounted.cleanup() + } + }) + + it('focuses a Research workspace node without changing the current zoom', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation') + const Registry = client.ResearchWorkspaceRegistry as new (storage: Storage) => { + for(id: string): { + getSnapshot(): { + selection: { selectedNodeIds: string[]; orderedFileIds: string[] } + viewport: { scale: number; x: number; y: number } + } + setFiles(files: Array>): void + setArtifacts(artifacts: Array>): void + setCanvasSize(size: { width: number; height: number }): void + setViewport(viewport: { scale: number; x: number; y: number }): void + focusNode(nodeId: string): boolean + } + } + const workspace = new Registry(new MemoryStorage()).for('focus-node') + workspace.setFiles([{ + id: 'file-focus', name: 'report.pdf', path: '/tmp/report.pdf', source: 'computer', + x: 200, y: 120 + }]) + workspace.setArtifacts([{ + id: 'artifact-focus', kind: 'assistant-result', messageId: 'm-summary', + title: '助手回复', excerpt: '摘要', x: 640, y: 360 + }]) + workspace.setCanvasSize({ width: 960, height: 600 }) + workspace.setViewport({ scale: 0.8, x: 44, y: -12 }) + + expect(workspace.focusNode('artifact-focus')).toBe(true) + expect(workspace.getSnapshot()).toMatchObject({ + selection: { selectedNodeIds: ['artifact-focus'], orderedFileIds: [] }, + viewport: { scale: 0.8, x: -32, y: 12 } + }) + const beforeMissing = workspace.getSnapshot() + expect(workspace.focusNode('missing')).toBe(false) + expect(workspace.getSnapshot()).toBe(beforeMissing) + }) + + it('ignores wheel zoom when Command is not held', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation') + expect(client.nextResearchCanvasViewport).toBeTypeOf('function') + if (typeof client.nextResearchCanvasViewport !== 'function') return + + const initial = { scale: 1, x: 0, y: 0 } + const next = client.nextResearchCanvasViewport(initial, { + metaKey: false, + deltaY: -100, + pointerX: 100, + pointerY: 80 + }) + + expect(next).toBe(initial) + }) + + it('keeps the pointer anchored while Command-wheel zooms the canvas', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation') + expect(client.nextResearchCanvasViewport).toBeTypeOf('function') + if (typeof client.nextResearchCanvasViewport !== 'function') return + + const next = client.nextResearchCanvasViewport( + { scale: 1, x: 0, y: 0 }, + { + metaKey: true, + deltaY: -100, + pointerX: 100, + pointerY: 80 + } + ) as { scale: number; x: number; y: number } + + expect(next.scale).toBeCloseTo(1.105170918, 8) + expect(next.x).toBeCloseTo(-10.5170918, 7) + expect(next.y).toBeCloseTo(-8.41367344, 7) + }) + + it('pans the research viewport without changing its zoom', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation') + expect(client.nextResearchCanvasPan).toBeTypeOf('function') + if (typeof client.nextResearchCanvasPan !== 'function') return + + const next = client.nextResearchCanvasPan( + { scale: 1.75, x: -20, y: 10 }, + { deltaX: 35, deltaY: -12 } + ) + + expect(next).toEqual({ scale: 1.75, x: 15, y: -2 }) + }) + + it('uses unmodified vertical and horizontal wheel deltas to pan the canvas', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation') + expect(client.nextResearchCanvasWheel).toBeTypeOf('function') + if (typeof client.nextResearchCanvasWheel !== 'function') return + + const next = client.nextResearchCanvasWheel( + { scale: 1.25, x: 10, y: 20 }, + { + metaKey: false, + deltaX: 24, + deltaY: 80, + pointerX: 300, + pointerY: 200 + } + ) + + expect(next).toEqual({ scale: 1.25, x: -14, y: -60 }) + }) +}) diff --git a/test/sherlock-office-preview-adapter.test.ts b/test/sherlock-office-preview-adapter.test.ts new file mode 100644 index 000000000..e1f2a0363 --- /dev/null +++ b/test/sherlock-office-preview-adapter.test.ts @@ -0,0 +1,414 @@ +import { readFile } from 'node:fs/promises' +import { createRequire } from 'node:module' +import { runInNewContext } from 'node:vm' +import { Window, type HTMLElement as HappyDOMHTMLElement } from 'happy-dom' +import { describe, expect, it, vi } from 'vitest' + +import { patchSherlockOfficePreviewClient } from '../scripts/lib/patch-sherlock-office-preview.mjs' + +type ClientBundle = Record +type BundleDescriptor = { + factory(require: (id: string) => unknown): ClientBundle +} + +const requireModule = createRequire(import.meta.url) +const { act, createElement } = requireModule('react') as { + act(callback: () => void | Promise): Promise + createElement(type: unknown, props?: unknown): unknown +} +const { createRoot } = requireModule('react-dom/client') as { + createRoot(container: unknown): { render(node: unknown): void; unmount(): void } +} +const officeClientPath = new URL( + '../build/sherlock-plugin-profile/vendor/@huanlin/dsh-plugin-better-sidebar-plugin-office/lib/client.js', + import.meta.url +) + +async function officeClientSource(): Promise { + return readFile(officeClientPath, 'utf8') +} + +async function loadPatchedOfficeClient(options: { + document?: unknown + window?: Window | Record + fetch?: typeof fetch + sourceTransform?(source: string): string + testEngine?: Record +} = {}): Promise { + const patched = patchSherlockOfficePreviewClient(await officeClientSource()) + const source = options.sourceTransform?.(patched) ?? patched + let descriptor: BundleDescriptor | undefined + const bundleWindow = options.window ?? {} + Object.assign(bundleWindow, { + __ModuleLoader__: { + load(value: BundleDescriptor) { descriptor = value } + } + }) + runInNewContext(source, { + AbortController: globalThis.AbortController, + Array, + Blob, + Map, + Set, + String, + TextDecoder: globalThis.TextDecoder, + URL: globalThis.URL, + URLSearchParams: globalThis.URLSearchParams, + clearTimeout, + document: options.document, + fetch: options.fetch, + global: { Array, String }, + navigator: options.window instanceof Window ? options.window.navigator : { language: 'zh-CN' }, + setTimeout, + __sherlockOfficeTest: options.testEngine, + window: bundleWindow + }) + if (descriptor === undefined) throw new Error('Office bundle did not register') + return descriptor.factory((id) => { + if (id === 'util') return requireModule('util') + return requireModule(id) + }) +} + +function installBrowserGlobals(browserWindow: Window): () => void { + const keys = ['window', 'document', 'navigator', 'IS_REACT_ACT_ENVIRONMENT'] as const + const descriptors = new Map(keys.map((key) => [key, Object.getOwnPropertyDescriptor(globalThis, key)])) + Object.defineProperties(globalThis, { + window: { configurable: true, value: browserWindow }, + document: { configurable: true, value: browserWindow.document }, + navigator: { configurable: true, value: browserWindow.navigator }, + IS_REACT_ACT_ENVIRONMENT: { configurable: true, value: true } + }) + return () => { + for (const key of keys) { + const descriptor = descriptors.get(key) + if (descriptor === undefined) delete (globalThis as Record)[key] + else Object.defineProperty(globalThis, key, descriptor) + } + } +} + +function instrumentDelayedOfficeEngine(source: string, kind: 'docx' | 'pptx'): string { + if (kind === 'docx') { + const match = /await renderAsync\(buf, (wrap|mount), void 0, \{/u.exec(source) + if (match === null) throw new Error('DOCX render anchor missing') + return source.replace( + match[0], + `await __sherlockOfficeTest.renderDocx(buf, ${match[1]}, void 0, {` + ) + } + const engineImport = 'const { PptxViewer, RECOMMENDED_ZIP_LIMITS } = await Promise.resolve().then(() => (init_aiden0z_pptx_renderer_es(), aiden0z_pptx_renderer_es_exports));' + if (source.split(engineImport).length - 1 !== 1) throw new Error('PPTX engine import anchor missing') + return source.replace( + engineImport, + 'const PptxViewer = { open: __sherlockOfficeTest.openPptx }; const RECOMMENDED_ZIP_LIMITS = __sherlockOfficeTest.recommendedZipLimits ?? {};' + ) +} + +async function waitForCalls(calls: unknown[], count: number): Promise { + for (let attempt = 0; attempt < 30 && calls.length < count; attempt += 1) { + await act(async () => { await Promise.resolve() }) + } + expect(calls).toHaveLength(count) +} + +describe('Sherlock bundled Office preview adapter', () => { + it('patches the pinned Office package exactly once and keeps the sidebar route intact', async () => { + const source = await officeClientSource() + const patched = patchSherlockOfficePreviewClient(source) + + expect(patchSherlockOfficePreviewClient(patched)).toBe(patched) + const previousResearchAdapter = patched.replace( + '...(kind === "pptx" ? { toolbar: "host" } : {})', + '...(kind === "pptx" ? { toolbar: "inline" } : {})' + ) + expect(patchSherlockOfficePreviewClient(previousResearchAdapter)).toBe(patched) + expect(patched).toContain('/* sherlock:office-preview-service:v1 */') + expect(patched).toContain('ctx.provide("officePreview", officePreviewService)') + expect(patched).toContain('ctx.inject(["betterSidebar"]') + expect(patched).not.toContain('const inject = ["betterSidebar"]') + expect(patched).toContain('betterSidebar.registerFileViewer(viewer)') + expect(patched).toContain('return `/sidebar/file?${params.toString()}`;') + expect(patched).not.toContain('globalThis.officePreview') + }) + + it('routes only opaque capability URLs to all three existing Office engines', async () => { + const client = await loadPatchedOfficeClient() + const service = client.officePreviewService + + expect(service.supports('docx')).toBe(true) + expect(service.supports('.xlsx')).toBe(true) + expect(service.supports('PPTX')).toBe(true) + expect(service.supports('doc')).toBe(false) + expect(service.Component({ + sourceUrl: 'sherlock-preview://Capability-ABC_123/', + kind: 'docx', + title: 'mixed-token.docx' + }).type.name).toBe('DocxView') + + for (const [kind, engine] of [ + ['docx', 'DocxView'], + ['xlsx', 'XlsxView'], + ['pptx', 'PptxView'] + ]) { + const element = service.Component({ + sourceUrl: `sherlock-preview://capability_${kind}/`, + kind, + title: `report.${kind}` + }) + expect(element.type.name).toBe(engine) + expect(element.props.path).toBe(`sherlock-preview://capability_${kind}/`) + expect(JSON.stringify(element.props)).not.toContain('/sidebar/file') + } + + for (const sourceUrl of [ + '/Users/private/report.docx', + 'file:///Users/private/report.docx', + 'https://attacker.example/report.docx', + 'sherlock-preview://capability_docx/extra', + 'sherlock-preview://user@capability_docx/' + ]) { + const fallback = service.Component({ sourceUrl, kind: 'docx', title: 'report.docx' }) + expect(fallback.props['data-sherlock-office-preview-unavailable']).toBe('') + } + }) + + it('suppresses the built-in PPT download toolbar in the Research adapter', async () => { + const client = await loadPatchedOfficeClient() + const element = client.officePreviewService.Component({ + sourceUrl: 'sherlock-preview://capability_pptx/', + kind: 'pptx', + title: 'research.pptx' + }) + + expect(element.type.name).toBe('PptxView') + expect(element.props.toolbar).toBe('host') + }) + + it('provides the adapter without Better Sidebar and registers the legacy viewers when it appears', async () => { + const client = await loadPatchedOfficeClient() + const provided = vi.fn() + let child: ((ctx: Record) => void) | undefined + const root = { + provide: provided, + inject(services: string[], callback: (ctx: Record) => void) { + expect(services).toEqual(['betterSidebar']) + child = callback + } + } + + client.apply(root) + expect(provided).toHaveBeenCalledWith('officePreview', client.officePreviewService) + expect(child).toBeTypeOf('function') + + const registerFileViewer = vi.fn(() => vi.fn()) + const effect = vi.fn((callback: () => unknown) => callback()) + child?.({ betterSidebar: { registerFileViewer }, effect }) + expect(registerFileViewer).toHaveBeenCalledTimes(3) + expect(effect).toHaveBeenCalledTimes(3) + }) + + it('aborts once, disposes either engine shape once, and rejects late attachment after teardown', async () => { + const client = await loadPatchedOfficeClient() + const dispose = vi.fn() + const first = client.createOfficePreviewLifecycle() + + expect(first.signal.aborted).toBe(false) + expect(first.attach({ dispose })).toBe(true) + first.dispose() + first.dispose() + expect(first.signal.aborted).toBe(true) + expect(dispose).toHaveBeenCalledTimes(1) + + const destroy = vi.fn() + const late = client.createOfficePreviewLifecycle() + late.dispose() + expect(late.attach({ destroy })).toBe(false) + expect(destroy).toHaveBeenCalledTimes(1) + late.dispose() + expect(destroy).toHaveBeenCalledTimes(1) + }) + + it('renders PPTX into an isolated mount while keeping the outer host as its scroll container', async () => { + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + const restoreGlobals = installBrowserGlobals(browserWindow) + const calls: Array<{ + mount: HappyDOMHTMLElement + options: { scrollContainer?: HappyDOMHTMLElement } + }> = [] + const client = await loadPatchedOfficeClient({ + document: browserWindow.document, + window: browserWindow, + fetch: async () => new Response(new Uint8Array([1, 2, 3])), + sourceTransform: (source) => instrumentDelayedOfficeEngine(source, 'pptx'), + testEngine: { + async openPptx( + _bytes: ArrayBuffer, + mount: HappyDOMHTMLElement, + options: { scrollContainer?: HappyDOMHTMLElement } + ) { + calls.push({ mount, options }) + return { destroy() {} } + } + } + }) + const host = browserWindow.document.createElement('div') + browserWindow.document.body.appendChild(host) + const root = createRoot(host) + try { + await act(async () => { + root.render(client.officePreviewService.Component({ + sourceUrl: 'sherlock-preview://capability-scroll/', + kind: 'pptx', + title: 'scroll.pptx' + })) + await Promise.resolve() + }) + await waitForCalls(calls, 1) + + expect(calls[0]!.mount.parentElement).not.toBeNull() + expect(calls[0]!.options.scrollContainer).toBe(calls[0]!.mount.parentElement) + expect(calls[0]!.options.scrollContainer).not.toBe(calls[0]!.mount) + } finally { + await act(async () => { root.unmount() }) + restoreGlobals() + } + }) + + it('aligns the PPTX renderer entry limit with the validated 64 MiB Office boundary', async () => { + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + const restoreGlobals = installBrowserGlobals(browserWindow) + const recommendedZipLimits = { + maxEntries: 4_000, + maxEntryUncompressedBytes: 32 * 1024 * 1024, + maxTotalUncompressedBytes: 256 * 1024 * 1024, + maxMediaBytes: 192 * 1024 * 1024, + maxConcurrency: 8 + } + const calls: Array<{ zipLimits?: Record }> = [] + const client = await loadPatchedOfficeClient({ + document: browserWindow.document, + window: browserWindow, + fetch: async () => new Response(new Uint8Array([1, 2, 3])), + sourceTransform: (source) => instrumentDelayedOfficeEngine(source, 'pptx'), + testEngine: { + recommendedZipLimits, + async openPptx( + _bytes: ArrayBuffer, + _mount: HappyDOMHTMLElement, + options: { zipLimits?: Record } + ) { + calls.push(options) + return { destroy() {} } + } + } + }) + const host = browserWindow.document.createElement('div') + browserWindow.document.body.appendChild(host) + const root = createRoot(host) + try { + await act(async () => { + root.render(client.officePreviewService.Component({ + sourceUrl: 'sherlock-preview://capability-large-media/', + kind: 'pptx', + title: 'large-media.pptx' + })) + await Promise.resolve() + }) + await waitForCalls(calls, 1) + + expect(calls[0]!.zipLimits).toEqual({ + ...recommendedZipLimits, + maxEntryUncompressedBytes: 64 * 1024 * 1024 + }) + expect(recommendedZipLimits.maxEntryUncompressedBytes).toBe(32 * 1024 * 1024) + } finally { + await act(async () => { root.unmount() }) + restoreGlobals() + } + }) + + it.each(['docx', 'pptx'] as const)( + 'keeps a completed %s B render intact when the superseded A engine resolves late', + async (kind) => { + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + const restoreGlobals = installBrowserGlobals(browserWindow) + const calls: Array<{ + mount: HappyDOMHTMLElement + finish(label: string): void + }> = [] + const testEngine = kind === 'docx' + ? { + renderDocx(_bytes: ArrayBuffer, mount: HappyDOMHTMLElement) { + return new Promise((resolve) => { + calls.push({ + mount, + finish(label) { + mount.textContent = label + resolve() + } + }) + }) + } + } + : { + openPptx(_bytes: ArrayBuffer, mount: HappyDOMHTMLElement) { + return new Promise((resolve) => { + calls.push({ + mount, + finish(label) { + const content = browserWindow.document.createElement('div') + content.textContent = label + mount.appendChild(content) + resolve({ destroy() { mount.replaceChildren() } }) + } + }) + }) + } + } + const client = await loadPatchedOfficeClient({ + document: browserWindow.document, + window: browserWindow, + fetch: async () => new Response(new Uint8Array([1, 2, 3])), + sourceTransform: (source) => instrumentDelayedOfficeEngine(source, kind), + testEngine + }) + const service = client.officePreviewService + const host = browserWindow.document.createElement('div') + browserWindow.document.body.appendChild(host) + const root = createRoot(host) + const render = async (label: 'a' | 'b') => { + await act(async () => { + root.render(service.Component({ + sourceUrl: `sherlock-preview://capability-${label}/`, + kind, + title: `${label}.${kind}` + })) + await Promise.resolve() + }) + } + try { + await render('a') + await waitForCalls(calls, 1) + await render('b') + await waitForCalls(calls, 2) + + await act(async () => { + calls[1]!.finish('B complete') + await Promise.resolve() + }) + expect(host.textContent).toContain('B complete') + + await act(async () => { + calls[0]!.finish('A late') + await Promise.resolve() + }) + expect(host.textContent).toContain('B complete') + expect(host.textContent).not.toContain('A late') + } finally { + await act(async () => { root.unmount() }) + restoreGlobals() + } + } + ) +}) diff --git a/test/sherlock-tooltip-positioning.test.ts b/test/sherlock-tooltip-positioning.test.ts new file mode 100644 index 000000000..e23ee8e36 --- /dev/null +++ b/test/sherlock-tooltip-positioning.test.ts @@ -0,0 +1,127 @@ +import { createRequire } from 'node:module' +import { readdir, readFile } from 'node:fs/promises' +import { Window } from 'happy-dom' +import { afterEach, describe, expect, it } from 'vitest' + +const requireModule = createRequire(import.meta.url) +const { createElement } = requireModule('react') as { + createElement: (type: unknown, props?: unknown, ...children: unknown[]) => unknown +} +const { act } = requireModule('react') as { + act: (callback: () => void | Promise) => Promise +} +const { createRoot } = requireModule('react-dom/client') as { + createRoot: (container: unknown) => { render(node: unknown): void; unmount(): void } +} + +async function loadTooltip(): Promise<(props: Record) => unknown> { + const source = await readFile( + 'node_modules/@deepseek-ai/dsh-client-ui-primitives/lib/index.js', + 'utf8' + ) + const start = source.indexOf('function Tooltip(') + const end = source.indexOf('//#endregion', start) + if (start === -1 || end === -1) throw new Error('Tooltip source not found') + const react = requireModule('react') as Record + const jsxRuntime = requireModule('react/jsx-runtime') as Record + const reactDom = requireModule('react-dom') as Record + const names = [ + 'Fragment', 'jsx', 'jsxs', 'cloneElement', 'createPortal', 'useCallback', 'useEffect', + 'useLayoutEffect', 'useRef', 'useState' + ] + const values = [ + jsxRuntime.Fragment, jsxRuntime.jsx, jsxRuntime.jsxs, react.cloneElement, + reactDom.createPortal, react.useCallback, react.useEffect, react.useLayoutEffect, + react.useRef, react.useState + ] + const factory = new Function( + ...names, + 'Tooltip_module_css_default', + `${source.slice(start, end)}; return Tooltip;` + ) + return factory(...values, { bubble: 'tooltip-bubble' }) +} + +const previousGlobals = { + document: globalThis.document, + HTMLElement: globalThis.HTMLElement, + window: globalThis.window +} + +afterEach(() => { + ;(globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT?: boolean }) + .IS_REACT_ACT_ENVIRONMENT = false + Object.assign(globalThis, previousGlobals) +}) + +describe('Sherlock tooltip positioning', () => { + it('ships the fixed body portal in the bundled web shell used by the packaged app', async () => { + const assetsDirectory = 'node_modules/@deepseek-ai/dsh-web-frontend/dist/assets' + const entry = (await readdir(assetsDirectory)).find((name) => + /^index-.*\.js$/.test(name) + ) + expect(entry).toBeTypeOf('string') + if (entry === undefined) return + + const bundledShell = await readFile(`${assetsDirectory}/${entry}`, 'utf8') + expect(bundledShell).toContain( + 'ln.createPortal(f.jsx("span",{ref:_,className:xf.bubble' + ) + expect(bundledShell).toContain( + 'style:{position:"fixed",left:C.x,top:E' + ) + expect(bundledShell).toContain('}),document.body)') + }) + + it('portals the tooltip to document.body so transformed sidebars cannot offset it', async () => { + ;(globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT?: boolean }) + .IS_REACT_ACT_ENVIRONMENT = true + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + Object.assign(globalThis, { + document: browserWindow.document, + HTMLElement: browserWindow.HTMLElement, + window: browserWindow + }) + const Tooltip = await loadTooltip() + const transformedSidebar = browserWindow.document.createElement('div') + transformedSidebar.style.transform = 'translateX(24px)' + browserWindow.document.body.appendChild(transformedSidebar) + const root = createRoot(transformedSidebar) + + try { + await act(async () => { + root.render(createElement(Tooltip, { + label: '复制', + side: 'bottom' + }, createElement('button', { type: 'button' }, 'copy'))) + }) + const button = transformedSidebar.querySelector('button') + Object.defineProperty(button, 'getBoundingClientRect', { + configurable: true, + value: () => ({ + x: 100, + y: 100, + left: 100, + top: 100, + right: 180, + bottom: 128, + width: 80, + height: 28, + toJSON: () => ({}) + }) + }) + await act(async () => { + ;(button as HTMLElement | null)?.focus() + }) + + const tooltip = browserWindow.document.querySelector('[role="tooltip"]') + expect(tooltip).not.toBeNull() + expect(tooltip?.parentElement).toBe(browserWindow.document.body) + expect((tooltip as HTMLElement | null)?.style.position).toBe('fixed') + expect((tooltip as HTMLElement | null)?.style.left).toBe('152px') + expect((tooltip as HTMLElement | null)?.style.top).toBe('136px') + } finally { + await act(async () => { root.unmount() }) + } + }) +}) diff --git a/test/sidebar-new-session-actions.test.ts b/test/sidebar-new-session-actions.test.ts new file mode 100644 index 000000000..9c590c720 --- /dev/null +++ b/test/sidebar-new-session-actions.test.ts @@ -0,0 +1,399 @@ +import { readFile } from 'node:fs/promises' +import { createRequire } from 'node:module' +import { runInNewContext } from 'node:vm' +import { Window } from 'happy-dom' +import { afterEach, describe, expect, it, vi } from 'vitest' + +type ClientBundle = Record +type BundleDescriptor = { + factory(require: (id: string) => unknown): ClientBundle +} + +const requireModule = createRequire(import.meta.url) +const react = requireModule('react') as Record +const jsxRuntime = requireModule('react/jsx-runtime') as Record +const { createElement } = react as { + createElement: (type: unknown, props?: unknown, ...children: unknown[]) => unknown +} +const { act } = react as { + act: (callback: () => void | Promise) => Promise +} +const { createRoot } = requireModule('react-dom/client') as { + createRoot(container: unknown): { render(node: unknown): void; unmount(): void } +} + +const previousGlobals = { + document: globalThis.document, + HTMLElement: globalThis.HTMLElement, + window: globalThis.window +} + +function installBrowserGlobals(browserWindow: Window) { + Object.assign(globalThis, { + document: browserWindow.document, + HTMLElement: browserWindow.HTMLElement, + window: browserWindow, + IS_REACT_ACT_ENVIRONMENT: true + }) +} + +afterEach(() => { + Object.assign(globalThis, previousGlobals) + ;(globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT?: boolean }) + .IS_REACT_ACT_ENVIRONMENT = false +}) + +function fakeModule(): unknown { + let fake: unknown + const target = function () {} + fake = new Proxy(target, { + get: () => fake, + apply: () => fake, + construct: () => ({}) + }) + return fake +} + +async function loadClientBundle( + packageName: string, + browserWindow?: Window, + expose: string[] = [] +): Promise { + let source = await readFile(`node_modules/@deepseek-ai/${packageName}/lib/client.js`, 'utf8') + if (expose.length > 0) { + source = source.replace( + '\t\texports.apply = apply;', + `\t\texports.apply = apply;\n${expose.map((name) => `\t\texports.__test${name} = ${name};`).join('\n')}` + ) + } + let descriptor: BundleDescriptor | undefined + const bundleWindow = browserWindow ?? ({ sessionStorage: undefined } as unknown as Window) + Object.assign(bundleWindow, { + __ModuleLoader__: { + load(value: BundleDescriptor) { + descriptor = value + } + } + }) + runInNewContext(source, { + window: bundleWindow, + document: browserWindow?.document, + navigator: browserWindow?.navigator ?? { userAgent: '' }, + localStorage: browserWindow?.localStorage, + sessionStorage: browserWindow?.sessionStorage, + CustomEvent: browserWindow?.CustomEvent, + HTMLElement: browserWindow?.HTMLElement, + requestAnimationFrame: browserWindow?.requestAnimationFrame.bind(browserWindow), + cancelAnimationFrame: browserWindow?.cancelAnimationFrame.bind(browserWindow), + queueMicrotask, + setTimeout, + clearTimeout, + console + }) + if (descriptor === undefined) throw new Error(`${packageName} did not register its client bundle`) + + return descriptor.factory((id) => { + if (id === 'react') return react + if (id === 'react/jsx-runtime') return jsxRuntime + if (id === 'react-dom') return requireModule('react-dom') + if (id === '@deepseek-ai/dsh-client-ui-primitives') { + const Tooltip = ({ children }: { children: unknown }) => children + const IconNewChat = ({ className }: { className?: string }) => + createElement('span', { className, 'data-test-icon': 'chat' }) + const IconSearch = ({ className }: { className?: string }) => + createElement('span', { className, 'data-test-icon': 'search' }) + return new Proxy({ + Tooltip, + IconNewChatOutline16: IconNewChat, + IconSearchOutline16: IconSearch, + IconPanelLeftOutline16: IconNewChat + }, { get: (target, property) => Reflect.get(target, property) ?? fakeModule() }) + } + return fakeModule() + }) +} + +describe('Sherlock sidebar new-session actions', () => { + it('renders distinct New Chat and New Research buttons and routes each action separately', async () => { + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + installBrowserGlobals(browserWindow) + const client = await loadClientBundle('dsh-client-ui-sidebar', browserWindow, ['SidebarRoot']) + const SidebarRoot = client.__testSidebarRoot as (props: Record) => unknown + const host = browserWindow.document.createElement('div') + browserWindow.document.body.appendChild(host) + const root = createRoot(host) + const startSession = vi.fn() + const startResearchSession = vi.fn() + const labels: Record = { + 'session.new': '新对话', + 'session.new.label': '新建对话', + 'session.newResearch': '新研究', + 'session.newResearch.label': '新建研究' + } + + try { + await act(async () => { + root.render(createElement(SidebarRoot, { + collapsed: false, + width: 280, + startSession, + startResearchSession, + toggleSidebar: vi.fn(), + t: (key: string) => labels[key] ?? key, + renderSlot: () => null + })) + }) + + const chat = host.querySelector('button[aria-label="新建对话"]') as HTMLElement | null + const research = host.querySelector('button[aria-label="新建研究"]') as HTMLElement | null + expect(chat?.textContent).toContain('新对话') + expect(research?.textContent).toContain('新研究') + expect(chat?.querySelector('[data-test-icon="chat"]')).not.toBeNull() + expect(research?.querySelector('[data-sherlock-research-icon]')).not.toBeNull() + expect(research?.querySelector('[data-test-icon="search"]')).toBeNull() + + await act(async () => { chat?.click() }) + await act(async () => { research?.click() }) + expect(startSession).toHaveBeenCalledOnce() + expect(startResearchSession).toHaveBeenCalledOnce() + } finally { + await act(async () => { root.unmount() }) + } + }) + + it('requests Chat view before reopening a workspace blank session', async () => { + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + installBrowserGlobals(browserWindow) + const client = await loadClientBundle('dsh-client-ui-sidebar', browserWindow) + let registration: { + inject: () => { + startSession: (workspaceId?: string) => void + } + } | undefined + const startSession = vi.fn(( + _workspaceId?: string, + beforeOpen?: (sessionId: string) => void + ) => { + beforeOpen?.('session-reused-from-research') + }) + const requested: Array<{ sessionId?: string }> = [] + browserWindow.addEventListener('sherlock:conversation-initial-chat', (event) => { + requested.push((event as unknown as { detail: { sessionId?: string } }).detail) + }) + + ;(client.apply as (context: Record) => void)({ + effect: (run: () => unknown) => run(), + layout: { toggleSidebar: vi.fn() }, + locale: { register: vi.fn() }, + slots: { + register: (value: typeof registration) => { + registration = value + return vi.fn() + } + }, + workspaces: { startSession } + }) + + registration?.inject().startSession() + + expect(startSession).toHaveBeenCalledWith(undefined, expect.any(Function)) + expect(requested).toEqual([{ sessionId: 'session-reused-from-research' }]) + }) + + it('prepares a requested session before opening it', async () => { + const client = await loadClientBundle('dsh-client-runtime') + const WorkspaceRuntime = client.WorkspaceRuntime as new ( + context: Record, api: Record, sessions: Record + ) => { + list: { update(mutator: (draft: Record) => void): void } + connectWorkspace(workspaceId: string): Promise + startSession(workspaceId?: string, beforeOpen?: (sessionId: string) => void): void + } + const events: string[] = [] + const sessions = { + list: { + subscribe: () => () => {}, + getSnapshot: () => ({ current: undefined, ids: [], byId: {} }) + }, + open: (sessionId: string) => { events.push(`open:${sessionId}`) }, + clear: vi.fn(), + create: vi.fn() + } + const runtime = new WorkspaceRuntime({ + reflect: { provide: vi.fn() } + }, {}, sessions) + runtime.list.update((draft) => { + draft.items = [{ workspaceId: 'workspace-1', path: '/workspace', sessionIds: [] }] + draft.recentWorkspaceId = 'workspace-1' + }) + runtime.connectWorkspace = async () => 'session-new-research' + + runtime.startSession('workspace-1', (sessionId) => { + events.push(`prepare:${sessionId}`) + }) + await new Promise((resolve) => queueMicrotask(() => resolve())) + + expect(events).toEqual([ + 'prepare:session-new-research', + 'open:session-new-research' + ]) + }) + + it('renders the requested Research view on the new session first frame', async () => { + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + installBrowserGlobals(browserWindow) + browserWindow.sessionStorage.setItem( + 'sherlock.conversation.initial-research-session.v1', + 'session-new-research' + ) + const client = await loadClientBundle( + 'dsh-client-ui-conversation', browserWindow, + ['ConversationSessionHeader', 'ConversationSession'] + ) + const ConversationSessionHeader = client.__testConversationSessionHeader as ( + props: Record + ) => unknown + const ConversationSession = client.__testConversationSession as ( + props: Record + ) => unknown + const renderedViews: string[] = [] + const host = browserWindow.document.createElement('div') + browserWindow.document.body.appendChild(host) + const root = createRoot(host) + const state = { + view: null, + draft: '', + selection: null, + inspect: null, + researchRightTab: 'conversation', + researchFilesTabOpen: true, + researchConversationUnread: false + } + const useSession = (selector: (value: Record) => unknown) => selector({ + composerPhase: 'blank', blank: true + }) + const views = { + subscribe: () => () => {}, + version: () => 1, + list: () => [{ id: 'chat', label: '对话' }, { id: 'research', label: '研究' }] + } + const actions = { + setView: vi.fn(), setDraft: vi.fn(), setInspect: vi.fn() + } + const renderSlot = (_name: string, _props?: unknown, options?: { only: string }) => { + if (options?.only === undefined) return null + renderedViews.push(options.only) + return createElement('div', { 'data-rendered-view': options.only }) + } + + try { + await act(async () => { + root.render(createElement(react.Fragment as unknown as string, null, + createElement(ConversationSessionHeader, { + sessionId: 'session-new-research', + useSession, + useSessions: (selector: (value: Record) => unknown) => selector({ + byId: { + 'session-new-research': { + id: 'session-new-research', displayTitle: '新对话', origin: 'root' + } + } + }), + useStore: (selector: (value: typeof state) => unknown) => selector(state), + actions, + renderSlot, + views, + open: vi.fn(), + t: (key: string) => key + }), + createElement(ConversationSession, { + sessionId: 'session-new-research', + useSession, + useInput: (selector: (value: Record) => unknown) => selector({ draft: '' }), + inputActions: { setDraft: vi.fn() }, + useStore: (selector: (value: typeof state) => unknown) => selector(state), + actions, + views, + renderSlot, + bindDraftMirror: () => () => {}, + releaseSessionImages: vi.fn(), + releaseResearchWorkspace: vi.fn() + }) + )) + }) + + expect(renderedViews.at(-1)).toBe('research') + expect(host.querySelector('[data-rendered-view="research"]')).not.toBeNull() + expect(host.querySelector('[data-rendered-view="chat"]')).toBeNull() + expect(host.querySelector('header')?.getAttribute('aria-hidden')).toBeNull() + expect(host.querySelector('[data-conversation-view-id="research"]') + ?.getAttribute('aria-selected')).toBe('true') + } finally { + await act(async () => { root.unmount() }) + } + }) + + it('switches a reused blank Research session back to Chat on request', async () => { + const browserWindow = new Window({ url: 'https://sherlock.local/' }) + installBrowserGlobals(browserWindow) + const client = await loadClientBundle( + 'dsh-client-ui-conversation', browserWindow, + ['ConversationSession'] + ) + const ConversationSession = client.__testConversationSession as ( + props: Record + ) => unknown + const host = browserWindow.document.createElement('div') + browserWindow.document.body.appendChild(host) + const root = createRoot(host) + const actions = { + setView: vi.fn(), setDraft: vi.fn(), setInspect: vi.fn() + } + + try { + await act(async () => { + root.render(createElement(ConversationSession, { + sessionId: 'session-reused-from-research', + useSession: (selector: (value: Record) => unknown) => selector({ + composerPhase: 'blank', blank: true + }), + useInput: (selector: (value: Record) => unknown) => selector({ draft: '' }), + inputActions: { setDraft: vi.fn() }, + useStore: (selector: (value: Record) => unknown) => selector({ + view: 'research', + draft: '', + selection: null, + inspect: null, + researchRightTab: 'conversation', + researchFilesTabOpen: true, + researchConversationUnread: false + }), + actions, + views: { + subscribe: () => () => {}, + version: () => 1, + list: () => [{ id: 'chat', label: '对话' }, { id: 'research', label: '研究' }] + }, + renderSlot: (_name: string, _props?: unknown, options?: { only: string }) => + options?.only === undefined + ? null + : createElement('div', { 'data-rendered-view': options.only }), + bindDraftMirror: () => () => {}, + releaseSessionImages: vi.fn(), + releaseResearchWorkspace: vi.fn() + })) + }) + + await act(async () => { + browserWindow.dispatchEvent(new browserWindow.CustomEvent( + 'sherlock:conversation-initial-chat', + { detail: { sessionId: 'session-reused-from-research' } } + )) + }) + + expect(actions.setView).toHaveBeenCalledWith('chat') + } finally { + await act(async () => { root.unmount() }) + } + }) +}) diff --git a/test/sidebar-update-control.test.ts b/test/sidebar-update-control.test.ts new file mode 100644 index 000000000..969503e85 --- /dev/null +++ b/test/sidebar-update-control.test.ts @@ -0,0 +1,196 @@ +import { Window } from 'happy-dom' +import { describe, expect, it, vi } from 'vitest' +import { SidebarUpdateControl } from '../src/preload/sidebar-update-control' + +function fixture(): Document { + const window = new Window() + window.document.body.innerHTML = ` + ` + return window.document as unknown as Document +} + +function currentHarnessFixture(): Document { + const window = new Window() + window.document.body.innerHTML = ` + ` + return window.document as unknown as Document +} + +function actions() { + return { + download: vi.fn(), + install: vi.fn(), + retry: vi.fn() + } +} + +describe('Sherlock sidebar update control', () => { + it('mounts one hidden control at the end of the sidebar footer', () => { + const document = fixture() + const control = new SidebarUpdateControl(document, 'zh', actions()) + + expect(control.mount()).toBe(true) + expect(control.mount()).toBe(true) + + const footer = document.querySelector('[data-dsh-sidebar-footer]')! + const button = footer.lastElementChild as HTMLButtonElement + expect(button.id).toBe('sherlock-sidebar-update-button') + expect(button.hidden).toBe(true) + expect(document.querySelectorAll('#sherlock-sidebar-update-button')).toHaveLength(1) + expect(footer.firstElementChild?.id).toBe('settings') + }) + + it('mounts beside Settings in the current Harness sidebar structure', () => { + const document = currentHarnessFixture() + const control = new SidebarUpdateControl(document, 'zh', actions()) + + expect(control.mount()).toBe(true) + + const settingsArea = document.querySelector('.hHd-Xa_settingsArea')! + const button = settingsArea.lastElementChild as HTMLButtonElement + expect(settingsArea.hasAttribute('data-sherlock-update-footer')).toBe(true) + expect(button.id).toBe('sherlock-sidebar-update-button') + expect(settingsArea.querySelector('#settings')).not.toBeNull() + }) + + it('centers a compact update control on the Harness Settings row', () => { + const document = currentHarnessFixture() + const control = new SidebarUpdateControl(document, 'zh', actions()) + + control.mount() + + const styles = document.querySelector( + '#sherlock-sidebar-update-style' + )!.textContent + expect(styles).toMatch( + /#sherlock-sidebar-update-button\s*\{[^}]*width:\s*28px;[^}]*height:\s*28px;[^}]*position:\s*absolute;[^}]*right:\s*0;[^}]*top:\s*50%;[^}]*transform:\s*translateY\(-50%\);/s + ) + expect(styles).toMatch( + /#sherlock-sidebar-update-button\s*\{[^}]*border-radius:\s*8px;[^}]*box-shadow:\s*none;/s + ) + expect(styles).toMatch( + /#sherlock-sidebar-update-button\[data-action="download"\]:hover[^}]*width:\s*88px;/s + ) + }) + + it('shows the blue download action only for an available update', () => { + const document = fixture() + const callbacks = actions() + const control = new SidebarUpdateControl(document, 'zh', callbacks) + control.mount() + + control.render({ + phase: 'available', + currentVersion: '0.5.0', + availableVersion: '0.6.0', + manual: false + }) + + const button = document.querySelector( + '#sherlock-sidebar-update-button' + )! + expect(button.hidden).toBe(false) + expect(button.dataset.action).toBe('download') + expect(button.getAttribute('aria-label')).toBe('下载 Sherlock 0.6.0 更新') + expect(button.querySelector('.sherlock-sidebar-update-label')?.textContent).toBe('下载更新') + expect(button.innerHTML).toContain('M12 3v11') + button.click() + expect(callbacks.download).toHaveBeenCalledOnce() + }) + + it('renders determinate download progress on the same control', () => { + const document = fixture() + const control = new SidebarUpdateControl(document, 'zh', actions()) + control.mount() + + control.render({ + phase: 'downloading', + currentVersion: '0.5.0', + availableVersion: '0.6.0', + percent: 42.6, + manual: false + }) + + const button = document.querySelector( + '#sherlock-sidebar-update-button' + )! + expect(button.dataset.action).toBe('progress') + expect(button.getAttribute('role')).toBe('progressbar') + expect(button.getAttribute('aria-valuenow')).toBe('43') + expect(button.disabled).toBe(true) + expect(button.innerHTML).not.toContain('M12 3v11') + expect(button.querySelector('[data-update-progress-ring]')).not.toBeNull() + expect( + button.querySelector('.sherlock-update-ring-value')?.getAttribute('stroke-dashoffset') + ).toBe('57') + expect(button.style.getPropertyValue('--sherlock-update-progress')).toBe('43%') + + const styles = document.querySelector( + '#sherlock-sidebar-update-style' + )!.textContent + expect(styles).not.toContain('conic-gradient') + }) + + it('keeps the completed progress ring visible while automatic restart begins', () => { + const document = fixture() + const callbacks = actions() + const control = new SidebarUpdateControl(document, 'zh', callbacks) + control.mount() + + control.render({ + phase: 'downloaded', + currentVersion: '0.5.0', + availableVersion: '0.6.0', + manual: false + }) + + const button = document.querySelector( + '#sherlock-sidebar-update-button' + )! + expect(button.dataset.action).toBe('progress') + expect(button.disabled).toBe(true) + expect(button.getAttribute('aria-valuenow')).toBe('100') + expect( + button.querySelector('.sherlock-update-ring-value')?.getAttribute('stroke-dashoffset') + ).toBe('0') + button.click() + const panel = document.querySelector('#sherlock-sidebar-update-panel')! + expect(panel.hidden).toBe(true) + expect(callbacks.install).not.toHaveBeenCalled() + }) + + it('remounts after Harness replaces the sidebar footer', () => { + const document = fixture() + const control = new SidebarUpdateControl(document, 'zh', actions()) + control.mount() + control.render({ + phase: 'available', + currentVersion: '0.5.0', + availableVersion: '0.6.0', + manual: false + }) + + document.querySelector('[data-dsh-sidebar-root]')!.innerHTML = ` +
` + + expect(control.mount()).toBe(true) + const button = document.querySelector( + '#sherlock-sidebar-update-button' + )! + expect(button.hidden).toBe(false) + expect(button.dataset.action).toBe('download') + }) +}) diff --git a/test/sidebar-vibrancy.test.ts b/test/sidebar-vibrancy.test.ts new file mode 100644 index 000000000..cd28addd3 --- /dev/null +++ b/test/sidebar-vibrancy.test.ts @@ -0,0 +1,102 @@ +import { readFile } from 'node:fs/promises' +import path from 'node:path' +import { describe, expect, it } from 'vitest' + +const projectRoot = path.resolve(import.meta.dirname, '..') + +async function readProjectFile(relativePath: string): Promise { + return readFile(path.join(projectRoot, relativePath), 'utf8') +} + +describe('Sherlock macOS sidebar vibrancy', () => { + it('passes the first click through when the macOS window is inactive', async () => { + const main = await readProjectFile('src/main/index.ts') + + const macWindowOptions = main.match( + /\.\.\.\(isMacOS[\s\S]*?\? \{([\s\S]*?)\}\s*: \{/ + )?.[1] + + expect(macWindowOptions).toContain('acceptFirstMouse: true') + }) + + it('creates a native macOS sidebar material while preserving solid fallback windows', async () => { + const main = await readProjectFile('src/main/index.ts') + + expect(main).toContain("const isMacOS = process.platform === 'darwin'") + expect(main).toContain("vibrancy: 'menu' as const") + expect(main).toContain("visualEffectState: 'active' as const") + expect(main).toContain("backgroundColor: '#00000000'") + expect(main).toContain("window.setBackgroundColor('#00000000')") + expect(main).toContain("window.setVibrancy('menu')") + expect(main).not.toContain("nativeTheme.themeSource = isDark ? 'dark' : 'light'") + expect(main).toContain('startHarnessThemePreferenceSync()') + expect(main).toContain('nativeTheme.themeSource = preference') + expect(main).toContain( + "process.platform === 'win32' || process.platform === 'darwin'" + ) + expect(main).toContain("isDark ? '#141416' : '#ffffff'") + }) + + it('keeps macOS native material synchronized after live theme changes', async () => { + const preload = await readProjectFile('src/preload/index.ts') + const nativeThemeSync = await readProjectFile('src/preload/windows-titlebar.ts') + + expect(preload).toContain("process.platform === 'darwin'") + expect(preload).toContain('mountNativeThemeSync({ document, ipcRenderer })') + expect(nativeThemeSync).toContain('export function mountNativeThemeSync') + expect(nativeThemeSync).toContain( + "attributeFilter: ['data-ds-dark-theme']" + ) + expect(nativeThemeSync).toContain( + "window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change'" + ) + }) + + it('makes only the macOS sidebar window layer transparent', async () => { + const layoutClient = await readProjectFile( + 'node_modules/@deepseek-ai/dsh-client-ui-layout/lib/client.js' + ) + const layoutPatch = await readProjectFile( + 'patches/@deepseek-ai+dsh-client-ui-layout+0.1.0-rc.7.patch' + ) + + for (const source of [layoutClient, layoutPatch]) { + expect(source).toContain('navigator.userAgent.includes("Macintosh")') + expect(source).toContain('html,body,#root{background-color:transparent!important}') + expect(source).toContain('.pI_x6G_frame,.pI_x6G_sidebarCol{background:transparent}') + expect(source).toContain('.pI_x6G_sidebarCol{border-right:0}') + expect(source).toContain( + '.pI_x6G_centerCol,.pI_x6G_detailsCol{background:var(--dsw-alias-bg-base)}' + ) + } + }) + + it('uses a white translucent tint in light mode and a dark tint in dark mode', async () => { + const sidebarClient = await readProjectFile( + 'node_modules/@deepseek-ai/dsh-client-ui-sidebar/lib/client.js' + ) + const sidebarPatch = await readProjectFile( + 'patches/@deepseek-ai+dsh-client-ui-sidebar+0.1.0-rc.7.patch' + ) + + for (const source of [sidebarClient, sidebarPatch]) { + expect(source).toContain('background:var(--dsw-specific-sidebar-fill)') + expect(source).toContain( + '.hHd-Xa_root{background:rgba(255,255,255,.62)}body[data-ds-dark-theme] .hHd-Xa_root{background:rgba(18,18,20,.46)}' + ) + } + }) + + it('removes the session-list fade that becomes a visible bar over vibrancy', async () => { + const workspaceClient = await readProjectFile( + 'node_modules/@deepseek-ai/dsh-client-ui-workspace/lib/client.js' + ) + const workspacePatch = await readProjectFile( + 'patches/@deepseek-ai+dsh-client-ui-workspace+0.1.0-rc.7.patch' + ) + + for (const source of [workspaceClient, workspacePatch]) { + expect(source).toContain('.qDHVXG_fade{display:none}') + } + }) +}) diff --git a/test/standard-agent-preset.test.ts b/test/standard-agent-preset.test.ts new file mode 100644 index 000000000..0f833cb94 --- /dev/null +++ b/test/standard-agent-preset.test.ts @@ -0,0 +1,263 @@ +import { readFile, rm, mkdtemp } from 'node:fs/promises' +import { tmpdir } from 'node:os' +import path from 'node:path' +import { spawnSync } from 'node:child_process' +import { runInNewContext } from 'node:vm' +import { parse } from 'yaml' +import { describe, expect, it, vi } from 'vitest' +import { SessionId } from '@deepseek-ai/dsh-session' + +type SnapshotStore = { + getSnapshot(): T + set(value: T): void + subscribe(listener: () => void): () => void +} + +function createSnapshotStore(initial: T): SnapshotStore { + let value = initial + const listeners = new Set<() => void>() + return { + getSnapshot: () => value, + set(next) { + value = next + for (const listener of listeners) listener() + }, + subscribe(listener) { + listeners.add(listener) + return () => listeners.delete(listener) + } + } +} + +async function loadAgentPresetClient(): Promise> { + const source = await readFile( + 'node_modules/@deepseek-ai/dsh-client-ui-agent-preset/lib/client.js', + 'utf8' + ) + let descriptor: + | { factory(require: (id: string) => unknown): Record } + | undefined + runInNewContext(source, { + window: { + __ModuleLoader__: { + load(value: typeof descriptor) { + descriptor = value + } + } + } + }) + if (descriptor === undefined) throw new Error('Agent preset client bundle did not register') + return descriptor.factory((id) => + id === '@deepseek-ai/dsh-client-runtime/client' ? { createSnapshotStore } : {} + ) +} + +const roster = { + presets: [ + { + id: 'standard', + trust: 'system', + name: 'Standard mode', + description: 'Standard tools', + isDefault: false + }, + { id: 'code', trust: 'system', name: 'PTC mode', isDefault: false }, + { id: 'minimal', trust: 'system', name: 'Minimal mode', isDefault: false }, + { id: 'cordis', trust: 'system', name: 'Creator mode', isDefault: false }, + { id: 'liangshen', trust: 'user', name: '梁神模式', isDefault: true } + ], + authorable: true, + hasDocument: true +} + +describe('Sherlock standard agent preset policy', () => { + it('instructs the agent to provide concise user-facing progress during long work', async () => { + const source = await readFile( + 'node_modules/@deepseek-ai/dsh/config/sherlock-agent-presets/standard/agent.cordis.yml', + 'utf8' + ) + const entries = parse(source, { + customTags: [ + { + tag: 'tag:yaml.org,2002:js', + resolve: (value: string) => value + } + ] + }) as Array<{ id?: string; config?: { text?: string } }> + const persona = entries.find((entry) => entry.id === 'persona')?.config?.text ?? '' + + expect(persona).toContain('concise user-facing progress updates') + expect(persona).toContain('Do not reveal private reasoning') + expect(persona).toContain('final answer') + }) + + it('gives the single Standard-mode picker enough room and wraps its description', async () => { + const source = await readFile( + 'node_modules/@deepseek-ai/dsh-client-ui-agent-preset/lib/client.js', + 'utf8' + ) + + expect(source).toContain('.cubgiG_picker{min-width:420px}') + expect(source).toContain('.cubgiG_item{box-sizing:border-box;flex-direction:column;gap:1px;width:376px') + expect(source).toContain( + '.cubgiG_itemDesc{color:var(--dsw-alias-label-tertiary);white-space:normal;overflow-wrap:anywhere;font-size:12px;line-height:17px}' + ) + expect(source).toContain( + '[role=menu]:has(.cubgiG_item){width:420px!important;max-width:calc(100vw - 24px)}' + ) + expect(source).toContain('data-agent-preset-fallback') + expect(source).toContain('children: t("presetStandardName")') + }) + + it('falls back old session preset selections to standard mode', async () => { + const { resolveSessionPreset } = await import('@deepseek-ai/dsh-agent-presets') + + expect( + resolveSessionPreset({ + header: { + version: 0, + id: SessionId('session-old-custom-preset'), + createdAt: 1, + agentPreset: 'liangshen' + }, + events: [] + }) + ).toBe('standard') + expect( + resolveSessionPreset({ + header: { + version: 0, + id: SessionId('session-old-builtin-preset'), + createdAt: 1, + agentPreset: 'minimal' + }, + events: [ + { + type: 'agent-preset/selected', + seq: 0, + time: 2, + data: { agentPreset: 'cordis' } + } + ] + }) + ).toBe('standard') + }) + + it('composes only the shipped standard preset and excludes the user preset root', async () => { + const dshHome = await mkdtemp(path.join(tmpdir(), 'sherlock-preset-policy-')) + try { + const result = spawnSync( + process.execPath, + ['node_modules/@deepseek-ai/dsh/lib/bin.js', '--profile', 'web', '--dump-config'], + { + cwd: process.cwd(), + env: { ...process.env, DSH_HOME: dshHome }, + encoding: 'utf8' + } + ) + expect(result.status, result.stderr).toBe(0) + const entries = parse(result.stdout, { + customTags: [ + { + tag: 'tag:yaml.org,2002:js', + resolve: (value: string) => value + } + ] + }) as Array<{ + id?: string + config?: { + default?: string + includeUserRoot?: boolean + roots?: Array<{ path?: string; trust?: string }> + } + }> + const presets = entries.find((entry) => entry.id === 'agent-presets') + + expect(presets?.config).toMatchObject({ + default: 'standard', + includeUserRoot: false, + roots: [{ trust: 'system' }] + }) + const configuredRoots = presets?.config?.roots ?? [] + expect(path.basename(configuredRoots[0]?.path ?? '')).toBe('sherlock-agent-presets') + + const { discoverPresets } = await import('@deepseek-ai/dsh-agent-presets') + const discovered = await discoverPresets( + configuredRoots.map((root) => ({ + path: root.path ?? '', + trust: root.trust === 'system' ? 'system' : 'user' + })) + ) + expect(discovered.map((preset) => preset.id)).toEqual(['standard']) + } finally { + await rm(dshHome, { recursive: true, force: true }) + } + }) + + it('normalizes settings, composer, and management stores to standard mode', async () => { + const client = await loadAgentPresetClient() + expect(client.AgentPresetSettingsController).toBeTypeOf('function') + expect(client.AgentPresetSeatController).toBeTypeOf('function') + expect(client.AgentPresetSectionController).toBeTypeOf('function') + + if ( + typeof client.AgentPresetSettingsController !== 'function' || + typeof client.AgentPresetSeatController !== 'function' || + typeof client.AgentPresetSectionController !== 'function' + ) { + return + } + + const update = vi.fn(async () => ({ result: { ok: true, value: {} } })) + const list = vi.fn(async () => ({ result: { ok: true, value: roster } })) + const api = { + agentPresets: { list }, + settings: { + describe: vi.fn(async () => ({ result: { ok: true, value: { writable: true } } })), + update + } + } + + const SettingsController = client.AgentPresetSettingsController as new ( + api: unknown + ) => { load(): Promise; store: SnapshotStore> } + const settings = new SettingsController(api) + await settings.load() + expect(settings.store.getSnapshot()).toMatchObject({ + status: 'ready', + currentValue: 'standard', + options: [{ id: 'standard', trust: 'system' }] + }) + + const SeatController = client.AgentPresetSeatController as new ( + api: unknown, + currentSession: () => unknown + ) => { load(): Promise; store: SnapshotStore> } + const seat = new SeatController(api, () => ({ + id: 'blank-session', + blank: true, + agentPreset: 'liangshen' + })) + await seat.load() + expect(seat.store.getSnapshot()).toMatchObject({ + current: 'standard', + options: [{ id: 'standard', trust: 'system' }] + }) + + const SectionController = client.AgentPresetSectionController as new ( + api: unknown + ) => { load(): Promise; store: SnapshotStore> } + const section = new SectionController(api) + await section.load() + expect(section.store.getSnapshot()).toMatchObject({ + status: 'ready', + authorable: false, + hasDocument: false, + rows: [{ id: 'standard', trust: 'system', isDefault: true }] + }) + expect(update).toHaveBeenCalledWith({ + ns: 'agent-presets', + patch: { default: 'standard' } + }) + }) +}) diff --git a/test/subagent-report-queue.test.ts b/test/subagent-report-queue.test.ts new file mode 100644 index 000000000..558d6ddea --- /dev/null +++ b/test/subagent-report-queue.test.ts @@ -0,0 +1,169 @@ +import { readFile } from 'node:fs/promises' +import { createRequire } from 'node:module' +import { runInNewContext } from 'node:vm' +import { describe, expect, it } from 'vitest' + +type ClientBundle = Record + +type BundleDescriptor = { + factory(require: (id: string) => unknown): ClientBundle +} + +function fakeModule(): unknown { + let fake: unknown + const target = function () {} + fake = new Proxy(target, { + get: () => fake, + apply: () => fake, + construct: () => ({}) + }) + return fake +} + +async function loadClientBundle(packageName: string): Promise { + const source = await readFile( + `node_modules/@deepseek-ai/${packageName}/lib/client.js`, + 'utf8' + ) + const requireModule = createRequire(import.meta.url) + const react = requireModule('react') + const jsxRuntime = requireModule('react/jsx-runtime') + let descriptor: BundleDescriptor | undefined + + runInNewContext(source, { + window: { + __ModuleLoader__: { + load(value: BundleDescriptor) { + descriptor = value + } + } + } + }) + if (descriptor === undefined) throw new Error(`${packageName} did not register its client bundle`) + + return descriptor.factory((id) => { + if (id === 'react') return react + if (id === 'react/jsx-runtime') return jsxRuntime + return fakeModule() + }) +} + +describe('background subagent report queue', () => { + it('preserves message provenance in the client queue projection', async () => { + const client = await loadClientBundle('dsh-client-runtime') + expect(client.SessionQueueMirror).toBeTypeOf('function') + if (typeof client.SessionQueueMirror !== 'function') return + + const mirror = new (client.SessionQueueMirror as new () => { + replace(items: unknown[]): void + snapshot(): Array<{ anchorSeq?: number; source?: { kind?: string } }> + })() + mirror.replace([ + { + id: 'queue-1', + anchorSeq: 66, + placement: 'queued', + message: { + id: 'message-1', + content: [{ type: 'text', text: 'Background subagent child-1 reported:' }], + source: { + kind: 'subagent-report', + form: 'relay', + senderSessionId: 'child-1' + } + } + } + ]) + + expect(mirror.snapshot()[0]?.source).toEqual({ + kind: 'subagent-report', + form: 'relay', + senderSessionId: 'child-1' + }) + expect(mirror.snapshot()[0]?.anchorSeq).toBe(66) + }) + + it('anchors pending queue rows to the durable splice sequence', async () => { + const host = await import('@deepseek-ai/dsh-host-apiproxy') as unknown as Record + expect(host.rememberQueueAnchorSeqs).toBeTypeOf('function') + expect(host.projectQueueItems).toBeTypeOf('function') + if ( + typeof host.rememberQueueAnchorSeqs !== 'function' || + typeof host.projectQueueItems !== 'function' + ) return + + const anchors = new Map() + const message = { + id: 'steering-1', + source: { kind: 'user' }, + content: [{ type: 'text', text: '继续，但先回答这个问题' }] + } + const splice = { + target: 'next-step', + start: 0, + removedCount: 0, + inserted: [message] + } + + ;(host.rememberQueueAnchorSeqs as ( + anchors: Map, + event: { type: string; seq: number; data: typeof splice } + ) => void)(anchors, { + type: 'agent/inbox/spliced', + seq: 66, + data: splice + }) + + const items = (host.projectQueueItems as ( + agent: { inbox: { nextTurn: unknown[]; nextStep: unknown[] } }, + change: typeof splice, + anchors: ReadonlyMap + ) => Array<{ id: string; anchorSeq?: number; placement: string }>)( + { inbox: { nextTurn: [], nextStep: [] } }, + splice, + anchors + ) + + expect(items).toEqual([ + { + id: 'steering-1', + anchorSeq: 66, + placement: 'steering', + message + } + ]) + }) + + it('keeps internal subagent traffic out of the user-controlled queue', async () => { + const client = await loadClientBundle('dsh-client-ui-conversation') + expect(client.userQueuedMessages).toBeTypeOf('function') + if (typeof client.userQueuedMessages !== 'function') return + + const rows = [ + { + id: 'user-message', + placement: 'queued', + source: { kind: 'user' } + }, + { + id: 'subagent-report', + placement: 'queued', + source: { kind: 'subagent-report' } + }, + { + id: 'subagent-settled', + placement: 'queued', + source: { kind: 'subagent-settled' } + }, + { + id: 'steering-user-message', + placement: 'steering', + source: { kind: 'user' } + } + ] + + const visible = (client.userQueuedMessages as (items: typeof rows) => typeof rows)(rows) + + expect(visible.map(({ id }) => id)).toEqual(['user-message']) + }) +}) diff --git a/test/tool-path-search-recovery.test.ts b/test/tool-path-search-recovery.test.ts new file mode 100644 index 000000000..3063ed11f --- /dev/null +++ b/test/tool-path-search-recovery.test.ts @@ -0,0 +1,61 @@ +import { homedir } from 'node:os' +import path from 'node:path' +import { describe, expect, it } from 'vitest' +import { Context } from '@deepseek-ai/cordis' +import { LocalFileSystem } from '@deepseek-ai/dsh-fs-local' +import { runRipgrep } from '@deepseek-ai/dsh-tool-fs-search' + +describe('filesystem tool recovery', () => { + it('resolves a leading home shorthand outside the session workspace', async () => { + const filesystem = new LocalFileSystem(new Context(), { + cwd: '/tmp/sherlock-empty-workspace', + diffBasisMaxBytes: 1024 + }) + + const target = await filesystem.resolve('~/.agents/skills/example/SKILL.md') + + expect(target.displayPath).toBe( + path.join(homedir(), '.agents/skills/example/SKILL.md') + ) + }) + + it('treats an empty ripgrep search scope as a successful zero-match result', async () => { + const workdir = '/tmp/sherlock-empty-workspace' + const stream = (text: string) => ({ + readFrom: () => ({ text, lossy: false }) + }) + const ctx = { + subprocess: { + spawn: () => ({ + done: Promise.resolve({ exitCode: 2, signal: null }), + collected: { + stdout: stream(''), + stderr: stream( + 'rg: No files were searched, which means ripgrep probably applied a filter you did not expect.\n' + ) + } + }) + } + } + const exec = { + signal: new AbortController().signal, + agent: { session: { header: { cwd: workdir } } } + } + + await expect( + runRipgrep( + ctx as never, + exec as never, + 'grep', + ['--json', '--regexp=version'], + 20_000_000, + 3_000, + 64 * 1024 + ) + ).resolves.toEqual({ + stdout: '', + noMatches: true, + workdir + }) + }) +}) diff --git a/test/update-manager.test.ts b/test/update-manager.test.ts new file mode 100644 index 000000000..5c12ca809 --- /dev/null +++ b/test/update-manager.test.ts @@ -0,0 +1,129 @@ +import { afterEach, describe, expect, it, vi } from 'vitest' + +const fakes = vi.hoisted(() => { + class FakeAutoUpdater { + autoDownload = true + autoInstallOnAppQuit = true + allowPrerelease = true + logger: unknown + private listeners = new Map void>>() + + on(event: string, listener: (...args: unknown[]) => void): this { + this.listeners.set(event, [...(this.listeners.get(event) ?? []), listener]) + return this + } + + private emit(event: string, value: unknown): void { + for (const listener of this.listeners.get(event) ?? []) listener(value) + } + + async checkForUpdates(): Promise { + this.emit('update-available', { version: '0.6.0' }) + } + + async downloadUpdate(): Promise { + this.emit('download-progress', { percent: 44.4 }) + this.emit('update-downloaded', { version: '0.6.0' }) + return ['/tmp/sherlock-update.zip'] + } + + quitAndInstall(): void {} + } + + return { + autoUpdater: new FakeAutoUpdater(), + ipcHandle: vi.fn(), + ipcHandlers: new Map unknown>(), + powerOn: vi.fn(), + powerRemove: vi.fn() + } +}) + +vi.mock('electron', () => ({ + app: { + getVersion: () => '0.5.0', + isPackaged: true, + isReady: () => false + }, + BrowserWindow: { getAllWindows: () => [] }, + ipcMain: { + handle: (channel: string, handler: (event: unknown) => unknown) => { + fakes.ipcHandle(channel, handler) + fakes.ipcHandlers.set(channel, handler) + } + }, + powerMonitor: { on: fakes.powerOn, removeListener: fakes.powerRemove } +})) + +vi.mock('electron-updater', () => ({ + default: { autoUpdater: fakes.autoUpdater } +})) + +import { + checkForUpdates, + downloadAvailableUpdate, + getUpdateStatus, + registerUpdateHandlers, + startUpdateManager, + stopUpdateManager +} from '../src/main/update/update-manager' + +afterEach(() => stopUpdateManager()) + +describe('desktop update manager', () => { + it('rejects every update action from a child frame', async () => { + const webContents = { mainFrame: { processId: 7, routingId: 41 } } + const mainWindow = { + isDestroyed: () => false, + webContents + } + registerUpdateHandlers(() => mainWindow) + const childEvent = { + sender: webContents, + senderFrame: { processId: 7, routingId: 42 } + } + + for (const channel of [ + 'updates:status', + 'updates:check', + 'updates:download', + 'updates:install' + ]) { + const handler = fakes.ipcHandlers.get(channel) + expect(handler, channel).toBeTypeOf('function') + await expect(Promise.resolve().then(() => handler?.(childEvent))).rejects.toThrow( + 'main Sherlock window' + ) + } + }) + + it('exposes a dedicated manual update check to the trusted preload', () => { + expect(fakes.ipcHandle.mock.calls.map(([channel]) => channel)).toContain('updates:check') + }) + + it('discovers without downloading and downloads only after the explicit action', async () => { + const download = vi.spyOn(fakes.autoUpdater, 'downloadUpdate') + const quitAndInstall = vi.spyOn(fakes.autoUpdater, 'quitAndInstall') + const prepareToInstall = vi.fn(async () => {}) + startUpdateManager({ prepareToInstall }) + + await checkForUpdates() + expect(getUpdateStatus()).toMatchObject({ + phase: 'available', + availableVersion: '0.6.0' + }) + expect(fakes.autoUpdater.autoDownload).toBe(false) + expect(download).not.toHaveBeenCalled() + + await downloadAvailableUpdate() + expect(download).toHaveBeenCalledOnce() + expect(getUpdateStatus()).toMatchObject({ + phase: 'downloaded', + availableVersion: '0.6.0' + }) + await vi.waitFor(() => { + expect(prepareToInstall).toHaveBeenCalledOnce() + expect(quitAndInstall).toHaveBeenCalledWith(false, true) + }) + }) +}) diff --git a/test/update-ui.test.ts b/test/update-ui.test.ts index 10bb588d6..e3b552646 100644 --- a/test/update-ui.test.ts +++ b/test/update-ui.test.ts @@ -15,15 +15,15 @@ const downloading: UpdateStatus = { manual: false } -describe('desktop update card visibility', () => { - it('shows automatic downloads but keeps automatic background checks quiet', () => { +describe('desktop update control visibility', () => { + it('shows update actions but keeps checks quiet until an update exists', () => { expect(shouldShowUpdate(downloading)).toBe(true) expect( shouldShowUpdate({ phase: 'checking', currentVersion: '1.0.0', manual: false }) ).toBe(false) expect( shouldShowUpdate({ phase: 'checking', currentVersion: '1.0.0', manual: true }) - ).toBe(true) + ).toBe(false) }) it('keeps a dismissed version hidden while its download phase changes', () => { @@ -39,20 +39,25 @@ describe('desktop update card visibility', () => { }) }) -describe('secure update card wiring', () => { +describe('secure sidebar update wiring', () => { it('bundles a preload and mounts it without enabling Node in Harness', async () => { - const [config, main, preload] = await Promise.all([ + const [config, main, preload, sidebarControl] = await Promise.all([ readFile('electron.vite.config.ts', 'utf8'), readFile('src/main/index.ts', 'utf8'), - readFile('src/preload/index.ts', 'utf8') + readFile('src/preload/index.ts', 'utf8'), + readFile('src/preload/sidebar-update-control.ts', 'utf8') ]) expect(config).toContain('preload:') expect(main).toContain("preload: join(import.meta.dirname, '../preload/index.cjs')") expect(main).toContain('nodeIntegration: false') expect(preload).toContain("ipcRenderer.on('updates:status-changed'") + expect(preload).toContain("ipcRenderer.invoke('updates:download')") expect(preload).toContain("ipcRenderer.invoke('updates:install')") - expect(preload).toContain("'right:20px'") - expect(preload).toContain("'bottom:20px'") + expect(preload).toContain('new SidebarUpdateControl(document, locale') + expect(sidebarControl).toContain("'[data-dsh-sidebar-footer]'") + expect(sidebarControl).toContain('width: 28px') + expect(sidebarControl).toContain('width: 88px') + expect(sidebarControl).toContain('background: #1677ff') }) }) diff --git a/test/update.test.ts b/test/update.test.ts index d0a38b8ae..ff01ebbe5 100644 --- a/test/update.test.ts +++ b/test/update.test.ts @@ -10,6 +10,11 @@ import { supportsAutoUpdates, UPDATE_CHECK_INTERVAL_MS } from '../src/main/update/update-policy' +import { + initialUpdateStatus, + reduceUpdateStatus +} from '../src/main/update/update-state' +import { updateAction } from '../src/preload/update-view' const execFile = promisify(execFileCallback) const projectRoot = path.resolve(import.meta.dirname, '..') @@ -34,6 +39,45 @@ describe('desktop update policy', () => { }) }) +describe('sidebar update action', () => { + it('offers download after discovery and holds the progress ring at completion', () => { + const idle = initialUpdateStatus('0.5.0') + const available = reduceUpdateStatus(idle, { + type: 'available', + version: '0.6.0' + }) + const downloading = reduceUpdateStatus(available, { + type: 'progress', + percent: 42.6 + }) + const downloaded = reduceUpdateStatus(downloading, { + type: 'downloaded', + version: '0.6.0' + }) + + expect(updateAction(idle)).toEqual({ kind: 'hidden' }) + expect(updateAction(available)).toEqual({ kind: 'download', version: '0.6.0' }) + expect(updateAction(downloading)).toEqual({ kind: 'progress', percent: 42.6 }) + expect(updateAction(downloaded)).toEqual({ kind: 'progress', percent: 100 }) + }) + + it('keeps automatic failures hidden and makes manual failures retryable', () => { + const idle = initialUpdateStatus('0.5.0') + const automatic = reduceUpdateStatus(idle, { + type: 'error', + message: 'offline' + }) + const checking = reduceUpdateStatus(idle, { type: 'check', manual: true }) + const manual = reduceUpdateStatus(checking, { + type: 'error', + message: 'offline' + }) + + expect(updateAction(automatic)).toEqual({ kind: 'hidden' }) + expect(updateAction(manual)).toEqual({ kind: 'retry', message: 'offline' }) + }) +}) + describe('macOS update metadata', () => { it('merges both architectures and keeps only ZIP update payloads', async () => { const root = await mkdtemp(path.join(tmpdir(), 'dsh-update-metadata-')) @@ -65,10 +109,10 @@ describe('macOS update metadata', () => { } expect(merged.version).toBe('0.2.0') expect(merged.files.map((file) => file.url)).toEqual([ - 'dsh-desktop-mac-arm64.zip', - 'dsh-desktop-mac-x64.zip' + 'sherlock-mac-arm64.zip', + 'sherlock-mac-x64.zip' ]) - expect(merged.path).toBe('dsh-desktop-mac-arm64.zip') + expect(merged.path).toBe('sherlock-mac-arm64.zip') expect(merged.releaseDate).toBe('2026-08-14T02:00:00.000Z') }) }) @@ -78,12 +122,12 @@ function metadata(architecture: 'arm64' | 'x64', releaseDate: string) { version: '0.2.0', files: [ { - url: `dsh-desktop-mac-${architecture}.zip`, + url: `sherlock-mac-${architecture}.zip`, sha512: `zip-${architecture}`, size: 100 }, { - url: `dsh-desktop-mac-${architecture}.dmg`, + url: `sherlock-mac-${architecture}.dmg`, sha512: `dmg-${architecture}`, size: 200 } diff --git a/test/web-search-settings-ui.test.ts b/test/web-search-settings-ui.test.ts new file mode 100644 index 000000000..65d8953d5 --- /dev/null +++ b/test/web-search-settings-ui.test.ts @@ -0,0 +1,178 @@ +import { readFile } from 'node:fs/promises' +import { createRequire } from 'node:module' +import { runInNewContext } from 'node:vm' +import { describe, expect, it } from 'vitest' + +const requireModule = createRequire(import.meta.url) +const { renderToStaticMarkup } = requireModule('react-dom/server') as { + renderToStaticMarkup(node: unknown): string +} + +type BundleDescriptor = { + factory(require: (id: string) => unknown): { apply(ctx: unknown): void } +} + +type SlotRegistration = { + options: { key?: string } + component: (props: Record) => { + props: { children: unknown } + } +} + +function fakeComponentModule(): unknown { + let fake: unknown + const component = () => null + fake = new Proxy( + { ChevronDown: component }, + { + get(target, property) { + return Reflect.get(target, property) ?? component + } + } + ) + return fake +} + +function snapshotStore(initial: T) { + let value = initial + return { + getSnapshot: () => value, + subscribe: () => () => undefined, + set: (next: T) => { + value = next + } + } +} + +async function settingsPluginBundle() { + const source = await readFile( + 'node_modules/@deepseek-ai/dsh-client-ui-settings-plugins/lib/client.js', + 'utf8' + ) + let descriptor: BundleDescriptor | undefined + runInNewContext(source, { + window: { + __ModuleLoader__: { + load(value: BundleDescriptor) { + descriptor = value + } + } + }, + document: undefined + }) + if (!descriptor) throw new Error('settings plugin did not register') + const react = requireModule('react') + const jsxRuntime = requireModule('react/jsx-runtime') + return descriptor.factory((id) => { + if (id === 'react') return react + if (id === 'react/jsx-runtime') return jsxRuntime + if (id === '@deepseek-ai/dsh-client-runtime/client') { + return { createSnapshotStore: snapshotStore } + } + if (id === '@deepseek-ai/dsh-client-ui-slots') { + return { resolveSlotLabel: (label: unknown) => label } + } + if (id === '@deepseek-ai/dsh-client-ui-primitives') return fakeComponentModule() + return fakeComponentModule() + }) +} + +describe('web search settings card', () => { + it('renders the automatic, native-only, and off choices for the new search namespace', async () => { + const registrations: SlotRegistration[] = [] + const dictionaries: Record> = {} + const scope = { + getSnapshot: () => ({ + status: 'ready', + writable: true, + value: { mode: 'auto' }, + base: { mode: 'auto' }, + user: undefined + }), + subscribe: () => () => undefined, + set: async () => undefined, + unset: async () => undefined + } + const slots = { + entries: () => [], + getVersion: () => 0, + subscribe: () => () => undefined, + register: (options: SlotRegistration['options'], component: SlotRegistration['component']) => { + if (options.key) registrations.push({ options, component }) + return undefined + }, + inject: (_name: string, install: () => unknown) => { + const result = install() + if (result && typeof (result as Iterable)[Symbol.iterator] === 'function') { + Array.from(result as Iterable) + } + } + } + const api = { + settings: { + describe: async () => ({ + result: { + ok: true, + value: { namespaces: [{ ns: 'web-search-session-model' }] } + } + }) + }, + credentials: { + describe: async () => ({ + result: { ok: true, value: { credentials: {} } } + }) + } + } + const bundle = await settingsPluginBundle() + bundle.apply({ + get: (name: string) => (name === 'connection' ? { api } : undefined), + effect: (install: () => unknown) => { + install() + }, + on: () => () => undefined, + remote: { $on: () => () => undefined }, + settingsScope: { bind: () => scope }, + slots, + locale: { + bind: () => (key: string) => dictionaries.zh?.[key] ?? key, + register: (_namespace: string, values: Record>) => { + Object.assign(dictionaries, values) + return () => undefined + }, + getSnapshot: () => ({ revision: 0 }), + subscribe: () => () => undefined + } + }) + + const registration = registrations.find( + ({ options }) => options.key === 'web-search-session-model' + ) + expect(registration).toBeDefined() + if (!registration) return + + const card = registration.component({ + t: (key: string) => dictionaries.zh?.[key] ?? key, + useWebSearchCard: (select: (value: unknown) => unknown) => + select({ + available: true, + writable: true, + dirty: false, + invalid: false, + saving: false, + failed: false, + mode: { text: 'auto', overridden: false, invalid: false } + }), + edit: () => undefined, + resetField: () => undefined, + save: () => undefined, + discard: () => undefined + }) + const html = renderToStaticMarkup(card.props.children) + + expect(html).toContain('id="plugin-config-web-search-mode"') + expect(html).toContain('value="auto" selected="">自动（推荐）') + expect(html).toContain('value="native-only">仅模型原生') + expect(html).toContain('value="off">关闭') + expect(html).not.toContain('API Key') + }) +}) diff --git a/test/windows-titlebar.test.ts b/test/windows-titlebar.test.ts index 811dbe890..a05746aeb 100644 --- a/test/windows-titlebar.test.ts +++ b/test/windows-titlebar.test.ts @@ -43,14 +43,15 @@ describe('Windows titlebar menu', () => { it('accepts only the fixed menu command allowlist', async () => { const main = await readFile('src/main/index.ts', 'utf8') - expect(desktopMenuCommands).toContain('connect-phone') + expect(desktopMenuCommands).not.toContain('connect-phone') expect(desktopMenuCommands).toContain('check-for-updates') expect(desktopMenuCommands).toContain('toggle-fullscreen') expect(isDesktopMenuCommand('copy')).toBe(true) + expect(isDesktopMenuCommand('connect-phone')).toBe(false) expect(isDesktopMenuCommand('run-shell-command')).toBe(false) expect(isDesktopMenuCommand({ command: 'quit' })).toBe(false) expect(main).toContain("ipcMain.handle('desktop-menu:execute'") - expect(main).toContain('event.senderFrame !== mainWindow.webContents.mainFrame') + expect(main).toContain('assertTrustedMainWindowEvent(event, mainWindow)') expect(main).toContain('if (!isDesktopMenuCommand(command))') }) @@ -60,7 +61,7 @@ describe('Windows titlebar menu', () => { expect(main).toContain('window.setTitleBarOverlay(windowsTitleBarOverlay(isDark))') expect(main).toContain("ipcMain.handle('desktop-titlebar:set-theme'") - expect(preload).toContain("attributeFilter: ['data-ds-dark-theme', 'class', 'style']") + expect(preload).toContain("attributeFilter: ['data-ds-dark-theme']") expect(preload).toContain("ipcRenderer.invoke('desktop-titlebar:set-theme', isDark)") }) }) diff --git a/vitest.config.ts b/vitest.config.ts new file mode 100644 index 000000000..7c68a0b57 --- /dev/null +++ b/vitest.config.ts @@ -0,0 +1,7 @@ +import { configDefaults, defineConfig } from 'vitest/config' + +export default defineConfig({ + test: { + exclude: [...configDefaults.exclude, '**/.worktrees/**'] + } +})