From b20b138fe485817e8d69d0c60e376e3c53af149a Mon Sep 17 00:00:00 2001 From: Oleg Maslov Date: Wed, 2 Sep 2026 10:14:22 +0200 Subject: [PATCH] moving --- .env.example | 1 + .gitattributes | 5 + .github/sync.md | 19 +- .github/workflows/ci.yml | 5 +- .../hive-mind-cli-cross-platform.yml | 9 +- .github/workflows/mind-parity-check.yml | 15 +- .github/workflows/release.yml | 2533 +++++- .github/workflows/sync-mind.yml | 19 +- .github/workflows/tauri-build-pr.yml | 200 +- .gitignore | 25 +- AGENTS.md | 136 +- CLAUDE.md | 164 +- README.md | 75 +- THREAT_MODEL.md | 28 +- app/package-lock.json | 14 +- app/package.json | 11 +- app/scripts/apply-signing-config.mjs | 39 +- app/scripts/new-windows-signing-handoff.ps1 | 1059 +++ app/scripts/sign-macos-adhoc.sh | 7 +- app/scripts/sign-windows-artifact.ps1 | 4704 +++++++++++ app/scripts/sign-windows-artifact.test.ps1 | 2772 +++++++ app/scripts/sign-windows-pilot.ps1 | 5 +- app/scripts/signing-config.test.ts | 169 + app/scripts/signing-config.ts | 114 +- app/scripts/signing-guidance.test.ts | 45 + app/src-tauri/Cargo.lock | 1 + app/src-tauri/Cargo.toml | 8 + app/src-tauri/nsis/installer.nsi | 80 +- app/src-tauri/src/commands/agent.rs | 2 +- app/src-tauri/src/commands/memory.rs | 11 +- app/src-tauri/src/commands/wiki.rs | 8 +- app/src-tauri/src/lib.rs | 66 +- app/src-tauri/src/service.rs | 1748 +++- app/src-tauri/src/tray.rs | 10 +- app/src-tauri/tauri.conf.json | 8 +- app/tests/auto-update.test.ts | 5 +- apps/browser-ext/README.md | 97 +- apps/browser-ext/background.js | 133 +- apps/browser-ext/popup.html | 22 + apps/browser-ext/popup.js | 27 + apps/web/package.json | 2 +- apps/web/src/app-entry.tsx | 23 + apps/web/src/boot-connect.test.ts | 210 + apps/web/src/boot-connect.ts | 148 +- apps/web/src/components/os/ChatHost.tsx | 1 + .../src/components/os/ModelPilotCard.test.tsx | 2 + apps/web/src/components/os/ModelPilotCard.tsx | 8 +- apps/web/src/components/os/apps/ChatApp.tsx | 145 +- .../ChatWindowInstance.model-refresh.test.tsx | 92 +- .../components/os/apps/ChatWindowInstance.tsx | 81 +- .../src/components/os/apps/ConnectorsApp.tsx | 26 +- .../components/os/apps/LauncherApp.test.tsx | 112 +- .../src/components/os/apps/LauncherApp.tsx | 38 +- .../src/components/os/apps/SettingsApp.tsx | 2 + .../src/components/os/apps/UserProfileApp.tsx | 36 +- .../components/os/apps/agents/GroupDetail.tsx | 2 +- .../os/apps/chat-blocks/BlockRenderer.tsx | 45 +- .../chat-blocks/CapabilityRequestCard.tsx | 218 +- .../os/apps/chat-blocks/TextBlock.tsx | 52 +- .../chat-blocks/capability-request-parser.ts | 52 + .../os/apps/connectors/ConnectorCard.tsx | 29 +- .../os/model-gate/ModelGate.test.tsx | 116 +- .../components/os/model-gate/ModelGate.tsx | 214 +- .../os/overlays/CreateWorkspaceDialog.tsx | 4 +- .../os/overlays/SpawnAgentDialog.test.tsx | 14 + .../os/overlays/SpawnAgentDialog.tsx | 3 - .../BrowserCompanionSettings.test.tsx | 86 + .../os/settings/BrowserCompanionSettings.tsx | 157 + apps/web/src/components/ui/scroll-area.tsx | 7 +- apps/web/src/hooks/useChat.ts | 776 +- apps/web/src/hooks/useHasWorkingModel.test.ts | 229 +- apps/web/src/hooks/useHasWorkingModel.ts | 135 +- apps/web/src/hooks/useWorkspaces.ts | 29 +- apps/web/src/index.css | 2 - apps/web/src/lib/adapter.authgate.test.ts | 503 ++ .../lib/adapter.model-router-timeout.test.ts | 37 + apps/web/src/lib/adapter.ts | 506 +- apps/web/src/lib/fetch-utils.ts | 34 +- apps/web/src/lib/launcher-prompt-args.test.ts | 11 +- apps/web/src/lib/launcher-prompt-args.ts | 16 +- apps/web/src/lib/render-markdown.test.ts | 59 + apps/web/src/lib/render-markdown.ts | 58 +- apps/web/src/lib/tauri-bindings.test.ts | 112 + apps/web/src/lib/tauri-bindings.ts | 101 +- apps/web/src/lib/types.ts | 16 +- apps/web/src/main.test.ts | 113 + apps/web/src/main.tsx | 52 +- apps/web/src/providers/InstallProvider.tsx | 31 +- .../src/test/build-warning-hygiene.test.ts | 19 +- apps/web/src/test/lane-c-input-power.test.tsx | 960 +++ .../lane-s2-streaming-interaction.test.tsx | 997 ++- apps/web/src/test/launcher-a11y.test.tsx | 5 + .../src/test/p1b-authgate-surfaces.test.tsx | 45 + .../src/test/phase4b-connector-hub.test.tsx | 227 +- .../src/test/pr4-inline-capability.test.tsx | 408 +- apps/web/src/test/pr4-install-store.test.tsx | 50 + .../web/src/test/pr5-settings-reskin.test.tsx | 12 + .../src/test/wave-u-chat-action-row.test.tsx | 20 + apps/www/__tests__/middleware.test.ts | 4 +- apps/www/app/_components/DownloadCTA.tsx | 18 +- apps/www/app/_components/Navbar.tsx | 5 +- apps/www/app/_components/Pricing.tsx | 18 +- apps/www/app/_components/Reveal.tsx | 4 +- apps/www/app/_lib/event-taxonomy.ts | 1 - apps/www/app/docs/methodology/page.tsx | 9 +- apps/www/app/layout.tsx | 1 - apps/www/eslint.config.mjs | 12 + apps/www/next-env.d.ts | 3 +- apps/www/package.json | 11 +- apps/www/proxy.ts | 25 + apps/www/tsconfig.json | 5 +- benchmarks/data/beam/beam-1M.meta.json | 51 + .../JUDGE-DELTA-search-N160-2026-05-22.md | 62 + .../gaia2/PHASE-4-P4.2-PROGRESS-2026-05-21.md | 201 + .../PHASE-4-P4.5-RESULTS-N160-2026-05-22.md | 80 + .../gaia2/PILLAR1-QWEN-LOCAL-RUNBOOK.md | 221 + .../PILLAR1-QWEN36-N160-RESULT-2026-05-27.md | 122 + .../PILLAR1-WAGGLE-FULL-VS-BARE-2026-05-27.md | 169 + ...PILLAR1-WAGGLE-VS-HERMES-N40-2026-05-22.md | 49 + benchmarks/gaia2/README.md | 65 + .../WAGGLE-HARNESS-PROBE-N10-2026-05-22.md | 45 + .../gaia2/WINDOWS-DOCKER-RUNNER-PATCHES.md | 100 + benchmarks/gaia2/adapter.ts | 656 ++ benchmarks/gaia2/config.yaml | 70 + benchmarks/gaia2/data/.gitkeep | 0 benchmarks/gaia2/dry-run-results-memo.md | 212 + benchmarks/gaia2/rejudge_user_message.py | 180 + benchmarks/gaia2/runs/.gitkeep | 0 benchmarks/gaia2/scripts/dump-tasks.py | 85 + .../gaia2/scripts/run-dry-verification.ts | 319 + benchmarks/gaia2/smoke-evidence.md | 152 + .../gaia2/spike-waggle-worker/README.md | 13 + .../spike-waggle-worker/import-proof.mjs | 16 + .../gaia2/spike-waggle-worker/package.json | 1 + benchmarks/gaia2/waggle-container/BUILD.md | 72 + benchmarks/gaia2/waggle-container/Dockerfile | 76 + .../gaia2/waggle-container/entrypoint.sh | 37 + .../gaia2/waggle-container/stub-core/index.js | 7 + .../waggle-container/stub-core/package.json | 1 + .../gaia2/waggle-container/waggle_worker.mjs | 199 + benchmarks/harness/E6-LOCKED-CONFIG.md | 33 + .../results/beam/E2-sonnet-pilot-report.md | 95 + benchmarks/harness/scripts/_belief-smoke.ts | 60 + benchmarks/harness/scripts/_e4-aggregate.mjs | 69 + benchmarks/harness/scripts/_judge-diag.ts | 30 + benchmarks/harness/scripts/_or-judge-probe.ts | 24 + benchmarks/harness/scripts/_rejudge-or.ts | 123 + benchmarks/harness/scripts/_rejudge-probe.ts | 17 + benchmarks/harness/scripts/_wait-gpt5.ts | 17 + .../scripts/beam-build-ledger-state.ts | 146 + .../harness/scripts/beam-build-ledger.ts | 298 + .../harness/scripts/beam-compose-matched50.ts | 114 + benchmarks/harness/scripts/beam-e2-analyze.ts | 207 + benchmarks/harness/scripts/beam-e2-cells.ts | 393 + benchmarks/harness/scripts/beam-rejudge.ts | 99 + benchmarks/harness/scripts/beam-run-belief.ts | 422 + .../harness/scripts/beam-run-ledger-e7L1.ts | 373 + .../harness/scripts/beam-run-ledger-e8.ts | 456 ++ .../harness/scripts/beam-run-ledger-e8a2.ts | 423 + .../harness/scripts/beam-run-ledger-e8d.ts | 423 + .../harness/scripts/beam-run-ledger-e8f.ts | 429 + .../harness/scripts/beam-run-ledger-e8g.ts | 422 + .../harness/scripts/beam-run-ledger-e8h.ts | 422 + .../harness/scripts/beam-run-ledger-e8h2.ts | 422 + .../harness/scripts/beam-run-ledger-e8i.ts | 429 + .../harness/scripts/beam-run-ledger-e8j.ts | 424 + .../harness/scripts/beam-run-ledger-e8k.ts | 423 + .../harness/scripts/beam-run-ledger-e8l.ts | 422 + .../harness/scripts/beam-run-ledger-e8l2.ts | 426 + benchmarks/harness/scripts/beam-run-ledger.ts | 330 + .../harness/scripts/beam-run-multiroute.ts | 521 ++ benchmarks/harness/scripts/e1-aggregate.ts | 137 + benchmarks/harness/scripts/e1-judge-eywa.ts | 143 + benchmarks/harness/scripts/e7-gate140.txt | 140 + benchmarks/harness/scripts/e7-gate42.txt | 42 + benchmarks/harness/scripts/e8-heldout140.txt | 140 + benchmarks/harness/scripts/e8-probeA.txt | 28 + benchmarks/harness/scripts/e8-probeB.txt | 2 + benchmarks/harness/scripts/e8-probeC.txt | 14 + benchmarks/harness/scripts/e8-probeD.txt | 14 + benchmarks/harness/scripts/e8-probeF.txt | 12 + benchmarks/harness/scripts/e8-probeG.txt | 14 + benchmarks/harness/scripts/e8-probeJ.txt | 70 + benchmarks/harness/scripts/e8-probeK.txt | 70 + benchmarks/harness/scripts/e8-probeL.txt | 70 + benchmarks/harness/scripts/e8-probeL2.txt | 14 + benchmarks/harness/scripts/matched50.txt | 50 + benchmarks/harness/src/beam-multiroute.ts | 281 + benchmarks/harness/src/beam-nugget-judge.ts | 81 +- benchmarks/harness/src/beam-openai-client.ts | 86 +- docker-compose.production.yml | 21 + docs/GETTING-STARTED.md | 35 +- docs/PM-SYNC-PRE-DAY0-2026-05-05.md | 11 + .../2026-07-08-ux-post-phase-1-roadmap.md | 6 + ...26-05-05-claude-md-amendment-invariants.md | 13 +- .../2026-05-05-day-0-minus-1-runbook.md | 14 +- docs/code-signing-pilot-and-launch.md | 37 +- ...026-05-12-apps-www-deployment-readiness.md | 2 +- docs/paper/2026-07-10-audit-response-plan.md | 149 + .../paper/2026-07-11-codex-consult-prompt.txt | 34 + .../paper/2026-07-11-fable-codex-consensus.md | 74 + docs/paper/2026-07-11-protocol-freeze.md | 99 + .../E-4-OSS-EXTRACTION-VERIFIED-2026-05-20.md | 49 +- .../L-17-placeholder-audit-2026-04-19.md | 14 +- docs/plans/monorepo-migration-progress.md | 19 +- .../production-readiness/01A-FEATURE_WAVES.md | 5 + .../01B-DEPLOYMENT_PHASES.md | 5 + docs/production-readiness/02-UX_AUDIT.md | 5 + .../production-readiness/03A-AGENT_QUALITY.md | 5 + .../03B-SERVER_QUALITY.md | 5 + docs/production-readiness/03C-UI_QUALITY.md | 5 + docs/production-readiness/04A-APP_SECURITY.md | 5 + docs/production-readiness/04B-SECRETS_DEPS.md | 5 + docs/production-readiness/05-TEST_REPORT.md | 5 + docs/production-readiness/06-BUILD_REPORT.md | 5 + .../production-readiness/07-ISSUE_REGISTER.md | 5 + .../08-CONFIDENCE_MATRIX.md | 5 + .../09-LAUNCH_RECOMMENDATION.md | 206 +- .../10-SECURITY_REVIEW_2026-08-11.md | 73 + .../11-HIVE-MIND-PARITY-AUDIT-2026-08-13.md | 115 + .../2026-07-03-release-audit.md | 6 + .../2026-07-03-release-signoff.md | 6 + docs/production-readiness/2026-07-16-audit.md | 85 + docs/production-readiness/AUDIT_COMPLETE.md | 5 + eslint.config.js | 4 + package-lock.json | 1971 +++-- package.json | 40 +- packages/agent/package.json | 13 +- packages/agent/src/agent-loop.ts | 624 +- packages/agent/src/agent-run-budget.ts | 163 + packages/agent/src/behavioral-spec.ts | 124 +- packages/agent/src/capability-acquisition.ts | 41 +- packages/agent/src/cli-tools.ts | 171 +- packages/agent/src/confirmation.ts | 113 +- packages/agent/src/connector-registry.ts | 109 +- .../agent/src/connectors/gcal-connector.ts | 31 +- .../agent/src/connectors/jira-connector.ts | 56 +- .../agent/src/connectors/linear-connector.ts | 29 +- .../agent/src/connectors/monday-connector.ts | 52 +- .../src/connectors/obsidian-connector.ts | 44 +- .../src/connectors/salesforce-connector.ts | 178 +- packages/agent/src/context-compressor.ts | 94 +- packages/agent/src/cost-tracker.ts | 431 +- packages/agent/src/custom-personas.ts | 24 + packages/agent/src/document-tools.ts | 6 +- packages/agent/src/evolution-deploy.ts | 35 +- packages/agent/src/external-process-env.ts | 70 + packages/agent/src/external-tool-runner.ts | 220 +- packages/agent/src/git-tools.ts | 159 +- packages/agent/src/grounding-check.ts | 1229 ++- packages/agent/src/hooks.ts | 10 +- packages/agent/src/index.ts | 36 +- packages/agent/src/loop-gates.ts | 61 +- packages/agent/src/lsp-tools.ts | 97 +- packages/agent/src/mcp/mcp-runtime.ts | 178 +- packages/agent/src/mcp/mcp-tool-retrieval.ts | Bin 8840 -> 11230 bytes packages/agent/src/orchestrator.ts | 64 +- packages/agent/src/pattern-write-back.ts | 36 +- packages/agent/src/pdf-tools.ts | 32 +- packages/agent/src/persona-data.ts | 122 +- packages/agent/src/personas.ts | 2 +- packages/agent/src/presentation-tools.ts | 15 +- packages/agent/src/prompt-assembler.ts | 86 +- packages/agent/src/providers/openai-compat.ts | 144 +- packages/agent/src/quantitative-number.ts | 274 + packages/agent/src/sidecar-owned-process.ts | 153 + packages/agent/src/skill-audit-store.ts | 26 +- packages/agent/src/skill-requirements.ts | 36 +- packages/agent/src/smart-router.ts | 58 +- packages/agent/src/spreadsheet-tools.ts | 6 +- packages/agent/src/sse-parser.ts | 59 +- packages/agent/src/subagent-orchestrator.ts | 271 +- packages/agent/src/subagent-tools.ts | 86 +- packages/agent/src/system-tools-helpers.ts | 829 +- packages/agent/src/system-tools.ts | 266 +- packages/agent/src/task-shape.ts | 1 + packages/agent/src/tool-command.ts | 116 +- packages/agent/src/tool-detection.ts | 450 +- packages/agent/src/tool-executor.ts | 107 +- packages/agent/src/tool-filter.ts | 501 ++ packages/agent/src/tool-launcher.ts | 81 +- packages/agent/src/tool-process-tracker.ts | 57 +- packages/agent/src/tools.ts | 6 + packages/agent/src/trace-recorder.ts | 2 + packages/agent/src/url-egress-guard.ts | 293 +- packages/agent/src/verification-gate.ts | 192 +- packages/agent/src/workflow-composer.ts | 14 +- packages/agent/src/workflow-tools.ts | 29 +- .../agent/tests/agent-loop-budget.test.ts | 1475 ++++ packages/agent/tests/agent-loop.test.ts | 118 +- .../tests/behavioral-spec-overrides.test.ts | 11 + .../tests/capability-acquisition.test.ts | 1 + .../tests/capability-marketplace.test.ts | 27 + packages/agent/tests/cli-tools.test.ts | 327 +- .../agent/tests/compaction-persist.test.ts | 54 + packages/agent/tests/confirmation.test.ts | 76 +- packages/agent/tests/connector-sdk.test.ts | 83 +- .../connectors/connectors-crm-data.test.ts | 141 +- .../connectors/connectors-knowledge.test.ts | 75 + .../tests/connectors/connectors-pm.test.ts | 224 + .../agent/tests/context-compressor.test.ts | 196 +- packages/agent/tests/cost-tracker.test.ts | 236 +- .../e2e/connector-swarm-scenarios.test.ts | 6 + packages/agent/tests/evolution-deploy.test.ts | 71 +- .../agent/tests/external-tool-runner.test.ts | 361 +- packages/agent/tests/git-tools.test.ts | 220 +- .../tests/governance-enforcement.test.ts | 4 + packages/agent/tests/grounding-check.test.ts | 1125 +++ .../agent/tests/hook-packages-runtime.test.ts | 392 +- .../agent/tests/integration-local.test.ts | 4 + packages/agent/tests/lsp-tools.test.ts | 113 +- packages/agent/tests/mcp-runtime.test.ts | 357 +- .../agent/tests/mcp-tool-retrieval.test.ts | 121 + packages/agent/tests/openai-compat.test.ts | 161 +- .../orchestrator-recall-hardening.test.ts | 166 + packages/agent/tests/pdf-tools.test.ts | 32 + .../tests/performance/perf-baselines.test.ts | 24 +- .../persona-instruction-fidelity.test.ts | 122 + packages/agent/tests/personas.test.ts | 8 + .../agent/tests/phase4-hooks-cohort.test.ts | 32 +- .../agent/tests/premium-contract-e2e.test.ts | 46 +- .../agent/tests/presentation-tools.test.ts | 41 + .../prompt-assembler-feature-flag.test.ts | 23 + packages/agent/tests/prompt-assembler.test.ts | 165 +- packages/agent/tests/shell-env.test.ts | 26 +- .../agent/tests/sidecar-owned-process.test.ts | 136 + .../agent/tests/skill-audit-store.test.ts | 67 +- packages/agent/tests/skill-audit.test.ts | 9 +- packages/agent/tests/skill-diffusion.test.ts | 4 + .../agent/tests/skill-requirements.test.ts | 16 + packages/agent/tests/skill-retirement.test.ts | 14 +- .../agent/tests/skill-write-service.test.ts | 7 +- packages/agent/tests/smart-router.test.ts | 140 +- packages/agent/tests/sse-parser.test.ts | 84 +- packages/agent/tests/streaming.test.ts | 15 +- .../agent/tests/subagent-orchestrator.test.ts | 526 +- .../tests/subagent-tools-security.test.ts | 133 +- packages/agent/tests/subagent-tools.test.ts | 60 +- packages/agent/tests/system-tools.test.ts | 818 +- packages/agent/tests/task-shape.test.ts | 19 + packages/agent/tests/tool-detection.test.ts | 577 +- .../tool-executor-critical-floor.test.ts | 229 +- .../tool-executor-untrusted-wrap.test.ts | 141 + packages/agent/tests/tool-filter.test.ts | 735 +- packages/agent/tests/tool-launcher.test.ts | 194 +- .../agent/tests/tool-process-tracker.test.ts | 105 +- packages/agent/tests/url-egress-guard.test.ts | 397 +- .../tests/verification-gate-loop.test.ts | 147 +- .../agent/tests/verification-gate.test.ts | 137 + .../agent/tests/w42-reranker-recall.test.ts | 52 +- .../agent/tests/workflow-composer.test.ts | 15 + .../agent/tests/workflow-templates.test.ts | 15 +- packages/cli/src/repl.ts | 4 +- packages/cli/tests/cli-runtime.test.ts | 72 +- packages/core/src/config.ts | 12 +- packages/core/src/file-indexer.ts | 20 +- packages/core/src/index.ts | 9 +- packages/core/src/install-audit.ts | 7 +- packages/core/src/team-sync.ts | 10 +- packages/core/src/vault.ts | 192 +- packages/core/tests/config.test.ts | 69 + packages/core/tests/cron-store.test.ts | 7 +- .../tests/embedding-provider-quota.test.ts | 7 +- packages/core/tests/file-indexer.test.ts | 72 +- .../tests/install-audit-check-parity.test.ts | 7 +- packages/core/tests/team-sync.test.ts | 26 +- packages/core/tests/vault-acl-probe.ts | 57 + packages/core/tests/vault.test.ts | 244 +- .../src/commands/cognify.test.ts | 167 + .../hive-mind-cli/src/commands/cognify.ts | 145 +- .../src/commands/harvest-local.test.ts | 245 +- .../src/commands/harvest-local.ts | 82 +- .../hive-mind-cli/src/commands/hook-call.ts | 195 + .../src/commands/maintenance.test.ts | 98 +- .../hive-mind-cli/src/commands/maintenance.ts | 27 +- packages/hive-mind-cli/src/dispatch.test.ts | 21 + packages/hive-mind-cli/src/dispatch.ts | 11 +- packages/hive-mind-cli/src/index.ts | 6 +- packages/hive-mind-cli/tests/cli-help.test.ts | 6 +- .../hive-mind-cli/tests/hook-call.test.ts | 285 + packages/hive-mind-core/CONTRIBUTING.md | 149 +- packages/hive-mind-core/README.md | 20 +- packages/hive-mind-core/package.json | 8 +- .../src/harvest/extract-kg-entities.ts | 103 +- .../hive-mind-core/src/harvest/pipeline.ts | 39 +- .../hive-mind-core/src/harvest/raw-turns.ts | 39 +- .../src/harvest/url-egress-guard.ts | 280 +- packages/hive-mind-core/src/hook-runtime.ts | 258 + packages/hive-mind-core/src/index.ts | 13 +- .../src/memory-ingress-guard.ts | 751 ++ .../src/mind/execution-traces.ts | 250 +- packages/hive-mind-core/src/mind/frames.ts | 29 + .../src/mind/inprocess-embedder.ts | 20 +- .../src/mind/inprocess-reranker.ts | 32 +- packages/hive-mind-core/src/mind/knowledge.ts | 26 +- .../src/mind/raw-detail-lane.ts | 2 +- packages/hive-mind-core/src/mind/search.ts | 185 +- packages/hive-mind-core/src/mind/supersede.ts | 400 +- .../src/mind/transformers-model-load.ts | 258 + .../hive-mind-core/src/multi-mind-cache.ts | 45 +- .../hive-mind-core/src/workspace-manager.ts | 173 +- .../tests/harvest/extract-kg-entities.test.ts | 119 +- .../tests/harvest/pipeline-injection.test.ts | 233 +- .../tests/harvest/raw-turns.test.ts | 59 +- .../tests/harvest/set-hash.test.ts | 7 + .../tests/harvest/url-egress-guard.test.ts | 350 +- .../hive-mind-core/tests/hook-runtime.test.ts | 422 + .../tests/memory-ingress-guard.test.ts | 678 ++ .../tests/mind/execution-traces.test.ts | 157 + .../tests/mind/frames-hive-mind.test.ts | 58 +- .../tests/mind/inprocess-reranker.test.ts | 83 + .../tests/mind/search-chunks.test.ts | 52 + .../hive-mind-core/tests/mind/search.test.ts | 162 +- .../tests/mind/supersede.test.ts | 547 +- .../mind/transformers-model-load.test.ts | 537 ++ .../tests/multi-mind-cache-eviction.test.ts | 23 + .../tests/workspace-manager.test.ts | 251 + .../src/bin/claude-code-hooks-cli.ts | 12 +- .../src/hooks/_shared.ts | 16 +- .../src/hooks/pre-compact.ts | 13 +- .../src/hooks/session-start.ts | 17 +- .../src/hooks/stop.ts | 15 +- .../src/hooks/user-prompt-submit.ts | 13 +- .../src/install.ts | 117 +- .../src/settings-merger.ts | 74 +- .../src/uninstall.ts | 48 +- .../hive-mind-hooks-claude-code/src/verify.ts | 45 +- .../tests/hooks/shared.test.ts | 21 + .../tests/hooks/stop.test.ts | 29 +- .../tests/install.test.ts | 34 +- .../tests/settings-merger.test.ts | 53 + .../tests/uninstall.test.ts | 34 +- .../tests/verify.test.ts | 64 +- .../src/paths.ts | 21 +- packages/hive-mind-hooks-codex/src/adapter.ts | 11 +- .../src/hooks/pre-compact.ts | 12 +- .../src/hooks/session-start.ts | 12 +- .../hive-mind-hooks-codex/src/hooks/stop.ts | 12 +- .../src/hooks/user-prompt-submit.ts | 12 +- packages/hive-mind-hooks-codex/src/install.ts | 9 +- packages/hive-mind-hooks-codex/src/paths.ts | 86 +- .../tests/hooks/session-start.test.ts | 16 +- .../tests/install.test.ts | 19 +- .../hive-mind-hooks-codex/tests/paths.test.ts | 184 +- .../tests/register.test.ts | 4 +- .../hive-mind-hooks-core/src/handlers-core.ts | 6 +- .../hive-mind-hooks-core/src/hook-shared.ts | 21 +- packages/hive-mind-hooks-core/src/index.ts | 3 + .../tests/handlers-core.test.ts | 34 + .../tests/hook-shared.test.ts | 22 + packages/hive-mind-hooks-cursor/README.md | 5 + .../src/hooks/pre-compact.ts | 12 +- .../src/hooks/session-start.ts | 12 +- .../hive-mind-hooks-cursor/src/hooks/stop.ts | 12 +- .../src/hooks/user-prompt-submit.ts | 12 +- .../src/hooks/session-start.ts | 12 +- .../hive-mind-hooks-hermes/src/hooks/stop.ts | 12 +- .../src/hooks/user-prompt-submit.ts | 12 +- packages/hive-mind-hooks-hermes/src/paths.ts | 53 +- .../tests/paths.test.ts | 59 +- packages/hive-mind-hooks-openclaw/README.md | 5 + .../src/bin/openclaw-hooks.ts | 13 +- .../hive-mind-hooks-openclaw/src/handler.ts | 135 +- .../hive-mind-hooks-openclaw/src/install.ts | 103 +- .../hive-mind-hooks-openclaw/src/verify.ts | 417 +- .../tests/handler.test.ts | 94 + .../tests/install.test.ts | 20 +- .../tests/verify.test.ts | 490 +- packages/hive-mind-mcp-server/package.json | 4 + .../hive-mind-mcp-server/src/core/setup.ts | 3 +- .../src/integration.test.ts | 127 +- .../src/tools/awareness.ts | 12 +- .../hive-mind-mcp-server/src/tools/cleanup.ts | 123 +- .../hive-mind-mcp-server/src/tools/harvest.ts | 127 +- .../src/tools/identity.ts | 19 + .../hive-mind-mcp-server/src/tools/ingest.ts | 267 +- .../hive-mind-mcp-server/src/tools/memory.ts | 27 +- .../tests/runtime.test.ts | 69 +- .../hive-mind-shim-core/src/cli-bridge.ts | 74 +- packages/hive-mind-shim-core/src/index.ts | 2 + .../hive-mind-shim-core/src/main-module.ts | 19 + .../tests/cli-bridge.test.ts | 113 +- .../tests/main-module.test.ts | 17 + packages/hive-mind-wiki-compiler/package.json | 4 +- packages/launcher/package.json | 5 +- packages/launcher/tests/cli.test.ts | 294 +- packages/launcher/tsup.config.ts | 5 +- packages/marketplace/package.json | 6 +- packages/marketplace/src/index.ts | 3 + packages/marketplace/src/install-security.ts | 564 ++ packages/marketplace/src/installer.ts | 499 +- packages/marketplace/src/mcp-registry.ts | 755 +- packages/marketplace/src/security.ts | 10 +- packages/marketplace/src/types.ts | 47 + .../tests/installer-security.test.ts | 1132 +++ .../marketplace/tests/mcp-registry.test.ts | 268 +- .../marketplace/tests/multi-source.test.ts | 21 + packages/memory-mcp/src/core/setup.ts | 3 +- packages/memory-mcp/src/tools/awareness.ts | 12 +- packages/memory-mcp/src/tools/cleanup.ts | 123 +- packages/memory-mcp/src/tools/harvest.ts | 127 +- packages/memory-mcp/src/tools/identity.ts | 19 + packages/memory-mcp/src/tools/ingest.ts | 267 +- packages/memory-mcp/src/tools/memory.ts | 27 +- packages/memory-mcp/tests/runtime.test.ts | 77 +- packages/memory-mcp/tests/scope.test.ts | 129 +- packages/sdk/package.json | 3 + packages/sdk/src/plugin-runtime.ts | 13 + packages/sdk/tests/plugin-manager.test.ts | 7 +- packages/server/package.json | 5 +- packages/server/src/daemons/scout.ts | 14 +- packages/server/src/index.ts | 21 +- .../server/src/local/agent-run-registry.ts | 44 +- packages/server/src/local/approval-grants.ts | 48 +- .../src/local/browser-companion-pairing.ts | 103 + .../server/src/local/channels/chat-client.ts | 6 + .../server/src/local/chat-collaboration.ts | 639 +- packages/server/src/local/cron.ts | 24 +- .../server/src/local/executor-registry.ts | 9 +- .../server/src/local/fleet-run-executor.ts | 122 +- packages/server/src/local/hardware-detect.ts | 6 +- .../src/local/harvest-autosync-frame.ts | 27 +- .../server/src/local/held-action-executor.ts | 16 +- packages/server/src/local/index.ts | 696 +- packages/server/src/local/lifecycle.ts | 207 +- .../src/local/litellm-runtime-config.ts | 23 +- .../src/local/managed-ollama-runtime.ts | 1746 ++++ .../src/local/marketplace-background-sync.ts | 2 +- packages/server/src/local/mcp-config.ts | 277 +- packages/server/src/local/memory-lane-cron.ts | 42 +- .../server/src/local/model-availability.ts | 149 +- .../server/src/local/model-spend-meter.ts | 153 + .../server/src/local/monthly-assessment.ts | 36 +- packages/server/src/local/offline-manager.ts | 99 +- .../server/src/local/persona-tool-filter.ts | 16 +- packages/server/src/local/provider-env.ts | 29 +- .../src/local/provider-model-catalog.ts | 7 +- .../server/src/local/routes/agent-groups.ts | 295 +- packages/server/src/local/routes/agent-run.ts | 62 +- packages/server/src/local/routes/agent.ts | 79 +- .../src/local/routes/anthropic-proxy.ts | 1209 ++- packages/server/src/local/routes/approval.ts | 17 +- packages/server/src/local/routes/artifacts.ts | 16 +- packages/server/src/local/routes/backup.ts | 183 +- .../server/src/local/routes/browser-ext.ts | 118 +- .../src/local/routes/capability-proposals.ts | 270 + .../server/src/local/routes/chat-context.ts | 32 +- .../src/local/routes/chat-governance.ts | 3 +- .../server/src/local/routes/chat-helpers.ts | 1309 ++- .../src/local/routes/chat-persistence.ts | 451 +- .../src/local/routes/chat-prompt-packaging.ts | 208 + packages/server/src/local/routes/chat.ts | 2502 ++++-- .../server/src/local/routes/connectors.ts | 64 +- packages/server/src/local/routes/cost.ts | 26 +- packages/server/src/local/routes/events.ts | 6 +- .../src/local/routes/external-tool-runs.ts | 873 +- packages/server/src/local/routes/files.ts | 6 + packages/server/src/local/routes/harvest.ts | 143 +- packages/server/src/local/routes/import.ts | 29 +- packages/server/src/local/routes/ingest.ts | 247 +- .../src/local/routes/local-inference.ts | 303 +- .../server/src/local/routes/marketplace.ts | 135 +- packages/server/src/local/routes/mcps.ts | 191 +- .../server/src/local/routes/memory-center.ts | 86 +- packages/server/src/local/routes/memory.ts | 152 +- packages/server/src/local/routes/personas.ts | 30 +- packages/server/src/local/routes/sessions.ts | 74 +- packages/server/src/local/routes/settings.ts | 30 +- packages/server/src/local/routes/team.ts | 63 +- packages/server/src/local/routes/tools.ts | 291 +- .../server/src/local/routes/waggle-dance.ts | 47 +- .../src/local/routes/workspace-context.ts | 8 +- .../server/src/local/routes/workspaces.ts | 225 +- .../server/src/local/security-middleware.ts | 474 +- packages/server/src/local/service.ts | 218 +- .../services/vector-enrichment-service.ts | 191 + .../server/src/local/storage/fs-provider.ts | 108 +- packages/server/src/local/storage/index.ts | 2 +- packages/server/src/local/storage/security.ts | 82 +- .../server/src/local/team-server-binding.ts | 14 + .../server/src/local/team-server-egress.ts | 34 + .../src/local/utils/office-archive-guard.ts | 590 ++ packages/server/src/local/vector-backfill.ts | 469 +- packages/server/src/local/workspace-state.ts | 7 +- .../src/local/workspace-turn-coordinator.ts | 384 + packages/server/src/routes/agents.ts | 35 +- .../src/routes/capability-governance.ts | 12 +- packages/server/src/routes/cron.ts | 2 +- packages/server/src/routes/jobs.ts | 33 +- packages/server/src/routes/knowledge.ts | 6 + packages/server/src/routes/resources.ts | 4 +- packages/server/src/routes/scout.ts | 4 +- packages/server/src/routes/suggestions.ts | 6 +- packages/server/src/routes/teams.ts | 15 +- packages/server/src/routes/webhooks.ts | 10 +- packages/server/src/scheduler/cron-runner.ts | 89 +- packages/server/src/services/agent-service.ts | 31 +- packages/server/src/services/cron-service.ts | 14 +- packages/server/src/services/job-service.ts | 29 +- .../server/src/services/knowledge-service.ts | 30 +- .../server/src/services/proactive-service.ts | 11 +- .../server/src/services/resource-service.ts | 24 +- .../services/team-capability-governance.ts | 20 +- packages/server/src/services/team-service.ts | 8 + packages/server/src/stripe/webhook.ts | 19 +- packages/server/src/ws/gateway.ts | 13 + packages/server/tests/auth.test.ts | 84 +- packages/server/tests/backup-restore.test.ts | 324 + packages/server/tests/chat-api.test.ts | 1881 ++++- packages/server/tests/cron.test.ts | 370 +- packages/server/tests/daemons/scout.test.ts | 43 +- packages/server/tests/data-export.test.ts | 6 +- packages/server/tests/deployment.test.ts | 8 + packages/server/tests/entrypoint.test.ts | 49 + .../server/tests/evolution-run-route.test.ts | 6 +- packages/server/tests/hardware-detect.test.ts | 22 + packages/server/tests/ingest-api.test.ts | 574 +- packages/server/tests/litellm-api.test.ts | 311 +- packages/server/tests/local-mode.test.ts | 834 +- .../server/tests/local/agent-groups.test.ts | 1299 ++- .../tests/local/agent-run-registry.test.ts | 150 + packages/server/tests/local/agent-run.test.ts | 69 +- packages/server/tests/local/agents.test.ts | 112 + .../tests/local/ambiguity-detection.test.ts | 30 + .../tests/local/anthropic-proxy.test.ts | 2581 +++++- .../server/tests/local/approval-held.test.ts | 309 +- packages/server/tests/local/artifacts.test.ts | 66 +- .../server/tests/local/automations.test.ts | 459 +- .../tests/local/browser-ext-auth.test.ts | 350 +- .../browser-ext-pairing-lifecycle.test.ts | 162 + .../tests/local/capability-proposals.test.ts | 220 + .../tests/local/chat-approval-timeout.test.ts | 16 +- .../tests/local/chat-collaboration.test.ts | 975 ++- .../tests/local/chat-governance.test.ts | 97 +- .../server/tests/local/chat-helpers.test.ts | 1437 +++- .../tests/local/chat-prompt-packaging.test.ts | 666 ++ .../connector-registry-integration.test.ts | 9 +- .../tests/local/connectors-phase4.test.ts | 394 +- packages/server/tests/local/cost.test.ts | 47 + .../server/tests/local/cron-ai-task.test.ts | 182 +- .../local/cron-scheduler-hardening.test.ts | 54 + .../tests/local/executor-registry.test.ts | 14 +- .../tests/local/external-tool-roadmap.test.ts | 60 + .../tests/local/external-tool-runs.test.ts | 1276 ++- .../server/tests/local/files-indexer.test.ts | 24 + packages/server/tests/local/files.test.ts | 394 +- .../tests/local/fleet-isolation.test.ts | 603 +- .../local/harvest-autosync-frame.test.ts | 98 +- .../server/tests/local/harvest-cache.test.ts | 92 +- .../local/harvest-ingress-security.test.ts | 208 + .../tests/local/held-action-executor.test.ts | 23 +- packages/server/tests/local/import.test.ts | 108 + packages/server/tests/local/lifecycle.test.ts | 178 + .../local/litellm-runtime-config.test.ts | 24 + .../tests/local/local-inference-route.test.ts | 793 +- .../local/managed-ollama-runtime.test.ts | 2374 ++++++ .../local/marketplace-background-sync.test.ts | 17 + .../tests/local/marketplace-sources.test.ts | 14 +- .../server/tests/local/mcp-config.test.ts | 257 +- packages/server/tests/local/mcps.test.ts | 505 +- .../server/tests/local/memory-center.test.ts | 229 +- .../tests/local/memory-lane-cron.test.ts | 45 + .../tests/local/model-spend-meter.test.ts | 146 + .../tests/local/monthly-assessment.test.ts | 94 +- .../persona-acceptance-prompt-budget.test.ts | 1704 ++++ .../tests/local/personas-routes.test.ts | 191 +- .../local/phase2-traversal-backup.test.ts | 110 +- .../tests/local/phase2-traversal-chat.test.ts | 9 +- .../local/phase2-traversal-tasks.test.ts | 7 +- .../tests/local/security-middleware.test.ts | 635 +- .../server/tests/local/sse-resilience.test.ts | 1257 ++- .../tests/local/team-integration.test.ts | 359 +- .../tests/local/vector-backfill.test.ts | 357 +- .../local/vector-enrichment-service.test.ts | 160 + .../local/workspace-turn-coordinator.test.ts | 270 + .../tests/local/workspaces-lifecycle.test.ts | 34 + packages/server/tests/offline-mode.test.ts | 503 +- .../server/tests/persona-tool-filter.test.ts | 427 +- packages/server/tests/plugin-autoload.test.ts | 14 +- packages/server/tests/proactive.test.ts | 26 +- packages/server/tests/routes/agents.test.ts | 278 +- .../routes/capability-governance.test.ts | 192 +- packages/server/tests/routes/health.test.ts | 22 +- .../server/tests/routes/knowledge.test.ts | 77 +- .../server/tests/routes/resources.test.ts | 39 +- packages/server/tests/routes/teams.test.ts | 16 + packages/server/tests/routes/webhooks.test.ts | 173 + .../tests/routes/workspace-context.test.ts | 4 +- .../tests/routes/workspace-state.test.ts | 6 +- packages/server/tests/service.test.ts | 283 +- .../server/tests/skill-integration.test.ts | 12 + .../server/tests/smart-router-chat.test.ts | 1374 ++++ packages/server/tests/start-trial.test.ts | 145 +- packages/server/tests/stripe/webhook.test.ts | 26 + packages/server/tests/tauri-config.test.ts | 7061 ++++++++++++++++- packages/server/tests/team-local.test.ts | 191 +- .../server/tests/tools-routes-launch.test.ts | 675 +- .../server/tests/waggle-dance-routes.test.ts | 79 +- packages/server/tests/workspace-api.test.ts | 293 +- .../workspace-sessions-concurrency.test.ts | 317 +- packages/server/tests/ws/gateway.test.ts | 63 +- packages/shared/src/schemas.ts | 4 +- packages/shared/src/tool-detection.ts | 56 +- packages/shared/tests/tool-manifests.test.ts | 55 +- packages/waggle-dance/package.json | 11 +- packages/weaver/src/consolidation.ts | 96 +- .../tests/consolidation-enhanced.test.ts | 27 + packages/weaver/tests/consolidation.test.ts | 179 +- packages/worker/package.json | 11 +- packages/worker/src/execution-policy.ts | 69 + packages/worker/src/handlers/chat-handler.ts | 15 +- packages/worker/src/handlers/group-handler.ts | 21 +- packages/worker/src/handlers/task-handler.ts | 13 +- packages/worker/src/index.ts | 29 +- packages/worker/tests/entrypoint.test.ts | 72 + .../worker/tests/execution-policy.test.ts | 92 + .../tests/handlers/chat-handler.test.ts | 83 +- .../worker/tests/handlers/handlers.test.ts | 318 +- playwright.config.ts | 42 +- scripts/build-hook-runtime.mjs | 10 +- scripts/build-sidecar.mjs | 192 +- scripts/bundle-native-deps.mjs | 41 +- scripts/bundle-node.mjs | 443 +- scripts/certify-windows-installer.ps1 | 3422 ++++++++ scripts/check-sidecar-resources.mjs | 896 ++- scripts/oss-drift-baseline.json | 309 + scripts/oss-drift-check.mjs | 566 ++ scripts/oss-drift-check.sh | 126 +- scripts/oss-subtree-split.sh | 78 +- scripts/parity-check.sh | 144 +- scripts/publish-windows-release.ps1 | 918 +++ scripts/qualify-smart-router.test.ts | 707 ++ scripts/qualify-smart-router.ts | 1372 ++++ scripts/read-tauri-bootstrap-token.mjs | 262 + scripts/seal-persona-acceptance.ts | 71 + scripts/stage-agent-pptx-runtime.mjs | 37 + scripts/stage-sidecar-deps.mjs | 254 +- scripts/test-windows-external-agents.ps1 | 1231 +++ .../test-windows-official-auth-canaries.ps1 | 2239 ++++++ scripts/verify-codex-hook-discovery.mjs | 1426 ++++ scripts/verify-codex-tool-denial.mjs | 2882 +++++++ tests/behaviors/chat-pipeline.test.ts | 223 +- tests/browser-companion-background.test.ts | 256 +- .../failure-injection/network-drop.spec.ts | 23 +- tests/e2e/five-persona-state-bundles.spec.ts | 28 +- .../e2e/launcher-real-hook-lifecycle.spec.ts | 185 +- .../e2e/launcher-real-tool-lifecycle.spec.ts | 308 +- tests/e2e/launcher-rendered-states.spec.ts | 3 +- tests/e2e/phase8-visual.spec.ts | 153 +- tests/e2e/user-journeys.spec.ts | 26 +- .../external-agent-collaboration.live.test.ts | 285 +- tests/integration/m3-full-stack.test.ts | 104 +- tests/mcp-context-profile-security.test.ts | 290 + tests/mcp-import-path-security.test.ts | 867 ++ tests/mcp-save-memory-security.test.ts | 205 + tests/oss-subtree-split.test.ts | 541 +- tests/placeholder-audit.test.ts | 2 +- tests/vision/persona-acceptance-seal.test.ts | 329 + tests/vision/persona-acceptance-seal.ts | 495 ++ tests/vision/persona-cases.ts | 378 + tests/vision/persona-scorer.test.ts | 6713 ++++++++++++++++ tests/vision/persona-scorer.ts | 3003 +++++++ tests/vision/personas.spec.ts | 1729 +++- tests/vision/verifier-contract.test.ts | 478 ++ tests/vision/verifier-contract.ts | 351 + tests/visual/views.spec.ts | 75 +- vendor/pptxgenjs/LICENSE | 21 + vendor/pptxgenjs/package.json | 24 + vendor/pptxgenjs/types/index.d.ts | 2679 +++++++ vitest.config.ts | 3 +- vitest.infra-suites.ts | 3 +- 771 files changed, 161561 insertions(+), 9027 deletions(-) create mode 100644 app/scripts/new-windows-signing-handoff.ps1 create mode 100644 app/scripts/sign-windows-artifact.ps1 create mode 100644 app/scripts/sign-windows-artifact.test.ps1 create mode 100644 app/scripts/signing-guidance.test.ts create mode 100644 apps/web/src/app-entry.tsx create mode 100644 apps/web/src/boot-connect.test.ts create mode 100644 apps/web/src/components/os/settings/BrowserCompanionSettings.test.tsx create mode 100644 apps/web/src/components/os/settings/BrowserCompanionSettings.tsx create mode 100644 apps/web/src/main.test.ts create mode 100644 apps/www/eslint.config.mjs create mode 100644 apps/www/proxy.ts create mode 100644 benchmarks/data/beam/beam-1M.meta.json create mode 100644 benchmarks/gaia2/JUDGE-DELTA-search-N160-2026-05-22.md create mode 100644 benchmarks/gaia2/PHASE-4-P4.2-PROGRESS-2026-05-21.md create mode 100644 benchmarks/gaia2/PHASE-4-P4.5-RESULTS-N160-2026-05-22.md create mode 100644 benchmarks/gaia2/PILLAR1-QWEN-LOCAL-RUNBOOK.md create mode 100644 benchmarks/gaia2/PILLAR1-QWEN36-N160-RESULT-2026-05-27.md create mode 100644 benchmarks/gaia2/PILLAR1-WAGGLE-FULL-VS-BARE-2026-05-27.md create mode 100644 benchmarks/gaia2/PILLAR1-WAGGLE-VS-HERMES-N40-2026-05-22.md create mode 100644 benchmarks/gaia2/README.md create mode 100644 benchmarks/gaia2/WAGGLE-HARNESS-PROBE-N10-2026-05-22.md create mode 100644 benchmarks/gaia2/WINDOWS-DOCKER-RUNNER-PATCHES.md create mode 100644 benchmarks/gaia2/adapter.ts create mode 100644 benchmarks/gaia2/config.yaml create mode 100644 benchmarks/gaia2/data/.gitkeep create mode 100644 benchmarks/gaia2/dry-run-results-memo.md create mode 100644 benchmarks/gaia2/rejudge_user_message.py create mode 100644 benchmarks/gaia2/runs/.gitkeep create mode 100644 benchmarks/gaia2/scripts/dump-tasks.py create mode 100644 benchmarks/gaia2/scripts/run-dry-verification.ts create mode 100644 benchmarks/gaia2/smoke-evidence.md create mode 100644 benchmarks/gaia2/spike-waggle-worker/README.md create mode 100644 benchmarks/gaia2/spike-waggle-worker/import-proof.mjs create mode 100644 benchmarks/gaia2/spike-waggle-worker/package.json create mode 100644 benchmarks/gaia2/waggle-container/BUILD.md create mode 100644 benchmarks/gaia2/waggle-container/Dockerfile create mode 100644 benchmarks/gaia2/waggle-container/entrypoint.sh create mode 100644 benchmarks/gaia2/waggle-container/stub-core/index.js create mode 100644 benchmarks/gaia2/waggle-container/stub-core/package.json create mode 100644 benchmarks/gaia2/waggle-container/waggle_worker.mjs create mode 100644 benchmarks/harness/E6-LOCKED-CONFIG.md create mode 100644 benchmarks/harness/results/beam/E2-sonnet-pilot-report.md create mode 100644 benchmarks/harness/scripts/_belief-smoke.ts create mode 100644 benchmarks/harness/scripts/_e4-aggregate.mjs create mode 100644 benchmarks/harness/scripts/_judge-diag.ts create mode 100644 benchmarks/harness/scripts/_or-judge-probe.ts create mode 100644 benchmarks/harness/scripts/_rejudge-or.ts create mode 100644 benchmarks/harness/scripts/_rejudge-probe.ts create mode 100644 benchmarks/harness/scripts/_wait-gpt5.ts create mode 100644 benchmarks/harness/scripts/beam-build-ledger-state.ts create mode 100644 benchmarks/harness/scripts/beam-build-ledger.ts create mode 100644 benchmarks/harness/scripts/beam-compose-matched50.ts create mode 100644 benchmarks/harness/scripts/beam-e2-analyze.ts create mode 100644 benchmarks/harness/scripts/beam-e2-cells.ts create mode 100644 benchmarks/harness/scripts/beam-rejudge.ts create mode 100644 benchmarks/harness/scripts/beam-run-belief.ts create mode 100644 benchmarks/harness/scripts/beam-run-ledger-e7L1.ts create mode 100644 benchmarks/harness/scripts/beam-run-ledger-e8.ts create mode 100644 benchmarks/harness/scripts/beam-run-ledger-e8a2.ts create mode 100644 benchmarks/harness/scripts/beam-run-ledger-e8d.ts create mode 100644 benchmarks/harness/scripts/beam-run-ledger-e8f.ts create mode 100644 benchmarks/harness/scripts/beam-run-ledger-e8g.ts create mode 100644 benchmarks/harness/scripts/beam-run-ledger-e8h.ts create mode 100644 benchmarks/harness/scripts/beam-run-ledger-e8h2.ts create mode 100644 benchmarks/harness/scripts/beam-run-ledger-e8i.ts create mode 100644 benchmarks/harness/scripts/beam-run-ledger-e8j.ts create mode 100644 benchmarks/harness/scripts/beam-run-ledger-e8k.ts create mode 100644 benchmarks/harness/scripts/beam-run-ledger-e8l.ts create mode 100644 benchmarks/harness/scripts/beam-run-ledger-e8l2.ts create mode 100644 benchmarks/harness/scripts/beam-run-ledger.ts create mode 100644 benchmarks/harness/scripts/beam-run-multiroute.ts create mode 100644 benchmarks/harness/scripts/e1-aggregate.ts create mode 100644 benchmarks/harness/scripts/e1-judge-eywa.ts create mode 100644 benchmarks/harness/scripts/e7-gate140.txt create mode 100644 benchmarks/harness/scripts/e7-gate42.txt create mode 100644 benchmarks/harness/scripts/e8-heldout140.txt create mode 100644 benchmarks/harness/scripts/e8-probeA.txt create mode 100644 benchmarks/harness/scripts/e8-probeB.txt create mode 100644 benchmarks/harness/scripts/e8-probeC.txt create mode 100644 benchmarks/harness/scripts/e8-probeD.txt create mode 100644 benchmarks/harness/scripts/e8-probeF.txt create mode 100644 benchmarks/harness/scripts/e8-probeG.txt create mode 100644 benchmarks/harness/scripts/e8-probeJ.txt create mode 100644 benchmarks/harness/scripts/e8-probeK.txt create mode 100644 benchmarks/harness/scripts/e8-probeL.txt create mode 100644 benchmarks/harness/scripts/e8-probeL2.txt create mode 100644 benchmarks/harness/scripts/matched50.txt create mode 100644 benchmarks/harness/src/beam-multiroute.ts create mode 100644 docs/paper/2026-07-10-audit-response-plan.md create mode 100644 docs/paper/2026-07-11-codex-consult-prompt.txt create mode 100644 docs/paper/2026-07-11-fable-codex-consensus.md create mode 100644 docs/paper/2026-07-11-protocol-freeze.md create mode 100644 docs/production-readiness/10-SECURITY_REVIEW_2026-08-11.md create mode 100644 docs/production-readiness/11-HIVE-MIND-PARITY-AUDIT-2026-08-13.md create mode 100644 docs/production-readiness/2026-07-16-audit.md create mode 100644 packages/agent/src/agent-run-budget.ts create mode 100644 packages/agent/src/external-process-env.ts create mode 100644 packages/agent/src/quantitative-number.ts create mode 100644 packages/agent/src/sidecar-owned-process.ts create mode 100644 packages/agent/tests/agent-loop-budget.test.ts create mode 100644 packages/agent/tests/pdf-tools.test.ts create mode 100644 packages/agent/tests/persona-instruction-fidelity.test.ts create mode 100644 packages/agent/tests/presentation-tools.test.ts create mode 100644 packages/agent/tests/sidecar-owned-process.test.ts create mode 100644 packages/core/tests/vault-acl-probe.ts create mode 100644 packages/hive-mind-cli/src/commands/cognify.test.ts create mode 100644 packages/hive-mind-cli/src/commands/hook-call.ts create mode 100644 packages/hive-mind-cli/tests/hook-call.test.ts create mode 100644 packages/hive-mind-core/src/hook-runtime.ts create mode 100644 packages/hive-mind-core/src/memory-ingress-guard.ts create mode 100644 packages/hive-mind-core/src/mind/transformers-model-load.ts create mode 100644 packages/hive-mind-core/tests/hook-runtime.test.ts create mode 100644 packages/hive-mind-core/tests/memory-ingress-guard.test.ts create mode 100644 packages/hive-mind-core/tests/mind/inprocess-reranker.test.ts create mode 100644 packages/hive-mind-core/tests/mind/transformers-model-load.test.ts create mode 100644 packages/hive-mind-shim-core/src/main-module.ts create mode 100644 packages/hive-mind-shim-core/tests/main-module.test.ts create mode 100644 packages/marketplace/src/install-security.ts create mode 100644 packages/marketplace/tests/installer-security.test.ts create mode 100644 packages/server/src/local/browser-companion-pairing.ts create mode 100644 packages/server/src/local/managed-ollama-runtime.ts create mode 100644 packages/server/src/local/model-spend-meter.ts create mode 100644 packages/server/src/local/routes/capability-proposals.ts create mode 100644 packages/server/src/local/routes/chat-prompt-packaging.ts create mode 100644 packages/server/src/local/services/vector-enrichment-service.ts create mode 100644 packages/server/src/local/team-server-binding.ts create mode 100644 packages/server/src/local/team-server-egress.ts create mode 100644 packages/server/src/local/utils/office-archive-guard.ts create mode 100644 packages/server/src/local/workspace-turn-coordinator.ts create mode 100644 packages/server/tests/entrypoint.test.ts create mode 100644 packages/server/tests/local/browser-ext-pairing-lifecycle.test.ts create mode 100644 packages/server/tests/local/capability-proposals.test.ts create mode 100644 packages/server/tests/local/chat-prompt-packaging.test.ts create mode 100644 packages/server/tests/local/external-tool-roadmap.test.ts create mode 100644 packages/server/tests/local/harvest-ingress-security.test.ts create mode 100644 packages/server/tests/local/lifecycle.test.ts create mode 100644 packages/server/tests/local/managed-ollama-runtime.test.ts create mode 100644 packages/server/tests/local/model-spend-meter.test.ts create mode 100644 packages/server/tests/local/persona-acceptance-prompt-budget.test.ts create mode 100644 packages/server/tests/local/vector-enrichment-service.test.ts create mode 100644 packages/server/tests/local/workspace-turn-coordinator.test.ts create mode 100644 packages/server/tests/routes/webhooks.test.ts create mode 100644 packages/server/tests/smart-router-chat.test.ts create mode 100644 packages/worker/src/execution-policy.ts create mode 100644 packages/worker/tests/entrypoint.test.ts create mode 100644 packages/worker/tests/execution-policy.test.ts create mode 100644 scripts/certify-windows-installer.ps1 create mode 100644 scripts/oss-drift-baseline.json create mode 100644 scripts/oss-drift-check.mjs create mode 100644 scripts/publish-windows-release.ps1 create mode 100644 scripts/qualify-smart-router.test.ts create mode 100644 scripts/qualify-smart-router.ts create mode 100644 scripts/read-tauri-bootstrap-token.mjs create mode 100644 scripts/seal-persona-acceptance.ts create mode 100644 scripts/stage-agent-pptx-runtime.mjs create mode 100644 scripts/test-windows-external-agents.ps1 create mode 100644 scripts/test-windows-official-auth-canaries.ps1 create mode 100644 scripts/verify-codex-hook-discovery.mjs create mode 100644 scripts/verify-codex-tool-denial.mjs create mode 100644 tests/mcp-context-profile-security.test.ts create mode 100644 tests/mcp-import-path-security.test.ts create mode 100644 tests/mcp-save-memory-security.test.ts create mode 100644 tests/vision/persona-acceptance-seal.test.ts create mode 100644 tests/vision/persona-acceptance-seal.ts create mode 100644 tests/vision/persona-cases.ts create mode 100644 tests/vision/persona-scorer.test.ts create mode 100644 tests/vision/persona-scorer.ts create mode 100644 tests/vision/verifier-contract.test.ts create mode 100644 tests/vision/verifier-contract.ts create mode 100644 vendor/pptxgenjs/LICENSE create mode 100644 vendor/pptxgenjs/package.json create mode 100644 vendor/pptxgenjs/types/index.d.ts diff --git a/.env.example b/.env.example index f94f9ca..dbcf2a4 100644 --- a/.env.example +++ b/.env.example @@ -42,6 +42,7 @@ DATABASE_URL=postgres://waggle:waggle_dev@localhost:5434/waggle REDIS_URL=redis://localhost:6381 CLERK_SECRET_KEY=sk_test_... CLERK_PUBLISHABLE_KEY=pk_test_... +CLERK_WEBHOOK_SIGNING_SECRET= PORT=3100 CORS_ORIGIN=http://localhost:8080 diff --git a/.gitattributes b/.gitattributes index 2b7b360..2e9e5bd 100644 --- a/.gitattributes +++ b/.gitattributes @@ -59,3 +59,8 @@ decisions/*.md -text # are consumed by `curl | bash` on Linux/macOS. A CRLF checkout would break the # shebang and `read`/`printf` parsing, so pin them to LF regardless of core.autocrlf. *.sh text eol=lf + +# Tauri rewrites these tracked files during Windows packaging. Keep checkout and +# generated bytes stable so post-build mutation checks report semantic drift only. +app/src-tauri/Cargo.toml text eol=lf +app/src-tauri/gen/schemas/*.json text eol=lf diff --git a/.github/sync.md b/.github/sync.md index 9ce6f83..0f6ce31 100644 --- a/.github/sync.md +++ b/.github/sync.md @@ -1,14 +1,13 @@ > **⚠️ DEPRECATED (2026-04-30 monorepo migration) — HISTORICAL/AUDIT REFERENCE ONLY.** -> This manual describes the dual-repo bidirectional-sync mechanism that ran while the -> substrate lived in BOTH waggle-os (`packages/core/src/{mind,harvest}/`) and an external -> `marolinik/hive-mind`. After the migration the substrate lives ONLY at -> **`packages/hive-mind-core/src/{mind,harvest}/`**, and the OSS mirror is **generated** via -> `git subtree split` — see [`packages/hive-mind-core/CONTRIBUTING.md`](../packages/hive-mind-core/CONTRIBUTING.md) -> and [`scripts/oss-subtree-split.sh`](../scripts/oss-subtree-split.sh). The -> `mind-parity-check.yml` / `sync-mind.yml` workflows referenced below are **inert deprecation -> anchors** (their `packages/core/src/...` trigger paths no longer exist, so they never fire). -> Everything below is retained for historical context — do NOT treat it as the active process. -> See CLAUDE.md §7.5 for the current mechanism. +> This manual describes the retired dual-repo bidirectional-sync mechanism. The canonical +> substrate now lives only at **`packages/hive-mind-core/src/{mind,harvest}/`**. Its public +> mirror has a different layout and is updated through a maintainer-curated forward-port that +> removes excluded files and interleaved `install_audit` logic. A raw subtree split is unsafe +> and must never be pushed; [`scripts/oss-subtree-split.sh`](../scripts/oss-subtree-split.sh) +> is inspection-only. The workflows below are inert deprecation anchors because their old +> `packages/core/src/...` trigger paths no longer exist. Everything after this banner is +> historical and must not be treated as current instructions. See AGENTS.md §7.5 and +> [`packages/hive-mind-core/CONTRIBUTING.md`](../packages/hive-mind-core/CONTRIBUTING.md). --- diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8953663..fa57ffb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,10 +60,12 @@ jobs: run: | npm test -- \ --exclude=packages/cli/tests/cli-runtime.test.ts \ + --exclude=packages/marketplace/tests/cli-runtime.test.ts \ --exclude=packages/hive-mind-cli/tests/cli-help.test.ts \ --exclude=packages/hive-mind-mcp-server/tests/runtime.test.ts \ --exclude=packages/launcher/tests/cli.test.ts \ - --exclude=packages/memory-mcp/tests/runtime.test.ts + --exclude=packages/memory-mcp/tests/runtime.test.ts \ + --maxWorkers=2 # These tests each create a temporary project and run npm install. Running # several cold installs in parallel makes individual test timeouts measure @@ -72,6 +74,7 @@ jobs: run: | npx vitest run \ packages/cli/tests/cli-runtime.test.ts \ + packages/marketplace/tests/cli-runtime.test.ts \ packages/hive-mind-cli/tests/cli-help.test.ts \ packages/hive-mind-mcp-server/tests/runtime.test.ts \ packages/launcher/tests/cli.test.ts \ diff --git a/.github/workflows/hive-mind-cli-cross-platform.yml b/.github/workflows/hive-mind-cli-cross-platform.yml index ae735fd..dc15682 100644 --- a/.github/workflows/hive-mind-cli-cross-platform.yml +++ b/.github/workflows/hive-mind-cli-cross-platform.yml @@ -19,6 +19,9 @@ on: - 'packages/hive-mind-mcp-server/**' - 'packages/hive-mind-wiki-compiler/**' - 'packages/hive-mind-hooks-claude-code/**' + - 'vendor/pptxgenjs/**' + - 'package.json' + - 'package-lock.json' - '.github/workflows/hive-mind-cli-cross-platform.yml' pull_request: branches: [main] @@ -26,6 +29,10 @@ on: - 'packages/hive-mind-cli/**' - 'packages/hive-mind-shim-core/**' - 'packages/hive-mind-core/**' + - 'vendor/pptxgenjs/**' + - 'package.json' + - 'package-lock.json' + - '.github/workflows/hive-mind-cli-cross-platform.yml' jobs: install-and-smoke: @@ -47,7 +54,7 @@ jobs: node-version: ${{ matrix.node-version }} - name: Install workspace deps - run: npm install + run: npm ci # hive-mind-core imports @waggle/shared, whose dist/ is gitignored and so # absent on a clean checkout. hive-mind-core/tsconfig declares no project diff --git a/.github/workflows/mind-parity-check.yml b/.github/workflows/mind-parity-check.yml index a642035..ea3cd00 100644 --- a/.github/workflows/mind-parity-check.yml +++ b/.github/workflows/mind-parity-check.yml @@ -5,15 +5,17 @@ name: mind-parity-check # This workflow ran the (then-external) hive-mind repo's mind/+harvest/ tests # against waggle-os's substrate to verify behavioral parity while the same code # lived in both repos. After CC Sesija B migration, the substrate lives ONLY in -# waggle-os/packages/hive-mind-core/, and the OSS mirror at -# github.com/marolinik/hive-mind is generated FROM waggle-os via subtree-split -# (not maintained as a parallel codebase). Parity checking is therefore -# definitionally trivial — the OSS export is byte-identical to its source. +# waggle-os/packages/hive-mind-core/. The OSS mirror at +# github.com/marolinik/hive-mind is a separately curated layout produced from +# that canonical source. It is intentionally not byte-identical: imports and +# layout differ, and excluded files plus interleaved `install_audit` logic are +# removed during the maintainer-reviewed forward-port. # # This workflow is preserved as the deprecation anchor. It will NOT fire on # push because trigger paths (packages/core/src/mind/**) no longer exist as # tracked content. See sync-mind.yml's deprecation note for the full migration -# context. +# context. Do not reactivate this injection workflow as a substitute for the +# current drift review, curated export, and public-mirror test gates. # Memory Sync Repair Step 3.1. Verifies that hive-mind's mind/ + harvest/ # tests pass against waggle-os's substrate. The check runs the waggle-os @@ -48,6 +50,9 @@ concurrency: jobs: parity-check: + # Permanently inert deprecation anchor. The old test-injection model is not a + # safe substitute for the curated forward-port and drift-review workflow. + if: ${{ false }} name: hive-mind ↔ waggle-os mind substrate parity runs-on: ubuntu-latest timeout-minutes: 15 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f4ddd19..d14dc8f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,10 +1,11 @@ # Waggle — Release Build Workflow # # Builds desktop apps for Windows (NSIS) and macOS (DMG) on tag push. -# Publishes artifacts as GitHub Release assets. +# Publishes only the certified Windows installer; macOS outputs remain +# workflow verification artifacts until the deferred macOS release gate lands. # -# Trigger: push tag v* (e.g., v1.0.0) -# Also supports manual dispatch for testing. +# Trigger: push tag v* (e.g., v1.0.0). Use tauri-build-pr.yml for manual +# unsigned verification builds; production signing is tag-only. name: Release Build @@ -12,127 +13,2543 @@ on: push: tags: - 'v*' - workflow_dispatch: permissions: - contents: write + contents: read + +env: + WINDOWS_SIGNING_TRANSPORT_MAX_ITEMS: 60000 + +concurrency: + group: release-${{ github.ref }} + cancel-in-progress: false jobs: - build-windows: + build-windows-prebuilt: runs-on: windows-latest + permissions: + contents: read + outputs: + build_receipt_sha256: ${{ steps.handoff.outputs.receipt_sha256 }} + handoff_size_bytes: ${{ steps.handoff.outputs.handoff_size_bytes }} + artifact_id: ${{ steps.upload-prebuilt.outputs.artifact-id }} + artifact_digest: ${{ steps.upload-prebuilt.outputs.artifact-digest }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 + with: + fetch-depth: 0 + persist-credentials: false + + - name: Validate immutable Windows build boundary + shell: pwsh + run: | + if ($env:GITHUB_REPOSITORY -cne 'marolinik/waggle-os' -or + $env:GITHUB_REF_TYPE -cne 'tag' -or + $env:GITHUB_SHA -cnotmatch '^[0-9a-f]{40}$') { + throw 'Windows release build requires the exact repository, tag, and revision boundary.' + } + $checkedOutRevision = (git rev-parse --verify HEAD).Trim().ToLowerInvariant() + if ($LASTEXITCODE -ne 0 -or $checkedOutRevision -cne $env:GITHUB_SHA) { + throw 'Checked-out Windows release revision differs from GITHUB_SHA.' + } + if (@(git status --porcelain=v1 --untracked-files=all).Count -ne 0) { + throw 'Windows release build checkout must be clean.' + } + $version = [string](Get-Content -Raw -LiteralPath 'app/src-tauri/tauri.conf.json' | ConvertFrom-Json).version + $expectedTag = "v$version" + if ($env:GITHUB_REF -ne "refs/tags/$expectedTag" -or $env:GITHUB_REF_NAME -ne $expectedTag) { + throw "Release tag $env:GITHUB_REF_NAME does not exactly match app version $version" + } + $remoteMainRevision = (git rev-parse --verify refs/remotes/origin/main).Trim().ToLowerInvariant() + if ($LASTEXITCODE -ne 0 -or $remoteMainRevision -cnotmatch '^[0-9a-f]{40}$') { + throw 'Fresh checkout did not provide canonical origin/main for release ancestry validation' + } + git merge-base --is-ancestor $env:GITHUB_SHA refs/remotes/origin/main + if ($LASTEXITCODE -ne 0) { throw 'Release tag commit is not an ancestor of canonical origin/main' } - name: Setup Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: - node-version: 20 + node-version: 22.23.2 cache: npm - name: Setup Rust - uses: dtolnay/rust-toolchain@stable + uses: dtolnay/rust-toolchain@4cda84d5c5c54efe2404f9d843567869ab1699d4 + with: + toolchain: 1.94.0 - name: Rust cache - uses: Swatinem/rust-cache@v2 + uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2 with: workspaces: app/src-tauri - name: Install dependencies - run: npm install + run: npm ci + + - name: Install locked Tauri CLI + run: npm ci --prefix app --ignore-scripts - name: Build packages (shared -> core -> agent -> server) run: npm run build:packages + - name: Bundle Node.js runtime + run: node scripts/bundle-node.mjs + - name: Build sidecar run: node scripts/build-sidecar.mjs - name: Bundle native dependencies run: node scripts/bundle-native-deps.mjs - - name: Bundle Node.js runtime - run: node scripts/bundle-node.mjs - - name: Stage sidecar dependencies run: node scripts/stage-sidecar-deps.mjs + - name: Verify packaged hook lifecycles + run: node node_modules/vitest/vitest.mjs run --root . --config vitest.config.ts packages/agent/tests/hook-packages-runtime.test.ts -t "runs staged Tauri hook lifecycles" + env: + WAGGLE_VERIFY_STAGED_HOOK_RUNTIME: '1' + - name: Build frontend run: cd apps/web && npx vite build - - name: Build Tauri (Windows) - uses: tauri-apps/tauri-action@v0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - projectPath: app - tagName: ${{ github.ref_name }} - releaseName: 'Waggle ${{ github.ref_name }}' - releaseBody: 'See the release notes for details.' - releaseDraft: true - prerelease: false + - name: Build full unsigned Tauri NSIS package + shell: pwsh + run: | + $override = Get-Content -Raw -LiteralPath 'app/src-tauri/tauri.build-override.conf.json' | ConvertFrom-Json + if ($null -ne $override.bundle.windows -and + $null -ne $override.bundle.windows.PSObject.Properties['signCommand']) { + throw 'The hosted prebuilt job must not carry a Windows signing command.' + } + Push-Location app + try { + & node node_modules/@tauri-apps/cli/tauri.js build ` + --target x86_64-pc-windows-msvc ` + --bundles nsis ` + --config src-tauri/tauri.build-override.conf.json + if ($LASTEXITCODE -ne 0) { throw 'Full unsigned Tauri NSIS package failed.' } + } finally { + Pop-Location + } - build-macos: - runs-on: macos-latest - strategy: - matrix: - target: [aarch64-apple-darwin, x86_64-apple-darwin] + - name: Issue immutable Windows signing handoff + id: handoff + shell: pwsh + run: | + $handoffRoot = Join-Path $env:RUNNER_TEMP 'waggle-windows-signing-handoff' + if (Test-Path -LiteralPath $handoffRoot) { + throw "Windows signing handoff root already exists: $handoffRoot" + } + & ./app/scripts/new-windows-signing-handoff.ps1 ` + -SourceTargetRoot 'app/src-tauri/target' ` + -DestinationRoot $handoffRoot + if ($LASTEXITCODE -ne 0) { throw 'Windows signing handoff failed.' } + $receiptPath = Join-Path $handoffRoot 'build-receipt.json' + $prebuiltRoot = Join-Path $handoffRoot 'prebuilt' + if (-not (Test-Path -LiteralPath $receiptPath -PathType Leaf) -or + -not (Test-Path -LiteralPath $prebuiltRoot -PathType Container)) { + throw 'Windows signing handoff did not publish its canonical receipt and prebuilt root.' + } + $receiptSha256 = (Get-FileHash -LiteralPath $receiptPath -Algorithm SHA256).Hash + if ($receiptSha256 -notmatch '^[0-9A-F]{64}$') { + throw 'Windows signing handoff receipt digest is invalid.' + } + $handoffSizeBytes = [long]( + Get-ChildItem -LiteralPath $handoffRoot -Recurse -Force -File | + Measure-Object -Property Length -Sum + ).Sum + if ($handoffSizeBytes -le 0) { + throw 'Windows signing handoff has an invalid aggregate size.' + } + "receipt_sha256=$receiptSha256" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "handoff_size_bytes=$handoffSizeBytes" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + + - name: Upload immutable Windows signing handoff + id: upload-prebuilt + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4 + with: + name: waggle-windows-prebuilt-${{ github.sha }} + path: ${{ runner.temp }}\waggle-windows-signing-handoff + if-no-files-found: error + include-hidden-files: true + retention-days: 7 + + prepare-windows-signing: + needs: build-windows-prebuilt + runs-on: windows-latest + permissions: + contents: read + outputs: + release_mode: ${{ steps.release-mode.outputs.mode }} + candidate_version: ${{ steps.release-mode.outputs.candidate_version }} + bootstrap_identity: ${{ steps.release-mode.outputs.bootstrap_identity }} + upgrade_base_tag: ${{ steps.release-mode.outputs.upgrade_base_tag }} + upgrade_base_asset_name: ${{ steps.release-mode.outputs.upgrade_base_asset_name }} + upgrade_base_sha256: ${{ steps.release-mode.outputs.upgrade_base_sha256 }} + upgrade_base_commit: ${{ steps.release-mode.outputs.upgrade_base_commit }} + signer_subject: ${{ steps.signer-identity.outputs.subject }} + preparation_receipt_sha256: ${{ steps.stage-prepared.outputs.receipt_sha256 }} + preparation_size_bytes: ${{ steps.stage-prepared.outputs.size_bytes }} + artifact_id: ${{ steps.upload-prepared.outputs.artifact-id }} + artifact_digest: ${{ steps.upload-prepared.outputs.artifact-digest }} steps: - - uses: actions/checkout@v4 - - - name: Setup Node.js - uses: actions/setup-node@v4 + - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 with: - node-version: 20 + fetch-depth: 0 + persist-credentials: false + + - name: Validate exact hosted signing preparation boundary + shell: pwsh + run: | + $version = [string](Get-Content -Raw -LiteralPath 'app/src-tauri/tauri.conf.json' | ConvertFrom-Json).version + if ($env:GITHUB_ACTIONS -cne 'true' -or + $env:GITHUB_EVENT_NAME -cne 'push' -or + $env:GITHUB_REPOSITORY -cne 'marolinik/waggle-os' -or + $env:GITHUB_REF_TYPE -cne 'tag' -or + $env:GITHUB_REF -cne "refs/tags/v$version" -or + $env:GITHUB_REF_NAME -cne "v$version" -or + $env:GITHUB_WORKFLOW_REF -cne "marolinik/waggle-os/.github/workflows/release.yml@$env:GITHUB_REF" -or + $env:GITHUB_WORKFLOW_SHA -cne $env:GITHUB_SHA -or + $env:RUNNER_ENVIRONMENT -cne 'github-hosted' -or + $env:GITHUB_SHA -cnotmatch '^[0-9a-f]{40}$') { + throw 'Windows signing preparation requires the exact hosted push, repository, tag, workflow, and revision boundary.' + } + $checkedOutRevision = (git rev-parse --verify HEAD).Trim().ToLowerInvariant() + if ($LASTEXITCODE -ne 0 -or $checkedOutRevision -cne $env:GITHUB_SHA -or + @(git status --porcelain=v1 --untracked-files=all).Count -ne 0) { + throw 'Windows signing preparation checkout is not the clean GITHUB_SHA revision.' + } + + - name: Resolve Windows release mode + id: release-mode + shell: pwsh + env: + WINDOWS_BOOTSTRAP_RELEASE_IDENTITY: ${{ vars.WINDOWS_BOOTSTRAP_RELEASE_IDENTITY }} + WINDOWS_UPGRADE_BASE_TAG: ${{ vars.WINDOWS_UPGRADE_BASE_TAG }} + WINDOWS_UPGRADE_BASE_ASSET_NAME: ${{ vars.WINDOWS_UPGRADE_BASE_ASSET_NAME }} + WINDOWS_UPGRADE_BASE_SHA256: ${{ vars.WINDOWS_UPGRADE_BASE_SHA256 }} + WINDOWS_UPGRADE_BASE_COMMIT: ${{ vars.WINDOWS_UPGRADE_BASE_COMMIT }} + run: | + function Resolve-WindowsReleaseMode { + param( + [string]$CandidateVersion, + [string]$CandidateTag, + [string]$CandidateSha, + [string]$BootstrapIdentity, + [string]$BaseTag, + [string]$BaseAssetName, + [string]$BaseSha256, + [string]$BaseCommit + ) + + if ($CandidateVersion -notmatch '^\d+\.\d+\.\d+$' -or + $CandidateTag -cne "v$CandidateVersion" -or + $CandidateSha -cnotmatch '^[0-9a-f]{40}$') { + throw 'Candidate release identity is not a strict tag, version, and commit tuple.' + } + $candidateSemVer = [version]$CandidateVersion + $bootstrapSemVer = [version]'0.2.0' + + $releaseInputs = @( + $BootstrapIdentity, + $BaseTag, + $BaseAssetName, + $BaseSha256, + $BaseCommit + ) + if (@($releaseInputs | Where-Object { $_ -ne $_.Trim() }).Count -gt 0) { + throw 'Windows release-mode inputs must be exact values without surrounding whitespace.' + } + + $baselineInputs = @($BaseTag, $BaseAssetName, $BaseSha256, $BaseCommit) + $configuredBaselineInputs = @( + $baselineInputs | Where-Object { -not [string]::IsNullOrEmpty($_) } + ).Count + + if ($CandidateVersion -ceq '0.2.0') { + if ($CandidateTag -cne 'v0.2.0' -or $configuredBaselineInputs -ne 0) { + throw 'The v0.2.0 bootstrap requires all protected upgrade-baseline inputs to be exactly empty.' + } + $expectedBootstrapIdentity = "v0.2.0@$CandidateSha" + if (-not [string]::Equals( + $BootstrapIdentity, + $expectedBootstrapIdentity, + [System.StringComparison]::Ordinal + )) { + throw 'The v0.2.0 bootstrap authorization does not exactly match the release tag and commit.' + } + return 'bootstrap' + } + + if ($candidateSemVer -le $bootstrapSemVer) { + throw 'Non-bootstrap Windows releases must be newer than v0.2.0.' + } + if (-not [string]::IsNullOrEmpty($BootstrapIdentity)) { + throw 'Bootstrap authorization is valid only for the exact v0.2.0 release.' + } + if ($configuredBaselineInputs -ne 4) { + throw 'Non-bootstrap Windows releases require all four protected upgrade-baseline inputs.' + } + if ($CandidateVersion -ceq '0.2.1' -and $BaseTag -cne 'v0.2.0') { + throw 'The first Windows upgrade must use the signed v0.2.0 bootstrap baseline.' + } + return 'upgrade' + } + + $candidateVersion = [string](Get-Content -Raw -LiteralPath 'app/src-tauri/tauri.conf.json' | ConvertFrom-Json).version + $bootstrapIdentity = [string]$env:WINDOWS_BOOTSTRAP_RELEASE_IDENTITY + $baseTag = [string]$env:WINDOWS_UPGRADE_BASE_TAG + $baseAssetName = [string]$env:WINDOWS_UPGRADE_BASE_ASSET_NAME + $baseSha256 = [string]$env:WINDOWS_UPGRADE_BASE_SHA256 + $baseCommit = [string]$env:WINDOWS_UPGRADE_BASE_COMMIT + $releaseMode = Resolve-WindowsReleaseMode ` + -CandidateVersion $candidateVersion ` + -CandidateTag $env:GITHUB_REF_NAME ` + -CandidateSha $env:GITHUB_SHA ` + -BootstrapIdentity $bootstrapIdentity ` + -BaseTag $baseTag ` + -BaseAssetName $baseAssetName ` + -BaseSha256 $baseSha256 ` + -BaseCommit $baseCommit + "mode=$releaseMode" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "candidate_version=$candidateVersion" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "bootstrap_identity=$bootstrapIdentity" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "upgrade_base_tag=$baseTag" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "upgrade_base_asset_name=$baseAssetName" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "upgrade_base_sha256=$baseSha256" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "upgrade_base_commit=$baseCommit" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + + - name: Validate protected signer subject + id: signer-identity + shell: pwsh + env: + WINDOWS_CODESIGN_APPROVED_SUBJECT: ${{ vars.WINDOWS_CODESIGN_APPROVED_SUBJECT }} + run: | + $expected = 'CN=EGZAKTA DOO BEOGRAD, O=EGZAKTA DOO BEOGRAD, L=Amsterdam, C=NL' + $subject = [string]$env:WINDOWS_CODESIGN_APPROVED_SUBJECT + if ($subject -cne $expected -or $subject -cne $subject.Trim() -or + $subject -match '[\x00-\x1F\x7F]') { + throw 'WINDOWS_CODESIGN_APPROVED_SUBJECT does not exactly match the approved public identity.' + } + "subject=$subject" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + + - name: Validate capacity before duplicate handoff extraction + shell: pwsh + env: + WAGGLE_HANDOFF_SIZE_BYTES: ${{ needs.build-windows-prebuilt.outputs.handoff_size_bytes }} + run: | + $handoffSizeBytes = [long]0 + if (-not [long]::TryParse( + [string]$env:WAGGLE_HANDOFF_SIZE_BYTES, + [Globalization.NumberStyles]::None, + [Globalization.CultureInfo]::InvariantCulture, + [ref]$handoffSizeBytes + ) -or $handoffSizeBytes -le 0 -or $handoffSizeBytes -gt 40GB) { + throw 'Hosted build handoff size output is missing or invalid.' + } + $dependencyAndCertificationOverheadBytes = [long]9GB + if ($handoffSizeBytes -gt + ([long]::MaxValue - $dependencyAndCertificationOverheadBytes) / 2) { + throw 'Hosted build handoff size overflows the capacity calculation.' + } + $requiredBytes = [long]( + $handoffSizeBytes * 2 + $dependencyAndCertificationOverheadBytes + ) + $runnerRoot = [IO.Path]::GetPathRoot([IO.Path]::GetFullPath($env:RUNNER_TEMP)) + $availableBytes = [IO.DriveInfo]::new($runnerRoot).AvailableFreeSpace + if ($availableBytes -lt $requiredBytes) { + throw "Insufficient disk for two isolated handoff extractions: requires=$requiredBytes available=$availableBytes" + } + + - name: Setup Node.js for protected packaging + uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 + with: + node-version: '22.23.2' + cache: npm + cache-dependency-path: app/package-lock.json + + - name: Install locked Tauri packaging CLI + run: npm ci --prefix app --ignore-scripts + + - name: Download immutable prebuilt handoff for unsigned verification + uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4 + with: + artifact-ids: ${{ needs.build-windows-prebuilt.outputs.artifact_id }} + path: ${{ runner.temp }}\waggle-prebuilt-unsigned + merge-multiple: true + + - name: Download immutable prebuilt handoff for signed packaging + uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4 + with: + artifact-ids: ${{ needs.build-windows-prebuilt.outputs.artifact_id }} + path: ${{ runner.temp }}\waggle-prebuilt-signing + merge-multiple: true + + - name: Verify duplicate handoff roots and bound receipt + id: verify-handoff + shell: pwsh + env: + EXPECTED_BUILD_RECEIPT_SHA256: ${{ needs.build-windows-prebuilt.outputs.build_receipt_sha256 }} + run: | + $expectedSha256 = [string]$env:EXPECTED_BUILD_RECEIPT_SHA256 + if ($expectedSha256 -notmatch '^[0-9A-F]{64}$') { + throw 'Build receipt SHA-256 output is missing or invalid.' + } + $unsignedDownload = [IO.Path]::GetFullPath((Resolve-Path (Join-Path $env:RUNNER_TEMP 'waggle-prebuilt-unsigned')).Path) + $signingDownload = [IO.Path]::GetFullPath((Resolve-Path (Join-Path $env:RUNNER_TEMP 'waggle-prebuilt-signing')).Path) + if ([string]::Equals($unsignedDownload, $signingDownload, [StringComparison]::OrdinalIgnoreCase)) { + throw 'Unsigned and signing handoff downloads must be distinct.' + } + $unsignedReceipt = Join-Path $unsignedDownload 'build-receipt.json' + $signingReceipt = Join-Path $signingDownload 'build-receipt.json' + $unsignedRoot = Join-Path $unsignedDownload 'prebuilt' + $signingRoot = Join-Path $signingDownload 'prebuilt' + $unsignedNsisRoot = Join-Path $unsignedDownload 'nsis-toolchain' + $signingNsisRoot = Join-Path $signingDownload 'nsis-toolchain' + foreach ($path in @($unsignedReceipt, $signingReceipt)) { + if (-not (Test-Path -LiteralPath $path -PathType Leaf) -or + -not [string]::Equals( + (Get-FileHash -LiteralPath $path -Algorithm SHA256).Hash, + $expectedSha256, + [StringComparison]::OrdinalIgnoreCase + )) { + throw 'Downloaded hosted build receipt differs from its immutable handoff digest.' + } + } + $signingReceiptForPackage = Join-Path $signingDownload 'build-receipt.package.json' + [IO.File]::Copy($signingReceipt, $signingReceiptForPackage, $false) + if ((Get-FileHash -LiteralPath $signingReceiptForPackage -Algorithm SHA256).Hash -cne + $expectedSha256) { + throw 'Signing package receipt copy changed before use.' + } + foreach ($path in @($unsignedRoot, $signingRoot)) { + if (-not (Test-Path -LiteralPath $path -PathType Container)) { + throw 'Downloaded prebuilt input root is missing.' + } + } + foreach ($path in @($unsignedNsisRoot, $signingNsisRoot)) { + if (-not (Test-Path -LiteralPath $path -PathType Container)) { + throw 'Downloaded NSIS toolchain root is missing.' + } + } + $receipt = Get-Content -Raw -LiteralPath $unsignedReceipt | ConvertFrom-Json -Depth 32 + $expectedNsisAggregate = '1FC822D1A183552A80ADEA01B0BF456F462B90518256EF1FE9EDFA22D76CD85A' + if (@($receipt.nsisInventory.entries).Count -ne 442 -or + [string]$receipt.nsisInventory.sha256 -cne $expectedNsisAggregate) { + throw 'Hosted build receipt does not bind the pinned 442-file NSIS closure.' + } + . ./app/scripts/sign-windows-artifact.ps1 + $unsignedNsisInventory = New-WagglePrebuiltInventory $unsignedNsisRoot + $signingNsisInventory = New-WagglePrebuiltInventory $signingNsisRoot + foreach ($inventory in @($unsignedNsisInventory, $signingNsisInventory)) { + if (@($inventory.entries).Count -ne 442 -or + [string]$inventory.sha256 -cne $expectedNsisAggregate -or + ($inventory | ConvertTo-Json -Depth 8 -Compress) -cne + ($receipt.nsisInventory | ConvertTo-Json -Depth 8 -Compress)) { + throw 'Downloaded NSIS toolchain does not exactly match its canonical receipt inventory.' + } + } + $installedNsisRoot = Join-Path $env:LOCALAPPDATA 'tauri\NSIS' + if (Test-Path -LiteralPath $installedNsisRoot) { + throw 'Fresh protected signer runner unexpectedly already contains a Tauri NSIS closure.' + } + $installedNsisParent = Split-Path $installedNsisRoot -Parent + New-Item -ItemType Directory -Path $installedNsisParent -Force | Out-Null + $temporaryNsisRoot = Join-Path $installedNsisParent "NSIS.$([Guid]::NewGuid().ToString('N')).tmp" + Copy-Item -LiteralPath $unsignedNsisRoot -Destination $temporaryNsisRoot -Recurse -ErrorAction Stop + [IO.Directory]::Move($temporaryNsisRoot, $installedNsisRoot) + $installedNsisInventory = New-WagglePrebuiltInventory $installedNsisRoot + if (($installedNsisInventory | ConvertTo-Json -Depth 8 -Compress) -cne + ($receipt.nsisInventory | ConvertTo-Json -Depth 8 -Compress)) { + throw 'Installed signer NSIS closure changed during receipt-bound staging.' + } + $resourceEntries = @($receipt.resourcesInventory.entries) + Assert-WaggleCanonicalInventoryEntries $resourceEntries 'Hosted resources inventory' + $sourceResourcesRoot = Get-TrustedPath ` + (Join-Path $unsignedRoot 'resources') 'Hosted source resources' 'Container' + $signingResourcesRoot = Get-TrustedPath ` + (Join-Path $signingRoot 'resources') 'Hosted signing resources' 'Container' + $canonicalResourcesRoot = Get-TrustedPath ` + ([IO.Path]::GetFullPath('app/src-tauri/resources')) ` + 'Canonical repository resources' 'Container' + $canonicalResourcesPrefix = $canonicalResourcesRoot.TrimEnd('\') + '\' + $materializedEntries = [Collections.Generic.List[object]]::new() + foreach ($entry in $resourceEntries) { + $relative = [string]$entry.path + $sourcePath = Get-TrustedPath ` + (Join-Path $sourceResourcesRoot $relative) 'Hosted resource file' -AllowHardLink + $signingPath = Get-TrustedPath ` + (Join-Path $signingResourcesRoot $relative) 'Hosted signing resource file' -AllowHardLink + foreach ($path in @($sourcePath, $signingPath)) { + $item = Get-Item -LiteralPath $path -Force + if ([long]$item.Length -ne [long]$entry.size -or + (Get-FileHash -LiteralPath $path -Algorithm SHA256).Hash -cne + [string]$entry.sha256) { + throw 'Hosted resource file differs from its canonical build receipt.' + } + } + $destinationPath = [IO.Path]::GetFullPath( + (Join-Path $canonicalResourcesRoot $relative) + ) + if (-not $destinationPath.StartsWith( + $canonicalResourcesPrefix, + [StringComparison]::OrdinalIgnoreCase + )) { + throw 'Hosted resource destination escaped the canonical repository resources root.' + } + [IO.Directory]::CreateDirectory((Split-Path $destinationPath -Parent)) | Out-Null + if (Test-Path -LiteralPath $destinationPath) { + $existing = Get-TrustedPath ` + $destinationPath 'Existing canonical resource' -AllowHardLink + if ((Get-FileHash -LiteralPath $existing -Algorithm SHA256).Hash -cne + [string]$entry.sha256) { + throw 'Tracked canonical resource differs from the hosted build receipt.' + } + } else { + [IO.File]::Copy($sourcePath, $destinationPath, $false) + } + $materialized = Get-Item -LiteralPath $destinationPath -Force + $materializedEntries.Add([pscustomobject][ordered]@{ + path = $relative + size = [long]$materialized.Length + sha256 = (Get-FileHash -LiteralPath $destinationPath -Algorithm SHA256).Hash + }) + } + if (@(Get-ChildItem -LiteralPath $canonicalResourcesRoot -Recurse -Force -File).Count -ne + $resourceEntries.Count -or + (Get-WaggleInventorySha256 @($materializedEntries)) -cne + [string]$receipt.resourcesInventory.sha256) { + throw 'Materialized canonical repository resources differ from the hosted build receipt.' + } + $canonicalService = Get-TrustedPath ` + (Join-Path $canonicalResourcesRoot 'service.js') ` + 'Canonical source-bound service.js' + "unsigned_root=$unsignedRoot" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "signing_root=$signingRoot" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "receipt_path=$signingReceiptForPackage" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "source_service_path=$canonicalService" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + + - name: Provision pinned Artifact Signing client package + id: artifact-signing-package + shell: pwsh + run: | + $packagePath = Join-Path $env:RUNNER_TEMP 'Microsoft.ArtifactSigning.Client.1.0.128.nupkg' + if (Test-Path -LiteralPath $packagePath) { throw 'Artifact Signing package destination already exists.' } + Invoke-WebRequest ` + -Uri 'https://www.nuget.org/api/v2/package/Microsoft.ArtifactSigning.Client/1.0.128' ` + -OutFile $packagePath ` + -UseBasicParsing + $actualSha256 = (Get-FileHash -LiteralPath $packagePath -Algorithm SHA256).Hash + if ($actualSha256 -cne '74BD7D27E6CE1051409C38D9B46BC8DF0400ECD643D51FFBF2AC00869061E40B') { + throw 'Official Artifact Signing package does not match the repository-pinned SHA-256.' + } + "package_path=$packagePath" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + + - name: Validate protected Azure OIDC bindings + shell: pwsh + env: + AZURE_CLIENT_ID: ${{ vars.AZURE_CLIENT_ID }} + AZURE_TENANT_ID: ${{ vars.AZURE_TENANT_ID }} + AZURE_SUBSCRIPTION_ID: ${{ vars.AZURE_SUBSCRIPTION_ID }} + run: | + foreach ($entry in @( + @('AZURE_CLIENT_ID', [string]$env:AZURE_CLIENT_ID), + @('AZURE_TENANT_ID', [string]$env:AZURE_TENANT_ID), + @('AZURE_SUBSCRIPTION_ID', [string]$env:AZURE_SUBSCRIPTION_ID) + )) { + if ([string]$entry[1] -cnotmatch '^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$' -or + [string]$entry[1] -cne ([string]$entry[1]).Trim()) { + throw "$([string]$entry[0]) must be one exact GUID in the protected signing environment." + } + } + + - name: Provision pinned portable signing toolchain + id: portable-toolchain + shell: pwsh + run: | + $stageRoot = Join-Path $env:RUNNER_TEMP 'waggle-portable-signing-stage' + $root = Join-Path $stageRoot 'toolchain' + if (Test-Path -LiteralPath $root) { throw 'Portable signing toolchain root already exists.' } + . ./app/scripts/sign-windows-artifact.ps1 + $root = New-PrivateDirectory $root + $downloads = Join-Path $stageRoot 'downloads' + New-Item -ItemType Directory -Path $downloads | Out-Null + $packages = @( + [pscustomobject]@{ + Name = 'node.zip' + Uri = 'https://nodejs.org/dist/v22.22.2/node-v22.22.2-win-x64.zip' + Sha256 = '7C93E9D92BF68C07182B471AA187E35EE6CD08EF0F24AB060DFFF605FCC1C57C' + }, + [pscustomobject]@{ + Name = 'mingit.zip' + Uri = 'https://github.com/git-for-windows/git/releases/download/v2.51.0.windows.1/MinGit-2.51.0-64-bit.zip' + Sha256 = 'C2C955A21FA99889D83F485F24FA5D9A38FFFC2D509D4022385510E11C26B250' + }, + [pscustomobject]@{ + Name = 'sevenzip.exe' + Uri = 'https://www.7-zip.org/a/7z2501-x64.exe' + Sha256 = '78AFA2A1C773CAF3CF7EDF62F857D2A8A5DA55FB0FFF5DA416074C0D28B2B55F' + } + ) + foreach ($package in $packages) { + $path = Join-Path $downloads $package.Name + Invoke-WebRequest -Uri $package.Uri -OutFile $path -UseBasicParsing + if ((Get-FileHash -LiteralPath $path -Algorithm SHA256).Hash -cne $package.Sha256) { + throw "Portable signing package has the wrong SHA-256: $($package.Name)" + } + } + $nodeRoot = Join-Path $root 'node' + $gitRoot = Join-Path $root 'git' + $sevenZipRoot = Join-Path $root 'sevenzip' + Expand-Archive -LiteralPath (Join-Path $downloads 'node.zip') -DestinationPath $nodeRoot + Expand-Archive -LiteralPath (Join-Path $downloads 'mingit.zip') -DestinationPath $gitRoot + New-Item -ItemType Directory -Path $sevenZipRoot | Out-Null + & 'C:\Windows\System32\tar.exe' ` + -xf (Join-Path $downloads 'sevenzip.exe') ` + -C $sevenZipRoot + if ($LASTEXITCODE -ne 0) { throw 'Pinned 7-Zip package extraction failed.' } + $nodePath = Join-Path $nodeRoot 'node-v22.22.2-win-x64\node.exe' + $gitPath = Join-Path $gitRoot 'cmd\git.exe' + $gitRuntimePath = Join-Path $gitRoot 'mingw64\bin\git.exe' + $sevenZipPath = Join-Path $sevenZipRoot '7z.exe' + $sevenZipDllPath = Join-Path $sevenZipRoot '7z.dll' + $innerFiles = @( + @($nodePath, 'AE1A50511BE58E987483FDBC12125407443926D2D394669ADE2352776E920DD3'), + @($gitPath, '34A408843194BE320D8A87A3C12CD5C7D2E08D03B24567A41DB32E21D12569D2'), + @($gitRuntimePath, '755D4896D35663D0FF08924F84507F35236B83D240635B512C519BF43CC71A87'), + @($sevenZipPath, '4CD7D776C686427226A151789D2D61F0B2ED2C392148CC4E69C0238362FAFECF'), + @($sevenZipDllPath, '5BD20FB38499D95C39594F41D4781B6181B3304B7F1F4D06B0182F514E7EAA74') + ) + foreach ($binding in $innerFiles) { + $path = [IO.Path]::GetFullPath([string]$binding[0]) + if (-not $path.StartsWith( + [IO.Path]::GetFullPath($root).TrimEnd('\') + '\', + [StringComparison]::OrdinalIgnoreCase + ) -or + -not (Test-Path -LiteralPath $path -PathType Leaf) -or + (Get-FileHash -LiteralPath $path -Algorithm SHA256).Hash -cne [string]$binding[1]) { + throw 'Portable signing toolchain inner binary does not match its pinned identity.' + } + } + $nodeSignature = Get-AuthenticodeSignature -LiteralPath $nodePath + $gitSignature = Get-AuthenticodeSignature -LiteralPath $gitPath + $gitRuntimeSignature = Get-AuthenticodeSignature -LiteralPath $gitRuntimePath + if ($nodeSignature.Status -ne 'Valid' -or + [string]$nodeSignature.SignerCertificate.Subject -cne + 'CN=OpenJS Foundation, O=OpenJS Foundation, L=San Francisco, S=California, C=US' -or + $gitSignature.Status -ne 'Valid' -or + [string]$gitSignature.SignerCertificate.Subject -cne + 'CN=Johannes Schindelin, O=Johannes Schindelin, S=Nordrhein-Westfalen, C=DE' -or + $gitRuntimeSignature.Status -ne 'Valid' -or + [string]$gitRuntimeSignature.SignerCertificate.Subject -cne + 'CN=Johannes Schindelin, O=Johannes Schindelin, S=Nordrhein-Westfalen, C=DE') { + throw 'Portable Node.js or Git lacks its approved Authenticode publisher evidence.' + } + $allowedFiles = @( + Get-ChildItem -LiteralPath $root -Recurse -Force | + Where-Object { -not $_.PSIsContainer } + ) + foreach ($file in $allowedFiles) { + if (($file.Attributes -band [IO.FileAttributes]::ReparsePoint) -ne 0 -or + @(Get-Item -LiteralPath $file.FullName -Stream *).Count -ne 1) { + throw "Portable signing toolchain contains a linked file or alternate data stream: $($file.FullName)" + } + } + $toolchainInventory = New-WagglePrebuiltInventory -Root $root + if (@($toolchainInventory.entries).Count -ne 2495 -or + [string]$toolchainInventory.sha256 -cne + 'D64F897D4E1A7F07FE9BA62D6AF062EF9F0E41C595CDAF2F3C4F73991BBEA0F5') { + throw 'Portable signing toolchain differs from the pinned official extracted closure.' + } + $receiptPath = Join-Path $stageRoot 'portable-toolchain-receipt.json' + if (Test-Path -LiteralPath $receiptPath) { + throw 'Portable signing toolchain receipt destination already exists.' + } + $toolchainReceipt = [ordered]@{ + schemaVersion = 1 + portableToolchainRoot = [IO.Path]::GetFullPath($root) + archives = [ordered]@{ + node = [ordered]@{ + path = [IO.Path]::GetFullPath((Join-Path $downloads 'node.zip')) + sha256 = '7C93E9D92BF68C07182B471AA187E35EE6CD08EF0F24AB060DFFF605FCC1C57C' + } + git = [ordered]@{ + path = [IO.Path]::GetFullPath((Join-Path $downloads 'mingit.zip')) + sha256 = 'C2C955A21FA99889D83F485F24FA5D9A38FFFC2D509D4022385510E11C26B250' + } + sevenZip = [ordered]@{ + path = [IO.Path]::GetFullPath((Join-Path $downloads 'sevenzip.exe')) + sha256 = '78AFA2A1C773CAF3CF7EDF62F857D2A8A5DA55FB0FFF5DA416074C0D28B2B55F' + } + } + inventory = $toolchainInventory + } + Write-WaggleJsonNoBom $receiptPath $toolchainReceipt + $receiptSha256 = (Get-FileHash -LiteralPath $receiptPath -Algorithm SHA256).Hash + if ($receiptSha256 -notmatch '^[0-9A-F]{64}$') { + throw 'Portable signing toolchain receipt digest is invalid.' + } + "root=$root" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "node_path=$nodePath" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "git_path=$gitPath" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "sevenzip_path=$sevenZipPath" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "receipt_path=$receiptPath" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "receipt_sha256=$receiptSha256" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + + - name: Stage fully inventoried Windows signing preparation + id: stage-prepared + shell: pwsh + env: + WAGGLE_RELEASE_MODE: ${{ steps.release-mode.outputs.mode }} + WAGGLE_CANDIDATE_VERSION: ${{ steps.release-mode.outputs.candidate_version }} + WINDOWS_BOOTSTRAP_RELEASE_IDENTITY: ${{ steps.release-mode.outputs.bootstrap_identity }} + WINDOWS_UPGRADE_BASE_TAG: ${{ steps.release-mode.outputs.upgrade_base_tag }} + WINDOWS_UPGRADE_BASE_ASSET_NAME: ${{ steps.release-mode.outputs.upgrade_base_asset_name }} + WINDOWS_UPGRADE_BASE_SHA256: ${{ steps.release-mode.outputs.upgrade_base_sha256 }} + WINDOWS_UPGRADE_BASE_COMMIT: ${{ steps.release-mode.outputs.upgrade_base_commit }} + WINDOWS_CODESIGN_APPROVED_SUBJECT: ${{ steps.signer-identity.outputs.subject }} + AZURE_CLIENT_ID: ${{ vars.AZURE_CLIENT_ID }} + AZURE_TENANT_ID: ${{ vars.AZURE_TENANT_ID }} + AZURE_SUBSCRIPTION_ID: ${{ vars.AZURE_SUBSCRIPTION_ID }} + EXPECTED_BUILD_RECEIPT_SHA256: ${{ needs.build-windows-prebuilt.outputs.build_receipt_sha256 }} + EXPECTED_BUILD_ARTIFACT_ID: ${{ needs.build-windows-prebuilt.outputs.artifact_id }} + EXPECTED_BUILD_ARTIFACT_DIGEST: ${{ needs.build-windows-prebuilt.outputs.artifact_digest }} + EXPECTED_BUILD_HANDOFF_SIZE_BYTES: ${{ needs.build-windows-prebuilt.outputs.handoff_size_bytes }} + run: | + function Write-WaggleJsonNoBom { + param([string]$Path, [object]$Value) + [IO.File]::WriteAllText( + $Path, + ($Value | ConvertTo-Json -Depth 32), + [Text.UTF8Encoding]::new($false) + ) + } + + function Copy-WagglePreparedItem { + param([string]$Source, [string]$Destination, [string]$Kind = 'Leaf') + if (-not (Test-Path -LiteralPath $Source -PathType $Kind) -or + (Test-Path -LiteralPath $Destination)) { + throw "Signing preparation source is missing or destination already exists: $Destination" + } + [IO.Directory]::CreateDirectory((Split-Path $Destination -Parent)) | Out-Null + Copy-Item -LiteralPath $Source -Destination $Destination -Recurse -ErrorAction Stop + } + + function Assert-WagglePreparedTree { + param([string]$Root, [string]$Label) + $trustedRoot = [IO.Path]::GetFullPath((Resolve-Path -LiteralPath $Root).Path) + $items = @(Get-ChildItem -LiteralPath $trustedRoot -Recurse -Force) + $maxItems = [int]$env:WINDOWS_SIGNING_TRANSPORT_MAX_ITEMS + if ($items.Count -gt $maxItems) { + throw "$Label exceeds the bounded $maxItems-item transport envelope." + } + foreach ($item in $items) { + $linkProperty = $item.PSObject.Properties['LinkType'] + $linkType = if ($null -eq $linkProperty) { '' } else { [string]$linkProperty.Value } + if (($item.Attributes -band [IO.FileAttributes]::ReparsePoint) -ne 0 -or + -not [string]::IsNullOrEmpty($linkType)) { + throw "$Label contains a linked or reparse filesystem object." + } + if (-not $item.PSIsContainer -and + @(Get-Item -LiteralPath $item.FullName -Stream *).Count -ne 1) { + throw "$Label contains a file with an alternate data stream." + } + } + } + + foreach ($digest in @( + [string]$env:EXPECTED_BUILD_RECEIPT_SHA256, + [string]$env:EXPECTED_BUILD_ARTIFACT_DIGEST + )) { + if ($digest -cnotmatch '^[0-9A-Fa-f]{64}$') { + throw 'Signing preparation received an invalid upstream digest.' + } + } + if ($env:EXPECTED_BUILD_ARTIFACT_ID -cnotmatch '^[1-9][0-9]*$' -or + $env:EXPECTED_BUILD_HANDOFF_SIZE_BYTES -cnotmatch '^[1-9][0-9]*$') { + throw 'Signing preparation received an invalid upstream artifact identity or size.' + } + + . ./app/scripts/sign-windows-artifact.ps1 + $preparedRoot = Join-Path $env:RUNNER_TEMP 'waggle-windows-signing-preparation' + $payloadRoot = Join-Path $preparedRoot 'payload' + if (Test-Path -LiteralPath $preparedRoot) { + throw 'Windows signing preparation root already exists.' + } + [IO.Directory]::CreateDirectory($payloadRoot) | Out-Null + + foreach ($variant in @('unsigned', 'signing')) { + $sourceRoot = Join-Path $env:RUNNER_TEMP "waggle-prebuilt-$variant" + $destinationRoot = Join-Path $payloadRoot "raw\$variant" + foreach ($relative in @('build-receipt.json', 'prebuilt', 'nsis-toolchain')) { + $kind = if ($relative -eq 'build-receipt.json') { 'Leaf' } else { 'Container' } + Copy-WagglePreparedItem ` + (Join-Path $sourceRoot $relative) (Join-Path $destinationRoot $relative) $kind + } + } + + $artifactSigningDestination = Join-Path $payloadRoot ` + 'artifact-signing\Microsoft.ArtifactSigning.Client.1.0.128.nupkg' + Copy-WagglePreparedItem ` + '${{ steps.artifact-signing-package.outputs.package_path }}' ` + $artifactSigningDestination + if ((Get-FileHash -LiteralPath $artifactSigningDestination -Algorithm SHA256).Hash -cne + '74BD7D27E6CE1051409C38D9B46BC8DF0400ECD643D51FFBF2AC00869061E40B') { + throw 'Staged Artifact Signing package differs from its pinned identity.' + } + + $portableSourceRoot = '${{ steps.portable-toolchain.outputs.root }}' + $portableSourceReceiptPath = '${{ steps.portable-toolchain.outputs.receipt_path }}' + $portableSourceReceipt = Get-Content -Raw -LiteralPath $portableSourceReceiptPath | + ConvertFrom-Json -Depth 32 + if ([int]$portableSourceReceipt.schemaVersion -ne 1 -or + [string]$portableSourceReceipt.portableToolchainRoot -cne + [IO.Path]::GetFullPath($portableSourceRoot) -or + @($portableSourceReceipt.inventory.entries).Count -ne 2495 -or + [string]$portableSourceReceipt.inventory.sha256 -cne + 'D64F897D4E1A7F07FE9BA62D6AF062EF9F0E41C595CDAF2F3C4F73991BBEA0F5') { + throw 'Portable signing toolchain source receipt is not the pinned semantic closure.' + } + Copy-WagglePreparedItem ` + $portableSourceRoot (Join-Path $payloadRoot 'portable\toolchain') 'Container' + $portableDownloadsSource = Join-Path (Split-Path $portableSourceRoot -Parent) 'downloads' + Copy-WagglePreparedItem ` + $portableDownloadsSource (Join-Path $payloadRoot 'portable\downloads') 'Container' + $relativePortableReceipt = [ordered]@{ + schemaVersion = 1 + portableToolchainRoot = 'portable\toolchain' + archives = [ordered]@{ + node = [ordered]@{ + path = 'portable\downloads\node.zip' + sha256 = '7C93E9D92BF68C07182B471AA187E35EE6CD08EF0F24AB060DFFF605FCC1C57C' + } + git = [ordered]@{ + path = 'portable\downloads\mingit.zip' + sha256 = 'C2C955A21FA99889D83F485F24FA5D9A38FFFC2D509D4022385510E11C26B250' + } + sevenZip = [ordered]@{ + path = 'portable\downloads\sevenzip.exe' + sha256 = '78AFA2A1C773CAF3CF7EDF62F857D2A8A5DA55FB0FFF5DA416074C0D28B2B55F' + } + } + inventory = $portableSourceReceipt.inventory + } + Write-WaggleJsonNoBom ` + (Join-Path $payloadRoot 'portable\portable-toolchain-receipt.json') ` + $relativePortableReceipt + + $tauriDestination = Join-Path $payloadRoot 'tauri\node_modules\@tauri-apps' + foreach ($packageName in @('cli', 'cli-win32-x64-msvc')) { + $sourcePackage = Join-Path 'app\node_modules\@tauri-apps' $packageName + $package = Get-Content -Raw -LiteralPath (Join-Path $sourcePackage 'package.json') | + ConvertFrom-Json + if ([string]$package.name -cne "@tauri-apps/$packageName" -or + [string]$package.version -cne '2.10.1') { + throw "Prepared Tauri package is not the locked Windows package: $packageName" + } + Copy-WagglePreparedItem ` + $sourcePackage (Join-Path $tauriDestination $packageName) 'Container' + } + + Assert-WagglePreparedTree $payloadRoot 'Windows signing preparation payload' + $payloadInventory = New-WagglePrebuiltInventory -Root $payloadRoot + $allowedPrefixes = @( + 'raw\unsigned\', + 'raw\signing\', + 'portable\toolchain\', + 'portable\downloads\', + 'tauri\node_modules\@tauri-apps\cli\', + 'tauri\node_modules\@tauri-apps\cli-win32-x64-msvc\' + ) + $allowedExact = @( + 'artifact-signing\Microsoft.ArtifactSigning.Client.1.0.128.nupkg', + 'portable\portable-toolchain-receipt.json' + ) + foreach ($entry in @($payloadInventory.entries)) { + $relative = [string]$entry.path + $allowed = $allowedExact -ccontains $relative + foreach ($prefix in $allowedPrefixes) { + if ($relative.StartsWith($prefix, [StringComparison]::Ordinal)) { + $allowed = $true + break + } + } + if (-not $allowed) { + throw "Windows signing preparation contains a non-allowlisted payload path: $relative" + } + } + + $preparationReceipt = [ordered]@{ + schemaVersion = 1 + repository = 'marolinik/waggle-os' + sourceRevision = $env:GITHUB_SHA + candidateTag = $env:GITHUB_REF_NAME + candidateVersion = $env:WAGGLE_CANDIDATE_VERSION + workflowRef = $env:GITHUB_WORKFLOW_REF + workflowSha = $env:GITHUB_WORKFLOW_SHA + release = [ordered]@{ + mode = $env:WAGGLE_RELEASE_MODE + bootstrapIdentity = $env:WINDOWS_BOOTSTRAP_RELEASE_IDENTITY + upgradeBaseTag = $env:WINDOWS_UPGRADE_BASE_TAG + upgradeBaseAssetName = $env:WINDOWS_UPGRADE_BASE_ASSET_NAME + upgradeBaseSha256 = $env:WINDOWS_UPGRADE_BASE_SHA256 + upgradeBaseCommit = $env:WINDOWS_UPGRADE_BASE_COMMIT + } + signerSubject = $env:WINDOWS_CODESIGN_APPROVED_SUBJECT + build = [ordered]@{ + receiptSha256 = $env:EXPECTED_BUILD_RECEIPT_SHA256.ToUpperInvariant() + artifactId = $env:EXPECTED_BUILD_ARTIFACT_ID + artifactDigest = $env:EXPECTED_BUILD_ARTIFACT_DIGEST.ToUpperInvariant() + handoffSizeBytes = $env:EXPECTED_BUILD_HANDOFF_SIZE_BYTES + } + azure = [ordered]@{ + clientId = $env:AZURE_CLIENT_ID + tenantId = $env:AZURE_TENANT_ID + subscriptionId = $env:AZURE_SUBSCRIPTION_ID + audience = 'api://AzureADTokenExchange' + } + payloadInventory = $payloadInventory + } + $preparationReceiptPath = Join-Path $preparedRoot 'preparation-receipt.json' + Write-WaggleJsonNoBom $preparationReceiptPath $preparationReceipt + Assert-WagglePreparedTree $preparedRoot 'Windows signing preparation artifact' + $receiptSha256 = (Get-FileHash -LiteralPath $preparationReceiptPath -Algorithm SHA256).Hash + $sizeBytes = [long]( + Get-ChildItem -LiteralPath $preparedRoot -Recurse -Force -File | + Measure-Object -Property Length -Sum + ).Sum + if ($receiptSha256 -cnotmatch '^[0-9A-F]{64}$' -or $sizeBytes -le 0) { + throw 'Windows signing preparation receipt or aggregate size is invalid.' + } + "receipt_sha256=$receiptSha256" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "size_bytes=$sizeBytes" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + + - name: Upload immutable prepared Windows signing handoff + id: upload-prepared + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4 + with: + name: waggle-windows-signing-prepared-${{ github.sha }} + path: ${{ runner.temp }}\waggle-windows-signing-preparation + if-no-files-found: error + include-hidden-files: true + retention-days: 7 + + sign-windows: + needs: [build-windows-prebuilt, prepare-windows-signing] + runs-on: windows-latest + permissions: + contents: read + id-token: write + outputs: + release_mode: ${{ needs.prepare-windows-signing.outputs.release_mode }} + candidate_sha256: ${{ steps.stage-signed.outputs.candidate_sha256 }} + candidate_version: ${{ steps.stage-signed.outputs.candidate_version }} + bootstrap_identity: ${{ needs.prepare-windows-signing.outputs.bootstrap_identity }} + upgrade_base_tag: ${{ needs.prepare-windows-signing.outputs.upgrade_base_tag }} + upgrade_base_asset_name: ${{ needs.prepare-windows-signing.outputs.upgrade_base_asset_name }} + upgrade_base_sha256: ${{ needs.prepare-windows-signing.outputs.upgrade_base_sha256 }} + upgrade_base_commit: ${{ needs.prepare-windows-signing.outputs.upgrade_base_commit }} + signer_subject: ${{ needs.prepare-windows-signing.outputs.signer_subject }} + build_receipt_sha256: ${{ needs.build-windows-prebuilt.outputs.build_receipt_sha256 }} + build_artifact_id: ${{ needs.build-windows-prebuilt.outputs.artifact_id }} + build_artifact_digest: ${{ needs.build-windows-prebuilt.outputs.artifact_digest }} + handoff_receipt_sha256: ${{ steps.stage-signed.outputs.receipt_sha256 }} + artifact_id: ${{ steps.upload-signed.outputs.artifact-id }} + artifact_digest: ${{ steps.upload-signed.outputs.artifact-digest }} + steps: + - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 + with: + fetch-depth: 0 + persist-credentials: false + + - name: Validate exact hosted OIDC release boundary + shell: pwsh + run: | + $version = [string](Get-Content -Raw -LiteralPath 'app/src-tauri/tauri.conf.json' | ConvertFrom-Json).version + if ($env:GITHUB_ACTIONS -cne 'true' -or + $env:GITHUB_EVENT_NAME -cne 'push' -or + $env:GITHUB_REPOSITORY -cne 'marolinik/waggle-os' -or + $env:GITHUB_REF_TYPE -cne 'tag' -or + $env:GITHUB_REF -cne "refs/tags/v$version" -or + $env:GITHUB_REF_NAME -cne "v$version" -or + $env:GITHUB_WORKFLOW_REF -cne "marolinik/waggle-os/.github/workflows/release.yml@$env:GITHUB_REF" -or + $env:GITHUB_WORKFLOW_SHA -cne $env:GITHUB_SHA -or + $env:RUNNER_ENVIRONMENT -cne 'github-hosted' -or + $env:GITHUB_SHA -cnotmatch '^[0-9a-f]{40}$') { + throw 'Windows signing requires the exact hosted push, repository, tag, workflow, and revision boundary.' + } + $checkedOutRevision = (git rev-parse --verify HEAD).Trim().ToLowerInvariant() + if ($LASTEXITCODE -ne 0 -or $checkedOutRevision -cne $env:GITHUB_SHA -or + @(git status --porcelain=v1 --untracked-files=all).Count -ne 0) { + throw 'Windows signing checkout is not the clean GITHUB_SHA revision.' + } + + - name: Validate initial signing revision on fresh origin main + shell: pwsh + run: | + $checkedOutRevision = (git rev-parse --verify HEAD).Trim().ToLowerInvariant() + $remoteMainRevision = (git rev-parse --verify refs/remotes/origin/main).Trim().ToLowerInvariant() + if ($LASTEXITCODE -ne 0 -or + $checkedOutRevision -cne $env:GITHUB_SHA -or + $env:GITHUB_WORKFLOW_SHA -cne $env:GITHUB_SHA -or + $remoteMainRevision -cnotmatch '^[0-9a-f]{40}$' -or + @(git status --porcelain=v1 --untracked-files=all).Count -ne 0) { + throw 'Initial signing checkout, workflow, or origin/main revision evidence is invalid.' + } + git merge-base --is-ancestor $env:GITHUB_SHA refs/remotes/origin/main + if ($LASTEXITCODE -ne 0) { + throw 'The exact signing revision is not contained by initial fresh origin/main.' + } + + - name: Download immutable prepared Windows signing handoff + uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4 + with: + artifact-ids: ${{ needs.prepare-windows-signing.outputs.artifact_id }} + path: ${{ runner.temp }}\waggle-windows-signing-prepared + merge-multiple: true + + - name: Verify and restore immutable prepared Windows signing handoff + id: verify-prepared + shell: pwsh + env: + EXPECTED_PREPARATION_RECEIPT_SHA256: ${{ needs.prepare-windows-signing.outputs.preparation_receipt_sha256 }} + EXPECTED_PREPARATION_ARTIFACT_ID: ${{ needs.prepare-windows-signing.outputs.artifact_id }} + EXPECTED_PREPARATION_ARTIFACT_DIGEST: ${{ needs.prepare-windows-signing.outputs.artifact_digest }} + EXPECTED_PREPARATION_SIZE_BYTES: ${{ needs.prepare-windows-signing.outputs.preparation_size_bytes }} + EXPECTED_RELEASE_MODE: ${{ needs.prepare-windows-signing.outputs.release_mode }} + EXPECTED_CANDIDATE_VERSION: ${{ needs.prepare-windows-signing.outputs.candidate_version }} + EXPECTED_BOOTSTRAP_IDENTITY: ${{ needs.prepare-windows-signing.outputs.bootstrap_identity }} + EXPECTED_UPGRADE_BASE_TAG: ${{ needs.prepare-windows-signing.outputs.upgrade_base_tag }} + EXPECTED_UPGRADE_BASE_ASSET_NAME: ${{ needs.prepare-windows-signing.outputs.upgrade_base_asset_name }} + EXPECTED_UPGRADE_BASE_SHA256: ${{ needs.prepare-windows-signing.outputs.upgrade_base_sha256 }} + EXPECTED_UPGRADE_BASE_COMMIT: ${{ needs.prepare-windows-signing.outputs.upgrade_base_commit }} + EXPECTED_SIGNER_SUBJECT: ${{ needs.prepare-windows-signing.outputs.signer_subject }} + EXPECTED_BUILD_RECEIPT_SHA256: ${{ needs.build-windows-prebuilt.outputs.build_receipt_sha256 }} + EXPECTED_BUILD_ARTIFACT_ID: ${{ needs.build-windows-prebuilt.outputs.artifact_id }} + EXPECTED_BUILD_ARTIFACT_DIGEST: ${{ needs.build-windows-prebuilt.outputs.artifact_digest }} + EXPECTED_BUILD_HANDOFF_SIZE_BYTES: ${{ needs.build-windows-prebuilt.outputs.handoff_size_bytes }} + AZURE_CLIENT_ID: ${{ vars.AZURE_CLIENT_ID }} + AZURE_TENANT_ID: ${{ vars.AZURE_TENANT_ID }} + AZURE_SUBSCRIPTION_ID: ${{ vars.AZURE_SUBSCRIPTION_ID }} + run: | + function Write-WaggleJsonNoBom { + param([string]$Path, [object]$Value) + [IO.File]::WriteAllText( + $Path, + ($Value | ConvertTo-Json -Depth 32), + [Text.UTF8Encoding]::new($false) + ) + } + + function Assert-WaggleTransportTree { + param([string]$Root, [string]$Label) + $items = @(Get-ChildItem -LiteralPath $Root -Recurse -Force) + $maxItems = [int]$env:WINDOWS_SIGNING_TRANSPORT_MAX_ITEMS + if ($items.Count -gt $maxItems) { + throw "$Label exceeds the bounded $maxItems-item transport envelope." + } + foreach ($item in $items) { + $linkProperty = $item.PSObject.Properties['LinkType'] + $linkType = if ($null -eq $linkProperty) { '' } else { [string]$linkProperty.Value } + if (($item.Attributes -band [IO.FileAttributes]::ReparsePoint) -ne 0 -or + -not [string]::IsNullOrEmpty($linkType)) { + throw "$Label contains a linked or reparse filesystem object." + } + if (-not $item.PSIsContainer -and + @(Get-Item -LiteralPath $item.FullName -Stream *).Count -ne 1) { + throw "$Label contains a file with an alternate data stream." + } + } + } + + function Assert-WaggleExactValue { + param([object]$Actual, [string]$Expected, [string]$Label) + if ([string]$Actual -cne $Expected) { + throw "Prepared Windows signing binding differs: $Label" + } + } + + $preparedRoot = [IO.Path]::GetFullPath( + (Resolve-Path -LiteralPath (Join-Path $env:RUNNER_TEMP 'waggle-windows-signing-prepared')).Path + ) + $payloadRoot = Join-Path $preparedRoot 'payload' + $receiptPath = Join-Path $preparedRoot 'preparation-receipt.json' + foreach ($digest in @( + [string]$env:EXPECTED_PREPARATION_RECEIPT_SHA256, + [string]$env:EXPECTED_PREPARATION_ARTIFACT_DIGEST, + [string]$env:EXPECTED_BUILD_RECEIPT_SHA256, + [string]$env:EXPECTED_BUILD_ARTIFACT_DIGEST + )) { + if ($digest -cnotmatch '^[0-9A-Fa-f]{64}$') { + throw 'Prepared Windows signing digest binding is invalid.' + } + } + if ($env:EXPECTED_PREPARATION_ARTIFACT_ID -cnotmatch '^[1-9][0-9]*$' -or + $env:EXPECTED_BUILD_ARTIFACT_ID -cnotmatch '^[1-9][0-9]*$' -or + $env:EXPECTED_PREPARATION_SIZE_BYTES -cnotmatch '^[1-9][0-9]*$') { + throw 'Prepared Windows signing artifact identity or size binding is invalid.' + } + Assert-WaggleTransportTree $preparedRoot 'Prepared Windows signing artifact' + $actualSizeBytes = [long]( + Get-ChildItem -LiteralPath $preparedRoot -Recurse -Force -File | + Measure-Object -Property Length -Sum + ).Sum + if (-not (Test-Path -LiteralPath $payloadRoot -PathType Container) -or + -not (Test-Path -LiteralPath $receiptPath -PathType Leaf) -or + $actualSizeBytes -ne [long]$env:EXPECTED_PREPARATION_SIZE_BYTES -or + (Get-FileHash -LiteralPath $receiptPath -Algorithm SHA256).Hash -cne + $env:EXPECTED_PREPARATION_RECEIPT_SHA256.ToUpperInvariant()) { + throw 'Prepared Windows signing artifact differs from its immutable receipt or size.' + } + + . ./app/scripts/sign-windows-artifact.ps1 + $receipt = Get-Content -Raw -LiteralPath $receiptPath | ConvertFrom-Json -Depth 32 + if ([int]$receipt.schemaVersion -ne 1) { + throw 'Prepared Windows signing receipt schema is invalid.' + } + Assert-WaggleExactValue $receipt.repository 'marolinik/waggle-os' 'repository' + Assert-WaggleExactValue $receipt.sourceRevision $env:GITHUB_SHA 'sourceRevision' + Assert-WaggleExactValue $receipt.candidateTag $env:GITHUB_REF_NAME 'candidateTag' + Assert-WaggleExactValue $receipt.candidateVersion $env:EXPECTED_CANDIDATE_VERSION 'candidateVersion' + Assert-WaggleExactValue $receipt.workflowRef $env:GITHUB_WORKFLOW_REF 'workflowRef' + Assert-WaggleExactValue $receipt.workflowSha $env:GITHUB_WORKFLOW_SHA 'workflowSha' + Assert-WaggleExactValue $receipt.release.mode $env:EXPECTED_RELEASE_MODE 'release.mode' + Assert-WaggleExactValue $receipt.release.bootstrapIdentity $env:EXPECTED_BOOTSTRAP_IDENTITY 'release.bootstrapIdentity' + Assert-WaggleExactValue $receipt.release.upgradeBaseTag $env:EXPECTED_UPGRADE_BASE_TAG 'release.upgradeBaseTag' + Assert-WaggleExactValue $receipt.release.upgradeBaseAssetName $env:EXPECTED_UPGRADE_BASE_ASSET_NAME 'release.upgradeBaseAssetName' + Assert-WaggleExactValue $receipt.release.upgradeBaseSha256 $env:EXPECTED_UPGRADE_BASE_SHA256 'release.upgradeBaseSha256' + Assert-WaggleExactValue $receipt.release.upgradeBaseCommit $env:EXPECTED_UPGRADE_BASE_COMMIT 'release.upgradeBaseCommit' + Assert-WaggleExactValue $receipt.signerSubject $env:EXPECTED_SIGNER_SUBJECT 'signerSubject' + Assert-WaggleExactValue $receipt.build.receiptSha256 $env:EXPECTED_BUILD_RECEIPT_SHA256.ToUpperInvariant() 'build.receiptSha256' + Assert-WaggleExactValue $receipt.build.artifactId $env:EXPECTED_BUILD_ARTIFACT_ID 'build.artifactId' + Assert-WaggleExactValue $receipt.build.artifactDigest $env:EXPECTED_BUILD_ARTIFACT_DIGEST.ToUpperInvariant() 'build.artifactDigest' + Assert-WaggleExactValue $receipt.build.handoffSizeBytes $env:EXPECTED_BUILD_HANDOFF_SIZE_BYTES 'build.handoffSizeBytes' + Assert-WaggleExactValue $receipt.azure.clientId $env:AZURE_CLIENT_ID 'azure.clientId' + Assert-WaggleExactValue $receipt.azure.tenantId $env:AZURE_TENANT_ID 'azure.tenantId' + Assert-WaggleExactValue $receipt.azure.subscriptionId $env:AZURE_SUBSCRIPTION_ID 'azure.subscriptionId' + Assert-WaggleExactValue $receipt.azure.audience 'api://AzureADTokenExchange' 'azure.audience' + + $actualPayloadInventory = New-WagglePrebuiltInventory -Root $payloadRoot + if (($actualPayloadInventory | ConvertTo-Json -Depth 32 -Compress) -cne + ($receipt.payloadInventory | ConvertTo-Json -Depth 32 -Compress)) { + throw 'Prepared Windows signing payload differs from its canonical inventory.' + } + + $unsignedRoot = Get-TrustedPath ` + (Join-Path $payloadRoot 'raw\unsigned\prebuilt') 'Prepared unsigned root' 'Container' + $signingRoot = Get-TrustedPath ` + (Join-Path $payloadRoot 'raw\signing\prebuilt') 'Prepared signing root' 'Container' + $unsignedReceipt = Get-TrustedPath ` + (Join-Path $payloadRoot 'raw\unsigned\build-receipt.json') 'Prepared unsigned build receipt' + $signingReceipt = Get-TrustedPath ` + (Join-Path $payloadRoot 'raw\signing\build-receipt.json') 'Prepared signing build receipt' + foreach ($buildReceiptPath in @($unsignedReceipt, $signingReceipt)) { + if ((Get-FileHash -LiteralPath $buildReceiptPath -Algorithm SHA256).Hash -cne + $env:EXPECTED_BUILD_RECEIPT_SHA256.ToUpperInvariant()) { + throw 'Prepared raw handoff receipt differs from the immutable build receipt.' + } + } + $buildReceipt = Get-Content -Raw -LiteralPath $unsignedReceipt | ConvertFrom-Json -Depth 32 + foreach ($rawRoot in @($unsignedRoot, $signingRoot)) { + $rawInventory = New-WagglePrebuiltInventory -Root $rawRoot + if (($rawInventory | ConvertTo-Json -Depth 32 -Compress) -cne + ($buildReceipt.targetInventory | ConvertTo-Json -Depth 32 -Compress)) { + throw 'Prepared raw prebuilt root differs from the hosted build receipt.' + } + } + $expectedNsisAggregate = '1FC822D1A183552A80ADEA01B0BF456F462B90518256EF1FE9EDFA22D76CD85A' + foreach ($nsisRoot in @( + (Join-Path $payloadRoot 'raw\unsigned\nsis-toolchain'), + (Join-Path $payloadRoot 'raw\signing\nsis-toolchain') + )) { + $nsisInventory = New-WagglePrebuiltInventory -Root $nsisRoot + if (@($nsisInventory.entries).Count -ne 442 -or + [string]$nsisInventory.sha256 -cne $expectedNsisAggregate -or + ($nsisInventory | ConvertTo-Json -Depth 8 -Compress) -cne + ($buildReceipt.nsisInventory | ConvertTo-Json -Depth 8 -Compress)) { + throw 'Prepared NSIS toolchain differs from the hosted build receipt.' + } + } + + $installedNsisRoot = Join-Path $env:LOCALAPPDATA 'tauri\NSIS' + if (Test-Path -LiteralPath $installedNsisRoot) { + throw 'Fresh OIDC signer unexpectedly already contains a Tauri NSIS closure.' + } + [IO.Directory]::CreateDirectory((Split-Path $installedNsisRoot -Parent)) | Out-Null + Copy-Item -LiteralPath (Join-Path $payloadRoot 'raw\unsigned\nsis-toolchain') ` + -Destination $installedNsisRoot -Recurse -ErrorAction Stop + $installedNsisInventory = New-WagglePrebuiltInventory -Root $installedNsisRoot + if (($installedNsisInventory | ConvertTo-Json -Depth 8 -Compress) -cne + ($buildReceipt.nsisInventory | ConvertTo-Json -Depth 8 -Compress)) { + throw 'Restored signer NSIS closure differs from the hosted build receipt.' + } + + $resourceEntries = @($buildReceipt.resourcesInventory.entries) + Assert-WaggleCanonicalInventoryEntries $resourceEntries 'Prepared resources inventory' + $sourceResourcesRoot = Get-TrustedPath ` + (Join-Path $unsignedRoot 'resources') 'Prepared source resources' 'Container' + $signingResourcesRoot = Get-TrustedPath ` + (Join-Path $signingRoot 'resources') 'Prepared signing resources' 'Container' + $canonicalResourcesRoot = Get-TrustedPath ` + ([IO.Path]::GetFullPath('app/src-tauri/resources')) 'Canonical repository resources' 'Container' + $canonicalPrefix = $canonicalResourcesRoot.TrimEnd('\') + '\' + $materializedEntries = [Collections.Generic.List[object]]::new() + foreach ($entry in $resourceEntries) { + $relative = [string]$entry.path + $sourcePath = Get-TrustedPath ` + (Join-Path $sourceResourcesRoot $relative) 'Prepared resource file' -AllowHardLink + $signingPath = Get-TrustedPath ` + (Join-Path $signingResourcesRoot $relative) 'Prepared signing resource file' -AllowHardLink + foreach ($path in @($sourcePath, $signingPath)) { + $item = Get-Item -LiteralPath $path -Force + if ([long]$item.Length -ne [long]$entry.size -or + (Get-FileHash -LiteralPath $path -Algorithm SHA256).Hash -cne [string]$entry.sha256) { + throw 'Prepared resource file differs from its hosted receipt.' + } + } + $destination = [IO.Path]::GetFullPath((Join-Path $canonicalResourcesRoot $relative)) + if (-not $destination.StartsWith($canonicalPrefix, [StringComparison]::OrdinalIgnoreCase)) { + throw 'Prepared resource destination escaped the canonical repository root.' + } + [IO.Directory]::CreateDirectory((Split-Path $destination -Parent)) | Out-Null + if (Test-Path -LiteralPath $destination) { + if ((Get-FileHash -LiteralPath $destination -Algorithm SHA256).Hash -cne + [string]$entry.sha256) { + throw 'Canonical repository resource differs from the prepared receipt.' + } + } else { + [IO.File]::Copy($sourcePath, $destination, $false) + } + $materialized = Get-Item -LiteralPath $destination -Force + $materializedEntries.Add([pscustomobject][ordered]@{ + path = $relative + size = [long]$materialized.Length + sha256 = (Get-FileHash -LiteralPath $destination -Algorithm SHA256).Hash + }) + } + if ((Get-WaggleInventorySha256 @($materializedEntries)) -cne + [string]$buildReceipt.resourcesInventory.sha256) { + throw 'Restored canonical resources differ from the prepared build receipt.' + } + + $tauriSource = Join-Path $payloadRoot 'tauri\node_modules\@tauri-apps' + $tauriDestination = [IO.Path]::GetFullPath('app\node_modules\@tauri-apps') + if (Test-Path -LiteralPath (Split-Path $tauriDestination -Parent)) { + throw 'Fresh OIDC signer unexpectedly already contains app node_modules.' + } + [IO.Directory]::CreateDirectory($tauriDestination) | Out-Null + foreach ($packageName in @('cli', 'cli-win32-x64-msvc')) { + Copy-Item -LiteralPath (Join-Path $tauriSource $packageName) ` + -Destination $tauriDestination -Recurse -ErrorAction Stop + } + $restoredPackages = @( + Get-ChildItem -LiteralPath $tauriDestination -Force -Directory | + ForEach-Object { $_.Name } | Sort-Object + ) + if ([string]::Join("`n", $restoredPackages) -cne + [string]::Join("`n", @('cli', 'cli-win32-x64-msvc'))) { + throw 'OIDC signer restored more than the two approved Tauri CLI packages.' + } + + $portableRelativeReceiptPath = Join-Path $payloadRoot ` + 'portable\portable-toolchain-receipt.json' + $portableRelativeReceipt = Get-Content -Raw -LiteralPath $portableRelativeReceiptPath | + ConvertFrom-Json -Depth 32 + if ([int]$portableRelativeReceipt.schemaVersion -ne 1 -or + [string]$portableRelativeReceipt.portableToolchainRoot -cne 'portable\toolchain' -or + [string]$portableRelativeReceipt.archives.node.path -cne 'portable\downloads\node.zip' -or + [string]$portableRelativeReceipt.archives.git.path -cne 'portable\downloads\mingit.zip' -or + [string]$portableRelativeReceipt.archives.sevenZip.path -cne 'portable\downloads\sevenzip.exe' -or + @($portableRelativeReceipt.inventory.entries).Count -ne 2495 -or + [string]$portableRelativeReceipt.inventory.sha256 -cne + 'D64F897D4E1A7F07FE9BA62D6AF062EF9F0E41C595CDAF2F3C4F73991BBEA0F5') { + throw 'Prepared portable toolchain receipt is not path-relative and repository-pinned.' + } + $portablePayloadRoot = Get-TrustedPath ` + (Join-Path $payloadRoot 'portable\toolchain') 'Prepared portable toolchain' 'Container' + $portableDownloads = Get-TrustedPath ` + (Join-Path $payloadRoot 'portable\downloads') 'Restored portable downloads' 'Container' + $portableActualInventory = New-WagglePrebuiltInventory -Root $portablePayloadRoot + if (($portableActualInventory | ConvertTo-Json -Depth 32 -Compress) -cne + ($portableRelativeReceipt.inventory | ConvertTo-Json -Depth 32 -Compress)) { + throw 'Restored portable toolchain differs from its path-relative receipt.' + } + $relocatedReceiptRoot = Join-Path $env:RUNNER_TEMP 'waggle-portable-signing-restored' + if (Test-Path -LiteralPath $relocatedReceiptRoot) { + throw 'Relocated portable receipt root already exists.' + } + $relocatedReceiptRoot = New-PrivateDirectory $relocatedReceiptRoot + $portableRoot = New-PrivateDirectory (Join-Path $relocatedReceiptRoot 'toolchain') + foreach ($entry in @($portableRelativeReceipt.inventory.entries)) { + $relative = [string]$entry.path + $source = Get-TrustedPath ` + (Join-Path $portablePayloadRoot $relative) 'Prepared portable toolchain file' + $destination = Join-Path $portableRoot $relative + [IO.Directory]::CreateDirectory((Split-Path $destination -Parent)) | Out-Null + [IO.File]::Copy($source, $destination, $false) + } + $restoredPortableInventory = New-WagglePrebuiltInventory -Root $portableRoot + if (($restoredPortableInventory | ConvertTo-Json -Depth 32 -Compress) -cne + ($portableRelativeReceipt.inventory | ConvertTo-Json -Depth 32 -Compress)) { + throw 'Private restored portable toolchain differs from its path-relative receipt.' + } + $relocatedReceiptPath = Join-Path $relocatedReceiptRoot 'portable-toolchain-receipt.json' + $relocatedReceipt = [ordered]@{ + schemaVersion = 1 + portableToolchainRoot = [IO.Path]::GetFullPath($portableRoot) + archives = [ordered]@{ + node = [ordered]@{ + path = [IO.Path]::GetFullPath((Join-Path $portableDownloads 'node.zip')) + sha256 = '7C93E9D92BF68C07182B471AA187E35EE6CD08EF0F24AB060DFFF605FCC1C57C' + } + git = [ordered]@{ + path = [IO.Path]::GetFullPath((Join-Path $portableDownloads 'mingit.zip')) + sha256 = 'C2C955A21FA99889D83F485F24FA5D9A38FFFC2D509D4022385510E11C26B250' + } + sevenZip = [ordered]@{ + path = [IO.Path]::GetFullPath((Join-Path $portableDownloads 'sevenzip.exe')) + sha256 = '78AFA2A1C773CAF3CF7EDF62F857D2A8A5DA55FB0FFF5DA416074C0D28B2B55F' + } + } + inventory = $portableRelativeReceipt.inventory + } + Write-WaggleJsonNoBom $relocatedReceiptPath $relocatedReceipt + $relocatedReceiptSha256 = (Get-FileHash -LiteralPath $relocatedReceiptPath -Algorithm SHA256).Hash + + $artifactSigningPackage = Get-TrustedPath ` + (Join-Path $payloadRoot 'artifact-signing\Microsoft.ArtifactSigning.Client.1.0.128.nupkg') ` + 'Prepared Artifact Signing package' + if ((Get-FileHash -LiteralPath $artifactSigningPackage -Algorithm SHA256).Hash -cne + '74BD7D27E6CE1051409C38D9B46BC8DF0400ECD643D51FFBF2AC00869061E40B') { + throw 'Prepared Artifact Signing package differs from its pinned SHA-256.' + } + "unsigned_root=$unsignedRoot" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "signing_root=$signingRoot" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "build_receipt_path=$signingReceipt" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "artifact_signing_package=$artifactSigningPackage" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "portable_root=$portableRoot" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "portable_node=$([IO.Path]::GetFullPath((Join-Path $portableRoot 'node\node-v22.22.2-win-x64\node.exe')))" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "portable_git=$([IO.Path]::GetFullPath((Join-Path $portableRoot 'git\cmd\git.exe')))" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "portable_sevenzip=$([IO.Path]::GetFullPath((Join-Path $portableRoot 'sevenzip\7z.exe')))" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "portable_receipt_path=$relocatedReceiptPath" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "portable_receipt_sha256=$relocatedReceiptSha256" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + + - name: Refresh exact signing repository refs + uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 + with: + repository: marolinik/waggle-os + ref: ${{ github.ref }} + fetch-depth: 0 + persist-credentials: false + clean: false + + - name: Revalidate exact signing revision against fresh origin main + shell: pwsh + run: | + $checkedOutRevision = (git rev-parse --verify HEAD).Trim().ToLowerInvariant() + if ($LASTEXITCODE -ne 0) { + throw 'Could not resolve the exact signing checkout after refreshing repository refs.' + } + $remoteMainRevision = (git rev-parse --verify refs/remotes/origin/main).Trim().ToLowerInvariant() + if ($LASTEXITCODE -ne 0 -or + $checkedOutRevision -cne $env:GITHUB_SHA -or + $env:GITHUB_WORKFLOW_SHA -cne $env:GITHUB_SHA -or + $remoteMainRevision -cnotmatch '^[0-9a-f]{40}$' -or + @(git status --porcelain=v1 --untracked-files=all).Count -ne 0) { + throw 'Fresh signing checkout, workflow, or origin/main revision evidence is invalid.' + } + git merge-base --is-ancestor $env:GITHUB_SHA refs/remotes/origin/main + if ($LASTEXITCODE -ne 0) { + throw 'The exact signing revision is not contained by fresh origin/main.' + } + + - name: Authenticate Azure Artifact Signing with OIDC + uses: azure/login@f5d393ae46f8fde4be8b75f32e3fc50e654ad0ca # v3.0.1 + with: + client-id: ${{ vars.AZURE_CLIENT_ID }} + tenant-id: ${{ vars.AZURE_TENANT_ID }} + subscription-id: ${{ vars.AZURE_SUBSCRIPTION_ID }} + audience: api://AzureADTokenExchange + + - name: Package and sign from immutable prepared inputs + id: sign-windows + shell: pwsh + env: + WINDOWS_CODESIGN_APPROVED_SUBJECT: ${{ needs.prepare-windows-signing.outputs.signer_subject }} + EXPECTED_BUILD_RECEIPT_SHA256: ${{ needs.build-windows-prebuilt.outputs.build_receipt_sha256 }} + run: | + & 'C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe' ` + -NoLogo -NoProfile -NonInteractive -ExecutionPolicy Bypass ` + -File ./app/scripts/sign-windows-artifact.ps1 ` + -Mode Package ` + -UnsignedInputRoot '${{ steps.verify-prepared.outputs.unsigned_root }}' ` + -SigningInputRoot '${{ steps.verify-prepared.outputs.signing_root }}' ` + -BuildReceiptPath '${{ steps.verify-prepared.outputs.build_receipt_path }}' ` + -BuildReceiptSha256 $env:EXPECTED_BUILD_RECEIPT_SHA256 ` + -ArtifactSigningPackageSource '${{ steps.verify-prepared.outputs.artifact_signing_package }}' ` + -PortableToolchainRoot '${{ steps.verify-prepared.outputs.portable_root }}' ` + -PortableToolchainReceiptPath '${{ steps.verify-prepared.outputs.portable_receipt_path }}' ` + -PortableToolchainReceiptSha256 '${{ steps.verify-prepared.outputs.portable_receipt_sha256 }}' ` + -PortableNodePath '${{ steps.verify-prepared.outputs.portable_node }}' ` + -PortableGitPath '${{ steps.verify-prepared.outputs.portable_git }}' ` + -PortableSevenZipPath '${{ steps.verify-prepared.outputs.portable_sevenzip }}' + if ($LASTEXITCODE -ne 0) { throw 'Protected Artifact Signing package failed.' } + $receipts = @(Get-ChildItem -LiteralPath 'app/src-tauri/target/.signing-sessions' -Recurse -Filter 'provenance-receipt.json' -File) + if ($receipts.Count -ne 1) { throw "Expected exactly one sealed signing receipt, found $($receipts.Count)." } + $receipt = Get-Content -Raw -LiteralPath $receipts[0].FullName | ConvertFrom-Json + if ([string]$receipt.status -cne 'sealed' -or + [string]$receipt.sourceRevision -cne $env:GITHUB_SHA -or + [string]$receipt.signerSubject -cne $env:WINDOWS_CODESIGN_APPROVED_SUBJECT -or + [string]$receipt.installerSha256 -notmatch '^[0-9A-F]{64}$') { + throw 'Sealed signing receipt does not bind the approved revision and signer.' + } + $installerPath = [IO.Path]::GetFullPath([string]$receipt.installerPath) + $targetRoot = [IO.Path]::GetFullPath((Resolve-Path 'app/src-tauri/target').Path) + $targetPrefix = $targetRoot.TrimEnd([char[]]@('\', '/')) + [IO.Path]::DirectorySeparatorChar + if (-not $installerPath.StartsWith($targetPrefix, [StringComparison]::OrdinalIgnoreCase) -or + -not (Test-Path -LiteralPath $installerPath -PathType Leaf) -or + -not [string]::Equals( + (Get-FileHash -LiteralPath $installerPath -Algorithm SHA256).Hash, + [string]$receipt.installerSha256, + [StringComparison]::OrdinalIgnoreCase + )) { + throw 'Sealed installer is missing, escaped the target root, or changed after signing.' + } + if ($env:GITHUB_OUTPUT) { + "candidate_sha256=$([string]$receipt.installerSha256)" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + } + + - name: Stage exact signed handoff + id: stage-signed + shell: pwsh + env: + WAGGLE_RELEASE_MODE: ${{ needs.prepare-windows-signing.outputs.release_mode }} + WINDOWS_BOOTSTRAP_RELEASE_IDENTITY: ${{ needs.prepare-windows-signing.outputs.bootstrap_identity }} + WINDOWS_UPGRADE_BASE_TAG: ${{ needs.prepare-windows-signing.outputs.upgrade_base_tag }} + WINDOWS_UPGRADE_BASE_ASSET_NAME: ${{ needs.prepare-windows-signing.outputs.upgrade_base_asset_name }} + WINDOWS_UPGRADE_BASE_SHA256: ${{ needs.prepare-windows-signing.outputs.upgrade_base_sha256 }} + WINDOWS_UPGRADE_BASE_COMMIT: ${{ needs.prepare-windows-signing.outputs.upgrade_base_commit }} + WINDOWS_CODESIGN_APPROVED_SUBJECT: ${{ needs.prepare-windows-signing.outputs.signer_subject }} + EXPECTED_BUILD_RECEIPT_SHA256: ${{ needs.build-windows-prebuilt.outputs.build_receipt_sha256 }} + EXPECTED_BUILD_ARTIFACT_ID: ${{ needs.build-windows-prebuilt.outputs.artifact_id }} + EXPECTED_BUILD_ARTIFACT_DIGEST: ${{ needs.build-windows-prebuilt.outputs.artifact_digest }} + EXPECTED_PREPARATION_RECEIPT_SHA256: ${{ needs.prepare-windows-signing.outputs.preparation_receipt_sha256 }} + EXPECTED_PREPARATION_ARTIFACT_ID: ${{ needs.prepare-windows-signing.outputs.artifact_id }} + EXPECTED_PREPARATION_ARTIFACT_DIGEST: ${{ needs.prepare-windows-signing.outputs.artifact_digest }} + run: | + $signedRoot = Join-Path $env:RUNNER_TEMP 'waggle-windows-signed' + if (Test-Path -LiteralPath $signedRoot) { throw 'Signed handoff root already exists.' } + $releaseRoot = New-Item -ItemType Directory -Path (Join-Path $signedRoot 'release') + $sourceNsisRoot = New-Item -ItemType Directory -Path (Join-Path $signedRoot 'source\release-nsis') + $sourceResourcesRoot = New-Item -ItemType Directory -Path (Join-Path $signedRoot 'source\resources') + $provenanceRoot = New-Item -ItemType Directory -Path (Join-Path $signedRoot 'provenance') + $receipts = @( + Get-ChildItem -LiteralPath 'app/src-tauri/target/.signing-sessions' ` + -Recurse -Filter 'provenance-receipt.json' -File + ) + if ($receipts.Count -ne 1) { throw 'Signed handoff requires exactly one sealed provenance receipt.' } + $provenance = Get-Content -Raw -LiteralPath $receipts[0].FullName | ConvertFrom-Json -Depth 32 + $installer = Get-Item -LiteralPath ([string]$provenance.installerPath) + $candidateVersion = [string]( + Get-Content -Raw -LiteralPath 'app/src-tauri/tauri.conf.json' | ConvertFrom-Json + ).version + if ([string]$provenance.status -cne 'sealed' -or + [string]$provenance.sourceRevision -cne $env:GITHUB_SHA -or + [string]$provenance.signerSubject -cne $env:WINDOWS_CODESIGN_APPROVED_SUBJECT -or + $candidateVersion -notmatch '^\d+\.\d+\.\d+$' -or + $env:GITHUB_REF_NAME -cne "v$candidateVersion" -or + (Get-FileHash -LiteralPath $installer.FullName -Algorithm SHA256).Hash -cne + [string]$provenance.installerSha256) { + throw 'Signed handoff source no longer matches the protected signing receipt.' + } + $signedReleaseRoot = Split-Path -Parent (Split-Path -Parent $installer.DirectoryName) + $generatedInstallerScripts = @( + Get-ChildItem -LiteralPath (Join-Path $signedReleaseRoot 'nsis') ` + -Recurse -Filter 'installer.nsi' -File + ) + $sourceService = Get-Item -LiteralPath 'app/src-tauri/resources/service.js' + if ($generatedInstallerScripts.Count -ne 1) { + throw 'Signed handoff does not contain exactly one generated installer.nsi.' + } + Copy-Item -LiteralPath $installer.FullName -Destination $releaseRoot.FullName -ErrorAction Stop + Copy-Item -LiteralPath $generatedInstallerScripts[0].FullName ` + -Destination (Join-Path $sourceNsisRoot.FullName 'installer.nsi') -ErrorAction Stop + Copy-Item -LiteralPath $sourceService.FullName ` + -Destination (Join-Path $sourceResourcesRoot.FullName 'service.js') -ErrorAction Stop + Copy-Item -LiteralPath $receipts[0].FullName ` + -Destination (Join-Path $provenanceRoot.FullName 'provenance-receipt.json') -ErrorAction Stop + + . ./app/scripts/sign-windows-artifact.ps1 + $inventory = New-WagglePrebuiltInventory -Root $signedRoot + $expectedPaths = @( + 'provenance\provenance-receipt.json' + "release\$($installer.Name)" + 'source\release-nsis\installer.nsi' + 'source\resources\service.js' + ) + if (@($inventory.entries).Count -ne $expectedPaths.Count -or + [string]::Join("`n", @($inventory.entries | ForEach-Object { [string]$_.path })) -cne + [string]::Join("`n", $expectedPaths)) { + throw 'Signed handoff topology differs from the exact four-file contract.' + } + foreach ($value in @( + $env:EXPECTED_BUILD_RECEIPT_SHA256, + $env:EXPECTED_BUILD_ARTIFACT_DIGEST, + [string]$provenance.installerSha256 + )) { + if ($value -cnotmatch '^[0-9A-Fa-f]{64}$') { throw 'Signed handoff digest binding is invalid.' } + } + if ($env:EXPECTED_BUILD_ARTIFACT_ID -cnotmatch '^[1-9][0-9]*$') { + throw 'Signed handoff build artifact ID is invalid.' + } + if ($env:EXPECTED_PREPARATION_RECEIPT_SHA256 -cnotmatch '^[0-9A-Fa-f]{64}$' -or + $env:EXPECTED_PREPARATION_ARTIFACT_DIGEST -cnotmatch '^[0-9A-Fa-f]{64}$' -or + $env:EXPECTED_PREPARATION_ARTIFACT_ID -cnotmatch '^[1-9][0-9]*$') { + throw 'Signed handoff preparation artifact binding is invalid.' + } + $handoffReceipt = [ordered]@{ + schemaVersion = 1 + sourceRevision = $env:GITHUB_SHA + candidateTag = $env:GITHUB_REF_NAME + candidateVersion = $candidateVersion + releaseMode = $env:WAGGLE_RELEASE_MODE + bootstrapIdentity = $env:WINDOWS_BOOTSTRAP_RELEASE_IDENTITY + upgradeBaseTag = $env:WINDOWS_UPGRADE_BASE_TAG + upgradeBaseAssetName = $env:WINDOWS_UPGRADE_BASE_ASSET_NAME + upgradeBaseSha256 = $env:WINDOWS_UPGRADE_BASE_SHA256 + upgradeBaseCommit = $env:WINDOWS_UPGRADE_BASE_COMMIT + signerSubject = $env:WINDOWS_CODESIGN_APPROVED_SUBJECT + candidateSha256 = ([string]$provenance.installerSha256).ToUpperInvariant() + buildReceiptSha256 = $env:EXPECTED_BUILD_RECEIPT_SHA256.ToUpperInvariant() + buildArtifactId = $env:EXPECTED_BUILD_ARTIFACT_ID + buildArtifactDigest = $env:EXPECTED_BUILD_ARTIFACT_DIGEST.ToUpperInvariant() + preparationReceiptSha256 = $env:EXPECTED_PREPARATION_RECEIPT_SHA256.ToUpperInvariant() + preparationArtifactId = $env:EXPECTED_PREPARATION_ARTIFACT_ID + preparationArtifactDigest = $env:EXPECTED_PREPARATION_ARTIFACT_DIGEST.ToUpperInvariant() + timestampPolicy = 'fresh-certification-monotonic-v1' + inventory = $inventory + } + $receiptPath = Join-Path $signedRoot 'signing-handoff-receipt.json' + Write-WaggleJsonNoBom $receiptPath $handoffReceipt + $receiptSha256 = (Get-FileHash -LiteralPath $receiptPath -Algorithm SHA256).Hash + "receipt_sha256=$receiptSha256" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "candidate_sha256=$([string]$handoffReceipt.candidateSha256)" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "candidate_version=$candidateVersion" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + + - name: Upload immutable signed Windows handoff + id: upload-signed + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4 + with: + name: waggle-windows-signed-${{ github.sha }} + path: ${{ runner.temp }}\waggle-windows-signed + if-no-files-found: error + include-hidden-files: true + retention-days: 7 + + certify-windows: + needs: sign-windows + runs-on: windows-latest + permissions: + contents: read + outputs: + release_mode: ${{ steps.verify-signed.outputs.release_mode }} + candidate_sha256: ${{ steps.certify-windows.outputs.candidate_sha256 }} + candidate_version: ${{ steps.certify-windows.outputs.candidate_version }} + bootstrap_identity: ${{ steps.verify-signed.outputs.bootstrap_identity }} + upgrade_base_tag: ${{ steps.verify-signed.outputs.upgrade_base_tag }} + upgrade_base_asset_name: ${{ steps.verify-signed.outputs.upgrade_base_asset_name }} + upgrade_base_sha256: ${{ steps.verify-signed.outputs.upgrade_base_sha256 }} + upgrade_base_commit: ${{ steps.verify-signed.outputs.upgrade_base_commit }} + signer_subject: ${{ steps.verify-signed.outputs.signer_subject }} + sealed_receipt_sha256: ${{ steps.stage-sealed.outputs.receipt_sha256 }} + artifact_id: ${{ steps.upload-sealed.outputs.artifact-id }} + artifact_digest: ${{ steps.upload-sealed.outputs.artifact-digest }} + steps: + - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 + with: + fetch-depth: 0 + persist-credentials: false + + - name: Validate credential-free certification boundary + shell: pwsh + run: | + $version = [string](Get-Content -Raw -LiteralPath 'app/src-tauri/tauri.conf.json' | ConvertFrom-Json).version + $checkedOutRevision = (git rev-parse --verify HEAD).Trim().ToLowerInvariant() + if ($env:GITHUB_REPOSITORY -cne 'marolinik/waggle-os' -or + $env:GITHUB_REF_TYPE -cne 'tag' -or + $env:RUNNER_ENVIRONMENT -cne 'github-hosted' -or + $env:GITHUB_REF_NAME -cne "v$version" -or + $checkedOutRevision -cne $env:GITHUB_SHA -or + @(git status --porcelain=v1 --untracked-files=all).Count -ne 0) { + throw 'Windows certification requires a clean fresh runner at the exact release revision.' + } + + - name: Setup Node.js for source-bound certification + uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 + with: + node-version: '22.23.2' cache: npm - - name: Setup Rust - uses: dtolnay/rust-toolchain@stable + - name: Install locked certification dependencies + run: npm ci + + - name: Download immutable signed Windows handoff + uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4 with: + artifact-ids: ${{ needs.sign-windows.outputs.artifact_id }} + path: ${{ runner.temp }}\waggle-windows-signed + merge-multiple: true + + - name: Validate exact signed handoff before candidate execution + id: verify-signed + shell: pwsh + env: + EXPECTED_HANDOFF_RECEIPT_SHA256: ${{ needs.sign-windows.outputs.handoff_receipt_sha256 }} + EXPECTED_SIGNED_ARTIFACT_ID: ${{ needs.sign-windows.outputs.artifact_id }} + EXPECTED_SIGNED_ARTIFACT_DIGEST: ${{ needs.sign-windows.outputs.artifact_digest }} + EXPECTED_BUILD_RECEIPT_SHA256: ${{ needs.sign-windows.outputs.build_receipt_sha256 }} + EXPECTED_BUILD_ARTIFACT_ID: ${{ needs.sign-windows.outputs.build_artifact_id }} + EXPECTED_BUILD_ARTIFACT_DIGEST: ${{ needs.sign-windows.outputs.build_artifact_digest }} + EXPECTED_RELEASE_MODE: ${{ needs.sign-windows.outputs.release_mode }} + EXPECTED_CANDIDATE_SHA256: ${{ needs.sign-windows.outputs.candidate_sha256 }} + EXPECTED_CANDIDATE_VERSION: ${{ needs.sign-windows.outputs.candidate_version }} + EXPECTED_BOOTSTRAP_IDENTITY: ${{ needs.sign-windows.outputs.bootstrap_identity }} + EXPECTED_UPGRADE_BASE_TAG: ${{ needs.sign-windows.outputs.upgrade_base_tag }} + EXPECTED_UPGRADE_BASE_ASSET_NAME: ${{ needs.sign-windows.outputs.upgrade_base_asset_name }} + EXPECTED_UPGRADE_BASE_SHA256: ${{ needs.sign-windows.outputs.upgrade_base_sha256 }} + EXPECTED_UPGRADE_BASE_COMMIT: ${{ needs.sign-windows.outputs.upgrade_base_commit }} + EXPECTED_SIGNER_SUBJECT: ${{ needs.sign-windows.outputs.signer_subject }} + run: | + $signedRoot = [IO.Path]::GetFullPath( + (Resolve-Path (Join-Path $env:RUNNER_TEMP 'waggle-windows-signed')).Path + ) + $receiptPath = Join-Path $signedRoot 'signing-handoff-receipt.json' + foreach ($digest in @( + $env:EXPECTED_HANDOFF_RECEIPT_SHA256, + $env:EXPECTED_SIGNED_ARTIFACT_DIGEST, + $env:EXPECTED_BUILD_RECEIPT_SHA256, + $env:EXPECTED_CANDIDATE_SHA256 + )) { + if ($digest -cnotmatch '^[0-9A-Fa-f]{64}$') { throw 'Signed handoff expected digest is invalid.' } + } + if ($env:EXPECTED_SIGNED_ARTIFACT_ID -cnotmatch '^[1-9][0-9]*$' -or + -not (Test-Path -LiteralPath $receiptPath -PathType Leaf) -or + (Get-FileHash -LiteralPath $receiptPath -Algorithm SHA256).Hash -cne + $env:EXPECTED_HANDOFF_RECEIPT_SHA256.ToUpperInvariant()) { + throw 'Signed handoff immutable artifact or receipt binding is invalid.' + } + $receipt = Get-Content -Raw -LiteralPath $receiptPath | ConvertFrom-Json -Depth 32 + $expectedBindings = [ordered]@{ + sourceRevision = $env:GITHUB_SHA + candidateTag = $env:GITHUB_REF_NAME + candidateVersion = $env:EXPECTED_CANDIDATE_VERSION + releaseMode = $env:EXPECTED_RELEASE_MODE + bootstrapIdentity = $env:EXPECTED_BOOTSTRAP_IDENTITY + upgradeBaseTag = $env:EXPECTED_UPGRADE_BASE_TAG + upgradeBaseAssetName = $env:EXPECTED_UPGRADE_BASE_ASSET_NAME + upgradeBaseSha256 = $env:EXPECTED_UPGRADE_BASE_SHA256 + upgradeBaseCommit = $env:EXPECTED_UPGRADE_BASE_COMMIT + signerSubject = $env:EXPECTED_SIGNER_SUBJECT + candidateSha256 = $env:EXPECTED_CANDIDATE_SHA256 + buildReceiptSha256 = $env:EXPECTED_BUILD_RECEIPT_SHA256 + buildArtifactId = $env:EXPECTED_BUILD_ARTIFACT_ID + buildArtifactDigest = $env:EXPECTED_BUILD_ARTIFACT_DIGEST.ToUpperInvariant() + timestampPolicy = 'fresh-certification-monotonic-v1' + } + if ($receipt.schemaVersion -is [string] -or [int]$receipt.schemaVersion -ne 1 -or + $env:EXPECTED_BUILD_ARTIFACT_ID -cnotmatch '^[1-9][0-9]*$' -or + $env:EXPECTED_BUILD_ARTIFACT_DIGEST -cnotmatch '^[0-9A-Fa-f]{64}$') { + throw 'Signed handoff receipt schema or upstream artifact binding is invalid.' + } + foreach ($property in $expectedBindings.Keys) { + if (-not [string]::Equals( + [string]$receipt.$property, + [string]$expectedBindings[$property], + [StringComparison]::Ordinal + )) { + throw "Signed handoff protected binding differs: $property" + } + } + . ./app/scripts/sign-windows-artifact.ps1 + $entries = @($receipt.inventory.entries) + Assert-WaggleCanonicalInventoryEntries $entries 'Signed handoff inventory' + if ($entries.Count -ne 4 -or + (Get-WaggleInventorySha256 $entries) -cne [string]$receipt.inventory.sha256) { + throw 'Signed handoff inventory aggregate is invalid.' + } + $actualPaths = @( + Get-ChildItem -LiteralPath $signedRoot -Recurse -Force -File | + ForEach-Object { [IO.Path]::GetRelativePath($signedRoot, $_.FullName).Replace('/', '\') } | + Sort-Object -CaseSensitive + ) + $expectedPaths = @($entries | ForEach-Object { [string]$_.path }) + + @('signing-handoff-receipt.json') + $expectedPaths = @($expectedPaths | Sort-Object -CaseSensitive) + if ([string]::Join("`n", $actualPaths) -cne [string]::Join("`n", $expectedPaths)) { + throw 'Signed handoff extracted topology is not exact.' + } + foreach ($entry in $entries) { + $path = Get-TrustedPath (Join-Path $signedRoot ([string]$entry.path)) 'Signed handoff file' + $item = Get-Item -LiteralPath $path + if ([long]$item.Length -ne [long]$entry.size -or + (Get-FileHash -LiteralPath $path -Algorithm SHA256).Hash -cne + ([string]$entry.sha256).ToUpperInvariant()) { + throw 'Signed handoff file differs from its exact receipt.' + } + } + $installerEntries = @($entries | Where-Object { [string]$_.path -match '^release\\[^\\]+-setup\.exe$' }) + if ($installerEntries.Count -ne 1) { throw 'Signed handoff has an ambiguous installer identity.' } + $installerSource = Get-TrustedPath ` + (Join-Path $signedRoot ([string]$installerEntries[0].path)) 'Signed candidate installer' + $signature = Get-AuthenticodeSignature -LiteralPath $installerSource + if ($signature.Status -ne 'Valid' -or + [string]$signature.SignerCertificate.Subject -cne $env:EXPECTED_SIGNER_SUBJECT -or + $null -eq $signature.TimeStamperCertificate) { + throw 'Signed candidate lacks the approved signer and timestamp before execution.' + } + $targetReleaseRoot = [IO.Path]::GetFullPath( + 'app/src-tauri/target/x86_64-pc-windows-msvc/release' + ) + if (Test-Path -LiteralPath $targetReleaseRoot) { throw 'Certification target unexpectedly exists.' } + $bundleRoot = New-Item -ItemType Directory -Path (Join-Path $targetReleaseRoot 'bundle\nsis') + $nsisRoot = New-Item -ItemType Directory -Path (Join-Path $targetReleaseRoot 'nsis') + $installerTarget = Join-Path $bundleRoot.FullName (Split-Path $installerSource -Leaf) + [IO.File]::Copy($installerSource, $installerTarget, $false) + [IO.File]::Copy( + (Join-Path $signedRoot 'source\release-nsis\installer.nsi'), + (Join-Path $nsisRoot.FullName 'installer.nsi'), + $false + ) + $canonicalServicePath = [IO.Path]::GetFullPath('app/src-tauri/resources/service.js') + if (Test-Path -LiteralPath $canonicalServicePath) { + throw 'Fresh certification checkout unexpectedly contains generated service.js.' + } + [IO.File]::Copy( + (Join-Path $signedRoot 'source\resources\service.js'), + $canonicalServicePath, + $false + ) + $hookTime = (Get-Item -LiteralPath 'app/src-tauri/nsis/installer.nsi').LastWriteTimeUtc + (Get-Item -LiteralPath (Join-Path $nsisRoot.FullName 'installer.nsi')).LastWriteTimeUtc = + $hookTime.AddSeconds(1) + (Get-Item -LiteralPath $installerTarget).LastWriteTimeUtc = $hookTime.AddSeconds(2) + "release_mode=$([string]$receipt.releaseMode)" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "bootstrap_identity=$([string]$receipt.bootstrapIdentity)" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "upgrade_base_tag=$([string]$receipt.upgradeBaseTag)" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "upgrade_base_asset_name=$([string]$receipt.upgradeBaseAssetName)" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "upgrade_base_sha256=$([string]$receipt.upgradeBaseSha256)" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "upgrade_base_commit=$([string]$receipt.upgradeBaseCommit)" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "signer_subject=$([string]$receipt.signerSubject)" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + + - name: Reclaim Windows build intermediates for managed-model certification + shell: pwsh + run: | + $installers = @( + Get-ChildItem -LiteralPath 'app/src-tauri/target/x86_64-pc-windows-msvc/release/bundle/nsis' ` + -Filter '*-setup.exe' -File + ) + if ($installers.Count -ne 1) { throw 'Certification target installer identity is ambiguous.' } + $installer = $installers[0] + $targetRoot = [IO.Path]::GetFullPath((Resolve-Path 'app/src-tauri/target').Path) + $targetPrefix = $targetRoot.TrimEnd([char[]]@('\', '/')) + [IO.Path]::DirectorySeparatorChar + $targetProfileRoot = [IO.Path]::GetFullPath((Split-Path -Parent (Split-Path -Parent $installer.DirectoryName))) + if (-not $targetProfileRoot.StartsWith($targetPrefix, [StringComparison]::OrdinalIgnoreCase)) { + throw "Refusing to prune outside the Tauri target: $targetProfileRoot" + } + foreach ($directoryName in @('deps', 'incremental', 'build', '.fingerprint')) { + $directory = Join-Path $targetProfileRoot $directoryName + if (Test-Path -LiteralPath $directory -PathType Container) { + Remove-Item -LiteralPath $directory -Recurse -Force -ErrorAction Stop + } + } + $driveRoot = [IO.Path]::GetPathRoot($targetRoot) + if ($driveRoot -notmatch '^[A-Za-z]:\\$') { throw "Unexpected Tauri target drive: $driveRoot" } + $drive = Get-PSDrive -Name $driveRoot.Substring(0, 1) -PSProvider FileSystem + if ([int64]$drive.Free -lt 8GB) { + throw "Managed-model certification requires at least 8 GiB free after pruning; available=$($drive.Free)" + } + + - name: Download signed Windows upgrade baseline + if: steps.verify-signed.outputs.release_mode == 'upgrade' + shell: pwsh + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + WINDOWS_UPGRADE_BASE_TAG: ${{ steps.verify-signed.outputs.upgrade_base_tag }} + WINDOWS_UPGRADE_BASE_ASSET_NAME: ${{ steps.verify-signed.outputs.upgrade_base_asset_name }} + WINDOWS_UPGRADE_BASE_SHA256: ${{ steps.verify-signed.outputs.upgrade_base_sha256 }} + WINDOWS_UPGRADE_BASE_COMMIT: ${{ steps.verify-signed.outputs.upgrade_base_commit }} + run: | + $baseTag = [string]$env:WINDOWS_UPGRADE_BASE_TAG + $assetName = [string]$env:WINDOWS_UPGRADE_BASE_ASSET_NAME + $expectedSha256 = ([string]$env:WINDOWS_UPGRADE_BASE_SHA256).Trim().ToUpperInvariant() + $expectedBaseCommit = ([string]$env:WINDOWS_UPGRADE_BASE_COMMIT).Trim().ToLowerInvariant() + if ($baseTag -notmatch '^v(?\d+\.\d+\.\d+)$') { + throw 'WINDOWS_UPGRADE_BASE_TAG must use exact vX.Y.Z format' + } + $baseVersion = $Matches['version'] + if ($assetName -notmatch '^[A-Za-z0-9][A-Za-z0-9._-]*-setup\.exe$') { + throw 'WINDOWS_UPGRADE_BASE_ASSET_NAME must be one exact NSIS setup filename' + } + if ($expectedSha256 -notmatch '^[0-9A-F]{64}$') { + throw 'WINDOWS_UPGRADE_BASE_SHA256 must be exactly 64 hexadecimal characters' + } + if ($expectedBaseCommit -notmatch '^[0-9a-f]{40}$') { + throw 'WINDOWS_UPGRADE_BASE_COMMIT must be exactly 40 hexadecimal characters' + } + $candidateVersion = [string](Get-Content -Raw -LiteralPath 'app/src-tauri/tauri.conf.json' | ConvertFrom-Json).version + if ($candidateVersion -notmatch '^\d+\.\d+\.\d+$' -or $env:GITHUB_REF_NAME -ne "v$candidateVersion") { + throw 'Candidate installer version no longer matches the release tag' + } + if ([version]$baseVersion -ge [version]$candidateVersion) { + throw 'The protected Windows upgrade baseline must be older than the candidate' + } + + $baseCommit = (git rev-parse --verify "refs/tags/$baseTag^{}").Trim().ToLowerInvariant() + if ($LASTEXITCODE -ne 0 -or $baseCommit -notmatch '^[0-9a-f]{40}$') { + throw "Fresh checkout could not resolve protected upgrade baseline tag $baseTag" + } + if (-not [string]::Equals($baseCommit, $expectedBaseCommit, [System.StringComparison]::Ordinal)) { + throw 'Protected Windows upgrade baseline tag does not resolve to WINDOWS_UPGRADE_BASE_COMMIT' + } + git merge-base --is-ancestor $baseCommit $env:GITHUB_SHA + if ($LASTEXITCODE -ne 0) { + throw 'The protected Windows upgrade baseline is not an ancestor of the candidate release' + } + $releaseJson = gh release view $baseTag --json isDraft,isPrerelease,tagName,assets + if ($LASTEXITCODE -ne 0) { throw "Could not inspect protected upgrade baseline $baseTag" } + $releaseData = $releaseJson | ConvertFrom-Json + if ($releaseData.tagName -ne $baseTag -or $releaseData.isDraft -or $releaseData.isPrerelease) { + throw 'Windows upgrade baseline must be an exact published, non-prerelease release' + } + $matchingAssets = @($releaseData.assets | Where-Object { $_.name -eq $assetName }) + if ($matchingAssets.Count -ne 1) { + throw "Expected exactly one protected upgrade baseline asset named $assetName" + } + + $downloadRoot = Join-Path $env:RUNNER_TEMP 'waggle-windows-upgrade-baseline' + if (Test-Path -LiteralPath $downloadRoot) { + throw "Upgrade baseline directory already exists: $downloadRoot" + } + New-Item -ItemType Directory -Path $downloadRoot | Out-Null + gh release download $baseTag --pattern $assetName --dir $downloadRoot + if ($LASTEXITCODE -ne 0) { throw 'Could not download the protected Windows upgrade baseline' } + $downloadedFiles = @(Get-ChildItem -LiteralPath $downloadRoot -File) + if ($downloadedFiles.Count -ne 1 -or $downloadedFiles[0].Name -ne $assetName) { + throw 'Downloaded Windows upgrade baseline identity is ambiguous' + } + $baseInstaller = $downloadedFiles[0] + $actualSha256 = (Get-FileHash -LiteralPath $baseInstaller.FullName -Algorithm SHA256).Hash + if (-not [string]::Equals($actualSha256, $expectedSha256, [System.StringComparison]::OrdinalIgnoreCase)) { + throw 'Downloaded Windows upgrade baseline does not match the protected SHA-256' + } + + - name: Certify Windows Solo installer lifecycle + id: certify-windows + shell: pwsh + env: + WAGGLE_RELEASE_MODE: ${{ steps.verify-signed.outputs.release_mode }} + WINDOWS_CODESIGN_APPROVED_SUBJECT: ${{ steps.verify-signed.outputs.signer_subject }} + WINDOWS_UPGRADE_BASE_TAG: ${{ steps.verify-signed.outputs.upgrade_base_tag }} + WINDOWS_UPGRADE_BASE_ASSET_NAME: ${{ steps.verify-signed.outputs.upgrade_base_asset_name }} + WINDOWS_UPGRADE_BASE_SHA256: ${{ steps.verify-signed.outputs.upgrade_base_sha256 }} + WAGGLE_UPGRADE_BASE_COMMIT: ${{ steps.verify-signed.outputs.upgrade_base_commit }} + run: | + if ($env:WAGGLE_RELEASE_MODE -notin @('bootstrap', 'upgrade')) { + throw 'Windows release mode is missing or invalid during certification' + } + $installers = @( + Get-ChildItem -LiteralPath 'app/src-tauri/target/x86_64-pc-windows-msvc/release/bundle/nsis' ` + -Filter '*-setup.exe' -File + ) + if ($installers.Count -ne 1) { throw 'Certification target installer identity is ambiguous.' } + $installer = $installers[0] + if ($installer.Name -notmatch '^[A-Za-z0-9][A-Za-z0-9._-]*-setup\.exe$' -or + $installer.DirectoryName -notmatch '[\\/]bundle[\\/]nsis$') { + throw 'Sealed signing receipt did not identify one canonical NSIS setup executable.' + } + $candidateVersion = [string](Get-Content -Raw -LiteralPath 'app/src-tauri/tauri.conf.json' | ConvertFrom-Json).version + if ($candidateVersion -notmatch '^\d+\.\d+\.\d+$' -or $env:GITHUB_REF_NAME -ne "v$candidateVersion") { + throw 'Candidate installer version no longer matches the release tag' + } + $candidateSha256 = (Get-FileHash -LiteralPath $installer.FullName -Algorithm SHA256).Hash + if ($candidateSha256 -cne '${{ needs.sign-windows.outputs.candidate_sha256 }}') { + throw 'Materialized candidate differs from the protected signed-handoff digest.' + } + $cleanReceiptPath = Join-Path $installer.DirectoryName 'windows-installer-certificate.json' + $upgradeReceiptPath = Join-Path $installer.DirectoryName 'windows-installer-upgrade-certificate.json' + if ((Test-Path -LiteralPath $cleanReceiptPath) -or + (Test-Path -LiteralPath $upgradeReceiptPath)) { + throw 'Refusing to overwrite a pre-existing Windows certification receipt' + } + + & ./scripts/certify-windows-installer.ps1 ` + -InstallerPath $installer.FullName ` + -ReceiptPath $cleanReceiptPath ` + -RequireAuthenticodeSignature ` + -ExpectedSignerSubject $env:WINDOWS_CODESIGN_APPROVED_SUBJECT ` + -ExpectedSourceRevision $env:GITHUB_SHA ` + -VerifyManagedModel + + if ($env:WAGGLE_RELEASE_MODE -eq 'upgrade') { + if ($env:WINDOWS_UPGRADE_BASE_TAG -notmatch '^v(?\d+\.\d+\.\d+)$') { + throw 'Protected upgrade base tag is invalid during certification.' + } + $baseVersion = $Matches['version'] + $baseInstallerPath = Join-Path ` + (Join-Path $env:RUNNER_TEMP 'waggle-windows-upgrade-baseline') ` + $env:WINDOWS_UPGRADE_BASE_ASSET_NAME + & ./scripts/certify-windows-installer.ps1 ` + -InstallerPath $installer.FullName ` + -ReceiptPath $upgradeReceiptPath ` + -RequireAuthenticodeSignature ` + -ExpectedSignerSubject $env:WINDOWS_CODESIGN_APPROVED_SUBJECT ` + -ExpectedSourceRevision $env:GITHUB_SHA ` + -RequireVersionToVersionUpgrade ` + -PreviousInstallerPath $baseInstallerPath ` + -ExpectedPreviousInstallerSha256 $env:WINDOWS_UPGRADE_BASE_SHA256 ` + -ExpectedPreviousVersion $baseVersion ` + -ExpectedPreviousSourceRevision $env:WAGGLE_UPGRADE_BASE_COMMIT ` + -ExpectedCandidateInstallerSha256 $candidateSha256 ` + -ExpectedCandidateVersion $candidateVersion ` + -VerifyManagedModel + } elseif (Test-Path -LiteralPath $upgradeReceiptPath) { + throw 'Bootstrap certification unexpectedly produced an upgrade receipt' + } + + $postCertificationSha256 = (Get-FileHash -LiteralPath $installer.FullName -Algorithm SHA256).Hash + if (-not [string]::Equals($postCertificationSha256, $candidateSha256, [System.StringComparison]::OrdinalIgnoreCase)) { + throw 'Candidate installer changed during Windows lifecycle certification' + } + "candidate_sha256=$candidateSha256" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + "candidate_version=$candidateVersion" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + + - name: Stage sealed Windows release outputs + id: stage-sealed + shell: pwsh + env: + WAGGLE_RELEASE_MODE: ${{ steps.verify-signed.outputs.release_mode }} + WINDOWS_BOOTSTRAP_RELEASE_IDENTITY: ${{ steps.verify-signed.outputs.bootstrap_identity }} + WINDOWS_UPGRADE_BASE_TAG: ${{ steps.verify-signed.outputs.upgrade_base_tag }} + WINDOWS_UPGRADE_BASE_ASSET_NAME: ${{ steps.verify-signed.outputs.upgrade_base_asset_name }} + WINDOWS_UPGRADE_BASE_SHA256: ${{ steps.verify-signed.outputs.upgrade_base_sha256 }} + WINDOWS_UPGRADE_BASE_COMMIT: ${{ steps.verify-signed.outputs.upgrade_base_commit }} + WINDOWS_CODESIGN_APPROVED_SUBJECT: ${{ steps.verify-signed.outputs.signer_subject }} + EXPECTED_CANDIDATE_SHA256: ${{ steps.certify-windows.outputs.candidate_sha256 }} + EXPECTED_CANDIDATE_VERSION: ${{ steps.certify-windows.outputs.candidate_version }} + SIGNED_HANDOFF_RECEIPT_SHA256: ${{ needs.sign-windows.outputs.handoff_receipt_sha256 }} + SIGNED_HANDOFF_ARTIFACT_ID: ${{ needs.sign-windows.outputs.artifact_id }} + SIGNED_HANDOFF_ARTIFACT_DIGEST: ${{ needs.sign-windows.outputs.artifact_digest }} + run: | + $sealedRoot = Join-Path $env:RUNNER_TEMP 'waggle-windows-sealed' + if (Test-Path -LiteralPath $sealedRoot) { throw 'Sealed Windows output root already exists.' } + $releaseRoot = New-Item -ItemType Directory -Path (Join-Path $sealedRoot 'release') + $sourceNsisRoot = New-Item -ItemType Directory -Path (Join-Path $sealedRoot 'source\release-nsis') + $sourceResourcesRoot = New-Item -ItemType Directory -Path (Join-Path $sealedRoot 'source\resources') + $provenanceRoot = New-Item -ItemType Directory -Path (Join-Path $sealedRoot 'provenance') + $installers = @( + Get-ChildItem -LiteralPath 'app/src-tauri/target/x86_64-pc-windows-msvc/release/bundle/nsis' ` + -Filter '*-setup.exe' -File + ) + if ($installers.Count -ne 1) { throw 'Sealed release installer identity is ambiguous.' } + $installer = $installers[0] + $cleanReceipt = Get-Item -LiteralPath (Join-Path $installer.DirectoryName 'windows-installer-certificate.json') + $upgradeReceiptPath = Join-Path $installer.DirectoryName 'windows-installer-upgrade-certificate.json' + $provenanceReceipt = Get-Item -LiteralPath ( + Join-Path $env:RUNNER_TEMP 'waggle-windows-signed\provenance\provenance-receipt.json' + ) + foreach ($file in @($installer, $cleanReceipt)) { + Copy-Item -LiteralPath $file.FullName -Destination $releaseRoot.FullName -ErrorAction Stop + } + Copy-Item -LiteralPath $provenanceReceipt.FullName ` + -Destination $provenanceRoot.FullName -ErrorAction Stop + $cleanReceiptData = Get-Content -Raw -LiteralPath $cleanReceipt.FullName | ConvertFrom-Json -Depth 32 + $signedReleaseRoot = Split-Path -Parent (Split-Path -Parent $installer.DirectoryName) + $generatedInstallerScripts = @( + Get-ChildItem -LiteralPath (Join-Path $signedReleaseRoot 'nsis') ` + -Recurse -Filter 'installer.nsi' -File + ) + $sourceService = Get-Item -LiteralPath 'app/src-tauri/resources/service.js' + if ($generatedInstallerScripts.Count -ne 1 -or + (Get-FileHash -LiteralPath $generatedInstallerScripts[0].FullName -Algorithm SHA256).Hash -cne + [string]$cleanReceiptData.evidence.generatedInstallerScriptSha256 -or + (Get-FileHash -LiteralPath $sourceService.FullName -Algorithm SHA256).Hash -cne + [string]$cleanReceiptData.evidence.sidecarBundleSha256) { + throw 'Certified source inputs no longer match the clean-install receipt.' + } + Copy-Item -LiteralPath $generatedInstallerScripts[0].FullName ` + -Destination (Join-Path $sourceNsisRoot.FullName 'installer.nsi') -ErrorAction Stop + Copy-Item -LiteralPath $sourceService.FullName ` + -Destination (Join-Path $sourceResourcesRoot.FullName 'service.js') -ErrorAction Stop + if ($env:WAGGLE_RELEASE_MODE -ceq 'upgrade') { + $upgradeReceipt = Get-Item -LiteralPath $upgradeReceiptPath + Copy-Item -LiteralPath $upgradeReceipt.FullName -Destination $releaseRoot.FullName -ErrorAction Stop + $baselineRoot = New-Item -ItemType Directory -Path (Join-Path $sealedRoot 'baseline') + $baseInstaller = Get-Item -LiteralPath ( + Join-Path ` + (Join-Path $env:RUNNER_TEMP 'waggle-windows-upgrade-baseline') ` + $env:WINDOWS_UPGRADE_BASE_ASSET_NAME + ) + Copy-Item -LiteralPath $baseInstaller.FullName -Destination $baselineRoot.FullName -ErrorAction Stop + } elseif (Test-Path -LiteralPath $upgradeReceiptPath) { + throw 'Bootstrap sealed outputs contain an unexpected upgrade receipt.' + } + $stagedInstaller = Get-Item -LiteralPath (Join-Path $releaseRoot.FullName $installer.Name) + if (-not [string]::Equals( + (Get-FileHash -LiteralPath $stagedInstaller.FullName -Algorithm SHA256).Hash, + $env:EXPECTED_CANDIDATE_SHA256, + [StringComparison]::OrdinalIgnoreCase + )) { + throw 'Staged sealed installer differs from its certified digest.' + } + if (@(Get-ChildItem -LiteralPath $provenanceRoot.FullName -File).Count -ne 1 -or + @(Get-ChildItem -LiteralPath (Join-Path $sealedRoot 'source') -Recurse -File).Count -ne 2) { + throw 'Sealed provenance and source inputs do not have the exact approved topology.' + } + . ./app/scripts/sign-windows-artifact.ps1 + $sealedInventory = New-WagglePrebuiltInventory -Root $sealedRoot + $expectedInventoryCount = if ($env:WAGGLE_RELEASE_MODE -ceq 'upgrade') { 7 } else { 5 } + if (@($sealedInventory.entries).Count -ne $expectedInventoryCount) { + throw 'Sealed release topology differs from the exact mode-specific contract.' + } + foreach ($digest in @( + $env:EXPECTED_CANDIDATE_SHA256, + $env:SIGNED_HANDOFF_RECEIPT_SHA256, + $env:SIGNED_HANDOFF_ARTIFACT_DIGEST + )) { + if ($digest -cnotmatch '^[0-9A-Fa-f]{64}$') { throw 'Sealed release digest binding is invalid.' } + } + if ($env:SIGNED_HANDOFF_ARTIFACT_ID -cnotmatch '^[1-9][0-9]*$') { + throw 'Sealed release signed-handoff artifact ID is invalid.' + } + $sealedReceipt = [ordered]@{ + schemaVersion = 1 + sourceRevision = $env:GITHUB_SHA + candidateTag = $env:GITHUB_REF_NAME + candidateVersion = $env:EXPECTED_CANDIDATE_VERSION + releaseMode = $env:WAGGLE_RELEASE_MODE + bootstrapIdentity = $env:WINDOWS_BOOTSTRAP_RELEASE_IDENTITY + upgradeBaseTag = $env:WINDOWS_UPGRADE_BASE_TAG + upgradeBaseAssetName = $env:WINDOWS_UPGRADE_BASE_ASSET_NAME + upgradeBaseSha256 = $env:WINDOWS_UPGRADE_BASE_SHA256 + upgradeBaseCommit = $env:WINDOWS_UPGRADE_BASE_COMMIT + signerSubject = $env:WINDOWS_CODESIGN_APPROVED_SUBJECT + candidateSha256 = $env:EXPECTED_CANDIDATE_SHA256.ToUpperInvariant() + signedHandoffReceiptSha256 = $env:SIGNED_HANDOFF_RECEIPT_SHA256.ToUpperInvariant() + signedHandoffArtifactId = $env:SIGNED_HANDOFF_ARTIFACT_ID + signedHandoffArtifactDigest = $env:SIGNED_HANDOFF_ARTIFACT_DIGEST.ToUpperInvariant() + inventory = $sealedInventory + } + $sealedReceiptPath = Join-Path $sealedRoot 'sealed-release-receipt.json' + Write-WaggleJsonNoBom $sealedReceiptPath $sealedReceipt + $sealedReceiptSha256 = (Get-FileHash -LiteralPath $sealedReceiptPath -Algorithm SHA256).Hash + "receipt_sha256=$sealedReceiptSha256" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + + - name: Upload sealed Windows release outputs + id: upload-sealed + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4 + with: + name: waggle-windows-sealed-${{ github.sha }} + path: ${{ runner.temp }}\waggle-windows-sealed + if-no-files-found: error + include-hidden-files: true + retention-days: 30 + + attest-windows: + needs: certify-windows + if: github.event.repository.private == false + environment: production + runs-on: ubuntu-latest + permissions: + contents: read + attestations: write + id-token: write + steps: + - name: Download certified Windows release by immutable artifact ID + uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4 + with: + artifact-ids: ${{ needs.certify-windows.outputs.artifact_id }} + path: ${{ runner.temp }}/waggle-windows-sealed + merge-multiple: true + + - name: Validate certified artifact receipt and topology without execution + shell: pwsh + env: + EXPECTED_SEALED_RECEIPT_SHA256: ${{ needs.certify-windows.outputs.sealed_receipt_sha256 }} + EXPECTED_SEALED_ARTIFACT_ID: ${{ needs.certify-windows.outputs.artifact_id }} + EXPECTED_SEALED_ARTIFACT_DIGEST: ${{ needs.certify-windows.outputs.artifact_digest }} + EXPECTED_RELEASE_MODE: ${{ needs.certify-windows.outputs.release_mode }} + EXPECTED_CANDIDATE_SHA256: ${{ needs.certify-windows.outputs.candidate_sha256 }} + EXPECTED_CANDIDATE_VERSION: ${{ needs.certify-windows.outputs.candidate_version }} + EXPECTED_BOOTSTRAP_IDENTITY: ${{ needs.certify-windows.outputs.bootstrap_identity }} + EXPECTED_UPGRADE_BASE_TAG: ${{ needs.certify-windows.outputs.upgrade_base_tag }} + EXPECTED_UPGRADE_BASE_ASSET_NAME: ${{ needs.certify-windows.outputs.upgrade_base_asset_name }} + EXPECTED_UPGRADE_BASE_SHA256: ${{ needs.certify-windows.outputs.upgrade_base_sha256 }} + EXPECTED_UPGRADE_BASE_COMMIT: ${{ needs.certify-windows.outputs.upgrade_base_commit }} + EXPECTED_SIGNER_SUBJECT: ${{ needs.certify-windows.outputs.signer_subject }} + run: | + $sealedRoot = [IO.Path]::GetFullPath( + (Resolve-Path (Join-Path $env:RUNNER_TEMP 'waggle-windows-sealed')).Path + ) + $receiptPath = Join-Path $sealedRoot 'sealed-release-receipt.json' + foreach ($digest in @( + $env:EXPECTED_SEALED_RECEIPT_SHA256, + $env:EXPECTED_SEALED_ARTIFACT_DIGEST, + $env:EXPECTED_CANDIDATE_SHA256 + )) { + if ($digest -cnotmatch '^[0-9A-Fa-f]{64}$') { throw 'Attestation input digest is invalid.' } + } + if ($env:EXPECTED_SEALED_ARTIFACT_ID -cnotmatch '^[1-9][0-9]*$' -or + -not (Test-Path -LiteralPath $receiptPath -PathType Leaf) -or + (Get-FileHash -LiteralPath $receiptPath -Algorithm SHA256).Hash -cne + $env:EXPECTED_SEALED_RECEIPT_SHA256.ToUpperInvariant()) { + throw 'Attestation input immutable artifact or receipt binding is invalid.' + } + $receipt = Get-Content -Raw -LiteralPath $receiptPath | ConvertFrom-Json -Depth 32 + $expectedBindings = [ordered]@{ + sourceRevision = $env:GITHUB_SHA + candidateTag = $env:GITHUB_REF_NAME + candidateVersion = $env:EXPECTED_CANDIDATE_VERSION + releaseMode = $env:EXPECTED_RELEASE_MODE + bootstrapIdentity = $env:EXPECTED_BOOTSTRAP_IDENTITY + upgradeBaseTag = $env:EXPECTED_UPGRADE_BASE_TAG + upgradeBaseAssetName = $env:EXPECTED_UPGRADE_BASE_ASSET_NAME + upgradeBaseSha256 = $env:EXPECTED_UPGRADE_BASE_SHA256 + upgradeBaseCommit = $env:EXPECTED_UPGRADE_BASE_COMMIT + signerSubject = $env:EXPECTED_SIGNER_SUBJECT + candidateSha256 = $env:EXPECTED_CANDIDATE_SHA256 + } + if ([int]$receipt.schemaVersion -ne 1) { throw 'Sealed release receipt schema is invalid.' } + foreach ($property in $expectedBindings.Keys) { + if (-not [string]::Equals( + [string]$receipt.$property, + [string]$expectedBindings[$property], + [StringComparison]::OrdinalIgnoreCase + )) { + throw "Sealed release protected binding differs before attestation: $property" + } + } + $entries = @($receipt.inventory.entries) + $expectedCount = if ($env:EXPECTED_RELEASE_MODE -ceq 'upgrade') { 7 } else { 5 } + if ($entries.Count -ne $expectedCount) { throw 'Sealed release receipt inventory count is invalid.' } + $seen = [Collections.Generic.HashSet[string]]::new([StringComparer]::OrdinalIgnoreCase) + $orderedPaths = [Collections.Generic.List[string]]::new() + foreach ($entry in $entries) { + $relative = [string]$entry.path + if ($relative -match '(^|[\\/])\.\.?(?:[\\/]|$)' -or + $relative.Contains('/') -or $relative.Contains(':') -or + -not $seen.Add($relative) -or [string]$entry.sha256 -cnotmatch '^[0-9A-Fa-f]{64}$' -or + [long]$entry.size -lt 0) { + throw 'Sealed release receipt contains an unsafe inventory entry.' + } + $orderedPaths.Add($relative) + $platformRelative = $relative.Replace('\', [IO.Path]::DirectorySeparatorChar) + $path = [IO.Path]::GetFullPath((Join-Path $sealedRoot $platformRelative)) + $prefix = $sealedRoot.TrimEnd([IO.Path]::DirectorySeparatorChar) + [IO.Path]::DirectorySeparatorChar + if (-not $path.StartsWith($prefix, [StringComparison]::Ordinal) -or + -not (Test-Path -LiteralPath $path -PathType Leaf) -or + (Get-Item -LiteralPath $path).Length -ne [long]$entry.size -or + (Get-FileHash -LiteralPath $path -Algorithm SHA256).Hash -cne + ([string]$entry.sha256).ToUpperInvariant()) { + throw 'Sealed release artifact differs from its exact receipt.' + } + } + $sortedPaths = @($orderedPaths | Sort-Object -CaseSensitive) + if ([string]::Join("`n", $orderedPaths) -cne [string]::Join("`n", $sortedPaths)) { + throw 'Sealed release receipt paths are not canonically ordered.' + } + $canonical = @($entries | ForEach-Object { + [ordered]@{ + path = [string]$_.path + size = [long]$_.size + sha256 = ([string]$_.sha256).ToUpperInvariant() + } + }) | ConvertTo-Json -Depth 8 -Compress + $inventorySha256 = [Convert]::ToHexString( + [Security.Cryptography.SHA256]::HashData([Text.Encoding]::UTF8.GetBytes($canonical)) + ) + if ($inventorySha256 -cne [string]$receipt.inventory.sha256) { + throw 'Sealed release receipt inventory aggregate is invalid.' + } + $actualPaths = @( + Get-ChildItem -LiteralPath $sealedRoot -Recurse -Force -File | + ForEach-Object { [IO.Path]::GetRelativePath($sealedRoot, $_.FullName).Replace('/', '\') } | + Sort-Object -CaseSensitive + ) + $expectedPaths = @($orderedPaths) + @('sealed-release-receipt.json') + $expectedPaths = @($expectedPaths | Sort-Object -CaseSensitive) + if ([string]::Join("`n", $actualPaths) -cne [string]::Join("`n", $expectedPaths)) { + throw 'Sealed release extracted topology is not exact before attestation.' + } + + - name: Attest bootstrap Windows artifacts + if: needs.certify-windows.outputs.release_mode == 'bootstrap' + uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a # v3 + with: + subject-path: | + ${{ runner.temp }}/waggle-windows-sealed/release/*-setup.exe + ${{ runner.temp }}/waggle-windows-sealed/release/windows-installer-certificate.json + ${{ runner.temp }}/waggle-windows-sealed/source/release-nsis/installer.nsi + ${{ runner.temp }}/waggle-windows-sealed/source/resources/service.js + ${{ runner.temp }}/waggle-windows-sealed/provenance/provenance-receipt.json + ${{ runner.temp }}/waggle-windows-sealed/sealed-release-receipt.json + + - name: Attest upgrade Windows artifacts + if: needs.certify-windows.outputs.release_mode == 'upgrade' + uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a # v3 + with: + subject-path: | + ${{ runner.temp }}/waggle-windows-sealed/release/*-setup.exe + ${{ runner.temp }}/waggle-windows-sealed/release/windows-installer-certificate.json + ${{ runner.temp }}/waggle-windows-sealed/release/windows-installer-upgrade-certificate.json + ${{ runner.temp }}/waggle-windows-sealed/source/release-nsis/installer.nsi + ${{ runner.temp }}/waggle-windows-sealed/source/resources/service.js + ${{ runner.temp }}/waggle-windows-sealed/provenance/provenance-receipt.json + ${{ runner.temp }}/waggle-windows-sealed/sealed-release-receipt.json + + publish-windows: + needs: [certify-windows, attest-windows] + if: >- + vars.WINDOWS_PUBLIC_RELEASE_AUTHORIZED == 'true' && + github.event.repository.private == false && + startsWith(github.ref, 'refs/tags/v') + runs-on: windows-latest + permissions: + contents: write + steps: + - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 + with: + fetch-depth: 0 + persist-credentials: false + + - name: Validate immutable publication boundary + shell: pwsh + run: | + $version = [string](Get-Content -Raw -LiteralPath 'app/src-tauri/tauri.conf.json' | ConvertFrom-Json).version + $checkedOutRevision = (git rev-parse --verify HEAD).Trim().ToLowerInvariant() + if ($env:GITHUB_REPOSITORY -cne 'marolinik/waggle-os' -or + $env:GITHUB_REF_TYPE -cne 'tag' -or + $env:GITHUB_REF_NAME -cne "v$version" -or + $checkedOutRevision -cne $env:GITHUB_SHA -or + @(git status --porcelain=v1 --untracked-files=all).Count -ne 0) { + throw 'Windows publication requires the clean exact repository, tag, revision, and version boundary.' + } + + - name: Download sealed Windows release outputs + uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4 + with: + artifact-ids: ${{ needs.certify-windows.outputs.artifact_id }} + path: ${{ runner.temp }}\waggle-windows-sealed + merge-multiple: true + + - name: Stage exact publication inputs + id: publication-inputs + shell: pwsh + env: + WAGGLE_RELEASE_MODE: ${{ needs.certify-windows.outputs.release_mode }} + EXPECTED_CANDIDATE_SHA256: ${{ needs.certify-windows.outputs.candidate_sha256 }} + EXPECTED_CANDIDATE_VERSION: ${{ needs.certify-windows.outputs.candidate_version }} + EXPECTED_BOOTSTRAP_IDENTITY: ${{ needs.certify-windows.outputs.bootstrap_identity }} + EXPECTED_BASE_TAG: ${{ needs.certify-windows.outputs.upgrade_base_tag }} + EXPECTED_BASE_ASSET_NAME: ${{ needs.certify-windows.outputs.upgrade_base_asset_name }} + EXPECTED_BASE_SHA256: ${{ needs.certify-windows.outputs.upgrade_base_sha256 }} + EXPECTED_BASE_COMMIT: ${{ needs.certify-windows.outputs.upgrade_base_commit }} + EXPECTED_SIGNER_SUBJECT: ${{ needs.certify-windows.outputs.signer_subject }} + EXPECTED_SEALED_RECEIPT_SHA256: ${{ needs.certify-windows.outputs.sealed_receipt_sha256 }} + EXPECTED_SEALED_ARTIFACT_ID: ${{ needs.certify-windows.outputs.artifact_id }} + EXPECTED_SEALED_ARTIFACT_DIGEST: ${{ needs.certify-windows.outputs.artifact_digest }} + run: | + $sealedRoot = Join-Path $env:RUNNER_TEMP 'waggle-windows-sealed' + $sealedReceiptPath = Join-Path $sealedRoot 'sealed-release-receipt.json' + foreach ($digest in @( + $env:EXPECTED_SEALED_RECEIPT_SHA256, + $env:EXPECTED_SEALED_ARTIFACT_DIGEST, + $env:EXPECTED_CANDIDATE_SHA256 + )) { + if ($digest -cnotmatch '^[0-9A-Fa-f]{64}$') { throw 'Publication artifact digest is invalid.' } + } + if ($env:EXPECTED_SEALED_ARTIFACT_ID -cnotmatch '^[1-9][0-9]*$' -or + -not (Test-Path -LiteralPath $sealedReceiptPath -PathType Leaf) -or + (Get-FileHash -LiteralPath $sealedReceiptPath -Algorithm SHA256).Hash -cne + $env:EXPECTED_SEALED_RECEIPT_SHA256.ToUpperInvariant()) { + throw 'Publication immutable artifact or sealed receipt binding is invalid.' + } + $sealedReceipt = Get-Content -Raw -LiteralPath $sealedReceiptPath | + ConvertFrom-Json -Depth 32 + $expectedBindings = [ordered]@{ + sourceRevision = $env:GITHUB_SHA + candidateTag = $env:GITHUB_REF_NAME + candidateVersion = $env:EXPECTED_CANDIDATE_VERSION + releaseMode = $env:WAGGLE_RELEASE_MODE + bootstrapIdentity = $env:EXPECTED_BOOTSTRAP_IDENTITY + upgradeBaseTag = $env:EXPECTED_BASE_TAG + upgradeBaseAssetName = $env:EXPECTED_BASE_ASSET_NAME + upgradeBaseSha256 = $env:EXPECTED_BASE_SHA256 + upgradeBaseCommit = $env:EXPECTED_BASE_COMMIT + signerSubject = $env:EXPECTED_SIGNER_SUBJECT + candidateSha256 = $env:EXPECTED_CANDIDATE_SHA256 + } + if ($sealedReceipt.schemaVersion -is [string] -or [int]$sealedReceipt.schemaVersion -ne 1) { + throw 'Publication sealed receipt schema is invalid.' + } + foreach ($property in $expectedBindings.Keys) { + if (-not [string]::Equals( + [string]$sealedReceipt.$property, + [string]$expectedBindings[$property], + [StringComparison]::Ordinal + )) { + throw "Publication sealed receipt binding differs: $property" + } + } + $entries = @($sealedReceipt.inventory.entries) + $expectedEntryCount = if ($env:WAGGLE_RELEASE_MODE -ceq 'upgrade') { 7 } else { 5 } + if ($entries.Count -ne $expectedEntryCount) { + throw 'Publication sealed receipt inventory count is invalid.' + } + $seen = [Collections.Generic.HashSet[string]]::new([StringComparer]::OrdinalIgnoreCase) + $orderedPaths = [Collections.Generic.List[string]]::new() + foreach ($entry in $entries) { + $relative = [string]$entry.path + if ($relative -match '(^|[\\/])\.\.?(?:[\\/]|$)' -or + $relative.Contains('/') -or $relative.Contains(':') -or + -not $seen.Add($relative) -or [string]$entry.sha256 -cnotmatch '^[0-9A-Fa-f]{64}$' -or + [long]$entry.size -lt 0) { + throw 'Publication sealed receipt contains an unsafe inventory entry.' + } + $orderedPaths.Add($relative) + $path = [IO.Path]::GetFullPath((Join-Path $sealedRoot $relative)) + $prefix = [IO.Path]::GetFullPath($sealedRoot).TrimEnd('\') + '\' + if (-not $path.StartsWith($prefix, [StringComparison]::OrdinalIgnoreCase) -or + -not (Test-Path -LiteralPath $path -PathType Leaf) -or + (Get-Item -LiteralPath $path).Length -ne [long]$entry.size -or + (Get-FileHash -LiteralPath $path -Algorithm SHA256).Hash -cne + ([string]$entry.sha256).ToUpperInvariant()) { + throw 'Publication artifact file differs from its sealed receipt.' + } + } + $sortedPaths = @($orderedPaths | Sort-Object -CaseSensitive) + if ([string]::Join("`n", $orderedPaths) -cne [string]::Join("`n", $sortedPaths)) { + throw 'Publication sealed receipt paths are not canonically ordered.' + } + $canonical = @($entries | ForEach-Object { + [ordered]@{ + path = [string]$_.path + size = [long]$_.size + sha256 = ([string]$_.sha256).ToUpperInvariant() + } + }) | ConvertTo-Json -Depth 8 -Compress + $inventorySha256 = [Convert]::ToHexString( + [Security.Cryptography.SHA256]::HashData([Text.Encoding]::UTF8.GetBytes($canonical)) + ) + if ($inventorySha256 -cne [string]$sealedReceipt.inventory.sha256) { + throw 'Publication sealed receipt inventory aggregate is invalid.' + } + $actualPaths = @( + Get-ChildItem -LiteralPath $sealedRoot -Recurse -Force -File | + ForEach-Object { [IO.Path]::GetRelativePath($sealedRoot, $_.FullName).Replace('/', '\') } | + Sort-Object -CaseSensitive + ) + $expectedPaths = @($orderedPaths) + @('sealed-release-receipt.json') + $expectedPaths = @($expectedPaths | Sort-Object -CaseSensitive) + if ([string]::Join("`n", $actualPaths) -cne [string]::Join("`n", $expectedPaths)) { + throw 'Sealed publication artifact topology is not exact.' + } + $sourceReleaseRoot = Join-Path $sealedRoot 'release' + $sealedSourceRoot = Join-Path $sealedRoot 'source' + $sealedProvenanceRoot = Join-Path $sealedRoot 'provenance' + $installers = @(Get-ChildItem -LiteralPath $sourceReleaseRoot -Filter '*-setup.exe' -File) + if ($installers.Count -ne 1 -or + -not [string]::Equals( + (Get-FileHash -LiteralPath $installers[0].FullName -Algorithm SHA256).Hash, + [string]$env:EXPECTED_CANDIDATE_SHA256, + [StringComparison]::OrdinalIgnoreCase + )) { + throw 'Sealed publication artifact does not contain exactly the certified candidate installer.' + } + $cleanReceipt = Get-Item -LiteralPath ( + Join-Path $sourceReleaseRoot 'windows-installer-certificate.json' + ) + $upgradeReceiptPath = Join-Path ` + $sourceReleaseRoot 'windows-installer-upgrade-certificate.json' + $expectedReleaseFileCount = if ($env:WAGGLE_RELEASE_MODE -ceq 'upgrade') { 3 } else { 2 } + if (@(Get-ChildItem -LiteralPath $sourceReleaseRoot -File).Count -ne + $expectedReleaseFileCount -or + ($env:WAGGLE_RELEASE_MODE -ceq 'upgrade') -ne + (Test-Path -LiteralPath $upgradeReceiptPath -PathType Leaf)) { + throw 'Sealed release directory does not contain exactly the installer and required certificate receipt(s).' + } + $sealedGeneratedInstaller = Get-Item -LiteralPath ( + Join-Path $sealedSourceRoot 'release-nsis\installer.nsi' + ) + $sealedService = Get-Item -LiteralPath ( + Join-Path $sealedSourceRoot 'resources\service.js' + ) + $sealedProvenance = @(Get-ChildItem -LiteralPath $sealedProvenanceRoot -File) + if (@(Get-ChildItem -LiteralPath $sealedSourceRoot -Recurse -File).Count -ne 2 -or + $sealedProvenance.Count -ne 1 -or + $sealedProvenance[0].Name -cne 'provenance-receipt.json') { + throw 'Sealed publication source and provenance topology is not exact.' + } + $cleanReceiptData = Get-Content -Raw -LiteralPath $cleanReceipt.FullName | + ConvertFrom-Json -Depth 32 + if ((Get-FileHash -LiteralPath $sealedGeneratedInstaller.FullName -Algorithm SHA256).Hash -cne + [string]$cleanReceiptData.evidence.generatedInstallerScriptSha256 -or + (Get-FileHash -LiteralPath $sealedService.FullName -Algorithm SHA256).Hash -cne + [string]$cleanReceiptData.evidence.sidecarBundleSha256) { + throw 'Sealed publication source inputs differ from their certified hashes.' + } + $targetReleaseRoot = 'app/src-tauri/target/x86_64-pc-windows-msvc/release' + if (Test-Path -LiteralPath $targetReleaseRoot) { throw 'Publication target already exists.' } + $publicationRoot = New-Item -ItemType Directory -Path (Join-Path $targetReleaseRoot 'bundle\nsis') + $generatedNsisRoot = New-Item -ItemType Directory -Path (Join-Path $targetReleaseRoot 'nsis') + Copy-Item -LiteralPath $installers[0].FullName ` + -Destination $publicationRoot.FullName -ErrorAction Stop + Copy-Item -LiteralPath $cleanReceipt.FullName ` + -Destination $publicationRoot.FullName -ErrorAction Stop + if ($env:WAGGLE_RELEASE_MODE -ceq 'upgrade') { + Copy-Item -LiteralPath $upgradeReceiptPath ` + -Destination $publicationRoot.FullName -ErrorAction Stop + } + Copy-Item -LiteralPath $sealedGeneratedInstaller.FullName ` + -Destination (Join-Path $generatedNsisRoot.FullName 'installer.nsi') -ErrorAction Stop + $canonicalServicePath = [IO.Path]::GetFullPath('app/src-tauri/resources/service.js') + if (Test-Path -LiteralPath $canonicalServicePath) { + throw 'Fresh publication checkout unexpectedly already contains generated service.js.' + } + [IO.File]::Copy($sealedService.FullName, $canonicalServicePath, $false) + if (@(Get-ChildItem -LiteralPath $publicationRoot.FullName -File).Count -ne + $expectedReleaseFileCount) { + throw 'Publication bundle contains an unexpected asset; provenance must remain separate.' + } + $baseInstallerPath = '' + if ($env:WAGGLE_RELEASE_MODE -ceq 'upgrade') { + $baselineRoot = Join-Path $sealedRoot 'baseline' + $baseInstallers = @(Get-ChildItem -LiteralPath $baselineRoot -File) + if ($baseInstallers.Count -ne 1 -or + $baseInstallers[0].Name -cne $env:EXPECTED_BASE_ASSET_NAME -or + -not [string]::Equals( + (Get-FileHash -LiteralPath $baseInstallers[0].FullName -Algorithm SHA256).Hash, + [string]$env:EXPECTED_BASE_SHA256, + [StringComparison]::OrdinalIgnoreCase + )) { + throw 'Sealed publication artifact does not contain the exact protected upgrade baseline.' + } + $baseInstallerPath = $baseInstallers[0].FullName + } elseif (Test-Path -LiteralPath (Join-Path $sealedRoot 'baseline')) { + throw 'Bootstrap sealed publication artifact contains an unexpected upgrade baseline.' + } + "WAGGLE_UPGRADE_BASE_INSTALLER_PATH=$baseInstallerPath" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + + - name: Publish certified Windows release + if: success() && startsWith(github.ref, 'refs/tags/v') + shell: pwsh + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + WINDOWS_BOOTSTRAP_RELEASE_IDENTITY: ${{ needs.certify-windows.outputs.bootstrap_identity }} + WINDOWS_UPGRADE_BASE_TAG: ${{ needs.certify-windows.outputs.upgrade_base_tag }} + WINDOWS_UPGRADE_BASE_ASSET_NAME: ${{ needs.certify-windows.outputs.upgrade_base_asset_name }} + WINDOWS_UPGRADE_BASE_SHA256: ${{ needs.certify-windows.outputs.upgrade_base_sha256 }} + WINDOWS_UPGRADE_BASE_COMMIT: ${{ needs.certify-windows.outputs.upgrade_base_commit }} + WINDOWS_CODESIGN_APPROVED_SUBJECT: ${{ needs.certify-windows.outputs.signer_subject }} + WAGGLE_RELEASE_MODE: ${{ needs.certify-windows.outputs.release_mode }} + WAGGLE_UPGRADE_BASE_COMMIT: ${{ needs.certify-windows.outputs.upgrade_base_commit }} + WAGGLE_CERTIFIED_CANDIDATE_SHA256: ${{ needs.certify-windows.outputs.candidate_sha256 }} + WAGGLE_CERTIFIED_CANDIDATE_VERSION: ${{ needs.certify-windows.outputs.candidate_version }} + run: | + if ($env:WAGGLE_RELEASE_MODE -notin @('bootstrap', 'upgrade')) { + throw 'Protected signer did not authorize a publication mode.' + } + $baseVersion = '' + if ($env:WAGGLE_RELEASE_MODE -ceq 'upgrade') { + if ($env:WINDOWS_UPGRADE_BASE_TAG -notmatch '^v(?\d+\.\d+\.\d+)$') { + throw 'Protected upgrade base tag is invalid during publication.' + } + $baseVersion = $Matches['version'] + } + $env:WAGGLE_UPGRADE_BASE_VERSION = $baseVersion + ./scripts/publish-windows-release.ps1 -Mode $env:WAGGLE_RELEASE_MODE + + build-macos: + strategy: + matrix: + include: + - target: aarch64-apple-darwin + arch: arm64 + runner: macos-15 + - target: x86_64-apple-darwin + arch: x64 + runner: macos-15-intel + runs-on: ${{ matrix.runner }} + env: + TARGET_ARCH: ${{ matrix.arch }} + steps: + - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 + with: + persist-credentials: false + + - name: Setup Node.js + uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 + with: + node-version: 22.23.2 + cache: npm + + - name: Verify runner architecture + run: node -e "if (process.arch !== process.env.TARGET_ARCH) { console.error('Expected ' + process.env.TARGET_ARCH + ' runner, got ' + process.arch); process.exit(1); }" + + - name: Setup Rust + uses: dtolnay/rust-toolchain@4cda84d5c5c54efe2404f9d843567869ab1699d4 + with: + toolchain: 1.94.0 targets: ${{ matrix.target }} - name: Rust cache - uses: Swatinem/rust-cache@v2 + uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2 with: workspaces: app/src-tauri - name: Install dependencies - run: npm install + run: npm ci + + - name: Install locked Tauri CLI + run: npm ci --prefix app --ignore-scripts - name: Build packages (shared -> core -> agent -> server) run: npm run build:packages + - name: Bundle Node.js runtime + run: node scripts/bundle-node.mjs + - name: Build sidecar run: node scripts/build-sidecar.mjs - name: Bundle native dependencies run: node scripts/bundle-native-deps.mjs - env: - TARGET_ARCH: ${{ matrix.target == 'aarch64-apple-darwin' && 'arm64' || 'x64' }} - - - name: Bundle Node.js runtime - run: node scripts/bundle-node.mjs - env: - TARGET_ARCH: ${{ matrix.target == 'aarch64-apple-darwin' && 'arm64' || 'x64' }} - name: Stage sidecar dependencies run: node scripts/stage-sidecar-deps.mjs - env: - TARGET_ARCH: ${{ matrix.target == 'aarch64-apple-darwin' && 'arm64' || 'x64' }} - name: Build frontend run: cd apps/web && npx vite build - name: Build Tauri (macOS) - uses: tauri-apps/tauri-action@v0 + run: cd app && node node_modules/@tauri-apps/cli/tauri.js build --target ${{ matrix.target }} env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + TAURI_PRIVATE_KEY: '' + TAURI_KEY_PASSWORD: '' + + - name: Upload macOS DMG verification artifact + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4 with: - projectPath: app - tagName: ${{ github.ref_name }} - releaseName: 'Waggle ${{ github.ref_name }}' - releaseBody: 'See the release notes for details.' - releaseDraft: true - prerelease: false - args: --target ${{ matrix.target }} + name: waggle-macos-dmg-verification-${{ matrix.target }}-${{ github.sha }} + path: app/src-tauri/target/${{ matrix.target }}/release/bundle/dmg/*.dmg + if-no-files-found: error + retention-days: 7 + + - name: Upload macOS app verification artifact + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4 + with: + name: waggle-macos-app-verification-${{ matrix.target }}-${{ github.sha }} + path: app/src-tauri/target/${{ matrix.target }}/release/bundle/macos/*.app + if-no-files-found: error + retention-days: 7 # NOTE: the Tauri auto-updater is disabled for v1 (plugins.updater removed from # tauri.conf.json — see BUILD P0-2 / P1-8). The former `update-manifest` job diff --git a/.github/workflows/sync-mind.yml b/.github/workflows/sync-mind.yml index 50a7f07..0b02c46 100644 --- a/.github/workflows/sync-mind.yml +++ b/.github/workflows/sync-mind.yml @@ -3,15 +3,16 @@ name: sync-mind-to-hive-mind # DEPRECATED 2026-04-30 — CC Sesija B monorepo migration §2.6 Task B22. # # This workflow was the bidirectional-sync mechanism between waggle-os and the -# now-archived `marolinik/hive-mind` repo while substrate code lived in BOTH +# public `marolinik/hive-mind` repo while substrate code lived in BOTH # places (packages/core/src/mind/ + packages/core/src/harvest/ in waggle-os, # duplicated in hive-mind/packages/core/src/{mind,harvest}/). # # After CC Sesija B migration (commits ff5b4aa..b59d188 on # feature/hive-mind-monorepo-migration), the substrate lives ONLY in -# waggle-os/packages/hive-mind-core/. The OSS distribution mechanism is now -# `git subtree split` from waggle-os monorepo to public mirror — see -# `scripts/oss-subtree-split.sh` and `packages/hive-mind-core/CONTRIBUTING.md`. +# waggle-os/packages/hive-mind-core/. The public mirror now has a curated layout +# and is updated through a maintainer-reviewed forward-port that removes excluded +# files and interleaved `install_audit` logic. Raw subtree branches are unsafe +# publish sources; see `packages/hive-mind-core/CONTRIBUTING.md`. # # This workflow is preserved for AUDIT TRAIL purposes (the historical # trigger paths and concurrency settings are referenced in EXTRACTION.md and @@ -21,9 +22,9 @@ name: sync-mind-to-hive-mind # on commit 3b556c0. # # DO NOT delete this file as part of cleanup — leave it as the deprecation -# anchor. If the workflow ever needs reactivation, trigger paths must be -# updated to the new packages/hive-mind-core/ location AND the -# @hive-mind ↔ @waggle name remapping must be added. +# anchor. Do not reactivate it by changing trigger paths: its filtered-patch +# model cannot safely remove interleaved proprietary schema logic. Build any +# future automation from the curated-forward-port contract instead. # Memory Sync Repair Step 3.2 — waggle-os → hive-mind direction. # @@ -59,6 +60,8 @@ concurrency: jobs: open-hive-mind-pr: + # Permanently inert deprecation anchor. This filtered-patch publisher cannot + # enforce the current interleaved proprietary-content boundary. name: Open auto-sync PR to marolinik/hive-mind runs-on: ubuntu-latest timeout-minutes: 10 @@ -68,7 +71,7 @@ jobs: # Configured by Marko via `gh secret set HIVE_MIND_SYNC_TOKEN`. # Without the secret, the job fails fast with a documented error # rather than silently skipping. - if: ${{ vars.MIND_SYNC_ENABLED == 'true' }} + if: ${{ false }} steps: - name: Checkout waggle-os (full history for the diff) diff --git a/.github/workflows/tauri-build-pr.yml b/.github/workflows/tauri-build-pr.yml index 0ebd618..9cc1396 100644 --- a/.github/workflows/tauri-build-pr.yml +++ b/.github/workflows/tauri-build-pr.yml @@ -24,6 +24,7 @@ on: - 'scripts/**' - 'package.json' - 'package-lock.json' + - '.github/workflows/release.yml' - '.github/workflows/tauri-build-pr.yml' push: branches: @@ -35,144 +36,251 @@ on: - 'scripts/**' - 'package.json' - 'package-lock.json' + - '.github/workflows/release.yml' + - '.github/workflows/tauri-build-pr.yml' workflow_dispatch: +permissions: + contents: read + jobs: verify-windows: runs-on: windows-latest timeout-minutes: 45 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 + with: + persist-credentials: false - name: Setup Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: - node-version: 20 + node-version: 22.23.2 cache: npm - name: Setup Rust - uses: dtolnay/rust-toolchain@stable + uses: dtolnay/rust-toolchain@4cda84d5c5c54efe2404f9d843567869ab1699d4 + with: + toolchain: 1.94.0 - name: Rust cache - uses: Swatinem/rust-cache@v2 + uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2 with: workspaces: app/src-tauri - name: Install dependencies - run: npm install + run: npm ci + + - name: Verify Windows skill-audit and vault regressions + shell: pwsh + run: node node_modules/vitest/vitest.mjs run --root . --config vitest.config.ts packages/agent/tests/skill-audit-store.test.ts packages/core/tests/vault.test.ts --maxWorkers=1 --no-file-parallelism + + - name: Verify Windows release-mode and publication guards + shell: pwsh + env: + WAGGLE_REQUIRE_PWSH7: '1' + run: node node_modules/vitest/vitest.mjs run --root . --config vitest.config.ts packages/server/tests/tauri-config.test.ts -t "CI/CD Configuration" + + - name: Install locked Tauri CLI + run: npm ci --prefix app --ignore-scripts - name: Build packages (shared → core → agent → server) run: npm run build:packages + - name: Bundle Node.js runtime + run: node scripts/bundle-node.mjs + - name: Build sidecar run: node scripts/build-sidecar.mjs - name: Bundle native dependencies run: node scripts/bundle-native-deps.mjs - - name: Bundle Node.js runtime - run: node scripts/bundle-node.mjs - - name: Stage sidecar dependencies run: node scripts/stage-sidecar-deps.mjs + - name: Verify packaged hook lifecycles + run: node node_modules/vitest/vitest.mjs run --root . --config vitest.config.ts packages/agent/tests/hook-packages-runtime.test.ts -t "runs staged Tauri hook lifecycles" + env: + WAGGLE_VERIFY_STAGED_HOOK_RUNTIME: '1' + - name: Build frontend run: cd apps/web && npx vite build + - name: Verify repository cleanliness before Tauri build + shell: pwsh + run: | + $sourceStatus = @(& git status --porcelain=v1 --untracked-files=all) + if ($LASTEXITCODE -ne 0) { throw 'Could not inspect repository source state before Tauri build.' } + if ($sourceStatus.Count -ne 0) { + $sourceDetails = $sourceStatus -join [Environment]::NewLine + throw "Repository must be clean before Windows Tauri build.$([Environment]::NewLine)$sourceDetails" + } + - name: Build Tauri (Windows) - # @tauri-apps/cli is declared in app/package.json devDeps but is absent - # from package-lock.json, so `npm install` never installs it and a bare - # `npx tauri` errors "could not determine executable to run". Fetch the - # CLI explicitly by package name (npx resolves the win32 binary). - run: cd app && npx --yes @tauri-apps/cli@2 build + id: tauri-build-windows + # app/package-lock.json pins the CLI and platform binary. Invoke that + # local copy so verification builds cannot drift to a newer 2.x release. + run: cd app && node node_modules/@tauri-apps/cli/tauri.js build --bundles nsis env: # Skip code signing for PR verification — release.yml handles signing # only on tag push. TAURI_PRIVATE_KEY: '' TAURI_KEY_PASSWORD: '' + - name: Report repository changes after Tauri build + if: ${{ always() && steps.tauri-build-windows.outcome != 'skipped' }} + shell: pwsh + run: | + $sourceStatus = @(& git status --porcelain=v1 --untracked-files=all) + if ($LASTEXITCODE -ne 0) { throw 'Could not inspect repository source state after Tauri build.' } + if ($sourceStatus.Count -ne 0) { + $trackedPaths = @(& git diff --name-only --diff-filter=ACDMRTUXB) + if ($LASTEXITCODE -ne 0) { throw 'Could not enumerate tracked Tauri build mutations.' } + foreach ($trackedPath in $trackedPaths) { + Write-Host "::group::Tracked mutation: $trackedPath" + $headBlob = @(& git rev-parse "HEAD:$trackedPath" 2>&1) -join '' + $headBlobExit = $LASTEXITCODE + $indexBlob = @(& git rev-parse ":$trackedPath" 2>&1) -join '' + $indexBlobExit = $LASTEXITCODE + if (Test-Path -LiteralPath $trackedPath -PathType Leaf) { + $worktreeHash = (Get-FileHash -LiteralPath $trackedPath -Algorithm SHA256).Hash.ToLowerInvariant() + $filteredBlob = @(& git hash-object "--path=$trackedPath" -- $trackedPath 2>&1) -join '' + $filteredBlobExit = $LASTEXITCODE + $resolvedPath = (Resolve-Path -LiteralPath $trackedPath).Path + $bytes = [IO.File]::ReadAllBytes($resolvedPath) + $crlfCount = 0 + $lfOnlyCount = 0 + for ($index = 0; $index -lt $bytes.Length; $index += 1) { + if ($bytes[$index] -ne 10) { continue } + if ($index -gt 0 -and $bytes[$index - 1] -eq 13) { $crlfCount += 1 } + else { $lfOnlyCount += 1 } + } + } else { + $worktreeHash = '' + $filteredBlob = '' + $filteredBlobExit = 0 + $crlfCount = 0 + $lfOnlyCount = 0 + } + Write-Host "HEAD blob (exit $headBlobExit): $headBlob" + Write-Host "Index blob (exit $indexBlobExit): $indexBlob" + Write-Host "Git-filtered worktree blob (exit $filteredBlobExit): $filteredBlob" + Write-Host "Raw worktree SHA256: $worktreeHash; CRLF=$crlfCount; LF-only=$lfOnlyCount" + $changeSummary = @(& git diff --numstat -- $trackedPath) + $changeSummaryExit = $LASTEXITCODE + if ($changeSummaryExit -ne 0) { + Write-Host "Could not render numeric diff summary (exit $changeSummaryExit)." + } else { + Write-Host "Numeric diff summary: $($changeSummary -join '; ')" + } + Write-Host '::endgroup::' + } + $sourceDetails = $sourceStatus -join [Environment]::NewLine + throw "Windows Tauri build mutated repository worktree.$([Environment]::NewLine)$sourceDetails" + } + + - name: Certify Windows Solo installer lifecycle + shell: pwsh + run: | + $installers = @(Get-ChildItem -LiteralPath 'app/src-tauri/target' -Recurse -Filter '*-setup.exe' -File | Where-Object { $_.DirectoryName -match '[\\/]bundle[\\/]nsis$' }) + if ($installers.Count -ne 1) { throw "Expected exactly one NSIS setup executable, found $($installers.Count)" } + $installer = $installers[0] + & ./scripts/certify-windows-installer.ps1 -InstallerPath $installer.FullName -ExpectedSourceRevision $env:GITHUB_SHA + - name: Upload Windows artifacts - uses: actions/upload-artifact@v4 - if: always() + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4 with: name: waggle-windows-${{ github.sha }} path: | - app/src-tauri/target/release/bundle/nsis/*.exe - app/src-tauri/target/release/bundle/msi/*.msi - if-no-files-found: warn + app/src-tauri/target/**/bundle/nsis/*.exe + app/src-tauri/target/**/bundle/nsis/windows-installer-certificate.json + if-no-files-found: error retention-days: 7 verify-macos: - runs-on: macos-latest timeout-minutes: 60 strategy: # Per-arch, matching release.yml. Universal builds are rejected by the # bundle scripts (sqlite-vec / onnxruntime / node ship per-arch binaries), # so each arch is staged and built separately. matrix: - target: [aarch64-apple-darwin, x86_64-apple-darwin] + include: + - target: aarch64-apple-darwin + arch: arm64 + runner: macos-15 + bundles: dmg + artifact_path: app/src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/*.dmg + - target: x86_64-apple-darwin + arch: x64 + runner: macos-15-intel + bundles: app + artifact_path: app/src-tauri/target/x86_64-apple-darwin/release/bundle/macos/*.app + runs-on: ${{ matrix.runner }} + env: + TARGET_ARCH: ${{ matrix.arch }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 + with: + persist-credentials: false - name: Setup Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: - node-version: 20 + node-version: 22.23.2 cache: npm + - name: Verify runner architecture + run: node -e "if (process.arch !== process.env.TARGET_ARCH) { console.error('Expected ' + process.env.TARGET_ARCH + ' runner, got ' + process.arch); process.exit(1); }" + - name: Setup Rust - uses: dtolnay/rust-toolchain@stable + uses: dtolnay/rust-toolchain@4cda84d5c5c54efe2404f9d843567869ab1699d4 with: + toolchain: 1.94.0 targets: ${{ matrix.target }} - name: Rust cache - uses: Swatinem/rust-cache@v2 + uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2 with: workspaces: app/src-tauri - name: Install dependencies - run: npm install + run: npm ci + + - name: Install locked Tauri CLI + run: npm ci --prefix app --ignore-scripts - name: Build packages (shared → core → agent → server) run: npm run build:packages + - name: Bundle Node.js runtime + run: node scripts/bundle-node.mjs + - name: Build sidecar run: node scripts/build-sidecar.mjs - name: Bundle native dependencies run: node scripts/bundle-native-deps.mjs - env: - TARGET_ARCH: ${{ matrix.target == 'aarch64-apple-darwin' && 'arm64' || 'x64' }} - - - name: Bundle Node.js runtime - run: node scripts/bundle-node.mjs - env: - TARGET_ARCH: ${{ matrix.target == 'aarch64-apple-darwin' && 'arm64' || 'x64' }} - name: Stage sidecar dependencies run: node scripts/stage-sidecar-deps.mjs - env: - TARGET_ARCH: ${{ matrix.target == 'aarch64-apple-darwin' && 'arm64' || 'x64' }} - name: Build frontend run: cd apps/web && npx vite build - name: Build Tauri (macOS ${{ matrix.target }}) - # See verify-windows note: fetch @tauri-apps/cli by package name (absent - # from the lockfile). Built per-arch — universal is rejected by the - # bundle scripts (per-arch native modules), matching release.yml. - run: cd app && npx --yes @tauri-apps/cli@2 build --target ${{ matrix.target }} + # See verify-windows note: use the app-local lockfile-pinned CLI. + # Built per-arch — universal is rejected by the bundle scripts + # (per-arch native modules), matching release.yml. + run: cd app && node node_modules/@tauri-apps/cli/tauri.js build --target ${{ matrix.target }} --bundles ${{ matrix.bundles }} env: TAURI_PRIVATE_KEY: '' TAURI_KEY_PASSWORD: '' - name: Upload macOS artifacts - uses: actions/upload-artifact@v4 - if: always() + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4 with: name: waggle-macos-${{ matrix.target }}-${{ github.sha }} - path: | - app/src-tauri/target/${{ matrix.target }}/release/bundle/dmg/*.dmg - app/src-tauri/target/${{ matrix.target }}/release/bundle/macos/*.app - if-no-files-found: warn + path: ${{ matrix.artifact_path }} + if-no-files-found: error retention-days: 7 diff --git a/.gitignore b/.gitignore index 36f8dd5..7c73884 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,11 @@ dist dist-ssr *.local +# Local generated analysis and runtime build artifacts +coverage/ +dist-analyze/ +node-compile-cache/ + # Environment .env .env.local @@ -198,7 +203,6 @@ app/src-tauri/resources/native/ # hook). A committed copy goes stale silently — a binary shipping an old server # is a release-stopping defect class (UX-Refactor P4 ruling). app/src-tauri/resources/service.js -app/src-tauri/resources/service.js.map # Editor directories and files .vscode/* @@ -219,6 +223,8 @@ app/src-tauri/resources/service.js.map playwright-report/ test-results/ tests/screenshots/ +/.playwright-cli/ +/output/ s*.png screen*.png # …but never the committed persona avatars (sales-rep/support-agent match s*.png) @@ -280,3 +286,20 @@ bun.lock # Local plaintext API keys — never commit AI API KEYS.txt + +# Sesija C external dependencies — vendored per-clone, not committed +# (ARE platform installed under external/meta-agents-research-environments; +# pinned SHA tracked in benchmarks/gaia2/README.md) +external/ + +# Sesija C per-run output dirs — large JSONL traces, not committed +# (Phase 2 smoke evidence summarized in benchmarks/gaia2/smoke-evidence.md; +# Phase 4 dry run JSONLs stay local + summarized in dry-run-results-memo.md) +benchmarks/gaia2/runs/* +!benchmarks/gaia2/runs/.gitkeep + +# Sesija C per-clone Gaia2 task dumps — produced by dump-tasks.py from HF, +# large JSONL (2.44–2.67M chars/scenario), not committed. Phase 3b-B +# regenerates locally; Phase 4 Docker run uses ARE-native HF loader directly. +benchmarks/gaia2/data/* +!benchmarks/gaia2/data/.gitkeep diff --git a/AGENTS.md b/AGENTS.md index 3c5295d..eeeff43 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -16,8 +16,9 @@ If you're about to write code, **Section 3** is the most important thing you'll ## 1. What Waggle OS Actually Is -**Waggle OS** is a workspace-native AI agent platform with persistent memory. It ships as a -Tauri 2.0 desktop binary for Windows and macOS, with a Vite-bundled web app and a Node.js sidecar. +**Waggle OS** is a workspace-native AI agent platform with persistent memory. The active release +candidate is a Windows-first Tauri 2.0 desktop app with a Vite-bundled web UI and a bundled Node.js +sidecar. macOS packaging, signing, notarization, and runtime certification are roadmap work. **Strategic function:** Waggle is the demand-creation and qualification engine for KVARK — Egzakta Group's sovereign enterprise AI platform. @@ -38,23 +39,52 @@ Egzakta Group's sovereign enterprise AI platform. and connectors are all free (they generate memory). Team collaboration (shared memory, WaggleDance, governance) is the upgrade trigger. -### Key Technology Facts (Verified April 2026) +### Current Release Qualification Contract (2026-08-22) + +- Launch gate: **Windows Solo only**. +- In-scope external-agent release cohort: **Claude Code, Codex, and Hermes**. Each integration + uses the user's own installed client and its official user authentication. +- **Cursor and OpenClaw are roadmap-only**: detection metadata may remain, but production launch, + hooks, Fleet/task dispatch, and direct run routes must fail closed for them. +- Claude Desktop, Codex Desktop, and Hermes Desktop may remain as detected convenience launch + surfaces; they are not separate memory-hook or agent-acceptance targets in this release gate. +- ChatGPT/OpenAI is a model/provider and memory-import surface, not a separate launcher target. +- The Windows Solo qualification receipt must prove the bundled Node sidecar, no-Python + OpenAI-compatible proxy, Waggle-managed local runtime/model, default in-process embedding path, + and freedom from developer Node, Docker, Python, external LiteLLM, or a separately installed + Ollama. A separate revision-bound receipt must prove smart-router primary, compact-tool-context, + budget, and fallback paths and may carry forward only under the launch recommendation's bounded + no-impact rule; user-installed Ollama remains optional. +- Persona release evidence requires a complete 10-persona x 3-run collection with every result + at or above 95/100 after any explicitly documented independent semantic adjudication, plus a + final-HEAD no-impact attestation or a fresh 30/30 rerun when intervening behavior changed. Never + relabel a non-gating collection as a canonical deterministic seal. +- Do not claim release approval until the current launch recommendation's exact-HEAD gates pass. +- Exact candidate revisions, installer hashes, local receipt hashes, carry-forward limits, and the + current verdict live only in `docs/production-readiness/09-LAUNCH_RECOMMENDATION.md`. Do not copy + an old candidate's evidence forward merely because a later branch contains its commits. +- Public GO still requires a publicly trusted Authenticode artifact and a sealed managed Deep + Security report for the exact approved release-tag commit, with no unresolved Critical/High. +- The repository remains private until an explicit open-source and licensing decision is made. + +### Key Technology Facts (Verified August 2026) | Layer | Stack | |---|---| | Frontend | React **19** + TypeScript + Vite + Tailwind 4 + base-ui/react | | Desktop | Tauri 2.0 (Rust shell) | | Backend | Fastify sidecar (Node.js, bundled into Tauri) | -| LLM routing | LiteLLM (see `litellm-config.yaml`) | +| LLM routing | Bundled no-Python OpenAI-compatible proxy for Windows Solo; optional LiteLLM deployment config | | Database | SQLite via @waggle/core (better-sqlite3 + sqlite-vec-windows-x64) | | Memory | FrameStore + HybridSearch + KnowledgeGraph + IdentityLayer + AwarenessLayer | | Agent runtime | `packages/agent/src/agent-loop.ts` | | Billing | Stripe (installed; `stripe@^21.0.1`) | | Design | Hive DS — honey #e5a000 / hive-950 #08090c / accent #a78bfa | | Tests | Vitest (unit) + Playwright (E2E) | -| Deploy | Dockerfile + docker-compose.production.yml + render.yaml | +| Deploy | Windows Tauri installer; optional Dockerfile + docker-compose.production.yml + render.yaml | -Package manager: npm (root) with `bun.lock` also present. Node >= 20. +Package manager: npm with the root `package-lock.json`. Source development requires Node +`^20.19.0 || >=22.12.0`; the packaged Windows desktop runtime is pinned to Node `22.23.2`. --- @@ -67,7 +97,7 @@ waggle-os/ ├── apps/ │ ├── web/ # <-- MAIN web app UI (this is where most components live) │ └── www/ # Landing page (waggle-os.ai) -├── packages/ # 16 workspace packages (see below) +├── packages/ # 28 workspace packages (see below) ├── sidecar/ # Node.js sidecar bundled into Tauri ├── scripts/ # build-sidecar, bundle-native-deps, bundle-node ├── tests/ # Cross-cutting integration tests @@ -81,7 +111,7 @@ waggle-os/ └── package.json (workspaces: apps/*, packages/*) ``` -### Packages (`packages/`, 27 workspaces — verified 2026-05-28) +### Packages (`packages/`, 28 workspaces — verified 2026-08-02) ``` Core (15): admin-web cli launcher marketplace @@ -89,15 +119,15 @@ agent core memory-mcp optimizer sdk server shared waggle-dance weaver wiki-compiler worker -hive-mind OSS split (12 — synced to marolinik/hive-mind, see §7.5): +hive-mind OSS source set (13 — curated forward-port target is marolinik/hive-mind; see §7.5): hive-mind-core hive-mind-cli hive-mind-shim-core hive-mind-mcp-server -hive-mind-wiki-compiler -hive-mind-hooks-{Codex, Codex-desktop, codex, codex-desktop, +hive-mind-wiki-compiler hive-mind-hooks-core +hive-mind-hooks-{claude-code, claude-desktop, codex, codex-desktop, cursor, hermes, openclaw} ``` > Note: the prior list said "16" and included `ui`, which has no `package.json` -> (not a workspace). Real count is 27. The 12 `hive-mind-*` packages were added -> since the April verification. +> (not a workspace). The live count is 28: 15 product packages and 13 +> `hive-mind-*` packages. ### `packages/agent/src/` — MOST ACTIVE (94 .ts files + 4 subdirs) @@ -152,10 +182,11 @@ Subdirs: MOVED (2026-04-30 monorepo migration): the memory substrate `mind/` (db/schema/ identity/awareness/frames/sessions/search/knowledge/scoring/reconcile/ontology/ concept-tracker/entity-normalizer/evolution-runs/execution-traces/ - improvement-signals/embedding-provider/*-embedder) and `harvest/` (chatgpt/Codex/ - Codex/gemini/perplexity/pdf/plaintext/markdown/url/universal adapters + + improvement-signals/embedding-provider/*-embedder) and `harvest/` (chatgpt/claude/ + claude-code/gemini/perplexity/pdf/plaintext/markdown/url/universal adapters + pipeline.ts + dedup.ts) now live at **packages/hive-mind-core/src/{mind,harvest}/**, - NOT under packages/core/. The OSS mirror is generated from there via subtree-split (§7.5). + NOT under packages/core/. The OSS mirror is curated from there through a maintainer-reviewed + forward-port (§7.5); raw subtree branches are never publish sources. ``` For the deep-dive on what the mind/ substrate does, see [`docs/memory-architecture.md`](docs/memory-architecture.md). @@ -219,6 +250,35 @@ npm run lint > run the `packages/server` tsc above. (A real type error slipped through this > way on 2026-05-28; see `docs/addictiveness-audit-2026-05-28/REDUNDANCY-AUDIT.md`.) +### Windows Solo release commands (PowerShell 7; frozen clean checkout) + +```powershell +# Local build-host preparation (the installed desktop has none of these prerequisites). +npm ci +npm ci --prefix app --ignore-scripts +npm run build:packages + +# Local unsigned smoke build only; this is not a releasable artifact. +npm --prefix app run tauri:build:win + +# Optional internal-pilot build. Its private test root is not public trust. +npm --prefix app run tauri:build:win:pilot-signed + +# Certify an internal candidate under a disposable Windows profile. +pwsh -NoProfile -File scripts/certify-windows-installer.ps1 ` + -InstallerPath "" ` + -ExpectedSourceRevision "<40-character-final-HEAD>" ` + -VerifyManagedModel +``` + +Production signing is hosted-only. Do not use a local thumbprint, client secret, or +`sign-windows-artifact.ps1` substitute to create a release artifact. The exact-tag +`.github/workflows/release.yml` Azure OIDC chain is authoritative for production signing, +certification, attestation, and publication. Never treat an unsigned or internal-pilot build +as publicly trusted. +The certified installed desktop must not depend on developer Node.js, Python, +Docker, external LiteLLM, or a separately installed Ollama. + --- ## 3. Behavioral Rules — How You Must Work @@ -379,7 +439,7 @@ interface AgentPersona { // guardrails + picker metadata (all optional, all shipped) disallowedTools?: string[] // denylist — overrides tools[] on conflict failurePatterns?: string[] // documented failure modes — shown in hover tooltip - isReadOnly?: boolean // true = no write tools ever (enforced in assembleToolPool) + isReadOnly?: boolean // true = no write tools after applyPersonaToolFilter/filterMcpToolsForPersona tagline?: string // one sentence for picker hover bestFor?: string[] // 3 example tasks in user-facing language wontDo?: string // hard boundary statement @@ -418,7 +478,7 @@ shows tagline + bestFor + wontDo. "Create Custom Persona" inline form POSTs to ## 7. Security Constraints (Non-Negotiable) -1. **Vault-only secrets.** API keys in Vault or `.env` (never committed). `.env.example` has key names only. +1. **Vault-only secrets.** API keys belong in Vault or an untracked local `.env`, never in Git. `.env.example` may contain non-secret development defaults, but never usable credentials or secrets. 2. **Injection defense.** `scanForInjection()` from `injection-scanner.ts` MUST be called on all connector/external input. 3. **No eval, no dynamic require.** Tauri WebView is restricted. 4. **Tauri IPC allowlist.** Explicit in `app/src-tauri/capabilities/`. Never `allowlist: all: true`. @@ -428,7 +488,7 @@ shows tagline + bestFor + wontDo. "Create Custom Persona" inline form POSTs to --- -## 7.5. Memory Substrate Sync (waggle-os → hive-mind, subtree-split) +## 7.5. Memory Substrate Sync (waggle-os → hive-mind, curated forward-port) The memory substrate lives at **`packages/hive-mind-core/src/{mind,harvest}/`** (moved from `packages/core/src/` in the 2026-04-30 monorepo migration). The public OSS mirror at @@ -443,14 +503,16 @@ directly on the OSS mirror.** Parity is NOT automatic — it broke once: the cro (`inprocess-reranker.ts` + HybridSearch options) was written directly on `marolinik/hive-mind` during the LoCoMo benchmark arc and existed ONLY there, discovered by the W4 recon and reverse-ported in W4.2 (`f47ee8f`). Rules: -1. Substrate changes land in `packages/hive-mind-core/` here FIRST; the mirror is regenerated - via subtree-split afterward. +1. Substrate changes land in `packages/hive-mind-core/` here FIRST; the mirror is updated + through a reviewed, maintainer-curated forward-port afterward. 2. Benchmark/experiment work in a `D:/Projects/hive-mind` checkout is throwaway unless reverse-ported here — port it the same arc, don't let it sit. -3. Run **`scripts/oss-drift-check.sh`** (file-level diff of the mapped src trees) before every - OSS release push and after any arc that touched a hive-mind checkout. -4. External PRs on the OSS repo are fine — the maintainer merges them back here via - subtree-pull, then re-splits. +3. Run **`node scripts/oss-drift-check.mjs D:/Projects/hive-mind`** before every OSS release + push and after any arc that touched a hive-mind checkout. The checker compares the live + mapped trees with an immutable reviewed baseline: parity and reviewed adaptations are + allowed, while known blockers, unreviewed differences, or forbidden exports keep exit 1. +4. External PRs on the OSS repo are fine — the maintainer intentionally ports accepted changes + back here first, then prepares the next curated forward-port. === END CRITICAL === === CORRECTION — how the sync ACTUALLY works (2026-06-12 drift analysis) === @@ -481,8 +543,10 @@ The prior text here claimed the mirror is produced by `scripts/oss-subtree-split **To work on the substrate or publish the OSS mirror:** see [`packages/hive-mind-core/CONTRIBUTING.md`](./packages/hive-mind-core/CONTRIBUTING.md), [`scripts/oss-subtree-split.sh`](./scripts/oss-subtree-split.sh) (inspection/guard only), and -[`scripts/oss-drift-check.sh`](./scripts/oss-drift-check.sh) (run before every release; note its -~50 "DIFFERS" are mostly OSS-adaptation noise — layout + import rewrites — not true drift). +[`scripts/oss-drift-check.mjs`](./scripts/oss-drift-check.mjs) (run before every release; its +immutable baseline distinguishes parity, reviewed adaptations, known blockers, unreviewed +differences, and forbidden exports; every blocker or unreviewed entry must be resolved or +explicitly re-baselined through maintainer review before an OSS release). **Deprecated (do not rely on; do not delete):** the old dual-repo bidirectional-sync workflows `.github/workflows/{mind-parity-check,sync-mind}.yml` and the `.github/sync.md` manual are **preserved @@ -517,7 +581,7 @@ Grep before creating. These exist and are functional: | `packages/core/src/telemetry.ts` | Telemetry pipeline | | `packages/hive-mind-core/src/harvest/pipeline.ts` | Harvest adapters + dedup | | `packages/core/src/compliance/` | Compliance + audit | -| `app/src/components/cockpit/` | Tauri cockpit UI | +| `apps/web/src/components/os/` | Main desktop cockpit UI loaded by Tauri | --- @@ -556,7 +620,7 @@ Do not recreate or expose outside gating. - **Premium harness reached HONEST 21/21** (May 2026 S1) — every pillar regression-locked + composing. Full agent suite 2657/2657. See `memory/project_session_handoff_0519_s1.md`. **AI-OS arc (May 2026 S1/S2, 14 commits on origin):** -- Phase 0 — Tool detection PoC (`packages/agent/src/tool-detection.ts`) for all 7 supported AI tools, hermetic + cross-platform. +- Phase 0 — Tool detection PoC (`packages/agent/src/tool-detection.ts`) for eight registered AI-tool surfaces, hermetic + cross-platform. Registration is broader than release support. - Phase 1A — WaggleDance v2 dispatcher branches wired (discovery/routed_share/model_recipe/knowledge_match/task_claim/model_recommendation). - Phase 1B — Local sidecar surface (`/api/waggle-dance/signal` + `/signals`), SignalBus ring buffer, personal-tier-eligible. - Phase 1C — Bridge: v2 bus → existing `/api/waggle/signals` UI stream (zero frontend changes). @@ -565,7 +629,7 @@ Do not recreate or expose outside gating. - Phase 2A — Launcher backend (`/api/tools/launch`, `/api/tools/hooks`). - Phase 2B — LauncherApp dock surface (`apps/web/src/components/os/apps/LauncherApp.tsx`). - Phase 3 — Skill diffusion (D1 fire → `skill_share` broadcast via `onSkillDistillationFire` callback). -- Phase 4 — Full 7-tool launch cohort + Mission Control inventory tile + Memory provenance badge + launch-with-prompt textarea + process tracker / 'Running' badge. +- Phase 4 — Eight-tool inventory/detection surface + Mission Control tile + Memory provenance badge + launch-with-prompt textarea + process tracker / 'Running' badge. The in-scope agent-integration release cohort is Claude Code, Codex, and Hermes; Cursor and OpenClaw are roadmap-only. End-to-end: detect → install hooks (reversible) → launch with `WAGGLE_WORKSPACE_ID` env → hook captures → shim emitter → bus → bridge → UI. Rollback tag: `checkpoint/pre-ai-os-2026-05-20`. AI-OS exploration doc: `docs/plans/AI-OS-EXPLORATION-2026-05-19.md`. @@ -574,7 +638,7 @@ End-to-end: detect → install hooks (reversible) → launch with `WAGGLE_WORKSP |---|---|---| | 1 | Spawn Agent + Dock wiring | P36 already wired in `Dock.tsx`+`Desktop.tsx`; P35 third-tier fallback (LiteLLM → runtime model → provider catalogs) landed `14942be`. Residual: runtime verification on a clean install. | | 2 | Light mode finish | P40/P41 + CR-2 — semantic-token migration is done (no hive-950 references except a comment); remaining issues are render-time fine-tuning (BootScreen visual polish + a few header-styling judgments) that need a binary build to validate. | -| 3 | Wave 2/3 hook implementations | **Mostly DONE (corrected 2026-06-29).** 6 of 7 hook packages ship real bins: Codex + the 2026-06-01 Wave 2/3 port (codex, codex-desktop, cursor, hermes, openclaw). Only `hive-mind-hooks-Codex-desktop` remains a binless `export {}` stub (deferred MCP-bridge category). The dock (`LauncherApp.tsx`) now exposes hook install/verify/uninstall for all 6 via the corrected `HOOKS_COHORT` (was hardcoded `['Codex']`). Residual: Codex-desktop MCP-bridge hook only. | +| 3 | External-tool release cohort | **Windows Solo scope fixed 2026-08-02.** Claude Code, Codex, and Hermes are the in-scope agent-integration cohort. Cursor and OpenClaw implementations remain in-tree as roadmap work and are fail-closed in production surfaces. Claude Desktop, Codex Desktop, and Hermes Desktop are convenience launch surfaces, not separate agent-acceptance targets. | **Closed during May 2026 backlog sweep:** - ✅ OW-6 PersonaSwitcher two-tier — shipped via M-01 (`PersonaSwitcher.tsx` + `lib/persona-tier.ts` + `lib/persona-tooltip.ts`); 26/26 tests passing @@ -623,17 +687,13 @@ For the full polish+launch backlog see `docs/plans/BACKLOG-CONSOLIDATED-2026-04- | BEHAVIORAL_SPEC | Core agent rules (`packages/agent/src/behavioral-spec.ts`) | | Sidecar | Node.js Fastify server bundled into Tauri (`/sidecar`) | | KVARK | Egzakta sovereign enterprise AI — top of the Waggle funnel | -| LiteLLM | LLM routing layer (`litellm-config.yaml`) | +| LiteLLM | Optional server/team deployment proxy config (`litellm-config.yaml`); Windows Solo uses the bundled no-Python proxy and smart router | | WaggleDance | Multi-agent coordination package (`packages/waggle-dance`) | -| Weaver | `packages/weaver` — (check source for current role) | +| Weaver | Memory consolidation and session-skill extraction engine (`packages/weaver`) | | Evolution | Self-improvement subsystem (`evolution-*.ts`, `judge.ts`, `iterative-optimizer.ts`) | -| assembleToolPool | Per-persona tool filtering from allowlist + denylist (to implement) | +| applyPersonaToolFilter / filterMcpToolsForPersona | Enforced local and MCP per-persona allowlist/denylist filtering (`packages/server/src/local/persona-tool-filter.ts`) | --- Maintained by Marko Markovic · Egzakta Group · April 2026 waggle-os.ai · www.kvark.ai - -## Imported Claude Cowork project instructions - -This is my app repo... use it for exploring and working. What ever you produce, you will put in a new folder cowork and store all there dont change the reo itself. diff --git a/CLAUDE.md b/CLAUDE.md index d30b8a7..7327235 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1,9 +1,9 @@ # CLAUDE.md — Waggle OS -### Authoritative Operating Contract · All Agents · All Contributors · All Sessions +### Claude operational companion -> Read this file in full before touching a single line of code. -> It is the single source of truth for architecture, strategic intent, and mechanical operating rules. -> If this file conflicts with any other document, **this file wins.** +> Read `AGENTS.md` in full before touching code. `AGENTS.md` is the canonical operating +> contract for all agents and wins on conflict. This file is a Claude-oriented companion; +> keep shared guidance aligned, but never treat it as a second source of truth. --- @@ -16,8 +16,9 @@ If you're about to write code, **Section 3** is the most important thing you'll ## 1. What Waggle OS Actually Is -**Waggle OS** is a workspace-native AI agent platform with persistent memory. It ships as a -Tauri 2.0 desktop binary for Windows and macOS, with a Vite-bundled web app and a Node.js sidecar. +**Waggle OS** is a workspace-native AI agent platform with persistent memory. Its current desktop +release scope is Windows-first: a Tauri 2.0 app with a Vite-bundled web UI and bundled Node.js +sidecar. macOS packaging, signing, notarization, and runtime certification are roadmap work. **Strategic function:** Waggle is the demand-creation and qualification engine for KVARK — Egzakta Group's sovereign enterprise AI platform. @@ -38,23 +39,68 @@ Egzakta Group's sovereign enterprise AI platform. and connectors are all free (they generate memory). Team collaboration (shared memory, WaggleDance, governance) is the upgrade trigger. -### Key Technology Facts (Verified April 2026) +### Current Release Qualification Contract (2026-08-22) + +- Launch gate: **Windows Solo only**. +- In-scope external-agent release cohort: **Claude Code, Codex, and Hermes**. Each integration + uses the user's own installed client and its official user authentication. +- **Cursor and OpenClaw are roadmap-only**: detection metadata may remain, but production launch, + hooks, Fleet/task dispatch, and direct run routes must fail closed for them. +- Claude Desktop, Codex Desktop, and Hermes Desktop may remain as detected convenience launch + surfaces; they are not separate memory-hook or agent-acceptance targets in this release gate. +- ChatGPT/OpenAI is a model/provider and memory-import surface, not a separate launcher target. +- The Windows Solo launch contract requires an exact-revision Windows installer qualification receipt to + prove its bundled Node sidecar, no-Python OpenAI-compatible proxy, Waggle-managed local runtime/model, default + in-process embedding path, and freedom from developer Node, Docker, Python, external LiteLLM, or a + separately installed Ollama. A separate revision-bound router receipt must prove the smart-router primary, + compact-tool-context, budget, and fallback paths. A user-installed Ollama remains optional. +- Every receipt is valid first for the exact source revision and artifact SHA-256 it names. An older + router, persona, or authentication receipt is historical unless the current launch recommendation + explicitly carries it forward through a bounded no-impact attestation. +- Bounded carry-forward is allowed only when an exhaustive intervening-diff review proves that no + covered runtime surface changed, independent review approves that classification, and focused tests + and lint cover the intervening changes. Any affected persona, chat, provider, authentication, memory, + routing, or tool-context behavior requires a fresh receipt. Installer, public signing, and sealed + security artifacts remain revision-bound and must name the exact candidate they cover. +- A release-record-only Markdown descendant does not change the frozen runtime revision or installer + SHA-256. The eventual public hosted artifact and managed Deep Scan must instead be regenerated for + and name the exact approved release-tag commit. +- Persona evidence requires a complete 30-result collection across 10 personas at >=95/100 after + any explicitly documented independent semantic adjudication, plus either a fresh release-revision + run or an approved bounded no-impact attestation. Never relabel a non-gating collection as a + canonical deterministic seal. Claude Code/Codex/Hermes official user-auth canaries follow the + same carry-forward rule. GO also requires zero unresolved Critical/High findings. +- Do not claim release approval, production readiness, an overall 9.5/10, or competitor superiority + unless the current launch recommendation says GO for that same release. + +### Evidence authority + +Exact candidate revisions, installer and receipt hashes, carry-forward boundaries, open +checks, and the current verdict live only in +`docs/production-readiness/09-LAUNCH_RECOMMENDATION.md`. Do not duplicate an old +candidate table here or infer that an ancestor's installer certifies a later HEAD. The +repository remains private until an explicit open-source and licensing decision is made. +Public GO remains blocked until a publicly trusted Authenticode artifact and an exact-candidate +sealed managed Deep Security report close with no unresolved Critical/High findings. + +### Key Technology Facts (Verified August 2026) | Layer | Stack | |---|---| | Frontend | React **19** + TypeScript + Vite + Tailwind 4 + base-ui/react | | Desktop | Tauri 2.0 (Rust shell) | | Backend | Fastify sidecar (Node.js, bundled into Tauri) | -| LLM routing | LiteLLM (see `litellm-config.yaml`) | +| LLM routing | Windows Solo release contract: bundled no-Python OpenAI-compatible proxy and smart router; optional LiteLLM deployment config | | Database | SQLite via @waggle/core (better-sqlite3 + sqlite-vec-windows-x64) | | Memory | FrameStore + HybridSearch + KnowledgeGraph + IdentityLayer + AwarenessLayer | | Agent runtime | `packages/agent/src/agent-loop.ts` | | Billing | Stripe (installed; `stripe@^21.0.1`) | | Design | Hive DS — honey #e5a000 / hive-950 #08090c / accent #a78bfa | | Tests | Vitest (unit) + Playwright (E2E) | -| Deploy | Dockerfile + docker-compose.production.yml + render.yaml | +| Deploy | Windows Tauri installer release contract; optional Dockerfile + docker-compose.production.yml + render.yaml for server/team deployment | -Package manager: npm (root) with `bun.lock` also present. Node >= 20. +Package manager: npm with the root `package-lock.json`. Source development requires Node +`^20.19.0 || >=22.12.0`; the packaged Windows desktop runtime is pinned to Node `22.23.2`. --- @@ -67,7 +113,7 @@ waggle-os/ ├── apps/ │ ├── web/ # <-- MAIN web app UI (this is where most components live) │ └── www/ # Landing page (waggle-os.ai) -├── packages/ # 16 workspace packages (see below) +├── packages/ # 28 workspace packages (see below) ├── sidecar/ # Node.js sidecar bundled into Tauri ├── scripts/ # build-sidecar, bundle-native-deps, bundle-node ├── tests/ # Cross-cutting integration tests @@ -81,7 +127,7 @@ waggle-os/ └── package.json (workspaces: apps/*, packages/*) ``` -### Packages (`packages/`, 27 workspaces — verified 2026-05-28) +### Packages (`packages/`, 28 workspaces — verified 2026-08-02) ``` Core (15): admin-web cli launcher marketplace @@ -89,15 +135,15 @@ agent core memory-mcp optimizer sdk server shared waggle-dance weaver wiki-compiler worker -hive-mind OSS split (12 — synced to marolinik/hive-mind, see §7.5): +hive-mind OSS source set (13 — curated forward-port target is marolinik/hive-mind; see §7.5): hive-mind-core hive-mind-cli hive-mind-shim-core hive-mind-mcp-server -hive-mind-wiki-compiler +hive-mind-wiki-compiler hive-mind-hooks-core hive-mind-hooks-{claude-code, claude-desktop, codex, codex-desktop, cursor, hermes, openclaw} ``` > Note: the prior list said "16" and included `ui`, which has no `package.json` -> (not a workspace). Real count is 27. The 12 `hive-mind-*` packages were added -> since the April verification. +> (not a workspace). The live count is 28: 15 product packages and 13 +> `hive-mind-*` packages. ### `packages/agent/src/` — MOST ACTIVE (94 .ts files + 4 subdirs) @@ -155,7 +201,8 @@ MOVED (2026-04-30 monorepo migration): the memory substrate `mind/` (db/schema/ improvement-signals/embedding-provider/*-embedder) and `harvest/` (chatgpt/claude/ claude-code/gemini/perplexity/pdf/plaintext/markdown/url/universal adapters + pipeline.ts + dedup.ts) now live at **packages/hive-mind-core/src/{mind,harvest}/**, - NOT under packages/core/. The OSS mirror is generated from there via subtree-split (§7.5). + NOT under packages/core/. The OSS mirror is curated from there through a maintainer-reviewed + forward-port (§7.5); raw subtree branches are never publish sources. ``` For the deep-dive on what the mind/ substrate does, see [`docs/memory-architecture.md`](docs/memory-architecture.md). @@ -219,6 +266,49 @@ npm run lint > run the `packages/server` tsc above. (A real type error slipped through this > way on 2026-05-28; see `docs/addictiveness-audit-2026-05-28/REDUNDANCY-AUDIT.md`.) +### Windows Solo release commands (PowerShell 7; final frozen clean checkout) + +```powershell +# Local build-host preparation (the installed desktop has none of these prerequisites). +npm ci +npm ci --prefix app --ignore-scripts +npm run build:packages + +# Local unsigned build only; this verifies packaging/runtime, not public trust. +npm --prefix app run tauri:build:win + +# Optional internal-pilot build. Its private test root is not public trust. +npm --prefix app run tauri:build:win:pilot-signed + +# Internal clean-profile certification. Omit public-signature requirements for a pilot. +pwsh -NoProfile -File scripts/certify-windows-installer.ps1 ` + -InstallerPath "" ` + -ExpectedSourceRevision "<40-character-final-HEAD>" ` + -VerifyManagedModel +``` + +Production signing is hosted-only. Do not run `new-windows-signing-handoff.ps1`, +`sign-windows-artifact.ps1`, or a local thumbprint-signing substitute to create a +release artifact. `.github/workflows/release.yml` is authoritative and must run from +an approved exact release tag. Its Windows chain is `build-windows-prebuilt` -> +`prepare-windows-signing` -> `sign-windows` -> `certify-windows` -> +`attest-windows` -> `publish-windows`. +`sign-windows` requires Azure Artifact Signing OIDC variables, a federated credential +scoped to the exact approved tag ref, and the least-privilege certificate-profile signer +role. Before Azure authentication, it must bind the push event, repository, tag, +workflow ref/SHA, clean checkout, and fresh `origin/main` ancestry. Signing may produce +private Actions artifacts, but public attestation and `publish-windows` remain disabled +while the repository is private; publication additionally requires +`WINDOWS_PUBLIC_RELEASE_AUTHORIZED` to be explicitly `true`. The existing `production` +environment isolates public-attestation OIDC claims from the exact-tag Azure signer. +Private repositories require GitHub Enterprise Cloud for GitHub artifact attestations, +so the sealed certified artifact is the terminal private-repository output. The approved +signer subject and timestamp must still pass before credential-free certification. +Never treat the local certification command as signed or change repository visibility +without an explicit OSS/licensing decision. +The certified installed desktop must not depend on developer Node.js, Python, +Docker, external LiteLLM, or a separately installed Ollama. + --- ## 3. Behavioral Rules — How You Must Work @@ -379,7 +469,7 @@ interface AgentPersona { // guardrails + picker metadata (all optional, all shipped) disallowedTools?: string[] // denylist — overrides tools[] on conflict failurePatterns?: string[] // documented failure modes — shown in hover tooltip - isReadOnly?: boolean // true = no write tools ever (enforced in assembleToolPool) + isReadOnly?: boolean // true = no write tools after applyPersonaToolFilter/filterMcpToolsForPersona tagline?: string // one sentence for picker hover bestFor?: string[] // 3 example tasks in user-facing language wontDo?: string // hard boundary statement @@ -418,7 +508,7 @@ shows tagline + bestFor + wontDo. "Create Custom Persona" inline form POSTs to ## 7. Security Constraints (Non-Negotiable) -1. **Vault-only secrets.** API keys in Vault or `.env` (never committed). `.env.example` has key names only. +1. **Vault-only secrets.** API keys belong in Vault or an untracked local `.env`, never in Git. `.env.example` may contain non-secret development defaults, but never usable credentials or secrets. 2. **Injection defense.** `scanForInjection()` from `injection-scanner.ts` MUST be called on all connector/external input. 3. **No eval, no dynamic require.** Tauri WebView is restricted. 4. **Tauri IPC allowlist.** Explicit in `app/src-tauri/capabilities/`. Never `allowlist: all: true`. @@ -428,7 +518,7 @@ shows tagline + bestFor + wontDo. "Create Custom Persona" inline form POSTs to --- -## 7.5. Memory Substrate Sync (waggle-os → hive-mind, subtree-split) +## 7.5. Memory Substrate Sync (waggle-os → hive-mind, curated forward-port) The memory substrate lives at **`packages/hive-mind-core/src/{mind,harvest}/`** (moved from `packages/core/src/` in the 2026-04-30 monorepo migration). The public OSS mirror at @@ -443,14 +533,16 @@ directly on the OSS mirror.** Parity is NOT automatic — it broke once: the cro (`inprocess-reranker.ts` + HybridSearch options) was written directly on `marolinik/hive-mind` during the LoCoMo benchmark arc and existed ONLY there, discovered by the W4 recon and reverse-ported in W4.2 (`f47ee8f`). Rules: -1. Substrate changes land in `packages/hive-mind-core/` here FIRST; the mirror is regenerated - via subtree-split afterward. +1. Substrate changes land in `packages/hive-mind-core/` here FIRST; the mirror is updated + through a reviewed, maintainer-curated forward-port afterward. 2. Benchmark/experiment work in a `D:/Projects/hive-mind` checkout is throwaway unless reverse-ported here — port it the same arc, don't let it sit. -3. Run **`scripts/oss-drift-check.sh`** (file-level diff of the mapped src trees) before every - OSS release push and after any arc that touched a hive-mind checkout. -4. External PRs on the OSS repo are fine — the maintainer merges them back here via - subtree-pull, then re-splits. +3. Run **`node scripts/oss-drift-check.mjs D:/Projects/hive-mind`** before every OSS release + push and after any arc that touched a hive-mind checkout. The checker compares the live + mapped trees with an immutable reviewed baseline: parity and reviewed adaptations are + allowed, while known blockers, unreviewed differences, or forbidden exports keep exit 1. +4. External PRs on the OSS repo are fine — the maintainer intentionally ports accepted changes + back here first, then prepares the next curated forward-port. === END CRITICAL === === CORRECTION — how the sync ACTUALLY works (2026-06-12 drift analysis) === @@ -481,8 +573,10 @@ The prior text here claimed the mirror is produced by `scripts/oss-subtree-split **To work on the substrate or publish the OSS mirror:** see [`packages/hive-mind-core/CONTRIBUTING.md`](./packages/hive-mind-core/CONTRIBUTING.md), [`scripts/oss-subtree-split.sh`](./scripts/oss-subtree-split.sh) (inspection/guard only), and -[`scripts/oss-drift-check.sh`](./scripts/oss-drift-check.sh) (run before every release; note its -~50 "DIFFERS" are mostly OSS-adaptation noise — layout + import rewrites — not true drift). +[`scripts/oss-drift-check.mjs`](./scripts/oss-drift-check.mjs) (run before every release; its +immutable baseline distinguishes parity, reviewed adaptations, known blockers, unreviewed +differences, and forbidden exports; every blocker or unreviewed entry must be resolved or +explicitly re-baselined through maintainer review before an OSS release). **Deprecated (do not rely on; do not delete):** the old dual-repo bidirectional-sync workflows `.github/workflows/{mind-parity-check,sync-mind}.yml` and the `.github/sync.md` manual are **preserved @@ -517,7 +611,7 @@ Grep before creating. These exist and are functional: | `packages/core/src/telemetry.ts` | Telemetry pipeline | | `packages/hive-mind-core/src/harvest/pipeline.ts` | Harvest adapters + dedup | | `packages/core/src/compliance/` | Compliance + audit | -| `app/src/components/cockpit/` | Tauri cockpit UI | +| `apps/web/src/components/os/` | Main desktop cockpit UI loaded by Tauri | --- @@ -556,7 +650,7 @@ Do not recreate or expose outside gating. - **Premium harness reached HONEST 21/21** (May 2026 S1) — every pillar regression-locked + composing. Full agent suite 2657/2657. See `memory/project_session_handoff_0519_s1.md`. **AI-OS arc (May 2026 S1/S2, 14 commits on origin):** -- Phase 0 — Tool detection PoC (`packages/agent/src/tool-detection.ts`) for all 7 supported AI tools, hermetic + cross-platform. +- Phase 0 — Tool detection PoC (`packages/agent/src/tool-detection.ts`) for eight registered AI-tool surfaces, hermetic + cross-platform. Registration is broader than release support. - Phase 1A — WaggleDance v2 dispatcher branches wired (discovery/routed_share/model_recipe/knowledge_match/task_claim/model_recommendation). - Phase 1B — Local sidecar surface (`/api/waggle-dance/signal` + `/signals`), SignalBus ring buffer, personal-tier-eligible. - Phase 1C — Bridge: v2 bus → existing `/api/waggle/signals` UI stream (zero frontend changes). @@ -565,7 +659,7 @@ Do not recreate or expose outside gating. - Phase 2A — Launcher backend (`/api/tools/launch`, `/api/tools/hooks`). - Phase 2B — LauncherApp dock surface (`apps/web/src/components/os/apps/LauncherApp.tsx`). - Phase 3 — Skill diffusion (D1 fire → `skill_share` broadcast via `onSkillDistillationFire` callback). -- Phase 4 — Full 7-tool launch cohort + Mission Control inventory tile + Memory provenance badge + launch-with-prompt textarea + process tracker / 'Running' badge. +- Phase 4 — Eight-tool inventory/detection surface + Mission Control tile + Memory provenance badge + launch-with-prompt textarea + process tracker / 'Running' badge. The in-scope agent-integration release cohort is Claude Code, Codex, and Hermes; Cursor and OpenClaw are roadmap-only. End-to-end: detect → install hooks (reversible) → launch with `WAGGLE_WORKSPACE_ID` env → hook captures → shim emitter → bus → bridge → UI. Rollback tag: `checkpoint/pre-ai-os-2026-05-20`. AI-OS exploration doc: `docs/plans/AI-OS-EXPLORATION-2026-05-19.md`. @@ -574,7 +668,7 @@ End-to-end: detect → install hooks (reversible) → launch with `WAGGLE_WORKSP |---|---|---| | 1 | Spawn Agent + Dock wiring | P36 already wired in `Dock.tsx`+`Desktop.tsx`; P35 third-tier fallback (LiteLLM → runtime model → provider catalogs) landed `14942be`. Residual: runtime verification on a clean install. | | 2 | Light mode finish | P40/P41 + CR-2 — semantic-token migration is done (no hive-950 references except a comment); remaining issues are render-time fine-tuning (BootScreen visual polish + a few header-styling judgments) that need a binary build to validate. | -| 3 | Wave 2/3 hook implementations | **Mostly DONE (corrected 2026-06-29).** 6 of 7 hook packages ship real bins: claude-code + the 2026-06-01 Wave 2/3 port (codex, codex-desktop, cursor, hermes, openclaw). Only `hive-mind-hooks-claude-desktop` remains a binless `export {}` stub (deferred MCP-bridge category). The dock (`LauncherApp.tsx`) now exposes hook install/verify/uninstall for all 6 via the corrected `HOOKS_COHORT` (was hardcoded `['claude-code']`). Residual: claude-desktop MCP-bridge hook only. | +| 3 | External-tool release cohort | **Windows Solo scope fixed 2026-08-02.** Claude Code, Codex, and Hermes are the in-scope agent-integration cohort. Cursor and OpenClaw implementations remain in-tree as roadmap work and are fail-closed in production surfaces. Claude Desktop, Codex Desktop, and Hermes Desktop are convenience launch surfaces, not separate agent-acceptance targets. | **Closed during May 2026 backlog sweep:** - ✅ OW-6 PersonaSwitcher two-tier — shipped via M-01 (`PersonaSwitcher.tsx` + `lib/persona-tier.ts` + `lib/persona-tooltip.ts`); 26/26 tests passing @@ -623,11 +717,11 @@ For the full polish+launch backlog see `docs/plans/BACKLOG-CONSOLIDATED-2026-04- | BEHAVIORAL_SPEC | Core agent rules (`packages/agent/src/behavioral-spec.ts`) | | Sidecar | Node.js Fastify server bundled into Tauri (`/sidecar`) | | KVARK | Egzakta sovereign enterprise AI — top of the Waggle funnel | -| LiteLLM | LLM routing layer (`litellm-config.yaml`) | +| LiteLLM | Optional server/team deployment proxy config (`litellm-config.yaml`); Windows Solo uses the bundled no-Python proxy and smart router | | WaggleDance | Multi-agent coordination package (`packages/waggle-dance`) | -| Weaver | `packages/weaver` — (check source for current role) | +| Weaver | Memory consolidation and session-skill extraction engine (`packages/weaver`) | | Evolution | Self-improvement subsystem (`evolution-*.ts`, `judge.ts`, `iterative-optimizer.ts`) | -| assembleToolPool | Per-persona tool filtering from allowlist + denylist (to implement) | +| applyPersonaToolFilter / filterMcpToolsForPersona | Enforced local and MCP per-persona allowlist/denylist filtering (`packages/server/src/local/persona-tool-filter.ts`) | --- diff --git a/README.md b/README.md index 5cd3661..ef2a935 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,58 @@ # Waggle OS -Workspace-native AI agent platform with persistent memory, model-agnostic orchestration, and skill-extensible capabilities. It ships as a Tauri 2.0 desktop binary (Windows/macOS) with a Vite-bundled web app and a Node.js sidecar. +Workspace-native AI agent platform with persistent memory, model-agnostic orchestration, and skill-extensible capabilities. The current desktop release scope is Windows-first: a Tauri 2.0 app with a Vite-bundled web UI and bundled Node.js sidecar; macOS packaging and certification remain roadmap work. + +## Current Release Scope + +The active launch gate is **Windows Solo**. Its in-scope external-agent release cohort is **Claude Code, Codex, and Hermes**. Each tool uses the user's own installation and authentication; Waggle does not redistribute provider credentials or bypass provider terms. + +- **Cursor and OpenClaw are roadmap integrations.** They remain registered for detection and future development, but the production launcher, hooks, Fleet/task path, and direct run API do not offer them. +- Claude Desktop, Codex Desktop, and Hermes Desktop may appear as detected convenience launch surfaces; they are not separate memory-hook or agent-acceptance targets in this release gate. +- **ChatGPT/OpenAI is a model and memory-import surface**, not a separate local coding-agent launcher. +- The Windows Solo launch contract requires an exact-revision Windows installer qualification receipt to prove its bundled Node sidecar, no-Python OpenAI-compatible proxy, Waggle-managed local runtime/model, default in-process embedding path, and freedom from developer Node, Docker, Python, an external LiteLLM service, or a separately installed Ollama. A separate revision-bound router receipt must prove the smart-router primary, compact-tool-context, budget, and fallback paths. Router, persona, and authentication receipts may cover a later candidate only through an independently reviewed bounded no-impact attestation proving that no covered runtime surface changed; otherwise they must be rerun. A user-installed Ollama remains optional. +- Docker/LiteLLM deployment files remain optional server and team deployment choices; they are not desktop prerequisites. + +Release status, revision-bound receipts, and any bounded carry-forward attestations are governed only by the current [launch recommendation](docs/production-readiness/09-LAUNCH_RECOMMENDATION.md). If it does not say **GO**, do not describe Waggle as production-ready or reuse historical scores or receipts as current release evidence. + +### Current Windows Solo internal RC evidence — 2026-08-27 + +The current runtime candidate is private `main` commit +`23ad3fa5f99bddce648b84750a41365299aeb0da`. Its internal-pilot NSIS installer +(102,923,936 bytes; SHA-256 +`7BFA9F9B13633A51CD3336B42E3EF904B7F7A568C6DEE4F6CED967CBD4F40A59`) +passed **64/64** clean-profile checks. The receipt proves bundled sidecar and offline +npm, FREE/Solo first boot, in-process embeddings, the Waggle-managed local runtime and +`qwen2.5:0.5b`, local-model chat, proxy restart, repair, relaunch, data preservation, +Exit/cleanup, and uninstall. Docker, Python, developer Node.js, external LiteLLM, and a +separately installed Ollama were not prerequisites. + +- Private PR #66 merged as `23ad3fa5` after every blocking check passed: primary CI, + Playwright smoke and full E2E, Windows and both macOS Tauri verification targets, and + Hive Mind install/smoke on Windows, Ubuntu, and macOS. The tested PR head and merged + source have the same tree. +- Exact-current full and production dependency audits contain **0 Critical and 0 High** + findings. Lower-severity maintenance remains documented. +- The historical persona collection at `4c712ff6` still records all ten personas x3 at + or above 95/100 after documented independent adjudication, but it is not relabeled as + an exact-current seal. PR #66 changed memory behavior, so public release qualification + requires a fresh receipt or an explicit bounded semantic-impact attestation. +- Smart-router primary, compact-tool-context, durable-budget and fallback evidence, plus + the Claude Code, Codex, and Hermes official-user-auth canaries, remain historical + scoped evidence. No later change touched provider credential handling; the auth + harness read or copied no credential files. +- The curated Hive Mind mirror is hardened through private-to-maintainer PR #53, merged + on public `master` as `3410327800db3ea23f875d547a0c7f4d08826b7e`; Windows, macOS, + Ubuntu, and Ubuntu first-run smoke were green. The immutable drift baseline still + reports reviewed release blockers, so the next OSS package release remains a separate + maintainer-curated operation and is not implied by this Windows Solo RC. + +Detailed local receipt paths, hashes, limitations, and integration gates are recorded in +the current [launch recommendation](docs/production-readiness/09-LAUNCH_RECOMMENDATION.md). +The internal signer (`CN=Egzakta Internal Pilot`) and DigiCert timestamp prove the pilot +pipeline but are not publicly trusted Authenticode. Public release is **not yet approved**: +a protected hosted build with a publicly trusted signer, an exact-candidate sealed +managed Deep Security report, current persona qualification, and either fresh or +explicitly attested smart-router and official-auth qualification remain mandatory. ## Architecture @@ -57,12 +109,21 @@ The monorepo has **28 packages** under `packages/`. They split into two groups. ## Quick Start -### Self-host in one line (Linux / macOS) +### Windows Solo desktop + +Use only the signed Windows installer and SHA-256 identified by a **GO** [launch recommendation](docs/production-readiness/09-LAUNCH_RECOMMENDATION.md). If that recommendation is not GO, no packaged desktop artifact is release-approved; use the source-development instructions below. + +### Self-host from the private repository (Linux / macOS) ```bash -curl -fsSL https://raw.githubusercontent.com/marolinik/waggle-os/main/install.sh | bash +gh repo clone marolinik/waggle-os +cd waggle-os +bash install.sh ``` +This path is for maintainers with authenticated access to the private repository. +Do not publish an anonymous raw-file installer until the source/licensing decision is explicit. + Best for a VPS or homelab — this runs a headless Waggle server (no desktop shell): - **Checks prerequisites, clones, builds, and starts** the Node.js sidecar, then prints the URL (`http://127.0.0.1:3333`). A 5-question wizard — install dir, port, data dir, build web UI, start now — is all Enter-defaulted; pass `--yes` to accept every default non-interactively. @@ -74,7 +135,7 @@ Manage the running server with the installed wrapper: `scripts/waggle-server.sh ### Run from source (development) ```bash -# Prerequisites: Node.js >= 20, npm +# Prerequisites: Node.js ^20.19.0 or >=22.12.0, npm npm install # (Optional) copy the env template. Provider API keys are normally set in-app @@ -91,6 +152,10 @@ npm run dev:web # Open http://localhost:8080 ``` +The source tree follows the root `package.json` Node engine above. The packaged +Windows Solo desktop carries its own pinned Node.js 22.23.2 runtime, so an +installed user does not need a separate Node.js installation. + `npm run dev:server` runs the Fastify sidecar via `tsx` (equivalent to `cd packages/server && npx tsx src/local/start.ts`). `npm run dev:web` runs the Vite dev server for `apps/web`. @@ -115,7 +180,7 @@ run. See [`.env.example`](./.env.example) for the full contract. | `ANTHROPIC_API_KEY` | Recommended | Claude API key. Optional in `.env` — can be set in-app instead (vault). | | `OPENAI_API_KEY` | No | Enables OpenAI models and optional OpenAI embeddings. | | `EMBEDDING_PROVIDER` | No | `auto` (default) · `inprocess` · `ollama` · `voyage` · `openai` · `mock`. `auto` tries in-process → Ollama → API → mock. | -| `LITELLM_BASE_URL` | No | LiteLLM proxy URL for multi-model routing (default `http://localhost:4000`). | +| `LITELLM_BASE_URL` | No | Optional external LiteLLM-compatible proxy URL. The Windows Solo desktop uses its bundled no-Python proxy unless explicitly configured otherwise. | | `DATABASE_URL` | Team only | PostgreSQL connection string. | | `REDIS_URL` | Team only | Redis for the background job queue. | diff --git a/THREAT_MODEL.md b/THREAT_MODEL.md index e85dd64..09232e4 100644 --- a/THREAT_MODEL.md +++ b/THREAT_MODEL.md @@ -1,9 +1,9 @@ # Waggle OS — Threat Model -Waggle OS is a **workspace-native AI agent platform with persistent memory**, shipped as -a Tauri desktop binary (Windows/macOS) with a bundled Node.js sidecar. This document -states the trust boundary and the controls that enforce it, so contributors can reason -about security without reading the full agent + connector stack. +Waggle OS is a **workspace-native AI agent platform with persistent memory**. The current +launch scope is a Windows-first Tauri desktop binary with a bundled Node.js sidecar; +macOS packaging and certification remain roadmap work. This document states the trust +boundary and the controls that enforce it. > Status: living document. The controls below are implemented and cited to source. > Known gaps are open and honestly listed. @@ -76,10 +76,11 @@ approval class, initiator, and trust source — a verifiable history of what was when, why, and by whom. Backs the EU-AI-Act capability-provenance story. ### 5. Local secret storage — `vault.ts` -`packages/core/src/vault.ts`. Secrets are encrypted with AES-256-GCM under a machine-local -key file; each entry is independently encrypted. API keys live in the vault or `.env` -(never committed; `.env.example` carries key names only). No secret is ever written to a -prompt, a log, or a memory frame. +`packages/core/src/vault.ts`. Secrets are encrypted with AES-256-GCM under a +machine-local key file; each entry is independently encrypted. Runtime API keys +belong in the vault or a local `.env` (never committed). `.env.example` contains +names plus non-secret development defaults, never live credentials. Callers must +not persist secret values into prompts, logs, or memory frames. ### 6. MCP tool scope gate — `scope.ts` `packages/memory-mcp/src/scope.ts` + `packages/hive-mind-mcp-server/src/scope.ts`. An @@ -148,14 +149,15 @@ Coverage: preamble (`orchestrator.ts`) but is not yet wrapped in the same structural fence; harvest content is scanned at ingest but not re-fenced per frame. Extending the fence to recall is a low-marginal-value follow-up. -4. **`isReadOnly` persona gating is fail-open.** Read-only personas filter write tools by - denylist rather than an inverse allowlist; a tool missing from the denylist is not - blocked. Flip to allowlist + static mutator backstop when persona governance is next - touched. +4. **Read-only persona gating depends on explicit classification.** Built-in tools are + filtered through `READ_ONLY_ALLOWED_TOOLS`; dynamic connector and MCP tools are dropped + wholesale for read-only personas. The residual risk is governance drift if a stateful + tool is incorrectly classified as side-effect-free and added to the allowlist; focused + tests guard known mutators and the MCP-denial boundary. 5. **Connector endpoint URLs are not redacted before logging.** userinfo/query/fragment on LiteLLM/connector URLs can leak credentials into logs — fold a `redactUrl` pass into the next compliance/logging pass. -6. **Connector auto-harvest persists external content durably.** Opt-in PRO connector +6. **Connector auto-harvest persists external content durably.** Opt-in Solo/FREE connector harvest writes external data (e.g. inbox metadata + message previews) into the personal mind, where it is recalled into model context on later turns. Content is injection-scanned per frame but NOT scanned for secrets/PII; the email harvest pins `$select` to diff --git a/app/package-lock.json b/app/package-lock.json index 2b4cfb1..83bd094 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -2958,9 +2958,9 @@ "license": "MIT" }, "node_modules/nanoid": { - "version": "3.3.11", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", - "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", + "version": "3.3.17", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.17.tgz", + "integrity": "sha512-xQLf0A3HOMlgHq0n247/LRuAOYmB7dXJ/DvAxGvsSBij45XtBSmQycu+F8ODbHwns/XyFZagyL1+J0Offw1E0g==", "dev": true, "funding": [ { @@ -3007,9 +3007,9 @@ } }, "node_modules/postcss": { - "version": "8.5.12", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.12.tgz", - "integrity": "sha512-W62t/Se6rA0Az3DfCL0AqJwXuKwBeYg6nOaIgzP+xZ7N5BFCI7DYi1qs6ygUYT6rvfi6t9k65UMLJC+PHZpDAA==", + "version": "8.5.25", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.25.tgz", + "integrity": "sha512-DTPx3RWSSnWyzLxQnlH0rJP+EW5ekl16ZU4/psbIhA0e53kJfdgaN5vKM+xP7yJtXVu+nfdVFmlgFDEKAe4Pyw==", "dev": true, "funding": [ { @@ -3027,7 +3027,7 @@ ], "license": "MIT", "dependencies": { - "nanoid": "^3.3.11", + "nanoid": "^3.3.16", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" }, diff --git a/app/package.json b/app/package.json index d837b07..a53bf90 100644 --- a/app/package.json +++ b/app/package.json @@ -9,12 +9,13 @@ "typecheck": "tsc -b", "preview": "vite preview", "tauri": "tauri", - "tauri:build": "node ../scripts/build-sidecar.mjs && node ../scripts/bundle-native-deps.mjs && node ../scripts/bundle-node.mjs && node ../scripts/stage-sidecar-deps.mjs && cd ../apps/web && npx vite build && cd ../../app && npx tauri build", - "tauri:build:local": "node ../scripts/build-sidecar.mjs && node ../scripts/bundle-native-deps.mjs && node ../scripts/bundle-node.mjs && node ../scripts/stage-sidecar-deps.mjs && cd ../apps/web && npx vite build && cd ../../app && npx tauri build --debug", - "tauri:build:win": "node ../scripts/build-sidecar.mjs && node ../scripts/bundle-native-deps.mjs && node ../scripts/bundle-node.mjs && node ../scripts/stage-sidecar-deps.mjs && cd ../apps/web && npx vite build && cd ../../app && npx tauri build --target x86_64-pc-windows-msvc", + "tauri:build": "node ../scripts/bundle-node.mjs && node ../scripts/build-sidecar.mjs && node ../scripts/bundle-native-deps.mjs && node ../scripts/stage-sidecar-deps.mjs && cd ../apps/web && npx vite build && cd ../../app && npx tauri build", + "tauri:build:local": "node ../scripts/bundle-node.mjs && node ../scripts/build-sidecar.mjs && node ../scripts/bundle-native-deps.mjs && node ../scripts/stage-sidecar-deps.mjs && cd ../apps/web && npx vite build && cd ../../app && npx tauri build --debug", + "tauri:build:win": "node ../scripts/bundle-node.mjs && node ../scripts/build-sidecar.mjs && node ../scripts/bundle-native-deps.mjs && node ../scripts/stage-sidecar-deps.mjs && node ../scripts/check-sidecar-resources.mjs && cd ../apps/web && npx vite build && cd ../../app && npx tauri build --target x86_64-pc-windows-msvc", + "tauri:build:win:pilot-signed": "npm run tauri:sign:pilot:win:apply && npm run tauri:build:win -- --config src-tauri/tauri.build-override.conf.json", "tauri:build:mac": "npm run tauri:build:mac:arm64 && npm run tauri:build:mac:x64", - "tauri:build:mac:arm64": "node ../scripts/build-sidecar.mjs && TARGET_ARCH=arm64 node ../scripts/bundle-native-deps.mjs && TARGET_ARCH=arm64 node ../scripts/bundle-node.mjs && TARGET_ARCH=arm64 node ../scripts/stage-sidecar-deps.mjs && cd ../apps/web && npx vite build && cd ../../app && npx tauri build --target aarch64-apple-darwin", - "tauri:build:mac:x64": "node ../scripts/build-sidecar.mjs && TARGET_ARCH=x64 node ../scripts/bundle-native-deps.mjs && TARGET_ARCH=x64 node ../scripts/bundle-node.mjs && TARGET_ARCH=x64 node ../scripts/stage-sidecar-deps.mjs && cd ../apps/web && npx vite build && cd ../../app && npx tauri build --target x86_64-apple-darwin", + "tauri:build:mac:arm64": "TARGET_ARCH=arm64 node ../scripts/bundle-node.mjs && node ../scripts/build-sidecar.mjs && TARGET_ARCH=arm64 node ../scripts/bundle-native-deps.mjs && TARGET_ARCH=arm64 node ../scripts/stage-sidecar-deps.mjs && cd ../apps/web && npx vite build && cd ../../app && npx tauri build --target aarch64-apple-darwin", + "tauri:build:mac:x64": "TARGET_ARCH=x64 node ../scripts/bundle-node.mjs && node ../scripts/build-sidecar.mjs && TARGET_ARCH=x64 node ../scripts/bundle-native-deps.mjs && TARGET_ARCH=x64 node ../scripts/stage-sidecar-deps.mjs && cd ../apps/web && npx vite build && cd ../../app && npx tauri build --target x86_64-apple-darwin", "tauri:dev": "npx tauri dev", "tauri:sign:pilot:win:setup": "powershell -ExecutionPolicy Bypass -File scripts/sign-windows-pilot.ps1 -Mode Setup", "tauri:sign:pilot:win:apply": "node scripts/apply-signing-config.mjs", diff --git a/app/scripts/apply-signing-config.mjs b/app/scripts/apply-signing-config.mjs index c6e6df2..b421a6e 100644 --- a/app/scripts/apply-signing-config.mjs +++ b/app/scripts/apply-signing-config.mjs @@ -16,12 +16,10 @@ import { readFileSync, writeFileSync, existsSync } from 'node:fs'; import { resolve, dirname } from 'node:path'; import { fileURLToPath } from 'node:url'; -// The pure helpers below mirror app/scripts/signing-config.ts so this CLI has -// zero TS-loader dependency at runtime. The .ts version is the canonical -// implementation tested by signing-config.test.ts (19 cases covering parse, -// merge, idempotency, immutability). Keep the two implementations in lockstep: -// any change to parseThumbprintString or addWindowsSigningToOverride below -// MUST be mirrored in signing-config.ts and vice versa. +// The pure helpers below mirror the certificate-store helpers in +// app/scripts/signing-config.ts so this pilot CLI has zero TS-loader dependency +// at runtime. Keep parseThumbprintString and addWindowsSigningToOverride in +// lockstep with the canonical TypeScript implementation. const SCRIPT_DIR = dirname(fileURLToPath(import.meta.url)); const APP_DIR = resolve(SCRIPT_DIR, '..'); @@ -33,11 +31,12 @@ const OVERRIDE_PATH = resolve( 'tauri.build-override.conf.json', ); const THUMBPRINT_PATH = resolve(APP_DIR, 'src-tauri', '.thumbprint.txt'); - const DEFAULT_DIGEST_ALGORITHM = 'sha256'; const DEFAULT_TIMESTAMP_URL = 'http://timestamp.digicert.com'; const THUMBPRINT_LENGTH = 40; const HEX_PATTERN = /^[0-9A-F]+$/; +const WINDOWS_SIGNING_MODE = + process.env.WAGGLE_WINDOWS_SIGNING_MODE ?? 'certificate-store'; function parseThumbprintString(raw) { if (!raw || raw.trim().length === 0) { @@ -59,13 +58,15 @@ function addWindowsSigningToOverride(config, thumbprint, options = {}) { const existingBundle = config.bundle ?? {}; const existingWindows = existingBundle.windows ?? {}; + const nonCustomCommandWindows = { ...existingWindows }; + delete nonCustomCommandWindows.signCommand; return { ...config, bundle: { ...existingBundle, windows: { - ...existingWindows, + ...nonCustomCommandWindows, certificateThumbprint: normalisedThumbprint, digestAlgorithm, timestampUrl, @@ -77,6 +78,20 @@ function addWindowsSigningToOverride(config, thumbprint, options = {}) { // ─── Main ─────────────────────────────────────────────────────────────────── function main() { + if (!['certificate-store', 'artifact-signing'].includes(WINDOWS_SIGNING_MODE)) { + console.error( + `[apply-signing-config] unsupported WAGGLE_WINDOWS_SIGNING_MODE: ${WINDOWS_SIGNING_MODE}`, + ); + process.exit(1); + } + if (WINDOWS_SIGNING_MODE === 'artifact-signing') { + console.error( + '[apply-signing-config] Azure Artifact Signing is hosted-only. ' + + 'Run the protected GitHub-hosted release workflow; this local helper cannot issue ' + + 'the immutable build receipt, protected OIDC identity, session manifest, or callback ledger.', + ); + process.exit(1); + } if (!existsSync(THUMBPRINT_PATH)) { console.error( `[apply-signing-config] thumbprint file missing: ${THUMBPRINT_PATH}`, @@ -93,7 +108,6 @@ function main() { process.exit(1); } - const rawThumbprint = readFileSync(THUMBPRINT_PATH, 'utf8'); const overrideRaw = readFileSync(OVERRIDE_PATH, 'utf8'); let override; @@ -108,6 +122,7 @@ function main() { let updated; try { + const rawThumbprint = readFileSync(THUMBPRINT_PATH, 'utf8'); updated = addWindowsSigningToOverride(override, rawThumbprint); } catch (err) { console.error( @@ -122,9 +137,9 @@ function main() { writeFileSync(OVERRIDE_PATH, serialised, 'utf8'); const relativePath = OVERRIDE_PATH.replace(REPO_ROOT, '').replace(/^\\/, ''); - console.log( - `[apply-signing-config] wrote thumbprint ${updated.bundle.windows.certificateThumbprint.slice(0, 8)}... to ${relativePath}`, - ); + const signingDescription = + `thumbprint ${updated.bundle.windows.certificateThumbprint.slice(0, 8)}...`; + console.log(`[apply-signing-config] wrote ${signingDescription} to ${relativePath}`); } main(); diff --git a/app/scripts/new-windows-signing-handoff.ps1 b/app/scripts/new-windows-signing-handoff.ps1 new file mode 100644 index 0000000..5e32a45 --- /dev/null +++ b/app/scripts/new-windows-signing-handoff.ps1 @@ -0,0 +1,1059 @@ +[CmdletBinding()] +param( + [Parameter(Mandatory = $true)] + [ValidateNotNullOrEmpty()] + [string]$SourceTargetRoot, + + [Parameter(Mandatory = $true)] + [ValidateNotNullOrEmpty()] + [string]$DestinationRoot, + + [string]$GitPath = 'C:\Program Files\Git\cmd\git.exe', + + [string]$NodePath = '' +) + +Set-StrictMode -Version Latest +$ErrorActionPreference = 'Stop' + +$ApprovedRepository = 'marolinik/waggle-os' +$TargetTriple = 'x86_64-pc-windows-msvc' +$ExpectedNodeVersion = 'v22.23.2' +$ExpectedNsisFileCount = 442 +$ExpectedNsisInventorySha256 = '1FC822D1A183552A80ADEA01B0BF456F462B90518256EF1FE9EDFA22D76CD85A' +$OpenJsPublisher = 'CN=OpenJS Foundation, O=OpenJS Foundation, L=San Francisco, S=California, C=US' +$GitPublisher = 'CN=Johannes Schindelin, O=Johannes Schindelin, S=Nordrhein-Westfalen, C=DE' +$CodeSigningOid = '1.3.6.1.5.5.7.3.3' +$MaxTargetFileCount = 18000 +$MaxTargetBytes = 768MB +$MaxResourceFileCount = 17500 +$MaxResourceBytes = 600MB + +function Get-HandoffHex { + param([Parameter(Mandatory = $true)] [byte[]]$Bytes) + + return ([BitConverter]::ToString($Bytes) -replace '-', '') +} + +function Get-HandoffBytesSha256 { + param([Parameter(Mandatory = $true)] [byte[]]$Bytes) + + $algorithm = [Security.Cryptography.SHA256]::Create() + try { + return Get-HandoffHex ($algorithm.ComputeHash($Bytes)) + } finally { + $algorithm.Dispose() + } +} + +function Get-HandoffNormalizedGitBlobSha1 { + param([Parameter(Mandatory = $true)] [string]$Path) + + $strictUtf8 = [Text.UTF8Encoding]::new($false, $true) + try { + $text = $strictUtf8.GetString([IO.File]::ReadAllBytes($Path)) + } catch { + throw 'Tracked handoff input is not canonical UTF-8 text.' + } + if ($text.Length -gt 0 -and $text[0] -eq [char]0xFEFF) { + throw 'Tracked handoff input contains a UTF-8 BOM.' + } + $normalized = $text.Replace("`r`n", "`n") + if ($normalized.Contains("`r")) { + throw 'Tracked handoff input contains a non-canonical carriage return.' + } + $contentBytes = [Text.UTF8Encoding]::new($false).GetBytes($normalized) + $headerBytes = [Text.Encoding]::ASCII.GetBytes("blob $($contentBytes.Length)`0") + $algorithm = [Security.Cryptography.SHA1]::Create() + try { + return Get-HandoffHex ($algorithm.ComputeHash([byte[]]($headerBytes + $contentBytes))) + } finally { + $algorithm.Dispose() + } +} + +function Get-HandoffFileSha256 { + param([Parameter(Mandatory = $true)] [string]$Path) + + $stream = [IO.File]::Open( + $Path, + [IO.FileMode]::Open, + [IO.FileAccess]::Read, + [IO.FileShare]::Read + ) + $algorithm = [Security.Cryptography.SHA256]::Create() + try { + return Get-HandoffHex ($algorithm.ComputeHash($stream)) + } finally { + $algorithm.Dispose() + $stream.Dispose() + } +} + +function Assert-HandoffSignedExecutable { + param( + [Parameter(Mandatory = $true)] [string]$Path, + [Parameter(Mandatory = $true)] [string]$ExpectedPublisher, + [Parameter(Mandatory = $true)] [string]$Label + ) + + $signature = Get-AuthenticodeSignature -LiteralPath $Path + if ($signature.Status -ne [Management.Automation.SignatureStatus]::Valid -or + [string]$signature.SignatureType -cne 'Authenticode' -or + $null -eq $signature.SignerCertificate -or + -not [string]::Equals( + [string]$signature.SignerCertificate.Subject, + $ExpectedPublisher, + [StringComparison]::Ordinal + )) { + throw "$Label does not have the approved Authenticode publisher." + } + $hasCodeSigningEku = @( + $signature.SignerCertificate.Extensions | + Where-Object { + $_ -is [Security.Cryptography.X509Certificates.X509EnhancedKeyUsageExtension] + } | + ForEach-Object { $_.EnhancedKeyUsages } | + Where-Object { $_.Value -eq $CodeSigningOid } + ).Count -gt 0 + if (-not $hasCodeSigningEku) { throw "$Label lacks the Code Signing EKU." } +} + +function Get-HandoffTrustedPath { + param( + [Parameter(Mandatory = $true)] [string]$Path, + [Parameter(Mandatory = $true)] [string]$Label, + [ValidateSet('Leaf', 'Container')] [string]$PathType = 'Leaf', + [switch]$AllowHardLink + ) + + if ([string]::IsNullOrWhiteSpace($Path) -or + $Path -match '[\x00-\x1F\x7F]' -or + $Path -notmatch '^[A-Za-z]:[\\/]' -or + $Path -match '^[\\/]{2}' -or + $Path.Substring(2) -match ':' -or + $Path -match '(^|[\\/])\.\.?(?:[\\/]|$)' -or + @($Path -split '[\\/]' | Where-Object { $_ -match '[. ]$' }).Count -ne 0) { + throw "$Label must use a safe, fully qualified local Windows path." + } + + $fullPath = [IO.Path]::GetFullPath($Path) + $testPathType = if ($PathType -ceq 'Leaf') { 'Leaf' } else { 'Container' } + if (-not (Test-Path -LiteralPath $fullPath -PathType $testPathType)) { + throw "$Label does not exist as a $($PathType.ToLowerInvariant()): $fullPath" + } + + $root = [IO.Path]::GetPathRoot($fullPath) + $relative = $fullPath.Substring($root.Length) + $current = $root + foreach ($component in @($relative -split '[\\/]' | Where-Object { $_ })) { + $current = Join-Path $current $component + $item = Get-Item -LiteralPath $current -Force + if (($item.Attributes -band [IO.FileAttributes]::ReparsePoint) -ne 0) { + throw "$Label traverses a reparse point: $current" + } + $linkTypeProperty = $item.PSObject.Properties['LinkType'] + if ($null -eq $linkTypeProperty) { + throw "$Label filesystem provider does not expose link topology." + } + $linkType = [string]$linkTypeProperty.Value + if (-not [string]::IsNullOrEmpty($linkType) -and + -not ($AllowHardLink -and $linkType -ceq 'HardLink')) { + throw "$Label traverses an unsupported linked filesystem object: $current" + } + } + + $resolved = (Resolve-Path -LiteralPath $fullPath).ProviderPath + if (-not [string]::Equals( + [IO.Path]::GetFullPath($resolved), + $fullPath, + [StringComparison]::OrdinalIgnoreCase + )) { + throw "$Label resolves to an unexpected path." + } + return $fullPath +} + +function Get-HandoffContainedRelativePath { + param( + [Parameter(Mandatory = $true)] [string]$Path, + [Parameter(Mandatory = $true)] [string]$Root + ) + + $fullPath = [IO.Path]::GetFullPath($Path) + $fullRoot = [IO.Path]::GetFullPath($Root).TrimEnd('\') + $prefix = "$fullRoot\" + if (-not $fullPath.StartsWith($prefix, [StringComparison]::OrdinalIgnoreCase)) { + return $null + } + return $fullPath.Substring($prefix.Length).Replace('/', '\') +} + +function Assert-HandoffCanonicalRelativePath { + param( + [Parameter(Mandatory = $true)] [string]$Path, + [Parameter(Mandatory = $true)] [string]$Label + ) + + if ([string]::IsNullOrWhiteSpace($Path) -or + $Path -match '[\x00-\x1F\x7F]' -or + $Path -match '(^|[\\/])\.\.?(?:[\\/]|$)' -or + [IO.Path]::IsPathRooted($Path) -or + $Path.Contains('/') -or + $Path.Contains(':') -or + @($Path -split '\\' | Where-Object { $_ -match '[. ]$' }).Count -ne 0) { + throw "$Label contains an unsafe or non-canonical relative path." + } +} + +function Get-HandoffTreeFiles { + param( + [Parameter(Mandatory = $true)] [string]$Root, + [Parameter(Mandatory = $true)] [string]$Label, + [switch]$AllowCargoHardLinkPair, + [string]$CargoReleaseRoot = '', + [int]$MaxFileCount = [int]::MaxValue, + [long]$MaxBytes = [long]::MaxValue, + [int]$MaxDirectoryCount = [int]::MaxValue + ) + + if ($MaxFileCount -lt 1 -or $MaxBytes -lt 1 -or $MaxDirectoryCount -lt 1) { + throw "$Label inventory bound is invalid." + } + $trustedRoot = Get-HandoffTrustedPath $Root $Label 'Container' + $pending = [Collections.Generic.Queue[string]]::new() + $files = [Collections.Generic.List[object]]::new() + $exactPaths = [Collections.Generic.HashSet[string]]::new([StringComparer]::Ordinal) + $foldedPaths = [Collections.Generic.HashSet[string]]::new([StringComparer]::OrdinalIgnoreCase) + $totalBytes = [long]0 + $directoryCount = 1 + $pending.Enqueue($trustedRoot) + while ($pending.Count -gt 0) { + $directory = $pending.Dequeue() + $enumerator = [IO.Directory]::EnumerateFileSystemEntries($directory).GetEnumerator() + try { + while ($enumerator.MoveNext()) { + $item = Get-Item -LiteralPath ([string]$enumerator.Current) -Force + if (($item.Attributes -band [IO.FileAttributes]::ReparsePoint) -ne 0) { + throw "$Label contains a reparse point: $($item.FullName)" + } + $linkTypeProperty = $item.PSObject.Properties['LinkType'] + if ($null -eq $linkTypeProperty) { + throw "$Label filesystem provider does not expose link topology." + } + $linkType = [string]$linkTypeProperty.Value + if ($item.PSIsContainer) { + if (-not [string]::IsNullOrEmpty($linkType)) { + throw "$Label contains a linked directory." + } + $childDirectory = [IO.Path]::GetFullPath($item.FullName) + if ($null -eq (Get-HandoffContainedRelativePath $childDirectory $trustedRoot)) { + throw "$Label directory escaped its root." + } + $directoryCount++ + $directoryRelative = Get-HandoffContainedRelativePath $childDirectory $trustedRoot + if ($directoryCount -gt $MaxDirectoryCount -or + @($directoryRelative -split '\\').Count -gt 32) { + throw "$Label exceeds its deterministic directory-count or depth bound." + } + $pending.Enqueue($childDirectory) + continue + } + + $path = [IO.Path]::GetFullPath($item.FullName) + $relative = Get-HandoffContainedRelativePath $path $trustedRoot + if ($null -eq $relative) { throw "$Label file escaped its root." } + Assert-HandoffCanonicalRelativePath $relative $Label + if (-not $exactPaths.Add($relative) -or -not $foldedPaths.Add($relative)) { + throw "$Label contains a duplicate path or case-insensitive collision." + } + $streams = @(Get-Item -LiteralPath $path -Stream * -ErrorAction Stop) + if ($streams.Count -ne 1 -or [string]$streams[0].Stream -cne ':$DATA') { + throw "$Label contains an alternate data stream." + } + + if (-not [string]::IsNullOrEmpty($linkType)) { + if (-not $AllowCargoHardLinkPair -or $linkType -cne 'HardLink') { + throw "$Label contains an unsupported hard link." + } + $releaseRoot = [IO.Path]::GetFullPath($CargoReleaseRoot) + $main = [IO.Path]::GetFullPath((Join-Path $releaseRoot 'waggle.exe')) + $dependency = [IO.Path]::GetFullPath((Join-Path $releaseRoot 'deps\waggle.exe')) + if (-not [string]::Equals($path, $main, [StringComparison]::OrdinalIgnoreCase) -and + -not [string]::Equals($path, $dependency, [StringComparison]::OrdinalIgnoreCase)) { + throw "$Label permits only the exact Cargo executable hard-link pair." + } + } + $fileSize = [long]$item.Length + if ($files.Count -ge $MaxFileCount -or $fileSize -lt 0 -or + $totalBytes -gt $MaxBytes - $fileSize) { + throw "$Label exceeds its deterministic file-count or byte bound." + } + $totalBytes += $fileSize + $files.Add([pscustomobject]@{ FullName = $path; RelativePath = $relative }) + } + } finally { + if ($enumerator -is [IDisposable]) { $enumerator.Dispose() } + } + } + return @($files) +} + +function Assert-HandoffMappingBounds { + param( + [Parameter(Mandatory = $true)] [object[]]$Mappings, + [Parameter(Mandatory = $true)] [int]$MaxFileCount, + [Parameter(Mandatory = $true)] [long]$MaxBytes, + [Parameter(Mandatory = $true)] [string]$Label + ) + + if ($MaxFileCount -lt 1 -or $MaxBytes -lt 1 -or $Mappings.Count -gt $MaxFileCount) { + throw "$Label exceeds its deterministic file-count or byte bound." + } + $totalBytes = [long]0 + foreach ($mapping in $Mappings) { + $size = [long](Get-Item -LiteralPath ([string]$mapping.Source) -Force).Length + if ($size -lt 0 -or $totalBytes -gt $MaxBytes - $size) { + throw "$Label exceeds its deterministic file-count or byte bound." + } + $totalBytes += $size + } + return $totalBytes +} + +function Assert-HandoffDefaultIndexFlags { + param( + [Parameter(Mandatory = $true)] [string]$Git, + [Parameter(Mandatory = $true)] [string]$RepoRoot + ) + + foreach ($flag in @('-v', '-f')) { + $entries = @(& $Git -C $RepoRoot ls-files $flag --full-name) + if ($LASTEXITCODE -ne 0 -or $entries.Count -lt 100 -or + @($entries | Where-Object { [string]$_ -notmatch '^H [^\x00-\x1F\x7F]+$' }).Count -ne 0) { + throw 'Repository index contains assume-unchanged, skip-worktree, fsmonitor-valid, or non-default tracked state.' + } + } + $fsmonitor = @(& $Git -C $RepoRoot config --get-all core.fsmonitor) + $fsmonitorExitCode = $LASTEXITCODE + if (($fsmonitorExitCode -ne 0 -and $fsmonitorExitCode -ne 1) -or + $fsmonitor.Count -ne 0) { + throw 'Repository must not enable core.fsmonitor for the signing handoff.' + } +} + +function Assert-HandoffRepositoryState { + param( + [Parameter(Mandatory = $true)] [string]$Git, + [Parameter(Mandatory = $true)] [string]$RepoRoot, + [Parameter(Mandatory = $true)] [string]$Revision, + [Parameter(Mandatory = $true)] [string]$AppVersion, + [Parameter(Mandatory = $true)] [string[]]$TrackedPaths + ) + + $actualRoot = [string](& $Git -C $RepoRoot rev-parse --show-toplevel) + $head = [string](& $Git -C $RepoRoot rev-parse --verify HEAD) + $tagCommit = [string](& $Git -C $RepoRoot rev-parse --verify "refs/tags/v$AppVersion`^{commit}") + $status = @(& $Git -C $RepoRoot status --porcelain=v1 --untracked-files=all) + if ($LASTEXITCODE -ne 0 -or + -not [string]::Equals( + [IO.Path]::GetFullPath($actualRoot), + [IO.Path]::GetFullPath($RepoRoot), + [StringComparison]::OrdinalIgnoreCase + ) -or $head -cne $Revision -or $tagCommit -cne $Revision -or + $status.Count -ne 0) { + throw 'Windows signing handoff requires the clean exact tagged GITHUB_SHA.' + } + Assert-HandoffDefaultIndexFlags $Git $RepoRoot + foreach ($trackedPath in $TrackedPaths) { + & $Git -C $RepoRoot ls-files --error-unmatch -- $trackedPath | Out-Null + if ($LASTEXITCODE -ne 0) { + throw "Windows signing handoff input is not tracked: $trackedPath" + } + $expectedBlob = [string](& $Git -C $RepoRoot rev-parse --verify "HEAD:$trackedPath") + $actualBlob = Get-HandoffNormalizedGitBlobSha1 (Join-Path $RepoRoot $trackedPath) + if ($LASTEXITCODE -ne 0 -or $expectedBlob -notmatch '^[0-9a-f]{40}$' -or + -not [string]::Equals( + $expectedBlob, + $actualBlob, + [StringComparison]::OrdinalIgnoreCase + )) { + throw "Tracked handoff input differs from its exact HEAD blob: $trackedPath" + } + } +} + +function Get-HandoffHardLinkPaths { + param([Parameter(Mandatory = $true)] [string]$Path) + + $fsutil = Get-HandoffTrustedPath 'C:\Windows\System32\fsutil.exe' 'fsutil' -AllowHardLink + $raw = @(& $fsutil hardlink list $Path) + if ($LASTEXITCODE -ne 0 -or $raw.Count -ne 2) { + throw 'Cargo executable must have exactly two hard-link paths.' + } + $volumeRoot = [IO.Path]::GetPathRoot($Path).TrimEnd('\') + return @($raw | ForEach-Object { + if ([string]$_ -notmatch '^\\[^\\]') { + throw 'fsutil returned a non-canonical hard-link path.' + } + [IO.Path]::GetFullPath($volumeRoot + [string]$_) + }) +} + +function Assert-HandoffCargoPair { + param( + [Parameter(Mandatory = $true)] [string]$ReleaseRoot, + [Parameter(Mandatory = $true)] [string]$Label + ) + + $release = Get-HandoffTrustedPath $ReleaseRoot "$Label release root" 'Container' + $main = Get-HandoffTrustedPath (Join-Path $release 'waggle.exe') "$Label main" -AllowHardLink + $dependency = Get-HandoffTrustedPath ` + (Join-Path $release 'deps\waggle.exe') "$Label dependency" -AllowHardLink + $links = @(Get-HandoffHardLinkPaths $main) + $set = [Collections.Generic.HashSet[string]]::new([StringComparer]::OrdinalIgnoreCase) + foreach ($link in $links) { [void]$set.Add($link) } + if ($set.Count -ne 2 -or -not $set.Contains($main) -or -not $set.Contains($dependency) -or + (Get-HandoffFileSha256 $main) -cne (Get-HandoffFileSha256 $dependency)) { + throw "$Label does not have the exact equal-byte release\waggle.exe and release\deps\waggle.exe hard-link pair." + } +} + +function New-HandoffInventory { + param( + [Parameter(Mandatory = $true)] [object[]]$Mappings, + [Parameter(Mandatory = $true)] [string]$Label + ) + + $entries = [Collections.Generic.List[object]]::new() + $exactPaths = [Collections.Generic.HashSet[string]]::new([StringComparer]::Ordinal) + $foldedPaths = [Collections.Generic.HashSet[string]]::new([StringComparer]::OrdinalIgnoreCase) + foreach ($mapping in $Mappings) { + $relative = [string]$mapping.Path + Assert-HandoffCanonicalRelativePath $relative $Label + if (-not $exactPaths.Add($relative) -or -not $foldedPaths.Add($relative)) { + throw "$Label contains a duplicate path or case-insensitive collision." + } + $source = [IO.Path]::GetFullPath([string]$mapping.Source) + if (-not (Test-Path -LiteralPath $source -PathType Leaf)) { + throw "$Label source file is missing." + } + $item = Get-Item -LiteralPath $source -Force + if (($item.Attributes -band [IO.FileAttributes]::ReparsePoint) -ne 0) { + throw "$Label source file became a reparse point." + } + $linkTypeProperty = $item.PSObject.Properties['LinkType'] + if ($null -eq $linkTypeProperty -or + -not ([string]::IsNullOrEmpty([string]$linkTypeProperty.Value) -or + [string]$linkTypeProperty.Value -ceq 'HardLink')) { + throw "$Label source file has an unsupported link topology." + } + $streams = @(Get-Item -LiteralPath $source -Stream * -ErrorAction Stop) + if ($streams.Count -ne 1 -or [string]$streams[0].Stream -cne ':$DATA') { + throw "$Label source file contains an alternate data stream." + } + $lock = [IO.File]::Open( + $source, + [IO.FileMode]::Open, + [IO.FileAccess]::Read, + [IO.FileShare]::Read + ) + try { + $entries.Add([pscustomobject][ordered]@{ + path = $relative + size = [long]$item.Length + sha256 = Get-HandoffFileSha256 $source + }) + } finally { + $lock.Dispose() + } + } + $sorted = @($entries) + [Array]::Sort($sorted, [Comparison[object]]{ + param($left, $right) + return [StringComparer]::Ordinal.Compare([string]$left.path, [string]$right.path) + }) + $canonical = @($sorted | ForEach-Object { + [ordered]@{ + path = [string]$_.path + size = [long]$_.size + sha256 = ([string]$_.sha256).ToUpperInvariant() + } + }) | ConvertTo-Json -Depth 8 -Compress + return [pscustomobject][ordered]@{ + entries = $sorted + sha256 = Get-HandoffBytesSha256 ([Text.Encoding]::UTF8.GetBytes($canonical)) + } +} + +function Assert-HandoffInventoriesEqual { + param( + [Parameter(Mandatory = $true)] [object]$Expected, + [Parameter(Mandatory = $true)] [object]$Actual, + [Parameter(Mandatory = $true)] [string]$Label + ) + + if (-not [string]::Equals( + [string]$Expected.sha256, + [string]$Actual.sha256, + [StringComparison]::OrdinalIgnoreCase + ) -or @($Expected.entries).Count -ne @($Actual.entries).Count) { + throw "$Label inventory changed during handoff staging." + } + for ($index = 0; $index -lt @($Expected.entries).Count; $index++) { + $left = @($Expected.entries)[$index] + $right = @($Actual.entries)[$index] + if ([string]$left.path -cne [string]$right.path -or + [long]$left.size -ne [long]$right.size -or + -not [string]::Equals( + [string]$left.sha256, + [string]$right.sha256, + [StringComparison]::OrdinalIgnoreCase + )) { + throw "$Label inventory changed during handoff staging." + } + } +} + +function Copy-HandoffMappings { + param( + [Parameter(Mandatory = $true)] [object[]]$Mappings, + [Parameter(Mandatory = $true)] [string]$Root, + [string]$SkipRelativePath = '' + ) + + foreach ($mapping in $Mappings) { + $relative = [string]$mapping.Path + if (-not [string]::IsNullOrEmpty($SkipRelativePath) -and + $relative -ceq $SkipRelativePath) { + continue + } + $destination = Join-Path $Root $relative + [IO.Directory]::CreateDirectory((Split-Path $destination -Parent)) | Out-Null + if (Test-Path -LiteralPath $destination) { + throw 'Handoff destination contains an unexpected file or directory collision.' + } + [IO.File]::Copy([string]$mapping.Source, $destination, $false) + } +} + +function Get-HandoffMappings { + param( + [Parameter(Mandatory = $true)] [string]$ReleaseRoot, + [Parameter(Mandatory = $true)] [string]$ResourcesRoot + ) + + $mappings = [Collections.Generic.List[object]]::new() + foreach ($relative in @('waggle.exe', 'deps\waggle.exe')) { + $mappings.Add([pscustomobject]@{ + Source = Join-Path $ReleaseRoot $relative + Path = "$TargetTriple\release\$relative" + }) + } + foreach ($treeSpec in @( + [pscustomobject]@{ + Root = Join-Path $ReleaseRoot 'nsis' + Prefix = "$TargetTriple\release\nsis" + }, + [pscustomobject]@{ + Root = Join-Path $ReleaseRoot 'bundle\nsis' + Prefix = "$TargetTriple\release\bundle\nsis" + } + )) { + $treeMaxCount = if ([string]$treeSpec.Prefix -like '*\bundle\nsis') { 1 } else { 128 } + $treeMaxBytes = if ([string]$treeSpec.Prefix -like '*\bundle\nsis') { 256MB } else { 64MB } + foreach ($file in @(Get-HandoffTreeFiles ` + ([string]$treeSpec.Root) 'Unsigned NSIS output' ` + -MaxFileCount $treeMaxCount -MaxBytes $treeMaxBytes ` + -MaxDirectoryCount 16)) { + $mappings.Add([pscustomobject]@{ + Source = [string]$file.FullName + Path = "$([string]$treeSpec.Prefix)\$([string]$file.RelativePath)" + }) + } + } + foreach ($file in @(Get-HandoffTreeFiles ` + $ResourcesRoot 'Tauri sidecar resources' ` + -MaxFileCount $MaxResourceFileCount -MaxBytes $MaxResourceBytes ` + -MaxDirectoryCount 2400)) { + $mappings.Add([pscustomobject]@{ + Source = [string]$file.FullName + Path = "resources\$([string]$file.RelativePath)" + }) + } + return @($mappings) +} + +function Get-HandoffResourceMappings { + param([Parameter(Mandatory = $true)] [object[]]$TargetMappings) + + return @($TargetMappings | Where-Object { + ([string]$_.Path).StartsWith('resources\', [StringComparison]::Ordinal) + } | ForEach-Object { + [pscustomobject]@{ + Source = [string]$_.Source + Path = ([string]$_.Path).Substring('resources\'.Length) + } + }) +} + +function Get-HandoffTreeMappings { + param( + [Parameter(Mandatory = $true)] [string]$Root, + [Parameter(Mandatory = $true)] [string]$Label, + [switch]$AllowCargoHardLinkPair, + [string]$CargoReleaseRoot = '', + [int]$MaxFileCount = [int]::MaxValue, + [long]$MaxBytes = [long]::MaxValue, + [int]$MaxDirectoryCount = [int]::MaxValue + ) + + return @(Get-HandoffTreeFiles ` + $Root $Label ` + -AllowCargoHardLinkPair:$AllowCargoHardLinkPair ` + -CargoReleaseRoot $CargoReleaseRoot ` + -MaxFileCount $MaxFileCount -MaxBytes $MaxBytes ` + -MaxDirectoryCount $MaxDirectoryCount | ForEach-Object { + [pscustomobject]@{ Source = [string]$_.FullName; Path = [string]$_.RelativePath } + }) +} + +function Write-HandoffJsonNoBom { + param( + [Parameter(Mandatory = $true)] [string]$Path, + [Parameter(Mandatory = $true)] [object]$Value + ) + + [IO.File]::WriteAllText( + $Path, + ($Value | ConvertTo-Json -Depth 32), + [Text.UTF8Encoding]::new($false) + ) +} + +function Write-HandoffOutput { + param( + [Parameter(Mandatory = $true)] [string]$Name, + [Parameter(Mandatory = $true)] [string]$Value + ) + + if ($Name -notmatch '^[a-z_]+$' -or $Value -match '[\r\n\x00]') { + throw 'GitHub output contains an unsafe name or value.' + } + $line = "$Name=$Value" + Write-Host $line + $outputPath = [Environment]::GetEnvironmentVariable('GITHUB_OUTPUT') + if (-not [string]::IsNullOrWhiteSpace($outputPath)) { + $trustedOutput = Get-HandoffTrustedPath $outputPath 'GITHUB_OUTPUT' + [IO.File]::AppendAllText( + $trustedOutput, + $line + [Environment]::NewLine, + [Text.UTF8Encoding]::new($false) + ) + } +} + +function New-HandoffBuildReceipt { + param( + [Parameter(Mandatory = $true)] [string]$SourceRevision, + [Parameter(Mandatory = $true)] [object]$TargetInventory, + [Parameter(Mandatory = $true)] [object]$ResourcesInventory, + [Parameter(Mandatory = $true)] [object]$NsisInventory, + [Parameter(Mandatory = $true)] [string]$CheckerSha256 + ) + + if ($SourceRevision -notmatch '^[0-9a-f]{40}$' -or + $CheckerSha256 -notmatch '^[0-9A-F]{64}$') { + throw 'Handoff receipt requires an exact source revision and checker SHA-256.' + } + return [ordered]@{ + schemaVersion = 1 + repository = $ApprovedRepository + sourceRevision = $SourceRevision + targetTriple = $TargetTriple + targetInventory = $TargetInventory + resourcesInventory = $ResourcesInventory + nsisInventory = $NsisInventory + checker = [ordered]@{ + exitCode = 0 + sha256 = $CheckerSha256 + } + } +} + +function Invoke-HandoffDestinationTransaction { + param( + [Parameter(Mandatory = $true)] [string]$DestinationRoot, + [Parameter(Mandatory = $true)] [string]$DestinationParentRoot, + [Parameter(Mandatory = $true)] [object[]]$TargetMappings, + [Parameter(Mandatory = $true)] [object[]]$ResourceMappings, + [Parameter(Mandatory = $true)] [object[]]$NsisMappings, + [Parameter(Mandatory = $true)] [object]$ExpectedTargetInventory, + [Parameter(Mandatory = $true)] [object]$ExpectedResourcesInventory, + [Parameter(Mandatory = $true)] [object]$ExpectedNsisInventory, + [Parameter(Mandatory = $true)] [string]$SourceRevision, + [Parameter(Mandatory = $true)] [string]$CheckerSha256, + [scriptblock]$FinalSourceAssertion = {}, + [int]$TargetFileCountLimit = $MaxTargetFileCount, + [long]$TargetByteLimit = $MaxTargetBytes, + [int]$ResourceFileCountLimit = $MaxResourceFileCount, + [long]$ResourceByteLimit = $MaxResourceBytes, + [int]$NsisFileCountLimit = $ExpectedNsisFileCount, + [long]$NsisByteLimit = 16MB + ) + + $destinationParent = Get-HandoffTrustedPath ` + $DestinationParentRoot 'Handoff destination parent' 'Container' + if ([string]::IsNullOrWhiteSpace($DestinationRoot) -or + -not [IO.Path]::IsPathRooted($DestinationRoot) -or + $DestinationRoot -match '[\x00-\x1F\x7F]' -or + $DestinationRoot -match '(^|[\\/])\.\.?(?:[\\/]|$)') { + throw 'DestinationRoot must be a safe, fully qualified local Windows path.' + } + $destination = [IO.Path]::GetFullPath($DestinationRoot).TrimEnd('\') + if (-not [string]::Equals( + (Split-Path $destination -Parent), + $destinationParent.TrimEnd('\'), + [StringComparison]::OrdinalIgnoreCase + ) -or (Split-Path $destination -Leaf) -notmatch '^[A-Za-z0-9][A-Za-z0-9._-]*$' -or + (Test-Path -LiteralPath $destination)) { + throw 'DestinationRoot must be an absent direct child of its trusted parent.' + } + + [void](Assert-HandoffMappingBounds ` + $TargetMappings $TargetFileCountLimit $TargetByteLimit 'Hosted target inventory') + [void](Assert-HandoffMappingBounds ` + $ResourceMappings $ResourceFileCountLimit $ResourceByteLimit ` + 'Hosted resources inventory') + [void](Assert-HandoffMappingBounds ` + $NsisMappings $NsisFileCountLimit $NsisByteLimit 'Hosted NSIS inventory') + + $prebuiltRoot = Join-Path $destination 'prebuilt' + $stagedNsisRoot = Join-Path $destination 'nsis-toolchain' + $receiptPath = Join-Path $destination 'build-receipt.json' + try { + [IO.Directory]::CreateDirectory($prebuiltRoot) | Out-Null + [IO.Directory]::CreateDirectory($stagedNsisRoot) | Out-Null + $mainRelative = "$TargetTriple\release\waggle.exe" + Copy-HandoffMappings $TargetMappings $prebuiltRoot $mainRelative + $stagedDependency = Join-Path ` + $prebuiltRoot "$TargetTriple\release\deps\waggle.exe" + $stagedMain = Join-Path $prebuiltRoot $mainRelative + New-Item -ItemType HardLink -Path $stagedMain -Target $stagedDependency | Out-Null + Copy-HandoffMappings $NsisMappings $stagedNsisRoot + + Assert-HandoffCargoPair ` + (Join-Path $prebuiltRoot "$TargetTriple\release") 'Staged Cargo output' + $stagedTargetMappings = @(Get-HandoffTreeMappings ` + $prebuiltRoot 'Staged prebuilt tree' -AllowCargoHardLinkPair ` + -CargoReleaseRoot (Join-Path $prebuiltRoot "$TargetTriple\release") ` + -MaxFileCount $TargetFileCountLimit -MaxBytes $TargetByteLimit ` + -MaxDirectoryCount 2500) + $stagedResourceMappings = @(Get-HandoffTreeMappings ` + (Join-Path $prebuiltRoot 'resources') 'Staged sidecar resources' ` + -MaxFileCount $ResourceFileCountLimit -MaxBytes $ResourceByteLimit ` + -MaxDirectoryCount 2400) + $stagedNsisMappings = @(Get-HandoffTreeMappings ` + $stagedNsisRoot 'Staged NSIS toolchain' ` + -MaxFileCount $NsisFileCountLimit -MaxBytes $NsisByteLimit ` + -MaxDirectoryCount 128) + & $FinalSourceAssertion $prebuiltRoot $stagedNsisRoot + $targetInventory = New-HandoffInventory $stagedTargetMappings 'Staged target inventory' + $resourcesInventory = New-HandoffInventory ` + $stagedResourceMappings 'Staged resources inventory' + $nsisInventory = New-HandoffInventory $stagedNsisMappings 'Staged NSIS inventory' + Assert-HandoffInventoriesEqual ` + $ExpectedTargetInventory $targetInventory 'Hosted target' + Assert-HandoffInventoriesEqual ` + $ExpectedResourcesInventory $resourcesInventory 'Hosted resources' + Assert-HandoffInventoriesEqual ` + $ExpectedNsisInventory $nsisInventory 'Hosted NSIS toolchain' + + & $FinalSourceAssertion $prebuiltRoot $stagedNsisRoot + $receipt = New-HandoffBuildReceipt ` + $SourceRevision $targetInventory $resourcesInventory $nsisInventory $CheckerSha256 + Write-HandoffJsonNoBom $receiptPath $receipt + $receiptSha256 = Get-HandoffFileSha256 $receiptPath + return [pscustomobject][ordered]@{ + ArtifactRoot = $destination + PrebuiltRoot = $prebuiltRoot + NsisToolchainRoot = $stagedNsisRoot + ReceiptPath = $receiptPath + ReceiptSha256 = $receiptSha256 + Receipt = $receipt + } + } catch { + if (Test-Path -LiteralPath $destination -PathType Container) { + [IO.Directory]::Delete($destination, $true) + } + throw + } +} + +function Invoke-WindowsSigningHandoff { + if ([Environment]::OSVersion.Platform -ne [PlatformID]::Win32NT -or + -not [Environment]::Is64BitProcess) { + throw 'Windows signing handoff requires 64-bit Windows.' + } + + $repoRoot = Get-HandoffTrustedPath ` + (Split-Path (Split-Path $PSScriptRoot -Parent) -Parent) ` + 'Repository root' 'Container' + $expectedBoundary = [ordered]@{ + GITHUB_ACTIONS = 'true' + RUNNER_ENVIRONMENT = 'github-hosted' + RUNNER_OS = 'Windows' + GITHUB_REPOSITORY = $ApprovedRepository + GITHUB_REF_TYPE = 'tag' + } + foreach ($entry in $expectedBoundary.GetEnumerator()) { + if ([Environment]::GetEnvironmentVariable([string]$entry.Key) -cne [string]$entry.Value) { + throw "Windows signing handoff requires exact $($entry.Key) boundary evidence." + } + } + $workspace = Get-HandoffTrustedPath ` + ([Environment]::GetEnvironmentVariable('GITHUB_WORKSPACE')) ` + 'GITHUB_WORKSPACE' 'Container' + if (-not [string]::Equals($workspace, $repoRoot, [StringComparison]::OrdinalIgnoreCase)) { + throw 'Windows signing handoff must run from the exact GitHub workspace.' + } + + $revision = [Environment]::GetEnvironmentVariable('GITHUB_SHA') + if ($revision -notmatch '^[0-9a-f]{40}$') { + throw 'GITHUB_SHA must be one exact lowercase commit revision.' + } + $expectedGitPath = 'C:\Program Files\Git\cmd\git.exe' + if (-not [string]::Equals( + [IO.Path]::GetFullPath($GitPath), + $expectedGitPath, + [StringComparison]::OrdinalIgnoreCase + )) { + throw 'Git executable must use the canonical Git for Windows path.' + } + $git = Get-HandoffTrustedPath $expectedGitPath 'Git executable' -AllowHardLink + $runnerToolCache = Get-HandoffTrustedPath ` + ([Environment]::GetEnvironmentVariable('RUNNER_TOOL_CACHE')) ` + 'RUNNER_TOOL_CACHE' 'Container' + $expectedNodePath = Join-Path $runnerToolCache 'node\22.23.2\x64\node.exe' + if ([string]::IsNullOrWhiteSpace($NodePath)) { + $NodePath = $expectedNodePath + } elseif (-not [string]::Equals( + [IO.Path]::GetFullPath($NodePath), + [IO.Path]::GetFullPath($expectedNodePath), + [StringComparison]::OrdinalIgnoreCase + )) { + throw 'Node.js runtime must use the exact setup-node tool-cache path.' + } + $node = Get-HandoffTrustedPath $NodePath 'Node.js runtime' -AllowHardLink + $configPath = Get-HandoffTrustedPath ` + (Join-Path $repoRoot 'app\src-tauri\tauri.conf.json') 'Tauri config' + $checkerPath = Get-HandoffTrustedPath ` + (Join-Path $repoRoot 'scripts\check-sidecar-resources.mjs') ` + 'Sidecar resource checker' + + $toolLocks = [Collections.Generic.List[IDisposable]]::new() + try { + foreach ($toolPath in @($git, $node, $configPath, $checkerPath)) { + $toolLocks.Add([IO.File]::Open( + $toolPath, + [IO.FileMode]::Open, + [IO.FileAccess]::Read, + [IO.FileShare]::Read + )) + } + Assert-HandoffSignedExecutable $git $GitPublisher 'Git executable' + Assert-HandoffSignedExecutable $node $OpenJsPublisher 'Node.js runtime' + $nodeVersion = [string](& $node --version) + if ($LASTEXITCODE -ne 0 -or $nodeVersion -cne $ExpectedNodeVersion) { + throw "Node.js runtime must be exactly $ExpectedNodeVersion." + } + $appVersion = [string]( + Get-Content -Raw -LiteralPath $configPath | ConvertFrom-Json + ).version + if ($appVersion -notmatch '^\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?$' -or + [Environment]::GetEnvironmentVariable('GITHUB_REF_NAME') -cne "v$appVersion") { + throw 'Windows signing handoff requires the exact app-version release tag.' + } + + $trackedHandoffPaths = @( + 'app/scripts/new-windows-signing-handoff.ps1', + 'scripts/check-sidecar-resources.mjs', + 'app/src-tauri/tauri.conf.json' + ) + Assert-HandoffRepositoryState ` + $git $repoRoot $revision $appVersion $trackedHandoffPaths + + $expectedSourceTarget = [IO.Path]::GetFullPath( + (Join-Path $repoRoot 'app\src-tauri\target') + ) + $sourceTargetCandidate = if ([IO.Path]::IsPathRooted($SourceTargetRoot)) { + $SourceTargetRoot + } else { + Join-Path $repoRoot $SourceTargetRoot + } + $sourceTarget = Get-HandoffTrustedPath ` + $sourceTargetCandidate 'Unsigned Cargo target root' 'Container' + if (-not [string]::Equals( + $sourceTarget, + $expectedSourceTarget, + [StringComparison]::OrdinalIgnoreCase + )) { + throw 'Unsigned Cargo target root must be the canonical repository target root.' + } + $sourceRelease = Get-HandoffTrustedPath ` + (Join-Path $sourceTarget "$TargetTriple\release") ` + 'Unsigned Cargo release root' 'Container' + Assert-HandoffCargoPair $sourceRelease 'Unsigned Cargo output' + $sourceNsis = Get-HandoffTrustedPath ` + (Join-Path $sourceRelease 'nsis') 'Generated NSIS input root' 'Container' + $sourceBundleNsis = Get-HandoffTrustedPath ` + (Join-Path $sourceRelease 'bundle\nsis') 'Generated NSIS bundle root' 'Container' + if (@(Get-HandoffTreeFiles ` + $sourceNsis 'Generated NSIS input root' ` + -MaxFileCount 128 -MaxBytes 64MB -MaxDirectoryCount 16).Count -eq 0 -or + @(Get-HandoffTreeFiles ` + $sourceBundleNsis 'Generated NSIS bundle root' ` + -MaxFileCount 1 -MaxBytes 256MB -MaxDirectoryCount 1).Count -eq 0) { + throw 'A completed full unsigned NSIS build is required before handoff.' + } + $expectedInstaller = Get-HandoffTrustedPath ` + (Join-Path $sourceBundleNsis "Waggle_${appVersion}_x64-setup.exe") ` + 'Unsigned NSIS installer' + $bundleFiles = @(Get-HandoffTreeFiles ` + $sourceBundleNsis 'Generated NSIS bundle root' ` + -MaxFileCount 1 -MaxBytes 256MB -MaxDirectoryCount 1) + if ($bundleFiles.Count -ne 1 -or + -not [string]::Equals( + [string]$bundleFiles[0].FullName, + $expectedInstaller, + [StringComparison]::OrdinalIgnoreCase + )) { + throw 'Generated NSIS bundle root must contain only the exact versioned installer.' + } + foreach ($unsignedPath in @( + (Join-Path $sourceRelease 'waggle.exe'), + (Join-Path $sourceRelease 'deps\waggle.exe'), + $expectedInstaller + )) { + $signature = Get-AuthenticodeSignature -LiteralPath $unsignedPath + if ($signature.Status -ne [Management.Automation.SignatureStatus]::NotSigned -or + [string]$signature.SignatureType -cne 'None') { + throw 'Windows signing handoff accepts only an unsigned executable and NSIS installer.' + } + } + + $resourcesRoot = Get-HandoffTrustedPath ` + (Join-Path $repoRoot 'app\src-tauri\resources') ` + 'Tauri sidecar resources' 'Container' + $localAppData = [Environment]::GetFolderPath('LocalApplicationData') + $nsisToolchainRoot = Get-HandoffTrustedPath ` + (Join-Path $localAppData 'tauri\NSIS') 'Tauri NSIS toolchain' 'Container' + $checkerSha256 = Get-HandoffFileSha256 $checkerPath + + $targetMappings = @(Get-HandoffMappings $sourceRelease $resourcesRoot) + $resourceMappings = @(Get-HandoffResourceMappings $targetMappings) + $targetBytes = [long](Assert-HandoffMappingBounds ` + $targetMappings $MaxTargetFileCount $MaxTargetBytes 'Hosted target inventory') + [void](Assert-HandoffMappingBounds ` + $resourceMappings $MaxResourceFileCount $MaxResourceBytes 'Hosted resources inventory') + $nsisMappings = @(Get-HandoffTreeMappings ` + $nsisToolchainRoot 'Tauri NSIS toolchain' ` + -MaxFileCount $ExpectedNsisFileCount -MaxBytes 16MB -MaxDirectoryCount 128) + $nsisBytes = [long](Assert-HandoffMappingBounds ` + $nsisMappings $ExpectedNsisFileCount 16MB 'Hosted NSIS inventory') + $expectedTargetInventory = New-HandoffInventory $targetMappings 'Hosted target inventory' + $expectedResourcesInventory = New-HandoffInventory ` + $resourceMappings 'Hosted resources inventory' + $expectedNsisInventory = New-HandoffInventory $nsisMappings 'Hosted NSIS inventory' + if (@($expectedNsisInventory.entries).Count -ne $ExpectedNsisFileCount -or + [string]$expectedNsisInventory.sha256 -cne $ExpectedNsisInventorySha256) { + throw 'Tauri NSIS toolchain does not match the pinned 442-file closure.' + } + + $savedTargetArch = [Environment]::GetEnvironmentVariable('TARGET_ARCH') + $savedNodeOptions = [Environment]::GetEnvironmentVariable('NODE_OPTIONS') + $savedNodePath = [Environment]::GetEnvironmentVariable('NODE_PATH') + try { + [Environment]::SetEnvironmentVariable('TARGET_ARCH', 'x64') + [Environment]::SetEnvironmentVariable('NODE_OPTIONS', $null) + [Environment]::SetEnvironmentVariable('NODE_PATH', $null) + Push-Location $repoRoot + try { + & $node $checkerPath --expected-source-revision $revision + if ($LASTEXITCODE -ne 0) { + throw "Sidecar resource checker failed with exit code $LASTEXITCODE." + } + } finally { + Pop-Location + } + } finally { + [Environment]::SetEnvironmentVariable('TARGET_ARCH', $savedTargetArch) + [Environment]::SetEnvironmentVariable('NODE_OPTIONS', $savedNodeOptions) + [Environment]::SetEnvironmentVariable('NODE_PATH', $savedNodePath) + } + if ((Get-HandoffFileSha256 $checkerPath) -cne $checkerSha256) { + throw 'Sidecar resource checker changed while it was executing.' + } + + $runnerTemp = Get-HandoffTrustedPath ` + ([Environment]::GetEnvironmentVariable('RUNNER_TEMP')) 'RUNNER_TEMP' 'Container' + if ([string]::IsNullOrWhiteSpace($DestinationRoot) -or + -not [IO.Path]::IsPathRooted($DestinationRoot) -or + $DestinationRoot -match '[\x00-\x1F\x7F]' -or + $DestinationRoot -match '(^|[\\/])\.\.?(?:[\\/]|$)') { + throw 'DestinationRoot must be a safe, fully qualified local Windows path.' + } + $destination = [IO.Path]::GetFullPath($DestinationRoot).TrimEnd('\') + if (-not [string]::Equals( + (Split-Path $destination -Parent), + $runnerTemp.TrimEnd('\'), + [StringComparison]::OrdinalIgnoreCase + ) -or (Split-Path $destination -Leaf) -notmatch '^[A-Za-z0-9][A-Za-z0-9._-]*$' -or + (Test-Path -LiteralPath $destination)) { + throw 'DestinationRoot must be an absent direct child of RUNNER_TEMP.' + } + if ($targetBytes -gt [long]::MaxValue - $nsisBytes -or + $targetBytes + $nsisBytes -gt [long]::MaxValue - 1GB) { + throw 'Handoff disk-capacity calculation overflowed.' + } + $requiredFreeBytes = $targetBytes + $nsisBytes + 1GB + $availableFreeBytes = [IO.DriveInfo]::new( + [IO.Path]::GetPathRoot($destination) + ).AvailableFreeSpace + if ($availableFreeBytes -lt $requiredFreeBytes) { + throw "RUNNER_TEMP has insufficient free space for the bounded handoff: requires $requiredFreeBytes bytes." + } + + $finalSourceAssertion = { + $lockedHead = [string](& $git -C $repoRoot rev-parse --verify HEAD) + $lockedStatus = @(& $git -C $repoRoot status --porcelain=v1 --untracked-files=all) + if ($LASTEXITCODE -ne 0 -or $lockedHead -cne $revision -or $lockedStatus.Count -ne 0 -or + (Get-HandoffFileSha256 $checkerPath) -cne $checkerSha256) { + throw 'Repository or checker changed while the handoff was being assembled.' + } + Assert-HandoffDefaultIndexFlags $git $repoRoot + }.GetNewClosure() + $handoff = Invoke-HandoffDestinationTransaction ` + -DestinationRoot $destination -DestinationParentRoot $runnerTemp ` + -TargetMappings $targetMappings -ResourceMappings $resourceMappings ` + -NsisMappings $nsisMappings ` + -ExpectedTargetInventory $expectedTargetInventory ` + -ExpectedResourcesInventory $expectedResourcesInventory ` + -ExpectedNsisInventory $expectedNsisInventory ` + -SourceRevision $revision -CheckerSha256 $checkerSha256 ` + -FinalSourceAssertion $finalSourceAssertion + + Write-HandoffOutput 'artifact_root' $handoff.ArtifactRoot + Write-HandoffOutput 'prebuilt_root' $handoff.PrebuiltRoot + Write-HandoffOutput 'nsis_toolchain_root' $handoff.NsisToolchainRoot + Write-HandoffOutput 'receipt_path' $handoff.ReceiptPath + Write-HandoffOutput 'receipt_sha256' $handoff.ReceiptSha256 + Write-HandoffOutput 'source_revision' $revision + } finally { + foreach ($toolLock in $toolLocks) { $toolLock.Dispose() } + } +} + +if ($MyInvocation.InvocationName -ne '.') { + Invoke-WindowsSigningHandoff +} diff --git a/app/scripts/sign-macos-adhoc.sh b/app/scripts/sign-macos-adhoc.sh index 675ac20..58d3dc9 100644 --- a/app/scripts/sign-macos-adhoc.sh +++ b/app/scripts/sign-macos-adhoc.sh @@ -7,11 +7,10 @@ # Usage: # ./sign-macos-adhoc.sh # -# Tauri's bundle config (tauri.build-override.conf.json) already passes -# `signingIdentity: "-"` to codesign at build time, so the produced .app is -# already ad-hoc-signed. This script: +# Ordinary `npm run tauri:build:mac` does not load the optional build override. +# Treat the input as unsigned until this script signs and verifies it. This script: # -# 1. Re-signs the bundle with --force --deep to catch any nested helpers +# 1. Signs or re-signs the bundle with --force --deep to catch nested helpers # (sidecar binary, native deps) that Tauri's pass missed. # 2. Verifies the signature with --verify --deep --strict. # diff --git a/app/scripts/sign-windows-artifact.ps1 b/app/scripts/sign-windows-artifact.ps1 new file mode 100644 index 0000000..8df2750 --- /dev/null +++ b/app/scripts/sign-windows-artifact.ps1 @@ -0,0 +1,4704 @@ +[CmdletBinding()] +param( + [ValidateSet('Callback', 'Package')] + [string]$Mode = 'Callback', + + [AllowEmptyString()] + [string]$ArtifactPath = '', + + [AllowEmptyString()] + [string]$ArtifactSigningPackageSource = '', + + [AllowEmptyString()] + [string]$UnsignedInputRoot = '', + + [AllowEmptyString()] + [string]$SigningInputRoot = '', + + [AllowEmptyString()] + [string]$BuildReceiptPath = '', + + [AllowEmptyString()] + [string]$BuildReceiptSha256 = '', + + [AllowEmptyString()] + [string]$PortableToolchainRoot = '', + + [AllowEmptyString()] + [string]$PortableNodePath = '', + + [AllowEmptyString()] + [string]$PortableGitPath = '', + + [AllowEmptyString()] + [string]$PortableSevenZipPath = '', + + [AllowEmptyString()] + [string]$PortableToolchainReceiptPath = '', + + [AllowEmptyString()] + [string]$PortableToolchainReceiptSha256 = '', + + [switch]$TrustedPowerShellHost +) + +$trustedModuleRoot = [IO.Path]::GetFullPath([IO.Path]::Combine($PSHOME, 'Modules')) +[Environment]::SetEnvironmentVariable('PSModulePath', $trustedModuleRoot, 'Process') +$global:PSModuleAutoLoadingPreference = 'None' +foreach ($moduleName in @( + 'Microsoft.PowerShell.Security', + 'Microsoft.PowerShell.Management', + 'Microsoft.PowerShell.Utility' + )) { + $moduleManifest = [IO.Path]::Combine( + $trustedModuleRoot, $moduleName, "$moduleName.psd1" + ) + if (-not [IO.File]::Exists($moduleManifest)) { + throw "Trusted PowerShell module is missing: $moduleManifest" + } + Microsoft.PowerShell.Core\Import-Module ` + $moduleManifest -Force -Scope Global -ErrorAction Stop +} +if ($PSVersionTable.PSEdition -ceq 'Desktop') { + $appxManifest = [IO.Path]::Combine($trustedModuleRoot, 'Appx', 'Appx.psd1') + if ([IO.File]::Exists($appxManifest)) { + Microsoft.PowerShell.Core\Import-Module ` + $appxManifest -Force -Scope Global -ErrorAction Stop + } +} + +$trustedCommandModules = [ordered]@{ + 'Get-AuthenticodeSignature' = 'Microsoft.PowerShell.Security' + 'Get-Acl' = 'Microsoft.PowerShell.Security' + 'Set-Acl' = 'Microsoft.PowerShell.Security' + 'Get-FileHash' = 'Microsoft.PowerShell.Utility' +} +foreach ($entry in $trustedCommandModules.GetEnumerator()) { + $command = $ExecutionContext.SessionState.InvokeCommand.GetCommand( + [string]$entry.Key, + [Management.Automation.CommandTypes]::All + ) + $expectedModulePath = [IO.Path]::Combine( + $trustedModuleRoot, [string]$entry.Value, "$([string]$entry.Value).psd1" + ) + if ($null -eq $command -or + -not [string]::Equals( + [IO.Path]::GetFullPath([string]$command.Module.Path), + [IO.Path]::GetFullPath($expectedModulePath), + [StringComparison]::OrdinalIgnoreCase + )) { + throw "PowerShell command '$($entry.Key)' did not resolve from the trusted module root." + } +} + +Set-StrictMode -Version Latest +$ErrorActionPreference = 'Stop' + +$MicrosoftPublisher = 'CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US' +$MicrosoftWindowsPublisher = 'CN=Microsoft Windows, O=Microsoft Corporation, L=Redmond, S=Washington, C=US' +$DotNetPublisher = 'CN=.NET, O=Microsoft Corporation, L=Redmond, S=Washington, C=US' +$NodePublisher = 'CN=OpenJS Foundation, O=OpenJS Foundation, L=San Francisco, S=California, C=US' +$GitPublisher = 'CN=Johannes Schindelin, O=Johannes Schindelin, S=Nordrhein-Westfalen, C=DE' +$ArtifactSigningEndpoint = 'https://weu.codesigning.azure.net/' +$ArtifactSigningAccount = 'waggleos-egzakta-signing' +$ArtifactSigningProfile = 'waggleos-public-trust' +$ArtifactSigningClientVersion = '1.0.128.0' +$ArtifactSigningDlibSha256 = '2D4C1BBC87467B3AC25BBC49DF58CC8B36A0F92B3E21AA98BBBAD08A4D7C98BA' +$ArtifactSigningPackageSha256 = '74BD7D27E6CE1051409C38D9B46BC8DF0400ECD643D51FFBF2AC00869061E40B' +$ArtifactSigningX64ManifestSha256 = '7B78EF94C8B5939281F7AA364EA6406716F844D893DAA89AF601933D0BA1DB6E' +$SignToolSha256 = '431EE314C83988CACDA86606356FD321B75AE0093481B97E3B738E99C412F2A0' +$TauriCliVersion = '2.10.1' +$TauriCliSha256 = '0DD6EC63C7C63A993FDE20955E291D833C03F3760E63E0EE21E83482F6C0B43A' +$TauriCliPackageSha256 = '15A3A9383E8EDF7AD3D5117DBD8B9A6D75EE36654D3F71D2D0AD48E294EBAB98' +$TauriCliMainSha256 = '49DF414A16784E3711D5582D55C5C9E537ACEB1108C5ECFC6A17CDC2F5259B4D' +$TauriCliIndexSha256 = 'F6A7556765D3ED2DD40F9FCF609CEB7D3646FCCBB7FA01EEB9B7931F8BC8BB4F' +$TauriNativePackageSha256 = '6CB1DD193C36BAA11679ED9403FC564AA1E06A2BFAA066A146555D93BD07A783' +$TauriNativeBinarySha256 = 'F7289148FDF4CE6CE527D34C63A0055C87DE4FFE0A98475F3998D527225B1443' +$MakensisSha256 = '42850802704ECB11163F7E0329D35EE54BD288953200D4966E226D572848CFC5' +$NsisClosureSha256 = '1FC822D1A183552A80ADEA01B0BF456F462B90518256EF1FE9EDFA22D76CD85A' +$GitSha256 = '34A408843194BE320D8A87A3C12CD5C7D2E08D03B24567A41DB32E21D12569D2' +$GitRuntimeSha256 = '755D4896D35663D0FF08924F84507F35236B83D240635B512C519BF43CC71A87' +$NodePath = 'C:\Program Files\nodejs\node.exe' +$NodeSha256 = 'AE1A50511BE58E987483FDBC12125407443926D2D394669ADE2352776E920DD3' +$SevenZipPath = 'C:\Program Files\7-Zip\7z.exe' +$SevenZipSha256 = '4CD7D776C686427226A151789D2D61F0B2ED2C392148CC4E69C0238362FAFECF' +$SevenZipDllSha256 = '5BD20FB38499D95C39594F41D4781B6181B3304B7F1F4D06B0182F514E7EAA74' +$NodeArchiveSha256 = '7C93E9D92BF68C07182B471AA187E35EE6CD08EF0F24AB060DFFF605FCC1C57C' +$GitArchiveSha256 = 'C2C955A21FA99889D83F485F24FA5D9A38FFFC2D509D4022385510E11C26B250' +$SevenZipArchiveSha256 = '78AFA2A1C773CAF3CF7EDF62F857D2A8A5DA55FB0FFF5DA416074C0D28B2B55F' +$PortableToolchainFileCount = 2495 +$PortableToolchainInventorySha256 = 'D64F897D4E1A7F07FE9BA62D6AF062EF9F0E41C595CDAF2F3C4F73991BBEA0F5' +$ApprovedPublisher = 'CN=EGZAKTA DOO BEOGRAD, O=EGZAKTA DOO BEOGRAD, L=Amsterdam, C=NL' +$CodeSigningOid = '1.3.6.1.5.5.7.3.3' +$SystemPowerShellPath = 'C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe' +$SignToolPath = 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64\signtool.exe' +$GitPath = 'C:\Program Files\Git\cmd\git.exe' +$NsisUninstallerPattern = '^nst[0-9A-F]{4}\.tmp$' + +function Get-TrustedPath { + param( + [Parameter(Mandatory = $true)] [string]$Path, + [Parameter(Mandatory = $true)] [string]$Label, + [ValidateSet('Leaf', 'Container')] [string]$PathType = 'Leaf', + [switch]$AllowHardLink + ) + + if ([string]::IsNullOrWhiteSpace($Path) -or + $Path -match '[\x00-\x1F\x7F]' -or + $Path -notmatch '^[A-Za-z]:[\\/]' -or + $Path -match '^[\\/]{2}' -or + $Path -match '^[\\/]{2}[?.][\\/]' -or + $Path -match '(^|[\\/])\.\.?(?:[\\/]|$)' -or + $Path.Substring(2) -match ':' -or + @($Path -split '[\\/]' | Where-Object { $_ -match '[. ]$' }).Count -gt 0) { + throw "$Label must use a safe, fully qualified local Windows path." + } + + $fullPath = [IO.Path]::GetFullPath($Path) + $testPathType = if ($PathType -eq 'Leaf') { 'Leaf' } else { 'Container' } + if (-not (Test-Path -LiteralPath $fullPath -PathType $testPathType)) { + throw "$Label does not exist as a $($PathType.ToLowerInvariant()): $fullPath" + } + + $root = [IO.Path]::GetPathRoot($fullPath) + $relative = $fullPath.Substring($root.Length) + $current = $root + foreach ($component in @($relative -split '[\\/]' | Where-Object { $_ })) { + $current = Join-Path $current $component + $item = Get-Item -LiteralPath $current -Force + if (($item.Attributes -band [IO.FileAttributes]::ReparsePoint) -ne 0) { + throw "$Label traverses a reparse point: $current" + } + $linkTypeProperty = $item.PSObject.Properties['LinkType'] + $linkType = if ($null -eq $linkTypeProperty) { '' } else { [string]$linkTypeProperty.Value } + if (-not [string]::IsNullOrEmpty($linkType) -and + -not ($AllowHardLink -and $linkType -ceq 'HardLink')) { + throw "$Label traverses a linked filesystem object: $current" + } + } + + $resolved = (Resolve-Path -LiteralPath $fullPath).ProviderPath + if (-not [string]::Equals( + [IO.Path]::GetFullPath($resolved), + $fullPath, + [StringComparison]::OrdinalIgnoreCase + )) { + throw "$Label resolves to an unexpected path." + } + return $fullPath +} + +function Get-ContainedRelativePath { + param( + [Parameter(Mandatory = $true)] [string]$Path, + [Parameter(Mandatory = $true)] [string]$Root + ) + + $relative = [IO.Path]::GetRelativePath($Root, $Path) + if ([IO.Path]::IsPathRooted($relative) -or + $relative -eq '..' -or + $relative.StartsWith("..$([IO.Path]::DirectorySeparatorChar)", [StringComparison]::Ordinal)) { + return $null + } + return $relative.Replace('/', '\') +} + +function Get-ArtifactPolicyKind { + param( + [Parameter(Mandatory = $true)] [string]$Path, + [Parameter(Mandatory = $true)] [string]$ReleaseRoot, + [Parameter(Mandatory = $true)] [string]$ResourcesRoot, + [AllowNull()] [string]$NsisTempRoot, + [Parameter(Mandatory = $true)] [string]$Version + ) + + $releaseRelative = Get-ContainedRelativePath $Path $ReleaseRoot + if ($null -ne $releaseRelative) { + $allowedPeFiles = @( + 'waggle.exe', + 'nsis\x64\Plugins\x86-unicode\NSISdl.dll', + 'nsis\x64\Plugins\x86-unicode\StartMenu.dll', + 'nsis\x64\Plugins\x86-unicode\System.dll', + 'nsis\x64\Plugins\x86-unicode\nsDialogs.dll', + 'nsis\x64\Plugins\x86-unicode\additional\nsis_tauri_utils.dll', + "bundle\nsis\Waggle_${Version}_x64-setup.exe" + ) + if ($allowedPeFiles -contains $releaseRelative) { + return 'PE' + } + throw "Artifact is not in the approved Tauri release manifest: $releaseRelative" + } + + $resourceRelative = Get-ContainedRelativePath $Path $ResourcesRoot + if ($null -ne $resourceRelative) { + $allowedResourceFiles = @( + 'native\vec0.dll', + 'native\onnxruntime\onnxruntime.dll', + 'node_modules\@img\sharp-win32-x64\lib\libvips-42.dll', + 'node_modules\@img\sharp-win32-x64\lib\libvips-cpp-8.18.3.dll', + 'node_modules\onnxruntime-node\bin\napi-v3\win32\x64\onnxruntime.dll', + 'node_modules\sqlite-vec-windows-x64\vec0.dll' + ) + if ($allowedResourceFiles -contains $resourceRelative) { + return 'PE' + } + throw "Artifact is not in the approved Tauri resource manifest: $resourceRelative" + } + + if ($null -ne $NsisTempRoot) { + $tempRelative = Get-ContainedRelativePath $Path $NsisTempRoot + if ($null -ne $tempRelative -and + $tempRelative -notmatch '[\\/]' -and + $tempRelative -cmatch '^nst[0-9A-F]{4}\.tmp$') { + return 'PE' + } + } + + throw 'Artifact is outside every approved Waggle signing root.' +} + +function Assert-PeFile { + param([Parameter(Mandatory = $true)] [string]$Path) + + $stream = [IO.File]::Open($Path, [IO.FileMode]::Open, [IO.FileAccess]::Read, [IO.FileShare]::Read) + try { + if ($stream.Length -lt 64) { throw 'PE file is too short.' } + $reader = [IO.BinaryReader]::new($stream) + if ($reader.ReadUInt16() -ne 0x5A4D) { throw 'Artifact lacks the PE MZ header.' } + $stream.Position = 0x3C + $peOffset = $reader.ReadUInt32() + if ($peOffset -lt 64 -or $peOffset -gt 4MB -or $peOffset + 4 -gt $stream.Length) { + throw 'Artifact has an invalid PE header offset.' + } + $stream.Position = $peOffset + if ($reader.ReadUInt32() -ne 0x00004550) { throw 'Artifact lacks the PE signature.' } + } finally { + $stream.Dispose() + } +} + +function Assert-MsiFile { + param([Parameter(Mandatory = $true)] [string]$Path) + + $expected = [byte[]](0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1) + $stream = [IO.File]::Open($Path, [IO.FileMode]::Open, [IO.FileAccess]::Read, [IO.FileShare]::Read) + try { + if ($stream.Length -lt $expected.Length) { throw 'MSI file is too short.' } + $actual = [byte[]]::new($expected.Length) + if ($stream.Read($actual, 0, $actual.Length) -ne $actual.Length) { + throw 'Could not read the MSI header.' + } + if (-not [Linq.Enumerable]::SequenceEqual($actual, $expected)) { + throw 'Artifact lacks the MSI compound-file header.' + } + } finally { + $stream.Dispose() + } +} + +function Assert-ApprovedAuthenticodeFile { + param( + [Parameter(Mandatory = $true)] [string]$Path, + [Parameter(Mandatory = $true)] [string]$Label, + [AllowNull()] [string]$ExpectedSha256, + [Parameter(Mandatory = $true)] [string]$ExpectedPublisher, + [switch]$AllowCatalog + ) + + $signature = Get-AuthenticodeSignature -LiteralPath $Path + $signatureType = [string]$signature.SignatureType + $approvedSignatureType = $signatureType -ceq 'Authenticode' -or + ($AllowCatalog -and $signatureType -ceq 'Catalog') + if ($signature.Status -ne [Management.Automation.SignatureStatus]::Valid -or + -not $approvedSignatureType -or + $null -eq $signature.SignerCertificate -or + -not [string]::Equals( + [string]$signature.SignerCertificate.Subject, + $ExpectedPublisher, + [StringComparison]::Ordinal + )) { + throw "$Label is not validly Authenticode-signed by the approved publisher." + } + + $hasCodeSigningEku = @( + $signature.SignerCertificate.Extensions | + Where-Object { $_ -is [Security.Cryptography.X509Certificates.X509EnhancedKeyUsageExtension] } | + ForEach-Object { $_.EnhancedKeyUsages } | + Where-Object { $_.Value -eq $CodeSigningOid } + ).Count -gt 0 + if (-not $hasCodeSigningEku) { throw "$Label lacks the Code Signing EKU." } + + if (-not [string]::IsNullOrEmpty($ExpectedSha256)) { + $actualHash = (Get-FileHash -LiteralPath $Path -Algorithm SHA256).Hash + if (-not [string]::Equals($actualHash, $ExpectedSha256, [StringComparison]::OrdinalIgnoreCase)) { + throw "$Label does not match the pinned SHA-256 digest." + } + } +} + +function Assert-MicrosoftAuthenticodeFile { + param( + [Parameter(Mandatory = $true)] [string]$Path, + [Parameter(Mandatory = $true)] [string]$Label, + [AllowNull()] [string]$ExpectedSha256, + [string]$ExpectedPublisher = $MicrosoftPublisher, + [switch]$AllowCatalog + ) + + Assert-ApprovedAuthenticodeFile ` + $Path $Label $ExpectedSha256 $ExpectedPublisher -AllowCatalog:$AllowCatalog +} + +function Assert-ApprovedPowerShell7Path { + param([Parameter(Mandatory = $true)] [string]$Path) + + $programFiles = [Environment]::GetFolderPath( + [Environment+SpecialFolder]::ProgramFiles + ) + $standardPath = [IO.Path]::GetFullPath((Join-Path $programFiles 'PowerShell\7\pwsh.exe')) + $windowsAppsPattern = '^[A-Za-z]:\\Program Files\\WindowsApps\\Microsoft\.PowerShell_\d+\.\d+\.\d+\.\d+_x64__8wekyb3d8bbwe\\pwsh\.exe$' + if (-not [string]::Equals($Path, $standardPath, [StringComparison]::OrdinalIgnoreCase) -and + $Path -notmatch $windowsAppsPattern) { + throw 'PowerShell 7 must come from the canonical Microsoft installation path.' + } + if ([Version](Get-Item -LiteralPath $Path).VersionInfo.FileVersion -lt [Version]'7.5.0') { + throw 'Artifact Signing requires PowerShell 7.5 or newer for non-coercing JSON validation.' + } + Assert-MicrosoftAuthenticodeFile $Path 'PowerShell 7 host' $null +} + +function Get-ApprovedPowerShell7Path { + $programFiles = [Environment]::GetFolderPath( + [Environment+SpecialFolder]::ProgramFiles + ) + $candidates = @() + $standardPath = Join-Path $programFiles 'PowerShell\7\pwsh.exe' + if (Test-Path -LiteralPath $standardPath -PathType Leaf) { + $candidates += $standardPath + } + if ($PSVersionTable.PSEdition -ceq 'Core') { + $currentHost = (Get-Process -Id $PID).Path + if (-not [string]::IsNullOrWhiteSpace($currentHost)) { + $candidates += $currentHost + } + } + + if ($PSVersionTable.PSEdition -ceq 'Desktop') { + $windowsAppsRoot = Join-Path $programFiles 'WindowsApps' + $candidates += @( + Microsoft.PowerShell.Core\Get-Module Appx | + ForEach-Object { Appx\Get-AppxPackage -Name Microsoft.PowerShell -ErrorAction SilentlyContinue } | + Where-Object { + [string]$_.Architecture -ceq 'X64' -and + $_.InstallLocation -like "$windowsAppsRoot\Microsoft.PowerShell_*" + } | + Sort-Object Version -Descending | + ForEach-Object { Join-Path $_.InstallLocation 'pwsh.exe' } | + Where-Object { Test-Path -LiteralPath $_ -PathType Leaf } + ) + } + + foreach ($candidate in $candidates) { + try { + $trustedCandidate = Get-TrustedPath $candidate 'PowerShell 7 host' -AllowHardLink + Assert-ApprovedPowerShell7Path $trustedCandidate + return $trustedCandidate + } catch { + continue + } + } + throw 'No approved, Microsoft-signed 64-bit PowerShell 7 host is installed.' +} + +function Invoke-TrustedPowerShellRelaunch { + param( + [Parameter(Mandatory = $true)] [ValidateSet('Callback', 'Package')] [string]$LaunchMode, + [string]$Path = '', + [string]$PackageSource = '', + [string]$ToolchainRoot = '', + [string]$Node = '', + [string]$Git = '', + [string]$SevenZip = '', + [string]$ToolchainReceipt = '', + [string]$ToolchainReceiptSha256 = '' + ) + + $systemHost = Get-TrustedPath $SystemPowerShellPath 'Windows PowerShell bootstrap' -AllowHardLink + $actualHost = Get-TrustedPath (Get-Process -Id $PID).Path 'Current bootstrap host' -AllowHardLink + if (-not [string]::Equals($actualHost, $systemHost, [StringComparison]::OrdinalIgnoreCase)) { + throw 'Artifact Signing bootstrap must run under canonical Windows PowerShell.' + } + Assert-MicrosoftAuthenticodeFile ` + $systemHost 'Windows PowerShell bootstrap' $null $MicrosoftWindowsPublisher -AllowCatalog + + $powerShell7 = Get-ApprovedPowerShell7Path + $arguments = @( + '-NoLogo', '-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', + '-File', $PSCommandPath, '-Mode', $LaunchMode, '-TrustedPowerShellHost' + ) + if ($LaunchMode -ceq 'Callback') { + if ([string]::IsNullOrWhiteSpace($Path)) { + throw 'Signing callback requires an artifact path.' + } + $arguments += @('-ArtifactPath', $Path) + } else { + foreach ($pair in @( + @('-UnsignedInputRoot', $UnsignedInputRoot), + @('-SigningInputRoot', $SigningInputRoot), + @('-BuildReceiptPath', $BuildReceiptPath), + @('-BuildReceiptSha256', $BuildReceiptSha256), + @('-ArtifactSigningPackageSource', $PackageSource), + @('-PortableToolchainRoot', $ToolchainRoot), + @('-PortableNodePath', $Node), + @('-PortableGitPath', $Git), + @('-PortableSevenZipPath', $SevenZip), + @('-PortableToolchainReceiptPath', $ToolchainReceipt), + @('-PortableToolchainReceiptSha256', $ToolchainReceiptSha256) + )) { + if (-not [string]::IsNullOrWhiteSpace([string]$pair[1])) { + $arguments += @([string]$pair[0], [string]$pair[1]) + } + } + } + & $powerShell7 @arguments + if ($LASTEXITCODE -ne 0) { + throw "Trusted PowerShell 7 signing process failed with exit code $LASTEXITCODE." + } +} + +function New-PrivateDirectory { + param([Parameter(Mandatory = $true)] [string]$Path) + + [IO.Directory]::CreateDirectory($Path) | Out-Null + $inheritance = [Security.AccessControl.InheritanceFlags]::ContainerInherit -bor + [Security.AccessControl.InheritanceFlags]::ObjectInherit + $propagation = [Security.AccessControl.PropagationFlags]::None + $allow = [Security.AccessControl.AccessControlType]::Allow + $fullControl = [Security.AccessControl.FileSystemRights]::FullControl + $identities = @( + [Security.Principal.WindowsIdentity]::GetCurrent().User, + [Security.Principal.SecurityIdentifier]::new('S-1-5-18'), + [Security.Principal.SecurityIdentifier]::new('S-1-5-32-544') + ) + $approvedSids = [Collections.Generic.HashSet[string]]::new([StringComparer]::Ordinal) + foreach ($identity in $identities) { [void]$approvedSids.Add($identity.Value) } + $isApprovedAcl = { + param([Security.AccessControl.DirectorySecurity]$Acl) + + if (-not $Acl.AreAccessRulesProtected -or + -not $approvedSids.Contains( + $Acl.GetOwner([Security.Principal.SecurityIdentifier]).Value + )) { + return $false + } + $rules = @($Acl.GetAccessRules( + $true, + $true, + [Security.Principal.SecurityIdentifier] + )) + if ($rules.Count -ne $approvedSids.Count) { return $false } + foreach ($rule in $rules) { + if ($rule.IsInherited -or + $rule.AccessControlType -ne $allow -or + -not $approvedSids.Contains($rule.IdentityReference.Value) -or + ($rule.FileSystemRights -band $fullControl) -ne $fullControl) { + return $false + } + } + return $true + } + + $existing = Get-Acl -LiteralPath $Path + if (-not (& $isApprovedAcl $existing)) { + $security = $existing + $security.SetAccessRuleProtection($true, $false) + $security.SetOwner([Security.Principal.WindowsIdentity]::GetCurrent().User) + $existingRules = @($security.GetAccessRules( + $true, + $true, + [Security.Principal.SecurityIdentifier] + )) + foreach ($existingRule in $existingRules) { + $security.RemoveAccessRuleSpecific($existingRule) + } + foreach ($identity in $identities) { + $rule = [Security.AccessControl.FileSystemAccessRule]::new( + $identity, + $fullControl, + $inheritance, + $propagation, + $allow + ) + [void]$security.AddAccessRule($rule) + } + Set-Acl -LiteralPath $Path -AclObject $security + } + + $trustedPath = Get-TrustedPath $Path 'Private signing directory' 'Container' + $applied = Get-Acl -LiteralPath $trustedPath + if (-not (& $isApprovedAcl $applied)) { + throw 'Private signing directory permissions do not match the approved principals.' + } + return $trustedPath +} + +function Open-ReadLock { + param([Parameter(Mandatory = $true)] [string]$Path) + + return [IO.File]::Open( + $Path, + [IO.FileMode]::Open, + [IO.FileAccess]::Read, + [IO.FileShare]::Read + ) +} + +function Get-WagglePrebuiltFiles { + param( + [Parameter(Mandatory = $true)] [string]$Root, + [Parameter(Mandatory = $true)] [string]$Label + ) + + $trustedRoot = Get-TrustedPath $Root $Label 'Container' + $pending = [Collections.Generic.Queue[string]]::new() + $files = [Collections.Generic.List[string]]::new() + $pending.Enqueue($trustedRoot) + while ($pending.Count -gt 0) { + $directory = $pending.Dequeue() + foreach ($item in @(Get-ChildItem -LiteralPath $directory -Force)) { + if (($item.Attributes -band [IO.FileAttributes]::ReparsePoint) -ne 0) { + throw "$Label contains a reparse point or linked filesystem object: $($item.FullName)" + } + if ($item.PSIsContainer) { + $pending.Enqueue((Get-TrustedPath $item.FullName $Label 'Container')) + } else { + $files.Add((Get-TrustedPath $item.FullName $Label -AllowHardLink)) + } + } + } + return [pscustomobject]@{ Root = $trustedRoot; Files = @($files) } +} + +function Get-WaggleInventorySha256 { + param([Parameter(Mandatory = $true)] [object[]]$Entries) + + $canonical = @($Entries | ForEach-Object { + [ordered]@{ + path = [string]$_.path + size = [long]$_.size + sha256 = ([string]$_.sha256).ToUpperInvariant() + } + }) | ConvertTo-Json -Depth 8 -Compress + return [Convert]::ToHexString( + [Security.Cryptography.SHA256]::HashData([Text.Encoding]::UTF8.GetBytes($canonical)) + ) +} + +function Assert-WaggleCanonicalInventoryEntries { + param( + [Parameter(Mandatory = $true)] [object[]]$Entries, + [Parameter(Mandatory = $true)] [string]$Label + ) + + $exactPaths = [Collections.Generic.HashSet[string]]::new([StringComparer]::Ordinal) + $foldedPaths = [Collections.Generic.HashSet[string]]::new([StringComparer]::OrdinalIgnoreCase) + $orderedPaths = [Collections.Generic.List[string]]::new() + foreach ($entry in $Entries) { + $relativePath = [string](Get-RequiredPropertyValue $entry 'path' "$Label entry") + $sha256 = [string](Get-RequiredPropertyValue $entry 'sha256' "$Label entry") + $size = [long](Get-RequiredPropertyValue $entry 'size' "$Label entry") + if ([string]::IsNullOrWhiteSpace($relativePath) -or + $relativePath -match '[\x00-\x1F\x7F]' -or + $relativePath -match '(^|[\\/])\.\.?(?:[\\/]|$)' -or + [IO.Path]::IsPathRooted($relativePath) -or + $relativePath.Contains('/') -or + $relativePath.Contains(':') -or + @($relativePath -split '\\' | Where-Object { $_ -match '[. ]$' }).Count -ne 0) { + throw "$Label contains an unsafe or non-canonical relative path." + } + if (-not $exactPaths.Add($relativePath) -or -not $foldedPaths.Add($relativePath)) { + throw "$Label contains a duplicate canonical path or case-insensitive case collision." + } + if ($sha256 -notmatch '^[0-9A-Fa-f]{64}$' -or $size -lt 0) { + throw "$Label contains an invalid SHA-256 digest or file size." + } + $orderedPaths.Add($relativePath) + } + $sortedPaths = [Collections.Generic.List[string]]::new() + foreach ($path in $orderedPaths) { $sortedPaths.Add($path) } + $sortedPaths.Sort([StringComparer]::Ordinal) + if ([string]::Join("`n", $orderedPaths) -cne [string]::Join("`n", $sortedPaths)) { + throw "$Label entries must be sorted by ordinal canonical path." + } +} + +function New-WagglePrebuiltInventory { + param( + [Parameter(Mandatory = $true)] [string]$Root, + [string]$CargoReleaseRelativePath = 'release' + ) + + $tree = Get-WagglePrebuiltFiles $Root 'Prebuilt input tree' + $entries = [Collections.Generic.List[object]]::new() + foreach ($path in $tree.Files) { + $streams = @(Get-Item -LiteralPath $path -Stream * -ErrorAction Stop) + if ($streams.Count -ne 1 -or [string]$streams[0].Stream -cne ':$DATA') { + throw 'Prebuilt input tree contains an alternate data stream (ADS).' + } + $relative = (Get-ContainedRelativePath $path $tree.Root).Replace('/', '\') + if ($null -eq $relative) { throw 'Prebuilt input tree path escaped its root.' } + $item = Get-Item -LiteralPath $path -Force + $linkTypeProperty = $item.PSObject.Properties['LinkType'] + $linkType = if ($null -eq $linkTypeProperty) { '' } else { [string]$linkTypeProperty.Value } + if (-not [string]::IsNullOrEmpty($linkType)) { + if ($linkType -cne 'HardLink') { + throw 'Prebuilt input tree contains an unsupported linked filesystem object.' + } + Assert-ApprovedHardLinkTopology ` + $path (Join-Path $tree.Root $CargoReleaseRelativePath) + } + $lock = Open-ReadLock $path + try { + $entries.Add([pscustomobject][ordered]@{ + path = $relative + size = [long]$item.Length + sha256 = (Get-FileHash -LiteralPath $path -Algorithm SHA256).Hash + }) + } finally { + $lock.Dispose() + } + } + $sortedEntries = @($entries) + [Array]::Sort($sortedEntries, [Comparison[object]]{ + param($left, $right) + return [StringComparer]::Ordinal.Compare([string]$left.path, [string]$right.path) + }) + Assert-WaggleCanonicalInventoryEntries $sortedEntries 'Prebuilt input inventory' + return [pscustomobject][ordered]@{ + entries = $sortedEntries + sha256 = Get-WaggleInventorySha256 $sortedEntries + } +} + +function Test-WagglePathsOverlap { + param( + [Parameter(Mandatory = $true)] [string]$Left, + [Parameter(Mandatory = $true)] [string]$Right + ) + $leftPath = [IO.Path]::GetFullPath($Left).TrimEnd('\') + $rightPath = [IO.Path]::GetFullPath($Right).TrimEnd('\') + return [string]::Equals($leftPath, $rightPath, [StringComparison]::OrdinalIgnoreCase) -or + $leftPath.StartsWith("$rightPath\", [StringComparison]::OrdinalIgnoreCase) -or + $rightPath.StartsWith("$leftPath\", [StringComparison]::OrdinalIgnoreCase) +} + +function New-WagglePrebuiltWorkCopy { + param( + [Parameter(Mandatory = $true)] [string]$SourceRoot, + [Parameter(Mandatory = $true)] [string]$DestinationRoot, + [Parameter(Mandatory = $true)] [object]$Inventory, + [Parameter(Mandatory = $true)] [string]$Label, + [string]$CargoReleaseRelativePath = 'x86_64-pc-windows-msvc\release' + ) + + $source = Get-TrustedPath $SourceRoot "$Label source" 'Container' + $destination = [IO.Path]::GetFullPath($DestinationRoot) + if ((Test-WagglePathsOverlap $source $destination) -or + (Test-Path -LiteralPath $destination)) { + throw "$Label destination must be absent and distinct from its source." + } + $root = New-PrivateDirectory $destination + $entries = @((Get-RequiredPropertyValue $Inventory 'entries' "$Label inventory")) + Assert-WaggleCanonicalInventoryEntries $entries "$Label inventory" + $releaseRelative = $CargoReleaseRelativePath + $mainRelative = "$releaseRelative\waggle.exe" + $dependencyRelative = "$releaseRelative\deps\waggle.exe" + $mainEntry = @($entries | Where-Object { [string]$_.path -ceq $mainRelative }) + $dependencyEntry = @($entries | Where-Object { [string]$_.path -ceq $dependencyRelative }) + if ($mainEntry.Count -ne 1 -or $dependencyEntry.Count -ne 1 -or + [long]$mainEntry[0].size -ne [long]$dependencyEntry[0].size -or + -not [string]::Equals( + [string]$mainEntry[0].sha256, + [string]$dependencyEntry[0].sha256, + [StringComparison]::OrdinalIgnoreCase + )) { + throw "$Label inventory lacks the exact equal-byte Cargo executable pair." + } + try { + foreach ($entry in $entries) { + $relative = [string]$entry.path + if ($relative -ceq $mainRelative) { continue } + $sourcePath = Get-TrustedPath ` + (Join-Path $source $relative) "$Label source file" -AllowHardLink + $destinationPath = Join-Path $root $relative + [IO.Directory]::CreateDirectory((Split-Path $destinationPath -Parent)) | Out-Null + [IO.File]::Copy($sourcePath, $destinationPath, $false) + } + $dependencyPath = Join-Path $root $dependencyRelative + $mainPath = Join-Path $root $mainRelative + New-Item -ItemType HardLink -Path $mainPath -Target $dependencyPath | Out-Null + $copyInventory = New-WagglePrebuiltInventory ` + -Root $root -CargoReleaseRelativePath $CargoReleaseRelativePath + if (-not [string]::Equals( + [string]$copyInventory.sha256, + [string](Get-RequiredPropertyValue $Inventory 'sha256' "$Label inventory"), + [StringComparison]::OrdinalIgnoreCase + )) { + throw "$Label work copy does not match the receipt-bound inventory." + } + Assert-ApprovedHardLinkTopology ` + $mainPath (Join-Path $root $releaseRelative) + return $root + } catch { + if (Test-Path -LiteralPath $root) { + Remove-Item -LiteralPath $root -Recurse -Force -ErrorAction SilentlyContinue + } + throw + } +} + +function Assert-WaggleHostedDiskCapacity { + param( + [Parameter(Mandatory = $true)] [string]$Path, + [Parameter(Mandatory = $true)] [object]$Inventory, + [long]$AvailableBytes = -1 + ) + $entries = @((Get-RequiredPropertyValue $Inventory 'entries' 'Hosted build target inventory')) + $inventoryBytes = [long]0 + foreach ($entry in $entries) { + $size = [long](Get-RequiredPropertyValue $entry 'size' 'Hosted build inventory entry') + if ($size -lt 0 -or $inventoryBytes -gt [long]::MaxValue - $size) { + throw 'Hosted build target inventory has an invalid aggregate size.' + } + $inventoryBytes += $size + } + $safetyBytes = [Math]::Max(2GB, [long][Math]::Ceiling($inventoryBytes / 2.0)) + $requiredBytes = $inventoryBytes + $safetyBytes + if ($AvailableBytes -lt 0) { + $root = [IO.Path]::GetPathRoot([IO.Path]::GetFullPath($Path)) + $AvailableBytes = [IO.DriveInfo]::new($root).AvailableFreeSpace + } + if ($AvailableBytes -lt $requiredBytes) { + throw "Hosted signing has insufficient free disk space: requires $requiredBytes bytes, available $AvailableBytes bytes." + } + return $requiredBytes +} + +function New-WagglePreflightEvidenceCopy { + param( + [Parameter(Mandatory = $true)] [object]$Context, + [Parameter(Mandatory = $true)] [string]$DestinationRoot + ) + $root = New-PrivateDirectory $DestinationRoot + try { + $fixedPaths = @(Get-ExpectedNsisFixedPaths $Context '0.0.0') + $mainSource = Get-TrustedPath $fixedPaths[0] 'Unsigned preflight main' -AllowHardLink + $mainRelative = Get-ContainedRelativePath $mainSource $Context.TargetRoot + if ($null -eq $mainRelative) { + throw 'Unsigned preflight main escaped its target root.' + } + $mainDestination = Join-Path $root $mainRelative + $dependencyDestination = Join-Path ` + (Split-Path $mainDestination -Parent) 'deps\waggle.exe' + [IO.Directory]::CreateDirectory((Split-Path $dependencyDestination -Parent)) | Out-Null + [IO.File]::Copy($mainSource, $dependencyDestination, $false) + New-Item -ItemType HardLink -Path $mainDestination -Target $dependencyDestination | Out-Null + Assert-ApprovedHardLinkTopology ` + $mainDestination (Split-Path $mainDestination -Parent) + + foreach ($sourcePathValue in @($fixedPaths | Select-Object -Skip 1)) { + $sourcePath = Get-TrustedPath ` + $sourcePathValue 'Unsigned preflight evidence source' -AllowHardLink + $relative = Get-ContainedRelativePath $sourcePath $Context.TargetRoot + if ($null -eq $relative) { + throw 'Unsigned preflight evidence escaped its target root.' + } + $destination = Join-Path $root $relative + [IO.Directory]::CreateDirectory((Split-Path $destination -Parent)) | Out-Null + [IO.File]::Copy($sourcePath, $destination, $false) + if ((Get-FileHash -LiteralPath $destination -Algorithm SHA256).Hash -cne + (Get-FileHash -LiteralPath $sourcePath -Algorithm SHA256).Hash) { + throw 'Unsigned preflight evidence copy failed digest verification.' + } + } + return $root + } catch { + if (Test-Path -LiteralPath $root) { + Remove-Item -LiteralPath $root -Recurse -Force -ErrorAction SilentlyContinue + } + throw + } +} + +function Open-WaggleValidatedPrebuiltTree { + param( + [Parameter(Mandatory = $true)] [string]$Root, + [Parameter(Mandatory = $true)] [object]$ExpectedInventory, + [Parameter(Mandatory = $true)] [string]$Label, + [string[]]$DisallowedRoots = @(), + [string[]]$MutablePaths = @(), + [string[]]$RegeneratedRoots = @(), + [string]$CargoReleaseRelativePath = 'release' + ) + + $trustedRoot = Get-TrustedPath $Root $Label 'Container' + foreach ($disallowedRoot in $DisallowedRoots) { + $overlaps = if ([string]::IsNullOrWhiteSpace($disallowedRoot)) { + $false + } else { + Test-WagglePathsOverlap $trustedRoot ([IO.Path]::GetFullPath($disallowedRoot)) + } + if (-not [string]::IsNullOrWhiteSpace($disallowedRoot) -and + $overlaps) { + throw "$Label must be distinct from every disallowed root; root overlap is forbidden." + } + } + $expectedEntries = @((Get-RequiredPropertyValue $ExpectedInventory 'entries' "$Label inventory")) + $expectedSha256 = [string](Get-RequiredPropertyValue ` + $ExpectedInventory 'sha256' "$Label inventory") + Assert-WaggleCanonicalInventoryEntries $expectedEntries "$Label inventory" + if ($expectedSha256 -notmatch '^[0-9A-Fa-f]{64}$' -or + -not [string]::Equals( + (Get-WaggleInventorySha256 $expectedEntries), + $expectedSha256, + [StringComparison]::OrdinalIgnoreCase + )) { + throw "$Label inventory aggregate SHA-256 digest is invalid." + } + + $tree = Get-WagglePrebuiltFiles $trustedRoot $Label + $actualPaths = [Collections.Generic.List[string]]::new() + foreach ($path in $tree.Files) { + $relative = Get-ContainedRelativePath $path $trustedRoot + if ($null -eq $relative) { throw "$Label path escaped its root." } + $actualPaths.Add($relative.Replace('/', '\')) + } + $actualPaths.Sort([StringComparer]::Ordinal) + $expectedPaths = @($expectedEntries | ForEach-Object { [string]$_.path }) + if ($actualPaths.Count -ne $expectedPaths.Count -or + [string]::Join("`n", $actualPaths) -cne [string]::Join("`n", $expectedPaths)) { + throw "$Label contains missing, extra, or unexpected files relative to its inventory." + } + + $mutableSet = [Collections.Generic.HashSet[string]]::new( + [StringComparer]::OrdinalIgnoreCase + ) + foreach ($mutablePathValue in @($MutablePaths)) { + $mutablePath = Get-TrustedPath ` + $mutablePathValue "$Label mutable file" -AllowHardLink + if ($null -eq (Get-ContainedRelativePath $mutablePath $trustedRoot) -or + -not $mutableSet.Add($mutablePath)) { + throw "$Label mutable-file roster contains an escaped or duplicate path." + } + } + $regeneratedRootList = [Collections.Generic.List[string]]::new() + foreach ($regeneratedRootValue in @($RegeneratedRoots)) { + $regeneratedRoot = Get-TrustedPath ` + $regeneratedRootValue "$Label regenerated root" 'Container' + $relativeRoot = Get-ContainedRelativePath $regeneratedRoot $trustedRoot + if ($null -eq $relativeRoot -or $relativeRoot -ceq '.') { + throw "$Label regenerated-root roster contains an escaped or unsafe root." + } + foreach ($existingRoot in $regeneratedRootList) { + if (Test-WagglePathsOverlap $regeneratedRoot $existingRoot) { + throw "$Label regenerated-root roster contains duplicate or overlapping roots." + } + } + $regeneratedRootList.Add($regeneratedRoot) + } + $matchedMutableSet = [Collections.Generic.HashSet[string]]::new( + [StringComparer]::OrdinalIgnoreCase + ) + $matchedRegeneratedRoots = [Collections.Generic.HashSet[string]]::new( + [StringComparer]::OrdinalIgnoreCase + ) + + $locks = [Collections.Generic.List[IDisposable]]::new() + try { + for ($index = 0; $index -lt $expectedEntries.Count; $index++) { + $entry = $expectedEntries[$index] + $path = Get-TrustedPath (Join-Path $trustedRoot ([string]$entry.path)) $Label -AllowHardLink + $streams = @(Get-Item -LiteralPath $path -Stream * -ErrorAction Stop) + if ($streams.Count -ne 1 -or [string]$streams[0].Stream -cne ':$DATA') { + throw "$Label contains an alternate data stream (ADS)." + } + $item = Get-Item -LiteralPath $path -Force + $linkTypeProperty = $item.PSObject.Properties['LinkType'] + $linkType = if ($null -eq $linkTypeProperty) { '' } else { [string]$linkTypeProperty.Value } + if (-not [string]::IsNullOrEmpty($linkType)) { + if ($linkType -cne 'HardLink') { throw "$Label contains an unsupported link." } + Assert-ApprovedHardLinkTopology ` + $path (Join-Path $trustedRoot $CargoReleaseRelativePath) + } + $lock = Open-ReadLock $path + try { + if ([long]$item.Length -ne [long]$entry.size -or + -not [string]::Equals( + (Get-FileHash -LiteralPath $path -Algorithm SHA256).Hash, + [string]$entry.sha256, + [StringComparison]::OrdinalIgnoreCase + )) { + throw "$Label file does not match its inventory SHA-256 digest and size." + } + if ($mutableSet.Contains($path)) { + [void]$matchedMutableSet.Add($path) + } + $isRegeneratedOutput = $false + foreach ($regeneratedRoot in $regeneratedRootList) { + if ($null -ne (Get-ContainedRelativePath $path $regeneratedRoot)) { + $isRegeneratedOutput = $true + [void]$matchedRegeneratedRoots.Add($regeneratedRoot) + break + } + } + if (-not $mutableSet.Contains($path) -and -not $isRegeneratedOutput) { + $locks.Add($lock) + $lock = $null + } + } finally { + if ($null -ne $lock) { $lock.Dispose() } + } + } + if ($matchedMutableSet.Count -ne $mutableSet.Count) { + throw "$Label mutable-file roster does not match its exact inventory." + } + if ($matchedRegeneratedRoots.Count -ne $regeneratedRootList.Count) { + throw "$Label regenerated-root roster does not match its exact inventory." + } + return [pscustomobject]@{ + Root = $trustedRoot + Inventory = $ExpectedInventory + Locks = $locks + MutablePaths = @($mutableSet) + RegeneratedRoots = @($regeneratedRootList) + } + } catch { + foreach ($lock in $locks) { $lock.Dispose() } + throw + } +} + +function Clear-WaggleRegeneratedRoots { + param([Parameter(Mandatory = $true)] [object]$Lease) + + $leaseRoot = Get-TrustedPath $Lease.Root 'Validated prebuilt work root' 'Container' + foreach ($rootValue in @($Lease.RegeneratedRoots)) { + $trustedRoot = Get-TrustedPath ` + ([string]$rootValue) 'Validated Tauri-generated output root' 'Container' + $relativeRoot = Get-ContainedRelativePath $trustedRoot $leaseRoot + if ($null -eq $relativeRoot -or $relativeRoot -ceq '.') { + throw 'Tauri-generated output root escaped its validated private work root.' + } + [IO.Directory]::Delete($trustedRoot, $true) + if (Test-Path -LiteralPath $trustedRoot) { + throw 'Tauri-generated output root could not be cleared before packaging.' + } + } +} + +function Get-NsisPatchedMainSha256 { + param([Parameter(Mandatory = $true)] [string]$Path) + + $trustedPath = Get-TrustedPath $Path 'Tauri main executable' -AllowHardLink + $lock = Open-ReadLock $trustedPath + try { + $bytes = [IO.File]::ReadAllBytes($trustedPath) + $unknownToken = [Text.Encoding]::ASCII.GetBytes('__TAURI_BUNDLE_TYPE_VAR_UNK') + $nsisToken = [Text.Encoding]::ASCII.GetBytes('__TAURI_BUNDLE_TYPE_VAR_NSS') + $msiToken = [Text.Encoding]::ASCII.GetBytes('__TAURI_BUNDLE_TYPE_VAR_MSI') + $findOffsets = { + param([byte[]]$Needle) + $offsets = [Collections.Generic.List[int]]::new() + for ($offset = 0; $offset -le $bytes.Length - $Needle.Length; $offset++) { + $matches = $true + for ($index = 0; $index -lt $Needle.Length; $index++) { + if ($bytes[$offset + $index] -ne $Needle[$index]) { + $matches = $false + break + } + } + if ($matches) { $offsets.Add($offset) } + } + return @($offsets) + } + $unknownOffsets = @(& $findOffsets $unknownToken) + if ($unknownOffsets.Count -ne 1 -or + @(& $findOffsets $nsisToken).Count -ne 0 -or + @(& $findOffsets $msiToken).Count -ne 0) { + throw 'Tauri main executable must contain exactly one unpatched bundle-type token.' + } + $patched = [byte[]]$bytes.Clone() + [Array]::Copy($nsisToken, 0, $patched, $unknownOffsets[0], $nsisToken.Length) + return [Convert]::ToHexString( + [Security.Cryptography.SHA256]::HashData($patched) + ) + } finally { + $lock.Dispose() + } +} + +function Get-RequiredPropertyValue { + param( + [Parameter(Mandatory = $true)] [object]$InputObject, + [Parameter(Mandatory = $true)] [string]$Name, + [Parameter(Mandatory = $true)] [string]$Label + ) + + $property = $InputObject.PSObject.Properties[$Name] + if ($null -eq $property -or $null -eq $property.Value) { + throw "$Label is missing required property '$Name'." + } + return $property.Value +} + +function Assert-ExactCanonicalPathValue { + param( + [Parameter(Mandatory = $true)] [string]$Actual, + [Parameter(Mandatory = $true)] [string]$Expected, + [Parameter(Mandatory = $true)] [string]$Label + ) + + if ([string]::IsNullOrWhiteSpace($Actual) -or + $Actual -match '[\x00-\x1F\x7F]' -or + $Actual -notmatch '^[A-Za-z]:[\\/]' -or + $Actual -match '^[\\/]{2}' -or + $Actual -match '(^|[\\/])\.\.?(?:[\\/]|$)' -or + $Actual.Substring(2) -match ':' -or + @($Actual -split '[\\/]' | Where-Object { $_ -match '[. ]$' }).Count -gt 0) { + throw "$Label must be a safe, fully qualified local Windows path." + } + if (-not [string]::Equals( + [IO.Path]::GetFullPath($Actual), + [IO.Path]::GetFullPath($Expected), + [StringComparison]::OrdinalIgnoreCase + )) { + throw "$Label does not match the signing session." + } +} + +function Get-WaggleSigningSlotPhase { + param([Parameter(Mandatory = $true)] [int]$Order) + if ($Order -eq 1) { return 1 } + if ($Order -ge 2 -and $Order -le 7) { return 2 } + if ($Order -ge 8 -and $Order -le 12) { return 3 } + if ($Order -eq 13) { return 4 } + if ($Order -eq 14) { return 5 } + throw 'Signing callback slot order is outside the exact NSIS phase roster.' +} + +function Assert-PrivateDirectoryAcl { + param( + [Parameter(Mandatory = $true)] [string]$Path, + [Parameter(Mandatory = $true)] [string]$Label + ) + + $directory = Get-TrustedPath $Path $Label 'Container' + $acl = Get-Acl -LiteralPath $directory + $allow = [Security.AccessControl.AccessControlType]::Allow + $fullControl = [Security.AccessControl.FileSystemRights]::FullControl + $approvedSids = [Collections.Generic.HashSet[string]]::new([StringComparer]::Ordinal) + foreach ($identity in @( + [Security.Principal.WindowsIdentity]::GetCurrent().User, + [Security.Principal.SecurityIdentifier]::new('S-1-5-18'), + [Security.Principal.SecurityIdentifier]::new('S-1-5-32-544') + )) { + [void]$approvedSids.Add($identity.Value) + } + + if (-not $acl.AreAccessRulesProtected -or + -not $approvedSids.Contains( + $acl.GetOwner([Security.Principal.SecurityIdentifier]).Value + )) { + throw "$Label must have protected private signing permissions." + } + $rules = @($acl.GetAccessRules( + $true, + $true, + [Security.Principal.SecurityIdentifier] + )) + if ($rules.Count -ne $approvedSids.Count) { + throw "$Label contains an unexpected access rule." + } + foreach ($rule in $rules) { + if ($rule.IsInherited -or + $rule.AccessControlType -ne $allow -or + -not $approvedSids.Contains($rule.IdentityReference.Value) -or + ($rule.FileSystemRights -band $fullControl) -ne $fullControl) { + throw "$Label contains an unapproved access rule." + } + } + return $directory +} + +function Assert-WagglePinnedToolFile { + param( + [Parameter(Mandatory = $true)] [string]$Path, + [Parameter(Mandatory = $true)] [string]$Label, + [Parameter(Mandatory = $true)] [string]$ExpectedSha256, + [AllowNull()] [string]$ExpectedPublisher, + [switch]$AllowCatalog, + [switch]$AllowHardLink + ) + + $trustedPath = Get-TrustedPath $Path $Label -AllowHardLink:$AllowHardLink + if ([string]::IsNullOrEmpty($ExpectedPublisher)) { + if ((Get-FileHash -LiteralPath $trustedPath -Algorithm SHA256).Hash -cne + $ExpectedSha256) { + throw "$Label does not match the pinned SHA-256 digest." + } + } else { + Assert-ApprovedAuthenticodeFile ` + $trustedPath $Label $ExpectedSha256 $ExpectedPublisher ` + -AllowCatalog:$AllowCatalog + } + return $trustedPath +} + +function Open-WagglePortableToolchainReceipt { + param( + [Parameter(Mandatory = $true)] [string]$Root, + [Parameter(Mandatory = $true)] [string]$ReceiptPath, + [Parameter(Mandatory = $true)] [string]$ReceiptSha256, + [string[]]$DisallowedRoots = @() + ) + + if ($ReceiptSha256 -notmatch '^[0-9A-Fa-f]{64}$') { + throw 'Portable signing toolchain receipt SHA-256 is invalid.' + } + $trustedRoot = Assert-PrivateDirectoryAcl $Root 'Portable signing toolchain root' + $trustedReceipt = Get-TrustedPath $ReceiptPath 'Portable signing toolchain receipt' + if (Test-WagglePathsOverlap $trustedRoot $trustedReceipt) { + throw 'Portable signing toolchain receipt must be outside its toolchain root.' + } + foreach ($disallowedRoot in @($DisallowedRoots | Where-Object { + -not [string]::IsNullOrWhiteSpace([string]$_) + })) { + if (Test-WagglePathsOverlap $trustedReceipt ([string]$disallowedRoot)) { + throw 'Portable signing toolchain receipt overlaps a protected signing boundary.' + } + } + $locks = [Collections.Generic.List[IDisposable]]::new() + try { + $receiptLock = Open-ReadLock $trustedReceipt + $locks.Add($receiptLock) + if (-not [string]::Equals( + (Get-FileHash -LiteralPath $trustedReceipt -Algorithm SHA256).Hash, + $ReceiptSha256, + [StringComparison]::OrdinalIgnoreCase + )) { + throw 'Portable signing toolchain receipt does not match its handoff SHA-256.' + } + try { + $receipt = Get-Content -Raw -LiteralPath $trustedReceipt | + ConvertFrom-Json -Depth 32 -DateKind String + } catch { + throw 'Portable signing toolchain receipt is not valid JSON.' + } + if ([int](Get-RequiredPropertyValue ` + $receipt 'schemaVersion' 'Portable signing toolchain receipt') -ne 1) { + throw 'Portable signing toolchain receipt schemaVersion must be 1.' + } + Assert-ExactCanonicalPathValue ` + ([string](Get-RequiredPropertyValue ` + $receipt 'portableToolchainRoot' 'Portable signing toolchain receipt')) ` + $trustedRoot 'Portable signing toolchain receipt root' + + $archives = Get-RequiredPropertyValue ` + $receipt 'archives' 'Portable signing toolchain receipt' + $archiveBindings = @( + @('node', $NodeArchiveSha256), + @('git', $GitArchiveSha256), + @('sevenZip', $SevenZipArchiveSha256) + ) + $archivePaths = [Collections.Generic.HashSet[string]]::new( + [StringComparer]::OrdinalIgnoreCase + ) + foreach ($binding in $archiveBindings) { + $archive = Get-RequiredPropertyValue ` + $archives ([string]$binding[0]) 'Portable toolchain archives' + $archivePath = Get-TrustedPath ` + ([string](Get-RequiredPropertyValue ` + $archive 'path' 'Portable toolchain vendor archive')) ` + 'Portable toolchain vendor archive' + $archiveHash = [string](Get-RequiredPropertyValue ` + $archive 'sha256' 'Portable toolchain vendor archive') + if ($archiveHash -cne [string]$binding[1] -or + -not $archivePaths.Add($archivePath) -or + (Test-WagglePathsOverlap $trustedRoot $archivePath) -or + [string]::Equals( + $trustedReceipt, $archivePath, [StringComparison]::OrdinalIgnoreCase + )) { + throw 'Portable toolchain vendor archives are not the exact distinct repository-pinned handoff.' + } + foreach ($disallowedRoot in @($DisallowedRoots | Where-Object { + -not [string]::IsNullOrWhiteSpace([string]$_) + })) { + if (Test-WagglePathsOverlap $archivePath ([string]$disallowedRoot)) { + throw 'Portable toolchain vendor archive overlaps a protected signing boundary.' + } + } + $archiveLock = Open-ReadLock $archivePath + if ((Get-FileHash -LiteralPath $archivePath -Algorithm SHA256).Hash -cne + $archiveHash) { + $archiveLock.Dispose() + throw 'Portable toolchain vendor archive does not match its pinned SHA-256.' + } + $locks.Add($archiveLock) + } + + $inventory = Get-RequiredPropertyValue ` + $receipt 'inventory' 'Portable signing toolchain receipt' + $inventoryEntries = @((Get-RequiredPropertyValue ` + $inventory 'entries' 'Portable signing toolchain inventory')) + $inventoryHash = [string](Get-RequiredPropertyValue ` + $inventory 'sha256' 'Portable signing toolchain inventory') + if ($inventoryEntries.Count -ne $PortableToolchainFileCount -or + $inventoryHash -cne $PortableToolchainInventorySha256) { + throw 'Portable signing toolchain inventory does not match the repository-pinned full closure.' + } + $treeLease = Open-WaggleValidatedPrebuiltTree ` + $trustedRoot $inventory 'Portable signing toolchain full closure' ` + ($DisallowedRoots + @($trustedReceipt) + @($archivePaths)) + foreach ($treeLock in $treeLease.Locks) { $locks.Add($treeLock) } + $treeLease.Locks.Clear() + return [pscustomobject]@{ + Receipt = $receipt + ReceiptPath = $trustedReceipt + ReceiptSha256 = $ReceiptSha256.ToUpperInvariant() + Inventory = $inventory + InventorySha256 = $inventoryHash + Locks = $locks + } + } catch { + foreach ($lock in $locks) { $lock.Dispose() } + throw + } +} + +function Get-WagglePortableToolchain { + param( + [Parameter(Mandatory = $true)] [string]$Root, + [Parameter(Mandatory = $true)] [string]$Node, + [Parameter(Mandatory = $true)] [string]$Git, + [Parameter(Mandatory = $true)] [string]$SevenZip, + [Parameter(Mandatory = $true)] [string]$ReceiptPath, + [Parameter(Mandatory = $true)] [string]$ReceiptSha256, + [string[]]$DisallowedRoots = @() + ) + + $trustedRoot = Assert-PrivateDirectoryAcl $Root 'Portable signing toolchain root' + foreach ($disallowedRoot in @($DisallowedRoots | Where-Object { + -not [string]::IsNullOrWhiteSpace([string]$_) + })) { + if (Test-WagglePathsOverlap $trustedRoot ([string]$disallowedRoot)) { + throw 'Portable signing toolchain root overlaps a repository, prebuilt, receipt, or signing-temp boundary.' + } + } + + $receiptLease = Open-WagglePortableToolchainReceipt ` + $trustedRoot $ReceiptPath $ReceiptSha256 -DisallowedRoots $DisallowedRoots + $receiptLeaseTransferred = $false + try { + $rootItems = @(Get-ChildItem -LiteralPath $trustedRoot -Force -Recurse) + $rootFiles = @($rootItems | Where-Object { -not $_.PSIsContainer }) + $rootBytes = [long](($rootFiles | Measure-Object -Property Length -Sum).Sum) + if ($rootItems.Count -gt 20000 -or $rootBytes -gt 1GB) { + throw 'Portable signing toolchain root exceeds the bounded 20,000-item or 1-GiB trust envelope.' + } + foreach ($item in $rootItems) { + $linkProperty = $item.PSObject.Properties['LinkType'] + $linkType = if ($null -eq $linkProperty) { '' } else { [string]$linkProperty.Value } + if (($item.Attributes -band [IO.FileAttributes]::ReparsePoint) -ne 0 -or + -not [string]::IsNullOrEmpty($linkType)) { + throw 'Portable signing toolchain root contains a linked or reparse filesystem object.' + } + } + + $requestedTools = [ordered]@{ + Node = @($Node, 'Portable Node.js runtime') + Git = @($Git, 'Portable Git executable') + SevenZip = @($SevenZip, 'Portable 7-Zip inventory tool') + } + $trustedTools = @{} + $uniquePaths = [Collections.Generic.HashSet[string]]::new( + [StringComparer]::OrdinalIgnoreCase + ) + foreach ($entry in $requestedTools.GetEnumerator()) { + $trustedPath = Get-TrustedPath ([string]$entry.Value[0]) ([string]$entry.Value[1]) + $relativePath = Get-ContainedRelativePath $trustedPath $trustedRoot + if ([string]::IsNullOrEmpty($relativePath)) { + throw "$($entry.Value[1]) must be a regular non-reparse file contained by the private portable toolchain root." + } + if (-not $uniquePaths.Add($trustedPath)) { + throw 'Portable signing tool paths must be distinct regular files.' + } + $trustedTools[[string]$entry.Key] = $trustedPath + } + + $sevenZipDll = Get-TrustedPath ` + (Join-Path (Split-Path $trustedTools.SevenZip -Parent) '7z.dll') ` + 'Portable 7-Zip runtime library' + $sevenZipDllRelative = Get-ContainedRelativePath $sevenZipDll $trustedRoot + if ([string]::IsNullOrEmpty($sevenZipDllRelative) -or + -not $uniquePaths.Add($sevenZipDll)) { + throw 'Portable 7-Zip runtime library must be a distinct regular file contained by the private portable toolchain root.' + } + $gitRuntime = Get-TrustedPath ` + (Join-Path (Split-Path (Split-Path $trustedTools.Git -Parent) -Parent) ` + 'mingw64\bin\git.exe') ` + 'Portable Git runtime' + $gitRuntimeRelative = Get-ContainedRelativePath $gitRuntime $trustedRoot + if ([string]::IsNullOrEmpty($gitRuntimeRelative) -or + -not $uniquePaths.Add($gitRuntime)) { + throw 'Portable Git runtime must be a distinct regular file contained by the private portable toolchain root.' + } + + $trustedTools.Node = Assert-WagglePinnedToolFile ` + $trustedTools.Node 'Portable Node.js runtime' $NodeSha256 $NodePublisher + $trustedTools.Git = Assert-WagglePinnedToolFile ` + $trustedTools.Git 'Portable Git executable' $GitSha256 $GitPublisher + $gitRuntime = Assert-WagglePinnedToolFile ` + $gitRuntime 'Portable Git runtime' $GitRuntimeSha256 $GitPublisher + $trustedTools.SevenZip = Assert-WagglePinnedToolFile ` + $trustedTools.SevenZip 'Portable 7-Zip inventory tool' $SevenZipSha256 $null + $sevenZipDll = Assert-WagglePinnedToolFile ` + $sevenZipDll 'Portable 7-Zip runtime library' $SevenZipDllSha256 $null + + $result = [pscustomobject]@{ + PortableToolchainRoot = $trustedRoot + NodePath = $trustedTools.Node + GitPath = $trustedTools.Git + GitRuntimePath = $gitRuntime + SevenZipPath = $trustedTools.SevenZip + SevenZipDllPath = $sevenZipDll + ReceiptPath = $receiptLease.ReceiptPath + ReceiptSha256 = $receiptLease.ReceiptSha256 + InventorySha256 = $receiptLease.InventorySha256 + Locks = $receiptLease.Locks + } + $receiptLeaseTransferred = $true + return $result + } finally { + if (-not $receiptLeaseTransferred) { + foreach ($lock in $receiptLease.Locks) { $lock.Dispose() } + } + } +} + +function Get-WaggleSigningToolchain { + param( + [string[]]$DisallowedRoots = @(), + [switch]$AllowPortableBeforeManifest + ) + + $portableValues = [ordered]@{ + Root = [Environment]::GetEnvironmentVariable('WAGGLE_SIGNING_PORTABLE_TOOLCHAIN_ROOT') + Node = [Environment]::GetEnvironmentVariable('WAGGLE_SIGNING_PORTABLE_NODE_PATH') + Git = [Environment]::GetEnvironmentVariable('WAGGLE_SIGNING_PORTABLE_GIT_PATH') + SevenZip = [Environment]::GetEnvironmentVariable('WAGGLE_SIGNING_PORTABLE_SEVEN_ZIP_PATH') + Receipt = [Environment]::GetEnvironmentVariable('WAGGLE_SIGNING_PORTABLE_RECEIPT_PATH') + ReceiptSha256 = [Environment]::GetEnvironmentVariable('WAGGLE_SIGNING_PORTABLE_RECEIPT_SHA256') + } + $providedCount = @($portableValues.Values | Where-Object { + -not [string]::IsNullOrWhiteSpace([string]$_) + }).Count + if ($providedCount -ne 0) { + if ($providedCount -ne $portableValues.Count) { + throw 'Portable signing toolchain environment must provide the exact root, Node, Git, 7-Zip, receipt path, and receipt SHA-256.' + } + if (-not $AllowPortableBeforeManifest -and + ([Environment]::GetEnvironmentVariable('WAGGLE_SIGNING_MANIFEST_PATH') -notmatch + '^[A-Za-z]:[\\/]' -or + [Environment]::GetEnvironmentVariable('WAGGLE_SIGNING_MANIFEST_SHA256') -notmatch + '^[0-9A-Fa-f]{64}$')) { + throw 'Portable signing tools are valid only inside an active receipt-bound signing session.' + } + return Get-WagglePortableToolchain ` + $portableValues.Root $portableValues.Node $portableValues.Git ` + $portableValues.SevenZip $portableValues.Receipt ` + $portableValues.ReceiptSha256 -DisallowedRoots $DisallowedRoots + } + + $systemNode = Assert-WagglePinnedToolFile ` + $NodePath 'Node.js runtime' $NodeSha256 $NodePublisher -AllowHardLink + $systemGit = Assert-WagglePinnedToolFile ` + $GitPath 'Git executable' $GitSha256 $GitPublisher -AllowHardLink + $systemGitRuntime = Assert-WagglePinnedToolFile ` + (Join-Path (Split-Path (Split-Path $systemGit -Parent) -Parent) ` + 'mingw64\bin\git.exe') ` + 'Git runtime' $GitRuntimeSha256 $GitPublisher -AllowHardLink + $systemSevenZip = Assert-WagglePinnedToolFile ` + $SevenZipPath '7-Zip inventory tool' $SevenZipSha256 $null + $systemSevenZipDll = Assert-WagglePinnedToolFile ` + (Join-Path (Split-Path $systemSevenZip -Parent) '7z.dll') ` + '7-Zip runtime library' $SevenZipDllSha256 $null + return [pscustomobject]@{ + PortableToolchainRoot = $null + NodePath = $systemNode + GitPath = $systemGit + GitRuntimePath = $systemGitRuntime + SevenZipPath = $systemSevenZip + SevenZipDllPath = $systemSevenZipDll + ReceiptPath = $null + ReceiptSha256 = $null + InventorySha256 = $null + Locks = [Collections.Generic.List[IDisposable]]::new() + } +} + +function Assert-WagglePortableToolchainEnvironment { + param([Parameter(Mandatory = $true)] [object]$Context) + + if ($null -eq $Context.PortableToolchainRoot) { return } + foreach ($binding in @( + @('WAGGLE_SIGNING_PORTABLE_TOOLCHAIN_ROOT', $Context.PortableToolchainRoot), + @('WAGGLE_SIGNING_PORTABLE_NODE_PATH', $Context.NodePath), + @('WAGGLE_SIGNING_PORTABLE_GIT_PATH', $Context.GitPath), + @('WAGGLE_SIGNING_PORTABLE_SEVEN_ZIP_PATH', $Context.SevenZipPath), + @('WAGGLE_SIGNING_PORTABLE_RECEIPT_PATH', $Context.PortableToolchainReceiptPath) + )) { + Assert-ExactCanonicalPathValue ` + ([Environment]::GetEnvironmentVariable([string]$binding[0])) ` + ([string]$binding[1]) ([string]$binding[0]) + } + if ([Environment]::GetEnvironmentVariable('WAGGLE_SIGNING_PORTABLE_RECEIPT_SHA256') -cne + $Context.PortableToolchainReceiptSha256) { + throw 'WAGGLE_SIGNING_PORTABLE_RECEIPT_SHA256 does not match the signing session.' + } +} + +function Assert-WagglePortableSessionBootstrap { + param( + [Parameter(Mandatory = $true)] [object]$Toolchain, + [Parameter(Mandatory = $true)] [string]$RepoRoot, + [Parameter(Mandatory = $true)] [string]$TauriRoot + ) + + if ($null -eq $Toolchain.PortableToolchainRoot) { return } + $sessionId = [Environment]::GetEnvironmentVariable('WAGGLE_SIGNING_SESSION_ID') + $manifestPathValue = [Environment]::GetEnvironmentVariable('WAGGLE_SIGNING_MANIFEST_PATH') + $manifestSha256 = [Environment]::GetEnvironmentVariable('WAGGLE_SIGNING_MANIFEST_SHA256') + if ($sessionId -notmatch '^[0-9a-f]{32}$' -or + $manifestSha256 -notmatch '^[0-9A-Fa-f]{64}$') { + throw 'Portable signing callback is not inside an active receipt-bound signing session.' + } + $sessionDirectory = Assert-PrivateDirectoryAcl ` + (Join-Path $TauriRoot "target\.signing-sessions\run-$sessionId") ` + 'Portable signing callback session directory' + $expectedManifestPath = Join-Path $sessionDirectory 'manifest.json' + Assert-ExactCanonicalPathValue ` + $manifestPathValue $expectedManifestPath 'Portable signing callback manifest path' + $manifestPath = Get-TrustedPath $manifestPathValue 'Portable signing callback manifest' + $lock = Open-ReadLock $manifestPath + try { + if ((Get-FileHash -LiteralPath $manifestPath -Algorithm SHA256).Hash -cne + $manifestSha256.ToUpperInvariant()) { + throw 'Portable signing callback manifest does not match its session digest.' + } + try { + $manifest = Get-Content -Raw -LiteralPath $manifestPath | + ConvertFrom-Json -Depth 32 -DateKind String + } catch { + throw 'Portable signing callback manifest is not valid JSON.' + } + if ([int](Get-RequiredPropertyValue $manifest 'schemaVersion' 'Signing manifest') -ne 1 -or + [string](Get-RequiredPropertyValue $manifest 'mode' 'Signing manifest') -cne 'nsis' -or + [string](Get-RequiredPropertyValue $manifest 'sessionId' 'Signing manifest') -cne $sessionId) { + throw 'Portable signing callback manifest does not bind the active NSIS session.' + } + Assert-ExactCanonicalPathValue ` + ([string](Get-RequiredPropertyValue $manifest 'repoRoot' 'Signing manifest')) ` + $RepoRoot 'Portable signing callback repository root' + $sourceRevision = [string](Get-RequiredPropertyValue ` + $manifest 'sourceRevision' 'Signing manifest') + $receipt = Get-RequiredPropertyValue ` + $manifest 'buildReceipt' 'Receipt-bound signing manifest' + if ($sourceRevision -notmatch '^[0-9a-f]{40}$' -or + [int](Get-RequiredPropertyValue $receipt 'schemaVersion' 'Hosted build receipt') -ne 1 -or + [string](Get-RequiredPropertyValue $receipt 'repository' 'Hosted build receipt') -cne + 'marolinik/waggle-os' -or + [string](Get-RequiredPropertyValue $receipt 'sourceRevision' 'Hosted build receipt') -cne + $sourceRevision -or + [string](Get-RequiredPropertyValue $receipt 'targetTriple' 'Hosted build receipt') -cne + 'x86_64-pc-windows-msvc') { + throw 'Portable signing callback manifest is not bound to the approved hosted receipt.' + } + $manifestToolchain = Get-RequiredPropertyValue $manifest 'toolchain' 'Signing manifest' + foreach ($binding in @( + @('portableToolchainRoot', $Toolchain.PortableToolchainRoot), + @('nodePath', $Toolchain.NodePath), + @('gitPath', $Toolchain.GitPath), + @('gitRuntimePath', $Toolchain.GitRuntimePath), + @('sevenZipPath', $Toolchain.SevenZipPath), + @('sevenZipDllPath', $Toolchain.SevenZipDllPath), + @('portableToolchainReceiptPath', $Toolchain.ReceiptPath) + )) { + Assert-ExactCanonicalPathValue ` + ([string](Get-RequiredPropertyValue ` + $manifestToolchain ([string]$binding[0]) 'Signing manifest toolchain')) ` + ([string]$binding[1]) "Portable signing callback $($binding[0])" + } + foreach ($binding in @( + @('nodeSha256', $NodeSha256), + @('gitSha256', $GitSha256), + @('gitRuntimeSha256', $GitRuntimeSha256), + @('sevenZipSha256', $SevenZipSha256), + @('sevenZipDllSha256', $SevenZipDllSha256), + @('portableToolchainReceiptSha256', $Toolchain.ReceiptSha256), + @('portableToolchainInventorySha256', $PortableToolchainInventorySha256) + )) { + if ([string](Get-RequiredPropertyValue ` + $manifestToolchain ([string]$binding[0]) 'Signing manifest toolchain') -cne + [string]$binding[1]) { + throw "Portable signing callback $($binding[0]) is not repository-pinned." + } + } + if ([int](Get-RequiredPropertyValue ` + $manifestToolchain 'portableToolchainFileCount' 'Signing manifest toolchain') -ne + $PortableToolchainFileCount) { + throw 'Portable signing callback full closure file count is not repository-pinned.' + } + } finally { + $lock.Dispose() + } +} + +function Get-WaggleSigningContext { + param([switch]$AllowPortableBeforeManifest) + + $sessionId = [Environment]::GetEnvironmentVariable('WAGGLE_SIGNING_SESSION_ID') + if ($sessionId -notmatch '^[0-9a-f]{32}$') { + throw 'WAGGLE_SIGNING_SESSION_ID must be one lowercase 128-bit session id.' + } + $scriptPath = Get-TrustedPath $PSCommandPath 'Signing wrapper' + $appRoot = Split-Path (Split-Path $scriptPath -Parent) -Parent + $repoRoot = Get-TrustedPath (Split-Path $appRoot -Parent) 'Repository root' 'Container' + $tauriRoot = Get-TrustedPath (Join-Path $appRoot 'src-tauri') 'Tauri root' 'Container' + $resourcesRootValue = [Environment]::GetEnvironmentVariable('WAGGLE_SIGNING_RESOURCES_ROOT') + if ([string]::IsNullOrWhiteSpace($resourcesRootValue)) { + throw 'WAGGLE_SIGNING_RESOURCES_ROOT must identify the receipt-bound resource tree.' + } + $resourcesRoot = Get-TrustedPath $resourcesRootValue 'Tauri resources root' 'Container' + $cargoTargetRoot = [Environment]::GetEnvironmentVariable('CARGO_TARGET_DIR') + if ([string]::IsNullOrWhiteSpace($cargoTargetRoot)) { + throw 'CARGO_TARGET_DIR must identify the isolated signing package root.' + } + $targetRoot = Assert-PrivateDirectoryAcl $cargoTargetRoot 'Signing package target root' + $releaseRoot = Get-TrustedPath ` + (Join-Path $targetRoot 'x86_64-pc-windows-msvc\release') ` + 'Tauri release root' 'Container' + $configPath = Get-TrustedPath (Join-Path $tauriRoot 'tauri.conf.json') 'Tauri config' + $sessionDirectory = Join-Path ` + (Join-Path $tauriRoot 'target\.signing-sessions') ` + "run-$sessionId" + $overrideConfigPath = Get-TrustedPath ` + (Join-Path $sessionDirectory 'tauri.signing-override.json') ` + 'Tauri signing override config' + $tauriCliPath = Get-TrustedPath ` + (Join-Path $appRoot 'node_modules\@tauri-apps\cli\tauri.js') ` + 'Tauri CLI' + $tauriCliPackagePath = Get-TrustedPath ` + (Join-Path $appRoot 'node_modules\@tauri-apps\cli\package.json') ` + 'Tauri CLI package manifest' + $tauriCliMainPath = Get-TrustedPath ` + (Join-Path $appRoot 'node_modules\@tauri-apps\cli\main.js') ` + 'Tauri CLI main module' + $tauriCliIndexPath = Get-TrustedPath ` + (Join-Path $appRoot 'node_modules\@tauri-apps\cli\index.js') ` + 'Tauri CLI native loader' + $tauriNativePackagePath = Get-TrustedPath ` + (Join-Path $appRoot 'node_modules\@tauri-apps\cli-win32-x64-msvc\package.json') ` + 'Tauri native package manifest' + $tauriNativeBinaryPath = Get-TrustedPath ` + (Join-Path $appRoot 'node_modules\@tauri-apps\cli-win32-x64-msvc\cli.win32-x64-msvc.node') ` + 'Tauri native CLI binary' + $tauriVersion = [string]( + Get-Content -Raw -LiteralPath $tauriCliPackagePath | ConvertFrom-Json + ).version + if ($tauriVersion -cne $TauriCliVersion) { + throw "Tauri CLI must be the pinned version $TauriCliVersion." + } + $tauriNativeVersion = [string]( + Get-Content -Raw -LiteralPath $tauriNativePackagePath | ConvertFrom-Json + ).version + if ($tauriNativeVersion -cne $TauriCliVersion) { + throw "Tauri native CLI must be the pinned version $TauriCliVersion." + } + $makensisPath = Get-TrustedPath ` + (Join-Path ([Environment]::GetFolderPath('LocalApplicationData')) 'tauri\NSIS\Bin\makensis.exe') ` + 'makensis' + $nsisRoot = Get-TrustedPath ` + (Split-Path (Split-Path $makensisPath -Parent) -Parent) ` + 'NSIS compiler root' 'Container' + $toolchain = Get-WaggleSigningToolchain ` + -DisallowedRoots @( + $repoRoot, $targetRoot, $resourcesRoot, + [Environment]::GetEnvironmentVariable('TEMP'), + [Environment]::GetEnvironmentVariable('WAGGLE_SIGNING_MANIFEST_PATH') + ) ` + -AllowPortableBeforeManifest:$AllowPortableBeforeManifest + if (-not $AllowPortableBeforeManifest) { + Assert-WagglePortableSessionBootstrap $toolchain $repoRoot $tauriRoot + } + $git = $toolchain.GitPath + $gitLock = Open-ReadLock $git + try { + if ((Get-FileHash -LiteralPath $git -Algorithm SHA256).Hash -cne $GitSha256) { + throw 'Git executable does not match the pinned SHA-256 digest.' + } + $sourceRevision = [string](& $git -C $repoRoot rev-parse --verify HEAD) + if ($LASTEXITCODE -ne 0 -or $sourceRevision -notmatch '^[0-9a-f]{40}$') { + throw 'Could not resolve the exact repository source revision.' + } + $status = @(& $git -C $repoRoot status --porcelain=v1 --untracked-files=all) + if ($LASTEXITCODE -ne 0 -or $status.Count -ne 0) { + throw 'Signing requires a clean exact repository revision.' + } + } finally { + $gitLock.Dispose() + } + + return [pscustomobject]@{ + RepoRoot = $repoRoot + AppRoot = $appRoot + TauriRoot = $tauriRoot + ResourcesRoot = $resourcesRoot + TargetRoot = $targetRoot + ReleaseRoot = $releaseRoot + ConfigPath = $configPath + OverrideConfigPath = $overrideConfigPath + WrapperPath = $scriptPath + TauriCliPath = $tauriCliPath + TauriCliPackagePath = $tauriCliPackagePath + TauriCliMainPath = $tauriCliMainPath + TauriCliIndexPath = $tauriCliIndexPath + TauriNativePackagePath = $tauriNativePackagePath + TauriNativeBinaryPath = $tauriNativeBinaryPath + MakensisPath = $makensisPath + NsisRoot = $nsisRoot + GitPath = $git + GitRuntimePath = $toolchain.GitRuntimePath + PortableToolchainRoot = $toolchain.PortableToolchainRoot + PortableToolchainReceiptPath = $toolchain.ReceiptPath + PortableToolchainReceiptSha256 = $toolchain.ReceiptSha256 + PortableToolchainInventorySha256 = $toolchain.InventorySha256 + PortableToolchainLocks = $toolchain.Locks + SignToolPath = Get-TrustedPath $SignToolPath 'SignTool' -AllowHardLink + ArtifactSigningPackagePath = Get-TrustedPath ` + (Join-Path $tauriRoot 'target\.artifact-signing-tools\Microsoft.ArtifactSigning.Client.1.0.128.nupkg') ` + 'Artifact Signing package' + NodePath = $toolchain.NodePath + SevenZipPath = $toolchain.SevenZipPath + SevenZipDllPath = $toolchain.SevenZipDllPath + SourceRevision = $sourceRevision + TauriCliVersion = $TauriCliVersion + TauriCliSha256 = $TauriCliSha256 + TauriCliPackageSha256 = $TauriCliPackageSha256 + TauriCliMainSha256 = $TauriCliMainSha256 + TauriCliIndexSha256 = $TauriCliIndexSha256 + TauriNativePackageSha256 = $TauriNativePackageSha256 + TauriNativeBinarySha256 = $TauriNativeBinarySha256 + MakensisSha256 = $MakensisSha256 + NsisClosureSha256 = $NsisClosureSha256 + GitSha256 = $GitSha256 + GitRuntimeSha256 = $GitRuntimeSha256 + NodeSha256 = $NodeSha256 + SevenZipSha256 = $SevenZipSha256 + SevenZipDllSha256 = $SevenZipDllSha256 + SignToolSha256 = $SignToolSha256 + ArtifactSigningPackageSha256 = $ArtifactSigningPackageSha256 + ArtifactSigningX64ManifestSha256 = $ArtifactSigningX64ManifestSha256 + } +} + +function Get-ExpectedNsisFixedPaths { + param( + [Parameter(Mandatory = $true)] [object]$Context, + [Parameter(Mandatory = $true)] [string]$Version + ) + + return @( + Join-Path $Context.ReleaseRoot 'waggle.exe' + Join-Path $Context.ResourcesRoot 'native\vec0.dll' + Join-Path $Context.ResourcesRoot 'native\onnxruntime\onnxruntime.dll' + Join-Path $Context.ResourcesRoot 'node_modules\@img\sharp-win32-x64\lib\libvips-42.dll' + Join-Path $Context.ResourcesRoot 'node_modules\@img\sharp-win32-x64\lib\libvips-cpp-8.18.3.dll' + Join-Path $Context.ResourcesRoot 'node_modules\onnxruntime-node\bin\napi-v3\win32\x64\onnxruntime.dll' + Join-Path $Context.ResourcesRoot 'node_modules\sqlite-vec-windows-x64\vec0.dll' + Join-Path $Context.ReleaseRoot 'nsis\x64\Plugins\x86-unicode\NSISdl.dll' + Join-Path $Context.ReleaseRoot 'nsis\x64\Plugins\x86-unicode\StartMenu.dll' + Join-Path $Context.ReleaseRoot 'nsis\x64\Plugins\x86-unicode\System.dll' + Join-Path $Context.ReleaseRoot 'nsis\x64\Plugins\x86-unicode\nsDialogs.dll' + Join-Path $Context.ReleaseRoot 'nsis\x64\Plugins\x86-unicode\additional\nsis_tauri_utils.dll' + ) | ForEach-Object { [IO.Path]::GetFullPath($_) } +} + +function Get-ExpectedNsisPackagedPaths { + return @( + 'waggle.exe' + 'resources\native\vec0.dll' + 'resources\native\onnxruntime\onnxruntime.dll' + 'resources\node_modules\@img\sharp-win32-x64\lib\libvips-42.dll' + 'resources\node_modules\@img\sharp-win32-x64\lib\libvips-cpp-8.18.3.dll' + 'resources\node_modules\onnxruntime-node\bin\napi-v3\win32\x64\onnxruntime.dll' + 'resources\node_modules\sqlite-vec-windows-x64\vec0.dll' + '$PLUGINSDIR\NSISdl.dll' + '$PLUGINSDIR\StartMenu.dll' + '$PLUGINSDIR\System.dll' + '$PLUGINSDIR\nsDialogs.dll' + '$PLUGINSDIR\nsis_tauri_utils.dll' + ) +} + +function Add-ValidatedSessionFileLock { + param( + [Parameter(Mandatory = $true)] [Collections.Generic.List[IDisposable]]$Locks, + [Parameter(Mandatory = $true)] [string]$Path, + [Parameter(Mandatory = $true)] [string]$ExpectedSha256, + [Parameter(Mandatory = $true)] [string]$Label, + [switch]$AllowHardLink + ) + + if ($ExpectedSha256 -notmatch '^[0-9A-Fa-f]{64}$') { + throw "$Label manifest SHA-256 is invalid." + } + $trustedPath = Get-TrustedPath $Path $Label -AllowHardLink:$AllowHardLink + $lock = Open-ReadLock $trustedPath + try { + if (-not [string]::Equals( + (Get-FileHash -LiteralPath $trustedPath -Algorithm SHA256).Hash, + $ExpectedSha256, + [StringComparison]::OrdinalIgnoreCase + )) { + throw "$Label does not match the signing manifest SHA-256 digest." + } + $Locks.Add($lock) + $lock = $null + } finally { + if ($null -ne $lock) { $lock.Dispose() } + } + return $trustedPath +} + +function Assert-WaggleSigningOverrideContract { + param( + [Parameter(Mandatory = $true)] [string]$Path, + [Parameter(Mandatory = $true)] [string]$WrapperPath, + [AllowNull()] [string]$ResourcesRoot = $null, + [switch]$Unsigned + ) + try { + $override = Get-Content -Raw -LiteralPath $Path | ConvertFrom-Json -Depth 16 + } catch { + throw 'Tauri signing override is not valid JSON.' + } + $targets = @((Get-RequiredPropertyValue ` + (Get-RequiredPropertyValue $override 'bundle' 'Tauri signing override') ` + 'targets' 'Tauri signing override bundle')) + $bundle = $override.bundle + $windows = Get-RequiredPropertyValue $bundle 'windows' 'Tauri signing override bundle' + $signCommand = $windows.PSObject.Properties['signCommand'] + $expectedArgs = @( + '-NoLogo', '-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', + '-File', $WrapperPath, '-ArtifactPath', '%1' + ) + if ([bool](Get-RequiredPropertyValue $bundle 'active' 'Tauri signing override bundle') -ne $true -or + $targets.Count -ne 1 -or [string]$targets[0] -cne 'nsis' -or + [string](Get-RequiredPropertyValue ` + (Get-RequiredPropertyValue $override 'build' 'Tauri signing override') ` + 'beforeBuildCommand' 'Tauri signing override build') -cne '' -or + [string](Get-RequiredPropertyValue ` + (Get-RequiredPropertyValue $override 'build' 'Tauri signing override') ` + 'beforeBundleCommand' 'Tauri signing override build') -cne '' -or + $null -ne $windows.PSObject.Properties['certificateThumbprint'] -or + $null -ne $windows.PSObject.Properties['timestampUrl']) { + throw 'Tauri signing override must be the exact fail-closed NSIS-only callback contract.' + } + if (-not [string]::IsNullOrWhiteSpace($ResourcesRoot)) { + $resourceMap = Get-RequiredPropertyValue ` + $bundle 'resources' 'Tauri signing override bundle' + $resourceEntries = @($resourceMap.PSObject.Properties) + $trustedResourcesRoot = Get-TrustedPath ` + $ResourcesRoot 'Tauri signing override resource root' 'Container' + if ($resourceEntries.Count -ne 1 -or + -not [string]::Equals( + [IO.Path]::GetFullPath([string]$resourceEntries[0].Name), + $trustedResourcesRoot, + [StringComparison]::OrdinalIgnoreCase + ) -or + [string]$resourceEntries[0].Value -cne 'resources') { + throw 'Tauri signing override must map the exact receipt-bound resource tree.' + } + } elseif ($null -ne $bundle.PSObject.Properties['resources']) { + throw 'Tauri signing override unexpectedly contains an unbound resource map.' + } + if ($Unsigned) { + if ($null -ne $signCommand) { + throw 'Unsigned Tauri override cannot contain a signing callback.' + } + return + } + if ($null -eq $signCommand) { + throw 'Signed Tauri override must contain the signing callback.' + } + $actualCommand = $signCommand.Value + $actualArgs = @((Get-RequiredPropertyValue ` + $actualCommand 'args' 'Tauri signing override signCommand')) + if ([string](Get-RequiredPropertyValue ` + $actualCommand 'cmd' 'Tauri signing override signCommand') -cne + $SystemPowerShellPath -or + $actualArgs.Count -ne $expectedArgs.Count -or + [string]::Join("`n", $actualArgs) -cne [string]::Join("`n", $expectedArgs)) { + throw 'Tauri signing override must be the exact fail-closed NSIS-only callback contract.' + } +} + +function Get-WaggleSigningSession { + param([Parameter(Mandatory = $true)] [object]$Context) + + Assert-WagglePortableToolchainEnvironment $Context + $manifestPathValue = [Environment]::GetEnvironmentVariable('WAGGLE_SIGNING_MANIFEST_PATH') + $manifestSha256 = [Environment]::GetEnvironmentVariable('WAGGLE_SIGNING_MANIFEST_SHA256') + $sessionId = [Environment]::GetEnvironmentVariable('WAGGLE_SIGNING_SESSION_ID') + if ([string]::IsNullOrWhiteSpace($manifestPathValue)) { + throw 'WAGGLE_SIGNING_MANIFEST_PATH is required for production signing.' + } + if ($manifestSha256 -notmatch '^[0-9A-Fa-f]{64}$') { + throw 'WAGGLE_SIGNING_MANIFEST_SHA256 must be one exact SHA-256 digest.' + } + if ($sessionId -notmatch '^[0-9a-f]{32}$') { + throw 'WAGGLE_SIGNING_SESSION_ID must be one lowercase 128-bit session id.' + } + + $sessionDirectory = Join-Path ` + (Join-Path $Context.TauriRoot 'target\.signing-sessions') ` + "run-$sessionId" + $expectedManifestPath = Join-Path $sessionDirectory 'manifest.json' + Assert-ExactCanonicalPathValue ` + $manifestPathValue $expectedManifestPath 'Signing manifest path' + $sessionDirectory = Assert-PrivateDirectoryAcl $sessionDirectory 'Signing session directory' + $manifestPath = Get-TrustedPath $manifestPathValue 'Signing manifest' + + $locks = [Collections.Generic.List[IDisposable]]::new() + $portableLocksProperty = $Context.PSObject.Properties['PortableToolchainLocks'] + if ($null -ne $portableLocksProperty -and $null -ne $portableLocksProperty.Value) { + foreach ($portableLock in @($portableLocksProperty.Value)) { + $locks.Add($portableLock) + } + $portableLocksProperty.Value.Clear() + } + try { + $manifestLock = Open-ReadLock $manifestPath + $locks.Add($manifestLock) + if (-not [string]::Equals( + (Get-FileHash -LiteralPath $manifestPath -Algorithm SHA256).Hash, + $manifestSha256, + [StringComparison]::OrdinalIgnoreCase + )) { + throw 'Signing manifest does not match WAGGLE_SIGNING_MANIFEST_SHA256.' + } + try { + $manifest = Get-Content -Raw -LiteralPath $manifestPath | + ConvertFrom-Json -Depth 32 -DateKind String + } catch { + throw 'Signing manifest is not valid JSON.' + } + + if ([int](Get-RequiredPropertyValue $manifest 'schemaVersion' 'Signing manifest') -ne 1) { + throw 'Signing manifest schemaVersion must be 1.' + } + if ([string](Get-RequiredPropertyValue $manifest 'mode' 'Signing manifest') -cne 'nsis') { + throw 'Production signing is NSIS-only.' + } + if ([string](Get-RequiredPropertyValue $manifest 'sessionId' 'Signing manifest') -cne $sessionId) { + throw 'Signing manifest session id does not match WAGGLE_SIGNING_SESSION_ID.' + } + if ([string](Get-RequiredPropertyValue $manifest 'sourceRevision' 'Signing manifest') -cne + [string]$Context.SourceRevision) { + throw 'Signing manifest source revision does not match the clean repository HEAD.' + } + if ($null -ne $Context.PortableToolchainRoot) { + $buildReceipt = Get-RequiredPropertyValue ` + $manifest 'buildReceipt' 'Receipt-bound signing manifest' + if ([int](Get-RequiredPropertyValue $buildReceipt 'schemaVersion' 'Hosted build receipt') -ne 1 -or + [string](Get-RequiredPropertyValue $buildReceipt 'repository' 'Hosted build receipt') -cne + 'marolinik/waggle-os' -or + [string](Get-RequiredPropertyValue $buildReceipt 'sourceRevision' 'Hosted build receipt') -cne + [string]$Context.SourceRevision -or + [string](Get-RequiredPropertyValue $buildReceipt 'targetTriple' 'Hosted build receipt') -cne + 'x86_64-pc-windows-msvc') { + throw 'Portable signing callback is not bound to the approved hosted build receipt.' + } + } + + $createdAt = [DateTimeOffset]::MinValue + $expiresAt = [DateTimeOffset]::MinValue + if (-not [DateTimeOffset]::TryParseExact( + [string](Get-RequiredPropertyValue $manifest 'createdAtUtc' 'Signing manifest'), + 'O', + [Globalization.CultureInfo]::InvariantCulture, + [Globalization.DateTimeStyles]::AssumeUniversal, + [ref]$createdAt + ) -or + -not [DateTimeOffset]::TryParseExact( + [string](Get-RequiredPropertyValue $manifest 'expiresAtUtc' 'Signing manifest'), + 'O', + [Globalization.CultureInfo]::InvariantCulture, + [Globalization.DateTimeStyles]::AssumeUniversal, + [ref]$expiresAt + )) { + throw 'Signing manifest timestamps must use the round-trip UTC format.' + } + $now = [DateTimeOffset]::UtcNow + if ($createdAt -gt $now.AddMinutes(5) -or + $expiresAt -le $now -or + $expiresAt -le $createdAt -or + $expiresAt -gt $createdAt.AddHours(4)) { + throw 'Signing manifest is expired or outside the four-hour signing window.' + } + + Assert-ExactCanonicalPathValue ` + ([string](Get-RequiredPropertyValue $manifest 'repoRoot' 'Signing manifest')) ` + $Context.RepoRoot 'Signing manifest repository root' + Assert-ExactCanonicalPathValue ` + ([string](Get-RequiredPropertyValue $manifest 'tauriRoot' 'Signing manifest')) ` + $Context.TauriRoot 'Signing manifest Tauri root' + Assert-ExactCanonicalPathValue ` + ([string](Get-RequiredPropertyValue $manifest 'releaseRoot' 'Signing manifest')) ` + $Context.ReleaseRoot 'Signing manifest release root' + Assert-ExactCanonicalPathValue ` + ([string](Get-RequiredPropertyValue $manifest 'resourcesRoot' 'Signing manifest')) ` + $Context.ResourcesRoot 'Signing manifest resources root' + Assert-ExactCanonicalPathValue ` + ([string](Get-RequiredPropertyValue $manifest 'targetRoot' 'Signing manifest')) ` + $Context.TargetRoot 'Signing manifest target root' + + $expectedTempRoot = Join-Path ` + (Join-Path $Context.TauriRoot 'target\.signing-temp') ` + "run-$sessionId" + $tempRootValue = [string](Get-RequiredPropertyValue $manifest 'tempRoot' 'Signing manifest') + Assert-ExactCanonicalPathValue $tempRootValue $expectedTempRoot 'Signing manifest session temp root' + $tempRoot = Assert-PrivateDirectoryAcl $tempRootValue 'Signing session temp root' + foreach ($name in @('TEMP', 'TMP', 'WAGGLE_NSIS_SIGNING_TEMP_ROOT')) { + $environmentPath = [Environment]::GetEnvironmentVariable($name) + if ([string]::IsNullOrWhiteSpace($environmentPath)) { + throw "$name must identify the signing session temp root." + } + Assert-ExactCanonicalPathValue $environmentPath $tempRoot "$name path" + } + + $expectedLedgerPath = Join-Path $sessionDirectory 'callback-ledger.json' + $ledgerPathValue = [string](Get-RequiredPropertyValue $manifest 'ledgerPath' 'Signing manifest') + Assert-ExactCanonicalPathValue $ledgerPathValue $expectedLedgerPath 'Signing callback ledger path' + $ledgerPath = Get-TrustedPath $ledgerPathValue 'Signing callback ledger' + + $config = Get-Content -Raw -LiteralPath $Context.ConfigPath | ConvertFrom-Json + $version = [string]$config.version + if ($version -notmatch '^\d+\.\d+\.\d+$' -or + [string](Get-RequiredPropertyValue $manifest 'appVersion' 'Signing manifest') -cne $version) { + throw 'Signing manifest app version does not match tauri.conf.json.' + } + + $toolchain = Get-RequiredPropertyValue $manifest 'toolchain' 'Signing manifest' + $toolBindings = @( + @('wrapperPath', 'wrapperSha256', $Context.WrapperPath, $null, 'Signing wrapper', $false), + @('tauriConfigPath', 'tauriConfigSha256', $Context.ConfigPath, $null, 'Tauri config', $false), + @('tauriOverrideConfigPath', 'tauriOverrideConfigSha256', $Context.OverrideConfigPath, $null, 'Tauri signing override config', $false), + @('tauriCliPath', 'tauriCliSha256', $Context.TauriCliPath, $Context.TauriCliSha256, 'Tauri CLI', $false), + @('tauriCliPackagePath', 'tauriCliPackageSha256', $Context.TauriCliPackagePath, $Context.TauriCliPackageSha256, 'Tauri CLI package manifest', $false), + @('tauriCliMainPath', 'tauriCliMainSha256', $Context.TauriCliMainPath, $Context.TauriCliMainSha256, 'Tauri CLI main module', $false), + @('tauriCliIndexPath', 'tauriCliIndexSha256', $Context.TauriCliIndexPath, $Context.TauriCliIndexSha256, 'Tauri CLI native loader', $false), + @('tauriNativePackagePath', 'tauriNativePackageSha256', $Context.TauriNativePackagePath, $Context.TauriNativePackageSha256, 'Tauri native package manifest', $false), + @('tauriNativeBinaryPath', 'tauriNativeBinarySha256', $Context.TauriNativeBinaryPath, $Context.TauriNativeBinarySha256, 'Tauri native CLI binary', $false), + @('makensisPath', 'makensisSha256', $Context.MakensisPath, $Context.MakensisSha256, 'makensis', $false), + @('gitPath', 'gitSha256', $Context.GitPath, $Context.GitSha256, 'Git executable', $true), + @('gitRuntimePath', 'gitRuntimeSha256', $Context.GitRuntimePath, $Context.GitRuntimeSha256, 'Git runtime', $true), + @('nodePath', 'nodeSha256', $Context.NodePath, $Context.NodeSha256, 'Node.js runtime', $true), + @('sevenZipPath', 'sevenZipSha256', $Context.SevenZipPath, $Context.SevenZipSha256, '7-Zip inventory tool', $false), + @('signToolPath', 'signToolSha256', $Context.SignToolPath, $Context.SignToolSha256, 'SignTool', $true), + @('artifactSigningPackagePath', 'artifactSigningPackageSha256', $Context.ArtifactSigningPackagePath, $Context.ArtifactSigningPackageSha256, 'Artifact Signing package', $false) + ) + foreach ($binding in $toolBindings) { + $manifestToolPath = [string](Get-RequiredPropertyValue $toolchain $binding[0] 'Signing manifest toolchain') + $manifestToolHash = [string](Get-RequiredPropertyValue $toolchain $binding[1] 'Signing manifest toolchain') + Assert-ExactCanonicalPathValue $manifestToolPath ([string]$binding[2]) "$($binding[4]) path" + if ($null -ne $binding[3] -and $manifestToolHash -cne [string]$binding[3]) { + throw "$($binding[4]) manifest SHA-256 is not the repository-pinned digest." + } + Add-ValidatedSessionFileLock ` + $locks ([string]$binding[2]) $manifestToolHash ([string]$binding[4]) ` + -AllowHardLink:([bool]$binding[5]) | Out-Null + } + if ($null -ne $Context.PortableToolchainRoot) { + Assert-ExactCanonicalPathValue ` + ([string](Get-RequiredPropertyValue ` + $toolchain 'portableToolchainRoot' 'Signing manifest toolchain')) ` + $Context.PortableToolchainRoot 'Portable signing toolchain root' + $sevenZipDllPath = [string](Get-RequiredPropertyValue ` + $toolchain 'sevenZipDllPath' 'Signing manifest toolchain') + $sevenZipDllHash = [string](Get-RequiredPropertyValue ` + $toolchain 'sevenZipDllSha256' 'Signing manifest toolchain') + Assert-ExactCanonicalPathValue ` + $sevenZipDllPath $Context.SevenZipDllPath '7-Zip runtime library path' + if ($sevenZipDllHash -cne $Context.SevenZipDllSha256) { + throw '7-Zip runtime library manifest SHA-256 is not the repository-pinned digest.' + } + Add-ValidatedSessionFileLock ` + $locks $Context.SevenZipDllPath $sevenZipDllHash ` + '7-Zip runtime library' | Out-Null + Assert-ExactCanonicalPathValue ` + ([string](Get-RequiredPropertyValue ` + $toolchain 'portableToolchainReceiptPath' 'Signing manifest toolchain')) ` + $Context.PortableToolchainReceiptPath ` + 'Portable signing toolchain receipt path' + if ([string](Get-RequiredPropertyValue ` + $toolchain 'portableToolchainReceiptSha256' 'Signing manifest toolchain') -cne + $Context.PortableToolchainReceiptSha256 -or + [string](Get-RequiredPropertyValue ` + $toolchain 'portableToolchainInventorySha256' 'Signing manifest toolchain') -cne + $PortableToolchainInventorySha256 -or + [int](Get-RequiredPropertyValue ` + $toolchain 'portableToolchainFileCount' 'Signing manifest toolchain') -ne + $PortableToolchainFileCount) { + throw 'Portable signing toolchain manifest does not bind the repository-pinned full closure.' + } + } + if ([string](Get-RequiredPropertyValue $toolchain 'tauriCliVersion' 'Signing manifest toolchain') -cne + [string]$Context.TauriCliVersion) { + throw 'Signing manifest Tauri CLI version is not the repository-pinned version.' + } + if ([string](Get-RequiredPropertyValue $toolchain 'artifactSigningX64ManifestSha256' 'Signing manifest toolchain') -cne + [string]$Context.ArtifactSigningX64ManifestSha256) { + throw 'Signing manifest Artifact Signing x64 closure digest is not repository-pinned.' + } + Assert-WaggleSigningOverrideContract ` + $Context.OverrideConfigPath $Context.WrapperPath $Context.ResourcesRoot + + $payloads = @((Get-RequiredPropertyValue $manifest 'payloads' 'Signing manifest')) + $uniquePayloadPaths = [Collections.Generic.HashSet[string]]::new([StringComparer]::OrdinalIgnoreCase) + foreach ($payload in $payloads) { + $payloadPath = [string](Get-RequiredPropertyValue $payload 'path' 'Signing manifest payload') + $payloadHash = [string](Get-RequiredPropertyValue $payload 'sha256' 'Signing manifest payload') + $payloadSize = [long](Get-RequiredPropertyValue $payload 'size' 'Signing manifest payload') + if ([string]::IsNullOrWhiteSpace($payloadPath) -or + -not $uniquePayloadPaths.Add($payloadPath) -or + $payloadHash -notmatch '^[0-9A-Fa-f]{64}$' -or $payloadSize -lt 0) { + throw 'Signing manifest NSIS payload digest inventory is invalid.' + } + } + if ($payloads.Count -lt 10 -or -not $uniquePayloadPaths.Contains('waggle.exe')) { + throw 'Signing manifest NSIS payload inventory is invalid or incomplete.' + } + + $expectedFixedPaths = @(Get-ExpectedNsisFixedPaths $Context $version) + $expectedPackagedPaths = @(Get-ExpectedNsisPackagedPaths) + $expectedFixedSet = [Collections.Generic.HashSet[string]]::new( + [StringComparer]::OrdinalIgnoreCase + ) + foreach ($expectedPath in $expectedFixedPaths) { [void]$expectedFixedSet.Add($expectedPath) } + $seenFixedSet = [Collections.Generic.HashSet[string]]::new( + [StringComparer]::OrdinalIgnoreCase + ) + $seenIds = [Collections.Generic.HashSet[string]]::new([StringComparer]::Ordinal) + $seenOrders = [Collections.Generic.HashSet[int]]::new() + $slots = @((Get-RequiredPropertyValue $manifest 'slots' 'Signing manifest')) + if ($slots.Count -ne 14) { + throw 'NSIS-only signing manifest must contain exactly 14 callback slots.' + } + $uninstallerSlots = 0 + $installerSlots = 0 + foreach ($slot in $slots) { + $slotId = [string](Get-RequiredPropertyValue $slot 'id' 'Signing manifest slot') + $slotKind = [string](Get-RequiredPropertyValue $slot 'kind' 'Signing manifest slot') + $slotOrder = [int](Get-RequiredPropertyValue $slot 'order' 'Signing manifest slot') + $maxUses = [int](Get-RequiredPropertyValue $slot 'maxUses' 'Signing manifest slot') + if ($slotId -notmatch '^[a-z0-9][a-z0-9-]{2,63}$' -or + -not $seenIds.Add($slotId) -or + -not $seenOrders.Add($slotOrder) -or + $slotOrder -lt 1 -or + $slotOrder -gt $slots.Count -or + $maxUses -ne 1) { + throw 'Signing manifest callback slots must have unique ids, consecutive orders, and maxUses 1.' + } + switch ($slotKind) { + 'fixed' { + $slotPath = [string](Get-RequiredPropertyValue $slot 'path' 'Fixed signing slot') + $slotHash = [string](Get-RequiredPropertyValue $slot 'preSignSha256' 'Fixed signing slot') + $packagedPath = [string](Get-RequiredPropertyValue $slot 'packagedPath' 'Fixed signing slot') + if ($slotHash -notmatch '^[0-9A-Fa-f]{64}$' -or + -not $expectedFixedSet.Contains([IO.Path]::GetFullPath($slotPath)) -or + -not $seenFixedSet.Add([IO.Path]::GetFullPath($slotPath)) -or + $slotOrder -gt $expectedPackagedPaths.Count -or + $packagedPath -cne $expectedPackagedPaths[$slotOrder - 1]) { + throw 'Fixed signing slot is outside the exact NSIS-only callback manifest.' + } + } + 'generated-nsis-uninstaller' { + $uninstallerSlots++ + $expectedEvidencePath = Join-Path $sessionDirectory 'signed-evidence\13-nsis-uninstaller.exe' + if ([string](Get-RequiredPropertyValue $slot 'pathPattern' 'NSIS uninstaller slot') -cne + $NsisUninstallerPattern -or $slotOrder -ne ($slots.Count - 1)) { + throw 'NSIS uninstaller slot must be the one-time penultimate session lease.' + } + Assert-ExactCanonicalPathValue ` + ([string](Get-RequiredPropertyValue $slot 'evidencePath' 'NSIS uninstaller slot')) ` + $expectedEvidencePath 'NSIS uninstaller evidence path' + } + 'generated-nsis-installer' { + $installerSlots++ + $expectedInstaller = Join-Path ` + $Context.ReleaseRoot ` + "bundle\nsis\Waggle_${version}_x64-setup.exe" + Assert-ExactCanonicalPathValue ` + ([string](Get-RequiredPropertyValue $slot 'path' 'NSIS installer slot')) ` + $expectedInstaller 'NSIS installer slot path' + if ($slotOrder -ne $slots.Count) { + throw 'NSIS installer slot must be the final callback lease.' + } + } + default { throw 'Production signing manifest contains a non-NSIS callback slot.' } + } + } + if ($seenFixedSet.Count -ne $expectedFixedSet.Count -or + $uninstallerSlots -ne 1 -or $installerSlots -ne 1 -or + [int](@($slots | Where-Object { $_.order -eq 1 })[0].order) -ne 1 -or + -not [string]::Equals( + [string](@($slots | Where-Object { $_.order -eq 1 })[0].path), + [string]$expectedFixedPaths[0], + [StringComparison]::OrdinalIgnoreCase + )) { + throw 'Signing manifest does not cover the exact ordered NSIS callback surface.' + } + + $session = [pscustomobject]@{ + Id = $sessionId + Manifest = $manifest + ManifestSha256 = $manifestSha256.ToUpperInvariant() + ManifestPath = $manifestPath + SessionDirectory = $sessionDirectory + TempRoot = $tempRoot + LedgerPath = $ledgerPath + Context = $Context + Locks = $locks + } + $ledger = Get-Content -Raw -LiteralPath $ledgerPath | + ConvertFrom-Json -Depth 32 -DateKind String + Assert-WaggleSigningLedgerState $session $ledger + return $session + } catch { + foreach ($lock in $locks) { $lock.Dispose() } + throw + } +} + +function Assert-WaggleSigningLedgerState { + param( + [Parameter(Mandatory = $true)] [object]$Session, + [Parameter(Mandatory = $true)] [object]$Ledger + ) + + if ([int](Get-RequiredPropertyValue $Ledger 'schemaVersion' 'Signing callback ledger') -ne 3 -or + [string](Get-RequiredPropertyValue $Ledger 'sessionId' 'Signing callback ledger') -cne + [string]$Session.Id -or + -not [string]::Equals( + [string](Get-RequiredPropertyValue $Ledger 'manifestSha256' 'Signing callback ledger'), + [string]$Session.ManifestSha256, + [StringComparison]::OrdinalIgnoreCase + ) -or + [string](Get-RequiredPropertyValue $Ledger 'state' 'Signing callback ledger') -notin + @('open', 'failed', 'sealed')) { + throw 'Signing callback ledger does not belong to the active manifest session.' + } + foreach ($field in @('terminalAtUtc', 'terminalReceiptSha256')) { + if ($null -eq $Ledger.PSObject.Properties[$field]) { + throw "Signing callback ledger is missing required property '$field'." + } + } + $ledgerState = [string]$Ledger.state + if ($ledgerState -ceq 'open') { + if ($null -ne $Ledger.terminalAtUtc -or $null -ne $Ledger.terminalReceiptSha256) { + throw 'An open signing callback ledger cannot contain terminal metadata.' + } + } else { + $terminalAt = [DateTimeOffset]::MinValue + if (-not [DateTimeOffset]::TryParseExact( + [string]$Ledger.terminalAtUtc, + 'O', + [Globalization.CultureInfo]::InvariantCulture, + [Globalization.DateTimeStyles]::AssumeUniversal, + [ref]$terminalAt + ) -or [string]$Ledger.terminalReceiptSha256 -notmatch '^[0-9A-Fa-f]{64}$') { + throw 'Terminal signing callback ledger metadata is invalid.' + } + } + + $manifestSlots = @($Session.Manifest.slots) + $entries = @((Get-RequiredPropertyValue $Ledger 'entries' 'Signing callback ledger')) + if ($entries.Count -ne $manifestSlots.Count -or $entries.Count -ne 14) { + throw 'Signing callback ledger must predeclare the exact 14-slot manifest roster.' + } + + $reservedCount = 0 + $failedCount = 0 + for ($index = 0; $index -lt $manifestSlots.Count; $index++) { + $slot = $manifestSlots[$index] + $entry = $entries[$index] + $slotId = [string](Get-RequiredPropertyValue $slot 'id' 'Signing manifest slot') + $slotKind = [string](Get-RequiredPropertyValue $slot 'kind' 'Signing manifest slot') + $slotOrder = [int](Get-RequiredPropertyValue $slot 'order' 'Signing manifest slot') + if ([string](Get-RequiredPropertyValue $entry 'slotId' 'Signing callback ledger entry') -cne + $slotId -or + [string](Get-RequiredPropertyValue $entry 'kind' 'Signing callback ledger entry') -cne + $slotKind -or + [int](Get-RequiredPropertyValue $entry 'order' 'Signing callback ledger entry') -ne + $slotOrder -or $slotOrder -ne ($index + 1)) { + throw 'Signing callback ledger roster does not exactly match the ordered manifest slots.' + } + + foreach ($field in @( + 'reservationId', 'path', 'preSignSha256', 'reservedAtUtc', + 'completedAtUtc', 'postSignSha256', 'signerSubject' + )) { + if ($null -eq $entry.PSObject.Properties[$field]) { + throw "Signing callback ledger entry is missing required property '$field'." + } + } + $status = [string](Get-RequiredPropertyValue $entry 'status' 'Signing callback ledger entry') + $attempts = [int](Get-RequiredPropertyValue $entry 'attempts' 'Signing callback ledger entry') + + if ($status -ceq 'pending') { + if ($attempts -ne 0 -or @( + 'reservationId', 'path', 'preSignSha256', 'reservedAtUtc', + 'completedAtUtc', 'postSignSha256', 'signerSubject' | + Where-Object { $null -ne $entry.PSObject.Properties[$_].Value } + ).Count -ne 0) { + throw 'Pending signing callback ledger entries must be pristine and unused.' + } + continue + } + + if ($status -notin @('reserved', 'completed', 'failed') -or $attempts -ne 1 -or + [string]$entry.reservationId -notmatch '^[0-9a-f]{32}$' -or + [string]$entry.preSignSha256 -notmatch '^[0-9A-Fa-f]{64}$' -or + [string]::IsNullOrWhiteSpace([string]$entry.path)) { + throw 'Consumed signing callback ledger entry has invalid reservation metadata.' + } + $entryPath = [IO.Path]::GetFullPath([string]$entry.path) + if ($slotKind -ceq 'generated-nsis-uninstaller') { + $relative = Get-ContainedRelativePath $entryPath $Session.TempRoot + if ($null -eq $relative -or $relative -match '[\\/]' -or + $relative -cnotmatch $NsisUninstallerPattern) { + throw 'Signing callback ledger contains an invalid NSIS uninstaller path.' + } + } else { + Assert-ExactCanonicalPathValue ` + $entryPath ([string](Get-RequiredPropertyValue $slot 'path' 'Signing manifest slot')) ` + 'Signing callback ledger artifact path' + } + if ($slotKind -ceq 'fixed' -and -not [string]::Equals( + [string]$entry.preSignSha256, + [string](Get-RequiredPropertyValue $slot 'preSignSha256' 'Fixed signing slot'), + [StringComparison]::OrdinalIgnoreCase + )) { + throw 'Signing callback ledger fixed artifact hash does not match the manifest.' + } + + $reservedAt = [DateTimeOffset]::MinValue + if (-not [DateTimeOffset]::TryParseExact( + [string]$entry.reservedAtUtc, + 'O', + [Globalization.CultureInfo]::InvariantCulture, + [Globalization.DateTimeStyles]::AssumeUniversal, + [ref]$reservedAt + )) { + throw 'Signing callback reservation timestamp is invalid.' + } + + if ($status -ceq 'reserved') { + if ($ledgerState -cne 'open') { + throw 'Only an open signing callback ledger may contain a reservation.' + } + $reservedCount++ + if ($reservedCount -ne 1 -or @( + 'completedAtUtc', 'postSignSha256', 'signerSubject' | + Where-Object { $null -ne $entry.PSObject.Properties[$_].Value } + ).Count -ne 0) { + throw 'Reserved signing callback ledger entry has invalid completion metadata.' + } + continue + } + + if ($status -ceq 'failed') { + if ($ledgerState -cne 'failed') { + throw 'Only a failed signing callback ledger may contain a failed entry.' + } + $failedCount++ + if ($failedCount -ne 1 -or @( + 'completedAtUtc', 'postSignSha256', 'signerSubject' | + Where-Object { $null -ne $entry.PSObject.Properties[$_].Value } + ).Count -ne 0) { + throw 'Failed signing callback ledger entry has invalid completion metadata.' + } + continue + } + + $completedAt = [DateTimeOffset]::MinValue + if (-not [DateTimeOffset]::TryParseExact( + [string]$entry.completedAtUtc, + 'O', + [Globalization.CultureInfo]::InvariantCulture, + [Globalization.DateTimeStyles]::AssumeUniversal, + [ref]$completedAt + ) -or $completedAt -lt $reservedAt -or + [string]$entry.postSignSha256 -notmatch '^[0-9A-Fa-f]{64}$' -or + [string]::IsNullOrWhiteSpace([string]$entry.signerSubject)) { + throw 'Completed signing callback ledger entry has invalid completion metadata.' + } + } + if ($ledgerState -ceq 'open' -and $failedCount -ne 0) { + throw 'An open signing callback ledger cannot contain a failed entry.' + } + if ($ledgerState -ceq 'failed' -and $reservedCount -ne 0) { + throw 'A failed signing callback ledger cannot retain a reservation.' + } + if ($ledgerState -ceq 'sealed' -and + @($entries | Where-Object { [string]$_.status -cne 'completed' }).Count -ne 0) { + throw 'A sealed signing callback ledger must contain only completed entries.' + } + if ($reservedCount -gt 1) { + throw 'Signing callback ledger contains multiple reservations.' + } + if ($ledgerState -ceq 'open') { + $incompletePhases = @($entries | Where-Object { + [string]$_.status -cne 'completed' + } | ForEach-Object { Get-WaggleSigningSlotPhase ([int]$_.order) }) + $firstIncompletePhase = if ($incompletePhases.Count -eq 0) { + 6 + } else { + ($incompletePhases | Measure-Object -Minimum).Minimum + } + if (@($entries | Where-Object { + (Get-WaggleSigningSlotPhase ([int]$_.order)) -gt $firstIncompletePhase -and + [string]$_.status -ne 'pending' + }).Count -ne 0) { + throw 'Signing callback ledger crossed an incomplete NSIS signing phase.' + } + } +} + +function Write-WaggleLedgerAtomicNoLock { + param( + [Parameter(Mandatory = $true)] [object]$Session, + [Parameter(Mandatory = $true)] [object]$Ledger + ) + + $tempLedgerPath = $null + $backupLedgerPath = $null + try { + $ledgerPath = Get-TrustedPath $Session.LedgerPath 'Signing callback ledger' + Assert-ExactCanonicalPathValue ` + $ledgerPath (Join-Path $Session.SessionDirectory 'callback-ledger.json') ` + 'Signing callback ledger path' + Assert-WaggleSigningLedgerState $Session $ledger + $json = $ledger | ConvertTo-Json -Depth 32 -Compress + $tempLedgerPath = Join-Path ` + $Session.SessionDirectory ` + "callback-ledger.$([Guid]::NewGuid().ToString('N')).tmp" + $backupLedgerPath = Join-Path ` + $Session.SessionDirectory ` + "callback-ledger.$([Guid]::NewGuid().ToString('N')).bak" + $bytes = [Text.UTF8Encoding]::new($false).GetBytes($json) + $stream = [IO.FileStream]::new( + $tempLedgerPath, + [IO.FileMode]::CreateNew, + [IO.FileAccess]::Write, + [IO.FileShare]::None, + 4096, + [IO.FileOptions]::WriteThrough + ) + try { + $stream.Write($bytes, 0, $bytes.Length) + $stream.Flush($true) + } finally { + $stream.Dispose() + } + [IO.File]::Replace($tempLedgerPath, $ledgerPath, $backupLedgerPath, $true) + $tempLedgerPath = $null + try { [IO.File]::Delete($backupLedgerPath) } catch { } + $backupLedgerPath = $null + } finally { + if ($null -ne $tempLedgerPath -and (Test-Path -LiteralPath $tempLedgerPath -PathType Leaf)) { + try { [IO.File]::Delete($tempLedgerPath) } catch { } + } + if ($null -ne $backupLedgerPath -and (Test-Path -LiteralPath $backupLedgerPath -PathType Leaf)) { + try { [IO.File]::Delete($backupLedgerPath) } catch { } + } + } +} + +function Invoke-WaggleLedgerMutation { + param( + [Parameter(Mandatory = $true)] [object]$Session, + [Parameter(Mandatory = $true)] [scriptblock]$Mutation, + [switch]$AllowTerminalReceipt + ) + + $mutex = [Threading.Mutex]::new($false, "Local\WaggleSigning-$($Session.Id)") + $hasMutex = $false + try { + try { + $hasMutex = $mutex.WaitOne([TimeSpan]::FromSeconds(30)) + } catch [Threading.AbandonedMutexException] { + $hasMutex = $true + } + if (-not $hasMutex) { throw 'Timed out waiting for the signing callback ledger.' } + + $ledgerPath = Get-TrustedPath $Session.LedgerPath 'Signing callback ledger' + try { + $ledger = Get-Content -Raw -LiteralPath $ledgerPath | + ConvertFrom-Json -Depth 32 -DateKind String + } catch { + throw 'Signing callback ledger is not valid JSON.' + } + Assert-WaggleSigningLedgerState $Session $ledger + if ([string]$ledger.state -cne 'open') { + throw 'Signing callback ledger is already terminal.' + } + if (-not $AllowTerminalReceipt -and @( + @('terminal-intent.json', 'provenance-receipt.json', 'failure-receipt.json') | + Where-Object { Test-Path -LiteralPath (Join-Path $Session.SessionDirectory $_) } + ).Count -ne 0) { + throw 'Signing callback ledger has a pending terminal receipt.' + } + + $mutationResult = & $Mutation $ledger + Write-WaggleLedgerAtomicNoLock $Session $ledger + return $mutationResult + } finally { + if ($hasMutex) { $mutex.ReleaseMutex() } + $mutex.Dispose() + } +} + +function Reserve-WaggleSigningCallback { + param( + [Parameter(Mandatory = $true)] [object]$Session, + [Parameter(Mandatory = $true)] [string]$ArtifactPath + ) + + $artifact = Get-TrustedPath $ArtifactPath 'Signing callback artifact' -AllowHardLink + $matches = @($Session.Manifest.slots | Where-Object { + if ([string]$_.kind -ceq 'generated-nsis-uninstaller') { + $relative = Get-ContainedRelativePath $artifact $Session.TempRoot + return $null -ne $relative -and + $relative -notmatch '[\\/]' -and $relative -cmatch $NsisUninstallerPattern + } + $pathProperty = $_.PSObject.Properties['path'] + return $null -ne $pathProperty -and [string]::Equals( + [IO.Path]::GetFullPath([string]$pathProperty.Value), + $artifact, + [StringComparison]::OrdinalIgnoreCase + ) + }) + if ($matches.Count -ne 1) { + throw 'Signing callback artifact does not match exactly one manifest slot.' + } + $slot = $matches[0] + $preSignHash = (Get-FileHash -LiteralPath $artifact -Algorithm SHA256).Hash + if ([string]$slot.kind -ceq 'fixed' -and + -not [string]::Equals( + $preSignHash, + [string]$slot.preSignSha256, + [StringComparison]::OrdinalIgnoreCase + )) { + throw 'Signing callback artifact does not match the manifest pre-sign SHA-256 digest.' + } + + if (@(@('terminal-intent.json', 'provenance-receipt.json', 'failure-receipt.json') | Where-Object { + Test-Path -LiteralPath (Join-Path $Session.SessionDirectory $_) + }).Count -ne 0) { + throw 'Signing provenance receipt already exists.' + } + Invoke-WaggleLedgerMutation $Session { + param($ledger) + + $entries = @($ledger.entries) + $entry = $entries[[int]$slot.order - 1] + if ([string]$entry.status -cne 'pending' -or [int]$entry.attempts -ne 0) { + throw 'Signing callback slot was already consumed.' + } + $slotPhase = Get-WaggleSigningSlotPhase ([int]$slot.order) + if (@($entries | Where-Object { [string]$_.status -ceq 'reserved' }).Count -ne 0 -or + @($entries | Where-Object { + (Get-WaggleSigningSlotPhase ([int]$_.order)) -lt $slotPhase -and + [string]$_.status -cne 'completed' + }).Count -ne 0) { + throw 'Signing callback phase does not match the manifest ledger.' + } + $entry.status = 'reserved' + $entry.attempts = 1 + $entry.reservationId = [Guid]::NewGuid().ToString('N') + $entry.path = $artifact + $entry.preSignSha256 = $preSignHash + $entry.reservedAtUtc = [DateTimeOffset]::UtcNow.ToString('O') + return [pscustomobject][ordered]@{ + reservationId = [string]$entry.reservationId + slotId = [string]$entry.slotId + order = [int]$entry.order + kind = [string]$entry.kind + path = [string]$entry.path + preSignSha256 = [string]$entry.preSignSha256 + } + } +} + +function Complete-WaggleSigningCallback { + param( + [Parameter(Mandatory = $true)] [object]$Session, + [Parameter(Mandatory = $true)] [object]$Reservation, + [Parameter(Mandatory = $true)] [string]$SignedArtifactPath + ) + + $artifact = Get-TrustedPath $SignedArtifactPath 'Signed callback artifact' + $postSignHash = (Get-FileHash -LiteralPath $artifact -Algorithm SHA256).Hash + $signature = Get-AuthenticodeSignature -LiteralPath $artifact + $signerSubject = if ($null -eq $signature.SignerCertificate) { + $null + } else { + [string]$signature.SignerCertificate.Subject + } + Invoke-WaggleLedgerMutation $Session { + param($ledger) + + $entries = @($ledger.entries) + $matchingEntries = @($entries | Where-Object { + [string]$_.slotId -ceq [string]$Reservation.slotId + }) + if ($matchingEntries.Count -ne 1 -or + [string]$matchingEntries[0].status -cne 'reserved' -or + [string]$matchingEntries[0].reservationId -cne [string]$Reservation.reservationId -or + [int]$matchingEntries[0].order -ne [int]$Reservation.order -or + [string]$matchingEntries[0].kind -cne [string]$Reservation.kind -or + -not [string]::Equals( + [string]$matchingEntries[0].path, + [string]$Reservation.path, + [StringComparison]::OrdinalIgnoreCase + ) -or + -not [string]::Equals( + [IO.Path]::GetFullPath([string]$matchingEntries[0].path), + $artifact, + [StringComparison]::OrdinalIgnoreCase + ) -or + -not [string]::Equals( + [string]$matchingEntries[0].preSignSha256, + [string]$Reservation.preSignSha256, + [StringComparison]::OrdinalIgnoreCase + )) { + throw 'Signing callback reservation is missing or already completed.' + } + $matchingEntries[0].status = 'completed' + $matchingEntries[0].completedAtUtc = [DateTimeOffset]::UtcNow.ToString('O') + $matchingEntries[0].postSignSha256 = $postSignHash + $matchingEntries[0].signerSubject = $signerSubject + return $matchingEntries[0] + } +} + +function Write-WaggleDurableJsonNew { + param( + [Parameter(Mandatory = $true)] [string]$Path, + [Parameter(Mandatory = $true)] [object]$Value + ) + $bytes = [Text.UTF8Encoding]::new($false).GetBytes( + ($Value | ConvertTo-Json -Depth 32 -Compress) + ) + $stream = [IO.FileStream]::new( + $Path, + [IO.FileMode]::CreateNew, + [IO.FileAccess]::Write, + [IO.FileShare]::None, + 4096, + [IO.FileOptions]::WriteThrough + ) + try { + $stream.Write($bytes, 0, $bytes.Length) + $stream.Flush($true) + } finally { + $stream.Dispose() + } +} + +function Assert-WaggleTerminalReceipt { + param( + [Parameter(Mandatory = $true)] [object]$Session, + [Parameter(Mandatory = $true)] [ValidateSet('failed', 'sealed')] [string]$State, + [Parameter(Mandatory = $true)] [object]$Receipt + ) + + if ([int](Get-RequiredPropertyValue $Receipt 'schemaVersion' 'Signing terminal receipt') -ne 1 -or + [string](Get-RequiredPropertyValue $Receipt 'status' 'Signing terminal receipt') -cne $State -or + [string](Get-RequiredPropertyValue $Receipt 'sessionId' 'Signing terminal receipt') -cne + [string]$Session.Id -or + -not [string]::Equals( + [string](Get-RequiredPropertyValue $Receipt 'manifestSha256' 'Signing terminal receipt'), + [string]$Session.ManifestSha256, + [StringComparison]::OrdinalIgnoreCase + )) { + throw 'Signing terminal receipt does not belong to the active session.' + } + $terminalAtUtc = [string](Get-RequiredPropertyValue ` + $Receipt 'terminalAtUtc' 'Signing terminal receipt') + $terminalAt = [DateTimeOffset]::MinValue + if (-not [DateTimeOffset]::TryParseExact( + $terminalAtUtc, + 'O', + [Globalization.CultureInfo]::InvariantCulture, + [Globalization.DateTimeStyles]::AssumeUniversal, + [ref]$terminalAt + )) { + throw 'Signing terminal receipt has an invalid terminal timestamp.' + } + $sourceRevision = [string](Get-RequiredPropertyValue ` + $Receipt 'sourceRevision' 'Signing terminal receipt') + if ($sourceRevision -cne [string]$Session.Context.SourceRevision) { + throw 'Signing terminal receipt does not match the active source revision.' + } + if ($State -ceq 'failed') { + foreach ($name in @('failureCode', 'failureMessage', 'rollbackOutcome')) { + if ([string]::IsNullOrWhiteSpace([string](Get-RequiredPropertyValue ` + $Receipt $name 'Signing failure receipt'))) { + throw 'Signing failure receipt has incomplete failure provenance.' + } + } + if ($null -eq $Receipt.PSObject.Properties['failedSlotId']) { + throw 'Signing failure receipt is missing its failed-slot provenance.' + } + } else { + foreach ($name in @( + 'manifestPath', 'callbackLedgerPath', 'installerPath', + 'installerSha256', 'signerSubject', 'payloadManifestSha256', 'artifactBindings' + )) { + [void](Get-RequiredPropertyValue $Receipt $name 'Signing provenance receipt') + } + Assert-ExactCanonicalPathValue ` + ([string]$Receipt.manifestPath) ([string]$Session.ManifestPath) ` + 'Signing provenance manifest path' + Assert-ExactCanonicalPathValue ` + ([string]$Receipt.callbackLedgerPath) ([string]$Session.LedgerPath) ` + 'Signing provenance callback ledger path' + $installerSlots = @($Session.Manifest.slots | Where-Object { + [string]$_.kind -ceq 'generated-nsis-installer' + }) + if ($installerSlots.Count -ne 1) { + throw 'Signing provenance session lacks one exact installer slot.' + } + Assert-ExactCanonicalPathValue ` + ([string]$Receipt.installerPath) ([string]$installerSlots[0].path) ` + 'Signing provenance installer path' + if ([string]$Receipt.installerSha256 -notmatch '^[0-9A-Fa-f]{64}$' -or + [string]$Receipt.payloadManifestSha256 -notmatch '^[0-9A-Fa-f]{64}$' -or + [string]::IsNullOrWhiteSpace([string]$Receipt.signerSubject) -or + @($Receipt.artifactBindings).Count -lt 2) { + throw 'Signing provenance receipt has invalid artifact provenance.' + } + } + return $terminalAtUtc +} + +function Get-WaggleTerminalIntentPath { + param([Parameter(Mandatory = $true)] [object]$Session) + return Join-Path $Session.SessionDirectory 'terminal-intent.json' +} + +function Assert-WaggleTerminalIntent { + param( + [Parameter(Mandatory = $true)] [object]$Session, + [Parameter(Mandatory = $true)] [ValidateSet('failed', 'sealed')] [string]$State, + [Parameter(Mandatory = $true)] [object]$Intent + ) + if ([int](Get-RequiredPropertyValue $Intent 'schemaVersion' 'Signing terminal intent') -ne 1 -or + [string](Get-RequiredPropertyValue $Intent 'state' 'Signing terminal intent') -cne $State -or + [string](Get-RequiredPropertyValue $Intent 'sessionId' 'Signing terminal intent') -cne + [string]$Session.Id -or + -not [string]::Equals( + [string](Get-RequiredPropertyValue $Intent 'manifestSha256' 'Signing terminal intent'), + [string]$Session.ManifestSha256, + [StringComparison]::OrdinalIgnoreCase + ) -or + [string](Get-RequiredPropertyValue ` + $Intent 'receiptSha256' 'Signing terminal intent') -notmatch '^[0-9A-Fa-f]{64}$') { + throw 'Signing terminal intent does not belong to the active session.' + } + $terminalAtUtc = [string](Get-RequiredPropertyValue ` + $Intent 'terminalAtUtc' 'Signing terminal intent') + $terminalAt = [DateTimeOffset]::MinValue + if (-not [DateTimeOffset]::TryParseExact( + $terminalAtUtc, + 'O', + [Globalization.CultureInfo]::InvariantCulture, + [Globalization.DateTimeStyles]::AssumeUniversal, + [ref]$terminalAt + )) { + throw 'Signing terminal intent has an invalid terminal timestamp.' + } + return $terminalAtUtc +} + +function Set-WaggleSigningTerminalState { + param( + [Parameter(Mandatory = $true)] [object]$Session, + [Parameter(Mandatory = $true)] [ValidateSet('failed', 'sealed')] [string]$State, + [Parameter(Mandatory = $true)] [object]$Receipt, + [Parameter(Mandatory = $true)] [scriptblock]$LedgerMutation + ) + + $mutex = [Threading.Mutex]::new($false, "Local\WaggleSigning-$($Session.Id)") + $hasMutex = $false + $temporaryReceipt = $null + $temporaryIntent = $null + $receiptLock = $null + $intentLock = $null + try { + try { + $hasMutex = $mutex.WaitOne([TimeSpan]::FromSeconds(30)) + } catch [Threading.AbandonedMutexException] { + $hasMutex = $true + } + if (-not $hasMutex) { + throw 'Timed out waiting to terminalize the signing session.' + } + + $fileName = if ($State -ceq 'sealed') { + 'provenance-receipt.json' + } else { + 'failure-receipt.json' + } + $receiptPath = Join-Path $Session.SessionDirectory $fileName + $oppositeFileName = if ($State -ceq 'sealed') { + 'failure-receipt.json' + } else { + 'provenance-receipt.json' + } + $oppositePath = Join-Path $Session.SessionDirectory $oppositeFileName + if (Test-Path -LiteralPath $oppositePath) { + throw 'Signing session already contains the opposite terminal receipt.' + } + $intentPath = Get-WaggleTerminalIntentPath $Session + + $ledgerPath = Get-TrustedPath $Session.LedgerPath 'Signing callback ledger' + try { + $currentLedger = Get-Content -Raw -LiteralPath $ledgerPath | + ConvertFrom-Json -Depth 32 -DateKind String + } catch { + throw 'Signing callback ledger is not valid JSON.' + } + Assert-WaggleSigningLedgerState $Session $currentLedger + if ([string]$currentLedger.state -notin @('open', $State)) { + throw 'Signing session is already in a different terminal state.' + } + + if ([string]$currentLedger.state -ceq 'open') { + & $LedgerMutation $currentLedger + } + + if (Test-Path -LiteralPath $receiptPath) { + $trustedReceiptPath = Get-TrustedPath $receiptPath 'Signing terminal receipt' + $receiptLock = Open-ReadLock $trustedReceiptPath + try { + $persistedReceipt = Get-Content -Raw -LiteralPath $trustedReceiptPath | + ConvertFrom-Json -Depth 32 -DateKind String + } catch { + throw 'Signing terminal receipt is not valid JSON.' + } + $terminalAtUtc = Assert-WaggleTerminalReceipt ` + $Session $State $persistedReceipt + [void](Assert-WaggleTerminalReceipt $Session $State $Receipt) + $candidateReceipt = $Receipt | ConvertTo-Json -Depth 32 | + ConvertFrom-Json -Depth 32 -DateKind String + $candidateReceipt.terminalAtUtc = $terminalAtUtc + if (($candidateReceipt | ConvertTo-Json -Depth 32 -Compress) -cne + ($persistedReceipt | ConvertTo-Json -Depth 32 -Compress)) { + throw 'Signing terminal receipt does not match the current terminalization candidate.' + } + $receiptHash = (Get-FileHash -LiteralPath $trustedReceiptPath -Algorithm SHA256).Hash + if (-not (Test-Path -LiteralPath $intentPath -PathType Leaf)) { + throw 'Signing terminal receipt exists without its durable terminal intent.' + } + $trustedIntentPath = Get-TrustedPath $intentPath 'Signing terminal intent' + $intentLock = Open-ReadLock $trustedIntentPath + try { + $intent = Get-Content -Raw -LiteralPath $trustedIntentPath | + ConvertFrom-Json -Depth 16 -DateKind String + } catch { + throw 'Signing terminal intent is not valid JSON.' + } + $intentTerminalAtUtc = Assert-WaggleTerminalIntent $Session $State $intent + if ($intentTerminalAtUtc -cne $terminalAtUtc -or + -not [string]::Equals( + [string]$intent.receiptSha256, + $receiptHash, + [StringComparison]::OrdinalIgnoreCase + )) { + throw 'Signing terminal receipt does not match its durable terminal intent.' + } + } else { + $terminalAtUtc = Assert-WaggleTerminalReceipt $Session $State $Receipt + $candidateReceipt = $Receipt | ConvertTo-Json -Depth 32 | + ConvertFrom-Json -Depth 32 -DateKind String + if (Test-Path -LiteralPath $intentPath) { + $trustedIntentPath = Get-TrustedPath $intentPath 'Signing terminal intent' + $intentLock = Open-ReadLock $trustedIntentPath + try { + $intent = Get-Content -Raw -LiteralPath $trustedIntentPath | + ConvertFrom-Json -Depth 16 -DateKind String + } catch { + throw 'Signing terminal intent is not valid JSON.' + } + $terminalAtUtc = Assert-WaggleTerminalIntent $Session $State $intent + $candidateReceipt.terminalAtUtc = $terminalAtUtc + } + $temporaryReceipt = Join-Path ` + $Session.SessionDirectory "$fileName.$([Guid]::NewGuid().ToString('N')).tmp" + Write-WaggleDurableJsonNew $temporaryReceipt $candidateReceipt + $trustedTemporaryReceipt = Get-TrustedPath ` + $temporaryReceipt 'Staged signing terminal receipt' + $persistedReceipt = Get-Content -Raw -LiteralPath $trustedTemporaryReceipt | + ConvertFrom-Json -Depth 32 -DateKind String + $terminalAtUtc = Assert-WaggleTerminalReceipt ` + $Session $State $persistedReceipt + $receiptHash = (Get-FileHash -LiteralPath $trustedTemporaryReceipt -Algorithm SHA256).Hash + if ($null -ne $intentLock) { + if (-not [string]::Equals( + [string]$intent.receiptSha256, + $receiptHash, + [StringComparison]::OrdinalIgnoreCase + )) { + throw 'Signing terminalization candidate does not match its durable terminal intent.' + } + } else { + $intent = [pscustomobject][ordered]@{ + schemaVersion = 1 + state = $State + sessionId = $Session.Id + manifestSha256 = $Session.ManifestSha256 + terminalAtUtc = $terminalAtUtc + receiptSha256 = $receiptHash + } + $temporaryIntent = Join-Path ` + $Session.SessionDirectory "terminal-intent.$([Guid]::NewGuid().ToString('N')).tmp" + Write-WaggleDurableJsonNew $temporaryIntent $intent + [void](Assert-WaggleTerminalIntent $Session $State ( + Get-Content -Raw -LiteralPath $temporaryIntent | + ConvertFrom-Json -Depth 16 -DateKind String + )) + [IO.File]::Move($temporaryIntent, $intentPath) + $temporaryIntent = $null + $trustedIntentPath = Get-TrustedPath $intentPath 'Signing terminal intent' + $intentLock = Open-ReadLock $trustedIntentPath + try { + $persistedIntent = Get-Content -Raw -LiteralPath $trustedIntentPath | + ConvertFrom-Json -Depth 16 -DateKind String + } catch { + throw 'Signing terminal intent is not valid JSON.' + } + $persistedIntentTerminalAtUtc = Assert-WaggleTerminalIntent ` + $Session $State $persistedIntent + if ($persistedIntentTerminalAtUtc -cne $terminalAtUtc -or + -not [string]::Equals( + [string]$persistedIntent.receiptSha256, + $receiptHash, + [StringComparison]::OrdinalIgnoreCase + )) { + throw 'Published signing terminal intent does not match its staged receipt.' + } + } + } + + if ([string]$currentLedger.state -ceq $State) { + if (-not [string]::Equals( + [string]$currentLedger.terminalReceiptSha256, + $receiptHash, + [StringComparison]::OrdinalIgnoreCase + ) -or [string]$currentLedger.terminalAtUtc -cne $terminalAtUtc) { + throw 'Terminal ledger does not match its durable receipt.' + } + return $receiptPath + } + + $currentLedger.state = $State + $currentLedger.terminalAtUtc = $terminalAtUtc + $currentLedger.terminalReceiptSha256 = $receiptHash + Assert-WaggleSigningLedgerState $Session $currentLedger + if ($null -ne $temporaryReceipt) { + [IO.File]::Move($temporaryReceipt, $receiptPath) + $temporaryReceipt = $null + $trustedReceiptPath = Get-TrustedPath $receiptPath 'Signing terminal receipt' + $receiptLock = Open-ReadLock $trustedReceiptPath + if (-not [string]::Equals( + (Get-FileHash -LiteralPath $trustedReceiptPath -Algorithm SHA256).Hash, + $receiptHash, + [StringComparison]::OrdinalIgnoreCase + )) { + throw 'Published signing terminal receipt does not match its durable terminal intent.' + } + } + Write-WaggleLedgerAtomicNoLock $Session $currentLedger + return Get-TrustedPath $receiptPath 'Signing terminal receipt' + } finally { + if ($null -ne $temporaryReceipt -and + (Test-Path -LiteralPath $temporaryReceipt -PathType Leaf)) { + try { [IO.File]::Delete($temporaryReceipt) } catch { } + } + if ($null -ne $temporaryIntent -and + (Test-Path -LiteralPath $temporaryIntent -PathType Leaf)) { + try { [IO.File]::Delete($temporaryIntent) } catch { } + } + if ($null -ne $receiptLock) { $receiptLock.Dispose() } + if ($null -ne $intentLock) { $intentLock.Dispose() } + if ($hasMutex) { $mutex.ReleaseMutex() } + $mutex.Dispose() + } +} + +function Publish-WaggleTerminalReceipt { + param( + [Parameter(Mandatory = $true)] [object]$Session, + [Parameter(Mandatory = $true)] [ValidateSet('failed', 'sealed')] [string]$State, + [Parameter(Mandatory = $true)] [object]$Receipt, + [Parameter(Mandatory = $true)] [scriptblock]$LedgerMutation + ) + + return Set-WaggleSigningTerminalState ` + -Session $Session -State $State -Receipt $Receipt ` + -LedgerMutation $LedgerMutation +} + +function Fail-WaggleSigningSession { + param( + [Parameter(Mandatory = $true)] [object]$Session, + [AllowNull()] [object]$Reservation, + [Parameter(Mandatory = $true)] [string]$FailureCode, + [Parameter(Mandatory = $true)] [string]$FailureMessage, + [string]$RollbackOutcome = 'not-required' + ) + + $ledger = Get-Content -Raw -LiteralPath $Session.LedgerPath | + ConvertFrom-Json -Depth 32 -DateKind String + Assert-WaggleSigningLedgerState $Session $ledger + if ([string]$ledger.state -ceq 'failed') { + $persistedReceiptPath = Join-Path $Session.SessionDirectory 'failure-receipt.json' + try { + $persistedReceipt = Get-Content -Raw -LiteralPath $persistedReceiptPath | + ConvertFrom-Json -Depth 32 -DateKind String + } catch { + throw 'Signing failure receipt is not valid JSON.' + } + return Publish-WaggleTerminalReceipt $Session 'failed' $persistedReceipt { param($_) } + } + if ([string]$ledger.state -cne 'open') { + throw 'A sealed signing session cannot be marked failed.' + } + $reserved = @($ledger.entries | Where-Object { [string]$_.status -ceq 'reserved' }) + if ($reserved.Count -gt 1) { throw 'Signing ledger contains multiple reservations.' } + $failedSlot = $null + if ($null -ne $Reservation) { + $reserved = @($reserved | Where-Object { + [string]$_.reservationId -ceq [string]$Reservation.reservationId + }) + if ($reserved.Count -ne 1) { + throw 'Signing failure does not match the active reservation.' + } + $failedSlot = [string]$reserved[0].slotId + } elseif ($reserved.Count -eq 1) { + $failedSlot = [string]$reserved[0].slotId + } + $terminalAt = [DateTimeOffset]::UtcNow.ToString('O') + $receipt = [pscustomobject][ordered]@{ + schemaVersion = 1 + status = 'failed' + sessionId = $Session.Id + sourceRevision = $Session.Context.SourceRevision + manifestPath = $Session.ManifestPath + manifestSha256 = $Session.ManifestSha256 + failureCode = $FailureCode + failureMessage = $FailureMessage + failedSlotId = $failedSlot + rollbackOutcome = $RollbackOutcome + terminalAtUtc = $terminalAt + } + return Publish-WaggleTerminalReceipt $Session 'failed' $receipt { + param($activeLedger) + $activeReserved = @($activeLedger.entries | Where-Object { [string]$_.status -ceq 'reserved' }) + if ($null -ne $failedSlot) { + $activeReserved = @($activeReserved | Where-Object { [string]$_.slotId -ceq $failedSlot }) + if ($activeReserved.Count -ne 1) { + throw 'Signing failure reservation changed before terminalization.' + } + $activeReserved[0].status = 'failed' + } elseif ($activeReserved.Count -ne 0) { + throw 'Signing failure receipt omitted an active reservation.' + } + } +} + +function Expand-PinnedArtifactSigningPackage { + param( + [Parameter(Mandatory = $true)] [string]$PackagePath, + [Parameter(Mandatory = $true)] [string]$StagingRoot + ) + + $package = Get-TrustedPath $PackagePath 'Artifact Signing package' + $packageLock = Open-ReadLock $package + try { + if ((Get-FileHash -LiteralPath $package -Algorithm SHA256).Hash -cne + $ArtifactSigningPackageSha256) { + throw 'Artifact Signing package does not match the pinned SHA-256 digest.' + } + $stagedPackage = Join-Path $StagingRoot 'Microsoft.ArtifactSigning.Client.1.0.128.nupkg' + [IO.File]::Copy($package, $stagedPackage, $false) + if ((Get-FileHash -LiteralPath $stagedPackage -Algorithm SHA256).Hash -cne + $ArtifactSigningPackageSha256) { + throw 'Staged Artifact Signing package differs from the pinned package.' + } + } finally { + $packageLock.Dispose() + } + + $toolRoot = New-PrivateDirectory (Join-Path $StagingRoot 'artifact-signing-client') + Add-Type -AssemblyName System.IO.Compression.FileSystem + [IO.Compression.ZipFile]::ExtractToDirectory($stagedPackage, $toolRoot) + $x64Root = Get-TrustedPath (Join-Path $toolRoot 'bin\x64') 'Artifact Signing x64 root' 'Container' + $toolFiles = @(Get-ChildItem -LiteralPath $x64Root -Force) + if ($toolFiles.Count -ne 41 -or @($toolFiles | Where-Object { -not $_.PSIsContainer }).Count -ne 41) { + throw 'Artifact Signing x64 toolset does not match the pinned 41-file closure.' + } + $manifestLines = @( + $toolFiles | + Sort-Object Name | + ForEach-Object { + "{0} {1}" -f (Get-FileHash -LiteralPath $_.FullName -Algorithm SHA256).Hash, $_.Name + } + ) + $manifestBytes = [Text.Encoding]::UTF8.GetBytes(($manifestLines -join "`n") + "`n") + $manifestHash = [Convert]::ToHexString( + [Security.Cryptography.SHA256]::HashData($manifestBytes) + ) + if ($manifestHash -cne $ArtifactSigningX64ManifestSha256) { + throw 'Artifact Signing x64 dependency manifest does not match the pinned digest.' + } + + $dlib = Get-TrustedPath ` + (Join-Path $x64Root 'Azure.CodeSigning.Dlib.dll') ` + 'Azure Artifact Signing dlib' + if ([string](Get-Item -LiteralPath $dlib).VersionInfo.FileVersion -cne $ArtifactSigningClientVersion) { + throw "Azure Artifact Signing dlib must be version $ArtifactSigningClientVersion x64." + } + Assert-MicrosoftAuthenticodeFile $dlib 'Azure Artifact Signing dlib' $ArtifactSigningDlibSha256 + + $locks = [Collections.Generic.List[IDisposable]]::new() + try { + foreach ($toolFile in $toolFiles) { + $trustedToolFile = Get-TrustedPath $toolFile.FullName 'Artifact Signing dependency' + $locks.Add((Open-ReadLock $trustedToolFile)) + } + } catch { + foreach ($lock in $locks) { $lock.Dispose() } + throw + } + return [pscustomobject]@{ + Dlib = $dlib + Locks = $locks + } +} + +function Assert-DotNet8X64Runtime { + $dotnet = Get-TrustedPath 'C:\Program Files\dotnet\dotnet.exe' '.NET host' -AllowHardLink + Assert-MicrosoftAuthenticodeFile $dotnet '.NET host' $null $DotNetPublisher + $dotnetLock = Open-ReadLock $dotnet + try { + $runtimes = @(& $dotnet --list-runtimes) + if ($LASTEXITCODE -ne 0 -or + -not ($runtimes -match '^Microsoft\.NETCore\.App 8\.\d+\.\d+ \[')) { + throw 'Artifact Signing requires an installed x64 .NET 8 runtime.' + } + } finally { + $dotnetLock.Dispose() + } +} + +function Get-SystemFsutilPath { + return Get-TrustedPath ` + 'C:\Windows\System32\fsutil.exe' 'fsutil' -AllowHardLink +} + +function Get-HardLinkPaths { + param([Parameter(Mandatory = $true)] [string]$Path) + + $fsutil = Get-SystemFsutilPath + $fsutilLock = Open-ReadLock $fsutil + try { + Assert-MicrosoftAuthenticodeFile ` + $fsutil 'fsutil' $null $MicrosoftWindowsPublisher -AllowCatalog + $rawLinks = @(& $fsutil hardlink list $Path) + if ($LASTEXITCODE -ne 0 -or $rawLinks.Count -lt 2) { + throw 'Could not enumerate the complete hard-link set for the signing artifact.' + } + } finally { + $fsutilLock.Dispose() + } + + $volumeRoot = [IO.Path]::GetPathRoot($Path) + $links = foreach ($rawLink in $rawLinks) { + $volumeRelative = [string]$rawLink + if ($volumeRelative -notmatch '^\\[^\\]') { + throw 'fsutil returned an invalid hard-link path.' + } + $absolutePath = $volumeRoot.TrimEnd('\') + $volumeRelative + Get-TrustedPath $absolutePath 'Hard-link sibling' -AllowHardLink + } + return @($links | Sort-Object -Unique) +} + +function Assert-ApprovedHardLinkTopology { + param( + [Parameter(Mandatory = $true)] [string]$Path, + [Parameter(Mandatory = $true)] [string]$ReleaseRoot, + [switch]$AllowDetachedMain + ) + + $expectedMain = [IO.Path]::GetFullPath((Join-Path $ReleaseRoot 'waggle.exe')) + $expectedDependency = [IO.Path]::GetFullPath((Join-Path $ReleaseRoot 'deps\waggle.exe')) + $isMain = [string]::Equals($Path, $expectedMain, [StringComparison]::OrdinalIgnoreCase) + $isDependency = [string]::Equals( + $Path, + $expectedDependency, + [StringComparison]::OrdinalIgnoreCase + ) + $item = Get-Item -LiteralPath $Path -Force + $linkTypeProperty = $item.PSObject.Properties['LinkType'] + $linkType = if ($null -eq $linkTypeProperty) { '' } else { [string]$linkTypeProperty.Value } + if ([string]::IsNullOrEmpty($linkType)) { + if ($isMain -and -not $AllowDetachedMain) { + throw 'Cargo main executable must have the exact release\waggle.exe <-> release\deps\waggle.exe hard-link topology.' + } + return + } + if ($linkType -cne 'HardLink') { + throw 'Only the exact Cargo main-executable hard-link topology is allowed.' + } + + if (-not $isMain -and -not $isDependency) { + throw 'Only the exact Cargo executable pair may be hard-linked.' + } + + $actualLinks = @(Get-HardLinkPaths $Path) + $actualSet = [Collections.Generic.HashSet[string]]::new([StringComparer]::OrdinalIgnoreCase) + foreach ($actualLink in $actualLinks) { [void]$actualSet.Add($actualLink) } + if ($actualSet.Count -ne 2 -or + -not $actualSet.Contains($expectedMain) -or + -not $actualSet.Contains($expectedDependency)) { + throw 'Cargo main executable has an unexpected hard-link sibling.' + } +} + +function Restore-WaggleReplacedArtifact { + param( + [Parameter(Mandatory = $true)] [string]$ArtifactPath, + [Parameter(Mandatory = $true)] [string]$BackupPath, + [Parameter(Mandatory = $true)] [string]$ExpectedOriginalSha256, + [Parameter(Mandatory = $true)] [string[]]$ExpectedHardLinkPaths + ) + + if ($ExpectedOriginalSha256 -notmatch '^[0-9A-Fa-f]{64}$') { + throw 'Rollback expected-original SHA-256 is invalid.' + } + + $backup = Get-TrustedPath $BackupPath 'Rollback backup' -AllowHardLink + if ((Get-FileHash -LiteralPath $backup -Algorithm SHA256).Hash -cne + $ExpectedOriginalSha256.ToUpperInvariant()) { + throw 'Rollback backup SHA-256 does not match expected original digest.' + } + + $artifact = Get-TrustedPath $ArtifactPath 'Rollback artifact' -AllowHardLink + $expectedSet = [Collections.Generic.HashSet[string]]::new( + [StringComparer]::OrdinalIgnoreCase + ) + foreach ($expectedPath in @($ExpectedHardLinkPaths)) { + if ([string]::IsNullOrWhiteSpace($expectedPath)) { + throw 'Rollback hard-link inventory contains an empty path.' + } + [void]$expectedSet.Add([IO.Path]::GetFullPath($expectedPath)) + } + $isCargoPair = $expectedSet.Count -eq 2 + $releaseRoot = $null + if ($isCargoPair) { + $releaseRoot = Split-Path $artifact -Parent + $expectedMain = [IO.Path]::GetFullPath((Join-Path $releaseRoot 'waggle.exe')) + $expectedDependency = [IO.Path]::GetFullPath((Join-Path $releaseRoot 'deps\waggle.exe')) + if (-not [string]::Equals( + $artifact, + $expectedMain, + [StringComparison]::OrdinalIgnoreCase + ) -or -not $expectedSet.Contains($expectedMain) -or + -not $expectedSet.Contains($expectedDependency)) { + throw 'Rollback hard-link inventory does not match the exact Cargo executable pair.' + } + $dependency = Get-TrustedPath ` + $expectedDependency 'Rollback Cargo dependency' -AllowHardLink + if ((Get-FileHash -LiteralPath $dependency -Algorithm SHA256).Hash -cne + $ExpectedOriginalSha256.ToUpperInvariant()) { + throw 'Rollback Cargo dependency no longer matches the expected original digest.' + } + $backupLinks = @(Get-HardLinkPaths $backup) + $backupSet = [Collections.Generic.HashSet[string]]::new( + [StringComparer]::OrdinalIgnoreCase + ) + foreach ($backupLink in $backupLinks) { [void]$backupSet.Add($backupLink) } + if ($backupSet.Count -ne 2 -or + -not $backupSet.Contains($backup) -or + -not $backupSet.Contains($expectedDependency)) { + throw 'Rollback backup has unexpected hard-link topology.' + } + } elseif ($expectedSet.Count -ne 1 -or -not $expectedSet.Contains($artifact)) { + throw 'Rollback regular-file inventory must contain only the exact artifact path.' + } else { + $backupItem = Get-Item -LiteralPath $backup -Force + $backupLinkType = $backupItem.PSObject.Properties['LinkType'] + if ($null -ne $backupLinkType -and + -not [string]::IsNullOrEmpty([string]$backupLinkType.Value)) { + throw 'Rollback regular-file backup unexpectedly has linked-file topology.' + } + } + + $failedReplacement = Join-Path ` + (Split-Path $backup -Parent) ` + "failed-replacement-$([Guid]::NewGuid().ToString('N')).bin" + [IO.File]::Replace($backup, $artifact, $failedReplacement, $true) + try { + if ((Get-FileHash -LiteralPath $artifact -Algorithm SHA256).Hash -cne + $ExpectedOriginalSha256.ToUpperInvariant()) { + throw 'Rollback did not restore the exact original artifact bytes.' + } + if ($isCargoPair) { + Assert-ApprovedHardLinkTopology $artifact $releaseRoot + } else { + $restoredItem = Get-Item -LiteralPath $artifact -Force + $restoredLinkType = $restoredItem.PSObject.Properties['LinkType'] + if ($null -ne $restoredLinkType -and + -not [string]::IsNullOrEmpty([string]$restoredLinkType.Value)) { + throw 'Rollback restored regular artifact with unexpected linked-file topology.' + } + } + } finally { + if (Test-Path -LiteralPath $failedReplacement -PathType Leaf) { + [IO.File]::Delete($failedReplacement) + } + } +} + +function Get-ApprovedArtifact { + param( + [Parameter(Mandatory = $true)] [string]$Path, + [Parameter(Mandatory = $true)] [object]$SigningSession, + [switch]$AllowDetachedMain + ) + + $context = $SigningSession.Context + $tauriRoot = $context.TauriRoot + $resourcesRoot = $context.ResourcesRoot + $releaseRoot = $context.ReleaseRoot + $artifact = Get-TrustedPath $Path 'Signing artifact' -AllowHardLink + $tempRoot = $SigningSession.TempRoot + $version = [string](Get-Content -Raw -LiteralPath $context.ConfigPath | ConvertFrom-Json).version + if ($version -notmatch '^\d+\.\d+\.\d+$') { throw 'Tauri version is not strict semantic version.' } + + $kind = Get-ArtifactPolicyKind $artifact $releaseRoot $resourcesRoot $tempRoot $version + Assert-ApprovedHardLinkTopology $artifact $releaseRoot -AllowDetachedMain:$AllowDetachedMain + if ($kind -eq 'MSI') { Assert-MsiFile $artifact } else { Assert-PeFile $artifact } + return $artifact +} + +function Assert-WaggleSignedArtifact { + param( + [Parameter(Mandatory = $true)] [string]$Path, + [Parameter(Mandatory = $true)] [string]$SignTool + ) + + & $SignTool verify /pa /all /v $Path + if ($LASTEXITCODE -ne 0) { + throw "Signed artifact verification failed with SignTool exit code $LASTEXITCODE." + } + + $signature = Get-AuthenticodeSignature -LiteralPath $Path + if ($signature.Status -ne [Management.Automation.SignatureStatus]::Valid -or + [string]$signature.SignatureType -cne 'Authenticode' -or + $null -eq $signature.SignerCertificate -or + $null -eq $signature.TimeStamperCertificate) { + throw 'Signed artifact lacks a valid, timestamped Authenticode signature.' + } + if (-not [string]::Equals( + [string]$signature.SignerCertificate.Subject, + $ApprovedPublisher, + [StringComparison]::Ordinal + )) { + throw 'Signed artifact publisher does not match the repository-approved identity.' + } + $hasCodeSigningEku = @( + $signature.SignerCertificate.Extensions | + Where-Object { $_ -is [Security.Cryptography.X509Certificates.X509EnhancedKeyUsageExtension] } | + ForEach-Object { $_.EnhancedKeyUsages } | + Where-Object { $_.Value -eq $CodeSigningOid } + ).Count -gt 0 + if (-not $hasCodeSigningEku) { + throw 'Signed artifact certificate lacks the Code Signing EKU.' + } +} + +function Write-WaggleJsonNoBom { + param( + [Parameter(Mandatory = $true)] [string]$Path, + [Parameter(Mandatory = $true)] [object]$Value + ) + [IO.File]::WriteAllText( + $Path, + ($Value | ConvertTo-Json -Depth 32), + [Text.UTF8Encoding]::new($false) + ) +} + +function Write-WaggleSigningOverride { + param( + [Parameter(Mandatory = $true)] [string]$Path, + [Parameter(Mandatory = $true)] [string]$WrapperPath, + [AllowNull()] [string]$ResourcesRoot = $null, + [switch]$EnableSigning + ) + $windows = [ordered]@{} + if ($EnableSigning) { + $windows.signCommand = [ordered]@{ + cmd = $SystemPowerShellPath + args = @( + '-NoLogo', '-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', + '-File', $WrapperPath, '-ArtifactPath', '%1' + ) + } + } + $bundle = [ordered]@{ + active = $true + targets = @('nsis') + windows = $windows + } + if (-not [string]::IsNullOrWhiteSpace($ResourcesRoot)) { + $trustedResourcesRoot = Get-TrustedPath ` + $ResourcesRoot 'Signing override resource root' 'Container' + $resourceMap = [ordered]@{} + $resourceMap[$trustedResourcesRoot] = 'resources' + $bundle.resources = $resourceMap + } + Write-WaggleJsonNoBom $Path ([ordered]@{ + build = [ordered]@{ beforeBuildCommand = ''; beforeBundleCommand = '' } + bundle = $bundle + }) + return Get-TrustedPath $Path 'Tauri signing override config' +} + +function Get-NsisPayloadInventory { + param( + [Parameter(Mandatory = $true)] [string]$InstallerPath, + [Parameter(Mandatory = $true)] [string]$InventoryTool + ) + $installer = Get-TrustedPath $InstallerPath 'NSIS installer inventory artifact' -AllowHardLink + $output = @(& $InventoryTool l -slt -- $installer) + if ($LASTEXITCODE -ne 0) { + throw "NSIS payload inventory failed with 7-Zip exit code $LASTEXITCODE." + } + $afterDelimiter = $false + $paths = [Collections.Generic.List[string]]::new() + $uniquePaths = [Collections.Generic.HashSet[string]]::new([StringComparer]::OrdinalIgnoreCase) + foreach ($line in $output) { + if ([string]$line -ceq '----------') { + $afterDelimiter = $true + continue + } + if ($afterDelimiter -and [string]$line -cmatch '^Path = (.+)$' -and + $Matches[1] -cne '[0]') { + $path = [string]$Matches[1] + if ($path -match '[\x00-\x1F\x7F]' -or [IO.Path]::IsPathRooted($path) -or + $path -match '(^|[\\/])\.\.?(?:[\\/]|$)' -or $path -match ':' -or + -not $uniquePaths.Add($path)) { + throw 'NSIS payload inventory contains an unsafe, duplicate, or case-colliding path.' + } + $paths.Add($path) + } + } + $paths.Sort([StringComparer]::Ordinal) + $inventory = @($paths) + if ($inventory.Count -lt 10 -or $inventory -notcontains 'waggle.exe') { + throw 'NSIS payload inventory is incomplete or missing waggle.exe.' + } + return $inventory +} + +function Expand-NsisPayloadManifest { + param( + [Parameter(Mandatory = $true)] [string]$InstallerPath, + [Parameter(Mandatory = $true)] [string]$InventoryTool, + [Parameter(Mandatory = $true)] [string]$ExtractionRoot + ) + $installer = Get-TrustedPath $InstallerPath 'NSIS payload artifact' -AllowHardLink + $expectedPaths = @(Get-NsisPayloadInventory $installer $InventoryTool) + $root = New-PrivateDirectory $ExtractionRoot + if (@(Get-ChildItem -LiteralPath $root -Force).Count -ne 0) { + throw 'NSIS payload extraction root must be empty.' + } + & $InventoryTool x -y "-o$root" -- $installer | Out-Null + if ($LASTEXITCODE -ne 0) { + throw "NSIS payload extraction failed with 7-Zip exit code $LASTEXITCODE." + } + $entries = [Collections.Generic.List[object]]::new() + $actualPaths = [Collections.Generic.List[string]]::new() + foreach ($file in @(Get-ChildItem -LiteralPath $root -Recurse -File -Force)) { + $trustedFile = Get-TrustedPath $file.FullName 'Extracted NSIS payload' + $relative = (Get-ContainedRelativePath $trustedFile $root).Replace('/', '\') + $actualPaths.Add($relative) + $entries.Add([pscustomobject][ordered]@{ + path = $relative + sha256 = (Get-FileHash -LiteralPath $trustedFile -Algorithm SHA256).Hash + size = [long]$file.Length + extractedPath = $trustedFile + }) + } + $actualPaths.Sort([StringComparer]::Ordinal) + if ($actualPaths.Count -ne $expectedPaths.Count -or + [string]::Join("`n", $actualPaths) -cne [string]::Join("`n", $expectedPaths)) { + throw 'Extracted NSIS payload roster differs from the exact archive inventory.' + } + return @($entries | Sort-Object { [string]$_.path }) +} + +function Get-WagglePayloadManifestSha256 { + param([Parameter(Mandatory = $true)] [object[]]$Payloads) + $canonical = @($Payloads | Sort-Object { [string]$_.path } | ForEach-Object { + [ordered]@{ path = [string]$_.path; sha256 = [string]$_.sha256; size = [long]$_.size } + }) | ConvertTo-Json -Depth 8 -Compress + return [Convert]::ToHexString( + [Security.Cryptography.SHA256]::HashData([Text.Encoding]::UTF8.GetBytes($canonical)) + ) +} + +function Assert-WaggleUnsignedPayloadResourceProjection { + param( + [Parameter(Mandatory = $true)] [object[]]$Payloads, + [Parameter(Mandatory = $true)] [object]$ResourcesInventory + ) + + $payloadResources = @( + @($Payloads) | + Where-Object { ([string]$_.path).StartsWith('resources\', [StringComparison]::Ordinal) } | + ForEach-Object { + [pscustomobject][ordered]@{ + path = ([string]$_.path).Substring('resources\'.Length) + size = [long]$_.size + sha256 = [string]$_.sha256 + } + } + ) + $expectedResources = @((Get-RequiredPropertyValue ` + $ResourcesInventory 'entries' 'Hosted build resourcesInventory')) + Assert-WaggleCanonicalInventoryEntries ` + $payloadResources 'Unsigned NSIS payload resource projection' + Assert-WaggleCanonicalInventoryEntries ` + $expectedResources 'Hosted build resourcesInventory' + if ($payloadResources.Count -ne $expectedResources.Count) { + throw 'Unsigned NSIS payload resource projection does not match build receipt.' + } + for ($index = 0; $index -lt $payloadResources.Count; $index++) { + if ([string]$payloadResources[$index].path -cne [string]$expectedResources[$index].path -or + [long]$payloadResources[$index].size -ne [long]$expectedResources[$index].size -or + -not [string]::Equals( + [string]$payloadResources[$index].sha256, + [string]$expectedResources[$index].sha256, + [StringComparison]::OrdinalIgnoreCase + )) { + throw 'Unsigned NSIS payload resource projection does not match build receipt.' + } + } +} + +function New-WagglePendingLedger { + param( + [Parameter(Mandatory = $true)] [string]$SessionId, + [Parameter(Mandatory = $true)] [string]$ManifestSha256, + [Parameter(Mandatory = $true)] [object[]]$Slots + ) + return [pscustomobject][ordered]@{ + schemaVersion = 3 + sessionId = $SessionId + manifestSha256 = $ManifestSha256 + state = 'open' + terminalAtUtc = $null + terminalReceiptSha256 = $null + entries = @($Slots | ForEach-Object { + [pscustomobject][ordered]@{ + slotId = [string]$_.id + order = [int]$_.order + kind = [string]$_.kind + status = 'pending' + attempts = 0 + reservationId = $null + path = $null + preSignSha256 = $null + reservedAtUtc = $null + completedAtUtc = $null + postSignSha256 = $null + signerSubject = $null + } + }) + } +} + +function Resolve-WagglePreflightFixedPath { + param( + [Parameter(Mandatory = $true)] [string]$SigningPath, + [Parameter(Mandatory = $true)] [string]$SigningTargetRoot, + [Parameter(Mandatory = $true)] [string]$PreflightTargetRoot + ) + + $relativePath = Get-ContainedRelativePath ` + ([IO.Path]::GetFullPath($SigningPath)) ` + ([IO.Path]::GetFullPath($SigningTargetRoot)) + if ($null -eq $relativePath) { + throw 'Preflight signing path escaped the signing target root.' + } + return Get-TrustedPath ` + (Join-Path $PreflightTargetRoot $relativePath) ` + 'Preflight signing artifact' -AllowHardLink +} + +function New-WaggleSigningManifest { + param( + [Parameter(Mandatory = $true)] [object]$Context, + [Parameter(Mandatory = $true)] [object[]]$Payloads, + [Parameter(Mandatory = $true)] [string]$PreflightTargetRoot, + [AllowNull()] [object]$BuildReceipt = $null + ) + $sessionId = [Environment]::GetEnvironmentVariable('WAGGLE_SIGNING_SESSION_ID') + $sessionDirectory = Assert-PrivateDirectoryAcl ` + (Join-Path (Join-Path $Context.TauriRoot 'target\.signing-sessions') "run-$sessionId") ` + 'Signing session directory' + $manifestPath = Join-Path $sessionDirectory 'manifest.json' + $ledgerPath = Join-Path $sessionDirectory 'callback-ledger.json' + if (Test-Path -LiteralPath $manifestPath -or Test-Path -LiteralPath $ledgerPath) { + throw 'Signing session manifest or ledger already exists.' + } + + $version = [string](Get-Content -Raw -LiteralPath $Context.ConfigPath | ConvertFrom-Json).version + $fixedPaths = @(Get-ExpectedNsisFixedPaths $Context $version) + $packagedPaths = @(Get-ExpectedNsisPackagedPaths) + $trustedPreflightTargetRoot = Get-TrustedPath ` + $PreflightTargetRoot 'Preflight signing target root' 'Container' + $preflightReleaseRoot = Get-TrustedPath ` + (Join-Path $trustedPreflightTargetRoot 'x86_64-pc-windows-msvc\release') ` + 'Preflight signing release root' 'Container' + $slots = [Collections.Generic.List[object]]::new() + for ($index = 0; $index -lt $fixedPaths.Count; $index++) { + $fixedPath = [IO.Path]::GetFullPath($fixedPaths[$index]) + $preflightPath = Resolve-WagglePreflightFixedPath ` + $fixedPath $Context.TargetRoot $trustedPreflightTargetRoot + Assert-PeFile $preflightPath + Assert-ApprovedHardLinkTopology ` + $preflightPath $preflightReleaseRoot + if ((Get-AuthenticodeSignature -LiteralPath $preflightPath).Status -ne + [Management.Automation.SignatureStatus]::NotSigned) { + throw 'Unsigned NSIS preflight contains an already signed or invalid callback artifact.' + } + $slots.Add([pscustomobject][ordered]@{ + id = 'fixed-{0:d2}' -f ($index + 1) + order = $index + 1 + kind = 'fixed' + maxUses = 1 + path = $fixedPath + packagedPath = $packagedPaths[$index] + preSignSha256 = if ($index -eq 0) { + Get-NsisPatchedMainSha256 $preflightPath + } else { + (Get-FileHash -LiteralPath $preflightPath -Algorithm SHA256).Hash + } + }) + } + $slots.Add([pscustomobject][ordered]@{ + id = 'nsis-uninstaller' + order = 13 + kind = 'generated-nsis-uninstaller' + maxUses = 1 + pathPattern = $NsisUninstallerPattern + evidencePath = Join-Path $sessionDirectory 'signed-evidence\13-nsis-uninstaller.exe' + }) + $installerPath = Join-Path ` + $Context.ReleaseRoot "bundle\nsis\Waggle_${version}_x64-setup.exe" + $slots.Add([pscustomobject][ordered]@{ + id = 'nsis-installer' + order = 14 + kind = 'generated-nsis-installer' + maxUses = 1 + path = $installerPath + }) + + $toolchain = [ordered]@{ + wrapperPath = $Context.WrapperPath + wrapperSha256 = (Get-FileHash -LiteralPath $Context.WrapperPath -Algorithm SHA256).Hash + tauriConfigPath = $Context.ConfigPath + tauriConfigSha256 = (Get-FileHash -LiteralPath $Context.ConfigPath -Algorithm SHA256).Hash + tauriOverrideConfigPath = $Context.OverrideConfigPath + tauriOverrideConfigSha256 = (Get-FileHash -LiteralPath $Context.OverrideConfigPath -Algorithm SHA256).Hash + tauriCliPath = $Context.TauriCliPath + tauriCliSha256 = $Context.TauriCliSha256 + tauriCliPackagePath = $Context.TauriCliPackagePath + tauriCliPackageSha256 = $Context.TauriCliPackageSha256 + tauriCliMainPath = $Context.TauriCliMainPath + tauriCliMainSha256 = $Context.TauriCliMainSha256 + tauriCliIndexPath = $Context.TauriCliIndexPath + tauriCliIndexSha256 = $Context.TauriCliIndexSha256 + tauriNativePackagePath = $Context.TauriNativePackagePath + tauriNativePackageSha256 = $Context.TauriNativePackageSha256 + tauriNativeBinaryPath = $Context.TauriNativeBinaryPath + tauriNativeBinarySha256 = $Context.TauriNativeBinarySha256 + tauriCliVersion = $Context.TauriCliVersion + nsisRoot = $Context.NsisRoot + nsisClosureSha256 = $Context.NsisClosureSha256 + makensisPath = $Context.MakensisPath + makensisSha256 = $Context.MakensisSha256 + gitPath = $Context.GitPath + gitSha256 = $Context.GitSha256 + gitRuntimePath = $Context.GitRuntimePath + gitRuntimeSha256 = $Context.GitRuntimeSha256 + nodePath = $Context.NodePath + nodeSha256 = $Context.NodeSha256 + sevenZipPath = $Context.SevenZipPath + sevenZipSha256 = $Context.SevenZipSha256 + signToolPath = $Context.SignToolPath + signToolSha256 = $Context.SignToolSha256 + artifactSigningPackagePath = $Context.ArtifactSigningPackagePath + artifactSigningPackageSha256 = $Context.ArtifactSigningPackageSha256 + artifactSigningX64ManifestSha256 = $Context.ArtifactSigningX64ManifestSha256 + } + if ($null -ne $Context.PortableToolchainRoot) { + $toolchain.portableToolchainRoot = $Context.PortableToolchainRoot + $toolchain.sevenZipDllPath = $Context.SevenZipDllPath + $toolchain.sevenZipDllSha256 = $Context.SevenZipDllSha256 + $toolchain.portableToolchainReceiptPath = $Context.PortableToolchainReceiptPath + $toolchain.portableToolchainReceiptSha256 = $Context.PortableToolchainReceiptSha256 + $toolchain.portableToolchainInventorySha256 = $PortableToolchainInventorySha256 + $toolchain.portableToolchainFileCount = $PortableToolchainFileCount + } + $now = [DateTimeOffset]::UtcNow + $manifest = [pscustomobject][ordered]@{ + schemaVersion = 1 + mode = 'nsis' + sessionId = $sessionId + sourceRevision = $Context.SourceRevision + buildReceipt = $BuildReceipt + createdAtUtc = $now.ToString('O') + expiresAtUtc = $now.AddHours(4).ToString('O') + repoRoot = $Context.RepoRoot + tauriRoot = $Context.TauriRoot + targetRoot = $Context.TargetRoot + releaseRoot = $Context.ReleaseRoot + resourcesRoot = $Context.ResourcesRoot + tempRoot = [Environment]::GetEnvironmentVariable('WAGGLE_NSIS_SIGNING_TEMP_ROOT') + ledgerPath = $ledgerPath + appVersion = $version + payloads = @($Payloads | Sort-Object { [string]$_.path } | ForEach-Object { + [pscustomobject][ordered]@{ + path = [string]$_.path + sha256 = [string]$_.sha256 + size = [long]$_.size + } + }) + toolchain = $toolchain + slots = @($slots) + } + Write-WaggleJsonNoBom $manifestPath $manifest + $manifestSha256 = (Get-FileHash -LiteralPath $manifestPath -Algorithm SHA256).Hash + Write-WaggleJsonNoBom ` + $ledgerPath (New-WagglePendingLedger $sessionId $manifestSha256 @($slots)) + [Environment]::SetEnvironmentVariable('WAGGLE_SIGNING_MANIFEST_PATH', $manifestPath) + [Environment]::SetEnvironmentVariable('WAGGLE_SIGNING_MANIFEST_SHA256', $manifestSha256) + return Get-WaggleSigningSession $Context +} + +function Get-CompletedWaggleSigningLedger { + param([Parameter(Mandatory = $true)] [object]$Session) + $ledger = Get-Content -Raw -LiteralPath $Session.LedgerPath | + ConvertFrom-Json -Depth 32 -DateKind String + Assert-WaggleSigningLedgerState $Session $ledger + if ([string]$ledger.state -cne 'open' -or + @($ledger.entries | Where-Object { [string]$_.status -cne 'completed' }).Count -ne 0) { + throw 'Signing callback ledger is incomplete after the NSIS package.' + } + return $ledger +} + +function Assert-WaggleFinalPayloadBindings { + param( + [Parameter(Mandatory = $true)] [object]$Session, + [Parameter(Mandatory = $true)] [object]$Ledger, + [Parameter(Mandatory = $true)] [object[]]$ActualPayloads, + [Parameter(Mandatory = $true)] [scriptblock]$SignatureVerifier + ) + $expectedPayloads = @($Session.Manifest.payloads | Sort-Object { [string]$_.path }) + $actualPayloadsSorted = @($ActualPayloads | Sort-Object { [string]$_.path }) + if ($expectedPayloads.Count -ne $actualPayloadsSorted.Count -or + [string]::Join("`n", @($expectedPayloads | ForEach-Object { [string]$_.path })) -cne + [string]::Join("`n", @($actualPayloadsSorted | ForEach-Object { [string]$_.path }))) { + throw 'Final signed NSIS payload inventory differs from the unsigned preflight inventory.' + } + $fixedSlots = @($Session.Manifest.slots | Where-Object { [string]$_.kind -ceq 'fixed' }) + $bindings = [Collections.Generic.List[object]]::new() + for ($index = 0; $index -lt $expectedPayloads.Count; $index++) { + $expected = $expectedPayloads[$index] + $actual = $actualPayloadsSorted[$index] + $slot = @($fixedSlots | Where-Object { + [string]$_.packagedPath -ceq [string]$expected.path + }) + $expectedHash = [string]$expected.sha256 + $slotOrder = $null + if ($slot.Count -eq 1) { + $slotOrder = [int]$slot[0].order + $expectedHash = [string]$Ledger.entries[$slotOrder - 1].postSignSha256 + } elseif ($slot.Count -gt 1) { + throw 'Multiple signing slots map to one packaged NSIS payload.' + } + if (-not [string]::Equals( + [string]$actual.sha256, + $expectedHash, + [StringComparison]::OrdinalIgnoreCase + )) { + throw "Final NSIS payload bytes differ for '$([string]$expected.path)'." + } + if ($null -ne $slotOrder) { + & $SignatureVerifier ([string]$actual.extractedPath) $Session.Context.SignToolPath + $bindings.Add([pscustomobject][ordered]@{ + order = $slotOrder + kind = 'packaged-signed-payload' + packagedPath = [string]$expected.path + sha256 = $expectedHash + }) + } + } + return @($bindings | Sort-Object order) +} + +function Assert-WaggleSigningPackageComplete { + param( + [Parameter(Mandatory = $true)] [object]$Session, + [AllowNull()] [object[]]$ActualPayloads, + [AllowNull()] [scriptblock]$SignatureVerifier + ) + + $ledger = Get-CompletedWaggleSigningLedger $Session + if ($null -eq $SignatureVerifier) { + $SignatureVerifier = { param($Path, $SignTool) Assert-WaggleSignedArtifact $Path $SignTool } + } + $installerEntry = @($ledger.entries | Where-Object { [int]$_.order -eq 14 }) + if ($installerEntry.Count -ne 1) { + throw 'Signing callback ledger lacks the final NSIS installer entry.' + } + $installer = Get-TrustedPath ([string]$installerEntry[0].path) 'Final NSIS installer' + if (-not [string]::Equals( + (Get-FileHash -LiteralPath $installer -Algorithm SHA256).Hash, + [string]$installerEntry[0].postSignSha256, + [StringComparison]::OrdinalIgnoreCase + )) { + throw 'Final NSIS installer hash does not match the completed callback ledger.' + } + $installerLock = Open-ReadLock $installer + $uninstallerLock = $null + $extractionRoot = $null + $validationSucceeded = $false + try { + & $SignatureVerifier $installer $Session.Context.SignToolPath + if ($null -eq $ActualPayloads) { + $extractionRoot = Join-Path $Session.SessionDirectory 'final-payload-extraction' + $ActualPayloads = @(Expand-NsisPayloadManifest ` + $installer $Session.Context.SevenZipPath $extractionRoot) + } + $artifactBindings = [Collections.Generic.List[object]]::new() + foreach ($binding in @(Assert-WaggleFinalPayloadBindings ` + $Session $ledger $ActualPayloads $SignatureVerifier)) { + $artifactBindings.Add($binding) + } + $uninstallerSlot = @($Session.Manifest.slots | Where-Object { + [string]$_.kind -ceq 'generated-nsis-uninstaller' + }) + if ($uninstallerSlot.Count -ne 1) { + throw 'Signing manifest lacks the generated NSIS uninstaller evidence slot.' + } + $uninstallerEvidence = Get-TrustedPath ` + ([string]$uninstallerSlot[0].evidencePath) 'Signed NSIS uninstaller evidence' + $uninstallerLock = Open-ReadLock $uninstallerEvidence + $uninstallerEntry = $ledger.entries[[int]$uninstallerSlot[0].order - 1] + if (-not [string]::Equals( + (Get-FileHash -LiteralPath $uninstallerEvidence -Algorithm SHA256).Hash, + [string]$uninstallerEntry.postSignSha256, + [StringComparison]::OrdinalIgnoreCase + )) { + throw 'Signed NSIS uninstaller evidence differs from the callback ledger.' + } + & $SignatureVerifier $uninstallerEvidence $Session.Context.SignToolPath + $artifactBindings.Add([pscustomobject][ordered]@{ + order = [int]$uninstallerEntry.order + kind = 'generated-nsis-uninstaller-evidence' + evidencePath = $uninstallerEvidence + sha256 = [string]$uninstallerEntry.postSignSha256 + }) + $artifactBindings.Add([pscustomobject][ordered]@{ + order = [int]$installerEntry[0].order + kind = 'generated-nsis-installer' + path = $installer + sha256 = [string]$installerEntry[0].postSignSha256 + }) + $validationSucceeded = $true + } finally { + if ($null -ne $extractionRoot -and (Test-Path -LiteralPath $extractionRoot)) { + Remove-Item -LiteralPath $extractionRoot -Recurse -Force -ErrorAction SilentlyContinue + } + if (-not $validationSucceeded) { + if ($null -ne $uninstallerLock) { $uninstallerLock.Dispose() } + $installerLock.Dispose() + } + } + + try { + if (-not [string]::Equals( + (Get-FileHash -LiteralPath $installer -Algorithm SHA256).Hash, + [string]$installerEntry[0].postSignSha256, + [StringComparison]::OrdinalIgnoreCase + )) { + throw 'Final NSIS installer changed before provenance publication.' + } + $terminalAt = [DateTimeOffset]::UtcNow.ToString('O') + $receipt = [pscustomobject][ordered]@{ + schemaVersion = 1 + status = 'sealed' + sessionId = $Session.Id + sourceRevision = $Session.Context.SourceRevision + manifestPath = $Session.ManifestPath + manifestSha256 = $Session.ManifestSha256 + callbackLedgerPath = $Session.LedgerPath + installerPath = $installer + installerSha256 = [string]$installerEntry[0].postSignSha256 + signerSubject = [string]$installerEntry[0].signerSubject + payloadManifestSha256 = Get-WagglePayloadManifestSha256 $ActualPayloads + artifactBindings = @($artifactBindings | Sort-Object order) + terminalAtUtc = $terminalAt + } + $receiptPath = Publish-WaggleTerminalReceipt $Session 'sealed' $receipt { + param($activeLedger) + if (@($activeLedger.entries | Where-Object { [string]$_.status -cne 'completed' }).Count -ne 0) { + throw 'Signing callback ledger changed before final sealing.' + } + } + return [pscustomobject]@{ + InstallerPath = $installer + ReceiptPath = $receiptPath + } + } finally { + if ($null -ne $uninstallerLock) { $uninstallerLock.Dispose() } + $installerLock.Dispose() + } +} + +function Install-WaggleArtifactSigningPackage { + param( + [Parameter(Mandatory = $true)] [string]$TauriRoot, + [string]$SourcePath = '' + ) + $destinationDirectoryPath = Join-Path $TauriRoot 'target\.artifact-signing-tools' + $destinationPath = Join-Path ` + $destinationDirectoryPath 'Microsoft.ArtifactSigning.Client.1.0.128.nupkg' + if (Test-Path -LiteralPath $destinationPath -PathType Leaf) { + $destination = Get-TrustedPath $destinationPath 'Artifact Signing package' + if ((Get-FileHash -LiteralPath $destination -Algorithm SHA256).Hash -cne + $ArtifactSigningPackageSha256) { + throw 'Existing production Artifact Signing package has the wrong SHA-256 digest.' + } + return $destination + } + if ([string]::IsNullOrWhiteSpace($SourcePath)) { + throw 'Production Artifact Signing package is not provisioned by the protected hosted signing workflow.' + } + $source = Get-TrustedPath $SourcePath 'Artifact Signing package source' + $sourceLock = Open-ReadLock $source + $temporaryPath = $null + try { + if ((Get-FileHash -LiteralPath $source -Algorithm SHA256).Hash -cne + $ArtifactSigningPackageSha256) { + throw 'Artifact Signing package source does not match the pinned SHA-256 digest.' + } + $destinationDirectory = New-PrivateDirectory $destinationDirectoryPath + $temporaryPath = Join-Path ` + $destinationDirectory "artifact-signing.$([Guid]::NewGuid().ToString('N')).tmp" + [IO.File]::Copy($source, $temporaryPath, $false) + if ((Get-FileHash -LiteralPath $temporaryPath -Algorithm SHA256).Hash -cne + $ArtifactSigningPackageSha256) { + throw 'Provisioned Artifact Signing package copy failed digest verification.' + } + [IO.File]::Move($temporaryPath, $destinationPath) + $temporaryPath = $null + return Get-TrustedPath $destinationPath 'Artifact Signing package' + } finally { + $sourceLock.Dispose() + if ($null -ne $temporaryPath -and (Test-Path -LiteralPath $temporaryPath -PathType Leaf)) { + try { [IO.File]::Delete($temporaryPath) } catch { } + } + } +} + +function Open-WagglePackageToolchainLocks { + param([Parameter(Mandatory = $true)] [object]$Context) + $bindings = @( + @($Context.WrapperPath, (Get-FileHash -LiteralPath $Context.WrapperPath -Algorithm SHA256).Hash, 'Signing wrapper'), + @($Context.NodePath, $Context.NodeSha256, 'Node.js runtime'), + @($Context.SevenZipPath, $Context.SevenZipSha256, '7-Zip'), + @($Context.SevenZipDllPath, $Context.SevenZipDllSha256, '7-Zip runtime library'), + @($Context.TauriCliPath, $Context.TauriCliSha256, 'Tauri CLI'), + @($Context.TauriCliPackagePath, $Context.TauriCliPackageSha256, 'Tauri CLI package'), + @($Context.TauriCliMainPath, $Context.TauriCliMainSha256, 'Tauri CLI main module'), + @($Context.TauriCliIndexPath, $Context.TauriCliIndexSha256, 'Tauri CLI native loader'), + @($Context.TauriNativePackagePath, $Context.TauriNativePackageSha256, 'Tauri native package'), + @($Context.TauriNativeBinaryPath, $Context.TauriNativeBinarySha256, 'Tauri native binary'), + @($Context.MakensisPath, $Context.MakensisSha256, 'makensis'), + @($Context.GitPath, $Context.GitSha256, 'Git executable'), + @($Context.GitRuntimePath, $Context.GitRuntimeSha256, 'Git runtime'), + @($Context.SignToolPath, $Context.SignToolSha256, 'SignTool'), + @($Context.ArtifactSigningPackagePath, $Context.ArtifactSigningPackageSha256, 'Artifact Signing package') + ) + $locks = [Collections.Generic.List[IDisposable]]::new() + try { + foreach ($portableLock in @($Context.PortableToolchainLocks)) { + $locks.Add($portableLock) + } + $Context.PortableToolchainLocks.Clear() + $trackedBundleInputs = @( + 'app/src-tauri/tauri.conf.json', + 'app/src-tauri/Cargo.toml', + 'app/src-tauri/Cargo.lock', + 'app/src-tauri/build.rs', + 'app/src-tauri/nsis/installer.nsi', + 'app/src-tauri/icons/32x32.png', + 'app/src-tauri/icons/128x128.png', + 'app/src-tauri/icons/128x128@2x.png', + 'app/src-tauri/icons/icon.icns', + 'app/src-tauri/icons/icon.ico', + 'app/src-tauri/icons/icon.png' + ) + foreach ($relativePath in $trackedBundleInputs) { + $trackedPath = Get-TrustedPath ` + (Join-Path $Context.RepoRoot $relativePath) ` + 'Tracked Tauri packaging input' -AllowHardLink + $locks.Add((Open-ReadLock $trackedPath)) + } + $nsisInventory = New-WagglePrebuiltInventory -Root $Context.NsisRoot + if (@($nsisInventory.entries).Count -ne 442 -or + -not [string]::Equals( + [string]$nsisInventory.sha256, + [string]$Context.NsisClosureSha256, + [StringComparison]::OrdinalIgnoreCase + )) { + throw 'NSIS compiler closure does not match the pinned 442-file inventory.' + } + $nsisLease = Open-WaggleValidatedPrebuiltTree ` + $Context.NsisRoot $nsisInventory 'NSIS compiler closure' + foreach ($nsisLock in $nsisLease.Locks) { $locks.Add($nsisLock) } + $nsisLease.Locks.Clear() + foreach ($binding in $bindings) { + $path = Get-TrustedPath ([string]$binding[0]) ([string]$binding[2]) -AllowHardLink + $lock = Open-ReadLock $path + if ((Get-FileHash -LiteralPath $path -Algorithm SHA256).Hash -cne [string]$binding[1]) { + $lock.Dispose() + throw "$($binding[2]) does not match the pinned production-build digest." + } + $locks.Add($lock) + } + $lockedRevision = [string](& $Context.GitPath -C $Context.RepoRoot rev-parse --verify HEAD) + $lockedStatus = @(& $Context.GitPath -C $Context.RepoRoot status --porcelain=v1 --untracked-files=all) + if ($LASTEXITCODE -ne 0 -or + $lockedRevision -cne [string]$Context.SourceRevision -or + $lockedStatus.Count -ne 0) { + throw 'Exact repository revision changed before packaging inputs were locked.' + } + Assert-WaggleHostedSigningBoundary $lockedRevision ([string]( + Get-Content -Raw -LiteralPath $Context.ConfigPath | ConvertFrom-Json + ).version) + return $locks + } catch { + foreach ($lock in $locks) { $lock.Dispose() } + throw + } +} + +function Invoke-WagglePinnedNodeScript { + param( + [Parameter(Mandatory = $true)] [object]$Context, + [Parameter(Mandatory = $true)] [string]$ScriptPath, + [Parameter(Mandatory = $true)] [string]$WorkingDirectory, + [string[]]$Arguments = @(), + [string]$Label = 'Node build step' + ) + Push-Location $WorkingDirectory + try { + & $Context.NodePath $ScriptPath @Arguments + if ($LASTEXITCODE -ne 0) { + throw "$Label failed with exit code $LASTEXITCODE." + } + } finally { + Pop-Location + } +} + +function Assert-WaggleHostedResourceInventoryProjection { + param( + [Parameter(Mandatory = $true)] [object]$TargetInventory, + [Parameter(Mandatory = $true)] [object]$ResourcesInventory + ) + + $projection = @( + @((Get-RequiredPropertyValue ` + $TargetInventory 'entries' 'Hosted build targetInventory')) | + Where-Object { ([string]$_.path).StartsWith('resources\', [StringComparison]::Ordinal) } | + ForEach-Object { + [pscustomobject][ordered]@{ + path = ([string]$_.path).Substring('resources\'.Length) + size = [long]$_.size + sha256 = [string]$_.sha256 + } + } + ) + $resourceEntries = @((Get-RequiredPropertyValue ` + $ResourcesInventory 'entries' 'Hosted build resourcesInventory')) + Assert-WaggleCanonicalInventoryEntries ` + $projection 'Hosted build target resource projection' + Assert-WaggleCanonicalInventoryEntries ` + $resourceEntries 'Hosted build resourcesInventory' + if ($projection.Count -ne $resourceEntries.Count) { + throw 'Hosted build target resource projection does not match resourcesInventory.' + } + for ($index = 0; $index -lt $projection.Count; $index++) { + if ([string]$projection[$index].path -cne [string]$resourceEntries[$index].path -or + [long]$projection[$index].size -ne [long]$resourceEntries[$index].size -or + -not [string]::Equals( + [string]$projection[$index].sha256, + [string]$resourceEntries[$index].sha256, + [StringComparison]::OrdinalIgnoreCase + )) { + throw 'Hosted build target resource projection does not match resourcesInventory.' + } + } + if (-not [string]::Equals( + (Get-WaggleInventorySha256 $projection), + [string](Get-RequiredPropertyValue ` + $ResourcesInventory 'sha256' 'Hosted build resourcesInventory'), + [StringComparison]::OrdinalIgnoreCase + )) { + throw 'Hosted build target resource projection does not match resourcesInventory.' + } +} + +function Get-WaggleHostedBuildReceipt { + param( + [Parameter(Mandatory = $true)] [string]$Path, + [Parameter(Mandatory = $true)] [string]$ExpectedSha256, + [Parameter(Mandatory = $true)] [string]$ExpectedSourceRevision + ) + + if ($ExpectedSha256 -notmatch '^[0-9A-Fa-f]{64}$') { + throw 'Build receipt SHA-256 must be one exact digest.' + } + $receiptPath = Get-TrustedPath $Path 'Hosted build receipt' + $lock = Open-ReadLock $receiptPath + try { + if (-not [string]::Equals( + (Get-FileHash -LiteralPath $receiptPath -Algorithm SHA256).Hash, + $ExpectedSha256, + [StringComparison]::OrdinalIgnoreCase + )) { + throw 'Hosted build receipt does not match its SHA-256 handoff.' + } + try { + $receipt = Get-Content -Raw -LiteralPath $receiptPath | + ConvertFrom-Json -Depth 32 -DateKind String + } catch { + throw 'Hosted build receipt is not valid JSON.' + } + if ([int](Get-RequiredPropertyValue $receipt 'schemaVersion' 'Hosted build receipt') -ne 1 -or + [string](Get-RequiredPropertyValue $receipt 'repository' 'Hosted build receipt') -cne + 'marolinik/waggle-os' -or + [string](Get-RequiredPropertyValue $receipt 'sourceRevision' 'Hosted build receipt') -cne + $ExpectedSourceRevision -or + [string](Get-RequiredPropertyValue $receipt 'targetTriple' 'Hosted build receipt') -cne + 'x86_64-pc-windows-msvc') { + throw 'Hosted build receipt does not bind the approved repository, revision, and target.' + } + foreach ($name in @('targetInventory', 'resourcesInventory')) { + $inventory = Get-RequiredPropertyValue $receipt $name 'Hosted build receipt' + $entries = @((Get-RequiredPropertyValue $inventory 'entries' "Hosted build $name")) + Assert-WaggleCanonicalInventoryEntries $entries "Hosted build $name" + if (-not [string]::Equals( + (Get-WaggleInventorySha256 $entries), + [string](Get-RequiredPropertyValue $inventory 'sha256' "Hosted build $name"), + [StringComparison]::OrdinalIgnoreCase + )) { + throw "Hosted build $name aggregate digest is invalid." + } + } + Assert-WaggleHostedResourceInventoryProjection ` + $receipt.targetInventory $receipt.resourcesInventory + $checker = Get-RequiredPropertyValue $receipt 'checker' 'Hosted build receipt' + if ([int](Get-RequiredPropertyValue $checker 'exitCode' 'Hosted build checker') -ne 0 -or + [string](Get-RequiredPropertyValue $checker 'sha256' 'Hosted build checker') -notmatch + '^[0-9A-Fa-f]{64}$') { + throw 'Hosted build sidecar/resource checker did not succeed with a bound digest.' + } + return [pscustomobject]@{ Receipt = $receipt; Path = $receiptPath; Lock = $lock } + } catch { + $lock.Dispose() + throw + } +} + +function Assert-WaggleHostedSigningBoundary { + param( + [Parameter(Mandatory = $true)] [string]$ExpectedRevision, + [Parameter(Mandatory = $true)] [string]$ExpectedVersion + ) + + if ($ExpectedRevision -notmatch '^[0-9a-f]{40}$' -or + $ExpectedVersion -notmatch '^\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?$') { + throw 'Hosted Package mode requires exact revision and app-version inputs.' + } + $expectedTag = "v$ExpectedVersion" + $expectedRef = "refs/tags/$expectedTag" + $expectedWorkflowRef = "marolinik/waggle-os/.github/workflows/release.yml@$expectedRef" + + $expected = [ordered]@{ + GITHUB_ACTIONS = 'true' + GITHUB_EVENT_NAME = 'push' + RUNNER_ENVIRONMENT = 'github-hosted' + GITHUB_REPOSITORY = 'marolinik/waggle-os' + GITHUB_SHA = $ExpectedRevision + GITHUB_REF = $expectedRef + GITHUB_REF_TYPE = 'tag' + GITHUB_REF_NAME = $expectedTag + GITHUB_WORKFLOW_REF = $expectedWorkflowRef + GITHUB_WORKFLOW_SHA = $ExpectedRevision + } + foreach ($entry in $expected.GetEnumerator()) { + if ([Environment]::GetEnvironmentVariable([string]$entry.Key) -cne [string]$entry.Value) { + throw "Hosted Package mode requires exact $($entry.Key) boundary evidence." + } + } +} + +function Invoke-WaggleSigningPackage { + if (-not $IsWindows -or -not [Environment]::Is64BitProcess -or + $PSVersionTable.PSEdition -cne 'Core' -or + $PSVersionTable.PSVersion -lt [Version]'7.5.0') { + throw 'Production signing Package mode requires approved 64-bit PowerShell 7.5+ on Windows.' + } + $actualHost = Get-TrustedPath (Get-Process -Id $PID).Path 'Current PowerShell 7 host' -AllowHardLink + Assert-ApprovedPowerShell7Path $actualHost + + $scriptPath = Get-TrustedPath $PSCommandPath 'Signing wrapper' + $appRoot = Split-Path (Split-Path $scriptPath -Parent) -Parent + $repoRoot = Get-TrustedPath (Split-Path $appRoot -Parent) 'Repository root' 'Container' + $tauriRoot = Get-TrustedPath (Join-Path $appRoot 'src-tauri') 'Tauri root' 'Container' + if (@( + $UnsignedInputRoot, $SigningInputRoot, $BuildReceiptPath, $BuildReceiptSha256, + $PortableToolchainRoot, $PortableNodePath, $PortableGitPath, + $PortableSevenZipPath, $PortableToolchainReceiptPath, + $PortableToolchainReceiptSha256 | + Where-Object { [string]::IsNullOrWhiteSpace([string]$_) } + ).Count -ne 0) { + throw 'Hosted Package mode requires both prebuilt roots, the exact build receipt, and the complete portable toolchain handoff.' + } + $unsignedSourceRoot = Get-TrustedPath ` + $UnsignedInputRoot 'Unsigned prebuilt input root' 'Container' + $signingSourceRoot = Get-TrustedPath ` + $SigningInputRoot 'Signing prebuilt input root' 'Container' + $portableToolchain = Get-WagglePortableToolchain ` + $PortableToolchainRoot $PortableNodePath $PortableGitPath ` + $PortableSevenZipPath $PortableToolchainReceiptPath ` + $PortableToolchainReceiptSha256 ` + -DisallowedRoots @( + $repoRoot, $unsignedSourceRoot, $signingSourceRoot, + $BuildReceiptPath, $ArtifactSigningPackageSource + ) + $portableBootstrapLocks = $portableToolchain.Locks + try { + $gitLock = Open-ReadLock $portableToolchain.GitPath + try { + $sourceRevision = [string](& $portableToolchain.GitPath ` + -C $repoRoot rev-parse --verify HEAD) + if ($LASTEXITCODE -ne 0 -or $sourceRevision -notmatch '^[0-9a-f]{40}$') { + throw 'Could not resolve the exact repository source revision.' + } + } finally { + $gitLock.Dispose() + } + $appVersion = [string]( + Get-Content -Raw -LiteralPath (Join-Path $tauriRoot 'tauri.conf.json') | + ConvertFrom-Json + ).version + Assert-WaggleHostedSigningBoundary $sourceRevision $appVersion + foreach ($pair in @( + @($unsignedSourceRoot, $signingSourceRoot), + @($unsignedSourceRoot, $BuildReceiptPath), + @($signingSourceRoot, $BuildReceiptPath), + @($unsignedSourceRoot, $tauriRoot), + @($signingSourceRoot, $tauriRoot) + )) { + if (Test-WagglePathsOverlap ([string]$pair[0]) ([string]$pair[1])) { + throw 'Hosted Package input, receipt, repository, and output roots must be distinct.' + } + } + $receiptLease = Get-WaggleHostedBuildReceipt ` + $BuildReceiptPath $BuildReceiptSha256 $sourceRevision + $receipt = $receiptLease.Receipt + } catch { + foreach ($lock in $portableBootstrapLocks) { $lock.Dispose() } + throw + } + $sessionId = [Guid]::NewGuid().ToString('N') + $sessionDirectory = New-PrivateDirectory ` + (Join-Path $tauriRoot "target\.signing-sessions\run-$sessionId") + $tempRoot = New-PrivateDirectory ` + (Join-Path $tauriRoot "target\.signing-temp\run-$sessionId") + $overridePath = Join-Path $sessionDirectory 'tauri.signing-override.json' + + $environmentNames = @( + 'WAGGLE_SIGNING_SESSION_ID', 'WAGGLE_SIGNING_MANIFEST_PATH', + 'WAGGLE_SIGNING_MANIFEST_SHA256', 'CARGO_TARGET_DIR', 'TEMP', 'TMP', + 'WAGGLE_NSIS_SIGNING_TEMP_ROOT', 'WAGGLE_SIGNING_RESOURCES_ROOT', + 'WAGGLE_SIGNING_PORTABLE_TOOLCHAIN_ROOT', + 'WAGGLE_SIGNING_PORTABLE_NODE_PATH', + 'WAGGLE_SIGNING_PORTABLE_GIT_PATH', + 'WAGGLE_SIGNING_PORTABLE_SEVEN_ZIP_PATH', + 'WAGGLE_SIGNING_PORTABLE_RECEIPT_PATH', + 'WAGGLE_SIGNING_PORTABLE_RECEIPT_SHA256', + 'NODE_OPTIONS', 'NODE_PATH', + 'NAPI_RS_NATIVE_LIBRARY_PATH', 'NAPI_RS_FORCE_WASI', + 'npm_config_node_options', 'TARGET_ARCH' + ) + $savedEnvironment = @{} + foreach ($name in $environmentNames) { + $savedEnvironment[$name] = [Environment]::GetEnvironmentVariable($name) + } + $session = $null + $packageLocks = $null + $unsignedSourceLease = $null + $signingSourceLease = $null + $unsignedWorkLease = $null + $signingWorkLease = $null + $unsignedWorkRoot = $null + $signingWorkRoot = $null + $preflightEvidenceRoot = $null + $unsignedExtractionRoot = $null + $unsignedOverrideLock = $null + $packageSucceeded = $false + try { + [Environment]::SetEnvironmentVariable('WAGGLE_SIGNING_SESSION_ID', $sessionId) + [Environment]::SetEnvironmentVariable('WAGGLE_SIGNING_MANIFEST_PATH', $null) + [Environment]::SetEnvironmentVariable('WAGGLE_SIGNING_MANIFEST_SHA256', $null) + [Environment]::SetEnvironmentVariable( + 'WAGGLE_SIGNING_PORTABLE_TOOLCHAIN_ROOT', $portableToolchain.PortableToolchainRoot + ) + [Environment]::SetEnvironmentVariable( + 'WAGGLE_SIGNING_PORTABLE_NODE_PATH', $portableToolchain.NodePath + ) + [Environment]::SetEnvironmentVariable( + 'WAGGLE_SIGNING_PORTABLE_GIT_PATH', $portableToolchain.GitPath + ) + [Environment]::SetEnvironmentVariable( + 'WAGGLE_SIGNING_PORTABLE_SEVEN_ZIP_PATH', $portableToolchain.SevenZipPath + ) + [Environment]::SetEnvironmentVariable( + 'WAGGLE_SIGNING_PORTABLE_RECEIPT_PATH', $portableToolchain.ReceiptPath + ) + [Environment]::SetEnvironmentVariable( + 'WAGGLE_SIGNING_PORTABLE_RECEIPT_SHA256', $portableToolchain.ReceiptSha256 + ) + [Environment]::SetEnvironmentVariable('TEMP', $tempRoot) + [Environment]::SetEnvironmentVariable('TMP', $tempRoot) + [Environment]::SetEnvironmentVariable('WAGGLE_NSIS_SIGNING_TEMP_ROOT', $tempRoot) + [Environment]::SetEnvironmentVariable('NODE_OPTIONS', $null) + [Environment]::SetEnvironmentVariable('NODE_PATH', $null) + [Environment]::SetEnvironmentVariable('NAPI_RS_NATIVE_LIBRARY_PATH', $null) + [Environment]::SetEnvironmentVariable('NAPI_RS_FORCE_WASI', $null) + [Environment]::SetEnvironmentVariable('npm_config_node_options', $null) + [Environment]::SetEnvironmentVariable('TARGET_ARCH', 'x64') + + $cargoReleaseRelative = 'x86_64-pc-windows-msvc\release' + $sourceDisallowedRoots = @( + $sessionDirectory, $tempRoot, $tauriRoot, $BuildReceiptPath + ) + $unsignedSourceLease = Open-WaggleValidatedPrebuiltTree ` + $unsignedSourceRoot $receipt.targetInventory ` + 'Unsigned receipt-bound prebuilt input tree' ` + ($sourceDisallowedRoots + @($signingSourceRoot)) ` + -CargoReleaseRelativePath $cargoReleaseRelative + $signingSourceLease = Open-WaggleValidatedPrebuiltTree ` + $signingSourceRoot $receipt.targetInventory ` + 'Signing receipt-bound prebuilt input tree' ` + ($sourceDisallowedRoots + @($unsignedSourceRoot)) ` + -CargoReleaseRelativePath $cargoReleaseRelative + + $workRoot = Join-Path $sessionDirectory 'work' + $unsignedWorkRoot = Join-Path $workRoot 'unsigned' + $signingWorkRoot = Join-Path $workRoot 'signing' + [void](Assert-WaggleHostedDiskCapacity $sessionDirectory $receipt.targetInventory) + New-WagglePrebuiltWorkCopy ` + $unsignedSourceRoot $unsignedWorkRoot $receipt.targetInventory ` + 'Unsigned hosted prebuilt input' $cargoReleaseRelative | Out-Null + + $unsignedReleaseRoot = Join-Path $unsignedWorkRoot $cargoReleaseRelative + $unsignedResourcesRoot = Join-Path $unsignedWorkRoot 'resources' + $unsignedMutablePaths = @( + (Join-Path $unsignedReleaseRoot 'waggle.exe'), + (Join-Path $unsignedReleaseRoot 'deps\waggle.exe') + ) + $unsignedRegeneratedRoots = @( + (Join-Path $unsignedReleaseRoot 'nsis'), + (Join-Path $unsignedReleaseRoot 'bundle\nsis') + ) + $unsignedWorkLease = Open-WaggleValidatedPrebuiltTree ` + $unsignedWorkRoot $receipt.targetInventory 'Unsigned private work tree' ` + @($unsignedSourceRoot, $signingSourceRoot, $signingWorkRoot, $tempRoot) ` + -MutablePaths $unsignedMutablePaths ` + -RegeneratedRoots $unsignedRegeneratedRoots ` + -CargoReleaseRelativePath $cargoReleaseRelative + Clear-WaggleRegeneratedRoots $unsignedWorkLease + Write-WaggleSigningOverride ` + $overridePath $scriptPath $unsignedResourcesRoot | Out-Null + Assert-WaggleSigningOverrideContract ` + $overridePath $scriptPath $unsignedResourcesRoot -Unsigned + Install-WaggleArtifactSigningPackage ` + $tauriRoot $ArtifactSigningPackageSource | Out-Null + + [Environment]::SetEnvironmentVariable('CARGO_TARGET_DIR', $unsignedWorkRoot) + [Environment]::SetEnvironmentVariable( + 'WAGGLE_SIGNING_RESOURCES_ROOT', $unsignedResourcesRoot + ) + $context = Get-WaggleSigningContext -AllowPortableBeforeManifest + $packageLocks = Open-WagglePackageToolchainLocks $context + + $unsignedOverrideLock = Open-ReadLock $overridePath + try { + Assert-WaggleSigningOverrideContract ` + $overridePath $scriptPath $unsignedResourcesRoot -Unsigned + Invoke-WagglePinnedNodeScript ` + $context $context.TauriCliPath $context.AppRoot @( + 'bundle', '--target', 'x86_64-pc-windows-msvc', '--no-sign', + '--bundles', 'nsis', '--config', $overridePath, '--ci' + ) 'Unsigned immutable NSIS preflight package' + } finally { + $unsignedOverrideLock.Dispose() + $unsignedOverrideLock = $null + } + + $version = [string](Get-Content -Raw -LiteralPath $context.ConfigPath | ConvertFrom-Json).version + $installerPath = Join-Path ` + $context.ReleaseRoot "bundle\nsis\Waggle_${version}_x64-setup.exe" + $unsignedExtractionRoot = Join-Path $sessionDirectory 'unsigned-payload-extraction' + $payloads = @(Expand-NsisPayloadManifest ` + $installerPath $context.SevenZipPath $unsignedExtractionRoot) + Assert-WaggleUnsignedPayloadResourceProjection ` + $payloads $receipt.resourcesInventory + $preflightEvidenceRoot = New-WagglePreflightEvidenceCopy ` + $context (Join-Path $sessionDirectory 'preflight-evidence') + Remove-Item -LiteralPath $unsignedExtractionRoot -Recurse -Force + $unsignedExtractionRoot = $null + Remove-Item -LiteralPath $installerPath -Force + foreach ($lock in $unsignedWorkLease.Locks) { $lock.Dispose() } + $unsignedWorkLease = $null + Remove-Item -LiteralPath $unsignedWorkRoot -Recurse -Force + $unsignedWorkRoot = $null + + [void](Assert-WaggleHostedDiskCapacity $sessionDirectory $receipt.targetInventory) + New-WagglePrebuiltWorkCopy ` + $signingSourceRoot $signingWorkRoot $receipt.targetInventory ` + 'Signing hosted prebuilt input' $cargoReleaseRelative | Out-Null + $signingReleaseRoot = Join-Path $signingWorkRoot $cargoReleaseRelative + $signingResourcesRoot = Join-Path $signingWorkRoot 'resources' + $signingMutablePaths = @( + Get-ExpectedNsisFixedPaths ` + ([pscustomobject]@{ + ReleaseRoot = $signingReleaseRoot + ResourcesRoot = $signingResourcesRoot + }) ` + '0.0.0' + ) + @((Join-Path $signingReleaseRoot 'deps\waggle.exe')) + $signingRegeneratedRoots = @( + (Join-Path $signingReleaseRoot 'nsis'), + (Join-Path $signingReleaseRoot 'bundle\nsis') + ) + $signingWorkLease = Open-WaggleValidatedPrebuiltTree ` + $signingWorkRoot $receipt.targetInventory 'Signing private work tree' ` + @($unsignedSourceRoot, $signingSourceRoot, $tempRoot) ` + -MutablePaths $signingMutablePaths ` + -RegeneratedRoots $signingRegeneratedRoots ` + -CargoReleaseRelativePath $cargoReleaseRelative + Clear-WaggleRegeneratedRoots $signingWorkLease + + Write-WaggleSigningOverride ` + $overridePath $scriptPath $signingResourcesRoot -EnableSigning | Out-Null + Assert-WaggleSigningOverrideContract ` + $overridePath $scriptPath $signingResourcesRoot + [Environment]::SetEnvironmentVariable('CARGO_TARGET_DIR', $signingWorkRoot) + [Environment]::SetEnvironmentVariable( + 'WAGGLE_SIGNING_RESOURCES_ROOT', $signingResourcesRoot + ) + $context = Get-WaggleSigningContext -AllowPortableBeforeManifest + $session = New-WaggleSigningManifest ` + $context $payloads $preflightEvidenceRoot $receipt + Remove-Item -LiteralPath $preflightEvidenceRoot -Recurse -Force + $preflightEvidenceRoot = $null + Assert-DotNet8X64Runtime + + Invoke-WagglePinnedNodeScript ` + $context $context.TauriCliPath $context.AppRoot @( + 'bundle', '--target', 'x86_64-pc-windows-msvc', '--bundles', 'nsis', + '--config', $overridePath, '--ci' + ) 'Signed NSIS bundle' + + $result = Assert-WaggleSigningPackageComplete $session + $packageSucceeded = $true + Write-Host "Public Artifact Signing package sealed: $($result.InstallerPath)" + Write-Host "Provenance receipt: $($result.ReceiptPath)" + } catch { + $packageFailure = $_ + if ($null -ne $session) { + try { + Fail-WaggleSigningSession ` + $session $null 'package_or_finalization_failure' ` + $packageFailure.Exception.Message | Out-Null + } catch { + throw "Signing package failed: $($packageFailure.Exception.Message) Terminalization also failed: $($_.Exception.Message)" + } + } + throw $packageFailure + } finally { + if ($null -ne $unsignedExtractionRoot -and (Test-Path -LiteralPath $unsignedExtractionRoot)) { + Remove-Item -LiteralPath $unsignedExtractionRoot -Recurse -Force -ErrorAction SilentlyContinue + } + if ($null -ne $preflightEvidenceRoot -and (Test-Path -LiteralPath $preflightEvidenceRoot)) { + Remove-Item -LiteralPath $preflightEvidenceRoot -Recurse -Force -ErrorAction SilentlyContinue + } + if ($null -ne $unsignedOverrideLock) { $unsignedOverrideLock.Dispose() } + if ($null -ne $session) { + foreach ($sessionLock in $session.Locks) { $sessionLock.Dispose() } + } + if ($null -ne $packageLocks) { foreach ($lock in $packageLocks) { $lock.Dispose() } } + foreach ($lock in $portableBootstrapLocks) { $lock.Dispose() } + foreach ($lease in @( + $unsignedWorkLease, $signingWorkLease, + $unsignedSourceLease, $signingSourceLease + )) { + if ($null -ne $lease) { foreach ($lock in $lease.Locks) { $lock.Dispose() } } + } + if ($null -ne $unsignedWorkRoot -and (Test-Path -LiteralPath $unsignedWorkRoot)) { + Remove-Item -LiteralPath $unsignedWorkRoot -Recurse -Force -ErrorAction SilentlyContinue + } + if (-not $packageSucceeded -and $null -ne $signingWorkRoot -and + (Test-Path -LiteralPath $signingWorkRoot)) { + Remove-Item -LiteralPath $signingWorkRoot -Recurse -Force -ErrorAction SilentlyContinue + } + $receiptLease.Lock.Dispose() + foreach ($name in $environmentNames) { + [Environment]::SetEnvironmentVariable($name, $savedEnvironment[$name]) + } + } +} + +function Invoke-WaggleArtifactSigning { + param([Parameter(Mandatory = $true)] [string]$Path) + + if (-not $IsWindows -or -not [Environment]::Is64BitProcess -or + $PSVersionTable.PSEdition -cne 'Core' -or + $PSVersionTable.PSVersion -lt [Version]'7.5.0') { + throw 'Azure Artifact Signing requires approved 64-bit PowerShell 7.5+ on Windows.' + } + + $actualHost = Get-TrustedPath (Get-Process -Id $PID).Path 'Current PowerShell 7 host' -AllowHardLink + Assert-ApprovedPowerShell7Path $actualHost + $context = Get-WaggleSigningContext + $session = Get-WaggleSigningSession $context + $artifact = $null + $reservation = $null + $stagingRoot = $null + $signToolLock = $null + $toolsetLocks = $null + $signedArtifactLock = $null + $replaced = $false + $expectedRollbackPaths = $null + try { + $artifact = Get-ApprovedArtifact $Path $session + $reservation = Reserve-WaggleSigningCallback $session $artifact + $sourceHash = [string]$reservation.preSignSha256 + try { + Assert-DotNet8X64Runtime + $signTool = $context.SignToolPath + $packagePath = $context.ArtifactSigningPackagePath + $stagingParent = New-PrivateDirectory ` + (Join-Path $context.TauriRoot 'target\.signing-staging') + $stagingRoot = New-PrivateDirectory ` + (Join-Path $stagingParent ([Guid]::NewGuid().ToString('N'))) + $stagedArtifact = Join-Path $stagingRoot ([IO.Path]::GetFileName($artifact)) + $backupPath = Join-Path $stagingRoot 'original.backup' + $metadataPath = Join-Path $stagingRoot 'artifact-signing.json' + $metadata = [ordered]@{ + Endpoint = $ArtifactSigningEndpoint + CodeSigningAccountName = $ArtifactSigningAccount + CertificateProfileName = $ArtifactSigningProfile + } + [IO.File]::Copy($artifact, $stagedArtifact, $false) + $stagedArtifact = Get-TrustedPath $stagedArtifact 'Staged signing artifact' + Assert-PeFile $stagedArtifact + if ((Get-FileHash -LiteralPath $stagedArtifact -Algorithm SHA256).Hash -cne $sourceHash) { + throw 'Staged artifact bytes differ from the validated source artifact.' + } + [IO.File]::WriteAllText( + $metadataPath, + ($metadata | ConvertTo-Json -Compress), + [Text.UTF8Encoding]::new($false) + ) + + $signToolLock = Open-ReadLock $signTool + Assert-MicrosoftAuthenticodeFile $signTool 'SignTool' $SignToolSha256 + $toolset = Expand-PinnedArtifactSigningPackage $packagePath $stagingRoot + $dlib = $toolset.Dlib + $toolsetLocks = $toolset.Locks + + & $signTool sign ` + /v /debug ` + /fd SHA256 ` + /tr 'http://timestamp.acs.microsoft.com' ` + /td SHA256 ` + /dlib $dlib ` + /dmdf $metadataPath ` + $stagedArtifact + if ($LASTEXITCODE -ne 0) { + throw "Azure Artifact Signing failed with SignTool exit code $LASTEXITCODE." + } + Assert-WaggleSignedArtifact $stagedArtifact $signTool + + $artifact = Get-ApprovedArtifact $artifact $session + if ((Get-FileHash -LiteralPath $artifact -Algorithm SHA256).Hash -cne $sourceHash) { + throw 'Source artifact changed while its validated staging copy was being signed.' + } + $sourceItem = Get-Item -LiteralPath $artifact -Force + $sourceLinkTypeProperty = $sourceItem.PSObject.Properties['LinkType'] + $sourceLinkType = if ($null -eq $sourceLinkTypeProperty) { + '' + } else { + [string]$sourceLinkTypeProperty.Value + } + $expectedRollbackPaths = if ($sourceLinkType -ceq 'HardLink') { + @(Get-HardLinkPaths $artifact) + } else { + @($artifact) + } + [IO.File]::Replace($stagedArtifact, $artifact, $backupPath, $true) + $replaced = $true + $artifact = Get-ApprovedArtifact $artifact $session -AllowDetachedMain + $signedArtifactLock = Open-ReadLock $artifact + Assert-WaggleSignedArtifact $artifact $signTool + if ([string]$reservation.kind -ceq 'generated-nsis-uninstaller') { + $uninstallerSlot = $session.Manifest.slots[[int]$reservation.order - 1] + $evidencePath = [string]$uninstallerSlot.evidencePath + $evidenceDirectory = New-PrivateDirectory (Split-Path $evidencePath -Parent) + Assert-ExactCanonicalPathValue ` + $evidenceDirectory (Join-Path $session.SessionDirectory 'signed-evidence') ` + 'Signed evidence directory' + if (Test-Path -LiteralPath $evidencePath) { + throw 'Signed NSIS uninstaller evidence was already published.' + } + $temporaryEvidence = Join-Path ` + $evidenceDirectory "uninstaller.$([Guid]::NewGuid().ToString('N')).tmp" + [IO.File]::Copy($artifact, $temporaryEvidence, $false) + if ((Get-FileHash -LiteralPath $temporaryEvidence -Algorithm SHA256).Hash -cne + (Get-FileHash -LiteralPath $artifact -Algorithm SHA256).Hash) { + throw 'Signed NSIS uninstaller evidence copy failed digest verification.' + } + [IO.File]::Move($temporaryEvidence, $evidencePath) + } + Complete-WaggleSigningCallback $session $reservation $artifact | Out-Null + $replaced = $false + Remove-Item -LiteralPath $backupPath -Force -ErrorAction SilentlyContinue + } catch { + $signingFailure = $_ + $rollbackOutcome = 'not-required' + if ($null -ne $signedArtifactLock) { + $signedArtifactLock.Dispose() + $signedArtifactLock = $null + } + if ($replaced) { + if (-not (Test-Path -LiteralPath $backupPath -PathType Leaf)) { + $rollbackOutcome = 'rollback-failed: Rollback backup is missing.' + } else { + try { + Restore-WaggleReplacedArtifact ` + -ArtifactPath $artifact -BackupPath $backupPath ` + -ExpectedOriginalSha256 $sourceHash ` + -ExpectedHardLinkPaths $expectedRollbackPaths + $rollbackOutcome = 'restored-original' + } catch { + $rollbackOutcome = "rollback-failed: $($_.Exception.Message)" + } + } + } + try { + Fail-WaggleSigningSession ` + $session $reservation 'callback_failure' ` + $signingFailure.Exception.Message $rollbackOutcome | Out-Null + } catch { + throw "Signing callback failed: $($signingFailure.Exception.Message) Terminalization also failed: $($_.Exception.Message)" + } + throw $signingFailure + } finally { + if ($null -ne $toolsetLocks) { + foreach ($toolsetLock in $toolsetLocks) { $toolsetLock.Dispose() } + } + if ($null -ne $signedArtifactLock) { $signedArtifactLock.Dispose() } + if ($null -ne $signToolLock) { $signToolLock.Dispose() } + if ($null -ne $stagingRoot) { + Remove-Item -LiteralPath $stagingRoot -Recurse -Force -ErrorAction SilentlyContinue + } + } + } finally { + foreach ($sessionLock in $session.Locks) { $sessionLock.Dispose() } + } + + Write-Host "Azure Artifact Signing verified: $artifact" +} + +if ($MyInvocation.InvocationName -ne '.') { + if ($TrustedPowerShellHost) { + if ($Mode -ceq 'Package') { + Invoke-WaggleSigningPackage + } else { + if ([string]::IsNullOrWhiteSpace($ArtifactPath)) { + throw 'Signing callback requires an artifact path.' + } + Invoke-WaggleArtifactSigning -Path $ArtifactPath + } + } else { + Invoke-TrustedPowerShellRelaunch ` + -LaunchMode $Mode -Path $ArtifactPath ` + -PackageSource $ArtifactSigningPackageSource ` + -ToolchainRoot $PortableToolchainRoot ` + -Node $PortableNodePath -Git $PortableGitPath -SevenZip $PortableSevenZipPath ` + -ToolchainReceipt $PortableToolchainReceiptPath ` + -ToolchainReceiptSha256 $PortableToolchainReceiptSha256 + } +} diff --git a/app/scripts/sign-windows-artifact.test.ps1 b/app/scripts/sign-windows-artifact.test.ps1 new file mode 100644 index 0000000..0717706 --- /dev/null +++ b/app/scripts/sign-windows-artifact.test.ps1 @@ -0,0 +1,2772 @@ +#Requires -Version 7.0 + +Set-StrictMode -Version Latest +$ErrorActionPreference = 'Stop' + +$wrapperPath = Join-Path $PSScriptRoot 'sign-windows-artifact.ps1' +. $wrapperPath -ArtifactPath 'C:\unused.exe' + +$passed = 0 + +function Assert-Equal { + param($Actual, $Expected, [string]$Label) + if ($Actual -cne $Expected) { throw "$Label expected '$Expected', got '$Actual'." } + $script:passed++ +} + +function Assert-Throws { + param([scriptblock]$Action, [string]$Pattern, [string]$Label) + try { + & $Action + } catch { + if ($_.Exception.Message -notmatch $Pattern) { + throw "$Label threw the wrong error: $($_.Exception.Message)" + } + $script:passed++ + return + } + throw "$Label did not throw." +} + +function Write-JsonNoBom { + param([string]$Path, [object]$Value) + [IO.File]::WriteAllText( + $Path, + ($Value | ConvertTo-Json -Depth 32 -Compress), + [Text.UTF8Encoding]::new($false) + ) +} + +function New-SyntheticPe { + param([string]$Path, [byte]$Marker = 0) + [IO.Directory]::CreateDirectory((Split-Path $Path -Parent)) | Out-Null + $bytes = [byte[]]::new(128) + $bytes[0] = 0x4D + $bytes[1] = 0x5A + [BitConverter]::GetBytes([uint32]0x40).CopyTo($bytes, 0x3C) + $bytes[0x40] = 0x50 + $bytes[0x41] = 0x45 + $bytes[0x42] = 0 + $bytes[0x43] = 0 + $bytes[127] = $Marker + [IO.File]::WriteAllBytes($Path, $bytes) +} + +function New-SyntheticPatchablePe { + param([string]$Path) + [IO.Directory]::CreateDirectory((Split-Path $Path -Parent)) | Out-Null + $bytes = [byte[]]::new(256) + $bytes[0] = 0x4D + $bytes[1] = 0x5A + [BitConverter]::GetBytes([uint32]0x40).CopyTo($bytes, 0x3C) + $bytes[0x40] = 0x50 + $bytes[0x41] = 0x45 + $token = [Text.Encoding]::ASCII.GetBytes('__TAURI_BUNDLE_TYPE_VAR_UNK') + [Array]::Copy($token, 0, $bytes, 160, $token.Length) + [IO.File]::WriteAllBytes($Path, $bytes) +} + +function Get-Sha256 { + param([string]$Path) + return (Get-FileHash -LiteralPath $Path -Algorithm SHA256).Hash +} + +function Get-RealSha256 { + param([string]$Path) + $stream = [IO.File]::Open( + $Path, + [IO.FileMode]::Open, + [IO.FileAccess]::Read, + [IO.FileShare]::Read + ) + $algorithm = [Security.Cryptography.SHA256]::Create() + try { + return ([BitConverter]::ToString($algorithm.ComputeHash($stream)) -replace '-', '') + } finally { + $algorithm.Dispose() + $stream.Dispose() + } +} + +function New-PendingLedger { + param([string]$SessionId, [string]$ManifestSha256, [object[]]$Slots) + return [pscustomobject][ordered]@{ + schemaVersion = 3 + sessionId = $SessionId + manifestSha256 = $ManifestSha256 + state = 'open' + terminalAtUtc = $null + terminalReceiptSha256 = $null + entries = @($Slots | ForEach-Object { + [pscustomobject][ordered]@{ + slotId = [string]$_.id + order = [int]$_.order + kind = [string]$_.kind + status = 'pending' + attempts = 0 + reservationId = $null + path = $null + preSignSha256 = $null + reservedAtUtc = $null + completedAtUtc = $null + postSignSha256 = $null + signerSubject = $null + } + }) + } +} + +function Close-PrebuiltTreeLease { + param([AllowNull()] [object]$Lease) + if ($null -eq $Lease) { return } + $locksProperty = $Lease.PSObject.Properties['Locks'] + $locks = if ($null -eq $locksProperty) { @($Lease) } else { @($locksProperty.Value) } + foreach ($lock in $locks) { + if ($null -ne $lock) { $lock.Dispose() } + } +} + +function Assert-FreshProcessModuleIsolation { + param( + [Parameter(Mandatory = $true)] [string]$HostPath, + [Parameter(Mandatory = $true)] [string]$Label, + [Parameter(Mandatory = $true)] [string]$Root + ) + + $hostRoot = Join-Path $Root ([IO.Path]::GetFileNameWithoutExtension($HostPath)) + $hostileModuleRoot = Join-Path $hostRoot 'hostile-modules' + $markerPath = Join-Path $hostRoot 'hostile-module-loaded.txt' + $childPath = Join-Path $hostRoot 'module-isolation-child.ps1' + [IO.Directory]::CreateDirectory($hostileModuleRoot) | Out-Null + foreach ($moduleName in @( + 'Microsoft.PowerShell.Security', + 'Microsoft.PowerShell.Management', + 'Microsoft.PowerShell.Utility' + )) { + $moduleRoot = Join-Path $hostileModuleRoot $moduleName + [IO.Directory]::CreateDirectory($moduleRoot) | Out-Null + $modulePath = Join-Path $moduleRoot "$moduleName.psm1" + $manifestPath = Join-Path $moduleRoot "$moduleName.psd1" + [IO.File]::WriteAllText( + $modulePath, + "[IO.File]::AppendAllText('$($markerPath.Replace("'", "''"))', '$moduleName')`n" + + "function Get-AuthenticodeSignature { throw 'hostile command' }`n" + + "function Get-Acl { throw 'hostile command' }`n" + + "function Set-Acl { throw 'hostile command' }`n" + + "function Get-FileHash { throw 'hostile command' }`n" + + 'Export-ModuleMember -Function *', + [Text.UTF8Encoding]::new($false) + ) + New-ModuleManifest -Path $manifestPath -RootModule "$moduleName.psm1" ` + -ModuleVersion '99.0.0' -FunctionsToExport '*' | Out-Null + } + $childSource = @' +param([string]$WrapperPath, [string]$HostileModuleRoot, [string]$MarkerPath) +$ErrorActionPreference = 'Stop' +[Environment]::SetEnvironmentVariable('PSModulePath', $HostileModuleRoot, 'Process') +$global:PSModuleAutoLoadingPreference = 'All' +. $WrapperPath -ArtifactPath 'C:\unused.exe' +$trustedRoot = [IO.Path]::GetFullPath([IO.Path]::Combine($PSHOME, 'Modules')) +$expected = @{ + 'Get-AuthenticodeSignature' = 'Microsoft.PowerShell.Security' + 'Get-Acl' = 'Microsoft.PowerShell.Security' + 'Set-Acl' = 'Microsoft.PowerShell.Security' +} +if ($PSVersionTable.PSEdition -ceq 'Core') { + $expected['Get-FileHash'] = 'Microsoft.PowerShell.Utility' +} +foreach ($entry in $expected.GetEnumerator()) { + $command = Get-Command $entry.Key -CommandType Cmdlet -ErrorAction Stop + $expectedPath = [IO.Path]::Combine($trustedRoot, $entry.Value, "$($entry.Value).psd1") + if (-not [string]::Equals( + [IO.Path]::GetFullPath([string]$command.Module.Path), + [IO.Path]::GetFullPath($expectedPath), + [StringComparison]::OrdinalIgnoreCase + )) { + throw "Command '$($entry.Key)' resolved outside the trusted module root." + } +} +if ([IO.File]::Exists($MarkerPath)) { throw 'A hostile PowerShell module was loaded.' } +'module-isolation-ok' +'@ + [IO.File]::WriteAllText($childPath, $childSource, [Text.UTF8Encoding]::new($false)) + $output = & $HostPath -NoLogo -NoProfile -NonInteractive ` + -ExecutionPolicy Bypass -File $childPath ` + -WrapperPath $wrapperPath -HostileModuleRoot $hostileModuleRoot ` + -MarkerPath $markerPath 2>&1 + if ($LASTEXITCODE -ne 0 -or @($output | Where-Object { $_ -ceq 'module-isolation-ok' }).Count -ne 1) { + throw "$Label hostile PSModulePath isolation failed: $($output -join ' | ')" + } + if (Test-Path -LiteralPath $markerPath) { + throw "$Label imported a hostile PowerShell module." + } + $script:passed++ +} + +function Start-SynchronizedChild { + param( + [Parameter(Mandatory = $true)] [string]$PowerShellPath, + [Parameter(Mandatory = $true)] [string]$ScriptPath, + [Parameter(Mandatory = $true)] [hashtable]$Arguments + ) + $argumentList = [Collections.Generic.List[string]]::new() + foreach ($argument in @( + '-NoLogo', '-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', + '-File', ('"' + $ScriptPath + '"') + )) { + $argumentList.Add($argument) + } + foreach ($entry in $Arguments.GetEnumerator()) { + $argumentList.Add("-$($entry.Key)") + $argumentList.Add('"' + ([string]$entry.Value).Replace('"', '\"') + '"') + } + return Start-Process -FilePath $PowerShellPath -ArgumentList @($argumentList) ` + -WindowStyle Hidden -PassThru +} + +function Wait-ForChildBarriers { + param([string[]]$Paths, [string]$Label) + $deadline = [DateTimeOffset]::UtcNow.AddSeconds(30) + while (@($Paths | Where-Object { -not (Test-Path -LiteralPath $_ -PathType Leaf) }).Count -ne 0) { + if ([DateTimeOffset]::UtcNow -gt $deadline) { + throw "Timed out waiting for $Label child barriers." + } + Start-Sleep -Milliseconds 20 + } +} + +$releaseRoot = 'D:\repo\app\src-tauri\target\x86_64-pc-windows-msvc\release' +$resourcesRoot = 'D:\repo\app\src-tauri\resources' +$tempRoot = 'D:\repo\app\src-tauri\target\.signing-temp\run-123456' +$version = '0.2.0' + +$installedTauriRoot = Join-Path ` + (Split-Path $PSScriptRoot -Parent) 'node_modules\@tauri-apps\cli' +$installedNativeRoot = Join-Path ` + (Split-Path $PSScriptRoot -Parent) 'node_modules\@tauri-apps\cli-win32-x64-msvc' +foreach ($binding in @( + @((Join-Path $installedTauriRoot 'tauri.js'), $TauriCliSha256, 'installed Tauri entry'), + @((Join-Path $installedTauriRoot 'main.js'), $TauriCliMainSha256, 'installed Tauri main'), + @((Join-Path $installedTauriRoot 'index.js'), $TauriCliIndexSha256, 'installed Tauri loader'), + @((Join-Path $installedNativeRoot 'package.json'), $TauriNativePackageSha256, 'installed Tauri native package'), + @((Join-Path $installedNativeRoot 'cli.win32-x64-msvc.node'), $TauriNativeBinarySha256, 'installed Tauri native binary') + )) { + Assert-Equal (Get-Sha256 $binding[0]) $binding[1] $binding[2] +} +$wrapperSource = Get-Content -Raw -LiteralPath $wrapperPath +if ($wrapperSource -match "ValidateSet\('Callback',\s*'Build'\)" -or + $wrapperSource -match 'function\s+Invoke-WaggleSigningBuild' -or + $wrapperSource -match 'function\s+Assert-WaggleSigningBuildComplete' -or + $wrapperSource -match "Mode\s+-ceq\s+'Build'") { + throw 'Production Artifact Signing still exposes the rejected local Build issuer.' +} +if ($wrapperSource -notmatch "ValidateSet\('Callback',\s*'Package'\)" -or + $wrapperSource -notmatch 'function\s+Invoke-WaggleSigningPackage' -or + $wrapperSource -notmatch 'function\s+Assert-WaggleSigningPackageComplete') { + throw 'Production Artifact Signing lacks the hosted-only Package issuer.' +} +foreach ($portableParameter in @( + 'PortableToolchainRoot', 'PortableNodePath', + 'PortableGitPath', 'PortableSevenZipPath' + )) { + if ($wrapperSource -notmatch "\[string\]\`$$portableParameter") { + throw "Hosted Package mode lacks the explicit $portableParameter input." + } + $passed++ +} +$portableEnvironmentNames = @( + 'WAGGLE_SIGNING_PORTABLE_TOOLCHAIN_ROOT', + 'WAGGLE_SIGNING_PORTABLE_NODE_PATH', + 'WAGGLE_SIGNING_PORTABLE_GIT_PATH', + 'WAGGLE_SIGNING_PORTABLE_SEVEN_ZIP_PATH' +) +foreach ($portableEnvironmentName in $portableEnvironmentNames) { + if ($wrapperSource -notmatch [Regex]::Escape($portableEnvironmentName)) { + throw "Signing callbacks do not receive $portableEnvironmentName." + } + $passed++ +} +if ($wrapperSource -notmatch 'function\s+Get-WagglePortableToolchain' -or + $wrapperSource -notmatch 'portableToolchainRoot' -or + $wrapperSource -notmatch 'sevenZipDllPath' -or + $wrapperSource -notmatch 'sevenZipDllSha256') { + throw 'Portable signing tools are not path-, manifest-, and closure-bound.' +} +$passed++ +if ($wrapperSource -notmatch [Regex]::Escape( + 'CN=.NET, O=Microsoft Corporation, L=Redmond, S=Washington, C=US' + ) -or + $wrapperSource -notmatch + 'Assert-MicrosoftAuthenticodeFile\s+\$dotnet\s+''\.NET host''\s+\$null\s+\$DotNetPublisher') { + throw '.NET 8 validation is not bound to the exact repository-pinned .NET signer.' +} +$passed++ +if ($wrapperSource -notmatch 'Restore-WaggleReplacedArtifact\s+`?\s*-ArtifactPath') { + throw 'Production signing callback does not use the verified rollback path.' +} +$passed++ +foreach ($hostBoundaryName in @( + 'GITHUB_ACTIONS', 'GITHUB_EVENT_NAME', 'RUNNER_ENVIRONMENT', + 'GITHUB_REPOSITORY', 'GITHUB_SHA', 'GITHUB_REF', + 'GITHUB_REF_TYPE', 'GITHUB_REF_NAME', 'GITHUB_WORKFLOW_REF', + 'GITHUB_WORKFLOW_SHA' + )) { + if ($wrapperSource -notmatch [Regex]::Escape($hostBoundaryName)) { + throw "Hosted Package mode does not bind $hostBoundaryName." + } + $passed++ +} +foreach ($hostBoundaryPattern in @( + "GITHUB_EVENT_NAME\s*=\s*'push'", + 'GITHUB_REF\s*=\s*\$expectedRef', + 'GITHUB_WORKFLOW_REF\s*=\s*\$expectedWorkflowRef', + 'GITHUB_WORKFLOW_SHA\s*=\s*\$ExpectedRevision' + )) { + if ($wrapperSource -notmatch $hostBoundaryPattern) { + throw "Hosted Package mode lacks exact boundary binding: $hostBoundaryPattern" + } + $passed++ +} +$validBoundaryRevision = '0123456789abcdef0123456789abcdef01234567' +$validBoundaryVersion = '0.2.0' +$validHostedBoundary = [ordered]@{ + GITHUB_ACTIONS = 'true' + GITHUB_EVENT_NAME = 'push' + RUNNER_ENVIRONMENT = 'github-hosted' + GITHUB_REPOSITORY = 'marolinik/waggle-os' + GITHUB_SHA = $validBoundaryRevision + GITHUB_REF = 'refs/tags/v0.2.0' + GITHUB_REF_TYPE = 'tag' + GITHUB_REF_NAME = 'v0.2.0' + GITHUB_WORKFLOW_REF = 'marolinik/waggle-os/.github/workflows/release.yml@refs/tags/v0.2.0' + GITHUB_WORKFLOW_SHA = $validBoundaryRevision +} +$savedHostedBoundary = @{} +foreach ($name in $validHostedBoundary.Keys) { + $savedHostedBoundary[$name] = [Environment]::GetEnvironmentVariable($name) +} +try { + foreach ($name in $validHostedBoundary.Keys) { + [Environment]::SetEnvironmentVariable($name, $validHostedBoundary[$name]) + } + Assert-WaggleHostedSigningBoundary ` + -ExpectedRevision $validBoundaryRevision ` + -ExpectedVersion $validBoundaryVersion + $passed++ + foreach ($name in $validHostedBoundary.Keys) { + [Environment]::SetEnvironmentVariable($name, "invalid-$name") + Assert-Throws { + Assert-WaggleHostedSigningBoundary ` + -ExpectedRevision $validBoundaryRevision ` + -ExpectedVersion $validBoundaryVersion + } "exact $([Regex]::Escape($name)) boundary evidence" ` + "hosted signing rejects mutated $name" + [Environment]::SetEnvironmentVariable($name, $validHostedBoundary[$name]) + } +} finally { + foreach ($name in $validHostedBoundary.Keys) { + [Environment]::SetEnvironmentVariable($name, $savedHostedBoundary[$name]) + } +} +$wrapperTokens = $null +$wrapperParseErrors = $null +$wrapperAst = [Management.Automation.Language.Parser]::ParseFile( + $wrapperPath, [ref]$wrapperTokens, [ref]$wrapperParseErrors +) +if (@($wrapperParseErrors).Count -ne 0) { + throw "Signing wrapper does not parse: $($wrapperParseErrors[0].Message)" +} +$packageFunctions = @($wrapperAst.FindAll({ + param($node) + $node -is [Management.Automation.Language.FunctionDefinitionAst] -and + $node.Name -ceq 'Invoke-WaggleSigningPackage' +}, $true)) +if ($packageFunctions.Count -ne 1 -or + $packageFunctions[0].Extent.Text -match + 'BuildScriptPaths|ViteCliPath|bundleNode|buildSidecar|bundleNativeDeps|stageSidecarDeps|tauri:build') { + throw 'Hosted Package mode still contains the rejected local source-build closure.' +} +$passed++ +$packageSource = $packageFunctions[0].Extent.Text +if ([regex]::Matches($packageSource, 'New-WagglePrebuiltWorkCopy').Count -ne 2 -or + [regex]::Matches($packageSource, 'Clear-WaggleRegeneratedRoots').Count -ne 2 -or + $packageSource -notmatch "SetEnvironmentVariable\('CARGO_TARGET_DIR',\s*\`$unsignedWorkRoot\)" -or + $packageSource -notmatch "SetEnvironmentVariable\('CARGO_TARGET_DIR',\s*\`$signingWorkRoot\)" -or + $packageSource -match "SetEnvironmentVariable\('CARGO_TARGET_DIR',\s*\`$(?:unsigned|signing)SourceRoot\)" -or + $packageSource -notmatch '(?s)New-WaggleSigningManifest.*?\$preflightEvidenceRoot.*?\$receipt' -or + $packageSource -notmatch '(?s)Unsigned hosted prebuilt input.*?Remove-Item\s+-LiteralPath\s+\$unsignedWorkRoot.*?Signing hosted prebuilt input' -or + $packageSource -notmatch '(?s)Unsigned private work tree.*?Clear-WaggleRegeneratedRoots.*?Unsigned immutable NSIS preflight package' -or + $packageSource -notmatch '(?s)Signing private work tree.*?Clear-WaggleRegeneratedRoots.*?Signed NSIS bundle' -or + [regex]::Matches($packageSource, 'Assert-WaggleHostedDiskCapacity').Count -ne 2) { + throw 'Hosted Package mode does not isolate immutable receipt inputs in private work copies.' +} +$passed++ +if ($packageSource -notmatch '(?s)Open-ReadLock\s+\$overridePath.*?Unsigned immutable NSIS preflight package' -or + $wrapperSource -notmatch '(?s)function\s+Open-WagglePackageToolchainLocks.*?app/src-tauri/icons/icon\.ico.*?status\s+--porcelain=v1.*?Assert-WaggleHostedSigningBoundary') { + throw 'Hosted Package mode does not lock exact-HEAD packaging inputs and its unsigned override.' +} +$passed++ +if ($wrapperSource -notmatch "(?s)if\s*\(\`$replaced\)\s*\{.*?Rollback backup is missing") { + throw 'Signing callback does not report a missing required rollback backup as a rollback failure.' +} +$passed++ +if ($wrapperSource -notmatch "PSModuleAutoLoadingPreference\s*=\s*'None'" -or + $wrapperSource -notmatch "SetEnvironmentVariable\(\s*'PSModulePath'") { + throw 'Production Artifact Signing does not harden PowerShell module resolution before trust checks.' +} +$passed++ +if ($wrapperSource -match 'NpmCliPath\s+run|npm\s+run\s+tauri:build') { + throw 'Production signing build still invokes the PATH-dependent npm build script.' +} +$passed++ +foreach ($environmentName in @( + 'NODE_OPTIONS', 'NODE_PATH', 'NAPI_RS_NATIVE_LIBRARY_PATH', + 'NAPI_RS_FORCE_WASI', 'npm_config_node_options' + )) { + if ($wrapperSource -notmatch "SetEnvironmentVariable\('$environmentName', \`$null\)") { + throw "Production signing build does not sanitize $environmentName." + } + $passed++ +} +if ($packageSource -notmatch '(?s)foreach\s*\(\$name\s+in\s+\$environmentNames\).*?\$savedEnvironment\[\$name\].*?finally\s*\{.*?SetEnvironmentVariable\(\$name,\s*\$savedEnvironment\[\$name\]\)' -or + $wrapperSource -notmatch "@\('-PortableToolchainRoot',\s*\`$ToolchainRoot\)" -or + $wrapperSource -notmatch "@\('-PortableNodePath',\s*\`$Node\)" -or + $wrapperSource -notmatch "@\('-PortableGitPath',\s*\`$Git\)" -or + $wrapperSource -notmatch "@\('-PortableSevenZipPath',\s*\`$SevenZip\)") { + throw 'Portable toolchain inputs are not forwarded and transactionally restored.' +} +$passed++ + +& { + $handoffPath = Join-Path $PSScriptRoot 'new-windows-signing-handoff.ps1' + . $handoffPath -SourceTargetRoot 'C:\unused' -DestinationRoot 'C:\unused' + + Assert-Equal $MaxTargetFileCount 18000 'handoff target file-count production bound' + Assert-Equal $MaxTargetBytes ([long]768MB) 'handoff target byte production bound' + Assert-Equal $MaxResourceFileCount 17500 'handoff resource file-count production bound' + Assert-Equal $MaxResourceBytes ([long]600MB) 'handoff resource byte production bound' + + $handoffFixtureRoot = Join-Path ` + ([IO.Path]::GetTempPath()) ` + "waggle-handoff-test-$([Guid]::NewGuid().ToString('N'))" + [IO.Directory]::CreateDirectory($handoffFixtureRoot) | Out-Null + $handoffReparsePath = $null + try { + $sourceRoot = Join-Path $handoffFixtureRoot 'source' + $sourceDependency = Join-Path $sourceRoot 'release\deps\waggle.exe' + $sourceMain = Join-Path $sourceRoot 'release\waggle.exe' + $sourceResource = Join-Path $sourceRoot 'resources\service.js' + $sourceResourceTwo = Join-Path $sourceRoot 'resources\model.json' + $sourceNsis = Join-Path $sourceRoot 'nsis\makensis.exe' + $sourceNsisDll = Join-Path $sourceRoot 'nsis\plugin.dll' + [IO.Directory]::CreateDirectory((Split-Path $sourceDependency -Parent)) | Out-Null + [IO.Directory]::CreateDirectory((Split-Path $sourceResource -Parent)) | Out-Null + [IO.Directory]::CreateDirectory((Split-Path $sourceNsis -Parent)) | Out-Null + New-SyntheticPe $sourceDependency 211 + New-Item -ItemType HardLink -Path $sourceMain -Target $sourceDependency | Out-Null + [IO.File]::WriteAllText($sourceResource, 'receipt-bound-service') + [IO.File]::WriteAllText($sourceResourceTwo, '{"model":"fixture"}') + [IO.File]::WriteAllText($sourceNsis, 'fixture-makensis') + [IO.File]::WriteAllText($sourceNsisDll, 'fixture-plugin') + + $targetMappings = @( + [pscustomobject]@{ + Source = $sourceMain + Path = "$TargetTriple\release\waggle.exe" + }, + [pscustomobject]@{ + Source = $sourceDependency + Path = "$TargetTriple\release\deps\waggle.exe" + }, + [pscustomobject]@{ Source = $sourceResource; Path = 'resources\service.js' }, + [pscustomobject]@{ Source = $sourceResourceTwo; Path = 'resources\model.json' } + ) + $resourceMappings = @( + [pscustomobject]@{ Source = $sourceResource; Path = 'service.js' }, + [pscustomobject]@{ Source = $sourceResourceTwo; Path = 'model.json' } + ) + $nsisMappings = @( + [pscustomobject]@{ Source = $sourceNsis; Path = 'makensis.exe' }, + [pscustomobject]@{ Source = $sourceNsisDll; Path = 'plugins\plugin.dll' } + ) + $expectedTarget = New-HandoffInventory $targetMappings 'Fixture target' + $expectedResources = New-HandoffInventory $resourceMappings 'Fixture resources' + $expectedNsis = New-HandoffInventory $nsisMappings 'Fixture NSIS' + $sourceRevision = 'a' * 40 + $checkerSha256 = 'B' * 64 + $transactionArguments = @{ + DestinationParentRoot = $handoffFixtureRoot + TargetMappings = $targetMappings + ResourceMappings = $resourceMappings + NsisMappings = $nsisMappings + ExpectedTargetInventory = $expectedTarget + ExpectedResourcesInventory = $expectedResources + ExpectedNsisInventory = $expectedNsis + SourceRevision = $sourceRevision + CheckerSha256 = $checkerSha256 + TargetFileCountLimit = 8 + TargetByteLimit = 1MB + ResourceFileCountLimit = 4 + ResourceByteLimit = 1MB + NsisFileCountLimit = 4 + NsisByteLimit = 1MB + } + + $acceptedDestination = Join-Path $handoffFixtureRoot 'accepted' + $accepted = Invoke-HandoffDestinationTransaction ` + -DestinationRoot $acceptedDestination @transactionArguments + Assert-Equal ` + (Test-Path -LiteralPath $accepted.ReceiptPath -PathType Leaf) $true ` + 'handoff transaction publishes a receipt' + Assert-Equal ` + (Get-HandoffFileSha256 $accepted.ReceiptPath) $accepted.ReceiptSha256 ` + 'handoff receipt digest binds exact bytes' + $acceptedReceipt = Get-Content -Raw -LiteralPath $accepted.ReceiptPath | + ConvertFrom-Json -Depth 32 -DateKind String + Assert-Equal $acceptedReceipt.schemaVersion 1 'handoff receipt schema' + Assert-Equal $acceptedReceipt.repository $ApprovedRepository 'handoff receipt repository' + Assert-Equal $acceptedReceipt.sourceRevision $sourceRevision ` + 'handoff receipt source revision' + Assert-Equal $acceptedReceipt.targetInventory.sha256 $expectedTarget.sha256 ` + 'handoff receipt target inventory' + Assert-Equal $acceptedReceipt.resourcesInventory.sha256 $expectedResources.sha256 ` + 'handoff receipt resource inventory' + Assert-Equal $acceptedReceipt.nsisInventory.sha256 $expectedNsis.sha256 ` + 'handoff receipt NSIS inventory' + $acceptedRelease = Join-Path ` + $accepted.PrebuiltRoot "$TargetTriple\release" + Assert-HandoffCargoPair $acceptedRelease 'Accepted staged Cargo output' + $passed++ + + foreach ($boundProbe in @( + [pscustomobject]@{ Name = 'target-count'; Overrides = @{ TargetFileCountLimit = 3 } }, + [pscustomobject]@{ + Name = 'target-bytes' + Overrides = @{ + TargetByteLimit = ([long](Assert-HandoffMappingBounds ` + $targetMappings 8 1MB 'Fixture target bytes')) - 1 + } + }, + [pscustomobject]@{ Name = 'resource-count'; Overrides = @{ ResourceFileCountLimit = 1 } }, + [pscustomobject]@{ Name = 'nsis-count'; Overrides = @{ NsisFileCountLimit = 1 } } + )) { + $probeDestination = Join-Path $handoffFixtureRoot ([string]$boundProbe.Name) + $probeArguments = @{} + $transactionArguments + foreach ($override in $boundProbe.Overrides.GetEnumerator()) { + $probeArguments[$override.Key] = $override.Value + } + Assert-Throws { + Invoke-HandoffDestinationTransaction ` + -DestinationRoot $probeDestination @probeArguments | Out-Null + } 'deterministic file-count or byte bound' ` + "handoff $($boundProbe.Name) rejection" + Assert-Equal (Test-Path -LiteralPath $probeDestination) $false ` + "handoff $($boundProbe.Name) leaves no destination" + } + + $tamperedDestination = Join-Path $handoffFixtureRoot 'tampered-stage' + Assert-Throws { + Invoke-HandoffDestinationTransaction ` + -DestinationRoot $tamperedDestination @transactionArguments ` + -FinalSourceAssertion { + param([string]$StagedRoot) + [IO.File]::WriteAllText( + (Join-Path $StagedRoot 'resources\service.js'), + 'tampered-after-copy' + ) + } | Out-Null + } 'inventory changed during handoff staging' ` + 'handoff tampered staged inventory rejection' + Assert-Equal (Test-Path -LiteralPath $tamperedDestination) $false ` + 'handoff tamper rollback removes the entire destination' + + $collisionMappings = @($resourceMappings) + @( + [pscustomobject]@{ Source = $sourceResource; Path = 'SERVICE.JS' } + ) + Assert-Throws { + New-HandoffInventory $collisionMappings 'Fixture collision' | Out-Null + } 'duplicate path or case-insensitive collision' ` + 'handoff case-insensitive collision rejection' + Assert-Throws { + Invoke-HandoffDestinationTransaction ` + -DestinationRoot (Join-Path $handoffFixtureRoot '..\escape') ` + @transactionArguments | Out-Null + } 'safe, fully qualified local Windows path|absent direct child' ` + 'handoff unsafe destination rejection' + + $adsRoot = Join-Path $handoffFixtureRoot 'ads-tree' + [IO.Directory]::CreateDirectory($adsRoot) | Out-Null + $adsFile = Join-Path $adsRoot 'payload.bin' + [IO.File]::WriteAllText($adsFile, 'visible') + [IO.File]::WriteAllText("${adsFile}:hidden", 'hidden') + Assert-Throws { + Get-HandoffTreeFiles $adsRoot 'Fixture ADS tree' | Out-Null + } 'alternate data stream' 'handoff ADS rejection' + + $reparseTarget = Join-Path $handoffFixtureRoot 'reparse-target' + $reparseRoot = Join-Path $handoffFixtureRoot 'reparse-tree' + [IO.Directory]::CreateDirectory($reparseTarget) | Out-Null + [IO.Directory]::CreateDirectory($reparseRoot) | Out-Null + [IO.File]::WriteAllText((Join-Path $reparseTarget 'payload.bin'), 'outside') + $handoffReparsePath = Join-Path $reparseRoot 'linked' + New-Item -ItemType Junction -Path $handoffReparsePath ` + -Target $reparseTarget | Out-Null + Assert-Throws { + Get-HandoffTreeFiles $reparseRoot 'Fixture reparse tree' | Out-Null + } 'reparse point|linked directory' 'handoff reparse rejection' + + $git = [string]( + Get-Command git.exe -CommandType Application -ErrorAction Stop | + Select-Object -First 1 -ExpandProperty Source + ) + $repoFixture = Join-Path $handoffFixtureRoot 'repo' + [IO.Directory]::CreateDirectory($repoFixture) | Out-Null + & $git -C $repoFixture init --quiet + & $git -C $repoFixture config user.email 'handoff-test@invalid.example' + & $git -C $repoFixture config user.name 'Waggle Handoff Test' + for ($index = 0; $index -lt 101; $index++) { + [IO.File]::WriteAllText( + (Join-Path $repoFixture ("input-{0:D3}.txt" -f $index)), + "canonical-$index", + [Text.UTF8Encoding]::new($false) + ) + } + & $git -C $repoFixture add -- . + & $git -C $repoFixture commit --quiet -m 'fixture' + & $git -C $repoFixture tag v1.0.0 + $fixtureRevision = [string](& $git -C $repoFixture rev-parse HEAD) + $trackedFixture = @('input-000.txt') + Assert-HandoffRepositoryState ` + $git $repoFixture $fixtureRevision '1.0.0' $trackedFixture + $passed++ + [IO.File]::AppendAllText((Join-Path $repoFixture 'input-000.txt'), 'dirty') + Assert-Throws { + Assert-HandoffRepositoryState ` + $git $repoFixture $fixtureRevision '1.0.0' $trackedFixture + } 'clean exact tagged' 'handoff dirty repository rejection' + & $git -C $repoFixture checkout --quiet -- input-000.txt + & $git -C $repoFixture tag -d v1.0.0 | Out-Null + Assert-Throws { + Assert-HandoffRepositoryState ` + $git $repoFixture $fixtureRevision '1.0.0' $trackedFixture 2>$null + } 'clean exact tagged' 'handoff missing release tag rejection' + & $git -C $repoFixture tag v1.0.0 + & $git -C $repoFixture update-index --skip-worktree input-000.txt + Assert-Throws { + Assert-HandoffRepositoryState ` + $git $repoFixture $fixtureRevision '1.0.0' $trackedFixture + } 'non-default tracked state' 'handoff skip-worktree index rejection' + & $git -C $repoFixture update-index --no-skip-worktree input-000.txt + } finally { + if ($null -ne $handoffReparsePath -and + (Test-Path -LiteralPath $handoffReparsePath)) { + [IO.Directory]::Delete($handoffReparsePath) + } + if (Test-Path -LiteralPath $handoffFixtureRoot) { + foreach ($fixtureItem in @(Get-ChildItem ` + -LiteralPath $handoffFixtureRoot -Force -Recurse)) { + if (($fixtureItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0) { + $fixtureItem.Attributes = [IO.FileAttributes]::Normal + } + } + [IO.Directory]::Delete($handoffFixtureRoot, $true) + } + } +} + +& { + $portableFixtureParent = Join-Path ` + ([IO.Path]::GetTempPath()) ` + "waggle-portable-tools-$([Guid]::NewGuid().ToString('N'))" + [IO.Directory]::CreateDirectory($portableFixtureParent) | Out-Null + $portableRoot = New-PrivateDirectory (Join-Path $portableFixtureParent 'private') + $node = Join-Path $portableRoot 'node\node.exe' + $git = Join-Path $portableRoot 'git\cmd\git.exe' + $gitRuntime = Join-Path $portableRoot 'git\mingw64\bin\git.exe' + $gitDependency = Join-Path $portableRoot 'git\mingw64\bin\libcrypto-3-x64.dll' + $sevenZip = Join-Path $portableRoot 'sevenzip\7z.exe' + $sevenZipDll = Join-Path $portableRoot 'sevenzip\7z.dll' + $outsideNode = Join-Path $portableFixtureParent 'outside-node.exe' + foreach ($path in @( + $node, $git, $gitRuntime, $gitDependency, + $sevenZip, $sevenZipDll, $outsideNode + )) { + [IO.Directory]::CreateDirectory((Split-Path $path -Parent)) | Out-Null + [IO.File]::WriteAllText($path, "fixture:$([IO.Path]::GetFileName($path))") + } + + function Get-FileHash { + param([string]$LiteralPath, [string]$Algorithm) + if ($null -ne (Get-Variable receiptPath -ErrorAction SilentlyContinue) -and + [string]::Equals( + [IO.Path]::GetFullPath($LiteralPath), + [IO.Path]::GetFullPath($receiptPath), + [StringComparison]::OrdinalIgnoreCase + )) { + return [pscustomobject]@{ Hash = Get-RealSha256 $LiteralPath } + } + $content = [IO.File]::ReadAllText($LiteralPath) + $hash = if ($content -match 'tampered') { + '0' * 64 + } else { + switch ([IO.Path]::GetFileName($LiteralPath)) { + 'node.exe' { $NodeSha256 } + 'git.exe' { + if ($LiteralPath -match 'mingw64') { $GitRuntimeSha256 } else { $GitSha256 } + } + '7z.exe' { $SevenZipSha256 } + '7z.dll' { $SevenZipDllSha256 } + 'node.zip' { $NodeArchiveSha256 } + 'mingit.zip' { $GitArchiveSha256 } + 'sevenzip.exe' { $SevenZipArchiveSha256 } + default { 'F' * 64 } + } + } + return [pscustomobject]@{ Hash = $hash } + } + + $archiveRoot = Join-Path $portableFixtureParent 'downloads' + [IO.Directory]::CreateDirectory($archiveRoot) | Out-Null + $nodeArchive = Join-Path $archiveRoot 'node.zip' + $gitArchive = Join-Path $archiveRoot 'mingit.zip' + $sevenZipArchive = Join-Path $archiveRoot 'sevenzip.exe' + foreach ($archive in @($nodeArchive, $gitArchive, $sevenZipArchive)) { + [IO.File]::WriteAllText($archive, 'fixture:vendor-archive') + } + $portableInventory = New-WagglePrebuiltInventory -Root $portableRoot + $receiptPath = Join-Path $portableFixtureParent 'portable-receipt.json' + Write-WaggleJsonNoBom $receiptPath ([ordered]@{ + schemaVersion = 1 + portableToolchainRoot = $portableRoot + archives = [ordered]@{ + node = [ordered]@{ path = $nodeArchive; sha256 = $NodeArchiveSha256 } + git = [ordered]@{ path = $gitArchive; sha256 = $GitArchiveSha256 } + sevenZip = [ordered]@{ path = $sevenZipArchive; sha256 = $SevenZipArchiveSha256 } + } + inventory = $portableInventory + }) + $portableReceiptJson = [IO.File]::ReadAllText($receiptPath) + $receiptSha256 = Get-RealSha256 $receiptPath + $savedPortableFileCount = $PortableToolchainFileCount + $savedPortableInventorySha256 = $PortableToolchainInventorySha256 + $PortableToolchainFileCount = @($portableInventory.entries).Count + $PortableToolchainInventorySha256 = $portableInventory.sha256 + + function Get-AuthenticodeSignature { + param([string]$LiteralPath) + $content = [IO.File]::ReadAllText($LiteralPath) + $subject = switch ([IO.Path]::GetFileName($LiteralPath)) { + 'node.exe' { $NodePublisher } + 'git.exe' { + if ($content -match 'wrong-publisher') { $MicrosoftPublisher } else { $GitPublisher } + } + 'dotnet.exe' { + if ($content -match 'wrong-publisher') { $MicrosoftPublisher } else { $DotNetPublisher } + } + default { $MicrosoftPublisher } + } + $oids = [Security.Cryptography.OidCollection]::new() + [void]$oids.Add([Security.Cryptography.Oid]::new($CodeSigningOid)) + $eku = [Security.Cryptography.X509Certificates.X509EnhancedKeyUsageExtension]::new( + $oids, + $false + ) + return [pscustomobject]@{ + Status = [Management.Automation.SignatureStatus]::Valid + SignatureType = 'Authenticode' + SignerCertificate = [pscustomobject]@{ + Subject = $subject + Extensions = @($eku) + } + } + } + + $portableEnvironmentNames = @( + 'WAGGLE_SIGNING_PORTABLE_TOOLCHAIN_ROOT', + 'WAGGLE_SIGNING_PORTABLE_NODE_PATH', + 'WAGGLE_SIGNING_PORTABLE_GIT_PATH', + 'WAGGLE_SIGNING_PORTABLE_SEVEN_ZIP_PATH', + 'WAGGLE_SIGNING_PORTABLE_RECEIPT_PATH', + 'WAGGLE_SIGNING_PORTABLE_RECEIPT_SHA256', + 'WAGGLE_SIGNING_MANIFEST_PATH', + 'WAGGLE_SIGNING_MANIFEST_SHA256' + ) + $savedPortableEnvironment = @{} + foreach ($name in $portableEnvironmentNames) { + $savedPortableEnvironment[$name] = [Environment]::GetEnvironmentVariable($name) + } + try { + $portable = Get-WagglePortableToolchain ` + $portableRoot $node $git $sevenZip $receiptPath $receiptSha256 + Assert-Equal $portable.NodePath $node 'portable Node path validation' + Assert-Equal $portable.GitPath $git 'portable Git path validation' + Assert-Equal $portable.GitRuntimePath $gitRuntime ` + 'portable Git runtime closure validation' + Assert-Equal $portable.SevenZipDllPath $sevenZipDll ` + 'portable 7-Zip closure validation' + foreach ($lock in $portable.Locks) { $lock.Dispose() } + + [IO.File]::AppendAllText( + $receiptPath, ' ', [Text.UTF8Encoding]::new($false) + ) + Assert-Throws { + Get-WagglePortableToolchain ` + $portableRoot $node $git $sevenZip $receiptPath $receiptSha256 + } 'does not match its handoff SHA-256' ` + 'portable raw receipt byte tamper with stale digest rejection' + [IO.File]::WriteAllText( + $receiptPath, $portableReceiptJson, [Text.UTF8Encoding]::new($false) + ) + + Assert-Throws { + Get-WagglePortableToolchain ` + $portableRoot $node $git $sevenZip $receiptPath ('E' * 64) + } 'does not match its handoff SHA-256' 'portable receipt handoff digest rejection' + + $mutatedReceipt = $portableReceiptJson | ConvertFrom-Json -Depth 32 + $mutatedReceipt.schemaVersion = 2 + Write-WaggleJsonNoBom $receiptPath $mutatedReceipt + Assert-Throws { + Get-WagglePortableToolchain ` + $portableRoot $node $git $sevenZip $receiptPath ` + (Get-RealSha256 $receiptPath) + } 'schemaVersion must be 1' 'portable receipt schema rejection' + [IO.File]::WriteAllText( + $receiptPath, $portableReceiptJson, [Text.UTF8Encoding]::new($false) + ) + + $mutatedReceipt = $portableReceiptJson | ConvertFrom-Json -Depth 32 + $mutatedReceipt.portableToolchainRoot = $portableFixtureParent + Write-WaggleJsonNoBom $receiptPath $mutatedReceipt + Assert-Throws { + Get-WagglePortableToolchain ` + $portableRoot $node $git $sevenZip $receiptPath ` + (Get-RealSha256 $receiptPath) + } 'receipt root' 'portable receipt root substitution rejection' + [IO.File]::WriteAllText( + $receiptPath, $portableReceiptJson, [Text.UTF8Encoding]::new($false) + ) + + $mutatedReceipt = $portableReceiptJson | ConvertFrom-Json -Depth 32 + $mutatedReceipt.archives.node.sha256 = '0' * 64 + Write-WaggleJsonNoBom $receiptPath $mutatedReceipt + Assert-Throws { + Get-WagglePortableToolchain ` + $portableRoot $node $git $sevenZip $receiptPath ` + (Get-RealSha256 $receiptPath) + } 'exact distinct repository-pinned handoff' ` + 'portable receipt recomputed archive hash rejection' + [IO.File]::WriteAllText( + $receiptPath, $portableReceiptJson, [Text.UTF8Encoding]::new($false) + ) + + $mutatedReceipt = $portableReceiptJson | ConvertFrom-Json -Depth 32 + $mutatedReceipt.archives.node.path = $gitArchive + Write-WaggleJsonNoBom $receiptPath $mutatedReceipt + Assert-Throws { + Get-WagglePortableToolchain ` + $portableRoot $node $git $sevenZip $receiptPath ` + (Get-RealSha256 $receiptPath) + } 'exact distinct repository-pinned handoff|does not match its pinned SHA-256' ` + 'portable receipt recomputed archive path rejection' + [IO.File]::WriteAllText( + $receiptPath, $portableReceiptJson, [Text.UTF8Encoding]::new($false) + ) + + $mutatedReceipt = $portableReceiptJson | ConvertFrom-Json -Depth 32 + $mutatedReceipt.inventory.sha256 = '0' * 64 + Write-WaggleJsonNoBom $receiptPath $mutatedReceipt + Assert-Throws { + Get-WagglePortableToolchain ` + $portableRoot $node $git $sevenZip $receiptPath ` + (Get-RealSha256 $receiptPath) + } 'repository-pinned full closure' ` + 'portable receipt recomputed inventory aggregate rejection' + [IO.File]::WriteAllText( + $receiptPath, $portableReceiptJson, [Text.UTF8Encoding]::new($false) + ) + + $mutatedReceipt = $portableReceiptJson | ConvertFrom-Json -Depth 32 + $mutatedReceipt.inventory.entries[0].sha256 = '0' * 64 + Write-WaggleJsonNoBom $receiptPath $mutatedReceipt + Assert-Throws { + Get-WagglePortableToolchain ` + $portableRoot $node $git $sevenZip $receiptPath ` + (Get-RealSha256 $receiptPath) + } 'inventory aggregate SHA-256 digest is invalid' ` + 'portable receipt recomputed inventory entry rejection' + [IO.File]::WriteAllText( + $receiptPath, $portableReceiptJson, [Text.UTF8Encoding]::new($false) + ) + + $mutatedReceipt = $portableReceiptJson | ConvertFrom-Json -Depth 32 + $mutatedReceipt.inventory.entries = @($mutatedReceipt.inventory.entries)[1..( + @($mutatedReceipt.inventory.entries).Count - 1 + )] + Write-WaggleJsonNoBom $receiptPath $mutatedReceipt + Assert-Throws { + Get-WagglePortableToolchain ` + $portableRoot $node $git $sevenZip $receiptPath ` + (Get-RealSha256 $receiptPath) + } 'repository-pinned full closure' ` + 'portable receipt recomputed inventory full-count rejection' + [IO.File]::WriteAllText( + $receiptPath, $portableReceiptJson, [Text.UTF8Encoding]::new($false) + ) + + $unexpectedDependency = Join-Path $portableRoot 'git\mingw64\bin\injected.dll' + [IO.File]::WriteAllText($unexpectedDependency, 'unexpected') + Assert-Throws { + Get-WagglePortableToolchain ` + $portableRoot $node $git $sevenZip $receiptPath $receiptSha256 + } 'missing, extra, or unexpected files' ` + 'portable unexpected adjacent dependency rejection' + [IO.File]::Delete($unexpectedDependency) + + [IO.File]::WriteAllText($gitDependency, 'tampered adjacent dependency') + Assert-Throws { + Get-WagglePortableToolchain ` + $portableRoot $node $git $sevenZip $receiptPath $receiptSha256 + } 'inventory SHA-256 digest and size' ` + 'portable mutated adjacent dependency rejection' + [IO.File]::WriteAllText($gitDependency, 'fixture:libcrypto-3-x64.dll') + + [IO.File]::Delete($gitDependency) + Assert-Throws { + Get-WagglePortableToolchain ` + $portableRoot $node $git $sevenZip $receiptPath $receiptSha256 + } 'missing, extra, or unexpected files' ` + 'portable missing adjacent dependency rejection' + [IO.File]::WriteAllText($gitDependency, 'fixture:libcrypto-3-x64.dll') + + [IO.File]::WriteAllText($node, 'tampered') + Assert-Throws { + Get-WagglePortableToolchain ` + $portableRoot $node $git $sevenZip $receiptPath $receiptSha256 + } 'inventory SHA-256 digest and size' 'portable Node tamper rejection' + [IO.File]::WriteAllText($node, 'fixture:node.exe') + + [IO.File]::WriteAllText($git, 'wrong-publisher') + Assert-Throws { + Get-WagglePortableToolchain ` + $portableRoot $node $git $sevenZip $receiptPath $receiptSha256 + } 'Git executable.*approved publisher' 'portable Git publisher rejection' + [IO.File]::WriteAllText($git, 'fixture:git.exe') + + Assert-Throws { + Get-WagglePortableToolchain ` + $portableRoot $outsideNode $git $sevenZip $receiptPath $receiptSha256 + } 'contained by the private portable toolchain root' ` + 'portable tool path containment rejection' + Assert-Throws { + Get-WagglePortableToolchain ` + $portableRoot $node $git $sevenZip $receiptPath $receiptSha256 ` + -DisallowedRoots @($portableFixtureParent) + } 'overlaps.*boundary' 'portable root overlap rejection' + + [Environment]::SetEnvironmentVariable( + 'WAGGLE_SIGNING_PORTABLE_TOOLCHAIN_ROOT', $portableRoot + ) + [Environment]::SetEnvironmentVariable('WAGGLE_SIGNING_PORTABLE_NODE_PATH', $node) + [Environment]::SetEnvironmentVariable('WAGGLE_SIGNING_PORTABLE_GIT_PATH', $git) + [Environment]::SetEnvironmentVariable('WAGGLE_SIGNING_PORTABLE_SEVEN_ZIP_PATH', $sevenZip) + [Environment]::SetEnvironmentVariable('WAGGLE_SIGNING_PORTABLE_RECEIPT_PATH', $receiptPath) + [Environment]::SetEnvironmentVariable('WAGGLE_SIGNING_PORTABLE_RECEIPT_SHA256', $receiptSha256) + [Environment]::SetEnvironmentVariable('WAGGLE_SIGNING_MANIFEST_PATH', $null) + [Environment]::SetEnvironmentVariable('WAGGLE_SIGNING_MANIFEST_SHA256', $null) + Assert-Throws { + Get-WaggleSigningToolchain + } 'active receipt-bound signing session' ` + 'portable callback outside receipt-bound session rejection' + $resolvedPortable = Get-WaggleSigningToolchain -AllowPortableBeforeManifest + Assert-Equal $resolvedPortable.PortableToolchainRoot $portableRoot ` + 'Package setup resolves exact portable root' + foreach ($lock in $resolvedPortable.Locks) { $lock.Dispose() } + [Environment]::SetEnvironmentVariable('WAGGLE_SIGNING_PORTABLE_NODE_PATH', $null) + Assert-Throws { + Get-WaggleSigningToolchain -AllowPortableBeforeManifest + } 'must provide the exact root, Node, Git, 7-Zip, receipt path, and receipt SHA-256' ` + 'partial portable environment rejection' + + $dotnetFixture = Join-Path $portableRoot 'dotnet.exe' + [IO.File]::WriteAllText($dotnetFixture, 'wrong-publisher') + Assert-Throws { + Assert-MicrosoftAuthenticodeFile ` + $dotnetFixture '.NET host' $null $DotNetPublisher + } 'approved publisher' 'generic Microsoft signer rejected for .NET host' + [IO.File]::WriteAllText($dotnetFixture, 'exact-dotnet-publisher') + Assert-MicrosoftAuthenticodeFile ` + $dotnetFixture '.NET host' $null $DotNetPublisher + $script:passed++ + } finally { + $PortableToolchainFileCount = $savedPortableFileCount + $PortableToolchainInventorySha256 = $savedPortableInventorySha256 + foreach ($name in $portableEnvironmentNames) { + [Environment]::SetEnvironmentVariable($name, $savedPortableEnvironment[$name]) + } + [IO.Directory]::Delete($portableFixtureParent, $true) + } +} + +Assert-Equal ` + (Get-ArtifactPolicyKind 'D:\repo\app\src-tauri\target\x86_64-pc-windows-msvc\release\waggle.exe' $releaseRoot $resourcesRoot $tempRoot $version) ` + 'PE' 'main executable policy' +Assert-Equal ` + (Get-ArtifactPolicyKind 'D:\repo\app\src-tauri\target\x86_64-pc-windows-msvc\release\bundle\nsis\Waggle_0.2.0_x64-setup.exe' $releaseRoot $resourcesRoot $tempRoot $version) ` + 'PE' 'NSIS installer policy' +Assert-Throws { + Get-ArtifactPolicyKind 'D:\repo\app\src-tauri\target\x86_64-pc-windows-msvc\release\bundle\msi\Waggle_0.2.0_x64_en-US.msi' $releaseRoot $resourcesRoot $tempRoot $version +} 'approved Tauri release manifest' 'MSI rejection for NSIS-only production signing' +Assert-Throws { + Get-ArtifactPolicyKind 'D:\repo\app\src-tauri\target\x86_64-pc-windows-msvc\release\wix\x64\wix\WixUIExtension.dll' $releaseRoot $resourcesRoot $tempRoot $version +} 'approved Tauri release manifest' 'WiX rejection for NSIS-only production signing' +Assert-Equal ` + (Get-ArtifactPolicyKind 'D:\repo\app\src-tauri\resources\native\vec0.dll' $releaseRoot $resourcesRoot $tempRoot $version) ` + 'PE' 'resource policy' +Assert-Equal ` + (Get-ArtifactPolicyKind 'D:\repo\app\src-tauri\target\.signing-temp\run-123456\nst9DA7.tmp' $releaseRoot $resourcesRoot $tempRoot $version) ` + 'PE' 'NSIS uninstaller policy' + +Assert-Throws { + Get-ArtifactPolicyKind 'D:\outside\malware.exe' $releaseRoot $resourcesRoot $tempRoot $version +} 'outside every approved' 'outside-root rejection' +Assert-Throws { + Get-ArtifactPolicyKind 'D:\repo\app\src-tauri\target\x86_64-pc-windows-msvc\release-evil\waggle.exe' $releaseRoot $resourcesRoot $tempRoot $version +} 'outside every approved' 'prefix-collision rejection' +Assert-Throws { + Get-ArtifactPolicyKind 'D:\repo\app\src-tauri\target\.signing-temp\run-123456\evil.tmp' $releaseRoot $resourcesRoot $tempRoot $version +} 'outside every approved' 'wrong temp name rejection' +Assert-Throws { + Get-ArtifactPolicyKind 'D:\repo\app\src-tauri\resources\node.exe' $releaseRoot $resourcesRoot $tempRoot $version +} 'resource manifest' 'vendor binary rejection' +Assert-Throws { + Get-TrustedPath 'D:\safe\..\outside.exe' 'Traversal probe' +} 'safe, fully qualified' 'traversal rejection' +Assert-Throws { + Get-TrustedPath '\\server\share\outside.exe' 'UNC probe' +} 'safe, fully qualified' 'UNC rejection' +Assert-Throws { + Get-TrustedPath '\\?\C:\outside.exe' 'Device probe' +} 'safe, fully qualified' 'device path rejection' +Assert-Throws { + Get-TrustedPath 'D:\outside.exe:stream' 'ADS probe' +} 'safe, fully qualified' 'ADS rejection' + +$probeRoot = Join-Path ([IO.Path]::GetTempPath()) "waggle-signing-policy-$([Guid]::NewGuid().ToString('N'))" +$targetDirectory = Join-Path $probeRoot 'target' +$junctionPath = Join-Path $probeRoot 'junction' +$fakeToolDirectory = Join-Path $probeRoot 'x64' +$hardLinkReleaseRoot = Join-Path $probeRoot 'release' +try { + [IO.Directory]::CreateDirectory($targetDirectory) | Out-Null + [IO.File]::WriteAllText((Join-Path $targetDirectory 'payload.exe'), 'not a PE') + New-Item -ItemType Junction -Path $junctionPath -Target $targetDirectory | Out-Null + Assert-Throws { + Get-TrustedPath (Join-Path $junctionPath 'payload.exe') 'Junction probe' + } 'reparse point|linked filesystem' 'junction rejection' + + [IO.Directory]::CreateDirectory($fakeToolDirectory) | Out-Null + $patchableMain = Join-Path $probeRoot 'patchable-waggle.exe' + New-SyntheticPatchablePe $patchableMain + $expectedPatchedBytes = [IO.File]::ReadAllBytes($patchableMain) + $expectedToken = [Text.Encoding]::ASCII.GetBytes('__TAURI_BUNDLE_TYPE_VAR_NSS') + [Array]::Copy($expectedToken, 0, $expectedPatchedBytes, 160, $expectedToken.Length) + $expectedPatchedHash = [Convert]::ToHexString( + [Security.Cryptography.SHA256]::HashData($expectedPatchedBytes) + ) + Assert-Equal ` + (Get-NsisPatchedMainSha256 $patchableMain) ` + $expectedPatchedHash ` + 'Tauri NSIS main patch pre-authorization hash' + $missingPatchToken = Join-Path $probeRoot 'missing-patch-token.exe' + New-SyntheticPe $missingPatchToken + Assert-Throws { + Get-NsisPatchedMainSha256 $missingPatchToken + } 'exactly one unpatched' 'missing Tauri bundle token rejection' + $duplicatePatchToken = Join-Path $probeRoot 'duplicate-patch-token.exe' + $duplicateBytes = [byte[]]::new(320) + $sourceBytes = [IO.File]::ReadAllBytes($patchableMain) + [Array]::Copy($sourceBytes, $duplicateBytes, $sourceBytes.Length) + $unknownToken = [Text.Encoding]::ASCII.GetBytes('__TAURI_BUNDLE_TYPE_VAR_UNK') + [Array]::Copy($unknownToken, 0, $duplicateBytes, 270, $unknownToken.Length) + [IO.File]::WriteAllBytes($duplicatePatchToken, $duplicateBytes) + Assert-Throws { + Get-NsisPatchedMainSha256 $duplicatePatchToken + } 'exactly one unpatched' 'duplicate Tauri bundle token rejection' + $fakeSignTool = Join-Path $fakeToolDirectory 'signtool.exe' + $fakeDlib = Join-Path $fakeToolDirectory 'Azure.CodeSigning.Dlib.dll' + [IO.File]::WriteAllText($fakeSignTool, 'impostor') + [IO.File]::WriteAllText($fakeDlib, 'impostor') + Assert-Throws { + Assert-MicrosoftAuthenticodeFile ` + (Get-TrustedPath $fakeSignTool 'Fake SignTool') 'Fake SignTool' $null + } 'not validly Authenticode-signed by the approved publisher' 'fake SignTool rejection' + Assert-Throws { + Assert-MicrosoftAuthenticodeFile ` + (Get-TrustedPath $fakeDlib 'Fake dlib') 'Fake dlib' $ArtifactSigningDlibSha256 + } 'not validly Authenticode-signed by the approved publisher' 'fake dlib rejection' + + $currentPowerShell = Get-TrustedPath (Get-Process -Id $PID).Path 'Current PowerShell' + Assert-MicrosoftAuthenticodeFile $currentPowerShell 'Current PowerShell' $null + $passed++ + $approvedPowerShell = Get-ApprovedPowerShell7Path + Assert-ApprovedPowerShell7Path $approvedPowerShell + $passed++ + Assert-FreshProcessModuleIsolation ` + $approvedPowerShell 'PowerShell 7' $probeRoot + if (Test-Path -LiteralPath $SystemPowerShellPath -PathType Leaf) { + Assert-FreshProcessModuleIsolation ` + $SystemPowerShellPath 'Windows PowerShell' $probeRoot + } + + $privateDirectory = New-PrivateDirectory (Join-Path $probeRoot 'private') + if (-not (Get-Acl -LiteralPath $privateDirectory).AreAccessRulesProtected) { + throw 'Private signing directory test still inherits permissions.' + } + $passed++ + if ((New-PrivateDirectory $privateDirectory) -cne $privateDirectory) { + throw 'Private signing directory hardening is not idempotent.' + } + $passed++ + + $readLock = Open-ReadLock $fakeSignTool + try { + Assert-Throws { + $writeProbe = [IO.File]::Open( + $fakeSignTool, + [IO.FileMode]::Open, + [IO.FileAccess]::Write, + [IO.FileShare]::None + ) + $writeProbe.Dispose() + } 'used by another process|cannot access' 'read-lock write rejection' + } finally { + $readLock.Dispose() + } + + $hardLinkDeps = Join-Path $hardLinkReleaseRoot 'deps' + [IO.Directory]::CreateDirectory($hardLinkDeps) | Out-Null + $hardLinkDependency = Join-Path $hardLinkDeps 'waggle.exe' + $hardLinkMain = Join-Path $hardLinkReleaseRoot 'waggle.exe' + [IO.File]::WriteAllText($hardLinkDependency, 'cargo executable probe') + New-Item -ItemType HardLink -Path $hardLinkMain -Target $hardLinkDependency | Out-Null + $originalSystemRoot = $env:SystemRoot + try { + $env:SystemRoot = $probeRoot + Assert-Equal ` + (Get-SystemFsutilPath) ` + 'C:\Windows\System32\fsutil.exe' ` + 'fixed fsutil path ignores environment' + } finally { + $env:SystemRoot = $originalSystemRoot + } + Assert-ApprovedHardLinkTopology $hardLinkMain $hardLinkReleaseRoot + $passed++ + $detachedReleaseRoot = Join-Path $probeRoot 'detached-release' + [IO.Directory]::CreateDirectory($detachedReleaseRoot) | Out-Null + $detachedMain = Join-Path $detachedReleaseRoot 'waggle.exe' + [IO.File]::WriteAllText($detachedMain, 'detached executable probe') + Assert-Throws { + Assert-ApprovedHardLinkTopology $detachedMain $detachedReleaseRoot + } 'must have.*hard-link topology' 'detached Cargo main rejection' + Assert-ApprovedHardLinkTopology $detachedMain $detachedReleaseRoot -AllowDetachedMain + $passed++ + $rogueHardLink = Join-Path $probeRoot 'rogue.exe' + New-Item -ItemType HardLink -Path $rogueHardLink -Target $hardLinkDependency | Out-Null + Assert-Throws { + Assert-ApprovedHardLinkTopology $hardLinkMain $hardLinkReleaseRoot + } 'unexpected hard-link sibling' 'rogue hard-link rejection' +} finally { + if (Test-Path -LiteralPath $junctionPath) { [IO.Directory]::Delete($junctionPath) } + if (Test-Path -LiteralPath $probeRoot) { [IO.Directory]::Delete($probeRoot, $true) } +} + +$prebuiltFixtureRoot = Join-Path ` + ([IO.Path]::GetTempPath()) ` + "waggle-prebuilt-tree-$([Guid]::NewGuid().ToString('N'))" +$reparseDirectory = $null +try { + $seedRoot = Join-Path $prebuiltFixtureRoot 'seed' + [IO.Directory]::CreateDirectory((Join-Path $seedRoot 'Bin')) | Out-Null + [IO.Directory]::CreateDirectory((Join-Path $seedRoot 'resources')) | Out-Null + [IO.File]::WriteAllBytes( + (Join-Path $seedRoot 'Bin\Payload.bin'), + [Text.Encoding]::UTF8.GetBytes('immutable-payload-one') + ) + [IO.File]::WriteAllBytes( + (Join-Path $seedRoot 'resources\data.bin'), + [Text.Encoding]::UTF8.GetBytes('immutable-payload-two') + ) + $expectedInventory = New-WagglePrebuiltInventory -Root $seedRoot + if (@($expectedInventory.entries).Count -ne 2 -or + [string]$expectedInventory.sha256 -notmatch '^[0-9A-Fa-f]{64}$') { + throw 'Prebuilt inventory lacks its exact canonical entries and aggregate digest.' + } + $passed++ + + $treeLease = Open-WaggleValidatedPrebuiltTree ` + -Root $seedRoot -ExpectedInventory $expectedInventory -Label 'Pristine prebuilt tree' + try { + foreach ($entry in @($expectedInventory.entries)) { + $lockedPath = Join-Path $seedRoot ([string]$entry.path) + Assert-Throws { + $writeProbe = [IO.File]::Open( + $lockedPath, + [IO.FileMode]::Open, + [IO.FileAccess]::Write, + [IO.FileShare]::None + ) + $writeProbe.Dispose() + } 'used by another process|cannot access' 'validated prebuilt tree holds every file read-locked' + } + } finally { + Close-PrebuiltTreeLease $treeLease + } + + $mutablePath = Join-Path $seedRoot 'Bin\Payload.bin' + $immutablePath = Join-Path $seedRoot 'resources\data.bin' + $mutableLease = Open-WaggleValidatedPrebuiltTree ` + -Root $seedRoot -ExpectedInventory $expectedInventory ` + -Label 'Signing-mutable prebuilt tree' -MutablePaths @($mutablePath) + try { + $mutableWriteProbe = [IO.File]::Open( + $mutablePath, + [IO.FileMode]::Open, + [IO.FileAccess]::Write, + [IO.FileShare]::None + ) + $mutableWriteProbe.Dispose() + $passed++ + Assert-Throws { + $immutableWriteProbe = [IO.File]::Open( + $immutablePath, + [IO.FileMode]::Open, + [IO.FileAccess]::Write, + [IO.FileShare]::None + ) + $immutableWriteProbe.Dispose() + } 'used by another process|cannot access' 'mutable tree keeps immutable files read-locked' + } finally { + Close-PrebuiltTreeLease $mutableLease + } + + foreach ($passName in @('unsigned-generated-roots', 'signing-generated-roots')) { + $generatedTreeRoot = Join-Path $prebuiltFixtureRoot $passName + $generatedReleaseRoot = Join-Path ` + $generatedTreeRoot 'x86_64-pc-windows-msvc\release' + $generatedNsisRoot = Join-Path $generatedReleaseRoot 'nsis' + $generatedBundleNsisRoot = Join-Path $generatedReleaseRoot 'bundle\nsis' + $generatedNsisSiblingRoot = Join-Path $generatedReleaseRoot 'nsis-evil' + $generatedBundleSiblingRoot = Join-Path $generatedReleaseRoot 'bundle\nsis-old' + $generatedResourceRoot = Join-Path $generatedTreeRoot 'resources' + foreach ($directory in @( + $generatedNsisRoot, $generatedBundleNsisRoot, + $generatedNsisSiblingRoot, $generatedBundleSiblingRoot, + $generatedResourceRoot + )) { + [IO.Directory]::CreateDirectory($directory) | Out-Null + } + $generatedFiles = @( + [pscustomobject]@{ + Path = Join-Path $generatedNsisRoot 'x64\Plugins\fixture.dll' + Content = 'tauri-nsis-output' + } + [pscustomobject]@{ + Path = Join-Path $generatedBundleNsisRoot 'Waggle_fixture_x64-setup.exe' + Content = 'tauri-installer-output' + } + [pscustomobject]@{ + Path = Join-Path $generatedNsisSiblingRoot 'sibling.dll' + Content = 'locked-nsis-sibling' + } + [pscustomobject]@{ + Path = Join-Path $generatedBundleSiblingRoot 'sibling.exe' + Content = 'locked-bundle-sibling' + } + [pscustomobject]@{ + Path = Join-Path $generatedResourceRoot 'data.bin' + Content = 'locked-resource' + } + ) + foreach ($file in $generatedFiles) { + [IO.Directory]::CreateDirectory((Split-Path ([string]$file.Path) -Parent)) | Out-Null + [IO.File]::WriteAllBytes( + [string]$file.Path, [Text.Encoding]::UTF8.GetBytes([string]$file.Content) + ) + } + $generatedInventory = New-WagglePrebuiltInventory -Root $generatedTreeRoot + $generatedLease = Open-WaggleValidatedPrebuiltTree ` + -Root $generatedTreeRoot -ExpectedInventory $generatedInventory ` + -Label "$passName private work tree" ` + -RegeneratedRoots @($generatedNsisRoot, $generatedBundleNsisRoot) ` + -CargoReleaseRelativePath 'x86_64-pc-windows-msvc\release' + try { + Clear-WaggleRegeneratedRoots $generatedLease + Assert-Equal ` + (Test-Path -LiteralPath $generatedNsisRoot) $false ` + "$passName clears the exact Tauri NSIS work root" + Assert-Equal ` + (Test-Path -LiteralPath $generatedBundleNsisRoot) $false ` + "$passName clears the exact Tauri installer output root" + Assert-Equal ` + (Test-Path -LiteralPath $generatedNsisSiblingRoot -PathType Container) $true ` + "$passName preserves the nsis-evil sibling root" + Assert-Equal ` + (Test-Path -LiteralPath $generatedBundleSiblingRoot -PathType Container) $true ` + "$passName preserves the bundle nsis-old sibling root" + foreach ($lockedFile in @( + (Join-Path $generatedNsisSiblingRoot 'sibling.dll'), + (Join-Path $generatedBundleSiblingRoot 'sibling.exe'), + (Join-Path $generatedResourceRoot 'data.bin') + )) { + Assert-Throws { + $writeProbe = [IO.File]::Open( + $lockedFile, + [IO.FileMode]::Open, + [IO.FileAccess]::Write, + [IO.FileShare]::None + ) + $writeProbe.Dispose() + } 'used by another process|cannot access' ` + "$passName retains the non-generated work-tree lock for $lockedFile" + } + } finally { + Close-PrebuiltTreeLease $generatedLease + } + } + + $copySeed = { + param([string]$Name) + $destination = Join-Path $prebuiltFixtureRoot $Name + [IO.Directory]::CreateDirectory($destination) | Out-Null + Copy-Item -Path (Join-Path $seedRoot '*') -Destination $destination -Recurse + return $destination + } + + $extraRoot = & $copySeed 'extra' + [IO.File]::WriteAllText((Join-Path $extraRoot 'unexpected.bin'), 'unexpected') + Assert-Throws { + Open-WaggleValidatedPrebuiltTree ` + -Root $extraRoot -ExpectedInventory $expectedInventory -Label 'Extra-file tree' + } 'extra|unexpected|inventory' 'prebuilt tree extra-file rejection' + + $missingRoot = & $copySeed 'missing' + [IO.File]::Delete((Join-Path $missingRoot 'resources\data.bin')) + Assert-Throws { + Open-WaggleValidatedPrebuiltTree ` + -Root $missingRoot -ExpectedInventory $expectedInventory -Label 'Missing-file tree' + } 'missing|inventory' 'prebuilt tree missing-file rejection' + + $mutatedRoot = & $copySeed 'same-size-mutation' + $mutatedPath = Join-Path $mutatedRoot 'Bin\Payload.bin' + $originalLength = (Get-Item -LiteralPath $mutatedPath).Length + [IO.File]::WriteAllBytes( + $mutatedPath, + [Text.Encoding]::UTF8.GetBytes('tampered-payload-one!') + ) + Assert-Equal ` + (Get-Item -LiteralPath $mutatedPath).Length ` + $originalLength ` + 'same-size prebuilt mutation fixture' + Assert-Throws { + Open-WaggleValidatedPrebuiltTree ` + -Root $mutatedRoot -ExpectedInventory $expectedInventory -Label 'Mutated tree' + } 'SHA-256|digest|inventory' 'prebuilt tree same-size mutation rejection' + + $collisionInventory = $expectedInventory | ConvertTo-Json -Depth 32 | + ConvertFrom-Json -Depth 32 -DateKind String + $collisionEntry = $collisionInventory.entries[0] | ConvertTo-Json -Depth 8 | + ConvertFrom-Json -Depth 8 -DateKind String + $collisionEntry.path = ([string]$collisionEntry.path).ToUpperInvariant() + $collisionInventory.entries = @($collisionInventory.entries) + @($collisionEntry) + Assert-Throws { + Open-WaggleValidatedPrebuiltTree ` + -Root $seedRoot -ExpectedInventory $collisionInventory -Label 'Case-collision inventory' + } 'case-insensitive|case collision|duplicate canonical' 'prebuilt inventory case-collision rejection' + + $traversalInventory = $expectedInventory | ConvertTo-Json -Depth 32 | + ConvertFrom-Json -Depth 32 -DateKind String + $traversalInventory.entries[0].path = '..\outside.bin' + Assert-Throws { + Open-WaggleValidatedPrebuiltTree ` + -Root $seedRoot -ExpectedInventory $traversalInventory -Label 'Traversal inventory' + } 'relative|traversal|canonical|unsafe' 'prebuilt inventory traversal rejection' + + $adsRoot = & $copySeed 'alternate-data-stream' + $adsCarrier = Join-Path $adsRoot 'Bin\Payload.bin' + [IO.File]::WriteAllText("${adsCarrier}:waggle-probe", 'hidden-content') + Assert-Throws { + Open-WaggleValidatedPrebuiltTree ` + -Root $adsRoot -ExpectedInventory $expectedInventory -Label 'ADS tree' + } 'alternate data stream|ADS|named stream' 'prebuilt tree ADS rejection' + + $reparseRoot = & $copySeed 'reparse' + $reparseDirectory = Join-Path $reparseRoot 'resources' + $reparseTarget = Join-Path $prebuiltFixtureRoot 'reparse-target' + Move-Item -LiteralPath $reparseDirectory -Destination $reparseTarget + New-Item -ItemType Junction -Path $reparseDirectory -Target $reparseTarget | Out-Null + Assert-Throws { + Open-WaggleValidatedPrebuiltTree ` + -Root $reparseRoot -ExpectedInventory $expectedInventory -Label 'Reparse tree' + } 'reparse point|linked filesystem|junction' 'prebuilt tree reparse rejection' + + $unapprovedLinkRoot = & $copySeed 'unapproved-hardlink' + $unapprovedLink = Join-Path $unapprovedLinkRoot 'rogue-link.bin' + Copy-Item -LiteralPath (Join-Path $unapprovedLinkRoot 'resources\data.bin') ` + -Destination $unapprovedLink + $unapprovedLinkInventory = New-WagglePrebuiltInventory -Root $unapprovedLinkRoot + [IO.File]::Delete($unapprovedLink) + New-Item -ItemType HardLink -Path $unapprovedLink ` + -Target (Join-Path $unapprovedLinkRoot 'resources\data.bin') | Out-Null + Assert-Throws { + Open-WaggleValidatedPrebuiltTree ` + -Root $unapprovedLinkRoot -ExpectedInventory $unapprovedLinkInventory ` + -Label 'Unapproved hard-link tree' + } 'hard-link|hardlink|link topology' 'prebuilt tree unapproved hard-link rejection' + + $approvedLinkRoot = Join-Path $prebuiltFixtureRoot 'approved-hardlink' + $approvedDependency = Join-Path $approvedLinkRoot 'release\deps\waggle.exe' + $approvedMain = Join-Path $approvedLinkRoot 'release\waggle.exe' + [IO.Directory]::CreateDirectory((Split-Path $approvedDependency -Parent)) | Out-Null + New-SyntheticPe $approvedDependency 91 + New-Item -ItemType HardLink -Path $approvedMain -Target $approvedDependency | Out-Null + $approvedLinkInventory = New-WagglePrebuiltInventory -Root $approvedLinkRoot + $approvedLinkLease = Open-WaggleValidatedPrebuiltTree ` + -Root $approvedLinkRoot -ExpectedInventory $approvedLinkInventory ` + -Label 'Approved Cargo hard-link tree' + try { + Assert-ApprovedHardLinkTopology ` + $approvedMain (Join-Path $approvedLinkRoot 'release') + $passed++ + } finally { + Close-PrebuiltTreeLease $approvedLinkLease + } + + $combinedSourceRoot = Join-Path $prebuiltFixtureRoot 'combined-source' + $combinedReleaseRelative = 'x86_64-pc-windows-msvc\release' + $combinedDependency = Join-Path ` + $combinedSourceRoot "$combinedReleaseRelative\deps\waggle.exe" + $combinedMain = Join-Path $combinedSourceRoot "$combinedReleaseRelative\waggle.exe" + $combinedResource = Join-Path $combinedSourceRoot 'resources\service.js' + [IO.Directory]::CreateDirectory((Split-Path $combinedDependency -Parent)) | Out-Null + [IO.Directory]::CreateDirectory((Split-Path $combinedResource -Parent)) | Out-Null + New-SyntheticPe $combinedDependency 92 + New-Item -ItemType HardLink -Path $combinedMain -Target $combinedDependency | Out-Null + [IO.File]::WriteAllText($combinedResource, 'receipt-bound-sidecar') + $combinedInventory = New-WagglePrebuiltInventory ` + -Root $combinedSourceRoot -CargoReleaseRelativePath $combinedReleaseRelative + $requiredDiskBytes = Assert-WaggleHostedDiskCapacity ` + -Path $combinedSourceRoot -Inventory $combinedInventory -AvailableBytes ([long]::MaxValue) + Assert-Throws { + Assert-WaggleHostedDiskCapacity ` + -Path $combinedSourceRoot -Inventory $combinedInventory ` + -AvailableBytes ($requiredDiskBytes - 1) + } 'insufficient free disk space' 'hosted signing disk-capacity fail-fast' + $passed++ + $combinedSourceLease = Open-WaggleValidatedPrebuiltTree ` + -Root $combinedSourceRoot -ExpectedInventory $combinedInventory ` + -Label 'Combined hosted input tree' ` + -CargoReleaseRelativePath $combinedReleaseRelative + $combinedWorkRoot = Join-Path $prebuiltFixtureRoot 'combined-work' + try { + $sourceHashBeforeCopy = Get-Sha256 $combinedMain + New-WagglePrebuiltWorkCopy ` + -SourceRoot $combinedSourceRoot -DestinationRoot $combinedWorkRoot ` + -Inventory $combinedInventory -Label 'Combined hosted input tree' ` + -CargoReleaseRelativePath $combinedReleaseRelative | Out-Null + Assert-Equal (Get-Sha256 $combinedMain) $sourceHashBeforeCopy ` + 'work-copy creation leaves receipt source unchanged' + $workMain = Join-Path $combinedWorkRoot "$combinedReleaseRelative\waggle.exe" + $workDependency = Join-Path ` + $combinedWorkRoot "$combinedReleaseRelative\deps\waggle.exe" + Assert-ApprovedHardLinkTopology ` + $workMain (Join-Path $combinedWorkRoot $combinedReleaseRelative) + $workLinks = @(Get-HardLinkPaths $workMain) + if ($workLinks.Count -ne 2 -or $workLinks -notcontains $workMain -or + $workLinks -notcontains $workDependency -or + $workLinks -contains $combinedMain -or $workLinks -contains $combinedDependency) { + throw 'Work copy did not create a destination-local Cargo hard-link pair.' + } + $passed++ + $combinedWorkLease = Open-WaggleValidatedPrebuiltTree ` + -Root $combinedWorkRoot -ExpectedInventory $combinedInventory ` + -Label 'Combined mutable private work tree' ` + -MutablePaths @($workMain, $workDependency) ` + -CargoReleaseRelativePath $combinedReleaseRelative + try { + $writeProbe = [IO.File]::Open( + $workMain, + [IO.FileMode]::Open, + [IO.FileAccess]::Write, + [IO.FileShare]::None + ) + $writeProbe.Dispose() + Assert-Throws { + $writeProbe = [IO.File]::Open( + (Join-Path $combinedWorkRoot 'resources\service.js'), + [IO.FileMode]::Open, + [IO.FileAccess]::Write, + [IO.FileShare]::None + ) + $writeProbe.Dispose() + } 'used by another process|cannot access|being used|denied' ` + 'private work tree locks immutable resources while Cargo pair stays mutable' + } finally { + Close-PrebuiltTreeLease $combinedWorkLease + } + } finally { + Close-PrebuiltTreeLease $combinedSourceLease + if (Test-Path -LiteralPath $combinedWorkRoot) { + [IO.Directory]::Delete($combinedWorkRoot, $true) + } + } + + $resourcesInventory = New-WagglePrebuiltInventory ` + -Root (Join-Path $seedRoot 'resources') + $hostedReceiptPath = Join-Path $prebuiltFixtureRoot 'build-receipt.json' + $hostedReceipt = [pscustomobject][ordered]@{ + schemaVersion = 1 + repository = 'marolinik/waggle-os' + sourceRevision = 'a' * 40 + targetTriple = 'x86_64-pc-windows-msvc' + targetInventory = $expectedInventory + resourcesInventory = $resourcesInventory + checker = [pscustomobject]@{ exitCode = 0; sha256 = 'A' * 64 } + } + Write-JsonNoBom $hostedReceiptPath $hostedReceipt + $hostedReceiptLease = Get-WaggleHostedBuildReceipt ` + $hostedReceiptPath (Get-Sha256 $hostedReceiptPath) ('a' * 40) + $hostedReceiptLease.Lock.Dispose() + $passed++ + $mismatchedReceipt = $hostedReceipt | ConvertTo-Json -Depth 32 | + ConvertFrom-Json -Depth 32 -DateKind String + $mismatchedReceipt.resourcesInventory.entries[0].sha256 = 'B' * 64 + $mismatchedReceipt.resourcesInventory.sha256 = Get-WaggleInventorySha256 ` + @($mismatchedReceipt.resourcesInventory.entries) + Write-JsonNoBom $hostedReceiptPath $mismatchedReceipt + Assert-Throws { + Get-WaggleHostedBuildReceipt ` + $hostedReceiptPath (Get-Sha256 $hostedReceiptPath) ('a' * 40) + } 'resource projection.*does not match' ` + 'hosted receipt rejects independently valid mismatched resource inventory' + + $payloadProjection = @( + [pscustomobject]@{ path = 'waggle.exe'; size = 128; sha256 = 'C' * 64 }, + [pscustomobject]@{ + path = 'resources\data.bin' + size = [long]$resourcesInventory.entries[0].size + sha256 = [string]$resourcesInventory.entries[0].sha256 + } + ) + Assert-WaggleUnsignedPayloadResourceProjection ` + $payloadProjection $resourcesInventory + $passed++ + $tamperedPayloadProjection = $payloadProjection | ConvertTo-Json -Depth 8 | + ConvertFrom-Json -Depth 8 -DateKind String + $tamperedPayloadProjection[1].sha256 = 'D' * 64 + Assert-Throws { + Assert-WaggleUnsignedPayloadResourceProjection ` + $tamperedPayloadProjection $resourcesInventory + } 'resource projection.*does not match' ` + 'unsigned payload rejects resource digest mismatch against build receipt' + + $preflightSigningRoot = Join-Path $prebuiltFixtureRoot 'preflight-signing' + $preflightUnsignedRoot = Join-Path $prebuiltFixtureRoot 'preflight-unsigned' + $preflightRelative = 'resources\service.js' + $preflightSigningPath = Join-Path $preflightSigningRoot $preflightRelative + $preflightUnsignedPath = Join-Path $preflightUnsignedRoot $preflightRelative + [IO.Directory]::CreateDirectory((Split-Path $preflightSigningPath -Parent)) | Out-Null + [IO.Directory]::CreateDirectory((Split-Path $preflightUnsignedPath -Parent)) | Out-Null + [IO.File]::WriteAllText($preflightSigningPath, 'signing-copy') + [IO.File]::WriteAllText($preflightUnsignedPath, 'unsigned-copy') + Assert-Equal ` + (Resolve-WagglePreflightFixedPath ` + $preflightSigningPath $preflightSigningRoot $preflightUnsignedRoot) ` + ([IO.Path]::GetFullPath($preflightUnsignedPath)) ` + 'manifest preflight resolves same relative path from unsigned work tree' + Assert-Throws { + Resolve-WagglePreflightFixedPath ` + (Join-Path $prebuiltFixtureRoot 'outside.bin') ` + $preflightSigningRoot $preflightUnsignedRoot + } 'escaped.*signing target root' 'manifest preflight rejects signing-root escape' + + $rollbackRoot = Join-Path $prebuiltFixtureRoot 'rollback' + $rollbackDependency = Join-Path $rollbackRoot 'release\deps\waggle.exe' + $rollbackMain = Join-Path $rollbackRoot 'release\waggle.exe' + [IO.Directory]::CreateDirectory((Split-Path $rollbackDependency -Parent)) | Out-Null + New-SyntheticPe $rollbackDependency 101 + New-Item -ItemType HardLink -Path $rollbackMain -Target $rollbackDependency | Out-Null + $expectedOriginalSha256 = Get-Sha256 $rollbackMain + $expectedHardLinkPaths = @(Get-HardLinkPaths $rollbackMain) + $replacement = Join-Path $rollbackRoot 'signed-replacement.exe' + $backup = Join-Path $rollbackRoot 'original.backup' + New-SyntheticPe $replacement 102 + [IO.File]::Replace($replacement, $rollbackMain, $backup, $true) + if ((Get-Sha256 $rollbackMain) -ceq $expectedOriginalSha256) { + throw 'Rollback test fixture did not replace the original artifact.' + } + $passed++ + Restore-WaggleReplacedArtifact ` + -ArtifactPath $rollbackMain -BackupPath $backup ` + -ExpectedOriginalSha256 $expectedOriginalSha256 ` + -ExpectedHardLinkPaths $expectedHardLinkPaths + Assert-Equal (Get-Sha256 $rollbackMain) $expectedOriginalSha256 'rollback restores exact main bytes' + Assert-Equal (Get-Sha256 $rollbackDependency) $expectedOriginalSha256 'rollback preserves exact dependency bytes' + Assert-ApprovedHardLinkTopology ` + $rollbackMain (Join-Path $rollbackRoot 'release') + $passed++ + + $regularRollbackArtifact = Join-Path $rollbackRoot 'regular-artifact.dll' + $regularRollbackReplacement = Join-Path $rollbackRoot 'regular-replacement.dll' + $regularRollbackBackup = Join-Path $rollbackRoot 'regular.backup' + New-SyntheticPe $regularRollbackArtifact 106 + New-SyntheticPe $regularRollbackReplacement 107 + $regularOriginalHash = Get-Sha256 $regularRollbackArtifact + [IO.File]::Replace( + $regularRollbackReplacement, + $regularRollbackArtifact, + $regularRollbackBackup, + $true + ) + Restore-WaggleReplacedArtifact ` + -ArtifactPath $regularRollbackArtifact -BackupPath $regularRollbackBackup ` + -ExpectedOriginalSha256 $regularOriginalHash ` + -ExpectedHardLinkPaths @($regularRollbackArtifact) + Assert-Equal ` + (Get-Sha256 $regularRollbackArtifact) $regularOriginalHash ` + 'rollback restores exact regular-artifact bytes' + + $missingBackupArtifact = Join-Path $rollbackRoot 'missing-backup-artifact.exe' + $missingBackup = Join-Path $rollbackRoot 'missing.backup' + New-SyntheticPe $missingBackupArtifact 103 + $missingArtifactHash = Get-Sha256 $missingBackupArtifact + Assert-Throws { + Restore-WaggleReplacedArtifact ` + -ArtifactPath $missingBackupArtifact -BackupPath $missingBackup ` + -ExpectedOriginalSha256 ('0' * 64) ` + -ExpectedHardLinkPaths @($missingBackupArtifact) + } 'backup.*missing|does not exist' 'rollback missing-backup rejection' + Assert-Equal ` + (Get-Sha256 $missingBackupArtifact) $missingArtifactHash ` + 'missing rollback backup leaves replacement unchanged' + + $corruptBackupArtifact = Join-Path $rollbackRoot 'corrupt-backup-artifact.exe' + $corruptBackup = Join-Path $rollbackRoot 'corrupt.backup' + New-SyntheticPe $corruptBackupArtifact 104 + New-SyntheticPe $corruptBackup 105 + $corruptArtifactHash = Get-Sha256 $corruptBackupArtifact + Assert-Throws { + Restore-WaggleReplacedArtifact ` + -ArtifactPath $corruptBackupArtifact -BackupPath $corruptBackup ` + -ExpectedOriginalSha256 ('0' * 64) ` + -ExpectedHardLinkPaths @($corruptBackupArtifact) + } 'backup.*SHA-256|backup.*digest|original.*digest' 'rollback corrupt-backup rejection' + Assert-Equal ` + (Get-Sha256 $corruptBackupArtifact) $corruptArtifactHash ` + 'corrupt rollback backup leaves replacement unchanged' + + Assert-Throws { + Open-WaggleValidatedPrebuiltTree ` + -Root $seedRoot -ExpectedInventory $expectedInventory ` + -Label 'Overlapping prebuilt tree' -DisallowedRoots @($prebuiltFixtureRoot) + } 'overlap|disallowed root|must be distinct' 'prebuilt tree root-overlap rejection' +} finally { + if ($null -ne $reparseDirectory -and (Test-Path -LiteralPath $reparseDirectory)) { + [IO.Directory]::Delete($reparseDirectory) + } + if (Test-Path -LiteralPath $prebuiltFixtureRoot) { + [IO.Directory]::Delete($prebuiltFixtureRoot, $true) + } +} + +$sessionFixtureRoot = Join-Path ` + ([IO.Path]::GetTempPath()) ` + "waggle-signing-session-$([Guid]::NewGuid().ToString('N'))" +$environmentNames = @( + 'WAGGLE_SIGNING_MANIFEST_PATH', 'WAGGLE_SIGNING_MANIFEST_SHA256', + 'WAGGLE_SIGNING_SESSION_ID', 'CARGO_TARGET_DIR', 'TEMP', 'TMP', + 'WAGGLE_NSIS_SIGNING_TEMP_ROOT', 'NODE_OPTIONS', 'NODE_PATH', + 'WAGGLE_SIGNING_PORTABLE_TOOLCHAIN_ROOT', + 'WAGGLE_SIGNING_PORTABLE_NODE_PATH', + 'WAGGLE_SIGNING_PORTABLE_GIT_PATH', + 'WAGGLE_SIGNING_PORTABLE_SEVEN_ZIP_PATH', + 'NAPI_RS_NATIVE_LIBRARY_PATH', 'NAPI_RS_FORCE_WASI', + 'npm_config_node_options', 'TARGET_ARCH' +) +$savedEnvironment = @{} +foreach ($name in $environmentNames) { + $savedEnvironment[$name] = [Environment]::GetEnvironmentVariable($name) +} +try { + $sessionId = '0123456789abcdef0123456789abcdef' + $tauriRoot = Join-Path $sessionFixtureRoot 'app\src-tauri' + $resourcesRoot = Join-Path $tauriRoot 'resources' + $targetRoot = New-PrivateDirectory ` + (Join-Path $tauriRoot "target\.signing-builds\run-$sessionId") + $releaseRoot = Join-Path $targetRoot 'x86_64-pc-windows-msvc\release' + [IO.Directory]::CreateDirectory($resourcesRoot) | Out-Null + [IO.File]::WriteAllText((Join-Path $resourcesRoot 'service.js'), 'sidecar') + [IO.Directory]::CreateDirectory($releaseRoot) | Out-Null + $sessionDirectory = New-PrivateDirectory ` + (Join-Path $tauriRoot "target\.signing-sessions\run-$sessionId") + $tempRoot = New-PrivateDirectory ` + (Join-Path $tauriRoot "target\.signing-temp\run-$sessionId") + $configPath = Join-Path $tauriRoot 'tauri.conf.json' + $overridePath = Join-Path $sessionDirectory 'tauri.signing-override.json' + Write-JsonNoBom $configPath ([ordered]@{ version = '0.2.0' }) + Write-WaggleSigningOverride ` + $overridePath $wrapperPath $resourcesRoot | Out-Null + $unsignedOverride = Get-Content -Raw $overridePath | ConvertFrom-Json -Depth 16 + Assert-Equal $unsignedOverride.bundle.targets[0] 'nsis' 'unsigned preflight targets NSIS only' + Assert-Equal $unsignedOverride.build.beforeBuildCommand '' 'unsigned preflight disables nested build' + Assert-Equal $unsignedOverride.build.beforeBundleCommand '' 'unsigned preflight disables nested bundle hook' + $unsignedResourceMap = @($unsignedOverride.bundle.resources.PSObject.Properties) + Assert-Equal $unsignedResourceMap.Count 1 'unsigned override maps one complete resource tree' + Assert-Equal ` + ([IO.Path]::GetFullPath([string]$unsignedResourceMap[0].Name)) ` + ([IO.Path]::GetFullPath($resourcesRoot)) ` + 'unsigned override resource source' + Assert-Equal ([string]$unsignedResourceMap[0].Value) 'resources' ` + 'unsigned override resource destination' + if ($null -ne $unsignedOverride.bundle.windows.PSObject.Properties['signCommand']) { + throw 'Unsigned preflight override unexpectedly contains a signing command.' + } + $passed++ + Write-WaggleSigningOverride ` + $overridePath $wrapperPath $resourcesRoot -EnableSigning | Out-Null + $signedOverride = Get-Content -Raw $overridePath | ConvertFrom-Json -Depth 16 + Assert-Equal $signedOverride.bundle.windows.signCommand.cmd ` + $SystemPowerShellPath 'signed override uses canonical bootstrap host' + Assert-Equal ` + (@($signedOverride.bundle.windows.signCommand.args | Where-Object { $_ -ceq '%1' }).Count) ` + 1 'signed override contains one artifact placeholder' + Assert-Equal $signedOverride.build.beforeBundleCommand '' 'signed override disables nested bundle hook' + $invalidOverride = $signedOverride | ConvertTo-Json -Depth 16 | + ConvertFrom-Json -Depth 16 + $invalidOverride.bundle.resources = [ordered]@{ + (Join-Path $resourcesRoot 'native') = 'resources' + } + Write-JsonNoBom $overridePath $invalidOverride + Assert-Throws { + Assert-WaggleSigningOverrideContract ` + $overridePath $wrapperPath $resourcesRoot + } 'exact receipt-bound resource tree' ` + 'signed override rejects receipt resource subroot substitution' + Write-WaggleSigningOverride ` + $overridePath $wrapperPath $resourcesRoot -EnableSigning | Out-Null + + $toolDirectory = Join-Path $sessionFixtureRoot 'tools' + [IO.Directory]::CreateDirectory($toolDirectory) | Out-Null + $toolNames = @( + 'wrapper.ps1', 'tauri.js', 'tauri-main.js', 'tauri-index.js', + 'tauri-package.json', 'tauri-native-package.json', 'tauri-native.node', + 'vite.js', 'vite-package.json', 'bundle-node.mjs', 'build-sidecar.mjs', + 'bundle-native-deps.mjs', 'stage-sidecar-deps.mjs', 'makensis.exe', + 'git.exe', 'git-runtime.exe', 'node.exe', 'npm-cli.js', '7z.exe', 'signtool.exe', + 'artifact-signing.nupkg' + ) + $toolPaths = @{} + foreach ($toolName in $toolNames) { + $toolPath = Join-Path $toolDirectory $toolName + [IO.File]::WriteAllText($toolPath, "fixture:$toolName") + $toolPaths[$toolName] = $toolPath + } + + $context = [pscustomobject]@{ + RepoRoot = $sessionFixtureRoot + AppRoot = Join-Path $sessionFixtureRoot 'app' + TauriRoot = $tauriRoot + ResourcesRoot = $resourcesRoot + TargetRoot = $targetRoot + ReleaseRoot = $releaseRoot + ConfigPath = $configPath + OverrideConfigPath = $overridePath + WrapperPath = $wrapperPath + TauriCliPath = $toolPaths['tauri.js'] + TauriCliPackagePath = $toolPaths['tauri-package.json'] + TauriCliMainPath = $toolPaths['tauri-main.js'] + TauriCliIndexPath = $toolPaths['tauri-index.js'] + TauriNativePackagePath = $toolPaths['tauri-native-package.json'] + TauriNativeBinaryPath = $toolPaths['tauri-native.node'] + ViteCliPath = $toolPaths['vite.js'] + VitePackagePath = $toolPaths['vite-package.json'] + WebRoot = Join-Path $sessionFixtureRoot 'apps\web' + BuildScriptPaths = [ordered]@{ + bundleNode = $toolPaths['bundle-node.mjs'] + buildSidecar = $toolPaths['build-sidecar.mjs'] + bundleNativeDeps = $toolPaths['bundle-native-deps.mjs'] + stageSidecarDeps = $toolPaths['stage-sidecar-deps.mjs'] + } + MakensisPath = $toolPaths['makensis.exe'] + GitPath = $toolPaths['git.exe'] + GitRuntimePath = $toolPaths['git-runtime.exe'] + PortableToolchainRoot = $null + NodePath = $toolPaths['node.exe'] + NpmCliPath = $toolPaths['npm-cli.js'] + SevenZipPath = $toolPaths['7z.exe'] + SevenZipDllPath = $toolPaths['7z.exe'] + SignToolPath = $toolPaths['signtool.exe'] + ArtifactSigningPackagePath = $toolPaths['artifact-signing.nupkg'] + SourceRevision = 'a' * 40 + TauriCliVersion = '2.10.1' + TauriCliSha256 = Get-Sha256 $toolPaths['tauri.js'] + TauriCliPackageSha256 = Get-Sha256 $toolPaths['tauri-package.json'] + TauriCliMainSha256 = Get-Sha256 $toolPaths['tauri-main.js'] + TauriCliIndexSha256 = Get-Sha256 $toolPaths['tauri-index.js'] + TauriNativePackageSha256 = Get-Sha256 $toolPaths['tauri-native-package.json'] + TauriNativeBinarySha256 = Get-Sha256 $toolPaths['tauri-native.node'] + ViteCliSha256 = Get-Sha256 $toolPaths['vite.js'] + VitePackageSha256 = Get-Sha256 $toolPaths['vite-package.json'] + ViteVersion = '6.4.3' + BuildScriptHashes = [ordered]@{ + bundleNode = Get-Sha256 $toolPaths['bundle-node.mjs'] + buildSidecar = Get-Sha256 $toolPaths['build-sidecar.mjs'] + bundleNativeDeps = Get-Sha256 $toolPaths['bundle-native-deps.mjs'] + stageSidecarDeps = Get-Sha256 $toolPaths['stage-sidecar-deps.mjs'] + } + MakensisSha256 = Get-Sha256 $toolPaths['makensis.exe'] + GitSha256 = Get-Sha256 $toolPaths['git.exe'] + GitRuntimeSha256 = Get-Sha256 $toolPaths['git-runtime.exe'] + NodeSha256 = Get-Sha256 $toolPaths['node.exe'] + NpmCliSha256 = Get-Sha256 $toolPaths['npm-cli.js'] + SevenZipSha256 = Get-Sha256 $toolPaths['7z.exe'] + SevenZipDllSha256 = Get-Sha256 $toolPaths['7z.exe'] + SignToolSha256 = Get-Sha256 $toolPaths['signtool.exe'] + ArtifactSigningPackageSha256 = Get-Sha256 $toolPaths['artifact-signing.nupkg'] + ArtifactSigningX64ManifestSha256 = 'B' * 64 + } + $fixedPaths = @(Get-ExpectedNsisFixedPaths $context '0.2.0') + $packagedPaths = @(Get-ExpectedNsisPackagedPaths) + $slots = [Collections.Generic.List[object]]::new() + for ($index = 0; $index -lt $fixedPaths.Count; $index++) { + New-SyntheticPe $fixedPaths[$index] ([byte]($index + 1)) + $slots.Add([pscustomobject][ordered]@{ + id = 'fixed-{0:d2}' -f ($index + 1) + order = $index + 1 + kind = 'fixed' + maxUses = 1 + path = $fixedPaths[$index] + packagedPath = $packagedPaths[$index] + preSignSha256 = Get-Sha256 $fixedPaths[$index] + }) + } + $slots.Add([pscustomobject][ordered]@{ + id = 'nsis-uninstaller' + order = 13 + kind = 'generated-nsis-uninstaller' + maxUses = 1 + pathPattern = $NsisUninstallerPattern + evidencePath = Join-Path $sessionDirectory 'signed-evidence\13-nsis-uninstaller.exe' + }) + $slots.Add([pscustomobject][ordered]@{ + id = 'nsis-installer' + order = 14 + kind = 'generated-nsis-installer' + maxUses = 1 + path = Join-Path $releaseRoot 'bundle\nsis\Waggle_0.2.0_x64-setup.exe' + }) + + $manifestPath = Join-Path $sessionDirectory 'manifest.json' + $ledgerPath = Join-Path $sessionDirectory 'callback-ledger.json' + $baseManifest = [pscustomobject][ordered]@{ + schemaVersion = 1 + mode = 'nsis' + sessionId = $sessionId + sourceRevision = $context.SourceRevision + createdAtUtc = [DateTimeOffset]::UtcNow.AddMinutes(-1).ToString('O') + expiresAtUtc = [DateTimeOffset]::UtcNow.AddHours(1).ToString('O') + repoRoot = $context.RepoRoot + tauriRoot = $tauriRoot + targetRoot = $targetRoot + releaseRoot = $releaseRoot + resourcesRoot = $resourcesRoot + tempRoot = $tempRoot + ledgerPath = $ledgerPath + appVersion = '0.2.0' + payloads = @( + [pscustomobject]@{ path = 'waggle.exe'; sha256 = '1' * 64; size = 128 } + ) + @(1..9 | ForEach-Object { + [pscustomobject]@{ path = "resources\fixture-$_.bin"; sha256 = '2' * 64; size = $_ } + }) + toolchain = [pscustomobject][ordered]@{ + wrapperPath = $context.WrapperPath + wrapperSha256 = Get-Sha256 $context.WrapperPath + tauriConfigPath = $configPath + tauriConfigSha256 = Get-Sha256 $configPath + tauriOverrideConfigPath = $overridePath + tauriOverrideConfigSha256 = Get-Sha256 $overridePath + tauriCliPath = $context.TauriCliPath + tauriCliSha256 = $context.TauriCliSha256 + tauriCliPackagePath = $context.TauriCliPackagePath + tauriCliPackageSha256 = $context.TauriCliPackageSha256 + tauriCliMainPath = $context.TauriCliMainPath + tauriCliMainSha256 = $context.TauriCliMainSha256 + tauriCliIndexPath = $context.TauriCliIndexPath + tauriCliIndexSha256 = $context.TauriCliIndexSha256 + tauriNativePackagePath = $context.TauriNativePackagePath + tauriNativePackageSha256 = $context.TauriNativePackageSha256 + tauriNativeBinaryPath = $context.TauriNativeBinaryPath + tauriNativeBinarySha256 = $context.TauriNativeBinarySha256 + tauriCliVersion = $context.TauriCliVersion + viteCliPath = $context.ViteCliPath + viteCliSha256 = $context.ViteCliSha256 + vitePackagePath = $context.VitePackagePath + vitePackageSha256 = $context.VitePackageSha256 + viteVersion = $context.ViteVersion + buildScripts = [pscustomobject][ordered]@{ + bundleNode = [pscustomobject]@{ path = $context.BuildScriptPaths.bundleNode; sha256 = $context.BuildScriptHashes.bundleNode } + buildSidecar = [pscustomobject]@{ path = $context.BuildScriptPaths.buildSidecar; sha256 = $context.BuildScriptHashes.buildSidecar } + bundleNativeDeps = [pscustomobject]@{ path = $context.BuildScriptPaths.bundleNativeDeps; sha256 = $context.BuildScriptHashes.bundleNativeDeps } + stageSidecarDeps = [pscustomobject]@{ path = $context.BuildScriptPaths.stageSidecarDeps; sha256 = $context.BuildScriptHashes.stageSidecarDeps } + } + makensisPath = $context.MakensisPath + makensisSha256 = $context.MakensisSha256 + gitPath = $context.GitPath + gitSha256 = $context.GitSha256 + gitRuntimePath = $context.GitRuntimePath + gitRuntimeSha256 = $context.GitRuntimeSha256 + nodePath = $context.NodePath + nodeSha256 = $context.NodeSha256 + npmCliPath = $context.NpmCliPath + npmCliSha256 = $context.NpmCliSha256 + sevenZipPath = $context.SevenZipPath + sevenZipSha256 = $context.SevenZipSha256 + signToolPath = $context.SignToolPath + signToolSha256 = $context.SignToolSha256 + artifactSigningPackagePath = $context.ArtifactSigningPackagePath + artifactSigningPackageSha256 = $context.ArtifactSigningPackageSha256 + artifactSigningX64ManifestSha256 = $context.ArtifactSigningX64ManifestSha256 + } + slots = @($slots) + } + $writeSessionFixture = { + param([object]$Manifest) + Write-JsonNoBom $manifestPath $Manifest + $manifestHash = Get-Sha256 $manifestPath + Write-JsonNoBom $ledgerPath (New-PendingLedger $sessionId $manifestHash $Manifest.slots) + $env:WAGGLE_SIGNING_MANIFEST_SHA256 = $manifestHash + return $manifestHash + } + + $env:WAGGLE_SIGNING_MANIFEST_PATH = $manifestPath + $env:WAGGLE_SIGNING_SESSION_ID = $sessionId + $env:CARGO_TARGET_DIR = $targetRoot + $env:TEMP = $tempRoot + $env:TMP = $tempRoot + $env:WAGGLE_NSIS_SIGNING_TEMP_ROOT = $tempRoot + [void](& $writeSessionFixture $baseManifest) + + $loadedSession = Get-WaggleSigningSession $context + try { + Assert-Equal $loadedSession.Id $sessionId 'valid manifest session load' + foreach ($lockedPath in @( + $context.TauriCliMainPath, + $context.TauriCliIndexPath, + $context.TauriNativeBinaryPath + )) { + Assert-Throws { + $writeProbe = [IO.File]::Open( + $lockedPath, + [IO.FileMode]::Open, + [IO.FileAccess]::Write, + [IO.FileShare]::None + ) + $writeProbe.Dispose() + } 'used by another process|cannot access' 'loaded session locks complete Tauri runtime closure' + } + } finally { + foreach ($lock in $loadedSession.Locks) { $lock.Dispose() } + } + + $portableContext = $context | Select-Object * + $portableContext.PortableToolchainRoot = $toolDirectory + $portableContext | Add-Member ` + -NotePropertyName PortableToolchainReceiptPath ` + -NotePropertyValue $toolPaths['artifact-signing.nupkg'] + $portableContext | Add-Member ` + -NotePropertyName PortableToolchainReceiptSha256 ` + -NotePropertyValue (Get-Sha256 $toolPaths['artifact-signing.nupkg']) + $portableContext | Add-Member ` + -NotePropertyName PortableToolchainInventorySha256 ` + -NotePropertyValue $PortableToolchainInventorySha256 + $portableContext | Add-Member ` + -NotePropertyName PortableToolchainLocks ` + -NotePropertyValue ([Collections.Generic.List[IDisposable]]::new()) + $portableContext.SevenZipDllPath = $toolPaths['7z.exe'] + $portableContext.SevenZipDllSha256 = Get-Sha256 $toolPaths['7z.exe'] + $portableManifest = $baseManifest | ConvertTo-Json -Depth 32 | + ConvertFrom-Json -Depth 32 -DateKind String + $portableManifest | Add-Member -NotePropertyName buildReceipt -NotePropertyValue ( + [pscustomobject]@{ + schemaVersion = 1 + repository = 'marolinik/waggle-os' + sourceRevision = $context.SourceRevision + targetTriple = 'x86_64-pc-windows-msvc' + } + ) + $portableManifest.toolchain | Add-Member ` + -NotePropertyName portableToolchainRoot -NotePropertyValue $toolDirectory + $portableManifest.toolchain | Add-Member ` + -NotePropertyName sevenZipDllPath -NotePropertyValue $portableContext.SevenZipDllPath + $portableManifest.toolchain | Add-Member ` + -NotePropertyName sevenZipDllSha256 -NotePropertyValue $portableContext.SevenZipDllSha256 + $portableManifest.toolchain | Add-Member ` + -NotePropertyName portableToolchainReceiptPath ` + -NotePropertyValue $portableContext.PortableToolchainReceiptPath + $portableManifest.toolchain | Add-Member ` + -NotePropertyName portableToolchainReceiptSha256 ` + -NotePropertyValue $portableContext.PortableToolchainReceiptSha256 + $portableManifest.toolchain | Add-Member ` + -NotePropertyName portableToolchainInventorySha256 ` + -NotePropertyValue $PortableToolchainInventorySha256 + $portableManifest.toolchain | Add-Member ` + -NotePropertyName portableToolchainFileCount ` + -NotePropertyValue $PortableToolchainFileCount + $env:WAGGLE_SIGNING_PORTABLE_TOOLCHAIN_ROOT = $toolDirectory + $env:WAGGLE_SIGNING_PORTABLE_NODE_PATH = $context.NodePath + $env:WAGGLE_SIGNING_PORTABLE_GIT_PATH = $context.GitPath + $env:WAGGLE_SIGNING_PORTABLE_SEVEN_ZIP_PATH = $context.SevenZipPath + $env:WAGGLE_SIGNING_PORTABLE_RECEIPT_PATH = ` + $portableContext.PortableToolchainReceiptPath + $env:WAGGLE_SIGNING_PORTABLE_RECEIPT_SHA256 = ` + $portableContext.PortableToolchainReceiptSha256 + [void](& $writeSessionFixture $portableManifest) + $portableSession = Get-WaggleSigningSession $portableContext + try { + Assert-Equal $portableSession.Id $sessionId ` + 'receipt-bound portable manifest session load' + } finally { + foreach ($lock in $portableSession.Locks) { $lock.Dispose() } + } + + $wrongPortableRootManifest = $portableManifest | ConvertTo-Json -Depth 32 | + ConvertFrom-Json -Depth 32 -DateKind String + $wrongPortableRootManifest.toolchain.portableToolchainRoot = ` + Join-Path $sessionFixtureRoot 'substituted-tools' + [void](& $writeSessionFixture $wrongPortableRootManifest) + Assert-Throws { + Get-WaggleSigningSession $portableContext + } 'Portable signing toolchain root does not match' ` + 'portable manifest root substitution rejection' + + $wrongPortableHashManifest = $portableManifest | ConvertTo-Json -Depth 32 | + ConvertFrom-Json -Depth 32 -DateKind String + $wrongPortableHashManifest.toolchain.sevenZipDllSha256 = '0' * 64 + [void](& $writeSessionFixture $wrongPortableHashManifest) + Assert-Throws { + Get-WaggleSigningSession $portableContext + } '7-Zip runtime library manifest SHA-256' ` + 'portable manifest closure digest substitution rejection' + + [void](& $writeSessionFixture $portableManifest) + $env:WAGGLE_SIGNING_PORTABLE_NODE_PATH = $context.GitPath + Assert-Throws { + Get-WaggleSigningSession $portableContext + } 'WAGGLE_SIGNING_PORTABLE_NODE_PATH does not match' ` + 'portable callback environment substitution rejection' + $env:WAGGLE_SIGNING_PORTABLE_NODE_PATH = $context.NodePath + + $unboundPortableManifest = $portableManifest | ConvertTo-Json -Depth 32 | + ConvertFrom-Json -Depth 32 -DateKind String + $unboundPortableManifest.PSObject.Properties.Remove('buildReceipt') + [void](& $writeSessionFixture $unboundPortableManifest) + Assert-Throws { + Get-WaggleSigningSession $portableContext + } 'missing required property.*buildReceipt' ` + 'portable callback without hosted receipt rejection' + + foreach ($portableEnvironmentName in @( + 'WAGGLE_SIGNING_PORTABLE_TOOLCHAIN_ROOT', + 'WAGGLE_SIGNING_PORTABLE_NODE_PATH', + 'WAGGLE_SIGNING_PORTABLE_GIT_PATH', + 'WAGGLE_SIGNING_PORTABLE_SEVEN_ZIP_PATH', + 'WAGGLE_SIGNING_PORTABLE_RECEIPT_PATH', + 'WAGGLE_SIGNING_PORTABLE_RECEIPT_SHA256' + )) { + [Environment]::SetEnvironmentVariable($portableEnvironmentName, $null) + } + [void](& $writeSessionFixture $baseManifest) + + $validManifestHash = $env:WAGGLE_SIGNING_MANIFEST_SHA256 + $env:WAGGLE_SIGNING_MANIFEST_SHA256 = '0' * 64 + Assert-Throws { + Get-WaggleSigningSession $context + } 'manifest does not match.*SHA256|manifest.*WAGGLE_SIGNING_MANIFEST_SHA256' 'wrong manifest digest rejection' + $env:WAGGLE_SIGNING_MANIFEST_SHA256 = $validManifestHash + + $unsupportedManifest = $baseManifest | ConvertTo-Json -Depth 32 | + ConvertFrom-Json -Depth 32 -DateKind String + $unsupportedManifest.mode = 'msi' + [void](& $writeSessionFixture $unsupportedManifest) + Assert-Throws { + Get-WaggleSigningSession $context + } 'NSIS-only' 'unsupported manifest mode rejection' + + $expiredManifest = $baseManifest | ConvertTo-Json -Depth 32 | + ConvertFrom-Json -Depth 32 -DateKind String + $expiredManifest.createdAtUtc = [DateTimeOffset]::UtcNow.AddHours(-2).ToString('O') + $expiredManifest.expiresAtUtc = [DateTimeOffset]::UtcNow.AddHours(-1).ToString('O') + [void](& $writeSessionFixture $expiredManifest) + Assert-Throws { + Get-WaggleSigningSession $context + } 'expired|four-hour' 'expired manifest rejection' + + $wrongToolManifest = $baseManifest | ConvertTo-Json -Depth 32 | + ConvertFrom-Json -Depth 32 -DateKind String + $wrongToolManifest.toolchain.wrapperSha256 = '0' * 64 + [void](& $writeSessionFixture $wrongToolManifest) + Assert-Throws { + Get-WaggleSigningSession $context + } 'wrapper.*SHA-256' 'wrong wrapper digest rejection' + + $wrongNativeManifest = $baseManifest | ConvertTo-Json -Depth 32 | + ConvertFrom-Json -Depth 32 -DateKind String + $wrongNativeManifest.toolchain.tauriNativeBinarySha256 = '0' * 64 + [void](& $writeSessionFixture $wrongNativeManifest) + Assert-Throws { + Get-WaggleSigningSession $context + } 'native CLI binary.*SHA-256|native CLI binary.*digest' 'wrong Tauri native digest rejection' + + Write-JsonNoBom $overridePath ([ordered]@{ + build = @{ beforeBuildCommand = '' } + bundle = @{ active = $true; targets = @('msi'); windows = @{ + signCommand = @{ cmd = $SystemPowerShellPath; args = @( + '-NoLogo', '-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', + '-File', $wrapperPath, '-ArtifactPath', '%1' + ) } + } } + }) + $wrongOverrideManifest = $baseManifest | ConvertTo-Json -Depth 32 | + ConvertFrom-Json -Depth 32 -DateKind String + $wrongOverrideManifest.toolchain.tauriOverrideConfigSha256 = Get-Sha256 $overridePath + [void](& $writeSessionFixture $wrongOverrideManifest) + Assert-Throws { + Get-WaggleSigningSession $context + } 'NSIS-only callback contract' 'MSI signing override rejection' + Write-WaggleSigningOverride $overridePath $wrapperPath -EnableSigning | Out-Null + + [void](& $writeSessionFixture $baseManifest) + $env:TEMP = Join-Path $sessionFixtureRoot 'wrong-temp' + Assert-Throws { + Get-WaggleSigningSession $context + } 'TEMP path does not match' 'cross-session TEMP rejection' + $env:TEMP = $tempRoot + + [void](& $writeSessionFixture $baseManifest) + $legacyLedger = [pscustomobject]@{ + schemaVersion = 1 + sessionId = $sessionId + manifestSha256 = $env:WAGGLE_SIGNING_MANIFEST_SHA256 + nextOrder = 1 + entries = @() + } + Assert-Throws { + Assert-WaggleSigningLedgerState ` + ([pscustomobject]@{ + Id = $sessionId + ManifestSha256 = $env:WAGGLE_SIGNING_MANIFEST_SHA256 + Manifest = $baseManifest + TempRoot = $tempRoot + }) ` + $legacyLedger + } 'active manifest session|schemaVersion' 'legacy empty ledger rejection' + + $lifecycleDirectory = New-PrivateDirectory (Join-Path $sessionFixtureRoot 'lifecycle') + $lifecycleTemp = New-PrivateDirectory (Join-Path $lifecycleDirectory 'temp') + $lifecycleSlots = [Collections.Generic.List[object]]::new() + $signedHost = Get-TrustedPath (Get-Process -Id $PID).Path 'Signed lifecycle host' -AllowHardLink + for ($index = 0; $index -lt 14; $index++) { + $path = if ($index -eq 0) { + $signedHost + } else { + $candidate = Join-Path $lifecycleDirectory "slot-$($index + 1).exe" + New-SyntheticPe $candidate ([byte]($index + 20)) + $candidate + } + $lifecycleSlots.Add([pscustomobject][ordered]@{ + id = 'lifecycle-{0:d2}' -f ($index + 1) + order = $index + 1 + kind = 'fixed' + maxUses = 1 + path = $path + preSignSha256 = Get-Sha256 $path + }) + } + $lifecycleLedgerPath = Join-Path $lifecycleDirectory 'callback-ledger.json' + $lifecycleSession = [pscustomobject]@{ + Id = 'abcdef0123456789abcdef0123456789' + ManifestSha256 = 'C' * 64 + Manifest = [pscustomobject]@{ slots = @($lifecycleSlots) } + TempRoot = $lifecycleTemp + SessionDirectory = $lifecycleDirectory + LedgerPath = $lifecycleLedgerPath + ManifestPath = Join-Path $lifecycleDirectory 'manifest.json' + Context = [pscustomobject]@{ SourceRevision = 'a' * 40 } + } + Write-JsonNoBom $lifecycleLedgerPath ` + (New-PendingLedger $lifecycleSession.Id $lifecycleSession.ManifestSha256 $lifecycleSlots) + $lifecycleLedger = Get-Content -Raw $lifecycleLedgerPath | + ConvertFrom-Json -Depth 32 -DateKind String + Assert-WaggleSigningLedgerState $lifecycleSession $lifecycleLedger + $passed++ + + Assert-Throws { + Reserve-WaggleSigningCallback $lifecycleSession $lifecycleSlots[1].path + } 'callback phase' 'cross-phase callback rejection' + + $ledgerBeforeInvalidMutation = Get-Content -Raw -LiteralPath $lifecycleLedgerPath + Assert-Throws { + Invoke-WaggleLedgerMutation $lifecycleSession { + param($ledger) + $ledger.entries[0].attempts = 99 + } + } 'pristine|reservation metadata' 'invalid ledger mutation rejection' + Assert-Equal ` + (Get-Content -Raw -LiteralPath $lifecycleLedgerPath) ` + $ledgerBeforeInvalidMutation ` + 'invalid mutation leaves ledger unchanged' + + $reservation = Reserve-WaggleSigningCallback $lifecycleSession $lifecycleSlots[0].path + Assert-Throws { + Reserve-WaggleSigningCallback $lifecycleSession $lifecycleSlots[0].path + } 'already consumed|state must be' 'duplicate callback rejection' + Assert-Throws { + Reserve-WaggleSigningCallback $lifecycleSession $lifecycleSlots[1].path + } 'callback phase|state must be' 'reserved callback blocks later slot' + Complete-WaggleSigningCallback $lifecycleSession $reservation $lifecycleSlots[0].path | Out-Null + $completedLedger = Get-Content -Raw -LiteralPath $lifecycleLedgerPath | + ConvertFrom-Json -Depth 32 -DateKind String + Assert-Equal $completedLedger.entries[0].status 'completed' 'callback completion state' + [IO.File]::Copy($signedHost, $lifecycleSlots[2].path, $true) + $lifecycleSlots[2].preSignSha256 = Get-Sha256 $lifecycleSlots[2].path + $phaseReservation = Reserve-WaggleSigningCallback ` + $lifecycleSession $lifecycleSlots[2].path + Assert-Equal $phaseReservation.order 3 'resource callback may arrive out of manifest order' + Complete-WaggleSigningCallback ` + $lifecycleSession $phaseReservation $lifecycleSlots[2].path | Out-Null + $secondReservation = Reserve-WaggleSigningCallback $lifecycleSession $lifecycleSlots[1].path + Assert-Equal $secondReservation.order 2 'next ordered callback reservation' + $failureReceiptPath = Fail-WaggleSigningSession ` + $lifecycleSession $secondReservation 'fixture_failure' 'fixture error' 'restored-original' + Assert-Equal ` + (Test-Path -LiteralPath $failureReceiptPath -PathType Leaf) ` + $true ` + 'failed callback publishes durable failure receipt' + $failedLedger = Get-Content -Raw -LiteralPath $lifecycleLedgerPath | + ConvertFrom-Json -Depth 32 -DateKind String + Assert-Equal $failedLedger.state 'failed' 'callback failure terminal ledger state' + Assert-Equal $failedLedger.entries[1].status 'failed' 'reserved callback becomes failed' + $failedLedgerBeforeRetry = Get-Content -Raw -LiteralPath $lifecycleLedgerPath + Assert-Throws { + Reserve-WaggleSigningCallback $lifecycleSession $lifecycleSlots[2].path + } 'receipt already exists|terminal' 'failed session callback retry rejection' + Assert-Equal ` + (Get-Content -Raw -LiteralPath $lifecycleLedgerPath) ` + $failedLedgerBeforeRetry ` + 'failed session retry leaves ledger unchanged' + + $completeDirectory = New-PrivateDirectory (Join-Path $sessionFixtureRoot 'complete-ledger') + $completeTemp = New-PrivateDirectory (Join-Path $completeDirectory 'temp') + $completeSlots = [Collections.Generic.List[object]]::new() + $completePayloads = [Collections.Generic.List[object]]::new() + for ($index = 0; $index -lt 12; $index++) { + $completePath = Join-Path $completeDirectory "complete-$($index + 1).exe" + New-SyntheticPe $completePath ([byte]($index + 40)) + $completeSlots.Add([pscustomobject][ordered]@{ + id = 'complete-{0:d2}' -f ($index + 1) + order = $index + 1 + kind = 'fixed' + maxUses = 1 + path = $completePath + packagedPath = $packagedPaths[$index] + preSignSha256 = Get-Sha256 $completePath + }) + $completePayloads.Add([pscustomobject][ordered]@{ + path = $packagedPaths[$index] + sha256 = Get-Sha256 $completePath + size = [long](Get-Item -LiteralPath $completePath).Length + extractedPath = $completePath + }) + } + $completeUninstallerPath = Join-Path $completeTemp 'nstABCD.tmp' + New-SyntheticPe $completeUninstallerPath 80 + $completeEvidencePath = Join-Path $completeDirectory 'signed-evidence\13-nsis-uninstaller.exe' + New-SyntheticPe $completeEvidencePath 81 + $completeSlots.Add([pscustomobject][ordered]@{ + id = 'complete-13'; order = 13; kind = 'generated-nsis-uninstaller'; maxUses = 1 + pathPattern = $NsisUninstallerPattern; evidencePath = $completeEvidencePath + }) + $completeInstallerPath = Join-Path $completeDirectory 'Waggle_0.2.0_x64-setup.exe' + New-SyntheticPe $completeInstallerPath 82 + $completeSlots.Add([pscustomobject][ordered]@{ + id = 'complete-14'; order = 14; kind = 'generated-nsis-installer'; maxUses = 1 + path = $completeInstallerPath + }) + $completeLedgerPath = Join-Path $completeDirectory 'callback-ledger.json' + $completeSession = [pscustomobject]@{ + Id = 'fedcba9876543210fedcba9876543210' + ManifestSha256 = 'D' * 64 + Manifest = [pscustomobject]@{ + slots = @($completeSlots) + payloads = @($completePayloads | ForEach-Object { + [pscustomobject]@{ path = $_.path; sha256 = $_.sha256; size = $_.size } + }) + } + TempRoot = $completeTemp + SessionDirectory = $completeDirectory + LedgerPath = $completeLedgerPath + ManifestPath = Join-Path $completeDirectory 'manifest.json' + Context = [pscustomobject]@{ + SourceRevision = 'b' * 40 + SignToolPath = $toolPaths['signtool.exe'] + SevenZipPath = $toolPaths['7z.exe'] + } + } + $completeLedger = New-PendingLedger ` + $completeSession.Id $completeSession.ManifestSha256 @($completeSlots) + $reservedAt = [DateTimeOffset]::UtcNow.AddMinutes(-2).ToString('O') + $completedAt = [DateTimeOffset]::UtcNow.AddMinutes(-1).ToString('O') + foreach ($entry in $completeLedger.entries) { + $slot = $completeSlots[[int]$entry.order - 1] + $entryPath = if ([int]$entry.order -eq 13) { + $completeUninstallerPath + } else { + [string]$slot.path + } + $entry.status = 'completed' + $entry.attempts = 1 + $entry.reservationId = [Guid]::NewGuid().ToString('N') + $entry.path = $entryPath + $entry.preSignSha256 = Get-Sha256 $entryPath + $entry.reservedAtUtc = $reservedAt + $entry.completedAtUtc = $completedAt + $entry.postSignSha256 = if ([int]$entry.order -eq 13) { + Get-Sha256 $completeEvidencePath + } else { + Get-Sha256 $entryPath + } + $entry.signerSubject = 'CN=Fixture signer' + } + Write-JsonNoBom $completeLedgerPath $completeLedger + $loadedCompleteLedger = Get-CompletedWaggleSigningLedger $completeSession + Assert-Equal $loadedCompleteLedger.entries.Count 14 'complete finalizer accepts exact 14-slot ledger' + $changedPayloads = @($completePayloads | ForEach-Object { + [pscustomobject]@{ + path = $_.path; sha256 = $_.sha256; size = $_.size; extractedPath = $_.extractedPath + } + }) + $changedPayloads[0].sha256 = '0' * 64 + Assert-Throws { + Assert-WaggleFinalPayloadBindings ` + $completeSession $loadedCompleteLedger $changedPayloads { param($Path, $SignTool) } + } 'payload bytes differ' 'same-name changed packaged payload rejection' + $completeLedger.entries[13].status = 'pending' + $completeLedger.entries[13].attempts = 0 + foreach ($field in @( + 'reservationId', 'path', 'preSignSha256', 'reservedAtUtc', + 'completedAtUtc', 'postSignSha256', 'signerSubject' + )) { + $completeLedger.entries[13].$field = $null + } + Write-JsonNoBom $completeLedgerPath $completeLedger + Assert-Throws { + Get-CompletedWaggleSigningLedger $completeSession + } 'incomplete' 'finalizer rejects incomplete callback ledger' + Write-JsonNoBom $completeLedgerPath $loadedCompleteLedger + $finalResult = Assert-WaggleSigningPackageComplete ` + $completeSession @($completePayloads) { param($Path, $SignTool) } + Assert-Equal ` + (Test-Path -LiteralPath $finalResult.ReceiptPath -PathType Leaf) ` + $true ` + 'finalizer publishes regular provenance receipt' + $sealedLedger = Get-Content -Raw -LiteralPath $completeLedgerPath | + ConvertFrom-Json -Depth 32 -DateKind String + Assert-Equal $sealedLedger.state 'sealed' 'finalizer seals only after receipt publication' + Assert-Equal ` + $sealedLedger.terminalReceiptSha256 ` + (Get-Sha256 $finalResult.ReceiptPath) ` + 'sealed ledger binds exact provenance receipt digest' + + $receiptFailureDirectory = New-PrivateDirectory ` + (Join-Path $sessionFixtureRoot 'receipt-ledger-recovery') + $receiptFailureLedgerPath = Join-Path $receiptFailureDirectory 'callback-ledger.json' + $receiptFailureSession = [pscustomobject]@{ + Id = '11111111111111111111111111111111' + ManifestSha256 = 'F' * 64 + Manifest = [pscustomobject]@{ slots = @($completeSlots) } + TempRoot = $completeTemp + SessionDirectory = $receiptFailureDirectory + LedgerPath = $receiptFailureLedgerPath + ManifestPath = Join-Path $receiptFailureDirectory 'manifest.json' + Context = [pscustomobject]@{ SourceRevision = 'b' * 40 } + } + Write-JsonNoBom $receiptFailureLedgerPath ` + (New-PendingLedger $receiptFailureSession.Id $receiptFailureSession.ManifestSha256 @($completeSlots)) + $ledgerBlocker = [IO.FileStream]::new( + $receiptFailureLedgerPath, + [IO.FileMode]::Open, + [IO.FileAccess]::Read, + [IO.FileShare]::Read + ) + try { + Assert-Throws { + Fail-WaggleSigningSession ` + $receiptFailureSession $null 'forced-ledger-failure' ` + 'forced receipt-before-ledger recovery fixture' + } 'replace|access|being used|used by another process' ` + 'ledger replace failure occurs after durable receipt publication' + } finally { + $ledgerBlocker.Dispose() + } + $pendingReceiptPath = Join-Path $receiptFailureDirectory 'failure-receipt.json' + $terminalIntentPath = Join-Path $receiptFailureDirectory 'terminal-intent.json' + Assert-Equal ` + (Test-Path -LiteralPath $pendingReceiptPath -PathType Leaf) $true ` + 'ledger failure leaves a durable pending terminal receipt' + Assert-Equal ` + (Test-Path -LiteralPath $terminalIntentPath -PathType Leaf) $true ` + 'ledger failure leaves a durable terminal intent' + $receiptFailureLedger = Get-Content -Raw -LiteralPath $receiptFailureLedgerPath | + ConvertFrom-Json -Depth 32 -DateKind String + Assert-Equal $receiptFailureLedger.state 'open' 'receipt failure leaves ledger open' + Assert-Throws { + Invoke-WaggleLedgerMutation $receiptFailureSession { param($ledger) } + } 'pending terminal receipt' 'pending terminal intent blocks ordinary ledger mutation' + $pendingReceiptBytes = [IO.File]::ReadAllBytes($pendingReceiptPath) + $pendingReceipt = Get-Content -Raw -LiteralPath $pendingReceiptPath | + ConvertFrom-Json -Depth 32 -DateKind String + $pendingReceiptSha256 = Get-Sha256 $pendingReceiptPath + [IO.File]::WriteAllText( + $pendingReceiptPath, + '{"schemaVersion":1,"status":"failed","tampered":true}', + [Text.UTF8Encoding]::new($false) + ) + Assert-Throws { + Fail-WaggleSigningSession ` + $receiptFailureSession $null 'forced-ledger-failure' ` + 'forced receipt-before-ledger recovery fixture' + } 'intent|digest|receipt' 'tampered pending terminal receipt is rejected' + [IO.File]::WriteAllBytes($pendingReceiptPath, $pendingReceiptBytes) + $recoveredReceiptPath = Fail-WaggleSigningSession ` + $receiptFailureSession $null 'forced-ledger-failure' ` + 'forced receipt-before-ledger recovery fixture' + $recoveredLedger = Get-Content -Raw -LiteralPath $receiptFailureLedgerPath | + ConvertFrom-Json -Depth 32 -DateKind String + Assert-Equal $recoveredLedger.state 'failed' 'pending terminal receipt recovers ledger state' + Assert-Equal ` + $recoveredLedger.terminalAtUtc $pendingReceipt.terminalAtUtc ` + 'recovery reuses the original durable terminal timestamp' + Assert-Equal ` + $recoveredLedger.terminalReceiptSha256 $pendingReceiptSha256 ` + 'recovery reuses the original durable terminal receipt digest' + $recoveredBytes = [IO.File]::ReadAllBytes($recoveredReceiptPath) + [IO.File]::WriteAllText($recoveredReceiptPath, '{}', [Text.UTF8Encoding]::new($false)) + Assert-Throws { + Fail-WaggleSigningSession ` + $receiptFailureSession $null 'forced-ledger-failure' ` + 'forced receipt-before-ledger recovery fixture' + } 'intent|digest|receipt' 'post-commit terminal receipt tampering is rejected' + [IO.File]::WriteAllBytes($recoveredReceiptPath, $recoveredBytes) + + $intentOnlyDirectory = New-PrivateDirectory ` + (Join-Path $sessionFixtureRoot 'intent-only-recovery') + $intentOnlyLedgerPath = Join-Path $intentOnlyDirectory 'callback-ledger.json' + $intentOnlySession = [pscustomobject]@{ + Id = '12121212121212121212121212121212' + ManifestSha256 = '1' * 64 + Manifest = [pscustomobject]@{ slots = @($completeSlots) } + TempRoot = $completeTemp + SessionDirectory = $intentOnlyDirectory + LedgerPath = $intentOnlyLedgerPath + ManifestPath = Join-Path $intentOnlyDirectory 'manifest.json' + Context = [pscustomobject]@{ SourceRevision = 'b' * 40 } + } + Write-JsonNoBom $intentOnlyLedgerPath ` + (New-PendingLedger $intentOnlySession.Id $intentOnlySession.ManifestSha256 @($completeSlots)) + $intentOnlyTerminalAt = [DateTimeOffset]::UtcNow.AddMinutes(-3).ToString('O') + $intentOnlyReceipt = [pscustomobject][ordered]@{ + schemaVersion = 1 + status = 'failed' + sessionId = $intentOnlySession.Id + sourceRevision = $intentOnlySession.Context.SourceRevision + manifestPath = $intentOnlySession.ManifestPath + manifestSha256 = $intentOnlySession.ManifestSha256 + failureCode = 'intent-only-failure' + failureMessage = 'recover the receipt from the durable terminal intent' + failedSlotId = $null + rollbackOutcome = 'not-required' + terminalAtUtc = $intentOnlyTerminalAt + } + $intentOnlyStagedReceiptPath = Join-Path $intentOnlyDirectory 'staged-receipt.tmp' + Write-WaggleDurableJsonNew $intentOnlyStagedReceiptPath $intentOnlyReceipt + $intentOnlyReceiptSha256 = Get-Sha256 $intentOnlyStagedReceiptPath + [IO.File]::Delete($intentOnlyStagedReceiptPath) + Write-WaggleDurableJsonNew ` + (Join-Path $intentOnlyDirectory 'terminal-intent.json') ` + ([pscustomobject][ordered]@{ + schemaVersion = 1 + state = 'failed' + sessionId = $intentOnlySession.Id + manifestSha256 = $intentOnlySession.ManifestSha256 + terminalAtUtc = $intentOnlyTerminalAt + receiptSha256 = $intentOnlyReceiptSha256 + }) + Assert-Throws { + Fail-WaggleSigningSession ` + $intentOnlySession $null 'intent-only-failure' 'tampered recovery candidate' + } 'intent|candidate' 'intent-only recovery rejects a changed terminal candidate' + Assert-Equal ` + (Test-Path -LiteralPath (Join-Path $intentOnlyDirectory 'failure-receipt.json')) ` + $false ` + 'intent-only candidate mismatch does not publish a receipt' + $intentOnlyOpenLedger = Get-Content -Raw -LiteralPath $intentOnlyLedgerPath | + ConvertFrom-Json -Depth 32 -DateKind String + Assert-Equal $intentOnlyOpenLedger.state 'open' 'intent-only candidate mismatch leaves ledger open' + $intentOnlyRecoveredReceiptPath = Fail-WaggleSigningSession ` + $intentOnlySession $null 'intent-only-failure' ` + 'recover the receipt from the durable terminal intent' + $intentOnlyRecoveredLedger = Get-Content -Raw -LiteralPath $intentOnlyLedgerPath | + ConvertFrom-Json -Depth 32 -DateKind String + Assert-Equal $intentOnlyRecoveredLedger.state 'failed' 'intent-only retry terminalizes the ledger' + Assert-Equal ` + $intentOnlyRecoveredLedger.terminalAtUtc $intentOnlyTerminalAt ` + 'intent-only retry reuses the durable terminal timestamp' + Assert-Equal ` + (Get-Sha256 $intentOnlyRecoveredReceiptPath) $intentOnlyReceiptSha256 ` + 'intent-only retry publishes the exact intent-bound receipt bytes' + + $concurrencyRoot = New-PrivateDirectory ` + (Join-Path $sessionFixtureRoot 'concurrent-reservation') + $concurrencyLedgerPath = Join-Path $concurrencyRoot 'callback-ledger.json' + $concurrencySessionPath = Join-Path $concurrencyRoot 'session.json' + $concurrencySession = [pscustomobject]@{ + Id = '22222222222222222222222222222222' + ManifestSha256 = '2' * 64 + Manifest = [pscustomobject]@{ slots = @($lifecycleSlots) } + TempRoot = $lifecycleTemp + SessionDirectory = $concurrencyRoot + LedgerPath = $concurrencyLedgerPath + ManifestPath = Join-Path $concurrencyRoot 'manifest.json' + Context = [pscustomobject]@{ SourceRevision = 'a' * 40 } + } + Write-JsonNoBom $concurrencyLedgerPath ` + (New-PendingLedger ` + $concurrencySession.Id $concurrencySession.ManifestSha256 @($lifecycleSlots)) + Write-JsonNoBom $concurrencySessionPath $concurrencySession + $reservationChildPath = Join-Path $concurrencyRoot 'reserve-child.ps1' + $reservationChildSource = @' +param( + [string]$WrapperPath, [string]$SessionPath, [string]$CallbackArtifactPath, + [string]$ReadyPath, [string]$GoPath, [string]$ResultPath +) +$ErrorActionPreference = 'Stop' +. $WrapperPath -ArtifactPath 'C:\unused.exe' +$session = Get-Content -Raw -LiteralPath $SessionPath | + ConvertFrom-Json -Depth 32 -DateKind String +[IO.File]::WriteAllText($ReadyPath, 'ready') +while (-not [IO.File]::Exists($GoPath)) { Start-Sleep -Milliseconds 10 } +try { + $reservation = Reserve-WaggleSigningCallback $session $CallbackArtifactPath + [IO.File]::WriteAllText($ResultPath, "reserved:$($reservation.reservationId)") +} catch { + [IO.File]::WriteAllText($ResultPath, "error:$($_.Exception.Message)") +} +'@ + [IO.File]::WriteAllText( + $reservationChildPath, $reservationChildSource, [Text.UTF8Encoding]::new($false) + ) + $reservationGoPath = Join-Path $concurrencyRoot 'go' + $reservationReadyPaths = @( + (Join-Path $concurrencyRoot 'ready-1'), + (Join-Path $concurrencyRoot 'ready-2') + ) + $reservationResultPaths = @( + (Join-Path $concurrencyRoot 'result-1'), + (Join-Path $concurrencyRoot 'result-2') + ) + $reservationProcesses = @() + for ($index = 0; $index -lt 2; $index++) { + $reservationProcesses += Start-SynchronizedChild ` + -PowerShellPath $approvedPowerShell -ScriptPath $reservationChildPath ` + -Arguments @{ + WrapperPath = $wrapperPath + SessionPath = $concurrencySessionPath + CallbackArtifactPath = [string]$lifecycleSlots[0].path + ReadyPath = $reservationReadyPaths[$index] + GoPath = $reservationGoPath + ResultPath = $reservationResultPaths[$index] + } + } + Wait-ForChildBarriers $reservationReadyPaths 'reservation race' + [IO.File]::WriteAllText($reservationGoPath, 'go') + foreach ($process in $reservationProcesses) { + if (-not $process.WaitForExit(30000)) { + $process.Kill() + throw 'Timed out waiting for the duplicate reservation race.' + } + Assert-Equal $process.ExitCode 0 'reservation race child exit code' + } + $reservationResults = @($reservationResultPaths | ForEach-Object { + [IO.File]::ReadAllText($_) + }) + Assert-Equal ` + @($reservationResults | Where-Object { $_ -cmatch '^reserved:[0-9a-f]{32}$' }).Count ` + 1 ` + "concurrent duplicate reservation has exactly one winner [$($reservationResults -join ' | ')]" + Assert-Equal ` + @($reservationResults | Where-Object { + $_ -cmatch '^error:.*(already consumed|state must be|reservation)' + }).Count ` + 1 ` + 'concurrent duplicate reservation has exactly one rejected loser' + $concurrencyLedger = Get-Content -Raw -LiteralPath $concurrencyLedgerPath | + ConvertFrom-Json -Depth 32 -DateKind String + Assert-WaggleSigningLedgerState $concurrencySession $concurrencyLedger + Assert-Equal $concurrencyLedger.entries[0].status 'reserved' 'reservation race persists one reservation' + Assert-Equal $concurrencyLedger.entries[0].attempts 1 'reservation race consumes one attempt' + + $terminalRoot = New-PrivateDirectory ` + (Join-Path $sessionFixtureRoot 'concurrent-terminal') + $terminalLedgerPath = Join-Path $terminalRoot 'callback-ledger.json' + $terminalSessionPath = Join-Path $terminalRoot 'session.json' + $terminalSession = [pscustomobject]@{ + Id = '33333333333333333333333333333333' + ManifestSha256 = '3' * 64 + Manifest = [pscustomobject]@{ slots = @($completeSlots) } + TempRoot = $completeTemp + SessionDirectory = $terminalRoot + LedgerPath = $terminalLedgerPath + ManifestPath = Join-Path $terminalRoot 'manifest.json' + Context = [pscustomobject]@{ SourceRevision = 'b' * 40 } + } + $terminalLedger = $loadedCompleteLedger | ConvertTo-Json -Depth 32 | + ConvertFrom-Json -Depth 32 -DateKind String + $terminalLedger.sessionId = $terminalSession.Id + $terminalLedger.manifestSha256 = $terminalSession.ManifestSha256 + $terminalLedger.state = 'open' + $terminalLedger.terminalAtUtc = $null + $terminalLedger.terminalReceiptSha256 = $null + Write-JsonNoBom $terminalLedgerPath $terminalLedger + Write-JsonNoBom $terminalSessionPath $terminalSession + $terminalChildPath = Join-Path $terminalRoot 'terminal-child.ps1' + $terminalChildSource = @' +param( + [string]$WrapperPath, [string]$SessionPath, [string]$State, + [string]$ReadyPath, [string]$GoPath, [string]$ResultPath +) +$ErrorActionPreference = 'Stop' +. $WrapperPath -ArtifactPath 'C:\unused.exe' +$session = Get-Content -Raw -LiteralPath $SessionPath | + ConvertFrom-Json -Depth 32 -DateKind String +[IO.File]::WriteAllText($ReadyPath, 'ready') +while (-not [IO.File]::Exists($GoPath)) { Start-Sleep -Milliseconds 10 } +$receipt = [pscustomobject][ordered]@{ + schemaVersion = 1 + status = $State + sessionId = $session.Id + sourceRevision = $session.Context.SourceRevision + manifestSha256 = $session.ManifestSha256 + terminalAtUtc = [DateTimeOffset]::UtcNow.ToString('O') + failureCode = if ($State -ceq 'failed') { 'race-fixture' } else { $null } + failureMessage = if ($State -ceq 'failed') { 'race fixture failure' } else { $null } + failedSlotId = $null + rollbackOutcome = if ($State -ceq 'failed') { 'not-required' } else { $null } + manifestPath = if ($State -ceq 'sealed') { $session.ManifestPath } else { $null } + callbackLedgerPath = if ($State -ceq 'sealed') { $session.LedgerPath } else { $null } + installerPath = if ($State -ceq 'sealed') { [string]$session.Manifest.slots[13].path } else { $null } + installerSha256 = if ($State -ceq 'sealed') { 'A' * 64 } else { $null } + signerSubject = if ($State -ceq 'sealed') { 'CN=Race Fixture' } else { $null } + payloadManifestSha256 = if ($State -ceq 'sealed') { 'B' * 64 } else { $null } + artifactBindings = if ($State -ceq 'sealed') { @( + [pscustomobject]@{ kind = 'fixture'; sha256 = 'C' * 64 }, + [pscustomobject]@{ kind = 'fixture'; sha256 = 'D' * 64 } + ) } else { $null } +} +try { + $path = Set-WaggleSigningTerminalState ` + -Session $session -State $State -Receipt $receipt ` + -LedgerMutation { param($ledger) } + [IO.File]::WriteAllText($ResultPath, "terminal:${State}:$path") +} catch { + [IO.File]::WriteAllText($ResultPath, "error:$($_.Exception.Message)") +} +'@ + [IO.File]::WriteAllText( + $terminalChildPath, $terminalChildSource, [Text.UTF8Encoding]::new($false) + ) + $terminalGoPath = Join-Path $terminalRoot 'go' + $terminalReadyPaths = @( + (Join-Path $terminalRoot 'ready-failed'), + (Join-Path $terminalRoot 'ready-sealed') + ) + $terminalResultPaths = @( + (Join-Path $terminalRoot 'result-failed'), + (Join-Path $terminalRoot 'result-sealed') + ) + $terminalStates = @('failed', 'sealed') + $terminalProcesses = @() + for ($index = 0; $index -lt 2; $index++) { + $terminalProcesses += Start-SynchronizedChild ` + -PowerShellPath $approvedPowerShell -ScriptPath $terminalChildPath ` + -Arguments @{ + WrapperPath = $wrapperPath + SessionPath = $terminalSessionPath + State = $terminalStates[$index] + ReadyPath = $terminalReadyPaths[$index] + GoPath = $terminalGoPath + ResultPath = $terminalResultPaths[$index] + } + } + Wait-ForChildBarriers $terminalReadyPaths 'terminal fail-vs-seal race' + [IO.File]::WriteAllText($terminalGoPath, 'go') + foreach ($process in $terminalProcesses) { + if (-not $process.WaitForExit(30000)) { + $process.Kill() + throw 'Timed out waiting for the terminal fail-vs-seal race.' + } + Assert-Equal $process.ExitCode 0 'terminal race child exit code' + } + $terminalResults = @($terminalResultPaths | ForEach-Object { + [IO.File]::ReadAllText($_) + }) + Assert-Equal ` + @($terminalResults | Where-Object { $_ -cmatch '^terminal:(failed|sealed):' }).Count ` + 1 ` + 'terminal fail-vs-seal race has exactly one winner' + Assert-Equal ` + @($terminalResults | Where-Object { + $_ -cmatch '^error:.*(terminal|opposite|different)' + }).Count ` + 1 ` + 'terminal fail-vs-seal race has exactly one rejected loser' + $terminalReceiptPaths = @( + (Join-Path $terminalRoot 'failure-receipt.json'), + (Join-Path $terminalRoot 'provenance-receipt.json') + ) + $publishedTerminalReceipts = @($terminalReceiptPaths | Where-Object { + Test-Path -LiteralPath $_ -PathType Leaf + }) + Assert-Equal $publishedTerminalReceipts.Count 1 'terminal race publishes one receipt' + $terminalLedgerAfterRace = Get-Content -Raw -LiteralPath $terminalLedgerPath | + ConvertFrom-Json -Depth 32 -DateKind String + Assert-WaggleSigningLedgerState $terminalSession $terminalLedgerAfterRace + $expectedTerminalState = if ( + [IO.Path]::GetFileName($publishedTerminalReceipts[0]) -ceq 'failure-receipt.json' + ) { 'failed' } else { 'sealed' } + Assert-Equal ` + $terminalLedgerAfterRace.state $expectedTerminalState ` + 'terminal race ledger matches its sole receipt' + Assert-Equal ` + $terminalLedgerAfterRace.terminalReceiptSha256 ` + (Get-Sha256 $publishedTerminalReceipts[0]) ` + 'terminal race ledger binds its sole receipt digest' +} finally { + foreach ($name in $environmentNames) { + [Environment]::SetEnvironmentVariable($name, $savedEnvironment[$name]) + } + if (Test-Path -LiteralPath $sessionFixtureRoot) { + [IO.Directory]::Delete($sessionFixtureRoot, $true) + } +} + +Write-Host "Artifact Signing policy tests passed: $passed" diff --git a/app/scripts/sign-windows-pilot.ps1 b/app/scripts/sign-windows-pilot.ps1 index 6605c48..c1057c4 100644 --- a/app/scripts/sign-windows-pilot.ps1 +++ b/app/scripts/sign-windows-pilot.ps1 @@ -155,9 +155,8 @@ if ($Mode -eq 'Setup') { Write-Host "[setup] thumbprint -> $ThumbprintFile" -ForegroundColor Green Write-Host '' Write-Host 'Next:' -ForegroundColor Cyan - Write-Host ' 1. cd app && npm run tauri:sign:pilot:win:apply' - Write-Host ' 2. npm run tauri:build:win' - Write-Host ' 3. .\scripts\sign-windows-pilot.ps1 -Mode Sign -ArtifactPath ' + Write-Host ' 1. npm run tauri:build:win:pilot-signed' + Write-Host ' 2. .\scripts\sign-windows-pilot.ps1 -Mode Sign -ArtifactPath # optional' return } diff --git a/app/scripts/signing-config.test.ts b/app/scripts/signing-config.test.ts index 1524335..e01369f 100644 --- a/app/scripts/signing-config.test.ts +++ b/app/scripts/signing-config.test.ts @@ -1,6 +1,10 @@ import { describe, it, expect } from 'vitest'; +import { spawnSync } from 'node:child_process'; +import { dirname, resolve } from 'node:path'; +import { fileURLToPath } from 'node:url'; import { parseThumbprintString, + addWindowsArtifactSigningToOverride, addWindowsSigningToOverride, addMacosAdhocToOverride, type TauriOverrideConfig, @@ -86,6 +90,23 @@ describe('addWindowsSigningToOverride', () => { expect(out.bundle?.windows?.certificateThumbprint).toBe(VALID_THUMBPRINT); }); + it('removes an Azure signCommand when returning to certificate-store signing', () => { + const azure: TauriOverrideConfig = addWindowsArtifactSigningToOverride( + { + bundle: { + windows: { nsis: { installMode: 'currentUser' } }, + }, + }, + String.raw`D:\a\waggle-os\app\scripts\sign-windows-artifact.ps1`, + ); + + const out = addWindowsSigningToOverride(azure, VALID_THUMBPRINT); + + expect(out.bundle?.windows?.signCommand).toBeUndefined(); + expect(out.bundle?.windows?.certificateThumbprint).toBe(VALID_THUMBPRINT); + expect(out.bundle?.windows?.nsis).toEqual({ installMode: 'currentUser' }); + }); + it('overrides custom digestAlgorithm and timestampUrl when options provided', () => { const out = addWindowsSigningToOverride({}, VALID_THUMBPRINT, { digestAlgorithm: 'sha384', @@ -127,6 +148,154 @@ describe('addWindowsSigningToOverride', () => { }); }); +// ─── addWindowsArtifactSigningToOverride ─────────────────────────────────── + +describe('addWindowsArtifactSigningToOverride', () => { + const WRAPPER_PATH = String.raw`D:\a\waggle-os\app\scripts\sign-windows-artifact.ps1`; + const SYSTEM_POWERSHELL_PATH = + String.raw`C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe`; + + it('configures an object-form Tauri signCommand with one artifact placeholder', () => { + const out = addWindowsArtifactSigningToOverride( + {}, + WRAPPER_PATH, + ); + + expect(out.bundle?.windows?.signCommand).toEqual({ + cmd: SYSTEM_POWERSHELL_PATH, + args: [ + '-NoLogo', + '-NoProfile', + '-NonInteractive', + '-ExecutionPolicy', + 'Bypass', + '-File', + WRAPPER_PATH, + '-ArtifactPath', + '%1', + ], + }); + }); + + it('removes mutually exclusive certificate-store signing fields', () => { + const input: TauriOverrideConfig = { + bundle: { + windows: { + certificateThumbprint: 'AB'.repeat(20), + digestAlgorithm: 'sha256', + timestampUrl: 'http://timestamp.digicert.com', + tsp: true, + nsis: { installMode: 'currentUser' }, + }, + }, + }; + + const out = addWindowsArtifactSigningToOverride( + input, + WRAPPER_PATH, + ); + expect(out.bundle?.windows?.certificateThumbprint).toBeUndefined(); + expect(out.bundle?.windows?.digestAlgorithm).toBeUndefined(); + expect(out.bundle?.windows?.timestampUrl).toBeUndefined(); + expect(out.bundle?.windows?.tsp).toBeUndefined(); + expect(out.bundle?.windows?.nsis).toEqual({ installMode: 'currentUser' }); + }); + + it('is immutable and idempotent', () => { + const input: TauriOverrideConfig = { + build: { + beforeBuildCommand: 'npm run build', + beforeBundleCommand: 'node mutate-bundle.mjs', + }, + bundle: { + active: false, + targets: ['msi'], + windows: { nsis: { installMode: 'currentUser' } }, + }, + }; + const snapshot = JSON.parse(JSON.stringify(input)); + const once = addWindowsArtifactSigningToOverride( + input, + WRAPPER_PATH, + ); + const twice = addWindowsArtifactSigningToOverride( + once, + WRAPPER_PATH, + ); + + expect(input).toEqual(snapshot); + expect(twice).toEqual(once); + expect(once.build).toEqual({ + beforeBuildCommand: '', + beforeBundleCommand: '', + }); + expect(once.bundle?.active).toBe(true); + expect(once.bundle?.targets).toEqual(['nsis']); + expect(once.bundle?.windows?.nsis).toEqual({ installMode: 'currentUser' }); + }); + + it('rejects non-absolute, placeholder-bearing, or control-character wrapper paths', () => { + expect(() => + addWindowsArtifactSigningToOverride( + {}, + 'scripts/sign.ps1', + ), + ).toThrow(/absolute Windows path/i); + expect(() => + addWindowsArtifactSigningToOverride( + {}, + String.raw`D:\a\%1\sign-windows-artifact.ps1`, + ), + ).toThrow(/placeholder/i); + expect(() => + addWindowsArtifactSigningToOverride( + {}, + 'D:\\safe\nmalicious.ps1', + ), + ).toThrow(/control characters/i); + expect(() => + addWindowsArtifactSigningToOverride( + {}, + String.raw`D:\safe\..\malicious.ps1`, + ), + ).toThrow(/canonical local Windows/i); + expect(() => + addWindowsArtifactSigningToOverride( + {}, + String.raw`D:\safe\sign.ps1:payload`, + ), + ).toThrow(/canonical local Windows/i); + }); + + it('contains exactly one artifact placeholder across the complete command', () => { + const out = addWindowsArtifactSigningToOverride({}, WRAPPER_PATH); + const command = out.bundle?.windows?.signCommand; + const placeholderCount = [command?.cmd, ...(command?.args ?? [])] + .flatMap((part) => part?.match(/%1/g) ?? []) + .length; + expect(placeholderCount).toBe(1); + }); +}); + +describe('apply-signing-config Artifact Signing boundary', () => { + it('fails closed toward the protected hosted release workflow, never local Build mode', () => { + const scriptDir = dirname(fileURLToPath(import.meta.url)); + const result = spawnSync( + process.execPath, + [resolve(scriptDir, 'apply-signing-config.mjs')], + { + cwd: resolve(scriptDir, '..'), + env: { ...process.env, WAGGLE_WINDOWS_SIGNING_MODE: 'artifact-signing' }, + encoding: 'utf8', + }, + ); + const output = `${result.stdout}\n${result.stderr}`; + expect(result.status).not.toBe(0); + expect(output).toMatch(/protected GitHub-hosted release workflow/i); + expect(output).not.toMatch(/-Mode Build/i); + }); +}); + // ─── addMacosAdhocToOverride ──────────────────────────────────────────────── describe('addMacosAdhocToOverride', () => { diff --git a/app/scripts/signing-config.ts b/app/scripts/signing-config.ts index eeb6b2d..011d148 100644 --- a/app/scripts/signing-config.ts +++ b/app/scripts/signing-config.ts @@ -18,10 +18,17 @@ export interface TauriBundleWindows { certificateThumbprint?: string; digestAlgorithm?: string; + signCommand?: TauriSignCommand; timestampUrl?: string; + tsp?: boolean; [key: string]: unknown; } +export interface TauriSignCommand { + cmd: string; + args: string[]; +} + export interface TauriBundleMacOS { signingIdentity?: string; [key: string]: unknown; @@ -34,6 +41,7 @@ export interface TauriBundle { } export interface TauriOverrideConfig { + build?: Record; bundle?: TauriBundle; [key: string]: unknown; } @@ -50,6 +58,39 @@ const DEFAULT_TIMESTAMP_URL = 'http://timestamp.digicert.com'; const MACOS_ADHOC_IDENTITY = '-'; const THUMBPRINT_LENGTH = 40; const HEX_PATTERN = /^[0-9A-F]+$/; +const WINDOWS_ABSOLUTE_PATH_PATTERN = /^[A-Za-z]:[\\/]/; +const WINDOWS_POWERSHELL_PATH = + String.raw`C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe`; + +function containsControlCharacter(value: string): boolean { + return [...value].some((character) => { + const codePoint = character.codePointAt(0) ?? 0; + return codePoint <= 31 || codePoint === 127; + }); +} + +function assertCanonicalWindowsFilePath(value: string): void { + if (containsControlCharacter(value)) { + throw new Error('Artifact Signing wrapper path contains control characters.'); + } + if (!WINDOWS_ABSOLUTE_PATH_PATTERN.test(value)) { + throw new Error('Artifact Signing wrapper must use an absolute Windows path.'); + } + const pathTail = value.slice(3); + const segments = pathTail.split(/[\\/]/); + if ( + pathTail.length === 0 + || value.slice(2).includes(':') + || segments.some( + (segment) => segment.length === 0 + || segment === '.' + || segment === '..' + || /[. ]$/.test(segment), + ) + ) { + throw new Error('Artifact Signing wrapper must use a canonical local Windows file path.'); + } +} // ─── parseThumbprintString ────────────────────────────────────────────────── @@ -82,7 +123,7 @@ export function parseThumbprintString(raw: string): string { * Return a new override config with Windows code-signing fields applied. * * Preserves all existing top-level and bundle fields; replaces only the - * three signing-specific keys under `bundle.windows`. Idempotent — calling + * signing-specific keys under `bundle.windows`. Idempotent — calling * twice with the same thumbprint yields an equal result. */ export function addWindowsSigningToOverride( @@ -96,9 +137,11 @@ export function addWindowsSigningToOverride( const existingBundle: TauriBundle = config.bundle ?? {}; const existingWindows: TauriBundleWindows = existingBundle.windows ?? {}; + const nonCustomCommandWindows: TauriBundleWindows = { ...existingWindows }; + delete nonCustomCommandWindows.signCommand; const nextWindows: TauriBundleWindows = { - ...existingWindows, + ...nonCustomCommandWindows, certificateThumbprint: normalisedThumbprint, digestAlgorithm, timestampUrl, @@ -115,6 +158,73 @@ export function addWindowsSigningToOverride( }; } +// ─── addWindowsArtifactSigningToOverride ─────────────────────────────────── + +/** + * Return a new override config that delegates every Tauri Windows signing + * target to the fail-closed Azure Artifact Signing wrapper. + * + * Tauri replaces `%1` with each binary path. Object form keeps the absolute + * wrapper path intact when the checkout contains spaces. Certificate-store + * fields are removed because Tauri must not combine them with `signCommand`. + */ +export function addWindowsArtifactSigningToOverride< + T extends TauriOverrideConfig, +>(config: Readonly, wrapperPath: string): T { + assertCanonicalWindowsFilePath(wrapperPath); + if (wrapperPath.includes('%1')) { + throw new Error('Artifact Signing wrapper path cannot contain the %1 placeholder.'); + } + const existingBuild = config.build ?? {}; + const existingBundle: TauriBundle = config.bundle ?? {}; + const existingWindows: TauriBundleWindows = existingBundle.windows ?? {}; + const nonSigningWindows: TauriBundleWindows = { ...existingWindows }; + delete nonSigningWindows.certificateThumbprint; + delete nonSigningWindows.digestAlgorithm; + delete nonSigningWindows.timestampUrl; + delete nonSigningWindows.tsp; + + const nextWindows: TauriBundleWindows = { + ...nonSigningWindows, + signCommand: { + cmd: WINDOWS_POWERSHELL_PATH, + args: [ + '-NoLogo', + '-NoProfile', + '-NonInteractive', + '-ExecutionPolicy', + 'Bypass', + '-File', + wrapperPath, + '-ArtifactPath', + '%1', + ], + }, + }; + const placeholderCount = [ + nextWindows.signCommand?.cmd, + ...(nextWindows.signCommand?.args ?? []), + ].flatMap((part) => part?.match(/%1/g) ?? []).length; + if (placeholderCount !== 1) { + throw new Error('Artifact Signing command must contain exactly one %1 placeholder.'); + } + + return { + ...config, + build: { + ...existingBuild, + beforeBuildCommand: '', + beforeBundleCommand: '', + }, + bundle: { + ...existingBundle, + active: true, + targets: ['nsis'], + windows: nextWindows, + }, + }; +} + // ─── addMacosAdhocToOverride ──────────────────────────────────────────────── /** diff --git a/app/scripts/signing-guidance.test.ts b/app/scripts/signing-guidance.test.ts new file mode 100644 index 0000000..bf4d887 --- /dev/null +++ b/app/scripts/signing-guidance.test.ts @@ -0,0 +1,45 @@ +import { readFileSync } from 'node:fs'; + +import { describe, expect, it } from 'vitest'; + +const playbook = readFileSync( + new URL('../../docs/code-signing-pilot-and-launch.md', import.meta.url), + 'utf8', +); +const pilotScript = readFileSync( + new URL('./sign-windows-pilot.ps1', import.meta.url), + 'utf8', +); +const macPilotScript = readFileSync( + new URL('./sign-macos-adhoc.sh', import.meta.url), + 'utf8', +); + +describe('internal pilot signing guidance', () => { + it('routes Windows builds through the explicit pilot-signing override', () => { + expect(playbook).toContain('npm run tauri:build:win:pilot-signed'); + expect(playbook).not.toMatch(/^npm run tauri:build:win$/m); + expect(pilotScript).toContain( + "Write-Host ' 1. npm run tauri:build:win:pilot-signed'", + ); + expect(pilotScript).not.toMatch( + /Write-Host '[ ]{2}1\. npm run tauri:build:win'\s*$/m, + ); + expect(pilotScript).not.toMatch(/Write-Host '[ ]+1\. cd app/); + }); + + it('does not claim an ordinary macOS build loads the signing override', () => { + expect(playbook).toContain('macOS is deferred'); + expect(playbook).toContain('npm run tauri:sign:pilot:mac:adhoc'); + expect(playbook).not.toContain( + 'so every `npm run tauri:build:mac` produces an ad-hoc-signed `.app` automatically', + ); + expect(playbook).not.toContain( + 'ships the macOS ad-hoc identity in the build-override config by default', + ); + expect(macPilotScript).toContain( + 'Treat the input as unsigned until this script signs and verifies it.', + ); + expect(macPilotScript).not.toContain('already passes'); + }); +}); diff --git a/app/src-tauri/Cargo.lock b/app/src-tauri/Cargo.lock index 7817784..ce6993d 100644 --- a/app/src-tauri/Cargo.lock +++ b/app/src-tauri/Cargo.lock @@ -5018,6 +5018,7 @@ dependencies = [ "tokio", "urlencoding", "uuid", + "windows-sys 0.61.2", ] [[package]] diff --git a/app/src-tauri/Cargo.toml b/app/src-tauri/Cargo.toml index a1e6699..3d74885 100644 --- a/app/src-tauri/Cargo.toml +++ b/app/src-tauri/Cargo.toml @@ -27,3 +27,11 @@ serde_json = "1" tokio = { version = "1", features = ["full"] } urlencoding = "2" uuid = { version = "1", features = ["v4"] } + +[target.'cfg(windows)'.dependencies] +windows-sys = { version = "0.61", features = [ + "Win32_Foundation", + "Win32_Security", + "Win32_System_JobObjects", + "Win32_System_Threading", +] } diff --git a/app/src-tauri/nsis/installer.nsi b/app/src-tauri/nsis/installer.nsi index c31993c..3bf9f1f 100644 --- a/app/src-tauri/nsis/installer.nsi +++ b/app/src-tauri/nsis/installer.nsi @@ -1,69 +1,25 @@ -; ─── Waggle NSIS Installer Template ────────────────────────────────────────── +; Waggle-specific extensions for Tauri's NSIS installer. ; -; Custom hooks for the Tauri NSIS installer: -; 1. Welcome message with Waggle branding -; 2. Desktop shortcut creation -; 3. Start Menu entry -; 4. "Launch Waggle" on finish -; 5. Uninstaller with optional ~/.waggle/ data removal +; Tauri owns install location, shortcuts, finish-page launch, silent /R launch, +; registry entries, and uninstaller cleanup. Do not duplicate those here: doing +; so double-launched normal installs and made silent repair nondeterministic. +; Autostart is handled by tauri-plugin-autostart at runtime. +; Personal data is always preserved by the package uninstaller. Tauri's base +; uninstaller exposes a generic "Delete app data" checkbox, so PREUNINSTALL +; explicitly neutralizes that state. Destructive erasure is available only +; through Waggle's authenticated, phrase-gated UI. ; -; Tauri injects NSIS defines: PRODUCT_NAME, PRODUCT_VERSION, MAINBINARYNAME, -; DEFAULT_INSTALL_DIR. Autostart is handled by tauri-plugin-autostart at -; runtime, not by the installer. -; -; Reference: https://tauri.app/distribute/windows-installer/#nsis -; ───────────────────────────────────────────────────────────────────────────── - -InstallDir "${DEFAULT_INSTALL_DIR}" +; Reference: https://v2.tauri.app/distribute/windows-installer/#extending-the-installer !macro NSIS_HOOK_PREINSTALL - DetailPrint "Installing ${PRODUCT_NAME} v${PRODUCT_VERSION}..." - DetailPrint "Your personal AI agent workspace — powered by Waggle." + DetailPrint "Installing Waggle..." + DetailPrint "Your personal AI agent workspace - powered by Waggle." !macroend -!macro NSIS_HOOK_POSTINSTALL - ; ── Desktop shortcut ────────────────────────────────────────────────────── - CreateShortcut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\${MAINBINARYNAME}.exe" \ - "" "$INSTDIR\${MAINBINARYNAME}.exe" 0 - DetailPrint "Desktop shortcut created." - - ; ── Start Menu entry ────────────────────────────────────────────────────── - CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}" - CreateShortcut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" \ - "$INSTDIR\${MAINBINARYNAME}.exe" "" "$INSTDIR\${MAINBINARYNAME}.exe" 0 - CreateShortcut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall ${PRODUCT_NAME}.lnk" \ - "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 - DetailPrint "Start Menu entry created." - - ; ── Launch after install ────────────────────────────────────────────────── - Exec '"$INSTDIR\${MAINBINARYNAME}.exe"' - DetailPrint "Launching ${PRODUCT_NAME}..." -!macroend - -!macro NSIS_HOOK_POSTUNINSTALL - ; ── Remove desktop shortcut ───────────────────────────────────────────── - Delete "$DESKTOP\${PRODUCT_NAME}.lnk" - - ; ── Remove Start Menu entries ─────────────────────────────────────────── - Delete "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" - Delete "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall ${PRODUCT_NAME}.lnk" - RMDir "$SMPROGRAMS\${PRODUCT_NAME}" - - ; ── Ask about user data removal ───────────────────────────────────────── - MessageBox MB_YESNO|MB_ICONQUESTION \ - "Waggle stores your data (agents, memories, configuration) in:$\r$\n$\r$\n\ - $PROFILE\.waggle$\r$\n$\r$\n\ - Do you want to remove this data as well?$\r$\n$\r$\n\ - Choose $\"Yes$\" to delete all data, or $\"No$\" to keep it for future use." \ - IDYES removeData IDNO skipData - - removeData: - RMDir /r "$PROFILE\.waggle" - DetailPrint "User data removed: $PROFILE\.waggle" - Goto doneData - - skipData: - DetailPrint "User data preserved: $PROFILE\.waggle" - - doneData: +!macro NSIS_HOOK_PREUNINSTALL + StrCmp $DeleteAppDataCheckboxState "1" 0 +2 + MessageBox MB_OK|MB_ICONINFORMATION \ + "For safety, Waggle always preserves app data during uninstall. Data can only be erased from Settings > Data & Privacy while Waggle is installed." + StrCpy $DeleteAppDataCheckboxState 0 + DetailPrint "Preserving Waggle app data." !macroend diff --git a/app/src-tauri/src/commands/agent.rs b/app/src-tauri/src/commands/agent.rs index 30afe78..ba5517b 100644 --- a/app/src-tauri/src/commands/agent.rs +++ b/app/src-tauri/src/commands/agent.rs @@ -42,7 +42,7 @@ pub async fn run_agent_query( session: Option, ) -> Result { let request_id = format!("agent-{}", Uuid::new_v4()); - let port = state.port; + let port = state.verified_port()?; let app_clone = app.clone(); let req_id_clone = request_id.clone(); diff --git a/app/src-tauri/src/commands/memory.rs b/app/src-tauri/src/commands/memory.rs index f3b29f2..8dc25c8 100644 --- a/app/src-tauri/src/commands/memory.rs +++ b/app/src-tauri/src/commands/memory.rs @@ -31,9 +31,10 @@ pub async fn recall_memory( limit: Option, workspace_id: Option, ) -> Result { + let port = state.verified_port()?; let mut url = format!( "{}?q={}", - sidecar_url(state.port, "/api/memory/search"), + sidecar_url(port, "/api/memory/search"), urlencoding::encode(&query) ); if let Some(s) = scope { @@ -61,6 +62,7 @@ pub async fn save_memory( importance: Option, source: Option, ) -> Result { + let port = state.verified_port()?; let mut body = json!({ "content": content }); if let Some(ws) = workspace_id { body["workspace"] = json!(ws); @@ -72,7 +74,7 @@ pub async fn save_memory( body["source"] = json!(src); } - let url = sidecar_url(state.port, "/api/memory/frames"); + let url = sidecar_url(port, "/api/memory/frames"); let resp = http_post(&url, &body).await?; parse_json(resp).await } @@ -85,7 +87,8 @@ pub async fn search_entities( workspace_id: Option, scope: Option, ) -> Result { - let mut url = sidecar_url(state.port, "/api/memory/graph").to_string(); + let port = state.verified_port()?; + let mut url = sidecar_url(port, "/api/memory/graph").to_string(); let mut params: Vec = Vec::new(); if let Some(ws) = workspace_id { params.push(format!("workspace={}", urlencoding::encode(&ws))); @@ -111,7 +114,7 @@ pub async fn search_entities( /// pre-A1.1 placeholders and now only fire on hard sidecar outages. #[tauri::command] pub async fn get_identity(state: State<'_, ServiceState>) -> Result { - let url = sidecar_url(state.port, "/api/identity"); + let url = sidecar_url(state.verified_port()?, "/api/identity"); match http_get(&url).await { Ok(resp) if resp.status().as_u16() == 404 => Ok(identity_placeholder( "sidecar route 404 (unexpected post-A1.1)", diff --git a/app/src-tauri/src/commands/wiki.rs b/app/src-tauri/src/commands/wiki.rs index 13020e1..bf27460 100644 --- a/app/src-tauri/src/commands/wiki.rs +++ b/app/src-tauri/src/commands/wiki.rs @@ -26,7 +26,7 @@ use crate::service::ServiceState; /// index (slugs + titles + metadata); call get_wiki_page_content for the body. #[tauri::command] pub async fn get_wiki_pages(state: State<'_, ServiceState>) -> Result { - let url = sidecar_url(state.port, "/api/wiki/pages"); + let url = sidecar_url(state.verified_port()?, "/api/wiki/pages"); let resp = http_get(&url).await?; parse_json(resp).await } @@ -36,7 +36,7 @@ pub async fn get_wiki_pages(state: State<'_, ServiceState>) -> Result, slug: String) -> Result { let url = sidecar_url( - state.port, + state.verified_port()?, &format!("/api/wiki/pages/{}", urlencoding::encode(&slug)), ); let resp = http_get(&url).await?; @@ -51,7 +51,7 @@ pub async fn get_wiki_page_content( slug: String, ) -> Result { let url = sidecar_url( - state.port, + state.verified_port()?, &format!("/api/wiki/pages/{}/content", urlencoding::encode(&slug)), ); let resp = http_get(&url).await?; @@ -69,7 +69,7 @@ pub async fn compile_wiki_section( if let Some(ws) = workspace_id { body["workspace"] = json!(ws); } - let url = sidecar_url(state.port, "/api/wiki/compile"); + let url = sidecar_url(state.verified_port()?, "/api/wiki/compile"); let resp = http_post(&url, &body).await?; parse_json(resp).await } diff --git a/app/src-tauri/src/lib.rs b/app/src-tauri/src/lib.rs index bfa1fac..bfb0a13 100644 --- a/app/src-tauri/src/lib.rs +++ b/app/src-tauri/src/lib.rs @@ -59,6 +59,52 @@ pub fn run() { commands::onboarding::reset_first_launch, ]) .setup(|app| { + // Create the configured window here so the Windows certifier can + // opt into a loopback-only WebView CDP port without shipping + // remote debugging enabled for normal launches. + let main_window_config = app + .config() + .app + .windows + .iter() + .find(|window| window.label == "main") + .cloned() + .ok_or_else(|| { + std::io::Error::new( + std::io::ErrorKind::NotFound, + "configured main window is missing", + ) + })?; + let mut main_window = tauri::WebviewWindowBuilder::from_config( + app.handle(), + &main_window_config, + )?; + #[cfg(windows)] + if let Some(raw_port) = std::env::var_os("WAGGLE_CERTIFIER_WEBVIEW_DEBUG_PORT") { + let raw_port = raw_port.to_string_lossy(); + let port = raw_port.parse::().map_err(|_| { + std::io::Error::new( + std::io::ErrorKind::InvalidInput, + "WAGGLE_CERTIFIER_WEBVIEW_DEBUG_PORT must be an integer", + ) + })?; + if port < 1024 { + return Err(std::io::Error::new( + std::io::ErrorKind::InvalidInput, + "WAGGLE_CERTIFIER_WEBVIEW_DEBUG_PORT must be >= 1024", + ) + .into()); + } + let browser_args = format!( + "--disable-features=msWebOOUI,msPdfOOUI,msSmartScreenProtection --remote-debugging-port={port}" + ); + main_window = main_window.additional_browser_args(&browser_args); + eprintln!( + "[waggle] WebView certifier debug endpoint enabled on 127.0.0.1:{port}" + ); + } + main_window.build()?; + tray::setup_tray(app.handle())?; // Register global hotkey: Ctrl+Shift+W to toggle window visibility @@ -90,18 +136,17 @@ pub fn run() { ); } - // Auto-start the sidecar service before the webview loads so the - // React app finds it already healthy on localhost:3333. + // Auto-start an owned sidecar launch before the webview loads. + // Its verified endpoint may differ from the preferred port. let service_state = app.state::(); - let port = service_state.port; - match service::spawn_service_sync(port, &service_state.process) { - Ok(()) => eprintln!("[waggle] Sidecar spawn initiated on port {}", port), + match service::spawn_service_sync(&service_state) { + Ok(()) => eprintln!("[waggle] Owned sidecar spawn initiated"), Err(e) => eprintln!("[waggle] Failed to auto-start sidecar: {}", e), } // Start service watchdog let app_handle_watchdog = app.handle().clone(); - service::start_watchdog(app_handle_watchdog, port); + service::start_watchdog(app_handle_watchdog); Ok(()) }) @@ -115,15 +160,10 @@ pub fn run() { .build(tauri::generate_context!()) .expect("error while building tauri application") .run(|app_handle, event| { - // R7-002: kill the sidecar on app exit so it doesn't orphan and hold port 3333. + // R7-002: kill only the owned sidecar launch on app exit. if let tauri::RunEvent::Exit = event { if let Some(state) = app_handle.try_state::() { - if let Ok(mut proc) = state.process.lock() { - if let Some(mut child) = proc.take() { - let _ = child.kill(); - let _ = child.wait(); - } - } + let _ = service::stop_service_sync(&state); } } }); diff --git a/app/src-tauri/src/service.rs b/app/src-tauri/src/service.rs index 642d883..f1b4dbd 100644 --- a/app/src-tauri/src/service.rs +++ b/app/src-tauri/src/service.rs @@ -1,29 +1,316 @@ +use serde::{Deserialize, Serialize}; +use std::ffi::OsStr; +#[cfg(windows)] +use std::fs::{File, OpenOptions}; +#[cfg(windows)] +use std::io::{Read, Write}; use std::path::{Path, PathBuf}; +#[cfg(windows)] +use std::process::Stdio; use std::process::{Child, Command}; +#[cfg(windows)] +use std::sync::Arc; use std::sync::Mutex; use std::time::{Duration, Instant}; use tauri::{AppHandle, Emitter, Manager, State}; +use uuid::Uuid; + +const WATCHDOG_FAILURE_THRESHOLD: u32 = 3; +const WATCHDOG_INITIAL_STARTUP_GRACE: Duration = Duration::from_secs(600); +const READY_RECORD_MAX_BYTES: u64 = 16 * 1024; +#[cfg(windows)] +const CREATE_NO_WINDOW: u32 = 0x08000000; +#[cfg(windows)] +const MAX_SERVICE_LOG_BYTES: u64 = 5 * 1024 * 1024; +#[cfg(windows)] +const SERVICE_LOG_DIR_ENV: &str = "WAGGLE_DESKTOP_SERVICE_LOG_DIR"; + +#[cfg(windows)] +#[derive(Debug)] +struct KillOnCloseJob(windows_sys::Win32::Foundation::HANDLE); + +#[cfg(windows)] +unsafe impl Send for KillOnCloseJob {} + +#[cfg(windows)] +impl Drop for KillOnCloseJob { + fn drop(&mut self) { + unsafe { + windows_sys::Win32::Foundation::CloseHandle(self.0); + } + } +} + +#[cfg(windows)] +fn create_kill_on_close_job() -> Result { + use windows_sys::Win32::System::JobObjects::{ + CreateJobObjectW, JobObjectExtendedLimitInformation, SetInformationJobObject, + JOBOBJECT_EXTENDED_LIMIT_INFORMATION, JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE, + JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK, + }; + + let job = unsafe { CreateJobObjectW(std::ptr::null(), std::ptr::null()) }; + if job.is_null() { + return Err(format!( + "Unable to create the managed service job: {}", + std::io::Error::last_os_error() + )); + } + let job = KillOnCloseJob(job); + let mut limits = JOBOBJECT_EXTENDED_LIMIT_INFORMATION::default(); + limits.BasicLimitInformation.LimitFlags = + JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE | JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK; + let configured = unsafe { + SetInformationJobObject( + job.0, + JobObjectExtendedLimitInformation, + std::ptr::from_ref(&limits).cast(), + std::mem::size_of::() as u32, + ) + }; + if configured == 0 { + return Err(format!( + "Unable to configure the managed service job: {}", + std::io::Error::last_os_error() + )); + } + Ok(job) +} + +#[cfg(windows)] +fn assign_child_to_job(job: &KillOnCloseJob, child: &Child) -> Result<(), String> { + use std::os::windows::io::AsRawHandle; + use windows_sys::Win32::Foundation::HANDLE; + use windows_sys::Win32::System::JobObjects::AssignProcessToJobObject; + + let assigned = unsafe { AssignProcessToJobObject(job.0, child.as_raw_handle() as HANDLE) }; + if assigned == 0 { + return Err(format!( + "Unable to bind the service lifetime to Waggle: {}", + std::io::Error::last_os_error() + )); + } + Ok(()) +} + +#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq)] +#[serde(rename_all = "camelCase")] +pub struct ServiceEndpoint { + pub port: u16, + pub instance_id: String, + pub bootstrap_token: String, +} + +#[derive(Clone, Debug, PartialEq, Eq)] +struct ManagedLaunchConfig { + instance_id: String, + bootstrap_token: String, + ready_path: PathBuf, +} + +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase", deny_unknown_fields)] +struct DesktopReadyRecord { + schema_version: u8, + instance_id: String, + pid: u32, + host: String, + preferred_port: u16, + port: u16, + started_at: String, +} + +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase")] +struct HealthIdentity { + instance_id: Option, + port: Option, +} + +fn managed_launch_config(instance_id: &str) -> Result { + let instance_id = instance_id.trim(); + if instance_id.is_empty() { + return Err("Managed service instance ID cannot be empty".to_string()); + } + let ready_path = std::env::temp_dir() + .join("waggle-sidecar-ready") + .join(format!("sidecar-{}-{instance_id}.json", std::process::id())); + if !ready_path.is_absolute() { + return Err("Managed service ready path must be absolute".to_string()); + } + Ok(ManagedLaunchConfig { + instance_id: instance_id.to_string(), + bootstrap_token: Uuid::new_v4().to_string(), + ready_path, + }) +} + +fn new_managed_launch_config() -> Result { + managed_launch_config(&Uuid::new_v4().to_string()) +} + +fn apply_managed_launch_environment( + command: &mut Command, + preferred_port: u16, + config: &ManagedLaunchConfig, +) { + command.env("WAGGLE_PORT", preferred_port.to_string()); + command.env("WAGGLE_DESKTOP_PORT_FALLBACK", "1"); + command.env("WAGGLE_INSTANCE_ID", &config.instance_id); + command.env("WAGGLE_DESKTOP_BOOTSTRAP_TOKEN", &config.bootstrap_token); + command.env("WAGGLE_READY_FILE", &config.ready_path); +} + +fn parse_ready_record( + bytes: &[u8], + expected_instance_id: &str, + expected_pid: u32, + expected_preferred_port: u16, + bootstrap_token: &str, +) -> Result { + if bytes.len() as u64 > READY_RECORD_MAX_BYTES { + return Err("Managed service ready record is too large".to_string()); + } + let record: DesktopReadyRecord = serde_json::from_slice(bytes) + .map_err(|error| format!("Invalid managed service ready record: {error}"))?; + if record.schema_version != 1 + || record.instance_id != expected_instance_id + || record.pid != expected_pid + || record.host != "127.0.0.1" + || record.preferred_port != expected_preferred_port + || record.port == 0 + || record.started_at.trim().is_empty() + { + return Err("Managed service ready record does not match the owned launch".to_string()); + } + Ok(ServiceEndpoint { + port: record.port, + instance_id: record.instance_id, + bootstrap_token: bootstrap_token.to_string(), + }) +} + +fn health_payload_matches(bytes: &[u8], endpoint: &ServiceEndpoint) -> bool { + serde_json::from_slice::(bytes).is_ok_and(|health| { + health.instance_id.as_deref() == Some(endpoint.instance_id.as_str()) + && health.port == Some(endpoint.port) + }) +} + +fn netstat_has_owned_listener(bytes: &[u8], port: u16, pid: u32) -> bool { + String::from_utf8_lossy(bytes).lines().any(|line| { + let columns = line.split_whitespace().collect::>(); + if columns.len() < 5 + || !columns[0].eq_ignore_ascii_case("TCP") + || !columns[3].eq_ignore_ascii_case("LISTENING") + || columns[4].parse::().ok() != Some(pid) + { + return false; + } + let Some((host, local_port)) = columns[1].rsplit_once(':') else { + return false; + }; + host == "127.0.0.1" && local_port.parse::().ok() == Some(port) + }) +} + +#[cfg(windows)] +fn listener_is_owned_by_pid(port: u16, pid: u32) -> Result { + let system_root = std::env::var_os("SystemRoot") + .or_else(|| std::env::var_os("WINDIR")) + .map(PathBuf::from) + .ok_or_else(|| "Unable to resolve the Windows system directory".to_string())?; + let netstat = system_root.join("System32").join("netstat.exe"); + if !netstat.is_file() { + return Err("Unable to locate the Windows TCP ownership verifier".to_string()); + } + let mut command = Command::new(netstat); + command.args(["-ano", "-p", "tcp"]); + hide_windows_console(&mut command); + let output = command + .output() + .map_err(|error| format!("Unable to inspect Windows TCP ownership: {error}"))?; + if !output.status.success() { + return Err("Windows TCP ownership verification failed".to_string()); + } + Ok(netstat_has_owned_listener(&output.stdout, port, pid)) +} + +#[cfg(not(windows))] +fn listener_is_owned_by_pid(_port: u16, _pid: u32) -> Result { + // The active launch gate is Windows-first. macOS retains the existing + // instance/child-handle validation until its platform-specific owner + // query is implemented in the deferred macOS certification phase. + Ok(true) +} + +struct ManagedLaunch { + generation: u64, + child: Child, + #[cfg(windows)] + _job: KillOnCloseJob, + config: ManagedLaunchConfig, + endpoint: Option, + started_at: Instant, +} + +struct ServiceRuntime { + next_generation: u64, + active: Option, + desired_running: bool, +} pub struct ServiceState { - pub process: Mutex>, - pub port: u16, + preferred_port: u16, + runtime: Mutex, } impl ServiceState { - pub fn new(port: u16) -> Self { + pub fn new(preferred_port: u16) -> Self { Self { - process: Mutex::new(None), - port, + preferred_port, + runtime: Mutex::new(ServiceRuntime { + next_generation: 1, + active: None, + desired_running: true, + }), } } + + pub(crate) fn verified_port(&self) -> Result { + current_launch_token(self)? + .and_then(|token| token.endpoint.map(|endpoint| endpoint.port)) + .ok_or_else(|| "Managed service endpoint has not been verified".to_string()) + } +} + +#[derive(Clone, Debug)] +struct LaunchToken { + generation: u64, + instance_id: String, + bootstrap_token: String, + ready_path: PathBuf, + pid: u32, + preferred_port: u16, + endpoint: Option, + started_at: Instant, +} + +fn valid_node_override(custom: Option<&OsStr>) -> Option { + let custom_path = PathBuf::from(custom?); + custom_path.is_file().then_some(custom_path) } /// Resolve the Node.js binary path. /// Priority: WAGGLE_NODE_PATH env → bundled resources/node[.exe] → system PATH "node" fn resolve_node_path() -> String { // 1. Explicit env override (development/advanced users) - if let Ok(custom) = std::env::var("WAGGLE_NODE_PATH") { - return custom; + let custom = std::env::var_os("WAGGLE_NODE_PATH"); + if let Some(custom_path) = valid_node_override(custom.as_deref()) { + return custom_path.to_string_lossy().to_string(); + } + if custom.as_deref().is_some_and(|value| !value.is_empty()) { + eprintln!("[waggle] Ignoring WAGGLE_NODE_PATH because it is not a runtime file"); } // 2. Bundled Node.js in resources/ directory (next to exe) @@ -70,6 +357,212 @@ struct ServiceScript { kind: ServiceScriptKind, } +#[derive(Debug, PartialEq, Eq)] +struct BundledNpmEnvironment { + data_dir: PathBuf, + path: std::ffi::OsString, + npm_exec_path: PathBuf, + npm_prefix: PathBuf, + npm_cache: PathBuf, +} + +fn bundled_npm_environment( + resources_dir: &Path, + configured_data_dir: Option<&OsStr>, + home_dir: Option<&OsStr>, + ambient_path: Option<&OsStr>, +) -> Result { + let data_dir = configured_data_dir + .filter(|value| !value.is_empty()) + .map(PathBuf::from) + .or_else(|| { + home_dir + .filter(|value| !value.is_empty()) + .map(PathBuf::from) + .map(|home| home.join(".waggle")) + }) + .ok_or_else(|| "Unable to resolve writable npm data directory".to_string())?; + let runtime_dir = resources_dir + .join("node_modules") + .join("waggle-node-runtime"); + let npm_root = data_dir.join("npm"); + let separator = if cfg!(windows) { ";" } else { ":" }; + let mut path = std::ffi::OsString::from(runtime_dir.join("bin")); + path.push(separator); + path.push(resources_dir); + if let Some(existing_path) = ambient_path.filter(|value| !value.is_empty()) { + path.push(separator); + path.push(existing_path); + } + + Ok(BundledNpmEnvironment { + data_dir, + path, + npm_exec_path: runtime_dir + .join("node_modules") + .join("npm") + .join("bin") + .join("npm-cli.js"), + npm_prefix: npm_root.join("prefix"), + npm_cache: npm_root.join("cache"), + }) +} + +#[cfg(windows)] +fn hide_windows_console(command: &mut Command) { + use std::os::windows::process::CommandExt; + command.creation_flags(CREATE_NO_WINDOW); +} + +#[cfg(windows)] +fn rotate_service_log(log_path: &Path) -> Result<(), String> { + let metadata = match std::fs::symlink_metadata(log_path) { + Ok(metadata) => metadata, + Err(error) if error.kind() == std::io::ErrorKind::NotFound => return Ok(()), + Err(error) => return Err(format!("Unable to inspect service log: {error}")), + }; + if !metadata.file_type().is_file() || metadata.file_type().is_symlink() { + return Err("Service log path is not a regular file".to_string()); + } + if metadata.len() < MAX_SERVICE_LOG_BYTES { + return Ok(()); + } + + let previous_path = log_path.with_file_name("service.log.1"); + if previous_path.exists() { + std::fs::remove_file(&previous_path) + .map_err(|error| format!("Unable to replace previous service log: {error}"))?; + } + std::fs::rename(log_path, previous_path) + .map_err(|error| format!("Unable to rotate service log: {error}")) +} + +#[cfg(windows)] +struct ServiceLogWriter { + file: Option, + length: u64, + path: PathBuf, +} + +#[cfg(windows)] +impl ServiceLogWriter { + fn open(data_dir: &Path) -> Result { + let log_dir = data_dir.join("logs"); + std::fs::create_dir_all(&log_dir) + .map_err(|error| format!("Unable to create service log directory: {error}"))?; + let path = log_dir.join("service.log"); + rotate_service_log(&path)?; + let file = OpenOptions::new() + .create(true) + .append(true) + .open(&path) + .map_err(|error| format!("Unable to open service log: {error}"))?; + let length = file + .metadata() + .map_err(|error| format!("Unable to inspect service log: {error}"))? + .len(); + Ok(Self { + file: Some(file), + length, + path, + }) + } + + fn rotate(&mut self) -> Result<(), String> { + if let Some(mut file) = self.file.take() { + file.flush() + .map_err(|error| format!("Unable to flush service log: {error}"))?; + } + rotate_service_log(&self.path)?; + self.file = Some( + OpenOptions::new() + .create(true) + .append(true) + .open(&self.path) + .map_err(|error| format!("Unable to reopen service log: {error}"))?, + ); + self.length = 0; + Ok(()) + } + + fn write_capped(&mut self, mut bytes: &[u8]) -> Result<(), String> { + while !bytes.is_empty() { + if self.length >= MAX_SERVICE_LOG_BYTES { + self.rotate()?; + } + let available = (MAX_SERVICE_LOG_BYTES - self.length) as usize; + let count = available.min(bytes.len()); + let file = self + .file + .as_mut() + .ok_or_else(|| "Service log is unavailable".to_string())?; + file.write_all(&bytes[..count]) + .map_err(|error| format!("Unable to write service log: {error}"))?; + file.flush() + .map_err(|error| format!("Unable to flush service log: {error}"))?; + self.length += count as u64; + bytes = &bytes[count..]; + } + Ok(()) + } +} + +#[cfg(windows)] +fn pump_service_log(mut input: R, output: Arc>) { + std::thread::spawn(move || { + let mut buffer = [0u8; 8192]; + loop { + let count = match input.read(&mut buffer) { + Ok(0) | Err(_) => break, + Ok(count) => count, + }; + let Ok(mut writer) = output.lock() else { + break; + }; + if writer.write_capped(&buffer[..count]).is_err() { + break; + } + } + }); +} + +#[cfg(windows)] +fn start_service_log_capture(child: &mut Child, data_dir: &Path) -> Result<(), String> { + let stdout = child + .stdout + .take() + .ok_or_else(|| "Managed service stdout pipe is unavailable".to_string())?; + let stderr = child + .stderr + .take() + .ok_or_else(|| "Managed service stderr pipe is unavailable".to_string())?; + let writer = Arc::new(Mutex::new(ServiceLogWriter::open(data_dir)?)); + pump_service_log(stdout, Arc::clone(&writer)); + pump_service_log(stderr, writer); + Ok(()) +} + +#[cfg(windows)] +fn configured_service_log_dir(command: &Command) -> Option { + command + .get_envs() + .find(|(name, _)| *name == OsStr::new(SERVICE_LOG_DIR_ENV)) + .and_then(|(_, value)| value) + .map(PathBuf::from) +} + +#[cfg(windows)] +fn configure_bundled_windows_process(command: &mut Command, data_dir: &Path) -> Result<(), String> { + ServiceLogWriter::open(data_dir)?; + hide_windows_console(command); + command + .env(SERVICE_LOG_DIR_ENV, data_dir) + .stdin(Stdio::null()) + .stdout(Stdio::piped()) + .stderr(Stdio::piped()); + Ok(()) +} + fn find_dev_service_script(current_dir: &Path) -> Option { for dir in current_dir.ancestors() { let candidate = dir @@ -113,7 +606,10 @@ fn resolve_service_script( /// Build the Command used to spawn the sidecar process. /// Shared by both the sync auto-start path and the async `ensure_service` tauri command. -fn build_service_command(port: u16) -> Result { +fn build_service_command( + preferred_port: u16, + launch_config: &ManagedLaunchConfig, +) -> Result { let node_path = resolve_node_path(); let exe_dir = std::env::current_exe() @@ -133,7 +629,7 @@ fn build_service_command(port: u16) -> Result { c }; - cmd.env("WAGGLE_PORT", port.to_string()); + apply_managed_launch_environment(&mut cmd, preferred_port, launch_config); if service_script.kind == ServiceScriptKind::Bundled { cmd.env("WAGGLE_SKIP_LITELLM", "1"); @@ -142,6 +638,33 @@ fn build_service_command(port: u16) -> Result { let resources_dir = dir.join("resources"); let native_dir = resources_dir.join("native"); let node_modules_dir = resources_dir.join("node_modules"); + let configured_data_dir = std::env::var_os("WAGGLE_DATA_DIR"); + let home_dir = if cfg!(windows) { + std::env::var_os("USERPROFILE") + .filter(|value| !value.is_empty()) + .or_else(|| std::env::var_os("HOME").filter(|value| !value.is_empty())) + } else { + std::env::var_os("HOME") + .filter(|value| !value.is_empty()) + .or_else(|| std::env::var_os("USERPROFILE").filter(|value| !value.is_empty())) + }; + let ambient_path = std::env::var_os("PATH"); + let npm_environment = bundled_npm_environment( + &resources_dir, + configured_data_dir.as_deref(), + home_dir.as_deref(), + ambient_path.as_deref(), + )?; + std::fs::create_dir_all(&npm_environment.npm_prefix) + .map_err(|error| format!("Unable to create bundled npm prefix: {error}"))?; + std::fs::create_dir_all(&npm_environment.npm_cache) + .map_err(|error| format!("Unable to create bundled npm cache: {error}"))?; + cmd.env("PATH", &npm_environment.path); + cmd.env("NPM_EXECPATH", &npm_environment.npm_exec_path); + cmd.env("NPM_CONFIG_PREFIX", &npm_environment.npm_prefix); + cmd.env("NPM_CONFIG_CACHE", &npm_environment.npm_cache); + #[cfg(windows)] + configure_bundled_windows_process(&mut cmd, &npm_environment.data_dir)?; // NODE_PATH must include the staged production deps // (resources/node_modules — better-sqlite3, @fastify/static, @@ -185,6 +708,260 @@ fn build_service_command(port: u16) -> Result { #[cfg(test)] mod tests { use super::*; + use std::process::Stdio; + use std::thread; + + fn long_lived_command() -> Command { + let mut command = if cfg!(windows) { + let mut command = Command::new("cmd"); + command.args(["/C", "ping -n 30 127.0.0.1 >NUL"]); + command + } else { + let mut command = Command::new("sh"); + command.args(["-c", "sleep 30"]); + command + }; + command + .stdin(Stdio::null()) + .stdout(Stdio::null()) + .stderr(Stdio::null()); + command + } + + #[test] + fn managed_launch_uses_unique_ready_paths_and_exact_child_environment() { + let first = managed_launch_config("instance-a").expect("first launch config"); + let second = managed_launch_config("instance-b").expect("second launch config"); + assert!(first.ready_path.is_absolute()); + assert_ne!(first.ready_path, second.ready_path); + assert_ne!(first.bootstrap_token, second.bootstrap_token); + + let mut command = long_lived_command(); + apply_managed_launch_environment(&mut command, 3333, &first); + let environment = command + .get_envs() + .filter_map(|(name, value)| value.map(|value| (name.to_owned(), value.to_owned()))) + .collect::>(); + + assert_eq!( + environment.get(OsStr::new("WAGGLE_PORT")), + Some(&3333.to_string().into()) + ); + assert_eq!( + environment.get(OsStr::new("WAGGLE_DESKTOP_PORT_FALLBACK")), + Some(&"1".into()) + ); + assert_eq!( + environment.get(OsStr::new("WAGGLE_INSTANCE_ID")), + Some(&"instance-a".into()) + ); + assert_eq!( + environment.get(OsStr::new("WAGGLE_DESKTOP_BOOTSTRAP_TOKEN")), + Some(&first.bootstrap_token.clone().into()) + ); + assert_eq!( + environment.get(OsStr::new("WAGGLE_READY_FILE")), + Some(&first.ready_path.into_os_string()) + ); + + let generated_first = new_managed_launch_config().expect("generated first launch"); + let generated_second = new_managed_launch_config().expect("generated second launch"); + assert_ne!(generated_first.instance_id, generated_second.instance_id); + assert_ne!( + generated_first.bootstrap_token, + generated_second.bootstrap_token + ); + assert_ne!(generated_first.ready_path, generated_second.ready_path); + } + + #[test] + fn ready_record_accepts_only_the_owned_complete_launch() { + let valid = br#"{"schemaVersion":1,"instanceId":"instance-a","pid":42,"host":"127.0.0.1","preferredPort":3333,"port":49152,"startedAt":"2026-08-03T00:00:00.000Z"}"#; + assert_eq!( + parse_ready_record(valid, "instance-a", 42, 3333, "bootstrap-a") + .expect("owned ready record"), + ServiceEndpoint { + port: 49152, + instance_id: "instance-a".to_string(), + bootstrap_token: "bootstrap-a".to_string() + } + ); + assert!(parse_ready_record(valid, "instance-b", 42, 3333, "bootstrap-a").is_err()); + assert!(parse_ready_record(valid, "instance-a", 43, 3333, "bootstrap-a").is_err()); + assert!(parse_ready_record(valid, "instance-a", 42, 3334, "bootstrap-a").is_err()); + assert!(parse_ready_record( + br#"{"instanceId":"instance-a","port":49152}"#, + "instance-a", + 42, + 3333, + "bootstrap-a" + ) + .is_err()); + assert!(parse_ready_record(br#"{"schemaVersion":1,"instanceId":"instance-a","pid":42,"host":"127.0.0.1","preferredPort":3333,"port":0,"startedAt":"now"}"#, "instance-a", 42, 3333, "bootstrap-a").is_err()); + } + + #[test] + fn health_payload_requires_the_exact_owned_endpoint() { + let endpoint = ServiceEndpoint { + port: 49152, + instance_id: "instance-a".to_string(), + bootstrap_token: "bootstrap-a".to_string(), + }; + assert!(health_payload_matches( + br#"{"status":"ok","instanceId":"instance-a","port":49152}"#, + &endpoint + )); + assert!(!health_payload_matches( + br#"{"status":"ok","instanceId":"instance-b","port":49152}"#, + &endpoint + )); + assert!(!health_payload_matches( + br#"{"status":"ok","port":49152}"#, + &endpoint + )); + assert!(!health_payload_matches( + br#"{"status":"ok","instanceId":"instance-a","port":3333}"#, + &endpoint + )); + assert!(!health_payload_matches(b"not-json", &endpoint)); + } + + #[test] + fn windows_listener_proof_requires_exact_loopback_port_and_child_pid() { + let output = + b"Proto Local Address Foreign Address State PID\r\n\ + TCP 127.0.0.1:49152 0.0.0.0:0 LISTENING 4242\r\n\ + TCP 127.0.0.1:49153 0.0.0.0:0 LISTENING 9999\r\n"; + assert!(netstat_has_owned_listener(output, 49152, 4242)); + assert!(!netstat_has_owned_listener(output, 49152, 9999)); + assert!(!netstat_has_owned_listener(output, 49153, 4242)); + assert!(!netstat_has_owned_listener( + b"TCP 0.0.0.0:49152 0.0.0.0:0 LISTENING 4242", + 49152, + 4242, + )); + assert!(!netstat_has_owned_listener( + b"TCP 127.0.0.1:49152 0.0.0.0:0 ESTABLISHED 4242", + 49152, + 4242, + )); + } + + #[cfg(windows)] + #[test] + fn windows_listener_owner_is_verified_against_the_os_table() { + let listener = + std::net::TcpListener::bind(("127.0.0.1", 0)).expect("binds owned loopback listener"); + let port = listener + .local_addr() + .expect("reads listener address") + .port(); + assert!(listener_is_owned_by_pid(port, std::process::id()) + .expect("queries Windows TCP ownership")); + assert!( + !listener_is_owned_by_pid(port, std::process::id().saturating_add(1)) + .expect("rejects a different owner") + ); + } + + #[test] + fn explicit_stop_suppresses_watchdog_respawn() { + let state = ServiceState::new(3333); + spawn_managed_service_with(&state, |_, _| Ok(long_lived_command())) + .expect("starts managed child"); + stop_service_sync(&state).expect("stops managed child"); + let build_called = std::cell::Cell::new(false); + + let recovery = recover_service_with( + &state, + true, + Duration::ZERO, + WATCHDOG_FAILURE_THRESHOLD, + true, + |_, _| { + build_called.set(true); + Ok(long_lived_command()) + }, + ) + .expect("suppresses stopped service recovery"); + + assert_eq!(recovery, WatchdogRecovery::Suppressed); + assert!(!build_called.get()); + } + + #[test] + fn stale_generation_cannot_commit_or_delete_the_current_launch() { + let state = ServiceState::new(3333); + let first = spawn_managed_service_with(&state, |_, _| Ok(long_lived_command())) + .expect("starts first generation"); + std::fs::create_dir_all(first.ready_path.parent().expect("ready parent")) + .expect("creates ready parent"); + std::fs::write(&first.ready_path, b"first").expect("writes first ready file"); + stop_service_sync(&state).expect("stops first generation"); + assert!(!first.ready_path.exists()); + + let second = spawn_managed_service_with(&state, |_, _| Ok(long_lived_command())) + .expect("starts second generation"); + assert_ne!(first.generation, second.generation); + assert_ne!(first.instance_id, second.instance_id); + std::fs::create_dir_all(second.ready_path.parent().expect("second ready parent")) + .expect("creates second ready parent"); + std::fs::write(&second.ready_path, b"second").expect("writes second ready file"); + assert!(commit_endpoint_if_current( + &state, + &second, + ServiceEndpoint { + port: 49153, + instance_id: second.instance_id.clone(), + bootstrap_token: second.bootstrap_token.clone() + }, + ) + .expect("commits current endpoint")); + assert!(!commit_endpoint_if_current( + &state, + &first, + ServiceEndpoint { + port: 49152, + instance_id: first.instance_id.clone(), + bootstrap_token: first.bootstrap_token.clone() + }, + ) + .expect("rejects stale commit")); + remove_launch_ready_file(&first.ready_path); + assert!(second.ready_path.exists()); + assert_eq!( + state.verified_port().expect("preserves current endpoint"), + 49153 + ); + assert_eq!( + current_launch_token(&state) + .expect("reads current launch") + .expect("active launch") + .generation, + second.generation, + ); + stop_service_sync(&state).expect("cleans up second generation"); + } + + #[test] + fn command_port_is_unavailable_until_the_owned_endpoint_is_committed() { + let state = ServiceState::new(3333); + let launch = spawn_managed_service_with(&state, |_, _| Ok(long_lived_command())) + .expect("starts managed child"); + assert!(state.verified_port().is_err()); + + let endpoint = ServiceEndpoint { + port: 49152, + instance_id: launch.instance_id.clone(), + bootstrap_token: launch.bootstrap_token.clone(), + }; + assert!( + commit_endpoint_if_current(&state, &launch, endpoint).expect("commits owned endpoint") + ); + assert_eq!(state.verified_port().expect("reads verified port"), 49152); + stop_service_sync(&state).expect("stops managed child"); + assert!(state.verified_port().is_err()); + } #[test] fn service_script_prefers_bundled_resource_when_present() { @@ -223,74 +1000,798 @@ mod tests { let _ = std::fs::remove_dir_all(root); } -} -/// Synchronously spawn the sidecar process if not already running. Does not wait -/// for the health check. Safe to call from Tauri's synchronous `.setup()` callback. -pub fn spawn_service_sync(port: u16, process: &Mutex>) -> Result<(), String> { - { - let proc = process.lock().map_err(|e| e.to_string())?; - if proc.is_some() { - return Ok(()); + #[test] + fn invalid_node_overrides_do_not_shadow_runtime_fallbacks() { + let directory_override = std::env::temp_dir(); + assert_eq!(valid_node_override(None), None); + assert_eq!(valid_node_override(Some(OsStr::new(""))), None); + assert_eq!( + valid_node_override(Some(directory_override.as_os_str())), + None + ); + } + + #[test] + fn existing_node_override_is_accepted() { + let root = + std::env::temp_dir().join(format!("waggle-node-override-{}", std::process::id())); + std::fs::create_dir_all(&root).expect("creates temp runtime dir"); + let runtime = root.join(if cfg!(windows) { "node.exe" } else { "node" }); + std::fs::write(&runtime, b"runtime").expect("writes temp runtime"); + + assert_eq!( + valid_node_override(Some(runtime.as_os_str())), + Some(runtime.clone()) + ); + + let _ = std::fs::remove_dir_all(root); + } + + #[test] + fn bundled_npm_environment_uses_configured_data_dir_and_preserves_path() { + let resources = Path::new("waggle resources"); + let data_dir = Path::new("waggle data"); + let ambient_entries = vec![PathBuf::from("ambient-one"), PathBuf::from("ambient two")]; + let ambient_path = std::env::join_paths(&ambient_entries).expect("joins ambient PATH"); + let environment = bundled_npm_environment( + resources, + Some(data_dir.as_os_str()), + Some(OsStr::new("unused home")), + Some(ambient_path.as_os_str()), + ) + .expect("bundled npm environment resolves"); + + assert_eq!( + environment.npm_exec_path, + resources + .join("node_modules") + .join("waggle-node-runtime") + .join("node_modules") + .join("npm") + .join("bin") + .join("npm-cli.js") + ); + assert_eq!(environment.npm_prefix, data_dir.join("npm").join("prefix")); + assert_eq!(environment.npm_cache, data_dir.join("npm").join("cache")); + assert_eq!(environment.data_dir, data_dir); + let mut expected_path_entries = vec![ + resources + .join("node_modules") + .join("waggle-node-runtime") + .join("bin"), + resources.to_path_buf(), + ]; + expected_path_entries.extend(ambient_entries); + assert_eq!( + std::env::split_paths(&environment.path).collect::>(), + expected_path_entries + ); + } + + #[test] + fn bundled_npm_environment_falls_back_to_waggle_home() { + let resources = Path::new("resources"); + let home = Path::new("home"); + let environment = bundled_npm_environment( + resources, + Some(OsStr::new("")), + Some(home.as_os_str()), + None, + ) + .expect("fallback npm environment resolves"); + + assert_eq!( + environment.npm_prefix, + home.join(".waggle").join("npm").join("prefix") + ); + assert_eq!( + environment.npm_cache, + home.join(".waggle").join("npm").join("cache") + ); + assert_eq!(environment.data_dir, home.join(".waggle")); + } + + #[test] + fn bundled_npm_environment_requires_a_writable_home() { + let result = bundled_npm_environment(Path::new("resources"), None, None, None); + assert_eq!( + result, + Err("Unable to resolve writable npm data directory".to_string()) + ); + } + + #[cfg(windows)] + #[test] + fn oversized_service_log_is_rotated_before_launch() { + let root = std::env::temp_dir().join(format!( + "waggle-service-log-{}-{}", + std::process::id(), + Uuid::new_v4() + )); + let log_dir = root.join("logs"); + std::fs::create_dir_all(&log_dir).expect("creates log directory"); + let log_path = log_dir.join("service.log"); + std::fs::write(&log_path, vec![b'x'; MAX_SERVICE_LOG_BYTES as usize]) + .expect("writes oversized service log"); + + rotate_service_log(&log_path).expect("rotates service log"); + + assert!(!log_path.exists()); + assert_eq!( + std::fs::metadata(log_dir.join("service.log.1")) + .expect("reads rotated log") + .len(), + MAX_SERVICE_LOG_BYTES + ); + let _ = std::fs::remove_dir_all(root); + } + + #[cfg(windows)] + #[test] + fn service_log_writer_caps_current_and_retained_logs() { + let root = std::env::temp_dir().join(format!( + "waggle-service-log-cap-{}-{}", + std::process::id(), + Uuid::new_v4() + )); + let mut writer = ServiceLogWriter::open(&root).expect("opens service log writer"); + writer + .write_capped(&vec![b'x'; MAX_SERVICE_LOG_BYTES as usize + 1024]) + .expect("writes oversized diagnostics"); + writer + .write_capped(&vec![b'y'; MAX_SERVICE_LOG_BYTES as usize]) + .expect("rolls diagnostics during one process lifetime"); + drop(writer); + + let log_dir = root.join("logs"); + let current = std::fs::metadata(log_dir.join("service.log")) + .expect("reads current service log") + .len(); + let retained = std::fs::metadata(log_dir.join("service.log.1")) + .expect("reads retained service log") + .len(); + assert!(current <= MAX_SERVICE_LOG_BYTES); + assert!(retained <= MAX_SERVICE_LOG_BYTES); + assert!(current + retained <= MAX_SERVICE_LOG_BYTES * 2); + let _ = std::fs::remove_dir_all(root); + } + + #[cfg(windows)] + #[test] + fn closing_the_service_job_terminates_its_child() { + let mut child = long_lived_command().spawn().expect("starts service child"); + let job = create_kill_on_close_job().expect("creates kill-on-close job"); + assign_child_to_job(&job, &child).expect("assigns service child to job"); + + drop(job); + + let deadline = Instant::now() + Duration::from_secs(5); + loop { + if child.try_wait().expect("inspects service child").is_some() { + break; + } + if Instant::now() >= deadline { + let _ = child.kill(); + let _ = child.wait(); + panic!("service child survived closing the kill-on-close job"); + } + thread::sleep(Duration::from_millis(25)); } } - let mut cmd = build_service_command(port)?; - let child = cmd - .spawn() - .map_err(|e| format!("Failed to start service: {}", e))?; + #[cfg(windows)] + #[test] + fn closing_the_service_job_preserves_a_user_detached_descendant() { + use windows_sys::Win32::Foundation::{CloseHandle, WAIT_TIMEOUT}; + use windows_sys::Win32::System::Threading::{ + OpenProcess, WaitForSingleObject, PROCESS_QUERY_LIMITED_INFORMATION, + }; - let mut proc = process.lock().map_err(|e| e.to_string())?; - *proc = Some(child); + let root = std::env::temp_dir().join(format!( + "waggle-detached-job-{}-{}", + std::process::id(), + Uuid::new_v4() + )); + std::fs::create_dir_all(&root).expect("creates detached-job fixture"); + let marker = root.join("pid.txt"); + let escaped_marker = marker.to_string_lossy().replace('\'', "''"); + let script = format!( + "$child = Start-Process -FilePath (Join-Path $env:SystemRoot 'System32\\ping.exe') -ArgumentList '-t','127.0.0.1' -WindowStyle Hidden -PassThru; Set-Content -LiteralPath '{escaped_marker}' -Value $child.Id -NoNewline; Start-Sleep -Seconds 30" + ); + let mut command = Command::new("powershell.exe"); + command.args([ + "-NoLogo", + "-NoProfile", + "-NonInteractive", + "-WindowStyle", + "Hidden", + "-Command", + &script, + ]); + command + .stdin(Stdio::null()) + .stdout(Stdio::null()) + .stderr(Stdio::null()); + hide_windows_console(&mut command); + + let mut parent = command.spawn().expect("starts detached-session fixture"); + let job = create_kill_on_close_job().expect("creates service job"); + assign_child_to_job(&job, &parent).expect("assigns service fixture to job"); + let deadline = Instant::now() + Duration::from_secs(10); + while !marker.exists() { + if Instant::now() >= deadline { + let _ = parent.kill(); + let _ = parent.wait(); + panic!("detached-session fixture did not publish its pid"); + } + thread::sleep(Duration::from_millis(25)); + } + let detached_pid = std::fs::read_to_string(&marker) + .expect("reads detached pid") + .trim() + .parse::() + .expect("parses detached pid"); + + drop(job); + let _ = parent.wait(); + const SYNCHRONIZE_ACCESS: u32 = 0x00100000; + let detached = unsafe { + OpenProcess( + PROCESS_QUERY_LIMITED_INFORMATION | SYNCHRONIZE_ACCESS, + 0, + detached_pid, + ) + }; + let survived = !detached.is_null() + && unsafe { WaitForSingleObject(detached, 0) } == WAIT_TIMEOUT; + if !detached.is_null() { + unsafe { CloseHandle(detached) }; + } + let mut cleanup = Command::new("taskkill"); + cleanup + .args(["/PID", &detached_pid.to_string(), "/T", "/F"]) + .stdout(Stdio::null()) + .stderr(Stdio::null()); + hide_windows_console(&mut cleanup); + let _ = cleanup.status(); + let _ = std::fs::remove_dir_all(root); + + assert!(survived, "user-owned detached session died with the service job"); + } + + #[test] + fn exited_service_child_does_not_block_restart() { + let state = ServiceState::new(3333); + let command = if cfg!(windows) { + let mut command = Command::new("cmd"); + command.args(["/C", "exit", "0"]); + command + } else { + let mut command = Command::new("sh"); + command.args(["-c", "exit 0"]); + command + }; + spawn_managed_service_with(&state, |_, _| Ok(command)).expect("starts short-lived child"); + + for _ in 0..100 { + if current_launch_token(&state) + .expect("inspects service child") + .is_none() + { + break; + } + thread::sleep(Duration::from_millis(10)); + } + assert!(current_launch_token(&state) + .expect("reads launch") + .is_none()); + } + + #[test] + fn running_service_child_remains_registered() { + let state = ServiceState::new(3333); + let launch = spawn_managed_service_with(&state, |_, _| Ok(long_lived_command())) + .expect("starts long-lived child"); + + assert_eq!( + current_launch_token(&state) + .expect("inspects service child") + .expect("preserves running service child") + .generation, + launch.generation, + ); + stop_service_sync(&state).expect("stops long-lived child"); + } + + #[test] + fn service_spawn_holds_process_lock_until_child_registered() { + let state = ServiceState::new(3333); + spawn_managed_service_with(&state, |_, _| { + assert!(matches!( + state.runtime.try_lock(), + Err(std::sync::TryLockError::WouldBlock) + )); + Ok(long_lived_command()) + }) + .expect("spawns service while holding process lock"); + stop_service_sync(&state).expect("stops service child"); + } + + #[test] + fn watchdog_keeps_a_live_sidecar_during_cold_embedding_startup() { + assert!(!watchdog_should_restart( + false, + true, + Duration::from_secs(45), + WATCHDOG_FAILURE_THRESHOLD, + )); + assert!(!watchdog_should_restart( + false, + true, + WATCHDOG_INITIAL_STARTUP_GRACE - Duration::from_secs(1), + u32::MAX, + )); + } + + #[test] + fn watchdog_restarts_an_exited_sidecar_during_cold_startup() { + assert!(watchdog_should_restart(false, false, Duration::ZERO, 1,)); + } + + #[test] + fn watchdog_restarts_after_startup_grace_or_established_health_loss() { + assert!(watchdog_should_restart( + false, + true, + WATCHDOG_INITIAL_STARTUP_GRACE, + WATCHDOG_FAILURE_THRESHOLD, + )); + assert!(!watchdog_should_restart( + true, + true, + Duration::ZERO, + WATCHDOG_FAILURE_THRESHOLD - 1, + )); + assert!(watchdog_should_restart( + true, + true, + Duration::ZERO, + WATCHDOG_FAILURE_THRESHOLD, + )); + } + + #[test] + fn watchdog_does_not_spawn_while_a_cold_sidecar_is_alive() { + let state = ServiceState::new(3333); + spawn_managed_service_with(&state, |_, _| Ok(long_lived_command())) + .expect("starts cold sidecar"); + let build_called = std::cell::Cell::new(false); + + let recovery = recover_service_with( + &state, + false, + Duration::from_secs(45), + u32::MAX, + true, + |_, _| { + build_called.set(true); + Ok(long_lived_command()) + }, + ) + .expect("defers cold sidecar recovery"); + + assert_eq!(recovery, WatchdogRecovery::Deferred); + assert!(!build_called.get()); + stop_service_sync(&state).expect("stops cold sidecar"); + } + + #[test] + fn watchdog_restart_holds_the_process_lock_until_registration() { + let state = ServiceState::new(3333); + + let recovery = recover_service_with(&state, false, Duration::ZERO, 1, true, |_, _| { + assert!(matches!( + state.runtime.try_lock(), + Err(std::sync::TryLockError::WouldBlock) + )); + Ok(long_lived_command()) + }) + .expect("restarts exited sidecar atomically"); + + assert_eq!(recovery, WatchdogRecovery::Restarted); + assert!(current_launch_token(&state) + .expect("reads restarted sidecar") + .is_some()); + stop_service_sync(&state).expect("stops restarted sidecar"); + } + + #[test] + fn watchdog_restart_rotates_identity_and_removes_old_ready_file() { + let state = ServiceState::new(3333); + let first = spawn_managed_service_with(&state, |_, _| Ok(long_lived_command())) + .expect("starts first sidecar"); + std::fs::create_dir_all(first.ready_path.parent().expect("ready parent")) + .expect("creates ready parent"); + std::fs::write(&first.ready_path, b"first").expect("writes old ready file"); + + assert_eq!( + recover_service_with( + &state, + true, + Duration::ZERO, + WATCHDOG_FAILURE_THRESHOLD, + true, + |_, _| Ok(long_lived_command()), + ) + .expect("restarts managed child"), + WatchdogRecovery::Restarted, + ); + let second = current_launch_token(&state) + .expect("reads restarted child") + .expect("registered restarted child"); + assert_ne!(first.generation, second.generation); + assert_ne!(first.instance_id, second.instance_id); + assert!(!first.ready_path.exists()); + assert!(second.endpoint.is_none()); + stop_service_sync(&state).expect("stops restarted sidecar"); + } +} + +fn remove_launch_ready_file(path: &Path) { + match std::fs::symlink_metadata(path) { + Ok(_) => { + let _ = std::fs::remove_file(path); + } + Err(error) if error.kind() == std::io::ErrorKind::NotFound => {} + Err(_) => {} + } +} + +fn managed_launch_is_running(launch: &mut ManagedLaunch) -> Result { + match launch.child.try_wait() { + Ok(None) => Ok(true), + Ok(Some(_)) => Ok(false), + Err(error) => Err(format!("Failed to inspect service process: {error}")), + } +} + +fn launch_token(launch: &ManagedLaunch, preferred_port: u16) -> LaunchToken { + LaunchToken { + generation: launch.generation, + instance_id: launch.config.instance_id.clone(), + bootstrap_token: launch.config.bootstrap_token.clone(), + ready_path: launch.config.ready_path.clone(), + pid: launch.child.id(), + preferred_port, + endpoint: launch.endpoint.clone(), + started_at: launch.started_at, + } +} + +fn current_launch_token(state: &ServiceState) -> Result, String> { + let mut runtime = state.runtime.lock().map_err(|error| error.to_string())?; + let exited = match runtime.active.as_mut() { + Some(launch) => !managed_launch_is_running(launch)?, + None => return Ok(None), + }; + if exited { + if let Some(launch) = runtime.active.take() { + remove_launch_ready_file(&launch.config.ready_path); + } + return Ok(None); + } + Ok(runtime + .active + .as_ref() + .map(|launch| launch_token(launch, state.preferred_port))) +} + +fn spawn_locked( + runtime: &mut ServiceRuntime, + preferred_port: u16, + build_command: impl FnOnce(u16, &ManagedLaunchConfig) -> Result, +) -> Result { + let config = new_managed_launch_config()?; + remove_launch_ready_file(&config.ready_path); + let generation = runtime.next_generation; + runtime.next_generation = runtime.next_generation.saturating_add(1); + let mut command = build_command(preferred_port, &config)?; + #[cfg(windows)] + let log_dir = configured_service_log_dir(&command); + #[cfg(windows)] + let job = create_kill_on_close_job()?; + let mut child = command + .spawn() + .map_err(|error| format!("Failed to start service: {error}"))?; + #[cfg(windows)] + { + if let Err(error) = assign_child_to_job(&job, &child) { + let _ = child.kill(); + let _ = child.wait(); + return Err(error); + } + if let Some(log_dir) = log_dir { + if let Err(error) = start_service_log_capture(&mut child, &log_dir) { + let _ = child.kill(); + let _ = child.wait(); + return Err(error); + } + } + } + runtime.active = Some(ManagedLaunch { + generation, + child, + #[cfg(windows)] + _job: job, + config, + endpoint: None, + started_at: Instant::now(), + }); + Ok(launch_token( + runtime + .active + .as_ref() + .expect("managed launch was registered"), + preferred_port, + )) +} + +fn spawn_managed_service_with( + state: &ServiceState, + build_command: impl FnOnce(u16, &ManagedLaunchConfig) -> Result, +) -> Result { + let mut runtime = state.runtime.lock().map_err(|error| error.to_string())?; + runtime.desired_running = true; + let active_is_running = match runtime.active.as_mut() { + Some(launch) => managed_launch_is_running(launch)?, + None => false, + }; + if active_is_running { + return Ok(launch_token( + runtime + .active + .as_ref() + .expect("running launch remains registered"), + state.preferred_port, + )); + } + if let Some(launch) = runtime.active.take() { + remove_launch_ready_file(&launch.config.ready_path); + } + spawn_locked(&mut runtime, state.preferred_port, build_command) +} + +pub(crate) fn stop_service_sync(state: &ServiceState) -> Result<(), String> { + let mut runtime = state.runtime.lock().map_err(|error| error.to_string())?; + runtime.desired_running = false; + if let Some(mut launch) = runtime.active.take() { + let _ = launch.child.kill(); + let _ = launch.child.wait(); + remove_launch_ready_file(&launch.config.ready_path); + } Ok(()) } +fn watchdog_should_restart( + has_ever_been_healthy: bool, + child_is_running: bool, + initial_startup_elapsed: Duration, + consecutive_failures: u32, +) -> bool { + if !child_is_running { + return true; + } + + consecutive_failures >= WATCHDOG_FAILURE_THRESHOLD + && (has_ever_been_healthy || initial_startup_elapsed >= WATCHDOG_INITIAL_STARTUP_GRACE) +} + +#[derive(Debug, PartialEq, Eq)] +enum WatchdogRecovery { + Deferred, + Restarted, + RestartLimitReached, + Suppressed, +} + +fn recover_service_with( + state: &ServiceState, + has_ever_been_healthy: bool, + initial_startup_elapsed: Duration, + consecutive_failures: u32, + restart_allowed: bool, + build_command: impl FnOnce(u16, &ManagedLaunchConfig) -> Result, +) -> Result { + let mut runtime = state.runtime.lock().map_err(|error| error.to_string())?; + if !runtime.desired_running { + return Ok(WatchdogRecovery::Suppressed); + } + let child_is_running = match runtime.active.as_mut() { + Some(launch) => managed_launch_is_running(launch)?, + None => false, + }; + if !child_is_running { + if let Some(launch) = runtime.active.take() { + remove_launch_ready_file(&launch.config.ready_path); + } + } + if !watchdog_should_restart( + has_ever_been_healthy, + child_is_running, + initial_startup_elapsed, + consecutive_failures, + ) { + return Ok(WatchdogRecovery::Deferred); + } + if !restart_allowed { + return Ok(WatchdogRecovery::RestartLimitReached); + } + + if let Some(mut launch) = runtime.active.take() { + let _ = launch.child.kill(); + let _ = launch.child.wait(); + remove_launch_ready_file(&launch.config.ready_path); + } + + spawn_locked(&mut runtime, state.preferred_port, build_command) + .map_err(|error| format!("Failed to restart service: {error}"))?; + Ok(WatchdogRecovery::Restarted) +} + +fn read_ready_endpoint(token: &LaunchToken) -> Result, String> { + let metadata = match std::fs::symlink_metadata(&token.ready_path) { + Ok(metadata) => metadata, + Err(error) if error.kind() == std::io::ErrorKind::NotFound => return Ok(None), + Err(error) => { + return Err(format!( + "Unable to inspect managed service ready record: {error}" + )) + } + }; + if !metadata.file_type().is_file() || metadata.file_type().is_symlink() { + return Err("Managed service ready record is not a regular file".to_string()); + } + if metadata.len() > READY_RECORD_MAX_BYTES { + return Err("Managed service ready record is too large".to_string()); + } + let bytes = std::fs::read(&token.ready_path) + .map_err(|error| format!("Unable to read managed service ready record: {error}"))?; + parse_ready_record( + &bytes, + &token.instance_id, + token.pid, + token.preferred_port, + &token.bootstrap_token, + ) + .map(Some) +} + +async fn probe_owned_endpoint(endpoint: &ServiceEndpoint) -> Result { + let client = reqwest::Client::builder() + .redirect(reqwest::redirect::Policy::none()) + .timeout(Duration::from_secs(2)) + .build() + .map_err(|error| format!("Unable to build service health client: {error}"))?; + let url = format!("http://127.0.0.1:{}/health", endpoint.port); + let response = match client.get(url).send().await { + Ok(response) => response, + Err(_) => return Ok(false), + }; + if !response.status().is_success() { + return Ok(false); + } + if response + .content_length() + .is_some_and(|length| length > READY_RECORD_MAX_BYTES) + { + return Err("Managed service health response is too large".to_string()); + } + let bytes = response + .bytes() + .await + .map_err(|error| format!("Unable to read managed service health response: {error}"))?; + if bytes.len() as u64 > READY_RECORD_MAX_BYTES { + return Err("Managed service health response is too large".to_string()); + } + if !health_payload_matches(&bytes, endpoint) { + return Err("Managed service health identity does not match the owned launch".to_string()); + } + Ok(true) +} + +fn commit_endpoint_if_current( + state: &ServiceState, + token: &LaunchToken, + endpoint: ServiceEndpoint, +) -> Result { + if endpoint.port == 0 || endpoint.instance_id != token.instance_id { + return Ok(false); + } + let mut runtime = state.runtime.lock().map_err(|error| error.to_string())?; + let Some(active) = runtime.active.as_mut() else { + return Ok(false); + }; + if active.generation != token.generation + || active.child.id() != token.pid + || active.config.instance_id != token.instance_id + || !managed_launch_is_running(active)? + { + return Ok(false); + } + active.endpoint = Some(endpoint); + Ok(true) +} + +async fn discover_owned_endpoint( + state: &ServiceState, + token: &LaunchToken, +) -> Result, String> { + let current = current_launch_token(state)? + .ok_or_else(|| "Managed service process exited before becoming ready".to_string())?; + if current.generation != token.generation + || current.pid != token.pid + || current.instance_id != token.instance_id + { + return Err("Managed service launch changed during readiness validation".to_string()); + } + let endpoint_was_verified = current.endpoint.is_some(); + let endpoint = match current.endpoint.clone() { + Some(endpoint) => endpoint, + None => match read_ready_endpoint(¤t)? { + Some(endpoint) => endpoint, + None => return Ok(None), + }, + }; + if !probe_owned_endpoint(&endpoint).await? { + return Ok(None); + } + if !endpoint_was_verified && !listener_is_owned_by_pid(endpoint.port, current.pid)? { + return Err( + "Managed service endpoint is not owned by the spawned child process".to_string(), + ); + } + if !commit_endpoint_if_current(state, ¤t, endpoint.clone())? { + return Err("Managed service launch changed before endpoint commit".to_string()); + } + Ok(Some(endpoint)) +} + +/// Synchronously spawn the sidecar process if not already running. Does not wait +/// for the owned ready record. Safe to call from Tauri's synchronous `.setup()` callback. +pub fn spawn_service_sync(state: &ServiceState) -> Result<(), String> { + spawn_managed_service_with(state, build_service_command).map(|_| ()) +} + #[tauri::command] -pub async fn ensure_service(state: State<'_, ServiceState>) -> Result { - let port = state.port; - let health_url = format!("http://127.0.0.1:{}/health", port); - - match reqwest::get(&health_url).await { - Ok(resp) if resp.status().is_success() => { - return Ok("Service already running".to_string()); +pub async fn ensure_service(state: State<'_, ServiceState>) -> Result { + let token = spawn_managed_service_with(&state, build_service_command)?; + for _ in 0..600 { + if let Some(endpoint) = discover_owned_endpoint(&state, &token).await? { + return Ok(endpoint); } - _ => {} + tokio::time::sleep(Duration::from_secs(1)).await; } - - spawn_service_sync(port, &state.process)?; - - for _ in 0..30 { - tokio::time::sleep(std::time::Duration::from_secs(1)).await; - match reqwest::get(&health_url).await { - Ok(resp) if resp.status().is_success() => { - return Ok("Service started".to_string()); - } - _ => continue, - } - } - - Err("Service failed to start within 30 seconds".to_string()) + Err("Managed service failed to publish an owned endpoint within 600 seconds".to_string()) } #[tauri::command] pub async fn stop_service(state: State<'_, ServiceState>) -> Result { - let mut proc = state.process.lock().map_err(|e| e.to_string())?; - if let Some(mut child) = proc.take() { - let _ = child.kill(); - let _ = child.wait(); - } + stop_service_sync(&state)?; Ok("Service stopped".to_string()) } #[tauri::command] pub async fn get_service_port(state: State<'_, ServiceState>) -> Result { - Ok(state.port) + state.verified_port() } -pub fn start_watchdog(app: AppHandle, port: u16) { +pub fn start_watchdog(app: AppHandle) { tauri::async_runtime::spawn(async move { - let health_url = format!("http://127.0.0.1:{}/health", port); let mut consecutive_failures: u32 = 0; + let mut has_ever_been_healthy = false; + let mut initial_startup_started = Instant::now(); + let mut tracked_generation: Option = None; let mut restart_count: u32 = 0; let mut restart_window_start = Instant::now(); const MAX_RESTARTS: u32 = 5; @@ -302,60 +1803,99 @@ pub fn start_watchdog(app: AppHandle, port: u16) { loop { tokio::time::sleep(Duration::from_secs(10)).await; - match reqwest::get(&health_url).await { - Ok(resp) if resp.status().is_success() => { - consecutive_failures = 0; + let Some(state) = app.try_state::() else { + eprintln!("[waggle] Watchdog: service state is unavailable"); + break; + }; + let token = match current_launch_token(&state) { + Ok(token) => token, + Err(error) => { + eprintln!("[waggle] Watchdog: process inspection failed: {error}"); + None } - _ => { - consecutive_failures += 1; - if consecutive_failures >= 3 { - if restart_window_start.elapsed() > RESTART_WINDOW { - restart_count = 0; - restart_window_start = Instant::now(); - } - - if restart_count >= MAX_RESTARTS { - let _ = app.emit( - "waggle://service-status", - serde_json::json!({ "status": "failed" }), - ); - eprintln!("[waggle] Watchdog: max restarts exceeded, giving up"); - break; - } - - let _ = app.emit( - "waggle://service-status", - serde_json::json!({ "status": "restarting" }), - ); - eprintln!( - "[waggle] Watchdog: server unresponsive, respawning (attempt {})", - restart_count + 1 - ); - - // R7-003: self-heal — reap the dead child (so spawn_service_sync's - // is_some() early-return clears) then respawn the sidecar in place. - if let Some(state) = app.try_state::() { - { - if let Ok(mut proc) = state.process.lock() { - if let Some(mut child) = proc.take() { - let _ = child.kill(); - let _ = child.wait(); - } - } - } - match spawn_service_sync(port, &state.process) { - Ok(()) => eprintln!("[waggle] Watchdog: sidecar respawned"), - Err(e) => eprintln!("[waggle] Watchdog: respawn failed: {}", e), - } - } - let _ = app.emit("waggle://service-restart-needed", ()); - - restart_count += 1; - consecutive_failures = 0; - tokio::time::sleep(Duration::from_secs(10)).await; - } + }; + if let Some(ref token) = token { + if tracked_generation != Some(token.generation) { + tracked_generation = Some(token.generation); + consecutive_failures = 0; + has_ever_been_healthy = false; + initial_startup_started = token.started_at; } } + + let endpoint = match token.as_ref() { + Some(token) => match discover_owned_endpoint(&state, token).await { + Ok(endpoint) => endpoint, + Err(error) => { + eprintln!("[waggle] Watchdog: ownership validation failed: {error}"); + None + } + }, + None => None, + }; + if let Some(endpoint) = endpoint { + if !has_ever_been_healthy { + let _ = app.emit( + "waggle://service-status", + serde_json::json!({ "status": "ready", "endpoint": endpoint }), + ); + } + has_ever_been_healthy = true; + consecutive_failures = 0; + continue; + } + + consecutive_failures = consecutive_failures.saturating_add(1); + if restart_window_start.elapsed() > RESTART_WINDOW { + restart_count = 0; + restart_window_start = Instant::now(); + } + let recovery = recover_service_with( + &state, + has_ever_been_healthy, + initial_startup_started.elapsed(), + consecutive_failures, + restart_count < MAX_RESTARTS, + build_service_command, + ); + match recovery { + Ok(WatchdogRecovery::Deferred) => continue, + Ok(WatchdogRecovery::Suppressed) => { + consecutive_failures = 0; + tracked_generation = None; + continue; + } + Ok(WatchdogRecovery::RestartLimitReached) => { + let _ = app.emit( + "waggle://service-status", + serde_json::json!({ "status": "failed" }), + ); + eprintln!("[waggle] Watchdog: max restarts exceeded, giving up"); + break; + } + Ok(WatchdogRecovery::Restarted) => { + let _ = app.emit( + "waggle://service-status", + serde_json::json!({ "status": "restarting" }), + ); + let _ = app.emit("waggle://service-restart-needed", ()); + restart_count += 1; + consecutive_failures = 0; + has_ever_been_healthy = false; + tracked_generation = None; + initial_startup_started = Instant::now(); + } + Err(error) => { + eprintln!("[waggle] Watchdog: respawn failed: {error}"); + let _ = app.emit("waggle://service-restart-needed", ()); + restart_count += 1; + consecutive_failures = 0; + has_ever_been_healthy = false; + tracked_generation = None; + initial_startup_started = Instant::now(); + } + } + tokio::time::sleep(Duration::from_secs(10)).await; } }); } diff --git a/app/src-tauri/src/tray.rs b/app/src-tauri/src/tray.rs index 4db19de..b7ed692 100644 --- a/app/src-tauri/src/tray.rs +++ b/app/src-tauri/src/tray.rs @@ -1,7 +1,7 @@ use tauri::{ image::Image, menu::{MenuBuilder, MenuItemBuilder}, - tray::TrayIconBuilder, + tray::{MouseButton, MouseButtonState, TrayIconBuilder}, AppHandle, Emitter, Manager, }; @@ -50,6 +50,7 @@ pub fn setup_tray(app: &AppHandle) -> Result<(), Box> { TrayIconBuilder::new() .icon(icon) .menu(&menu) + .show_menu_on_left_click(false) .tooltip("Waggle Agent Service") .on_menu_event(|app, event| match event.id().as_ref() { "show" => { @@ -65,7 +66,12 @@ pub fn setup_tray(app: &AppHandle) -> Result<(), Box> { _ => {} }) .on_tray_icon_event(|tray, event| { - if let tauri::tray::TrayIconEvent::Click { .. } = event { + if let tauri::tray::TrayIconEvent::Click { + button: MouseButton::Left, + button_state: MouseButtonState::Up, + .. + } = event + { show_main_window(tray.app_handle()); } }) diff --git a/app/src-tauri/tauri.conf.json b/app/src-tauri/tauri.conf.json index 39af62f..f08d76f 100644 --- a/app/src-tauri/tauri.conf.json +++ b/app/src-tauri/tauri.conf.json @@ -28,21 +28,19 @@ "windows": [ { "title": "Waggle", + "create": false, "width": 1200, "height": 800, "minWidth": 800, "minHeight": 600, + "dataDirectory": "webview", "resizable": true, "fullscreen": false, "decorations": true } ], "security": { - "csp": "default-src 'self'; connect-src 'self' http://localhost:* http://127.0.0.1:* ws://localhost:* ws://127.0.0.1:* https://us.i.posthog.com; style-src 'self' 'unsafe-inline'; script-src 'self'; img-src 'self' data:" - }, - "trayIcon": { - "iconPath": "icons/icon.png", - "tooltip": "Waggle - AI Agent Swarm" + "csp": "default-src 'self'; connect-src 'self' ipc: http://ipc.localhost http://localhost:* http://127.0.0.1:* ws://localhost:* ws://127.0.0.1:* https://us.i.posthog.com; style-src 'self' 'unsafe-inline'; script-src 'self'; img-src 'self' data:" } }, "plugins": { diff --git a/app/tests/auto-update.test.ts b/app/tests/auto-update.test.ts index 62242ab..31201fc 100644 --- a/app/tests/auto-update.test.ts +++ b/app/tests/auto-update.test.ts @@ -101,8 +101,9 @@ describe('auto-update configuration', () => { expect(workflow).toContain('x86_64-apple-darwin'); }); - it('uses tauri-action for builds', () => { - expect(workflow).toContain('tauri-apps/tauri-action'); + it('uses the app-lockfile-pinned Tauri CLI for builds', () => { + expect(workflow).toContain('node node_modules/@tauri-apps/cli/tauri.js build'); + expect(workflow).not.toMatch(/^\s*uses:\s+tauri-apps\/tauri-action/m); }); it('does NOT publish a broken (empty-signature) updater manifest', () => { diff --git a/apps/browser-ext/README.md b/apps/browser-ext/README.md index 5554da8..fa110f0 100644 --- a/apps/browser-ext/README.md +++ b/apps/browser-ext/README.md @@ -1,69 +1,66 @@ -# Waggle Companion · Chrome MV3 extension +# Waggle Companion - Chrome MV3 extension -The browser-side hook for Waggle OS. Lets the user save any page or selection -to their workspace memory from anywhere on the web, without leaving the tab. +Browser-side capture for Waggle OS. It saves a page selection or the current +page to personal Waggle memory without leaving the tab. -This implements **FR-1** from the 2026-05-28 addictiveness audit — closes the -"external trigger surface" rubric gap (dim 1) for the non-coder personas -whose real workflow lives in browser tabs (researcher, journalist, marketer, -writer, retired teacher). +## What it does -## What it does (v0.1.0) +- The popup shows connection status and the active memory destination. +- Save Selection and Save Page send personal imported-memory captures. +- The context menu can save selected text. +- Pairing is explicit: generate a one-time code in Waggle Settings, then enter + it in the popup. The code is single-use and expires after ten minutes. -- **Popup** — shows connection status + the active workspace memory is saving to + two buttons (save selection / save page). -- **Right-click context menu** — "Save to Waggle memory" appears on any text selection. -- **Reuses existing sidecar endpoints** — `/api/browser-ext/session-token` for local token bootstrap, `/api/browser-ext/health` for status, and `/api/memory/frames` for ingest. No new ingest logic. +The popup never makes network requests. The MV3 background worker redeems the +code and stores only the resulting scoped credential in +`chrome.storage.local.companionToken`. Legacy `sessionToken` values are deleted +and never trusted. A rejected credential is removed; captures are never replayed +or automatically re-paired. -## How to load (developer mode, local install) +## Load locally -1. Start the Waggle sidecar with one of these env vars set so its CORS layer accepts the dev extension origin: - - **Quickest (dev only):** `WAGGLE_DEV_ALLOW_ANY_EXTENSION=1` — accepts any `chrome-extension://*` origin. Never set this in production. - - **Production-shaped:** `WAGGLE_BROWSER_EXT_IDS=` (comma-separated for multiple IDs). Pin once you have the loaded extension's ID from `chrome://extensions`. -2. Open `chrome://extensions` in Chrome (or Edge, or any Chromium browser). -3. Toggle **Developer mode** on (top right). -4. Click **Load unpacked** and pick this folder (`apps/browser-ext`). -5. Copy the extension ID shown on the card. -6. Restart the sidecar with `WAGGLE_BROWSER_EXT_IDS=` for the production-shaped path, or skip this if you used the dev escape hatch in step 1. -7. Pin the extension to the toolbar. -8. Open the popup — you should see a green dot + "Connected" + the memory destination. +1. Start Waggle with an extension allowlist: + - Development only: `WAGGLE_DEV_ALLOW_ANY_EXTENSION=1` + - Production-shaped: `WAGGLE_BROWSER_EXT_IDS=` +2. Open `chrome://extensions`, enable Developer mode, and choose Load unpacked. +3. Select this `apps/browser-ext` directory. +4. If using the production-shaped allowlist, copy the installed extension ID + into `WAGGLE_BROWSER_EXT_IDS` and restart Waggle. +5. In Waggle Settings -> Advanced, generate a Browser Companion code. +6. Enter that code in the extension popup. -Without either env var set, the sidecar rejects Browser Companion token bootstrap and the popup shows setup recovery copy. The extension stores the sidecar session token in `chrome.storage.local.sessionToken` after a successful bootstrap and sends it as a bearer token on save/status calls. - -## What's deliberately NOT in v0.1.0 - -- **Side panel chat** — the Chrome side panel for asking questions about the current page. Designed for v0.2; would call `/api/chat`. -- **One-time-code pairing UX** — v0.1.0 bootstraps the local session token for an env-allowlisted extension ID. A more explicit desktop Settings pairing flow with a one-time code is future hardening. -- **Cross-browser packaging** — manifest is MV3, works on Chrome/Edge/Brave. Firefox needs a parallel manifest shape. -- **Article extraction** — page text capture is `document.body.innerText` capped at 12k chars. Reader-mode style extraction belongs server-side. -- **Icons** — using browser default. Wire in real icons when we have the brand asset. -- **Build step** — vanilla JS, no bundler. Simpler MVP; if we add typescript/react for the side panel later, add Vite then. +Never enable `WAGGLE_DEV_ALLOW_ANY_EXTENSION` in a production build. ## Files | File | Role | |---|---| -| `manifest.json` | MV3 manifest — permissions, action, content script, background | -| `popup.html` | Popup UI shell (dark Hive theme inline) | -| `popup.js` | Popup logic — health refresh, selection read, save dispatch | -| `content.js` | Per-page content script — extracts selection + body text on demand | -| `background.js` | Service worker — fetch wrapper to the Waggle sidecar | +| `manifest.json` | MV3 permissions, popup, content script, background worker | +| `popup.html` | Popup UI | +| `popup.js` | Pairing, health, and capture UI logic | +| `content.js` | On-demand selection and page extraction | +| `background.js` | Pairing and authenticated loopback requests | ## Sidecar contract -- `GET /api/browser-ext/session-token` -> `{ token }` for allowlisted extension origins / MV3 service-worker requests. -- `GET /api/browser-ext/health` -> `{ ok: true, version, activeWorkspaceId, activeWorkspace }` (defined in `packages/server/src/local/routes/browser-ext.ts`; `activeWorkspace` is legacy compatibility) -- `POST /api/memory/frames` — existing endpoint, body `{ content, source: 'import', importance: 'normal' | 'low' }`. Dedup runs server-side. +- `POST /api/browser-ext/pair` redeems an allowlisted extension's valid code. +- `GET /api/browser-ext/health` reports local connection and workspace state. +- `POST /api/memory/frames` accepts only `source: "import"`, personal scope, + and normal/low importance for the paired credential. -## Verification +The global desktop session token is never exposed to the extension. -After loading the unpacked extension: -1. Click the extension icon on any web page → status should read "Connected" with a green dot. -2. Select some text → "Save selection to memory" enables → click it → toast reads "Saved to Waggle memory ✓". -3. Open the Waggle desktop → Memory app → confirm the new frame appears with source `import`. +## Manual smoke test -## Roadmap (post-MVP) +1. Open the popup before pairing: it must show the code form and disable + authenticated capture. +2. Pair with a fresh Settings code: the popup must show Connected. +3. Save a selection and confirm a personal frame with source `import` appears. +4. Revoke in Settings: the next health/save request must require a new code and + must not retry the previous capture. -- v0.2 — side panel with chat about the current page (calls `/api/chat`). -- v0.3 — pre-load Waggle's "Ask about this page" agent on important pages (configurable). -- v0.4 — Firefox MV2 parallel manifest. -- v0.5 — explicit auth pairing UX (one-time code from desktop Settings). +## Deferred + +- Side-panel chat about the current page. +- Firefox-specific packaging. +- Reader-mode extraction and branded icons. diff --git a/apps/browser-ext/background.js b/apps/browser-ext/background.js index e4c2042..2328a91 100644 --- a/apps/browser-ext/background.js +++ b/apps/browser-ext/background.js @@ -1,11 +1,9 @@ -// Waggle Companion background service worker — routes messages from -// popup.js to the local Waggle sidecar at 127.0.0.1:3333. -// -// MV3 service workers are short-lived; we don't keep any state here -// beyond per-message handlers. The sidecar's session token (if any) is -// pulled from chrome.storage.local on every request. +// Waggle Companion background service worker — the only extension process that +// talks to the loopback sidecar. The popup supplies a one-time code; only the +// resulting scoped credential is persisted. const SIDECAR = 'http://127.0.0.1:3333'; +const PAIRING_REQUIRED = 'Browser Companion not paired. Generate a one-time code in Waggle Settings.'; async function readJson(response) { try { @@ -18,56 +16,77 @@ async function readJson(response) { function authErrorMessage(status, body) { const code = body?.code; if (code === 'EXTENSION_NOT_ALLOWLISTED') { - return 'Browser Companion is not allowlisted. Add this extension ID to Waggle, restart Waggle, then try again.'; + return 'Browser Companion not allowlisted. Add the extension ID in Waggle, restart Waggle, and try again.'; } - if (status === 401 && code === 'INVALID_TOKEN') { - return 'Browser Companion pairing expired. Reopen Waggle desktop, then try again.'; + if (code === 'PAIRING_CODE_INVALID') { + return 'Invalid or expired pairing code. Generate a new one-time code in Waggle Settings.'; } - if (status === 401 && (code === 'MISSING_TOKEN' || !code)) { - return 'Browser Companion is not paired. Start Waggle desktop, then try again.'; + if (status === 401 && (code === 'INVALID_TOKEN' || code === 'MISSING_TOKEN' || !code)) { + return PAIRING_REQUIRED; } return body?.error || `HTTP ${status}`; } -async function requestSessionToken() { - const r = await fetch(`${SIDECAR}/api/browser-ext/session-token`, { - method: 'GET', - headers: { - Accept: 'application/json', - 'X-Waggle-Extension-Id': chrome.runtime.id, - }, - }); - const data = await readJson(r); - if (!r.ok || !data?.token) { - return { ok: false, error: authErrorMessage(r.status, data) }; - } - await chrome.storage.local.set({ sessionToken: data.token }); - return { ok: true, token: data.token }; +async function removeLegacyToken() { + await chrome.storage.local.remove('sessionToken'); } -async function getAuthHeaders(options = {}) { +async function getAuthHeaders() { try { - const { sessionToken } = await chrome.storage.local.get(['sessionToken']); - if (sessionToken) return { headers: { Authorization: `Bearer ${sessionToken}` } }; - if (!options.pair) return { headers: {} }; - const paired = await requestSessionToken(); - if (!paired.ok) return { headers: {}, error: paired.error }; - return { headers: { Authorization: `Bearer ${paired.token}` } }; + const { companionToken, sessionToken } = await chrome.storage.local.get([ + 'companionToken', + 'sessionToken', + ]); + if (sessionToken) await removeLegacyToken(); + if (!companionToken) return { headers: {}, error: PAIRING_REQUIRED }; + return { headers: { Authorization: `Bearer ${companionToken}` } }; } catch (err) { return { headers: {}, error: String(err) }; } } +async function pairWithCode(rawCode) { + const code = typeof rawCode === 'string' ? rawCode.trim().toUpperCase() : ''; + if (!/^[A-HJ-NP-Z2-9]{8}$/.test(code)) { + return { ok: false, error: 'Enter the 8-character code shown in Waggle Settings.' }; + } + try { + const response = await fetch(`${SIDECAR}/api/browser-ext/pair`, { + method: 'POST', + headers: { + Accept: 'application/json', + 'Content-Type': 'application/json', + 'X-Waggle-Extension-Id': chrome.runtime.id, + }, + body: JSON.stringify({ code }), + }); + const data = await readJson(response); + if (!response.ok || typeof data?.token !== 'string') { + return { ok: false, error: authErrorMessage(response.status, data) }; + } + await chrome.storage.local.set({ companionToken: data.token }); + await removeLegacyToken(); + return { ok: true }; + } catch (err) { + return { ok: false, error: String(err) }; + } +} + async function health() { try { - const auth = await getAuthHeaders({ pair: true }); + const auth = await getAuthHeaders(); if (auth.error) return { ok: false, error: auth.error }; - const r = await fetch(`${SIDECAR}/api/browser-ext/health`, { + const response = await fetch(`${SIDECAR}/api/browser-ext/health`, { method: 'GET', headers: { Accept: 'application/json', ...auth.headers }, }); - if (!r.ok) return { ok: false, error: authErrorMessage(r.status, await readJson(r)) }; - return await r.json(); + const data = await readJson(response); + if (response.status === 401) { + await chrome.storage.local.remove('companionToken'); + return { ok: false, error: PAIRING_REQUIRED }; + } + if (!response.ok) return { ok: false, error: authErrorMessage(response.status, data) }; + return data; } catch (err) { return { ok: false, error: String(err) }; } @@ -75,30 +94,23 @@ async function health() { async function saveMemory(payload) { try { - const body = JSON.stringify({ - content: payload.content, - source: payload.source || 'import', - importance: payload.importance || 'normal', - }); - const auth = await getAuthHeaders({ pair: true }); + const auth = await getAuthHeaders(); if (auth.error) return { saved: false, error: auth.error }; - let r = await fetch(`${SIDECAR}/api/memory/frames`, { + const response = await fetch(`${SIDECAR}/api/memory/frames`, { method: 'POST', headers: { 'Content-Type': 'application/json', ...auth.headers }, - body, + body: JSON.stringify({ + content: payload.content, + source: payload.source || 'import', + importance: payload.importance || 'normal', + }), }); - if (r.status === 401) { - const paired = await requestSessionToken(); - if (paired.ok) { - r = await fetch(`${SIDECAR}/api/memory/frames`, { - method: 'POST', - headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${paired.token}` }, - body, - }); - } + const data = await readJson(response); + if (response.status === 401) { + await chrome.storage.local.remove('companionToken'); + return { saved: false, error: PAIRING_REQUIRED }; } - if (!r.ok) return { saved: false, error: authErrorMessage(r.status, await readJson(r)) }; - const data = await r.json(); + if (!response.ok) return { saved: false, error: authErrorMessage(response.status, data) }; return { saved: data?.saved ?? true, duplicate: data?.duplicate ?? false, @@ -109,16 +121,16 @@ async function saveMemory(payload) { } } -chrome.runtime.onMessage.addListener((msg, _sender, sendResponse) => { +chrome.runtime.onMessage.addListener((message, _sender, sendResponse) => { (async () => { - if (msg?.type === 'health') sendResponse(await health()); - else if (msg?.type === 'save-memory') sendResponse(await saveMemory(msg)); + if (message?.type === 'health') sendResponse(await health()); + else if (message?.type === 'pair') sendResponse(await pairWithCode(message.code)); + else if (message?.type === 'save-memory') sendResponse(await saveMemory(message)); else sendResponse({ error: 'unknown message type' }); })(); - return true; // keep channel open for async sendResponse + return true; }); -// Context menu: right-click selection → "Save to Waggle memory" chrome.runtime.onInstalled.addListener(() => { chrome.contextMenus.create({ id: 'waggle-save-selection', @@ -134,7 +146,6 @@ chrome.contextMenus.onClicked.addListener(async (info, tab) => { source: 'import', importance: 'normal', }); - // Best-effort badge feedback (MV3 has no toast API in background). await chrome.action.setBadgeText({ text: result.saved ? '✓' : '!' }); await chrome.action.setBadgeBackgroundColor({ color: result.saved ? '#10b981' : '#ef4444' }); setTimeout(() => chrome.action.setBadgeText({ text: '' }), 2500); diff --git a/apps/browser-ext/popup.html b/apps/browser-ext/popup.html index 34fcef0..670e9a1 100644 --- a/apps/browser-ext/popup.html +++ b/apps/browser-ext/popup.html @@ -74,6 +74,19 @@ } #toast.ok { color: var(--success); border-color: var(--success); } #toast.err { color: var(--danger); border-color: var(--danger); } + #pair-form { + margin-bottom: 10px; padding: 8px; border: 1px solid var(--border); + border-radius: 8px; background: #101014; + } + #pair-form label { display: block; margin-bottom: 6px; color: var(--fg); } + .pair-row { display: flex; gap: 6px; } + #pair-code { + width: 100%; min-width: 0; padding: 7px 8px; border-radius: 6px; + border: 1px solid var(--border); background: var(--bg); color: var(--fg); + font: 600 14px/1 monospace; letter-spacing: .12em; text-transform: uppercase; + } + #pair-code:focus-visible { outline: 2px solid var(--primary); outline-offset: 2px; } + #pair-submit { width: auto; margin: 0; } footer { margin-top: 10px; padding-top: 8px; border-top: 1px solid var(--border); font-size: 10px; color: var(--muted); text-align: center; } a { color: var(--primary); text-decoration: none; } @@ -87,6 +100,15 @@
Memory destination: —
+ + diff --git a/apps/browser-ext/popup.js b/apps/browser-ext/popup.js index a32f49e..545b949 100644 --- a/apps/browser-ext/popup.js +++ b/apps/browser-ext/popup.js @@ -12,6 +12,9 @@ const btnSelection = $('save-selection'); const btnPage = $('save-page'); const btnOpen = $('open-waggle'); const toast = $('toast'); +const pairForm = $('pair-form'); +const pairCode = $('pair-code'); +const pairSubmit = $('pair-submit'); let cachedSelection = ''; let cachedPageMeta = null; @@ -60,6 +63,7 @@ async function refreshHealth() { // textContent (not innerHTML) — workspace names are user-controlled // and could otherwise be XSS sinks in the extension context. workspaceNameEl.textContent = formatMemoryDestination(reply); + pairForm.hidden = true; } else { throw new Error(reply?.error || 'No response'); } @@ -67,11 +71,32 @@ async function refreshHealth() { dot.className = 'dot disconnected'; statusText.textContent = 'Not connected'; workspaceNameEl.textContent = 'Unavailable'; + pairForm.hidden = false; const msg = err?.message || 'Start Waggle desktop on this machine, then re-open this popup.'; showToast(msg, 'err', { sticky: true }); } } +async function pair(event) { + event.preventDefault(); + const code = pairCode.value.trim().toUpperCase(); + pairSubmit.disabled = true; + try { + const reply = await chrome.runtime.sendMessage({ type: 'pair', code }); + if (!reply?.ok) { + showToast(reply?.error || 'Pairing failed.', 'err', { sticky: true }); + return; + } + pairCode.value = ''; + showToast('Browser Companion paired.', 'ok'); + await refreshHealth(); + } catch (err) { + showToast(err?.message || 'Pairing failed.', 'err', { sticky: true }); + } finally { + pairSubmit.disabled = false; + } +} + async function readActiveTab() { const [tab] = await chrome.tabs.query({ active: true, currentWindow: true }); if (!tab?.id) return null; @@ -108,6 +133,7 @@ async function save(kind) { showToast(reply.duplicate ? 'Already in memory.' : 'Saved to Waggle memory ✓', 'ok'); } else { const msg = reply?.error || 'Save failed.'; + if (isSetupError(msg)) pairForm.hidden = false; showToast(msg, 'err', { sticky: isSetupError(msg) }); } } @@ -115,6 +141,7 @@ async function save(kind) { btnSelection.addEventListener('click', () => save('selection')); btnPage.addEventListener('click', () => save('page')); btnOpen.addEventListener('click', () => chrome.tabs.create({ url: 'http://127.0.0.1:3333' })); +pairForm.addEventListener('submit', pair); refreshHealth(); readActiveTab(); diff --git a/apps/web/package.json b/apps/web/package.json index ecb0344..b1dc2ed 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -64,7 +64,7 @@ "react-dom": "^19.2.0", "react-hook-form": "^7.61.1", "react-resizable-panels": "^2.1.9", - "react-router-dom": "^6.30.1", + "react-router-dom": "^6.30.4", "recharts": "^2.15.4", "simple-icons": "^16.15.0", "sonner": "^1.7.4", diff --git a/apps/web/src/app-entry.tsx b/apps/web/src/app-entry.tsx new file mode 100644 index 0000000..5c0833a --- /dev/null +++ b/apps/web/src/app-entry.tsx @@ -0,0 +1,23 @@ +import { createRoot } from 'react-dom/client'; +import { flushSync } from 'react-dom'; +import App from './App.tsx'; +import './index.css'; +import { applyStoredThemeEarly } from '@/providers/ThemeProvider'; + +export function mountApp(): void { + // Apply the persisted theme before first paint to avoid a flash of the wrong + // theme (warm graphite/dark default; warm paper for light). + applyStoredThemeEarly(); + + const rootElement = document.getElementById('root'); + if (!rootElement) throw new Error('Waggle root element is missing'); + flushSync(() => { + createRoot(rootElement).render(); + }); + rootElement.dataset.waggleUiReady = 'ready'; + + // Initialize PostHog cloud analytics (DAY0-04). Keep it off the startup path. + void import('@/lib/posthog') + .then(({ initPostHog }) => initPostHog()) + .catch(() => {}); +} diff --git a/apps/web/src/boot-connect.test.ts b/apps/web/src/boot-connect.test.ts new file mode 100644 index 0000000..dc9591f --- /dev/null +++ b/apps/web/src/boot-connect.test.ts @@ -0,0 +1,210 @@ +import { beforeEach, describe, expect, it, vi } from 'vitest'; + +const adapterMocks = vi.hoisted(() => ({ + armDesktopServiceGate: vi.fn(), + connect: vi.fn(), + connectDesktopService: vi.fn(), + failDesktopServiceGate: vi.fn(), +})); +const tauriMocks = vi.hoisted(() => ({ + ensureDesktopService: vi.fn(), + isTauri: vi.fn(), + listenDesktopServiceLifecycle: vi.fn(), +})); + +vi.mock('./lib/adapter', () => ({ adapter: adapterMocks })); +vi.mock('./lib/tauri-bindings', () => tauriMocks); + +type DesktopEndpoint = { port: number; instanceId: string }; +type LifecycleEvent = + | { status: 'restarting' } + | { status: 'ready'; endpoint: DesktopEndpoint } + | { status: 'failed'; error?: string }; + +describe('boot connection', () => { + let emitLifecycle!: (event: LifecycleEvent) => void; + + beforeEach(() => { + vi.resetModules(); + vi.clearAllMocks(); + adapterMocks.armDesktopServiceGate.mockReturnValue(7); + adapterMocks.connect.mockResolvedValue({ status: 'ok' }); + adapterMocks.connectDesktopService.mockResolvedValue({ status: 'ok' }); + tauriMocks.isTauri.mockReturnValue(true); + tauriMocks.listenDesktopServiceLifecycle.mockImplementation(async (listener) => { + emitLifecycle = listener as (event: LifecycleEvent) => void; + return () => {}; + }); + }); + + it('does not release Tauri startup until the owned endpoint is connected', async () => { + const endpoint = { port: 49151, instanceId: 'desktop-instance-a' }; + let publishEndpoint!: (value: typeof endpoint) => void; + tauriMocks.ensureDesktopService.mockReturnValue( + new Promise((resolve) => { publishEndpoint = resolve; }), + ); + + const { armBootConnection } = await import('./boot-connect'); + const startup = armBootConnection(); + + expect(armBootConnection()).toBe(startup); + await Promise.resolve(); + expect(adapterMocks.connectDesktopService).not.toHaveBeenCalled(); + + publishEndpoint(endpoint); + await expect(startup).resolves.toBeUndefined(); + expect(adapterMocks.connectDesktopService).toHaveBeenCalledWith(endpoint, 7); + expect(adapterMocks.failDesktopServiceGate).not.toHaveBeenCalled(); + }); + + it('survives a stale initial launch and resolves from the replacement generation', async () => { + const replacement = { port: 49152, instanceId: 'desktop-instance-b' }; + let rejectInitial!: (error: Error) => void; + tauriMocks.ensureDesktopService.mockReturnValue( + new Promise((_resolve, reject) => { rejectInitial = reject; }), + ); + adapterMocks.armDesktopServiceGate.mockReturnValueOnce(7).mockReturnValueOnce(8); + + const { armBootConnection } = await import('./boot-connect'); + const startup = armBootConnection(); + await Promise.resolve(); + + emitLifecycle({ status: 'restarting' }); + emitLifecycle({ status: 'ready', endpoint: replacement }); + await expect(startup).resolves.toBeUndefined(); + rejectInitial(new Error('stale managed launch changed')); + await Promise.resolve(); + + expect(adapterMocks.connectDesktopService).toHaveBeenCalledWith(replacement, 8); + expect(adapterMocks.failDesktopServiceGate).not.toHaveBeenCalled(); + }); + + it('recovers when the stale launch rejects before its replacement event arrives', async () => { + const replacement = { port: 49152, instanceId: 'desktop-instance-b' }; + let rejectInitial!: (error: Error) => void; + tauriMocks.ensureDesktopService.mockReturnValue( + new Promise((_resolve, reject) => { rejectInitial = reject; }), + ); + adapterMocks.armDesktopServiceGate.mockReturnValueOnce(7).mockReturnValueOnce(8); + + const { armBootConnection } = await import('./boot-connect'); + const startup = armBootConnection(); + const outcome = startup.then(() => 'ready', () => 'failed'); + await Promise.resolve(); + + rejectInitial(new Error('stale managed launch changed')); + await Promise.resolve(); + emitLifecycle({ status: 'restarting' }); + emitLifecycle({ status: 'ready', endpoint: replacement }); + + await expect(outcome).resolves.toBe('ready'); + expect(adapterMocks.connectDesktopService).toHaveBeenCalledWith(replacement, 8); + expect(adapterMocks.failDesktopServiceGate).not.toHaveBeenCalled(); + }); + + it('actively relaunches when an early child exit produces no lifecycle event', async () => { + vi.useFakeTimers(); + try { + const replacement = { port: 49152, instanceId: 'desktop-instance-b' }; + tauriMocks.ensureDesktopService + .mockRejectedValueOnce(new Error('managed child exited before ready')) + .mockResolvedValueOnce(replacement); + adapterMocks.armDesktopServiceGate.mockReturnValueOnce(7).mockReturnValueOnce(8); + + const { armBootConnection } = await import('./boot-connect'); + const startup = armBootConnection(); + const outcome = startup.then(() => 'ready', () => 'failed'); + + await vi.advanceTimersByTimeAsync(15_000); + + await expect(outcome).resolves.toBe('ready'); + expect(tauriMocks.ensureDesktopService).toHaveBeenCalledTimes(2); + expect(adapterMocks.connectDesktopService).toHaveBeenCalledWith(replacement, 8); + expect(adapterMocks.failDesktopServiceGate).not.toHaveBeenCalled(); + } finally { + vi.useRealTimers(); + } + }); + + it('deduplicates lifecycle-ready and ensure results for the same endpoint', async () => { + const endpoint = { port: 49151, instanceId: 'desktop-instance-a' }; + let publishEndpoint!: (value: DesktopEndpoint) => void; + let finishConnection!: (value: { status: string }) => void; + tauriMocks.ensureDesktopService.mockReturnValue( + new Promise((resolve) => { publishEndpoint = resolve; }), + ); + adapterMocks.connectDesktopService.mockReturnValue( + new Promise<{ status: string }>((resolve) => { finishConnection = resolve; }), + ); + + const { armBootConnection } = await import('./boot-connect'); + const startup = armBootConnection(); + await Promise.resolve(); + + emitLifecycle({ status: 'ready', endpoint }); + publishEndpoint(endpoint); + await Promise.resolve(); + expect(adapterMocks.connectDesktopService).toHaveBeenCalledOnce(); + + finishConnection({ status: 'ok' }); + await expect(startup).resolves.toBeUndefined(); + }); + + it('cancels a concurrent ensure failure when the current endpoint binds successfully', async () => { + vi.useFakeTimers(); + try { + const endpoint = { port: 49151, instanceId: 'desktop-instance-a' }; + let rejectEnsure!: (error: Error) => void; + let finishConnection!: (value: { status: string }) => void; + tauriMocks.ensureDesktopService.mockReturnValue( + new Promise((_resolve, reject) => { rejectEnsure = reject; }), + ); + adapterMocks.connectDesktopService.mockReturnValue( + new Promise<{ status: string }>((resolve) => { finishConnection = resolve; }), + ); + + const { armBootConnection } = await import('./boot-connect'); + const startup = armBootConnection(); + await Promise.resolve(); + + emitLifecycle({ status: 'ready', endpoint }); + rejectEnsure(new Error('stale ensure failed')); + await Promise.resolve(); + finishConnection({ status: 'ok' }); + + await expect(startup).resolves.toBeUndefined(); + await vi.advanceTimersByTimeAsync(15_000); + expect(adapterMocks.failDesktopServiceGate).not.toHaveBeenCalled(); + } finally { + vi.useRealTimers(); + } + }); + + it('rejects startup and fails the current gate on a terminal ensure error', async () => { + vi.useFakeTimers(); + const failure = new Error('managed service failed'); + tauriMocks.ensureDesktopService.mockRejectedValue(failure); + + const { armBootConnection } = await import('./boot-connect'); + const startup = armBootConnection(); + const rejection = expect(startup).rejects.toThrow('managed service failed'); + + await vi.advanceTimersByTimeAsync(15_000); + await vi.advanceTimersByTimeAsync(15_000); + await rejection; + expect(tauriMocks.ensureDesktopService).toHaveBeenCalledTimes(2); + expect(adapterMocks.failDesktopServiceGate).toHaveBeenCalledWith(failure, 7); + vi.useRealTimers(); + }); + + it('keeps browser startup non-blocking while its health connection runs', async () => { + tauriMocks.isTauri.mockReturnValue(false); + adapterMocks.connect.mockReturnValue(new Promise(() => {})); + + const { armBootConnection } = await import('./boot-connect'); + + await expect(armBootConnection()).resolves.toBeUndefined(); + expect(adapterMocks.connect).toHaveBeenCalledOnce(); + expect(adapterMocks.armDesktopServiceGate).not.toHaveBeenCalled(); + }); +}); diff --git a/apps/web/src/boot-connect.ts b/apps/web/src/boot-connect.ts index f36019f..cdaab78 100644 --- a/apps/web/src/boot-connect.ts +++ b/apps/web/src/boot-connect.ts @@ -1,18 +1,138 @@ /** - * UX Refactor v2.1 P1b (D3) — boot connect kickoff. - * - * MUST stay main.tsx's FIRST import: ES-module import hoisting evaluates this - * module before any sibling, so the adapter's connect attempt is in flight - * before any component module could possibly issue a request — that is what - * arms the adapter's ensureReady() deferral gate for the entire boot burst - * (ServiceProvider's effect runs LAST among mount effects because it is the - * outermost provider; without this kickoff every child mount fetch would fire - * token-less first). - * - * Errors are swallowed here: ServiceProvider owns retry/backoff and the - * user-facing connection state, and a settled-failed attempt releases (then - * re-arms) the gate rather than wedging it. + * Arms backend connectivity before the React application graph is imported. + * Browser development keeps the existing fixed-URL behavior. Tauri builds + * accept only the endpoint that the Rust shell has verified belongs to its + * current managed sidecar generation. */ import { adapter } from './lib/adapter'; +import { + ensureDesktopService, + isTauri, + listenDesktopServiceLifecycle, + type DesktopServiceEndpoint, +} from './lib/tauri-bindings'; -adapter.connect().catch(() => { /* ServiceProvider surfaces connection state */ }); +let bootPromise: Promise | null = null; +const RECOVERY_RETRY_DELAY_MS = 15_000; +const MAX_ACTIVE_RECOVERY_ATTEMPTS = 1; + +export function armBootConnection(): Promise { + if (bootPromise) return bootPromise; + bootPromise = startBootConnection(); + return bootPromise; +} + +function startBootConnection(): Promise { + if (!isTauri()) { + void adapter.connect().catch(() => { + /* ServiceProvider surfaces browser connection state. */ + }); + return Promise.resolve(); + } + + return new Promise((resolveBoot, rejectBoot) => { + let bootSettled = false; + let activeGateId = adapter.armDesktopServiceGate(); + let bindingKey: string | null = null; + let bindingPromise: Promise | null = null; + let pendingFailure: { gateId: number; timer: ReturnType } | null = null; + let activeRecoveryAttempts = 0; + + const cancelPendingFailure = (gateId?: number) => { + if (!pendingFailure || (gateId !== undefined && pendingFailure.gateId !== gateId)) return; + clearTimeout(pendingFailure.timer); + pendingFailure = null; + }; + + const failActiveGate = (error: unknown, gateId: number) => { + if (gateId !== activeGateId) return; + cancelPendingFailure(gateId); + const failure = error instanceof Error ? error : new Error(String(error)); + bindingKey = null; + bindingPromise = null; + adapter.failDesktopServiceGate(failure, gateId); + if (!bootSettled) { + bootSettled = true; + rejectBoot(failure); + } + }; + function deferOperationalFailure(error: unknown, gateId: number) { + if (gateId !== activeGateId || bootSettled) return; + cancelPendingFailure(); + const failure = error instanceof Error ? error : new Error(String(error)); + const timer = setTimeout(() => { + if (pendingFailure?.gateId !== gateId) return; + pendingFailure = null; + if (activeRecoveryAttempts < MAX_ACTIVE_RECOVERY_ATTEMPTS) { + activeRecoveryAttempts += 1; + const recoveryGateId = restartGate(false); + void ensureActiveGate(recoveryGateId); + return; + } + failActiveGate(failure, gateId); + }, RECOVERY_RETRY_DELAY_MS); + pendingFailure = { gateId, timer }; + } + function restartGate(resetRecoveryAttempts = true): number { + cancelPendingFailure(); + bindingKey = null; + bindingPromise = null; + if (resetRecoveryAttempts) activeRecoveryAttempts = 0; + activeGateId = adapter.armDesktopServiceGate(); + return activeGateId; + } + function bindEndpoint(endpoint: DesktopServiceEndpoint, gateId: number): Promise { + if (gateId !== activeGateId) return Promise.resolve(); + cancelPendingFailure(gateId); + const key = `${gateId}:${endpoint.port}:${endpoint.instanceId}`; + if (bindingKey === key && bindingPromise) return bindingPromise; + bindingKey = key; + bindingPromise = adapter.connectDesktopService(endpoint, gateId) + .then(() => { + if (gateId !== activeGateId || bindingKey !== key) return; + cancelPendingFailure(gateId); + if (bootSettled) return; + bootSettled = true; + resolveBoot(); + }) + .catch((error) => { + if (gateId === activeGateId && bindingKey === key) { + bindingKey = null; + bindingPromise = null; + deferOperationalFailure(error, gateId); + } + }); + return bindingPromise; + } + async function ensureActiveGate(gateId: number): Promise { + try { + const endpoint = await ensureDesktopService(); + if (gateId === activeGateId) await bindEndpoint(endpoint, gateId); + } catch (error) { + deferOperationalFailure(error, gateId); + } + } + + void (async () => { + try { + await listenDesktopServiceLifecycle((event) => { + if (event.status === 'restarting') { + restartGate(); + } else if (event.status === 'ready') { + void bindEndpoint(event.endpoint, activeGateId); + } else { + failActiveGate( + new Error(event.error ?? 'The managed desktop service failed'), + activeGateId, + ); + } + }); + } catch (error) { + failActiveGate(error, activeGateId); + return; + } + + await ensureActiveGate(activeGateId); + })(); + }); +} diff --git a/apps/web/src/components/os/ChatHost.tsx b/apps/web/src/components/os/ChatHost.tsx index 0f34cc4..d39260f 100644 --- a/apps/web/src/components/os/ChatHost.tsx +++ b/apps/web/src/components/os/ChatHost.tsx @@ -128,6 +128,7 @@ const ChatHostInstance = ({ workspaceId }: { workspaceId: string }) => { templateId={ws?.templateId} storageType={ws?.storageType} initialPersona={personaId} + initialModel={ws?.model} initialMessage={seed?.initialMessage} autoSendInitial={seed?.autoSend ?? false} onPersonaChange={setPersona} diff --git a/apps/web/src/components/os/ModelPilotCard.test.tsx b/apps/web/src/components/os/ModelPilotCard.test.tsx index ee124cd..953138b 100644 --- a/apps/web/src/components/os/ModelPilotCard.test.tsx +++ b/apps/web/src/components/os/ModelPilotCard.test.tsx @@ -40,6 +40,8 @@ describe('ModelPilotCard', () => { const threshold = screen.getByRole('slider', { name: /budget saver activation threshold/i }); expect(threshold).toHaveAttribute('name', 'budgetThreshold'); + expect(threshold).toHaveAttribute('min', '0.5'); + expect(threshold).toHaveAttribute('max', '0.95'); expect(threshold.className).toContain('focus-visible:ring-2'); fireEvent.change(threshold, { target: { value: '0.75' } }); diff --git a/apps/web/src/components/os/ModelPilotCard.tsx b/apps/web/src/components/os/ModelPilotCard.tsx index cab31dd..91fce20 100644 --- a/apps/web/src/components/os/ModelPilotCard.tsx +++ b/apps/web/src/components/os/ModelPilotCard.tsx @@ -459,17 +459,17 @@ const ModelPilotCard = ({ aria-label="Budget saver activation threshold" name="budgetThreshold" type="range" - min={0.1} - max={1.0} + min={0.5} + max={0.95} step={0.05} value={budgetThreshold} onChange={(e) => onUpdate({ budgetThreshold: parseFloat(e.target.value) })} className="w-full h-1.5 rounded-full appearance-none bg-muted/50 accent-[var(--honey)] cursor-pointer focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background" />
- 10% 50% - 100% + 75% + 95%
)} diff --git a/apps/web/src/components/os/apps/ChatApp.tsx b/apps/web/src/components/os/apps/ChatApp.tsx index 2826b12..b196267 100644 --- a/apps/web/src/components/os/apps/ChatApp.tsx +++ b/apps/web/src/components/os/apps/ChatApp.tsx @@ -597,6 +597,16 @@ const ChatApp = ({ const followingRef = useRef(true); useEffect(() => { followingRef.current = following; }, [following]); const inputRef = useRef(null); + const composerEditRevisionRef = useRef(0); + const sendSubmissionRef = useRef(0); + const composerThreadKey = `${workspaceId ?? ''}\u0000${activeSessionId ?? ''}`; + const composerThreadKeyRef = useRef(composerThreadKey); + composerThreadKeyRef.current = composerThreadKey; + const starterTimeoutRef = useRef | null>(null); + useEffect(() => () => { + if (starterTimeoutRef.current) clearTimeout(starterTimeoutRef.current); + starterTimeoutRef.current = null; + }, [composerThreadKey]); const fileInputRef = useRef(null); const personaPickerRef = useRef(null); const modelPickerRef = useRef(null); @@ -625,6 +635,13 @@ const ChatApp = ({ if (!last || last.role !== 'assistant' || !last.content) return []; return extractSuggestedActions(last.content); }, [messages, isLoading]); + const persistedMessageIndices = useMemo(() => { + let persistedIndex = -1; + return messages.map(message => { + if (!message.draft && !message.queued) persistedIndex += 1; + return persistedIndex; + }); + }, [messages]); // B3: the latest completed file-write becomes the work-canvas doc; auto-open // the canvas when a NEW artifact appears (the user can close it; reopening is @@ -807,6 +824,37 @@ const ChatApp = ({ prevCanSendRef.current = canSend; }, [canSend]); + const submitComposerMessage = useCallback((content: string, restoreText = content) => { + const submission = ++sendSubmissionRef.current; + const editRevision = composerEditRevisionRef.current; + const threadKey = composerThreadKeyRef.current; + const restoreRejected = () => { + if ( + sendSubmissionRef.current === submission + && composerEditRevisionRef.current === editRevision + && composerThreadKeyRef.current === threadKey + ) { + setInput(current => current || restoreText); + } + }; + + setInput(''); + setShowSlash(false); + try { + const sendResult = onSendMessage(content); + if (sendResult) { + void sendResult.then( + accepted => { + if (accepted === false) restoreRejected(); + }, + restoreRejected, + ); + } + } catch { + restoreRejected(); + } + }, [onSendMessage]); + // F2: mount-once auto-send of the wizard's first task. This fires exactly once, // after the session has landed and history has been fetched (so the optimistic // turn isn't clobbered by the history replace). Once consumed, the untouched @@ -820,12 +868,14 @@ const ChatApp = ({ })) return; const text = (initialMessage as string).trim(); autoSentRef.current = true; // consume BEFORE dispatch: StrictMode/effect-rerun safe - if (inputUnchanged) setInput(''); - void Promise.resolve(onSendMessage(text)).then((ok) => { - // If the send failed, restore the untouched seed so the user can retry. - if (ok === false && inputUnchanged) setInput(prev => (prev === '' ? text : prev)); - }); - }, [autoSendInitial, initialMessage, activeSessionId, historyLoaded, onSendMessage]); + submitComposerMessage(text); + }, [ + autoSendInitial, + initialMessage, + activeSessionId, + historyLoaded, + submitComposerMessage, + ]); // Router arc P1-B (B2): composer "Best fit" — POST the composer text to // /api/route-proposals and inject the proposal as a LOCAL route_proposal @@ -907,20 +957,15 @@ const ChatApp = ({ if (text === '/models') { // Show available models as a local message const models = availableModels?.join(', ') || 'No models loaded'; - onSendMessage(`Available models: ${models}`); - setInput(''); + submitComposerMessage(`Available models: ${models}`, text); return; } if (text === '/cost') { - onSendMessage('/cost'); - setInput(''); - setShowSlash(false); + submitComposerMessage('/cost', text); return; } - onSendMessage(text); - setInput(''); - setShowSlash(false); + submitComposerMessage(text); }; const handleKeyDown = (e: React.KeyboardEvent) => { @@ -954,6 +999,7 @@ const ChatApp = ({ const handleInputChange = (e: React.ChangeEvent) => { const val = e.target.value; + composerEditRevisionRef.current += 1; setInput(val); if (val.startsWith('/')) { setShowSlash(true); @@ -1098,12 +1144,20 @@ const ChatApp = ({ // the first turn is a single click. Pre-filling the input first // gives the user a visible "this is what's about to ship" beat; // editing the input within the 1s cancels the auto-send. + composerEditRevisionRef.current += 1; + const editRevision = composerEditRevisionRef.current; + const threadKey = composerThreadKeyRef.current; setInput(msg); inputRef.current?.focus(); - setTimeout(() => { - if (inputRef.current?.value === msg) { - onSendMessage(msg); - setInput(''); + if (starterTimeoutRef.current) clearTimeout(starterTimeoutRef.current); + starterTimeoutRef.current = setTimeout(() => { + starterTimeoutRef.current = null; + if ( + composerThreadKeyRef.current === threadKey + && composerEditRevisionRef.current === editRevision + && inputRef.current?.value === msg + ) { + submitComposerMessage(msg); } }, 1000); }} @@ -1112,6 +1166,7 @@ const ChatApp = ({ // their starter strings end with ": " — the user must finish // the sentence before sending. Cursor lands at end-of-input // so they can type immediately. + composerEditRevisionRef.current += 1; setInput(msg); inputRef.current?.focus(); // Move caret to end so typing appends instead of replacing. @@ -1141,7 +1196,10 @@ const ChatApp = ({

Your memory and agents live inside a workspace

)} - {messages.map((msg, msgIdx) => ( + {messages.map((msg, msgIdx) => { + const messagePersona = msg.persona ? getPersonaById(msg.persona) : undefined; + const persistedMessageIndex = persistedMessageIndices[msgIdx]; + return (
{ if (onContextRail && msg.content) { @@ -1165,12 +1223,12 @@ const ChatApp = ({ : '' }`} > - {/* I1 fix 2: the active persona's bee sprite on every assistant - turn (22 unique mascots); unknown/custom personas fall back - to the letter/Bot mark below. */} - {persona && } + {/* The authoring persona is immutable message provenance. A + later persona switch must never relabel an earlier turn; + legacy/unknown messages fall back to the Bot mark. */} + {messagePersona && } - {persona ? persona.name[0] : )} @@ -1184,8 +1242,13 @@ const ChatApp = ({ {msg.role === 'assistant' && (
Waggle - {persona?.name && · {persona.name}} - {currentModel && · {formatModelLabel(currentModel)}} + {messagePersona?.name && · {messagePersona.name}} + {msg.model && · {formatModelLabel(msg.model)}} + {msg.draft && ( + + · {msg.draft.status === 'stopped' ? 'Stopped draft' : 'Draft'} · not saved + + )}
)}
- {msg.role === 'assistant' && msg.blocks && msg.blocks.length > 0 ? ( + {msg.role === 'assistant' && msg.draft?.content ? ( +
+ +
+ ) : msg.role === 'assistant' && msg.blocks && msg.blocks.length > 0 ? ( + ) : msg.role === 'assistant' ? ( + ) : ( - {msg.content} + + {msg.content} + )} {/* Copy button — assistant turns get Copy in the hover action row below (round-6 fix 2), so this overlay stays for user/ @@ -1262,7 +1346,7 @@ const ChatApp = ({ {msg.role === 'assistant' && msg.content && (
- ))} + ); + })} {/* Router arc B2: locally injected route proposals (composer Best fit). */} {routeProposals.map(rp => ( diff --git a/apps/web/src/components/os/apps/ChatWindowInstance.model-refresh.test.tsx b/apps/web/src/components/os/apps/ChatWindowInstance.model-refresh.test.tsx index 45ed43f..f42bf97 100644 --- a/apps/web/src/components/os/apps/ChatWindowInstance.model-refresh.test.tsx +++ b/apps/web/src/components/os/apps/ChatWindowInstance.model-refresh.test.tsx @@ -1,4 +1,4 @@ -import { act, cleanup, render, screen, waitFor } from '@testing-library/react'; +import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'; import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; const mocks = vi.hoisted(() => ({ @@ -6,8 +6,9 @@ const mocks = vi.hoisted(() => ({ getModel: vi.fn(), getSettings: vi.fn(), getTeamMembers: vi.fn(), - setModel: vi.fn(), patchWorkspace: vi.fn(), + useChat: vi.fn(), + toast: vi.fn(), })); vi.mock('@/lib/adapter', () => ({ adapter: mocks })); @@ -20,7 +21,25 @@ vi.mock('@/hooks/useSessions', () => ({ }), })); vi.mock('@/hooks/useChat', () => ({ - useChat: () => ({ + useChat: mocks.useChat, +})); +vi.mock('@/hooks/use-toast', () => ({ useToast: () => ({ toast: mocks.toast }) })); +vi.mock('./ChatApp', () => ({ + default: ({ availableModels, currentModel, onModelChange }: { + availableModels: string[]; + currentModel: string; + onModelChange: (model: string) => void; + }) => ( +
+
{availableModels.join(',')}
+
{currentModel || 'auto'}
+ + +
+ ), +})); + +const chatState = { messages: [], isLoading: false, historyLoaded: true, @@ -30,14 +49,7 @@ vi.mock('@/hooks/useChat', () => ({ clearHistory: vi.fn(), pendingApproval: null, approveAction: vi.fn(), - }), -})); -vi.mock('@/hooks/use-toast', () => ({ useToast: () => ({ toast: vi.fn() }) })); -vi.mock('./ChatApp', () => ({ - default: ({ availableModels }: { availableModels: string[] }) => ( -
{availableModels.join(',')}
- ), -})); +}; import ChatWindowInstance from './ChatWindowInstance'; @@ -48,8 +60,8 @@ beforeEach(() => { mocks.getModel.mockResolvedValue('openai/existing-model'); mocks.getSettings.mockResolvedValue({}); mocks.getTeamMembers.mockResolvedValue([]); - mocks.setModel.mockResolvedValue(undefined); mocks.patchWorkspace.mockResolvedValue(undefined); + mocks.useChat.mockReturnValue(chatState); }); afterEach(() => { @@ -70,4 +82,60 @@ describe('ChatWindowInstance model catalog refresh', () => { .toHaveTextContent('openai/model-released-while-open')); expect(mocks.getModels).toHaveBeenCalledTimes(2); }); + + it('passes the workspace model into chat and ignores a stale startup result after a user choice', async () => { + let resolveStartup!: (model: string) => void; + mocks.getModel.mockReturnValueOnce(new Promise((resolve) => { resolveStartup = resolve; })); + + render(); + fireEvent.click(screen.getByRole('button', { name: 'Select B' })); + expect(screen.getByTestId('current-model')).toHaveTextContent('openai/model-b'); + + await act(async () => { resolveStartup('openai/stale-startup-model'); }); + await waitFor(() => expect(mocks.patchWorkspace) + .toHaveBeenCalledWith('workspace-1', { model: 'openai/model-b' })); + expect(screen.getByTestId('current-model')).toHaveTextContent('openai/model-b'); + expect(mocks.useChat.mock.calls.at(-1)?.[0]).toMatchObject({ model: 'openai/model-b' }); + }); + + it('reverts a failed latest selection to the last confirmed workspace model', async () => { + mocks.patchWorkspace.mockRejectedValueOnce(new Error('offline')); + + render(); + fireEvent.click(screen.getByRole('button', { name: 'Select B' })); + + await waitFor(() => expect(screen.getByTestId('current-model')).toHaveTextContent('openai/model-a')); + expect(mocks.toast).toHaveBeenCalledWith(expect.objectContaining({ + title: 'Model change failed', + variant: 'destructive', + })); + expect(mocks.getModel).not.toHaveBeenCalled(); + }); + + it('serializes rapid changes and reverts the latest failure to the last successful choice', async () => { + let resolveB!: () => void; + const persistB = new Promise((resolve) => { resolveB = resolve; }); + mocks.patchWorkspace + .mockReturnValueOnce(persistB) + .mockRejectedValueOnce(new Error('second write failed')); + + render(); + await act(async () => { + fireEvent.click(screen.getByRole('button', { name: 'Select B' })); + await Promise.resolve(); + }); + expect(mocks.patchWorkspace).toHaveBeenCalledTimes(1); + await act(async () => { + fireEvent.click(screen.getByRole('button', { name: 'Select C' })); + await Promise.resolve(); + }); + expect(mocks.patchWorkspace).toHaveBeenCalledTimes(1); + await act(async () => { resolveB(); }); + await waitFor(() => expect(mocks.patchWorkspace).toHaveBeenCalledTimes(2)); + expect(mocks.patchWorkspace.mock.calls).toEqual([ + ['workspace-1', { model: 'openai/model-b' }], + ['workspace-1', { model: 'openai/model-c' }], + ]); + await waitFor(() => expect(screen.getByTestId('current-model')).toHaveTextContent('openai/model-b')); + }); }); diff --git a/apps/web/src/components/os/apps/ChatWindowInstance.tsx b/apps/web/src/components/os/apps/ChatWindowInstance.tsx index 6273579..2a9a83e 100644 --- a/apps/web/src/components/os/apps/ChatWindowInstance.tsx +++ b/apps/web/src/components/os/apps/ChatWindowInstance.tsx @@ -1,4 +1,4 @@ -import { useState, useEffect } from 'react'; +import { useState, useEffect, useRef } from 'react'; import { useChat } from '@/hooks/useChat'; import { useSessions } from '@/hooks/useSessions'; import { useToast } from '@/hooks/use-toast'; @@ -13,6 +13,8 @@ interface ChatWindowInstanceProps { workspaceId: string; workspaceName?: string; initialPersona?: string; + /** Workspace-scoped model already loaded by the shell. */ + initialModel?: string; /** QW-1: starter prompt prefilled into the chat input once on first mount. */ initialMessage?: string; /** F2: auto-send the initialMessage once the chat is ready (wizard "Let's go"). */ @@ -39,6 +41,7 @@ const ChatWindowInstance = ({ workspaceId, workspaceName, initialPersona, + initialModel, initialMessage, autoSendInitial = false, templateId, @@ -61,6 +64,26 @@ const ChatWindowInstance = ({ const { sessions, activeSessionId, setActiveSessionId, createSession } = useSessions(workspaceId); + const [currentModel, setCurrentModel] = useState(initialModel ?? ''); + const currentModelRef = useRef(initialModel ?? ''); + const confirmedModelRef = useRef(initialModel ?? ''); + const initialModelRef = useRef(initialModel); + const modelRevisionRef = useRef(0); + const userSelectedModelRef = useRef(false); + const modelPersistenceRef = useRef>(Promise.resolve()); + + // The shell may finish loading the workspace after this kept-alive chat + // mounts. Accept that workspace-scoped model until the user makes an + // explicit per-window choice; a late shell refresh must not overwrite it. + useEffect(() => { + initialModelRef.current = initialModel; + if (!initialModel || userSelectedModelRef.current) return; + modelRevisionRef.current += 1; + currentModelRef.current = initialModel; + confirmedModelRef.current = initialModel; + setCurrentModel(initialModel); + }, [initialModel]); + // chat-session-uuid-title (P2): the server returns a real title derived from the // first user message, or null for a brand-new untitled session. Render a friendly // placeholder instead of the raw `session-` id — covering both null/empty @@ -76,10 +99,10 @@ const ChatWindowInstance = ({ workspaceId, sessionId: activeSessionId, persona: currentPersona, + model: currentModel, autonomy: { level: autonomyLevel, expiresAt: autonomyExpiresAt }, }); - const [currentModel, setCurrentModel] = useState(''); const [availableModels, setAvailableModels] = useState([]); const [teamPresence, setTeamPresence] = useState([]); @@ -127,19 +150,34 @@ const ChatWindowInstance = ({ // Try fetching the current active model from the sidecar. Also retries on // transient failure — the initial render may race the sidecar spawning. const fetchCurrentModel = async () => { + if (initialModelRef.current || userSelectedModelRef.current) { + currentLanded = true; + return; + } + const loadRevision = modelRevisionRef.current; try { const model = await adapter.getModel(); - if (cancelled) return; + if (cancelled || userSelectedModelRef.current || loadRevision !== modelRevisionRef.current) { + currentLanded = true; + return; + } if (typeof model === 'string' && model) { + currentModelRef.current = model; + confirmedModelRef.current = model; setCurrentModel(model); currentLanded = true; return; } const settings = await adapter.getSettings(); - if (cancelled) return; + if (cancelled || userSelectedModelRef.current || loadRevision !== modelRevisionRef.current) { + currentLanded = true; + return; + } const fromSettings = (settings as { defaultModel?: string; model?: string }).defaultModel ?? (settings as { model?: string }).model; if (fromSettings) { + currentModelRef.current = fromSettings; + confirmedModelRef.current = fromSettings; setCurrentModel(fromSettings); currentLanded = true; } @@ -188,11 +226,38 @@ const ChatWindowInstance = ({ }, []); const handleModelChange = (model: string) => { + if (!model || model === currentModelRef.current) return; + userSelectedModelRef.current = true; + const revision = ++modelRevisionRef.current; + currentModelRef.current = model; setCurrentModel(model); - adapter.setModel(model).catch((err) => console.error('[ChatWindowInstance] set model failed:', err)); - adapter.patchWorkspace(workspaceId, { model }) - .then(() => toast({ title: 'Model updated', description: `Now using ${formatModelLabel(model)}` })) - .catch(() => toast({ title: 'Model updated locally', description: 'Backend offline — will sync when connected', variant: 'destructive' })); + // Serialize workspace writes so two rapid clicks cannot resolve out of + // order. The request itself already carries `model`, so the optimistic + // selection is safe for an immediate Send while persistence completes. + modelPersistenceRef.current = modelPersistenceRef.current + .catch(() => undefined) + .then(async () => { + try { + await adapter.patchWorkspace(workspaceId, { model }); + confirmedModelRef.current = model; + if (revision === modelRevisionRef.current) { + toast({ title: 'Model updated', description: `Now using ${formatModelLabel(model)}` }); + } + } catch (err) { + console.error('[ChatWindowInstance] persist model failed:', err); + if (revision !== modelRevisionRef.current) return; + const confirmedModel = confirmedModelRef.current; + currentModelRef.current = confirmedModel; + setCurrentModel(confirmedModel); + toast({ + title: 'Model change failed', + description: confirmedModel + ? `Still using ${formatModelLabel(confirmedModel)}` + : 'The previous model remains active.', + variant: 'destructive', + }); + } + }); }; return ( diff --git a/apps/web/src/components/os/apps/ConnectorsApp.tsx b/apps/web/src/components/os/apps/ConnectorsApp.tsx index e622d83..695abce 100644 --- a/apps/web/src/components/os/apps/ConnectorsApp.tsx +++ b/apps/web/src/components/os/apps/ConnectorsApp.tsx @@ -79,7 +79,7 @@ const SETUP_HINTS: Record = { }; /** - * The token/email inputs are a single shared state reused across every + * The credential inputs are a single shared state reused across every * connector row. They must be cleared whenever the expanded connector * changes (but NOT when re-collapsing the same one) so a credential typed * for connector A can never be submitted to connector B. Pure so it can be @@ -118,6 +118,7 @@ const ConnectorsApp = ({ personaId }: ConnectorsAppProps = {}) => { const [expanded, setExpanded] = useState(null); const [tokenInput, setTokenInput] = useState(''); const [emailInput, setEmailInput] = useState(''); + const [instanceUrlInput, setInstanceUrlInput] = useState(''); const [connecting, setConnecting] = useState(false); const [error, setError] = useState(null); const [revokeTarget, setRevokeTarget] = useState(null); @@ -126,12 +127,14 @@ const ConnectorsApp = ({ personaId }: ConnectorsAppProps = {}) => { const { toast } = useToast(); // Expand a connector (or collapse when re-clicking the open one). Resets the - // token/email inputs whenever the target connector changes (R4-007). + // credential inputs whenever the target connector changes (R4-007). const selectConnector = (id: string | null) => { + if (connecting) return; setExpanded(prev => { if (shouldResetCredentialInputs(prev, id)) { setTokenInput(''); setEmailInput(''); + setInstanceUrlInput(''); } return id; }); @@ -162,13 +165,17 @@ const ConnectorsApp = ({ personaId }: ConnectorsAppProps = {}) => { if (!tokenInput.trim()) return; setConnecting(true); try { - if (emailInput) { - await adapter.addVaultSecret({ key: `connector:${id}:email`, value: emailInput }); - } - await adapter.addVaultSecret({ key: `connector:${id}`, value: tokenInput, type: 'bearer' }); - await adapter.connectConnector(id); + await adapter.connectConnector(id, { + token: tokenInput.trim(), + ...(id === 'jira' ? { + email: emailInput.trim(), + baseUrl: instanceUrlInput.trim(), + } : {}), + ...(id === 'salesforce' ? { instanceUrl: instanceUrlInput.trim() } : {}), + }); setTokenInput(''); setEmailInput(''); + setInstanceUrlInput(''); setExpanded(null); await loadConnectors(); } catch (err) { @@ -277,8 +284,10 @@ const ConnectorsApp = ({ personaId }: ConnectorsAppProps = {}) => { onToggle={() => selectConnector(expanded === conn.id ? null : conn.id)} tokenInput={tokenInput} emailInput={emailInput} + instanceUrlInput={instanceUrlInput} onTokenChange={setTokenInput} onEmailChange={setEmailInput} + onInstanceUrlChange={setInstanceUrlInput} connecting={connecting} onConnect={() => void handleConnect(conn.id)} onDisconnect={() => void handleDisconnect(conn.id)} @@ -366,7 +375,8 @@ const ConnectorsApp = ({ personaId }: ConnectorsAppProps = {}) => {

diff --git a/apps/web/src/components/os/apps/LauncherApp.test.tsx b/apps/web/src/components/os/apps/LauncherApp.test.tsx index 29da14d..1ad4e7f 100644 --- a/apps/web/src/components/os/apps/LauncherApp.test.tsx +++ b/apps/web/src/components/os/apps/LauncherApp.test.tsx @@ -266,13 +266,16 @@ describe('LauncherApp · captured tasks', () => { expect(onOpenRoom).toHaveBeenCalledWith('room-multi'); }); - it('does not offer a captured task for a GUI-only tool', async () => { + it('labels a roadmap tool and offers no launch, task, or hook actions', async () => { mocks.adapter.detectTools.mockResolvedValue({ platform: 'darwin', detectedAt: '2026-07-11T00:00:00.000Z', tools: [{ - id: 'cursor', - displayName: 'Cursor', + id: 'cursor', + displayName: 'Cursor', + releaseStatus: 'roadmap', + launchable: false, + hookCapable: false, installed: true, installedPath: '/Applications/Cursor.app', version: '1.0.0', @@ -291,9 +294,96 @@ describe('LauncherApp · captured tasks', () => { render(); - expect(await screen.findByText('Cursor')).toBeInTheDocument(); - expect(screen.getByRole('button', { name: /^launch$/i })).toBeInTheDocument(); - expect(screen.queryByRole('button', { name: /run task/i })).not.toBeInTheDocument(); + const card = await screen.findByTestId('launcher-tool-cursor'); + expect(within(card).getByText('Roadmap')).toBeInTheDocument(); + expect(within(card).getByText(/detection retained for compatibility/i)).toBeInTheDocument(); + expect(within(card).queryByText('Detect only')).not.toBeInTheDocument(); + expect(within(card).queryByText('Hooks active')).not.toBeInTheDocument(); + expect(within(card).queryByRole('button', { name: /^launch$/i })).not.toBeInTheDocument(); + expect(within(card).queryByRole('button', { name: /run task/i })).not.toBeInTheDocument(); + expect(within(card).queryByRole('button', { name: /install hooks/i })).not.toBeInTheDocument(); + }); + + it('launches Hermes Desktop but excludes it and a broken CLI from captured teams', async () => { + mocks.adapter.detectTools.mockResolvedValue({ + platform: 'win32', + detectedAt: '2026-07-17T00:00:00.000Z', + tools: [ + { + id: 'codex', + displayName: 'Codex CLI', + installed: true, + installedPath: 'C:\\tools\\codex.exe', + version: '0.144.1', + hooksInstalled: true, + hookPointerPath: 'C:\\Users\\test\\.codex\\hooks.json', + launchable: true, + capabilities: { + interactiveLaunch: true, + headlessTask: true, + structuredProgress: true, + resumable: true, + liveWaggleDance: false, + }, + permissionModes: ['read-only', 'workspace-write', 'native'], + }, + { + id: 'hermes', + displayName: 'Hermes Agent CLI', + installed: true, + installedPath: 'C:\\Users\\test\\AppData\\Local\\hermes\\bin\\hermes.cmd', + version: null, + hooksInstalled: false, + hookPointerPath: null, + launchable: false, + diagnostic: 'Hermes failed its --version health check.', + capabilities: { + interactiveLaunch: true, + headlessTask: true, + structuredProgress: false, + resumable: true, + liveWaggleDance: false, + }, + permissionModes: ['native'], + }, + { + id: 'hermes-desktop', + displayName: 'Hermes Desktop', + installed: true, + installedPath: 'C:\\Users\\test\\AppData\\Local\\hermes\\Hermes.exe', + version: null, + hooksInstalled: false, + hookPointerPath: null, + launchable: true, + hookCapable: false, + capabilities: { + interactiveLaunch: true, + headlessTask: false, + structuredProgress: false, + resumable: false, + liveWaggleDance: false, + }, + permissionModes: [], + }, + ], + }); + + render(); + + const desktopCard = await screen.findByTestId('launcher-tool-hermes-desktop'); + expect(within(desktopCard).getByRole('button', { name: /^launch$/i })).toBeInTheDocument(); + expect(within(desktopCard).queryByRole('button', { name: /run task/i })).not.toBeInTheDocument(); + expect(within(desktopCard).queryByRole('button', { name: /install hooks/i })).not.toBeInTheDocument(); + expect(within(desktopCard).getByText(/launch only/i)).toBeInTheDocument(); + + const cliCard = screen.getByTestId('launcher-tool-hermes'); + expect(within(cliCard).queryByRole('button', { name: /^launch$/i })).not.toBeInTheDocument(); + expect(within(cliCard).queryByRole('button', { name: /run task/i })).not.toBeInTheDocument(); + expect(within(cliCard).getByText(/failed its --version health check/i)).toBeInTheDocument(); + + fireEvent.click(within(screen.getByTestId('launcher-tool-codex')).getByRole('button', { name: /run task/i })); + expect(screen.queryByRole('checkbox', { name: 'Hermes Agent CLI' })).not.toBeInTheDocument(); + expect(screen.queryByRole('checkbox', { name: 'Hermes Desktop' })).not.toBeInTheDocument(); }); }); @@ -553,7 +643,7 @@ describe('LauncherApp · hook cohort (#3)', () => { expect(screen.queryByText('Install pointer')).not.toBeInTheDocument(); }); - it('explains that Claude Desktop is launch-only because hooks are not supported yet', async () => { + it('offers Claude Desktop launch and hook management from the shared manifest', async () => { mocks.adapter.detectTools.mockResolvedValue({ platform: 'darwin', detectedAt: '2026-07-08T00:00:00.000Z', @@ -574,9 +664,9 @@ describe('LauncherApp · hook cohort (#3)', () => { expect(await screen.findByText('Claude Desktop')).toBeInTheDocument(); expect(screen.getByRole('button', { name: /^launch$/i })).toBeInTheDocument(); - expect(screen.queryByRole('button', { name: /install hooks/i })).not.toBeInTheDocument(); - expect(screen.queryByRole('button', { name: /^verify$/i })).not.toBeInTheDocument(); - expect(screen.getByText(/launch only/i)).toBeInTheDocument(); - expect(screen.getByText(/hooks are not supported for Claude Desktop yet/i)).toBeInTheDocument(); + expect(screen.getByRole('button', { name: /install hooks/i })).toBeInTheDocument(); + expect(screen.getByRole('button', { name: /^verify$/i })).toBeInTheDocument(); + expect(screen.queryByText(/launch only/i)).not.toBeInTheDocument(); + expect(screen.queryByText(/hooks are not supported for Claude Desktop yet/i)).not.toBeInTheDocument(); }); }); diff --git a/apps/web/src/components/os/apps/LauncherApp.tsx b/apps/web/src/components/os/apps/LauncherApp.tsx index 9ed0672..4b0cbda 100644 --- a/apps/web/src/components/os/apps/LauncherApp.tsx +++ b/apps/web/src/components/os/apps/LauncherApp.tsx @@ -1,10 +1,10 @@ /** * AI-OS Phase 2B — LauncherApp. * - * Dock surface for the AI-OS tool launcher. Lists every supported - * AI tool — all 7 are launchable; 6 (all but claude-desktop) also - * support hook install/verify/uninstall — with detection status, - * hook-install status, and per-tool actions: + * Dock surface for the AI-OS tool launcher. Lists registered AI execution + * surfaces while keeping roadmap integrations visibly inert. Each card + * includes detection status, hook-install status, + * and its supported actions: * * Launch in workspace X / Install hooks / Verify hooks / Uninstall hooks * @@ -40,12 +40,13 @@ import { BUILTIN_TOOL_MANIFESTS, type ExternalToolAccess, type ToolCapabilities, + type ToolReleaseStatus, } from '@waggle/shared'; // #5 — derived from the shared manifest registry (single source of truth), // replacing the hand-maintained local copies. LAUNCH_COHORT = launchable tools; -// HOOKS_COHORT = tools whose hive-mind hook package ships a bin (hookCapable — -// claude-desktop is the only one excluded). Mirrors the backend cohorts, which +// HOOKS_COHORT = tools whose hive-mind hook package ships a bin (hookCapable). +// Hermes Desktop is intentionally excluded. Mirrors the backend cohorts, which // derive from the same BUILTIN_TOOL_MANIFESTS. const LAUNCH_COHORT = BUILTIN_TOOL_MANIFESTS.filter((m) => m.launchable).map((m) => m.id); const HOOKS_COHORT = BUILTIN_TOOL_MANIFESTS.filter((m) => m.hookCapable).map((m) => m.id); @@ -53,6 +54,7 @@ const HOOKS_COHORT = BUILTIN_TOOL_MANIFESTS.filter((m) => m.hookCapable).map((m) interface DetectedTool { id: string; displayName: string; + releaseStatus?: ToolReleaseStatus; launchable?: boolean; hookCapable?: boolean; builtin?: boolean; @@ -116,12 +118,15 @@ const HOOK_PATH_RE = /([A-Za-z]:\\[^\s]+|\/[^\s]+)/; const MAX_VISIBLE_HOOK_DETAILS = 6; const toolCanLaunch = (tool: DetectedTool): boolean => - tool.launchable ?? LAUNCH_COHORT.includes(tool.id); + tool.releaseStatus !== 'roadmap' + && (tool.launchable ?? LAUNCH_COHORT.includes(tool.id)); const launchUnavailableMessage = (tool: DetectedTool): string => - tool.installed && tool.diagnostic - ? 'Launch is blocked for this install. Follow the note above, then refresh.' - : 'Detection ready. This adapter is not configured for launch.'; + tool.releaseStatus === 'roadmap' + ? 'Roadmap integration. Detection retained for compatibility; launch, tasks, and hooks are deferred.' + : tool.installed && tool.diagnostic + ? 'Launch is blocked for this install. Follow the note above, then refresh.' + : 'Detection ready. This adapter is not configured for launch.'; const toolUsesInlinePrompt = (tool: DetectedTool): boolean => toolAcceptsInlinePrompt(tool.id) || tool.acceptsInlinePrompt === true; @@ -139,6 +144,7 @@ const defaultAccessForTool = (tool: DetectedTool): ExternalToolAccess | null => const toolCanRunCapturedTask = (tool: DetectedTool): boolean => tool.installed && + toolCanLaunch(tool) && tool.capabilities?.headlessTask === true && (tool.permissionModes?.length ?? 0) > 0; @@ -763,7 +769,7 @@ const LauncherApp = ({ activeWorkspaceId, workspaces = [], onOpenRoom }: Launche Not installed )} - {tool.hooksInstalled && ( + {tool.hooksInstalled && tool.releaseStatus !== 'roadmap' && ( Hooks active @@ -786,7 +792,11 @@ const LauncherApp = ({ activeWorkspaceId, workspaces = [], onOpenRoom }: Launche Running )} - {!launchable && ( + {tool.releaseStatus === 'roadmap' ? ( + + Roadmap + + ) : !launchable && ( Detect only @@ -906,8 +916,8 @@ const LauncherApp = ({ activeWorkspaceId, workspaces = [], onOpenRoom }: Launche
{launchOnly && (
- {tool.id === 'claude-desktop' - ? 'Hooks are not supported for Claude Desktop yet.' + {tool.id === 'hermes-desktop' + ? 'Hook management is not supported for Hermes Desktop.' : 'Hook management is not supported for this tool yet.'}
)} diff --git a/apps/web/src/components/os/apps/SettingsApp.tsx b/apps/web/src/components/os/apps/SettingsApp.tsx index ba7562e..2ce5eee 100644 --- a/apps/web/src/components/os/apps/SettingsApp.tsx +++ b/apps/web/src/components/os/apps/SettingsApp.tsx @@ -36,6 +36,7 @@ import EraseDataDialog from '@/components/os/overlays/EraseDataDialog'; import TelegramDigestCard from '@/components/os/settings/TelegramDigestCard'; import ChannelsSettings from '@/components/os/settings/ChannelsSettings'; import CoverageCompassCard from '@/components/os/settings/CoverageCompassCard'; +import BrowserCompanionSettings from '@/components/os/settings/BrowserCompanionSettings'; import { AVAILABLE_SHAPES, useSelectedShape, type PromptShape } from '@/lib/shape-selection'; import { SectionLabel } from '@/components/os/warm'; import { ApprovalModal, type ApprovalRequest } from '@/components/ui/approval-modal'; @@ -1110,6 +1111,7 @@ const SettingsApp = () => {

~/.waggle/

All workspaces, memory, vault, and config live here.

+

Show login briefing on each launch

diff --git a/apps/web/src/components/os/apps/UserProfileApp.tsx b/apps/web/src/components/os/apps/UserProfileApp.tsx index 33c4a05..2361a94 100644 --- a/apps/web/src/components/os/apps/UserProfileApp.tsx +++ b/apps/web/src/components/os/apps/UserProfileApp.tsx @@ -236,9 +236,9 @@ const UserProfileApp = () => { ].filter((f): f is KnownFact => Boolean(f)); return ( -
+
{/* Sidebar */} -
+
{tabs.map(t => ( ))} {profile?.questionnaireCompleted && ( -
+
Profile set up
@@ -260,7 +260,7 @@ const UserProfileApp = () => {
{/* Content */} -
+
{/* ═══ IDENTITY ═══ */} {tab === 'identity' && ( @@ -322,7 +322,7 @@ const UserProfileApp = () => {
)} -
+
setName(e.target.value)} placeholder="Marko Markovic" @@ -354,7 +354,7 @@ const UserProfileApp = () => { className="w-full bg-muted/50 border border-border/50 rounded-lg px-3 py-2 text-sm text-foreground resize-none focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background" />
-
+
- -
- )} -
- {phase === 'pending' && !showToken && ( + {phase === 'pending' && ( <> diff --git a/apps/web/src/components/os/model-gate/ModelGate.test.tsx b/apps/web/src/components/os/model-gate/ModelGate.test.tsx index f49ab48..6f6e18e 100644 --- a/apps/web/src/components/os/model-gate/ModelGate.test.tsx +++ b/apps/web/src/components/os/model-gate/ModelGate.test.tsx @@ -10,6 +10,8 @@ const mocks = vi.hoisted(() => ({ adapter: { getProviders: vi.fn(), getLocalInferenceStatus: vi.fn(), + getLocalInferenceModels: vi.fn(), + bootstrapLocalRuntime: vi.fn(), testApiKey: vi.fn(), setProviderKey: vi.fn(), restartModelRouter: vi.fn(), @@ -46,13 +48,44 @@ const providersResp = (...defs: { activeSearch: 'duckduckgo', }); -const noLocal = { servers: [], ollamaInstalled: false, totalLocalModels: 0 }; +const noLocal = { + servers: [{ type: 'ollama' }], + ollamaInstalled: true, + ollamaRunning: true, + totalLocalModels: 0, + offlineReady: false, + dockerRequired: false, + managedRuntime: { + source: 'waggle-managed', + supported: true, + installed: true, + running: true, + targetVersion: '0.32.0', + version: '0.32.0', + artifactSizeBytes: 1_503_047_573, + downloadRequired: false, + dockerRequired: false, + }, + setupRequired: true, + setupMessage: null, +}; beforeEach(() => { mocks.adapter.getProviders.mockResolvedValue( providersResp({ id: 'anthropic', hasKey: false }, { id: 'openai', hasKey: false }, { id: 'ollama', hasKey: false }), ); mocks.adapter.getLocalInferenceStatus.mockResolvedValue(noLocal); + mocks.adapter.getLocalInferenceModels.mockResolvedValue({ + source: 'native', + models: [{ name: 'qwen3:1.7b', fitLevel: 'perfect', estimatedTps: 32, runMode: 'gpu' }], + }); + mocks.adapter.bootstrapLocalRuntime.mockResolvedValue({ + ok: true, + installedNow: true, + startedNow: true, + endpoint: 'http://127.0.0.1:11434', + dockerRequired: false, + }); mocks.adapter.testApiKey.mockResolvedValue({ valid: true, verified: true }); mocks.adapter.setProviderKey.mockResolvedValue({ router: { managed: true, ready: true } }); mocks.adapter.restartModelRouter.mockResolvedValue({ @@ -62,7 +95,11 @@ beforeEach(() => { unavailableProviders: [], }); mocks.adapter.saveSettings.mockResolvedValue(undefined); - mocks.adapter.pullLocalModel.mockResolvedValue({ ok: true }); + mocks.adapter.pullLocalModel.mockResolvedValue({ + ok: true, + model: 'llama3.2:latest', + verifiedGeneration: true, + }); // F3: default probe = network-degrade neutral (valid, not verified) so the // key-presence tests keep their "You have a working model" wording. mocks.adapter.probeProvider.mockResolvedValue({ configured: true, valid: true, verified: false }); @@ -95,7 +132,7 @@ describe('ModelGate', () => { expect(key).toHaveAttribute('autocomplete', 'off'); fireEvent.click(screen.getByRole('tab', { name: /local model/i })); - const pull = await screen.findByLabelText(/pull a model/i); + const pull = await screen.findByLabelText(/download and verify a model/i); expect(pull).toHaveAttribute('name', 'modelPullName'); expect(pull).toHaveAttribute('autocomplete', 'off'); }); @@ -373,15 +410,82 @@ describe('ModelGate', () => { expect(mocks.adapter.probeProvider).toHaveBeenCalledWith('anthropic'); }); - it('the local tab pulls a model and fires onModelReady', async () => { + it('installs and starts Waggle’s managed runtime without Docker or a system Ollama install', async () => { + mocks.adapter.getLocalInferenceStatus + .mockResolvedValueOnce({ + ...noLocal, + servers: [], + ollamaInstalled: false, + ollamaRunning: false, + managedRuntime: { + ...noLocal.managedRuntime, + installed: false, + running: false, + version: null, + downloadRequired: true, + }, + }) + .mockResolvedValue(noLocal); + render(); + fireEvent.click(await screen.findByRole('tab', { name: /local model/i })); + + expect(await screen.findByText(/1\.4 GB/i)).toBeInTheDocument(); + expect(screen.getByText(/no Docker, administrator access, or system Ollama install required/i)).toBeInTheDocument(); + expect(screen.queryByText(/install Ollama to run models/i)).not.toBeInTheDocument(); + fireEvent.click(screen.getByRole('button', { name: /^install runtime$/i })); + + await waitFor(() => expect(mocks.adapter.bootstrapLocalRuntime).toHaveBeenCalledOnce()); + expect(await screen.findByText(/private runtime ready/i)).toBeInTheDocument(); + expect(await screen.findByLabelText(/download and verify a model/i)).toBeInTheDocument(); + }); + + it('does not offer a fake managed install on an unsupported platform', async () => { + mocks.adapter.getLocalInferenceStatus.mockResolvedValue({ + ...noLocal, + servers: [], + ollamaInstalled: false, + ollamaRunning: false, + managedRuntime: { + ...noLocal.managedRuntime, + supported: false, + installed: false, + running: false, + version: null, + downloadRequired: true, + reason: 'No managed Ollama artifact for linux/x64', + }, + }); + render(); + fireEvent.click(await screen.findByRole('tab', { name: /local model/i })); + + expect(await screen.findByText(/no managed Ollama artifact for linux\/x64/i)).toBeInTheDocument(); + expect(screen.queryByRole('button', { name: /install runtime/i })).not.toBeInTheDocument(); + }); + + it('downloads, generation-verifies, and selects the local model before reporting ready', async () => { const onModelReady = vi.fn(); render(); fireEvent.click(await screen.findByRole('tab', { name: /local model/i })); - const input = await screen.findByLabelText(/pull a model/i); + const input = await screen.findByLabelText(/download and verify a model/i); fireEvent.change(input, { target: { value: 'llama3.2' } }); - fireEvent.click(screen.getByRole('button', { name: /^pull$/i })); + fireEvent.click(screen.getByRole('button', { name: /^install model$/i })); await waitFor(() => expect(mocks.adapter.pullLocalModel).toHaveBeenCalledWith('llama3.2')); + expect(mocks.adapter.saveSettings).toHaveBeenCalledWith({ defaultModel: 'ollama/llama3.2:latest' }); + expect(await screen.findByText(/installed and verified "llama3\.2:latest"/i)).toBeInTheDocument(); expect(onModelReady).toHaveBeenCalled(); }); + + it('does not report ready when the verified model cannot be selected as default', async () => { + const onModelReady = vi.fn(); + mocks.adapter.saveSettings.mockRejectedValueOnce(new Error('settings unavailable')); + render(); + fireEvent.click(await screen.findByRole('tab', { name: /local model/i })); + const input = await screen.findByLabelText(/download and verify a model/i); + fireEvent.change(input, { target: { value: 'llama3.2' } }); + fireEvent.click(screen.getByRole('button', { name: /^install model$/i })); + + expect(await screen.findByRole('alert')).toHaveTextContent(/could not select it as the default/i); + expect(onModelReady).not.toHaveBeenCalled(); + }); }); diff --git a/apps/web/src/components/os/model-gate/ModelGate.tsx b/apps/web/src/components/os/model-gate/ModelGate.tsx index 1329129..afcc3fb 100644 --- a/apps/web/src/components/os/model-gate/ModelGate.tsx +++ b/apps/web/src/components/os/model-gate/ModelGate.tsx @@ -41,7 +41,32 @@ interface ModelGateProps { interface LocalStatus { servers: Array>; ollamaInstalled: boolean; + ollamaRunning?: boolean; totalLocalModels: number; + dockerRequired?: false; + managedRuntime?: { + supported: boolean; + installed: boolean; + running: boolean; + targetVersion: string | null; + version: string | null; + artifactSizeBytes: number | null; + downloadRequired: boolean; + dockerRequired: false; + reason?: string; + }; +} + +interface LocalModelRecommendation { + name: string; + fitLevel?: string; + estimatedTps?: number; + runMode?: string; +} + +function formatDownloadSize(bytes: number | null | undefined): string | null { + if (!bytes || bytes <= 0) return null; + return `${(bytes / (1024 ** 3)).toFixed(1)} GB`; } type ValidateState = @@ -98,6 +123,9 @@ export function ModelGate({ // Local models const [local, setLocal] = useState(null); + const [recommendedLocal, setRecommendedLocal] = useState(null); + const [bootstrapping, setBootstrapping] = useState(false); + const [runtimeMsg, setRuntimeMsg] = useState<{ kind: 'ok' | 'err'; text: string } | null>(null); const [pullName, setPullName] = useState(''); const [pulling, setPulling] = useState(false); const [pullMsg, setPullMsg] = useState<{ kind: 'ok' | 'err'; text: string } | null>(null); @@ -108,6 +136,26 @@ export function ModelGate({ } catch { setLocal({ servers: [], ollamaInstalled: false, totalLocalModels: 0 }); } + try { + const result = await adapter.getLocalInferenceModels('general'); + const candidate = result.models.find((model) => ( + typeof model.name === 'string' + && model.fitLevel !== 'too_tight' + && model.runMode !== 'no_fit' + )); + const recommendation: LocalModelRecommendation | null = candidate && typeof candidate.name === 'string' + ? { + name: candidate.name, + ...(typeof candidate.fitLevel === 'string' ? { fitLevel: candidate.fitLevel } : {}), + ...(typeof candidate.estimatedTps === 'number' ? { estimatedTps: candidate.estimatedTps } : {}), + ...(typeof candidate.runMode === 'string' ? { runMode: candidate.runMode } : {}), + } + : null; + setRecommendedLocal(recommendation ?? null); + if (recommendation?.name) setPullName((current) => current || recommendation.name); + } catch { + setRecommendedLocal(null); + } }, []); useEffect(() => { void refreshLocal(); }, [refreshLocal]); @@ -343,21 +391,55 @@ export function ModelGate({ setPullMsg(null); try { const res = await adapter.pullLocalModel(name); - if (res?.ok) { - setPullMsg({ kind: 'ok', text: `Pulled "${name}".` }); + if (res?.ok && res.verifiedGeneration) { + let selectedAsDefault = true; + try { + await adapter.saveSettings({ defaultModel: `ollama/${res.model}` }); + } catch { + selectedAsDefault = false; + } + setPullMsg({ + kind: selectedAsDefault ? 'ok' : 'err', + text: selectedAsDefault + ? `Installed and verified "${res.model}". It is now your default local model.` + : `Installed and verified "${res.model}", but Waggle could not select it as the default.`, + }); setPullName(''); await refreshLocal(); - onModelReady?.(); + if (selectedAsDefault) onModelReady?.(); } else { - setPullMsg({ kind: 'err', text: `Could not pull "${name}".` }); + setPullMsg({ kind: 'err', text: `Could not install and verify "${name}".` }); } - } catch { - setPullMsg({ kind: 'err', text: `Could not pull "${name}" — is Ollama running?` }); + } catch (error) { + setPullMsg({ + kind: 'err', + text: error instanceof Error ? error.message : `Could not install and verify "${name}".`, + }); } finally { setPulling(false); } }; + const handleBootstrap = async () => { + setBootstrapping(true); + setRuntimeMsg(null); + try { + await adapter.bootstrapLocalRuntime(); + await refreshLocal(); + setRuntimeMsg({ + kind: 'ok', + text: 'Private runtime ready. Download the recommended model to finish local setup.', + }); + } catch (error) { + setRuntimeMsg({ + kind: 'err', + text: error instanceof Error ? error.message : 'Could not install the private runtime.', + }); + } finally { + setBootstrapping(false); + } + }; + // Round-P provider selector: a real filled-tile grid (not a pill row). The // fill/glyph encode key state at a glance; failing = the live probe rejected // the stored key (same `probe.failedProvider` signal the old chip carried). @@ -672,42 +754,96 @@ export function ModelGate({ {tab === 'local' && (

- {local?.ollamaInstalled - ? `Ollama detected — ${local.totalLocalModels} model${local.totalLocalModels === 1 ? '' : 's'} installed.` - : 'No local runtime detected. Install Ollama to run models privately on your machine.'} + {(local?.ollamaRunning ?? local?.ollamaInstalled) + ? `Private runtime running — ${local?.totalLocalModels ?? 0} model${local?.totalLocalModels === 1 ? '' : 's'} installed.` + : local?.managedRuntime?.installed + ? 'Private runtime installed but not running. Start it here to use local models.' + : local?.managedRuntime?.supported + ? 'No local runtime yet. Waggle can install and manage it for you.' + : local?.managedRuntime?.reason ?? 'Managed runtime status is unavailable. Retry the check before local setup.'}

-
- - setPullName(e.target.value)} - placeholder="e.g. llama3.2" - /> -
- + {!(local?.ollamaRunning ?? local?.ollamaInstalled) && local?.managedRuntime?.supported && ( +
+
+ +
+

+ {local.managedRuntime.installed ? 'Start private runtime' : 'Install private runtime'} +

+

+ {local.managedRuntime.installed + ? 'Starts Waggle’s verified local runtime on this device.' + : `Downloads the checksum-verified official runtime${formatDownloadSize(local.managedRuntime.artifactSizeBytes) ? ` (${formatDownloadSize(local.managedRuntime.artifactSizeBytes)})` : ''}. No Docker, administrator access, or system Ollama install required.`} +

+
+
+
+ +
- {pullMsg && ( -

- {pullMsg.text} + )} + {runtimeMsg && ( +

+ {runtimeMsg.text} +

+ )} + {(local?.ollamaRunning ?? local?.ollamaInstalled) && ( +
+ + {recommendedLocal && ( +

+ Recommended for this device: {recommendedLocal.name} + {recommendedLocal.fitLevel ? ` · ${recommendedLocal.fitLevel.replace('_', ' ')} fit` : ''} + {typeof recommendedLocal.estimatedTps === 'number' ? ` · ~${recommendedLocal.estimatedTps} tok/s` : ''} +

+ )} + setPullName(e.target.value)} + placeholder="e.g. llama3.2:3b" + /> +

+ Model weights are downloaded to Waggle’s private data directory. By continuing, you accept the model publisher’s upstream license.

- )} -
+
+ +
+ {pullMsg && ( +

+ {pullMsg.text} +

+ )} +
+ )}
)}
diff --git a/apps/web/src/components/os/overlays/CreateWorkspaceDialog.tsx b/apps/web/src/components/os/overlays/CreateWorkspaceDialog.tsx index 2f09233..39568b8 100644 --- a/apps/web/src/components/os/overlays/CreateWorkspaceDialog.tsx +++ b/apps/web/src/components/os/overlays/CreateWorkspaceDialog.tsx @@ -805,7 +805,7 @@ const CreateWorkspaceDialog = ({ open, onClose, onCreate }: CreateWorkspaceDialo }, [selectedTemplate, templates]); const handleCreate = () => { - if (!name.trim()) return; + if (!name.trim() || (storageType === 'local' && !storagePath.trim())) return; onCreate({ name: name.trim(), group, persona: agentMode === 'single' ? selectedPersona : undefined, @@ -1316,7 +1316,7 @@ const CreateWorkspaceDialog = ({ open, onClose, onCreate }: CreateWorkspaceDialo
- diff --git a/apps/web/src/components/os/overlays/SpawnAgentDialog.test.tsx b/apps/web/src/components/os/overlays/SpawnAgentDialog.test.tsx index 3beab35..d82ce1b 100644 --- a/apps/web/src/components/os/overlays/SpawnAgentDialog.test.tsx +++ b/apps/web/src/components/os/overlays/SpawnAgentDialog.test.tsx @@ -175,6 +175,20 @@ describe('SpawnAgentDialog durable launch', () => { expect(modelList).toContainElement(screen.getByTitle('anthropic/claude-3-5-sonnet')); }); + it('shows the retry CTA when a configured provider returns no models', async () => { + mocks.adapter.getModels.mockResolvedValue([]); + mocks.adapter.getModel.mockResolvedValue(''); + mocks.adapter.getProviders.mockResolvedValue({ + providers: [{ id: 'anthropic', name: 'Anthropic', hasKey: true, models: [] }], + search: [], + activeSearch: '', + }); + renderDialog(); + + const retryCta = await screen.findByTestId('spawn-no-models-cta'); + expect(retryCta).toHaveTextContent('Retry'); + }); + it('blocks launch and explains how to configure a model when no provider is ready', async () => { mocks.adapter.getModels.mockResolvedValue([]); mocks.adapter.getModel.mockResolvedValue('anthropic/claude-3-5-sonnet'); diff --git a/apps/web/src/components/os/overlays/SpawnAgentDialog.tsx b/apps/web/src/components/os/overlays/SpawnAgentDialog.tsx index 40808ef..7180dcc 100644 --- a/apps/web/src/components/os/overlays/SpawnAgentDialog.tsx +++ b/apps/web/src/components/os/overlays/SpawnAgentDialog.tsx @@ -97,9 +97,6 @@ const SpawnAgentDialog = ({ open, onClose, workspaces, activeWorkspaceId, onWork const deduped = Array.from(new Set(fromProviders)); if (deduped.length > 0) modelList = deduped; } - if (modelList.length === 0 && providers.providers.some((p) => p.hasKey)) { - setModelsError('Model list unavailable right now — retry, or check provider keys in Settings.'); - } setModels(modelList); setPricing(p); setProvidersWithKeys(countProvidersWithKeys(providers.providers)); diff --git a/apps/web/src/components/os/settings/BrowserCompanionSettings.test.tsx b/apps/web/src/components/os/settings/BrowserCompanionSettings.test.tsx new file mode 100644 index 0000000..35f9378 --- /dev/null +++ b/apps/web/src/components/os/settings/BrowserCompanionSettings.test.tsx @@ -0,0 +1,86 @@ +import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'; +import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; + +const mocks = vi.hoisted(() => ({ + getStatus: vi.fn(), + createCode: vi.fn(), + revoke: vi.fn(), +})); + +vi.mock('@/lib/adapter', () => ({ + adapter: { + getBrowserCompanionPairing: mocks.getStatus, + createBrowserCompanionPairingCode: mocks.createCode, + revokeBrowserCompanionPairing: mocks.revoke, + }, +})); + +import BrowserCompanionSettings from './BrowserCompanionSettings'; + +beforeEach(() => { + mocks.getStatus.mockResolvedValue({ paired: false, extensionId: null, pairedAt: null }); + mocks.createCode.mockResolvedValue({ code: 'ABCDEFGH', expiresAt: Date.now() + 600_000 }); + mocks.revoke.mockResolvedValue(undefined); +}); + +afterEach(() => { + cleanup(); + vi.clearAllMocks(); +}); + +describe('BrowserCompanionSettings', () => { + it('reports that pairing status is being checked before showing an actionable state', async () => { + let resolveStatus!: (value: { paired: boolean; extensionId: null; pairedAt: null }) => void; + mocks.getStatus.mockReturnValue(new Promise((resolve) => { resolveStatus = resolve; })); + + render(); + + expect(screen.getByTestId('browser-companion-status')).toHaveTextContent('Checking…'); + expect(screen.queryByText('Not paired')).not.toBeInTheDocument(); + expect(screen.queryByRole('button', { name: /generate one-time code/i })).not.toBeInTheDocument(); + + resolveStatus({ paired: false, extensionId: null, pairedAt: null }); + expect(await screen.findByText('Not paired')).toBeInTheDocument(); + }); + + it('fails closed when pairing status is unavailable', async () => { + mocks.getStatus.mockRejectedValue(new Error('offline')); + + render(); + + expect(await screen.findByText('Unavailable')).toBeInTheDocument(); + expect(screen.getByRole('alert')).toHaveTextContent('Could not read Browser Companion pairing status.'); + expect(screen.queryByRole('button', { name: /generate one-time code/i })).not.toBeInTheDocument(); + expect(screen.queryByRole('button', { name: /revoke/i })).not.toBeInTheDocument(); + }); + + it('generates a code, confirms pairing, and revokes it', async () => { + mocks.getStatus + .mockResolvedValueOnce({ paired: false, extensionId: null, pairedAt: null }) + .mockResolvedValueOnce({ paired: true, extensionId: 'extension-id', pairedAt: '2026-08-12T00:00:00Z' }); + render(); + await screen.findByText('Not paired'); + fireEvent.click(screen.getByRole('button', { name: /generate one-time code/i })); + expect(await screen.findByTestId('browser-companion-code')).toHaveTextContent('ABCDEFGH'); + expect(mocks.createCode).toHaveBeenCalledOnce(); + + fireEvent.click(screen.getByRole('button', { name: /check pairing/i })); + expect(await screen.findByText('Paired')).toBeInTheDocument(); + expect(screen.queryByTestId('browser-companion-code')).not.toBeInTheDocument(); + expect(screen.queryByRole('button', { name: /generate one-time code/i })).not.toBeInTheDocument(); + + fireEvent.click(screen.getByRole('button', { name: /revoke/i })); + await waitFor(() => expect(mocks.revoke).toHaveBeenCalledOnce()); + expect(await screen.findByText('Not paired')).toBeInTheDocument(); + expect(screen.getByRole('button', { name: /generate one-time code/i })).toBeInTheDocument(); + }); + + it('clears an expired pairing code', async () => { + mocks.createCode.mockResolvedValue({ code: 'ABCDEFGH', expiresAt: Date.now() - 1 }); + render(); + await screen.findByText('Not paired'); + fireEvent.click(screen.getByRole('button', { name: /generate one-time code/i })); + await waitFor(() => expect(mocks.createCode).toHaveBeenCalledOnce()); + await waitFor(() => expect(screen.queryByTestId('browser-companion-code')).not.toBeInTheDocument()); + }); +}); diff --git a/apps/web/src/components/os/settings/BrowserCompanionSettings.tsx b/apps/web/src/components/os/settings/BrowserCompanionSettings.tsx new file mode 100644 index 0000000..e9d2002 --- /dev/null +++ b/apps/web/src/components/os/settings/BrowserCompanionSettings.tsx @@ -0,0 +1,157 @@ +import { useCallback, useEffect, useRef, useState } from 'react'; +import { CheckCircle2, KeyRound, Loader2, Unplug } from 'lucide-react'; +import { adapter, type BrowserCompanionPairingStatus } from '@/lib/adapter'; + +const BrowserCompanionSettings = () => { + const [status, setStatus] = useState(null); + const [pairingCode, setPairingCode] = useState<{ code: string; expiresAt: number } | null>(null); + const [busy, setBusy] = useState<'generate' | 'check' | 'revoke' | null>(null); + const [error, setError] = useState(''); + const refreshId = useRef(0); + + const refresh = useCallback(async (showBusy = false) => { + const requestId = ++refreshId.current; + if (showBusy) setBusy('check'); + try { + const nextStatus = await adapter.getBrowserCompanionPairing(); + if (requestId !== refreshId.current) return; + setStatus(nextStatus); + if (nextStatus.paired) setPairingCode(null); + setError(''); + } catch { + if (requestId !== refreshId.current) return; + setError('Could not read Browser Companion pairing status.'); + } finally { + if (showBusy && requestId === refreshId.current) setBusy(null); + } + }, []); + + useEffect(() => { + void refresh(); + return () => { refreshId.current += 1; }; + }, [refresh]); + + useEffect(() => { + if (!pairingCode) return; + const remainingMs = pairingCode.expiresAt - Date.now(); + if (remainingMs <= 0) { + setPairingCode(null); + return; + } + const expiryTimer = window.setTimeout(() => setPairingCode(null), remainingMs); + return () => window.clearTimeout(expiryTimer); + }, [pairingCode]); + + const createCode = async () => { + setBusy('generate'); + setPairingCode(null); + try { + setPairingCode(await adapter.createBrowserCompanionPairingCode()); + setError(''); + } catch { + setError('Could not create a pairing code.'); + } finally { + setBusy(null); + } + }; + + const revoke = async () => { + refreshId.current += 1; + setBusy('revoke'); + try { + await adapter.revokeBrowserCompanionPairing(); + setPairingCode(null); + setStatus({ paired: false, extensionId: null, pairedAt: null }); + setError(''); + } catch { + setError('Could not revoke Browser Companion pairing.'); + } finally { + setBusy(null); + } + }; + + return ( +
+
+
+

+

+

+ Pair the extension with a short-lived, single-use code. Captures can write only to personal imported memory. +

+
+ + {status?.paired ? 'Paired' : status ? 'Not paired' : error ? 'Unavailable' : 'Checking…'} + +
+ + {status?.paired && ( +

+

+ )} + + {pairingCode && ( +
+

Enter this code in the Browser Companion popup:

+

+ {pairingCode.code} +

+

Expires {new Date(pairingCode.expiresAt).toLocaleTimeString()}.

+ +
+ )} + + {error &&

{error}

} + +
+ {status && !status.paired && ( + + )} + {status?.paired && ( + + )} +
+
+ ); +}; + +export default BrowserCompanionSettings; diff --git a/apps/web/src/components/ui/scroll-area.tsx b/apps/web/src/components/ui/scroll-area.tsx index 8d29b27..25b06f9 100644 --- a/apps/web/src/components/ui/scroll-area.tsx +++ b/apps/web/src/components/ui/scroll-area.tsx @@ -8,7 +8,12 @@ const ScrollArea = React.forwardRef< React.ComponentPropsWithoutRef >(({ className, children, ...props }, ref) => ( - {children} + + {children} + diff --git a/apps/web/src/hooks/useChat.ts b/apps/web/src/hooks/useChat.ts index a190770..af71a33 100644 --- a/apps/web/src/hooks/useChat.ts +++ b/apps/web/src/hooks/useChat.ts @@ -68,6 +68,94 @@ function flattenBlocks(blocks: ContentBlock[]): string { .join(''); } +function replaceTextBlocks(blocks: ContentBlock[], content: string): ContentBlock[] { + const firstTextIndex = blocks.findIndex(block => block.type === 'text'); + const firstText = firstTextIndex >= 0 ? blocks[firstTextIndex] as TextContentBlock : undefined; + const next: ContentBlock[] = blocks.filter(block => block.type !== 'text'); + if (!content) return next; + const insertAt = firstTextIndex < 0 ? next.length : Math.min(firstTextIndex, next.length); + next.splice(insertAt, 0, { + type: 'text', + blockId: firstText?.blockId ?? nextBlockId('text'), + content, + }); + return next; +} + +function clearDraftPreview( + draft: ChatMessage['draft'], + fallbackTurnId: string, +): NonNullable { + return { + turnId: draft?.turnId ?? fallbackTurnId, + revision: draft?.revision ?? 0, + content: '', + status: 'streaming', + }; +} + +function settleRunningBlocks(blocks: ContentBlock[], failure?: string): ContentBlock[] { + return blocks.map(block => { + if (block.type === 'step' && block.status === 'running') { + return { ...block, status: 'done' as const }; + } + if (block.type === 'tool_use' && block.status === 'running') { + return failure + ? { ...block, status: 'error' as const, result: failure } + : { ...block, status: 'done' as const }; + } + return block; + }); +} + +function settleRunningTools(tools: ToolExecution[], failure?: string): ToolExecution[] { + return tools.map(tool => tool.status === 'running' + ? { + ...tool, + status: failure ? 'error' as const : 'done' as const, + ...(failure ? { output: failure } : {}), + } + : tool); +} + +function mergeAuthoritativeHistory( + authoritative: ChatMessage[], + localTurns: ChatMessage[], +): ChatMessage[] { + const authoritativeIds = new Set(authoritative.map(message => message.id)); + return [ + ...authoritative, + ...localTurns.filter(message => !authoritativeIds.has(message.id)), + ]; +} + +interface PendingHistoryLoad { + cacheKey: string; + localMessageIds: Set; + localMessages: Map; + suppressedMessageIds: Set; + ready: Promise; + release: () => void; +} + +function isActiveTurnClearConflict(error: unknown): boolean { + const candidate = error as { status?: unknown; body?: { code?: unknown } }; + return candidate?.status === 409 + && candidate.body?.code === 'SESSION_TURN_IN_PROGRESS'; +} + +async function clearHistoryAfterAbort(workspaceId: string, sessionId: string): Promise { + for (let attempt = 0; ; attempt++) { + try { + await adapter.clearHistory(workspaceId, sessionId); + return; + } catch (error) { + if (!isActiveTurnClearConflict(error) || attempt >= 4) throw error; + await new Promise(resolve => setTimeout(resolve, 25 * (2 ** attempt))); + } + } +} + export type AutonomyLevel = 'normal' | 'trusted' | 'yolo'; export interface AutonomyState { level: AutonomyLevel; @@ -79,6 +167,8 @@ interface UseChatOptions { workspaceId: string | null; sessionId: string | null; persona?: string; + /** Model selected when the user sends this turn. */ + model?: string; /** * Phase B.5: per-window autonomy. When set to 'trusted' or 'yolo' (and not * expired), the server's pre-tool gate skips confirmation for the matching @@ -87,80 +177,277 @@ interface UseChatOptions { autonomy?: AutonomyState; } -export const useChat = ({ workspaceId, sessionId, persona, autonomy }: UseChatOptions) => { +export const useChat = ({ workspaceId, sessionId, persona, model, autonomy }: UseChatOptions) => { const [messages, setMessages] = useState([]); const [isLoading, setIsLoading] = useState(false); const [pendingApproval, setPendingApproval] = useState(null); + const [historyReloadRevision, setHistoryReloadRevision] = useState(0); + const settledCacheThreadRef = useRef(null); + const historyGenerationRef = useRef(0); + const pendingHistoryRef = useRef(null); + const clearingThreadCountsRef = useRef>(new Map()); + const clearSucceededThreadsRef = useRef>(new Set()); + const clearNeedsHistoryRecoveryRef = useRef>(new Set()); + const recoveringHistoryThreadsRef = useRef>(new Set()); + const historyRecoveryLocalIdsRef = useRef>>(new Map()); + const historyRecoveryLocalMessagesRef = useRef>>(new Map()); + const historyRecoveryRetryCountsRef = useRef>(new Map()); + const currentThreadRef = useRef({ workspaceId, sessionId }); + currentThreadRef.current = { workspaceId, sessionId }; // F2: true only after a real session's history fetch has landed. The wizard // auto-send waits on this so its optimistic turn isn't clobbered by the // history-replace that fires when the session id resolves. const [historyLoaded, setHistoryLoaded] = useState(false); - const abortRef = useRef(null); + const activeDispatchRef = useRef<{ + controller: AbortController; + workspaceId: string; + sessionId: string; + assistantId: string; + } | null>(null); // Lane C (Pillar 2.2/2.5): a send fired while a reply is still streaming must // NOT lock the composer or spawn a second concurrent SSE stream. Such sends // QUEUE behind the in-flight one — the optimistic user turn renders at once // with a truthful `queued` marker and dispatches when the current reply ends. const inFlightRef = useRef(false); - const queueRef = useRef>([]); + const queueRef = useRef>([]); // Late-bound so the dispatch loop can flush its own queue without a self-dep. const runDispatchRef = useRef< - (content: string, opts: { retry?: boolean } | undefined, optimisticId?: string) => Promise + ( + content: string, + opts: { retry?: boolean } | undefined, + optimisticId?: string, + turnModel?: string, + turnPersona?: string, + turnAutonomy?: AutonomyState, + ) => Promise >(async () => false); + const flushNextQueuedFor = useCallback((ownerWorkspaceId: string, ownerSessionId: string) => { + const currentThread = currentThreadRef.current; + if ( + currentThread.workspaceId !== ownerWorkspaceId + || (currentThread.sessionId ?? '') !== ownerSessionId + ) return; + + let next = queueRef.current.shift(); + while ( + next + && (next.workspaceId !== ownerWorkspaceId || next.sessionId !== ownerSessionId) + ) { + next = queueRef.current.shift(); + } + if (next) { + void runDispatchRef.current( + next.content, + { retry: next.retry }, + next.id, + next.model, + next.persona, + next.autonomy, + ); + } + }, []); + + const cancelActiveDispatch = useCallback(async () => { + const activeDispatch = activeDispatchRef.current; + queueRef.current = []; + setMessages(prev => ( + prev.some(message => message.queued) + ? prev.filter(message => !message.queued) + : prev + )); + setPendingApproval(null); + inFlightRef.current = false; + setIsLoading(false); + if (!activeDispatch) return; + + activeDispatchRef.current = null; + activeDispatch.controller.abort(); + try { + await Promise.resolve(adapter.abortAgent( + activeDispatch.workspaceId, + activeDispatch.sessionId, + )); + } catch { /* best-effort */ } + }, []); + // Cancel any in-flight stream on unmount useEffect(() => { - return () => { abortRef.current?.abort(); }; + return () => { activeDispatchRef.current?.controller.abort(); }; }, []); // Load history when session changes useEffect(() => { + const generation = ++historyGenerationRef.current; + const recoveringHistoryThreads = recoveringHistoryThreadsRef.current; + const historyRecoveryLocalIds = historyRecoveryLocalIdsRef.current; + const historyRecoveryLocalMessages = historyRecoveryLocalMessagesRef.current; + const historyRecoveryRetryCounts = historyRecoveryRetryCountsRef.current; + let effectPendingHistory: PendingHistoryLoad | null = null; + const activeDispatch = activeDispatchRef.current; + if ( + activeDispatch + && ( + activeDispatch.workspaceId !== workspaceId + || activeDispatch.sessionId !== (sessionId ?? '') + ) + ) { + void cancelActiveDispatch(); + } // Lane C: a message queued into the previous thread must never dispatch into // a freshly loaded one — drop the pending queue on every thread change. queueRef.current = []; + setPendingApproval(null); + let cancelled = false; + let historyFetchSucceeded = false; + let recoveryLocalIds: Set | undefined; + let recoveryLocalMessages: Map | undefined; + let isHistoryRecovery = false; if (workspaceId && sessionId) { const cacheKey = chatThreadCacheKey(workspaceId, sessionId); + recoveryLocalIds = historyRecoveryLocalIds.get(cacheKey); + recoveryLocalMessages = historyRecoveryLocalMessages.get(cacheKey); + isHistoryRecovery = ( + recoveringHistoryThreads.has(cacheKey) + && recoveryLocalIds !== undefined + ); + let releaseHistory!: () => void; + const ready = new Promise(resolve => { releaseHistory = resolve; }); + const pendingHistory: PendingHistoryLoad = { + cacheKey, + localMessageIds: new Set(recoveryLocalIds ?? []), + localMessages: new Map(recoveryLocalMessages ?? []), + suppressedMessageIds: new Set(), + ready, + release: releaseHistory, + }; + effectPendingHistory = pendingHistory; + pendingHistoryRef.current = pendingHistory; // Lane C (2.6-chat) cache-first paint: seed from the last-known thread so a // return to a visited session renders instantly, then refresh silently. const cached = readChatThreadCache(cacheKey); - if (cached) setMessages(cached); + setMessages(isHistoryRecovery + ? Array.from(pendingHistory.localMessages.values()) + : (cached ?? [])); setHistoryLoaded(false); adapter.getHistory(workspaceId, sessionId) .then((history) => { + if ( + cancelled + || historyGenerationRef.current !== generation + || pendingHistoryRef.current !== pendingHistory + ) return; const shaped = history.map(ensureBlocks); - setMessages(shaped); - writeChatThreadCache(cacheKey, shaped); + const visibleHistory = pendingHistory.suppressedMessageIds.size === 0 + ? shaped + : shaped.filter(message => !pendingHistory.suppressedMessageIds.has(message.id)); + setMessages(prev => { + if (pendingHistory.localMessageIds.size === 0) return visibleHistory; + const localTurns = new Map(pendingHistory.localMessages); + for (const message of prev) { + if (pendingHistory.localMessageIds.has(message.id)) { + localTurns.set(message.id, message); + } + } + return mergeAuthoritativeHistory(visibleHistory, Array.from(localTurns.values())); + }); + writeChatThreadCache(cacheKey, visibleHistory); + historyFetchSucceeded = true; }) .catch((err) => { + if (cancelled || historyGenerationRef.current !== generation) return; console.error('[useChat] history fetch failed:', err); // Keep a good cached paint on a transient refresh failure; only clear // when there was nothing to show. - if (!cached) setMessages([]); + if (!cached && pendingHistory.localMessageIds.size === 0) setMessages([]); }) - .finally(() => setHistoryLoaded(true)); + .finally(() => { + pendingHistory.release(); + const completedCurrent = ( + !cancelled + && historyGenerationRef.current === generation + && pendingHistoryRef.current === pendingHistory + ); + if (completedCurrent) { + pendingHistoryRef.current = null; + if (isHistoryRecovery && !historyFetchSucceeded) { + setHistoryLoaded(false); + const retryCount = historyRecoveryRetryCounts.get(cacheKey) ?? 0; + if (retryCount < 1) { + historyRecoveryRetryCounts.set(cacheKey, retryCount + 1); + setHistoryReloadRevision(revision => revision + 1); + } + } else { + setHistoryLoaded(true); + } + } + if ( + completedCurrent + && isHistoryRecovery + && historyFetchSucceeded + && historyRecoveryLocalIds.get(cacheKey) === recoveryLocalIds + ) { + recoveringHistoryThreads.delete(cacheKey); + historyRecoveryLocalIds.delete(cacheKey); + historyRecoveryLocalMessages.delete(cacheKey); + historyRecoveryRetryCounts.delete(cacheKey); + } + }); } else { + pendingHistoryRef.current = null; // No session yet — leave historyLoaded false so an auto-send waits for a // real session's history to land (never race the replace below). setMessages([]); } - }, [workspaceId, sessionId]); + return () => { + cancelled = true; + effectPendingHistory?.release(); + }; + }, [workspaceId, sessionId, historyReloadRevision, cancelActiveDispatch]); // Lane C: persist the SETTLED thread (never mid-stream partials or queued // turns) so a remount/return paints instantly from the cache above. useEffect(() => { - if (!workspaceId || !sessionId) return; + const cacheKey = workspaceId && sessionId + ? chatThreadCacheKey(workspaceId, sessionId) + : null; + // On a thread change this effect still sees the previous render's messages. + // Skip that transition commit so session A can never be written under B's + // cache key; the history effect above then installs B's cache (or []). + if (settledCacheThreadRef.current !== cacheKey) { + settledCacheThreadRef.current = cacheKey; + return; + } + if (!cacheKey) return; if (isLoading) return; if (messages.length === 0) return; if (messages.some((m) => m.queued)) return; - writeChatThreadCache(chatThreadCacheKey(workspaceId, sessionId), messages); + const settledMessages = messages.filter(message => !message.draft); + if (settledMessages.length === 0) return; + writeChatThreadCache(cacheKey, settledMessages); }, [messages, workspaceId, sessionId, isLoading]); const runDispatch = useCallback(async ( content: string, opts?: { retry?: boolean }, optimisticId?: string, + turnModel?: string, + turnPersona?: string, + turnAutonomy?: AutonomyState, ): Promise => { if (!workspaceId || !content.trim()) return false; + if (sessionId) setHistoryLoaded(true); + setPendingApproval(null); inFlightRef.current = true; // F2: report send success so the wizard auto-send knows whether to clear // the composer or leave the text for a manual retry. Error handling below @@ -168,18 +455,41 @@ export const useChat = ({ workspaceId, sessionId, persona, autonomy }: UseChatOp let failed = false; const trimmed = content.trim(); + const assistantId = crypto.randomUUID(); + const legacyTurnId = `legacy:${assistantId}`; + const immediateUserId = optimisticId ? undefined : crypto.randomUUID(); + let initialHistoryReady: Promise | undefined; + if (sessionId) { + const pendingHistory = pendingHistoryRef.current; + if (pendingHistory?.cacheKey === chatThreadCacheKey(workspaceId, sessionId)) { + pendingHistory.localMessageIds.add(assistantId); + pendingHistory.localMessageIds.add(optimisticId ?? immediateUserId!); + initialHistoryReady = pendingHistory.ready; + } + } const assistantMsg: ChatMessage = { - id: crypto.randomUUID(), + id: assistantId, role: 'assistant', content: '', blocks: [], timestamp: new Date().toISOString(), tools: [], + // Preserve the authoring persona on the turn itself. The active persona + // can change while this message remains in the thread; rendering from + // mutable window state would otherwise relabel historical responses. + persona: turnPersona, + // The placeholder is already an uncommitted draft even before the first + // token. Keeping this marker through tool/model events prevents Stop from + // ever caching a non-authoritative assistant record. + draft: { + turnId: legacyTurnId, + revision: 0, + content: '', + status: 'streaming', + }, }; // Target the assistant turn BY ID (not "last message"): a queued turn may // sit after it in the list, so position is not stable during streaming. - const assistantId = assistantMsg.id; - if (optimisticId) { // Flush path: the optimistic user turn is already rendered (queued while a // prior reply streamed). Promote it (clear `queued`) and insert the @@ -197,7 +507,7 @@ export const useChat = ({ workspaceId, sessionId, persona, autonomy }: UseChatOp }); } else { const userMsg: ChatMessage = { - id: crypto.randomUUID(), + id: immediateUserId!, role: 'user', content: trimmed, blocks: [{ type: 'text', blockId: nextBlockId('text'), content: trimmed }], @@ -207,24 +517,77 @@ export const useChat = ({ workspaceId, sessionId, persona, autonomy }: UseChatOp } setIsLoading(true); - abortRef.current?.abort(); + activeDispatchRef.current?.controller.abort(); // Lane S2 (Pillar 3.1): capture THIS stream's controller locally. The break - // guard below reads the local `controller`, not the shared `abortRef.current` - // — so a stop (or a fresh dispatch that reassigns abortRef) reliably halts - // THIS loop instead of racing whatever the ref now points at. + // guard below reads the local `controller`, while activeDispatch records + // which request owns the shared loading/queue state and server-side cancel. const controller = new AbortController(); - abortRef.current = controller; + const activeDispatch = { + controller, + workspaceId, + sessionId: sessionId ?? '', + assistantId, + }; + activeDispatchRef.current = activeDispatch; try { + // A history request that started before this turn cannot reliably tell an + // older identical exchange from this new one because the current API uses + // positional `hist-N` ids. Paint optimistically, but wait to POST until + // that snapshot settles so reconciliation is identity-safe. + if (initialHistoryReady) await initialHistoryReady; + if (controller.signal.aborted || activeDispatchRef.current !== activeDispatch) { + return true; + } + let terminalEventSeen = false; + let legacyCanonicalContent = ''; // Phase B.5: only forward autonomy when elevated — Normal is the // server default, so passing `undefined` keeps the wire payload lean. - const autonomyPayload = autonomy && autonomy.level !== 'normal' - ? { level: autonomy.level, expiresAt: autonomy.expiresAt ?? undefined } + const autonomyPayload = turnAutonomy && turnAutonomy.level !== 'normal' + ? { level: turnAutonomy.level, expiresAt: turnAutonomy.expiresAt ?? undefined } : undefined; - for await (const event of adapter.sendMessage(workspaceId, content, sessionId || undefined, persona, autonomyPayload, opts?.retry)) { + const eventStream = turnModel + ? adapter.sendMessage( + workspaceId, + content, + sessionId || undefined, + turnPersona, + autonomyPayload, + opts?.retry, + turnModel, + ) + : adapter.sendMessage( + workspaceId, + content, + sessionId || undefined, + turnPersona, + autonomyPayload, + opts?.retry, + ); + for await (const event of eventStream) { if (controller.signal.aborted) break; const evt = event as StreamEvent; const data = evt.data as Record; + if (terminalEventSeen) continue; + const isTerminalEvent = evt.type === 'done' || evt.type === 'error'; + const legacyTokenContent = evt.type === 'token' + ? typeof data === 'string' ? data : (data?.content as string ?? '') + : ''; + if (evt.type === 'token') legacyCanonicalContent += legacyTokenContent; + if (evt.type === 'error') failed = true; + if (isTerminalEvent) terminalEventSeen = true; + if (evt.type === 'approval_request' || evt.type === 'approval_required') { + const currentThread = currentThreadRef.current; + if ( + activeDispatchRef.current === activeDispatch + && currentThread.workspaceId === activeDispatch.workspaceId + && (currentThread.sessionId ?? '') === activeDispatch.sessionId + ) { + setPendingApproval(data as unknown as ApprovalRequest); + } + } else if (isTerminalEvent) { + setPendingApproval(null); + } setMessages(prev => { const msgs = [...prev]; @@ -236,16 +599,35 @@ export const useChat = ({ workspaceId, sessionId, persona, autonomy }: UseChatOp if (!last || last.role !== 'assistant') return msgs; const blocks = [...(last.blocks || [])]; let toolsUpdate: ToolExecution[] | null = null; + let modelUpdate: string | null = null; + let draftUpdate: ChatMessage['draft'] | null | undefined; switch (evt.type) { case 'token': { - const tokenContent = typeof data === 'string' ? data : (data?.content as string ?? ''); - const lastBlock = blocks[blocks.length - 1]; - if (lastBlock?.type === 'text') { - blocks[blocks.length - 1] = { ...lastBlock, content: lastBlock.content + tokenContent }; - } else { - blocks.push({ type: 'text', blockId: nextBlockId('text'), content: tokenContent }); - } + if (last.draft && last.draft.turnId !== legacyTurnId) break; + const previous = last.draft?.turnId === legacyTurnId ? last.draft : undefined; + draftUpdate = { + turnId: legacyTurnId, + revision: (previous?.revision ?? 0) + 1, + content: (previous?.content ?? '') + legacyTokenContent, + status: 'streaming', + }; + break; + } + + case 'draft_update': { + const turnId = typeof data?.turnId === 'string' ? data.turnId : ''; + const revision = typeof data?.revision === 'number' ? data.revision : 0; + const draftContent = typeof data?.content === 'string' ? data.content : ''; + if (!turnId || !Number.isInteger(revision) || revision <= 0) break; + if (last.draft?.turnId && last.draft.turnId !== legacyTurnId && last.draft.turnId !== turnId) break; + if (last.draft?.turnId === turnId && revision <= last.draft.revision) break; + draftUpdate = { + turnId, + revision, + content: draftContent, + status: 'streaming', + }; break; } @@ -275,6 +657,7 @@ export const useChat = ({ workspaceId, sessionId, persona, autonomy }: UseChatOp } case 'tool_start': { + draftUpdate = clearDraftPreview(last.draft, legacyTurnId); const toolName = (data?.name as string) ?? 'unknown'; const toolId = toolName + '-' + Date.now(); blocks.push({ @@ -322,23 +705,32 @@ export const useChat = ({ workspaceId, sessionId, persona, autonomy }: UseChatOp } case 'model_switch': { + draftUpdate = clearDraftPreview(last.draft, legacyTurnId); + const switchedModel = (data as Record).model; blocks.push({ type: 'model_switch', blockId: nextBlockId('model'), from: (data as Record).primary ?? 'primary', - to: (data as Record).model ?? 'fallback', + to: switchedModel ?? 'fallback', reason: (data as Record).reason ?? 'primary unavailable', }); + if (switchedModel) modelUpdate = switchedModel; break; } case 'error': { + draftUpdate = null; const errorMsg = typeof data === 'string' ? data : (data?.message as string ?? 'Unknown error'); + blocks.splice(0, blocks.length, ...settleRunningBlocks(blocks, errorMsg)); + if (last.tools) toolsUpdate = settleRunningTools(last.tools, errorMsg); + setPendingApproval(null); blocks.push({ type: 'error', blockId: nextBlockId('error'), message: errorMsg }); break; } case 'done': { + draftUpdate = null; + setPendingApproval(null); // Mark all running blocks as done — type-narrowed, no unsafe cast for (let i = 0; i < blocks.length; i++) { const b = blocks[i]; @@ -348,10 +740,15 @@ export const useChat = ({ workspaceId, sessionId, persona, autonomy }: UseChatOp blocks[i] = { ...b, status: 'done' }; } } - const doneContent = data?.content as string; - if (doneContent && !blocks.some(b => b.type === 'text' && b.content)) { - blocks.push({ type: 'text', blockId: nextBlockId('text'), content: doneContent }); - } + if (last.tools) toolsUpdate = settleRunningTools(last.tools); + const doneContent = typeof data?.content === 'string' + ? data.content + : last.draft?.turnId === legacyTurnId + ? legacyCanonicalContent + : last.content; + blocks.splice(0, blocks.length, ...replaceTextBlocks(blocks, doneContent)); + const resolvedModel = data?.model; + if (typeof resolvedModel === 'string' && resolvedModel) modelUpdate = resolvedModel; break; } @@ -359,20 +756,39 @@ export const useChat = ({ workspaceId, sessionId, persona, autonomy }: UseChatOp case 'approval_required': // Backend emits `approval_required` as the SSE event name; // legacy clients sent `approval_request`. Accept both. - setPendingApproval(data as unknown as ApprovalRequest); - return msgs; // Don't update blocks for approval + draftUpdate = clearDraftPreview(last.draft, legacyTurnId); + break; } const content = flattenBlocks(blocks); return msgs.map((m, i) => i === targetIdx - ? { ...m, blocks, content, ...(toolsUpdate && { tools: toolsUpdate }) } + ? { + ...m, + blocks, + content, + ...(toolsUpdate && { tools: toolsUpdate }), + ...(modelUpdate && { model: modelUpdate }), + ...(draftUpdate !== undefined && { draft: draftUpdate ?? undefined }), + } : m ); }); + if (isTerminalEvent) break; + } + if (!terminalEventSeen && !controller.signal.aborted) { + const incomplete = new Error('The response ended before completion. Please retry.'); + incomplete.name = 'ChatStreamIncompleteError'; + throw incomplete; } } catch (e) { + if (controller.signal.aborted) { + // User Stop is a successful cancellation, not a backend outage. Preserve + // the partial answer and let finally release the composer/queue. + return true; + } failed = true; + setPendingApproval(null); // P1b D3: sendMessage now THROWS AdapterHttpError on HTTP failure (it // used to parse the error body as an empty SSE stream — silent dead // chat). 'Backend is offline' is reserved for genuine network failures; @@ -384,7 +800,13 @@ export const useChat = ({ workspaceId, sessionId, persona, autonomy }: UseChatOp ? (e as Error & { status?: number; body?: unknown }) : null; const isTier403 = (httpErr?.body as { error?: string } | undefined)?.error === 'TIER_INSUFFICIENT'; - const message = isTier403 + const isIncompleteStream = e instanceof Error && e.name === 'ChatStreamIncompleteError'; + const isUnexpectedAbort = e instanceof Error && e.name === 'AbortError'; + const message = isIncompleteStream + ? e.message + : isUnexpectedAbort + ? 'The response was interrupted before completion. Please retry.' + : isTier403 ? 'This action needs a higher plan — see the upgrade window.' : httpErr ? `Chat request failed (${httpErr.status}): ${httpErr.message}` @@ -397,31 +819,66 @@ export const useChat = ({ workspaceId, sessionId, persona, autonomy }: UseChatOp // switch mid-flight resets messages. Return prev (not the clone) so // React's setState bail-out skips the no-op re-render. if (!last || last.role !== 'assistant') return prev; - const blocks = [...(last.blocks || []), { type: 'error' as const, blockId: nextBlockId('error'), message }]; + const blocks = [ + ...settleRunningBlocks(last.blocks || [], message), + { type: 'error' as const, blockId: nextBlockId('error'), message }, + ]; return msgs.map((m, i) => - i === targetIdx ? { ...m, blocks, content: message } : m + i === targetIdx + ? { + ...m, + blocks, + content: message, + draft: undefined, + ...(m.tools && { tools: settleRunningTools(m.tools, message) }), + } + : m ); }); } finally { - setIsLoading(false); - inFlightRef.current = false; - // Flush the next queued send (FIFO) now that the stream has ended. - const next = queueRef.current.shift(); - if (next) void runDispatchRef.current(next.content, { retry: next.retry }, next.id); + // A stopped request may settle after its replacement has started. Only + // the dispatch that still owns the shared state may release or flush it. + if (activeDispatchRef.current === activeDispatch) { + activeDispatchRef.current = null; + setIsLoading(false); + inFlightRef.current = false; + // Flush the next queued send (FIFO) now that the stream has ended. + flushNextQueuedFor(activeDispatch.workspaceId, activeDispatch.sessionId); + } } return !failed; - }, [workspaceId, sessionId, persona, autonomy]); + }, [workspaceId, sessionId, flushNextQueuedFor]); runDispatchRef.current = runDispatch; const sendMessage = useCallback(async (content: string, opts?: { retry?: boolean }): Promise => { if (!workspaceId || !content.trim()) return false; + const cacheKey = sessionId ? chatThreadCacheKey(workspaceId, sessionId) : null; + if (cacheKey && ( + (clearingThreadCountsRef.current.get(cacheKey) ?? 0) > 0 + || recoveringHistoryThreadsRef.current.has(cacheKey) + )) return false; const trimmed = content.trim(); // Lane C: if a reply is already streaming, QUEUE this send behind it instead // of racing a second SSE stream. The optimistic user turn renders now with a // truthful `queued` marker; it dispatches when the current reply finishes. if (inFlightRef.current) { const id = crypto.randomUUID(); - queueRef.current.push({ id, content: trimmed, retry: opts?.retry }); + queueRef.current.push({ + id, + content: trimmed, + retry: opts?.retry, + model: model || undefined, + persona, + autonomy: autonomy ? { ...autonomy } : undefined, + workspaceId, + sessionId: sessionId ?? '', + }); + if (sessionId) { + const pendingHistory = pendingHistoryRef.current; + if (pendingHistory?.cacheKey === chatThreadCacheKey(workspaceId, sessionId)) { + pendingHistory.localMessageIds.add(id); + } + } setMessages(prev => [...prev, { id, role: 'user', @@ -432,23 +889,45 @@ export const useChat = ({ workspaceId, sessionId, persona, autonomy }: UseChatOp }]); return true; } - return runDispatch(content, opts); - }, [workspaceId, runDispatch]); + return runDispatch( + content, + opts, + undefined, + model || undefined, + persona, + autonomy ? { ...autonomy } : undefined, + ); + }, [workspaceId, sessionId, model, persona, autonomy, runDispatch]); // F4: re-issue the last user turn after a failure. Drops the failed // user+assistant pair from local state first, then sendMessage re-appends a // fresh pair — avoiding a duplicate user bubble. const retryLastFailed = useCallback(() => { if (isLoading) return; + const cacheKey = workspaceId && sessionId + ? chatThreadCacheKey(workspaceId, sessionId) + : null; + if (cacheKey && ( + (clearingThreadCountsRef.current.get(cacheKey) ?? 0) > 0 + || recoveringHistoryThreadsRef.current.has(cacheKey) + )) return; let idx = -1; for (let i = messages.length - 1; i >= 0; i--) { if (messages[i].role === 'user') { idx = i; break; } } if (idx === -1) return; const content = messages[idx].content; + if (cacheKey) { + const pendingHistory = pendingHistoryRef.current; + if (pendingHistory?.cacheKey === cacheKey) { + for (const message of messages.slice(idx)) { + pendingHistory.suppressedMessageIds.add(message.id); + } + } + } setMessages(prev => prev.slice(0, idx)); void sendMessage(content, { retry: true }); - }, [messages, isLoading, sendMessage]); + }, [messages, isLoading, workspaceId, sessionId, sendMessage]); // Lane S2 (Pillar 3.1): user-initiated halt of the in-flight reply. Aborts THIS // stream's controller (the for-await breaks before appending the next event), @@ -456,42 +935,203 @@ export const useChat = ({ workspaceId, sessionId, persona, autonomy }: UseChatOp // agent loop to stop. The partial answer already rendered stays untouched — no // rollback. Idempotent: the stream's own `finally` also clears these. const stopStreaming = useCallback(() => { - if (!inFlightRef.current) return; - abortRef.current?.abort(); + const activeDispatch = activeDispatchRef.current; + if (!inFlightRef.current || !activeDispatch) return; + activeDispatch.controller.abort(); + setPendingApproval(null); + setMessages(prev => prev.map(message => { + if (message.id !== activeDispatch.assistantId || !message.draft) return message; + const failure = 'Stopped by user'; + return { + ...message, + blocks: settleRunningBlocks(message.blocks || [], failure), + draft: { ...message.draft, status: 'stopped' as const }, + ...(message.tools && { tools: settleRunningTools(message.tools, failure) }), + }; + })); inFlightRef.current = false; setIsLoading(false); - if (workspaceId) { - try { - void Promise.resolve(adapter.abortAgent(workspaceId)).catch(() => { /* best-effort */ }); - } catch { /* adapter unavailable */ } - } - }, [workspaceId]); + try { + void Promise.resolve(adapter.abortAgent( + activeDispatch.workspaceId, + activeDispatch.sessionId, + )).catch(() => { /* best-effort */ }); + } catch { /* adapter unavailable */ } + // Preserve user-entered order: if a turn was already queued, promote it + // before a newly typed send can bypass the queue after Stop releases input. + flushNextQueuedFor(activeDispatch.workspaceId, activeDispatch.sessionId); + }, [flushNextQueuedFor]); const clearHistory = useCallback(async () => { - if (sessionId) { + if (sessionId && workspaceId) { + const cacheKey = chatThreadCacheKey(workspaceId, sessionId); + const clearCounts = clearingThreadCountsRef.current; + const previousClearCount = clearCounts.get(cacheKey) ?? 0; + if (previousClearCount === 0) { + clearSucceededThreadsRef.current.delete(cacheKey); + clearNeedsHistoryRecoveryRef.current.delete(cacheKey); + } + clearCounts.set(cacheKey, previousClearCount + 1); + const activeDispatch = activeDispatchRef.current; + // Invalidate both the settled paint and any older in-flight refresh before + // waiting on the sidecar, so cleared history cannot reappear locally. + const pendingHistory = pendingHistoryRef.current; + if (pendingHistory?.cacheKey === cacheKey) { + clearNeedsHistoryRecoveryRef.current.add(cacheKey); + const recoveryLocalIds = new Set( + historyRecoveryLocalIdsRef.current.get(cacheKey) ?? [] + ); + for (const messageId of pendingHistory.localMessageIds) { + recoveryLocalIds.add(messageId); + } + historyRecoveryLocalIdsRef.current.set(cacheKey, recoveryLocalIds); + const recoveryLocalMessages = new Map( + historyRecoveryLocalMessagesRef.current.get(cacheKey) ?? [] + ); + for (const message of messages) { + if (recoveryLocalIds.has(message.id) && !message.queued) { + recoveryLocalMessages.set(message.id, message); + } + } + historyRecoveryLocalMessagesRef.current.set(cacheKey, recoveryLocalMessages); + historyRecoveryRetryCountsRef.current.set(cacheKey, 0); + historyGenerationRef.current += 1; + pendingHistory.release(); + pendingHistoryRef.current = null; + } else if (recoveringHistoryThreadsRef.current.has(cacheKey)) { + // A preceding failed clear can arm recovery one render before its GET is + // installed. A second clear in that window must inherit (and re-own) the + // recovery transaction instead of treating the absent GET as no recovery. + clearNeedsHistoryRecoveryRef.current.add(cacheKey); + const recoveryLocalIds = new Set( + historyRecoveryLocalIdsRef.current.get(cacheKey) ?? [] + ); + historyRecoveryLocalIdsRef.current.set(cacheKey, recoveryLocalIds); + const recoveryLocalMessages = new Map( + historyRecoveryLocalMessagesRef.current.get(cacheKey) ?? [] + ); + for (const message of messages) { + if (recoveryLocalIds.has(message.id) && !message.queued) { + recoveryLocalMessages.set(message.id, message); + } + } + historyRecoveryLocalMessagesRef.current.set(cacheKey, recoveryLocalMessages); + historyRecoveryRetryCountsRef.current.set(cacheKey, 0); + } + const cancellation = cancelActiveDispatch(); + setHistoryLoaded(true); + await cancellation; try { - await adapter.clearHistory(sessionId); - } catch (err) { console.error('[useChat] clear history failed:', err); } - setMessages([]); + await clearHistoryAfterAbort(workspaceId, sessionId); + clearSucceededThreadsRef.current.add(cacheKey); + // The user may have switched A -> B -> A while DELETE A was pending, + // starting a fresh GET A after the invalidation above. Invalidate that + // exact thread's newer snapshot without disturbing an active B fetch. + const currentHistory = pendingHistoryRef.current; + if (currentHistory?.cacheKey === cacheKey) { + historyGenerationRef.current += 1; + currentHistory.release(); + pendingHistoryRef.current = null; + } + const currentThread = currentThreadRef.current; + if ( + currentThread.workspaceId === workspaceId + && currentThread.sessionId === sessionId + ) { + setMessages([]); + setHistoryLoaded(true); + } + writeChatThreadCache(cacheKey, []); + } catch (err) { + console.error('[useChat] clear history failed:', err); + if (activeDispatch) { + const settleCanceledAssistant = (message: ChatMessage): ChatMessage => ( + message.id === activeDispatch.assistantId && message.draft + ? { + ...message, + blocks: settleRunningBlocks(message.blocks || [], 'Clear failed'), + draft: { ...message.draft, status: 'stopped' as const }, + ...(message.tools && { tools: settleRunningTools(message.tools, 'Clear failed') }), + } + : message + ); + setMessages(prev => prev.map(settleCanceledAssistant)); + const recoveryLocalMessages = historyRecoveryLocalMessagesRef.current.get(cacheKey); + if (recoveryLocalMessages) { + const nextRecoveryLocalMessages = new Map(recoveryLocalMessages); + const assistant = nextRecoveryLocalMessages.get(activeDispatch.assistantId); + if (assistant) { + nextRecoveryLocalMessages.set( + activeDispatch.assistantId, + settleCanceledAssistant(assistant) + ); + } + historyRecoveryLocalMessagesRef.current.set(cacheKey, nextRecoveryLocalMessages); + } + } + } finally { + const remaining = (clearCounts.get(cacheKey) ?? 1) - 1; + if (remaining <= 0) { + clearCounts.delete(cacheKey); + const shouldRecoverHistory = ( + !clearSucceededThreadsRef.current.has(cacheKey) + && clearNeedsHistoryRecoveryRef.current.has(cacheKey) + ); + clearSucceededThreadsRef.current.delete(cacheKey); + clearNeedsHistoryRecoveryRef.current.delete(cacheKey); + const currentThread = currentThreadRef.current; + if (shouldRecoverHistory) { + recoveringHistoryThreadsRef.current.add(cacheKey); + if (!historyRecoveryLocalIdsRef.current.has(cacheKey)) { + historyRecoveryLocalIdsRef.current.set(cacheKey, new Set()); + } + if (!historyRecoveryLocalMessagesRef.current.has(cacheKey)) { + historyRecoveryLocalMessagesRef.current.set(cacheKey, new Map()); + } + if (!historyRecoveryRetryCountsRef.current.has(cacheKey)) { + historyRecoveryRetryCountsRef.current.set(cacheKey, 0); + } + if ( + currentThread.workspaceId === workspaceId + && currentThread.sessionId === sessionId + ) { + setHistoryLoaded(false); + setHistoryReloadRevision(revision => revision + 1); + } + } else { + recoveringHistoryThreadsRef.current.delete(cacheKey); + historyRecoveryLocalIdsRef.current.delete(cacheKey); + historyRecoveryLocalMessagesRef.current.delete(cacheKey); + historyRecoveryRetryCountsRef.current.delete(cacheKey); + } + } else { + clearCounts.set(cacheKey, remaining); + } + } } - }, [sessionId]); + }, [sessionId, workspaceId, messages, cancelActiveDispatch]); const approveAction = useCallback(async ( requestId: string, approved: boolean, opts: { always?: boolean } = {}, ) => { + const approval = pendingApproval; + if (!approval || approval.requestId !== requestId) return; try { await adapter.respondApproval(requestId, approved, { always: opts.always, // Phase B.3: echo the source workspace we received on the SSE event // back to the backend so the grant stays scoped to this workspace. - sourceWorkspaceId: pendingApproval?.sourceWorkspaceId ?? null, + sourceWorkspaceId: approval.sourceWorkspaceId ?? null, }); } catch (err) { console.error('[useChat] approval response failed:', err); + return; } - setPendingApproval(null); + setPendingApproval(current => + current?.requestId === requestId ? null : current + ); }, [pendingApproval]); return { messages, isLoading, historyLoaded, sendMessage, retryLastFailed, stopStreaming, clearHistory, pendingApproval, approveAction }; diff --git a/apps/web/src/hooks/useHasWorkingModel.test.ts b/apps/web/src/hooks/useHasWorkingModel.test.ts index 04e597f..1f17bbb 100644 --- a/apps/web/src/hooks/useHasWorkingModel.test.ts +++ b/apps/web/src/hooks/useHasWorkingModel.test.ts @@ -1,36 +1,35 @@ -/** - * PR5 Phase A — the shared "≥1 working model" gate signal (cloud key OR local - * model), composed from the same /api/providers data the Settings Models tab - * reads. - */ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; -import { renderHook, waitFor, cleanup } from '@testing-library/react'; +import { act, cleanup, renderHook, waitFor } from '@testing-library/react'; const mocks = vi.hoisted(() => ({ adapter: { getProviders: vi.fn(), getLocalInferenceStatus: vi.fn(), + probeModel: vi.fn(), + probeProvider: vi.fn(), }, })); vi.mock('@/lib/adapter', () => ({ adapter: mocks.adapter, default: vi.fn() })); import { useHasWorkingModel } from './useHasWorkingModel'; -const providers = (...withKey: boolean[]) => ({ - providers: withKey.map((hasKey, i) => ({ id: `p${i}`, name: `P${i}`, hasKey, badge: null, keyUrl: null, requiresKey: true, models: [] })), - search: [], - activeSearch: 'duckduckgo', -}); - const providerRows = (...rows: Array<{ id: string; hasKey: boolean; requiresKey: boolean }>) => ({ providers: rows.map((row) => ({ ...row, name: row.id, badge: null, keyUrl: null, models: [] })), search: [], activeSearch: 'duckduckgo', }); +function deferred() { + let resolve!: (value: T) => void; + const promise = new Promise((resolvePromise) => { resolve = resolvePromise; }); + return { promise, resolve }; +} + beforeEach(() => { - mocks.adapter.getProviders.mockResolvedValue(providers()); + mocks.adapter.getProviders.mockResolvedValue(providerRows()); mocks.adapter.getLocalInferenceStatus.mockResolvedValue({ servers: [], ollamaInstalled: false, totalLocalModels: 0 }); + mocks.adapter.probeModel.mockResolvedValue({ model: null, configured: false, verified: false }); + mocks.adapter.probeProvider.mockResolvedValue({ configured: false, valid: false, verified: false }); }); afterEach(() => { cleanup(); vi.clearAllMocks(); }); @@ -39,39 +38,211 @@ describe('useHasWorkingModel', () => { const { result } = renderHook(() => useHasWorkingModel()); await waitFor(() => expect(result.current.loading).toBe(false)); expect(result.current).toMatchObject({ hasWorkingModel: false, cloudReady: false, localReady: false }); + expect(mocks.adapter.probeModel).not.toHaveBeenCalled(); }); - it('a keyed cloud provider → cloudReady → working', async () => { - mocks.adapter.getProviders.mockResolvedValue(providers(false, true)); + it('a verified default model is ready without provider fallback', async () => { + mocks.adapter.getProviders.mockResolvedValue(providerRows({ id: 'p0', hasKey: true, requiresKey: true })); + mocks.adapter.probeModel.mockResolvedValue({ model: 'p0/model', configured: true, verified: true }); const { result } = renderHook(() => useHasWorkingModel()); - await waitFor(() => expect(result.current.hasWorkingModel).toBe(true)); - expect(result.current.cloudReady).toBe(true); - expect(result.current.localReady).toBe(false); + await waitFor(() => expect(result.current.loading).toBe(false)); + expect(result.current).toMatchObject({ hasWorkingModel: true, cloudReady: true }); + expect(mocks.adapter.probeProvider).not.toHaveBeenCalled(); }); - it('a detected local model (no cloud key) → localReady → working', async () => { + it('a rejected default model blocks a keyed provider', async () => { + mocks.adapter.getProviders.mockResolvedValue(providerRows({ id: 'p0', hasKey: true, requiresKey: true })); + mocks.adapter.probeModel.mockResolvedValue({ model: 'p0/model', configured: true, verified: false, rejected: true }); + const { result } = renderHook(() => useHasWorkingModel()); + await waitFor(() => expect(result.current.loading).toBe(false)); + expect(result.current).toMatchObject({ hasWorkingModel: false, cloudReady: false }); + expect(mocks.adapter.probeProvider).not.toHaveBeenCalled(); + }); + + it('a transient default result remains usable after probing settles', async () => { + const modelProbe = deferred<{ model: string; configured: boolean; verified: boolean }>(); + mocks.adapter.getProviders.mockResolvedValue(providerRows({ id: 'p0', hasKey: true, requiresKey: true })); + mocks.adapter.probeModel.mockReturnValue(modelProbe.promise); + const { result } = renderHook(() => useHasWorkingModel()); + await waitFor(() => expect(mocks.adapter.probeModel).toHaveBeenCalledTimes(1)); + expect(result.current).toMatchObject({ loading: true, cloudReady: false, hasWorkingModel: false }); + await act(async () => { modelProbe.resolve({ model: 'p0/model', configured: true, verified: false }); }); + await waitFor(() => expect(result.current.loading).toBe(false)); + expect(result.current).toMatchObject({ hasWorkingModel: true, cloudReady: true }); + }); + + it('a keyed cloud provider is ready only after its fallback probe verifies it', async () => { + mocks.adapter.getProviders.mockResolvedValue(providerRows({ id: 'p0', hasKey: true, requiresKey: true })); + mocks.adapter.probeProvider.mockResolvedValue({ configured: true, valid: true, verified: true }); + const { result } = renderHook(() => useHasWorkingModel()); + await waitFor(() => expect(result.current.loading).toBe(false)); + expect(result.current).toMatchObject({ hasWorkingModel: true, cloudReady: true, localReady: false }); + expect(mocks.adapter.probeModel).toHaveBeenCalledTimes(1); + expect(mocks.adapter.probeProvider).toHaveBeenCalledWith('p0'); + }); + + it('a rejected fallback provider is not ready', async () => { + mocks.adapter.getProviders.mockResolvedValue(providerRows({ id: 'p0', hasKey: true, requiresKey: true })); + mocks.adapter.probeProvider.mockResolvedValue({ configured: true, valid: false, verified: true, error: 'rejected' }); + const { result } = renderHook(() => useHasWorkingModel()); + await waitFor(() => expect(result.current.loading).toBe(false)); + expect(result.current).toMatchObject({ hasWorkingModel: false, cloudReady: false }); + }); + + it('a valid but unverified fallback provider remains usable after probing settles', async () => { + mocks.adapter.getProviders.mockResolvedValue(providerRows({ id: 'p0', hasKey: true, requiresKey: true })); + mocks.adapter.probeProvider.mockResolvedValue({ configured: true, valid: true, verified: false }); + const { result } = renderHook(() => useHasWorkingModel()); + await waitFor(() => expect(result.current.loading).toBe(false)); + expect(result.current).toMatchObject({ hasWorkingModel: true, cloudReady: true }); + }); + + it('all unconfigured probes are not ready', async () => { + mocks.adapter.getProviders.mockResolvedValue(providerRows({ id: 'p0', hasKey: true, requiresKey: true })); + const { result } = renderHook(() => useHasWorkingModel()); + await waitFor(() => expect(result.current.loading).toBe(false)); + expect(result.current).toMatchObject({ hasWorkingModel: false, cloudReady: false }); + }); + + it('a pending cloud probe stays loading and non-ready', async () => { + const modelProbe = deferred<{ model: string; configured: boolean; verified: boolean }>(); + mocks.adapter.getProviders.mockResolvedValue(providerRows({ id: 'p0', hasKey: true, requiresKey: true })); + mocks.adapter.probeModel.mockReturnValue(modelProbe.promise); + const { result } = renderHook(() => useHasWorkingModel()); + await waitFor(() => expect(mocks.adapter.probeModel).toHaveBeenCalledTimes(1)); + expect(result.current).toMatchObject({ loading: true, cloudReady: false, hasWorkingModel: false }); + }); + + it('a detected local model overrides a rejected cloud default', async () => { + mocks.adapter.getProviders.mockResolvedValue(providerRows({ id: 'p0', hasKey: true, requiresKey: true })); + mocks.adapter.probeModel.mockResolvedValue({ model: 'p0/model', configured: true, verified: false, rejected: true }); mocks.adapter.getLocalInferenceStatus.mockResolvedValue({ servers: [], ollamaInstalled: true, totalLocalModels: 2 }); const { result } = renderHook(() => useHasWorkingModel()); - await waitFor(() => expect(result.current.hasWorkingModel).toBe(true)); - expect(result.current.cloudReady).toBe(false); - expect(result.current.localReady).toBe(true); + await waitFor(() => expect(result.current.loading).toBe(false)); + expect(result.current).toMatchObject({ hasWorkingModel: true, cloudReady: false, localReady: true }); + expect(mocks.adapter.probeModel).toHaveBeenCalledTimes(1); }); - it('does not count keyless local providers as cloud keys', async () => { + it('an installed local runtime with zero models is not ready', async () => { + mocks.adapter.getLocalInferenceStatus.mockResolvedValue({ servers: [], ollamaInstalled: true, totalLocalModels: 0 }); + const { result } = renderHook(() => useHasWorkingModel()); + await waitFor(() => expect(result.current.loading).toBe(false)); + expect(result.current).toMatchObject({ hasWorkingModel: false, localReady: false }); + }); + + it('does not count a keyless local provider as cloud readiness', async () => { mocks.adapter.getProviders.mockResolvedValue(providerRows({ id: 'ollama', hasKey: true, requiresKey: false })); mocks.adapter.getLocalInferenceStatus.mockResolvedValue({ servers: [], ollamaInstalled: true, totalLocalModels: 2 }); const { result } = renderHook(() => useHasWorkingModel()); - await waitFor(() => expect(result.current.hasWorkingModel).toBe(true)); - expect(result.current.cloudReady).toBe(false); - expect(result.current.localReady).toBe(true); + await waitFor(() => expect(result.current.loading).toBe(false)); + expect(result.current).toMatchObject({ cloudReady: false, localReady: true, hasWorkingModel: true }); + expect(mocks.adapter.probeModel).not.toHaveBeenCalled(); }); - it('a local-inference probe failure degrades to no-local (cloud can still pass)', async () => { + it('a local-inference probe failure degrades to no local model', async () => { mocks.adapter.getLocalInferenceStatus.mockRejectedValue(new Error('ollama down')); - mocks.adapter.getProviders.mockResolvedValue(providers(true)); const { result } = renderHook(() => useHasWorkingModel()); await waitFor(() => expect(result.current.loading).toBe(false)); + expect(result.current).toMatchObject({ localReady: false, hasWorkingModel: false }); + }); + + it('refresh reprobes unchanged provider ids after a key replacement', async () => { + mocks.adapter.getProviders.mockResolvedValue(providerRows({ id: 'p0', hasKey: true, requiresKey: true })); + mocks.adapter.probeModel + .mockResolvedValueOnce({ model: 'p0/model', configured: true, verified: true }) + .mockResolvedValueOnce({ model: 'p0/model', configured: true, verified: false, rejected: true }); + const { result } = renderHook(() => useHasWorkingModel()); + await waitFor(() => expect(result.current.hasWorkingModel).toBe(true)); + act(() => { result.current.refresh(); }); + await waitFor(() => expect(mocks.adapter.probeModel).toHaveBeenCalledTimes(2)); + await waitFor(() => expect(result.current.loading).toBe(false)); + expect(result.current).toMatchObject({ hasWorkingModel: false, cloudReady: false }); + }); + + it('a late old cloud success cannot overwrite a newer rejection', async () => { + const oldProbe = deferred<{ model: string; configured: boolean; verified: boolean; rejected?: boolean }>(); + const newProbe = deferred<{ model: string; configured: boolean; verified: boolean; rejected?: boolean }>(); + mocks.adapter.getProviders.mockResolvedValue(providerRows({ id: 'p0', hasKey: true, requiresKey: true })); + mocks.adapter.probeModel.mockReturnValueOnce(oldProbe.promise).mockReturnValueOnce(newProbe.promise); + const { result } = renderHook(() => useHasWorkingModel()); + await waitFor(() => expect(mocks.adapter.probeModel).toHaveBeenCalledTimes(1)); + act(() => { result.current.refresh(); }); + await waitFor(() => expect(mocks.adapter.probeModel).toHaveBeenCalledTimes(2)); + await act(async () => { newProbe.resolve({ model: 'p0/model', configured: true, verified: false, rejected: true }); }); + await waitFor(() => expect(result.current.loading).toBe(false)); + await act(async () => { oldProbe.resolve({ model: 'p0/model', configured: true, verified: true }); }); + expect(result.current).toMatchObject({ hasWorkingModel: false, cloudReady: false }); + }); + + it('a late old local positive result cannot overwrite a newer zero-model refresh', async () => { + const oldLocal = deferred<{ servers: never[]; ollamaInstalled: boolean; totalLocalModels: number }>(); + const newLocal = deferred<{ servers: never[]; ollamaInstalled: boolean; totalLocalModels: number }>(); + mocks.adapter.getLocalInferenceStatus.mockReturnValueOnce(oldLocal.promise).mockReturnValueOnce(newLocal.promise); + const { result } = renderHook(() => useHasWorkingModel()); + await waitFor(() => expect(mocks.adapter.getLocalInferenceStatus).toHaveBeenCalledTimes(1)); + act(() => { result.current.refresh(); }); + await waitFor(() => expect(mocks.adapter.getLocalInferenceStatus).toHaveBeenCalledTimes(2)); + await act(async () => { newLocal.resolve({ servers: [], ollamaInstalled: true, totalLocalModels: 0 }); }); + await waitFor(() => expect(result.current.loading).toBe(false)); + await act(async () => { oldLocal.resolve({ servers: [], ollamaInstalled: true, totalLocalModels: 2 }); }); expect(result.current.localReady).toBe(false); - expect(result.current.hasWorkingModel).toBe(true); // cloud key carries it + }); + + it('reprobes a same-id provider array returned by a window-focus refresh', async () => { + mocks.adapter.getProviders + .mockResolvedValueOnce(providerRows({ id: 'p0', hasKey: true, requiresKey: true })) + .mockResolvedValueOnce(providerRows({ id: 'p0', hasKey: true, requiresKey: true })); + mocks.adapter.probeModel + .mockResolvedValueOnce({ model: 'p0/model', configured: true, verified: true }) + .mockResolvedValueOnce({ model: 'p0/model', configured: true, verified: false, rejected: true }); + const { result } = renderHook(() => useHasWorkingModel()); + await waitFor(() => expect(result.current.hasWorkingModel).toBe(true)); + act(() => { window.dispatchEvent(new Event('focus')); }); + await waitFor(() => expect(mocks.adapter.probeModel).toHaveBeenCalledTimes(2)); + await waitFor(() => expect(result.current.loading).toBe(false)); + expect(result.current).toMatchObject({ hasWorkingModel: false, cloudReady: false }); + }); + + it('treats unavailable fallback probes as transient usable readiness', async () => { + mocks.adapter.getProviders.mockResolvedValue(providerRows( + { id: 'p0', hasKey: true, requiresKey: true }, + { id: 'p1', hasKey: true, requiresKey: true }, + )); + mocks.adapter.probeProvider.mockRejectedValue(new Error('sidecar offline')); + const { result } = renderHook(() => useHasWorkingModel()); + await waitFor(() => expect(result.current.loading).toBe(false)); + expect(result.current).toMatchObject({ hasWorkingModel: true, cloudReady: true }); + }); + + it('uses only refreshed p1 results when an explicit refresh replaces p0', async () => { + const oldP0Probe = deferred<{ configured: boolean; valid: boolean; verified: boolean }>(); + mocks.adapter.getProviders + .mockResolvedValueOnce(providerRows({ id: 'p0', hasKey: true, requiresKey: true })) + .mockResolvedValueOnce(providerRows({ id: 'p1', hasKey: true, requiresKey: true })); + mocks.adapter.probeModel.mockResolvedValue({ model: null, configured: false, verified: false }); + mocks.adapter.probeProvider.mockImplementation((id: string) => id === 'p0' + ? oldP0Probe.promise + : Promise.resolve({ configured: true, valid: false, verified: true })); + const { result } = renderHook(() => useHasWorkingModel()); + await waitFor(() => expect(mocks.adapter.probeProvider).toHaveBeenCalledWith('p0')); + act(() => { result.current.refresh(); }); + await waitFor(() => expect(mocks.adapter.probeProvider).toHaveBeenCalledWith('p1')); + await waitFor(() => expect(result.current).toMatchObject({ loading: false, cloudReady: false })); + await act(async () => { oldP0Probe.resolve({ configured: true, valid: true, verified: true }); }); + expect(mocks.adapter.probeProvider.mock.calls.map(([id]) => id)).toEqual(['p0', 'p1']); + expect(result.current).toMatchObject({ hasWorkingModel: false, cloudReady: false }); + }); + + it('does no cloud work when unmounted during a deferred explicit provider refresh', async () => { + const refreshProviders = deferred>(); + mocks.adapter.getProviders + .mockResolvedValueOnce(providerRows()) + .mockReturnValueOnce(refreshProviders.promise); + const { result, unmount } = renderHook(() => useHasWorkingModel()); + await waitFor(() => expect(result.current.loading).toBe(false)); + act(() => { result.current.refresh(); }); + unmount(); + await act(async () => { refreshProviders.resolve(providerRows({ id: 'p0', hasKey: true, requiresKey: true })); }); + expect(mocks.adapter.probeModel).not.toHaveBeenCalled(); }); }); diff --git a/apps/web/src/hooks/useHasWorkingModel.ts b/apps/web/src/hooks/useHasWorkingModel.ts index 44ade5a..2509d75 100644 --- a/apps/web/src/hooks/useHasWorkingModel.ts +++ b/apps/web/src/hooks/useHasWorkingModel.ts @@ -1,59 +1,144 @@ -import { useCallback, useEffect, useState } from 'react'; +import { useCallback, useEffect, useRef, useState } from 'react'; import { adapter } from '@/lib/adapter'; import { useProviders } from './useProviders'; /** - * useHasWorkingModel — the shared "≥1 working model" signal for the PR5 model - * gate (Onboarding step 3's HARD gate AND the Settings→Models banner). A model - * is "working" if either a cloud provider has a key configured OR a local model - * is detected. This is a UX affordance, not a security boundary — the real - * LLM-availability enforcement happens server-side at chat time — so it derives - * from already-fetched data (no live key-probe required to compute readiness). - * - * Composing useProviders keeps a single source of truth (the same /api/providers - * hasKey data the Settings Models tab reads), so the gate and the banner can - * never disagree about what counts as ready. + * Shared model-readiness signal for the onboarding hard gate and Models banner. + * Cloud keys are live-probed; a detected local model is independently sufficient. */ export interface WorkingModelState { - /** cloudReady || localReady — the hard-gate predicate. */ hasWorkingModel: boolean; - /** ≥1 cloud provider has a key in the vault. */ cloudReady: boolean; - /** ≥1 local model detected (Ollama/vLLM). */ localReady: boolean; loading: boolean; refresh: () => void; } export function useHasWorkingModel(): WorkingModelState { - const { activeProviders, loading: providersLoading, refresh: refreshProviders } = useProviders(); + const { providers, activeProviders, loading: providersLoading, refresh: refreshProviders } = useProviders(); const [localModelCount, setLocalModelCount] = useState(0); const [localLoading, setLocalLoading] = useState(true); + const [cloud, setCloud] = useState({ ready: false, loading: true }); + const mounted = useRef(true); + const localGeneration = useRef(0); + const cloudGeneration = useRef(0); + const explicitCloudRefresh = useRef(null); + const explicitProviders = useRef(null); + const activeProviderIds = useRef([]); + activeProviderIds.current = activeProviders.map((provider) => provider.id); const refreshLocal = useCallback(async () => { - setLocalLoading(true); + const generation = ++localGeneration.current; + if (mounted.current) { + setLocalModelCount(0); + setLocalLoading(true); + } try { const status = await adapter.getLocalInferenceStatus(); - setLocalModelCount(status?.totalLocalModels ?? 0); + if (mounted.current && generation === localGeneration.current) setLocalModelCount(status?.totalLocalModels ?? 0); } catch { - // Local-inference probe failed (Ollama not installed / unreachable) — - // treat as "no local model"; a cloud key can still make the gate pass. - setLocalModelCount(0); + if (mounted.current && generation === localGeneration.current) setLocalModelCount(0); } finally { - setLocalLoading(false); + if (mounted.current && generation === localGeneration.current) setLocalLoading(false); } }, []); - useEffect(() => { void refreshLocal(); }, [refreshLocal]); + const probeCloud = useCallback(async (providerIds: string[], generation: number) => { + const setCloudForGeneration = (next: { ready: boolean; loading: boolean }) => { + if (mounted.current && generation === cloudGeneration.current) setCloud(next); + }; + if (!mounted.current || generation !== cloudGeneration.current) return; + setCloudForGeneration({ ready: false, loading: true }); - const cloudReady = activeProviders.length > 0; + if (providerIds.length === 0) { + setCloudForGeneration({ ready: false, loading: false }); + return; + } + + let defaultProbe: Awaited> | null = null; + try { + defaultProbe = await adapter.probeModel(); + } catch { + // An unavailable default-model probe falls back to the keyed providers. + } + if (!mounted.current || generation !== cloudGeneration.current) return; + + if (defaultProbe?.configured) { + if (defaultProbe.verified) { + setCloudForGeneration({ ready: true, loading: false }); + return; + } + if (defaultProbe.rejected) { + setCloudForGeneration({ ready: false, loading: false }); + return; + } + setCloudForGeneration({ ready: true, loading: false }); + return; + } + + const outcomes = await Promise.allSettled(providerIds.map((id) => adapter.probeProvider(id))); + if (!mounted.current || generation !== cloudGeneration.current) return; + const probes = outcomes.flatMap((outcome) => outcome.status === 'fulfilled' ? [outcome.value] : []); + const verified = probes.some((probe) => probe.configured && probe.valid !== false && probe.verified); + const rejected = probes.some((probe) => probe.configured && probe.valid === false); + const transient = outcomes.some((outcome) => outcome.status === 'rejected') + || probes.some((probe) => probe.configured && probe.valid !== false); + setCloudForGeneration({ ready: verified || (!rejected && transient), loading: false }); + }, []); + + useEffect(() => { + mounted.current = true; + return () => { + mounted.current = false; + cloudGeneration.current += 1; + localGeneration.current += 1; + }; + }, []); + + useEffect(() => { + if (providersLoading) return; + if (explicitCloudRefresh.current === cloudGeneration.current) { + if (explicitProviders.current === providers) { + explicitCloudRefresh.current = null; + explicitProviders.current = null; + return; + } + explicitCloudRefresh.current = null; + explicitProviders.current = null; + } + const generation = ++cloudGeneration.current; + void probeCloud(activeProviderIds.current, generation); + }, [probeCloud, providers, providersLoading]); + + useEffect(() => { + void refreshLocal(); + }, [refreshLocal]); + + const refresh = useCallback(() => { + const generation = ++cloudGeneration.current; + explicitCloudRefresh.current = generation; + if (mounted.current) setCloud({ ready: false, loading: true }); + void refreshLocal(); + void (async () => { + const data = await refreshProviders(); + if (!mounted.current || generation !== cloudGeneration.current) return; + const ids = data + ? data.providers.filter((provider) => provider.hasKey && provider.requiresKey).map((provider) => provider.id) + : activeProviderIds.current; + explicitProviders.current = data?.providers ?? null; + await probeCloud(ids, generation); + if (mounted.current && generation === cloudGeneration.current && !data) explicitCloudRefresh.current = null; + })(); + }, [probeCloud, refreshLocal, refreshProviders]); + + const cloudReady = cloud.ready; const localReady = localModelCount > 0; return { hasWorkingModel: cloudReady || localReady, cloudReady, localReady, - loading: providersLoading || localLoading, - refresh: () => { refreshProviders(); void refreshLocal(); }, + loading: providersLoading || cloud.loading || localLoading, + refresh, }; } diff --git a/apps/web/src/hooks/useWorkspaces.ts b/apps/web/src/hooks/useWorkspaces.ts index 3e88265..14c3423 100644 --- a/apps/web/src/hooks/useWorkspaces.ts +++ b/apps/web/src/hooks/useWorkspaces.ts @@ -2,6 +2,7 @@ import { useState, useCallback, useEffect } from 'react'; import { adapter } from '@/lib/adapter'; import type { Workspace } from '@/lib/types'; import { useRevalidateOnError } from '@/hooks/useRevalidateOnError'; +import { toast } from '@/hooks/use-toast'; import { resolveActiveWorkspaceId, readPersistedWorkspaceId, @@ -41,7 +42,7 @@ export const useWorkspaces = () => { // P1b D3 plus-clause: errored list revalidates on focus/online/connect-settled. useRevalidateOnError(error !== null, fetchWorkspaces); - const createWorkspace = useCallback(async (data: { name: string; group: string; persona?: string; agentGroupId?: string; shared?: boolean; templateId?: string }) => { + const createWorkspace = useCallback(async (data: { name: string; group: string; persona?: string; agentGroupId?: string; shared?: boolean; templateId?: string; storageType?: Workspace['storageType']; storagePath?: string; storageConfig?: Record }) => { try { const ws = await adapter.createWorkspace(data); setWorkspaces(prev => [...prev, ws]); @@ -49,23 +50,15 @@ export const useWorkspaces = () => { persistWorkspaceId(ws.id); return ws; } catch (err) { - console.error('[useWorkspaces] create failed, using local fallback:', err); - const localWs: Workspace = { - id: `local-${Date.now()}`, - name: data.name, - group: data.group, - persona: data.persona, - shared: data.shared, - templateId: data.templateId, - health: 'healthy', - memoryCount: 0, - sessionCount: 0, - lastActive: new Date().toISOString(), - }; - setWorkspaces(prev => [...prev, localWs]); - setActiveWorkspaceId(localWs.id); - persistWorkspaceId(localWs.id); - return localWs; + console.error('[useWorkspaces] create failed:', err); + const message = err instanceof Error ? err.message : 'Failed to create workspace'; + setError(message); + toast({ + title: "Couldn't create workspace", + description: message, + variant: 'destructive', + }); + return null; } }, []); diff --git a/apps/web/src/index.css b/apps/web/src/index.css index 09f1115..d8d0c28 100644 --- a/apps/web/src/index.css +++ b/apps/web/src/index.css @@ -1,5 +1,3 @@ -@import url('https://fonts.googleapis.com/css2?family=Hanken+Grotesk:wght@300;400;500;600;700;800&family=JetBrains+Mono:wght@400;500;600&display=swap'); - /* Import Hive DS theme aliases and utility classes */ @import "./waggle-theme.css"; diff --git a/apps/web/src/lib/adapter.authgate.test.ts b/apps/web/src/lib/adapter.authgate.test.ts index d1dee7d..026ae6a 100644 --- a/apps/web/src/lib/adapter.authgate.test.ts +++ b/apps/web/src/lib/adapter.authgate.test.ts @@ -17,6 +17,7 @@ import LocalAdapter, { adapter as singletonAdapter, resolveDefaultServerUrl, } from './adapter'; +import { fetchWithTimeout } from './fetch-utils'; const BASE = 'http://test-server:4242'; @@ -25,6 +26,38 @@ const jsonRes = (body: unknown, status = 200) => const HEALTH = { status: 'ok', mode: 'local' }; const TOKEN_PATH = '/api/auth/session-token'; +const DESKTOP_A = { port: 49151, instanceId: 'desktop-instance-a' }; +const DESKTOP_B = { port: 49152, instanceId: 'desktop-instance-b' }; + +const desktopHealth = (endpoint = DESKTOP_A) => ({ + ...HEALTH, + port: endpoint.port, + instanceId: endpoint.instanceId, +}); + +const enableTauri = () => { + (window as unknown as { __TAURI_INTERNALS__: unknown }).__TAURI_INTERNALS__ = {}; +}; + +const flush = () => new Promise(resolve => setTimeout(resolve, 0)); + +class FakeEventSource { + static instances: FakeEventSource[] = []; + readonly url: string; + onmessage: ((event: MessageEvent) => void) | null = null; + onerror: (() => void) | null = null; + onopen: (() => void) | null = null; + closed = false; + + constructor(url: string) { + this.url = url; + FakeEventSource.instances.push(this); + } + + addEventListener(): void { /* listeners are irrelevant to the identity gate */ } + close(): void { this.closed = true; } + fireError(): void { this.onerror?.(); } +} /** Route-style fetch mock: dispatch on URL substring, in registration order. */ function routeMock(fetchSpy: ReturnType, routes: Array<[string, () => Response | Promise]>) { @@ -49,6 +82,8 @@ describe('P1b auth gate', () => { }); afterEach(() => { + delete (window as unknown as { __TAURI_INTERNALS__?: unknown }).__TAURI_INTERNALS__; + vi.unstubAllGlobals(); fetchSpy.mockRestore(); vi.useRealTimers(); }); @@ -204,6 +239,408 @@ describe('P1b auth gate', () => { expect(callsTo(fetchSpy, TOKEN_PATH)).toHaveLength(0); }); + // ── Rust-owned desktop endpoint gate ───────────────────────────────────── + + it('managed desktop stays network-cold and hides default/stored URLs until Rust binds an endpoint', async () => { + enableTauri(); + localStorage.setItem('waggle:server-url', 'http://stale-or-hostile:9999'); + const a = new LocalAdapter('http://constructor-override:8888'); + const gateId = a.armDesktopServiceGate(); + const request = a.getWorkspaces(); + const healthRequest = a.getSystemHealth(); + const rejected = expect(request).rejects.toThrow('desktop boot stopped'); + const healthRejected = expect(healthRequest).rejects.toThrow('desktop boot stopped'); + + await Promise.resolve(); + expect(fetchSpy).not.toHaveBeenCalled(); + expect(() => a.getServerUrl()).toThrow(/not ready/); + + a.failDesktopServiceGate(new Error('desktop boot stopped'), gateId); + await Promise.all([rejected, healthRejected]); + expect(fetchSpy).not.toHaveBeenCalled(); + expect(localStorage.getItem('waggle:server-url')).toBe('http://stale-or-hostile:9999'); + }); + + it('managed desktop uses only the matching Rust-owned endpoint and never persists it', async () => { + enableTauri(); + localStorage.setItem('waggle:server-url', 'http://stale-or-hostile:9999'); + const a = new LocalAdapter(BASE); + routeMock(fetchSpy, [ + ['/health', () => jsonRes(desktopHealth(DESKTOP_A))], + [TOKEN_PATH, () => jsonRes({ token: 'desktop-token-a' })], + ['/api/workspaces', () => jsonRes([])], + ]); + + const gateId = a.armDesktopServiceGate(); + await a.connectDesktopService(DESKTOP_A, gateId); + await a.getWorkspaces(); + + expect(a.getServerUrl()).toBe(`http://127.0.0.1:${DESKTOP_A.port}`); + expect(localStorage.getItem('waggle:server-url')).toBe('http://stale-or-hostile:9999'); + expect(callsTo(fetchSpy, '/health')).toHaveLength(2); + const [workspaceUrl, workspaceInit] = callsTo(fetchSpy, '/api/workspaces')[0]; + expect(workspaceUrl).toBe(`http://127.0.0.1:${DESKTOP_A.port}/api/workspaces`); + expect((workspaceInit.headers as Record).Authorization) + .toBe('Bearer desktop-token-a'); + }); + + it('managed 401 recovery revalidates identity before retrying on the same port', async () => { + enableTauri(); + const a = new LocalAdapter(BASE); + let health = desktopHealth(DESKTOP_A); + let token = 'desktop-token-a'; + let workspaceCalls = 0; + routeMock(fetchSpy, [ + ['/health', () => jsonRes(health)], + [TOKEN_PATH, () => jsonRes({ token })], + ['/api/workspaces', () => { + workspaceCalls++; + return jsonRes({ error: 'Unauthorized' }, 401); + }], + ]); + + const gateId = a.armDesktopServiceGate(); + await a.connectDesktopService(DESKTOP_A, gateId); + health = { ...desktopHealth(DESKTOP_B), port: DESKTOP_A.port }; + token = 'desktop-token-b'; + + await expect(a.getWorkspaces()).rejects.toThrow(/identity/); + expect(workspaceCalls).toBe(1); + expect(callsTo(fetchSpy, TOKEN_PATH)).toHaveLength(2); + expect(() => a.getServerUrl()).toThrow(/not ready/); + }); + + it('a post-ready managed health failure closes the verified desktop gate', async () => { + enableTauri(); + const a = new LocalAdapter(BASE); + routeMock(fetchSpy, [ + ['/health', () => jsonRes(desktopHealth(DESKTOP_A))], + [TOKEN_PATH, () => jsonRes({ token: 'desktop-token-a' })], + ]); + + const gateId = a.armDesktopServiceGate(); + await a.connectDesktopService(DESKTOP_A, gateId); + fetchSpy.mockRejectedValue(new TypeError('managed sidecar disappeared')); + + await expect(a.getSystemHealth()).rejects.toThrow(); + expect(a.isConnected).toBe(false); + expect(() => a.getServerUrl()).toThrow(/not ready/); + }); + + it('wrong desktop identity rejects the binding, shared connect, and queued request without token leakage', async () => { + enableTauri(); + const a = new LocalAdapter(BASE); + routeMock(fetchSpy, [ + ['/health', () => jsonRes(desktopHealth(DESKTOP_B))], + [TOKEN_PATH, () => jsonRes({ token: 'must-not-be-fetched' })], + ['/api/workspaces', () => jsonRes([])], + ]); + + const gateId = a.armDesktopServiceGate(); + const binding = a.connectDesktopService(DESKTOP_A, gateId); + const sharedConnect = a.connect(); + const queuedRequest = a.getWorkspaces(); + + await Promise.all([ + expect(binding).rejects.toThrow(/identity/), + expect(sharedConnect).rejects.toThrow(/identity/), + expect(queuedRequest).rejects.toThrow(/identity/), + ]); + expect(callsTo(fetchSpy, TOKEN_PATH)).toHaveLength(0); + expect(callsTo(fetchSpy, '/api/workspaces')).toHaveLength(0); + expect(a.isConnected).toBe(false); + expect(() => a.getServerUrl()).toThrow(/not ready/); + }); + + it('failing the desktop gate while token bootstrap is pending cannot be reopened by its late completion', async () => { + enableTauri(); + const a = new LocalAdapter(BASE); + let releaseToken!: (response: Response) => void; + const tokenGate = new Promise(resolve => { releaseToken = resolve; }); + routeMock(fetchSpy, [ + ['/health', () => jsonRes(desktopHealth(DESKTOP_A))], + [TOKEN_PATH, () => tokenGate], + ['/api/workspaces', () => jsonRes([])], + ]); + + const gateId = a.armDesktopServiceGate(); + const binding = a.connectDesktopService(DESKTOP_A, gateId); + const sharedConnect = a.connect(); + const queuedRequest = a.getWorkspaces(); + await vi.waitFor(() => expect(callsTo(fetchSpy, TOKEN_PATH)).toHaveLength(1)); + + const bindingRejected = expect(binding).rejects.toThrow(/shell stopped|generation changed/); + const sharedRejected = expect(sharedConnect).rejects.toThrow(/superseded|generation changed/); + const queuedRejected = expect(queuedRequest).rejects.toThrow('shell stopped'); + a.failDesktopServiceGate(new Error('shell stopped'), gateId); + releaseToken(jsonRes({ token: 'late-token' })); + + await Promise.all([bindingRejected, sharedRejected, queuedRejected]); + expect(a.isConnected).toBe(false); + expect(callsTo(fetchSpy, '/api/workspaces')).toHaveLength(0); + expect(() => a.getServerUrl()).toThrow(/not ready/); + }); + + it('superseding a token-pending launch rejects stale consumers and releases work only on the newer endpoint', async () => { + enableTauri(); + const a = new LocalAdapter(BASE); + let releaseOldToken!: (response: Response) => void; + const oldTokenGate = new Promise(resolve => { releaseOldToken = resolve; }); + fetchSpy.mockImplementation(async (url: unknown) => { + const value = String(url); + if (value === `http://127.0.0.1:${DESKTOP_A.port}/health`) { + return jsonRes(desktopHealth(DESKTOP_A)); + } + if (value === `http://127.0.0.1:${DESKTOP_A.port}${TOKEN_PATH}`) return oldTokenGate; + if (value === `http://127.0.0.1:${DESKTOP_B.port}/health`) { + return jsonRes(desktopHealth(DESKTOP_B)); + } + if (value === `http://127.0.0.1:${DESKTOP_B.port}${TOKEN_PATH}`) { + return jsonRes({ token: 'desktop-token-b' }); + } + if (value === `http://127.0.0.1:${DESKTOP_B.port}/api/workspaces`) return jsonRes([]); + throw new Error(`unmocked fetch: ${value}`); + }); + + const firstGate = a.armDesktopServiceGate(); + const staleBinding = a.connectDesktopService(DESKTOP_A, firstGate); + const staleConsumer = a.connect(); + await vi.waitFor(() => expect( + callsTo(fetchSpy, `:${DESKTOP_A.port}${TOKEN_PATH}`), + ).toHaveLength(1)); + + const staleBindingRejected = expect(staleBinding).rejects.toThrow(/superseded|changed/); + const staleConsumerRejected = expect(staleConsumer).rejects.toThrow(/superseded|changed/); + const secondGate = a.armDesktopServiceGate(); + const queuedRequest = a.getWorkspaces(); + await a.connectDesktopService(DESKTOP_B, secondGate); + await queuedRequest; + releaseOldToken(jsonRes({ token: 'stale-token-a' })); + await Promise.all([staleBindingRejected, staleConsumerRejected]); + + expect(a.getServerUrl()).toBe(`http://127.0.0.1:${DESKTOP_B.port}`); + expect(a.isConnected).toBe(true); + expect(callsTo(fetchSpy, '/api/workspaces')).toHaveLength(1); + }); + + it('same-gate competing bindings let only the newest endpoint commit or fail the gate', async () => { + enableTauri(); + const a = new LocalAdapter(BASE); + let releaseOldHealth!: (response: Response) => void; + const oldHealthGate = new Promise(resolve => { releaseOldHealth = resolve; }); + fetchSpy.mockImplementation(async (url: unknown) => { + const value = String(url); + if (value === `http://127.0.0.1:${DESKTOP_A.port}/health`) return oldHealthGate; + if (value === `http://127.0.0.1:${DESKTOP_B.port}/health`) { + return jsonRes(desktopHealth(DESKTOP_B)); + } + if (value === `http://127.0.0.1:${DESKTOP_B.port}${TOKEN_PATH}`) { + return jsonRes({ token: 'desktop-token-b' }); + } + if (value === `http://127.0.0.1:${DESKTOP_B.port}/api/workspaces`) return jsonRes([]); + throw new Error(`unmocked fetch: ${value}`); + }); + + const gateId = a.armDesktopServiceGate(); + const staleBinding = a.connectDesktopService(DESKTOP_A, gateId); + const staleRejected = expect(staleBinding).rejects.toThrow(/identity|superseded|changed/); + await vi.waitFor(() => expect(callsTo(fetchSpy, `:${DESKTOP_A.port}/health`)).toHaveLength(1)); + + await a.connectDesktopService(DESKTOP_B, gateId); + await a.getWorkspaces(); + releaseOldHealth(jsonRes(desktopHealth(DESKTOP_A))); + await staleRejected; + + expect(a.getServerUrl()).toBe(`http://127.0.0.1:${DESKTOP_B.port}`); + expect(a.isConnected).toBe(true); + expect(callsTo(fetchSpy, '/api/workspaces')).toHaveLength(1); + }); + + it('a current managed health deadline fails closed instead of releasing queued work', async () => { + vi.useFakeTimers(); + enableTauri(); + const a = new LocalAdapter(BASE); + fetchSpy.mockImplementation(() => new Promise(() => { /* never */ })); + + const gateId = a.armDesktopServiceGate(); + const binding = a.connectDesktopService(DESKTOP_A, gateId); + const queuedRequest = a.getWorkspaces(); + const bindingRejected = expect(binding).rejects.toThrow(/timed out/); + const queuedRejected = expect(queuedRequest).rejects.toThrow(/timed out/); + await vi.advanceTimersByTimeAsync(16000); + await Promise.all([bindingRejected, queuedRejected]); + + expect(a.isConnected).toBe(false); + expect(() => a.getServerUrl()).toThrow(/not ready/); + }); + + it('the outer connect watchdog fails closed when token bootstrap body stalls after healthy identity', async () => { + vi.useFakeTimers(); + enableTauri(); + const a = new LocalAdapter(BASE); + const hangingTokenBody = { + ok: true, + status: 200, + statusText: 'OK', + json: () => new Promise(() => { /* never */ }), + clone() { return this; }, + } as unknown as Response; + routeMock(fetchSpy, [ + ['/health', () => jsonRes(desktopHealth(DESKTOP_A))], + [TOKEN_PATH, () => hangingTokenBody], + ]); + + const gateId = a.armDesktopServiceGate(); + const binding = a.connectDesktopService(DESKTOP_A, gateId); + const queuedRequest = a.getWorkspaces(); + const bindingRejected = expect(binding).rejects.toThrow(/timed out/); + const queuedRejected = expect(queuedRequest).rejects.toThrow(/timed out/); + await vi.advanceTimersByTimeAsync(16000); + await Promise.all([bindingRejected, queuedRejected]); + + expect(callsTo(fetchSpy, '/health')).toHaveLength(1); + expect(callsTo(fetchSpy, TOKEN_PATH)).toHaveLength(1); + expect(a.isConnected).toBe(false); + expect(() => a.getServerUrl()).toThrow(/not ready/); + }); + + it('managed 401 token-body timeout rejects once and closes the verified gate', async () => { + vi.useFakeTimers(); + enableTauri(); + const a = new LocalAdapter(BASE); + let tokenCalls = 0; + let workspaceCalls = 0; + const hangingTokenBody = { + ok: true, + status: 200, + statusText: 'OK', + json: () => new Promise(() => { /* never */ }), + clone() { return this; }, + } as unknown as Response; + routeMock(fetchSpy, [ + ['/health', () => jsonRes(desktopHealth(DESKTOP_A))], + [TOKEN_PATH, () => (++tokenCalls === 1 + ? jsonRes({ token: 'desktop-token-a' }) + : hangingTokenBody)], + ['/api/workspaces', () => { + workspaceCalls++; + return jsonRes({ error: 'Unauthorized' }, 401); + }], + ]); + + const gateId = a.armDesktopServiceGate(); + await a.connectDesktopService(DESKTOP_A, gateId); + const request = a.getWorkspaces(); + const rejected = expect(request).rejects.toThrow(/timed out/); + await vi.advanceTimersByTimeAsync(16000); + await rejected; + + expect(tokenCalls).toBe(2); + expect(workspaceCalls).toBe(1); + expect(a.isConnected).toBe(false); + expect(() => a.getServerUrl()).toThrow(/not ready/); + }); + + it('a stale managed deadline cannot poison a newer verified generation', async () => { + vi.useFakeTimers(); + enableTauri(); + const a = new LocalAdapter(BASE); + fetchSpy.mockImplementation(async (url: unknown) => { + const value = String(url); + if (value === `http://127.0.0.1:${DESKTOP_A.port}/health`) { + return new Promise(() => { /* never */ }); + } + if (value === `http://127.0.0.1:${DESKTOP_B.port}/health`) { + return jsonRes(desktopHealth(DESKTOP_B)); + } + if (value === `http://127.0.0.1:${DESKTOP_B.port}${TOKEN_PATH}`) { + return jsonRes({ token: 'desktop-token-b' }); + } + if (value === `http://127.0.0.1:${DESKTOP_B.port}/api/workspaces`) return jsonRes([]); + throw new Error(`unmocked fetch: ${value}`); + }); + + const firstGate = a.armDesktopServiceGate(); + const staleBinding = a.connectDesktopService(DESKTOP_A, firstGate); + const staleRejected = expect(staleBinding).rejects.toThrow(/timed out/); + await Promise.resolve(); + expect(callsTo(fetchSpy, `:${DESKTOP_A.port}/health`)).toHaveLength(1); + + const secondGate = a.armDesktopServiceGate(); + await a.connectDesktopService(DESKTOP_B, secondGate); + await a.getWorkspaces(); + await vi.advanceTimersByTimeAsync(16000); + await staleRejected; + + expect(a.getServerUrl()).toBe(`http://127.0.0.1:${DESKTOP_B.port}`); + expect(a.isConnected).toBe(true); + }); + + it('desktop gate APIs are inert in the browser and cannot change browser routing', async () => { + const a = new LocalAdapter(BASE); + routeMock(fetchSpy, [['/api/workspaces', () => jsonRes([])]]); + + expect(a.armDesktopServiceGate()).toBe(0); + a.failDesktopServiceGate(new Error('ignored'), 0); + await a.getWorkspaces(); + await expect(a.connectDesktopService(DESKTOP_A, 0)).rejects.toThrow(/only available inside Tauri/); + + expect(a.getServerUrl()).toBe(BASE); + expect(callsTo(fetchSpy, '/api/workspaces')).toHaveLength(1); + }); + + it('managed SSE initial open revalidates identity and never opens on a same-port replacement', async () => { + enableTauri(); + FakeEventSource.instances = []; + vi.stubGlobal('EventSource', FakeEventSource); + const a = new LocalAdapter(BASE); + let health = desktopHealth(DESKTOP_A); + routeMock(fetchSpy, [ + ['/health', () => jsonRes(health)], + [TOKEN_PATH, () => jsonRes({ token: 'desktop-token-a' })], + ]); + + const gateId = a.armDesktopServiceGate(); + await a.connectDesktopService(DESKTOP_A, gateId); + health = { ...desktopHealth(DESKTOP_B), port: DESKTOP_A.port }; + const unsubscribe = a.subscribeNotifications(() => {}); + await flush(); + + expect(FakeEventSource.instances).toHaveLength(0); + expect(() => a.getServerUrl()).toThrow(/not ready/); + unsubscribe(); + }); + + it('managed SSE retry revalidates identity after token refresh and refuses an unverified replacement', async () => { + vi.useFakeTimers(); + enableTauri(); + FakeEventSource.instances = []; + vi.stubGlobal('EventSource', FakeEventSource); + const a = new LocalAdapter(BASE); + let health = desktopHealth(DESKTOP_A); + let token = 'desktop-token-a'; + routeMock(fetchSpy, [ + ['/health', () => jsonRes(health)], + [TOKEN_PATH, () => jsonRes({ token })], + ]); + + const gateId = a.armDesktopServiceGate(); + await a.connectDesktopService(DESKTOP_A, gateId); + const unsubscribe = a.subscribeNotifications(() => {}); + await vi.advanceTimersByTimeAsync(0); + expect(FakeEventSource.instances).toHaveLength(1); + + health = { ...desktopHealth(DESKTOP_B), port: DESKTOP_A.port }; + token = 'desktop-token-b'; + FakeEventSource.instances[0].fireError(); + await vi.advanceTimersByTimeAsync(1100); + + expect(FakeEventSource.instances).toHaveLength(1); + expect(FakeEventSource.instances[0].closed).toBe(true); + expect(() => a.getServerUrl()).toThrow(/not ready/); + unsubscribe(); + }); + // ── setServerUrl epoch guard ───────────────────────────────────────────── it('setServerUrl mid-flight: the stale connect cannot set connected state or the token', async () => { @@ -288,6 +725,72 @@ describe('P1b auth gate', () => { await expect(consume()).rejects.toThrow(AdapterHttpError); }); + it('fetchWithTimeout preserves fresh and pre-aborted caller cancellation without AbortSignal.any', async () => { + const anyDescriptor = Object.getOwnPropertyDescriptor(AbortSignal, 'any'); + Object.defineProperty(AbortSignal, 'any', { configurable: true, value: undefined }); + vi.useFakeTimers(); + const caller = new AbortController(); + fetchSpy.mockImplementation(async (_url, init) => new Promise((_resolve, reject) => { + const signal = (init as RequestInit | undefined)?.signal; + if (!(signal instanceof AbortSignal)) throw new Error('missing request signal'); + if (signal.aborted) { + reject(new DOMException('The operation was aborted', 'AbortError')); + return; + } + signal.addEventListener( + 'abort', + () => reject(new DOMException('The operation was aborted', 'AbortError')), + { once: true }, + ); + })); + + try { + const request = fetchWithTimeout(`${BASE}/slow`, { signal: caller.signal }); + caller.abort(); + await expect(request).rejects.toMatchObject({ name: 'AbortError' }); + + const preAborted = new AbortController(); + preAborted.abort(); + await expect(fetchWithTimeout(`${BASE}/already-stopped`, { + signal: preAborted.signal, + })).rejects.toMatchObject({ name: 'AbortError' }); + expect(vi.getTimerCount()).toBe(0); + } finally { + if (anyDescriptor) Object.defineProperty(AbortSignal, 'any', anyDescriptor); + else Reflect.deleteProperty(AbortSignal, 'any'); + } + }); + + it('abortAgent cancels only the requested chat session', async () => { + const a = new LocalAdapter(BASE); + const requestSignals: AbortSignal[] = []; + fetchSpy.mockImplementation(async (_url, init) => new Promise((_resolve, reject) => { + const signal = (init as RequestInit | undefined)?.signal; + if (!(signal instanceof AbortSignal)) throw new Error('missing request signal'); + requestSignals.push(signal); + signal.addEventListener( + 'abort', + () => reject(new DOMException('The operation was aborted', 'AbortError')), + { once: true }, + ); + })); + + const sessionA = a.sendMessage('ws1', 'first', 'session-a'); + const sessionB = a.sendMessage('ws1', 'second', 'session-b'); + const resultA = sessionA.next().catch((error: unknown) => error); + const resultB = sessionB.next().catch((error: unknown) => error); + + await vi.waitFor(() => expect(requestSignals).toHaveLength(2)); + await a.abortAgent('ws1', 'session-a'); + expect(requestSignals[0].aborted).toBe(true); + expect(requestSignals[1].aborted).toBe(false); + await expect(resultA).resolves.toMatchObject({ name: 'AbortError' }); + + await a.abortAgent('ws1'); + expect(requestSignals[1].aborted).toBe(true); + await expect(resultB).resolves.toMatchObject({ name: 'AbortError' }); + }); + // ── Body-envelope getters (fetchRaw contract — ApprovalModal flow et al) ── it('installMcp resolves the 422 SecurityGate envelope (requiresApproval) instead of throwing', async () => { diff --git a/apps/web/src/lib/adapter.model-router-timeout.test.ts b/apps/web/src/lib/adapter.model-router-timeout.test.ts index 9e08a42..3bf2aaa 100644 --- a/apps/web/src/lib/adapter.model-router-timeout.test.ts +++ b/apps/web/src/lib/adapter.model-router-timeout.test.ts @@ -30,4 +30,41 @@ describe('model router request deadlines', () => { 45_000, ]); }); + + it('allows chat time-to-first-token to exceed the generic request timeout', async () => { + const fetchSpy = vi.spyOn(client, 'fetch').mockResolvedValue(new Response([ + 'event: done', + 'data: {"content":"ok"}', + '', + '', + ].join('\n'), { + status: 200, + headers: { 'content-type': 'text/event-stream' }, + })); + + const events = []; + for await (const event of client.sendMessage( + 'workspace-1', + 'hello', + 'session-1', + 'writer', + undefined, + undefined, + 'openai/requested-model', + )) { + events.push(event); + } + + expect(fetchSpy).toHaveBeenCalledOnce(); + expect(fetchSpy.mock.calls[0]?.[2]).toBe(45_000); + const request = fetchSpy.mock.calls[0]?.[1] as RequestInit; + expect(JSON.parse(request.body as string)).toMatchObject({ + workspaceId: 'workspace-1', + message: 'hello', + sessionId: 'session-1', + persona: 'writer', + model: 'openai/requested-model', + }); + expect(events).toEqual([{ type: 'done', data: { content: 'ok' } }]); + }); }); diff --git a/apps/web/src/lib/adapter.ts b/apps/web/src/lib/adapter.ts index 94d9c34..1282a5f 100644 --- a/apps/web/src/lib/adapter.ts +++ b/apps/web/src/lib/adapter.ts @@ -14,6 +14,7 @@ import { type FrameImportance, type FrameSource, type IdentityResponse, + type DesktopServiceEndpoint, } from './tauri-bindings'; import type { Workspace, WorkspaceContext, ChatMessage, MemoryFrame, Memory, @@ -64,6 +65,31 @@ export interface AgentGroupRunResult { message?: string; } +export interface ManagedLocalRuntimeStatus { + source: 'waggle-managed'; + supported: boolean; + installed: boolean; + running: boolean; + targetVersion: string | null; + version: string | null; + artifactSizeBytes: number | null; + downloadRequired: boolean; + dockerRequired: false; + reason?: string; +} + +export interface LocalInferenceStatus { + servers: Array>; + ollamaInstalled: boolean; + ollamaRunning: boolean; + totalLocalModels: number; + offlineReady: boolean; + dockerRequired: false; + managedRuntime: ManagedLocalRuntimeStatus; + setupRequired: boolean; + setupMessage: string | null; +} + /** * CC Sesija A §2.2 — map adapter `MemoryFrame.importance` (number 1-4) to the * Tauri command's string enum. Inverse of IMPORTANCE_MAP. @@ -97,6 +123,12 @@ export interface ChannelPairedSender { export type ChannelPairings = Partial>; +export interface BrowserCompanionPairingStatus { + paired: boolean; + extensionId: string | null; + pairedAt: string | null; +} + export function resolveDefaultServerUrl( locationLike: Pick | undefined = typeof window !== 'undefined' ? window.location : undefined, @@ -249,10 +281,28 @@ export interface EmbeddingRoutingStatus { class LocalAdapter { private baseUrl: string; + private readonly managedDesktop: boolean; + private desktopEndpoint: DesktopServiceEndpoint | null = null; + private desktopEndpointReady = false; + private desktopGateId = 0; + private desktopGate: { + id: number; + promise: Promise; + resolve: () => void; + reject: (error: Error) => void; + status: 'pending' | 'ready' | 'failed'; + error: Error | null; + } | null = null; private authToken: string | null = null; private ws: WebSocket | null = null; /** P1b-SSE: one ref-counted reconnecting stream per (path, eventName). */ private sseStreams = new Map void; listeners: Set<(data: unknown) => void> }>(); + /** Active chat requests, session-scoped with workspace-wide Stop fallback. */ + private activeChatControllers = new Map>(); + + private chatControllerKey(workspaceId: string, sessionId?: string): string { + return `${workspaceId}\u0000${sessionId ?? ''}`; + } private _connected = false; private _connectAttempted = false; // P1b D3 gate state. _connectPromise doubles as the deferral gate: kept @@ -267,13 +317,19 @@ class LocalAdapter { private _epoch = 0; constructor(serverUrl?: string) { - this.baseUrl = serverUrl || localStorage.getItem('waggle:server-url') || resolveDefaultServerUrl(); + this.managedDesktop = isTauri(); + this.baseUrl = this.managedDesktop + ? resolveDefaultServerUrl() + : serverUrl || localStorage.getItem('waggle:server-url') || resolveDefaultServerUrl(); } get isConnected() { return this._connected; } get hasAttemptedConnect() { return this._connectAttempted; } setServerUrl(url: string) { + if (this.managedDesktop) { + throw new Error('The desktop service endpoint is managed by Waggle'); + } this._epoch++; this.baseUrl = url; localStorage.setItem('waggle:server-url', url); @@ -290,9 +346,147 @@ class LocalAdapter { } getServerUrl() { + if (this.managedDesktop && (!this.desktopEndpoint || !this.desktopEndpointReady)) { + throw new Error('The managed desktop service endpoint is not ready'); + } return this.baseUrl; } + armDesktopServiceGate(): number { + if (!this.managedDesktop) return 0; + if (this.desktopGate?.status === 'pending') { + const superseded = new Error('The managed desktop service launch was superseded'); + this.desktopGate.status = 'failed'; + this.desktopGate.error = superseded; + this.desktopGate.reject(superseded); + } + this._epoch++; + this.desktopEndpoint = null; + this.desktopEndpointReady = false; + this.authToken = null; + this._connected = false; + this._connectAttempted = false; + this._connectPromise = null; + this._healthProbePromise = null; + this._refreshPromise = null; + const id = ++this.desktopGateId; + let resolve!: () => void; + let reject!: (error: Error) => void; + const promise = new Promise((resolveGate, rejectGate) => { + resolve = resolveGate; + reject = rejectGate; + }); + void promise.catch(() => { /* future requests observe the same failure */ }); + this.desktopGate = { + id, + promise, + resolve, + reject, + status: 'pending', + error: null, + }; + return id; + } + + async connectDesktopService( + endpoint: DesktopServiceEndpoint, + gateId: number, + ): Promise { + if (!this.managedDesktop) { + throw new Error('Desktop service binding is only available inside Tauri'); + } + if (!Number.isInteger(endpoint.port) || endpoint.port < 1 || endpoint.port > 65535 + || typeof endpoint.instanceId !== 'string' || endpoint.instanceId.trim().length === 0) { + throw new Error('Tauri returned an invalid desktop service endpoint'); + } + if (!this.desktopGate || this.desktopGate.id !== gateId + || this.desktopGate.status !== 'pending') { + throw new Error('Ignoring a stale desktop service endpoint'); + } + + const bindEpoch = ++this._epoch; + this.baseUrl = `http://127.0.0.1:${endpoint.port}`; + this.desktopEndpoint = { + port: endpoint.port, + instanceId: endpoint.instanceId, + ...(endpoint.bootstrapToken ? { bootstrapToken: endpoint.bootstrapToken } : {}), + }; + this.desktopEndpointReady = false; + this.authToken = null; + this._connected = false; + this._connectAttempted = false; + this._connectPromise = null; + this._healthProbePromise = null; + this._refreshPromise = null; + + try { + const health = await this.connect(); + const record = health as SystemHealth & { instanceId?: unknown; port?: unknown }; + if (record.instanceId !== endpoint.instanceId || record.port !== endpoint.port) { + throw new Error('Desktop service health identity does not match the Tauri endpoint'); + } + if (!this.desktopGate || this.desktopGate.id !== gateId + || bindEpoch !== this._epoch + || this.desktopGate.status !== 'pending' + || this.desktopEndpoint?.port !== endpoint.port + || this.desktopEndpoint?.instanceId !== endpoint.instanceId) { + throw new Error('Desktop service launch changed during connection'); + } + this.desktopGate.status = 'ready'; + this.desktopGate.error = null; + this.desktopEndpointReady = true; + this.desktopGate.resolve(); + return health; + } catch (error) { + this.failCurrentDesktopGeneration(error, bindEpoch); + throw error; + } + } + + failDesktopServiceGate(error: unknown, gateId: number): void { + if (!this.managedDesktop || !this.desktopGate || this.desktopGate.id !== gateId) return; + if (this.desktopGate.status === 'failed') return; + const failure = error instanceof Error ? error : new Error(String(error)); + this._epoch++; + this.desktopEndpoint = null; + this.desktopEndpointReady = false; + this.authToken = null; + this._connected = false; + this._connectPromise = null; + this._healthProbePromise = null; + this._refreshPromise = null; + this.desktopGate.status = 'failed'; + this.desktopGate.error = failure; + this.desktopGate.reject(failure); + } + + private failCurrentDesktopGeneration(error: unknown, epoch: number): void { + if (!this.managedDesktop || epoch !== this._epoch) return; + const gateId = this.desktopGate?.id; + if (gateId !== undefined) this.failDesktopServiceGate(error, gateId); + } + + private async awaitDesktopServiceGate(): Promise { + if (!this.managedDesktop) return; + while (true) { + const gate = this.desktopGate; + if (!gate) { + throw new Error('The managed desktop service gate was not armed'); + } + try { + await gate.promise; + } catch (error) { + if (this.desktopGate !== gate) continue; + throw error; + } + if (this.desktopGate !== gate) continue; + if (gate.status === 'failed') { + throw gate.error ?? new Error('The managed desktop service failed'); + } + if (gate.status === 'ready') return; + } + } + /** * P1b D3: explicit re-probe that bypasses the retained settled-success * memo. `connect()` deliberately dedups onto a successful attempt (the @@ -315,10 +509,15 @@ class LocalAdapter { * gated request via ensureReady's re-arm) starts a fresh attempt. */ connect(): Promise { + if (this.managedDesktop && !this.desktopEndpoint) { + return this.awaitDesktopServiceGate().then(() => this.connect()); + } if (this._connectPromise) return this._connectPromise; - const p = this.doConnect(this._epoch); + const epoch = this._epoch; + const p = this.doConnect(epoch); this._connectPromise = p; - p.catch(() => { + p.catch((error) => { + this.failCurrentDesktopGeneration(error, epoch); if (this._connectPromise === p) this._connectPromise = null; }); return p; @@ -339,18 +538,27 @@ class LocalAdapter { try { const data = await Promise.race([ (async () => { - const health = await this.healthProbe(epoch); + let health = await this.healthProbe(epoch); + if (this.managedDesktop && epoch !== this._epoch) { + throw new Error('Connection attempt was superseded by a newer desktop generation'); + } // D1: the sidecar requires a bearer token even on loopback. Fetch it // from the auth-exempt, same-origin-gated bootstrap. (R1-001: it is // NOT served by the unauthenticated /health.) Best-effort — if the // bootstrap is unreachable we proceed token-less; the 401-refresh // retry leg recovers as soon as the endpoint is reachable. await this.fetchSessionToken(epoch); + if (this.managedDesktop) { + health = await this.revalidateDesktopEndpoint(epoch); + } return health; })(), deadline, ]); - if (epoch === this._epoch) this._connected = true; + if (epoch !== this._epoch) { + throw new Error('Connection attempt was superseded by a newer desktop generation'); + } + this._connected = true; return data; } catch (e) { if (epoch === this._epoch) this._connected = false; @@ -361,8 +569,8 @@ class LocalAdapter { } /** - * P1b D3: the deferral gate awaited by every non-exempt request. - * Four states: + * P1b D3: the connection gate awaited by every non-exempt request. + * Browser mode retains four states: * - never attempted → pass through (keeps the adapter unit-test files, * which construct LocalAdapter and call methods directly, gate-free; * production arms the gate via boot-connect.ts, main.tsx's first import) @@ -372,10 +580,13 @@ class LocalAdapter { * onto it. This makes the gate self-healing on the default desktop path * (webview up before the sidecar listens: the boot kickoff fails fast * with ECONNREFUSED and must not permanently disarm the gate). - * A FAILED attempt always releases the gate — the request proceeds and - * fails loudly with its own cause rather than hanging. + * A failed browser attempt releases the gate so the request fails with its + * own cause rather than hanging. Managed desktop mode first awaits the + * separate Rust-owned endpoint gate; a failed identity handshake stays + * closed until a newer lifecycle generation rearms it. */ private async ensureReady(): Promise { + await this.awaitDesktopServiceGate(); if (!this._connectAttempted) return; const gate = this._connectPromise ?? this.connect(); try { await gate; } catch { /* released — request fails with its own cause */ } @@ -386,7 +597,7 @@ class LocalAdapter { * null. The 401-refresh leg (refreshSessionToken) is the LOUD variant. */ private async fetchSessionToken(epoch: number): Promise { try { - const res = await this.request('/api/auth/session-token'); + const res = await this.request('/api/auth/session-token', undefined, undefined, false, true); if (res.ok) { const body = (await res.json()) as { token?: string }; if (epoch === this._epoch) this.authToken = body.token ?? null; @@ -419,6 +630,9 @@ class LocalAdapter { if (epoch === this._epoch) this.authToken = body.token; })(), CONNECT_DEADLINE_MS, 'session-token refresh'); this._refreshPromise = p; + if (this.managedDesktop) { + void p.catch((error) => this.failCurrentDesktopGeneration(error, epoch)); + } p.finally(() => { if (this._refreshPromise === p) this._refreshPromise = null; }).catch(() => { /* settled via callers */ }); @@ -451,18 +665,53 @@ class LocalAdapter { if (this._healthProbePromise) return this._healthProbePromise; const p = deadlined(this.doHealthProbe(epoch), CONNECT_DEADLINE_MS, 'health probe'); this._healthProbePromise = p; + void p.catch((error) => this.failCurrentDesktopGeneration(error, epoch)); p.finally(() => { if (this._healthProbePromise === p) this._healthProbePromise = null; }).catch(() => { /* settled via callers */ }); return p; } + /** + * A managed token is process-scoped. Always perform a fresh, non-memoized + * identity probe after obtaining one so a same-port sidecar replacement + * cannot inherit the previous Rust-verified generation's trust. + */ + private async revalidateDesktopEndpoint(epoch: number): Promise { + if (epoch !== this._epoch) { + throw new Error('Desktop service generation changed before revalidation'); + } + try { + const health = await deadlined( + this.doHealthProbe(epoch), + CONNECT_DEADLINE_MS, + 'desktop health revalidation', + ); + if (epoch !== this._epoch) { + throw new Error('Desktop service generation changed during revalidation'); + } + return health; + } catch (error) { + this.failCurrentDesktopGeneration(error, epoch); + throw error; + } + } + private async doHealthProbe(epoch: number): Promise { try { - const res = await this.request('/health'); + const res = await this.request('/health', undefined, undefined, false, true); if (!res.ok) throw new AdapterHttpError(res.status, res.statusText, await res.clone().json().catch(() => undefined)); - return await res.json(); + const data = await res.json() as SystemHealth & { instanceId?: unknown; port?: unknown }; + if (this.managedDesktop && ( + !this.desktopEndpoint + || data.instanceId !== this.desktopEndpoint.instanceId + || data.port !== this.desktopEndpoint.port + )) { + throw new Error('Desktop service health identity does not match the Tauri endpoint'); + } + return data; } catch (firstErr) { + if (this.managedDesktop) throw firstErr; const fallbackServer = resolveDefaultServerUrl(); if (this.baseUrl === fallbackServer) throw firstErr; try { @@ -510,10 +759,21 @@ class LocalAdapter { /** Shared request core: deferral gate → headers/token → fetch → 403 tier * dispatch → 401 refresh-retry (token-versioned, once per request). */ - private async request(path: string, init?: RequestInit, timeoutMs?: number, isRetry = false): Promise { + private async request( + path: string, + init?: RequestInit, + timeoutMs?: number, + isRetry = false, + bypassDesktopGate = false, + ): Promise { const purePath = path.split('?')[0]; const exempt = AUTH_EXEMPT_PATHS.has(purePath); + if (!bypassDesktopGate) await this.awaitDesktopServiceGate(); if (!exempt) await this.ensureReady(); + // A restart can rearm the desktop gate while ensureReady() is awaiting an + // older connect attempt. Recheck immediately before the synchronous fetch + // call so that attempt cannot release a request onto the superseded port. + if (!bypassDesktopGate) await this.awaitDesktopServiceGate(); const issuedToken = this.authToken; const headers: Record = { @@ -535,6 +795,13 @@ class LocalAdapter { if (issuedToken) { headers['Authorization'] = `Bearer ${issuedToken}`; } + if ( + this.managedDesktop + && purePath === '/api/auth/session-token' + && this.desktopEndpoint?.bootstrapToken + ) { + headers['X-Waggle-Desktop-Bootstrap'] = this.desktopEndpoint.bootstrapToken; + } const res = await fetchWithTimeout(`${this.baseUrl}${path}`, { ...init, headers }, timeoutMs); if (res.status === 403) { const clone = res.clone(); @@ -557,7 +824,11 @@ class LocalAdapter { if (this.authToken === issuedToken) { await this.refreshSessionToken(); } - return this.request(path, init, timeoutMs, true); + if (this.managedDesktop) { + await this.awaitDesktopServiceGate(); + await this.revalidateDesktopEndpoint(this._epoch); + } + return this.request(path, init, timeoutMs, true, bypassDesktopGate); } return res; } @@ -634,12 +905,12 @@ class LocalAdapter { return res.json(); } - async updateWorkspace(id: string, data: Partial): Promise { + async updateWorkspace(id: string, data: Partial>): Promise { const res = await this.fetch(`/api/workspaces/${id}`, { method: 'PUT', body: JSON.stringify(data) }); return res.json(); } - async patchWorkspace(id: string, data: Partial>): Promise { + async patchWorkspace(id: string, data: Partial>): Promise { const res = await this.fetch(`/api/workspaces/${id}`, { method: 'PATCH', body: JSON.stringify(data) }); return res.json(); } @@ -795,59 +1066,97 @@ class LocalAdapter { persona?: string, autonomy?: { level: 'normal' | 'trusted' | 'yolo'; expiresAt?: number }, retry?: boolean, + model?: string, ): AsyncGenerator { // CC Sesija A §2.2 — thread the user-selected Faza 1 GEPA shape into the // chat body. Sidecar /api/chat ignores `shape` until A3.1 wires it into // runRetrievalAgentLoop; carrying it now means A3.1 is a one-line server // change with no client redeploy needed. const shape = getSelectedShape(); - const res = await this.fetch('/api/chat', { - method: 'POST', - body: JSON.stringify({ workspaceId, message, sessionId, persona, autonomy, shape, retry }), - }); + const controller = new AbortController(); + const chatControllerKey = this.chatControllerKey(workspaceId, sessionId); + let controllers = this.activeChatControllers.get(chatControllerKey); + if (!controllers) { + controllers = new Set(); + this.activeChatControllers.set(chatControllerKey, controllers); + } + controllers.add(controller); + let reader: ReadableStreamDefaultReader | undefined; - if (!res.body) return; - const reader = res.body.getReader(); - const decoder = new TextDecoder(); - let buffer = ''; - let currentEventType = ''; + try { + const res = await this.fetch('/api/chat', { + method: 'POST', + body: JSON.stringify({ workspaceId, message, sessionId, persona, autonomy, shape, retry, model }), + signal: controller.signal, + }, MODEL_ROUTER_REQUEST_TIMEOUT_MS); - while (true) { - const { done, value } = await reader.read(); - if (done) break; - buffer += decoder.decode(value, { stream: true }); - const lines = buffer.split('\n'); - buffer = lines.pop() || ''; - for (const line of lines) { - if (line.startsWith('event: ')) { - currentEventType = line.slice(7).trim(); - } else if (line.startsWith('data: ')) { - try { - const data = JSON.parse(line.slice(6)); - // Map SSE event types to StreamEvent types expected by useChat - let type = currentEventType; - if (type === 'token') type = 'token'; - else if (type === 'tool') type = 'tool_start'; - else if (type === 'tool_result') type = 'tool_end'; - else if (type === 'done') type = 'done'; - else if (type === 'error') type = 'error'; - else if (type === 'step') type = 'step'; - else if (type === 'approval_request') type = 'approval_request'; + if (!res.body) return; + reader = res.body.getReader(); + const decoder = new TextDecoder(); + let buffer = ''; + let currentEventType = ''; + while (true) { + const { done, value } = await reader.read(); + if (done) break; + buffer += decoder.decode(value, { stream: true }); + const lines = buffer.split('\n'); + buffer = lines.pop() || ''; + for (const line of lines) { + if (line.startsWith('event: ')) { + currentEventType = line.slice(7).trim(); + } else if (line.startsWith('data: ')) { + try { + const data = JSON.parse(line.slice(6)); + // Map SSE event types to StreamEvent types expected by useChat + let type = currentEventType; + if (type === 'token') type = 'token'; + else if (type === 'tool') type = 'tool_start'; + else if (type === 'tool_result') type = 'tool_end'; + else if (type === 'done') type = 'done'; + else if (type === 'error') type = 'error'; + else if (type === 'step') type = 'step'; + else if (type === 'approval_request') type = 'approval_request'; - yield { type, data } as StreamEvent; - currentEventType = ''; - } catch { /* skip malformed */ } + yield { type, data } as StreamEvent; + currentEventType = ''; + } catch { /* skip malformed */ } + } } } + } finally { + controller.abort(); + controllers.delete(controller); + if (controllers.size === 0 && this.activeChatControllers.get(chatControllerKey) === controllers) { + this.activeChatControllers.delete(chatControllerKey); + } + if (reader) { + try { await reader.cancel(); } catch { /* stream already closed */ } + try { reader.releaseLock(); } catch { /* reader already released */ } + } } } - async abortAgent(workspaceId: string): Promise { - await this.fetch(`/api/agent/abort`, { method: 'POST', body: JSON.stringify({ workspaceId }) }); + async abortAgent(workspaceId: string, sessionId?: string): Promise { + const controllerKeys = sessionId !== undefined + ? [this.chatControllerKey(workspaceId, sessionId)] + : [...this.activeChatControllers.keys()].filter( + key => key.startsWith(`${workspaceId}\u0000`), + ); + for (const controllerKey of controllerKeys) { + const controllers = this.activeChatControllers.get(controllerKey); + if (!controllers) continue; + this.activeChatControllers.delete(controllerKey); + for (const controller of controllers) controller.abort(); + } } - async clearHistory(sessionId: string): Promise { - await this.fetch(`/api/chat/history?session=${sessionId}`, { method: 'DELETE' }); + async clearHistory( + workspaceId: string | null, + sessionId: string, + ): Promise { + const params = new URLSearchParams({ session: sessionId }); + if (workspaceId) params.set('workspace', workspaceId); + await this.fetch(`/api/chat/history?${params.toString()}`, { method: 'DELETE' }); } async getHistory(workspaceId: string, sessionId: string): Promise { @@ -1202,13 +1511,32 @@ class LocalAdapter { return res.json(); } - async getLocalInferenceStatus(): Promise<{ servers: Array>; ollamaInstalled: boolean; totalLocalModels: number }> { + async getLocalInferenceStatus(): Promise { const res = await this.fetch('/api/local-inference/status'); return res.json(); } - async pullLocalModel(model: string): Promise<{ ok: boolean }> { - const res = await this.fetch('/api/local-inference/pull', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ model }) }); + async bootstrapLocalRuntime(): Promise<{ + ok: boolean; + installedNow: boolean; + startedNow: boolean; + endpoint: string; + dockerRequired: false; + }> { + const res = await this.fetch( + '/api/local-inference/bootstrap', + { method: 'POST' }, + 45 * 60_000, + ); + return res.json(); + } + + async pullLocalModel(model: string): Promise<{ ok: boolean; model: string; verifiedGeneration: boolean }> { + const res = await this.fetch( + '/api/local-inference/pull', + { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ model }) }, + 50 * 60_000, + ); return res.json(); } @@ -2141,6 +2469,20 @@ class LocalAdapter { return res.json(); } + async getBrowserCompanionPairing(): Promise { + const res = await this.fetch('/api/browser-ext/pairing'); + return res.json(); + } + + async createBrowserCompanionPairingCode(): Promise<{ code: string; expiresAt: number }> { + const res = await this.fetch('/api/browser-ext/pairing-code', { method: 'POST' }); + return res.json(); + } + + async revokeBrowserCompanionPairing(): Promise { + await this.fetch('/api/browser-ext/pairing', { method: 'DELETE' }); + } + async saveChannelConfig( platform: ChannelPlatform, config: { @@ -2456,6 +2798,7 @@ class LocalAdapter { // --- Health --- async getSystemHealth(): Promise { + if (this.managedDesktop) await this.awaitDesktopServiceGate(); // Use the same auto-discovery fallback as connect() so the offline pill // converges on the working URL even if useOfflineStatus polls before // ServiceProvider's connect() effect runs (FR #10). @@ -2480,7 +2823,7 @@ class LocalAdapter { async connectConnector(id: string, credentials?: { token?: string; apiKey?: string; refreshToken?: string; - expiresAt?: string; scopes?: string[]; email?: string; + expiresAt?: string; scopes?: string[]; email?: string; baseUrl?: string; instanceUrl?: string; }): Promise { await this.fetch(`/api/connectors/${id}/connect`, { method: 'POST', @@ -3173,22 +3516,50 @@ class LocalAdapter { es.onerror = () => { es?.close(); if (cancelled) return; - const delay = Math.min(30000, 1000 * 2 ** attempt++); - retryTimer = setTimeout(() => { - // Sidecar restart rotates the token; the URL-baked one is then - // permanently stale. Best-effort refresh before each reopen — - // single-flighted, and a failure just means the next backoff round. - void this.refreshSessionToken().catch(() => { /* server still down */ }) - .then(() => { if (!cancelled) open(); }); - }, delay); + scheduleRetry(); }; }; + const scheduleRetry = () => { + if (cancelled) return; + const delay = Math.min(30000, 1000 * 2 ** attempt++); + retryTimer = setTimeout(() => { + // Sidecar restart rotates the token; wait for the current desktop gate + // and a fresh token before constructing a URL for the replacement + // generation. Failed refreshes stay closed and back off again. + void this.refreshSessionToken() + .then(() => this.awaitDesktopServiceGate()) + .then(async () => { + if (this.managedDesktop) { + await this.revalidateDesktopEndpoint(this._epoch); + } + }) + .then(() => { if (!cancelled) open(); }) + .catch(() => { + if (cancelled) return; + if (this.managedDesktop) scheduleRetry(); + else open(); + }); + }, delay); + }; + // Lazy-open: wait for the connect attempt to settle so the token exists. // Never-attempted (unit tests) passes through immediately; a FAILED // connect also releases — the stream 401s and enters the retry loop, // which doubles as the recovery path. - void this.ensureReady().then(() => { if (!cancelled) open(); }); + void this.ensureReady() + .then(() => this.awaitDesktopServiceGate()) + .then(async () => { + if (this.managedDesktop) { + await this.revalidateDesktopEndpoint(this._epoch); + } + }) + .then(() => { if (!cancelled) open(); }) + .catch(() => { + if (cancelled) return; + if (this.managedDesktop) scheduleRetry(); + else open(); + }); return () => { cancelled = true; @@ -3641,6 +4012,9 @@ class LocalAdapter { // --- WebSocket --- connectWebSocket(onMessage: (data: unknown) => void): () => void { + if (this.managedDesktop && (!this.desktopEndpoint || !this.desktopEndpointReady)) { + throw new Error('The managed desktop service endpoint is not ready'); + } const wsUrl = this.baseUrl.replace('http', 'ws') + `/ws?token=${this.authToken}`; this.ws = new WebSocket(wsUrl); this.ws.onmessage = (e) => { diff --git a/apps/web/src/lib/fetch-utils.ts b/apps/web/src/lib/fetch-utils.ts index 6f37962..4130f6d 100644 --- a/apps/web/src/lib/fetch-utils.ts +++ b/apps/web/src/lib/fetch-utils.ts @@ -12,6 +12,29 @@ export class NetworkError extends Error { } } +function combineAbortSignals(signals: AbortSignal[]): { + signal: AbortSignal; + cleanup: () => void; +} { + if (typeof AbortSignal.any === 'function') { + return { signal: AbortSignal.any(signals), cleanup: () => {} }; + } + + const controller = new AbortController(); + const abort = () => controller.abort(); + if (signals.some(signal => signal.aborted)) { + abort(); + } else { + for (const signal of signals) signal.addEventListener('abort', abort, { once: true }); + } + return { + signal: controller.signal, + cleanup: () => { + for (const signal of signals) signal.removeEventListener('abort', abort); + }, + }; +} + export async function fetchWithTimeout( url: string, options: RequestInit = {}, @@ -19,19 +42,26 @@ export async function fetchWithTimeout( ): Promise { const controller = new AbortController(); const timeout = setTimeout(() => controller.abort(), timeoutMs); + const combined = options.signal + ? combineAbortSignals([options.signal, controller.signal]) + : { signal: controller.signal, cleanup: () => {} }; try { const response = await fetch(url, { ...options, - signal: controller.signal, + signal: combined.signal, }); return response; } catch (err: unknown) { - if (err instanceof Error && err.name === 'AbortError') { + if (controller.signal.aborted && !options.signal?.aborted) { throw new TimeoutError(url, timeoutMs); } + // Caller cancellation (for example Chat Stop) is control flow, not a + // timeout/network outage. Preserve the native AbortError for the caller. + if (options.signal?.aborted) throw err; throw new NetworkError(url, err instanceof Error ? err : undefined); } finally { clearTimeout(timeout); + combined.cleanup(); } } diff --git a/apps/web/src/lib/launcher-prompt-args.test.ts b/apps/web/src/lib/launcher-prompt-args.test.ts index 6f9791f..d2787e0 100644 --- a/apps/web/src/lib/launcher-prompt-args.test.ts +++ b/apps/web/src/lib/launcher-prompt-args.test.ts @@ -57,17 +57,15 @@ describe('promptArgsForTool', () => { }); describe('hermes', () => { - it('passes prompt as positional argument (best-effort convention)', () => { - expect(promptArgsForTool('hermes', 'summarize todays standup')).toEqual([ - 'summarize todays standup', - ]); + it('does not send an unverified positional prompt during interactive launch', () => { + expect(promptArgsForTool('hermes', 'summarize todays standup')).toBeNull(); }); }); // ── GUI / folder-based tools ─────────────────────────────────────── describe('GUI-only / folder-based tools return null', () => { - it.each(['cursor', 'claude-desktop', 'codex-desktop'])( + it.each(['cursor', 'claude-desktop', 'codex-desktop', 'hermes-desktop'])( '%s — no CLI prompt surface', (toolId) => { expect(promptArgsForTool(toolId, 'anything')).toBeNull(); @@ -87,7 +85,8 @@ describe('toolAcceptsInlinePrompt', () => { ['claude-code', true], ['openclaw', true], ['codex', true], - ['hermes', true], + ['hermes', false], + ['hermes-desktop', false], ['cursor', false], ['claude-desktop', false], ['codex-desktop', false], diff --git a/apps/web/src/lib/launcher-prompt-args.ts b/apps/web/src/lib/launcher-prompt-args.ts index 00d2229..d1de1b6 100644 --- a/apps/web/src/lib/launcher-prompt-args.ts +++ b/apps/web/src/lib/launcher-prompt-args.ts @@ -12,7 +12,8 @@ * claude-code → ['--print', prompt] * openclaw → ['--print', prompt] (Claude Code fork) * codex → [prompt] (positional arg) - * hermes → [prompt] (positional arg — best-effort) + * hermes → null (captured-task API only) + * hermes-desktop → null (GUI only) * cursor → null (folder-based; no CLI prompt) * claude-desktop → null (GUI only) * codex-desktop → null (GUI only) @@ -63,20 +64,17 @@ export function promptArgsForTool(toolId: string, prompt: string): string[] | nu case 'codex': return [p]; - // Hermes Agent CLI: positional-arg convention by analogy. The - // hive-mind-hooks-hermes package is a Wave 2/3 stub; this entry - // is documented as best-effort and should be verified once the - // Hermes CLI is exercised against a real binary. - case 'hermes': - return [p]; - - // GUI-only tools: no CLI prompt surface. + // GUI-only tools and Hermes interactive launch: no verified inline-prompt + // surface. Hermes captured tasks use the shared headless task contract, + // not this dock-launch helper. // cursor: opens a folder (`cursor /path`), no --prompt flag. // claude-desktop / codex-desktop: GUI binaries with no // prompt-from-CLI handoff documented. case 'cursor': case 'claude-desktop': case 'codex-desktop': + case 'hermes': + case 'hermes-desktop': return null; default: diff --git a/apps/web/src/lib/render-markdown.test.ts b/apps/web/src/lib/render-markdown.test.ts index 34f6601..166bb39 100644 --- a/apps/web/src/lib/render-markdown.test.ts +++ b/apps/web/src/lib/render-markdown.test.ts @@ -74,4 +74,63 @@ describe('renderChatMarkdown', () => { const html = renderChatMarkdown('a\n\nb'); expect(html).toContain(''); }); + + it('preserves wildcard operators inside inline code', () => { + const host = document.createElement('div'); + host.innerHTML = renderChatMarkdown('Run `search_files("**/*")` without editing.'); + + expect(host.querySelector('code')?.textContent).toBe('search_files("**/*")'); + expect(host.querySelector('code strong, code em')).toBeNull(); + }); + + it('preserves emphasis and safe links wrapped around inline code', () => { + const host = document.createElement('div'); + host.innerHTML = renderChatMarkdown('Use **`npm test`** or [`npm run build`](https://example.com).'); + + expect(host.querySelector('strong code')?.textContent).toBe('npm test'); + expect(host.querySelector('a[href="https://example.com"] code')?.textContent).toBe('npm run build'); + }); + + it('never restores an inline code tag inside a link attribute', () => { + const host = document.createElement('div'); + host.innerHTML = renderChatMarkdown('[x](https://example.com/`fragment`)'); + + expect(host.querySelector('a')).toBeNull(); + expect(host.querySelector('code')?.textContent).toBe('fragment'); + }); + + it('preserves indentation and operators inside fenced code', () => { + const source = [ + '```python', + 'def retry(attempt: int) -> float:', + ' return base_backoff_s * (2 ** attempt)', + '```', + ].join('\n'); + const host = document.createElement('div'); + host.innerHTML = renderChatMarkdown(source); + + expect(host.querySelector('pre code')?.textContent).toBe([ + 'def retry(attempt: int) -> float:', + ' return base_backoff_s * (2 ** attempt)', + ].join('\n')); + expect(host.querySelector('pre code strong, pre code em')).toBeNull(); + }); + + it('renders an unfinished streaming fence as safe preformatted code', () => { + const host = document.createElement('div'); + host.innerHTML = renderChatMarkdown('```python\nvalue = 2 ** attempt'); + + expect(host.querySelector('pre code')?.textContent).toBe('value = 2 ** attempt'); + }); + + it('keeps fenced HTML inert and refuses unsafe language metadata', () => { + const safeHost = document.createElement('div'); + safeHost.innerHTML = renderChatMarkdown('```html\n\n```'); + expect(safeHost.querySelector('script')).toBeNull(); + expect(safeHost.querySelector('pre code')?.textContent).toBe(''); + + const unsafeHtml = renderChatMarkdown('```\">\nbody'); + expect(unsafeHtml).not.toContain('$1') .replace(/\*(.+?)\*/g, '$1') - .replace(/`(.+?)`/g, '$1') .replace(/\[([^\]]+)\]\(([^)]+)\)/g, (_m, label: string, url: string) => { const u = String(url).trim(); - const safe = /^https?:\/\//i.test(u) || u.startsWith('/') || u.startsWith('#'); + const safeScheme = /^https?:\/\//i.test(u) || u.startsWith('/') || u.startsWith('#'); + // A protected inline-code token is valid in link text, but never in an + // href: restoring a tag inside an attribute would be unsafe. + const safe = safeScheme && (!protectedHrefToken || !u.includes(protectedHrefToken)); return safe ? `${label}` : `${label} (${u})`; }); } +/** Inline rules over ALREADY-ESCAPED text, with code isolated first. */ +function applyInline(escaped: string): string { + let placeholderPrefix = '\uE000WAGGLE_CODE_'; + while (escaped.includes(placeholderPrefix)) placeholderPrefix = `\uE000${placeholderPrefix}`; + const codeSegments: string[] = []; + const codePattern = /`([^`\n]+)`/g; + const protectedText = escaped.replace(codePattern, (_match, code: string) => { + const index = codeSegments.push(code) - 1; + return `${placeholderPrefix}${index}\uE001`; + }); + let rendered = applyStyledText(protectedText, placeholderPrefix); + + for (let index = 0; index < codeSegments.length; index++) { + const token = `${placeholderPrefix}${index}\uE001`; + const code = `${codeSegments[index]}`; + rendered = rendered.split(token).join(code); + } + return rendered; +} + +function renderCodeBlock(lines: string[], language: string): string { + const languageAttribute = language ? ` data-language="${language}"` : ''; + return `
${lines.join('\n')}
`; +} + export function renderSimpleMarkdown(text: string): string { return applyInline(escapeHtml(text)).replace(/\n/g, '
'); } @@ -51,7 +78,25 @@ export function renderSimpleMarkdown(text: string): string { export function renderChatMarkdown(text: string): string { const lines = escapeHtml(text).split('\n'); const out: string[] = []; + let fence: { language: string; lines: string[] } | null = null; + for (const line of lines) { + if (fence) { + if (/^\s*```\s*$/.test(line)) { + out.push(renderCodeBlock(fence.lines, fence.language)); + fence = null; + } else { + fence.lines.push(line); + } + continue; + } + + const fenceStart = /^\s*```\s*([A-Za-z0-9_+-]*)\s*$/.exec(line); + if (fenceStart) { + fence = { language: fenceStart[1], lines: [] }; + continue; + } + const h3 = /^###\s+(.*)$/.exec(line); const h2 = /^##\s+(.*)$/.exec(line); const h1 = /^#\s+(.*)$/.exec(line); @@ -75,5 +120,10 @@ export function renderChatMarkdown(text: string): string { out.push(`${applyInline(line)}`); } } + + // During streaming, an opening fence may arrive before its closing marker. + // Render the partial body as code now; the next full-source render will close it. + if (fence) out.push(renderCodeBlock(fence.lines, fence.language)); + return out.join(''); } diff --git a/apps/web/src/lib/tauri-bindings.test.ts b/apps/web/src/lib/tauri-bindings.test.ts index ba99ee5..1cd804d 100644 --- a/apps/web/src/lib/tauri-bindings.test.ts +++ b/apps/web/src/lib/tauri-bindings.test.ts @@ -31,6 +31,8 @@ import { isFirstLaunch, markFirstLaunchComplete, resetFirstLaunch, + ensureDesktopService, + listenDesktopServiceLifecycle, } from './tauri-bindings'; const mockedInvoke = vi.mocked(invoke); @@ -51,6 +53,102 @@ describe('isTauri() runtime detection', () => { }); }); +describe('managed desktop service bindings', () => { + beforeEach(() => { + mockedInvoke.mockReset(); + mockedListen.mockReset(); + (window as unknown as { __TAURI_INTERNALS__: unknown }).__TAURI_INTERNALS__ = {}; + }); + + afterEach(() => { + delete (window as unknown as { __TAURI_INTERNALS__?: unknown }).__TAURI_INTERNALS__; + }); + + it('returns the exact validated endpoint from ensure_service', async () => { + mockedInvoke.mockResolvedValue({ port: 49151, instanceId: 'desktop-instance-a' }); + + await expect(ensureDesktopService()).resolves.toEqual({ + port: 49151, + instanceId: 'desktop-instance-a', + }); + expect(mockedInvoke).toHaveBeenCalledWith('ensure_service'); + }); + + it.each([ + [{ port: 0, instanceId: 'desktop-instance-a' }], + [{ port: 65536, instanceId: 'desktop-instance-a' }], + [{ port: 49151.5, instanceId: 'desktop-instance-a' }], + [{ port: 49151, instanceId: ' ' }], + [{ port: 49151 }], + ])('rejects malformed ensure_service endpoint %#', async (endpoint) => { + mockedInvoke.mockResolvedValue(endpoint); + await expect(ensureDesktopService()).rejects.toThrow(/invalid desktop service endpoint/); + }); + + it('deduplicates paired restart signals, resets on ready, rejects malformed ready, and disposes both listeners', async () => { + const handlers = new Map void>(); + const unlisteners = [vi.fn(), vi.fn()]; + mockedListen.mockImplementation(async (eventName, eventHandler) => { + handlers.set(String(eventName), eventHandler as (event: { payload: unknown }) => void); + return unlisteners[handlers.size - 1]; + }); + const onEvent = vi.fn(); + + const dispose = await listenDesktopServiceLifecycle(onEvent); + expect([...handlers.keys()]).toEqual([ + 'waggle://service-status', + 'waggle://service-restart-needed', + ]); + + handlers.get('waggle://service-restart-needed')?.({ payload: undefined }); + handlers.get('waggle://service-status')?.({ payload: { status: 'restarting' } }); + expect(onEvent).toHaveBeenCalledTimes(1); + expect(onEvent).toHaveBeenLastCalledWith({ status: 'restarting' }); + + handlers.get('waggle://service-status')?.({ + payload: { + status: 'ready', + endpoint: { port: 49151, instanceId: 'desktop-instance-a' }, + }, + }); + expect(onEvent).toHaveBeenLastCalledWith({ + status: 'ready', + endpoint: { port: 49151, instanceId: 'desktop-instance-a' }, + }); + + handlers.get('waggle://service-restart-needed')?.({ payload: undefined }); + expect(onEvent).toHaveBeenLastCalledWith({ status: 'restarting' }); + expect(onEvent).toHaveBeenCalledTimes(3); + + handlers.get('waggle://service-status')?.({ + payload: { status: 'ready', endpoint: { port: 0, instanceId: '' } }, + }); + expect(onEvent).toHaveBeenLastCalledWith({ + status: 'failed', + error: 'Tauri emitted an invalid desktop service endpoint', + }); + + dispose(); + expect(unlisteners[0]).toHaveBeenCalledOnce(); + expect(unlisteners[1]).toHaveBeenCalledOnce(); + }); + + it.each([ + 'waggle://service-status', + 'waggle://service-restart-needed', + ] as const)('disposes the surviving listener when %s registration fails', async (failedEvent) => { + const registrationError = new Error(`${failedEvent} registration failed`); + const survivingUnlisten = vi.fn(); + mockedListen.mockImplementation(async (eventName) => { + if (eventName === failedEvent) throw registrationError; + return survivingUnlisten; + }); + + await expect(listenDesktopServiceLifecycle(vi.fn())).rejects.toBe(registrationError); + expect(survivingUnlisten).toHaveBeenCalledOnce(); + }); +}); + describe('desktop shell event bindings', () => { beforeEach(() => { mockedListen.mockReset(); @@ -132,6 +230,20 @@ describe('desktop shell event bindings', () => { expect(unlisten).toHaveBeenCalled(); } }); + + it('disposes fulfilled listeners when a sibling shell registration rejects', async () => { + const firstUnlisten = vi.fn(); + const thirdUnlisten = vi.fn(); + const registrationError = new Error('shell listener registration failed'); + mockedListen + .mockResolvedValueOnce(firstUnlisten) + .mockRejectedValueOnce(registrationError) + .mockResolvedValueOnce(thirdUnlisten); + + await expect(listenDesktopShellEvents(vi.fn())).rejects.toBe(registrationError); + expect(firstUnlisten).toHaveBeenCalledOnce(); + expect(thirdUnlisten).toHaveBeenCalledOnce(); + }); }); describe('memory + identity bindings', () => { diff --git a/apps/web/src/lib/tauri-bindings.ts b/apps/web/src/lib/tauri-bindings.ts index 3dbd142..47463aa 100644 --- a/apps/web/src/lib/tauri-bindings.ts +++ b/apps/web/src/lib/tauri-bindings.ts @@ -313,6 +313,90 @@ export function resetFirstLaunch(): Promise { // Desktop shell events +export interface DesktopServiceEndpoint { + port: number; + instanceId: string; + /** Per-launch secret delivered only through Tauri IPC. */ + bootstrapToken?: string; +} + +export type DesktopServiceLifecycleEvent = + | { status: 'restarting' } + | { status: 'ready'; endpoint: DesktopServiceEndpoint } + | { status: 'failed'; error?: string }; + +function parseDesktopServiceEndpoint(value: unknown): DesktopServiceEndpoint | null { + const record = recordPayload(value); + const port = record?.port; + const instanceId = record?.instanceId; + const bootstrapToken = record?.bootstrapToken; + return Number.isInteger(port) && (port as number) > 0 && (port as number) <= 65535 + && typeof instanceId === 'string' && instanceId.trim().length > 0 + ? { + port: port as number, + instanceId, + ...(typeof bootstrapToken === 'string' + && bootstrapToken.length >= 32 + && bootstrapToken.length <= 200 + ? { bootstrapToken } + : {}), + } + : null; +} + +export async function ensureDesktopService(): Promise { + if (!isTauri()) throw new Error('Desktop service IPC is unavailable outside Tauri'); + const endpoint = parseDesktopServiceEndpoint(await invoke('ensure_service')); + if (!endpoint) throw new Error('Tauri returned an invalid desktop service endpoint'); + return endpoint; +} + +export async function listenDesktopServiceLifecycle( + onEvent: (event: DesktopServiceLifecycleEvent) => void, +): Promise { + let restartPending = false; + const emitRestarting = () => { + if (restartPending) return; + restartPending = true; + onEvent({ status: 'restarting' }); + }; + const statusListener = listen('waggle://service-status', (event) => { + const payload = recordPayload(event.payload); + if (payload?.status === 'restarting') { + emitRestarting(); + } else if (payload?.status === 'failed') { + restartPending = false; + onEvent({ status: 'failed' }); + } else if (payload?.status === 'ready') { + restartPending = false; + const endpoint = parseDesktopServiceEndpoint(payload.endpoint); + onEvent(endpoint + ? { status: 'ready', endpoint } + : { status: 'failed', error: 'Tauri emitted an invalid desktop service endpoint' }); + } + }); + const restartListener = listen('waggle://service-restart-needed', () => { + emitRestarting(); + }); + + const [statusResult, restartResult] = await Promise.allSettled([ + statusListener, + restartListener, + ]); + if (statusResult.status === 'rejected') { + if (restartResult.status === 'fulfilled') restartResult.value(); + throw statusResult.reason; + } + if (restartResult.status === 'rejected') { + statusResult.value(); + throw restartResult.reason; + } + return () => { + statusResult.value(); + restartResult.value(); + }; +} + export type DesktopNavigationPath = '/settings'; const DESKTOP_NAVIGATION_PATHS = new Set(['/settings']); @@ -402,7 +486,7 @@ export function describeDesktopShellNotice( export async function listenDesktopShellEvents( onNotice: (notice: DesktopShellNotice) => void, ): Promise { - const unlisteners = await Promise.all( + const listenerResults = await Promise.allSettled( DESKTOP_SHELL_EVENTS.map((eventName) => listen(eventName, (event) => { const notice = describeDesktopShellNotice(eventName, event.payload); @@ -412,6 +496,21 @@ export async function listenDesktopShellEvents( }), ), ); + const unlisteners: UnlistenFn[] = []; + let registrationError: PromiseRejectedResult | undefined; + for (const result of listenerResults) { + if (result.status === 'fulfilled') { + unlisteners.push(result.value); + } else if (!registrationError) { + registrationError = result; + } + } + if (registrationError) { + for (const unlisten of unlisteners) { + unlisten(); + } + throw registrationError.reason; + } return () => { for (const unlisten of unlisteners) { diff --git a/apps/web/src/lib/types.ts b/apps/web/src/lib/types.ts index 9adc074..1bc9972 100644 --- a/apps/web/src/lib/types.ts +++ b/apps/web/src/lib/types.ts @@ -435,6 +435,8 @@ export interface ChatMessage { feedback?: 'up' | 'down' | null; pinned?: boolean; persona?: string; + /** The model that actually produced this turn, as reported by the server. */ + model?: string; /** * Lane C (Pillar 2.2/2.5): an optimistic user turn that was typed+sent while a * previous reply was still streaming. It renders immediately with a truthful @@ -442,6 +444,18 @@ export interface ChatMessage { * never errors, never drops. Cleared to `false`/absent once dispatched. */ queued?: boolean; + /** + * Non-authoritative streaming preview. Draft text is display-only: it must + * never feed copy/pin/feedback, conversation context, or the settled cache. + * `done.content` is authoritative; legacy token streams that omit it settle + * from their accumulated token preview for backward compatibility. + */ + draft?: { + turnId: string; + revision: number; + content: string; + status: 'streaming' | 'stopped'; + }; } export interface ToolExecution { @@ -724,7 +738,7 @@ export interface SystemHealth { // `@waggle/shared` instead (richer status union incl. 'expired', category, authType). export interface StreamEvent { - type: 'token' | 'step' | 'tool_start' | 'tool_end' | 'done' | 'error' | 'approval_request' | 'approval_required' | 'model_switch' | 'notification'; + type: 'token' | 'draft_update' | 'step' | 'tool_start' | 'tool_end' | 'done' | 'error' | 'approval_request' | 'approval_required' | 'model_switch' | 'notification'; data: unknown; } diff --git a/apps/web/src/main.test.ts b/apps/web/src/main.test.ts new file mode 100644 index 0000000..e897f33 --- /dev/null +++ b/apps/web/src/main.test.ts @@ -0,0 +1,113 @@ +import { beforeEach, describe, expect, it, vi } from 'vitest'; + +const reactMocks = vi.hoisted(() => ({ + applyStoredThemeEarly: vi.fn(), + createRoot: vi.fn(() => ({ render: vi.fn() })), + flushSync: vi.fn((callback: () => void) => callback()), +})); +const bootMocks = vi.hoisted(() => ({ + armBootConnection: vi.fn(), +})); + +vi.mock('./boot-connect', () => ({ + armBootConnection: bootMocks.armBootConnection, +})); + +vi.mock('react-dom/client', () => ({ + createRoot: reactMocks.createRoot, +})); + +vi.mock('react-dom', () => ({ + flushSync: reactMocks.flushSync, +})); + +vi.mock('./App.tsx', () => ({ + default: () => null, +})); + +vi.mock('@/providers/ThemeProvider', () => ({ + applyStoredThemeEarly: reactMocks.applyStoredThemeEarly, +})); + +vi.mock('@/lib/posthog', () => ({ + initPostHog: vi.fn(), +})); + +describe('desktop startup surface', () => { + beforeEach(() => { + vi.resetModules(); + bootMocks.armBootConnection.mockReset(); + bootMocks.armBootConnection.mockResolvedValue(undefined); + document.body.innerHTML = '
'; + vi.spyOn(console, 'error').mockImplementation(() => {}); + }); + + it('keeps the startup surface mounted until the managed desktop service is ready', async () => { + let releaseService!: () => void; + const serviceReady = new Promise((resolve) => { releaseService = resolve; }); + bootMocks.armBootConnection.mockReturnValue(serviceReady); + + let markAppEntryImported!: () => void; + const appEntryImported = new Promise((resolve) => { markAppEntryImported = resolve; }); + const mountApp = vi.fn(); + vi.doMock('./app-entry', () => { + markAppEntryImported(); + return { mountApp }; + }); + + await import('./main'); + const earlyImport = await Promise.race([ + appEntryImported.then(() => true), + new Promise((resolve) => setTimeout(() => resolve(false), 50)), + ]); + + expect(earlyImport).toBe(false); + expect(mountApp).not.toHaveBeenCalled(); + expect(document.querySelector('[data-waggle-startup="loading"]')).not.toBeNull(); + + releaseService(); + await vi.waitFor(() => expect(mountApp).toHaveBeenCalledOnce()); + }); + + it('shows a visible alert when the application bundle cannot mount', async () => { + vi.doMock('./app-entry', () => ({ + mountApp: vi.fn(() => { + throw new Error('simulated app bundle failure'); + }), + })); + await import('./main'); + + await vi.waitFor(() => { + const alert = document.querySelector('[data-waggle-startup="failed"]'); + expect(alert?.getAttribute('role')).toBe('alert'); + expect(alert?.textContent).toContain('Waggle could not start'); + }); + }); + + it('keeps the app graph unloaded and shows a visible alert when service startup fails', async () => { + const mountApp = vi.fn(); + bootMocks.armBootConnection.mockRejectedValue(new Error('managed service failed')); + vi.doMock('./app-entry', () => ({ mountApp })); + + await import('./main'); + + await vi.waitFor(() => { + const alert = document.querySelector('[data-waggle-startup="failed"]'); + expect(alert?.getAttribute('role')).toBe('alert'); + expect(alert?.textContent).toContain('Waggle could not start'); + }); + expect(mountApp).not.toHaveBeenCalled(); + }); + + it('marks the desktop shell ready only after the synchronous app mount', async () => { + vi.doUnmock('./app-entry'); + await import('./main'); + + await vi.waitFor(() => { + const root = document.getElementById('root'); + expect(reactMocks.applyStoredThemeEarly).toHaveBeenCalledOnce(); + expect(reactMocks.createRoot).toHaveBeenCalledWith(root); + expect(root?.dataset.waggleUiReady).toBe('ready'); + }); + }); +}); diff --git a/apps/web/src/main.tsx b/apps/web/src/main.tsx index c8c2a6a..03545e0 100644 --- a/apps/web/src/main.tsx +++ b/apps/web/src/main.tsx @@ -1,19 +1,39 @@ -// P1b D3: must be the FIRST import — arms the adapter's request-deferral gate -// before any other module in the import graph can evaluate (see boot-connect.ts). -import "./boot-connect"; -import { createRoot } from "react-dom/client"; -import App from "./App.tsx"; -import "./index.css"; -import { applyStoredThemeEarly } from "@/providers/ThemeProvider"; +import { armBootConnection } from './boot-connect'; -// Apply the persisted theme before first paint to avoid a flash of the wrong -// theme (warm graphite/dark default; warm paper for light). -applyStoredThemeEarly(); +const root = document.getElementById('root'); +if (!root) throw new Error('Waggle root element is missing'); -createRoot(document.getElementById("root")!).render(); +const startup = document.createElement('main'); +startup.setAttribute('role', 'status'); +startup.setAttribute('aria-live', 'polite'); +startup.dataset.waggleStartup = 'loading'; +Object.assign(startup.style, { + alignItems: 'center', + color: '#f6f1e4', + display: 'flex', + fontFamily: 'system-ui, sans-serif', + fontSize: '16px', + justifyContent: 'center', + minHeight: '100vh', +}); -// Initialize PostHog cloud analytics (DAY0-04). -// Non-blocking and lazy-loaded so analytics never bloats the startup bundle. -void import("@/lib/posthog") - .then(({ initPostHog }) => initPostHog()) - .catch(() => {}); +const startupMessage = document.createElement('p'); +startupMessage.textContent = 'Starting Waggle…'; +startup.append(startupMessage); +root.replaceChildren(startup); + +const showStartupFailure = (error: unknown) => { + console.error('[waggle] UI startup failed', error); + startup.setAttribute('role', 'alert'); + startup.dataset.waggleStartup = 'failed'; + startupMessage.textContent = 'Waggle could not start. Close and reopen the app.'; +}; + +try { + void armBootConnection() + .then(() => import('./app-entry')) + .then(({ mountApp }) => mountApp()) + .catch((error) => showStartupFailure(error)); +} catch (error) { + showStartupFailure(error); +} diff --git a/apps/web/src/providers/InstallProvider.tsx b/apps/web/src/providers/InstallProvider.tsx index d3cbbfb..d9e25db 100644 --- a/apps/web/src/providers/InstallProvider.tsx +++ b/apps/web/src/providers/InstallProvider.tsx @@ -44,6 +44,13 @@ export interface InstallStore { uninstall: (target: InstallTarget) => Promise; /** Re-read server truth (initial, on connect-settled, and on nav per D4). */ hydrate: () => Promise; + /** Confirm a server-held marketplace proposal through the shared transaction state. */ + confirmPackageProposal: ( + packageId: number, + proposalId: string, + workspaceId: string, + sessionId: string, + ) => Promise; } const InstallContext = createContext(null); @@ -94,6 +101,27 @@ export const InstallProvider = ({ children }: { children: ReactNode }) => { hydrateSeq.current += 1; setInstalled(prev => { const n = new Set(prev); n.add(id); return n; }); }, []); + const confirmPackageProposal = useCallback(async ( + packageId: number, + proposalId: string, + workspaceId: string, + sessionId: string, + ) => { + const id = `pkg:${packageId}`; + addInstalling(id); + try { + await adapter.fetch( + `/api/capability-proposals/${encodeURIComponent(proposalId)}/confirm`, + { + method: 'POST', + body: JSON.stringify({ workspaceId, sessionId }), + }, + ); + markInstalled(id); + } finally { + clearInstalling(id); + } + }, [addInstalling, clearInstalling, markInstalled]); const markUninstalled = useCallback((id: string) => { hydrateSeq.current += 1; setInstalled(prev => { const n = new Set(prev); n.delete(id); return n; }); @@ -296,7 +324,8 @@ export const InstallProvider = ({ children }: { children: ReactNode }) => { install, uninstall, hydrate, - }), [installed, installing, hydrating, install, uninstall, hydrate]); + confirmPackageProposal, + }), [installed, installing, hydrating, install, uninstall, hydrate, confirmPackageProposal]); return {children}; }; diff --git a/apps/web/src/test/build-warning-hygiene.test.ts b/apps/web/src/test/build-warning-hygiene.test.ts index 20c2503..33522bc 100644 --- a/apps/web/src/test/build-warning-hygiene.test.ts +++ b/apps/web/src/test/build-warning-hygiene.test.ts @@ -46,10 +46,23 @@ describe('build warning hygiene', () => { } }); - it('keeps cloud analytics out of the startup bundle', () => { + it('arms the desktop gate before loading the app graph and keeps analytics lazy', () => { const mainSource = readFileSync(join(sourceRoot, 'main.tsx'), 'utf8'); + const appEntrySource = readFileSync(join(sourceRoot, 'app-entry.tsx'), 'utf8'); - expect(mainSource).not.toContain('from "@/lib/posthog"'); - expect(mainSource).toContain('import("@/lib/posthog")'); + const armIndex = mainSource.indexOf('armBootConnection()'); + const appImportIndex = mainSource.indexOf("import('./app-entry')"); + expect(armIndex).toBeGreaterThanOrEqual(0); + expect(appImportIndex).toBeGreaterThan(armIndex); + expect(mainSource).toMatch( + /^import\s+\{\s*armBootConnection\s*\}\s+from\s+['"]\.\/boot-connect['"];\s*/, + ); + expect(mainSource).not.toMatch(/from ['"].*App(?:\.tsx)?['"]/); + expect(mainSource).not.toMatch(/from ['"]\.\/app-entry['"]/); + expect(mainSource).not.toMatch(/posthog/i); + expect(mainSource).not.toMatch(/\bawait\b/); + + expect(appEntrySource).not.toMatch(/^\s*import(?!\s*\()[^;\n]*['"]@\/lib\/posthog['"]/m); + expect(appEntrySource).toMatch(/import\(\s*['"]@\/lib\/posthog['"]\s*\)/); }); }); diff --git a/apps/web/src/test/lane-c-input-power.test.tsx b/apps/web/src/test/lane-c-input-power.test.tsx index 1f23f54..e2392a9 100644 --- a/apps/web/src/test/lane-c-input-power.test.tsx +++ b/apps/web/src/test/lane-c-input-power.test.tsx @@ -41,6 +41,7 @@ const mocks = vi.hoisted(() => ({ // ChatApp mount side-effects getPins: vi.fn().mockResolvedValue([]), searchMemory: vi.fn().mockResolvedValue([]), + getWorkspaceContext: vi.fn().mockResolvedValue(null), submitFeedback: vi.fn(), ingestFile: vi.fn(), addPin: vi.fn(), @@ -59,6 +60,7 @@ function deferred() { beforeEach(() => { vi.clearAllMocks(); mocks.adapter.getHistory.mockResolvedValue([]); + mocks.adapter.getWorkspaceContext.mockResolvedValue(null); clearChatThreadCache(); }); afterEach(() => { cleanup(); }); @@ -160,6 +162,84 @@ describe('useChat — send queue (never locks, never drops)', () => { const users = result.current.messages.filter(m => m.role === 'user').map(m => m.content); expect(users).toEqual(['one', 'two', 'three']); }); + + it('stamps the authoring persona on the assistant turn', async () => { + mocks.adapter.sendMessage.mockImplementationOnce(async function* () { + yield { type: 'done', data: { content: 'Research answer' } }; + }); + const { useChat } = await import('@/hooks/useChat'); + const { result } = renderHook(() => useChat({ + workspaceId: 'ws-1', + sessionId: 'sess-persona', + persona: 'researcher', + })); + await act(async () => { await Promise.resolve(); }); + await act(async () => { await result.current.sendMessage('Investigate this'); }); + + const assistant = result.current.messages.find((message) => message.role === 'assistant'); + expect(assistant?.persona).toBe('researcher'); + }); + + it('keeps a queued turn bound to its authoring persona and autonomy', async () => { + const gate = deferred(); + mocks.adapter.sendMessage + .mockImplementationOnce(async function* () { + await gate.promise; + yield { type: 'done', data: { content: 'first answer' } }; + }) + .mockImplementationOnce(async function* () { + yield { type: 'done', data: { content: 'queued answer' } }; + }); + + const { useChat } = await import('@/hooks/useChat'); + const hook = renderHook( + ({ + activePersona, + autonomy, + }: { + activePersona: string; + autonomy: { level: 'normal' | 'yolo'; expiresAt: number | null }; + }) => useChat({ + workspaceId: 'ws-1', + sessionId: 'sess-queued-persona', + persona: activePersona, + autonomy, + }), + { initialProps: { + activePersona: 'planner', + autonomy: { level: 'normal' as const, expiresAt: null }, + } }, + ); + await act(async () => { await Promise.resolve(); }); + + let firstPromise: Promise | undefined; + await act(async () => { + firstPromise = hook.result.current.sendMessage('first'); + await Promise.resolve(); + await hook.result.current.sendMessage('queued as planner'); + }); + hook.rerender({ activePersona: 'coder', autonomy: { level: 'yolo', expiresAt: null } }); + + await act(async () => { + gate.resolve(); + await firstPromise; + await new Promise(resolve => setTimeout(resolve, 0)); + }); + + expect(mocks.adapter.sendMessage).toHaveBeenNthCalledWith( + 2, + 'ws-1', + 'queued as planner', + 'sess-queued-persona', + 'planner', + undefined, + undefined, + ); + const queuedAssistant = hook.result.current.messages.find( + message => message.role === 'assistant' && message.content === 'queued answer', + ); + expect(queuedAssistant?.persona).toBe('planner'); + }); }); // ── useChat thread cache (contract 4) ─────────────────────────────────────── @@ -199,6 +279,235 @@ describe('useChat — thread session cache (2.6-chat)', () => { expect(result.current.messages[0].content).toBe('cached'); }); + it('never lets delayed history from the previous session overwrite the active session', async () => { + const historyA = deferred(); + const historyB = deferred(); + mocks.adapter.getHistory + .mockReturnValueOnce(historyA.promise) + .mockReturnValueOnce(historyB.promise); + + const { useChat } = await import('@/hooks/useChat'); + const hook = renderHook( + ({ activeSession }: { activeSession: string }) => useChat({ + workspaceId: 'ws-1', + sessionId: activeSession, + }), + { initialProps: { activeSession: 'sess-a' } }, + ); + await act(async () => { await Promise.resolve(); }); + await act(async () => { + hook.rerender({ activeSession: 'sess-b' }); + await Promise.resolve(); + }); + + await act(async () => { + historyB.resolve([{ id: 'b', role: 'assistant', content: 'session B', timestamp: 'now' }]); + await Promise.resolve(); + }); + expect(hook.result.current.messages.map(message => message.content)).toEqual(['session B']); + expect(hook.result.current.historyLoaded).toBe(true); + + await act(async () => { + historyA.resolve([{ id: 'a', role: 'assistant', content: 'stale session A', timestamp: 'now' }]); + await Promise.resolve(); + }); + expect(hook.result.current.messages.map(message => message.content)).toEqual(['session B']); + expect(hook.result.current.historyLoaded).toBe(true); + }); + + it('clears an uncached session immediately without displaying or caching the previous session', async () => { + const historyB = deferred(); + mocks.adapter.getHistory + .mockResolvedValueOnce([{ id: 'a', role: 'assistant', content: 'session A', timestamp: 'now' }]) + .mockReturnValueOnce(historyB.promise); + + const { useChat } = await import('@/hooks/useChat'); + const hook = renderHook( + ({ activeSession }: { activeSession: string }) => useChat({ + workspaceId: 'ws-1', + sessionId: activeSession, + }), + { initialProps: { activeSession: 'sess-a' } }, + ); + await act(async () => { await Promise.resolve(); }); + expect(hook.result.current.messages.map(message => message.content)).toEqual(['session A']); + + await act(async () => { + hook.rerender({ activeSession: 'sess-b' }); + await Promise.resolve(); + }); + + expect(hook.result.current.messages).toEqual([]); + expect(readChatThreadCache(chatThreadCacheKey('ws-1', 'sess-b'))).toBeUndefined(); + + historyB.resolve([]); + await act(async () => { await Promise.resolve(); }); + }); + + it('never lets a delayed same-session history refresh erase a turn that already started', async () => { + const history = deferred(); + const streamGate = deferred(); + mocks.adapter.getHistory.mockReturnValueOnce(history.promise); + mocks.adapter.sendMessage.mockImplementationOnce(async function* () { + yield { type: 'token', data: { content: 'draft answer' } }; + await streamGate.promise; + yield { type: 'done', data: { content: 'canonical answer' } }; + }); + + const { useChat } = await import('@/hooks/useChat'); + const { result } = renderHook(() => useChat({ + workspaceId: 'ws-1', + sessionId: 'sess-history-race', + })); + let sendPromise: Promise | undefined; + await act(async () => { + sendPromise = result.current.sendMessage('question'); + await Promise.resolve(); + }); + + await act(async () => { + history.resolve([ + { id: 'old-u', role: 'user', content: 'older question', timestamp: 'old' }, + { id: 'old-a', role: 'assistant', content: 'older answer', timestamp: 'old' }, + ]); + await Promise.resolve(); + }); + const keptHistory = result.current.messages.some(message => message.content === 'older answer'); + const keptUser = result.current.messages.some(message => message.role === 'user'); + const keptDraft = result.current.messages.some(message => message.draft?.content === 'draft answer'); + + streamGate.resolve(); + await act(async () => { await sendPromise; }); + const keptFinal = result.current.messages.some(message => message.content === 'canonical answer'); + + expect(keptHistory).toBe(true); + expect(keptUser).toBe(true); + expect(keptDraft).toBe(true); + expect(keptFinal).toBe(true); + }); + + it('keeps the active turn when its pending history refresh fails', async () => { + const history = deferred(); + const streamGate = deferred(); + mocks.adapter.getHistory.mockReturnValueOnce(history.promise); + mocks.adapter.sendMessage.mockImplementationOnce(async function* () { + yield { type: 'token', data: { content: 'draft answer' } }; + await streamGate.promise; + yield { type: 'done', data: { content: 'canonical answer' } }; + }); + + const { useChat } = await import('@/hooks/useChat'); + const { result } = renderHook(() => useChat({ + workspaceId: 'ws-1', + sessionId: 'sess-history-error-race', + })); + let sendPromise: Promise | undefined; + await act(async () => { + sendPromise = result.current.sendMessage('question'); + await Promise.resolve(); + }); + + await act(async () => { + history.reject(new Error('offline')); + await Promise.resolve(); + }); + const keptDuringFailure = result.current.messages.some(message => + message.role === 'user' || message.draft?.content === 'draft answer' + ); + + streamGate.resolve(); + await act(async () => { await sendPromise; }); + const keptFinal = result.current.messages.some(message => message.content === 'canonical answer'); + + expect(keptDuringFailure).toBe(true); + expect(keptFinal).toBe(true); + }); + + it('does not restore a persisted failed pair while its retry waits for history', async () => { + const cacheKey = chatThreadCacheKey('ws-1', 'sess-pending-retry'); + const failedPair: ChatMessage[] = [ + { id: 'hist-user', role: 'user', content: 'retry me', timestamp: 'old' }, + { + id: 'hist-assistant', + role: 'assistant', + content: 'Generation failed: original failure', + timestamp: 'old', + }, + ]; + writeChatThreadCache(cacheKey, failedPair); + const history = deferred(); + mocks.adapter.getHistory.mockReturnValueOnce(history.promise); + mocks.adapter.sendMessage.mockImplementationOnce(async function* () { + yield { type: 'done', data: { content: 'recovered answer' } }; + }); + + const { useChat } = await import('@/hooks/useChat'); + const { result } = renderHook(() => useChat({ + workspaceId: 'ws-1', + sessionId: 'sess-pending-retry', + })); + await act(async () => { await Promise.resolve(); }); + expect(result.current.messages.map(message => message.id)) + .toEqual(['hist-user', 'hist-assistant']); + + act(() => { result.current.retryLastFailed(); }); + expect(mocks.adapter.sendMessage).not.toHaveBeenCalled(); + + history.resolve(failedPair); + await waitFor(() => expect(mocks.adapter.sendMessage).toHaveBeenCalledTimes(1)); + await waitFor(() => expect(result.current.isLoading).toBe(false)); + + expect(result.current.messages.map(message => [message.role, message.content])).toEqual([ + ['user', 'retry me'], + ['assistant', 'recovered answer'], + ]); + }); + + it('waits for initial history before dispatch and preserves a legitimate repeated exchange', async () => { + const history = deferred(); + mocks.adapter.getHistory.mockReturnValueOnce(history.promise); + mocks.adapter.sendMessage.mockImplementationOnce(async function* () { + yield { type: 'done', data: { content: 'canonical answer' } }; + }); + + const { useChat } = await import('@/hooks/useChat'); + const { result } = renderHook(() => useChat({ + workspaceId: 'ws-1', + sessionId: 'sess-history-overlap', + })); + let sendPromise: Promise | undefined; + await act(async () => { + sendPromise = result.current.sendMessage('question'); + await Promise.resolve(); + }); + + expect(mocks.adapter.sendMessage).not.toHaveBeenCalled(); + + await act(async () => { + history.resolve([ + { id: 'hist-0', role: 'user', content: 'question', timestamp: 'server-user' }, + { id: 'hist-1', role: 'assistant', content: 'canonical answer', timestamp: 'server-assistant' }, + ]); + await sendPromise; + }); + + expect(result.current.messages.map(message => [message.role, message.content])).toEqual([ + ['user', 'question'], + ['assistant', 'canonical answer'], + ['user', 'question'], + ['assistant', 'canonical answer'], + ]); + expect( + readChatThreadCache(chatThreadCacheKey('ws-1', 'sess-history-overlap')) + ?.map(message => [message.role, message.content]), + ).toEqual([ + ['user', 'question'], + ['assistant', 'canonical answer'], + ['user', 'question'], + ['assistant', 'canonical answer'], + ]); + }); + it('writes the settled thread to cache after a clean send', async () => { mocks.adapter.sendMessage.mockImplementationOnce(async function* () { yield { type: 'done', data: { content: 'answer' } }; @@ -215,6 +524,461 @@ describe('useChat — thread session cache (2.6-chat)', () => { // Settled thread has no `queued` turns. expect(cached!.some(m => m.queued)).toBe(false); }); + + it('clears server history for the current workspace', async () => { + const { useChat } = await import('@/hooks/useChat'); + const { result } = renderHook(() => useChat({ + workspaceId: 'ws-clear', + sessionId: 'sess-clear', + })); + await act(async () => { + await Promise.resolve(); + }); + + await act(async () => { + await result.current.clearHistory(); + }); + + expect(mocks.adapter.clearHistory).toHaveBeenCalledWith( + 'ws-clear', + 'sess-clear', + ); + }); + + it('invalidates the exact thread cache and ignores history that resolves after clear', async () => { + const key = chatThreadCacheKey('ws-clear-race', 'sess-clear-race'); + const oldMessage: ChatMessage = { + id: 'old', + role: 'assistant', + content: 'must stay cleared', + timestamp: 'now', + }; + writeChatThreadCache(key, [oldMessage]); + const history = deferred(); + mocks.adapter.getHistory.mockReturnValueOnce(history.promise); + + const { useChat } = await import('@/hooks/useChat'); + const { result } = renderHook(() => useChat({ + workspaceId: 'ws-clear-race', + sessionId: 'sess-clear-race', + })); + await act(async () => { await Promise.resolve(); }); + expect(result.current.messages.map(message => message.content)).toEqual(['must stay cleared']); + + await act(async () => { await result.current.clearHistory(); }); + const messagesAfterClear = result.current.messages; + const cacheAfterClear = readChatThreadCache(key); + + await act(async () => { + history.resolve([oldMessage]); + await Promise.resolve(); + }); + expect(messagesAfterClear).toEqual([]); + expect(cacheAfterClear).toEqual([]); + expect(result.current.messages).toEqual([]); + expect(readChatThreadCache(key)).toEqual([]); + }); + + it('does not resurrect a cleared thread after switching away and back during clear', async () => { + const oldMessage: ChatMessage = { + id: 'old-a', + role: 'assistant', + content: 'must remain cleared', + timestamp: 'old', + }; + const returningHistory = deferred(); + const clearGate = deferred(); + mocks.adapter.getHistory + .mockResolvedValueOnce([oldMessage]) + .mockResolvedValueOnce([]) + .mockReturnValueOnce(returningHistory.promise); + mocks.adapter.clearHistory.mockReturnValueOnce(clearGate.promise); + + const { useChat } = await import('@/hooks/useChat'); + const hook = renderHook( + ({ activeSession }: { activeSession: string }) => useChat({ + workspaceId: 'ws-clear-switch', + sessionId: activeSession, + }), + { initialProps: { activeSession: 'sess-a' } }, + ); + await act(async () => { await Promise.resolve(); }); + + let clearPromise: Promise | undefined; + await act(async () => { + clearPromise = hook.result.current.clearHistory(); + await Promise.resolve(); + }); + await act(async () => { + hook.rerender({ activeSession: 'sess-b' }); + await Promise.resolve(); + }); + await act(async () => { + hook.rerender({ activeSession: 'sess-a' }); + await Promise.resolve(); + }); + + clearGate.resolve(); + await act(async () => { await clearPromise; }); + returningHistory.resolve([oldMessage]); + await act(async () => { await Promise.resolve(); }); + + expect(hook.result.current.messages).toEqual([]); + expect(hook.result.current.historyLoaded).toBe(true); + expect( + readChatThreadCache(chatThreadCacheKey('ws-clear-switch', 'sess-a')), + ).toEqual([]); + }); + + it('refetches an uncached pending history snapshot when clear fails', async () => { + const abandonedHistory = deferred(); + const serverMessage: ChatMessage = { + id: 'server-old', + role: 'assistant', + content: 'still exists on server', + timestamp: 'old', + }; + mocks.adapter.getHistory + .mockReturnValueOnce(abandonedHistory.promise) + .mockResolvedValueOnce([serverMessage]); + mocks.adapter.clearHistory.mockRejectedValueOnce(new Error('offline')); + + const { useChat } = await import('@/hooks/useChat'); + const { result } = renderHook(() => useChat({ + workspaceId: 'ws-clear-failed-history', + sessionId: 'sess-clear-failed-history', + })); + await act(async () => { await Promise.resolve(); }); + + await act(async () => { await result.current.clearHistory(); }); + await waitFor(() => expect(mocks.adapter.getHistory).toHaveBeenCalledTimes(2)); + await waitFor(() => { + expect(result.current.messages.map(message => message.content)) + .toEqual(['still exists on server']); + }); + expect(result.current.historyLoaded).toBe(true); + }); + + it('recovers pending server history and the canceled local turn after clear fails', async () => { + const abandonedHistory = deferred(); + const serverMessage: ChatMessage = { + id: 'server-before-send', + role: 'assistant', + content: 'older server history', + timestamp: 'old', + }; + mocks.adapter.getHistory + .mockReturnValueOnce(abandonedHistory.promise) + .mockResolvedValueOnce([serverMessage]); + mocks.adapter.clearHistory.mockRejectedValueOnce(new Error('offline')); + + const { useChat } = await import('@/hooks/useChat'); + const { result } = renderHook(() => useChat({ + workspaceId: 'ws-clear-active-history', + sessionId: 'sess-clear-active-history', + })); + await act(async () => { await Promise.resolve(); }); + + let sendPromise: Promise | undefined; + await act(async () => { + sendPromise = result.current.sendMessage('local turn'); + await Promise.resolve(); + }); + await act(async () => { await result.current.clearHistory(); }); + await act(async () => { await sendPromise; }); + + await waitFor(() => expect(mocks.adapter.getHistory).toHaveBeenCalledTimes(2)); + await waitFor(() => { + const contents = result.current.messages.map(message => message.content); + expect(contents).toContain('older server history'); + expect(contents).toContain('local turn'); + }); + }); + + it('blocks a send until failed-clear history recovery is installed', async () => { + const abandonedHistory = deferred(); + const recoveryHistory = deferred(); + const streamGate = deferred(); + mocks.adapter.getHistory + .mockReturnValueOnce(abandonedHistory.promise) + .mockReturnValueOnce(recoveryHistory.promise); + mocks.adapter.clearHistory.mockRejectedValueOnce(new Error('offline')); + mocks.adapter.sendMessage.mockImplementationOnce(async function* () { + yield { type: 'token', data: { content: 'must not start' } }; + await streamGate.promise; + }); + + const { useChat } = await import('@/hooks/useChat'); + const { result } = renderHook(() => useChat({ + workspaceId: 'ws-clear-recovery-admission', + sessionId: 'sess-clear-recovery-admission', + })); + await act(async () => { await Promise.resolve(); }); + + let sendPromise: Promise | undefined; + await act(async () => { + await result.current.clearHistory(); + sendPromise = result.current.sendMessage('wait for recovery'); + await Promise.resolve(); + }); + + expect(await sendPromise).toBe(false); + expect(mocks.adapter.sendMessage).not.toHaveBeenCalled(); + expect(result.current.messages.some(message => message.content === 'wait for recovery')).toBe(false); + + recoveryHistory.resolve([]); + streamGate.resolve(); + await act(async () => { await Promise.resolve(); }); + }); + + it('keeps recovery ownership when clear fails again during the recovery fetch', async () => { + const abandonedHistory = deferred(); + const firstRecovery = deferred(); + const secondRecovery = deferred(); + const serverMessage: ChatMessage = { + id: 'server-before-recovery', + role: 'assistant', + content: 'server history survives', + timestamp: 'old', + }; + mocks.adapter.getHistory + .mockReturnValueOnce(abandonedHistory.promise) + .mockReturnValueOnce(firstRecovery.promise) + .mockReturnValueOnce(secondRecovery.promise); + mocks.adapter.clearHistory + .mockRejectedValueOnce(new Error('first clear offline')) + .mockRejectedValueOnce(new Error('second clear offline')); + mocks.adapter.sendMessage.mockImplementation(async function* () { + yield { type: 'done', data: { content: 'must not run' } }; + }); + + const { useChat } = await import('@/hooks/useChat'); + const { result } = renderHook(() => useChat({ + workspaceId: 'ws-reentrant-clear', + sessionId: 'sess-reentrant-clear', + })); + await act(async () => { await Promise.resolve(); }); + + let localSend: Promise | undefined; + await act(async () => { + localSend = result.current.sendMessage('local canceled turn'); + await Promise.resolve(); + }); + await act(async () => { await result.current.clearHistory(); }); + await act(async () => { await localSend; }); + await waitFor(() => expect(mocks.adapter.getHistory).toHaveBeenCalledTimes(2)); + + await act(async () => { await result.current.clearHistory(); }); + await waitFor(() => expect(mocks.adapter.getHistory).toHaveBeenCalledTimes(3)); + + let blockedSend: Promise | undefined; + await act(async () => { + blockedSend = result.current.sendMessage('must remain blocked'); + await Promise.resolve(); + }); + expect(result.current.messages.some(message => message.content === 'must remain blocked')).toBe(false); + + secondRecovery.resolve([serverMessage]); + firstRecovery.resolve([]); + await act(async () => { await Promise.resolve(); }); + expect(await blockedSend).toBe(false); + expect(mocks.adapter.sendMessage).not.toHaveBeenCalled(); + expect(result.current.messages.map(message => message.content)).toContain('server history survives'); + expect(result.current.messages.map(message => message.content)).toContain('local canceled turn'); + }); + + it('keeps recovery ownership when clear fails again before recovery installs', async () => { + const abandonedHistory = deferred(); + const recoveryHistory = deferred(); + const serverMessage: ChatMessage = { + id: 'server-before-install', + role: 'assistant', + content: 'server history before install', + timestamp: 'old', + }; + mocks.adapter.getHistory + .mockReturnValueOnce(abandonedHistory.promise) + .mockReturnValueOnce(recoveryHistory.promise); + mocks.adapter.clearHistory + .mockRejectedValueOnce(new Error('first clear offline')) + .mockRejectedValueOnce(new Error('second clear offline')); + + const { useChat } = await import('@/hooks/useChat'); + const { result } = renderHook(() => useChat({ + workspaceId: 'ws-preinstall-clear', + sessionId: 'sess-preinstall-clear', + })); + await act(async () => { await Promise.resolve(); }); + + let localSend: Promise | undefined; + await act(async () => { + localSend = result.current.sendMessage('local preinstall turn'); + await Promise.resolve(); + }); + await act(async () => { + await result.current.clearHistory(); + await result.current.clearHistory(); + }); + await act(async () => { await localSend; }); + await waitFor(() => expect(mocks.adapter.getHistory).toHaveBeenCalledTimes(2)); + + let blockedSend: Promise | undefined; + await act(async () => { + blockedSend = result.current.sendMessage('must remain blocked preinstall'); + await Promise.resolve(); + }); + expect(result.current.messages.some( + message => message.content === 'must remain blocked preinstall' + )).toBe(false); + + recoveryHistory.resolve([serverMessage]); + await act(async () => { await Promise.resolve(); }); + expect(await blockedSend).toBe(false); + expect(mocks.adapter.sendMessage).not.toHaveBeenCalled(); + expect(result.current.messages.map(message => message.content)).toContain('server history before install'); + expect(result.current.messages.map(message => message.content)).toContain('local preinstall turn'); + }); + + it('retries recovery once and stays fail-closed when history remains offline', async () => { + const abandonedHistory = deferred(); + const terminalRecovery = deferred(); + mocks.adapter.getHistory + .mockReturnValueOnce(abandonedHistory.promise) + .mockRejectedValueOnce(new Error('recovery offline')) + .mockReturnValueOnce(terminalRecovery.promise); + mocks.adapter.clearHistory.mockRejectedValueOnce(new Error('clear offline')); + + const { useChat } = await import('@/hooks/useChat'); + const { result } = renderHook(() => useChat({ + workspaceId: 'ws-recovery-offline', + sessionId: 'sess-recovery-offline', + })); + await act(async () => { await Promise.resolve(); }); + + let localSend: Promise | undefined; + await act(async () => { + localSend = result.current.sendMessage('local offline turn'); + await Promise.resolve(); + }); + await act(async () => { await result.current.clearHistory(); }); + await act(async () => { await localSend; }); + await waitFor(() => expect(mocks.adapter.getHistory).toHaveBeenCalledTimes(3)); + + let blockedDuringRetry: Promise | undefined; + await act(async () => { + blockedDuringRetry = result.current.sendMessage('blocked during recovery retry'); + await Promise.resolve(); + }); + expect(await blockedDuringRetry).toBe(false); + expect(mocks.adapter.sendMessage).not.toHaveBeenCalled(); + + terminalRecovery.reject(new Error('still offline')); + await act(async () => { await Promise.resolve(); await Promise.resolve(); }); + + let blockedAfterRetry: Promise | undefined; + await act(async () => { + blockedAfterRetry = result.current.sendMessage('blocked after recovery retry'); + }); + expect(await blockedAfterRetry).toBe(false); + expect(mocks.adapter.getHistory).toHaveBeenCalledTimes(3); + expect(result.current.historyLoaded).toBe(false); + expect(result.current.messages.map(message => message.content)).toContain('local offline turn'); + }); + + it('treats malformed resolved recovery history as failed and stays fail-closed', async () => { + const abandonedHistory = deferred(); + const recoveryRetry = deferred(); + mocks.adapter.getHistory + .mockReturnValueOnce(abandonedHistory.promise) + .mockResolvedValueOnce([null] as unknown as ChatMessage[]) + .mockReturnValueOnce(recoveryRetry.promise); + mocks.adapter.clearHistory.mockRejectedValueOnce(new Error('clear offline')); + + const { useChat } = await import('@/hooks/useChat'); + const { result } = renderHook(() => useChat({ + workspaceId: 'ws-malformed-recovery', + sessionId: 'sess-malformed-recovery', + })); + await act(async () => { await Promise.resolve(); }); + + let localSend: Promise | undefined; + await act(async () => { + localSend = result.current.sendMessage('local malformed turn'); + await Promise.resolve(); + }); + await act(async () => { await result.current.clearHistory(); }); + await act(async () => { await localSend; }); + + await waitFor(() => expect(mocks.adapter.getHistory).toHaveBeenCalledTimes(3)); + expect(result.current.historyLoaded).toBe(false); + + let blockedSend: Promise | undefined; + await act(async () => { + blockedSend = result.current.sendMessage('blocked after malformed history'); + }); + expect(await blockedSend).toBe(false); + expect(mocks.adapter.sendMessage).not.toHaveBeenCalled(); + + recoveryRetry.resolve([]); + await act(async () => { await Promise.resolve(); }); + expect(result.current.historyLoaded).toBe(true); + expect(result.current.messages.map(message => message.content)).toContain('local malformed turn'); + }); + + it('preserves a canceled local turn across navigation during failed-clear recovery', async () => { + const abandonedHistory = deferred(); + const staleRecovery = deferred(); + const serverMessage: ChatMessage = { + id: 'server-after-return', + role: 'assistant', + content: 'authoritative history after return', + timestamp: 'old', + }; + mocks.adapter.getHistory + .mockReturnValueOnce(abandonedHistory.promise) + .mockReturnValueOnce(staleRecovery.promise) + .mockResolvedValueOnce([]) + .mockResolvedValueOnce([serverMessage]); + mocks.adapter.clearHistory.mockRejectedValueOnce(new Error('offline')); + + const { useChat } = await import('@/hooks/useChat'); + const hook = renderHook( + ({ activeSession }: { activeSession: string }) => useChat({ + workspaceId: 'ws-recovery-navigation', + sessionId: activeSession, + }), + { initialProps: { activeSession: 'sess-a' } }, + ); + await act(async () => { await Promise.resolve(); }); + + let localSend: Promise | undefined; + await act(async () => { + localSend = hook.result.current.sendMessage('local canceled turn'); + await Promise.resolve(); + }); + await act(async () => { await hook.result.current.clearHistory(); }); + await act(async () => { await localSend; }); + await waitFor(() => expect(mocks.adapter.getHistory).toHaveBeenCalledTimes(2)); + + await act(async () => { + hook.rerender({ activeSession: 'sess-b' }); + await Promise.resolve(); + }); + await waitFor(() => expect(mocks.adapter.getHistory).toHaveBeenCalledTimes(3)); + await act(async () => { + hook.rerender({ activeSession: 'sess-a' }); + await Promise.resolve(); + }); + await waitFor(() => expect(mocks.adapter.getHistory).toHaveBeenCalledTimes(4)); + await waitFor(() => { + const contents = hook.result.current.messages.map(message => message.content); + expect(contents).toContain('authoritative history after return'); + expect(contents).toContain('local canceled turn'); + }); + + staleRecovery.resolve([]); + await act(async () => { await Promise.resolve(); }); + }); }); // ── ChatApp composer surface (contracts 1a + 2 + queued paint) ────────────── @@ -228,6 +992,8 @@ describe('ChatApp — composer input primacy', () => { onClearHistory: noop, pendingApproval: null, onApprove: noop, + workspaceId: null as string | null, + availableModels: [] as string[], activeSessionId: null as string | null, historyLoaded: false, initialMessage: undefined as string | undefined, @@ -293,4 +1059,198 @@ describe('ChatApp — composer input primacy', () => { gate.resolve(true); }); + + it('restores the composer text when an asynchronous send is rejected', async () => { + const onSendMessage = vi.fn().mockResolvedValue(false); + renderChat({ messages: [], onSendMessage }); + + const composer = screen.getByRole('textbox', { name: /message composer/i }); + fireEvent.change(composer, { target: { value: 'keep this message' } }); + fireEvent.click(screen.getByRole('button', { name: 'Send' })); + + await waitFor(() => expect(composer).toHaveValue('keep this message')); + expect(onSendMessage).toHaveBeenCalledWith('keep this message'); + }); + + it('never restores an older rejected send after a newer send was accepted', async () => { + const firstSend = deferred(); + const onSendMessage = vi.fn() + .mockReturnValueOnce(firstSend.promise) + .mockResolvedValueOnce(true); + renderChat({ messages: [], onSendMessage }); + + const composer = screen.getByRole('textbox', { name: /message composer/i }); + fireEvent.change(composer, { target: { value: 'older message' } }); + fireEvent.click(screen.getByRole('button', { name: 'Send' })); + fireEvent.change(composer, { target: { value: 'newer message' } }); + fireEvent.click(screen.getByRole('button', { name: 'Send' })); + await act(async () => { await Promise.resolve(); }); + + firstSend.resolve(false); + await act(async () => { await Promise.resolve(); }); + + expect(composer).toHaveValue(''); + expect(onSendMessage).toHaveBeenNthCalledWith(1, 'older message'); + expect(onSendMessage).toHaveBeenNthCalledWith(2, 'newer message'); + }); + + it('never restores a rejected send into a different session', async () => { + const firstSend = deferred(); + const onSendMessage = vi.fn(() => firstSend.promise); + const view = renderChat({ + messages: [assistantMsg], + workspaceId: 'ws-composer-owner', + activeSessionId: 'sess-a', + onSendMessage, + }); + + const composer = screen.getByRole('textbox', { name: /message composer/i }); + fireEvent.change(composer, { target: { value: 'session A draft' } }); + fireEvent.click(screen.getByRole('button', { name: 'Send' })); + view.rerender( + + + , + ); + + firstSend.resolve(false); + await act(async () => { await Promise.resolve(); }); + + expect(composer).toHaveValue(''); + }); + + it.each(['/cost', '/models'])( + 'restores the %s command when its asynchronous send is rejected', + async (command) => { + const onSendMessage = vi.fn().mockResolvedValue(false); + renderChat({ + messages: [], + onSendMessage, + availableModels: ['local/model-a'], + }); + + const composer = screen.getByRole('textbox', { name: /message composer/i }); + fireEvent.change(composer, { target: { value: command } }); + fireEvent.click(screen.getByRole('button', { name: 'Send' })); + + await waitFor(() => expect(composer).toHaveValue(command)); + }, + ); + + it('restores a rejected WorkspaceBriefing starter prompt', async () => { + vi.useFakeTimers(); + try { + mocks.adapter.getWorkspaceContext.mockResolvedValueOnce({ + greeting: 'Welcome', + suggestedPrompts: ['Inspect this workspace'], + }); + const onSendMessage = vi.fn().mockResolvedValue(false); + renderChat({ + messages: [], + workspaceId: 'ws-starter', + activeSessionId: 'sess-starter', + onSendMessage, + }); + await act(async () => { + await Promise.resolve(); + await Promise.resolve(); + }); + + fireEvent.click(screen.getByRole('button', { name: 'Inspect this workspace' })); + const composer = screen.getByRole('textbox', { name: /message composer/i }); + expect(composer).toHaveValue('Inspect this workspace'); + await act(async () => { + vi.advanceTimersByTime(1000); + await Promise.resolve(); + }); + + expect(onSendMessage).toHaveBeenCalledWith('Inspect this workspace'); + expect(composer).toHaveValue('Inspect this workspace'); + } finally { + vi.useRealTimers(); + } + }); + + it('cancels a delayed WorkspaceBriefing starter after a session switch', async () => { + vi.useFakeTimers(); + try { + mocks.adapter.getWorkspaceContext.mockResolvedValue({ + greeting: 'Welcome', + suggestedPrompts: ['Inspect this workspace'], + }); + const onSendMessage = vi.fn().mockResolvedValue(true); + const view = renderChat({ + messages: [], + workspaceId: 'ws-starter-owner', + activeSessionId: 'sess-a', + onSendMessage, + }); + await act(async () => { + await Promise.resolve(); + await Promise.resolve(); + }); + fireEvent.click(screen.getByRole('button', { name: 'Inspect this workspace' })); + + view.rerender( + + + , + ); + await act(async () => { + vi.advanceTimersByTime(1000); + await Promise.resolve(); + }); + + expect(onSendMessage).not.toHaveBeenCalled(); + } finally { + vi.useRealTimers(); + } + }); + + it('cancels a delayed WorkspaceBriefing starter after edit then revert', async () => { + vi.useFakeTimers(); + try { + mocks.adapter.getWorkspaceContext.mockResolvedValueOnce({ + greeting: 'Welcome', + suggestedPrompts: ['Inspect this workspace'], + }); + const onSendMessage = vi.fn().mockResolvedValue(true); + renderChat({ + messages: [], + workspaceId: 'ws-starter-edit', + activeSessionId: 'sess-starter-edit', + onSendMessage, + }); + await act(async () => { + await Promise.resolve(); + await Promise.resolve(); + }); + fireEvent.click(screen.getByRole('button', { name: 'Inspect this workspace' })); + + const composer = screen.getByRole('textbox', { name: /message composer/i }); + fireEvent.change(composer, { target: { value: 'edited' } }); + fireEvent.change(composer, { target: { value: 'Inspect this workspace' } }); + await act(async () => { + vi.advanceTimersByTime(1000); + await Promise.resolve(); + }); + + expect(onSendMessage).not.toHaveBeenCalled(); + expect(composer).toHaveValue('Inspect this workspace'); + } finally { + vi.useRealTimers(); + } + }); }); diff --git a/apps/web/src/test/lane-s2-streaming-interaction.test.tsx b/apps/web/src/test/lane-s2-streaming-interaction.test.tsx index 66bf3f2..ac31f20 100644 --- a/apps/web/src/test/lane-s2-streaming-interaction.test.tsx +++ b/apps/web/src/test/lane-s2-streaming-interaction.test.tsx @@ -12,8 +12,14 @@ */ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; import { renderHook, act, render, screen, fireEvent, cleanup } from '@testing-library/react'; +import { useLayoutEffect } from 'react'; import { TooltipProvider } from '@/components/ui/tooltip'; import type { ChatMessage } from '@/lib/types'; +import { + chatThreadCacheKey, + clearChatThreadCache, + readChatThreadCache, +} from '@/hooks/chat-thread-cache'; // jsdom lacks ResizeObserver (ChatApp's agent strip observes its own width). class ResizeObserverStub { @@ -52,6 +58,10 @@ const flush = () => new Promise((r) => setTimeout(r, 0)); beforeEach(() => { vi.clearAllMocks(); + mocks.adapter.sendMessage.mockReset(); + mocks.adapter.clearHistory.mockReset().mockResolvedValue(undefined); + mocks.adapter.respondApproval.mockReset().mockResolvedValue(undefined); + clearChatThreadCache(); mocks.adapter.getHistory.mockResolvedValue([]); mocks.adapter.abortAgent.mockResolvedValue(undefined); mocks.adapter.getPins.mockResolvedValue([]); @@ -69,11 +79,647 @@ describe('useChat — stopStreaming (halt in-flight, keep partial, re-enable sen return hook; } + it('replaces provisional token text with the authoritative done content', async () => { + mocks.adapter.sendMessage.mockImplementationOnce(async function* () { + yield { type: 'token', data: { content: 'discarded draft' } }; + yield { type: 'done', data: { content: 'canonical final' } }; + }); + + const { result } = await mountChat('sess-canonical'); + await act(async () => { await result.current.sendMessage('question'); }); + + const assistant = result.current.messages.find(m => m.role === 'assistant'); + expect(assistant?.content).toBe('canonical final'); + expect( + assistant?.blocks + ?.filter(block => block.type === 'text') + .map(block => block.content), + ).toEqual(['canonical final']); + }); + + it('keeps only the newest revisioned draft ephemeral until done commits canonical text', async () => { + const gate = deferred(); + mocks.adapter.sendMessage.mockImplementationOnce(async function* () { + yield { type: 'draft_update', data: { turnId: 'turn-1', revision: 1, content: 'first draft' } }; + yield { type: 'draft_update', data: { turnId: 'turn-1', revision: 1, content: 'stale duplicate' } }; + yield { type: 'draft_update', data: { turnId: 'turn-1', revision: 2, content: 'newest draft' } }; + await gate.promise; + yield { type: 'done', data: { content: 'canonical final' } }; + }); + + const { result } = await mountChat('sess-revisions'); + let sendPromise: Promise | undefined; + await act(async () => { + sendPromise = result.current.sendMessage('question'); + await flush(); + }); + + const streaming = result.current.messages.find(message => message.role === 'assistant'); + expect(streaming?.content).toBe(''); + expect(streaming?.draft).toEqual({ + turnId: 'turn-1', + revision: 2, + content: 'newest draft', + status: 'streaming', + }); + expect( + readChatThreadCache(chatThreadCacheKey('ws-1', 'sess-revisions')) + ?.some(message => message.draft || message.role === 'assistant'), + ).toBe(false); + + gate.resolve(); + await act(async () => { await sendPromise; }); + const settled = result.current.messages.find(message => message.role === 'assistant'); + expect(settled?.content).toBe('canonical final'); + expect(settled?.draft).toBeUndefined(); + }); + + it('fails visibly when the stream ends without a terminal event and never commits its draft', async () => { + mocks.adapter.sendMessage.mockImplementationOnce(async function* () { + yield { type: 'token', data: { content: 'unsafe partial' } }; + }); + + const { result } = await mountChat('sess-truncated'); + let succeeded = true; + await act(async () => { + succeeded = await result.current.sendMessage('question'); + }); + + expect(succeeded).toBe(false); + const assistant = result.current.messages.find(message => message.role === 'assistant'); + expect(assistant?.content).toBe('The response ended before completion. Please retry.'); + expect(assistant?.content).not.toContain('unsafe partial'); + expect(assistant?.draft).toBeUndefined(); + expect(assistant?.blocks?.some(block => block.type === 'error')).toBe(true); + }); + + it('stops consuming immediately after done even when the producer would stay open', async () => { + const never = deferred(); + mocks.adapter.sendMessage.mockImplementationOnce(async function* () { + yield { type: 'done', data: { content: 'complete' } }; + await never.promise; + }); + + const { result } = await mountChat('sess-terminal'); + let outcome: boolean | 'pending' = 'pending'; + let sendPromise: Promise | undefined; + try { + await act(async () => { + sendPromise = result.current.sendMessage('question').then(value => { outcome = value; }); + await flush(); + }); + expect(outcome).toBe(true); + expect(result.current.isLoading).toBe(false); + } finally { + never.resolve(); + await act(async () => { await sendPromise; }); + } + }); + + it('returns failure for a terminal SSE error', async () => { + mocks.adapter.sendMessage.mockImplementationOnce(async function* () { + yield { type: 'error', data: { message: 'provider failed' } }; + }); + + const { result } = await mountChat('sess-error'); + let succeeded = true; + await act(async () => { + succeeded = await result.current.sendMessage('question'); + }); + + expect(succeeded).toBe(false); + const assistant = result.current.messages.find(message => message.role === 'assistant'); + expect(assistant?.blocks?.some(block => block.type === 'error')).toBe(true); + }); + + it('treats an adapter AbortError as a failed transport unless the local controller was stopped', async () => { + mocks.adapter.sendMessage.mockImplementationOnce(async function* () { + yield { type: 'token', data: { content: 'unsafe partial' } }; + const error = new Error('The transport was aborted'); + error.name = 'AbortError'; + throw error; + }); + + const { result } = await mountChat('sess-transport-abort'); + let succeeded = true; + await act(async () => { + succeeded = await result.current.sendMessage('question'); + }); + + expect(succeeded).toBe(false); + const assistant = result.current.messages.find(message => message.role === 'assistant'); + expect(assistant?.draft).toBeUndefined(); + expect(assistant?.blocks?.some(block => block.type === 'error')).toBe(true); + }); + + it('does not resurrect an older draft revision after tool_start clears the preview', async () => { + const gate = deferred(); + mocks.adapter.sendMessage.mockImplementationOnce(async function* () { + yield { type: 'draft_update', data: { turnId: 'turn-watermark', revision: 2, content: 'newest' } }; + yield { type: 'tool_start', data: { name: 'read_file', input: { path: 'README.md' } } }; + yield { type: 'draft_update', data: { turnId: 'turn-watermark', revision: 1, content: 'stale' } }; + await gate.promise; + yield { type: 'done', data: { content: 'canonical' } }; + }); + + const { result } = await mountChat('sess-watermark'); + let sendPromise: Promise | undefined; + await act(async () => { + sendPromise = result.current.sendMessage('question'); + await flush(); + }); + + const assistant = result.current.messages.find(message => message.role === 'assistant'); + gate.resolve(); + await act(async () => { await sendPromise; }); + + expect(assistant?.draft?.content ?? '').toBe(''); + expect(assistant?.draft?.revision).toBe(2); + }); + + it('allows a revisioned stream to replace legacy token revisions from the same migration turn', async () => { + const gate = deferred(); + mocks.adapter.sendMessage.mockImplementationOnce(async function* () { + yield { type: 'token', data: { content: 'legacy ' } }; + yield { type: 'token', data: { content: 'preview' } }; + yield { type: 'draft_update', data: { turnId: 'turn-modern', revision: 1, content: 'modern preview' } }; + await gate.promise; + yield { type: 'done', data: { content: 'canonical' } }; + }); + + const { result } = await mountChat('sess-mixed-stream'); + let sendPromise: Promise | undefined; + await act(async () => { + sendPromise = result.current.sendMessage('question'); + await flush(); + }); + const assistant = result.current.messages.find(message => message.role === 'assistant'); + + gate.resolve(); + await act(async () => { await sendPromise; }); + + expect(assistant?.draft).toMatchObject({ + turnId: 'turn-modern', + revision: 1, + content: 'modern preview', + }); + }); + + it('keeps legacy token content when done omits canonical content', async () => { + mocks.adapter.sendMessage.mockImplementationOnce(async function* () { + yield { type: 'token', data: { content: 'legacy answer' } }; + yield { type: 'done', data: { model: 'legacy/model' } }; + }); + + const { result } = await mountChat('sess-legacy'); + await act(async () => { await result.current.sendMessage('question'); }); + + const assistant = result.current.messages.find(message => message.role === 'assistant'); + expect(assistant?.content).toBe('legacy answer'); + expect(assistant?.draft).toBeUndefined(); + expect(assistant?.model).toBe('legacy/model'); + }); + + it('keeps all legacy token content across tool activity when done omits content', async () => { + mocks.adapter.sendMessage.mockImplementationOnce(async function* () { + yield { type: 'token', data: { content: 'Before tool. ' } }; + yield { type: 'tool_start', data: { name: 'read_file', input: {} } }; + yield { type: 'tool_end', data: { name: 'read_file', result: 'ok' } }; + yield { type: 'token', data: { content: 'After tool.' } }; + yield { type: 'done', data: { model: 'legacy/model' } }; + }); + + const { result } = await mountChat('sess-legacy-tool'); + await act(async () => { await result.current.sendMessage('question'); }); + + const assistant = result.current.messages.find(message => message.role === 'assistant'); + expect(assistant?.content).toBe('Before tool. After tool.'); + expect(assistant?.draft).toBeUndefined(); + }); + + it.each([ + { label: 'before the first token', emitToolStart: false }, + { label: 'after tool_start clears provisional text', emitToolStart: true }, + ])('never caches an uncommitted assistant when stopped $label', async ({ emitToolStart }) => { + const gate = deferred(); + mocks.adapter.sendMessage.mockImplementationOnce(async function* () { + if (emitToolStart) { + yield { type: 'tool_start', data: { name: 'read_file', input: { path: 'README.md' } } }; + } + await gate.promise; + }); + + const sessionId = emitToolStart ? 'sess-stop-tool' : 'sess-stop-empty'; + const { result } = await mountChat(sessionId); + let sendPromise: Promise | undefined; + await act(async () => { + sendPromise = result.current.sendMessage('question'); + await flush(); + }); + await act(async () => { + result.current.stopStreaming(); + await flush(); + }); + + const cached = readChatThreadCache(chatThreadCacheKey('ws-1', sessionId)); + expect(cached?.some(message => message.role === 'assistant')).toBe(false); + + gate.resolve(); + await act(async () => { await sendPromise; }); + }); + + it('invalidates a pending approval and terminalizes running activity when stopped', async () => { + const gate = deferred(); + mocks.adapter.sendMessage.mockImplementationOnce(async function* () { + yield { type: 'step', data: { content: 'Inspecting workspace' } }; + yield { type: 'tool_start', data: { name: 'read_file', input: { path: 'README.md' } } }; + yield { + type: 'approval_required', + data: { requestId: 'approval-stale', toolName: 'read_file', sourceWorkspaceId: 'ws-1' }, + }; + await gate.promise; + }); + + const { result } = await mountChat('sess-stale-approval'); + let sendPromise: Promise | undefined; + await act(async () => { + sendPromise = result.current.sendMessage('question'); + await flush(); + }); + expect(result.current.pendingApproval?.requestId).toBe('approval-stale'); + + await act(async () => { + result.current.stopStreaming(); + await flush(); + }); + + const assistant = result.current.messages.find(message => message.role === 'assistant'); + const hasRunningActivity = + assistant?.blocks?.some(block => + (block.type === 'step' || block.type === 'tool_use') && block.status === 'running' + ) ?? false; + const pendingApprovalAfterStop = result.current.pendingApproval; + + gate.resolve(); + await act(async () => { await sendPromise; }); + + expect(pendingApprovalAfterStop).toBeNull(); + expect(hasRunningActivity).toBe(false); + }); + + it('drops queued work and aborts the active turn before clearing history', async () => { + const gate = deferred(); + const activeTurn = Object.assign(new Error('turn still settling'), { + name: 'AdapterHttpError', + status: 409, + body: { code: 'SESSION_TURN_IN_PROGRESS' }, + }); + mocks.adapter.clearHistory + .mockRejectedValueOnce(activeTurn) + .mockResolvedValueOnce(undefined); + mocks.adapter.sendMessage + .mockImplementationOnce(async function* () { + yield { type: 'token', data: { content: 'partial' } }; + await gate.promise; + yield { type: 'done', data: { content: 'must not return' } }; + }) + .mockImplementationOnce(async function* () { + yield { type: 'done', data: { content: 'queued work must not run' } }; + }); + + const { result } = await mountChat('sess-clear-active'); + let firstPromise: Promise | undefined; + await act(async () => { + firstPromise = result.current.sendMessage('first'); + await flush(); + await result.current.sendMessage('queued second'); + }); + expect(mocks.adapter.sendMessage).toHaveBeenCalledTimes(1); + + await act(async () => { await result.current.clearHistory(); }); + const callsImmediatelyAfterClear = mocks.adapter.sendMessage.mock.calls.length; + const loadingAfterClear = result.current.isLoading; + + gate.resolve(); + await act(async () => { await firstPromise; await flush(); }); + + expect(mocks.adapter.abortAgent).toHaveBeenCalledWith('ws-1', 'sess-clear-active'); + expect(mocks.adapter.clearHistory).toHaveBeenCalledTimes(2); + expect(callsImmediatelyAfterClear).toBe(1); + expect(mocks.adapter.sendMessage).toHaveBeenCalledTimes(1); + expect(loadingAfterClear).toBe(false); + expect(result.current.messages).toEqual([]); + expect(readChatThreadCache(chatThreadCacheKey('ws-1', 'sess-clear-active'))).toEqual([]); + }); + + it('removes canceled queued bubbles when clearing history fails', async () => { + const streamGate = deferred(); + mocks.adapter.clearHistory.mockRejectedValueOnce(new Error('offline')); + mocks.adapter.sendMessage + .mockImplementationOnce(async function* () { + yield { type: 'token', data: { content: 'partial' } }; + await streamGate.promise; + }) + .mockImplementationOnce(async function* () { + yield { type: 'done', data: { content: 'must not run' } }; + }); + + const { result } = await mountChat('sess-clear-failure'); + let firstPromise: Promise | undefined; + await act(async () => { + firstPromise = result.current.sendMessage('first'); + await flush(); + await result.current.sendMessage('queued second'); + }); + expect(result.current.messages.some(message => message.queued)).toBe(true); + + await act(async () => { await result.current.clearHistory(); }); + const messagesAfterFailure = result.current.messages; + + streamGate.resolve(); + await act(async () => { await firstPromise; }); + + expect(messagesAfterFailure.some(message => message.queued)).toBe(false); + expect(messagesAfterFailure.some(message => message.content === 'queued second')).toBe(false); + expect(mocks.adapter.sendMessage).toHaveBeenCalledTimes(1); + }); + + it('keeps the failed pair when retry is attempted during a clear that fails', async () => { + const clearGate = deferred(); + mocks.adapter.sendMessage.mockImplementationOnce(async function* () { + yield { type: 'error', data: { message: 'original failure' } }; + }); + mocks.adapter.clearHistory.mockReturnValueOnce(clearGate.promise); + + const { result } = await mountChat('sess-clear-retry'); + await act(async () => { await result.current.sendMessage('retry me'); }); + const beforeRetry = result.current.messages.map(message => ({ + id: message.id, + role: message.role, + content: message.content, + })); + + let clearPromise: Promise | undefined; + await act(async () => { + clearPromise = result.current.clearHistory(); + await flush(); + }); + act(() => { result.current.retryLastFailed(); }); + expect(mocks.adapter.sendMessage).toHaveBeenCalledTimes(1); + + clearGate.reject(new Error('offline')); + await act(async () => { await clearPromise; }); + + expect(result.current.messages.map(message => ({ + id: message.id, + role: message.role, + content: message.content, + }))).toEqual(beforeRetry); + }); + + it('does not start a new turn while the clear transaction is still pending', async () => { + const clearGate = deferred(); + mocks.adapter.clearHistory.mockReturnValueOnce(clearGate.promise); + + const { result } = await mountChat('sess-clear-pending'); + let clearPromise: Promise | undefined; + await act(async () => { + clearPromise = result.current.clearHistory(); + await flush(); + }); + + let accepted = true; + await act(async () => { + accepted = await result.current.sendMessage('must wait for clear'); + }); + + clearGate.resolve(); + await act(async () => { await clearPromise; }); + + expect(accepted).toBe(false); + expect(mocks.adapter.sendMessage).not.toHaveBeenCalled(); + expect(result.current.messages).toEqual([]); + }); + + it('keeps the thread blocked until every overlapping clear has settled', async () => { + const firstClear = deferred(); + const secondClear = deferred(); + mocks.adapter.clearHistory + .mockReturnValueOnce(firstClear.promise) + .mockReturnValueOnce(secondClear.promise); + mocks.adapter.sendMessage.mockImplementationOnce(async function* () { + yield { type: 'done', data: { content: 'must not run' } }; + }); + + const { result } = await mountChat('sess-overlapping-clear'); + let firstPromise: Promise | undefined; + let secondPromise: Promise | undefined; + await act(async () => { + firstPromise = result.current.clearHistory(); + await flush(); + }); + await act(async () => { + secondPromise = result.current.clearHistory(); + await flush(); + }); + + firstClear.resolve(); + await act(async () => { await firstPromise; }); + await act(async () => { + await result.current.sendMessage('must stay blocked'); + }); + + expect(mocks.adapter.sendMessage).not.toHaveBeenCalled(); + + secondClear.resolve(); + await act(async () => { await secondPromise; }); + }); + + it('tracks pending clears independently across session switches', async () => { + const clearA = deferred(); + const clearB = deferred(); + mocks.adapter.clearHistory + .mockReturnValueOnce(clearA.promise) + .mockReturnValueOnce(clearB.promise); + mocks.adapter.sendMessage.mockImplementation(async function* () { + yield { type: 'done', data: { content: 'accepted' } }; + }); + + const { useChat } = await import('@/hooks/useChat'); + const hook = renderHook( + ({ activeSession }: { activeSession: string }) => useChat({ + workspaceId: 'ws-1', + sessionId: activeSession, + }), + { initialProps: { activeSession: 'sess-a' } }, + ); + await act(async () => { await Promise.resolve(); }); + + let clearAPromise: Promise | undefined; + await act(async () => { + clearAPromise = hook.result.current.clearHistory(); + await flush(); + }); + await act(async () => { + hook.rerender({ activeSession: 'sess-b' }); + await flush(); + }); + await act(async () => { await hook.result.current.sendMessage('allowed in B'); }); + + let clearBPromise: Promise | undefined; + await act(async () => { + clearBPromise = hook.result.current.clearHistory(); + await flush(); + }); + clearB.resolve(); + await act(async () => { await clearBPromise; }); + await act(async () => { + hook.rerender({ activeSession: 'sess-a' }); + await flush(); + }); + + let acceptedInA = true; + await act(async () => { + acceptedInA = await hook.result.current.sendMessage('must wait in A'); + }); + + expect(acceptedInA).toBe(false); + expect(mocks.adapter.sendMessage).toHaveBeenCalledTimes(1); + + clearA.resolve(); + await act(async () => { await clearAPromise; }); + }); + + it.each(['done', 'error', 'throw'] as const)( + 'invalidates a pending approval when the stream terminates via %s', + async (terminal) => { + mocks.adapter.sendMessage.mockImplementationOnce(async function* () { + yield { + type: 'approval_required', + data: { requestId: `approval-${terminal}`, toolName: 'read_file', sourceWorkspaceId: 'ws-1' }, + }; + if (terminal === 'done') { + yield { type: 'done', data: { content: 'completed' } }; + } else if (terminal === 'error') { + yield { type: 'error', data: { message: 'failed' } }; + } else { + throw new Error('transport failed'); + } + }); + + const { result } = await mountChat(`sess-approval-${terminal}`); + await act(async () => { await result.current.sendMessage('question'); }); + + expect(result.current.pendingApproval).toBeNull(); + }, + ); + + it('keeps the approval actionable when submitting the decision fails', async () => { + const streamGate = deferred(); + mocks.adapter.respondApproval.mockRejectedValueOnce(new Error('offline')); + mocks.adapter.sendMessage.mockImplementationOnce(async function* () { + yield { + type: 'approval_required', + data: { requestId: 'approval-retry', toolName: 'write_file', sourceWorkspaceId: 'ws-1' }, + }; + await streamGate.promise; + }); + + const { result } = await mountChat('sess-approval-retry'); + let sendPromise: Promise | undefined; + await act(async () => { + sendPromise = result.current.sendMessage('question'); + await flush(); + }); + + await act(async () => { + await result.current.approveAction('approval-retry', true); + }); + const pendingAfterFailure = result.current.pendingApproval?.requestId; + + await act(async () => { + result.current.stopStreaming(); + streamGate.resolve(); + await sendPromise; + }); + + expect(pendingAfterFailure).toBe('approval-retry'); + }); + + it('does not let an older approval response clear a newer approval gate', async () => { + const submitGate = deferred(); + const secondApprovalGate = deferred(); + const streamGate = deferred(); + mocks.adapter.respondApproval.mockReturnValueOnce(submitGate.promise); + mocks.adapter.sendMessage.mockImplementationOnce(async function* () { + yield { + type: 'approval_required', + data: { requestId: 'approval-a', toolName: 'read_file', sourceWorkspaceId: 'ws-1' }, + }; + await secondApprovalGate.promise; + yield { + type: 'approval_required', + data: { requestId: 'approval-b', toolName: 'write_file', sourceWorkspaceId: 'ws-1' }, + }; + await streamGate.promise; + }); + + const { result } = await mountChat('sess-approval-order'); + let sendPromise: Promise | undefined; + await act(async () => { + sendPromise = result.current.sendMessage('question'); + await flush(); + }); + + let approvalPromise: Promise | undefined; + await act(async () => { + approvalPromise = result.current.approveAction('approval-a', true); + await Promise.resolve(); + }); + await act(async () => { + secondApprovalGate.resolve(); + await flush(); + }); + expect(result.current.pendingApproval?.requestId).toBe('approval-b'); + + await act(async () => { + submitGate.resolve(); + await approvalPromise; + }); + const pendingAfterOlderResponse = result.current.pendingApproval?.requestId; + + await act(async () => { + result.current.stopStreaming(); + streamGate.resolve(); + await sendPromise; + }); + + expect(pendingAfterOlderResponse).toBe('approval-b'); + }); + + it('terminalizes running tool and step blocks on a stream error', async () => { + mocks.adapter.sendMessage.mockImplementationOnce(async function* () { + yield { type: 'step', data: { content: 'Inspecting workspace' } }; + yield { type: 'tool_start', data: { name: 'read_file', input: { path: 'README.md' } } }; + yield { type: 'error', data: { message: 'provider failed' } }; + }); + + const { result } = await mountChat('sess-running-error'); + await act(async () => { await result.current.sendMessage('question'); }); + + const assistant = result.current.messages.find(message => message.role === 'assistant'); + expect( + assistant?.blocks?.some(block => + (block.type === 'step' || block.type === 'tool_use') && block.status === 'running' + ), + ).toBe(false); + }); + it('aborts the stream, keeps the partial answer, flips isLoading off, and calls the server cancel', async () => { const gate = deferred(); mocks.adapter.sendMessage.mockImplementationOnce(async function* () { yield { type: 'token', data: { content: 'partial answer' } }; - await gate.promise; // hold the stream open until (never) released + await gate.promise; yield { type: 'done', data: {} }; }); @@ -87,7 +733,8 @@ describe('useChat — stopStreaming (halt in-flight, keep partial, re-enable sen }); expect(result.current.isLoading).toBe(true); const streaming = result.current.messages.find(m => m.role === 'assistant'); - expect(streaming?.content).toBe('partial answer'); + expect(streaming?.content).toBe(''); + expect(streaming?.draft).toMatchObject({ content: 'partial answer', status: 'streaming' }); // Stop. await act(async () => { result.current.stopStreaming(); await flush(); }); @@ -95,9 +742,14 @@ describe('useChat — stopStreaming (halt in-flight, keep partial, re-enable sen // Composer returns to send (isLoading off) and the partial answer stays. expect(result.current.isLoading).toBe(false); const afterStop = result.current.messages.find(m => m.role === 'assistant'); - expect(afterStop?.content).toBe('partial answer'); - // Best-effort server-side cancel fired for this workspace. - expect(mocks.adapter.abortAgent).toHaveBeenCalledWith('ws-1'); + expect(afterStop?.content).toBe(''); + expect(afterStop?.draft).toMatchObject({ content: 'partial answer', status: 'stopped' }); + expect( + readChatThreadCache(chatThreadCacheKey('ws-1', 'sess-1')) + ?.some(message => message.role === 'assistant'), + ).toBe(false); + // The adapter targets only this exact workspace/session stream. + expect(mocks.adapter.abortAgent).toHaveBeenCalledWith('ws-1', 'sess-1'); // Send is re-enabled: a fresh send dispatches a new stream (not queued). mocks.adapter.sendMessage.mockImplementationOnce(async function* () { @@ -110,6 +762,200 @@ describe('useChat — stopStreaming (halt in-flight, keep partial, re-enable sen await act(async () => { await firstPromise?.catch(() => {}); }); }); + it('does not report a user-aborted stream as a backend outage', async () => { + const gate = deferred(); + mocks.adapter.sendMessage.mockImplementationOnce(async function* () { + yield { type: 'token', data: { content: 'partial answer' } }; + await gate.promise; + }); + mocks.adapter.abortAgent.mockImplementationOnce(async () => { + gate.reject(new DOMException('The operation was aborted', 'AbortError')); + }); + + const { result } = await mountChat(); + let sendPromise: Promise | undefined; + await act(async () => { + sendPromise = result.current.sendMessage('question'); + await flush(); + }); + + await act(async () => { + result.current.stopStreaming(); + await sendPromise; + await flush(); + }); + + const assistant = result.current.messages.find(m => m.role === 'assistant'); + expect(assistant?.content).toBe(''); + expect(assistant?.draft).toMatchObject({ content: 'partial answer', status: 'stopped' }); + expect(assistant?.blocks?.some(block => block.type === 'error')).toBe(false); + }); + + it('preserves queued FIFO when a stopped stream is replaced and settles late', async () => { + const firstGate = deferred(); + const secondGate = deferred(); + mocks.adapter.sendMessage + .mockImplementationOnce(async function* () { + yield { type: 'token', data: { content: 'first partial' } }; + await firstGate.promise; + }) + .mockImplementationOnce(async function* () { + yield { type: 'token', data: { content: 'second partial' } }; + await secondGate.promise; + }) + .mockImplementationOnce(async function* () { + yield { type: 'done', data: { content: 'third' } }; + }); + + const { result } = await mountChat(); + let firstPromise: Promise | undefined; + await act(async () => { + firstPromise = result.current.sendMessage('first'); + await flush(); + await result.current.sendMessage('second'); + await flush(); + }); + expect(mocks.adapter.sendMessage).toHaveBeenCalledTimes(1); + + await act(async () => { + result.current.stopStreaming(); + await flush(); + }); + expect(result.current.isLoading).toBe(true); + expect(mocks.adapter.sendMessage).toHaveBeenCalledTimes(2); + expect(mocks.adapter.sendMessage.mock.calls[1]?.[1]).toBe('second'); + + await act(async () => { await result.current.sendMessage('third'); await flush(); }); + expect(mocks.adapter.sendMessage).toHaveBeenCalledTimes(2); + + firstGate.resolve(); + await act(async () => { await firstPromise; await flush(); }); + expect(result.current.isLoading).toBe(true); + expect(mocks.adapter.sendMessage).toHaveBeenCalledTimes(2); + + secondGate.resolve(); + await act(async () => { await flush(); }); + await vi.waitFor(() => expect(mocks.adapter.sendMessage).toHaveBeenCalledTimes(3)); + expect(mocks.adapter.sendMessage.mock.calls[2]?.[1]).toBe('third'); + }); + + it('stops the originating session after the hook switches to another session', async () => { + const gate = deferred(); + mocks.adapter.sendMessage.mockImplementationOnce(async function* () { + yield { type: 'token', data: { content: 'session A partial' } }; + await gate.promise; + }); + const { useChat } = await import('@/hooks/useChat'); + const hook = renderHook( + ({ activeSession }: { activeSession: string }) => useChat({ + workspaceId: 'ws-1', + sessionId: activeSession, + }), + { initialProps: { activeSession: 'sess-a' } }, + ); + + let sendPromise: Promise | undefined; + await act(async () => { + sendPromise = hook.result.current.sendMessage('question'); + await flush(); + }); + await act(async () => { hook.rerender({ activeSession: 'sess-b' }); await flush(); }); + await act(async () => { hook.result.current.stopStreaming(); await flush(); }); + + expect(mocks.adapter.abortAgent).toHaveBeenCalledWith('ws-1', 'sess-a'); + gate.resolve(); + await act(async () => { await sendPromise; }); + }); + + it('aborts an approval-paused turn when switching sessions so the destination can send immediately', async () => { + const gate = deferred(); + mocks.adapter.sendMessage + .mockImplementationOnce(async function* () { + yield { + type: 'approval_required', + data: { requestId: 'approval-a', toolName: 'write_file', sourceWorkspaceId: 'ws-1' }, + }; + await gate.promise; + }) + .mockImplementationOnce(async function* () { + yield { type: 'done', data: { content: 'session B answer' } }; + }); + + const { useChat } = await import('@/hooks/useChat'); + const hook = renderHook( + ({ activeSession }: { activeSession: string }) => useChat({ + workspaceId: 'ws-1', + sessionId: activeSession, + }), + { initialProps: { activeSession: 'sess-a' } }, + ); + let firstPromise: Promise | undefined; + await act(async () => { + firstPromise = hook.result.current.sendMessage('session A question'); + await flush(); + }); + expect(hook.result.current.pendingApproval?.requestId).toBe('approval-a'); + + await act(async () => { + hook.rerender({ activeSession: 'sess-b' }); + await flush(); + }); + const loadingAfterSwitch = hook.result.current.isLoading; + await act(async () => { await hook.result.current.sendMessage('session B question'); }); + const callsBeforeOldTurnSettles = mocks.adapter.sendMessage.mock.calls.length; + + gate.resolve(); + await act(async () => { await firstPromise; }); + + expect(mocks.adapter.abortAgent).toHaveBeenCalledWith('ws-1', 'sess-a'); + expect(loadingAfterSwitch).toBe(false); + expect(callsBeforeOldTurnSettles).toBe(2); + expect(hook.result.current.messages.some(message => message.content === 'session B answer')).toBe(true); + }); + + it('never flushes a queued turn into a newly rendered session before passive cancellation', async () => { + const gate = deferred(); + mocks.adapter.sendMessage + .mockImplementationOnce(async function* () { + yield { type: 'token', data: { content: 'session A partial' } }; + await gate.promise; + yield { type: 'done', data: { content: 'session A answer' } }; + }) + .mockImplementationOnce(async function* () { + yield { type: 'done', data: { content: 'must not run in session B' } }; + }); + + const { useChat } = await import('@/hooks/useChat'); + const hook = renderHook( + ({ activeSession }: { activeSession: string }) => { + useLayoutEffect(() => { + if (activeSession === 'sess-b') gate.resolve(); + }, [activeSession]); + return useChat({ workspaceId: 'ws-1', sessionId: activeSession }); + }, + { initialProps: { activeSession: 'sess-a' } }, + ); + + let firstPromise: Promise | undefined; + await act(async () => { + firstPromise = hook.result.current.sendMessage('session A first'); + await flush(); + await hook.result.current.sendMessage('session A queued'); + }); + expect(mocks.adapter.sendMessage).toHaveBeenCalledTimes(1); + + await act(async () => { + hook.rerender({ activeSession: 'sess-b' }); + await flush(); + }); + await act(async () => { await firstPromise; }); + + expect(mocks.adapter.sendMessage).toHaveBeenCalledTimes(1); + expect( + hook.result.current.messages.some(message => message.content === 'must not run in session B'), + ).toBe(false); + }); + it('is a no-op when nothing is streaming', async () => { const { result } = await mountChat('sess-idle'); await act(async () => { result.current.stopStreaming(); await flush(); }); @@ -118,6 +964,60 @@ describe('useChat — stopStreaming (halt in-flight, keep partial, re-enable sen }); }); +describe('useChat — immutable per-turn model selection', () => { + it('snapshots queued models and records the model resolved by the server', async () => { + const firstGate = deferred(); + mocks.adapter.sendMessage + .mockImplementationOnce(async function* () { + yield { type: 'token', data: { content: 'first' } }; + await firstGate.promise; + yield { type: 'done', data: { model: 'openai/resolved-a' } }; + }) + .mockImplementationOnce(async function* () { + yield { type: 'done', data: { content: 'second', model: 'anthropic/resolved-b' } }; + }); + + const { useChat } = await import('@/hooks/useChat'); + const hook = renderHook( + ({ model }: { model: string }) => useChat({ + workspaceId: 'ws-1', + sessionId: 'sess-1', + model, + }), + { initialProps: { model: 'openai/request-a' } }, + ); + await act(async () => { await Promise.resolve(); }); + + let firstPromise: Promise | undefined; + await act(async () => { + firstPromise = hook.result.current.sendMessage('first question'); + await flush(); + }); + await act(async () => { hook.rerender({ model: 'anthropic/request-b' }); }); + await act(async () => { + await hook.result.current.sendMessage('second question'); + await flush(); + }); + + expect(mocks.adapter.sendMessage.mock.calls[0]?.[6]).toBe('openai/request-a'); + expect(mocks.adapter.sendMessage).toHaveBeenCalledTimes(1); + expect(hook.result.current.messages.find(message => message.role === 'assistant')?.model).toBeUndefined(); + + firstGate.resolve(); + await act(async () => { await firstPromise; await flush(); }); + await vi.waitFor(() => expect(mocks.adapter.sendMessage).toHaveBeenCalledTimes(2)); + expect(mocks.adapter.sendMessage.mock.calls[1]?.[6]).toBe('anthropic/request-b'); + + await vi.waitFor(() => { + const assistants = hook.result.current.messages.filter(message => message.role === 'assistant'); + expect(assistants.map(message => message.model)).toEqual([ + 'openai/resolved-a', + 'anthropic/resolved-b', + ]); + }); + }); +}); + // ── ChatApp streaming interaction surface (contracts 1 + 2, the UI side) ──── describe('ChatApp — streaming interaction contract', () => { @@ -130,6 +1030,7 @@ describe('ChatApp — streaming interaction contract', () => { pendingApproval: null, onApprove: noop, workspaceId: 'ws-1', + activeSessionId: null as string | null, onStopStreaming: noop as () => void, }; @@ -156,6 +1057,92 @@ describe('ChatApp — streaming interaction contract', () => { return { getTop: () => top }; } + it('renders a draft visibly while keeping canonical message actions disabled', async () => { + const draftMessage: ChatMessage = { + id: 'draft-1', + role: 'assistant', + content: '', + timestamp: 'now', + draft: { + turnId: 'turn-1', + revision: 2, + content: 'Visible provisional answer', + status: 'stopped', + }, + }; + await renderChat({ messages: [draftMessage], isLoading: false }); + + expect(screen.getByText('Visible provisional answer')).toBeInTheDocument(); + expect(screen.getByTestId('chat-draft-status')).toHaveTextContent('Stopped draft · not saved'); + expect(screen.queryByLabelText('Pin message')).toBeNull(); + }); + + it('renders capability markers in drafts inertly without exposing install actions', async () => { + const marker = ''; + const draftMessage: ChatMessage = { + id: 'draft-capability', + role: 'assistant', + content: '', + timestamp: 'now', + draft: { + turnId: 'turn-capability', + revision: 1, + content: `Safe draft before. ${marker} Safe draft after.`, + status: 'stopped', + }, + }; + await renderChat({ messages: [draftMessage], isLoading: false }); + + expect(screen.queryByTestId('capability-request-install')).toBeNull(); + expect(screen.queryByText(marker)).toBeNull(); + expect(screen.getByTestId('chat-draft-content').textContent).toBe('Safe draft before. Safe draft after.'); + }); + + it('hides capability markers in legacy assistant messages without blocks', async () => { + const marker = ''; + const legacyMessage: ChatMessage = { + id: 'legacy-capability', + role: 'assistant', + content: `Safe history before. ${marker} Safe history after.`, + timestamp: 'now', + }; + const { container } = await renderChat({ messages: [legacyMessage], isLoading: false }); + + expect(screen.queryByTestId('capability-request-install')).toBeNull(); + expect(container.textContent).not.toContain('waggle:capability_request'); + expect(container.textContent).toContain('Safe history before. Safe history after.'); + }); + + it('submits feedback using the persisted index when a stopped draft remains visible', async () => { + const messages: ChatMessage[] = [ + { id: 'u1', role: 'user', content: 'stopped question', timestamp: 'now' }, + { + id: 'draft-1', + role: 'assistant', + content: '', + timestamp: 'now', + draft: { + turnId: 'turn-stopped', + revision: 1, + content: 'stopped partial', + status: 'stopped', + }, + }, + { id: 'u2', role: 'user', content: 'completed question', timestamp: 'now' }, + { id: 'a2', role: 'assistant', content: 'completed answer', timestamp: 'now' }, + ]; + await renderChat({ messages, activeSessionId: 'sess-feedback' }); + + fireEvent.click(screen.getByRole('button', { name: 'Good response' })); + + expect(mocks.adapter.submitFeedback).toHaveBeenCalledWith({ + sessionId: 'sess-feedback', + messageIndex: 2, + rating: 'up', + reason: undefined, + }); + }); + it('auto-follow pins the viewport to the newest content while streaming', async () => { const { rerender } = await renderChat({ messages: [a1], isLoading: true }); const scrollEl = screen.getByTestId('chat-scroll'); diff --git a/apps/web/src/test/launcher-a11y.test.tsx b/apps/web/src/test/launcher-a11y.test.tsx index ddfa0bc..ee1c51d 100644 --- a/apps/web/src/test/launcher-a11y.test.tsx +++ b/apps/web/src/test/launcher-a11y.test.tsx @@ -41,6 +41,11 @@ describe('LauncherApp accessibility metadata', () => { expect(prompt).toHaveAttribute('autocomplete', 'off'); expect(prompt.className).toContain('focus-visible:ring-2'); + const scrollViewport = document.querySelector('[data-radix-scroll-area-viewport]'); + expect(scrollViewport).not.toBeNull(); + expect(scrollViewport).toHaveAttribute('tabindex', '0'); + expect(scrollViewport).toHaveClass('focus-visible:outline-offset-[-2px]'); + await waitFor(() => expect(mocks.adapter.detectTools).toHaveBeenCalled()); }); }); diff --git a/apps/web/src/test/p1b-authgate-surfaces.test.tsx b/apps/web/src/test/p1b-authgate-surfaces.test.tsx index 191167f..56db9f1 100644 --- a/apps/web/src/test/p1b-authgate-surfaces.test.tsx +++ b/apps/web/src/test/p1b-authgate-surfaces.test.tsx @@ -17,10 +17,12 @@ import { renderHook, act, waitFor, cleanup } from '@testing-library/react'; import { CONNECT_SETTLED_EVENT } from '@/hooks/useRevalidateOnError'; const mocks = vi.hoisted(() => ({ + toast: vi.fn(), adapter: { connect: vi.fn().mockResolvedValue(undefined), getTier: vi.fn(), getWorkspaces: vi.fn(), + createWorkspace: vi.fn(), getPermissions: vi.fn().mockResolvedValue({ defaultAutonomy: 'normal', externalGates: {} }), getAgentStatus: vi.fn().mockResolvedValue({ active: 0, agents: [] }), getNotificationHistory: vi.fn().mockResolvedValue([]), @@ -49,6 +51,10 @@ const mocks = vi.hoisted(() => ({ }, })); vi.mock('@/lib/adapter', () => ({ adapter: mocks.adapter, default: vi.fn() })); +vi.mock('@/hooks/use-toast', () => ({ + toast: mocks.toast, + useToast: () => ({ toast: mocks.toast, toasts: [], dismiss: vi.fn() }), +})); /** AdapterHttpError stand-in — the real class is mocked away with the module, * so consumers must duck-type on error.name (that is part of the contract). */ @@ -84,6 +90,45 @@ describe('useWorkspaces (P1b)', () => { await waitFor(() => expect(result.current.workspaces).toHaveLength(2)); expect(result.current.error).toBeNull(); }); + + it('failed create does not invent or activate a phantom workspace', async () => { + window.localStorage.clear(); + const { useWorkspaces } = await import('@/hooks/useWorkspaces'); + const { readPersistedWorkspaceId } = await import('@/lib/workspace-selection'); + mocks.adapter.getWorkspaces.mockResolvedValue([{ id: 'w1', name: 'Alpha', group: 'Personal' }]); + mocks.adapter.createWorkspace.mockRejectedValue(new Error('Local storage path is invalid')); + const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {}); + const { result } = renderHook(() => useWorkspaces()); + + try { + await waitFor(() => expect(result.current.workspaces).toHaveLength(1)); + act(() => result.current.selectWorkspace('w1')); + expect(readPersistedWorkspaceId()).toBe('w1'); + + let created: Awaited> | undefined; + await act(async () => { + created = await result.current.createWorkspace({ + name: 'Broken Linked Workspace', + group: 'Personal', + storageType: 'local', + storagePath: 'Z:\\missing-workspace', + }); + }); + + expect(created).toBeNull(); + expect(result.current.workspaces.map(workspace => workspace.id)).toEqual(['w1']); + expect(result.current.activeWorkspaceId).toBe('w1'); + expect(readPersistedWorkspaceId()).toBe('w1'); + expect(result.current.error).toBe('Local storage path is invalid'); + expect(mocks.toast).toHaveBeenCalledWith({ + title: "Couldn't create workspace", + description: 'Local storage path is invalid', + variant: 'destructive', + }); + } finally { + consoleSpy.mockRestore(); + } + }); }); // ── useBilling ───────────────────────────────────────────────────────────── diff --git a/apps/web/src/test/phase4b-connector-hub.test.tsx b/apps/web/src/test/phase4b-connector-hub.test.tsx index 2514266..f08befa 100644 --- a/apps/web/src/test/phase4b-connector-hub.test.tsx +++ b/apps/web/src/test/phase4b-connector-hub.test.tsx @@ -6,7 +6,7 @@ * audit history drawer. */ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; -import { render, screen, fireEvent, cleanup, waitFor } from '@testing-library/react'; +import { render, screen, fireEvent, cleanup, waitFor, act } from '@testing-library/react'; import { TooltipProvider } from '@/components/ui/tooltip'; const mocks = vi.hoisted(() => ({ @@ -22,8 +22,10 @@ const mocks = vi.hoisted(() => ({ getExtendAudit: vi.fn(), fetch: vi.fn(), }, + toast: vi.fn(), })); vi.mock('@/lib/adapter', () => ({ adapter: mocks.adapter, default: vi.fn() })); +vi.mock('@/hooks/use-toast', () => ({ useToast: () => ({ toast: mocks.toast }) })); import ConnectorsApp, { buildRevokeRequest, resetConnectorsRouteCache, shouldResetCredentialInputs } from '@/components/os/apps/ConnectorsApp'; import { ServiceProvider } from '@/providers/ServiceProvider'; @@ -53,6 +55,12 @@ const JIRA_CONNECTOR = { substrate: 'waggle', tools: [], category: 'productivity', }; +const SALESFORCE_CONNECTOR = { + id: 'salesforce', name: 'Salesforce', description: 'CRM', service: 'salesforce', + authType: 'bearer', status: 'disconnected', capabilities: ['read', 'write'], + substrate: 'waggle', tools: [], category: 'crm', +}; + const renderApp = () => render( , ); @@ -211,6 +219,14 @@ describe('ConnectorsApp — Connector Hub (S07)', () => { expect(email).toHaveAttribute('spellcheck', 'false'); expect(email.className).toContain('focus-visible:ring-2'); + const siteUrl = screen.getByRole('textbox', { name: /jira site url/i }); + expect(siteUrl).toHaveAttribute('type', 'url'); + expect(siteUrl).toHaveAttribute('name', 'connectorBaseUrl'); + expect(siteUrl).toHaveAttribute('autocomplete', 'url'); + expect(siteUrl).toHaveAttribute('spellcheck', 'false'); + expect(siteUrl).toHaveAttribute('placeholder', 'https://your-team.atlassian.net'); + expect(siteUrl.className).toContain('focus-visible:ring-2'); + const token = screen.getByLabelText(/jira api token/i); expect(token).toHaveAttribute('type', 'password'); expect(token).toHaveAttribute('name', 'connectorToken'); @@ -220,6 +236,215 @@ describe('ConnectorsApp — Connector Hub (S07)', () => { expect(screen.getByRole('button', { name: /^connect$/i }).className).toContain('focus-visible:ring-2'); }); + + it('submits ordinary connector credentials through the connect endpoint only', async () => { + renderApp(); + fireEvent.click(await screen.findByText('Slack')); + + const connect = screen.getByRole('button', { name: /^connect$/i }); + expect(connect).toBeDisabled(); + fireEvent.change(screen.getByLabelText(/slack api token/i), { + target: { value: ' xoxb-connector-token ' }, + }); + expect(connect).toBeEnabled(); + fireEvent.click(connect); + + await waitFor(() => expect(mocks.adapter.connectConnector).toHaveBeenCalledWith('slack', { + token: 'xoxb-connector-token', + })); + expect(mocks.adapter.addVaultSecret).not.toHaveBeenCalled(); + }); + + it('requires Jira email and site URL, then sends a trimmed credential tuple through connectConnector', async () => { + mocks.adapter.getConnectors.mockResolvedValue([...CONNECTORS, JIRA_CONNECTOR]); + renderApp(); + fireEvent.click(await screen.findByText('Jira')); + + const connect = screen.getByRole('button', { name: /^connect$/i }); + fireEvent.change(screen.getByLabelText(/jira api token/i), { + target: { value: ' jira-token ' }, + }); + expect(connect).toBeDisabled(); + fireEvent.change(screen.getByRole('textbox', { name: /atlassian account email/i }), { + target: { value: ' owner@example.com ' }, + }); + expect(connect).toBeDisabled(); + fireEvent.change(screen.getByRole('textbox', { name: /jira site url/i }), { + target: { value: ' https://team.atlassian.net ' }, + }); + expect(connect).toBeEnabled(); + fireEvent.click(connect); + + await waitFor(() => expect(mocks.adapter.connectConnector).toHaveBeenCalledWith('jira', { + token: 'jira-token', + email: 'owner@example.com', + baseUrl: 'https://team.atlassian.net', + })); + expect(mocks.adapter.addVaultSecret).not.toHaveBeenCalled(); + + fireEvent.click(screen.getByText('Jira')); + expect(screen.getByLabelText(/jira api token/i)).toHaveValue(''); + expect(screen.getByRole('textbox', { name: /atlassian account email/i })).toHaveValue(''); + expect(screen.getByRole('textbox', { name: /jira site url/i })).toHaveValue(''); + }); + + it('requires an accessible Salesforce instance URL and submits it with the token', async () => { + mocks.adapter.getConnectors.mockResolvedValue([...CONNECTORS, SALESFORCE_CONNECTOR]); + renderApp(); + fireEvent.click(await screen.findByText('Salesforce')); + + const instanceUrl = screen.getByRole('textbox', { name: /salesforce instance url/i }); + expect(instanceUrl).toHaveAttribute('type', 'url'); + expect(instanceUrl).toHaveAttribute('name', 'connectorInstanceUrl'); + expect(instanceUrl).toHaveAttribute('autocomplete', 'url'); + expect(instanceUrl).toHaveAttribute('spellcheck', 'false'); + + const connect = screen.getByRole('button', { name: /^connect$/i }); + fireEvent.change(screen.getByLabelText(/salesforce api token/i), { + target: { value: ' salesforce-token ' }, + }); + expect(connect).toBeDisabled(); + fireEvent.change(instanceUrl, { + target: { value: ' https://acme.my.salesforce.com ' }, + }); + expect(connect).toBeEnabled(); + fireEvent.click(connect); + + await waitFor(() => expect(mocks.adapter.connectConnector).toHaveBeenCalledWith('salesforce', { + token: 'salesforce-token', + instanceUrl: 'https://acme.my.salesforce.com', + })); + expect(mocks.adapter.addVaultSecret).not.toHaveBeenCalled(); + }); + + it('preserves entered credentials and exposes the server error when connect is rejected', async () => { + mocks.adapter.getConnectors.mockResolvedValue([...CONNECTORS, SALESFORCE_CONNECTOR]); + mocks.adapter.connectConnector.mockRejectedValueOnce(new Error('Valid Salesforce instanceUrl required')); + renderApp(); + fireEvent.click(await screen.findByText('Salesforce')); + + const token = screen.getByLabelText(/salesforce api token/i); + const instanceUrl = screen.getByRole('textbox', { name: /salesforce instance url/i }); + fireEvent.change(token, { target: { value: 'salesforce-token' } }); + fireEvent.change(instanceUrl, { target: { value: 'https://acme.my.salesforce.com' } }); + fireEvent.click(screen.getByRole('button', { name: /^connect$/i })); + + await waitFor(() => expect(mocks.toast).toHaveBeenCalledWith({ + title: 'Connection failed', + description: 'Valid Salesforce instanceUrl required', + variant: 'destructive', + })); + expect(token).toHaveValue('salesforce-token'); + expect(instanceUrl).toHaveValue('https://acme.my.salesforce.com'); + expect(screen.getByRole('button', { name: /^connect$/i })).toBeEnabled(); + }); + + it('preserves the full Jira tuple and exposes an invalid-site server rejection for retry', async () => { + mocks.adapter.getConnectors.mockResolvedValue([...CONNECTORS, JIRA_CONNECTOR]); + mocks.adapter.connectConnector.mockRejectedValueOnce(new Error('Valid Jira baseUrl required')); + renderApp(); + fireEvent.click(await screen.findByText('Jira')); + + const token = screen.getByLabelText(/jira api token/i); + const email = screen.getByRole('textbox', { name: /atlassian account email/i }); + const siteUrl = screen.getByRole('textbox', { name: /jira site url/i }); + fireEvent.change(token, { target: { value: 'jira-token' } }); + fireEvent.change(email, { target: { value: 'owner@example.com' } }); + fireEvent.change(siteUrl, { target: { value: 'https://jira.example.com' } }); + fireEvent.click(screen.getByRole('button', { name: /^connect$/i })); + + await waitFor(() => expect(mocks.toast).toHaveBeenCalledWith({ + title: 'Connection failed', + description: 'Valid Jira baseUrl required', + variant: 'destructive', + })); + expect(token).toHaveValue('jira-token'); + expect(email).toHaveValue('owner@example.com'); + expect(siteUrl).toHaveValue('https://jira.example.com'); + expect(screen.getByRole('button', { name: /^connect$/i })).toBeEnabled(); + }); + + it('locks connector switching while Jira connect is pending, then restores the retry tuple on rejection', async () => { + mocks.adapter.getConnectors.mockResolvedValue([ + ...CONNECTORS, + JIRA_CONNECTOR, + SALESFORCE_CONNECTOR, + ]); + let rejectConnection!: (reason: Error) => void; + mocks.adapter.connectConnector.mockImplementationOnce(() => new Promise((_resolve, reject) => { + rejectConnection = reject; + })); + renderApp(); + fireEvent.click(await screen.findByText('Jira')); + + const jiraRow = screen.getByText('Jira').closest('button')!; + const salesforceRow = screen.getByText('Salesforce').closest('button')!; + const token = screen.getByLabelText(/jira api token/i); + const email = screen.getByRole('textbox', { name: /atlassian account email/i }); + const siteUrl = screen.getByRole('textbox', { name: /jira site url/i }); + fireEvent.change(token, { target: { value: 'jira-token' } }); + fireEvent.change(email, { target: { value: 'owner@example.com' } }); + fireEvent.change(siteUrl, { target: { value: 'https://team.atlassian.net' } }); + fireEvent.click(screen.getByRole('button', { name: /^connect$/i })); + + await waitFor(() => expect(mocks.adapter.connectConnector).toHaveBeenCalledTimes(1)); + expect(jiraRow).toBeDisabled(); + expect(salesforceRow).toBeDisabled(); + expect(token).toBeDisabled(); + expect(email).toBeDisabled(); + expect(siteUrl).toBeDisabled(); + fireEvent.click(salesforceRow); + expect(screen.queryByLabelText(/salesforce api token/i)).not.toBeInTheDocument(); + + await act(async () => { + rejectConnection(new Error('Valid Jira baseUrl required')); + }); + await waitFor(() => expect(mocks.toast).toHaveBeenCalledWith({ + title: 'Connection failed', + description: 'Valid Jira baseUrl required', + variant: 'destructive', + })); + expect(token).toHaveValue('jira-token'); + expect(email).toHaveValue('owner@example.com'); + expect(siteUrl).toHaveValue('https://team.atlassian.net'); + expect(jiraRow).toBeEnabled(); + expect(salesforceRow).toBeEnabled(); + expect(screen.getByRole('button', { name: /^connect$/i })).toBeEnabled(); + }); + + it('clears token, email, and instance URL whenever the target connector changes', async () => { + mocks.adapter.getConnectors.mockResolvedValue([ + ...CONNECTORS, + JIRA_CONNECTOR, + SALESFORCE_CONNECTOR, + ]); + renderApp(); + + fireEvent.click(await screen.findByText('Jira')); + fireEvent.change(screen.getByLabelText(/jira api token/i), { target: { value: 'jira-token' } }); + fireEvent.change(screen.getByRole('textbox', { name: /atlassian account email/i }), { + target: { value: 'owner@example.com' }, + }); + fireEvent.change(screen.getByRole('textbox', { name: /jira site url/i }), { + target: { value: 'https://team.atlassian.net' }, + }); + + fireEvent.click(screen.getByText('Salesforce')); + expect(screen.getByLabelText(/salesforce api token/i)).toHaveValue(''); + const instanceUrl = screen.getByRole('textbox', { name: /salesforce instance url/i }); + expect(instanceUrl).toHaveValue(''); + fireEvent.change(screen.getByLabelText(/salesforce api token/i), { target: { value: 'sf-token' } }); + fireEvent.change(instanceUrl, { target: { value: 'https://acme.my.salesforce.com' } }); + + fireEvent.click(screen.getByText('Jira')); + expect(screen.getByLabelText(/jira api token/i)).toHaveValue(''); + expect(screen.getByRole('textbox', { name: /atlassian account email/i })).toHaveValue(''); + expect(screen.getByRole('textbox', { name: /jira site url/i })).toHaveValue(''); + + fireEvent.click(screen.getByText('Salesforce')); + expect(screen.getByLabelText(/salesforce api token/i)).toHaveValue(''); + expect(screen.getByRole('textbox', { name: /salesforce instance url/i })).toHaveValue(''); + }); }); describe('pure helpers', () => { diff --git a/apps/web/src/test/pr4-inline-capability.test.tsx b/apps/web/src/test/pr4-inline-capability.test.tsx index 0eeada6..980e2a4 100644 --- a/apps/web/src/test/pr4-inline-capability.test.tsx +++ b/apps/web/src/test/pr4-inline-capability.test.tsx @@ -1,21 +1,23 @@ /** * PR4 Phase D — the inline capability card (Variation B). Each kind routes - * through the shared install store (so a chat install reflects in the grid + - * count bar): connector token-paste / OAuth→Hub, mcp enable, marketplace - * resolve-then-install, starter via installPack. + * through a server-issued, scoped proposal for marketplace packages and the + * bundled install path for starter packs. */ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; -import { render, screen, fireEvent, cleanup, waitFor } from '@testing-library/react'; +import { act, render, renderHook, screen, fireEvent, cleanup, waitFor } from '@testing-library/react'; import type { ReactNode } from 'react'; import type { CapabilityRequest } from '@/components/os/apps/chat-blocks/CapabilityRequestCard'; +import type { ContentBlock } from '@/lib/types'; const mocks = vi.hoisted(() => ({ - adapter: { + adapter: { + getHistory: vi.fn().mockResolvedValue([]), connect: vi.fn().mockResolvedValue(undefined), forceReconnect: vi.fn().mockResolvedValue(undefined), getConnectors: vi.fn().mockResolvedValue([]), getMcps: vi.fn().mockResolvedValue([]), getMarketplace: vi.fn().mockResolvedValue({ packages: [] }), + fetch: vi.fn().mockResolvedValue(new Response('{}', { status: 200 })), searchMarketplace: vi.fn(), installMarketplacePackage: vi.fn().mockResolvedValue(new Response('{}', { status: 200 })), uninstallMarketplacePackage: vi.fn().mockResolvedValue(new Response('{}', { status: 200 })), @@ -27,25 +29,76 @@ const mocks = vi.hoisted(() => ({ }, toast: vi.fn(), })); -vi.mock('@/lib/adapter', () => ({ adapter: mocks.adapter, default: vi.fn() })); +vi.mock('@/lib/adapter', async (importOriginal) => { + const actual = await importOriginal(); + return { ...actual, adapter: mocks.adapter, default: vi.fn() }; +}); vi.mock('@/hooks/use-toast', () => ({ useToast: () => ({ toast: mocks.toast }) })); import { ServiceProvider } from '@/providers/ServiceProvider'; -import { InstallProvider } from '@/providers/InstallProvider'; +import { InstallProvider, useInstallStore } from '@/providers/InstallProvider'; +import { AdapterHttpError } from '@/lib/adapter'; import CapabilityRequestCard from '@/components/os/apps/chat-blocks/CapabilityRequestCard'; +import BlockRenderer from '@/components/os/apps/chat-blocks/BlockRenderer'; + +const InstalledCountProbe = () => { + const { installedCount } = useInstallStore(); + return {installedCount}; +}; const wrapper = ({ children }: { children: ReactNode }) => ( {children} ); -const renderCard = (request: CapabilityRequest) => render(, { wrapper }); +const DEFAULT_CONTEXT = { workspaceId: 'workspace-a', sessionId: 'session-a' }; +const PROPOSAL_ID = '123e4567-e89b-42d3-a456-426614174000'; + +const marketplaceRequest = (overrides: Partial = {}): CapabilityRequest => ({ + name: 'web-scraper', + source: 'marketplace', + kind: 'marketplace', + proposalId: PROPOSAL_ID, + expiresAt: '2999-01-01T00:00:00.000Z', + packageId: 7, + sourceId: 2, + publisher: 'Waggle Labs', + version: '1.2.3', + installType: 'skill', + manifestDigest: `sha256:${'a'.repeat(64)}`, + riskStatus: 'CLEAN', + riskScore: 100, + riskContentHash: 'b'.repeat(64), + riskBlocked: false, + riskDigest: `sha256:${'c'.repeat(64)}`, + ...overrides, +}); + +const marketplaceMarker = (overrides: Partial = {}) => + ``; + +const renderCard = ( + request: CapabilityRequest, + context: { workspaceId?: string | null; sessionId?: string | null } = DEFAULT_CONTEXT, +) => render( + <> + + + , + { wrapper }, +); +const renderBlocks = ( + blocks: ContentBlock[], + context: { workspaceId?: string | null; sessionId?: string | null } = DEFAULT_CONTEXT, +) => render(, { wrapper }); beforeEach(() => { + mocks.adapter.getHistory.mockResolvedValue([]); mocks.adapter.connect.mockResolvedValue(undefined); mocks.adapter.getConnectors.mockResolvedValue([]); mocks.adapter.getMcps.mockResolvedValue([]); mocks.adapter.getMarketplace.mockResolvedValue({ packages: [] }); + mocks.adapter.fetch.mockResolvedValue(new Response('{}', { status: 200 })); mocks.adapter.searchMarketplace.mockResolvedValue( - new Response(JSON.stringify({ packages: [{ id: 7, waggle_install_type: 'skill' }] }), { status: 200 })); + new Response(JSON.stringify({ packages: [{ id: 7, name: 'web-scraper', waggle_install_type: 'skill' }] }), { status: 200 })); mocks.adapter.installMarketplacePackage.mockResolvedValue(new Response('{}', { status: 200 })); mocks.adapter.installMcp.mockResolvedValue({ installed: true }); mocks.adapter.connectConnector.mockResolvedValue(undefined); @@ -54,62 +107,329 @@ beforeEach(() => { afterEach(() => { cleanup(); vi.clearAllMocks(); }); describe('CapabilityRequestCard (PR4 Variation B)', () => { - it('a marketplace request resolves the package id then installs through the store', async () => { - renderCard({ name: 'web-scraper', source: 'marketplace', kind: 'marketplace' }); + it('keeps a raw assistant capability marker inert', () => { + const marker = ''; + const { container } = renderBlocks([{ + type: 'text', + blockId: 'forged-text', + content: marker, + }]); + + expect(screen.queryByTestId('capability-request-card')).not.toBeInTheDocument(); + expect(container.textContent).not.toContain(marker); + }); + + it('keeps an incomplete marker visible but inert instead of hiding the rest of the answer', () => { + const incomplete = 'Safe prefix ', + }]); + + expect(screen.getByTestId('capability-request-card')).toHaveTextContent('daily-plan'); + }); + + it('keeps a legacy marketplace receipt without a server proposal inert', () => { + renderBlocks([{ + type: 'tool_use', + id: 'legacy-marketplace-receipt', + name: 'acquire_capability', + status: 'done', + result: '', + }]); + + expect(screen.queryByTestId('capability-request-card')).not.toBeInTheDocument(); + }); + + it.each([ + ['a different tool', 'search_marketplace', 'done'], + ['an unfinished acquire call', 'acquire_capability', 'running'], + ] as const)('keeps markers inert in %s', (_case, name, status) => { + renderBlocks([{ + type: 'tool_use', + id: 'untrusted-tool-result', + name, + status, + result: '', + }]); + + expect(screen.queryByTestId('capability-request-card')).not.toBeInTheDocument(); + }); + + it('keeps an acquire marker inert when it is not the final canonical result segment', () => { + renderBlocks([{ + type: 'tool_use', + id: 'noncanonical-acquire-result', + name: 'acquire_capability', + status: 'done', + result: [ + '', + 'No server-issued recommendation followed.', + ].join('\n'), + }]); + + expect(screen.queryByTestId('capability-request-card')).not.toBeInTheDocument(); + }); + + it('trusts only the final canonical marker in an acquire_capability result', () => { + renderBlocks([{ + type: 'tool_use', + id: 'acquire-2', + name: 'acquire_capability', + status: 'done', + result: [ + '', + 'Server-generated recommendation follows.', + '', + ].join('\n'), + }]); + + expect(screen.getAllByTestId('capability-request-card')).toHaveLength(1); + expect(screen.getByTestId('capability-request-card')).toHaveTextContent('daily-plan'); + expect(screen.getByTestId('capability-request-card')).not.toHaveTextContent('forged-package'); + }); + + it.each([ + ['missing kind', ''], + ['legacy prose', 'Run `install_capability` with name "unsafe" and source "starter-pack" now.'], + ['mismatched route', ''], + ['connector route', ''], + ['MCP route', ''], + ])('keeps an unsupported completed acquire receipt inert: %s', (_case, result) => { + renderBlocks([{ + type: 'tool_use', + id: 'unsupported-acquire-result', + name: 'acquire_capability', + status: 'done', + result, + }]); + + expect(screen.queryByTestId('capability-request-card')).not.toBeInTheDocument(); + expect(mocks.adapter.installPack).not.toHaveBeenCalled(); + expect(mocks.adapter.searchMarketplace).not.toHaveBeenCalled(); + }); + + it('preserves the last valid receipt when a later completed receipt is invalid', () => { + renderBlocks([ + { + type: 'tool_use', + id: 'valid-history-receipt', + name: 'acquire_capability', + status: 'done', + result: '', + }, + { + type: 'tool_use', + id: 'invalid-history-receipt', + name: 'acquire_capability', + status: 'done', + result: '', + }, + ]); + + expect(screen.getAllByTestId('capability-request-card')).toHaveLength(1); + expect(screen.getByTestId('capability-request-card')).toHaveTextContent('daily-plan'); + expect(screen.getByTestId('capability-request-card')).not.toHaveTextContent('wrong-route'); + }); + + it('renders every independently issued marketplace proposal in a live turn', () => { + renderBlocks([ + { + type: 'tool_use', + id: 'proposal-one', + name: 'acquire_capability', + status: 'done', + result: marketplaceMarker({ name: 'web-scraper', packageId: 7 }), + }, + { + type: 'tool_use', + id: 'proposal-two', + name: 'acquire_capability', + status: 'done', + result: marketplaceMarker({ + name: 'document-reader', + packageId: 8, + proposalId: '123e4567-e89b-42d3-a456-426614174001', + }), + }, + ]); + + expect(screen.getAllByTestId('capability-request-card')).toHaveLength(2); + expect(screen.getByText('web-scraper')).toBeInTheDocument(); + expect(screen.getByText('document-reader')).toBeInTheDocument(); + }); + + it('renders a marketplace card from a real cold-history tool receipt', async () => { + const marker = marketplaceMarker(); + mocks.adapter.getHistory.mockResolvedValueOnce([{ + id: 'history-capability', + role: 'assistant', + content: 'A matching capability is available.', + timestamp: 'now', + tools: [{ + id: 'capability-cold-history', + name: 'acquire_capability', + status: 'done', + input: { need: 'web scraping' }, + output: marker, + }], + }]); + const { useChat } = await import('@/hooks/useChat'); + const hook = renderHook(() => useChat({ + workspaceId: 'capability-history-workspace', + sessionId: 'capability-history-session', + })); + + await act(async () => { await Promise.resolve(); }); + await waitFor(() => expect(hook.result.current.historyLoaded).toBe(true)); + const assistant = hook.result.current.messages.find(message => message.id === 'history-capability'); + const blocks = assistant?.blocks ?? []; + expect(blocks).toEqual(expect.arrayContaining([ + expect.objectContaining({ + type: 'tool_use', + id: 'capability-cold-history', + name: 'acquire_capability', + status: 'done', + result: marker, + }), + ])); + + renderBlocks(blocks, { + workspaceId: 'capability-history-workspace', + sessionId: 'capability-history-session', + }); + expect(screen.getByTestId('capability-request-card')).toHaveTextContent('web-scraper'); + }); + + it.each([ + [{ name: 'daily-plan', source: 'starter-pack' }], + [{ name: 'wrong-route', source: 'marketplace', kind: 'skill' }], + ])('makes the card itself fail closed for an unsupported request', (request) => { + renderCard(request as CapabilityRequest); + expect(screen.queryByTestId('capability-request-card')).not.toBeInTheDocument(); + }); + + it('confirms a marketplace request by proposal id and exact chat scope', async () => { + renderCard(marketplaceRequest({ packageId: 73, installType: 'plugin' })); + await waitFor(() => expect(mocks.adapter.getMarketplace).toHaveBeenCalledTimes(2)); + await act(async () => { await Promise.resolve(); }); fireEvent.click(screen.getByTestId('capability-request-install')); - await waitFor(() => expect(mocks.adapter.searchMarketplace).toHaveBeenCalledWith('web-scraper', 1)); - await waitFor(() => expect(mocks.adapter.installMarketplacePackage).toHaveBeenCalledWith(7)); + await waitFor(() => expect(mocks.adapter.fetch).toHaveBeenCalledWith( + `/api/capability-proposals/${PROPOSAL_ID}/confirm`, + { + method: 'POST', + body: JSON.stringify(DEFAULT_CONTEXT), + }, + )); + expect(mocks.adapter.installMarketplacePackage).not.toHaveBeenCalled(); + expect(mocks.adapter.searchMarketplace).not.toHaveBeenCalled(); + expect(await screen.findByText(/Done — available/)).toBeInTheDocument(); + await waitFor(() => expect(screen.getByTestId('installed-count')).toHaveTextContent('1')); + }); + + it('does not consult poisoned fuzzy search results for a marketplace approval', async () => { + mocks.adapter.searchMarketplace.mockResolvedValue(new Response(JSON.stringify({ + packages: [ + { id: 8, name: 'web-scraper-pro', waggle_install_type: 'skill' }, + ], + }), { status: 200 })); + renderCard(marketplaceRequest()); + + fireEvent.click(screen.getByTestId('capability-request-install')); + + await waitFor(() => expect(mocks.adapter.fetch).toHaveBeenCalledTimes(1)); + expect(mocks.adapter.installMarketplacePackage).not.toHaveBeenCalled(); + expect(mocks.adapter.searchMarketplace).not.toHaveBeenCalled(); + }); + + it('submits at most one confirmation when Install is clicked twice', async () => { + let release!: () => void; + mocks.adapter.fetch.mockImplementationOnce(() => new Promise((resolve) => { + release = () => resolve(new Response('{}', { status: 200 })); + })); + renderCard(marketplaceRequest()); + + const install = screen.getByTestId('capability-request-install'); + fireEvent.click(install); + fireEvent.click(install); + + expect(mocks.adapter.fetch).toHaveBeenCalledTimes(1); + release(); expect(await screen.findByText(/Done — available/)).toBeInTheDocument(); }); - it('a token connector reveals an inline paste row and connects FE-direct (not over the approval wire)', async () => { - renderCard({ name: 'Slack', source: 'connector', kind: 'connector', connectorId: 'slack', authType: 'bearer' }); - // The verb is Connect, not Install. - expect(screen.getByTestId('capability-request-install')).toHaveTextContent('Connect'); + it.each([ + [404, 'CAPABILITY_PROPOSAL_NOT_AVAILABLE', 'This install request is no longer available.'], + [409, 'CAPABILITY_PROPOSAL_ALREADY_USED', 'This install request was already used.'], + [410, 'CAPABILITY_PROPOSAL_EXPIRED', 'This install request expired. Ask Waggle to find it again.'], + [422, 'INSTALL_FAILED', 'Install failed'], + ])('fails without a direct-install fallback after proposal HTTP %s', async (status, code, message) => { + mocks.adapter.fetch.mockRejectedValueOnce(new AdapterHttpError( + status, + 'failed', + { code, message: code === 'INSTALL_FAILED' ? message : undefined }, + )); + renderCard(marketplaceRequest()); + fireEvent.click(screen.getByTestId('capability-request-install')); - const input = await screen.findByLabelText(/slack api token/i); - expect(input).toHaveAttribute('name', 'capabilityConnectorToken'); - expect(input).toHaveAttribute('autocomplete', 'off'); - fireEvent.change(input, { target: { value: 'xoxb-9' } }); - fireEvent.click(screen.getByTestId('capability-connector-token-submit')); - await waitFor(() => expect(mocks.adapter.connectConnector).toHaveBeenCalledWith('slack', { token: 'xoxb-9' })); + expect(await screen.findByText(message)).toBeInTheDocument(); + expect(mocks.adapter.fetch).toHaveBeenCalledTimes(1); + expect(mocks.adapter.installMarketplacePackage).not.toHaveBeenCalled(); + expect(mocks.adapter.searchMarketplace).not.toHaveBeenCalled(); }); - it('an OAuth connector hands off to the Hub (no inline token)', async () => { - const events: CustomEvent[] = []; - const listener = (e: Event) => events.push(e as CustomEvent); - window.addEventListener('waggle:open-app', listener); - try { - renderCard({ name: 'Google Calendar', source: 'connector', kind: 'connector', authType: 'oauth2' }); - fireEvent.click(screen.getByTestId('capability-request-install')); - await waitFor(() => expect(events.some(e => e.detail.appId === 'connectors')).toBe(true)); - expect(screen.queryByTestId('capability-connector-token-input')).not.toBeInTheDocument(); - expect(mocks.adapter.connectConnector).not.toHaveBeenCalled(); - } finally { - window.removeEventListener('waggle:open-app', listener); - } + it.each([ + ['missing id', { name: 'web-scraper', source: 'marketplace', kind: 'marketplace', installType: 'skill' }], + ['zero id', { name: 'web-scraper', source: 'marketplace', kind: 'marketplace', packageId: 0, installType: 'skill' }], + ['fractional id', { name: 'web-scraper', source: 'marketplace', kind: 'marketplace', packageId: 7.5, installType: 'skill' }], + ['string id', { name: 'web-scraper', source: 'marketplace', kind: 'marketplace', packageId: '7', installType: 'skill' }], + ['invalid install type', { name: 'web-scraper', source: 'marketplace', kind: 'marketplace', packageId: 7, installType: 'mcp_server' }], + ['missing proposal', marketplaceRequest({ proposalId: undefined })], + ['expired proposal', marketplaceRequest({ expiresAt: '2000-01-01T00:00:00.000Z' })], + ])('fails closed for a marketplace request with %s', (_case, request) => { + renderCard(request as CapabilityRequest); + + expect(screen.queryByTestId('capability-request-card')).not.toBeInTheDocument(); + expect(mocks.adapter.installMarketplacePackage).not.toHaveBeenCalled(); }); - it('an mcp request enables through the store', async () => { - renderCard({ name: 'postgres', source: 'mcp', kind: 'mcp' }); - expect(screen.getByTestId('capability-request-install')).toHaveTextContent('Enable'); - fireEvent.click(screen.getByTestId('capability-request-install')); - await waitFor(() => expect(mocks.adapter.installMcp).toHaveBeenCalledWith('postgres', undefined)); - expect(await screen.findByText(/Done — available/)).toBeInTheDocument(); + it.each([ + ['missing workspace', { workspaceId: null, sessionId: 'session-a' }], + ['missing session', { workspaceId: 'workspace-a', sessionId: null }], + ])('fails closed for a proposal with %s', (_case, context) => { + renderCard(marketplaceRequest(), context); + + expect(screen.queryByTestId('capability-request-card')).not.toBeInTheDocument(); + expect(mocks.adapter.fetch).not.toHaveBeenCalled(); }); it('a starter-pack request installs via installPack (bundled, not store-tracked)', async () => { - renderCard({ name: 'daily-plan', source: 'starter-pack' }); + renderCard({ name: 'daily-plan', source: 'starter-pack', kind: 'skill' }); fireEvent.click(screen.getByTestId('capability-request-install')); await waitFor(() => expect(mocks.adapter.installPack).toHaveBeenCalledWith('daily-plan')); expect(mocks.adapter.installMarketplacePackage).not.toHaveBeenCalled(); }); it('Dismiss declines without installing', async () => { - renderCard({ name: 'web-scraper', source: 'marketplace', kind: 'marketplace' }); + renderCard(marketplaceRequest()); fireEvent.click(screen.getByTestId('capability-request-decline')); expect(await screen.findByText('Dismissed')).toBeInTheDocument(); + expect(mocks.adapter.fetch).not.toHaveBeenCalled(); expect(mocks.adapter.installMarketplacePackage).not.toHaveBeenCalled(); }); }); diff --git a/apps/web/src/test/pr4-install-store.test.tsx b/apps/web/src/test/pr4-install-store.test.tsx index 5b7281e..5b41665 100644 --- a/apps/web/src/test/pr4-install-store.test.tsx +++ b/apps/web/src/test/pr4-install-store.test.tsx @@ -15,6 +15,7 @@ const mocks = vi.hoisted(() => ({ getConnectors: vi.fn().mockResolvedValue([]), getMcps: vi.fn().mockResolvedValue([]), getMarketplace: vi.fn().mockResolvedValue({ packages: [] }), + fetch: vi.fn(), installMarketplacePackage: vi.fn(), uninstallMarketplacePackage: vi.fn().mockResolvedValue(undefined), connectConnector: vi.fn().mockResolvedValue(undefined), @@ -70,6 +71,7 @@ beforeEach(() => { mocks.adapter.getConnectors.mockResolvedValue([]); mocks.adapter.getMcps.mockResolvedValue([]); mocks.adapter.getMarketplace.mockResolvedValue({ packages: [] }); + mocks.adapter.fetch.mockResolvedValue(new Response('{}', { status: 200 })); mocks.adapter.installMarketplacePackage.mockResolvedValue(new Response('{}', { status: 200 })); mocks.adapter.uninstallMarketplacePackage.mockResolvedValue(undefined); mocks.adapter.connectConnector.mockResolvedValue(undefined); @@ -104,6 +106,54 @@ describe('InstallProvider — hydrate', () => { }); describe('InstallProvider — install dispatcher', () => { + it('holds proposal confirmation in shared installing state and marks exact package on success', async () => { + let release!: () => void; + mocks.adapter.fetch.mockImplementationOnce(() => new Promise((resolve) => { + release = () => resolve(new Response('{}', { status: 200 })); + })); + const { result } = await mountStore(); + + let confirmation!: Promise; + act(() => { + confirmation = result.current.confirmPackageProposal( + 9, + '123e4567-e89b-42d3-a456-426614174000', + 'workspace-a', + 'session-a', + ); + }); + await waitFor(() => expect(result.current.isInstalling('pkg:9')).toBe(true)); + expect(result.current.isInstalled('pkg:9')).toBe(false); + + await act(async () => { + release(); + await confirmation; + }); + + expect(result.current.isInstalling('pkg:9')).toBe(false); + expect(result.current.isInstalled('pkg:9')).toBe(true); + expect(mocks.adapter.fetch).toHaveBeenCalledWith( + '/api/capability-proposals/123e4567-e89b-42d3-a456-426614174000/confirm', + { method: 'POST', body: JSON.stringify({ workspaceId: 'workspace-a', sessionId: 'session-a' }) }, + ); + expect(mocks.adapter.installMarketplacePackage).not.toHaveBeenCalled(); + }); + + it('clears shared installing state when proposal confirmation fails', async () => { + mocks.adapter.fetch.mockRejectedValueOnce(new Error('expired')); + const { result } = await mountStore(); + + await expect(result.current.confirmPackageProposal( + 9, + '123e4567-e89b-42d3-a456-426614174000', + 'workspace-a', + 'session-a', + )).rejects.toThrow('expired'); + + expect(result.current.isInstalling('pkg:9')).toBe(false); + expect(result.current.isInstalled('pkg:9')).toBe(false); + }); + it('package install success flips installed + toasts Added', async () => { mocks.adapter.installMarketplacePackage.mockResolvedValue(new Response('{}', { status: 200 })); const { result } = await mountStore(); diff --git a/apps/web/src/test/pr5-settings-reskin.test.tsx b/apps/web/src/test/pr5-settings-reskin.test.tsx index 42ed397..792a5cc 100644 --- a/apps/web/src/test/pr5-settings-reskin.test.tsx +++ b/apps/web/src/test/pr5-settings-reskin.test.tsx @@ -24,6 +24,9 @@ const mocks = vi.hoisted(() => ({ // probe's honest "nothing to check" idle path. probeModel: vi.fn().mockResolvedValue({ configured: false }), probeProvider: vi.fn().mockResolvedValue({ configured: false, valid: false, verified: false }), + getBrowserCompanionPairing: vi.fn().mockResolvedValue({ paired: false, extensionId: null, pairedAt: null }), + createBrowserCompanionPairingCode: vi.fn(), + revokeBrowserCompanionPairing: vi.fn(), }, })); vi.mock('@/lib/adapter', () => ({ adapter: mocks.adapter, default: vi.fn() })); @@ -80,4 +83,13 @@ describe('PR5 Settings reskin', () => { fireEvent.click(screen.getByRole('button', { name: /everything/i })); expect(await screen.findByRole('tab', { name: /advanced/i })).toBeInTheDocument(); }); + + it('exposes Browser Companion pairing in Advanced settings', async () => { + await renderSettings(); + fireEvent.click(screen.getByRole('button', { name: /everything/i })); + fireEvent.click(await screen.findByRole('tab', { name: /advanced/i })); + + expect(await screen.findByTestId('browser-companion-settings')).toBeInTheDocument(); + expect(mocks.adapter.getBrowserCompanionPairing).toHaveBeenCalledOnce(); + }); }); diff --git a/apps/web/src/test/wave-u-chat-action-row.test.tsx b/apps/web/src/test/wave-u-chat-action-row.test.tsx index 507fc54..f251aa0 100644 --- a/apps/web/src/test/wave-u-chat-action-row.test.tsx +++ b/apps/web/src/test/wave-u-chat-action-row.test.tsx @@ -63,6 +63,26 @@ const render = (props: ChatAppRenderProps) => afterEach(() => cleanup()); describe('Wave U Lane F fix 1 — message action row presence', () => { + it('keeps historical assistant attribution when the active persona changes', () => { + render({ + messages: [{ ...assistantMsg, persona: 'researcher' }], + currentPersona: 'coder', + }); + + expect(screen.getByText('· Researcher')).toBeInTheDocument(); + expect(screen.queryByText('· Coder')).not.toBeInTheDocument(); + }); + + it('keeps historical model attribution when the active model changes', () => { + render({ + messages: [{ ...assistantMsg, model: 'openai/historical-model' }], + currentModel: 'anthropic/current-model', + }); + + expect(screen.getByText('· Historical Model')).toBeInTheDocument(); + expect(screen.queryByText('· Current Model')).not.toBeInTheDocument(); + }); + it('keeps the empty-state mascot intrinsically sized before image decode', () => { render({ messages: [] }); const emptyState = screen.getByText("Pick a workspace and Waggle's ready").closest('div'); diff --git a/apps/www/__tests__/middleware.test.ts b/apps/www/__tests__/middleware.test.ts index 82bf3f7..055b3cd 100644 --- a/apps/www/__tests__/middleware.test.ts +++ b/apps/www/__tests__/middleware.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from 'vitest'; -import { config } from '../middleware'; +import { config } from '../proxy'; -describe('www Clerk middleware boundary', () => { +describe('www Clerk proxy boundary', () => { it('protects only identity and server-owned flows', () => { expect(config.matcher).toEqual([ '/account(.*)', diff --git a/apps/www/app/_components/DownloadCTA.tsx b/apps/www/app/_components/DownloadCTA.tsx index 6a0682b..a148f5a 100644 --- a/apps/www/app/_components/DownloadCTA.tsx +++ b/apps/www/app/_components/DownloadCTA.tsx @@ -1,6 +1,6 @@ 'use client'; -import { useEffect, useState, type CSSProperties, type ReactNode } from 'react'; +import { useSyncExternalStore, type CSSProperties, type ReactNode } from 'react'; import { useTranslations } from 'next-intl'; import { detectOSFromUserAgent, type OSId } from '../_lib/os-detection'; import { emit, events } from '../_lib/event-taxonomy'; @@ -15,6 +15,10 @@ interface DownloadCTAProps { const DOWNLOAD_URL = '/download'; +const subscribeToClientEnvironment = () => () => {}; +const getClientOS = () => detectOSFromUserAgent(navigator.userAgent); +const getServerOS = (): null => null; + /** * OS-aware download CTA. Renders a generic "Download" label at SSR + first * paint, then swaps to "Download for {os}" after hydration via @@ -33,13 +37,11 @@ export default function DownloadCTA({ style, }: DownloadCTAProps) { const t = useTranslations('landing.download_cta'); - const [os, setOS] = useState(null); - - useEffect(() => { - if (typeof navigator !== 'undefined') { - setOS(detectOSFromUserAgent(navigator.userAgent)); - } - }, []); + const os = useSyncExternalStore( + subscribeToClientEnvironment, + getClientOS, + getServerOS, + ); const label = children ?? (os ? t('with_os', { os }) : t('default')); diff --git a/apps/www/app/_components/Navbar.tsx b/apps/www/app/_components/Navbar.tsx index 0a4ab14..3bdc7e8 100644 --- a/apps/www/app/_components/Navbar.tsx +++ b/apps/www/app/_components/Navbar.tsx @@ -2,6 +2,7 @@ import { useEffect, useState } from 'react'; import { useTranslations } from 'next-intl'; +import Link from 'next/link'; import { SignInButton, UserButton, Show } from '@clerk/nextjs'; import BrandMark from './BrandMark'; import DownloadCTA from './DownloadCTA'; @@ -47,9 +48,9 @@ export default function Navbar() { return (
- + - +