@sema-agent/core 7.57.0 → 7.59.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +1161 -0
- package/README.md +6 -4
- package/dist/agents/cc-peer-directory.js +8 -8
- package/dist/agents/child-model-seat.d.ts +4 -2
- package/dist/agents/child-model-seat.js +5 -3
- package/dist/agents/peer-directory.d.ts +9 -0
- package/dist/agents/peer-directory.js +6 -2
- package/dist/agents/send-message-tool.js +21 -12
- package/dist/agents/subagent-steps.js +2 -4
- package/dist/agents/subagent.js +33 -34
- package/dist/brain/anthropic.js +161 -45
- package/dist/brain/errors.d.ts +9 -3
- package/dist/brain/errors.js +7 -1
- package/dist/brain/failover.js +2 -1
- package/dist/brain/open-responses.js +3 -3
- package/dist/brain/openai.js +103 -53
- package/dist/brain/provider-dialect.d.ts +11 -0
- package/dist/brain/provider-dialect.js +5 -2
- package/dist/brain/reasoning-request.js +5 -4
- package/dist/brain/reasoning.d.ts +19 -0
- package/dist/brain/reasoning.js +17 -2
- package/dist/brain/request-route.d.ts +4 -1
- package/dist/brain/request-route.js +4 -1
- package/dist/brain/route-adjudicator.d.ts +84 -18
- package/dist/brain/route-adjudicator.js +89 -22
- package/dist/brain/route-conformance.js +1 -1
- package/dist/brain/stream-engine.js +84 -49
- package/dist/brain/stream-shared.d.ts +30 -0
- package/dist/brain/stream-shared.js +34 -1
- package/dist/brain/timeout.d.ts +62 -5
- package/dist/brain/timeout.js +93 -6
- package/dist/core/a2a.d.ts +2 -1
- package/dist/core/a2a.js +23 -10
- package/dist/core/account-row.d.ts +61 -0
- package/dist/core/account-row.js +51 -0
- package/dist/core/advisor-verdict.d.ts +2 -1
- package/dist/core/advisor-verdict.js +1 -1
- package/dist/core/allow-entry.d.ts +20 -7
- package/dist/core/allow-entry.js +18 -9
- package/dist/core/approval-object.d.ts +29 -15
- package/dist/core/approval-object.js +47 -19
- package/dist/core/ask-origin.d.ts +21 -2
- package/dist/core/ask-origin.js +5 -1
- package/dist/core/auto-compaction.d.ts +4 -0
- package/dist/core/auto-compaction.js +2 -2
- package/dist/core/auto-mode-directive.d.ts +29 -5
- package/dist/core/auto-mode-directive.js +38 -8
- package/dist/core/background-agent-store.d.ts +16 -3
- package/dist/core/checkpoint-requirements.d.ts +19 -1
- package/dist/core/checkpoint-requirements.js +5 -1
- package/dist/core/checkpoint-store.d.ts +85 -23
- package/dist/core/checkpoint-store.js +31 -9
- package/dist/core/child-clamp-seats.d.ts +29 -0
- package/dist/core/child-clamp-seats.js +56 -1
- package/dist/core/compliance.d.ts +2 -2
- package/dist/core/compliance.js +1 -1
- package/dist/core/effective-path-target.d.ts +8 -2
- package/dist/core/effective-path-target.js +8 -3
- package/dist/core/engine-notice.d.ts +99 -9
- package/dist/core/engine-notice.js +19 -5
- package/dist/core/fs-write-gate-policy.d.ts +4 -2
- package/dist/core/fs-write-gate-policy.js +7 -3
- package/dist/core/gate-fold.js +7 -4
- package/dist/core/gate-lanes.js +19 -6
- package/dist/core/gate-outcome.d.ts +32 -3
- package/dist/core/gate-outcome.js +19 -1
- package/dist/core/git-worktree-env.d.ts +53 -11
- package/dist/core/git-worktree-env.js +96 -12
- package/dist/core/governance-codes.d.ts +9 -1
- package/dist/core/governance-codes.js +13 -0
- package/dist/core/hooks.d.ts +35 -4
- package/dist/core/hooks.js +17 -11
- package/dist/core/human-input-projection.d.ts +1 -0
- package/dist/core/human-input-projection.js +3 -0
- package/dist/core/image-admission.d.ts +6 -5
- package/dist/core/image-admission.js +18 -14
- package/dist/core/locked-config.d.ts +20 -3
- package/dist/core/locked-config.js +40 -3
- package/dist/core/mailbox-store.d.ts +45 -1
- package/dist/core/mailbox-store.js +53 -9
- package/dist/core/mcp-call-meta.d.ts +66 -0
- package/dist/core/mcp-call-meta.js +103 -0
- package/dist/core/mcp-connection-pool.d.ts +3 -1
- package/dist/core/mcp-connection-pool.js +3 -1
- package/dist/core/mcp-failure.d.ts +117 -15
- package/dist/core/mcp-failure.js +71 -3
- package/dist/core/mcp-probe.d.ts +4 -0
- package/dist/core/mcp-probe.js +1 -1
- package/dist/core/mcp-server-link.d.ts +27 -3
- package/dist/core/mcp-server-link.js +25 -1
- package/dist/core/mcp-server-spec.d.ts +46 -18
- package/dist/core/mcp-server-spec.js +1 -18
- package/dist/core/mcp.d.ts +16 -20
- package/dist/core/mcp.js +112 -55
- package/dist/core/memory-engine/consolidation-driver.d.ts +2 -4
- package/dist/core/memory-engine/consolidation-driver.js +3 -3
- package/dist/core/memory-engine/consolidation.d.ts +4 -0
- package/dist/core/memory-engine/consolidation.js +1 -0
- package/dist/core/memory-engine/delegation-settlement.js +5 -12
- package/dist/core/memory-engine/distiller.js +2 -2
- package/dist/core/memory-engine/dual-root.d.ts +50 -1
- package/dist/core/memory-engine/dual-root.js +44 -1
- package/dist/core/memory-engine/engine.d.ts +67 -14
- package/dist/core/memory-engine/engine.js +384 -212
- package/dist/core/memory-engine/export-bundle.d.ts +23 -0
- package/dist/core/memory-engine/export-bundle.js +23 -4
- package/dist/core/memory-engine/file-backend.d.ts +128 -55
- package/dist/core/memory-engine/file-backend.js +290 -117
- package/dist/core/memory-engine/index.d.ts +1 -1
- package/dist/core/memory-engine/layout.d.ts +59 -11
- package/dist/core/memory-engine/layout.js +190 -40
- package/dist/core/memory-engine/memory-backend-contract.d.ts +1 -1
- package/dist/core/memory-engine/memory-backend-contract.js +39 -2
- package/dist/core/memory-engine/scope-contract.d.ts +45 -4
- package/dist/core/memory-engine/scope-contract.js +80 -11
- package/dist/core/memory-engine/sync-client.d.ts +9 -1
- package/dist/core/memory-engine/sync-client.js +31 -8
- package/dist/core/memory-engine/sync.d.ts +5 -0
- package/dist/core/memory-engine/types.d.ts +6 -0
- package/dist/core/mode-policy.d.ts +8 -5
- package/dist/core/mode-policy.js +5 -4
- package/dist/core/mods/classic-events.d.ts +5 -1
- package/dist/core/mods/host.js +1 -1
- package/dist/core/mods/kernel/dispatch.d.ts +3 -0
- package/dist/core/mods/kernel/dispatch.js +12 -9
- package/dist/core/mods/kernel/events.d.ts +6 -1
- package/dist/core/mods/kernel/events.js +2 -2
- package/dist/core/mods/kernel/registration.d.ts +9 -1
- package/dist/core/mods/kernel/registration.js +3 -0
- package/dist/core/mods/kernel/site-rules.d.ts +3 -0
- package/dist/core/mods/kernel/site-rules.js +10 -0
- package/dist/core/mods/package.d.ts +23 -0
- package/dist/core/mods/package.js +118 -0
- package/dist/core/mods/stations.d.ts +33 -12
- package/dist/core/mods/stations.js +45 -11
- package/dist/core/mods/tool-call.d.ts +5 -1
- package/dist/core/mods/tool-call.js +13 -4
- package/dist/core/parent-spec-seat.d.ts +8 -3
- package/dist/core/parent-spec-seat.js +2 -0
- package/dist/core/park-selfcheck.js +6 -0
- package/dist/core/path-guard-rows.d.ts +20 -0
- package/dist/core/path-guard-rows.js +11 -0
- package/dist/core/peer-seat.d.ts +248 -0
- package/dist/core/peer-seat.js +439 -0
- package/dist/core/permission-rule-consent.js +10 -4
- package/dist/core/permission-rule-model.d.ts +16 -0
- package/dist/core/permission-rule-model.js +1 -1
- package/dist/core/present-plan-tool.d.ts +20 -3
- package/dist/core/present-plan-tool.js +48 -4
- package/dist/core/protocol-http-auth.d.ts +40 -29
- package/dist/core/protocol-http-auth.js +30 -32
- package/dist/core/redaction-marks.d.ts +16 -0
- package/dist/core/redaction-marks.js +16 -0
- package/dist/core/redaction-passes.js +8 -9
- package/dist/core/resume-startup-cause.js +1 -0
- package/dist/core/retention.d.ts +41 -15
- package/dist/core/retention.js +59 -12
- package/dist/core/rewrite-rejudge.d.ts +38 -0
- package/dist/core/rewrite-rejudge.js +42 -2
- package/dist/core/roles.d.ts +34 -2
- package/dist/core/roles.js +43 -4
- package/dist/core/run-origin.d.ts +40 -0
- package/dist/core/run-origin.js +37 -0
- package/dist/core/runner/advertised-writable-dirs.d.ts +57 -38
- package/dist/core/runner/advertised-writable-dirs.js +126 -0
- package/dist/core/runner/announce-once-ledger.d.ts +5 -4
- package/dist/core/runner/announce-once-ledger.js +4 -2
- package/dist/core/runner/call-hook-stations.js +2 -2
- package/dist/core/runner/compaction-restate.d.ts +15 -6
- package/dist/core/runner/compaction-restate.js +28 -2
- package/dist/core/runner/contracts.d.ts +33 -21
- package/dist/core/runner/credential-origin-seat.js +4 -3
- package/dist/core/runner/cwd-alignment-probe.d.ts +20 -0
- package/dist/core/runner/cwd-alignment-probe.js +21 -0
- package/dist/core/runner/decide-continuation.d.ts +2 -2
- package/dist/core/runner/gate-exit.d.ts +30 -8
- package/dist/core/runner/gate-exit.js +15 -8
- package/dist/core/runner/image-removed-seat.d.ts +12 -0
- package/dist/core/runner/image-removed-seat.js +19 -0
- package/dist/core/runner/inline-image.js +1 -1
- package/dist/core/runner/memory-consolidation-driver.js +3 -3
- package/dist/core/runner/park-commit.d.ts +1 -1
- package/dist/core/runner/park-commit.js +3 -0
- package/dist/core/runner/prepare-ask-lane.d.ts +1 -1
- package/dist/core/runner/prepare-ask-lane.js +2 -1
- package/dist/core/runner/prepare-boundary-parks.js +2 -2
- package/dist/core/runner/prepare-caps-and-workflow.d.ts +5 -5
- package/dist/core/runner/prepare-caps-and-workflow.js +3 -1
- package/dist/core/runner/prepare-config-doors.d.ts +8 -5
- package/dist/core/runner/prepare-config-doors.js +14 -10
- package/dist/core/runner/prepare-context-lane.js +2 -0
- package/dist/core/runner/prepare-delegation-surface.d.ts +8 -0
- package/dist/core/runner/prepare-delegation-surface.js +16 -18
- package/dist/core/runner/prepare-gate-stations.js +1 -1
- package/dist/core/runner/prepare-hands-readface.d.ts +11 -3
- package/dist/core/runner/prepare-hands-readface.js +9 -1
- package/dist/core/runner/prepare-inherited-gate.d.ts +1 -3
- package/dist/core/runner/prepare-inherited-gate.js +14 -27
- package/dist/core/runner/prepare-memory.d.ts +3 -0
- package/dist/core/runner/prepare-memory.js +26 -37
- package/dist/core/runner/prepare-park-ask.d.ts +1 -1
- package/dist/core/runner/prepare-park-ask.js +2 -1
- package/dist/core/runner/prepare-policy-chain.d.ts +7 -7
- package/dist/core/runner/prepare-policy-chain.js +18 -15
- package/dist/core/runner/prepare-project-context.d.ts +2 -2
- package/dist/core/runner/prepare-project-context.js +2 -2
- package/dist/core/runner/prepare-prompt-inputs.d.ts +1 -1
- package/dist/core/runner/prepare-prompt-inputs.js +8 -19
- package/dist/core/runner/prepare-protocol-tools.d.ts +4 -2
- package/dist/core/runner/prepare-protocol-tools.js +11 -3
- package/dist/core/runner/prepare-run-refs.d.ts +2 -3
- package/dist/core/runner/prepare-run-refs.js +4 -1
- package/dist/core/runner/prepare-suspend-saga.d.ts +2 -0
- package/dist/core/runner/prepare-suspend-saga.js +2 -1
- package/dist/core/runner/prepare-task.js +28 -13
- package/dist/core/runner/prepare-wiring-manifest.d.ts +2 -1
- package/dist/core/runner/prepare-wiring-manifest.js +4 -3
- package/dist/core/runner/prepare-workspace-restore.d.ts +3 -0
- package/dist/core/runner/prepare-workspace-restore.js +4 -4
- package/dist/core/runner/reply-pricing.d.ts +30 -0
- package/dist/core/runner/reply-pricing.js +19 -0
- package/dist/core/runner/resume-admission.js +5 -3
- package/dist/core/runner/resume-apply.js +6 -1
- package/dist/core/runner/resume-checkpoint-screen.js +2 -0
- package/dist/core/runner/resume-policy-outcome.js +5 -5
- package/dist/core/runner/role-seat-defaulted.d.ts +44 -0
- package/dist/core/runner/role-seat-defaulted.js +40 -0
- package/dist/core/runner/run-brain-sinks.js +2 -0
- package/dist/core/runner/run-harness-handlers.d.ts +3 -4
- package/dist/core/runner/run-harness-handlers.js +1 -8
- package/dist/core/runner/run-identity-wiring.d.ts +2 -5
- package/dist/core/runner/run-identity-wiring.js +6 -4
- package/dist/core/runner/run-leg.d.ts +2 -0
- package/dist/core/runner/run-leg.js +42 -29
- package/dist/core/runner/run-notification-lane.js +3 -0
- package/dist/core/runner/run-stop-and-final-verify.js +2 -2
- package/dist/core/runner/run-terminal-adoption.d.ts +2 -5
- package/dist/core/runner/run-terminal-adoption.js +9 -3
- package/dist/core/runner/run-turn-boundary.js +77 -70
- package/dist/core/runner/runtask.d.ts +1 -1
- package/dist/core/runner/runtask.js +2 -2
- package/dist/core/runner/side-call-account.d.ts +1 -1
- package/dist/core/runner/side-call-account.js +3 -18
- package/dist/core/runner/sub-agent-deny-lists.d.ts +24 -0
- package/dist/core/runner/sub-agent-deny-lists.js +10 -0
- package/dist/core/runner/terminal-account.js +3 -3
- package/dist/core/runner/tool-end-body.js +2 -1
- package/dist/core/runner/tool-occurrence.d.ts +5 -2
- package/dist/core/runner/tool-occurrence.js +4 -3
- package/dist/core/runner/turn-attachments.d.ts +26 -22
- package/dist/core/runner/turn-attachments.js +24 -26
- package/dist/core/runner/write-protection-station.d.ts +8 -2
- package/dist/core/runner/write-protection-station.js +2 -0
- package/dist/core/runner-deps.d.ts +3 -3
- package/dist/core/secret-env.d.ts +32 -2
- package/dist/core/secret-env.js +65 -3
- package/dist/core/sensitive-path-policy.js +9 -10
- package/dist/core/session-log-transfer.d.ts +24 -0
- package/dist/core/session-log-transfer.js +166 -0
- package/dist/core/session-policy-store.d.ts +3 -1
- package/dist/core/session-policy-store.js +13 -9
- package/dist/core/session-store.d.ts +86 -24
- package/dist/core/session-store.js +162 -24
- package/dist/core/session.d.ts +92 -1
- package/dist/core/shell-read-silence.js +1 -0
- package/dist/core/side-query.d.ts +11 -1
- package/dist/core/side-query.js +9 -0
- package/dist/core/skill-grant-binding.d.ts +31 -2
- package/dist/core/skill-grant-binding.js +31 -1
- package/dist/core/skill-grant.d.ts +8 -5
- package/dist/core/skill-grant.js +6 -6
- package/dist/core/steer-replay.d.ts +4 -2
- package/dist/core/steer-replay.js +2 -1
- package/dist/core/store-contracts/background-agent-store-contract.js +27 -0
- package/dist/core/store-contracts/checkpoint-store-contract.js +20 -2
- package/dist/core/store-contracts/mailbox-store-contract.js +31 -1
- package/dist/core/store-contracts/session-repo-contract.js +112 -5
- package/dist/core/store-contracts/session-store-contract.d.ts +4 -1
- package/dist/core/store-contracts/session-store-contract.js +236 -2
- package/dist/core/synthetic-read-verdict.js +2 -1
- package/dist/core/task-event.d.ts +92 -8
- package/dist/core/task-notification.js +16 -10
- package/dist/core/task-registry-agent.js +1 -0
- package/dist/core/task-registry-shared.d.ts +7 -1
- package/dist/core/task-spec.d.ts +49 -1
- package/dist/core/task-stream.d.ts +2 -1
- package/dist/core/terminal-cause.d.ts +11 -1
- package/dist/core/tool-catalog-entries.js +1 -0
- package/dist/core/tool-check-reading.d.ts +1 -0
- package/dist/core/tool-check-reading.js +3 -3
- package/dist/core/tool-policy.d.ts +16 -0
- package/dist/core/tool-result-store.d.ts +17 -10
- package/dist/core/tool-result-store.js +3 -1
- package/dist/core/tool-roster.d.ts +112 -5
- package/dist/core/tool-roster.js +42 -1
- package/dist/core/tool-spec.d.ts +3 -1
- package/dist/core/types.d.ts +3 -3
- package/dist/core/types.js +1 -1
- package/dist/core/untrusted-egress.d.ts +0 -2
- package/dist/core/untrusted-egress.js +10 -14
- package/dist/core/user-attachment.js +1 -1
- package/dist/core/wiring-manifest.d.ts +18 -6
- package/dist/core/wiring-manifest.js +4 -3
- package/dist/core/workspace-snapshot.d.ts +44 -0
- package/dist/core/workspace-snapshot.js +34 -0
- package/dist/core/write-protect.d.ts +43 -3
- package/dist/core/write-protect.js +43 -16
- package/dist/engine/compaction/compaction.js +29 -3
- package/dist/engine/execution-env/node-execution-env.d.ts +4 -3
- package/dist/engine/execution-env/node-execution-env.js +24 -23
- package/dist/engine/execution-env/symlink-chain.d.ts +7 -5
- package/dist/engine/harness/agent-harness.d.ts +30 -2
- package/dist/engine/harness/agent-harness.js +43 -12
- package/dist/engine/harness/messages.d.ts +3 -1
- package/dist/engine/harness/messages.js +3 -2
- package/dist/engine/harness/types.d.ts +56 -7
- package/dist/engine/harness/types.js +5 -1
- package/dist/engine/llm/rejected-images.d.ts +46 -0
- package/dist/engine/llm/rejected-images.js +54 -0
- package/dist/engine/llm/tool-turns.d.ts +2 -1
- package/dist/engine/llm/types.d.ts +30 -10
- package/dist/engine/llm/types.js +1 -1
- package/dist/engine/loop/agent-loop.d.ts +8 -0
- package/dist/engine/loop/agent-loop.js +52 -15
- package/dist/engine/loop/types.d.ts +3 -1
- package/dist/engine/session/import-validate.js +3 -0
- package/dist/engine/session/memory-repo.d.ts +17 -9
- package/dist/engine/session/memory-repo.js +44 -34
- package/dist/engine/session/path-to-root.d.ts +38 -0
- package/dist/engine/session/path-to-root.js +39 -0
- package/dist/engine/session/repo-utils.d.ts +22 -4
- package/dist/engine/session/repo-utils.js +49 -1
- package/dist/engine/session/storage-base.d.ts +10 -1
- package/dist/engine/session/storage-base.js +11 -22
- package/dist/index.d.ts +29 -16
- package/dist/index.js +21 -11
- package/dist/internal/harness-types.d.ts +2 -2
- package/dist/internal/harness.d.ts +3 -2
- package/dist/internal/harness.js +2 -2
- package/dist/internal/llm.d.ts +1 -0
- package/dist/orchestration/workflow-observe.d.ts +17 -1
- package/dist/orchestration/workflow-observe.js +20 -0
- package/dist/orchestration/workflow-types.d.ts +32 -7
- package/dist/orchestration/workflow.js +739 -489
- package/dist/shell/counting-pass.d.ts +50 -0
- package/dist/shell/counting-pass.js +502 -0
- package/dist/shell/lex.d.ts +4 -2
- package/dist/shell/lex.js +93 -34
- package/dist/shell/shell-words.d.ts +1 -1
- package/dist/shell/shell-words.js +7 -6
- package/dist/stores/file/index.d.ts +4 -1
- package/dist/stores/file/index.js +4 -1
- package/dist/stores/file/mailbox-store.js +6 -10
- package/dist/stores/file/session-store.d.ts +15 -8
- package/dist/stores/file/session-store.js +28 -13
- package/dist/tools/fs/fs-bash.d.ts +6 -0
- package/dist/tools/fs/fs-bash.js +6 -3
- package/dist/tools/fs/fs-write.d.ts +6 -3
- package/dist/tools/fs/fs-write.js +8 -7
- package/dist/tools/fs/index.d.ts +3 -0
- package/dist/tools/fs/index.js +7 -3
- package/dist/tools/fs/program-read-model.d.ts +13 -0
- package/dist/tools/fs/program-read-model.js +15 -0
- package/dist/tools/fs/program-read-model.rows.js +1 -1
- package/dist/tools/fs/read-deny.d.ts +13 -10
- package/dist/tools/fs/read-deny.js +25 -5
- package/dist/tools/fs/read-floor.d.ts +19 -0
- package/dist/tools/fs/read-floor.js +23 -0
- package/dist/tools/fs/safety.js +40 -8
- package/dist/tools/fs/search.js +6 -24
- package/dist/tools/fs/shell-read-check.d.ts +9 -2
- package/dist/tools/fs/shell-read-check.js +61 -16
- package/dist/tools/fs/shell-read-establish.js +2 -1
- package/dist/tools/fs/shell-read-identity.js +1 -1
- package/dist/tools/fs/shell-read-judge.d.ts +26 -9
- package/dist/tools/fs/shell-read-judge.js +10 -6
- package/dist/tools/fs/shell-read-plan.d.ts +6 -1
- package/dist/tools/fs/shell-read-plan.js +22 -15
- package/dist/tools/fs/shell-read-start.js +1 -0
- package/dist/tools/fs/shell-reentry-text.d.ts +15 -1
- package/dist/tools/fs/shell-reentry-text.js +25 -3
- package/dist/tools/monitor.d.ts +4 -0
- package/dist/tools/monitor.js +2 -0
- package/dist/tools/worktree.d.ts +42 -15
- package/dist/tools/worktree.js +60 -32
- package/package.json +5 -2
- package/test/export-surface.snapshot.json +149 -1
- package/wire-changes/core-stores-sql@7.58.0.json +29 -0
- package/wire-changes/core-stores-sql@7.59.0.json +29 -0
- package/wire-changes/core@7.58.0.json +2188 -0
- package/wire-changes/core@7.59.0.json +2459 -0
- package/wire-changes/mods-kernel@7.58.0.json +81 -0
- package/wire-changes/mods-kernel@7.59.0.json +29 -0
- package/wire-changes/primitives@7.58.0.json +29 -0
- package/wire-changes/primitives@7.59.0.json +29 -0
- package/dist/primitives/credential-ref.d.ts +0 -89
- package/dist/primitives/credential-ref.js +0 -125
- package/dist/primitives/index.d.ts +0 -2
- package/dist/primitives/index.js +0 -1
|
@@ -0,0 +1,439 @@
|
|
|
1
|
+
import { createHash } from "node:crypto";
|
|
2
|
+
import { StreamableHTTPError } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
|
|
3
|
+
import { readCredentialRef } from "@sema-agent/primitives";
|
|
4
|
+
import { readMember } from "./thrown-value.js";
|
|
5
|
+
import { resolveProtocolHttpHeaders } from "./protocol-http-auth.js";
|
|
6
|
+
import { holdOwnCredentialValues, isSecretEnvKey } from "./secret-env.js";
|
|
7
|
+
import { inlineUntrusted } from "./untrusted-text.js";
|
|
8
|
+
export const PEER_ANSWER_LANES = Object.freeze({ http: "headers", a2a: "headers", stdio: "env" });
|
|
9
|
+
export const PEER_SEAT_WAIT_MS = 30_000;
|
|
10
|
+
export const AUTHORIZATION_URL_MAX = 2048;
|
|
11
|
+
export function authorizationUrlOf(raw) {
|
|
12
|
+
if (typeof raw !== "string" || /[\u0000-\u001f\u007f]/.test(raw))
|
|
13
|
+
return undefined;
|
|
14
|
+
let url;
|
|
15
|
+
try {
|
|
16
|
+
url = new URL(raw);
|
|
17
|
+
}
|
|
18
|
+
catch {
|
|
19
|
+
return undefined;
|
|
20
|
+
}
|
|
21
|
+
if ((url.protocol !== "https:" && url.protocol !== "http:") || url.username !== "" || url.password !== "")
|
|
22
|
+
return undefined;
|
|
23
|
+
const kept = url.origin + `${url.pathname}${url.search}${url.hash}`.replace(/[[\]()<>`"'{}|^\\]/g, (c) => `%${c.charCodeAt(0).toString(16).toUpperCase()}`);
|
|
24
|
+
return kept.length <= AUTHORIZATION_URL_MAX ? kept : undefined;
|
|
25
|
+
}
|
|
26
|
+
export function bearerChallengeParams(header) {
|
|
27
|
+
if (header === null)
|
|
28
|
+
return undefined;
|
|
29
|
+
const token = /[!#$%&'*+.^_`|~0-9A-Za-z-]+/y;
|
|
30
|
+
const readToken = (at) => ((token.lastIndex = at), token.exec(header)?.[0]);
|
|
31
|
+
let i = 0;
|
|
32
|
+
let scheme;
|
|
33
|
+
let params = new Map();
|
|
34
|
+
let bearer;
|
|
35
|
+
let bareScheme = false;
|
|
36
|
+
const space = () => void (i += /^[ \t]*/.exec(header.slice(i))[0].length);
|
|
37
|
+
while (i < header.length) {
|
|
38
|
+
space();
|
|
39
|
+
const name = readToken(i);
|
|
40
|
+
if (name === undefined) {
|
|
41
|
+
if (header[i] === ",")
|
|
42
|
+
bareScheme = false;
|
|
43
|
+
i++;
|
|
44
|
+
continue;
|
|
45
|
+
}
|
|
46
|
+
i += name.length;
|
|
47
|
+
space();
|
|
48
|
+
if (header[i] !== "=") {
|
|
49
|
+
if (bareScheme) {
|
|
50
|
+
bareScheme = false;
|
|
51
|
+
continue;
|
|
52
|
+
}
|
|
53
|
+
if (scheme?.toLowerCase() === "bearer")
|
|
54
|
+
bearer ??= params;
|
|
55
|
+
scheme = name;
|
|
56
|
+
params = new Map();
|
|
57
|
+
bareScheme = true;
|
|
58
|
+
continue;
|
|
59
|
+
}
|
|
60
|
+
bareScheme = false;
|
|
61
|
+
i++;
|
|
62
|
+
space();
|
|
63
|
+
let value = "";
|
|
64
|
+
if (header[i] === '"') {
|
|
65
|
+
for (i++; i < header.length && header[i] !== '"'; i++)
|
|
66
|
+
value += header[i] === "\\" ? (header[++i] ?? "") : header[i];
|
|
67
|
+
i++;
|
|
68
|
+
}
|
|
69
|
+
else {
|
|
70
|
+
value = readToken(i) ?? "";
|
|
71
|
+
i += value.length;
|
|
72
|
+
}
|
|
73
|
+
if (scheme !== undefined && !params.has(name.toLowerCase()))
|
|
74
|
+
params.set(name.toLowerCase(), value);
|
|
75
|
+
}
|
|
76
|
+
if (scheme?.toLowerCase() === "bearer")
|
|
77
|
+
bearer ??= params;
|
|
78
|
+
return bearer;
|
|
79
|
+
}
|
|
80
|
+
async function bodyHead(res, max) {
|
|
81
|
+
const reader = res.body?.getReader();
|
|
82
|
+
if (reader === undefined)
|
|
83
|
+
return undefined;
|
|
84
|
+
const decoder = new TextDecoder();
|
|
85
|
+
let text = "";
|
|
86
|
+
try {
|
|
87
|
+
while (text.length < max) {
|
|
88
|
+
const { done, value } = await reader.read();
|
|
89
|
+
if (done)
|
|
90
|
+
break;
|
|
91
|
+
text += decoder.decode(value, { stream: true });
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
catch {
|
|
95
|
+
}
|
|
96
|
+
finally {
|
|
97
|
+
void reader.cancel().catch(() => undefined);
|
|
98
|
+
}
|
|
99
|
+
return text.slice(0, max);
|
|
100
|
+
}
|
|
101
|
+
export class PeerSeatFailure extends Error {
|
|
102
|
+
reason;
|
|
103
|
+
authorizeUrl;
|
|
104
|
+
code;
|
|
105
|
+
constructor(reason, peerLabel, problem, extra) {
|
|
106
|
+
super(`the deployment's peer seat ${problem} for ${peerLabel} — the request was not sent`);
|
|
107
|
+
this.name = "PeerSeatFailure";
|
|
108
|
+
this.reason = reason;
|
|
109
|
+
this.authorizeUrl = extra?.authorizeUrl;
|
|
110
|
+
this.code = extra?.code ?? (reason === "answer_invalid" ? "config.peer_answer_invalid" : undefined);
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
export class PeerAuthorizationRefused extends StreamableHTTPError {
|
|
114
|
+
reason;
|
|
115
|
+
resourceMetadataUrl;
|
|
116
|
+
authorizeUrl;
|
|
117
|
+
renewed;
|
|
118
|
+
constructor(reason, facts) {
|
|
119
|
+
const lead = reason === "rejected" ? "the endpoint refused the request's authorization (HTTP 401)" : "the endpoint refused the request for insufficient scope (HTTP 403)";
|
|
120
|
+
super(reason === "rejected" ? 401 : 403, facts.body !== undefined && facts.body !== "" ? `${lead}: ${facts.body}` : lead);
|
|
121
|
+
this.name = "PeerAuthorizationRefused";
|
|
122
|
+
this.reason = reason;
|
|
123
|
+
this.resourceMetadataUrl = facts.resourceMetadataUrl;
|
|
124
|
+
this.authorizeUrl = facts.authorizeUrl;
|
|
125
|
+
this.renewed = facts.renewed === true;
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
export const REFUSAL_BODY_MAX = 4096;
|
|
129
|
+
export function refusedThenRenewed(err) {
|
|
130
|
+
let at = err;
|
|
131
|
+
for (let depth = 0; depth < 6 && at instanceof Error; depth++) {
|
|
132
|
+
if (at instanceof PeerAuthorizationRefused)
|
|
133
|
+
return at.renewed;
|
|
134
|
+
at = at.cause;
|
|
135
|
+
}
|
|
136
|
+
return false;
|
|
137
|
+
}
|
|
138
|
+
const HEADER_NAME = /^[!#$%&'*+.^_`|~0-9A-Za-z-]+$/;
|
|
139
|
+
const ENV_NAME = /^[A-Za-z_][A-Za-z0-9_]*$/;
|
|
140
|
+
const VALUE_BREAK = /[\r\n\0]/;
|
|
141
|
+
const ANSWER_MEMBERS = { carry: ["kind", "headers", "env", "expiresAt"], unauthorized: ["kind", "authorizeUrl"] };
|
|
142
|
+
const digestOf = (pieces) => {
|
|
143
|
+
const rows = (m) => Object.entries(m ?? {}).sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0));
|
|
144
|
+
return createHash("sha256").update(JSON.stringify([rows(pieces.headers), rows(pieces.env)])).digest("hex");
|
|
145
|
+
};
|
|
146
|
+
const NO_PIECES = Object.freeze({ digest: digestOf({}) });
|
|
147
|
+
function nameValues(raw, member) {
|
|
148
|
+
if (typeof raw !== "object" || raw === null || Array.isArray(raw))
|
|
149
|
+
return `its ${member} is not a record of names to strings`;
|
|
150
|
+
const out = Object.create(null);
|
|
151
|
+
const folded = new Set();
|
|
152
|
+
for (const name of Object.keys(raw)) {
|
|
153
|
+
const value = raw[name];
|
|
154
|
+
if (typeof value !== "string")
|
|
155
|
+
return `its ${member} member ${inlineUntrusted(JSON.stringify(name), 80)} is not a string`;
|
|
156
|
+
if (!(member === "headers" ? HEADER_NAME : ENV_NAME).test(name))
|
|
157
|
+
return `its ${member} name ${inlineUntrusted(JSON.stringify(name), 80)} is not a ${member === "headers" ? "header" : "variable"} name`;
|
|
158
|
+
if (VALUE_BREAK.test(value))
|
|
159
|
+
return `its ${member} member ${inlineUntrusted(JSON.stringify(name), 80)} holds a line break or NUL`;
|
|
160
|
+
if (member === "headers") {
|
|
161
|
+
if (folded.has(name.toLowerCase()))
|
|
162
|
+
return `its headers name ${inlineUntrusted(JSON.stringify(name), 80)} twice (header names are case-insensitive)`;
|
|
163
|
+
folded.add(name.toLowerCase());
|
|
164
|
+
}
|
|
165
|
+
out[name] = value;
|
|
166
|
+
}
|
|
167
|
+
return Object.freeze(out);
|
|
168
|
+
}
|
|
169
|
+
export function readPeerAnswer(raw, lane) {
|
|
170
|
+
try {
|
|
171
|
+
if (typeof raw !== "object" || raw === null || Array.isArray(raw))
|
|
172
|
+
return { problem: "answered something that is not an answer record" };
|
|
173
|
+
const record = raw;
|
|
174
|
+
const kind = record["kind"];
|
|
175
|
+
if (kind !== "carry" && kind !== "unauthorized")
|
|
176
|
+
return { problem: `answered the kind ${inlineUntrusted(JSON.stringify(kind) ?? String(kind), 80)}, which is neither "carry" nor "unauthorized"` };
|
|
177
|
+
const extra = Object.keys(record).find((key) => !ANSWER_MEMBERS[kind].includes(key));
|
|
178
|
+
if (extra !== undefined)
|
|
179
|
+
return { problem: `answered the member ${inlineUntrusted(JSON.stringify(extra), 80)}, which a "${kind}" answer does not have` };
|
|
180
|
+
if (kind === "unauthorized") {
|
|
181
|
+
const raw = record["authorizeUrl"];
|
|
182
|
+
if (raw === undefined)
|
|
183
|
+
return { unauthorized: {} };
|
|
184
|
+
const url = authorizationUrlOf(raw);
|
|
185
|
+
if (url === undefined)
|
|
186
|
+
return { problem: `answered an authorizeUrl that is not an absolute http(s) URL without user-info, of at most ${AUTHORIZATION_URL_MAX} characters, without control characters` };
|
|
187
|
+
return { unauthorized: { authorizeUrl: url } };
|
|
188
|
+
}
|
|
189
|
+
const own = PEER_ANSWER_LANES[lane];
|
|
190
|
+
const other = own === "headers" ? "env" : "headers";
|
|
191
|
+
if (record[other] !== undefined)
|
|
192
|
+
return { problem: `answered ${other} for a ${lane} peer, which carries ${own} only` };
|
|
193
|
+
const expiresAt = record["expiresAt"];
|
|
194
|
+
if (expiresAt !== undefined && (typeof expiresAt !== "number" || !Number.isFinite(expiresAt)))
|
|
195
|
+
return { problem: "answered an expiresAt that is not a finite epoch-millisecond number" };
|
|
196
|
+
const given = record[own];
|
|
197
|
+
const values = given === undefined ? undefined : nameValues(given, own);
|
|
198
|
+
if (typeof values === "string")
|
|
199
|
+
return { problem: `answered ${values}` };
|
|
200
|
+
const lanePieces = values === undefined ? {} : { [own]: values };
|
|
201
|
+
return { carry: Object.freeze({ ...lanePieces, ...(expiresAt !== undefined ? { expiresAt } : {}), digest: digestOf(lanePieces) }) };
|
|
202
|
+
}
|
|
203
|
+
catch {
|
|
204
|
+
return { problem: "answered a record whose members could not be read" };
|
|
205
|
+
}
|
|
206
|
+
}
|
|
207
|
+
async function askBounded(seat, question, signal) {
|
|
208
|
+
signal?.throwIfAborted();
|
|
209
|
+
const wait = new AbortController();
|
|
210
|
+
const timer = setTimeout(() => wait.abort(), PEER_SEAT_WAIT_MS);
|
|
211
|
+
timer.unref();
|
|
212
|
+
const stop = signal === undefined ? wait.signal : AbortSignal.any([signal, wait.signal]);
|
|
213
|
+
try {
|
|
214
|
+
const stopped = new Promise((_, reject) => stop.addEventListener("abort", () => reject(stop.reason), { once: true }));
|
|
215
|
+
stopped.catch(() => undefined);
|
|
216
|
+
return { answer: await Promise.race([seat(question, stop), stopped]) };
|
|
217
|
+
}
|
|
218
|
+
catch (err) {
|
|
219
|
+
if (signal?.aborted === true)
|
|
220
|
+
throw signal.reason;
|
|
221
|
+
return { failed: wait.signal.aborted ? "timed_out" : "threw" };
|
|
222
|
+
}
|
|
223
|
+
finally {
|
|
224
|
+
clearTimeout(timer);
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
export class PeerCarrier {
|
|
228
|
+
seat;
|
|
229
|
+
identity;
|
|
230
|
+
principal;
|
|
231
|
+
lane;
|
|
232
|
+
sent = [];
|
|
233
|
+
expiresAt;
|
|
234
|
+
renewed = false;
|
|
235
|
+
asked = false;
|
|
236
|
+
waiting;
|
|
237
|
+
rejection;
|
|
238
|
+
constructor(seat, identity, principal, lane, principalSent) {
|
|
239
|
+
this.seat = seat;
|
|
240
|
+
this.identity = identity;
|
|
241
|
+
this.principal = principal;
|
|
242
|
+
this.lane = lane;
|
|
243
|
+
if (principalSent && principal !== undefined && principal !== "")
|
|
244
|
+
this.sent.push(principal);
|
|
245
|
+
}
|
|
246
|
+
get label() {
|
|
247
|
+
return this.identity.protocol === "mcp" ? `MCP server "${inlineUntrusted(this.identity.server, 120)}"` : `A2A peer "${inlineUntrusted(this.identity.peer, 120)}"`;
|
|
248
|
+
}
|
|
249
|
+
async next(signal, destination) {
|
|
250
|
+
const waiting = this.waiting;
|
|
251
|
+
if (waiting !== undefined) {
|
|
252
|
+
this.waiting = undefined;
|
|
253
|
+
this.last = waiting;
|
|
254
|
+
return waiting;
|
|
255
|
+
}
|
|
256
|
+
const cause = this.asked ? "request" : "connect";
|
|
257
|
+
this.asked = true;
|
|
258
|
+
this.last = await this.ask(cause, signal, destination);
|
|
259
|
+
return this.last;
|
|
260
|
+
}
|
|
261
|
+
last;
|
|
262
|
+
async rejected(carried, signal, destination) {
|
|
263
|
+
this.rejection ??= this.ask("rejected", signal, destination)
|
|
264
|
+
.then((pieces) => {
|
|
265
|
+
this.waiting = pieces;
|
|
266
|
+
this.renewed = pieces.digest !== carried.digest;
|
|
267
|
+
return { renewed: this.renewed };
|
|
268
|
+
}, (err) => {
|
|
269
|
+
this.renewed = false;
|
|
270
|
+
return err instanceof PeerSeatFailure && err.reason === "unauthorized" && err.authorizeUrl !== undefined ? { renewed: false, authorizeUrl: err.authorizeUrl } : { renewed: false };
|
|
271
|
+
})
|
|
272
|
+
.finally(() => {
|
|
273
|
+
this.rejection = undefined;
|
|
274
|
+
});
|
|
275
|
+
return this.rejection;
|
|
276
|
+
}
|
|
277
|
+
expired(now = Date.now()) {
|
|
278
|
+
return this.expiresAt !== undefined && now >= this.expiresAt;
|
|
279
|
+
}
|
|
280
|
+
async ask(cause, signal, destination) {
|
|
281
|
+
if (this.seat === undefined)
|
|
282
|
+
return NO_PIECES;
|
|
283
|
+
const peer = this.identity.protocol === "a2a" && destination !== undefined ? { ...this.identity, destination } : this.identity;
|
|
284
|
+
const asked = await askBounded(this.seat, { peer, ...(this.principal !== undefined ? { principal: this.principal } : {}), cause }, signal);
|
|
285
|
+
if ("failed" in asked)
|
|
286
|
+
throw new PeerSeatFailure(asked.failed, this.label, asked.failed === "timed_out" ? `did not answer within ${PEER_SEAT_WAIT_MS} ms` : "threw");
|
|
287
|
+
const read = readPeerAnswer(asked.answer, this.lane);
|
|
288
|
+
if ("problem" in read)
|
|
289
|
+
throw new PeerSeatFailure("answer_invalid", this.label, read.problem);
|
|
290
|
+
if ("unauthorized" in read)
|
|
291
|
+
throw new PeerSeatFailure("unauthorized", this.label, "answered that this principal is not authorized", read.unauthorized.authorizeUrl === undefined ? undefined : { authorizeUrl: read.unauthorized.authorizeUrl });
|
|
292
|
+
const pieces = read.carry;
|
|
293
|
+
if (pieces.env !== undefined) {
|
|
294
|
+
const held = Object.entries(pieces.env).filter(([name, value]) => isSecretEnvKey(name, value)).map(([, value]) => value);
|
|
295
|
+
try {
|
|
296
|
+
holdOwnCredentialValues(held);
|
|
297
|
+
}
|
|
298
|
+
catch {
|
|
299
|
+
throw new PeerSeatFailure("answer_invalid", this.label, "answered an environment value that is the value of a variable every child on this host is handed");
|
|
300
|
+
}
|
|
301
|
+
for (const value of held)
|
|
302
|
+
this.remember(value);
|
|
303
|
+
}
|
|
304
|
+
if (this.lane === "stdio")
|
|
305
|
+
this.expiresAt = pieces.expiresAt;
|
|
306
|
+
for (const value of Object.values(pieces.headers ?? {}))
|
|
307
|
+
this.remember(value);
|
|
308
|
+
return pieces;
|
|
309
|
+
}
|
|
310
|
+
remember(value) {
|
|
311
|
+
if (value !== "" && !this.sent.includes(value))
|
|
312
|
+
this.sent.push(value);
|
|
313
|
+
}
|
|
314
|
+
}
|
|
315
|
+
export function carriedHttpHeaders(protocol, carrier, pieces, principalHeader, principal) {
|
|
316
|
+
try {
|
|
317
|
+
return resolveProtocolHttpHeaders(protocol, { ...(pieces.headers !== undefined ? { headers: { ...pieces.headers } } : {}), ...(principalHeader !== undefined ? { principalHeader } : {}) }, principal);
|
|
318
|
+
}
|
|
319
|
+
catch (err) {
|
|
320
|
+
if (pieces.headers === undefined)
|
|
321
|
+
throw err;
|
|
322
|
+
const message = err instanceof Error ? err.message : "";
|
|
323
|
+
const code = err?.code;
|
|
324
|
+
throw new PeerSeatFailure("answer_invalid", carrier.label, `answered headers the engine cannot send (${inlineUntrusted(message, 240)})`, typeof code === "string" ? { code } : undefined);
|
|
325
|
+
}
|
|
326
|
+
}
|
|
327
|
+
export function peerFetch(carrier, principalHeader, principal) {
|
|
328
|
+
return async (url, init) => {
|
|
329
|
+
const signal = init?.signal ?? undefined;
|
|
330
|
+
const pieces = await carrier.next(signal);
|
|
331
|
+
const own = carriedHttpHeaders("mcp", carrier, pieces, principalHeader, principal);
|
|
332
|
+
const headers = new Headers(init?.headers);
|
|
333
|
+
for (const [name, value] of Object.entries(own ?? {}))
|
|
334
|
+
headers.set(name, value);
|
|
335
|
+
const res = await fetch(url, { ...init, headers, redirect: "manual" });
|
|
336
|
+
if (res.status !== 401 && res.status !== 403)
|
|
337
|
+
return res;
|
|
338
|
+
const challenge = bearerChallengeParams(res.headers.get("www-authenticate"));
|
|
339
|
+
if (res.status === 403 && challenge?.get("error") !== "insufficient_scope")
|
|
340
|
+
return res;
|
|
341
|
+
const resourceMetadataUrl = authorizationUrlOf(challenge?.get("resource_metadata"));
|
|
342
|
+
const body = init?.method === "POST" ? await bodyHead(res, REFUSAL_BODY_MAX) : void (await res.body?.cancel().catch(() => undefined));
|
|
343
|
+
const reask = res.status === 401 ? await carrier.rejected(pieces, signal) : undefined;
|
|
344
|
+
throw new PeerAuthorizationRefused(res.status === 401 ? "rejected" : "scope", {
|
|
345
|
+
...(resourceMetadataUrl !== undefined ? { resourceMetadataUrl } : {}),
|
|
346
|
+
...(reask?.authorizeUrl !== undefined ? { authorizeUrl: reask.authorizeUrl } : {}),
|
|
347
|
+
renewed: reask?.renewed === true,
|
|
348
|
+
...(body !== undefined ? { body } : {}),
|
|
349
|
+
});
|
|
350
|
+
};
|
|
351
|
+
}
|
|
352
|
+
export const RETIRED_VALUE_MEMBERS = Object.freeze({ mcp: Object.freeze([Object.freeze(["transport", "headers"]), Object.freeze(["transport", "env"])]), a2a: Object.freeze([Object.freeze(["headers"])]) });
|
|
353
|
+
export function retiredValueMember(copy, at) {
|
|
354
|
+
for (const path of RETIRED_VALUE_MEMBERS[at]) {
|
|
355
|
+
let holder = copy;
|
|
356
|
+
for (const key of path.slice(0, -1))
|
|
357
|
+
holder = typeof holder === "object" && holder !== null && Object.hasOwn(holder, key) ? holder[key] : undefined;
|
|
358
|
+
const last = path[path.length - 1];
|
|
359
|
+
if (typeof holder === "object" && holder !== null && Object.hasOwn(holder, last) && holder[last] !== undefined)
|
|
360
|
+
return path;
|
|
361
|
+
}
|
|
362
|
+
return undefined;
|
|
363
|
+
}
|
|
364
|
+
export const CREDENTIALS_MEMBER = Object.freeze({ mcp: Object.freeze(["transport", "credentials"]), a2a: Object.freeze(["credentials"]) });
|
|
365
|
+
export function declaredCredentials(copy, at) {
|
|
366
|
+
let value = copy;
|
|
367
|
+
for (const key of CREDENTIALS_MEMBER[at])
|
|
368
|
+
value = typeof value === "object" && value !== null && Object.hasOwn(value, key) ? value[key] : undefined;
|
|
369
|
+
if (value === undefined)
|
|
370
|
+
return {};
|
|
371
|
+
const read = readCredentialRef(value);
|
|
372
|
+
if (read.ok)
|
|
373
|
+
return { ref: read.ref };
|
|
374
|
+
const p = read.problem;
|
|
375
|
+
return { problem: `${p.reason}${"kind" in p && p.kind !== undefined ? ` (kind ${JSON.stringify(p.kind)})` : ""}${"field" in p ? ` at ${JSON.stringify(p.field)}` : ""}` };
|
|
376
|
+
}
|
|
377
|
+
export function peerSeatMissing(subject, credentials, seat) {
|
|
378
|
+
if (credentials === undefined || seat !== undefined)
|
|
379
|
+
return undefined;
|
|
380
|
+
return Object.assign(new Error(`${subject} declares a credential reference (kind "${credentials.kind}") but the deployment wires no peer seat (RunnerDeps.peerSeat) to answer it — not dialed`), { code: "config.peer_seat_missing" });
|
|
381
|
+
}
|
|
382
|
+
export function mcpPeerTarget(spec, kind) {
|
|
383
|
+
const t = spec.transport;
|
|
384
|
+
const fingerprint = typeof spec.fingerprint === "string" ? { fingerprint: spec.fingerprint } : {};
|
|
385
|
+
const credentials = t.credentials !== undefined ? { credentials: t.credentials } : {};
|
|
386
|
+
if (kind === "stdio" && "command" in t)
|
|
387
|
+
return { protocol: "mcp", server: spec.name, transport: "stdio", command: t.command, args: [...(t.args ?? [])], ...credentials, ...fingerprint };
|
|
388
|
+
return { protocol: "mcp", server: spec.name, transport: "http", url: "url" in t ? t.url : "", ...credentials, ...fingerprint };
|
|
389
|
+
}
|
|
390
|
+
export function answeredUnauthorized(err) {
|
|
391
|
+
let at = err;
|
|
392
|
+
for (let depth = 0; depth < 6 && at instanceof Error; depth++) {
|
|
393
|
+
if (at instanceof StreamableHTTPError && at.code === 401)
|
|
394
|
+
return true;
|
|
395
|
+
at = at.cause;
|
|
396
|
+
}
|
|
397
|
+
return false;
|
|
398
|
+
}
|
|
399
|
+
export class Reauthorized {
|
|
400
|
+
error;
|
|
401
|
+
constructor(error) {
|
|
402
|
+
this.error = error;
|
|
403
|
+
}
|
|
404
|
+
}
|
|
405
|
+
export async function sentOnceMore(attempt, mayResend) {
|
|
406
|
+
const first = await attempt(false);
|
|
407
|
+
if (!(first instanceof Reauthorized))
|
|
408
|
+
return first;
|
|
409
|
+
if (!mayResend())
|
|
410
|
+
throw first.error;
|
|
411
|
+
const again = await attempt(true).catch((err) => {
|
|
412
|
+
const details = readMember(err, "details");
|
|
413
|
+
throw typeof details === "object" && details !== null && readMember(details, "delivered") === "no" ? first.error : err;
|
|
414
|
+
});
|
|
415
|
+
if (again instanceof Reauthorized)
|
|
416
|
+
throw again.error;
|
|
417
|
+
return again;
|
|
418
|
+
}
|
|
419
|
+
const IN_FLIGHT = new WeakMap();
|
|
420
|
+
export function inFlight(client, run) {
|
|
421
|
+
let calls = IN_FLIGHT.get(client);
|
|
422
|
+
if (calls === undefined)
|
|
423
|
+
IN_FLIGHT.set(client, (calls = new Set()));
|
|
424
|
+
const call = run();
|
|
425
|
+
const held = call.then(() => undefined, () => undefined);
|
|
426
|
+
calls.add(held);
|
|
427
|
+
void held.then(() => calls.delete(held));
|
|
428
|
+
return call;
|
|
429
|
+
}
|
|
430
|
+
export async function settledInFlight(client) {
|
|
431
|
+
await Promise.all([...(IN_FLIGHT.get(client) ?? [])]);
|
|
432
|
+
}
|
|
433
|
+
const CARRIERS = new WeakMap();
|
|
434
|
+
export function recordCarrier(client, carrier) {
|
|
435
|
+
CARRIERS.set(client, carrier);
|
|
436
|
+
}
|
|
437
|
+
export function carrierOf(client) {
|
|
438
|
+
return CARRIERS.get(client);
|
|
439
|
+
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { randomBytes } from "node:crypto";
|
|
2
|
-
import { COMMAND_RULE_TOOL, cardRuleFormOf, escapeForDisclosure, hasUnrenderableCharacters, parseRuleText, ruleAdmitsCommand, ruleBreadthWarningsOf, segmentCoverageOf, suggestRuleForHost, suggestRuleForName, suggestRuleForTool, suggestRulesForCommand, EDITED_RULE_BREADTH_WARNING_CODES, RULE_OFFER_KINDS, UNCOVERED_SEGMENT_REASONS, RULE_BEHAVIORS, RULE_BEHAVIOR_PRECEDENCE, isRuleBehavior, } from "./permission-rule-model.js";
|
|
2
|
+
import { COMMAND_RULE_TOOL, cardRuleFormOf, escapeForDisclosure, foldSpacing, hasUnrenderableCharacters, parseRuleText, ruleAdmitsCommand, ruleBreadthWarningsOf, segmentCoverageOf, suggestRuleForHost, suggestRuleForName, suggestRuleForTool, suggestRulesForCommand, EDITED_RULE_BREADTH_WARNING_CODES, RULE_OFFER_KINDS, UNCOVERED_SEGMENT_REASONS, RULE_BEHAVIORS, RULE_BEHAVIOR_PRECEDENCE, isRuleBehavior, } from "./permission-rule-model.js";
|
|
3
3
|
import { readRuleOwner, sameRuleOwner } from "./rule-owner.js";
|
|
4
4
|
import { principalNameOf, readPrincipal } from "./principal-name.js";
|
|
5
5
|
import { isPlainRecord } from "./mods/kernel/receive.js";
|
|
@@ -535,12 +535,18 @@ export async function confirmRuleApproval(opts) {
|
|
|
535
535
|
return settled === chosen ? { ok: true } : no("selection_mismatch");
|
|
536
536
|
}
|
|
537
537
|
function normalizeEditedSpelling(text) {
|
|
538
|
-
const m = /^([A-Za-z][A-Za-z0-9_]*)\((.+)
|
|
538
|
+
const m = /^([A-Za-z][A-Za-z0-9_]*)\((.+)\)$/.exec(text);
|
|
539
539
|
if (m === null)
|
|
540
540
|
return text;
|
|
541
541
|
const head = m[1];
|
|
542
|
-
const
|
|
543
|
-
if (head === undefined ||
|
|
542
|
+
const content = m[2];
|
|
543
|
+
if (head === undefined || content === undefined)
|
|
544
|
+
return text;
|
|
545
|
+
const read = head === COMMAND_RULE_TOOL ? foldSpacing(content) : content;
|
|
546
|
+
if (read === undefined)
|
|
547
|
+
return text;
|
|
548
|
+
const body = /^(.+) \*$/.exec(read)?.[1];
|
|
549
|
+
if (body === undefined || body.includes("*"))
|
|
544
550
|
return text;
|
|
545
551
|
return `${head}(${body}:*)`;
|
|
546
552
|
}
|
|
@@ -628,6 +628,22 @@ export declare const SHELL_RESERVED_WORDS: ReadonlySet<string>;
|
|
|
628
628
|
* misled.
|
|
629
629
|
*/
|
|
630
630
|
export declare const SUGGESTION_LEXICON: readonly string[];
|
|
631
|
+
/**
|
|
632
|
+
* Collapse space/tab runs that are OUTSIDE quotes, and refuse a command whose quoting does not balance.
|
|
633
|
+
*
|
|
634
|
+
* A blanket fold is unsound here, and unsound in the direction that matters: an exact approval of
|
|
635
|
+
* `rm 'safe file'` would be stored as `rm 'safe file'` and would then admit a command naming a
|
|
636
|
+
* DIFFERENT path. An exact rule has exactly one job — to mean the action the person approved — so
|
|
637
|
+
* whitespace inside a quoted argument is data and is preserved verbatim.
|
|
638
|
+
*
|
|
639
|
+
* Unbalanced quoting yields `undefined`: the command's real argv is then not determinable from the text,
|
|
640
|
+
* and a rule lane that cannot determine what it is looking at does not match. It treats a backslash as text: a matched
|
|
641
|
+
* command has passed the simple-command floor (which rejects backslashes) before it is folded, and a rule text that holds
|
|
642
|
+
* one (a pattern's `\*` aside) is refused by that floor after its form is read.
|
|
643
|
+
*
|
|
644
|
+
* Exported so the card-edit face's spelling normalizer reads a command rule's content through THIS fold and no second one.
|
|
645
|
+
*/
|
|
646
|
+
export declare function foldSpacing(s: string): string | undefined;
|
|
631
647
|
/**
|
|
632
648
|
* THE spelling of a content rule on a call's tool under one behavior — its rule word and grammar with a placeholder for the
|
|
633
649
|
* content, never a rule minted for the call — or undefined: the tool takes no content rule (the catalog gives it no grammar,
|
|
@@ -14,6 +14,25 @@ export declare const ENTER_PLAN_MODE_TOOL_NAME = "EnterPlanMode";
|
|
|
14
14
|
* Exit is via `present_plan` (→ plan_review → human approve-resume), not by this tool.
|
|
15
15
|
*/
|
|
16
16
|
export declare function createEnterPlanModeTool(enterPlanMode: () => Promise<void> | void): ToolSpec;
|
|
17
|
+
/** The plan file a leg declared (`TaskSpec.planFile`), as the plan-exit tool's file arm reads it: the declared spelling (the
|
|
18
|
+
* card's `filePath`), the same path as the seat tells it to the model (`shown` — `planFileShown`, one line, verbatim, at
|
|
19
|
+
* most 4096 characters: the seat refuses any other), and the seat's one reader of what the file holds (`readPlanFile`,
|
|
20
|
+
* advertised-writable-dirs.ts). Type-only import: this module is below the seat and must not load it. */
|
|
21
|
+
export interface PlanFileSource {
|
|
22
|
+
readonly path: string;
|
|
23
|
+
readonly shown: string;
|
|
24
|
+
readonly read: (signal?: AbortSignal) => Promise<import("./runner/advertised-writable-dirs.js").PlanFileReading>;
|
|
25
|
+
}
|
|
26
|
+
/**
|
|
27
|
+
* What the engine's plan-pause request primitive takes: the requester's own `reason`, and `requestedByCallId` — the id of
|
|
28
|
+
* the call that asks, which the ENGINE binds from that call's own context (the first-party tool passes its ctx's
|
|
29
|
+
* `toolCallId`; a caller tool's `ctx.requestReview` is wrapped per call), never a tool-supplied argument. Parked on the
|
|
30
|
+
* `plan_review` row as provenance: which call presented the plan awaiting a decision.
|
|
31
|
+
*/
|
|
32
|
+
export interface ReviewRequest {
|
|
33
|
+
reason?: string;
|
|
34
|
+
requestedByCallId?: string;
|
|
35
|
+
}
|
|
17
36
|
/**
|
|
18
37
|
* design/80 D-B — the first-party `present_plan` tool (CC `ExitPlanMode` parity). A THIN composition over the
|
|
19
38
|
* general `ctx.requestReview()` primitive: the model calls it with a plan; the tool returns the plan as its
|
|
@@ -22,6 +41,4 @@ export declare function createEnterPlanModeTool(enterPlanMode: () => Promise<voi
|
|
|
22
41
|
* NO side effect (`effect:"read"`); the actual pause/mint is the engine's, gated on a wired `checkpointStore`.
|
|
23
42
|
* `requestReview` is the prepare-task closure (the same primitive `ctx.requestReview` exposes to caller tools).
|
|
24
43
|
*/
|
|
25
|
-
export declare function createPresentPlanTool(requestReview: (opts?:
|
|
26
|
-
reason?: string;
|
|
27
|
-
}) => void): ToolSpec;
|
|
44
|
+
export declare function createPresentPlanTool(requestReview: (opts?: ReviewRequest) => void, planFile?: PlanFileSource): ToolSpec;
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { Type } from "typebox";
|
|
2
|
-
import { delimitUntrusted } from "./untrusted-text.js";
|
|
2
|
+
import { delimitUntrusted, inlineUntrusted } from "./untrusted-text.js";
|
|
3
3
|
import { mountRuleFace, toolFace } from "./tool-catalog-entries.js";
|
|
4
|
+
import { errorResult } from "./tools.js";
|
|
5
|
+
const READ_REASON_MAX = 600;
|
|
4
6
|
export const PRESENT_PLAN_TOOL_NAME = "ExitPlanMode";
|
|
5
7
|
export const ENTER_PLAN_MODE_TOOL_NAME = "EnterPlanMode";
|
|
6
8
|
const ENTER_PLAN_MODE_DESCRIPTION = `Enter PLAN MODE (read-only): stop making changes and switch to exploration/planning. For the rest of this run, every write/edit/mutating tool call ASKS the user first ("Cannot write to <path> while in plan mode."; where nobody can answer, it is refused) while read-only tools (Read, Grep, Glob, etc.) still work. When your plan is ready, call ${PRESENT_PLAN_TOOL_NAME} with it — the run PAUSES for a human to approve it, then continues (read-only lifted) so you can execute.
|
|
@@ -59,7 +61,49 @@ const PRESENT_PLAN_DESCRIPTION = [
|
|
|
59
61
|
"If the plan is approved, the run continues (and any read-only restriction is lifted) so you can execute it;",
|
|
60
62
|
"if it is rejected or edited, follow the reviewer's feedback instead of the original plan.",
|
|
61
63
|
].join(" ");
|
|
62
|
-
|
|
64
|
+
const PRESENT_PLAN_FILE_DESCRIPTION = (shown) => `Use this tool when you are in plan mode and have finished writing your plan to the plan file and are ready for user approval.
|
|
65
|
+
|
|
66
|
+
## How This Tool Works
|
|
67
|
+
- You should have already written your plan to the plan file: ${shown}
|
|
68
|
+
- This tool does NOT take the plan content as a parameter - it will read the plan from the file you wrote
|
|
69
|
+
- This tool simply signals that you're done planning and ready for the user to review and approve; the run PAUSES for a human to approve, edit, or reject it
|
|
70
|
+
- The user will see the contents of your plan file when they review it
|
|
71
|
+
|
|
72
|
+
## When to Use This Tool
|
|
73
|
+
IMPORTANT: Only use this tool when the task requires planning the implementation steps of a task that requires writing code. For research tasks where you're gathering information, searching files, reading files or in general trying to understand the codebase - do NOT use this tool.
|
|
74
|
+
|
|
75
|
+
## Before Using This Tool
|
|
76
|
+
Ensure your plan is complete and unambiguous:
|
|
77
|
+
- If you have unresolved questions about requirements or approach, resolve them first (in earlier phases)
|
|
78
|
+
- Once your plan is finalized, use THIS tool to request approval
|
|
79
|
+
|
|
80
|
+
**Important:** Do NOT separately ask "Is this plan okay?" or "Should I proceed?" - that's exactly what THIS tool does. ExitPlanMode inherently requests user approval of your plan.`;
|
|
81
|
+
function createPresentPlanFileTool(requestReview, planFile) {
|
|
82
|
+
return {
|
|
83
|
+
name: PRESENT_PLAN_TOOL_NAME,
|
|
84
|
+
...toolFace("exit-plan-mode-file"),
|
|
85
|
+
ruleFace: mountRuleFace("exit-plan-mode-file"),
|
|
86
|
+
description: PRESENT_PLAN_FILE_DESCRIPTION(planFile.shown),
|
|
87
|
+
parameters: Type.Object({}),
|
|
88
|
+
execute: async (_args, ctx) => {
|
|
89
|
+
const read = await planFile.read(ctx?.signal);
|
|
90
|
+
if (!read.ok)
|
|
91
|
+
return errorResult(`The plan file ${planFile.shown} could not be read (${inlineUntrusted(read.reason, READ_REASON_MAX)}), so plan mode was not exited. Write your plan to this file and call ExitPlanMode again.`);
|
|
92
|
+
if (read.text === undefined)
|
|
93
|
+
return errorResult(`No plan file found at ${planFile.shown}. Please write your plan to this file before calling ExitPlanMode.`);
|
|
94
|
+
const plan = read.text;
|
|
95
|
+
requestReview({ reason: "ExitPlanMode" });
|
|
96
|
+
return {
|
|
97
|
+
content: `Plan presented for human review (from ${planFile.shown}):\n\n${delimitUntrusted("plan", plan)}\n\n` +
|
|
98
|
+
"(The run is pausing for approval — you will continue once the plan is approved, edited, or rejected.)",
|
|
99
|
+
details: { type: "exit-plan-mode", plan, isAgent: false, filePath: planFile.path },
|
|
100
|
+
};
|
|
101
|
+
},
|
|
102
|
+
};
|
|
103
|
+
}
|
|
104
|
+
export function createPresentPlanTool(requestReview, planFile) {
|
|
105
|
+
if (planFile !== undefined)
|
|
106
|
+
return createPresentPlanFileTool(requestReview, planFile);
|
|
63
107
|
return {
|
|
64
108
|
name: PRESENT_PLAN_TOOL_NAME,
|
|
65
109
|
...toolFace("exit-plan-mode"),
|
|
@@ -70,9 +114,9 @@ export function createPresentPlanTool(requestReview) {
|
|
|
70
114
|
description: "Your full proposed plan, in markdown. The human reviewer approves / edits / rejects it before you act.",
|
|
71
115
|
}),
|
|
72
116
|
}),
|
|
73
|
-
execute: async (args) => {
|
|
117
|
+
execute: async (args, ctx) => {
|
|
74
118
|
const { plan } = args;
|
|
75
|
-
requestReview({ reason: "ExitPlanMode" });
|
|
119
|
+
requestReview({ reason: "ExitPlanMode", ...(typeof ctx?.toolCallId === "string" && ctx.toolCallId !== "" ? { requestedByCallId: ctx.toolCallId } : {}) });
|
|
76
120
|
return {
|
|
77
121
|
content: `Plan presented for human review:\n\n${delimitUntrusted("plan", plan)}\n\n` +
|
|
78
122
|
"(The run is pausing for approval — you will continue once the plan is approved, edited, or rejected.)",
|