@sema-agent/core 7.66.0 → 7.67.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 +3498 -0
- package/LICENSE +2 -1
- package/dist/agents/agent-definition.js +2 -1
- package/dist/agents/agent-transcript-tool.d.ts +1 -1
- package/dist/agents/agent-transcript-tool.js +4 -3
- package/dist/agents/builtin-agents.d.ts +10 -7
- package/dist/agents/builtin-agents.js +1 -0
- package/dist/agents/cascade.d.ts +24 -11
- package/dist/agents/cascade.js +21 -9
- package/dist/agents/child-failure.d.ts +30 -0
- package/dist/agents/child-failure.js +25 -1
- package/dist/agents/composition-placement.d.ts +6 -2
- package/dist/agents/composition-placement.js +7 -3
- package/dist/agents/cross-session-envelope.d.ts +10 -1
- package/dist/agents/cross-session-envelope.js +6 -2
- package/dist/agents/cross-session-judge.d.ts +7 -1
- package/dist/agents/cross-session-judge.js +1 -0
- package/dist/agents/cumulative-stats.d.ts +36 -2
- package/dist/agents/cumulative-stats.js +44 -9
- package/dist/agents/delegation-registry-seat.js +2 -3
- package/dist/agents/inherited-tool-pool.d.ts +9 -4
- package/dist/agents/inherited-tool-pool.js +7 -1
- package/dist/agents/leg-label.d.ts +28 -0
- package/dist/agents/leg-label.js +9 -0
- package/dist/agents/list-agents-tool.d.ts +1 -1
- package/dist/agents/list-agents-tool.js +4 -4
- package/dist/agents/org-delivery-gate.d.ts +129 -23
- package/dist/agents/org-delivery-gate.js +41 -20
- package/dist/agents/peer-held-queue.d.ts +15 -10
- package/dist/agents/peer-held-queue.js +47 -19
- package/dist/agents/peer-notice-route.js +2 -2
- package/dist/agents/peer-notices.d.ts +13 -2
- package/dist/agents/peer-notices.js +12 -2
- package/dist/agents/peer-session-drain.d.ts +65 -15
- package/dist/agents/peer-session-drain.js +198 -41
- package/dist/agents/read-inbox-tool.d.ts +3 -2
- package/dist/agents/read-inbox-tool.js +7 -5
- package/dist/agents/repair-loop.js +20 -16
- package/dist/agents/retain-ledger.d.ts +1 -1
- package/dist/agents/retain-ledger.js +2 -4
- package/dist/agents/root-session-lane.d.ts +27 -0
- package/dist/agents/root-session-lane.js +57 -0
- package/dist/agents/roster-store.js +1 -2
- package/dist/agents/send-message-tool.js +6 -4
- package/dist/agents/subagent.d.ts +20 -4
- package/dist/agents/subagent.js +218 -183
- package/dist/agents/tool-filter.d.ts +3 -10
- package/dist/agents/tool-filter.js +0 -13
- package/dist/agents/verifier-independence.d.ts +31 -0
- package/dist/agents/verifier-independence.js +23 -0
- package/dist/agents/verify.d.ts +23 -11
- package/dist/agents/verify.js +28 -12
- package/dist/agents/yield-adoption.d.ts +24 -0
- package/dist/agents/yield-adoption.js +84 -0
- package/dist/bench/metrics.d.ts +2 -2
- package/dist/brain/anthropic.d.ts +4 -2
- package/dist/brain/anthropic.js +49 -35
- package/dist/brain/brain-faces.d.ts +11 -0
- package/dist/brain/brain-faces.js +6 -0
- package/dist/brain/cache-retention.d.ts +2 -0
- package/dist/brain/cache-retention.js +9 -0
- package/dist/brain/circuit-breaker.js +51 -26
- package/dist/brain/errors.d.ts +15 -1
- package/dist/brain/errors.js +8 -0
- package/dist/brain/failover.d.ts +6 -0
- package/dist/brain/failover.js +52 -37
- package/dist/brain/media-degrade.d.ts +5 -0
- package/dist/brain/media-degrade.js +4 -0
- package/dist/brain/model-capability.d.ts +2 -1
- package/dist/brain/model-lane.d.ts +145 -0
- package/dist/brain/model-lane.js +444 -0
- package/dist/brain/open-responses.js +19 -22
- package/dist/brain/openai.js +23 -22
- package/dist/brain/provider-message.d.ts +9 -0
- package/dist/brain/provider-message.js +18 -0
- package/dist/brain/reasoning-request.d.ts +9 -7
- package/dist/brain/reasoning-request.js +9 -10
- package/dist/brain/reasoning.d.ts +47 -13
- package/dist/brain/reasoning.js +20 -10
- package/dist/brain/route-adjudicator.d.ts +8 -2
- package/dist/brain/route-adjudicator.js +35 -1
- package/dist/brain/route-conformance.js +17 -0
- package/dist/brain/routing.d.ts +2 -0
- package/dist/brain/routing.js +19 -8
- package/dist/brain/status-sink.d.ts +5 -4
- package/dist/brain/status-sink.js +2 -2
- package/dist/brain/stream-engine.js +8 -2
- package/dist/brain/stream-shared.d.ts +12 -0
- package/dist/brain/stream-shared.js +18 -0
- package/dist/brain/timeout.d.ts +28 -0
- package/dist/brain/timeout.js +13 -4
- package/dist/brain/tool-schema-projection.d.ts +2 -0
- package/dist/brain/tool-schema-projection.js +108 -0
- package/dist/brain/usage-reading.d.ts +49 -0
- package/dist/brain/usage-reading.js +44 -0
- package/dist/brain/usage-reasoning.d.ts +38 -0
- package/dist/brain/usage-reasoning.js +9 -0
- package/dist/config/catalog.d.ts +3 -0
- package/dist/config/catalog.js +18 -9
- package/dist/core/a2a.d.ts +22 -4
- package/dist/core/a2a.js +191 -50
- package/dist/core/agent-definition.d.ts +3 -1
- package/dist/core/agent-state.d.ts +29 -16
- package/dist/core/agent-state.js +36 -9
- package/dist/core/allow-entry.d.ts +12 -3
- package/dist/core/allow-entry.js +10 -3
- package/dist/core/approval-display.d.ts +18 -0
- package/dist/core/approval-display.js +26 -0
- package/dist/core/approval-object.js +2 -2
- package/dist/core/approval-route.d.ts +16 -0
- package/dist/core/approval-route.js +5 -0
- package/dist/core/approval-words.d.ts +43 -0
- package/dist/core/approval-words.js +37 -0
- package/dist/core/ask-origin.d.ts +37 -10
- package/dist/core/ask-origin.js +19 -7
- package/dist/core/ask-question.d.ts +36 -8
- package/dist/core/ask-question.js +24 -9
- package/dist/core/ask-unresolvable-notice.d.ts +3 -2
- package/dist/core/ask-unresolvable-notice.js +3 -2
- package/dist/core/attachment-source.d.ts +50 -0
- package/dist/core/attachment-source.js +46 -0
- package/dist/core/auto-compaction.d.ts +151 -40
- package/dist/core/auto-compaction.js +115 -50
- package/dist/core/auto-mode.d.ts +5 -0
- package/dist/core/auto-mode.js +11 -4
- package/dist/core/background-agent-store.d.ts +151 -23
- package/dist/core/background-agent-store.js +201 -61
- package/dist/core/background-shell.d.ts +4 -1
- package/dist/core/background-shell.js +1 -0
- package/dist/core/cache-break-detector.d.ts +49 -25
- package/dist/core/cache-break-detector.js +99 -44
- package/dist/core/caller-text.d.ts +28 -0
- package/dist/core/caller-text.js +12 -0
- package/dist/core/canonical-json.d.ts +5 -0
- package/dist/core/canonical-json.js +7 -0
- package/dist/core/checkpoint-features.d.ts +80 -9
- package/dist/core/checkpoint-features.js +1 -1
- package/dist/core/checkpoint-generation.d.ts +8 -1
- package/dist/core/checkpoint-generation.js +3 -0
- package/dist/core/checkpoint-queries.d.ts +47 -14
- package/dist/core/checkpoint-queries.js +63 -30
- package/dist/core/checkpoint-requirements.d.ts +36 -3
- package/dist/core/checkpoint-requirements.js +11 -1
- package/dist/core/checkpoint-row-verdict.d.ts +0 -2
- package/dist/core/checkpoint-row-verdict.js +5 -8
- package/dist/core/checkpoint-store.d.ts +166 -41
- package/dist/core/checkpoint-store.js +96 -15
- package/dist/core/child-clamp-seats.d.ts +10 -2
- package/dist/core/child-clamp-seats.js +2 -2
- package/dist/core/classifier-unavailable-arm.d.ts +11 -9
- package/dist/core/classifier-unavailable-arm.js +4 -2
- package/dist/core/command-sandbox-dispatch.d.ts +13 -0
- package/dist/core/command-sandbox-dispatch.js +8 -0
- package/dist/core/command-sandbox.d.ts +231 -0
- package/dist/core/command-sandbox.js +344 -0
- package/dist/core/completion-id.d.ts +21 -0
- package/dist/core/completion-id.js +14 -0
- package/dist/core/config-refusal-codes.d.ts +22 -0
- package/dist/core/config-refusal-codes.js +196 -0
- package/dist/core/context-edit.d.ts +26 -0
- package/dist/core/context-edit.js +4 -2
- package/dist/core/context-guard.d.ts +80 -7
- package/dist/core/context-guard.js +126 -25
- package/dist/core/context-settings.d.ts +32 -0
- package/dist/core/context-settings.js +41 -3
- package/dist/core/contract-faces.d.ts +22 -0
- package/dist/core/contract-faces.js +1 -0
- package/dist/core/credential-echo.d.ts +2 -2
- package/dist/core/credential-echo.js +2 -2
- package/dist/core/cross-boundary-taint.d.ts +10 -8
- package/dist/core/decision-receipt.d.ts +3 -2
- package/dist/core/decision-receipt.js +1 -1
- package/dist/core/definition-entry-grammar.d.ts +42 -0
- package/dist/core/definition-entry-grammar.js +15 -0
- package/dist/core/engine-attestation.d.ts +19 -4
- package/dist/core/engine-attestation.js +4 -0
- package/dist/core/engine-capabilities.d.ts +8 -1
- package/dist/core/engine-capabilities.js +1 -1
- package/dist/core/engine-contracts/open-face-contract.d.ts +39 -0
- package/dist/core/engine-contracts/open-face-contract.js +57 -0
- package/dist/core/engine-notice.d.ts +161 -33
- package/dist/core/exclusive-temp.d.ts +25 -0
- package/dist/core/exclusive-temp.js +19 -0
- package/dist/core/existing-target.d.ts +112 -0
- package/dist/core/existing-target.js +88 -0
- package/dist/core/file-history-store.d.ts +14 -6
- package/dist/core/gate-lanes.js +8 -3
- package/dist/core/gate-outcome.d.ts +2 -1
- package/dist/core/git-worktree-env.d.ts +92 -1
- package/dist/core/git-worktree-env.js +87 -6
- package/dist/core/governance-codes.d.ts +49 -8
- package/dist/core/governance-codes.js +59 -8
- package/dist/core/hands-band.d.ts +10 -6
- package/dist/core/hooks.d.ts +60 -6
- package/dist/core/hooks.js +10 -2
- package/dist/core/host-floor.d.ts +24 -8
- package/dist/core/host-floor.js +45 -16
- package/dist/core/human-input-projection.d.ts +7 -0
- package/dist/core/human-input-projection.js +11 -3
- package/dist/core/image-admission.d.ts +16 -4
- package/dist/core/image-admission.js +29 -17
- package/dist/core/input-author.d.ts +43 -1
- package/dist/core/input-author.js +19 -0
- package/dist/core/isolation-scope.d.ts +41 -0
- package/dist/core/isolation-scope.js +10 -0
- package/dist/core/json-schema-seats.d.ts +11 -0
- package/dist/core/json-schema-seats.js +5 -0
- package/dist/core/leg-identity.d.ts +53 -5
- package/dist/core/leg-identity.js +32 -1
- package/dist/core/locked-config.d.ts +33 -38
- package/dist/core/locked-config.js +21 -3
- package/dist/core/lsp.js +2 -1
- package/dist/core/mailbox-store.d.ts +111 -18
- package/dist/core/mailbox-store.js +101 -13
- package/dist/core/mcp-call-meta.js +1 -1
- package/dist/core/mcp-connection-pool.d.ts +8 -2
- package/dist/core/mcp-connection-pool.js +3 -1
- package/dist/core/mcp-failure.d.ts +6 -1
- package/dist/core/mcp-failure.js +10 -0
- package/dist/core/mcp-host-read.d.ts +293 -0
- package/dist/core/mcp-host-read.js +428 -0
- package/dist/core/mcp-server-link.d.ts +28 -6
- package/dist/core/mcp-server-link.js +35 -7
- package/dist/core/mcp-server-spec.d.ts +22 -29
- package/dist/core/mcp-server-spec.js +7 -14
- package/dist/core/mcp-server-unavailable-notice.d.ts +32 -0
- package/dist/core/mcp-server-unavailable-notice.js +15 -0
- package/dist/core/mcp-session-end.d.ts +5 -2
- package/dist/core/mcp-session-end.js +7 -2
- package/dist/core/mcp-tool-meta.d.ts +6 -0
- package/dist/core/mcp-tool-meta.js +1 -0
- package/dist/core/mcp.d.ts +54 -19
- package/dist/core/mcp.js +194 -241
- package/dist/core/memory-engine/committed-shadow-read.d.ts +16 -0
- package/dist/core/memory-engine/committed-shadow-read.js +21 -0
- package/dist/core/memory-engine/consolidation-driver.js +2 -1
- package/dist/core/memory-engine/consolidation.d.ts +3 -3
- package/dist/core/memory-engine/control-objects.d.ts +4 -3
- package/dist/core/memory-engine/control-objects.js +6 -4
- package/dist/core/memory-engine/delegation-settlement.d.ts +127 -25
- package/dist/core/memory-engine/delegation-settlement.js +145 -18
- package/dist/core/memory-engine/distiller.d.ts +2 -1
- package/dist/core/memory-engine/distiller.js +10 -5
- package/dist/core/memory-engine/dual-root.js +2 -2
- package/dist/core/memory-engine/engine.d.ts +127 -33
- package/dist/core/memory-engine/engine.js +774 -323
- package/dist/core/memory-engine/entry-scan.d.ts +3 -0
- package/dist/core/memory-engine/entry-scan.js +8 -0
- package/dist/core/memory-engine/export-bundle.d.ts +4 -0
- package/dist/core/memory-engine/export-bundle.js +2 -0
- package/dist/core/memory-engine/file-backend.d.ts +62 -17
- package/dist/core/memory-engine/file-backend.js +155 -99
- package/dist/core/memory-engine/index.d.ts +1 -1
- package/dist/core/memory-engine/index.js +1 -1
- package/dist/core/memory-engine/layer-observations.d.ts +7 -1
- package/dist/core/memory-engine/layer-observations.js +6 -0
- package/dist/core/memory-engine/layout.d.ts +88 -26
- package/dist/core/memory-engine/layout.js +105 -29
- package/dist/core/memory-engine/memory-deployment.js +4 -4
- package/dist/core/memory-engine/mount-failed-notice.d.ts +24 -0
- package/dist/core/memory-engine/mount-failed-notice.js +22 -0
- package/dist/core/memory-engine/origin-clearance.d.ts +15 -1
- package/dist/core/memory-engine/origin-clearance.js +30 -10
- package/dist/core/memory-engine/scan.js +1 -1
- package/dist/core/memory-engine/scope-contract.js +4 -3
- package/dist/core/memory-engine/session-write-home.js +13 -1
- package/dist/core/memory-engine/sync-client.d.ts +1 -1
- package/dist/core/memory-engine/sync-client.js +3 -1
- package/dist/core/memory-engine/tools.d.ts +5 -4
- package/dist/core/memory-engine/tools.js +1 -1
- package/dist/core/memory-engine/types.d.ts +18 -1
- package/dist/core/memory-engine/types.js +1 -0
- package/dist/core/memory.d.ts +1 -1
- package/dist/core/memory.js +2 -6
- package/dist/core/mode-policy.d.ts +8 -1
- package/dist/core/mode-policy.js +6 -2
- package/dist/core/model-fallbacks.d.ts +103 -0
- package/dist/core/model-fallbacks.js +79 -0
- package/dist/core/model-receipt.d.ts +15 -3
- package/dist/core/model-receipt.js +22 -1
- package/dist/core/model-seat.d.ts +1 -1
- package/dist/core/mods/classic-events.d.ts +5 -1
- package/dist/core/mods/dollar.d.ts +47 -2
- package/dist/core/mods/dollar.js +28 -5
- package/dist/core/mods/kernel/budget.d.ts +6 -0
- package/dist/core/mods/kernel/budget.js +6 -0
- package/dist/core/mods/kernel/dispatch.d.ts +23 -2
- package/dist/core/mods/kernel/dispatch.js +104 -15
- package/dist/core/mods/kernel/events.d.ts +18 -1
- package/dist/core/mods/kernel/events.js +7 -6
- package/dist/core/mods/kernel/index.d.ts +2 -2
- package/dist/core/mods/kernel/index.js +1 -1
- package/dist/core/mods/kernel/receive.d.ts +2 -1
- package/dist/core/mods/lifecycle-stations.d.ts +13 -4
- package/dist/core/mods/lifecycle-stations.js +8 -3
- package/dist/core/mods/message-display.d.ts +81 -0
- package/dist/core/mods/message-display.js +369 -0
- package/dist/core/mods/prompt-submit.d.ts +1 -1
- package/dist/core/mods/prompt-submit.js +5 -2
- package/dist/core/mods/session-append.d.ts +2 -2
- package/dist/core/mods/session-append.js +2 -1
- package/dist/core/mods/session-compact.js +2 -2
- package/dist/core/mods/stations.d.ts +48 -18
- package/dist/core/mods/stations.js +100 -19
- package/dist/core/mods/stop-answers.d.ts +23 -0
- package/dist/core/mods/stop-answers.js +20 -0
- package/dist/core/mounted-mcp.d.ts +48 -8
- package/dist/core/mounted-mcp.js +82 -16
- package/dist/core/namespaced-rule-name.js +2 -1
- package/dist/core/own-property-receipt.js +3 -5
- package/dist/core/parent-spec-seat.d.ts +20 -1
- package/dist/core/parent-spec-seat.js +13 -3
- package/dist/core/park-selfcheck.js +1 -0
- package/dist/core/path-identity.js +2 -1
- package/dist/core/peer-seat.d.ts +21 -7
- package/dist/core/peer-seat.js +25 -16
- package/dist/core/permission-rule-consent.js +15 -5
- package/dist/core/permission-rule-model.d.ts +4 -2
- package/dist/core/permission-rule-model.js +43 -23
- package/dist/core/permission-rule-store.d.ts +31 -16
- package/dist/core/permission-rule-store.js +27 -18
- package/dist/core/present-plan-tool.d.ts +6 -1
- package/dist/core/present-plan-tool.js +11 -3
- package/dist/core/pricing.d.ts +8 -6
- package/dist/core/pricing.js +1 -1
- package/dist/core/principal-name.d.ts +13 -0
- package/dist/core/principal-name.js +9 -2
- package/dist/core/process-identity.d.ts +140 -0
- package/dist/core/process-identity.js +215 -0
- package/dist/core/protocol-http-auth.d.ts +28 -6
- package/dist/core/protocol-http-auth.js +22 -5
- package/dist/core/protocol-naming.d.ts +7 -0
- package/dist/core/protocol-naming.js +12 -2
- package/dist/core/protocol-revocation.d.ts +72 -0
- package/dist/core/protocol-revocation.js +98 -0
- package/dist/core/protocol-table.d.ts +4 -4
- package/dist/core/protocol-table.js +3 -2
- package/dist/core/push-queue.d.ts +35 -2
- package/dist/core/push-queue.js +60 -4
- package/dist/core/read-only-shell.d.ts +19 -0
- package/dist/core/read-only-shell.js +38 -11
- package/dist/core/real-approval.d.ts +26 -0
- package/dist/core/real-approval.js +15 -0
- package/dist/core/redaction-marks.d.ts +6 -2
- package/dist/core/redaction-marks.js +3 -0
- package/dist/core/reminder-mint.d.ts +6 -0
- package/dist/core/reminder-mint.js +9 -8
- package/dist/core/remote-env.d.ts +31 -15
- package/dist/core/remote-env.js +29 -0
- package/dist/core/request-copy-projection.d.ts +51 -0
- package/dist/core/request-copy-projection.js +410 -0
- package/dist/core/resume-config-judge.d.ts +69 -0
- package/dist/core/resume-config-judge.js +78 -0
- package/dist/core/resume-startup-cause.d.ts +14 -4
- package/dist/core/resume-startup-cause.js +12 -2
- package/dist/core/retention-policy.js +2 -1
- package/dist/core/retention.d.ts +119 -24
- package/dist/core/retention.js +60 -16
- package/dist/core/retired-keys.d.ts +0 -10
- package/dist/core/retired-keys.js +2 -3
- package/dist/core/roles.d.ts +6 -0
- package/dist/core/roles.js +65 -4
- package/dist/core/row-shape.d.ts +149 -0
- package/dist/core/row-shape.js +184 -0
- package/dist/core/runner/advertised-writable-dirs.js +10 -9
- package/dist/core/runner/advisor-instructions.d.ts +11 -27
- package/dist/core/runner/advisor-instructions.js +18 -20
- package/dist/core/runner/advisor-tool.js +1 -0
- package/dist/core/runner/announce-once-ledger.js +4 -1
- package/dist/core/runner/approval-feedback.d.ts +17 -8
- package/dist/core/runner/approval-feedback.js +18 -13
- package/dist/core/runner/approver-defect-announcer.d.ts +17 -0
- package/dist/core/runner/approver-defect-announcer.js +22 -0
- package/dist/core/runner/assemble-result.d.ts +29 -14
- package/dist/core/runner/assemble-result.js +16 -25
- package/dist/core/runner/cache-hit-account.d.ts +77 -0
- package/dist/core/runner/cache-hit-account.js +46 -0
- package/dist/core/runner/call-hook-stations.d.ts +3 -2
- package/dist/core/runner/call-hook-stations.js +5 -4
- package/dist/core/runner/changed-files-scan.d.ts +43 -0
- package/dist/core/runner/changed-files-scan.js +34 -0
- package/dist/core/runner/checkpoint-scope.d.ts +33 -9
- package/dist/core/runner/checkpoint-scope.js +27 -1
- package/dist/core/runner/classifier-ladder.d.ts +2 -2
- package/dist/core/runner/classifier-ladder.js +18 -9
- package/dist/core/runner/clock-and-limits.d.ts +15 -4
- package/dist/core/runner/clock-and-limits.js +19 -1
- package/dist/core/runner/compact-session.js +84 -14
- package/dist/core/runner/compaction-call-options.d.ts +2 -29
- package/dist/core/runner/compaction-call-options.js +2 -9
- package/dist/core/runner/compaction-restate.d.ts +18 -2
- package/dist/core/runner/compaction-restate.js +36 -2
- package/dist/core/runner/construction-doors.js +8 -0
- package/dist/core/runner/context-room.d.ts +55 -0
- package/dist/core/runner/context-room.js +71 -0
- package/dist/core/runner/contracts.d.ts +313 -205
- package/dist/core/runner/conversation-segment.d.ts +49 -14
- package/dist/core/runner/conversation-segment.js +92 -19
- package/dist/core/runner/cross-boundary-lane.d.ts +4 -0
- package/dist/core/runner/cross-boundary-lane.js +9 -6
- package/dist/core/runner/decide-continuation.js +1 -1
- package/dist/core/runner/deferred-ask.d.ts +62 -0
- package/dist/core/runner/deferred-ask.js +44 -0
- package/dist/core/runner/delegation-owner.d.ts +19 -0
- package/dist/core/runner/delegation-owner.js +27 -1
- package/dist/core/runner/denial-limit-arms.d.ts +10 -6
- package/dist/core/runner/denial-limit-arms.js +13 -7
- package/dist/core/runner/env-capability-census.d.ts +1 -1
- package/dist/core/runner/file-history-request.js +2 -1
- package/dist/core/runner/file-history-restore.d.ts +16 -2
- package/dist/core/runner/file-history-restore.js +9 -1
- package/dist/core/runner/gate-exit.d.ts +18 -5
- package/dist/core/runner/gate-exit.js +26 -15
- package/dist/core/runner/git-status-frame.d.ts +26 -8
- package/dist/core/runner/git-status-frame.js +14 -9
- package/dist/core/runner/halt-attribution.d.ts +29 -12
- package/dist/core/runner/halt-attribution.js +38 -11
- package/dist/core/runner/image.js +3 -2
- package/dist/core/runner/initial-run-state.d.ts +1 -1
- package/dist/core/runner/initial-run-state.js +4 -4
- package/dist/core/runner/language-frame.d.ts +66 -0
- package/dist/core/runner/language-frame.js +76 -0
- package/dist/core/runner/leg-frame.d.ts +81 -0
- package/dist/core/runner/leg-frame.js +68 -0
- package/dist/core/runner/main-call-account.d.ts +34 -0
- package/dist/core/runner/main-call-account.js +50 -0
- package/dist/core/runner/mcp-redial.d.ts +9 -7
- package/dist/core/runner/mcp-redial.js +20 -21
- package/dist/core/runner/memory-consolidation-driver.d.ts +2 -0
- package/dist/core/runner/memory-consolidation-driver.js +5 -3
- package/dist/core/runner/messages-omitted-seat.d.ts +2 -0
- package/dist/core/runner/messages-omitted-seat.js +21 -0
- package/dist/core/runner/model-fallback-seat.d.ts +20 -0
- package/dist/core/runner/model-fallback-seat.js +43 -0
- package/dist/core/runner/model-lane-seat.d.ts +12 -0
- package/dist/core/runner/model-lane-seat.js +35 -0
- package/dist/core/runner/nested-memory-content.d.ts +33 -0
- package/dist/core/runner/nested-memory-content.js +171 -0
- package/dist/core/runner/nested-memory-lane.d.ts +181 -0
- package/dist/core/runner/nested-memory-lane.js +673 -0
- package/dist/core/runner/park-commit.d.ts +7 -0
- package/dist/core/runner/park-commit.js +3 -0
- package/dist/core/runner/prepare-advisor.d.ts +7 -9
- package/dist/core/runner/prepare-advisor.js +11 -5
- package/dist/core/runner/prepare-artifact.d.ts +1 -1
- package/dist/core/runner/prepare-artifact.js +8 -3
- package/dist/core/runner/prepare-ask-lane.d.ts +21 -3
- package/dist/core/runner/prepare-ask-lane.js +32 -28
- package/dist/core/runner/prepare-boundary-parks.d.ts +2 -2
- package/dist/core/runner/prepare-boundary-parks.js +21 -17
- package/dist/core/runner/prepare-caps-and-workflow.d.ts +10 -2
- package/dist/core/runner/prepare-caps-and-workflow.js +24 -18
- package/dist/core/runner/prepare-config-doors.d.ts +51 -5
- package/dist/core/runner/prepare-config-doors.js +73 -73
- package/dist/core/runner/prepare-context-lane.d.ts +68 -3
- package/dist/core/runner/prepare-context-lane.js +137 -27
- package/dist/core/runner/prepare-defer-classify.d.ts +0 -4
- package/dist/core/runner/prepare-defer-classify.js +9 -13
- package/dist/core/runner/prepare-delegation-surface.d.ts +8 -8
- package/dist/core/runner/prepare-delegation-surface.js +72 -64
- package/dist/core/runner/prepare-execution-env.js +1 -9
- package/dist/core/runner/prepare-file-history.d.ts +3 -2
- package/dist/core/runner/prepare-file-history.js +11 -4
- package/dist/core/runner/prepare-gate-stations.d.ts +21 -11
- package/dist/core/runner/prepare-gate-stations.js +13 -13
- package/dist/core/runner/prepare-hands-readface.d.ts +23 -6
- package/dist/core/runner/prepare-hands-readface.js +18 -12
- package/dist/core/runner/prepare-inherited-gate.d.ts +12 -5
- package/dist/core/runner/prepare-inherited-gate.js +14 -10
- package/dist/core/runner/prepare-lsp.js +2 -1
- package/dist/core/runner/prepare-memory-engine-session.js +30 -10
- package/dist/core/runner/prepare-memory.d.ts +4 -0
- package/dist/core/runner/prepare-memory.js +38 -16
- package/dist/core/runner/prepare-offload-wrappers.d.ts +3 -16
- package/dist/core/runner/prepare-offload-wrappers.js +6 -5
- package/dist/core/runner/prepare-park-ask.d.ts +13 -3
- package/dist/core/runner/prepare-park-ask.js +25 -19
- package/dist/core/runner/prepare-policy-chain.d.ts +17 -3
- package/dist/core/runner/prepare-policy-chain.js +144 -120
- package/dist/core/runner/prepare-project-context.d.ts +15 -53
- package/dist/core/runner/prepare-project-context.js +20 -83
- package/dist/core/runner/prepare-prompt-assembly.d.ts +7 -1
- package/dist/core/runner/prepare-prompt-assembly.js +9 -7
- package/dist/core/runner/prepare-prompt-inputs.d.ts +9 -3
- package/dist/core/runner/prepare-prompt-inputs.js +5 -3
- package/dist/core/runner/prepare-protocol-tools.d.ts +9 -4
- package/dist/core/runner/prepare-protocol-tools.js +46 -27
- package/dist/core/runner/prepare-question-face.d.ts +7 -6
- package/dist/core/runner/prepare-question-face.js +7 -6
- package/dist/core/runner/prepare-suspend-saga.d.ts +3 -0
- package/dist/core/runner/prepare-suspend-saga.js +1 -1
- package/dist/core/runner/prepare-task.d.ts +3 -3
- package/dist/core/runner/prepare-task.js +113 -61
- package/dist/core/runner/prepare-tool-disclosure-mount.js +6 -5
- package/dist/core/runner/prepare-turn-wiring.d.ts +33 -7
- package/dist/core/runner/prepare-turn-wiring.js +53 -17
- package/dist/core/runner/prepare-wiring-manifest.d.ts +42 -5
- package/dist/core/runner/prepare-wiring-manifest.js +81 -42
- package/dist/core/runner/prepare-workspace-restore.js +3 -2
- package/dist/core/runner/read-root-grant.js +2 -1
- package/dist/core/runner/reply-pricing.d.ts +31 -18
- package/dist/core/runner/reply-pricing.js +10 -15
- package/dist/core/runner/resume-admission.js +10 -15
- package/dist/core/runner/resume-apply.js +20 -9
- package/dist/core/runner/resume-checkpoint-screen.js +2 -4
- package/dist/core/runner/resume-internals-and-config.d.ts +12 -9
- package/dist/core/runner/resume-internals-and-config.js +37 -9
- package/dist/core/runner/resume-preflight.js +3 -3
- package/dist/core/runner/retired-runner-deps.js +3 -0
- package/dist/core/runner/rewind-files.js +6 -6
- package/dist/core/runner/run-attachment-seats.d.ts +1 -3
- package/dist/core/runner/run-attachment-seats.js +1 -6
- package/dist/core/runner/run-brain-sinks.d.ts +4 -7
- package/dist/core/runner/run-brain-sinks.js +7 -10
- package/dist/core/runner/run-clock-and-content.d.ts +8 -5
- package/dist/core/runner/run-clock-and-content.js +18 -3
- package/dist/core/runner/run-compaction-machinery.d.ts +8 -4
- package/dist/core/runner/run-compaction-machinery.js +4 -19
- package/dist/core/runner/run-git-lane.d.ts +8 -3
- package/dist/core/runner/run-git-lane.js +5 -3
- package/dist/core/runner/run-harness-handlers.d.ts +4 -1
- package/dist/core/runner/run-harness-handlers.js +70 -45
- package/dist/core/runner/run-identity-wiring.d.ts +6 -0
- package/dist/core/runner/run-identity-wiring.js +17 -8
- package/dist/core/runner/run-leg.d.ts +5 -2
- package/dist/core/runner/run-leg.js +156 -71
- package/dist/core/runner/run-notification-lane.d.ts +1 -1
- package/dist/core/runner/run-notification-lane.js +22 -10
- package/dist/core/runner/run-recovery-lanes.js +8 -6
- package/dist/core/runner/run-settle-and-teardown.d.ts +4 -0
- package/dist/core/runner/run-settle-and-teardown.js +77 -26
- package/dist/core/runner/run-stop-and-final-verify.js +46 -12
- package/dist/core/runner/run-telemetry-and-budget-seats.js +13 -28
- package/dist/core/runner/run-terminal-adoption.d.ts +2 -2
- package/dist/core/runner/run-terminal-adoption.js +14 -9
- package/dist/core/runner/run-tool-mount-facts.js +5 -9
- package/dist/core/runner/run-turn-boundary.d.ts +3 -2
- package/dist/core/runner/run-turn-boundary.js +112 -106
- package/dist/core/runner/runtask.d.ts +28 -8
- package/dist/core/runner/runtask.js +132 -41
- package/dist/core/runner/session-file-state-replay.d.ts +5 -3
- package/dist/core/runner/session-file-state-replay.js +10 -3
- package/dist/core/runner/session-rule-policy.d.ts +3 -3
- package/dist/core/runner/session-verb-doors.d.ts +18 -3
- package/dist/core/runner/session-verb-doors.js +38 -6
- package/dist/core/runner/shell-env-withheld.d.ts +8 -5
- package/dist/core/runner/shell-env-withheld.js +4 -4
- package/dist/core/runner/side-call-account.d.ts +12 -8
- package/dist/core/runner/side-call-account.js +24 -15
- package/dist/core/runner/stream-halt-verbs.js +1 -0
- package/dist/core/runner/stream-mode-verb.js +2 -1
- package/dist/core/runner/stream-settle-backstop.js +4 -1
- package/dist/core/runner/stream-steer-verb.js +35 -19
- package/dist/core/runner/sub-agent-deny-lists.d.ts +47 -11
- package/dist/core/runner/sub-agent-deny-lists.js +140 -39
- package/dist/core/runner/teardown-bounded.d.ts +6 -0
- package/dist/core/runner/teardown-bounded.js +12 -7
- package/dist/core/runner/terminal-account.d.ts +2 -0
- package/dist/core/runner/terminal-account.js +6 -1
- package/dist/core/runner/tool-disclosure.js +2 -1
- package/dist/core/runner/tool-end-body.js +3 -1
- package/dist/core/runner/tool-face-overlay.d.ts +1 -1
- package/dist/core/runner/tool-face-overlay.js +1 -1
- package/dist/core/runner/tool-occurrence.d.ts +34 -9
- package/dist/core/runner/tool-occurrence.js +32 -21
- package/dist/core/runner/tool-progress-lane.d.ts +20 -5
- package/dist/core/runner/tool-progress-lane.js +27 -5
- package/dist/core/runner/tool-result-media-seat.d.ts +15 -4
- package/dist/core/runner/tool-result-media-seat.js +17 -1
- package/dist/core/runner/tool-table-view.js +1 -1
- package/dist/core/runner/turn-attachments.d.ts +44 -71
- package/dist/core/runner/turn-attachments.js +52 -104
- package/dist/core/runner/usage-accounting.d.ts +3 -2
- package/dist/core/runner/usage-accounting.js +3 -2
- package/dist/core/runner/void-verifier-pause.js +1 -1
- package/dist/core/runner-deps.d.ts +42 -158
- package/dist/core/runtime-caps.d.ts +16 -4
- package/dist/core/secret-env.d.ts +20 -3
- package/dist/core/secret-env.js +46 -23
- package/dist/core/sensitive-path-policy.d.ts +8 -0
- package/dist/core/sensitive-path-policy.js +10 -2
- package/dist/core/session-checkout.d.ts +32 -27
- package/dist/core/session-checkout.js +109 -61
- package/dist/core/session-log-transfer.js +2 -1
- package/dist/core/session-policy-store.d.ts +24 -11
- package/dist/core/session-policy-store.js +11 -2
- package/dist/core/session-store.d.ts +16 -2
- package/dist/core/session-store.js +43 -17
- package/dist/core/session.d.ts +31 -3
- package/dist/core/session.js +33 -2
- package/dist/core/shell-run-candidates.d.ts +20 -8
- package/dist/core/shell-run-candidates.js +44 -21
- package/dist/core/side-query.d.ts +17 -5
- package/dist/core/side-query.js +17 -14
- package/dist/core/skill-grant.js +2 -3
- package/dist/core/skills-directory.js +3 -66
- package/dist/core/snapshot-frame-seat.d.ts +8 -0
- package/dist/core/snapshot-frame-seat.js +24 -0
- package/dist/core/steer-replay.d.ts +19 -3
- package/dist/core/steer-replay.js +8 -1
- package/dist/core/store-contracts/background-agent-store-contract.d.ts +17 -2
- package/dist/core/store-contracts/background-agent-store-contract.js +131 -2
- package/dist/core/store-contracts/checkpoint-store-contract.js +63 -1
- package/dist/core/store-contracts/mailbox-store-contract.d.ts +15 -2
- package/dist/core/store-contracts/mailbox-store-contract.js +213 -3
- package/dist/core/store-contracts/permission-rule-write-contract.js +24 -0
- package/dist/core/store-contracts/session-deletion-cascade-contract.d.ts +15 -0
- package/dist/core/store-contracts/session-deletion-cascade-contract.js +288 -0
- package/dist/core/store-contracts/session-policy-store-contract.js +57 -36
- package/dist/core/store-contracts/session-repo-contract.js +130 -5
- package/dist/core/store-contracts/session-store-contract.d.ts +1 -1
- package/dist/core/store-contracts/session-store-contract.js +17 -0
- package/dist/core/store-contracts/task-list-store-contract.d.ts +32 -0
- package/dist/core/store-contracts/task-list-store-contract.js +240 -0
- package/dist/core/store-contracts/tool-result-store-contract.d.ts +1 -1
- package/dist/core/store-contracts/tool-result-store-contract.js +41 -0
- package/dist/core/stub-env.d.ts +2 -2
- package/dist/core/stub-env.js +1 -0
- package/dist/core/synthetic-read-verdict.d.ts +38 -28
- package/dist/core/synthetic-read-verdict.js +19 -28
- package/dist/core/task-event.d.ts +171 -19
- package/dist/core/task-intake.d.ts +26 -0
- package/dist/core/task-intake.js +31 -0
- package/dist/core/task-limits.d.ts +8 -6
- package/dist/core/task-notification.d.ts +88 -8
- package/dist/core/task-notification.js +45 -5
- package/dist/core/task-registry-agent.d.ts +24 -7
- package/dist/core/task-registry-agent.js +51 -28
- package/dist/core/task-registry-monitor.js +16 -14
- package/dist/core/task-registry-shared.d.ts +177 -35
- package/dist/core/task-registry-shared.js +44 -17
- package/dist/core/task-registry-workflow.js +8 -5
- package/dist/core/task-registry-yield.d.ts +32 -0
- package/dist/core/task-registry-yield.js +85 -0
- package/dist/core/task-registry.d.ts +88 -10
- package/dist/core/task-registry.js +124 -33
- package/dist/core/task-result.d.ts +115 -31
- package/dist/core/task-spec-members.d.ts +140 -1
- package/dist/core/task-spec-members.js +23 -8
- package/dist/core/task-spec.d.ts +181 -51
- package/dist/core/task-spec.js +1 -1
- package/dist/core/task-stream.d.ts +12 -2
- package/dist/core/terminal-cause.d.ts +12 -4
- package/dist/core/thrown-value.d.ts +49 -7
- package/dist/core/thrown-value.js +38 -2
- package/dist/core/tool-catalog-entries.js +13 -3
- package/dist/core/tool-data-door.d.ts +7 -0
- package/dist/core/tool-data-door.js +13 -0
- package/dist/core/tool-face-lists.d.ts +25 -0
- package/dist/core/tool-face-lists.js +38 -0
- package/dist/core/tool-face-reader.d.ts +0 -10
- package/dist/core/tool-face-reader.js +5 -3
- package/dist/core/tool-list-grammar.d.ts +103 -0
- package/dist/core/tool-list-grammar.js +130 -0
- package/dist/core/tool-mount-facts.d.ts +47 -0
- package/dist/core/tool-mount-facts.js +50 -0
- package/dist/core/tool-mount-plan.d.ts +196 -0
- package/dist/core/tool-mount-plan.js +404 -0
- package/dist/core/tool-mount-static.d.ts +12 -0
- package/dist/core/tool-mount-static.js +174 -0
- package/dist/core/tool-name-aliases.d.ts +60 -2
- package/dist/core/tool-name-aliases.js +22 -2
- package/dist/core/tool-name-list.d.ts +3 -0
- package/dist/core/tool-name-readings.d.ts +4 -0
- package/dist/core/tool-name-readings.js +1 -0
- package/dist/core/tool-policy.d.ts +246 -51
- package/dist/core/tool-policy.js +165 -71
- package/dist/core/tool-registry.d.ts +4 -11
- package/dist/core/tool-registry.js +0 -3
- package/dist/core/tool-result-bytes.d.ts +94 -0
- package/dist/core/tool-result-bytes.js +34 -0
- package/dist/core/tool-result-store.d.ts +97 -13
- package/dist/core/tool-result-store.js +52 -4
- package/dist/core/tool-roster.d.ts +71 -10
- package/dist/core/tool-roster.js +71 -21
- package/dist/core/tool-search-setting.d.ts +7 -9
- package/dist/core/tool-search-setting.js +23 -7
- package/dist/core/tool-spec.d.ts +32 -2
- package/dist/core/tools.js +6 -20
- package/dist/core/trace.d.ts +63 -11
- package/dist/core/trace.js +19 -0
- package/dist/core/types.d.ts +8 -6
- package/dist/core/types.js +3 -1
- package/dist/core/unmatched-tool-names.d.ts +37 -0
- package/dist/core/unmatched-tool-names.js +18 -0
- package/dist/core/untrusted-egress.d.ts +16 -5
- package/dist/core/untrusted-egress.js +202 -32
- package/dist/core/untrusted-text.d.ts +29 -8
- package/dist/core/untrusted-text.js +6 -3
- package/dist/core/user-attachment.d.ts +129 -35
- package/dist/core/user-attachment.js +124 -57
- package/dist/core/user-row-origin.d.ts +63 -0
- package/dist/core/user-row-origin.js +61 -0
- package/dist/core/wiring-manifest.d.ts +161 -39
- package/dist/core/wiring-manifest.js +42 -6
- package/dist/core/workflow-run-store-contract.d.ts +11 -1
- package/dist/core/workflow-run-store-contract.js +60 -7
- package/dist/core/workflow-run-store.d.ts +61 -12
- package/dist/core/workflow-run-store.js +100 -15
- package/dist/core/workspace-snapshot.d.ts +10 -14
- package/dist/core/workspace-snapshot.js +3 -22
- package/dist/core/write-protect.d.ts +3 -5
- package/dist/core/write-protect.js +2 -4
- package/dist/engine/compaction/compaction.d.ts +3 -0
- package/dist/engine/compaction/compaction.js +4 -3
- package/dist/engine/execution-env/node-execution-env.d.ts +15 -4
- package/dist/engine/execution-env/node-execution-env.js +80 -27
- package/dist/engine/harness/agent-harness.d.ts +143 -27
- package/dist/engine/harness/agent-harness.js +162 -74
- package/dist/engine/harness/types.d.ts +84 -13
- package/dist/engine/harness/types.js +21 -1
- package/dist/engine/llm/tool-turns.d.ts +4 -0
- package/dist/engine/llm/tool-turns.js +7 -2
- package/dist/engine/llm/types.d.ts +111 -24
- package/dist/engine/llm/types.js +69 -5
- package/dist/engine/llm/validation.js +2 -1
- package/dist/engine/loop/agent-loop.d.ts +39 -6
- package/dist/engine/loop/agent-loop.js +172 -82
- package/dist/engine/loop/types.d.ts +43 -4
- package/dist/engine/lsp/node-lsp-manager.d.ts +5 -3
- package/dist/engine/lsp/node-lsp-manager.js +14 -10
- package/dist/engine/session/import-validate.js +9 -0
- package/dist/engine/session/memory-repo.d.ts +8 -1
- package/dist/engine/session/memory-repo.js +20 -12
- package/dist/engine/session/repo-utils.d.ts +10 -0
- package/dist/engine/session/repo-utils.js +11 -5
- package/dist/engine/session/row-cells.d.ts +32 -0
- package/dist/engine/session/row-cells.js +25 -0
- package/dist/index.d.ts +63 -34
- package/dist/index.js +44 -21
- package/dist/internal/harness.d.ts +8 -6
- package/dist/internal/harness.js +6 -4
- package/dist/internal/llm.d.ts +2 -2
- package/dist/internal/llm.js +1 -1
- package/dist/orchestration/governance-baseline-validity.d.ts +7 -0
- package/dist/orchestration/governance-baseline-validity.js +33 -9
- package/dist/orchestration/run-workflow-tool.d.ts +2 -0
- package/dist/orchestration/run-workflow-tool.js +25 -12
- package/dist/orchestration/workflow-governance.d.ts +19 -4
- package/dist/orchestration/workflow-governance.js +30 -9
- package/dist/orchestration/workflow-primitives.d.ts +4 -1
- package/dist/orchestration/workflow-primitives.js +2 -2
- package/dist/orchestration/workflow-script-runner.d.ts +1 -1
- package/dist/orchestration/workflow-size-guideline.d.ts +1 -1
- package/dist/orchestration/workflow-types.d.ts +21 -12
- package/dist/orchestration/workflow-types.js +15 -4
- package/dist/orchestration/workflow.d.ts +37 -7
- package/dist/orchestration/workflow.js +81 -35
- package/dist/prompt-assembly/artifact-store.js +6 -9
- package/dist/prompt-assembly/assemble.d.ts +4 -10
- package/dist/prompt-assembly/assemble.js +1 -3
- package/dist/prompt-assembly/catalog/constitution.d.ts +0 -20
- package/dist/prompt-assembly/catalog/constitution.js +2 -0
- package/dist/prompt-assembly/catalog/core-behavior.js +5 -3
- package/dist/prompt-assembly/catalog/engine.d.ts +108 -0
- package/dist/prompt-assembly/catalog/engine.js +19 -0
- package/dist/prompt-assembly/catalog/environment.d.ts +276 -0
- package/dist/prompt-assembly/catalog/environment.js +61 -0
- package/dist/prompt-assembly/catalog/index.d.ts +9 -2
- package/dist/prompt-assembly/catalog/index.js +73 -2
- package/dist/prompt-assembly/catalog/locales/index.d.ts +16 -0
- package/dist/prompt-assembly/catalog/locales/index.js +22 -0
- package/dist/prompt-assembly/catalog/locales/zh-Hans/constitution.d.ts +7 -0
- package/dist/prompt-assembly/catalog/locales/zh-Hans/constitution.js +124 -0
- package/dist/prompt-assembly/catalog/locales/zh-Hans/core-behavior.d.ts +6 -0
- package/dist/prompt-assembly/catalog/locales/zh-Hans/core-behavior.js +120 -0
- package/dist/prompt-assembly/catalog/locales/zh-Hans/cowork.d.ts +8 -0
- package/dist/prompt-assembly/catalog/locales/zh-Hans/cowork.js +442 -0
- package/dist/prompt-assembly/catalog/locales/zh-Hans/engine.d.ts +7 -0
- package/dist/prompt-assembly/catalog/locales/zh-Hans/engine.js +15 -0
- package/dist/prompt-assembly/catalog/locales/zh-Hans/environment.d.ts +7 -0
- package/dist/prompt-assembly/catalog/locales/zh-Hans/environment.js +50 -0
- package/dist/prompt-assembly/catalog/locales/zh-Hans/modes.d.ts +7 -0
- package/dist/prompt-assembly/catalog/locales/zh-Hans/modes.js +163 -0
- package/dist/prompt-assembly/catalog/locales/zh-Hans/role.d.ts +7 -0
- package/dist/prompt-assembly/catalog/locales/zh-Hans/role.js +148 -0
- package/dist/prompt-assembly/catalog/locales/zh-Hans/team.d.ts +6 -0
- package/dist/prompt-assembly/catalog/locales/zh-Hans/team.js +246 -0
- package/dist/prompt-assembly/catalog/role.js +3 -6
- package/dist/prompt-assembly/catalog/schema.d.ts +23 -1
- package/dist/prompt-assembly/catalog/schema.js +2 -0
- package/dist/prompt-assembly/composer.d.ts +6 -11
- package/dist/prompt-assembly/composer.js +7 -7
- package/dist/prompt-assembly/engine-text.d.ts +9 -0
- package/dist/prompt-assembly/engine-text.js +33 -0
- package/dist/prompt-assembly/event-registry.js +3 -3
- package/dist/prompt-assembly/explain.d.ts +1 -0
- package/dist/prompt-assembly/explain.js +1 -1
- package/dist/prompt-assembly/locale-review.d.ts +13 -0
- package/dist/prompt-assembly/locale-review.js +19 -0
- package/dist/prompt-assembly/overlay.d.ts +7 -3
- package/dist/prompt-assembly/overlay.js +27 -5
- package/dist/prompt-assembly/renderers.d.ts +4 -4
- package/dist/prompt-assembly/renderers.js +26 -17
- package/dist/prompt-assembly/role-base.d.ts +1 -1
- package/dist/prompt-assembly/select.d.ts +26 -5
- package/dist/prompt-assembly/select.js +25 -2
- package/dist/prompt-assembly/slots.d.ts +19 -0
- package/dist/prompt-assembly/slots.js +16 -0
- package/dist/prompt-assembly/sugar.d.ts +4 -7
- package/dist/prompt-assembly/sugar.js +1 -2
- package/dist/prompt-assembly/tool-catalog.d.ts +5 -1
- package/dist/prompt-assembly/tool-catalog.js +5 -1
- package/dist/prompt-assembly/turn-snapshot.d.ts +38 -10
- package/dist/prompt-assembly/turn-snapshot.js +43 -13
- package/dist/prompt-assembly/types.d.ts +3 -0
- package/dist/prompts/cowork.d.ts +6 -25
- package/dist/prompts/cowork.js +10 -12
- package/dist/prompts/default.d.ts +10 -32
- package/dist/prompts/default.js +37 -63
- package/dist/shell/lex.d.ts +39 -13
- package/dist/shell/lex.js +70 -30
- package/dist/stores/file/background-agent-store.d.ts +5 -0
- package/dist/stores/file/background-agent-store.js +35 -61
- package/dist/stores/file/checkpoint-store.d.ts +5 -3
- package/dist/stores/file/checkpoint-store.js +8 -10
- package/dist/stores/file/fs-atomic.d.ts +27 -70
- package/dist/stores/file/fs-atomic.js +52 -148
- package/dist/stores/file/index.d.ts +12 -0
- package/dist/stores/file/index.js +27 -2
- package/dist/stores/file/mailbox-store.d.ts +10 -1
- package/dist/stores/file/mailbox-store.js +40 -12
- package/dist/stores/file/permission-rule-adopt.js +5 -2
- package/dist/stores/file/permission-rule-store.d.ts +81 -20
- package/dist/stores/file/permission-rule-store.js +126 -33
- package/dist/stores/file/session-policy-store.d.ts +2 -2
- package/dist/stores/file/session-store.d.ts +21 -2
- package/dist/stores/file/session-store.js +27 -14
- package/dist/stores/file/task-list-store.js +23 -25
- package/dist/stores/file/tool-result-store.d.ts +45 -7
- package/dist/stores/file/tool-result-store.js +99 -36
- package/dist/stores/file/workflow-run-store.d.ts +1 -0
- package/dist/stores/file/workflow-run-store.js +14 -11
- package/dist/tools/artifact/artifact-tool.js +2 -0
- package/dist/tools/artifact/local-stub.js +6 -6
- package/dist/tools/fs/bash-program-position.d.ts +1 -2
- package/dist/tools/fs/bash-readonly-classifier.d.ts +35 -0
- package/dist/tools/fs/bash-readonly-classifier.js +50 -12
- package/dist/tools/fs/env-error-detail.d.ts +1 -0
- package/dist/tools/fs/env-error-detail.js +7 -0
- package/dist/tools/fs/fs-bash.d.ts +24 -6
- package/dist/tools/fs/fs-bash.js +73 -25
- package/dist/tools/fs/fs-pdf.js +6 -4
- package/dist/tools/fs/fs-read.d.ts +76 -31
- package/dist/tools/fs/fs-read.js +159 -79
- package/dist/tools/fs/fs-search-tools.d.ts +1 -1
- package/dist/tools/fs/fs-search-tools.js +3 -1
- package/dist/tools/fs/fs-shared.d.ts +59 -63
- package/dist/tools/fs/fs-shared.js +31 -18
- package/dist/tools/fs/fs-write.d.ts +13 -0
- package/dist/tools/fs/fs-write.js +69 -13
- package/dist/tools/fs/index.d.ts +19 -1
- package/dist/tools/fs/index.js +10 -2
- package/dist/tools/fs/pdf.js +10 -9
- package/dist/tools/fs/read-deny.js +4 -10
- package/dist/tools/fs/read-floor.d.ts +5 -4
- package/dist/tools/fs/removal-targets.d.ts +11 -5
- package/dist/tools/fs/removal-targets.js +62 -32
- package/dist/tools/fs/safety.d.ts +26 -19
- package/dist/tools/fs/safety.js +13 -8
- package/dist/tools/fs/search.d.ts +1 -1
- package/dist/tools/fs/shell-read-argv.js +1 -0
- package/dist/tools/fs/shell-read-bindings.d.ts +128 -26
- package/dist/tools/fs/shell-read-bindings.js +667 -139
- package/dist/tools/fs/shell-read-check.js +1 -1
- package/dist/tools/fs/shell-read-judge.d.ts +4 -1
- package/dist/tools/fs/shell-read-judge.js +5 -1
- package/dist/tools/fs/shell-read-plan.d.ts +4 -0
- package/dist/tools/fs/shell-read-plan.js +21 -19
- package/dist/tools/fs/shell-read-sourced.d.ts +4 -3
- package/dist/tools/fs/shell-read-sourced.js +18 -1
- package/dist/tools/fs/shell-read-start.d.ts +6 -6
- package/dist/tools/fs/shell-read-start.js +1 -6
- package/dist/tools/fs/shell-read-word.d.ts +4 -2
- package/dist/tools/fs/shell-read-word.js +7 -6
- package/dist/tools/fs/shell-read-workdir.d.ts +1 -1
- package/dist/tools/fs/shell-reentry-text.d.ts +24 -9
- package/dist/tools/fs/shell-reentry-text.js +50 -20
- package/dist/tools/monitor.d.ts +4 -0
- package/dist/tools/monitor.js +14 -4
- package/dist/tools/scheduler-tools.d.ts +5 -2
- package/dist/tools/scheduler-tools.js +8 -6
- package/dist/tools/task-list.d.ts +49 -20
- package/dist/tools/task-list.js +115 -35
- package/dist/tools/web.d.ts +13 -3
- package/dist/tools/web.js +17 -6
- package/dist/tools/worktree.d.ts +3 -2
- package/dist/tools/worktree.js +24 -25
- package/package.json +10 -3
- package/test/export-surface.snapshot.json +330 -32
- package/wire-changes/core-stores-sql@7.66.1.json +30 -0
- package/wire-changes/core-stores-sql@7.67.0.json +39 -0
- package/wire-changes/core@7.66.1.json +46 -0
- package/wire-changes/core@7.67.0.json +12578 -0
- package/wire-changes/mods-kernel@7.66.1.json +30 -0
- package/wire-changes/mods-kernel@7.67.0.json +167 -0
- package/wire-changes/primitives@7.66.1.json +30 -0
- package/wire-changes/primitives@7.67.0.json +325 -0
- package/wire-changes/wiki-gate@7.67.0.json +1636 -0
- package/dist/brain/degrading.d.ts +0 -93
- package/dist/brain/degrading.js +0 -189
- package/dist/core/tool-conformance.d.ts +0 -20
- package/dist/core/tool-conformance.js +0 -37
package/dist/core/mcp.js
CHANGED
|
@@ -5,7 +5,7 @@ import { remoteWords, resolveProtocolHttpHeaders } from "./protocol-http-auth.js
|
|
|
5
5
|
import { NO_CREDENTIAL_ECHO, carrierEcho, echoAnnouncer, echoedToolDrop, erasedEcho, serverInfoOf } from "./credential-echo.js";
|
|
6
6
|
import { PeerCarrier, Reauthorized, answeredUnauthorized, carrierOf, inFlight, mcpPeerTarget, peerFetch, peerSeatMissing, receivePeerSeat, recordCarrier, refusedThenRenewed, sentOnceMore, settledInFlight } from "./peer-seat.js";
|
|
7
7
|
import { disposeSectionEntry, sectionAnswerWarning } from "./prompt-section-seat.js";
|
|
8
|
-
import { createToolNameClaims,
|
|
8
|
+
import { createToolNameClaims, mintNamespacedToolName, mintNamespacePrefix } from "./protocol-naming.js";
|
|
9
9
|
import { mcpToolDropReason, refuseCollidingMcpServerNames } from "./mcp-name-judge.js";
|
|
10
10
|
import { Client, ProtocolError, ProtocolErrorCode } from "@modelcontextprotocol/client";
|
|
11
11
|
import { AjvJsonSchemaValidator } from "@modelcontextprotocol/client/validators/ajv";
|
|
@@ -13,22 +13,23 @@ import { ListResourcesResultSchema } from "@modelcontextprotocol/core";
|
|
|
13
13
|
import { McpConnectionPool, recordEngineDial } from "./mcp-connection-pool.js";
|
|
14
14
|
import { SessionEndingTransport, requestSite } from "./mcp-session-end.js";
|
|
15
15
|
import { mcpToolGate, UNPROVEN_GATE } from "./mcp-listing-drift.js";
|
|
16
|
-
import { ConnectionListing, Flights, IDLE_WATCHDOG_ABORT_REASON, Resendable, armMcpIdleWatchdog, callThroughLink, listingRefusal, observedFailure, owedByAnswer, reach, refusalScope } from "./mcp-server-link.js";
|
|
16
|
+
import { ConnectionListing, Flights, IDLE_WATCHDOG_ABORT_REASON, Resendable, armMcpIdleWatchdog, callThroughLink, listingRefusal, observedFailure, owedByAnswer, reach, refusalScope, revokedCallResult } from "./mcp-server-link.js";
|
|
17
17
|
import { underStartupBound } from "./mcp-startup-request.js";
|
|
18
|
-
import { LIST_MCP_RESOURCES, MCP_RESOURCE_LIST_ALLOW, MCP_RESOURCE_READ_ALLOW, READ_MCP_RESOURCE, READ_MCP_RESOURCE_DIR, retractInstructions, tellInstructions, toldOnDial, unretractInstructions, withdrawInstructionAdds } from "./mounted-mcp.js";
|
|
18
|
+
import { LIST_MCP_RESOURCES, MCP_FACE_WORD_DROP_REASON, MCP_RESOURCE_LIST_ALLOW, MCP_RESOURCE_READ_ALLOW, READ_MCP_RESOURCE, READ_MCP_RESOURCE_DIR, faceAllowed, isMcpFaceWord, retractInstructions, tellInstructions, toldOnDial, unretractInstructions, withdrawInstructionAdds } from "./mounted-mcp.js";
|
|
19
|
+
import { MCP_CHARS_PER_TOKEN, fetchMcpAnswer, mcpHostReadPorts, mcpMaxOutputTokens, notServed, readMcpListing } from "./mcp-host-read.js";
|
|
19
20
|
import { StdioClientTransport } from "@modelcontextprotocol/client/stdio";
|
|
20
21
|
import { describeHttpTransportFailure, failureFields, livenessOf, namingLostSession, readMcpFailure, sessionGone, unauthorizedLine } from "./mcp-failure.js";
|
|
21
|
-
import { lstat, mkdir, writeFile } from "node:fs/promises";
|
|
22
|
-
import { tmpdir } from "node:os";
|
|
23
|
-
import { join } from "node:path";
|
|
24
22
|
import { DEFAULT_REQUEST_TIMEOUT_MSEC } from "@modelcontextprotocol/client";
|
|
25
|
-
import {
|
|
26
|
-
import {
|
|
23
|
+
import { mediaBlockTypeOf } from "./image-admission.js";
|
|
24
|
+
import { keepBytesWith, mediaTypePhrase } from "./tool-result-bytes.js";
|
|
25
|
+
import { toolResultBytesKeeper } from "./tool-result-store.js";
|
|
27
26
|
import { sliceHeadSafe, sliceTailSafe } from "./surrogate-safe-slice.js";
|
|
28
27
|
import { truncateError } from "./tool-errors.js";
|
|
29
28
|
import { transportKindOf } from "./mcp-server-spec.js";
|
|
29
|
+
import { ProtocolRevokedRefusal, askCarriedRevocation, carryRevocation, libraryRevocationProbe } from "./protocol-revocation.js";
|
|
30
30
|
import { hostMount, hostSeatLine, hostSeatMissing, hostSeatVerdictOf, openHostPipe, settledBefore } from "./mcp-host-seat.js";
|
|
31
31
|
import { peerRequestRefusal } from "./host-floor.js";
|
|
32
|
+
import { MCP_SERVER_UNAVAILABLE } from "./mcp-server-unavailable-notice.js";
|
|
32
33
|
import { delimitUntrusted, inlineUntrusted, sanitizeUntrustedText } from "./untrusted-text.js";
|
|
33
34
|
import { discloseReminderShaped, observeReminderMarkEcho } from "./reminder-disclosure.js";
|
|
34
35
|
import { MARKED_BLOCK_AFTER_DATA } from "./reminder-mint.js";
|
|
@@ -38,15 +39,11 @@ export { resolveMcpDeclaredResultSize } from "./mcp-tool-meta.js";
|
|
|
38
39
|
import { withContentOrigin } from "./memory-engine/content-origin.js";
|
|
39
40
|
import { judgeMcpEntryDeclarations, snapshotMcpEntries } from "./locked-config.js";
|
|
40
41
|
import { validateJsonSchemaShape } from "./runner/strict-output-schema.js";
|
|
41
|
-
import { schemaKeyBoundProblem } from "./tool-roster.js";
|
|
42
|
+
import { rosterMemberBoundProblem, rosterRemoteNameOf, schemaKeyBoundProblem } from "./tool-roster.js";
|
|
42
43
|
import { boundaryFlowFace } from "./cross-boundary-taint.js";
|
|
43
44
|
import { readMember, thrownIs, thrownName, thrownText } from "./thrown-value.js";
|
|
45
|
+
import { JSON_SCHEMA_SUBSCHEMA_SEATS } from "./json-schema-seats.js";
|
|
44
46
|
export const MCP_PREFIX = MCP_NAMESPACE.prefix;
|
|
45
|
-
const MCP_OUTPUT_TOKENS_DEFAULT = 25_000;
|
|
46
|
-
const MCP_CHARS_PER_TOKEN = 4;
|
|
47
|
-
function mcpMaxOutputTokens() {
|
|
48
|
-
return resolveEnvBudget(process.env.MAX_MCP_OUTPUT_TOKENS, { name: "MAX_MCP_OUTPUT_TOKENS", unit: "tokens", default: MCP_OUTPUT_TOKENS_DEFAULT });
|
|
49
|
-
}
|
|
50
47
|
function mcpTruncationNote(limitTokens) {
|
|
51
48
|
return (`\n\n[OUTPUT TRUNCATED - exceeded ${limitTokens} token limit]\n\n` +
|
|
52
49
|
`The tool output was truncated. If this MCP server provides pagination or filtering tools, use them to ` +
|
|
@@ -196,6 +193,8 @@ function rethrowHonestMcpError(err, ctx) {
|
|
|
196
193
|
}
|
|
197
194
|
throw e;
|
|
198
195
|
};
|
|
196
|
+
if (err instanceof ProtocolRevokedRefusal)
|
|
197
|
+
finish(err);
|
|
199
198
|
sanitizeMcpErrorTextInPlace(err, ctx.declared);
|
|
200
199
|
if (ctx.idle?.signal.reason === IDLE_WATCHDOG_ABORT_REASON) {
|
|
201
200
|
ctx.liveness?.observe?.("timeout");
|
|
@@ -232,7 +231,7 @@ function rethrowHonestMcpError(err, ctx) {
|
|
|
232
231
|
finish(markMcpFailure(new Error(sessionGone(err, ctx.site)
|
|
233
232
|
? `${ctx.what} met a lost session on MCP server "${serverLabel}": ${httpFailure.condition}; ${ctx.resent === true ? "the call was sent again once on a fresh session, and the server reported that one gone too — if the server executed it before answering, it ran twice" : "the call was not sent again — if the server executed it before answering, it ran"}. The outcome is unknown.${writeEffectWarning(ctx.writeEffect)}${fenced}`
|
|
234
233
|
: failure.delivered === "no"
|
|
235
|
-
? `${ctx.what} could not reach MCP server "${serverLabel}": ${httpFailure.condition}. The request was not delivered, so the server did not execute it.
|
|
234
|
+
? `${ctx.what} could not reach MCP server "${serverLabel}": ${httpFailure.condition}. The request was not delivered, so the server did not execute it. ${refusalScope("connection", "mcp")}${fenced}`
|
|
236
235
|
: `${ctx.what} failed at the transport layer of MCP server "${serverLabel}": ${httpFailure.condition}. The request may or may not have executed on the server — the outcome is unknown.${writeEffectWarning(ctx.writeEffect)}${fenced}`, { cause: err }), details(failure.httpStatus !== undefined ? { httpStatus: failure.httpStatus } : undefined)));
|
|
237
236
|
}
|
|
238
237
|
case "protocol": {
|
|
@@ -250,6 +249,8 @@ function rethrowHonestMcpError(err, ctx) {
|
|
|
250
249
|
finish(markMcpFailure(new Error(unauthorizedLine(ctx.what, serverLabel, failure.authorization, refusedThenRenewed(err) && ctx.attempt !== "resent", writeEffectWarning(ctx.writeEffect)), { cause: err }), details()));
|
|
251
250
|
case "credential_unavailable":
|
|
252
251
|
finish(markMcpFailure(new Error(`${ctx.what} was not sent to MCP server "${serverLabel}": ${inlineUntrusted(thrownText(err), 400)}. The request was not delivered, so the server did not execute it. This is the deployment's credential seat, not the server — do not retry the call until it is fixed; use an alternative if one exists.`), details()));
|
|
252
|
+
case "revoked":
|
|
253
|
+
finish(err);
|
|
253
254
|
case "host_refused":
|
|
254
255
|
case "spawn_failed":
|
|
255
256
|
case "invalid_config":
|
|
@@ -267,88 +268,10 @@ function rethrowHonestMcpError(err, ctx) {
|
|
|
267
268
|
}
|
|
268
269
|
}
|
|
269
270
|
function throwDeadServer(server, what) {
|
|
270
|
-
throw markMcpFailure(new Error(`MCP server "${inlineUntrusted(server)}" is disconnected (its transport closed earlier in this task). ${what} was not attempted.
|
|
271
|
+
throw markMcpFailure(new Error(`MCP server "${inlineUntrusted(server)}" is disconnected (its transport closed earlier in this task). ${what} was not attempted. ${refusalScope("connection", "mcp")}`), { code: "connection_closed", delivered: "no", server });
|
|
271
272
|
}
|
|
272
273
|
export { normalizeNameSegment as normalizeMcpName, clampNameSegment } from "./protocol-naming.js";
|
|
273
274
|
export * from "./image-downsample.js";
|
|
274
|
-
const MCP_BLOB_DIR = join(tmpdir(), "sema-mcp-blobs");
|
|
275
|
-
function extensionForMime(mimeType) {
|
|
276
|
-
if (!mimeType)
|
|
277
|
-
return "bin";
|
|
278
|
-
const mt = (mimeType.split(";")[0] ?? "").trim().toLowerCase();
|
|
279
|
-
switch (mt) {
|
|
280
|
-
case "application/pdf": return "pdf";
|
|
281
|
-
case "application/json": return "json";
|
|
282
|
-
case "text/csv": return "csv";
|
|
283
|
-
case "text/plain": return "txt";
|
|
284
|
-
case "text/html": return "html";
|
|
285
|
-
case "text/markdown": return "md";
|
|
286
|
-
case "application/zip": return "zip";
|
|
287
|
-
case "application/vnd.openxmlformats-officedocument.wordprocessingml.document": return "docx";
|
|
288
|
-
case "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": return "xlsx";
|
|
289
|
-
case "application/vnd.openxmlformats-officedocument.presentationml.presentation": return "pptx";
|
|
290
|
-
case "application/msword": return "doc";
|
|
291
|
-
case "application/vnd.ms-excel": return "xls";
|
|
292
|
-
case "audio/mpeg": return "mp3";
|
|
293
|
-
case "audio/wav": return "wav";
|
|
294
|
-
case "audio/ogg": return "ogg";
|
|
295
|
-
case "video/mp4": return "mp4";
|
|
296
|
-
case "video/webm": return "webm";
|
|
297
|
-
case "image/png": return "png";
|
|
298
|
-
case "image/jpeg": return "jpg";
|
|
299
|
-
case "image/gif": return "gif";
|
|
300
|
-
case "image/webp": return "webp";
|
|
301
|
-
case "image/svg+xml": return "svg";
|
|
302
|
-
default: return "bin";
|
|
303
|
-
}
|
|
304
|
-
}
|
|
305
|
-
async function persistMcpBlob(base64Data, mimeType, server) {
|
|
306
|
-
const bytes = Buffer.from(base64Data, "base64");
|
|
307
|
-
const ext = extensionForMime(mimeType);
|
|
308
|
-
const filePath = join(MCP_BLOB_DIR, `mcp-${normalizeNameSegment(server ?? "server")}-blob-${Date.now()}-${Math.random().toString(36).slice(2, 8)}.${ext}`);
|
|
309
|
-
try {
|
|
310
|
-
await mkdir(MCP_BLOB_DIR, { recursive: true, mode: 0o700 });
|
|
311
|
-
const st = await lstat(MCP_BLOB_DIR);
|
|
312
|
-
if (st.isSymbolicLink() || !st.isDirectory()) {
|
|
313
|
-
return { error: `blob dir ${MCP_BLOB_DIR} is a symlink or not a directory; refusing to write`, bytes: bytes.length };
|
|
314
|
-
}
|
|
315
|
-
if (typeof process.getuid === "function" && st.uid !== process.getuid()) {
|
|
316
|
-
return { error: `blob dir ${MCP_BLOB_DIR} is owned by another user; refusing to write`, bytes: bytes.length };
|
|
317
|
-
}
|
|
318
|
-
await writeFile(filePath, bytes, { mode: 0o600, flag: "wx" });
|
|
319
|
-
return { filePath, bytes: bytes.length };
|
|
320
|
-
}
|
|
321
|
-
catch (err) {
|
|
322
|
-
return { error: thrownText(err), bytes: bytes.length };
|
|
323
|
-
}
|
|
324
|
-
}
|
|
325
|
-
async function blobToTextBlock(base64Data, mimeType, server, prefix, refetchHint = "") {
|
|
326
|
-
const r = await persistMcpBlob(base64Data, mimeType, server);
|
|
327
|
-
const mt = mimeType || "unknown type";
|
|
328
|
-
if ("error" in r) {
|
|
329
|
-
return { type: "text", text: `${prefix}Binary content (${mt}, ${r.bytes} bytes) could not be saved to disk: ${r.error}${refetchHint}` };
|
|
330
|
-
}
|
|
331
|
-
return { type: "text", text: `${prefix}Binary content (${mt}, ${r.bytes} bytes) saved to ${r.filePath}` };
|
|
332
|
-
}
|
|
333
|
-
async function boundedImageBlock(data, mimeType, server, processor) {
|
|
334
|
-
const admitted = await admitImageBytes(Buffer.from(data, "base64"), mimeType, processor);
|
|
335
|
-
if (admitted.ok)
|
|
336
|
-
return admitted.block;
|
|
337
|
-
const over = admitted.reason === "raw_too_large"
|
|
338
|
-
? `over the ${admitted.cap}-byte read cap`
|
|
339
|
-
: admitted.reason === "dimensions_too_large"
|
|
340
|
-
? unprocessedSizeClause(admitted)
|
|
341
|
-
: admitted.reason === "base64_too_large"
|
|
342
|
-
? `base64 ${admitted.base64.length} chars after processing exceeds the ${IMAGE_ADMISSION.hard.imageBase64Chars}-char API image limit`
|
|
343
|
-
: undefined;
|
|
344
|
-
if (over === undefined)
|
|
345
|
-
return { type: "image", data, mimeType };
|
|
346
|
-
const r = await persistMcpBlob(data, mimeType, server);
|
|
347
|
-
if ("error" in r) {
|
|
348
|
-
return { type: "text", text: `[image (${mimeType}): too large to inline (${r.bytes} bytes; ${over}) and could not be saved to disk: ${r.error} — image omitted]` };
|
|
349
|
-
}
|
|
350
|
-
return { type: "text", text: `[image (${mimeType}): too large to inline (${r.bytes} bytes; ${over}) — saved to ${r.filePath}]` };
|
|
351
|
-
}
|
|
352
275
|
export function inferCompactSchema(value, depth = 2) {
|
|
353
276
|
if (value === null)
|
|
354
277
|
return "null";
|
|
@@ -383,11 +306,30 @@ function buildTransport(spec, principal, kind, carrier, pieces, pipe) {
|
|
|
383
306
|
if (!("url" in t))
|
|
384
307
|
throw new Error(`MCP server "${spec.name}": transport kind "${String(kind)}" carries no url`);
|
|
385
308
|
resolveProtocolHttpHeaders(MCP_NAMESPACE.id, t.principalHeader !== undefined ? { principalHeader: t.principalHeader } : {}, principal);
|
|
386
|
-
return new SessionEndingTransport(new URL(t.url), { fetch: peerFetch(carrier, t.principalHeader, principal), requestInit: { redirect: "manual" } });
|
|
309
|
+
return new SessionEndingTransport(new URL(t.url), { fetch: peerFetch(carrier, t.principalHeader, principal, { server: spec.name, declared: [t.url] }), requestInit: { redirect: "manual" } });
|
|
310
|
+
}
|
|
311
|
+
function tellBinaryKept(binarySeat, info) {
|
|
312
|
+
if (info.kept.length === 0 || binarySeat?.onKept === undefined)
|
|
313
|
+
return;
|
|
314
|
+
try {
|
|
315
|
+
binarySeat.onKept(info);
|
|
316
|
+
}
|
|
317
|
+
catch {
|
|
318
|
+
}
|
|
319
|
+
}
|
|
320
|
+
async function keepBinaryContent(keep, base64, mimeType, prefix, notKeptHint = "") {
|
|
321
|
+
const { kept, clause } = await keepBytesWith(keep, Buffer.from(base64, "base64"), mimeType);
|
|
322
|
+
const text = `${prefix}Binary content (${mediaTypePhrase(mimeType)}, ${kept.bytes} bytes): ${clause}${"ref" in kept ? "" : notKeptHint}`;
|
|
323
|
+
return { block: { type: "text", text }, kept };
|
|
387
324
|
}
|
|
388
|
-
export async function mapContent(content, serverName,
|
|
389
|
-
const processor = await resolveImageProcessor(imageProcessor);
|
|
325
|
+
export async function mapContent(content, serverName, bytesKeep) {
|
|
390
326
|
const out = [];
|
|
327
|
+
const kept = [];
|
|
328
|
+
const keep = async (base64, mimeType, prefix, notKeptHint) => {
|
|
329
|
+
const k = await keepBinaryContent(bytesKeep, base64, mimeType, prefix, notKeptHint);
|
|
330
|
+
out.push(k.block);
|
|
331
|
+
kept.push(k.kept);
|
|
332
|
+
};
|
|
391
333
|
for (const item of content ?? []) {
|
|
392
334
|
if (item.type === "text" && typeof item.text === "string") {
|
|
393
335
|
out.push({ type: "text", text: item.text });
|
|
@@ -395,27 +337,29 @@ export async function mapContent(content, serverName, imageProcessor) {
|
|
|
395
337
|
else if (item.type === "image") {
|
|
396
338
|
const data = typeof item.data === "string" ? item.data : "";
|
|
397
339
|
const mimeType = typeof item.mimeType === "string" ? item.mimeType : "";
|
|
398
|
-
out.push(
|
|
340
|
+
out.push({ type: "image", data, mimeType });
|
|
399
341
|
}
|
|
400
342
|
else if (item.type === "audio" && typeof item.data === "string" && item.data) {
|
|
401
|
-
|
|
343
|
+
await keep(item.data, item.mimeType, `[Audio from ${inlineUntrusted(serverName ?? "MCP server")}] `);
|
|
402
344
|
}
|
|
403
345
|
else if (item.type === "audio") {
|
|
404
|
-
out.push({ type: "text", text: `[audio attachment${item.mimeType ? `: ${item.mimeType}` : ""}]` });
|
|
346
|
+
out.push({ type: "text", text: `[audio attachment${typeof item.mimeType === "string" && item.mimeType !== "" ? `: ${mediaTypePhrase(item.mimeType)}` : ""}]` });
|
|
405
347
|
}
|
|
406
348
|
else if (item.type === "resource" && item.resource) {
|
|
407
349
|
const r = item.resource;
|
|
350
|
+
const blockType = mediaBlockTypeOf(r.mimeType);
|
|
408
351
|
if (typeof r.text === "string") {
|
|
409
352
|
out.push({ type: "text", text: `[resource${r.uri ? ` ${r.uri}` : ""}]\n${r.text}` });
|
|
410
353
|
}
|
|
411
|
-
else if (r.blob && r.
|
|
412
|
-
out.push(
|
|
354
|
+
else if (typeof r.blob === "string" && r.blob !== "" && blockType !== undefined) {
|
|
355
|
+
out.push({ type: blockType, data: r.blob, mimeType: r.mimeType });
|
|
413
356
|
}
|
|
414
|
-
else if (r.blob) {
|
|
415
|
-
|
|
357
|
+
else if (typeof r.blob === "string" && r.blob !== "") {
|
|
358
|
+
const uri = typeof r.uri === "string" && r.uri !== "" ? inlineUntrusted(r.uri) : undefined;
|
|
359
|
+
await keep(r.blob, r.mimeType, `[resource${uri !== undefined ? ` ${uri}` : ""}] `, ` — data not inlined; it can be re-fetched via ${READ_MCP_RESOURCE}${uri !== undefined ? ` (uri ${uri})` : ""}.`);
|
|
416
360
|
}
|
|
417
361
|
else {
|
|
418
|
-
out.push({ type: "text", text: `[resource${r.uri ? ` ${r.uri}` : ""}${r.mimeType ? ` (${r.mimeType})` : ""}]` });
|
|
362
|
+
out.push({ type: "text", text: `[resource${r.uri ? ` ${r.uri}` : ""}${typeof r.mimeType === "string" && r.mimeType !== "" ? ` (${mediaTypePhrase(r.mimeType)})` : ""}]` });
|
|
419
363
|
}
|
|
420
364
|
}
|
|
421
365
|
else if (item.type === "resource_link" && item.uri) {
|
|
@@ -429,7 +373,7 @@ export async function mapContent(content, serverName, imageProcessor) {
|
|
|
429
373
|
if (out.length === 0) {
|
|
430
374
|
out.push({ type: "text", text: "" });
|
|
431
375
|
}
|
|
432
|
-
return out;
|
|
376
|
+
return { content: out, kept };
|
|
433
377
|
}
|
|
434
378
|
export const MCP_INVISIBLE_TEXT_RE = /[\p{Cf}\p{Co}\p{Cn}]/gu;
|
|
435
379
|
const MCP_SANITIZE_MAX_ROUNDS = 10;
|
|
@@ -445,9 +389,7 @@ function sanitizeMcpModelFacingText(text) {
|
|
|
445
389
|
}
|
|
446
390
|
const MCP_SCHEMA_PROSE_KEYS = new Set(["description", "title", "$comment"]);
|
|
447
391
|
const MCP_SCHEMA_CHILD_SEAT = new Map([
|
|
448
|
-
...
|
|
449
|
-
...["patternProperties"].map((k) => [k, "schemaMap"]),
|
|
450
|
-
...["items", "prefixItems", "additionalItems", "additionalProperties", "unevaluatedItems", "unevaluatedProperties", "contains", "propertyNames", "contentSchema", "not", "if", "then", "else", "allOf", "anyOf", "oneOf"].map((k) => [k, "schema"]),
|
|
392
|
+
...JSON_SCHEMA_SUBSCHEMA_SEATS,
|
|
451
393
|
...["required", "dependentRequired", "dependencies", "$ref", "$dynamicRef", "$id", "$anchor", "$dynamicAnchor"].map((k) => [k, "nameRefs"]),
|
|
452
394
|
]);
|
|
453
395
|
class McpPayloadKeyCollision extends Error {
|
|
@@ -646,10 +588,11 @@ export function mcpToolSchemaProblem(schema) {
|
|
|
646
588
|
}
|
|
647
589
|
return undefined;
|
|
648
590
|
}
|
|
649
|
-
|
|
650
|
-
|
|
591
|
+
const OPEN_DOOR = (send) => send();
|
|
592
|
+
export async function materializeMcpTools(specs, principal, onElicit, _imageProcessor, reminderDisclosure, revocations, poolOpts, promptSections, dialable, signal, hostFloor, peerSeat, onAuthorizationRequired, hostSeats, onCredentialEchoed, binarySeat) {
|
|
593
|
+
return materializeLegMcpTools(undefined, undefined, specs, principal, onElicit, undefined, reminderDisclosure, libraryRevocationProbe(revocations, "materializeMcpTools revocations"), poolOpts, promptSections, dialable, signal, hostFloor, receivePeerSeat(peerSeat, "materializeMcpTools peerSeat"), onAuthorizationRequired, hostSeats, onCredentialEchoed, binarySeat);
|
|
651
594
|
}
|
|
652
|
-
export async function materializeLegMcpTools(seat, ...[specs, principal, onElicit,
|
|
595
|
+
export async function materializeLegMcpTools(seat, onSubtreeActivity, ...[specs, principal, onElicit, , reminderDisclosure, revocations, poolOpts, promptSections, dialable, signal, hostFloor, peerSeat, onAuthorizationRequired, hostSeats, onCredentialEchoed, binarySeat]) {
|
|
653
596
|
const snapshot = snapshotMcpEntries(specs);
|
|
654
597
|
const axesRefused = new WeakMap();
|
|
655
598
|
const entries = snapshot.map((spec) => {
|
|
@@ -660,30 +603,24 @@ export async function materializeLegMcpTools(seat, ...[specs, principal, onElici
|
|
|
660
603
|
return spec;
|
|
661
604
|
});
|
|
662
605
|
refuseCollidingMcpServerNames(entries.map((s) => s.name));
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
|
|
667
|
-
|
|
668
|
-
|
|
669
|
-
const r = fingerprint === undefined ? mcpRevocations.isRevoked(serverName) : mcpRevocations.isRevoked(serverName, { fingerprint });
|
|
670
|
-
if (typeof r !== "boolean") {
|
|
671
|
-
throw new Error(`isRevoked returned ${r instanceof Promise ? "a Promise — the ledger seat is SYNCHRONOUS by contract" : `a non-boolean (${typeof r})`}`);
|
|
672
|
-
}
|
|
673
|
-
return r;
|
|
674
|
-
}
|
|
675
|
-
catch (e) {
|
|
676
|
-
if (!revocationProbeFailed) {
|
|
677
|
-
revocationProbeFailed = true;
|
|
678
|
-
try {
|
|
679
|
-
mcpRevocations.onProbeFailure?.(e);
|
|
680
|
-
}
|
|
681
|
-
catch {
|
|
682
|
-
}
|
|
683
|
-
}
|
|
684
|
-
return false;
|
|
685
|
-
}
|
|
606
|
+
const revokedNow = (spec) => {
|
|
607
|
+
if (revocations === undefined)
|
|
608
|
+
return undefined;
|
|
609
|
+
const fingerprint = spec.fingerprint;
|
|
610
|
+
const target = typeof fingerprint === "string" ? { protocol: "mcp", server: spec.name, fingerprint } : { protocol: "mcp", server: spec.name };
|
|
611
|
+
return revocations(target) ? new ProtocolRevokedRefusal(target) : undefined;
|
|
686
612
|
};
|
|
613
|
+
const doorOf = (spec, kind) => revocations === undefined
|
|
614
|
+
? OPEN_DOOR
|
|
615
|
+
: kind === "stdio" || kind === "host"
|
|
616
|
+
? async (send) => {
|
|
617
|
+
const refused = revokedNow(spec);
|
|
618
|
+
if (refused !== undefined)
|
|
619
|
+
throw refused;
|
|
620
|
+
return send();
|
|
621
|
+
}
|
|
622
|
+
: async (send) => carryRevocation(() => revokedNow(spec), send);
|
|
623
|
+
const dialGateOf = (spec) => (revocations === undefined ? OPEN_DOOR : async (send) => carryRevocation(() => revokedNow(spec), send));
|
|
687
624
|
const mcpDisclosure = reminderDisclosure?.reminderMark !== undefined
|
|
688
625
|
? { mark: reminderDisclosure.reminderMark, windows: new Map(), ...(reminderDisclosure.counts !== undefined ? { counts: reminderDisclosure.counts } : {}) }
|
|
689
626
|
: undefined;
|
|
@@ -720,7 +657,7 @@ export async function materializeLegMcpTools(seat, ...[specs, principal, onElici
|
|
|
720
657
|
const commitConnectedServer = (spec, s, transportKind) => {
|
|
721
658
|
const raised = [];
|
|
722
659
|
connections.push({ client: s.client, close: s.close });
|
|
723
|
-
const handle = { name: spec.name, spec, client: s.client, health: s.health, tools: s.tools, listing: s.listing, intakeAt: s.intakeAt, gates: () => intakeNow(handle).gates, definitions: () => intakeNow(handle).definitions, transportKind, announce: s.announce, instructions: s.instructions };
|
|
660
|
+
const handle = { name: spec.name, spec, client: s.client, health: s.health, tools: s.tools, listing: s.listing, intakeAt: s.intakeAt, gates: () => intakeNow(handle).gates, definitions: () => intakeNow(handle).definitions, transportKind, announce: s.announce, instructions: s.instructions, route: s.route };
|
|
724
661
|
const hIdx = serverHandles.findIndex((h) => h.name === spec.name);
|
|
725
662
|
if (hIdx === -1)
|
|
726
663
|
serverHandles.push(handle);
|
|
@@ -758,7 +695,7 @@ export async function materializeLegMcpTools(seat, ...[specs, principal, onElici
|
|
|
758
695
|
raised.push(schemaAdvisoryWarning(spec.name, a.tool, a.reason));
|
|
759
696
|
if (s.instructionsDefect !== undefined)
|
|
760
697
|
raised.push(sectionAnswerWarning(s.instructionsDefect));
|
|
761
|
-
if (s.toolsCapabilityAbsent === true && spec.allowTools !== undefined && spec.allowTools.
|
|
698
|
+
if (s.toolsCapabilityAbsent === true && spec.allowTools !== undefined && spec.allowTools.some((name) => !isMcpFaceWord(name))) {
|
|
762
699
|
raised.push(toolsCapabilityAbsentWarning(spec.name));
|
|
763
700
|
}
|
|
764
701
|
if (s.listingIncomplete)
|
|
@@ -777,7 +714,7 @@ export async function materializeLegMcpTools(seat, ...[specs, principal, onElici
|
|
|
777
714
|
const intakeNow = (h) => {
|
|
778
715
|
const latest = h.listing.latest();
|
|
779
716
|
if (latest.at !== h.intakeAt.at) {
|
|
780
|
-
const { gates, definitions } = intakeListedTools({ tools: [...latest.entries], unproven: latest.unproven }, h.spec, linkOf(h.name), echoOf(h.spec), outputSchemaValidatorOf(h.client),
|
|
717
|
+
const { gates, definitions } = intakeListedTools({ tools: [...latest.entries], unproven: latest.unproven }, h.spec, linkOf(h.name), echoOf(h.spec), outputSchemaValidatorOf(h.client), binarySeat, mcpDisclosure, doorOf(h.spec, h.transportKind), h.transportKind, seat, echoReadOf(h.spec), onSubtreeActivity);
|
|
781
718
|
h.intakeAt = { at: latest.at, gates, definitions };
|
|
782
719
|
}
|
|
783
720
|
return h.intakeAt;
|
|
@@ -802,12 +739,14 @@ export async function materializeLegMcpTools(seat, ...[specs, principal, onElici
|
|
|
802
739
|
};
|
|
803
740
|
const dialServer = async (spec, dialKind, dialOpts) => {
|
|
804
741
|
const hostSeat = dialKind === "host" ? hostSeats?.get(spec.name) : undefined;
|
|
805
|
-
const refusal = axesRefused.get(spec) ?? peerSeatMissing(`mcp: server "${inlineUntrusted(spec.name, 120)}"`, "credentials" in spec.transport ? spec.transport.credentials : undefined, peerSeat) ?? endpointRefusal(spec, dialKind) ?? (dialKind === "host" && hostSeat === undefined ? hostSeatMissing(spec.name) : undefined);
|
|
742
|
+
const refusal = axesRefused.get(spec) ?? peerSeatMissing(`mcp: server "${inlineUntrusted(spec.name, 120)}"`, "credentials" in spec.transport ? spec.transport.credentials : undefined, peerSeat) ?? endpointRefusal(spec, dialKind) ?? (dialKind === "host" && hostSeat === undefined ? hostSeatMissing(spec.name) : undefined) ?? fingerprintRefusal(spec);
|
|
806
743
|
if (refusal !== undefined)
|
|
807
744
|
throw refusal;
|
|
808
745
|
const carrier = new PeerCarrier(peerSeat, mcpPeerTarget(spec, dialKind), principal, dialKind === "stdio" ? "stdio" : "http", dialKind !== "stdio" && "principalHeader" in spec.transport && spec.transport.principalHeader !== undefined);
|
|
809
746
|
dialedBy.set(spec.name, carrier);
|
|
810
|
-
const
|
|
747
|
+
const through = doorOf(spec, dialKind);
|
|
748
|
+
const gate = dialGateOf(spec);
|
|
749
|
+
const dial = () => gate(() => connectServer(spec, principal, onElicit, binarySeat, mcpDisclosure, through, dialKind, poolOpts?.pool, { ...dialOpts, ...(poolOpts?.isolationScope !== undefined ? { isolationScope: poolOpts.isolationScope } : {}), link: linkOf(spec.name), carrier, announceEcho: (where) => announceEcho(spec.name, where), ...(signal !== undefined ? { signal } : {}), ...(hostSeat !== undefined ? { hostSeat } : {}) }, seat, onSubtreeActivity));
|
|
811
750
|
const connected = await dial().catch(async (err) => {
|
|
812
751
|
if (typeof err === "object" && err !== null)
|
|
813
752
|
dialedBy.set(spec.name, carrierOf(err) ?? carrier);
|
|
@@ -847,7 +786,7 @@ export async function materializeLegMcpTools(seat, ...[specs, principal, onElici
|
|
|
847
786
|
toolAxes.push(...s.axes);
|
|
848
787
|
if (s.instructions) {
|
|
849
788
|
serverInstructions.push(s.instructions);
|
|
850
|
-
toldOnDial(instructionsDelta,
|
|
789
|
+
toldOnDial(instructionsDelta, s.instructions);
|
|
851
790
|
}
|
|
852
791
|
commitConnectedServer(spec, s, dialKinds[i]);
|
|
853
792
|
}
|
|
@@ -857,7 +796,7 @@ export async function materializeLegMcpTools(seat, ...[specs, principal, onElici
|
|
|
857
796
|
statuses.push(failedStatus(spec, r.reason, dialKinds[i], declared));
|
|
858
797
|
}
|
|
859
798
|
}
|
|
860
|
-
const resourceTools = buildResourceTools(resourceServers,
|
|
799
|
+
const resourceTools = buildResourceTools(resourceServers, binarySeat);
|
|
861
800
|
tools.push(...resourceTools.tools);
|
|
862
801
|
toolAxes.push(...resourceTools.axes);
|
|
863
802
|
}
|
|
@@ -876,8 +815,8 @@ export async function materializeLegMcpTools(seat, ...[specs, principal, onElici
|
|
|
876
815
|
return declined("refused", stopped);
|
|
877
816
|
const spec = entries.find((e) => e.name === server);
|
|
878
817
|
if (spec === undefined)
|
|
879
|
-
return declined("not_declared",
|
|
880
|
-
if (
|
|
818
|
+
return declined("not_declared", "no MCP server of that name is declared for this task");
|
|
819
|
+
if (revokedNow(spec) !== undefined)
|
|
881
820
|
return declined("refused", "server revoked by the operator — the re-dial did not contact it");
|
|
882
821
|
const hIdx = serverHandles.findIndex((h) => h.name === server);
|
|
883
822
|
const prior = hIdx === -1 ? undefined : serverHandles[hIdx];
|
|
@@ -972,21 +911,17 @@ export async function materializeLegMcpTools(seat, ...[specs, principal, onElici
|
|
|
972
911
|
results.push({ server: h.name, prefix: prefixOf(h.name), status: "not_connected", toolCount: h.tools.length, added: [], removed: [] });
|
|
973
912
|
continue;
|
|
974
913
|
}
|
|
975
|
-
if (isServerRevoked(h.name)) {
|
|
976
|
-
results.push({ server: h.name, prefix: prefixOf(h.name), status: "revoked", toolCount: h.tools.length, added: [], removed: [], error: "server revoked by the operator — the refresh did not contact it" });
|
|
977
|
-
continue;
|
|
978
|
-
}
|
|
979
914
|
const site = requestSite(h.client);
|
|
980
915
|
try {
|
|
981
916
|
const at = h.listing.open();
|
|
982
|
-
const listed = await listToolsLenient(h.client, undefined, echoOf(h.spec));
|
|
917
|
+
const listed = await listToolsLenient(h.client, doorOf(h.spec, h.transportKind), undefined, echoOf(h.spec));
|
|
983
918
|
const answered = h.listing.answer(at, listed.tools, listed.incomplete !== undefined);
|
|
984
919
|
const mergedRaw = answered.view;
|
|
985
920
|
if (!answered.recorded) {
|
|
986
921
|
results.push({ server: h.name, prefix: prefixOf(h.name), status: "failed", toolCount: h.tools.length, added: [], removed: [], error: "a later listing of this server was opened and applied while this one was in the air — this one was discarded" });
|
|
987
922
|
continue;
|
|
988
923
|
}
|
|
989
|
-
const { serverTools, serverAxes, gates, definitions, dropped } = intakeListedTools({ tools: [...mergedRaw], unproven: answered.unproven }, h.spec, linkOf(h.name), echoOf(h.spec), outputSchemaValidatorOf(h.client),
|
|
924
|
+
const { serverTools, serverAxes, gates, definitions, dropped } = intakeListedTools({ tools: [...mergedRaw], unproven: answered.unproven }, h.spec, linkOf(h.name), echoOf(h.spec), outputSchemaValidatorOf(h.client), binarySeat, mcpDisclosure, doorOf(h.spec, h.transportKind), h.transportKind, seat, echoReadOf(h.spec), onSubtreeActivity);
|
|
990
925
|
const priorNames = h.tools.map((t) => t.name);
|
|
991
926
|
const newNames = serverTools.map((t) => t.name);
|
|
992
927
|
const added = newNames.filter((n) => !priorNames.includes(n));
|
|
@@ -1010,6 +945,10 @@ export async function materializeLegMcpTools(seat, ...[specs, principal, onElici
|
|
|
1010
945
|
});
|
|
1011
946
|
}
|
|
1012
947
|
catch (err) {
|
|
948
|
+
if (err instanceof ProtocolRevokedRefusal) {
|
|
949
|
+
results.push({ server: h.name, prefix: prefixOf(h.name), status: "revoked", toolCount: h.tools.length, added: [], removed: [], error: "server revoked by the operator — the refresh sent it no further request" });
|
|
950
|
+
continue;
|
|
951
|
+
}
|
|
1013
952
|
observedFailure(err, site, h.health, true);
|
|
1014
953
|
results.push({
|
|
1015
954
|
server: h.name,
|
|
@@ -1038,6 +977,7 @@ export async function materializeLegMcpTools(seat, ...[specs, principal, onElici
|
|
|
1038
977
|
return results;
|
|
1039
978
|
},
|
|
1040
979
|
reconnect: redialOnce,
|
|
980
|
+
...mcpHostReadPorts({ declaration: (name) => entries.find((e) => e.name === name), stopped: ownerStopped, route: (name) => serverHandles.find((h) => h.name === name)?.route, revoked: revokedNow, deps: binarySeat === undefined ? READ_DEPS : { ...READ_DEPS, keep: toolResultBytesKeeper(binarySeat, MCP_HOST_READ_CALL) } }),
|
|
1041
981
|
dispose: async () => {
|
|
1042
982
|
disposing = true;
|
|
1043
983
|
await Promise.allSettled(connections.map((c) => c.close()));
|
|
@@ -1082,6 +1022,16 @@ export function applyCallerAxisOverride(name, hint, override) {
|
|
|
1082
1022
|
axis.irreversibility = irrev;
|
|
1083
1023
|
return axis.effect !== undefined || axis.egress !== undefined || axis.irreversibility !== undefined ? axis : undefined;
|
|
1084
1024
|
}
|
|
1025
|
+
const MCP_HOST_READ_CALL = "mcp_host_read";
|
|
1026
|
+
const READ_DEPS = {
|
|
1027
|
+
walk: walkMcpListPages,
|
|
1028
|
+
fingerprint: listEntryFingerprint,
|
|
1029
|
+
timeoutMs: mcpToolTimeoutMs,
|
|
1030
|
+
idleMs: mcpIdleTimeoutMs,
|
|
1031
|
+
idleTripText: idleWatchdogTripText,
|
|
1032
|
+
failureText: namedMcpFailureText,
|
|
1033
|
+
};
|
|
1034
|
+
export const NO_DECLARED_MCP_READ_PORTS = mcpHostReadPorts({ declaration: () => undefined, stopped: () => undefined, route: () => undefined, revoked: () => undefined, deps: READ_DEPS });
|
|
1085
1035
|
const MCP_SKILLS_EXTENSION = "io.modelcontextprotocol/skills";
|
|
1086
1036
|
const MAX_DIR_READ_PAGES = 20;
|
|
1087
1037
|
const DIR_READ_NOT_A_DIRECTORY_RE = /not a directory|isn'?t a directory|not a folder/i;
|
|
@@ -1131,7 +1081,7 @@ export async function walkMcpListPages(fetchPage, opts) {
|
|
|
1131
1081
|
page = await fetchPage(cursor, remainingMs);
|
|
1132
1082
|
}
|
|
1133
1083
|
catch (err) {
|
|
1134
|
-
if (pages === 0 || opts.signal?.aborted)
|
|
1084
|
+
if (pages === 0 || opts.signal?.aborted || err instanceof ProtocolRevokedRefusal)
|
|
1135
1085
|
throw err;
|
|
1136
1086
|
return { items, incomplete: { reason: "page_error", pages, error: remoteErrorText(err, opts.declared ?? []) } };
|
|
1137
1087
|
}
|
|
@@ -1210,16 +1160,19 @@ async function readDirViaExtension(rs, uri, signal, timeoutMs, watchdog) {
|
|
|
1210
1160
|
do {
|
|
1211
1161
|
let page;
|
|
1212
1162
|
try {
|
|
1213
|
-
|
|
1163
|
+
const params = { uri, ...(cursor !== undefined ? { cursor } : {}) };
|
|
1164
|
+
page = await rs.through(() => rs.client.request({ method: "resources/directory/read", params }, ListResourcesResultSchema, { signal: watchdog.combinedSignal, timeout: timeoutMs }));
|
|
1214
1165
|
}
|
|
1215
1166
|
catch (err) {
|
|
1167
|
+
if (err instanceof ProtocolRevokedRefusal)
|
|
1168
|
+
throw err;
|
|
1216
1169
|
if (err instanceof ProtocolError && err.code === ProtocolErrorCode.InvalidParams) {
|
|
1217
1170
|
if (pages > 0)
|
|
1218
1171
|
return { kind: "ok", resources, cursorInvalid: true };
|
|
1219
1172
|
const detail = remoteErrorText(err, rs.declared);
|
|
1220
1173
|
return { kind: classifyDirReadInvalidParams(detail), detail };
|
|
1221
1174
|
}
|
|
1222
|
-
if (err
|
|
1175
|
+
if (notServed(err))
|
|
1223
1176
|
return { kind: "unsupported" };
|
|
1224
1177
|
if (pages > 0 && !signal?.aborted) {
|
|
1225
1178
|
return { kind: "ok", resources, incomplete: remoteErrorText(err, rs.declared) };
|
|
@@ -1263,7 +1216,7 @@ function renderDirChildren(server, uri, children, flags) {
|
|
|
1263
1216
|
terminate: false,
|
|
1264
1217
|
};
|
|
1265
1218
|
}
|
|
1266
|
-
function buildResourceTools(resourceServers,
|
|
1219
|
+
function buildResourceTools(resourceServers, binarySeat) {
|
|
1267
1220
|
const listable = () => resourceServers.filter((rs) => rs.listAllowed);
|
|
1268
1221
|
const readable = () => resourceServers.filter((rs) => rs.readAllowed);
|
|
1269
1222
|
if (listable().length === 0 && readable().length === 0)
|
|
@@ -1293,11 +1246,6 @@ function buildResourceTools(resourceServers, isServerRevoked = () => false) {
|
|
|
1293
1246
|
const errors = [];
|
|
1294
1247
|
const incomplete = [];
|
|
1295
1248
|
for (const rs of targets) {
|
|
1296
|
-
if (isServerRevoked(rs.server)) {
|
|
1297
|
-
errors.push({ server: rs.server, error: "server revoked by the operator mid-session (request not sent)" });
|
|
1298
|
-
sections.push(`[${rs.server}] Error: server revoked by the operator mid-session — the request was NOT sent. ${refusalScope("revocation")}`);
|
|
1299
|
-
continue;
|
|
1300
|
-
}
|
|
1301
1249
|
if (rs.health.dead) {
|
|
1302
1250
|
errors.push({ server: rs.server, error: "server disconnected (transport closed earlier in this task)" });
|
|
1303
1251
|
sections.push(`[${rs.server}] Error: server disconnected — its resources are unavailable.`);
|
|
@@ -1307,16 +1255,9 @@ function buildResourceTools(resourceServers, isServerRevoked = () => false) {
|
|
|
1307
1255
|
const watchdog = armMcpIdleWatchdog(rs.health, idleMs, signal);
|
|
1308
1256
|
const site = requestSite(rs.client);
|
|
1309
1257
|
try {
|
|
1310
|
-
const walk = await
|
|
1311
|
-
|
|
1312
|
-
|
|
1313
|
-
.catch((err) => {
|
|
1314
|
-
throw watchdog.idleSignal.reason === IDLE_WATCHDOG_ABORT_REASON ? new Error(idleWatchdogTripText(idleMs)) : err;
|
|
1315
|
-
});
|
|
1316
|
-
return { items: page.resources, ...(page.nextCursor !== undefined ? { nextCursor: page.nextCursor } : {}) };
|
|
1317
|
-
}, { budgetMs: mcpToolTimeoutMs(), onPage: () => watchdog.rearm(), fingerprintOf: listEntryFingerprint, declared: rs.declared, ...(signal !== undefined ? { signal } : {}) });
|
|
1318
|
-
all.push(...walk.items.map((r) => ({ server: rs.server, ...r })));
|
|
1319
|
-
const lines = walk.items.map((r) => resourceLine(r));
|
|
1258
|
+
const walk = await readMcpListing(rs, "resources", watchdog, idleMs, signal, READ_DEPS);
|
|
1259
|
+
all.push(...walk.entries.map((r) => ({ server: rs.server, ...r })));
|
|
1260
|
+
const lines = walk.entries.map((r) => resourceLine(r));
|
|
1320
1261
|
const body = lines.length ? lines.join("\n") : "(no resources)";
|
|
1321
1262
|
if (walk.incomplete) {
|
|
1322
1263
|
incomplete.push({ server: rs.server, ...walk.incomplete });
|
|
@@ -1327,6 +1268,11 @@ function buildResourceTools(resourceServers, isServerRevoked = () => false) {
|
|
|
1327
1268
|
}
|
|
1328
1269
|
}
|
|
1329
1270
|
catch (err) {
|
|
1271
|
+
if (err instanceof ProtocolRevokedRefusal) {
|
|
1272
|
+
errors.push({ server: rs.server, error: "server revoked by the operator (request not sent)" });
|
|
1273
|
+
sections.push(`[${rs.server}] Error: MCP server revoked by the operator — the request was NOT sent. ${refusalScope("revocation", "mcp")}`);
|
|
1274
|
+
continue;
|
|
1275
|
+
}
|
|
1330
1276
|
sanitizeMcpErrorTextInPlace(err, rs.declared);
|
|
1331
1277
|
if (signal?.aborted)
|
|
1332
1278
|
throw err;
|
|
@@ -1365,7 +1311,7 @@ function buildResourceTools(resourceServers, isServerRevoked = () => false) {
|
|
|
1365
1311
|
},
|
|
1366
1312
|
required: ["server", "uri"],
|
|
1367
1313
|
},
|
|
1368
|
-
execute: async (
|
|
1314
|
+
execute: async (toolCallId, params, signal) => {
|
|
1369
1315
|
const { server, uri } = (params ?? {});
|
|
1370
1316
|
if (!server || !uri)
|
|
1371
1317
|
return { content: [{ type: "text", text: "Error: `server` and `uri` are required." }], details: undefined, terminate: false };
|
|
@@ -1374,14 +1320,6 @@ function buildResourceTools(resourceServers, isServerRevoked = () => false) {
|
|
|
1374
1320
|
if (!rs)
|
|
1375
1321
|
return { content: [{ type: "text", text: `Error: no MCP server ${inlineUntrusted(server)} with readable resources. Available: ${serverNames(live)}.` }], details: undefined, terminate: false };
|
|
1376
1322
|
const what = `The read of resource ${inlineUntrusted(uri)}`;
|
|
1377
|
-
if (isServerRevoked(server)) {
|
|
1378
|
-
return {
|
|
1379
|
-
content: [{ type: "text", text: `${what} was refused: MCP server "${server}" was revoked by the operator mid-session. The request was NOT sent. ${refusalScope("revocation")}` }],
|
|
1380
|
-
details: { error: "mcp.server_revoked", code: "mcp.server_revoked", delivered: "no", server },
|
|
1381
|
-
terminate: false,
|
|
1382
|
-
isError: true,
|
|
1383
|
-
};
|
|
1384
|
-
}
|
|
1385
1323
|
if (rs.health.dead)
|
|
1386
1324
|
throwDeadServer(server, what);
|
|
1387
1325
|
const timeoutMs = mcpToolTimeoutMs();
|
|
@@ -1390,23 +1328,32 @@ function buildResourceTools(resourceServers, isServerRevoked = () => false) {
|
|
|
1390
1328
|
const site = requestSite(rs.client);
|
|
1391
1329
|
let res;
|
|
1392
1330
|
try {
|
|
1393
|
-
res = await rs.
|
|
1394
|
-
|
|
1395
|
-
|
|
1396
|
-
|
|
1331
|
+
res = await fetchMcpAnswer(rs, "resources/read", { uri }, watchdog, timeoutMs).catch((err) => rethrowHonestMcpError(err, { server, declared: rs.declared, what, timeoutMs, writeEffect: false, signal, attributeServer: true, site, idle: { signal: watchdog.idleSignal, idleMs }, liveness: rs.health }));
|
|
1332
|
+
}
|
|
1333
|
+
catch (err) {
|
|
1334
|
+
if (err instanceof ProtocolRevokedRefusal)
|
|
1335
|
+
return revokedCallResult(err, what);
|
|
1336
|
+
throw err;
|
|
1397
1337
|
}
|
|
1398
1338
|
finally {
|
|
1399
1339
|
watchdog.dispose();
|
|
1400
1340
|
}
|
|
1401
|
-
const
|
|
1402
|
-
|
|
1341
|
+
const kept = [];
|
|
1342
|
+
const text = (await Promise.all(res.items.map(async (entry) => {
|
|
1343
|
+
const c = typeof entry === "object" && entry !== null ? entry : {};
|
|
1344
|
+
const at = typeof c.uri === "string" ? c.uri : uri;
|
|
1345
|
+
const mimeType = typeof c.mimeType === "string" ? c.mimeType : undefined;
|
|
1346
|
+
if (typeof c.text === "string")
|
|
1403
1347
|
return c.text;
|
|
1404
|
-
if (
|
|
1405
|
-
|
|
1348
|
+
if (typeof c.blob === "string" && c.blob) {
|
|
1349
|
+
const k = await keepBinaryContent(toolResultBytesKeeper(binarySeat, toolCallId), c.blob, mimeType, `[binary resource ${at}] `);
|
|
1350
|
+
kept.push(k.kept);
|
|
1351
|
+
return k.block.text;
|
|
1406
1352
|
}
|
|
1407
|
-
return `[binary resource ${
|
|
1353
|
+
return `[binary resource ${at}${mimeType ? ` (${mediaTypePhrase(mimeType)})` : ""}]`;
|
|
1408
1354
|
}))).join("\n");
|
|
1409
|
-
|
|
1355
|
+
tellBinaryKept(binarySeat, { server, toolName: READ_MCP_RESOURCE, toolCallId, kept });
|
|
1356
|
+
return { content: [{ type: "text", text: delimitUntrusted(`${server} resource ${uri}`, text) }], details: res.answer, terminate: false };
|
|
1410
1357
|
},
|
|
1411
1358
|
});
|
|
1412
1359
|
axes.push({ name: READ_MCP_RESOURCE, effect: "read" });
|
|
@@ -1436,14 +1383,6 @@ function buildResourceTools(resourceServers, isServerRevoked = () => false) {
|
|
|
1436
1383
|
if (!rs)
|
|
1437
1384
|
return { content: [{ type: "text", text: `Error: no MCP server ${inlineUntrusted(server)} with listable resources. Available: ${serverNames(live)}.` }], details: undefined, terminate: false };
|
|
1438
1385
|
const what = `The directory listing of ${inlineUntrusted(uri)}`;
|
|
1439
|
-
if (isServerRevoked(server)) {
|
|
1440
|
-
return {
|
|
1441
|
-
content: [{ type: "text", text: `${what} was refused: MCP server "${server}" was revoked by the operator mid-session. The request was NOT sent. ${refusalScope("revocation")}` }],
|
|
1442
|
-
details: { error: "mcp.server_revoked", code: "mcp.server_revoked", delivered: "no", server },
|
|
1443
|
-
terminate: false,
|
|
1444
|
-
isError: true,
|
|
1445
|
-
};
|
|
1446
|
-
}
|
|
1447
1386
|
if (rs.health.dead)
|
|
1448
1387
|
throwDeadServer(server, what);
|
|
1449
1388
|
const timeoutMs = mcpToolTimeoutMs();
|
|
@@ -1478,17 +1417,16 @@ function buildResourceTools(resourceServers, isServerRevoked = () => false) {
|
|
|
1478
1417
|
return renderDirChildren(server, uri, r.resources, { truncated: r.truncated, incomplete: r.incomplete, cursorInvalid: r.cursorInvalid });
|
|
1479
1418
|
watchdog.rearm();
|
|
1480
1419
|
}
|
|
1481
|
-
const walk = await
|
|
1482
|
-
const page = await rs.client
|
|
1483
|
-
.request(resourcesListRequest(cursor), { signal: watchdog.combinedSignal, timeout: remainingMs })
|
|
1484
|
-
.catch((err) => rethrowHonestMcpError(err, { server, declared: rs.declared, what, timeoutMs: remainingMs, writeEffect: false, signal, attributeServer: true, site, idle: { signal: watchdog.idleSignal, idleMs }, liveness: rs.health }));
|
|
1485
|
-
rs.health.observe?.("completed");
|
|
1486
|
-
return { items: page.resources, ...(page.nextCursor !== undefined ? { nextCursor: page.nextCursor } : {}) };
|
|
1487
|
-
}, { budgetMs: timeoutMs, onPage: () => watchdog.rearm(), fingerprintOf: listEntryFingerprint, declared: rs.declared, ...(signal !== undefined ? { signal } : {}) });
|
|
1420
|
+
const walk = await readMcpListing(rs, "resources", watchdog, idleMs, signal, READ_DEPS, (err, remainingMs) => rethrowHonestMcpError(err, { server, declared: rs.declared, what, timeoutMs: remainingMs, writeEffect: false, signal, attributeServer: true, site, idle: { signal: watchdog.idleSignal, idleMs }, liveness: rs.health }));
|
|
1488
1421
|
const dirPrefix = uri.endsWith("/") ? uri : `${uri}/`;
|
|
1489
|
-
const children = walk.
|
|
1422
|
+
const children = walk.entries.filter((r) => r.uri !== uri && r.uri.startsWith(dirPrefix));
|
|
1490
1423
|
return renderDirChildren(server, uri, children, walk.incomplete ? { listing: walk.incomplete } : undefined);
|
|
1491
1424
|
}
|
|
1425
|
+
catch (err) {
|
|
1426
|
+
if (err instanceof ProtocolRevokedRefusal)
|
|
1427
|
+
return revokedCallResult(err, what);
|
|
1428
|
+
throw err;
|
|
1429
|
+
}
|
|
1492
1430
|
finally {
|
|
1493
1431
|
watchdog.dispose();
|
|
1494
1432
|
}
|
|
@@ -1548,14 +1486,12 @@ function parseLenientToolsPage(data) {
|
|
|
1548
1486
|
const cursorInvalid = nextCursor !== undefined && nextCursor !== null && typeof nextCursor !== "string";
|
|
1549
1487
|
return { value: { tools, ...(typeof nextCursor === "string" ? { nextCursor } : {}), ...(cursorInvalid ? { cursorInvalid: true } : {}) } };
|
|
1550
1488
|
}
|
|
1551
|
-
function
|
|
1552
|
-
return cursor === undefined ? { method: "resources/list" } : { method: "resources/list", params: { cursor } };
|
|
1553
|
-
}
|
|
1554
|
-
async function listToolsLenient(client, options, declared) {
|
|
1489
|
+
async function listToolsLenient(client, through, options, declared) {
|
|
1555
1490
|
if (!client.getServerCapabilities()?.tools)
|
|
1556
1491
|
return { tools: [], toolsCapabilityAbsent: true };
|
|
1557
1492
|
const walk = await walkMcpListPages(async (cursor, remainingMs) => {
|
|
1558
|
-
const
|
|
1493
|
+
const params = cursor === undefined ? {} : { cursor };
|
|
1494
|
+
const page = await through(() => client.request({ method: "tools/list", params }, LENIENT_LIST_TOOLS_RESULT_SCHEMA, { ...options, timeout: remainingMs }));
|
|
1559
1495
|
return {
|
|
1560
1496
|
items: page.tools,
|
|
1561
1497
|
...(page.nextCursor !== undefined ? { nextCursor: page.nextCursor } : {}),
|
|
@@ -1569,18 +1505,20 @@ async function listToolsLenient(client, options, declared) {
|
|
|
1569
1505
|
});
|
|
1570
1506
|
return { tools: walk.items, ...(walk.incomplete !== undefined ? { incomplete: walk.incomplete } : {}) };
|
|
1571
1507
|
}
|
|
1572
|
-
|
|
1508
|
+
function fingerprintRefusal(spec) {
|
|
1573
1509
|
const fp = spec.fingerprint;
|
|
1574
|
-
if (fp
|
|
1575
|
-
|
|
1576
|
-
}
|
|
1510
|
+
if (fp === undefined || (typeof fp === "string" && fp.length > 0 && fp.length <= 128))
|
|
1511
|
+
return undefined;
|
|
1512
|
+
return Object.assign(new Error(`MCP server "${inlineUntrusted(spec.name, 160)}": fingerprint must be a non-empty string of at most 128 characters (got ${typeof fp === "string" ? `${fp.length} characters` : typeof fp}) — not dialed`), { code: "config.mcp_fingerprint_invalid" });
|
|
1513
|
+
}
|
|
1514
|
+
async function connectServer(spec, principal, onElicit, binarySeat, reminderDisclosure, through, transportKind, pool, dialOpts, seat, onSubtreeActivity) {
|
|
1577
1515
|
const elicitOn = spec.elicitation === true && onElicit !== undefined;
|
|
1578
1516
|
const health = { dead: false, pendingElicitations: 0, lastElicitationClosedAt: 0 };
|
|
1579
1517
|
const announce = {};
|
|
1580
1518
|
const startupMs = mcpStartupTimeoutMs(spec);
|
|
1581
1519
|
const startupOpts = startupMs !== undefined ? { timeout: startupMs } : undefined;
|
|
1582
1520
|
const answersOneLeg = elicitOn || transportKind === "host";
|
|
1583
|
-
const poolKey = pool !== undefined && !answersOneLeg ? McpConnectionPool.keyOf(spec, principal, transportKind, startupMs) : undefined;
|
|
1521
|
+
const poolKey = pool !== undefined && !answersOneLeg ? McpConnectionPool.keyOf(spec, principal, transportKind, startupMs, dialOpts.isolationScope) : undefined;
|
|
1584
1522
|
const dialClient = async (stop = dialOpts?.signal) => {
|
|
1585
1523
|
stop?.throwIfAborted();
|
|
1586
1524
|
const outputSchemaValidator = new AjvJsonSchemaValidator();
|
|
@@ -1611,6 +1549,15 @@ async function connectServer(spec, principal, onElicit, imageProcessor, reminder
|
|
|
1611
1549
|
}
|
|
1612
1550
|
const pieces = transportKind === "stdio" ? await dialOpts.carrier.next(stop) : undefined;
|
|
1613
1551
|
const pipe = transportKind === "host" ? await openHostPipe(dialOpts.hostSeat, spec.name, stop) : undefined;
|
|
1552
|
+
if (transportKind === "stdio" || transportKind === "host") {
|
|
1553
|
+
try {
|
|
1554
|
+
askCarriedRevocation();
|
|
1555
|
+
}
|
|
1556
|
+
catch (refused) {
|
|
1557
|
+
await pipe?.close().catch(() => undefined);
|
|
1558
|
+
throw refused;
|
|
1559
|
+
}
|
|
1560
|
+
}
|
|
1614
1561
|
const transport = buildTransport(spec, principal, transportKind, dialOpts.carrier, pieces, pipe);
|
|
1615
1562
|
const hangUp = () => void client.close().catch(() => undefined);
|
|
1616
1563
|
stop?.addEventListener("abort", hangUp, { once: true });
|
|
@@ -1652,16 +1599,12 @@ async function connectServer(spec, principal, onElicit, imageProcessor, reminder
|
|
|
1652
1599
|
const at = listing.open();
|
|
1653
1600
|
const declared = (carrierOf(client) ?? dialOpts.carrier).sent;
|
|
1654
1601
|
const echo = carrierEcho(carrierOf(client) ?? dialOpts.carrier, dialOpts.announceEcho);
|
|
1655
|
-
const listed = await underStartupBound(startupMs, mountStop, (options) => listToolsLenient(client, options, declared)).finally(() => mount?.end());
|
|
1602
|
+
const listed = await underStartupBound(startupMs, mountStop, (options) => listToolsLenient(client, through, options, declared)).finally(() => mount?.end());
|
|
1656
1603
|
const answered = listing.answer(at, listed.tools, listed.incomplete !== undefined, dialOpts.carried);
|
|
1657
|
-
const { serverTools, serverAxes, gates, definitions, dropped, advisories } = intakeListedTools({ tools: [...answered.view], unproven: answered.unproven }, spec, dialOpts.link, declared, outputSchemaValidatorOf(client),
|
|
1604
|
+
const { serverTools, serverAxes, gates, definitions, dropped, advisories } = intakeListedTools({ tools: [...answered.view], unproven: answered.unproven }, spec, dialOpts.link, declared, outputSchemaValidatorOf(client), binarySeat, reminderDisclosure, through, transportKind, seat, echo, onSubtreeActivity);
|
|
1658
1605
|
const caps = client.getServerCapabilities();
|
|
1659
|
-
const resourceInfo = caps?.resources
|
|
1660
|
-
|
|
1661
|
-
listAllowed: !spec.allowTools || spec.allowTools.includes(MCP_RESOURCE_LIST_ALLOW),
|
|
1662
|
-
readAllowed: !spec.allowTools || spec.allowTools.includes(MCP_RESOURCE_READ_ALLOW),
|
|
1663
|
-
}
|
|
1664
|
-
: undefined;
|
|
1606
|
+
const resourceInfo = caps?.resources ? { listAllowed: faceAllowed(spec.allowTools, MCP_RESOURCE_LIST_ALLOW), readAllowed: faceAllowed(spec.allowTools, MCP_RESOURCE_READ_ALLOW) } : undefined;
|
|
1607
|
+
const route = { server: spec.name, client, through, health, transportKind: idleKindOf(transportKind), declared, meta: () => mcpCallMeta(undefined, undefined, spec.sessionMetaKey, seat?.sessionId), echo };
|
|
1665
1608
|
const rawInstructions = erasedEcho(client.getInstructions(), echo, "instructions");
|
|
1666
1609
|
const sanitized = rawInstructions && rawInstructions.trim() ? sanitizeUntrustedText(rawInstructions.trim()) : undefined;
|
|
1667
1610
|
const disposed = sanitized === undefined ? undefined : await disposeSectionEntry(dialOpts?.sections, { section: "core/discovery.mcp-instructions", server: spec.name, text: sanitized, mountedTools: serverTools.map((t) => t.name) });
|
|
@@ -1690,7 +1633,8 @@ async function connectServer(spec, principal, onElicit, imageProcessor, reminder
|
|
|
1690
1633
|
...(instructions ? { instructions } : {}),
|
|
1691
1634
|
...(disposed?.defect !== undefined ? { instructionsDefect: disposed.defect } : {}),
|
|
1692
1635
|
...(listed.incomplete !== undefined ? { listingIncomplete: listed.incomplete } : {}),
|
|
1693
|
-
|
|
1636
|
+
route,
|
|
1637
|
+
...(resourceInfo && (resourceInfo.listAllowed || resourceInfo.readAllowed) ? { resourceServer: { ...route, ...resourceInfo } } : {}),
|
|
1694
1638
|
};
|
|
1695
1639
|
}
|
|
1696
1640
|
catch (err) {
|
|
@@ -1700,7 +1644,7 @@ async function connectServer(spec, principal, onElicit, imageProcessor, reminder
|
|
|
1700
1644
|
throw err;
|
|
1701
1645
|
}
|
|
1702
1646
|
}
|
|
1703
|
-
function intakeListedTools(listed, spec, link, declared, validator,
|
|
1647
|
+
function intakeListedTools(listed, spec, link, declared, validator, binarySeat, reminderDisclosure, through = OPEN_DOOR, transportKind, seat, echo = NO_CREDENTIAL_ECHO, onSubtreeActivity) {
|
|
1704
1648
|
const declaredContentOrigin = spec.contentOrigin;
|
|
1705
1649
|
const serverTools = [];
|
|
1706
1650
|
const serverAxes = [];
|
|
@@ -1713,6 +1657,10 @@ function intakeListedTools(listed, spec, link, declared, validator, imageProcess
|
|
|
1713
1657
|
if (spec.allowTools && !spec.allowTools.includes(t.name)) {
|
|
1714
1658
|
continue;
|
|
1715
1659
|
}
|
|
1660
|
+
if (isMcpFaceWord(t.name)) {
|
|
1661
|
+
dropped.push({ tool: inlineUntrusted(t.name), reason: MCP_FACE_WORD_DROP_REASON });
|
|
1662
|
+
continue;
|
|
1663
|
+
}
|
|
1716
1664
|
const echoDrop = echoedToolDrop(t.name, t.inputSchema, echo);
|
|
1717
1665
|
if (echoDrop !== undefined) {
|
|
1718
1666
|
dropped.push(echoDrop);
|
|
@@ -1753,6 +1701,12 @@ function intakeListedTools(listed, spec, link, declared, validator, imageProcess
|
|
|
1753
1701
|
}
|
|
1754
1702
|
const remoteName = t.name;
|
|
1755
1703
|
const taskRequired = t.execution !== null && typeof t.execution === "object" && t.execution.taskSupport === "required";
|
|
1704
|
+
const wireName = mintNamespacedToolName(MCP_NAMESPACE, spec.name, remoteName);
|
|
1705
|
+
const rowNameProblem = rosterMemberBoundProblem({ name: wireName, remoteName: rosterRemoteNameOf(wireName, remoteName) });
|
|
1706
|
+
if (rowNameProblem !== undefined) {
|
|
1707
|
+
dropped.push({ tool: inlineUntrusted(t.name.replace(MCP_INVISIBLE_TEXT_RE, "")), reason: inlineUntrusted(rowNameProblem.message, 240) });
|
|
1708
|
+
continue;
|
|
1709
|
+
}
|
|
1756
1710
|
const { minted: namespacedName, heldBy: mintedBy } = claimToolName(remoteName);
|
|
1757
1711
|
if (mintedBy !== undefined) {
|
|
1758
1712
|
dropped.push({ tool: inlineUntrusted(t.name), reason: mcpToolDropReason(namespacedName, mintedBy, t.name) });
|
|
@@ -1783,17 +1737,9 @@ function intakeListedTools(listed, spec, link, declared, validator, imageProcess
|
|
|
1783
1737
|
mcpRemoteName: remoteName, ...boundaryFlowFace(spec.toolAxes?.[remoteName]), permissionSeat: "passthrough",
|
|
1784
1738
|
execute: async (toolCallId, params, signal) => {
|
|
1785
1739
|
const what = `The call to tool ${inlineUntrusted(remoteName)}`;
|
|
1786
|
-
if (isServerRevoked?.(spec.name) === true) {
|
|
1787
|
-
return {
|
|
1788
|
-
content: [{ type: "text", text: `The call to MCP server "${spec.name}" was refused: the server was revoked by the operator mid-session. The call was NOT sent, so the server did not execute it. ${refusalScope("revocation")}` }],
|
|
1789
|
-
details: { error: "mcp.server_revoked", code: "mcp.server_revoked", delivered: "no", server: spec.name },
|
|
1790
|
-
terminate: false,
|
|
1791
|
-
isError: true,
|
|
1792
|
-
};
|
|
1793
|
-
}
|
|
1794
1740
|
if (taskRequired) {
|
|
1795
1741
|
return {
|
|
1796
|
-
content: [{ type: "text", text: `The call was refused: this tool requires task-based execution (MCP tasks), which this client does not drive. The call was NOT sent, so the server did not execute it. ${refusalScope("declaration")}` }],
|
|
1742
|
+
content: [{ type: "text", text: `The call was refused: this tool requires task-based execution (MCP tasks), which this client does not drive. The call was NOT sent, so the server did not execute it. ${refusalScope("declaration", "mcp")}` }],
|
|
1797
1743
|
details: { error: "mcp.task_required", code: "mcp.task_required", delivered: "no", server: spec.name },
|
|
1798
1744
|
terminate: false,
|
|
1799
1745
|
isError: true,
|
|
@@ -1808,15 +1754,18 @@ function intakeListedTools(listed, spec, link, declared, validator, imageProcess
|
|
|
1808
1754
|
const site = requestSite(conn.client);
|
|
1809
1755
|
const watchdog = armMcpIdleWatchdog(conn.health, idleMs, signal);
|
|
1810
1756
|
try {
|
|
1811
|
-
const
|
|
1812
|
-
|
|
1757
|
+
const callParams = { name: remoteName, arguments: (params ?? {}), ...(callMeta !== undefined ? { _meta: callMeta } : {}) };
|
|
1758
|
+
const res = await through(() => conn.client.callTool(callParams, {
|
|
1813
1759
|
toolDefinition: definition.tool,
|
|
1814
1760
|
signal: watchdog.combinedSignal,
|
|
1815
1761
|
timeout: timeoutMs,
|
|
1816
1762
|
resetTimeoutOnProgress: true,
|
|
1817
|
-
onprogress: () =>
|
|
1763
|
+
onprogress: () => {
|
|
1764
|
+
onSubtreeActivity?.();
|
|
1765
|
+
watchdog.rearm();
|
|
1766
|
+
},
|
|
1818
1767
|
maxTotalTimeout: mcpToolTotalTimeoutMs(timeoutMs),
|
|
1819
|
-
})
|
|
1768
|
+
}))
|
|
1820
1769
|
.catch((err) => {
|
|
1821
1770
|
try {
|
|
1822
1771
|
return rethrowHonestMcpError(err, {
|
|
@@ -1853,14 +1802,17 @@ function intakeListedTools(listed, spec, link, declared, validator, imageProcess
|
|
|
1853
1802
|
watchdog.dispose();
|
|
1854
1803
|
}
|
|
1855
1804
|
};
|
|
1856
|
-
const send = (conn, resent) => inFlight(conn.client, () => sentOnceMore((last) => attempt(conn, resent, last), () =>
|
|
1805
|
+
const send = (conn, resent) => inFlight(conn.client, () => sentOnceMore((last) => attempt(conn, resent, last), () => reach(link, namespacedName, gate) === conn && signal?.aborted !== true).catch((err) => (owedByAnswer(err, conn.health), Promise.reject(err))));
|
|
1857
1806
|
const before = link.live();
|
|
1858
1807
|
if (before !== undefined && carrierOf(before.client)?.expired() === true)
|
|
1859
1808
|
await link.recover(before, "expired");
|
|
1860
|
-
const res = await callThroughLink(link, namespacedName, gate, signal, send, () => throwDeadServer(spec.name, what));
|
|
1809
|
+
const res = await callThroughLink(link, namespacedName, gate, signal, send, () => throwDeadServer(spec.name, what)).catch((err) => (err instanceof ProtocolRevokedRefusal ? err : Promise.reject(err)));
|
|
1810
|
+
if (res instanceof ProtocolRevokedRefusal)
|
|
1811
|
+
return revokedCallResult(res, what);
|
|
1861
1812
|
if (typeof res === "string")
|
|
1862
1813
|
return listingRefusal(res, remoteName, spec.name);
|
|
1863
|
-
const mapped = await mapContent(res.content, spec.name,
|
|
1814
|
+
const { content: mapped, kept } = await mapContent(res.content, spec.name, toolResultBytesKeeper(binarySeat, toolCallId));
|
|
1815
|
+
tellBinaryKept(binarySeat, { server: spec.name, toolName: namespacedName, toolCallId, kept });
|
|
1864
1816
|
if (res.isError === true) {
|
|
1865
1817
|
const parts = [];
|
|
1866
1818
|
for (const block of mapped) {
|
|
@@ -1923,7 +1875,8 @@ function intakeListedTools(listed, spec, link, declared, validator, imageProcess
|
|
|
1923
1875
|
}
|
|
1924
1876
|
function asServerWarning(spec, err, declared) {
|
|
1925
1877
|
const warning = new Error(`mcp: server "${spec.name}" failed to connect — skipped (${namedMcpFailureText(err, declared)})`, { cause: sanitizedCause(err, declared) });
|
|
1926
|
-
warning.code =
|
|
1878
|
+
warning.code = MCP_SERVER_UNAVAILABLE;
|
|
1879
|
+
warning.server = spec.name;
|
|
1927
1880
|
return warning;
|
|
1928
1881
|
}
|
|
1929
1882
|
function dialDecision(dialable, spec) {
|