@sema-agent/core 7.57.0 → 7.59.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +1161 -0
- package/README.md +6 -4
- package/dist/agents/cc-peer-directory.js +8 -8
- package/dist/agents/child-model-seat.d.ts +4 -2
- package/dist/agents/child-model-seat.js +5 -3
- package/dist/agents/peer-directory.d.ts +9 -0
- package/dist/agents/peer-directory.js +6 -2
- package/dist/agents/send-message-tool.js +21 -12
- package/dist/agents/subagent-steps.js +2 -4
- package/dist/agents/subagent.js +33 -34
- package/dist/brain/anthropic.js +161 -45
- package/dist/brain/errors.d.ts +9 -3
- package/dist/brain/errors.js +7 -1
- package/dist/brain/failover.js +2 -1
- package/dist/brain/open-responses.js +3 -3
- package/dist/brain/openai.js +103 -53
- package/dist/brain/provider-dialect.d.ts +11 -0
- package/dist/brain/provider-dialect.js +5 -2
- package/dist/brain/reasoning-request.js +5 -4
- package/dist/brain/reasoning.d.ts +19 -0
- package/dist/brain/reasoning.js +17 -2
- package/dist/brain/request-route.d.ts +4 -1
- package/dist/brain/request-route.js +4 -1
- package/dist/brain/route-adjudicator.d.ts +84 -18
- package/dist/brain/route-adjudicator.js +89 -22
- package/dist/brain/route-conformance.js +1 -1
- package/dist/brain/stream-engine.js +84 -49
- package/dist/brain/stream-shared.d.ts +30 -0
- package/dist/brain/stream-shared.js +34 -1
- package/dist/brain/timeout.d.ts +62 -5
- package/dist/brain/timeout.js +93 -6
- package/dist/core/a2a.d.ts +2 -1
- package/dist/core/a2a.js +23 -10
- package/dist/core/account-row.d.ts +61 -0
- package/dist/core/account-row.js +51 -0
- package/dist/core/advisor-verdict.d.ts +2 -1
- package/dist/core/advisor-verdict.js +1 -1
- package/dist/core/allow-entry.d.ts +20 -7
- package/dist/core/allow-entry.js +18 -9
- package/dist/core/approval-object.d.ts +29 -15
- package/dist/core/approval-object.js +47 -19
- package/dist/core/ask-origin.d.ts +21 -2
- package/dist/core/ask-origin.js +5 -1
- package/dist/core/auto-compaction.d.ts +4 -0
- package/dist/core/auto-compaction.js +2 -2
- package/dist/core/auto-mode-directive.d.ts +29 -5
- package/dist/core/auto-mode-directive.js +38 -8
- package/dist/core/background-agent-store.d.ts +16 -3
- package/dist/core/checkpoint-requirements.d.ts +19 -1
- package/dist/core/checkpoint-requirements.js +5 -1
- package/dist/core/checkpoint-store.d.ts +85 -23
- package/dist/core/checkpoint-store.js +31 -9
- package/dist/core/child-clamp-seats.d.ts +29 -0
- package/dist/core/child-clamp-seats.js +56 -1
- package/dist/core/compliance.d.ts +2 -2
- package/dist/core/compliance.js +1 -1
- package/dist/core/effective-path-target.d.ts +8 -2
- package/dist/core/effective-path-target.js +8 -3
- package/dist/core/engine-notice.d.ts +99 -9
- package/dist/core/engine-notice.js +19 -5
- package/dist/core/fs-write-gate-policy.d.ts +4 -2
- package/dist/core/fs-write-gate-policy.js +7 -3
- package/dist/core/gate-fold.js +7 -4
- package/dist/core/gate-lanes.js +19 -6
- package/dist/core/gate-outcome.d.ts +32 -3
- package/dist/core/gate-outcome.js +19 -1
- package/dist/core/git-worktree-env.d.ts +53 -11
- package/dist/core/git-worktree-env.js +96 -12
- package/dist/core/governance-codes.d.ts +9 -1
- package/dist/core/governance-codes.js +13 -0
- package/dist/core/hooks.d.ts +35 -4
- package/dist/core/hooks.js +17 -11
- package/dist/core/human-input-projection.d.ts +1 -0
- package/dist/core/human-input-projection.js +3 -0
- package/dist/core/image-admission.d.ts +6 -5
- package/dist/core/image-admission.js +18 -14
- package/dist/core/locked-config.d.ts +20 -3
- package/dist/core/locked-config.js +40 -3
- package/dist/core/mailbox-store.d.ts +45 -1
- package/dist/core/mailbox-store.js +53 -9
- package/dist/core/mcp-call-meta.d.ts +66 -0
- package/dist/core/mcp-call-meta.js +103 -0
- package/dist/core/mcp-connection-pool.d.ts +3 -1
- package/dist/core/mcp-connection-pool.js +3 -1
- package/dist/core/mcp-failure.d.ts +117 -15
- package/dist/core/mcp-failure.js +71 -3
- package/dist/core/mcp-probe.d.ts +4 -0
- package/dist/core/mcp-probe.js +1 -1
- package/dist/core/mcp-server-link.d.ts +27 -3
- package/dist/core/mcp-server-link.js +25 -1
- package/dist/core/mcp-server-spec.d.ts +46 -18
- package/dist/core/mcp-server-spec.js +1 -18
- package/dist/core/mcp.d.ts +16 -20
- package/dist/core/mcp.js +112 -55
- package/dist/core/memory-engine/consolidation-driver.d.ts +2 -4
- package/dist/core/memory-engine/consolidation-driver.js +3 -3
- package/dist/core/memory-engine/consolidation.d.ts +4 -0
- package/dist/core/memory-engine/consolidation.js +1 -0
- package/dist/core/memory-engine/delegation-settlement.js +5 -12
- package/dist/core/memory-engine/distiller.js +2 -2
- package/dist/core/memory-engine/dual-root.d.ts +50 -1
- package/dist/core/memory-engine/dual-root.js +44 -1
- package/dist/core/memory-engine/engine.d.ts +67 -14
- package/dist/core/memory-engine/engine.js +384 -212
- package/dist/core/memory-engine/export-bundle.d.ts +23 -0
- package/dist/core/memory-engine/export-bundle.js +23 -4
- package/dist/core/memory-engine/file-backend.d.ts +128 -55
- package/dist/core/memory-engine/file-backend.js +290 -117
- package/dist/core/memory-engine/index.d.ts +1 -1
- package/dist/core/memory-engine/layout.d.ts +59 -11
- package/dist/core/memory-engine/layout.js +190 -40
- package/dist/core/memory-engine/memory-backend-contract.d.ts +1 -1
- package/dist/core/memory-engine/memory-backend-contract.js +39 -2
- package/dist/core/memory-engine/scope-contract.d.ts +45 -4
- package/dist/core/memory-engine/scope-contract.js +80 -11
- package/dist/core/memory-engine/sync-client.d.ts +9 -1
- package/dist/core/memory-engine/sync-client.js +31 -8
- package/dist/core/memory-engine/sync.d.ts +5 -0
- package/dist/core/memory-engine/types.d.ts +6 -0
- package/dist/core/mode-policy.d.ts +8 -5
- package/dist/core/mode-policy.js +5 -4
- package/dist/core/mods/classic-events.d.ts +5 -1
- package/dist/core/mods/host.js +1 -1
- package/dist/core/mods/kernel/dispatch.d.ts +3 -0
- package/dist/core/mods/kernel/dispatch.js +12 -9
- package/dist/core/mods/kernel/events.d.ts +6 -1
- package/dist/core/mods/kernel/events.js +2 -2
- package/dist/core/mods/kernel/registration.d.ts +9 -1
- package/dist/core/mods/kernel/registration.js +3 -0
- package/dist/core/mods/kernel/site-rules.d.ts +3 -0
- package/dist/core/mods/kernel/site-rules.js +10 -0
- package/dist/core/mods/package.d.ts +23 -0
- package/dist/core/mods/package.js +118 -0
- package/dist/core/mods/stations.d.ts +33 -12
- package/dist/core/mods/stations.js +45 -11
- package/dist/core/mods/tool-call.d.ts +5 -1
- package/dist/core/mods/tool-call.js +13 -4
- package/dist/core/parent-spec-seat.d.ts +8 -3
- package/dist/core/parent-spec-seat.js +2 -0
- package/dist/core/park-selfcheck.js +6 -0
- package/dist/core/path-guard-rows.d.ts +20 -0
- package/dist/core/path-guard-rows.js +11 -0
- package/dist/core/peer-seat.d.ts +248 -0
- package/dist/core/peer-seat.js +439 -0
- package/dist/core/permission-rule-consent.js +10 -4
- package/dist/core/permission-rule-model.d.ts +16 -0
- package/dist/core/permission-rule-model.js +1 -1
- package/dist/core/present-plan-tool.d.ts +20 -3
- package/dist/core/present-plan-tool.js +48 -4
- package/dist/core/protocol-http-auth.d.ts +40 -29
- package/dist/core/protocol-http-auth.js +30 -32
- package/dist/core/redaction-marks.d.ts +16 -0
- package/dist/core/redaction-marks.js +16 -0
- package/dist/core/redaction-passes.js +8 -9
- package/dist/core/resume-startup-cause.js +1 -0
- package/dist/core/retention.d.ts +41 -15
- package/dist/core/retention.js +59 -12
- package/dist/core/rewrite-rejudge.d.ts +38 -0
- package/dist/core/rewrite-rejudge.js +42 -2
- package/dist/core/roles.d.ts +34 -2
- package/dist/core/roles.js +43 -4
- package/dist/core/run-origin.d.ts +40 -0
- package/dist/core/run-origin.js +37 -0
- package/dist/core/runner/advertised-writable-dirs.d.ts +57 -38
- package/dist/core/runner/advertised-writable-dirs.js +126 -0
- package/dist/core/runner/announce-once-ledger.d.ts +5 -4
- package/dist/core/runner/announce-once-ledger.js +4 -2
- package/dist/core/runner/call-hook-stations.js +2 -2
- package/dist/core/runner/compaction-restate.d.ts +15 -6
- package/dist/core/runner/compaction-restate.js +28 -2
- package/dist/core/runner/contracts.d.ts +33 -21
- package/dist/core/runner/credential-origin-seat.js +4 -3
- package/dist/core/runner/cwd-alignment-probe.d.ts +20 -0
- package/dist/core/runner/cwd-alignment-probe.js +21 -0
- package/dist/core/runner/decide-continuation.d.ts +2 -2
- package/dist/core/runner/gate-exit.d.ts +30 -8
- package/dist/core/runner/gate-exit.js +15 -8
- package/dist/core/runner/image-removed-seat.d.ts +12 -0
- package/dist/core/runner/image-removed-seat.js +19 -0
- package/dist/core/runner/inline-image.js +1 -1
- package/dist/core/runner/memory-consolidation-driver.js +3 -3
- package/dist/core/runner/park-commit.d.ts +1 -1
- package/dist/core/runner/park-commit.js +3 -0
- package/dist/core/runner/prepare-ask-lane.d.ts +1 -1
- package/dist/core/runner/prepare-ask-lane.js +2 -1
- package/dist/core/runner/prepare-boundary-parks.js +2 -2
- package/dist/core/runner/prepare-caps-and-workflow.d.ts +5 -5
- package/dist/core/runner/prepare-caps-and-workflow.js +3 -1
- package/dist/core/runner/prepare-config-doors.d.ts +8 -5
- package/dist/core/runner/prepare-config-doors.js +14 -10
- package/dist/core/runner/prepare-context-lane.js +2 -0
- package/dist/core/runner/prepare-delegation-surface.d.ts +8 -0
- package/dist/core/runner/prepare-delegation-surface.js +16 -18
- package/dist/core/runner/prepare-gate-stations.js +1 -1
- package/dist/core/runner/prepare-hands-readface.d.ts +11 -3
- package/dist/core/runner/prepare-hands-readface.js +9 -1
- package/dist/core/runner/prepare-inherited-gate.d.ts +1 -3
- package/dist/core/runner/prepare-inherited-gate.js +14 -27
- package/dist/core/runner/prepare-memory.d.ts +3 -0
- package/dist/core/runner/prepare-memory.js +26 -37
- package/dist/core/runner/prepare-park-ask.d.ts +1 -1
- package/dist/core/runner/prepare-park-ask.js +2 -1
- package/dist/core/runner/prepare-policy-chain.d.ts +7 -7
- package/dist/core/runner/prepare-policy-chain.js +18 -15
- package/dist/core/runner/prepare-project-context.d.ts +2 -2
- package/dist/core/runner/prepare-project-context.js +2 -2
- package/dist/core/runner/prepare-prompt-inputs.d.ts +1 -1
- package/dist/core/runner/prepare-prompt-inputs.js +8 -19
- package/dist/core/runner/prepare-protocol-tools.d.ts +4 -2
- package/dist/core/runner/prepare-protocol-tools.js +11 -3
- package/dist/core/runner/prepare-run-refs.d.ts +2 -3
- package/dist/core/runner/prepare-run-refs.js +4 -1
- package/dist/core/runner/prepare-suspend-saga.d.ts +2 -0
- package/dist/core/runner/prepare-suspend-saga.js +2 -1
- package/dist/core/runner/prepare-task.js +28 -13
- package/dist/core/runner/prepare-wiring-manifest.d.ts +2 -1
- package/dist/core/runner/prepare-wiring-manifest.js +4 -3
- package/dist/core/runner/prepare-workspace-restore.d.ts +3 -0
- package/dist/core/runner/prepare-workspace-restore.js +4 -4
- package/dist/core/runner/reply-pricing.d.ts +30 -0
- package/dist/core/runner/reply-pricing.js +19 -0
- package/dist/core/runner/resume-admission.js +5 -3
- package/dist/core/runner/resume-apply.js +6 -1
- package/dist/core/runner/resume-checkpoint-screen.js +2 -0
- package/dist/core/runner/resume-policy-outcome.js +5 -5
- package/dist/core/runner/role-seat-defaulted.d.ts +44 -0
- package/dist/core/runner/role-seat-defaulted.js +40 -0
- package/dist/core/runner/run-brain-sinks.js +2 -0
- package/dist/core/runner/run-harness-handlers.d.ts +3 -4
- package/dist/core/runner/run-harness-handlers.js +1 -8
- package/dist/core/runner/run-identity-wiring.d.ts +2 -5
- package/dist/core/runner/run-identity-wiring.js +6 -4
- package/dist/core/runner/run-leg.d.ts +2 -0
- package/dist/core/runner/run-leg.js +42 -29
- package/dist/core/runner/run-notification-lane.js +3 -0
- package/dist/core/runner/run-stop-and-final-verify.js +2 -2
- package/dist/core/runner/run-terminal-adoption.d.ts +2 -5
- package/dist/core/runner/run-terminal-adoption.js +9 -3
- package/dist/core/runner/run-turn-boundary.js +77 -70
- package/dist/core/runner/runtask.d.ts +1 -1
- package/dist/core/runner/runtask.js +2 -2
- package/dist/core/runner/side-call-account.d.ts +1 -1
- package/dist/core/runner/side-call-account.js +3 -18
- package/dist/core/runner/sub-agent-deny-lists.d.ts +24 -0
- package/dist/core/runner/sub-agent-deny-lists.js +10 -0
- package/dist/core/runner/terminal-account.js +3 -3
- package/dist/core/runner/tool-end-body.js +2 -1
- package/dist/core/runner/tool-occurrence.d.ts +5 -2
- package/dist/core/runner/tool-occurrence.js +4 -3
- package/dist/core/runner/turn-attachments.d.ts +26 -22
- package/dist/core/runner/turn-attachments.js +24 -26
- package/dist/core/runner/write-protection-station.d.ts +8 -2
- package/dist/core/runner/write-protection-station.js +2 -0
- package/dist/core/runner-deps.d.ts +3 -3
- package/dist/core/secret-env.d.ts +32 -2
- package/dist/core/secret-env.js +65 -3
- package/dist/core/sensitive-path-policy.js +9 -10
- package/dist/core/session-log-transfer.d.ts +24 -0
- package/dist/core/session-log-transfer.js +166 -0
- package/dist/core/session-policy-store.d.ts +3 -1
- package/dist/core/session-policy-store.js +13 -9
- package/dist/core/session-store.d.ts +86 -24
- package/dist/core/session-store.js +162 -24
- package/dist/core/session.d.ts +92 -1
- package/dist/core/shell-read-silence.js +1 -0
- package/dist/core/side-query.d.ts +11 -1
- package/dist/core/side-query.js +9 -0
- package/dist/core/skill-grant-binding.d.ts +31 -2
- package/dist/core/skill-grant-binding.js +31 -1
- package/dist/core/skill-grant.d.ts +8 -5
- package/dist/core/skill-grant.js +6 -6
- package/dist/core/steer-replay.d.ts +4 -2
- package/dist/core/steer-replay.js +2 -1
- package/dist/core/store-contracts/background-agent-store-contract.js +27 -0
- package/dist/core/store-contracts/checkpoint-store-contract.js +20 -2
- package/dist/core/store-contracts/mailbox-store-contract.js +31 -1
- package/dist/core/store-contracts/session-repo-contract.js +112 -5
- package/dist/core/store-contracts/session-store-contract.d.ts +4 -1
- package/dist/core/store-contracts/session-store-contract.js +236 -2
- package/dist/core/synthetic-read-verdict.js +2 -1
- package/dist/core/task-event.d.ts +92 -8
- package/dist/core/task-notification.js +16 -10
- package/dist/core/task-registry-agent.js +1 -0
- package/dist/core/task-registry-shared.d.ts +7 -1
- package/dist/core/task-spec.d.ts +49 -1
- package/dist/core/task-stream.d.ts +2 -1
- package/dist/core/terminal-cause.d.ts +11 -1
- package/dist/core/tool-catalog-entries.js +1 -0
- package/dist/core/tool-check-reading.d.ts +1 -0
- package/dist/core/tool-check-reading.js +3 -3
- package/dist/core/tool-policy.d.ts +16 -0
- package/dist/core/tool-result-store.d.ts +17 -10
- package/dist/core/tool-result-store.js +3 -1
- package/dist/core/tool-roster.d.ts +112 -5
- package/dist/core/tool-roster.js +42 -1
- package/dist/core/tool-spec.d.ts +3 -1
- package/dist/core/types.d.ts +3 -3
- package/dist/core/types.js +1 -1
- package/dist/core/untrusted-egress.d.ts +0 -2
- package/dist/core/untrusted-egress.js +10 -14
- package/dist/core/user-attachment.js +1 -1
- package/dist/core/wiring-manifest.d.ts +18 -6
- package/dist/core/wiring-manifest.js +4 -3
- package/dist/core/workspace-snapshot.d.ts +44 -0
- package/dist/core/workspace-snapshot.js +34 -0
- package/dist/core/write-protect.d.ts +43 -3
- package/dist/core/write-protect.js +43 -16
- package/dist/engine/compaction/compaction.js +29 -3
- package/dist/engine/execution-env/node-execution-env.d.ts +4 -3
- package/dist/engine/execution-env/node-execution-env.js +24 -23
- package/dist/engine/execution-env/symlink-chain.d.ts +7 -5
- package/dist/engine/harness/agent-harness.d.ts +30 -2
- package/dist/engine/harness/agent-harness.js +43 -12
- package/dist/engine/harness/messages.d.ts +3 -1
- package/dist/engine/harness/messages.js +3 -2
- package/dist/engine/harness/types.d.ts +56 -7
- package/dist/engine/harness/types.js +5 -1
- package/dist/engine/llm/rejected-images.d.ts +46 -0
- package/dist/engine/llm/rejected-images.js +54 -0
- package/dist/engine/llm/tool-turns.d.ts +2 -1
- package/dist/engine/llm/types.d.ts +30 -10
- package/dist/engine/llm/types.js +1 -1
- package/dist/engine/loop/agent-loop.d.ts +8 -0
- package/dist/engine/loop/agent-loop.js +52 -15
- package/dist/engine/loop/types.d.ts +3 -1
- package/dist/engine/session/import-validate.js +3 -0
- package/dist/engine/session/memory-repo.d.ts +17 -9
- package/dist/engine/session/memory-repo.js +44 -34
- package/dist/engine/session/path-to-root.d.ts +38 -0
- package/dist/engine/session/path-to-root.js +39 -0
- package/dist/engine/session/repo-utils.d.ts +22 -4
- package/dist/engine/session/repo-utils.js +49 -1
- package/dist/engine/session/storage-base.d.ts +10 -1
- package/dist/engine/session/storage-base.js +11 -22
- package/dist/index.d.ts +29 -16
- package/dist/index.js +21 -11
- package/dist/internal/harness-types.d.ts +2 -2
- package/dist/internal/harness.d.ts +3 -2
- package/dist/internal/harness.js +2 -2
- package/dist/internal/llm.d.ts +1 -0
- package/dist/orchestration/workflow-observe.d.ts +17 -1
- package/dist/orchestration/workflow-observe.js +20 -0
- package/dist/orchestration/workflow-types.d.ts +32 -7
- package/dist/orchestration/workflow.js +739 -489
- package/dist/shell/counting-pass.d.ts +50 -0
- package/dist/shell/counting-pass.js +502 -0
- package/dist/shell/lex.d.ts +4 -2
- package/dist/shell/lex.js +93 -34
- package/dist/shell/shell-words.d.ts +1 -1
- package/dist/shell/shell-words.js +7 -6
- package/dist/stores/file/index.d.ts +4 -1
- package/dist/stores/file/index.js +4 -1
- package/dist/stores/file/mailbox-store.js +6 -10
- package/dist/stores/file/session-store.d.ts +15 -8
- package/dist/stores/file/session-store.js +28 -13
- package/dist/tools/fs/fs-bash.d.ts +6 -0
- package/dist/tools/fs/fs-bash.js +6 -3
- package/dist/tools/fs/fs-write.d.ts +6 -3
- package/dist/tools/fs/fs-write.js +8 -7
- package/dist/tools/fs/index.d.ts +3 -0
- package/dist/tools/fs/index.js +7 -3
- package/dist/tools/fs/program-read-model.d.ts +13 -0
- package/dist/tools/fs/program-read-model.js +15 -0
- package/dist/tools/fs/program-read-model.rows.js +1 -1
- package/dist/tools/fs/read-deny.d.ts +13 -10
- package/dist/tools/fs/read-deny.js +25 -5
- package/dist/tools/fs/read-floor.d.ts +19 -0
- package/dist/tools/fs/read-floor.js +23 -0
- package/dist/tools/fs/safety.js +40 -8
- package/dist/tools/fs/search.js +6 -24
- package/dist/tools/fs/shell-read-check.d.ts +9 -2
- package/dist/tools/fs/shell-read-check.js +61 -16
- package/dist/tools/fs/shell-read-establish.js +2 -1
- package/dist/tools/fs/shell-read-identity.js +1 -1
- package/dist/tools/fs/shell-read-judge.d.ts +26 -9
- package/dist/tools/fs/shell-read-judge.js +10 -6
- package/dist/tools/fs/shell-read-plan.d.ts +6 -1
- package/dist/tools/fs/shell-read-plan.js +22 -15
- package/dist/tools/fs/shell-read-start.js +1 -0
- package/dist/tools/fs/shell-reentry-text.d.ts +15 -1
- package/dist/tools/fs/shell-reentry-text.js +25 -3
- package/dist/tools/monitor.d.ts +4 -0
- package/dist/tools/monitor.js +2 -0
- package/dist/tools/worktree.d.ts +42 -15
- package/dist/tools/worktree.js +60 -32
- package/package.json +5 -2
- package/test/export-surface.snapshot.json +149 -1
- package/wire-changes/core-stores-sql@7.58.0.json +29 -0
- package/wire-changes/core-stores-sql@7.59.0.json +29 -0
- package/wire-changes/core@7.58.0.json +2188 -0
- package/wire-changes/core@7.59.0.json +2459 -0
- package/wire-changes/mods-kernel@7.58.0.json +81 -0
- package/wire-changes/mods-kernel@7.59.0.json +29 -0
- package/wire-changes/primitives@7.58.0.json +29 -0
- package/wire-changes/primitives@7.59.0.json +29 -0
- package/dist/primitives/credential-ref.d.ts +0 -89
- package/dist/primitives/credential-ref.js +0 -125
- package/dist/primitives/index.d.ts +0 -2
- package/dist/primitives/index.js +0 -1
package/dist/core/mcp.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
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
|
-
import {
|
|
4
|
+
import { remoteWords, resolveProtocolHttpHeaders } from "./protocol-http-auth.js";
|
|
5
|
+
import { PeerCarrier, Reauthorized, answeredUnauthorized, carrierOf, inFlight, mcpPeerTarget, peerFetch, peerSeatMissing, recordCarrier, refusedThenRenewed, sentOnceMore, settledInFlight } from "./peer-seat.js";
|
|
5
6
|
import { disposeSectionEntry, sectionAnswerWarning } from "./prompt-section-seat.js";
|
|
6
7
|
import { createToolNameClaims, mintNamespacePrefix, normalizeNameSegment } from "./protocol-naming.js";
|
|
7
8
|
import { mcpToolDropReason, refuseCollidingMcpServerNames } from "./mcp-name-judge.js";
|
|
@@ -9,11 +10,11 @@ import { Client } from "@modelcontextprotocol/sdk/client/index.js";
|
|
|
9
10
|
import { McpConnectionPool } from "./mcp-connection-pool.js";
|
|
10
11
|
import { SessionEndingTransport, requestSite } from "./mcp-session-end.js";
|
|
11
12
|
import { mcpToolGate, UNPROVEN_GATE } from "./mcp-listing-drift.js";
|
|
12
|
-
import { ConnectionListing, Flights, IDLE_WATCHDOG_ABORT_REASON, Resendable, armMcpIdleWatchdog, callThroughLink, listingRefusal } from "./mcp-server-link.js";
|
|
13
|
+
import { ConnectionListing, Flights, IDLE_WATCHDOG_ABORT_REASON, Resendable, armMcpIdleWatchdog, callThroughLink, listingRefusal, observedFailure, owedByAnswer, reach, refusalScope } from "./mcp-server-link.js";
|
|
13
14
|
import { underStartupBound } from "./mcp-startup-request.js";
|
|
14
15
|
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";
|
|
15
16
|
import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
|
|
16
|
-
import {
|
|
17
|
+
import { describeHttpTransportFailure, failureFields, livenessOf, namingLostSession, readMcpFailure, sessionGone, unauthorizedLine } from "./mcp-failure.js";
|
|
17
18
|
import { lstat, mkdir, writeFile } from "node:fs/promises";
|
|
18
19
|
import { tmpdir } from "node:os";
|
|
19
20
|
import { join } from "node:path";
|
|
@@ -27,6 +28,7 @@ import { delimitUntrusted, inlineUntrusted, sanitizeUntrustedText } from "./untr
|
|
|
27
28
|
import { discloseReminderShaped, observeReminderMarkEcho } from "./reminder-disclosure.js";
|
|
28
29
|
import { MARKED_BLOCK_AFTER_DATA } from "./reminder-mint.js";
|
|
29
30
|
import { resolveMcpDeclaredResultSize, resolveMcpRequiresUserInteraction } from "./mcp-tool-meta.js";
|
|
31
|
+
import { mcpCallMeta } from "./mcp-call-meta.js";
|
|
30
32
|
export { resolveMcpDeclaredResultSize } from "./mcp-tool-meta.js";
|
|
31
33
|
import { withContentOrigin } from "./memory-engine/content-origin.js";
|
|
32
34
|
import { judgeMcpEntryDeclarations, snapshotMcpEntries } from "./locked-config.js";
|
|
@@ -208,9 +210,8 @@ function rethrowHonestMcpError(err, ctx) {
|
|
|
208
210
|
finish(err);
|
|
209
211
|
const serverLabel = inlineUntrusted(ctx.server);
|
|
210
212
|
const fenceServerText = (label, raw) => delimitUntrusted(label, truncateMcpErrorText(raw));
|
|
211
|
-
const failure =
|
|
212
|
-
ctx.
|
|
213
|
-
const details = (extra) => ({ code: failure.kind, delivered: failure.delivered, server: ctx.server, ...extra });
|
|
213
|
+
const failure = observedFailure(err, ctx.site, ctx.liveness, ctx.attempt === undefined);
|
|
214
|
+
const details = (extra) => ({ code: failure.kind, delivered: failure.delivered, server: ctx.server, ...(failure.authorization !== undefined ? { authorization: { ...failure.authorization } } : {}), ...extra });
|
|
214
215
|
switch (failure.kind) {
|
|
215
216
|
case "timeout": {
|
|
216
217
|
const data = err.data;
|
|
@@ -245,6 +246,10 @@ function rethrowHonestMcpError(err, ctx) {
|
|
|
245
246
|
}
|
|
246
247
|
finish(markMcpFailure(err, details()));
|
|
247
248
|
}
|
|
249
|
+
case "unauthorized":
|
|
250
|
+
finish(markMcpFailure(new Error(unauthorizedLine(ctx.what, serverLabel, failure.authorization, refusedThenRenewed(err) && ctx.attempt !== "resent", writeEffectWarning(ctx.writeEffect)), { cause: err }), details()));
|
|
251
|
+
case "credential_unavailable":
|
|
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()));
|
|
248
253
|
case "spawn_failed":
|
|
249
254
|
case "invalid_config":
|
|
250
255
|
case "unknown": {
|
|
@@ -360,8 +365,7 @@ export function inferCompactSchema(value, depth = 2) {
|
|
|
360
365
|
}
|
|
361
366
|
return typeof value;
|
|
362
367
|
}
|
|
363
|
-
|
|
364
|
-
function buildTransport(spec, principal, kind) {
|
|
368
|
+
function buildTransport(spec, principal, kind, carrier, pieces) {
|
|
365
369
|
const t = spec.transport;
|
|
366
370
|
if (kind === "stdio") {
|
|
367
371
|
if (!("command" in t))
|
|
@@ -369,16 +373,13 @@ function buildTransport(spec, principal, kind) {
|
|
|
369
373
|
return new StdioClientTransport({
|
|
370
374
|
command: t.command,
|
|
371
375
|
args: t.args,
|
|
372
|
-
env:
|
|
376
|
+
...(pieces?.env !== undefined ? { env: { ...pieces.env } } : {}),
|
|
373
377
|
});
|
|
374
378
|
}
|
|
375
379
|
if (!("url" in t))
|
|
376
380
|
throw new Error(`MCP server "${spec.name}": transport kind "${String(kind)}" carries no url`);
|
|
377
|
-
|
|
378
|
-
return new SessionEndingTransport(new URL(t.url), {
|
|
379
|
-
requestInit: headers ? { headers } : undefined,
|
|
380
|
-
fetch: declaredEndpointFetch,
|
|
381
|
-
});
|
|
381
|
+
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) });
|
|
382
383
|
}
|
|
383
384
|
let autoResizer;
|
|
384
385
|
export async function mapContent(content, serverName, imageResizer) {
|
|
@@ -642,7 +643,10 @@ export function mcpToolSchemaProblem(schema) {
|
|
|
642
643
|
}
|
|
643
644
|
return undefined;
|
|
644
645
|
}
|
|
645
|
-
export async function materializeMcpTools(specs, principal, onElicit, imageResizer, reminderDisclosure, mcpRevocations, poolOpts, promptSections, dialable, signal, hostFloor) {
|
|
646
|
+
export async function materializeMcpTools(specs, principal, onElicit, imageResizer, reminderDisclosure, mcpRevocations, poolOpts, promptSections, dialable, signal, hostFloor, peerSeat, onAuthorizationRequired) {
|
|
647
|
+
return materializeLegMcpTools(undefined, specs, principal, onElicit, imageResizer, reminderDisclosure, mcpRevocations, poolOpts, promptSections, dialable, signal, hostFloor, peerSeat, onAuthorizationRequired);
|
|
648
|
+
}
|
|
649
|
+
export async function materializeLegMcpTools(seat, ...[specs, principal, onElicit, imageResizer, reminderDisclosure, mcpRevocations, poolOpts, promptSections, dialable, signal, hostFloor, peerSeat, onAuthorizationRequired]) {
|
|
646
650
|
const snapshot = snapshotMcpEntries(specs);
|
|
647
651
|
const axesRefused = new WeakMap();
|
|
648
652
|
const entries = snapshot.map((spec) => {
|
|
@@ -686,6 +690,24 @@ export async function materializeMcpTools(specs, principal, onElicit, imageResiz
|
|
|
686
690
|
const warnings = [];
|
|
687
691
|
const serverInstructions = [];
|
|
688
692
|
const statuses = [];
|
|
693
|
+
const authorizationsAnnounced = new Set();
|
|
694
|
+
const announceAuthorization = (server, authorization) => {
|
|
695
|
+
if (onAuthorizationRequired === undefined || authorizationsAnnounced.has(server))
|
|
696
|
+
return;
|
|
697
|
+
authorizationsAnnounced.add(server);
|
|
698
|
+
try {
|
|
699
|
+
onAuthorizationRequired(server, { ...authorization });
|
|
700
|
+
}
|
|
701
|
+
catch {
|
|
702
|
+
}
|
|
703
|
+
};
|
|
704
|
+
const failedStatus = (spec, err, dialKind, declared) => {
|
|
705
|
+
const { failure, exchange } = readMcpFailure(err, { phase: "connect", transport: dialKind });
|
|
706
|
+
const liveness = livenessOf(exchange, Date.now());
|
|
707
|
+
if (failure.authorization !== undefined)
|
|
708
|
+
announceAuthorization(spec.name, failure.authorization);
|
|
709
|
+
return { name: spec.name, status: "failed", ...failureFields(failure), error: namedMcpFailureText(err, declared), ...(liveness !== undefined ? { liveness } : {}) };
|
|
710
|
+
};
|
|
689
711
|
const resourceServers = [];
|
|
690
712
|
const instructionsDelta = { pendingAdds: [], pendingRemovals: [] };
|
|
691
713
|
const droppedTools = [];
|
|
@@ -708,6 +730,7 @@ export async function materializeMcpTools(specs, principal, onElicit, imageResiz
|
|
|
708
730
|
s.status.liveness = observed;
|
|
709
731
|
};
|
|
710
732
|
s.health.observe = observe;
|
|
733
|
+
s.health.owed = (authorization) => void (disposing || announceAuthorization(spec.name, authorization));
|
|
711
734
|
const announceClose = () => {
|
|
712
735
|
if (disposing)
|
|
713
736
|
return;
|
|
@@ -758,12 +781,12 @@ export async function materializeMcpTools(specs, principal, onElicit, imageResiz
|
|
|
758
781
|
const gatesNow = (h) => {
|
|
759
782
|
const latest = h.listing.latest();
|
|
760
783
|
if (latest.at !== h.gatesAt.at)
|
|
761
|
-
h.gatesAt = { at: latest.at, gates: intakeListedTools({ tools: [...latest.entries], unproven: latest.unproven }, h.spec, linkOf(h.name), echoOf(h.spec), imageResizer, mcpDisclosure, isServerRevoked, h.transportKind).gates };
|
|
784
|
+
h.gatesAt = { at: latest.at, gates: intakeListedTools({ tools: [...latest.entries], unproven: latest.unproven }, h.spec, linkOf(h.name), echoOf(h.spec), imageResizer, mcpDisclosure, isServerRevoked, h.transportKind, seat).gates };
|
|
762
785
|
return h.gatesAt.gates;
|
|
763
786
|
};
|
|
764
787
|
const linkOf = (server) => ({
|
|
765
788
|
live: () => liveOf(server),
|
|
766
|
-
recover: (lost) => redialFlights.running(server) ?? (liveOf(server) === lost ? redialFlights.start(server, () => redialDial(server)) : Promise.resolve()),
|
|
789
|
+
recover: (lost, cause = "session") => redialFlights.running(server) ?? (liveOf(server) === lost ? redialFlights.start(server, () => redialDial(server, cause)) : Promise.resolve()),
|
|
767
790
|
});
|
|
768
791
|
const endpointRefusal = (spec, dialKind) => {
|
|
769
792
|
const transport = spec.transport;
|
|
@@ -779,12 +802,27 @@ export async function materializeMcpTools(specs, principal, onElicit, imageResiz
|
|
|
779
802
|
}
|
|
780
803
|
return peerRequestRefusal(`mcp: server "${inlineUntrusted(spec.name, 120)}"`, url, hostFloor);
|
|
781
804
|
};
|
|
782
|
-
const dialServer = (spec, dialKind, dialOpts) => {
|
|
783
|
-
const refusal = axesRefused.get(spec) ?? endpointRefusal(spec, dialKind);
|
|
784
|
-
|
|
805
|
+
const dialServer = async (spec, dialKind, dialOpts) => {
|
|
806
|
+
const refusal = axesRefused.get(spec) ?? peerSeatMissing(`mcp: server "${inlineUntrusted(spec.name, 120)}"`, spec.transport.credentials, peerSeat) ?? endpointRefusal(spec, dialKind);
|
|
807
|
+
if (refusal !== undefined)
|
|
808
|
+
throw refusal;
|
|
809
|
+
const carrier = new PeerCarrier(peerSeat, mcpPeerTarget(spec, dialKind), principal, dialKind === "stdio" ? "stdio" : "http", dialKind !== "stdio" && "principalHeader" in spec.transport && spec.transport.principalHeader !== undefined);
|
|
810
|
+
sentOf.set(spec.name, carrier.sent);
|
|
811
|
+
const dial = () => connectServer(spec, principal, onElicit, imageResizer, mcpDisclosure, isServerRevoked, dialKind, poolOpts?.pool, { ...dialOpts, link: linkOf(spec.name), carrier, ...(signal !== undefined ? { signal } : {}) }, seat);
|
|
812
|
+
const connected = await dial().catch(async (err) => {
|
|
813
|
+
if (typeof err === "object" && err !== null)
|
|
814
|
+
sentOf.set(spec.name, (carrierOf(err) ?? carrier).sent);
|
|
815
|
+
const dialing = (typeof err === "object" && err !== null ? carrierOf(err) : undefined) ?? carrier;
|
|
816
|
+
if (!(dialing.renewed && answeredUnauthorized(err)) || signal?.aborted === true)
|
|
817
|
+
throw err;
|
|
818
|
+
return dial();
|
|
819
|
+
});
|
|
820
|
+
sentOf.set(spec.name, (carrierOf(connected.client) ?? carrier).sent);
|
|
821
|
+
return connected;
|
|
785
822
|
};
|
|
786
823
|
const prefixOf = (name) => mintNamespacePrefix(MCP_NAMESPACE, name);
|
|
787
|
-
const
|
|
824
|
+
const sentOf = new Map();
|
|
825
|
+
const echoOf = (spec) => sentOf.get(spec.name) ?? [];
|
|
788
826
|
const heldCount = (name) => serverHandles.find((h) => h.name === name)?.tools.length ?? 0;
|
|
789
827
|
const reconcileInstructions = (name, after, connected) => {
|
|
790
828
|
if (!connected)
|
|
@@ -816,9 +854,7 @@ export async function materializeMcpTools(specs, principal, onElicit, imageResiz
|
|
|
816
854
|
else {
|
|
817
855
|
const declared = echoOf(spec);
|
|
818
856
|
warnings.push(asServerWarning(spec, r.reason, declared));
|
|
819
|
-
|
|
820
|
-
const liveness = livenessOf(kind, Date.now());
|
|
821
|
-
statuses.push({ name: spec.name, status: "failed", errorCode: kind, delivered, ...(httpStatus !== undefined ? { httpStatus } : {}), error: namedMcpFailureText(r.reason, declared), ...(liveness !== undefined ? { liveness } : {}) });
|
|
857
|
+
statuses.push(failedStatus(spec, r.reason, dialKinds[i], declared));
|
|
822
858
|
}
|
|
823
859
|
}
|
|
824
860
|
const resourceTools = buildResourceTools(resourceServers, isServerRevoked);
|
|
@@ -832,7 +868,7 @@ export async function materializeMcpTools(specs, principal, onElicit, imageResiz
|
|
|
832
868
|
const declineRedial = (server, outcome, reason) => ({ server, prefix: prefixOf(server), outcome, reason, toolCount: heldCount(server), added: [], removed: [] });
|
|
833
869
|
const redialFlights = new Flights();
|
|
834
870
|
const ownerStopped = () => (disposing ? "this materialization is being disposed — the task is tearing down" : signal?.aborted === true ? "the run was aborted" : undefined);
|
|
835
|
-
const redialDial = async (server) => {
|
|
871
|
+
const redialDial = async (server, cause = "session") => {
|
|
836
872
|
const prefix = prefixOf(server);
|
|
837
873
|
const declined = (outcome, reason) => declineRedial(server, outcome, reason);
|
|
838
874
|
const stopped = ownerStopped();
|
|
@@ -849,13 +885,20 @@ export async function materializeMcpTools(specs, principal, onElicit, imageResiz
|
|
|
849
885
|
if (prior) {
|
|
850
886
|
prior.announce.fn = undefined;
|
|
851
887
|
prior.health.observe = undefined;
|
|
852
|
-
|
|
853
|
-
|
|
854
|
-
|
|
855
|
-
|
|
888
|
+
if (cause !== "expired") {
|
|
889
|
+
serverHandles.splice(hIdx, 1);
|
|
890
|
+
const cIdx = connections.findIndex((c) => c.client === prior.client);
|
|
891
|
+
const priorConnection = cIdx === -1 ? undefined : connections.splice(cIdx, 1)[0];
|
|
892
|
+
await (priorConnection?.close() ?? prior.client.close()).catch(() => undefined);
|
|
893
|
+
}
|
|
856
894
|
}
|
|
857
895
|
const dialKind = readDialKind(spec);
|
|
858
|
-
const dialed = await dialServer(spec, dialKind, { fresh:
|
|
896
|
+
const dialed = await dialServer(spec, dialKind, { fresh: cause !== "expired", sections: promptSections, ...(prior !== undefined ? { carried: prior.listing.latest().entries } : {}) }).then((connected) => ({ connected }), (err) => ({ err }));
|
|
897
|
+
if (cause === "expired" && prior !== undefined) {
|
|
898
|
+
if (serverHandles.includes(prior))
|
|
899
|
+
serverHandles.splice(serverHandles.indexOf(prior), 1);
|
|
900
|
+
void settledInFlight(prior.client).then(() => (connections.find((c) => c.client === prior.client)?.close() ?? prior.client.close()).catch(() => undefined));
|
|
901
|
+
}
|
|
859
902
|
const stoppedLate = ownerStopped();
|
|
860
903
|
if (stoppedLate !== undefined) {
|
|
861
904
|
if ("connected" in dialed)
|
|
@@ -864,11 +907,9 @@ export async function materializeMcpTools(specs, principal, onElicit, imageResiz
|
|
|
864
907
|
}
|
|
865
908
|
if ("err" in dialed) {
|
|
866
909
|
const err = dialed.err;
|
|
867
|
-
const { kind, delivered, httpStatus } = classifyMcpFailure(err, { phase: "connect", transport: dialKind });
|
|
868
|
-
const redialLiveness = livenessOf(kind, Date.now());
|
|
869
910
|
const declared = echoOf(spec);
|
|
870
|
-
const
|
|
871
|
-
const
|
|
911
|
+
const status = failedStatus(spec, err, dialKind, declared);
|
|
912
|
+
const failure = status.error;
|
|
872
913
|
const sIdx = statuses.findIndex((st) => st.name === server);
|
|
873
914
|
if (sIdx === -1)
|
|
874
915
|
statuses.push(status);
|
|
@@ -946,7 +987,7 @@ export async function materializeMcpTools(specs, principal, onElicit, imageResiz
|
|
|
946
987
|
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" });
|
|
947
988
|
continue;
|
|
948
989
|
}
|
|
949
|
-
const { serverTools, serverAxes, gates, dropped, accepted } = intakeListedTools({ tools: [...mergedRaw], unproven: answered.unproven }, h.spec, linkOf(h.name), echoOf(h.spec), imageResizer, mcpDisclosure, isServerRevoked, h.transportKind);
|
|
990
|
+
const { serverTools, serverAxes, gates, dropped, accepted } = intakeListedTools({ tools: [...mergedRaw], unproven: answered.unproven }, h.spec, linkOf(h.name), echoOf(h.spec), imageResizer, mcpDisclosure, isServerRevoked, h.transportKind, seat);
|
|
950
991
|
cacheTools(accepted, answered.kept);
|
|
951
992
|
const priorNames = h.tools.map((t) => t.name);
|
|
952
993
|
const newNames = serverTools.map((t) => t.name);
|
|
@@ -971,7 +1012,7 @@ export async function materializeMcpTools(specs, principal, onElicit, imageResiz
|
|
|
971
1012
|
});
|
|
972
1013
|
}
|
|
973
1014
|
catch (err) {
|
|
974
|
-
|
|
1015
|
+
observedFailure(err, site, h.health, true);
|
|
975
1016
|
results.push({
|
|
976
1017
|
server: h.name,
|
|
977
1018
|
prefix: prefixOf(h.name),
|
|
@@ -1256,7 +1297,7 @@ function buildResourceTools(resourceServers, isServerRevoked = () => false) {
|
|
|
1256
1297
|
for (const rs of targets) {
|
|
1257
1298
|
if (isServerRevoked(rs.server)) {
|
|
1258
1299
|
errors.push({ server: rs.server, error: "server revoked by the operator mid-session (request not sent)" });
|
|
1259
|
-
sections.push(`[${rs.server}] Error: server revoked by the operator mid-session — the request was NOT sent.
|
|
1300
|
+
sections.push(`[${rs.server}] Error: server revoked by the operator mid-session — the request was NOT sent. ${refusalScope("revocation")}`);
|
|
1260
1301
|
continue;
|
|
1261
1302
|
}
|
|
1262
1303
|
if (rs.health.dead) {
|
|
@@ -1291,6 +1332,7 @@ function buildResourceTools(resourceServers, isServerRevoked = () => false) {
|
|
|
1291
1332
|
sanitizeMcpErrorTextInPlace(err, rs.declared);
|
|
1292
1333
|
if (signal?.aborted)
|
|
1293
1334
|
throw err;
|
|
1335
|
+
observedFailure(err, site, rs.health, true);
|
|
1294
1336
|
const msg = watchdog.idleSignal.reason === IDLE_WATCHDOG_ABORT_REASON
|
|
1295
1337
|
? idleWatchdogTripText(idleMs)
|
|
1296
1338
|
: namingLostSession(err, site, remoteErrorText(err, rs.declared));
|
|
@@ -1336,7 +1378,7 @@ function buildResourceTools(resourceServers, isServerRevoked = () => false) {
|
|
|
1336
1378
|
const what = `The read of resource ${inlineUntrusted(uri)}`;
|
|
1337
1379
|
if (isServerRevoked(server)) {
|
|
1338
1380
|
return {
|
|
1339
|
-
content: [{ type: "text", text: `${what} was refused: MCP server "${server}" was revoked by the operator mid-session. The request was NOT sent.
|
|
1381
|
+
content: [{ type: "text", text: `${what} was refused: MCP server "${server}" was revoked by the operator mid-session. The request was NOT sent. ${refusalScope("revocation")}` }],
|
|
1340
1382
|
details: { error: "mcp.server_revoked", code: "mcp.server_revoked", delivered: "no", server },
|
|
1341
1383
|
terminate: false,
|
|
1342
1384
|
isError: true,
|
|
@@ -1351,7 +1393,7 @@ function buildResourceTools(resourceServers, isServerRevoked = () => false) {
|
|
|
1351
1393
|
let res;
|
|
1352
1394
|
try {
|
|
1353
1395
|
res = await rs.client
|
|
1354
|
-
.readResource(
|
|
1396
|
+
.readResource(rs.readParams(uri), { signal: watchdog.combinedSignal, timeout: timeoutMs })
|
|
1355
1397
|
.catch((err) => rethrowHonestMcpError(err, { server, declared: rs.declared, what, timeoutMs, writeEffect: false, signal, attributeServer: true, site, idle: { signal: watchdog.idleSignal, idleMs }, liveness: rs.health }));
|
|
1356
1398
|
rs.health.observe?.("completed");
|
|
1357
1399
|
}
|
|
@@ -1398,7 +1440,7 @@ function buildResourceTools(resourceServers, isServerRevoked = () => false) {
|
|
|
1398
1440
|
const what = `The directory listing of ${inlineUntrusted(uri)}`;
|
|
1399
1441
|
if (isServerRevoked(server)) {
|
|
1400
1442
|
return {
|
|
1401
|
-
content: [{ type: "text", text: `${what} was refused: MCP server "${server}" was revoked by the operator mid-session. The request was NOT sent.
|
|
1443
|
+
content: [{ type: "text", text: `${what} was refused: MCP server "${server}" was revoked by the operator mid-session. The request was NOT sent. ${refusalScope("revocation")}` }],
|
|
1402
1444
|
details: { error: "mcp.server_revoked", code: "mcp.server_revoked", delivered: "no", server },
|
|
1403
1445
|
terminate: false,
|
|
1404
1446
|
isError: true,
|
|
@@ -1527,7 +1569,7 @@ async function listToolsLenient(client, options, declared) {
|
|
|
1527
1569
|
});
|
|
1528
1570
|
return { tools: walk.items, ...(walk.incomplete !== undefined ? { incomplete: walk.incomplete } : {}) };
|
|
1529
1571
|
}
|
|
1530
|
-
async function connectServer(spec, principal, onElicit, imageResizer, reminderDisclosure, isServerRevoked, transportKind, pool, dialOpts) {
|
|
1572
|
+
async function connectServer(spec, principal, onElicit, imageResizer, reminderDisclosure, isServerRevoked, transportKind, pool, dialOpts, seat) {
|
|
1531
1573
|
const fp = spec.fingerprint;
|
|
1532
1574
|
if (fp !== undefined && !(typeof fp === "string" && fp.length > 0 && fp.length <= 128)) {
|
|
1533
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" });
|
|
@@ -1560,7 +1602,8 @@ async function connectServer(spec, principal, onElicit, imageResizer, reminderDi
|
|
|
1560
1602
|
}
|
|
1561
1603
|
});
|
|
1562
1604
|
}
|
|
1563
|
-
const
|
|
1605
|
+
const pieces = transportKind === "stdio" ? await dialOpts.carrier.next(stop) : undefined;
|
|
1606
|
+
const transport = buildTransport(spec, principal, transportKind, dialOpts.carrier, pieces);
|
|
1564
1607
|
const hangUp = () => void client.close().catch(() => undefined);
|
|
1565
1608
|
stop?.addEventListener("abort", hangUp, { once: true });
|
|
1566
1609
|
try {
|
|
@@ -1568,11 +1611,14 @@ async function connectServer(spec, principal, onElicit, imageResizer, reminderDi
|
|
|
1568
1611
|
}
|
|
1569
1612
|
catch (err) {
|
|
1570
1613
|
await client.close().catch(() => undefined);
|
|
1614
|
+
if (typeof err === "object" && err !== null)
|
|
1615
|
+
recordCarrier(err, dialOpts.carrier);
|
|
1571
1616
|
throw stop?.aborted === true ? stop.reason : err;
|
|
1572
1617
|
}
|
|
1573
1618
|
finally {
|
|
1574
1619
|
stop?.removeEventListener("abort", hangUp);
|
|
1575
1620
|
}
|
|
1621
|
+
recordCarrier(client, dialOpts.carrier);
|
|
1576
1622
|
return client;
|
|
1577
1623
|
};
|
|
1578
1624
|
const lease = pool !== undefined && !elicitOn ? await pool.acquire(McpConnectionPool.keyOf(spec, principal, transportKind, startupMs), dialClient, dialOpts) : undefined;
|
|
@@ -1594,10 +1640,10 @@ async function connectServer(spec, principal, onElicit, imageResizer, reminderDi
|
|
|
1594
1640
|
const listing = lease?.listing ?? new ConnectionListing();
|
|
1595
1641
|
const at = listing.open();
|
|
1596
1642
|
const cacheTools = openListing();
|
|
1597
|
-
const declared =
|
|
1643
|
+
const declared = (carrierOf(client) ?? dialOpts.carrier).sent;
|
|
1598
1644
|
const listed = await underStartupBound(startupMs, dialOpts?.signal, (options) => listToolsLenient(client, options, declared));
|
|
1599
1645
|
const answered = listing.answer(at, listed.tools, listed.incomplete !== undefined, dialOpts.carried);
|
|
1600
|
-
const { serverTools, serverAxes, gates, dropped, advisories, accepted } = intakeListedTools({ tools: [...answered.view], unproven: answered.unproven }, spec, dialOpts.link, declared, imageResizer, reminderDisclosure, isServerRevoked, transportKind);
|
|
1646
|
+
const { serverTools, serverAxes, gates, dropped, advisories, accepted } = intakeListedTools({ tools: [...answered.view], unproven: answered.unproven }, spec, dialOpts.link, declared, imageResizer, reminderDisclosure, isServerRevoked, transportKind, seat);
|
|
1601
1647
|
cacheTools(accepted, answered.kept);
|
|
1602
1648
|
const caps = client.getServerCapabilities();
|
|
1603
1649
|
const resourceInfo = caps?.resources
|
|
@@ -1635,15 +1681,17 @@ async function connectServer(spec, principal, onElicit, imageResizer, reminderDi
|
|
|
1635
1681
|
...(instructions ? { instructions } : {}),
|
|
1636
1682
|
...(disposed?.defect !== undefined ? { instructionsDefect: disposed.defect } : {}),
|
|
1637
1683
|
...(listed.incomplete !== undefined ? { listingIncomplete: listed.incomplete } : {}),
|
|
1638
|
-
...(resourceInfo && (resourceInfo.listAllowed || resourceInfo.readAllowed) ? { resourceServer: { server: spec.name, client, health, transportKind: idleKindOf(transportKind), declared, ...resourceInfo } } : {}),
|
|
1684
|
+
...(resourceInfo && (resourceInfo.listAllowed || resourceInfo.readAllowed) ? { resourceServer: { server: spec.name, client, health, transportKind: idleKindOf(transportKind), declared, readParams: (uri) => { const _meta = mcpCallMeta(undefined, undefined, spec.sessionMetaKey, seat?.sessionId); return { uri, ...(_meta !== undefined ? { _meta } : {}) }; }, ...resourceInfo } } : {}),
|
|
1639
1685
|
};
|
|
1640
1686
|
}
|
|
1641
1687
|
catch (err) {
|
|
1642
1688
|
await close().catch(() => undefined);
|
|
1689
|
+
if (typeof err === "object" && err !== null)
|
|
1690
|
+
recordCarrier(err, carrierOf(client) ?? dialOpts.carrier);
|
|
1643
1691
|
throw err;
|
|
1644
1692
|
}
|
|
1645
1693
|
}
|
|
1646
|
-
function intakeListedTools(listed, spec, link, declared, imageResizer, reminderDisclosure, isServerRevoked, transportKind) {
|
|
1694
|
+
function intakeListedTools(listed, spec, link, declared, imageResizer, reminderDisclosure, isServerRevoked, transportKind, seat) {
|
|
1647
1695
|
const declaredContentOrigin = spec.contentOrigin;
|
|
1648
1696
|
const serverTools = [];
|
|
1649
1697
|
const serverAxes = [];
|
|
@@ -1719,11 +1767,11 @@ function intakeListedTools(listed, spec, link, declared, imageResizer, reminderD
|
|
|
1719
1767
|
...(mcpAlwaysLoad ? { mcpAlwaysLoad: true } : {}),
|
|
1720
1768
|
...gateFace,
|
|
1721
1769
|
mcpRemoteName: remoteName, ...boundaryFlowFace(spec.toolAxes?.[remoteName]), permissionSeat: "passthrough",
|
|
1722
|
-
execute: async (
|
|
1770
|
+
execute: async (toolCallId, params, signal) => {
|
|
1723
1771
|
const what = `The call to tool ${inlineUntrusted(remoteName)}`;
|
|
1724
1772
|
if (isServerRevoked?.(spec.name) === true) {
|
|
1725
1773
|
return {
|
|
1726
|
-
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.
|
|
1774
|
+
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")}` }],
|
|
1727
1775
|
details: { error: "mcp.server_revoked", code: "mcp.server_revoked", delivered: "no", server: spec.name },
|
|
1728
1776
|
terminate: false,
|
|
1729
1777
|
isError: true,
|
|
@@ -1731,7 +1779,7 @@ function intakeListedTools(listed, spec, link, declared, imageResizer, reminderD
|
|
|
1731
1779
|
}
|
|
1732
1780
|
if (taskRequired) {
|
|
1733
1781
|
return {
|
|
1734
|
-
content: [{ type: "text", text:
|
|
1782
|
+
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")}` }],
|
|
1735
1783
|
details: { error: "mcp.task_required", code: "mcp.task_required", delivered: "no", server: spec.name },
|
|
1736
1784
|
terminate: false,
|
|
1737
1785
|
isError: true,
|
|
@@ -1739,12 +1787,14 @@ function intakeListedTools(listed, spec, link, declared, imageResizer, reminderD
|
|
|
1739
1787
|
}
|
|
1740
1788
|
const timeoutMs = mcpToolTimeoutMs();
|
|
1741
1789
|
const idleMs = mcpIdleTimeoutMs(idleKindOf(transportKind));
|
|
1742
|
-
const
|
|
1790
|
+
const callMeta = mcpCallMeta(toolCallId, seat?.of(toolCallId), spec.sessionMetaKey, seat?.sessionId);
|
|
1791
|
+
let answeredWith = declared;
|
|
1792
|
+
const attempt = async (conn, resent, last) => {
|
|
1743
1793
|
const site = requestSite(conn.client);
|
|
1744
1794
|
const watchdog = armMcpIdleWatchdog(conn.health, idleMs, signal);
|
|
1745
1795
|
try {
|
|
1746
1796
|
const res = await conn.client
|
|
1747
|
-
.callTool({ name: remoteName, arguments: (params ?? {}) }, LENIENT_CALL_TOOL_RESULT_SCHEMA, {
|
|
1797
|
+
.callTool({ name: remoteName, arguments: (params ?? {}), ...(callMeta !== undefined ? { _meta: callMeta } : {}) }, LENIENT_CALL_TOOL_RESULT_SCHEMA, {
|
|
1748
1798
|
signal: watchdog.combinedSignal,
|
|
1749
1799
|
timeout: timeoutMs,
|
|
1750
1800
|
resetTimeoutOnProgress: true,
|
|
@@ -1755,13 +1805,13 @@ function intakeListedTools(listed, spec, link, declared, imageResizer, reminderD
|
|
|
1755
1805
|
try {
|
|
1756
1806
|
return rethrowHonestMcpError(err, {
|
|
1757
1807
|
server: spec.name,
|
|
1758
|
-
declared,
|
|
1808
|
+
declared: carrierOf(conn.client)?.sent ?? declared,
|
|
1759
1809
|
what,
|
|
1760
1810
|
timeoutMs,
|
|
1761
1811
|
writeEffect,
|
|
1762
1812
|
signal,
|
|
1763
1813
|
site,
|
|
1764
|
-
...(resent ? { resent: true } : {}),
|
|
1814
|
+
...(resent ? { resent: true } : {}), attempt: last ? "resent" : "first",
|
|
1765
1815
|
idle: { signal: watchdog.idleSignal, idleMs },
|
|
1766
1816
|
liveness: conn.health,
|
|
1767
1817
|
...(reminderDisclosure !== undefined
|
|
@@ -1772,18 +1822,25 @@ function intakeListedTools(listed, spec, link, declared, imageResizer, reminderD
|
|
|
1772
1822
|
catch (failure) {
|
|
1773
1823
|
if (sessionGone(err, site) && signal?.aborted !== true)
|
|
1774
1824
|
return new Resendable(conn, failure);
|
|
1825
|
+
if (!writeEffect && answeredUnauthorized(err) && carrierOf(conn.client)?.renewed === true && signal?.aborted !== true)
|
|
1826
|
+
return new Reauthorized(failure);
|
|
1775
1827
|
throw failure;
|
|
1776
1828
|
}
|
|
1777
1829
|
});
|
|
1778
|
-
if (res instanceof Resendable)
|
|
1830
|
+
if (res instanceof Resendable || res instanceof Reauthorized)
|
|
1779
1831
|
return res;
|
|
1780
1832
|
conn.health.observe?.("completed");
|
|
1833
|
+
answeredWith = carrierOf(conn.client)?.sent ?? declared;
|
|
1781
1834
|
return res;
|
|
1782
1835
|
}
|
|
1783
1836
|
finally {
|
|
1784
1837
|
watchdog.dispose();
|
|
1785
1838
|
}
|
|
1786
1839
|
};
|
|
1840
|
+
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))));
|
|
1841
|
+
const before = link.live();
|
|
1842
|
+
if (before !== undefined && carrierOf(before.client)?.expired() === true)
|
|
1843
|
+
await link.recover(before, "expired");
|
|
1787
1844
|
const res = await callThroughLink(link, namespacedName, gate, signal, send, () => throwDeadServer(spec.name, what));
|
|
1788
1845
|
if (typeof res === "string")
|
|
1789
1846
|
return listingRefusal(res, remoteName, spec.name);
|
|
@@ -1799,7 +1856,7 @@ function intakeListedTools(listed, spec, link, declared, imageResizer, reminderD
|
|
|
1799
1856
|
const errScLine = structuredContentErrorLine(res.structuredContent, parts.join("\n"));
|
|
1800
1857
|
if (errScLine !== undefined)
|
|
1801
1858
|
parts.push(errScLine);
|
|
1802
|
-
const body = truncateMcpErrorText(remoteWords(parts.join("\n").trim(),
|
|
1859
|
+
const body = truncateMcpErrorText(remoteWords(parts.join("\n").trim(), answeredWith));
|
|
1803
1860
|
const msg = body
|
|
1804
1861
|
? `MCP tool ${inlineUntrusted(remoteName)} reported an error. The server's error content follows as external/untrusted data:\n${delimitUntrusted(`${spec.name} tool error`, body)}`
|
|
1805
1862
|
: `MCP tool ${inlineUntrusted(remoteName)} reported an error`;
|
|
@@ -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));
|
|
@@ -205,6 +205,10 @@ export declare function consolidationTypeEligible(type: string | undefined): boo
|
|
|
205
205
|
export declare const CONSOLIDATION_GATE_FILE = "consolidation-gate.json";
|
|
206
206
|
export declare const CONSOLIDATION_PLANS_DIR = "consolidation-plans";
|
|
207
207
|
export declare const CONSOLIDATION_INTENTS_FILE = "consolidation-intents.json";
|
|
208
|
+
/** §1.6-4 — the mint archive: what was shown to the model and what it answered, verbatim, per run
|
|
209
|
+
* (the fold law's audit other-half; strict-family placement beside the plan workbook). Named here,
|
|
210
|
+
* beside the workbook, because the store's erasure lane reads both as carriers of an erased entry. */
|
|
211
|
+
export declare const CONSOLIDATION_DRIVER_PLANS_DIR = "distiller-plans";
|
|
208
212
|
export interface ConsolidationGateRow {
|
|
209
213
|
/** Last COMPLETED run's settle time (ms epoch). */
|
|
210
214
|
lastRunAt?: number;
|
|
@@ -110,6 +110,7 @@ export function consolidationTypeEligible(type) {
|
|
|
110
110
|
export const CONSOLIDATION_GATE_FILE = "consolidation-gate.json";
|
|
111
111
|
export const CONSOLIDATION_PLANS_DIR = "consolidation-plans";
|
|
112
112
|
export const CONSOLIDATION_INTENTS_FILE = "consolidation-intents.json";
|
|
113
|
+
export const CONSOLIDATION_DRIVER_PLANS_DIR = "distiller-plans";
|
|
113
114
|
function coerceGateFile(raw) {
|
|
114
115
|
if (raw === undefined)
|
|
115
116
|
return { v: 1, scopes: {} };
|
|
@@ -216,15 +216,7 @@ export function replayExternalSettlementEffects(controlDir, input) {
|
|
|
216
216
|
catch {
|
|
217
217
|
continue;
|
|
218
218
|
}
|
|
219
|
-
|
|
220
|
-
enqueueMemoryAnnouncement(controlDir, {
|
|
221
|
-
kind: "gate",
|
|
222
|
-
at: input.now(),
|
|
223
|
-
items: [`delegation settlement: a background delegation of session ${JSON.stringify(sessionId)} settled EXTERNAL after launch — the session is marked and its unmarked committed contributions are challenged`],
|
|
224
|
-
});
|
|
225
|
-
}
|
|
226
|
-
catch {
|
|
227
|
-
}
|
|
219
|
+
console.warn(`[sema] delegation settlement: a background delegation of session ${JSON.stringify(sessionId)} settled EXTERNAL after launch — the session is marked and its unmarked committed contributions are challenged`);
|
|
228
220
|
lockedStrictUpdate(controlDir, DELEGATION_SETTLEMENT_FILE, "memory delegation-settlement ledger", coerceSettlement, (r) => {
|
|
229
221
|
r.effects[s.row.settleId] = s.terminalEventId;
|
|
230
222
|
return { next: r, result: undefined };
|
|
@@ -663,10 +655,11 @@ export function openInstructionHold(controlDir, input) {
|
|
|
663
655
|
}
|
|
664
656
|
export function reconcileHolds(controlDir, input) {
|
|
665
657
|
const holdDir = join(controlDir, HOLD_DIR);
|
|
666
|
-
const discloseStranded = (holdId, rel, at) => {
|
|
658
|
+
const discloseStranded = (holdId, scope, rel, at) => {
|
|
667
659
|
try {
|
|
668
660
|
enqueueMemoryAnnouncement(controlDir, {
|
|
669
661
|
kind: "gate",
|
|
662
|
+
scope,
|
|
670
663
|
at: input.now(),
|
|
671
664
|
items: [`instruction hold ${holdId}: a concurrent writer's bytes for ${JSON.stringify(rel)} could not be restored onto the plane — they are preserved at ${at} for host recovery`],
|
|
672
665
|
});
|
|
@@ -688,7 +681,7 @@ export function reconcileHolds(controlDir, input) {
|
|
|
688
681
|
return;
|
|
689
682
|
const retired = retireStagingToCustody(staging, holdDir, stagingName);
|
|
690
683
|
if (restore === "stranded" || !retired.settled)
|
|
691
|
-
discloseStranded(row.holdId, row.rel, retired.at);
|
|
684
|
+
discloseStranded(row.holdId, row.scope, row.rel, retired.at);
|
|
692
685
|
};
|
|
693
686
|
const seatListing = new Map();
|
|
694
687
|
const listSeat = (seatDir) => {
|
|
@@ -737,7 +730,7 @@ export function reconcileHolds(controlDir, input) {
|
|
|
737
730
|
const onSeat = seat !== undefined && isSameFile(staged, seat);
|
|
738
731
|
const retired = retireStagingToCustody(staged, holdDir, name);
|
|
739
732
|
if (!(onSeat && retired.settled && isSameFile(plane, seat)))
|
|
740
|
-
discloseStranded(row.holdId, row.rel, retired.at);
|
|
733
|
+
discloseStranded(row.holdId, row.scope, row.rel, retired.at);
|
|
741
734
|
}
|
|
742
735
|
};
|
|
743
736
|
const rows = readHolds(controlDir).filter((r) => r.status === "capturing");
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { requireWriteGate } from "./consolidation-write-gate.js";
|
|
2
2
|
import { readMember, thrownText } from "../thrown-value.js";
|
|
3
3
|
import { assertServableRequestRoot, joinRequestUrl } from "../../brain/route-adjudicator.js";
|
|
4
|
-
import { holdOwnCredentialValues, namesASecret } from "../secret-env.js";
|
|
4
|
+
import { holdOwnCredentialValues, isBlankCredential, namesASecret } from "../secret-env.js";
|
|
5
5
|
import { remoteWords } from "../protocol-http-auth.js";
|
|
6
6
|
export const DISTILLER_DEFAULT_MAX_INPUTS_PER_PRODUCT = 32;
|
|
7
7
|
const SIZE_CLAUSE = {
|
|
@@ -161,7 +161,7 @@ export function openAiCompatChatSeat(seat) {
|
|
|
161
161
|
catch {
|
|
162
162
|
throw distillerConfigRefusal("memory consolidation driver chat seat's apiKey threw while it was read — refused (the thrown value is not repeated).");
|
|
163
163
|
}
|
|
164
|
-
if (typeof apiKey !== "string" || apiKey
|
|
164
|
+
if (typeof apiKey !== "string" || isBlankCredential(apiKey))
|
|
165
165
|
throw distillerConfigRefusal("memory consolidation driver chat seat needs an api key — a driver that silently skips would publish an empty plan as a model's answer.");
|
|
166
166
|
if (typeof seat.model !== "string" || seat.model.trim() === "" || isAliasModelId(seat.model)) {
|
|
167
167
|
throw distillerConfigRefusal(`memory consolidation driver chat seat needs an EXPLICIT model id, got ${JSON.stringify(seat.model)} — an alias can be re-pointed upstream and would move the driver with no trace in the plan.`);
|