@sema-agent/core 7.58.0 → 7.60.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 +1340 -0
- package/README.md +6 -4
- 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 +2 -1
- package/dist/agents/agent-transcript-tool.js +3 -1
- package/dist/agents/cc-peer-directory.js +8 -8
- package/dist/agents/child-model-seat.d.ts +4 -2
- package/dist/agents/child-model-seat.js +9 -4
- package/dist/agents/cumulative-stats.js +0 -1
- package/dist/agents/inherited-tool-pool.d.ts +26 -1
- package/dist/agents/inherited-tool-pool.js +22 -0
- package/dist/agents/peer-directory.d.ts +9 -0
- package/dist/agents/peer-directory.js +6 -2
- package/dist/agents/retain-ledger.d.ts +11 -1
- package/dist/agents/retain-ledger.js +13 -2
- package/dist/agents/roster-store.d.ts +1 -1
- package/dist/agents/roster-store.js +3 -1
- package/dist/agents/send-message-tool.d.ts +8 -19
- package/dist/agents/send-message-tool.js +32 -50
- package/dist/agents/subagent.d.ts +51 -17
- package/dist/agents/subagent.js +150 -112
- package/dist/agents/tool-filter.d.ts +1 -3
- package/dist/agents/tool-filter.js +4 -12
- package/dist/bench/metrics.d.ts +3 -5
- package/dist/bench/metrics.js +0 -1
- package/dist/brain/anthropic.js +161 -45
- package/dist/brain/degrading.js +3 -1
- package/dist/brain/errors.d.ts +9 -3
- package/dist/brain/errors.js +7 -1
- package/dist/brain/failover.js +2 -1
- package/dist/brain/open-responses.js +3 -3
- package/dist/brain/openai.js +103 -53
- package/dist/brain/provider-dialect.d.ts +11 -0
- package/dist/brain/provider-dialect.js +5 -2
- package/dist/brain/reasoning-request.js +5 -4
- package/dist/brain/reasoning.d.ts +19 -0
- package/dist/brain/reasoning.js +17 -2
- package/dist/brain/request-route.d.ts +4 -1
- package/dist/brain/request-route.js +4 -1
- package/dist/brain/route-adjudicator.d.ts +84 -18
- package/dist/brain/route-adjudicator.js +90 -22
- package/dist/brain/route-conformance.js +1 -1
- package/dist/brain/status-sink.d.ts +7 -1
- package/dist/brain/status-sink.js +6 -0
- package/dist/brain/stream-engine.js +84 -49
- package/dist/brain/stream-shared.d.ts +30 -0
- package/dist/brain/stream-shared.js +34 -1
- package/dist/brain/timeout.d.ts +65 -6
- package/dist/brain/timeout.js +111 -11
- package/dist/core/a2a.d.ts +15 -5
- package/dist/core/a2a.js +34 -19
- package/dist/core/account-row.d.ts +61 -0
- package/dist/core/account-row.js +51 -0
- package/dist/core/advisor-verdict.d.ts +2 -1
- package/dist/core/advisor-verdict.js +1 -1
- package/dist/core/agent-definition.d.ts +20 -0
- package/dist/core/allow-entry.d.ts +20 -6
- package/dist/core/allow-entry.js +17 -7
- package/dist/core/approval-object.d.ts +29 -15
- package/dist/core/approval-object.js +47 -19
- package/dist/core/artifact-host.d.ts +0 -2
- package/dist/core/artifact-host.js +0 -1
- package/dist/core/auto-compaction.js +1 -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 +63 -12
- package/dist/core/background-agent-store.d.ts +26 -4
- package/dist/core/background-agent-store.js +3 -2
- package/dist/core/background-shell.d.ts +12 -1
- package/dist/core/background-shell.js +12 -0
- package/dist/core/checkpoint-requirements.d.ts +13 -1
- package/dist/core/checkpoint-requirements.js +3 -1
- package/dist/core/checkpoint-store.d.ts +66 -25
- package/dist/core/checkpoint-store.js +22 -9
- package/dist/core/child-clamp-seats.d.ts +29 -0
- package/dist/core/child-clamp-seats.js +56 -1
- package/dist/core/compliance.d.ts +3 -3
- package/dist/core/compliance.js +1 -1
- 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 +4 -5
- package/dist/core/effective-path-target.d.ts +8 -2
- package/dist/core/effective-path-target.js +8 -3
- package/dist/core/engine-notice.d.ts +156 -23
- package/dist/core/engine-notice.js +19 -5
- package/dist/core/frame-settlement.d.ts +5 -0
- package/dist/core/frame-settlement.js +4 -0
- package/dist/core/gate-fold.js +8 -6
- package/dist/core/gate-lanes.js +47 -12
- package/dist/core/gate-outcome.d.ts +32 -3
- package/dist/core/gate-outcome.js +19 -1
- package/dist/core/governance-codes.d.ts +17 -1
- package/dist/core/governance-codes.js +25 -0
- package/dist/core/hands-band-screen.js +0 -1
- package/dist/core/hands-band.d.ts +0 -3
- package/dist/core/hooks.d.ts +70 -59
- package/dist/core/hooks.js +125 -80
- package/dist/core/image-admission.d.ts +106 -52
- package/dist/core/image-admission.js +184 -56
- package/dist/core/image-downsample.d.ts +36 -69
- package/dist/core/image-downsample.js +111 -73
- package/dist/core/integer-option.d.ts +21 -0
- package/dist/core/integer-option.js +13 -0
- package/dist/core/locked-config.d.ts +59 -5
- package/dist/core/locked-config.js +82 -50
- package/dist/core/mailbox-store.d.ts +45 -1
- package/dist/core/mailbox-store.js +53 -9
- package/dist/core/mcp-call-meta.d.ts +2 -2
- package/dist/core/mcp-call-meta.js +9 -10
- package/dist/core/mcp-failure.d.ts +122 -20
- package/dist/core/mcp-failure.js +73 -5
- package/dist/core/mcp-host-seat.d.ts +92 -0
- package/dist/core/mcp-host-seat.js +131 -0
- package/dist/core/mcp-probe.d.ts +7 -2
- package/dist/core/mcp-probe.js +7 -2
- package/dist/core/mcp-server-link.d.ts +22 -1
- package/dist/core/mcp-server-link.js +25 -1
- package/dist/core/mcp-server-spec.d.ts +38 -9
- package/dist/core/mcp-server-spec.js +55 -21
- package/dist/core/mcp.d.ts +27 -12
- package/dist/core/mcp.js +105 -76
- package/dist/core/memory-admission.d.ts +23 -6
- package/dist/core/memory-admission.js +19 -9
- package/dist/core/memory-engine/consolidation-driver.d.ts +2 -4
- package/dist/core/memory-engine/consolidation-driver.js +3 -3
- package/dist/core/memory-engine/consolidation.d.ts +4 -0
- package/dist/core/memory-engine/consolidation.js +1 -0
- package/dist/core/memory-engine/content-origin.d.ts +13 -0
- package/dist/core/memory-engine/content-origin.js +21 -3
- package/dist/core/memory-engine/delegation-settlement.js +5 -12
- package/dist/core/memory-engine/distiller.js +2 -2
- package/dist/core/memory-engine/dual-root.d.ts +50 -1
- package/dist/core/memory-engine/dual-root.js +44 -1
- package/dist/core/memory-engine/engine.d.ts +67 -14
- package/dist/core/memory-engine/engine.js +384 -212
- package/dist/core/memory-engine/export-bundle.d.ts +23 -0
- package/dist/core/memory-engine/export-bundle.js +23 -4
- package/dist/core/memory-engine/file-backend.d.ts +128 -55
- package/dist/core/memory-engine/file-backend.js +290 -117
- package/dist/core/memory-engine/index.d.ts +3 -2
- package/dist/core/memory-engine/index.js +2 -1
- package/dist/core/memory-engine/layout.d.ts +59 -11
- package/dist/core/memory-engine/layout.js +190 -40
- package/dist/core/memory-engine/memory-backend-contract.d.ts +1 -1
- package/dist/core/memory-engine/memory-backend-contract.js +39 -2
- package/dist/core/memory-engine/scope-contract.d.ts +13 -3
- package/dist/core/memory-engine/scope-contract.js +2 -2
- package/dist/core/memory-engine/sync-client.d.ts +51 -9
- package/dist/core/memory-engine/sync-client.js +107 -13
- package/dist/core/memory-engine/sync-report.d.ts +103 -0
- package/dist/core/memory-engine/sync-report.js +119 -0
- package/dist/core/memory-engine/sync.d.ts +8 -1
- package/dist/core/memory-engine/types.d.ts +6 -0
- package/dist/core/mode-policy.d.ts +9 -1
- package/dist/core/mode-policy.js +11 -1
- 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 +65 -0
- package/dist/core/mods/agent-stations.js +105 -0
- package/dist/core/mods/classic-events.d.ts +5 -1
- package/dist/core/mods/kernel/dispatch.d.ts +5 -1
- package/dist/core/mods/kernel/dispatch.js +6 -5
- package/dist/core/mods/kernel/events.d.ts +11 -4
- package/dist/core/mods/kernel/events.js +11 -7
- 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 +4 -0
- package/dist/core/mods/kernel/registration.js +3 -0
- package/dist/core/mods/lifecycle-stations.d.ts +41 -0
- package/dist/core/mods/lifecycle-stations.js +35 -0
- package/dist/core/mods/stations.d.ts +73 -60
- package/dist/core/mods/stations.js +64 -40
- package/dist/core/mods/tool-call.d.ts +10 -4
- package/dist/core/mods/tool-call.js +28 -12
- 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/own-property-receipt.d.ts +3 -0
- package/dist/core/own-property-receipt.js +3 -0
- package/dist/core/parent-spec-seat.d.ts +8 -3
- package/dist/core/parent-spec-seat.js +2 -0
- package/dist/core/park-selfcheck.js +14 -8
- package/dist/core/peer-seat.d.ts +133 -16
- package/dist/core/peer-seat.js +319 -42
- package/dist/core/permission-rule-consent.d.ts +0 -21
- package/dist/core/permission-rule-consent.js +11 -6
- package/dist/core/permission-rule-model.d.ts +20 -2
- package/dist/core/permission-rule-model.js +8 -7
- package/dist/core/present-plan-tool.d.ts +11 -3
- package/dist/core/present-plan-tool.js +2 -2
- 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 +146 -98
- package/dist/core/remote-env.js +113 -14
- package/dist/core/resume-startup-cause.js +1 -0
- package/dist/core/retention.js +37 -12
- package/dist/core/retired-keys.d.ts +6 -1
- package/dist/core/retired-keys.js +4 -1
- package/dist/core/rewrite-rejudge.d.ts +13 -5
- package/dist/core/rewrite-rejudge.js +9 -5
- package/dist/core/roles.d.ts +69 -3
- package/dist/core/roles.js +167 -80
- package/dist/core/rule-owner.d.ts +3 -0
- package/dist/core/runner/announce-once-ledger.d.ts +5 -4
- package/dist/core/runner/announce-once-ledger.js +4 -2
- package/dist/core/runner/assemble-result.d.ts +0 -5
- package/dist/core/runner/assemble-result.js +0 -1
- package/dist/core/runner/call-hook-stations.d.ts +17 -10
- package/dist/core/runner/call-hook-stations.js +23 -12
- 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/construction-doors.js +5 -0
- package/dist/core/runner/contracts.d.ts +82 -57
- package/dist/core/runner/credential-origin-seat.js +4 -3
- package/dist/core/runner/cross-boundary-lane.d.ts +3 -5
- package/dist/core/runner/cross-boundary-lane.js +11 -2
- package/dist/core/runner/cwd-alignment-probe.d.ts +20 -0
- package/dist/core/runner/cwd-alignment-probe.js +21 -0
- package/dist/core/runner/decide-continuation.d.ts +2 -2
- package/dist/core/runner/env-capability-census.d.ts +15 -20
- package/dist/core/runner/env-capability-census.js +25 -34
- 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 +87 -11
- package/dist/core/runner/gate-exit.js +30 -8
- package/dist/core/runner/git-status-frame.d.ts +5 -2
- package/dist/core/runner/git-status-frame.js +3 -4
- package/dist/core/runner/image-removed-seat.d.ts +12 -0
- package/dist/core/runner/image-removed-seat.js +19 -0
- package/dist/core/runner/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/memory-consolidation-driver.js +5 -5
- package/dist/core/runner/park-commit.d.ts +1 -1
- package/dist/core/runner/park-commit.js +3 -0
- package/dist/core/runner/permission-rule-lanes.js +1 -1
- package/dist/core/runner/prepare-ask-lane.d.ts +1 -1
- package/dist/core/runner/prepare-ask-lane.js +2 -1
- package/dist/core/runner/prepare-boundary-parks.d.ts +2 -2
- package/dist/core/runner/prepare-boundary-parks.js +5 -5
- package/dist/core/runner/prepare-caps-and-workflow.d.ts +7 -5
- package/dist/core/runner/prepare-caps-and-workflow.js +6 -3
- package/dist/core/runner/prepare-config-doors.d.ts +6 -1
- package/dist/core/runner/prepare-config-doors.js +16 -9
- package/dist/core/runner/prepare-context-lane.js +2 -0
- package/dist/core/runner/prepare-delegation-surface.d.ts +9 -3
- package/dist/core/runner/prepare-delegation-surface.js +5 -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 +4 -3
- package/dist/core/runner/prepare-gate-stations.js +4 -3
- package/dist/core/runner/prepare-hands-readface.d.ts +7 -1
- package/dist/core/runner/prepare-hands-readface.js +19 -6
- package/dist/core/runner/prepare-inherited-gate.d.ts +6 -7
- package/dist/core/runner/prepare-inherited-gate.js +22 -31
- 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 +12 -19
- package/dist/core/runner/prepare-park-ask.d.ts +4 -6
- package/dist/core/runner/prepare-park-ask.js +5 -9
- package/dist/core/runner/prepare-policy-chain.d.ts +8 -7
- package/dist/core/runner/prepare-policy-chain.js +136 -121
- package/dist/core/runner/prepare-project-context.d.ts +2 -2
- package/dist/core/runner/prepare-project-context.js +10 -7
- package/dist/core/runner/prepare-prompt-inputs.d.ts +5 -2
- package/dist/core/runner/prepare-prompt-inputs.js +10 -20
- package/dist/core/runner/prepare-protocol-tools.d.ts +5 -3
- package/dist/core/runner/prepare-protocol-tools.js +17 -2
- package/dist/core/runner/prepare-run-refs.d.ts +2 -3
- package/dist/core/runner/prepare-run-refs.js +4 -1
- package/dist/core/runner/prepare-suspend-saga.d.ts +0 -2
- package/dist/core/runner/prepare-suspend-saga.js +5 -7
- package/dist/core/runner/prepare-task.js +44 -28
- 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 +5 -4
- package/dist/core/runner/prepare-wiring-manifest.js +34 -19
- package/dist/core/runner/prepare-workspace-restore.js +3 -3
- package/dist/core/runner/reply-pricing.d.ts +30 -0
- package/dist/core/runner/reply-pricing.js +19 -0
- package/dist/core/runner/resume-admission.js +4 -2
- package/dist/core/runner/resume-apply.js +6 -1
- package/dist/core/runner/resume-checkpoint-screen.js +4 -4
- package/dist/core/runner/resume-policy-outcome.js +5 -5
- package/dist/core/runner/retired-runner-deps.js +4 -1
- package/dist/core/runner/role-seat-defaulted.d.ts +44 -0
- package/dist/core/runner/role-seat-defaulted.js +40 -0
- package/dist/core/runner/run-attachment-seats.js +3 -3
- package/dist/core/runner/run-brain-sinks.js +3 -0
- package/dist/core/runner/run-git-lane.d.ts +3 -1
- package/dist/core/runner/run-git-lane.js +1 -1
- package/dist/core/runner/run-harness-handlers.d.ts +3 -1
- package/dist/core/runner/run-harness-handlers.js +3 -1
- package/dist/core/runner/run-identity-wiring.d.ts +2 -5
- package/dist/core/runner/run-identity-wiring.js +6 -5
- package/dist/core/runner/run-leg.d.ts +2 -0
- package/dist/core/runner/run-leg.js +63 -56
- package/dist/core/runner/run-notification-lane.d.ts +3 -1
- package/dist/core/runner/run-notification-lane.js +16 -10
- package/dist/core/runner/run-settle-and-teardown.js +5 -1
- package/dist/core/runner/run-stop-and-final-verify.d.ts +4 -0
- package/dist/core/runner/run-stop-and-final-verify.js +14 -6
- package/dist/core/runner/run-terminal-adoption.d.ts +2 -5
- package/dist/core/runner/run-terminal-adoption.js +9 -3
- package/dist/core/runner/run-turn-boundary.js +89 -77
- package/dist/core/runner/runtask.d.ts +8 -5
- package/dist/core/runner/runtask.js +21 -13
- package/dist/core/runner/side-call-account.d.ts +1 -1
- package/dist/core/runner/side-call-account.js +3 -18
- package/dist/core/runner/skills-seat.js +2 -2
- package/dist/core/runner/sub-agent-deny-lists.d.ts +24 -0
- package/dist/core/runner/sub-agent-deny-lists.js +20 -7
- package/dist/core/runner/synthetic-tools.js +2 -2
- package/dist/core/runner/tool-disclosure.js +0 -2
- package/dist/core/runner/tool-end-body.js +2 -2
- 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-occurrence.d.ts +1 -1
- package/dist/core/runner/tool-occurrence.js +2 -2
- 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/turn-attachments.d.ts +29 -27
- package/dist/core/runner/turn-attachments.js +27 -42
- package/dist/core/runner-deps.d.ts +32 -19
- package/dist/core/secret-env.d.ts +35 -4
- package/dist/core/secret-env.js +65 -3
- package/dist/core/sensitive-path-policy.js +3 -3
- package/dist/core/session-policy-store.d.ts +12 -3
- package/dist/core/session-policy-store.js +29 -10
- package/dist/core/session-store.d.ts +5 -7
- package/dist/core/session-store.js +50 -11
- package/dist/core/side-query.d.ts +11 -1
- package/dist/core/side-query.js +9 -0
- package/dist/core/skill-grant-binding.d.ts +31 -2
- package/dist/core/skill-grant-binding.js +31 -1
- package/dist/core/skill-grant.d.ts +17 -5
- package/dist/core/skill-grant.js +24 -6
- package/dist/core/store-contracts/background-agent-store-contract.js +27 -0
- package/dist/core/store-contracts/checkpoint-store-contract.js +3 -2
- package/dist/core/store-contracts/mailbox-store-contract.js +31 -1
- package/dist/core/store-contracts/tool-result-store-contract.d.ts +1 -1
- package/dist/core/store-contracts/tool-result-store-contract.js +37 -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/synthetic-read-verdict.js +2 -1
- package/dist/core/task-event.d.ts +50 -10
- package/dist/core/task-notification.d.ts +88 -5
- package/dist/core/task-notification.js +146 -17
- package/dist/core/task-registry-agent.d.ts +18 -12
- package/dist/core/task-registry-agent.js +19 -6
- package/dist/core/task-registry-monitor.d.ts +7 -0
- package/dist/core/task-registry-monitor.js +28 -1
- package/dist/core/task-registry-shared.d.ts +43 -3
- package/dist/core/task-registry-shared.js +21 -7
- package/dist/core/task-registry-workflow.js +1 -1
- package/dist/core/task-registry.d.ts +50 -35
- package/dist/core/task-registry.js +64 -23
- package/dist/core/task-result.d.ts +3 -12
- package/dist/core/task-spec.d.ts +15 -7
- package/dist/core/task-stream.d.ts +1 -1
- package/dist/core/terminal-cause.d.ts +10 -0
- package/dist/core/tool-catalog-entries.js +1 -1
- package/dist/core/tool-check-reading.d.ts +1 -0
- package/dist/core/tool-check-reading.js +3 -3
- package/dist/core/tool-face-reader.d.ts +7 -6
- package/dist/core/tool-face-reader.js +4 -3
- package/dist/core/tool-name-aliases.d.ts +19 -0
- package/dist/core/tool-name-aliases.js +54 -2
- package/dist/core/tool-policy.d.ts +21 -4
- package/dist/core/tool-policy.js +1 -1
- 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 +88 -5
- package/dist/core/tool-result-store.js +51 -12
- package/dist/core/tool-roster.d.ts +112 -5
- package/dist/core/tool-roster.js +42 -1
- package/dist/core/tool-spec.d.ts +23 -5
- package/dist/core/trace.d.ts +0 -1
- package/dist/core/types.d.ts +5 -5
- package/dist/core/types.js +2 -2
- package/dist/core/untrusted-text.js +1 -1
- package/dist/core/user-attachment.d.ts +10 -5
- package/dist/core/user-attachment.js +15 -7
- package/dist/core/wiring-manifest.d.ts +6 -3
- package/dist/engine/compaction/compaction.js +29 -3
- package/dist/engine/execution-env/node-execution-env.d.ts +11 -5
- package/dist/engine/execution-env/node-execution-env.js +21 -13
- package/dist/engine/harness/agent-harness.d.ts +26 -3
- package/dist/engine/harness/agent-harness.js +49 -16
- package/dist/engine/harness/messages.d.ts +3 -1
- package/dist/engine/harness/messages.js +3 -2
- package/dist/engine/harness/types.d.ts +119 -28
- package/dist/engine/llm/rejected-images.d.ts +46 -0
- package/dist/engine/llm/rejected-images.js +54 -0
- package/dist/engine/llm/tool-turns.d.ts +2 -1
- package/dist/engine/llm/types.d.ts +18 -7
- package/dist/engine/loop/agent-loop.d.ts +20 -12
- package/dist/engine/loop/agent-loop.js +205 -36
- package/dist/engine/loop/types.d.ts +12 -3
- 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/path-to-root.d.ts +38 -0
- package/dist/engine/session/path-to-root.js +39 -0
- package/dist/engine/session/storage-base.js +4 -21
- package/dist/index.d.ts +35 -21
- package/dist/index.js +26 -17
- package/dist/internal/harness-types.d.ts +1 -1
- package/dist/internal/harness.d.ts +1 -0
- package/dist/internal/llm.d.ts +1 -0
- package/dist/orchestration/run-workflow-tool.d.ts +9 -3
- package/dist/orchestration/run-workflow-tool.js +59 -29
- package/dist/orchestration/workflow-governance.d.ts +1 -1
- package/dist/orchestration/workflow-governance.js +2 -1
- package/dist/orchestration/workflow-observe.d.ts +17 -1
- package/dist/orchestration/workflow-observe.js +20 -0
- package/dist/orchestration/workflow-types.d.ts +32 -7
- package/dist/orchestration/workflow.d.ts +4 -0
- package/dist/orchestration/workflow.js +762 -491
- package/dist/prompts/default.d.ts +1 -10
- package/dist/prompts/default.js +0 -2
- package/dist/shell/counting-pass.d.ts +50 -0
- package/dist/shell/counting-pass.js +502 -0
- package/dist/shell/lex.d.ts +4 -2
- package/dist/shell/lex.js +93 -34
- package/dist/shell/shell-words.d.ts +1 -1
- package/dist/shell/shell-words.js +7 -6
- package/dist/stores/file/background-agent-store.d.ts +1 -1
- package/dist/stores/file/background-agent-store.js +3 -1
- package/dist/stores/file/checkpoint-store.d.ts +127 -2
- package/dist/stores/file/checkpoint-store.js +19 -14
- package/dist/stores/file/file-history-store.d.ts +1 -1
- package/dist/stores/file/file-history-store.js +3 -1
- package/dist/stores/file/index.d.ts +4 -3
- package/dist/stores/file/index.js +17 -8
- package/dist/stores/file/mailbox-store.d.ts +1 -1
- package/dist/stores/file/mailbox-store.js +9 -11
- package/dist/stores/file/memory-store.d.ts +1 -1
- package/dist/stores/file/memory-store.js +3 -1
- package/dist/stores/file/session-policy-store.d.ts +1 -1
- package/dist/stores/file/session-policy-store.js +3 -1
- package/dist/stores/file/session-store.d.ts +1 -1
- package/dist/stores/file/session-store.js +3 -1
- 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 +20 -2
- package/dist/stores/file/tool-result-store.js +74 -6
- package/dist/stores/file/usage-window-store.d.ts +1 -1
- package/dist/stores/file/usage-window-store.js +3 -1
- package/dist/stores/file/workflow-journal-store.d.ts +1 -11
- package/dist/stores/file/workflow-journal-store.js +3 -2
- package/dist/tools/fs/containment-face.d.ts +5 -0
- 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 +7 -0
- package/dist/tools/fs/fs-bash-background-text.js +1 -0
- package/dist/tools/fs/fs-bash.d.ts +14 -4
- package/dist/tools/fs/fs-bash.js +29 -35
- package/dist/tools/fs/fs-pdf.d.ts +2 -2
- package/dist/tools/fs/fs-pdf.js +26 -21
- 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 +11 -13
- package/dist/tools/fs/fs-shared.js +11 -7
- package/dist/tools/fs/fs-write.js +5 -5
- package/dist/tools/fs/index.d.ts +14 -8
- package/dist/tools/fs/index.js +13 -5
- package/dist/tools/fs/program-read-model.d.ts +13 -0
- package/dist/tools/fs/program-read-model.js +15 -0
- package/dist/tools/fs/program-read-model.rows.js +1 -1
- package/dist/tools/fs/read-deny.d.ts +13 -10
- package/dist/tools/fs/read-deny.js +25 -5
- package/dist/tools/fs/read-floor.d.ts +62 -0
- package/dist/tools/fs/read-floor.js +58 -0
- 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 +3 -3
- package/dist/tools/fs/search.js +4 -4
- package/dist/tools/fs/shell-read-check.d.ts +1 -1
- package/dist/tools/fs/shell-read-check.js +2 -1
- package/dist/tools/fs/shell-read-judge.d.ts +16 -8
- package/dist/tools/fs/shell-read-judge.js +10 -6
- package/dist/tools/fs/shell-read-plan.d.ts +6 -1
- package/dist/tools/fs/shell-read-plan.js +22 -15
- package/dist/tools/fs/shell-read-start.js +1 -0
- package/dist/tools/fs/shell-reentry-text.d.ts +15 -1
- package/dist/tools/fs/shell-reentry-text.js +25 -3
- package/dist/tools/monitor.d.ts +9 -4
- package/dist/tools/monitor.js +17 -8
- package/dist/tools/scheduler-tools.js +42 -4
- package/dist/tools/web.d.ts +0 -10
- package/dist/tools/web.js +1 -4
- package/package.json +5 -2
- package/test/export-surface.snapshot.json +161 -21
- package/wire-changes/core-stores-sql@7.59.0.json +29 -0
- package/wire-changes/core-stores-sql@7.60.0.json +30 -0
- package/wire-changes/core@7.59.0.json +2459 -0
- package/wire-changes/core@7.60.0.json +3274 -0
- package/wire-changes/mods-kernel@7.59.0.json +29 -0
- package/wire-changes/mods-kernel@7.60.0.json +62 -0
- package/wire-changes/primitives@7.59.0.json +29 -0
- package/wire-changes/primitives@7.60.0.json +30 -0
package/dist/core/mcp.js
CHANGED
|
@@ -2,7 +2,8 @@ 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";
|
|
@@ -10,19 +11,22 @@ import { Client } from "@modelcontextprotocol/sdk/client/index.js";
|
|
|
10
11
|
import { McpConnectionPool } from "./mcp-connection-pool.js";
|
|
11
12
|
import { SessionEndingTransport, requestSite } from "./mcp-session-end.js";
|
|
12
13
|
import { mcpToolGate, UNPROVEN_GATE } from "./mcp-listing-drift.js";
|
|
13
|
-
import { ConnectionListing, Flights, IDLE_WATCHDOG_ABORT_REASON, Resendable, armMcpIdleWatchdog, callThroughLink, listingRefusal, reach } from "./mcp-server-link.js";
|
|
14
|
+
import { ConnectionListing, Flights, IDLE_WATCHDOG_ABORT_REASON, Resendable, armMcpIdleWatchdog, callThroughLink, listingRefusal, observedFailure, owedByAnswer, reach, refusalScope } from "./mcp-server-link.js";
|
|
14
15
|
import { underStartupBound } from "./mcp-startup-request.js";
|
|
15
16
|
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
17
|
import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
|
|
17
|
-
import {
|
|
18
|
+
import { describeHttpTransportFailure, failureFields, livenessOf, namingLostSession, readMcpFailure, sessionGone, unauthorizedLine } from "./mcp-failure.js";
|
|
18
19
|
import { lstat, mkdir, writeFile } from "node:fs/promises";
|
|
19
20
|
import { tmpdir } from "node:os";
|
|
20
21
|
import { join } from "node:path";
|
|
21
22
|
import { CallToolResultSchema, ElicitRequestSchema, ErrorCode, ListResourcesResultSchema, McpError } from "@modelcontextprotocol/sdk/types.js";
|
|
22
23
|
import { DEFAULT_REQUEST_TIMEOUT_MSEC } from "@modelcontextprotocol/sdk/shared/protocol.js";
|
|
23
|
-
import {
|
|
24
|
+
import { resolveImageProcessor } from "./image-downsample.js";
|
|
25
|
+
import { admitImageBytes, IMAGE_ADMISSION, unprocessedSizeClause } from "./image-admission.js";
|
|
24
26
|
import { sliceHeadSafe, sliceTailSafe } from "./surrogate-safe-slice.js";
|
|
25
27
|
import { truncateError } from "./tool-errors.js";
|
|
28
|
+
import { transportKindOf } from "./mcp-server-spec.js";
|
|
29
|
+
import { HostSeatTransport, hostSeatLine, hostSeatMissing, hostSeatVerdictOf } from "./mcp-host-seat.js";
|
|
26
30
|
import { peerRequestRefusal } from "./host-floor.js";
|
|
27
31
|
import { delimitUntrusted, inlineUntrusted, sanitizeUntrustedText } from "./untrusted-text.js";
|
|
28
32
|
import { discloseReminderShaped, observeReminderMarkEcho } from "./reminder-disclosure.js";
|
|
@@ -172,6 +176,9 @@ function sanitizeMcpErrorTextInPlace(err, declared) {
|
|
|
172
176
|
err.message = sanitized;
|
|
173
177
|
}
|
|
174
178
|
function namedMcpFailureText(err, declared) {
|
|
179
|
+
const seat = hostSeatVerdictOf(err);
|
|
180
|
+
if (seat !== undefined)
|
|
181
|
+
return seat.condition;
|
|
175
182
|
const detail = remoteErrorText(err, declared, { collapse: true });
|
|
176
183
|
const condition = thrownIs(err, McpError) ? describeMcpSpecErrorCode(readMember(err, "code")) : undefined;
|
|
177
184
|
return condition !== undefined ? `${condition}: ${detail}` : detail;
|
|
@@ -210,9 +217,8 @@ function rethrowHonestMcpError(err, ctx) {
|
|
|
210
217
|
finish(err);
|
|
211
218
|
const serverLabel = inlineUntrusted(ctx.server);
|
|
212
219
|
const fenceServerText = (label, raw) => delimitUntrusted(label, truncateMcpErrorText(raw));
|
|
213
|
-
const failure =
|
|
214
|
-
ctx.
|
|
215
|
-
const details = (extra) => ({ code: failure.kind, delivered: failure.delivered, server: ctx.server, ...extra });
|
|
220
|
+
const failure = observedFailure(err, ctx.site, ctx.liveness, ctx.attempt === undefined);
|
|
221
|
+
const details = (extra) => ({ code: failure.kind, delivered: failure.delivered, server: ctx.server, ...(failure.authorization !== undefined ? { authorization: { ...failure.authorization } } : {}), ...extra });
|
|
216
222
|
switch (failure.kind) {
|
|
217
223
|
case "timeout": {
|
|
218
224
|
const data = err.data;
|
|
@@ -247,11 +253,17 @@ function rethrowHonestMcpError(err, ctx) {
|
|
|
247
253
|
}
|
|
248
254
|
finish(markMcpFailure(err, details()));
|
|
249
255
|
}
|
|
256
|
+
case "unauthorized":
|
|
257
|
+
finish(markMcpFailure(new Error(unauthorizedLine(ctx.what, serverLabel, failure.authorization, refusedThenRenewed(err) && ctx.attempt !== "resent", writeEffectWarning(ctx.writeEffect)), { cause: err }), details()));
|
|
250
258
|
case "credential_unavailable":
|
|
251
259
|
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()));
|
|
260
|
+
case "host_refused":
|
|
252
261
|
case "spawn_failed":
|
|
253
262
|
case "invalid_config":
|
|
254
263
|
case "unknown": {
|
|
264
|
+
const seat = hostSeatVerdictOf(err);
|
|
265
|
+
if (seat !== undefined)
|
|
266
|
+
finish(markMcpFailure(new Error(hostSeatLine(ctx.what, serverLabel, seat, writeEffectWarning(ctx.writeEffect)), { cause: err }), details()));
|
|
255
267
|
if (ctx.attributeServer) {
|
|
256
268
|
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()));
|
|
257
269
|
}
|
|
@@ -325,26 +337,24 @@ async function blobToTextBlock(base64Data, mimeType, server, prefix, refetchHint
|
|
|
325
337
|
}
|
|
326
338
|
return { type: "text", text: `${prefix}Binary content (${mt}, ${r.bytes} bytes) saved to ${r.filePath}` };
|
|
327
339
|
}
|
|
328
|
-
async function boundedImageBlock(data, mimeType, server,
|
|
329
|
-
|
|
340
|
+
async function boundedImageBlock(data, mimeType, server, processor) {
|
|
341
|
+
const admitted = await admitImageBytes(Buffer.from(data, "base64"), mimeType, processor);
|
|
342
|
+
if (admitted.ok)
|
|
343
|
+
return admitted.block;
|
|
344
|
+
const over = admitted.reason === "raw_too_large"
|
|
345
|
+
? `over the ${admitted.cap}-byte read cap`
|
|
346
|
+
: admitted.reason === "dimensions_too_large"
|
|
347
|
+
? unprocessedSizeClause(admitted)
|
|
348
|
+
: admitted.reason === "base64_too_large"
|
|
349
|
+
? `base64 ${admitted.base64.length} chars after processing exceeds the ${IMAGE_ADMISSION.hard.imageBase64Chars}-char API image limit`
|
|
350
|
+
: undefined;
|
|
351
|
+
if (over === undefined)
|
|
330
352
|
return { type: "image", data, mimeType };
|
|
331
|
-
if (resizer) {
|
|
332
|
-
const resized = await resizer(data, mimeType).catch(() => undefined);
|
|
333
|
-
if (resized && resized.base64.length <= MCP_IMAGE_MAX_BASE64) {
|
|
334
|
-
return { type: "image", data: resized.base64, mimeType: resized.mimeType };
|
|
335
|
-
}
|
|
336
|
-
}
|
|
337
353
|
const r = await persistMcpBlob(data, mimeType, server);
|
|
338
354
|
if ("error" in r) {
|
|
339
|
-
return {
|
|
340
|
-
type: "text",
|
|
341
|
-
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]`,
|
|
342
|
-
};
|
|
355
|
+
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]` };
|
|
343
356
|
}
|
|
344
|
-
return {
|
|
345
|
-
type: "text",
|
|
346
|
-
text: `[image (${mimeType}): too large to inline (${r.bytes} bytes; base64 ${data.length} chars exceeds the 5MB API image limit) — saved to ${r.filePath}]`,
|
|
347
|
-
};
|
|
357
|
+
return { type: "text", text: `[image (${mimeType}): too large to inline (${r.bytes} bytes; ${over}) — saved to ${r.filePath}]` };
|
|
348
358
|
}
|
|
349
359
|
export function inferCompactSchema(value, depth = 2) {
|
|
350
360
|
if (value === null)
|
|
@@ -364,8 +374,10 @@ export function inferCompactSchema(value, depth = 2) {
|
|
|
364
374
|
}
|
|
365
375
|
return typeof value;
|
|
366
376
|
}
|
|
367
|
-
function buildTransport(spec, principal, kind, carrier, pieces) {
|
|
377
|
+
function buildTransport(spec, principal, kind, carrier, pieces, hostSeat) {
|
|
368
378
|
const t = spec.transport;
|
|
379
|
+
if (kind === "host")
|
|
380
|
+
return new HostSeatTransport(hostSeat, spec.name);
|
|
369
381
|
if (kind === "stdio") {
|
|
370
382
|
if (!("command" in t))
|
|
371
383
|
throw new Error(`MCP server "${spec.name}": transport kind "stdio" carries no command`);
|
|
@@ -380,9 +392,8 @@ function buildTransport(spec, principal, kind, carrier, pieces) {
|
|
|
380
392
|
resolveProtocolHttpHeaders(MCP_NAMESPACE.id, t.principalHeader !== undefined ? { principalHeader: t.principalHeader } : {}, principal);
|
|
381
393
|
return new SessionEndingTransport(new URL(t.url), { fetch: peerFetch(carrier, t.principalHeader, principal) });
|
|
382
394
|
}
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
const resizer = imageResizer ?? (await (autoResizer ??= sharpImageResizer()));
|
|
395
|
+
export async function mapContent(content, serverName, imageProcessor) {
|
|
396
|
+
const processor = await resolveImageProcessor(imageProcessor);
|
|
386
397
|
const out = [];
|
|
387
398
|
for (const item of content ?? []) {
|
|
388
399
|
if (item.type === "text" && typeof item.text === "string") {
|
|
@@ -391,7 +402,7 @@ export async function mapContent(content, serverName, imageResizer) {
|
|
|
391
402
|
else if (item.type === "image") {
|
|
392
403
|
const data = typeof item.data === "string" ? item.data : "";
|
|
393
404
|
const mimeType = typeof item.mimeType === "string" ? item.mimeType : "";
|
|
394
|
-
out.push(data !== "" && mimeType !== "" ? await boundedImageBlock(data, mimeType, serverName,
|
|
405
|
+
out.push(data !== "" && mimeType !== "" ? await boundedImageBlock(data, mimeType, serverName, processor) : { type: "image", data, mimeType });
|
|
395
406
|
}
|
|
396
407
|
else if (item.type === "audio" && typeof item.data === "string" && item.data) {
|
|
397
408
|
out.push(await blobToTextBlock(item.data, item.mimeType, serverName, `[Audio from ${serverName ?? "MCP server"}] `));
|
|
@@ -405,7 +416,7 @@ export async function mapContent(content, serverName, imageResizer) {
|
|
|
405
416
|
out.push({ type: "text", text: `[resource${r.uri ? ` ${r.uri}` : ""}]\n${r.text}` });
|
|
406
417
|
}
|
|
407
418
|
else if (r.blob && r.mimeType && r.mimeType.startsWith("image/")) {
|
|
408
|
-
out.push(await boundedImageBlock(r.blob, r.mimeType, serverName,
|
|
419
|
+
out.push(await boundedImageBlock(r.blob, r.mimeType, serverName, processor));
|
|
409
420
|
}
|
|
410
421
|
else if (r.blob) {
|
|
411
422
|
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})` : ""}.`));
|
|
@@ -642,10 +653,10 @@ export function mcpToolSchemaProblem(schema) {
|
|
|
642
653
|
}
|
|
643
654
|
return undefined;
|
|
644
655
|
}
|
|
645
|
-
export async function materializeMcpTools(specs, principal, onElicit,
|
|
646
|
-
return materializeLegMcpTools(undefined, specs, principal, onElicit,
|
|
656
|
+
export async function materializeMcpTools(specs, principal, onElicit, imageProcessor, reminderDisclosure, mcpRevocations, poolOpts, promptSections, dialable, signal, hostFloor, peerSeat, onAuthorizationRequired, hostSeats, onCredentialEchoed) {
|
|
657
|
+
return materializeLegMcpTools(undefined, specs, principal, onElicit, imageProcessor, reminderDisclosure, mcpRevocations, poolOpts, promptSections, dialable, signal, hostFloor, receivePeerSeat(peerSeat, "materializeMcpTools peerSeat"), onAuthorizationRequired, hostSeats, onCredentialEchoed);
|
|
647
658
|
}
|
|
648
|
-
export async function materializeLegMcpTools(seat, ...[specs, principal, onElicit,
|
|
659
|
+
export async function materializeLegMcpTools(seat, ...[specs, principal, onElicit, imageProcessor, reminderDisclosure, mcpRevocations, poolOpts, promptSections, dialable, signal, hostFloor, peerSeat, onAuthorizationRequired, hostSeats, onCredentialEchoed]) {
|
|
649
660
|
const snapshot = snapshotMcpEntries(specs);
|
|
650
661
|
const axesRefused = new WeakMap();
|
|
651
662
|
const entries = snapshot.map((spec) => {
|
|
@@ -689,6 +700,25 @@ export async function materializeLegMcpTools(seat, ...[specs, principal, onElici
|
|
|
689
700
|
const warnings = [];
|
|
690
701
|
const serverInstructions = [];
|
|
691
702
|
const statuses = [];
|
|
703
|
+
const authorizationsAnnounced = new Set();
|
|
704
|
+
const announceAuthorization = (server, authorization) => {
|
|
705
|
+
if (onAuthorizationRequired === undefined || authorizationsAnnounced.has(server))
|
|
706
|
+
return;
|
|
707
|
+
authorizationsAnnounced.add(server);
|
|
708
|
+
try {
|
|
709
|
+
onAuthorizationRequired(server, { ...authorization });
|
|
710
|
+
}
|
|
711
|
+
catch {
|
|
712
|
+
}
|
|
713
|
+
};
|
|
714
|
+
const announceEcho = echoAnnouncer(onCredentialEchoed);
|
|
715
|
+
const failedStatus = (spec, err, dialKind, declared) => {
|
|
716
|
+
const { failure, exchange } = readMcpFailure(err, { phase: "connect", transport: dialKind });
|
|
717
|
+
const liveness = livenessOf(exchange, Date.now());
|
|
718
|
+
if (failure.authorization !== undefined)
|
|
719
|
+
announceAuthorization(spec.name, failure.authorization);
|
|
720
|
+
return { name: spec.name, status: "failed", ...failureFields(failure), error: namedMcpFailureText(err, declared), ...(liveness !== undefined ? { liveness } : {}) };
|
|
721
|
+
};
|
|
692
722
|
const resourceServers = [];
|
|
693
723
|
const instructionsDelta = { pendingAdds: [], pendingRemovals: [] };
|
|
694
724
|
const droppedTools = [];
|
|
@@ -711,6 +741,7 @@ export async function materializeLegMcpTools(seat, ...[specs, principal, onElici
|
|
|
711
741
|
s.status.liveness = observed;
|
|
712
742
|
};
|
|
713
743
|
s.health.observe = observe;
|
|
744
|
+
s.health.owed = (authorization) => void (disposing || announceAuthorization(spec.name, authorization));
|
|
714
745
|
const announceClose = () => {
|
|
715
746
|
if (disposing)
|
|
716
747
|
return;
|
|
@@ -747,21 +778,13 @@ export async function materializeLegMcpTools(seat, ...[specs, principal, onElici
|
|
|
747
778
|
statuses[sIdx] = s.status;
|
|
748
779
|
return raised;
|
|
749
780
|
};
|
|
750
|
-
const readDialKind =
|
|
751
|
-
try {
|
|
752
|
-
const kind = spec.transport.kind;
|
|
753
|
-
return kind === "stdio" || kind === "http" ? kind : undefined;
|
|
754
|
-
}
|
|
755
|
-
catch {
|
|
756
|
-
return undefined;
|
|
757
|
-
}
|
|
758
|
-
};
|
|
781
|
+
const readDialKind = transportKindOf;
|
|
759
782
|
const dialKinds = entries.map(readDialKind);
|
|
760
783
|
const liveOf = (server) => serverHandles.find((h) => h.name === server);
|
|
761
784
|
const gatesNow = (h) => {
|
|
762
785
|
const latest = h.listing.latest();
|
|
763
786
|
if (latest.at !== h.gatesAt.at)
|
|
764
|
-
h.gatesAt = { at: latest.at, gates: intakeListedTools({ tools: [...latest.entries], unproven: latest.unproven }, h.spec, linkOf(h.name), echoOf(h.spec),
|
|
787
|
+
h.gatesAt = { at: latest.at, gates: intakeListedTools({ tools: [...latest.entries], unproven: latest.unproven }, h.spec, linkOf(h.name), echoOf(h.spec), imageProcessor, mcpDisclosure, isServerRevoked, h.transportKind, seat, echoReadOf(h.spec)).gates };
|
|
765
788
|
return h.gatesAt.gates;
|
|
766
789
|
};
|
|
767
790
|
const linkOf = (server) => ({
|
|
@@ -783,26 +806,28 @@ export async function materializeLegMcpTools(seat, ...[specs, principal, onElici
|
|
|
783
806
|
return peerRequestRefusal(`mcp: server "${inlineUntrusted(spec.name, 120)}"`, url, hostFloor);
|
|
784
807
|
};
|
|
785
808
|
const dialServer = async (spec, dialKind, dialOpts) => {
|
|
786
|
-
const
|
|
809
|
+
const hostSeat = dialKind === "host" ? hostSeats?.get(spec.name) : undefined;
|
|
810
|
+
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);
|
|
787
811
|
if (refusal !== undefined)
|
|
788
812
|
throw refusal;
|
|
789
813
|
const carrier = new PeerCarrier(peerSeat, mcpPeerTarget(spec, dialKind), principal, dialKind === "stdio" ? "stdio" : "http", dialKind !== "stdio" && "principalHeader" in spec.transport && spec.transport.principalHeader !== undefined);
|
|
790
|
-
|
|
791
|
-
const dial = () => connectServer(spec, principal, onElicit,
|
|
814
|
+
dialedBy.set(spec.name, carrier);
|
|
815
|
+
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);
|
|
792
816
|
const connected = await dial().catch(async (err) => {
|
|
793
817
|
if (typeof err === "object" && err !== null)
|
|
794
|
-
|
|
818
|
+
dialedBy.set(spec.name, carrierOf(err) ?? carrier);
|
|
795
819
|
const dialing = (typeof err === "object" && err !== null ? carrierOf(err) : undefined) ?? carrier;
|
|
796
820
|
if (!(dialing.renewed && answeredUnauthorized(err)) || signal?.aborted === true)
|
|
797
821
|
throw err;
|
|
798
822
|
return dial();
|
|
799
823
|
});
|
|
800
|
-
|
|
824
|
+
dialedBy.set(spec.name, carrierOf(connected.client) ?? carrier);
|
|
801
825
|
return connected;
|
|
802
826
|
};
|
|
803
827
|
const prefixOf = (name) => mintNamespacePrefix(MCP_NAMESPACE, name);
|
|
804
|
-
const
|
|
805
|
-
const echoOf = (spec) =>
|
|
828
|
+
const dialedBy = new Map();
|
|
829
|
+
const echoOf = (spec) => dialedBy.get(spec.name)?.sent ?? [];
|
|
830
|
+
const echoReadOf = (spec) => carrierEcho(dialedBy.get(spec.name) ?? NO_CREDENTIAL_ECHO, (where) => announceEcho(spec.name, where));
|
|
806
831
|
const heldCount = (name) => serverHandles.find((h) => h.name === name)?.tools.length ?? 0;
|
|
807
832
|
const reconcileInstructions = (name, after, connected) => {
|
|
808
833
|
if (!connected)
|
|
@@ -834,9 +859,7 @@ export async function materializeLegMcpTools(seat, ...[specs, principal, onElici
|
|
|
834
859
|
else {
|
|
835
860
|
const declared = echoOf(spec);
|
|
836
861
|
warnings.push(asServerWarning(spec, r.reason, declared));
|
|
837
|
-
|
|
838
|
-
const liveness = livenessOf(kind, Date.now());
|
|
839
|
-
statuses.push({ name: spec.name, status: "failed", errorCode: kind, delivered, ...(httpStatus !== undefined ? { httpStatus } : {}), error: namedMcpFailureText(r.reason, declared), ...(liveness !== undefined ? { liveness } : {}) });
|
|
862
|
+
statuses.push(failedStatus(spec, r.reason, dialKinds[i], declared));
|
|
840
863
|
}
|
|
841
864
|
}
|
|
842
865
|
const resourceTools = buildResourceTools(resourceServers, isServerRevoked);
|
|
@@ -889,11 +912,9 @@ export async function materializeLegMcpTools(seat, ...[specs, principal, onElici
|
|
|
889
912
|
}
|
|
890
913
|
if ("err" in dialed) {
|
|
891
914
|
const err = dialed.err;
|
|
892
|
-
const { kind, delivered, httpStatus } = classifyMcpFailure(err, { phase: "connect", transport: dialKind });
|
|
893
|
-
const redialLiveness = livenessOf(kind, Date.now());
|
|
894
915
|
const declared = echoOf(spec);
|
|
895
|
-
const
|
|
896
|
-
const
|
|
916
|
+
const status = failedStatus(spec, err, dialKind, declared);
|
|
917
|
+
const failure = status.error;
|
|
897
918
|
const sIdx = statuses.findIndex((st) => st.name === server);
|
|
898
919
|
if (sIdx === -1)
|
|
899
920
|
statuses.push(status);
|
|
@@ -971,7 +992,7 @@ export async function materializeLegMcpTools(seat, ...[specs, principal, onElici
|
|
|
971
992
|
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" });
|
|
972
993
|
continue;
|
|
973
994
|
}
|
|
974
|
-
const { serverTools, serverAxes, gates, dropped, accepted } = intakeListedTools({ tools: [...mergedRaw], unproven: answered.unproven }, h.spec, linkOf(h.name), echoOf(h.spec),
|
|
995
|
+
const { serverTools, serverAxes, gates, dropped, accepted } = intakeListedTools({ tools: [...mergedRaw], unproven: answered.unproven }, h.spec, linkOf(h.name), echoOf(h.spec), imageProcessor, mcpDisclosure, isServerRevoked, h.transportKind, seat, echoReadOf(h.spec));
|
|
975
996
|
cacheTools(accepted, answered.kept);
|
|
976
997
|
const priorNames = h.tools.map((t) => t.name);
|
|
977
998
|
const newNames = serverTools.map((t) => t.name);
|
|
@@ -996,7 +1017,7 @@ export async function materializeLegMcpTools(seat, ...[specs, principal, onElici
|
|
|
996
1017
|
});
|
|
997
1018
|
}
|
|
998
1019
|
catch (err) {
|
|
999
|
-
|
|
1020
|
+
observedFailure(err, site, h.health, true);
|
|
1000
1021
|
results.push({
|
|
1001
1022
|
server: h.name,
|
|
1002
1023
|
prefix: prefixOf(h.name),
|
|
@@ -1281,7 +1302,7 @@ function buildResourceTools(resourceServers, isServerRevoked = () => false) {
|
|
|
1281
1302
|
for (const rs of targets) {
|
|
1282
1303
|
if (isServerRevoked(rs.server)) {
|
|
1283
1304
|
errors.push({ server: rs.server, error: "server revoked by the operator mid-session (request not sent)" });
|
|
1284
|
-
sections.push(`[${rs.server}] Error: server revoked by the operator mid-session — the request was NOT sent.
|
|
1305
|
+
sections.push(`[${rs.server}] Error: server revoked by the operator mid-session — the request was NOT sent. ${refusalScope("revocation")}`);
|
|
1285
1306
|
continue;
|
|
1286
1307
|
}
|
|
1287
1308
|
if (rs.health.dead) {
|
|
@@ -1316,6 +1337,7 @@ function buildResourceTools(resourceServers, isServerRevoked = () => false) {
|
|
|
1316
1337
|
sanitizeMcpErrorTextInPlace(err, rs.declared);
|
|
1317
1338
|
if (signal?.aborted)
|
|
1318
1339
|
throw err;
|
|
1340
|
+
observedFailure(err, site, rs.health, true);
|
|
1319
1341
|
const msg = watchdog.idleSignal.reason === IDLE_WATCHDOG_ABORT_REASON
|
|
1320
1342
|
? idleWatchdogTripText(idleMs)
|
|
1321
1343
|
: namingLostSession(err, site, remoteErrorText(err, rs.declared));
|
|
@@ -1361,7 +1383,7 @@ function buildResourceTools(resourceServers, isServerRevoked = () => false) {
|
|
|
1361
1383
|
const what = `The read of resource ${inlineUntrusted(uri)}`;
|
|
1362
1384
|
if (isServerRevoked(server)) {
|
|
1363
1385
|
return {
|
|
1364
|
-
content: [{ type: "text", text: `${what} was refused: MCP server "${server}" was revoked by the operator mid-session. The request was NOT sent.
|
|
1386
|
+
content: [{ type: "text", text: `${what} was refused: MCP server "${server}" was revoked by the operator mid-session. The request was NOT sent. ${refusalScope("revocation")}` }],
|
|
1365
1387
|
details: { error: "mcp.server_revoked", code: "mcp.server_revoked", delivered: "no", server },
|
|
1366
1388
|
terminate: false,
|
|
1367
1389
|
isError: true,
|
|
@@ -1423,7 +1445,7 @@ function buildResourceTools(resourceServers, isServerRevoked = () => false) {
|
|
|
1423
1445
|
const what = `The directory listing of ${inlineUntrusted(uri)}`;
|
|
1424
1446
|
if (isServerRevoked(server)) {
|
|
1425
1447
|
return {
|
|
1426
|
-
content: [{ type: "text", text: `${what} was refused: MCP server "${server}" was revoked by the operator mid-session. The request was NOT sent.
|
|
1448
|
+
content: [{ type: "text", text: `${what} was refused: MCP server "${server}" was revoked by the operator mid-session. The request was NOT sent. ${refusalScope("revocation")}` }],
|
|
1427
1449
|
details: { error: "mcp.server_revoked", code: "mcp.server_revoked", delivered: "no", server },
|
|
1428
1450
|
terminate: false,
|
|
1429
1451
|
isError: true,
|
|
@@ -1552,7 +1574,7 @@ async function listToolsLenient(client, options, declared) {
|
|
|
1552
1574
|
});
|
|
1553
1575
|
return { tools: walk.items, ...(walk.incomplete !== undefined ? { incomplete: walk.incomplete } : {}) };
|
|
1554
1576
|
}
|
|
1555
|
-
async function connectServer(spec, principal, onElicit,
|
|
1577
|
+
async function connectServer(spec, principal, onElicit, imageProcessor, reminderDisclosure, isServerRevoked, transportKind, pool, dialOpts, seat) {
|
|
1556
1578
|
const fp = spec.fingerprint;
|
|
1557
1579
|
if (fp !== undefined && !(typeof fp === "string" && fp.length > 0 && fp.length <= 128)) {
|
|
1558
1580
|
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" });
|
|
@@ -1586,7 +1608,7 @@ async function connectServer(spec, principal, onElicit, imageResizer, reminderDi
|
|
|
1586
1608
|
});
|
|
1587
1609
|
}
|
|
1588
1610
|
const pieces = transportKind === "stdio" ? await dialOpts.carrier.next(stop) : undefined;
|
|
1589
|
-
const transport = buildTransport(spec, principal, transportKind, dialOpts.carrier, pieces);
|
|
1611
|
+
const transport = buildTransport(spec, principal, transportKind, dialOpts.carrier, pieces, dialOpts.hostSeat);
|
|
1590
1612
|
const hangUp = () => void client.close().catch(() => undefined);
|
|
1591
1613
|
stop?.addEventListener("abort", hangUp, { once: true });
|
|
1592
1614
|
try {
|
|
@@ -1604,7 +1626,8 @@ async function connectServer(spec, principal, onElicit, imageResizer, reminderDi
|
|
|
1604
1626
|
recordCarrier(client, dialOpts.carrier);
|
|
1605
1627
|
return client;
|
|
1606
1628
|
};
|
|
1607
|
-
const
|
|
1629
|
+
const answersOneLeg = elicitOn || transportKind === "host";
|
|
1630
|
+
const lease = pool !== undefined && !answersOneLeg ? await pool.acquire(McpConnectionPool.keyOf(spec, principal, transportKind, startupMs), dialClient, dialOpts) : undefined;
|
|
1608
1631
|
const client = lease !== undefined ? lease.client : await dialClient();
|
|
1609
1632
|
const close = () => (lease !== undefined ? lease.release() : client.close());
|
|
1610
1633
|
const openListing = () => {
|
|
@@ -1624,9 +1647,10 @@ async function connectServer(spec, principal, onElicit, imageResizer, reminderDi
|
|
|
1624
1647
|
const at = listing.open();
|
|
1625
1648
|
const cacheTools = openListing();
|
|
1626
1649
|
const declared = (carrierOf(client) ?? dialOpts.carrier).sent;
|
|
1650
|
+
const echo = carrierEcho(carrierOf(client) ?? dialOpts.carrier, dialOpts.announceEcho);
|
|
1627
1651
|
const listed = await underStartupBound(startupMs, dialOpts?.signal, (options) => listToolsLenient(client, options, declared));
|
|
1628
1652
|
const answered = listing.answer(at, listed.tools, listed.incomplete !== undefined, dialOpts.carried);
|
|
1629
|
-
const { serverTools, serverAxes, gates, dropped, advisories, accepted } = intakeListedTools({ tools: [...answered.view], unproven: answered.unproven }, spec, dialOpts.link, declared,
|
|
1653
|
+
const { serverTools, serverAxes, gates, dropped, advisories, accepted } = intakeListedTools({ tools: [...answered.view], unproven: answered.unproven }, spec, dialOpts.link, declared, imageProcessor, reminderDisclosure, isServerRevoked, transportKind, seat, echo);
|
|
1630
1654
|
cacheTools(accepted, answered.kept);
|
|
1631
1655
|
const caps = client.getServerCapabilities();
|
|
1632
1656
|
const resourceInfo = caps?.resources
|
|
@@ -1635,15 +1659,15 @@ async function connectServer(spec, principal, onElicit, imageResizer, reminderDi
|
|
|
1635
1659
|
readAllowed: !spec.allowTools || spec.allowTools.includes(MCP_RESOURCE_READ_ALLOW),
|
|
1636
1660
|
}
|
|
1637
1661
|
: undefined;
|
|
1638
|
-
const rawInstructions = client.getInstructions();
|
|
1662
|
+
const rawInstructions = erasedEcho(client.getInstructions(), echo, "instructions");
|
|
1639
1663
|
const sanitized = rawInstructions && rawInstructions.trim() ? sanitizeUntrustedText(rawInstructions.trim()) : undefined;
|
|
1640
1664
|
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) });
|
|
1641
1665
|
const instructions = disposed?.kept === undefined ? undefined : { server: spec.name, ...disposed.kept };
|
|
1642
|
-
const info = client.getServerVersion();
|
|
1666
|
+
const info = serverInfoOf(client.getServerVersion(), echo);
|
|
1643
1667
|
const status = {
|
|
1644
1668
|
name: spec.name,
|
|
1645
1669
|
status: "connected",
|
|
1646
|
-
...(info ? { serverInfo:
|
|
1670
|
+
...(info ? { serverInfo: info } : {}),
|
|
1647
1671
|
toolNames: serverTools.map((t) => t.name),
|
|
1648
1672
|
liveness: livenessOf("completed", Date.now()),
|
|
1649
1673
|
};
|
|
@@ -1674,7 +1698,7 @@ async function connectServer(spec, principal, onElicit, imageResizer, reminderDi
|
|
|
1674
1698
|
throw err;
|
|
1675
1699
|
}
|
|
1676
1700
|
}
|
|
1677
|
-
function intakeListedTools(listed, spec, link, declared,
|
|
1701
|
+
function intakeListedTools(listed, spec, link, declared, imageProcessor, reminderDisclosure, isServerRevoked, transportKind, seat, echo = NO_CREDENTIAL_ECHO) {
|
|
1678
1702
|
const declaredContentOrigin = spec.contentOrigin;
|
|
1679
1703
|
const serverTools = [];
|
|
1680
1704
|
const serverAxes = [];
|
|
@@ -1687,11 +1711,16 @@ function intakeListedTools(listed, spec, link, declared, imageResizer, reminderD
|
|
|
1687
1711
|
if (spec.allowTools && !spec.allowTools.includes(t.name)) {
|
|
1688
1712
|
continue;
|
|
1689
1713
|
}
|
|
1714
|
+
const echoDrop = echoedToolDrop(t.name, t.inputSchema, echo);
|
|
1715
|
+
if (echoDrop !== undefined) {
|
|
1716
|
+
dropped.push(echoDrop);
|
|
1717
|
+
continue;
|
|
1718
|
+
}
|
|
1690
1719
|
let modelFacingSchema;
|
|
1691
1720
|
let sanitizedDescription;
|
|
1692
1721
|
try {
|
|
1693
1722
|
modelFacingSchema = sanitizeMcpModelFacingValue(t.inputSchema);
|
|
1694
|
-
sanitizedDescription = t.description !== undefined ? sanitizeMcpModelFacingText(t.description) : undefined;
|
|
1723
|
+
sanitizedDescription = t.description !== undefined ? sanitizeMcpModelFacingText(erasedEcho(t.description, echo, "tool_listing")) : undefined;
|
|
1695
1724
|
}
|
|
1696
1725
|
catch (err) {
|
|
1697
1726
|
const reason = err instanceof McpPayloadKeyCollision
|
|
@@ -1754,7 +1783,7 @@ function intakeListedTools(listed, spec, link, declared, imageResizer, reminderD
|
|
|
1754
1783
|
const what = `The call to tool ${inlineUntrusted(remoteName)}`;
|
|
1755
1784
|
if (isServerRevoked?.(spec.name) === true) {
|
|
1756
1785
|
return {
|
|
1757
|
-
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.
|
|
1786
|
+
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")}` }],
|
|
1758
1787
|
details: { error: "mcp.server_revoked", code: "mcp.server_revoked", delivered: "no", server: spec.name },
|
|
1759
1788
|
terminate: false,
|
|
1760
1789
|
isError: true,
|
|
@@ -1762,7 +1791,7 @@ function intakeListedTools(listed, spec, link, declared, imageResizer, reminderD
|
|
|
1762
1791
|
}
|
|
1763
1792
|
if (taskRequired) {
|
|
1764
1793
|
return {
|
|
1765
|
-
content: [{ type: "text", text:
|
|
1794
|
+
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")}` }],
|
|
1766
1795
|
details: { error: "mcp.task_required", code: "mcp.task_required", delivered: "no", server: spec.name },
|
|
1767
1796
|
terminate: false,
|
|
1768
1797
|
isError: true,
|
|
@@ -1772,7 +1801,7 @@ function intakeListedTools(listed, spec, link, declared, imageResizer, reminderD
|
|
|
1772
1801
|
const idleMs = mcpIdleTimeoutMs(idleKindOf(transportKind));
|
|
1773
1802
|
const callMeta = mcpCallMeta(toolCallId, seat?.of(toolCallId), spec.sessionMetaKey, seat?.sessionId);
|
|
1774
1803
|
let answeredWith = declared;
|
|
1775
|
-
const attempt = async (conn, resent) => {
|
|
1804
|
+
const attempt = async (conn, resent, last) => {
|
|
1776
1805
|
const site = requestSite(conn.client);
|
|
1777
1806
|
const watchdog = armMcpIdleWatchdog(conn.health, idleMs, signal);
|
|
1778
1807
|
try {
|
|
@@ -1794,7 +1823,7 @@ function intakeListedTools(listed, spec, link, declared, imageResizer, reminderD
|
|
|
1794
1823
|
writeEffect,
|
|
1795
1824
|
signal,
|
|
1796
1825
|
site,
|
|
1797
|
-
...(resent ? { resent: true } : {}),
|
|
1826
|
+
...(resent ? { resent: true } : {}), attempt: last ? "resent" : "first",
|
|
1798
1827
|
idle: { signal: watchdog.idleSignal, idleMs },
|
|
1799
1828
|
liveness: conn.health,
|
|
1800
1829
|
...(reminderDisclosure !== undefined
|
|
@@ -1820,14 +1849,14 @@ function intakeListedTools(listed, spec, link, declared, imageResizer, reminderD
|
|
|
1820
1849
|
watchdog.dispose();
|
|
1821
1850
|
}
|
|
1822
1851
|
};
|
|
1823
|
-
const send = (conn, resent) => inFlight(conn.client, () => sentOnceMore(() => attempt(conn, resent), () => isServerRevoked?.(spec.name) !== true && reach(link, namespacedName, gate) === conn && signal?.aborted !== true));
|
|
1852
|
+
const send = (conn, resent) => inFlight(conn.client, () => sentOnceMore((last) => attempt(conn, resent, last), () => isServerRevoked?.(spec.name) !== true && reach(link, namespacedName, gate) === conn && signal?.aborted !== true).catch((err) => (owedByAnswer(err, conn.health), Promise.reject(err))));
|
|
1824
1853
|
const before = link.live();
|
|
1825
1854
|
if (before !== undefined && carrierOf(before.client)?.expired() === true)
|
|
1826
1855
|
await link.recover(before, "expired");
|
|
1827
1856
|
const res = await callThroughLink(link, namespacedName, gate, signal, send, () => throwDeadServer(spec.name, what));
|
|
1828
1857
|
if (typeof res === "string")
|
|
1829
1858
|
return listingRefusal(res, remoteName, spec.name);
|
|
1830
|
-
const mapped = await mapContent(res.content, spec.name,
|
|
1859
|
+
const mapped = await mapContent(res.content, spec.name, imageProcessor);
|
|
1831
1860
|
if (res.isError === true) {
|
|
1832
1861
|
const parts = [];
|
|
1833
1862
|
for (const block of mapped) {
|
|
@@ -6,6 +6,26 @@ export interface MemoryScopeRequest {
|
|
|
6
6
|
scope: string;
|
|
7
7
|
origin: MemoryScopeOrigin;
|
|
8
8
|
}
|
|
9
|
+
/** A deployment-origin org scope: the only kind an admission with no caller is asked about. */
|
|
10
|
+
export interface DeploymentMemoryScopeRequest extends MemoryScopeRequest {
|
|
11
|
+
origin: "deployment";
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* What the resolver is asked, discriminated by whether a caller asks. `principal` a string: the caller's principal name,
|
|
15
|
+
* and the request may hold scopes of either origin. `principal: undefined`: no caller — the door has already refused
|
|
16
|
+
* every request-origin scope, so only deployment-origin ones are asked about. Caller presence is read once, at the door
|
|
17
|
+
* (`readPrincipal`: absent = omitted or the empty string; a provided value that is no name is refused); a resolver reads
|
|
18
|
+
* this discriminant and never decides absence for itself.
|
|
19
|
+
*/
|
|
20
|
+
export type MemoryScopeAdmissionInput = {
|
|
21
|
+
principal: string;
|
|
22
|
+
requested: ReadonlyArray<MemoryScopeRequest>;
|
|
23
|
+
requestedWriteScope: MemoryScopeRequest | null;
|
|
24
|
+
} | {
|
|
25
|
+
principal: undefined;
|
|
26
|
+
requested: ReadonlyArray<DeploymentMemoryScopeRequest>;
|
|
27
|
+
requestedWriteScope: DeploymentMemoryScopeRequest | null;
|
|
28
|
+
};
|
|
9
29
|
/**
|
|
10
30
|
* The resolver's verdict — exactly two states. `ok: true` carries the FROZEN admitted projection:
|
|
11
31
|
* `scopes` must be a subset of the requested org scopes (an unrequested grant is a resolver fault ⇒
|
|
@@ -23,16 +43,13 @@ export type MemoryAdmissionVerdict = {
|
|
|
23
43
|
/**
|
|
24
44
|
* The trusted deployment resolver ({@link import("./types.js").RunnerDeps.memoryScopeAdmission}).
|
|
25
45
|
* Receives ONLY the org-parsed scopes (non-org scopes are not its business), each tagged with its
|
|
26
|
-
* origin,
|
|
46
|
+
* origin, and the caller ({@link MemoryScopeAdmissionInput}). Both async and sync forms are accepted.
|
|
27
47
|
*/
|
|
28
|
-
export type MemoryScopeAdmission = (input:
|
|
29
|
-
principal: string | undefined;
|
|
30
|
-
requested: ReadonlyArray<MemoryScopeRequest>;
|
|
31
|
-
requestedWriteScope: MemoryScopeRequest | null;
|
|
32
|
-
}) => MemoryAdmissionVerdict | Promise<MemoryAdmissionVerdict>;
|
|
48
|
+
export type MemoryScopeAdmission = (input: MemoryScopeAdmissionInput) => MemoryAdmissionVerdict | Promise<MemoryAdmissionVerdict>;
|
|
33
49
|
/** Inputs to {@link admitMemoryScopes} — assembled by the prepare path (prepare-memory.ts). */
|
|
34
50
|
export interface MemoryAdmissionInput {
|
|
35
51
|
memorySpec: NormalizedMemorySpec;
|
|
52
|
+
/** The task's principal as given (`TaskSpec.principal`); the door reads caller presence from it. */
|
|
36
53
|
principal: string | undefined;
|
|
37
54
|
admission: MemoryScopeAdmission | undefined;
|
|
38
55
|
/** The deployment's self-certified org scopes (`RunnerDeps.deploymentMemoryScopes`). */
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { parseScopeKey } from "./memory-engine/scope-contract.js";
|
|
2
|
+
import { readPrincipal } from "./principal-name.js";
|
|
2
3
|
import { thrownText } from "./thrown-value.js";
|
|
3
4
|
function codedError(code, message) {
|
|
4
5
|
const e = new Error(message);
|
|
@@ -19,6 +20,22 @@ function orgScopesOf(spec) {
|
|
|
19
20
|
const writeOrg = spec.writeScope !== null && parseScopeKey(spec.writeScope).kind === "org" ? spec.writeScope : null;
|
|
20
21
|
return { readOrg, writeOrg };
|
|
21
22
|
}
|
|
23
|
+
const isDeploymentRequest = (r) => r.origin === "deployment";
|
|
24
|
+
function admissionInputOf(principal, requested, requestedWriteScope) {
|
|
25
|
+
const copy = (r) => ({ ...r });
|
|
26
|
+
const caller = readPrincipal(principal);
|
|
27
|
+
if (caller.kind === "name")
|
|
28
|
+
return { principal: caller.name, requested: requested.map(copy), requestedWriteScope: requestedWriteScope && copy(requestedWriteScope) };
|
|
29
|
+
if (caller.kind === "invalid") {
|
|
30
|
+
throw codedError("memory.admission_denied", `the task's principal is not a principal name (got ${caller.fault}) — org memory admission takes a principal name or none.`);
|
|
31
|
+
}
|
|
32
|
+
const deployment = requested.filter(isDeploymentRequest);
|
|
33
|
+
const write = requestedWriteScope === null || isDeploymentRequest(requestedWriteScope) ? requestedWriteScope : undefined;
|
|
34
|
+
if (deployment.length === requested.length && write !== undefined)
|
|
35
|
+
return { principal: undefined, requested: deployment.map(copy), requestedWriteScope: write && copy(write) };
|
|
36
|
+
throw codedError("memory.admission_denied", `org memory scope(s) ${requested.filter((r) => !isDeploymentRequest(r)).map((r) => `"${r.scope}"`).join(", ")} require an authenticated ` +
|
|
37
|
+
`TaskSpec.principal for admission — a principal-less request cannot be admitted to a tenant plane.`);
|
|
38
|
+
}
|
|
22
39
|
export async function admitMemoryScopes(input) {
|
|
23
40
|
const { memorySpec, principal, admission, deploymentScopes, parentAdmittedOrgScopes } = input;
|
|
24
41
|
const governed = admission !== undefined ||
|
|
@@ -109,17 +126,10 @@ export async function admitMemoryScopes(input) {
|
|
|
109
126
|
writeScopeNarrowed: false,
|
|
110
127
|
});
|
|
111
128
|
}
|
|
112
|
-
|
|
113
|
-
throw codedError("memory.admission_denied", `org memory scope(s) ${requestOrigin.map((r) => `"${r.scope}"`).join(", ")} require an authenticated ` +
|
|
114
|
-
`TaskSpec.principal for admission — a principal-less request cannot be admitted to a tenant plane.`);
|
|
115
|
-
}
|
|
129
|
+
const asked = admissionInputOf(principal, requests, writeOrg !== null ? requests[allOrg.indexOf(writeOrg)] : null);
|
|
116
130
|
let verdict;
|
|
117
131
|
try {
|
|
118
|
-
verdict = await admission(
|
|
119
|
-
principal,
|
|
120
|
-
requested: requests,
|
|
121
|
-
requestedWriteScope: writeOrg !== null ? { scope: writeOrg, origin: originOf(writeOrg) } : null,
|
|
122
|
-
});
|
|
132
|
+
verdict = await admission(asked);
|
|
123
133
|
}
|
|
124
134
|
catch (err) {
|
|
125
135
|
const hinted = err.retryAfterMs;
|
|
@@ -21,14 +21,12 @@
|
|
|
21
21
|
* auto lane's task-boundary tick), never on a background schedule of core's own.
|
|
22
22
|
*/
|
|
23
23
|
import type { EngineNotice } from "../types.js";
|
|
24
|
-
import { type ConsolidationGateRow, CONSOLIDATION_WRITE_REFUSED_CODE, type ConsolidationRunStopReason, type MemoryConsolidationOptions } from "./consolidation.js";
|
|
24
|
+
import { CONSOLIDATION_DRIVER_PLANS_DIR, type ConsolidationGateRow, CONSOLIDATION_WRITE_REFUSED_CODE, type ConsolidationRunStopReason, type MemoryConsolidationOptions } from "./consolidation.js";
|
|
25
25
|
import { type ConsolidationPlanFoldEvidence, type ConsolidationPlanSummary } from "./engine.js";
|
|
26
26
|
import type { SyntheticWriteVerdict } from "../synthetic-read-verdict.js";
|
|
27
27
|
import { mintLlmConsolidationPlan, type ConsolidationDriveCycleRow, type ConsolidationDriveEngine, type ConsolidationFoldState, type DistillerChatFn, type LlmConsolidationPlan, type LlmConsolidationPlanProduct, type LlmDistillerContract } from "./distiller.js";
|
|
28
28
|
export declare const CONSOLIDATION_DRIVER_RUNS_FILE = "distiller-runs.json";
|
|
29
|
-
|
|
30
|
-
* (the fold law's audit other-half; strict-family placement beside the plan workbook). */
|
|
31
|
-
export declare const CONSOLIDATION_DRIVER_PLANS_DIR = "distiller-plans";
|
|
29
|
+
export { CONSOLIDATION_DRIVER_PLANS_DIR };
|
|
32
30
|
export interface ConsolidationDriverRunRow {
|
|
33
31
|
runId: string;
|
|
34
32
|
scope: string;
|
|
@@ -4,12 +4,12 @@ import { atomicWriteFileSync, ensureDirExists, lockedStrictUpdate, readStrictSid
|
|
|
4
4
|
import { inlineUntrusted } from "../untrusted-text.js";
|
|
5
5
|
import { extensionWords } from "../untrusted-egress.js";
|
|
6
6
|
import { deliverEngineNotice } from "../engine-notice.js";
|
|
7
|
-
import { CONSOLIDATION_FORCE_THROTTLE_FLOOR_MS, screenConsolidationOptions, supersessionFuseCeiling, updateConsolidationGate, recommendationUnconsumed, CONSOLIDATION_WRITE_REFUSED_CODE, ConsolidationRefusedError, } from "./consolidation.js";
|
|
7
|
+
import { CONSOLIDATION_DRIVER_PLANS_DIR, CONSOLIDATION_FORCE_THROTTLE_FLOOR_MS, screenConsolidationOptions, supersessionFuseCeiling, updateConsolidationGate, recommendationUnconsumed, CONSOLIDATION_WRITE_REFUSED_CODE, ConsolidationRefusedError, } from "./consolidation.js";
|
|
8
8
|
import { memoryConsolidationIncompleteNotice, memoryConsolidationWithheldNotice } from "./engine.js";
|
|
9
9
|
import { asThrownError, thrownText } from "../thrown-value.js";
|
|
10
10
|
import { CONSOLIDATION_DRIVE_ABORT, CONSOLIDATION_SNAPSHOT_PARKED, MEMORY_DISTILLER_CONTRACT_V1, detectCleanArmVerbatimLeak, driveConsolidationToFixpoint, isAliasModelId, llmPlanDistiller, mintExposurePartitionedPlan, mintLlmConsolidationPlan, normalizedCandidateRev, } from "./distiller.js";
|
|
11
11
|
export const CONSOLIDATION_DRIVER_RUNS_FILE = "distiller-runs.json";
|
|
12
|
-
export
|
|
12
|
+
export { CONSOLIDATION_DRIVER_PLANS_DIR };
|
|
13
13
|
function coerceRunsFile(raw) {
|
|
14
14
|
if (raw === undefined)
|
|
15
15
|
return { v: 1, scopes: {} };
|
|
@@ -199,7 +199,7 @@ export async function runMemoryConsolidationDriver(engine, scope, opts) {
|
|
|
199
199
|
const announceFailures = [];
|
|
200
200
|
const announce = (items) => {
|
|
201
201
|
try {
|
|
202
|
-
enqueueMemoryAnnouncement(controlDir, { kind: "gate", at: now(), items });
|
|
202
|
+
enqueueMemoryAnnouncement(controlDir, { kind: "gate", scope, at: now(), items });
|
|
203
203
|
}
|
|
204
204
|
catch (err) {
|
|
205
205
|
announceFailures.push(thrownText(err));
|