@sema-agent/core 7.59.0 → 7.61.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 +1169 -0
- package/README.md +2 -2
- package/dist/agents/agent-definition.d.ts +7 -0
- package/dist/agents/agent-definition.js +12 -0
- package/dist/agents/agent-transcript-tool.d.ts +4 -3
- package/dist/agents/agent-transcript-tool.js +4 -2
- package/dist/agents/cascade.d.ts +61 -10
- package/dist/agents/cascade.js +60 -20
- package/dist/agents/child-model-seat.js +6 -3
- package/dist/agents/composition-allowance.d.ts +53 -0
- package/dist/agents/composition-allowance.js +49 -0
- package/dist/agents/composition-placement.d.ts +29 -0
- package/dist/agents/composition-placement.js +24 -0
- package/dist/agents/cumulative-stats.d.ts +4 -0
- package/dist/agents/cumulative-stats.js +3 -1
- package/dist/agents/inherited-tool-pool.d.ts +28 -1
- package/dist/agents/inherited-tool-pool.js +22 -0
- package/dist/agents/list-agents-tool.d.ts +1 -1
- package/dist/agents/peer-notice-route.d.ts +1 -1
- package/dist/agents/peer-notice-route.js +4 -3
- package/dist/agents/peer-notices.d.ts +4 -4
- package/dist/agents/peer-notices.js +8 -4
- package/dist/agents/peer-session-drain.d.ts +8 -1
- package/dist/agents/peer-session-drain.js +36 -7
- package/dist/agents/repair-loop.js +16 -6
- package/dist/agents/retain-ledger.d.ts +11 -1
- package/dist/agents/retain-ledger.js +16 -3
- package/dist/agents/roster-store.d.ts +2 -2
- package/dist/agents/roster-store.js +8 -3
- package/dist/agents/send-message-tool.d.ts +14 -27
- package/dist/agents/send-message-tool.js +47 -54
- package/dist/agents/subagent-completion-gate.d.ts +35 -0
- package/dist/agents/subagent-completion-gate.js +62 -0
- package/dist/agents/subagent-steps.d.ts +7 -6
- package/dist/agents/subagent.d.ts +52 -28
- package/dist/agents/subagent.js +276 -246
- package/dist/agents/suspend-guard.d.ts +9 -0
- package/dist/agents/suspend-guard.js +4 -0
- package/dist/agents/tool-filter.d.ts +1 -3
- package/dist/agents/tool-filter.js +4 -12
- package/dist/agents/verify.d.ts +41 -14
- package/dist/agents/verify.js +37 -27
- package/dist/bench/metrics.d.ts +3 -5
- package/dist/bench/metrics.js +0 -1
- package/dist/brain/anthropic.js +1 -0
- package/dist/brain/degrading.js +3 -1
- package/dist/brain/errors.d.ts +7 -1
- package/dist/brain/errors.js +6 -0
- package/dist/brain/failover.js +2 -1
- package/dist/brain/open-responses.js +1 -0
- package/dist/brain/openai.js +1 -0
- package/dist/brain/provider-dialect.d.ts +10 -0
- package/dist/brain/provider-dialect.js +13 -2
- package/dist/brain/route-adjudicator.js +3 -1
- package/dist/brain/status-sink.d.ts +7 -1
- package/dist/brain/status-sink.js +6 -0
- package/dist/brain/stream-engine.d.ts +3 -0
- package/dist/brain/stream-engine.js +4 -0
- package/dist/brain/timeout.d.ts +3 -1
- package/dist/brain/timeout.js +18 -5
- package/dist/core/a2a.d.ts +15 -5
- package/dist/core/a2a.js +34 -19
- package/dist/core/agent-definition.d.ts +20 -0
- package/dist/core/agent-state.d.ts +1 -1
- package/dist/core/allow-entry.d.ts +61 -23
- package/dist/core/allow-entry.js +134 -39
- package/dist/core/artifact-host.d.ts +0 -2
- package/dist/core/artifact-host.js +0 -1
- package/dist/core/ask-origin.d.ts +79 -0
- package/dist/core/ask-origin.js +76 -0
- package/dist/core/ask-question.d.ts +19 -13
- package/dist/core/ask-question.js +8 -2
- package/dist/core/auto-compaction.d.ts +2 -0
- package/dist/core/auto-compaction.js +2 -1
- package/dist/core/auto-mode-defaults.d.ts +8 -0
- package/dist/core/auto-mode-defaults.js +1 -0
- package/dist/core/auto-mode-rebuild.d.ts +2 -1
- package/dist/core/auto-mode.d.ts +39 -4
- package/dist/core/auto-mode.js +66 -17
- package/dist/core/background-agent-store.d.ts +17 -6
- package/dist/core/background-agent-store.js +15 -13
- package/dist/core/background-shell.d.ts +12 -1
- package/dist/core/background-shell.js +12 -0
- package/dist/core/checkpoint-requirements.d.ts +24 -3
- package/dist/core/checkpoint-requirements.js +9 -1
- package/dist/core/checkpoint-store.d.ts +86 -32
- package/dist/core/checkpoint-store.js +10 -5
- package/dist/core/child-clamp-seats.d.ts +3 -2
- package/dist/core/child-clamp-seats.js +4 -3
- package/dist/core/closest-name.d.ts +13 -0
- package/dist/core/closest-name.js +35 -0
- package/dist/core/compliance.d.ts +1 -1
- package/dist/core/context-settings.js +3 -5
- package/dist/core/credential-echo.d.ts +52 -0
- package/dist/core/credential-echo.js +65 -0
- package/dist/core/credential-vocabulary.d.ts +13 -3
- package/dist/core/credential-vocabulary.js +12 -4
- package/dist/core/cross-boundary-taint.d.ts +5 -6
- package/dist/core/decision-receipt.d.ts +14 -1
- package/dist/core/decision-receipt.js +6 -3
- package/dist/core/delegation-frames.d.ts +13 -9
- package/dist/core/effective-path-target.js +2 -3
- package/dist/core/engine-attestation.d.ts +11 -1
- package/dist/core/engine-attestation.js +2 -0
- package/dist/core/engine-notice.d.ts +106 -32
- package/dist/core/file-history-retention.d.ts +8 -0
- package/dist/core/file-history-retention.js +14 -11
- package/dist/core/file-history-store.d.ts +31 -1
- package/dist/core/file-history-store.js +31 -2
- package/dist/core/frame-settlement.d.ts +15 -0
- package/dist/core/frame-settlement.js +10 -1
- package/dist/core/fs-write-gate-policy.d.ts +3 -3
- package/dist/core/fs-write-gate-policy.js +8 -7
- package/dist/core/gate-fold.js +9 -6
- package/dist/core/gate-lanes.js +46 -12
- package/dist/core/gate-outcome.d.ts +40 -1
- package/dist/core/gate-outcome.js +10 -0
- package/dist/core/git-worktree-env.d.ts +7 -3
- package/dist/core/git-worktree-env.js +16 -13
- package/dist/core/governance-codes.d.ts +19 -3
- package/dist/core/governance-codes.js +27 -3
- package/dist/core/hands-band-screen.js +0 -1
- package/dist/core/hands-band.d.ts +0 -3
- package/dist/core/hooks.d.ts +51 -60
- package/dist/core/hooks.js +131 -78
- package/dist/core/host-floor.js +3 -5
- package/dist/core/image-admission.d.ts +145 -52
- package/dist/core/image-admission.js +202 -47
- package/dist/core/image-downsample.d.ts +36 -69
- package/dist/core/image-downsample.js +111 -73
- package/dist/core/input-author.d.ts +36 -0
- package/dist/core/input-author.js +39 -0
- package/dist/core/integer-option.d.ts +21 -0
- package/dist/core/integer-option.js +13 -0
- package/dist/core/leg-identity.d.ts +62 -0
- package/dist/core/leg-identity.js +18 -0
- package/dist/core/locked-config.d.ts +55 -3
- package/dist/core/locked-config.js +84 -51
- package/dist/core/lsp.d.ts +5 -3
- package/dist/core/lsp.js +3 -2
- package/dist/core/mailbox-store.d.ts +85 -10
- package/dist/core/mailbox-store.js +31 -10
- package/dist/core/mcp-call-meta.d.ts +2 -2
- package/dist/core/mcp-call-meta.js +9 -10
- package/dist/core/mcp-connection-pool.d.ts +6 -20
- package/dist/core/mcp-connection-pool.js +10 -28
- package/dist/core/mcp-failure.d.ts +83 -16
- package/dist/core/mcp-failure.js +67 -30
- package/dist/core/mcp-host-seat.d.ts +131 -0
- package/dist/core/mcp-host-seat.js +305 -0
- package/dist/core/mcp-probe.d.ts +7 -2
- package/dist/core/mcp-probe.js +9 -4
- package/dist/core/mcp-server-link.d.ts +18 -6
- package/dist/core/mcp-server-link.js +19 -4
- package/dist/core/mcp-server-spec.d.ts +39 -9
- package/dist/core/mcp-server-spec.js +55 -21
- package/dist/core/mcp-session-end.d.ts +1 -2
- package/dist/core/mcp-session-end.js +1 -1
- package/dist/core/mcp.d.ts +23 -55
- package/dist/core/mcp.js +172 -156
- package/dist/core/media-byte-cap.d.ts +21 -46
- package/dist/core/media-byte-cap.js +55 -55
- package/dist/core/member-group.d.ts +7 -0
- package/dist/core/member-group.js +35 -0
- package/dist/core/memory-admission.d.ts +23 -6
- package/dist/core/memory-admission.js +19 -9
- package/dist/core/memory-engine/consolidation.d.ts +1 -1
- package/dist/core/memory-engine/consolidation.js +7 -1
- package/dist/core/memory-engine/content-origin.d.ts +13 -0
- package/dist/core/memory-engine/content-origin.js +21 -3
- package/dist/core/memory-engine/dual-root.d.ts +31 -0
- package/dist/core/memory-engine/dual-root.js +59 -11
- package/dist/core/memory-engine/engine.js +27 -24
- package/dist/core/memory-engine/file-backend.d.ts +13 -0
- package/dist/core/memory-engine/file-backend.js +35 -15
- package/dist/core/memory-engine/index.d.ts +2 -1
- package/dist/core/memory-engine/index.js +2 -1
- package/dist/core/memory-engine/layout.d.ts +3 -0
- package/dist/core/memory-engine/layout.js +13 -3
- package/dist/core/memory-engine/memory-deployment.d.ts +110 -0
- package/dist/core/memory-engine/memory-deployment.js +182 -0
- package/dist/core/memory-engine/scope-contract.d.ts +13 -3
- package/dist/core/memory-engine/scope-contract.js +2 -2
- package/dist/core/memory-engine/sync-client.d.ts +68 -13
- package/dist/core/memory-engine/sync-client.js +147 -18
- package/dist/core/memory-engine/sync-report.d.ts +106 -0
- package/dist/core/memory-engine/sync-report.js +119 -0
- package/dist/core/memory-engine/sync.d.ts +13 -3
- package/dist/core/mode-policy.d.ts +15 -7
- package/dist/core/mode-policy.js +18 -6
- package/dist/core/model-receipt.d.ts +39 -0
- package/dist/core/model-receipt.js +139 -0
- package/dist/core/mods/agent-stations.d.ts +100 -0
- package/dist/core/mods/agent-stations.js +154 -0
- package/dist/core/mods/dollar.d.ts +62 -0
- package/dist/core/mods/extension-call.d.ts +15 -1
- package/dist/core/mods/extension-call.js +7 -2
- package/dist/core/mods/kernel/dispatch.d.ts +9 -4
- package/dist/core/mods/kernel/dispatch.js +8 -8
- package/dist/core/mods/kernel/events.d.ts +13 -4
- package/dist/core/mods/kernel/events.js +14 -10
- package/dist/core/mods/kernel/receive.d.ts +5 -0
- package/dist/core/mods/kernel/receive.js +10 -0
- package/dist/core/mods/kernel/registration.d.ts +3 -0
- package/dist/core/mods/kernel/registration.js +5 -0
- package/dist/core/mods/kernel/site-rules.d.ts +6 -3
- package/dist/core/mods/kernel/site-rules.js +10 -2
- package/dist/core/mods/lifecycle-stations.d.ts +41 -0
- package/dist/core/mods/lifecycle-stations.js +35 -0
- package/dist/core/mods/session-append.d.ts +115 -0
- package/dist/core/mods/session-append.js +311 -0
- package/dist/core/mods/session-compact.d.ts +48 -0
- package/dist/core/mods/session-compact.js +194 -0
- package/dist/core/mods/session-receive.d.ts +93 -0
- package/dist/core/mods/session-receive.js +141 -0
- package/dist/core/mods/session-send.d.ts +72 -0
- package/dist/core/mods/session-send.js +88 -0
- package/dist/core/mods/stations.d.ts +89 -75
- package/dist/core/mods/stations.js +57 -53
- package/dist/core/mods/tool-call.d.ts +12 -4
- package/dist/core/mods/tool-call.js +32 -16
- package/dist/core/mounted-mcp.d.ts +5 -0
- package/dist/core/mounted-mcp.js +2 -2
- package/dist/core/namespaced-rule-name.d.ts +7 -1
- package/dist/core/namespaced-rule-name.js +13 -2
- package/dist/core/oracle-isolation.js +1 -1
- package/dist/core/output-style.js +3 -4
- package/dist/core/own-property-receipt.d.ts +62 -0
- package/dist/core/own-property-receipt.js +43 -0
- package/dist/core/park-selfcheck.js +12 -10
- package/dist/core/path-identity.d.ts +11 -0
- package/dist/core/path-identity.js +4 -0
- package/dist/core/path-rule-binding.d.ts +3 -1
- package/dist/core/path-rule-binding.js +3 -1
- package/dist/core/peer-seat.d.ts +66 -11
- package/dist/core/peer-seat.js +199 -42
- package/dist/core/permission-rule-consent.d.ts +21 -26
- package/dist/core/permission-rule-consent.js +22 -3
- package/dist/core/permission-rule-model.d.ts +38 -13
- package/dist/core/permission-rule-model.js +54 -16
- package/dist/core/permission-rule-org.d.ts +1 -1
- package/dist/core/permission-rule-provider.js +4 -1
- package/dist/core/permission-rules.d.ts +4 -0
- package/dist/core/permission-rules.js +11 -16
- package/dist/core/protocol-http-auth.d.ts +14 -2
- package/dist/core/protocol-http-auth.js +16 -7
- package/dist/core/read-face-seats.d.ts +7 -5
- package/dist/core/read-face-seats.js +4 -1
- package/dist/core/redaction-marks.d.ts +4 -3
- package/dist/core/redaction-marks.js +2 -2
- package/dist/core/remote-env.d.ts +218 -122
- package/dist/core/remote-env.js +133 -14
- package/dist/core/retention-policy.d.ts +24 -23
- package/dist/core/retention-policy.js +36 -2
- package/dist/core/retention.d.ts +4 -1
- package/dist/core/retention.js +37 -12
- package/dist/core/retired-keys.d.ts +8 -3
- package/dist/core/retired-keys.js +4 -1
- package/dist/core/rewrite-rejudge.d.ts +12 -5
- package/dist/core/rewrite-rejudge.js +9 -5
- package/dist/core/roles.d.ts +37 -3
- package/dist/core/roles.js +126 -78
- package/dist/core/row-admission.d.ts +10 -0
- package/dist/core/row-admission.js +5 -0
- package/dist/core/rule-owner.d.ts +3 -0
- package/dist/core/runner/advisor-instructions.d.ts +2 -1
- package/dist/core/runner/advisor-instructions.js +2 -1
- package/dist/core/runner/announce-once-ledger.d.ts +4 -4
- package/dist/core/runner/assemble-result.d.ts +13 -8
- package/dist/core/runner/assemble-result.js +12 -8
- package/dist/core/runner/call-hook-stations.d.ts +17 -10
- package/dist/core/runner/call-hook-stations.js +21 -10
- package/dist/core/runner/caller-roster.d.ts +12 -9
- package/dist/core/runner/caller-roster.js +5 -2
- package/dist/core/runner/checkpoint-scope.d.ts +16 -1
- package/dist/core/runner/checkpoint-scope.js +21 -0
- package/dist/core/runner/child-tree.d.ts +7 -8
- package/dist/core/runner/child-tree.js +6 -6
- package/dist/core/runner/classifier-ladder.d.ts +10 -2
- package/dist/core/runner/classifier-ladder.js +39 -8
- package/dist/core/runner/compact-session.js +14 -2
- package/dist/core/runner/compaction-call-options.d.ts +1 -1
- package/dist/core/runner/compaction-restate.d.ts +2 -2
- package/dist/core/runner/compaction-restate.js +4 -3
- package/dist/core/runner/construction-doors.d.ts +2 -2
- package/dist/core/runner/construction-doors.js +7 -2
- package/dist/core/runner/contracts.d.ts +158 -65
- package/dist/core/runner/cross-boundary-lane.d.ts +4 -6
- package/dist/core/runner/cross-boundary-lane.js +11 -2
- package/dist/core/runner/decide-continuation.d.ts +4 -2
- package/dist/core/runner/decide-continuation.js +7 -4
- package/dist/core/runner/denial-limit-arms.d.ts +15 -21
- package/dist/core/runner/denial-limit-arms.js +17 -10
- package/dist/core/runner/env-capability-census.d.ts +15 -20
- package/dist/core/runner/env-capability-census.js +25 -34
- package/dist/core/runner/expire-settle.d.ts +44 -0
- package/dist/core/runner/expire-settle.js +55 -0
- package/dist/core/runner/file-history-request.d.ts +2 -2
- package/dist/core/runner/file-history-request.js +0 -8
- package/dist/core/runner/gate-exit.d.ts +75 -7
- package/dist/core/runner/gate-exit.js +20 -1
- package/dist/core/runner/git-status-frame.d.ts +5 -2
- package/dist/core/runner/git-status-frame.js +4 -4
- package/dist/core/runner/halt-attribution.d.ts +2 -1
- package/dist/core/runner/halt-attribution.js +2 -1
- package/dist/core/runner/image.d.ts +7 -2
- package/dist/core/runner/image.js +14 -8
- package/dist/core/runner/inline-image.d.ts +10 -8
- package/dist/core/runner/inline-image.js +11 -9
- package/dist/core/runner/local-claims.d.ts +17 -0
- package/dist/core/runner/local-claims.js +18 -0
- package/dist/core/runner/media-removed-seat.d.ts +46 -0
- package/dist/core/runner/media-removed-seat.js +88 -0
- package/dist/core/runner/memory-consolidation-driver.js +4 -4
- package/dist/core/runner/park-commit.d.ts +2 -2
- package/dist/core/runner/permission-rule-lanes.d.ts +5 -1
- package/dist/core/runner/permission-rule-lanes.js +29 -10
- package/dist/core/runner/person-path-rows.js +1 -1
- package/dist/core/runner/placement-fence.d.ts +26 -0
- package/dist/core/runner/placement-fence.js +38 -0
- package/dist/core/runner/prepare-ask-lane.d.ts +6 -12
- package/dist/core/runner/prepare-ask-lane.js +4 -4
- package/dist/core/runner/prepare-boundary-parks.d.ts +6 -3
- package/dist/core/runner/prepare-boundary-parks.js +4 -4
- package/dist/core/runner/prepare-caps-and-workflow.d.ts +6 -0
- package/dist/core/runner/prepare-caps-and-workflow.js +5 -3
- package/dist/core/runner/prepare-config-doors.d.ts +6 -1
- package/dist/core/runner/prepare-config-doors.js +30 -26
- package/dist/core/runner/prepare-context-lane.d.ts +6 -2
- package/dist/core/runner/prepare-context-lane.js +13 -13
- package/dist/core/runner/prepare-delegation-surface.d.ts +13 -11
- package/dist/core/runner/prepare-delegation-surface.js +7 -8
- package/dist/core/runner/prepare-execution-env.d.ts +5 -2
- package/dist/core/runner/prepare-execution-env.js +7 -4
- package/dist/core/runner/prepare-file-history.d.ts +10 -12
- package/dist/core/runner/prepare-file-history.js +3 -12
- package/dist/core/runner/prepare-gate-stations.d.ts +23 -17
- package/dist/core/runner/prepare-gate-stations.js +10 -7
- package/dist/core/runner/prepare-hands-readface.d.ts +8 -6
- package/dist/core/runner/prepare-hands-readface.js +19 -11
- package/dist/core/runner/prepare-inherited-gate.d.ts +11 -4
- package/dist/core/runner/prepare-inherited-gate.js +12 -5
- package/dist/core/runner/prepare-lsp.d.ts +3 -0
- package/dist/core/runner/prepare-lsp.js +2 -2
- package/dist/core/runner/prepare-memory-engine-session.js +1 -1
- package/dist/core/runner/prepare-memory.d.ts +2 -2
- package/dist/core/runner/prepare-memory.js +2 -2
- package/dist/core/runner/prepare-park-ask.d.ts +8 -7
- package/dist/core/runner/prepare-park-ask.js +6 -12
- package/dist/core/runner/prepare-policy-chain.d.ts +15 -25
- package/dist/core/runner/prepare-policy-chain.js +131 -128
- package/dist/core/runner/prepare-project-context.d.ts +2 -2
- package/dist/core/runner/prepare-project-context.js +8 -5
- package/dist/core/runner/prepare-prompt-inputs.d.ts +4 -0
- package/dist/core/runner/prepare-prompt-inputs.js +4 -2
- package/dist/core/runner/prepare-protocol-tools.d.ts +5 -3
- package/dist/core/runner/prepare-protocol-tools.js +9 -2
- package/dist/core/runner/prepare-question-face.d.ts +6 -4
- package/dist/core/runner/prepare-question-face.js +2 -2
- package/dist/core/runner/prepare-run-refs.d.ts +3 -0
- package/dist/core/runner/prepare-run-refs.js +2 -2
- package/dist/core/runner/prepare-suspend-saga.d.ts +11 -9
- package/dist/core/runner/prepare-suspend-saga.js +21 -13
- package/dist/core/runner/prepare-task.d.ts +1 -1
- package/dist/core/runner/prepare-task.js +84 -42
- package/dist/core/runner/prepare-tool-disclosure-mount.d.ts +6 -0
- package/dist/core/runner/prepare-tool-disclosure-mount.js +3 -1
- package/dist/core/runner/prepare-turn-wiring.d.ts +2 -0
- package/dist/core/runner/prepare-turn-wiring.js +7 -2
- package/dist/core/runner/prepare-wiring-manifest.d.ts +7 -3
- package/dist/core/runner/prepare-wiring-manifest.js +34 -19
- package/dist/core/runner/prepare-workspace-restore.d.ts +5 -0
- package/dist/core/runner/prepare-workspace-restore.js +12 -8
- package/dist/core/runner/read-root-grant.d.ts +1 -1
- package/dist/core/runner/read-root-grant.js +2 -1
- package/dist/core/runner/resume-admission.d.ts +5 -3
- package/dist/core/runner/resume-admission.js +17 -3
- package/dist/core/runner/resume-apply.js +3 -1
- package/dist/core/runner/resume-checkpoint-screen.js +4 -4
- package/dist/core/runner/resume-claim.d.ts +8 -3
- package/dist/core/runner/resume-claim.js +28 -12
- package/dist/core/runner/resume-internals-and-config.d.ts +2 -2
- package/dist/core/runner/resume-internals-and-config.js +10 -1
- package/dist/core/runner/resume-preflight.d.ts +3 -2
- package/dist/core/runner/resume-preflight.js +13 -26
- package/dist/core/runner/retired-runner-deps.js +6 -1
- package/dist/core/runner/run-attachment-seats.js +3 -3
- package/dist/core/runner/run-brain-sinks.js +1 -0
- package/dist/core/runner/run-git-lane.d.ts +3 -1
- package/dist/core/runner/run-git-lane.js +3 -2
- package/dist/core/runner/run-harness-handlers.d.ts +3 -1
- package/dist/core/runner/run-harness-handlers.js +5 -3
- package/dist/core/runner/run-identity-wiring.d.ts +2 -2
- package/dist/core/runner/run-identity-wiring.js +15 -6
- package/dist/core/runner/run-leg.d.ts +3 -3
- package/dist/core/runner/run-leg.js +65 -56
- package/dist/core/runner/run-notification-lane.d.ts +3 -1
- package/dist/core/runner/run-notification-lane.js +36 -12
- package/dist/core/runner/run-recovery-lanes.js +3 -2
- package/dist/core/runner/run-settle-and-teardown.js +14 -8
- package/dist/core/runner/run-stop-and-final-verify.d.ts +4 -0
- package/dist/core/runner/run-stop-and-final-verify.js +12 -4
- package/dist/core/runner/run-telemetry-and-budget-seats.d.ts +1 -1
- package/dist/core/runner/run-terminal-adoption.d.ts +1 -1
- package/dist/core/runner/run-terminal-adoption.js +26 -17
- package/dist/core/runner/run-turn-boundary.js +37 -19
- package/dist/core/runner/runtask.d.ts +25 -7
- package/dist/core/runner/runtask.js +46 -22
- package/dist/core/runner/session-rule-policy.d.ts +1 -1
- package/dist/core/runner/session-rule-policy.js +6 -1
- package/dist/core/runner/shell-env-withheld.d.ts +1 -1
- package/dist/core/runner/skills-seat.js +2 -2
- package/dist/core/runner/stream-halt-verbs.d.ts +1 -14
- package/dist/core/runner/stream-halt-verbs.js +4 -3
- package/dist/core/runner/stream-reap.d.ts +7 -6
- package/dist/core/runner/stream-reap.js +13 -16
- package/dist/core/runner/stream-settle-backstop.d.ts +3 -2
- package/dist/core/runner/stream-settle-backstop.js +5 -3
- package/dist/core/runner/stream-steer-verb.d.ts +5 -2
- package/dist/core/runner/stream-steer-verb.js +8 -7
- package/dist/core/runner/sub-agent-deny-lists.js +10 -7
- package/dist/core/runner/synthetic-tools.js +2 -2
- package/dist/core/runner/terminal-account.d.ts +11 -1
- package/dist/core/runner/terminal-account.js +20 -0
- package/dist/core/runner/terminal-projection.d.ts +8 -2
- package/dist/core/runner/terminal-projection.js +2 -2
- package/dist/core/runner/tool-disclosure.d.ts +3 -0
- package/dist/core/runner/tool-disclosure.js +5 -4
- package/dist/core/runner/tool-end-body.d.ts +3 -3
- package/dist/core/runner/tool-end-body.js +1 -1
- package/dist/core/runner/tool-face-overlay.d.ts +1 -1
- package/dist/core/runner/tool-face-overlay.js +26 -19
- package/dist/core/runner/tool-output-projection.d.ts +3 -3
- package/dist/core/runner/tool-output-projection.js +7 -6
- package/dist/core/runner/tool-result-media-seat.d.ts +9 -1
- package/dist/core/runner/tool-result-media-seat.js +17 -1
- package/dist/core/runner/tool-table-view.d.ts +56 -0
- package/dist/core/runner/tool-table-view.js +51 -0
- package/dist/core/runner/turn-attachments.d.ts +6 -7
- package/dist/core/runner/turn-attachments.js +4 -17
- package/dist/core/runner/void-verifier-pause.d.ts +33 -0
- package/dist/core/runner/void-verifier-pause.js +41 -0
- package/dist/core/runner-deps.d.ts +55 -43
- package/dist/core/secret-env.d.ts +14 -13
- package/dist/core/secret-env.js +8 -9
- package/dist/core/session-log-transfer.js +9 -10
- package/dist/core/session-policy-store.d.ts +10 -3
- package/dist/core/session-policy-store.js +21 -3
- package/dist/core/session-reconcile.d.ts +3 -2
- package/dist/core/session-reconcile.js +7 -4
- package/dist/core/session-store.d.ts +5 -2
- package/dist/core/session-store.js +53 -16
- package/dist/core/session.d.ts +2 -1
- package/dist/core/shell-confinement.d.ts +37 -0
- package/dist/core/shell-confinement.js +56 -0
- package/dist/core/skill-grant.d.ts +9 -0
- package/dist/core/skill-grant.js +18 -0
- package/dist/core/store-contracts/checkpoint-store-contract.d.ts +2 -2
- package/dist/core/store-contracts/checkpoint-store-contract.js +15 -2
- package/dist/core/store-contracts/file-history-store-contract.d.ts +5 -2
- package/dist/core/store-contracts/file-history-store-contract.js +25 -1
- package/dist/core/store-contracts/mailbox-store-contract.d.ts +12 -5
- package/dist/core/store-contracts/mailbox-store-contract.js +156 -9
- package/dist/core/store-contracts/tool-result-store-contract.d.ts +1 -1
- package/dist/core/store-contracts/tool-result-store-contract.js +67 -0
- package/dist/core/stub-env.d.ts +5 -5
- package/dist/core/stub-env.js +11 -1
- package/dist/core/swappable-deps.d.ts +17 -43
- package/dist/core/swappable-deps.js +15 -5
- package/dist/core/synthetic-read-verdict.d.ts +1 -1
- package/dist/core/task-event.d.ts +35 -10
- package/dist/core/task-limits.d.ts +5 -0
- package/dist/core/task-notification.d.ts +172 -12
- package/dist/core/task-notification.js +209 -12
- package/dist/core/task-registry-agent.d.ts +23 -55
- package/dist/core/task-registry-agent.js +41 -56
- package/dist/core/task-registry-monitor.d.ts +8 -1
- package/dist/core/task-registry-monitor.js +43 -61
- package/dist/core/task-registry-shared.d.ts +52 -114
- package/dist/core/task-registry-shared.js +24 -48
- package/dist/core/task-registry-workflow.js +5 -22
- package/dist/core/task-registry.d.ts +64 -90
- package/dist/core/task-registry.js +73 -119
- package/dist/core/task-result.d.ts +27 -19
- package/dist/core/task-spec-members.d.ts +39 -0
- package/dist/core/task-spec-members.js +92 -0
- package/dist/core/task-spec.d.ts +13 -16
- package/dist/core/task-stream.d.ts +1 -1
- package/dist/core/task-tool-shape.d.ts +7 -57
- package/dist/core/task-tool-shape.js +7 -66
- package/dist/core/terminal-cause.d.ts +30 -0
- package/dist/core/terminal-cause.js +1 -0
- package/dist/core/tool-catalog-entries.js +3 -6
- package/dist/core/tool-check-reading.js +16 -10
- package/dist/core/tool-conformance.js +1 -2
- package/dist/core/tool-errors.d.ts +6 -3
- package/dist/core/tool-errors.js +2 -0
- package/dist/core/tool-face-reader.d.ts +7 -6
- package/dist/core/tool-face-reader.js +6 -4
- package/dist/core/tool-face.d.ts +2 -3
- package/dist/core/tool-name-aliases.d.ts +23 -28
- package/dist/core/tool-name-aliases.js +63 -7
- package/dist/core/tool-name-readings.d.ts +14 -3
- package/dist/core/tool-name-readings.js +2 -0
- package/dist/core/tool-policy.d.ts +113 -22
- package/dist/core/tool-policy.js +85 -15
- package/dist/core/tool-registry.d.ts +5 -5
- package/dist/core/tool-registry.js +2 -2
- package/dist/core/tool-result-store.d.ts +111 -5
- package/dist/core/tool-result-store.js +52 -12
- package/dist/core/tool-spec.d.ts +39 -10
- package/dist/core/trace.d.ts +18 -2
- package/dist/core/types.d.ts +3 -3
- package/dist/core/types.js +1 -1
- package/dist/core/untrusted-text.js +1 -1
- package/dist/core/user-attachment.d.ts +10 -5
- package/dist/core/user-attachment.js +40 -27
- package/dist/core/workflow-journal-store.d.ts +1 -1
- package/dist/core/workflow-run-store.d.ts +2 -0
- package/dist/core/workflow-run-store.js +6 -5
- package/dist/core/workflow-settled-run.d.ts +5 -0
- package/dist/core/workflow-settled-run.js +7 -0
- package/dist/engine/execution-env/node-execution-env.d.ts +37 -7
- package/dist/engine/execution-env/node-execution-env.js +224 -21
- package/dist/engine/harness/agent-harness.d.ts +66 -19
- package/dist/engine/harness/agent-harness.js +98 -27
- package/dist/engine/harness/messages.d.ts +4 -3
- package/dist/engine/harness/messages.js +2 -2
- package/dist/engine/harness/types.d.ts +151 -34
- package/dist/engine/llm/media-removed.d.ts +14 -0
- package/dist/engine/llm/media-removed.js +9 -0
- package/dist/engine/llm/rejected-images.d.ts +35 -25
- package/dist/engine/llm/rejected-images.js +59 -10
- package/dist/engine/llm/types.d.ts +24 -3
- package/dist/engine/llm/types.js +7 -3
- package/dist/engine/loop/agent-loop.d.ts +18 -13
- package/dist/engine/loop/agent-loop.js +173 -32
- package/dist/engine/loop/types.d.ts +21 -5
- package/dist/engine/lsp/node-lsp-manager.d.ts +3 -3
- package/dist/engine/lsp/node-lsp-manager.js +32 -13
- package/dist/engine/session/import-validate.js +7 -0
- package/dist/fixtures/index.d.ts +7 -5
- package/dist/fixtures/index.js +5 -3
- package/dist/index.d.ts +41 -23
- package/dist/index.js +29 -16
- package/dist/internal/harness-types.d.ts +3 -1
- package/dist/internal/llm.d.ts +2 -1
- package/dist/internal/llm.js +1 -0
- package/dist/orchestration/goal.d.ts +6 -2
- package/dist/orchestration/goal.js +6 -3
- package/dist/orchestration/run-workflow-tool.d.ts +20 -20
- package/dist/orchestration/run-workflow-tool.js +63 -56
- package/dist/orchestration/workflow-governance.d.ts +1 -1
- package/dist/orchestration/workflow-governance.js +2 -1
- package/dist/orchestration/workflow-types.d.ts +2 -2
- package/dist/orchestration/workflow.d.ts +8 -0
- package/dist/orchestration/workflow.js +33 -9
- package/dist/prompts/default.d.ts +1 -10
- package/dist/prompts/default.js +0 -2
- package/dist/stores/file/background-agent-store.d.ts +1 -1
- package/dist/stores/file/background-agent-store.js +19 -14
- package/dist/stores/file/checkpoint-store.d.ts +127 -2
- package/dist/stores/file/checkpoint-store.js +24 -16
- package/dist/stores/file/file-history-store.d.ts +1 -1
- package/dist/stores/file/file-history-store.js +4 -1
- package/dist/stores/file/index.d.ts +9 -6
- package/dist/stores/file/index.js +33 -9
- package/dist/stores/file/ledger-tuning.d.ts +23 -0
- package/dist/stores/file/ledger-tuning.js +21 -0
- package/dist/stores/file/mailbox-store.d.ts +1 -1
- package/dist/stores/file/mailbox-store.js +43 -21
- package/dist/stores/file/memory-store.d.ts +1 -1
- package/dist/stores/file/memory-store.js +4 -1
- package/dist/stores/file/permission-rule-adopt.js +24 -21
- package/dist/stores/file/permission-rule-store.js +6 -3
- package/dist/stores/file/session-policy-store.d.ts +1 -1
- package/dist/stores/file/session-policy-store.js +4 -1
- package/dist/stores/file/session-store.d.ts +17 -4
- package/dist/stores/file/session-store.js +22 -19
- package/dist/stores/file/shared-ledger.d.ts +26 -0
- package/dist/stores/file/shared-ledger.js +38 -9
- package/dist/stores/file/tool-result-store.d.ts +31 -2
- package/dist/stores/file/tool-result-store.js +129 -7
- package/dist/stores/file/usage-window-store.d.ts +1 -1
- package/dist/stores/file/usage-window-store.js +4 -1
- package/dist/stores/file/workflow-journal-store.d.ts +1 -13
- package/dist/stores/file/workflow-journal-store.js +4 -18
- package/dist/stores/file/workflow-run-store.d.ts +1 -1
- package/dist/stores/file/workflow-run-store.js +15 -10
- package/dist/tools/fs/containment-face.d.ts +5 -0
- package/dist/tools/fs/dead-cwd.d.ts +5 -5
- package/dist/tools/fs/dead-cwd.js +4 -11
- package/dist/tools/fs/encoding.d.ts +13 -4
- package/dist/tools/fs/encoding.js +17 -2
- package/dist/tools/fs/fs-bash-background-text.d.ts +13 -0
- package/dist/tools/fs/fs-bash-background-text.js +7 -0
- package/dist/tools/fs/fs-bash.d.ts +11 -22
- package/dist/tools/fs/fs-bash.js +58 -154
- package/dist/tools/fs/fs-pdf.d.ts +2 -2
- package/dist/tools/fs/fs-pdf.js +34 -27
- package/dist/tools/fs/fs-read.d.ts +5 -4
- package/dist/tools/fs/fs-read.js +35 -18
- package/dist/tools/fs/fs-search-tools.js +4 -1
- package/dist/tools/fs/fs-shared.d.ts +39 -16
- package/dist/tools/fs/fs-shared.js +25 -6
- package/dist/tools/fs/fs-write.js +5 -5
- package/dist/tools/fs/index.d.ts +15 -9
- package/dist/tools/fs/index.js +12 -18
- package/dist/tools/fs/pdf.d.ts +4 -4
- package/dist/tools/fs/pdf.js +6 -6
- package/dist/tools/fs/read-deny-home.js +8 -1
- package/dist/tools/fs/read-deny.d.ts +26 -2
- package/dist/tools/fs/read-deny.js +9 -2
- package/dist/tools/fs/read-floor.d.ts +57 -6
- package/dist/tools/fs/read-floor.js +241 -2
- package/dist/tools/fs/removal-targets.d.ts +9 -4
- package/dist/tools/fs/removal-targets.js +17 -9
- package/dist/tools/fs/search.d.ts +6 -5
- package/dist/tools/fs/search.js +10 -10
- package/dist/tools/fs/shell-read-establish.js +3 -1
- package/dist/tools/fs/shell-read-identity.d.ts +3 -1
- package/dist/tools/fs/shell-read-identity.js +4 -2
- package/dist/tools/fs/shell-read-judge.d.ts +7 -1
- package/dist/tools/fs/shell-read-judge.js +1 -1
- package/dist/tools/monitor.d.ts +12 -10
- package/dist/tools/monitor.js +22 -13
- package/dist/tools/scheduler-tools.js +42 -4
- package/dist/tools/web.d.ts +0 -10
- package/dist/tools/web.js +1 -4
- package/dist/tools/worktree.d.ts +5 -1
- package/dist/tools/worktree.js +20 -17
- package/package.json +8 -3
- package/test/export-surface.snapshot.json +166 -30
- package/wire-changes/core-stores-sql@7.60.0.json +30 -0
- package/wire-changes/core-stores-sql@7.61.0.json +480 -0
- package/wire-changes/core@7.60.0.json +3274 -0
- package/wire-changes/core@7.61.0.json +4405 -0
- package/wire-changes/mods-kernel@7.60.0.json +62 -0
- package/wire-changes/mods-kernel@7.61.0.json +65 -0
- package/wire-changes/primitives@7.60.0.json +30 -0
- package/wire-changes/primitives@7.61.0.json +30 -0
- package/dist/core/runner/image-removed-seat.d.ts +0 -12
- package/dist/core/runner/image-removed-seat.js +0 -19
package/dist/core/mcp.js
CHANGED
|
@@ -2,27 +2,32 @@ import { __resetEnvKnobAnnouncements } from "./env-knob-announce.js";
|
|
|
2
2
|
import { resolveEnvBudget } from "./env-budget.js";
|
|
3
3
|
import { MCP_NAMESPACE } from "./protocol-table.js";
|
|
4
4
|
import { remoteWords, resolveProtocolHttpHeaders } from "./protocol-http-auth.js";
|
|
5
|
-
import {
|
|
5
|
+
import { NO_CREDENTIAL_ECHO, carrierEcho, echoAnnouncer, echoedToolDrop, erasedEcho, serverInfoOf } from "./credential-echo.js";
|
|
6
|
+
import { PeerCarrier, Reauthorized, answeredUnauthorized, carrierOf, inFlight, mcpPeerTarget, peerFetch, peerSeatMissing, receivePeerSeat, recordCarrier, refusedThenRenewed, sentOnceMore, settledInFlight } from "./peer-seat.js";
|
|
6
7
|
import { disposeSectionEntry, sectionAnswerWarning } from "./prompt-section-seat.js";
|
|
7
8
|
import { createToolNameClaims, mintNamespacePrefix, normalizeNameSegment } from "./protocol-naming.js";
|
|
8
9
|
import { mcpToolDropReason, refuseCollidingMcpServerNames } from "./mcp-name-judge.js";
|
|
9
|
-
import { Client } from "@modelcontextprotocol/
|
|
10
|
-
import {
|
|
10
|
+
import { Client, ProtocolError, ProtocolErrorCode } from "@modelcontextprotocol/client";
|
|
11
|
+
import { AjvJsonSchemaValidator } from "@modelcontextprotocol/client/validators/ajv";
|
|
12
|
+
import { ListResourcesResultSchema } from "@modelcontextprotocol/core";
|
|
13
|
+
import { McpConnectionPool, recordEngineDial } from "./mcp-connection-pool.js";
|
|
11
14
|
import { SessionEndingTransport, requestSite } from "./mcp-session-end.js";
|
|
12
15
|
import { mcpToolGate, UNPROVEN_GATE } from "./mcp-listing-drift.js";
|
|
13
16
|
import { ConnectionListing, Flights, IDLE_WATCHDOG_ABORT_REASON, Resendable, armMcpIdleWatchdog, callThroughLink, listingRefusal, observedFailure, owedByAnswer, reach, refusalScope } from "./mcp-server-link.js";
|
|
14
17
|
import { underStartupBound } from "./mcp-startup-request.js";
|
|
15
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";
|
|
16
|
-
import { StdioClientTransport } from "@modelcontextprotocol/
|
|
19
|
+
import { StdioClientTransport } from "@modelcontextprotocol/client/stdio";
|
|
17
20
|
import { describeHttpTransportFailure, failureFields, livenessOf, namingLostSession, readMcpFailure, sessionGone, unauthorizedLine } from "./mcp-failure.js";
|
|
18
21
|
import { lstat, mkdir, writeFile } from "node:fs/promises";
|
|
19
22
|
import { tmpdir } from "node:os";
|
|
20
23
|
import { join } from "node:path";
|
|
21
|
-
import {
|
|
22
|
-
import {
|
|
23
|
-
import {
|
|
24
|
+
import { DEFAULT_REQUEST_TIMEOUT_MSEC } from "@modelcontextprotocol/client";
|
|
25
|
+
import { resolveImageProcessor } from "./image-downsample.js";
|
|
26
|
+
import { admitImageBytes, IMAGE_ADMISSION, unprocessedSizeClause } from "./image-admission.js";
|
|
24
27
|
import { sliceHeadSafe, sliceTailSafe } from "./surrogate-safe-slice.js";
|
|
25
28
|
import { truncateError } from "./tool-errors.js";
|
|
29
|
+
import { transportKindOf } from "./mcp-server-spec.js";
|
|
30
|
+
import { hostMount, hostSeatLine, hostSeatMissing, hostSeatVerdictOf, openHostPipe, settledBefore } from "./mcp-host-seat.js";
|
|
26
31
|
import { peerRequestRefusal } from "./host-floor.js";
|
|
27
32
|
import { delimitUntrusted, inlineUntrusted, sanitizeUntrustedText } from "./untrusted-text.js";
|
|
28
33
|
import { discloseReminderShaped, observeReminderMarkEcho } from "./reminder-disclosure.js";
|
|
@@ -155,30 +160,24 @@ const MCP_SPEC_ERROR_CODE_NAMES = new Map([
|
|
|
155
160
|
export function describeMcpSpecErrorCode(code) {
|
|
156
161
|
return typeof code === "number" ? MCP_SPEC_ERROR_CODE_NAMES.get(code) : undefined;
|
|
157
162
|
}
|
|
158
|
-
export function collapseMcpErrorPrefix(message) {
|
|
159
|
-
let out = message;
|
|
160
|
-
for (;;) {
|
|
161
|
-
const m = /^MCP error (-?\d+): (?=MCP error \1: )/.exec(out);
|
|
162
|
-
if (m === null)
|
|
163
|
-
return out;
|
|
164
|
-
out = out.slice(m[0].length);
|
|
165
|
-
}
|
|
166
|
-
}
|
|
167
163
|
function sanitizeMcpErrorTextInPlace(err, declared) {
|
|
168
164
|
if (!(err instanceof Error))
|
|
169
165
|
return;
|
|
170
|
-
const sanitized = remoteWords(err
|
|
166
|
+
const sanitized = remoteWords(err.message, declared);
|
|
171
167
|
if (sanitized !== err.message)
|
|
172
168
|
err.message = sanitized;
|
|
173
169
|
}
|
|
174
170
|
function namedMcpFailureText(err, declared) {
|
|
175
|
-
const
|
|
176
|
-
|
|
177
|
-
|
|
171
|
+
const seat = hostSeatVerdictOf(err);
|
|
172
|
+
if (seat !== undefined)
|
|
173
|
+
return seat.condition;
|
|
174
|
+
const detail = remoteErrorText(err, declared);
|
|
175
|
+
const code = thrownIs(err, ProtocolError) ? readMember(err, "code") : undefined;
|
|
176
|
+
const condition = describeMcpSpecErrorCode(code);
|
|
177
|
+
return condition !== undefined ? `${condition} (MCP protocol error ${String(code)}): ${detail}` : detail;
|
|
178
178
|
}
|
|
179
|
-
function remoteErrorText(err, declared
|
|
180
|
-
|
|
181
|
-
return remoteWords(opts?.collapse === true ? collapseMcpErrorPrefix(raw) : raw, declared);
|
|
179
|
+
function remoteErrorText(err, declared) {
|
|
180
|
+
return remoteWords(thrownText(err), declared);
|
|
182
181
|
}
|
|
183
182
|
function writeEffectWarning(writeEffect) {
|
|
184
183
|
return writeEffect
|
|
@@ -214,8 +213,9 @@ function rethrowHonestMcpError(err, ctx) {
|
|
|
214
213
|
const details = (extra) => ({ code: failure.kind, delivered: failure.delivered, server: ctx.server, ...(failure.authorization !== undefined ? { authorization: { ...failure.authorization } } : {}), ...extra });
|
|
215
214
|
switch (failure.kind) {
|
|
216
215
|
case "timeout": {
|
|
217
|
-
const data = err
|
|
218
|
-
const
|
|
216
|
+
const data = readMember(err, "data");
|
|
217
|
+
const total = typeof data === "object" && data !== null ? readMember(data, "maxTotalTimeout") : undefined;
|
|
218
|
+
const totalMs = typeof total === "number" ? total : undefined;
|
|
219
219
|
finish(markMcpFailure(new Error(totalMs !== undefined
|
|
220
220
|
? `${ctx.what} on MCP server "${serverLabel}" exceeded its total time ceiling of ${totalMs}ms (the call stayed alive — e.g. via progress notifications — but ran past the total wall-clock budget). The client stopped waiting, but the server may still be executing the request — the outcome is unknown.${writeEffectWarning(ctx.writeEffect)} (Set the MCP_TOOL_TIMEOUT_TOTAL environment variable (ms) to change this ceiling; MCP_TOOL_TIMEOUT only tunes the per-call timer, currently ${ctx.timeoutMs}ms.)`
|
|
221
221
|
: `${ctx.what} on MCP server "${serverLabel}" timed out after ${ctx.timeoutMs}ms. The client stopped waiting, but the server may still be executing the request — the outcome is unknown.${writeEffectWarning(ctx.writeEffect)} (Set the MCP_TOOL_TIMEOUT environment variable (ms) to change this limit.)`, { cause: err }), totalMs !== undefined ? details({ timeoutMs: totalMs, totalTimeout: true }) : details({ timeoutMs: ctx.timeoutMs })));
|
|
@@ -236,10 +236,10 @@ function rethrowHonestMcpError(err, ctx) {
|
|
|
236
236
|
: `${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
237
|
}
|
|
238
238
|
case "protocol": {
|
|
239
|
-
const code = err.code;
|
|
239
|
+
const code = thrownIs(err, ProtocolError) ? err.code : undefined;
|
|
240
240
|
const condition = describeMcpSpecErrorCode(code);
|
|
241
|
-
if (condition !== undefined) {
|
|
242
|
-
finish(markMcpFailure(new Error(`${ctx.what} on MCP server "${serverLabel}" was rejected with MCP protocol error ${code} — ${condition}. The server's error text follows as external/untrusted data:\n${fenceServerText(`${ctx.server} error`, err
|
|
241
|
+
if (condition !== undefined && typeof code === "number") {
|
|
242
|
+
finish(markMcpFailure(new Error(`${ctx.what} on MCP server "${serverLabel}" was rejected with MCP protocol error ${code} — ${condition}. The server's error text follows as external/untrusted data:\n${fenceServerText(`${ctx.server} error`, thrownText(err))}`, { cause: err }), details({ specErrorCode: code })));
|
|
243
243
|
}
|
|
244
244
|
if (ctx.attributeServer) {
|
|
245
245
|
finish(markMcpFailure(new Error(`${ctx.what} on MCP server "${serverLabel}" failed. The server's error text follows as external/untrusted data:\n${fenceServerText(`${ctx.server} error`, remoteErrorText(err, ctx.declared))}`, { cause: err }), details()));
|
|
@@ -250,9 +250,13 @@ function rethrowHonestMcpError(err, ctx) {
|
|
|
250
250
|
finish(markMcpFailure(new Error(unauthorizedLine(ctx.what, serverLabel, failure.authorization, refusedThenRenewed(err) && ctx.attempt !== "resent", writeEffectWarning(ctx.writeEffect)), { cause: err }), details()));
|
|
251
251
|
case "credential_unavailable":
|
|
252
252
|
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()));
|
|
253
|
+
case "host_refused":
|
|
253
254
|
case "spawn_failed":
|
|
254
255
|
case "invalid_config":
|
|
255
256
|
case "unknown": {
|
|
257
|
+
const seat = hostSeatVerdictOf(err);
|
|
258
|
+
if (seat !== undefined)
|
|
259
|
+
finish(markMcpFailure(new Error(hostSeatLine(ctx.what, serverLabel, seat, writeEffectWarning(ctx.writeEffect)), { cause: err }), details()));
|
|
256
260
|
if (ctx.attributeServer) {
|
|
257
261
|
finish(markMcpFailure(new Error(`${ctx.what} on MCP server "${serverLabel}" failed. The server's error text follows as external/untrusted data:\n${fenceServerText(`${ctx.server} error`, remoteErrorText(err, ctx.declared))}`, { cause: err }), details()));
|
|
258
262
|
}
|
|
@@ -326,26 +330,24 @@ async function blobToTextBlock(base64Data, mimeType, server, prefix, refetchHint
|
|
|
326
330
|
}
|
|
327
331
|
return { type: "text", text: `${prefix}Binary content (${mt}, ${r.bytes} bytes) saved to ${r.filePath}` };
|
|
328
332
|
}
|
|
329
|
-
async function boundedImageBlock(data, mimeType, server,
|
|
330
|
-
|
|
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)
|
|
331
345
|
return { type: "image", data, mimeType };
|
|
332
|
-
if (resizer) {
|
|
333
|
-
const resized = await resizer(data, mimeType).catch(() => undefined);
|
|
334
|
-
if (resized && resized.base64.length <= MCP_IMAGE_MAX_BASE64) {
|
|
335
|
-
return { type: "image", data: resized.base64, mimeType: resized.mimeType };
|
|
336
|
-
}
|
|
337
|
-
}
|
|
338
346
|
const r = await persistMcpBlob(data, mimeType, server);
|
|
339
347
|
if ("error" in r) {
|
|
340
|
-
return {
|
|
341
|
-
type: "text",
|
|
342
|
-
text: `[image (${mimeType}): too large to inline (${r.bytes} bytes; base64 ${data.length} chars exceeds the 5MB API image limit) and could not be saved to disk: ${r.error} — image omitted]`,
|
|
343
|
-
};
|
|
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]` };
|
|
344
349
|
}
|
|
345
|
-
return {
|
|
346
|
-
type: "text",
|
|
347
|
-
text: `[image (${mimeType}): too large to inline (${r.bytes} bytes; base64 ${data.length} chars exceeds the 5MB API image limit) — saved to ${r.filePath}]`,
|
|
348
|
-
};
|
|
350
|
+
return { type: "text", text: `[image (${mimeType}): too large to inline (${r.bytes} bytes; ${over}) — saved to ${r.filePath}]` };
|
|
349
351
|
}
|
|
350
352
|
export function inferCompactSchema(value, depth = 2) {
|
|
351
353
|
if (value === null)
|
|
@@ -365,8 +367,10 @@ export function inferCompactSchema(value, depth = 2) {
|
|
|
365
367
|
}
|
|
366
368
|
return typeof value;
|
|
367
369
|
}
|
|
368
|
-
function buildTransport(spec, principal, kind, carrier, pieces) {
|
|
370
|
+
function buildTransport(spec, principal, kind, carrier, pieces, pipe) {
|
|
369
371
|
const t = spec.transport;
|
|
372
|
+
if (kind === "host")
|
|
373
|
+
return pipe;
|
|
370
374
|
if (kind === "stdio") {
|
|
371
375
|
if (!("command" in t))
|
|
372
376
|
throw new Error(`MCP server "${spec.name}": transport kind "stdio" carries no command`);
|
|
@@ -379,11 +383,10 @@ function buildTransport(spec, principal, kind, carrier, pieces) {
|
|
|
379
383
|
if (!("url" in t))
|
|
380
384
|
throw new Error(`MCP server "${spec.name}": transport kind "${String(kind)}" carries no url`);
|
|
381
385
|
resolveProtocolHttpHeaders(MCP_NAMESPACE.id, t.principalHeader !== undefined ? { principalHeader: t.principalHeader } : {}, principal);
|
|
382
|
-
return new SessionEndingTransport(new URL(t.url), { fetch: peerFetch(carrier, t.principalHeader, principal) });
|
|
386
|
+
return new SessionEndingTransport(new URL(t.url), { fetch: peerFetch(carrier, t.principalHeader, principal), requestInit: { redirect: "manual" } });
|
|
383
387
|
}
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
const resizer = imageResizer ?? (await (autoResizer ??= sharpImageResizer()));
|
|
388
|
+
export async function mapContent(content, serverName, imageProcessor) {
|
|
389
|
+
const processor = await resolveImageProcessor(imageProcessor);
|
|
387
390
|
const out = [];
|
|
388
391
|
for (const item of content ?? []) {
|
|
389
392
|
if (item.type === "text" && typeof item.text === "string") {
|
|
@@ -392,7 +395,7 @@ export async function mapContent(content, serverName, imageResizer) {
|
|
|
392
395
|
else if (item.type === "image") {
|
|
393
396
|
const data = typeof item.data === "string" ? item.data : "";
|
|
394
397
|
const mimeType = typeof item.mimeType === "string" ? item.mimeType : "";
|
|
395
|
-
out.push(data !== "" && mimeType !== "" ? await boundedImageBlock(data, mimeType, serverName,
|
|
398
|
+
out.push(data !== "" && mimeType !== "" ? await boundedImageBlock(data, mimeType, serverName, processor) : { type: "image", data, mimeType });
|
|
396
399
|
}
|
|
397
400
|
else if (item.type === "audio" && typeof item.data === "string" && item.data) {
|
|
398
401
|
out.push(await blobToTextBlock(item.data, item.mimeType, serverName, `[Audio from ${serverName ?? "MCP server"}] `));
|
|
@@ -406,7 +409,7 @@ export async function mapContent(content, serverName, imageResizer) {
|
|
|
406
409
|
out.push({ type: "text", text: `[resource${r.uri ? ` ${r.uri}` : ""}]\n${r.text}` });
|
|
407
410
|
}
|
|
408
411
|
else if (r.blob && r.mimeType && r.mimeType.startsWith("image/")) {
|
|
409
|
-
out.push(await boundedImageBlock(r.blob, r.mimeType, serverName,
|
|
412
|
+
out.push(await boundedImageBlock(r.blob, r.mimeType, serverName, processor));
|
|
410
413
|
}
|
|
411
414
|
else if (r.blob) {
|
|
412
415
|
out.push(await blobToTextBlock(r.blob, r.mimeType, serverName, `[resource${r.uri ? ` ${r.uri}` : ""}] `, ` — data not inlined; it can be re-fetched via ${READ_MCP_RESOURCE}${r.uri ? ` (uri ${r.uri})` : ""}.`));
|
|
@@ -497,7 +500,7 @@ function sanitizeMcpModelFacingValue(value, seat = "schema") {
|
|
|
497
500
|
}
|
|
498
501
|
return value;
|
|
499
502
|
}
|
|
500
|
-
const MCP_TOOL_DESCRIPTION_MAX_CHARS =
|
|
503
|
+
const MCP_TOOL_DESCRIPTION_MAX_CHARS = 4096;
|
|
501
504
|
const MCP_TOOL_DESCRIPTION_TRUNCATION_MARK = "… [truncated]";
|
|
502
505
|
function capMcpToolDescription(description) {
|
|
503
506
|
if (description.length <= MCP_TOOL_DESCRIPTION_MAX_CHARS)
|
|
@@ -643,10 +646,10 @@ export function mcpToolSchemaProblem(schema) {
|
|
|
643
646
|
}
|
|
644
647
|
return undefined;
|
|
645
648
|
}
|
|
646
|
-
export async function materializeMcpTools(specs, principal, onElicit,
|
|
647
|
-
return materializeLegMcpTools(undefined, specs, principal, onElicit,
|
|
649
|
+
export async function materializeMcpTools(specs, principal, onElicit, imageProcessor, reminderDisclosure, mcpRevocations, poolOpts, promptSections, dialable, signal, hostFloor, peerSeat, onAuthorizationRequired, hostSeats, onCredentialEchoed) {
|
|
650
|
+
return materializeLegMcpTools(undefined, specs, principal, onElicit, imageProcessor, reminderDisclosure, mcpRevocations, poolOpts, promptSections, dialable, signal, hostFloor, receivePeerSeat(peerSeat, "materializeMcpTools peerSeat"), onAuthorizationRequired, hostSeats, onCredentialEchoed);
|
|
648
651
|
}
|
|
649
|
-
export async function materializeLegMcpTools(seat, ...[specs, principal, onElicit,
|
|
652
|
+
export async function materializeLegMcpTools(seat, ...[specs, principal, onElicit, imageProcessor, reminderDisclosure, mcpRevocations, poolOpts, promptSections, dialable, signal, hostFloor, peerSeat, onAuthorizationRequired, hostSeats, onCredentialEchoed]) {
|
|
650
653
|
const snapshot = snapshotMcpEntries(specs);
|
|
651
654
|
const axesRefused = new WeakMap();
|
|
652
655
|
const entries = snapshot.map((spec) => {
|
|
@@ -701,6 +704,7 @@ export async function materializeLegMcpTools(seat, ...[specs, principal, onElici
|
|
|
701
704
|
catch {
|
|
702
705
|
}
|
|
703
706
|
};
|
|
707
|
+
const announceEcho = echoAnnouncer(onCredentialEchoed);
|
|
704
708
|
const failedStatus = (spec, err, dialKind, declared) => {
|
|
705
709
|
const { failure, exchange } = readMcpFailure(err, { phase: "connect", transport: dialKind });
|
|
706
710
|
const liveness = livenessOf(exchange, Date.now());
|
|
@@ -716,7 +720,7 @@ export async function materializeLegMcpTools(seat, ...[specs, principal, onElici
|
|
|
716
720
|
const commitConnectedServer = (spec, s, transportKind) => {
|
|
717
721
|
const raised = [];
|
|
718
722
|
connections.push({ client: s.client, close: s.close });
|
|
719
|
-
const handle = { name: spec.name, spec, client: s.client,
|
|
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 };
|
|
720
724
|
const hIdx = serverHandles.findIndex((h) => h.name === spec.name);
|
|
721
725
|
if (hIdx === -1)
|
|
722
726
|
serverHandles.push(handle);
|
|
@@ -767,22 +771,16 @@ export async function materializeLegMcpTools(seat, ...[specs, principal, onElici
|
|
|
767
771
|
statuses[sIdx] = s.status;
|
|
768
772
|
return raised;
|
|
769
773
|
};
|
|
770
|
-
const readDialKind =
|
|
771
|
-
try {
|
|
772
|
-
const kind = spec.transport.kind;
|
|
773
|
-
return kind === "stdio" || kind === "http" ? kind : undefined;
|
|
774
|
-
}
|
|
775
|
-
catch {
|
|
776
|
-
return undefined;
|
|
777
|
-
}
|
|
778
|
-
};
|
|
774
|
+
const readDialKind = transportKindOf;
|
|
779
775
|
const dialKinds = entries.map(readDialKind);
|
|
780
776
|
const liveOf = (server) => serverHandles.find((h) => h.name === server);
|
|
781
|
-
const
|
|
777
|
+
const intakeNow = (h) => {
|
|
782
778
|
const latest = h.listing.latest();
|
|
783
|
-
if (latest.at !== h.
|
|
784
|
-
|
|
785
|
-
|
|
779
|
+
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), imageProcessor, mcpDisclosure, isServerRevoked, h.transportKind, seat, echoReadOf(h.spec));
|
|
781
|
+
h.intakeAt = { at: latest.at, gates, definitions };
|
|
782
|
+
}
|
|
783
|
+
return h.intakeAt;
|
|
786
784
|
};
|
|
787
785
|
const linkOf = (server) => ({
|
|
788
786
|
live: () => liveOf(server),
|
|
@@ -803,26 +801,28 @@ export async function materializeLegMcpTools(seat, ...[specs, principal, onElici
|
|
|
803
801
|
return peerRequestRefusal(`mcp: server "${inlineUntrusted(spec.name, 120)}"`, url, hostFloor);
|
|
804
802
|
};
|
|
805
803
|
const dialServer = async (spec, dialKind, dialOpts) => {
|
|
806
|
-
const
|
|
804
|
+
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);
|
|
807
806
|
if (refusal !== undefined)
|
|
808
807
|
throw refusal;
|
|
809
808
|
const carrier = new PeerCarrier(peerSeat, mcpPeerTarget(spec, dialKind), principal, dialKind === "stdio" ? "stdio" : "http", dialKind !== "stdio" && "principalHeader" in spec.transport && spec.transport.principalHeader !== undefined);
|
|
810
|
-
|
|
811
|
-
const dial = () => connectServer(spec, principal, onElicit,
|
|
809
|
+
dialedBy.set(spec.name, carrier);
|
|
810
|
+
const dial = () => connectServer(spec, principal, onElicit, imageProcessor, mcpDisclosure, isServerRevoked, dialKind, poolOpts?.pool, { ...dialOpts, link: linkOf(spec.name), carrier, announceEcho: (where) => announceEcho(spec.name, where), ...(signal !== undefined ? { signal } : {}), ...(hostSeat !== undefined ? { hostSeat } : {}) }, seat);
|
|
812
811
|
const connected = await dial().catch(async (err) => {
|
|
813
812
|
if (typeof err === "object" && err !== null)
|
|
814
|
-
|
|
813
|
+
dialedBy.set(spec.name, carrierOf(err) ?? carrier);
|
|
815
814
|
const dialing = (typeof err === "object" && err !== null ? carrierOf(err) : undefined) ?? carrier;
|
|
816
815
|
if (!(dialing.renewed && answeredUnauthorized(err)) || signal?.aborted === true)
|
|
817
816
|
throw err;
|
|
818
817
|
return dial();
|
|
819
818
|
});
|
|
820
|
-
|
|
819
|
+
dialedBy.set(spec.name, carrierOf(connected.client) ?? carrier);
|
|
821
820
|
return connected;
|
|
822
821
|
};
|
|
823
822
|
const prefixOf = (name) => mintNamespacePrefix(MCP_NAMESPACE, name);
|
|
824
|
-
const
|
|
825
|
-
const echoOf = (spec) =>
|
|
823
|
+
const dialedBy = new Map();
|
|
824
|
+
const echoOf = (spec) => dialedBy.get(spec.name)?.sent ?? [];
|
|
825
|
+
const echoReadOf = (spec) => carrierEcho(dialedBy.get(spec.name) ?? NO_CREDENTIAL_ECHO, (where) => announceEcho(spec.name, where));
|
|
826
826
|
const heldCount = (name) => serverHandles.find((h) => h.name === name)?.tools.length ?? 0;
|
|
827
827
|
const reconcileInstructions = (name, after, connected) => {
|
|
828
828
|
if (!connected)
|
|
@@ -979,7 +979,6 @@ export async function materializeLegMcpTools(seat, ...[specs, principal, onElici
|
|
|
979
979
|
const site = requestSite(h.client);
|
|
980
980
|
try {
|
|
981
981
|
const at = h.listing.open();
|
|
982
|
-
const cacheTools = h.openListing();
|
|
983
982
|
const listed = await listToolsLenient(h.client, undefined, echoOf(h.spec));
|
|
984
983
|
const answered = h.listing.answer(at, listed.tools, listed.incomplete !== undefined);
|
|
985
984
|
const mergedRaw = answered.view;
|
|
@@ -987,14 +986,13 @@ export async function materializeLegMcpTools(seat, ...[specs, principal, onElici
|
|
|
987
986
|
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" });
|
|
988
987
|
continue;
|
|
989
988
|
}
|
|
990
|
-
const { serverTools, serverAxes, gates,
|
|
991
|
-
cacheTools(accepted, answered.kept);
|
|
989
|
+
const { serverTools, serverAxes, gates, definitions, dropped } = intakeListedTools({ tools: [...mergedRaw], unproven: answered.unproven }, h.spec, linkOf(h.name), echoOf(h.spec), outputSchemaValidatorOf(h.client), imageProcessor, mcpDisclosure, isServerRevoked, h.transportKind, seat, echoReadOf(h.spec));
|
|
992
990
|
const priorNames = h.tools.map((t) => t.name);
|
|
993
991
|
const newNames = serverTools.map((t) => t.name);
|
|
994
992
|
const added = newNames.filter((n) => !priorNames.includes(n));
|
|
995
993
|
const removed = priorNames.filter((n) => !newNames.includes(n));
|
|
996
994
|
h.tools = serverTools;
|
|
997
|
-
h.
|
|
995
|
+
h.intakeAt = { at, gates, definitions };
|
|
998
996
|
results.push({
|
|
999
997
|
server: h.name,
|
|
1000
998
|
prefix: prefixOf(h.name),
|
|
@@ -1215,13 +1213,13 @@ async function readDirViaExtension(rs, uri, signal, timeoutMs, watchdog) {
|
|
|
1215
1213
|
page = await rs.client.request({ method: "resources/directory/read", params: { uri, ...(cursor !== undefined ? { cursor } : {}) } }, ListResourcesResultSchema, { signal: watchdog.combinedSignal, timeout: timeoutMs });
|
|
1216
1214
|
}
|
|
1217
1215
|
catch (err) {
|
|
1218
|
-
if (err instanceof
|
|
1216
|
+
if (err instanceof ProtocolError && err.code === ProtocolErrorCode.InvalidParams) {
|
|
1219
1217
|
if (pages > 0)
|
|
1220
1218
|
return { kind: "ok", resources, cursorInvalid: true };
|
|
1221
|
-
const detail = remoteErrorText(err, rs.declared
|
|
1219
|
+
const detail = remoteErrorText(err, rs.declared);
|
|
1222
1220
|
return { kind: classifyDirReadInvalidParams(detail), detail };
|
|
1223
1221
|
}
|
|
1224
|
-
if (err instanceof
|
|
1222
|
+
if (err instanceof ProtocolError && err.code === ProtocolErrorCode.MethodNotFound)
|
|
1225
1223
|
return { kind: "unsupported" };
|
|
1226
1224
|
if (pages > 0 && !signal?.aborted) {
|
|
1227
1225
|
return { kind: "ok", resources, incomplete: remoteErrorText(err, rs.declared) };
|
|
@@ -1311,7 +1309,7 @@ function buildResourceTools(resourceServers, isServerRevoked = () => false) {
|
|
|
1311
1309
|
try {
|
|
1312
1310
|
const walk = await walkMcpListPages(async (cursor, remainingMs) => {
|
|
1313
1311
|
const page = await rs.client
|
|
1314
|
-
.
|
|
1312
|
+
.request(resourcesListRequest(cursor), { signal: watchdog.combinedSignal, timeout: remainingMs })
|
|
1315
1313
|
.catch((err) => {
|
|
1316
1314
|
throw watchdog.idleSignal.reason === IDLE_WATCHDOG_ABORT_REASON ? new Error(idleWatchdogTripText(idleMs)) : err;
|
|
1317
1315
|
});
|
|
@@ -1393,7 +1391,7 @@ function buildResourceTools(resourceServers, isServerRevoked = () => false) {
|
|
|
1393
1391
|
let res;
|
|
1394
1392
|
try {
|
|
1395
1393
|
res = await rs.client
|
|
1396
|
-
.
|
|
1394
|
+
.request({ method: "resources/read", params: rs.readParams(uri) }, { signal: watchdog.combinedSignal, timeout: timeoutMs })
|
|
1397
1395
|
.catch((err) => rethrowHonestMcpError(err, { server, declared: rs.declared, what, timeoutMs, writeEffect: false, signal, attributeServer: true, site, idle: { signal: watchdog.idleSignal, idleMs }, liveness: rs.health }));
|
|
1398
1396
|
rs.health.observe?.("completed");
|
|
1399
1397
|
}
|
|
@@ -1482,7 +1480,7 @@ function buildResourceTools(resourceServers, isServerRevoked = () => false) {
|
|
|
1482
1480
|
}
|
|
1483
1481
|
const walk = await walkMcpListPages(async (cursor, remainingMs) => {
|
|
1484
1482
|
const page = await rs.client
|
|
1485
|
-
.
|
|
1483
|
+
.request(resourcesListRequest(cursor), { signal: watchdog.combinedSignal, timeout: remainingMs })
|
|
1486
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 }));
|
|
1487
1485
|
rs.health.observe?.("completed");
|
|
1488
1486
|
return { items: page.resources, ...(page.nextCursor !== undefined ? { nextCursor: page.nextCursor } : {}) };
|
|
@@ -1502,60 +1500,62 @@ function buildResourceTools(resourceServers, isServerRevoked = () => false) {
|
|
|
1502
1500
|
withContentOrigin(t, "external");
|
|
1503
1501
|
return { tools, axes };
|
|
1504
1502
|
}
|
|
1505
|
-
|
|
1506
|
-
|
|
1507
|
-
|
|
1508
|
-
|
|
1503
|
+
const OUTPUT_SCHEMA_VALIDATORS = new WeakMap();
|
|
1504
|
+
function outputSchemaValidatorOf(client) {
|
|
1505
|
+
const validator = OUTPUT_SCHEMA_VALIDATORS.get(client);
|
|
1506
|
+
if (validator === undefined)
|
|
1507
|
+
throw new Error("internal: an MCP client this module did not dial has no recorded schema validator");
|
|
1508
|
+
return validator;
|
|
1509
|
+
}
|
|
1510
|
+
function toolDefinitionOf(t, validator) {
|
|
1511
|
+
const tool = { ...t, inputSchema: t.inputSchema };
|
|
1512
|
+
if (!t.outputSchema)
|
|
1513
|
+
return { tool };
|
|
1509
1514
|
try {
|
|
1510
|
-
|
|
1515
|
+
validator.getValidator(t.outputSchema);
|
|
1516
|
+
return { tool };
|
|
1511
1517
|
}
|
|
1512
1518
|
catch {
|
|
1519
|
+
return { tool, outputSchemaUncompilable: true };
|
|
1513
1520
|
}
|
|
1514
1521
|
}
|
|
1515
|
-
const
|
|
1516
|
-
|
|
1517
|
-
if (typeof data !== "object" || data === null)
|
|
1518
|
-
return { success: false, error: new Error("tools/list result is not an object") };
|
|
1519
|
-
const rawTools = data.tools;
|
|
1520
|
-
if (!Array.isArray(rawTools))
|
|
1521
|
-
return { success: false, error: new Error("tools/list result.tools is not an array") };
|
|
1522
|
-
const tools = [];
|
|
1523
|
-
for (const raw of rawTools) {
|
|
1524
|
-
if (typeof raw !== "object" || raw === null || typeof raw.name !== "string") {
|
|
1525
|
-
return { success: false, error: new Error("a tools/list entry is missing a string name") };
|
|
1526
|
-
}
|
|
1527
|
-
const t = raw;
|
|
1528
|
-
tools.push({
|
|
1529
|
-
name: t.name,
|
|
1530
|
-
...(typeof t.description === "string" ? { description: t.description } : {}),
|
|
1531
|
-
inputSchema: t.inputSchema,
|
|
1532
|
-
...(t.annotations !== undefined ? { annotations: t.annotations } : {}),
|
|
1533
|
-
...(t._meta !== undefined ? { _meta: t._meta } : {}),
|
|
1534
|
-
...(t.outputSchema !== undefined ? { outputSchema: t.outputSchema } : {}),
|
|
1535
|
-
...(t.execution !== undefined ? { execution: t.execution } : {}),
|
|
1536
|
-
});
|
|
1537
|
-
}
|
|
1538
|
-
const nextCursor = data.nextCursor;
|
|
1539
|
-
const cursorInvalid = nextCursor !== undefined && nextCursor !== null && typeof nextCursor !== "string";
|
|
1540
|
-
return { success: true, data: { tools, ...(typeof nextCursor === "string" ? { nextCursor } : {}), ...(cursorInvalid ? { cursorInvalid: true } : {}) } };
|
|
1541
|
-
},
|
|
1522
|
+
const LENIENT_LIST_TOOLS_RESULT_SCHEMA = {
|
|
1523
|
+
"~standard": { version: 1, vendor: "sema-core", validate: parseLenientToolsPage },
|
|
1542
1524
|
};
|
|
1543
|
-
|
|
1544
|
-
if (typeof data !== "object" || data === null
|
|
1545
|
-
return
|
|
1525
|
+
function parseLenientToolsPage(data) {
|
|
1526
|
+
if (typeof data !== "object" || data === null)
|
|
1527
|
+
return { issues: [{ message: "tools/list result is not an object" }] };
|
|
1528
|
+
const rawTools = data.tools;
|
|
1529
|
+
if (!Array.isArray(rawTools))
|
|
1530
|
+
return { issues: [{ message: "tools/list result.tools is not an array" }] };
|
|
1531
|
+
const tools = [];
|
|
1532
|
+
for (const raw of rawTools) {
|
|
1533
|
+
if (typeof raw !== "object" || raw === null || typeof raw.name !== "string") {
|
|
1534
|
+
return { issues: [{ message: "a tools/list entry is missing a string name" }] };
|
|
1535
|
+
}
|
|
1536
|
+
const t = raw;
|
|
1537
|
+
tools.push({
|
|
1538
|
+
name: t.name,
|
|
1539
|
+
...(typeof t.description === "string" ? { description: t.description } : {}),
|
|
1540
|
+
inputSchema: t.inputSchema,
|
|
1541
|
+
...(t.annotations !== undefined ? { annotations: t.annotations } : {}),
|
|
1542
|
+
...(t._meta !== undefined ? { _meta: t._meta } : {}),
|
|
1543
|
+
...(t.outputSchema !== undefined ? { outputSchema: t.outputSchema } : {}),
|
|
1544
|
+
...(t.execution !== undefined ? { execution: t.execution } : {}),
|
|
1545
|
+
});
|
|
1546
1546
|
}
|
|
1547
|
-
const
|
|
1548
|
-
const
|
|
1549
|
-
|
|
1550
|
-
|
|
1551
|
-
|
|
1547
|
+
const nextCursor = data.nextCursor;
|
|
1548
|
+
const cursorInvalid = nextCursor !== undefined && nextCursor !== null && typeof nextCursor !== "string";
|
|
1549
|
+
return { value: { tools, ...(typeof nextCursor === "string" ? { nextCursor } : {}), ...(cursorInvalid ? { cursorInvalid: true } : {}) } };
|
|
1550
|
+
}
|
|
1551
|
+
function resourcesListRequest(cursor) {
|
|
1552
|
+
return cursor === undefined ? { method: "resources/list" } : { method: "resources/list", params: { cursor } };
|
|
1552
1553
|
}
|
|
1553
|
-
const LENIENT_CALL_TOOL_RESULT_SCHEMA = { safeParse: parseCallToolResultLenient };
|
|
1554
1554
|
async function listToolsLenient(client, options, declared) {
|
|
1555
1555
|
if (!client.getServerCapabilities()?.tools)
|
|
1556
1556
|
return { tools: [], toolsCapabilityAbsent: true };
|
|
1557
1557
|
const walk = await walkMcpListPages(async (cursor, remainingMs) => {
|
|
1558
|
-
const page = await client.request({ method: "tools/list", params: cursor === undefined ? {} : { cursor } },
|
|
1558
|
+
const page = await client.request({ method: "tools/list", params: cursor === undefined ? {} : { cursor } }, LENIENT_LIST_TOOLS_RESULT_SCHEMA, { ...options, timeout: remainingMs });
|
|
1559
1559
|
return {
|
|
1560
1560
|
items: page.tools,
|
|
1561
1561
|
...(page.nextCursor !== undefined ? { nextCursor: page.nextCursor } : {}),
|
|
@@ -1569,7 +1569,7 @@ async function listToolsLenient(client, options, declared) {
|
|
|
1569
1569
|
});
|
|
1570
1570
|
return { tools: walk.items, ...(walk.incomplete !== undefined ? { incomplete: walk.incomplete } : {}) };
|
|
1571
1571
|
}
|
|
1572
|
-
async function connectServer(spec, principal, onElicit,
|
|
1572
|
+
async function connectServer(spec, principal, onElicit, imageProcessor, reminderDisclosure, isServerRevoked, transportKind, pool, dialOpts, seat) {
|
|
1573
1573
|
const fp = spec.fingerprint;
|
|
1574
1574
|
if (fp !== undefined && !(typeof fp === "string" && fp.length > 0 && fp.length <= 128)) {
|
|
1575
1575
|
throw 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" });
|
|
@@ -1579,11 +1579,18 @@ async function connectServer(spec, principal, onElicit, imageResizer, reminderDi
|
|
|
1579
1579
|
const announce = {};
|
|
1580
1580
|
const startupMs = mcpStartupTimeoutMs(spec);
|
|
1581
1581
|
const startupOpts = startupMs !== undefined ? { timeout: startupMs } : undefined;
|
|
1582
|
+
const answersOneLeg = elicitOn || transportKind === "host";
|
|
1583
|
+
const poolKey = pool !== undefined && !answersOneLeg ? McpConnectionPool.keyOf(spec, principal, transportKind, startupMs) : undefined;
|
|
1582
1584
|
const dialClient = async (stop = dialOpts?.signal) => {
|
|
1583
1585
|
stop?.throwIfAborted();
|
|
1584
|
-
const
|
|
1586
|
+
const outputSchemaValidator = new AjvJsonSchemaValidator();
|
|
1587
|
+
const client = new Client({ name: `sema-core/${spec.name}`, version: "0.1.0" }, {
|
|
1588
|
+
capabilities: elicitOn ? { elicitation: { form: {} } } : {},
|
|
1589
|
+
jsonSchemaValidator: outputSchemaValidator,
|
|
1590
|
+
});
|
|
1591
|
+
OUTPUT_SCHEMA_VALIDATORS.set(client, outputSchemaValidator);
|
|
1585
1592
|
if (elicitOn) {
|
|
1586
|
-
client.setRequestHandler(
|
|
1593
|
+
client.setRequestHandler("elicitation/create", async (request, ctx) => {
|
|
1587
1594
|
health.pendingElicitations++;
|
|
1588
1595
|
try {
|
|
1589
1596
|
const p = request.params;
|
|
@@ -1593,7 +1600,7 @@ async function connectServer(spec, principal, onElicit, imageResizer, reminderDi
|
|
|
1593
1600
|
...(p.requestedSchema !== undefined ? { requestedSchema: p.requestedSchema } : {}),
|
|
1594
1601
|
...(principal !== undefined ? { principal } : {}),
|
|
1595
1602
|
};
|
|
1596
|
-
const answer = await onElicit(req,
|
|
1603
|
+
const answer = await onElicit(req, ctx.mcpReq.signal);
|
|
1597
1604
|
return answer.action === "accept" ? { action: "accept", content: answer.content ?? {} } : { action: answer.action };
|
|
1598
1605
|
}
|
|
1599
1606
|
finally {
|
|
@@ -1603,11 +1610,12 @@ async function connectServer(spec, principal, onElicit, imageResizer, reminderDi
|
|
|
1603
1610
|
});
|
|
1604
1611
|
}
|
|
1605
1612
|
const pieces = transportKind === "stdio" ? await dialOpts.carrier.next(stop) : undefined;
|
|
1606
|
-
const
|
|
1613
|
+
const pipe = transportKind === "host" ? await openHostPipe(dialOpts.hostSeat, spec.name, stop) : undefined;
|
|
1614
|
+
const transport = buildTransport(spec, principal, transportKind, dialOpts.carrier, pieces, pipe);
|
|
1607
1615
|
const hangUp = () => void client.close().catch(() => undefined);
|
|
1608
1616
|
stop?.addEventListener("abort", hangUp, { once: true });
|
|
1609
1617
|
try {
|
|
1610
|
-
await client.connect(transport, startupOpts);
|
|
1618
|
+
await settledBefore(client.connect(transport, startupOpts), pipe !== undefined ? stop : undefined);
|
|
1611
1619
|
}
|
|
1612
1620
|
catch (err) {
|
|
1613
1621
|
await client.close().catch(() => undefined);
|
|
@@ -1619,15 +1627,18 @@ async function connectServer(spec, principal, onElicit, imageResizer, reminderDi
|
|
|
1619
1627
|
stop?.removeEventListener("abort", hangUp);
|
|
1620
1628
|
}
|
|
1621
1629
|
recordCarrier(client, dialOpts.carrier);
|
|
1630
|
+
if (poolKey !== undefined)
|
|
1631
|
+
recordEngineDial(client, poolKey);
|
|
1622
1632
|
return client;
|
|
1623
1633
|
};
|
|
1624
|
-
const
|
|
1625
|
-
const
|
|
1634
|
+
const mount = transportKind === "host" ? hostMount(startupMs, dialOpts.signal) : undefined;
|
|
1635
|
+
const mountStop = mount?.signal ?? dialOpts?.signal;
|
|
1636
|
+
const lease = pool !== undefined && poolKey !== undefined ? await pool.acquire(poolKey, dialClient, dialOpts) : undefined;
|
|
1637
|
+
const client = lease !== undefined ? lease.client : await dialClient(mountStop).catch((err) => {
|
|
1638
|
+
mount?.end();
|
|
1639
|
+
throw err;
|
|
1640
|
+
});
|
|
1626
1641
|
const close = () => (lease !== undefined ? lease.release() : client.close());
|
|
1627
|
-
const openListing = () => {
|
|
1628
|
-
const write = lease?.openListing();
|
|
1629
|
-
return (tools, retained) => (write !== undefined ? write(tools, (all) => cacheMcpToolMetadata(client, all), retained) : cacheMcpToolMetadata(client, tools));
|
|
1630
|
-
};
|
|
1631
1642
|
try {
|
|
1632
1643
|
const onClosed = () => {
|
|
1633
1644
|
health.dead = true;
|
|
@@ -1639,12 +1650,11 @@ async function connectServer(spec, principal, onElicit, imageResizer, reminderDi
|
|
|
1639
1650
|
client.onclose = onClosed;
|
|
1640
1651
|
const listing = lease?.listing ?? new ConnectionListing();
|
|
1641
1652
|
const at = listing.open();
|
|
1642
|
-
const cacheTools = openListing();
|
|
1643
1653
|
const declared = (carrierOf(client) ?? dialOpts.carrier).sent;
|
|
1644
|
-
const
|
|
1654
|
+
const echo = carrierEcho(carrierOf(client) ?? dialOpts.carrier, dialOpts.announceEcho);
|
|
1655
|
+
const listed = await underStartupBound(startupMs, mountStop, (options) => listToolsLenient(client, options, declared)).finally(() => mount?.end());
|
|
1645
1656
|
const answered = listing.answer(at, listed.tools, listed.incomplete !== undefined, dialOpts.carried);
|
|
1646
|
-
const { serverTools, serverAxes, gates, dropped, advisories
|
|
1647
|
-
cacheTools(accepted, answered.kept);
|
|
1657
|
+
const { serverTools, serverAxes, gates, definitions, dropped, advisories } = intakeListedTools({ tools: [...answered.view], unproven: answered.unproven }, spec, dialOpts.link, declared, outputSchemaValidatorOf(client), imageProcessor, reminderDisclosure, isServerRevoked, transportKind, seat, echo);
|
|
1648
1658
|
const caps = client.getServerCapabilities();
|
|
1649
1659
|
const resourceInfo = caps?.resources
|
|
1650
1660
|
? {
|
|
@@ -1652,15 +1662,15 @@ async function connectServer(spec, principal, onElicit, imageResizer, reminderDi
|
|
|
1652
1662
|
readAllowed: !spec.allowTools || spec.allowTools.includes(MCP_RESOURCE_READ_ALLOW),
|
|
1653
1663
|
}
|
|
1654
1664
|
: undefined;
|
|
1655
|
-
const rawInstructions = client.getInstructions();
|
|
1665
|
+
const rawInstructions = erasedEcho(client.getInstructions(), echo, "instructions");
|
|
1656
1666
|
const sanitized = rawInstructions && rawInstructions.trim() ? sanitizeUntrustedText(rawInstructions.trim()) : undefined;
|
|
1657
1667
|
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) });
|
|
1658
1668
|
const instructions = disposed?.kept === undefined ? undefined : { server: spec.name, ...disposed.kept };
|
|
1659
|
-
const info = client.getServerVersion();
|
|
1669
|
+
const info = serverInfoOf(client.getServerVersion(), echo);
|
|
1660
1670
|
const status = {
|
|
1661
1671
|
name: spec.name,
|
|
1662
1672
|
status: "connected",
|
|
1663
|
-
...(info ? { serverInfo:
|
|
1673
|
+
...(info ? { serverInfo: info } : {}),
|
|
1664
1674
|
toolNames: serverTools.map((t) => t.name),
|
|
1665
1675
|
liveness: livenessOf("completed", Date.now()),
|
|
1666
1676
|
};
|
|
@@ -1668,13 +1678,12 @@ async function connectServer(spec, principal, onElicit, imageResizer, reminderDi
|
|
|
1668
1678
|
status,
|
|
1669
1679
|
client,
|
|
1670
1680
|
close,
|
|
1671
|
-
openListing,
|
|
1672
1681
|
health,
|
|
1673
1682
|
announce,
|
|
1674
1683
|
tools: serverTools,
|
|
1675
1684
|
axes: serverAxes,
|
|
1676
1685
|
listing,
|
|
1677
|
-
|
|
1686
|
+
intakeAt: { at, gates, definitions },
|
|
1678
1687
|
dropped,
|
|
1679
1688
|
schemaAdvisories: advisories,
|
|
1680
1689
|
...(listed.toolsCapabilityAbsent === true ? { toolsCapabilityAbsent: true } : {}),
|
|
@@ -1691,24 +1700,29 @@ async function connectServer(spec, principal, onElicit, imageResizer, reminderDi
|
|
|
1691
1700
|
throw err;
|
|
1692
1701
|
}
|
|
1693
1702
|
}
|
|
1694
|
-
function intakeListedTools(listed, spec, link, declared,
|
|
1703
|
+
function intakeListedTools(listed, spec, link, declared, validator, imageProcessor, reminderDisclosure, isServerRevoked, transportKind, seat, echo = NO_CREDENTIAL_ECHO) {
|
|
1695
1704
|
const declaredContentOrigin = spec.contentOrigin;
|
|
1696
1705
|
const serverTools = [];
|
|
1697
1706
|
const serverAxes = [];
|
|
1698
1707
|
const gates = new Map();
|
|
1699
1708
|
const dropped = [];
|
|
1700
|
-
const
|
|
1709
|
+
const definitions = new Map();
|
|
1701
1710
|
const advisories = [];
|
|
1702
1711
|
const claimToolName = createToolNameClaims(MCP_NAMESPACE, spec.name);
|
|
1703
1712
|
for (const t of listed.tools) {
|
|
1704
1713
|
if (spec.allowTools && !spec.allowTools.includes(t.name)) {
|
|
1705
1714
|
continue;
|
|
1706
1715
|
}
|
|
1716
|
+
const echoDrop = echoedToolDrop(t.name, t.inputSchema, echo);
|
|
1717
|
+
if (echoDrop !== undefined) {
|
|
1718
|
+
dropped.push(echoDrop);
|
|
1719
|
+
continue;
|
|
1720
|
+
}
|
|
1707
1721
|
let modelFacingSchema;
|
|
1708
1722
|
let sanitizedDescription;
|
|
1709
1723
|
try {
|
|
1710
1724
|
modelFacingSchema = sanitizeMcpModelFacingValue(t.inputSchema);
|
|
1711
|
-
sanitizedDescription = t.description !== undefined ? sanitizeMcpModelFacingText(t.description) : undefined;
|
|
1725
|
+
sanitizedDescription = t.description !== undefined ? sanitizeMcpModelFacingText(erasedEcho(t.description, echo, "tool_listing")) : undefined;
|
|
1712
1726
|
}
|
|
1713
1727
|
catch (err) {
|
|
1714
1728
|
const reason = err instanceof McpPayloadKeyCollision
|
|
@@ -1790,11 +1804,13 @@ function intakeListedTools(listed, spec, link, declared, imageResizer, reminderD
|
|
|
1790
1804
|
const callMeta = mcpCallMeta(toolCallId, seat?.of(toolCallId), spec.sessionMetaKey, seat?.sessionId);
|
|
1791
1805
|
let answeredWith = declared;
|
|
1792
1806
|
const attempt = async (conn, resent, last) => {
|
|
1807
|
+
const definition = conn.definitions().get(namespacedName);
|
|
1793
1808
|
const site = requestSite(conn.client);
|
|
1794
1809
|
const watchdog = armMcpIdleWatchdog(conn.health, idleMs, signal);
|
|
1795
1810
|
try {
|
|
1796
1811
|
const res = await conn.client
|
|
1797
|
-
.callTool({ name: remoteName, arguments: (params ?? {}), ...(callMeta !== undefined ? { _meta: callMeta } : {}) },
|
|
1812
|
+
.callTool({ name: remoteName, arguments: (params ?? {}), ...(callMeta !== undefined ? { _meta: callMeta } : {}) }, {
|
|
1813
|
+
toolDefinition: definition.tool,
|
|
1798
1814
|
signal: watchdog.combinedSignal,
|
|
1799
1815
|
timeout: timeoutMs,
|
|
1800
1816
|
resetTimeoutOnProgress: true,
|
|
@@ -1844,7 +1860,7 @@ function intakeListedTools(listed, spec, link, declared, imageResizer, reminderD
|
|
|
1844
1860
|
const res = await callThroughLink(link, namespacedName, gate, signal, send, () => throwDeadServer(spec.name, what));
|
|
1845
1861
|
if (typeof res === "string")
|
|
1846
1862
|
return listingRefusal(res, remoteName, spec.name);
|
|
1847
|
-
const mapped = await mapContent(res.content, spec.name,
|
|
1863
|
+
const mapped = await mapContent(res.content, spec.name, imageProcessor);
|
|
1848
1864
|
if (res.isError === true) {
|
|
1849
1865
|
const parts = [];
|
|
1850
1866
|
for (const block of mapped) {
|
|
@@ -1901,9 +1917,9 @@ function intakeListedTools(listed, spec, link, declared, imageResizer, reminderD
|
|
|
1901
1917
|
},
|
|
1902
1918
|
};
|
|
1903
1919
|
serverTools.push(declaredContentOrigin !== undefined ? withContentOrigin(mounted, declaredContentOrigin) : mounted);
|
|
1904
|
-
|
|
1920
|
+
definitions.set(namespacedName, toolDefinitionOf(t, validator));
|
|
1905
1921
|
}
|
|
1906
|
-
return { serverTools, serverAxes, gates, dropped, advisories
|
|
1922
|
+
return { serverTools, serverAxes, gates, definitions, dropped, advisories };
|
|
1907
1923
|
}
|
|
1908
1924
|
function asServerWarning(spec, err, declared) {
|
|
1909
1925
|
const warning = new Error(`mcp: server "${spec.name}" failed to connect — skipped (${namedMcpFailureText(err, declared)})`, { cause: sanitizedCause(err, declared) });
|