@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/peer-seat.js
CHANGED
|
@@ -1,12 +1,134 @@
|
|
|
1
1
|
import { createHash } from "node:crypto";
|
|
2
|
+
import { types } from "node:util";
|
|
2
3
|
import { StreamableHTTPError } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
|
|
4
|
+
import { canonicalize } from "./canonical-json.js";
|
|
3
5
|
import { readCredentialRef } from "@sema-agent/primitives";
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
6
|
+
import { callerText } from "./mcp-server-spec.js";
|
|
7
|
+
import { readMember, readOwnMembers } from "./thrown-value.js";
|
|
8
|
+
import { httpTrimmed, resolveProtocolHttpHeaders } from "./protocol-http-auth.js";
|
|
9
|
+
import { credentialHeaderValues, holdOwnCredentialValues, isSecretEnvKey, namesASecret } from "./secret-env.js";
|
|
7
10
|
import { inlineUntrusted } from "./untrusted-text.js";
|
|
11
|
+
const PEER_SEAT_MEMBERS = Object.freeze(["answer", "hold", "release"]);
|
|
12
|
+
export function receivePeerSeat(raw, subject) {
|
|
13
|
+
if (raw === undefined)
|
|
14
|
+
return undefined;
|
|
15
|
+
const refuse = (problem) => Object.assign(new Error(`${subject} ${problem} — the peer seat is an object { answer(question, signal), hold(ref), release(ref) }`), { code: "config.invalid_argument" });
|
|
16
|
+
if (typeof raw === "function")
|
|
17
|
+
throw refuse("is a function (the answer alone): put it under `answer` and add `hold` / `release`");
|
|
18
|
+
if (typeof raw !== "object" || raw === null || types.isProxy(raw))
|
|
19
|
+
throw refuse(raw === null ? "is null" : typeof raw !== "object" ? `is a ${typeof raw}` : "is a Proxy");
|
|
20
|
+
const read = Object.create(null);
|
|
21
|
+
for (const name of PEER_SEAT_MEMBERS) {
|
|
22
|
+
let member;
|
|
23
|
+
try {
|
|
24
|
+
member = Reflect.get(raw, name);
|
|
25
|
+
}
|
|
26
|
+
catch {
|
|
27
|
+
throw refuse(`threw while its \`${name}\` was read`);
|
|
28
|
+
}
|
|
29
|
+
if (typeof member !== "function")
|
|
30
|
+
throw refuse(`has no \`${name}\` function`);
|
|
31
|
+
read[name] = member;
|
|
32
|
+
}
|
|
33
|
+
return Object.freeze({
|
|
34
|
+
answer: (question, signal) => Reflect.apply(read.answer, raw, [question, signal]),
|
|
35
|
+
hold: (ref) => Reflect.apply(read.hold, raw, [ref]),
|
|
36
|
+
release: (ref) => Reflect.apply(read.release, raw, [ref]),
|
|
37
|
+
});
|
|
38
|
+
}
|
|
8
39
|
export const PEER_ANSWER_LANES = Object.freeze({ http: "headers", a2a: "headers", stdio: "env" });
|
|
9
40
|
export const PEER_SEAT_WAIT_MS = 30_000;
|
|
41
|
+
export const AUTHORIZATION_URL_MAX = 2048;
|
|
42
|
+
export function authorizationUrlOf(raw) {
|
|
43
|
+
if (typeof raw !== "string" || /[\u0000-\u001f\u007f]/.test(raw))
|
|
44
|
+
return undefined;
|
|
45
|
+
let url;
|
|
46
|
+
try {
|
|
47
|
+
url = new URL(raw);
|
|
48
|
+
}
|
|
49
|
+
catch {
|
|
50
|
+
return undefined;
|
|
51
|
+
}
|
|
52
|
+
if ((url.protocol !== "https:" && url.protocol !== "http:") || url.username !== "" || url.password !== "")
|
|
53
|
+
return undefined;
|
|
54
|
+
const kept = url.origin + `${url.pathname}${url.search}${url.hash}`.replace(/[[\]()<>`"'{}|^\\]/g, (c) => `%${c.charCodeAt(0).toString(16).toUpperCase()}`);
|
|
55
|
+
return kept.length <= AUTHORIZATION_URL_MAX ? kept : undefined;
|
|
56
|
+
}
|
|
57
|
+
export function bearerChallengeParams(header) {
|
|
58
|
+
if (header === null)
|
|
59
|
+
return undefined;
|
|
60
|
+
const token = /[!#$%&'*+.^_`|~0-9A-Za-z-]+/y;
|
|
61
|
+
const readToken = (at) => ((token.lastIndex = at), token.exec(header)?.[0]);
|
|
62
|
+
let i = 0;
|
|
63
|
+
let scheme;
|
|
64
|
+
let params = new Map();
|
|
65
|
+
let bearer;
|
|
66
|
+
let bareScheme = false;
|
|
67
|
+
const space = () => void (i += /^[ \t]*/.exec(header.slice(i))[0].length);
|
|
68
|
+
while (i < header.length) {
|
|
69
|
+
space();
|
|
70
|
+
const name = readToken(i);
|
|
71
|
+
if (name === undefined) {
|
|
72
|
+
if (header[i] === ",")
|
|
73
|
+
bareScheme = false;
|
|
74
|
+
i++;
|
|
75
|
+
continue;
|
|
76
|
+
}
|
|
77
|
+
i += name.length;
|
|
78
|
+
space();
|
|
79
|
+
if (header[i] !== "=") {
|
|
80
|
+
if (bareScheme) {
|
|
81
|
+
bareScheme = false;
|
|
82
|
+
continue;
|
|
83
|
+
}
|
|
84
|
+
if (scheme?.toLowerCase() === "bearer")
|
|
85
|
+
bearer ??= params;
|
|
86
|
+
scheme = name;
|
|
87
|
+
params = new Map();
|
|
88
|
+
bareScheme = true;
|
|
89
|
+
continue;
|
|
90
|
+
}
|
|
91
|
+
bareScheme = false;
|
|
92
|
+
i++;
|
|
93
|
+
space();
|
|
94
|
+
let value = "";
|
|
95
|
+
if (header[i] === '"') {
|
|
96
|
+
for (i++; i < header.length && header[i] !== '"'; i++)
|
|
97
|
+
value += header[i] === "\\" ? (header[++i] ?? "") : header[i];
|
|
98
|
+
i++;
|
|
99
|
+
}
|
|
100
|
+
else {
|
|
101
|
+
value = readToken(i) ?? "";
|
|
102
|
+
i += value.length;
|
|
103
|
+
}
|
|
104
|
+
if (scheme !== undefined && !params.has(name.toLowerCase()))
|
|
105
|
+
params.set(name.toLowerCase(), value);
|
|
106
|
+
}
|
|
107
|
+
if (scheme?.toLowerCase() === "bearer")
|
|
108
|
+
bearer ??= params;
|
|
109
|
+
return bearer;
|
|
110
|
+
}
|
|
111
|
+
async function bodyHead(res, max) {
|
|
112
|
+
const reader = res.body?.getReader();
|
|
113
|
+
if (reader === undefined)
|
|
114
|
+
return undefined;
|
|
115
|
+
const decoder = new TextDecoder();
|
|
116
|
+
let text = "";
|
|
117
|
+
try {
|
|
118
|
+
while (text.length < max) {
|
|
119
|
+
const { done, value } = await reader.read();
|
|
120
|
+
if (done)
|
|
121
|
+
break;
|
|
122
|
+
text += decoder.decode(value, { stream: true });
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
catch {
|
|
126
|
+
}
|
|
127
|
+
finally {
|
|
128
|
+
void reader.cancel().catch(() => undefined);
|
|
129
|
+
}
|
|
130
|
+
return text.slice(0, max);
|
|
131
|
+
}
|
|
10
132
|
export class PeerSeatFailure extends Error {
|
|
11
133
|
reason;
|
|
12
134
|
authorizeUrl;
|
|
@@ -19,9 +141,37 @@ export class PeerSeatFailure extends Error {
|
|
|
19
141
|
this.code = extra?.code ?? (reason === "answer_invalid" ? "config.peer_answer_invalid" : undefined);
|
|
20
142
|
}
|
|
21
143
|
}
|
|
144
|
+
export class PeerAuthorizationRefused extends StreamableHTTPError {
|
|
145
|
+
reason;
|
|
146
|
+
resourceMetadataUrl;
|
|
147
|
+
authorizeUrl;
|
|
148
|
+
renewed;
|
|
149
|
+
constructor(reason, facts) {
|
|
150
|
+
const lead = reason === "rejected" ? "the endpoint refused the request's authorization (HTTP 401)" : "the endpoint refused the request for insufficient scope (HTTP 403)";
|
|
151
|
+
super(reason === "rejected" ? 401 : 403, facts.body !== undefined && facts.body !== "" ? `${lead}: ${facts.body}` : lead);
|
|
152
|
+
this.name = "PeerAuthorizationRefused";
|
|
153
|
+
this.reason = reason;
|
|
154
|
+
this.resourceMetadataUrl = facts.resourceMetadataUrl;
|
|
155
|
+
this.authorizeUrl = facts.authorizeUrl;
|
|
156
|
+
this.renewed = facts.renewed === true;
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
export const REFUSAL_BODY_MAX = 4096;
|
|
160
|
+
export function refusedThenRenewed(err) {
|
|
161
|
+
let at = err;
|
|
162
|
+
for (let depth = 0; depth < 6 && at instanceof Error; depth++) {
|
|
163
|
+
if (at instanceof PeerAuthorizationRefused)
|
|
164
|
+
return at.renewed;
|
|
165
|
+
at = at.cause;
|
|
166
|
+
}
|
|
167
|
+
return false;
|
|
168
|
+
}
|
|
22
169
|
const HEADER_NAME = /^[!#$%&'*+.^_`|~0-9A-Za-z-]+$/;
|
|
23
170
|
const ENV_NAME = /^[A-Za-z_][A-Za-z0-9_]*$/;
|
|
24
|
-
const
|
|
171
|
+
const VALUE_LAW = Object.freeze({
|
|
172
|
+
headers: Object.freeze({ refuses: /[^\t\x20-\x7e\x80-\xff]/, holds: "a character an HTTP header value cannot carry" }),
|
|
173
|
+
env: Object.freeze({ refuses: /[\r\n\0]|\p{Surrogate}/u, holds: "a line break, a NUL or a lone surrogate" }),
|
|
174
|
+
});
|
|
25
175
|
const ANSWER_MEMBERS = { carry: ["kind", "headers", "env", "expiresAt"], unauthorized: ["kind", "authorizeUrl"] };
|
|
26
176
|
const digestOf = (pieces) => {
|
|
27
177
|
const rows = (m) => Object.entries(m ?? {}).sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0));
|
|
@@ -29,18 +179,19 @@ const digestOf = (pieces) => {
|
|
|
29
179
|
};
|
|
30
180
|
const NO_PIECES = Object.freeze({ digest: digestOf({}) });
|
|
31
181
|
function nameValues(raw, member) {
|
|
32
|
-
|
|
182
|
+
const members = readOwnMembers(raw);
|
|
183
|
+
if (members === undefined)
|
|
33
184
|
return `its ${member} is not a record of names to strings`;
|
|
34
185
|
const out = Object.create(null);
|
|
35
186
|
const folded = new Set();
|
|
36
|
-
for (const name of Object.keys(
|
|
37
|
-
const value =
|
|
187
|
+
for (const name of Object.keys(members)) {
|
|
188
|
+
const value = members[name];
|
|
38
189
|
if (typeof value !== "string")
|
|
39
190
|
return `its ${member} member ${inlineUntrusted(JSON.stringify(name), 80)} is not a string`;
|
|
40
191
|
if (!(member === "headers" ? HEADER_NAME : ENV_NAME).test(name))
|
|
41
192
|
return `its ${member} name ${inlineUntrusted(JSON.stringify(name), 80)} is not a ${member === "headers" ? "header" : "variable"} name`;
|
|
42
|
-
if (
|
|
43
|
-
return `its ${member} member ${inlineUntrusted(JSON.stringify(name), 80)} holds
|
|
193
|
+
if (VALUE_LAW[member].refuses.test(value))
|
|
194
|
+
return `its ${member} member ${inlineUntrusted(JSON.stringify(name), 80)} holds ${VALUE_LAW[member].holds}`;
|
|
44
195
|
if (member === "headers") {
|
|
45
196
|
if (folded.has(name.toLowerCase()))
|
|
46
197
|
return `its headers name ${inlineUntrusted(JSON.stringify(name), 80)} twice (header names are case-insensitive)`;
|
|
@@ -55,27 +206,31 @@ export function readPeerAnswer(raw, lane) {
|
|
|
55
206
|
if (typeof raw !== "object" || raw === null || Array.isArray(raw))
|
|
56
207
|
return { problem: "answered something that is not an answer record" };
|
|
57
208
|
const record = raw;
|
|
58
|
-
const
|
|
209
|
+
const memberOf = (name) => (Object.hasOwn(record, name) ? record[name] : undefined);
|
|
210
|
+
const kind = memberOf("kind");
|
|
59
211
|
if (kind !== "carry" && kind !== "unauthorized")
|
|
60
212
|
return { problem: `answered the kind ${inlineUntrusted(JSON.stringify(kind) ?? String(kind), 80)}, which is neither "carry" nor "unauthorized"` };
|
|
61
213
|
const extra = Object.keys(record).find((key) => !ANSWER_MEMBERS[kind].includes(key));
|
|
62
214
|
if (extra !== undefined)
|
|
63
215
|
return { problem: `answered the member ${inlineUntrusted(JSON.stringify(extra), 80)}, which a "${kind}" answer does not have` };
|
|
64
216
|
if (kind === "unauthorized") {
|
|
65
|
-
const
|
|
66
|
-
if (
|
|
67
|
-
return {
|
|
68
|
-
|
|
217
|
+
const given = memberOf("authorizeUrl");
|
|
218
|
+
if (given === undefined)
|
|
219
|
+
return { unauthorized: {} };
|
|
220
|
+
const url = authorizationUrlOf(given);
|
|
221
|
+
if (url === undefined)
|
|
222
|
+
return { problem: `answered an authorizeUrl that is not an absolute http(s) URL without user-info, of at most ${AUTHORIZATION_URL_MAX} characters, without control characters` };
|
|
223
|
+
return { unauthorized: { authorizeUrl: url } };
|
|
69
224
|
}
|
|
70
225
|
const own = PEER_ANSWER_LANES[lane];
|
|
71
226
|
const other = own === "headers" ? "env" : "headers";
|
|
72
|
-
if (
|
|
227
|
+
if (memberOf(other) !== undefined)
|
|
73
228
|
return { problem: `answered ${other} for a ${lane} peer, which carries ${own} only` };
|
|
74
|
-
const expiresAt =
|
|
75
|
-
if (expiresAt !== undefined && (typeof expiresAt !== "number" || !Number.isFinite(expiresAt)))
|
|
76
|
-
return { problem: "answered an expiresAt that is not a finite epoch-millisecond number" };
|
|
77
|
-
const
|
|
78
|
-
const values =
|
|
229
|
+
const expiresAt = memberOf("expiresAt");
|
|
230
|
+
if (expiresAt !== undefined && (typeof expiresAt !== "number" || !Number.isFinite(expiresAt) || expiresAt < 0))
|
|
231
|
+
return { problem: "answered an expiresAt that is not a finite, non-negative epoch-millisecond number" };
|
|
232
|
+
const carried = memberOf(own);
|
|
233
|
+
const values = carried === undefined ? undefined : nameValues(carried, own);
|
|
79
234
|
if (typeof values === "string")
|
|
80
235
|
return { problem: `answered ${values}` };
|
|
81
236
|
const lanePieces = values === undefined ? {} : { [own]: values };
|
|
@@ -85,6 +240,86 @@ export function readPeerAnswer(raw, lane) {
|
|
|
85
240
|
return { problem: "answered a record whose members could not be read" };
|
|
86
241
|
}
|
|
87
242
|
}
|
|
243
|
+
function dataMember(holder, key) {
|
|
244
|
+
if (typeof holder !== "object" || holder === null || types.isProxy(holder))
|
|
245
|
+
return undefined;
|
|
246
|
+
const descriptor = Object.getOwnPropertyDescriptor(holder, key);
|
|
247
|
+
return descriptor !== undefined && Object.hasOwn(descriptor, "value") ? descriptor.value : undefined;
|
|
248
|
+
}
|
|
249
|
+
function declaredReferences(declared) {
|
|
250
|
+
const refs = [];
|
|
251
|
+
for (const [list, path] of [[dataMember(declared, "mcp"), CREDENTIALS_MEMBER.mcp], [dataMember(declared, "a2a"), CREDENTIALS_MEMBER.a2a]]) {
|
|
252
|
+
if (!Array.isArray(list) || types.isProxy(list))
|
|
253
|
+
continue;
|
|
254
|
+
const length = dataMember(list, "length");
|
|
255
|
+
for (let index = 0; typeof length === "number" && index < length; index++) {
|
|
256
|
+
let at = dataMember(list, String(index));
|
|
257
|
+
for (const key of path)
|
|
258
|
+
at = dataMember(at, key);
|
|
259
|
+
if (at === undefined || (typeof at === "object" && at !== null && types.isProxy(at)))
|
|
260
|
+
continue;
|
|
261
|
+
const read = readCredentialRef(at);
|
|
262
|
+
if (read.ok)
|
|
263
|
+
refs.push(read.ref);
|
|
264
|
+
}
|
|
265
|
+
}
|
|
266
|
+
return refs;
|
|
267
|
+
}
|
|
268
|
+
export function holdPeerDeclarations(seat, declared, onFault) {
|
|
269
|
+
let released = false;
|
|
270
|
+
const holds = [];
|
|
271
|
+
const fault = (member, ref) => onFault(new Error(`the deployment's peer seat threw from \`${member}\` for a "${ref.kind}" reference${member === "hold" ? " — the reference is not held" : ""}`));
|
|
272
|
+
const call = (member, ref) => {
|
|
273
|
+
let returned;
|
|
274
|
+
try {
|
|
275
|
+
returned = seat[member](ref);
|
|
276
|
+
}
|
|
277
|
+
catch {
|
|
278
|
+
fault(member, ref);
|
|
279
|
+
return false;
|
|
280
|
+
}
|
|
281
|
+
if (typeof returned?.then !== "function")
|
|
282
|
+
return true;
|
|
283
|
+
return Promise.resolve(returned).then(() => true, () => (fault(member, ref), false));
|
|
284
|
+
};
|
|
285
|
+
if (seat !== undefined) {
|
|
286
|
+
const seen = new Set();
|
|
287
|
+
for (const ref of declaredReferences(declared)) {
|
|
288
|
+
const key = canonicalize(ref);
|
|
289
|
+
if (seen.has(key))
|
|
290
|
+
continue;
|
|
291
|
+
seen.add(key);
|
|
292
|
+
const outcome = call("hold", ref);
|
|
293
|
+
if (outcome === false)
|
|
294
|
+
continue;
|
|
295
|
+
if (outcome === true) {
|
|
296
|
+
holds.push(() => void call("release", ref));
|
|
297
|
+
continue;
|
|
298
|
+
}
|
|
299
|
+
let releaseAsked = false;
|
|
300
|
+
let fulfilled = false;
|
|
301
|
+
void outcome.then((ok) => {
|
|
302
|
+
fulfilled = ok;
|
|
303
|
+
if (ok && releaseAsked)
|
|
304
|
+
void call("release", ref);
|
|
305
|
+
});
|
|
306
|
+
holds.push(() => {
|
|
307
|
+
releaseAsked = true;
|
|
308
|
+
if (fulfilled)
|
|
309
|
+
void call("release", ref);
|
|
310
|
+
});
|
|
311
|
+
}
|
|
312
|
+
}
|
|
313
|
+
return {
|
|
314
|
+
release() {
|
|
315
|
+
if (released)
|
|
316
|
+
return;
|
|
317
|
+
released = true;
|
|
318
|
+
for (const releaseOne of holds.splice(0))
|
|
319
|
+
releaseOne();
|
|
320
|
+
},
|
|
321
|
+
};
|
|
322
|
+
}
|
|
88
323
|
async function askBounded(seat, question, signal) {
|
|
89
324
|
signal?.throwIfAborted();
|
|
90
325
|
const wait = new AbortController();
|
|
@@ -94,7 +329,7 @@ async function askBounded(seat, question, signal) {
|
|
|
94
329
|
try {
|
|
95
330
|
const stopped = new Promise((_, reject) => stop.addEventListener("abort", () => reject(stop.reason), { once: true }));
|
|
96
331
|
stopped.catch(() => undefined);
|
|
97
|
-
return { answer: await Promise.race([seat(question, stop), stopped]) };
|
|
332
|
+
return { answer: await Promise.race([seat.answer(question, stop), stopped]) };
|
|
98
333
|
}
|
|
99
334
|
catch (err) {
|
|
100
335
|
if (signal?.aborted === true)
|
|
@@ -111,6 +346,7 @@ export class PeerCarrier {
|
|
|
111
346
|
principal;
|
|
112
347
|
lane;
|
|
113
348
|
sent = [];
|
|
349
|
+
credentials = [];
|
|
114
350
|
expiresAt;
|
|
115
351
|
renewed = false;
|
|
116
352
|
asked = false;
|
|
@@ -145,52 +381,80 @@ export class PeerCarrier {
|
|
|
145
381
|
.then((pieces) => {
|
|
146
382
|
this.waiting = pieces;
|
|
147
383
|
this.renewed = pieces.digest !== carried.digest;
|
|
148
|
-
|
|
384
|
+
return { renewed: this.renewed };
|
|
385
|
+
}, (err) => {
|
|
149
386
|
this.renewed = false;
|
|
387
|
+
return err instanceof PeerSeatFailure && err.reason === "unauthorized" && err.authorizeUrl !== undefined ? { renewed: false, authorizeUrl: err.authorizeUrl } : { renewed: false };
|
|
150
388
|
})
|
|
151
389
|
.finally(() => {
|
|
152
390
|
this.rejection = undefined;
|
|
153
391
|
});
|
|
154
|
-
|
|
392
|
+
return this.rejection;
|
|
155
393
|
}
|
|
156
394
|
expired(now = Date.now()) {
|
|
157
395
|
return this.expiresAt !== undefined && now >= this.expiresAt;
|
|
158
396
|
}
|
|
159
397
|
async ask(cause, signal, destination) {
|
|
160
|
-
|
|
398
|
+
const identity = this.identity;
|
|
399
|
+
if (this.seat === undefined || (identity.protocol === "mcp" && identity.transport === "host"))
|
|
161
400
|
return NO_PIECES;
|
|
162
|
-
const peer =
|
|
401
|
+
const peer = identity.protocol === "a2a" && destination !== undefined ? { ...identity, destination } : identity;
|
|
163
402
|
const asked = await askBounded(this.seat, { peer, ...(this.principal !== undefined ? { principal: this.principal } : {}), cause }, signal);
|
|
164
403
|
if ("failed" in asked)
|
|
165
404
|
throw new PeerSeatFailure(asked.failed, this.label, asked.failed === "timed_out" ? `did not answer within ${PEER_SEAT_WAIT_MS} ms` : "threw");
|
|
405
|
+
this.holdAnswered(asked.answer);
|
|
166
406
|
const read = readPeerAnswer(asked.answer, this.lane);
|
|
167
407
|
if ("problem" in read)
|
|
168
408
|
throw new PeerSeatFailure("answer_invalid", this.label, read.problem);
|
|
169
409
|
if ("unauthorized" in read)
|
|
170
410
|
throw new PeerSeatFailure("unauthorized", this.label, "answered that this principal is not authorized", read.unauthorized.authorizeUrl === undefined ? undefined : { authorizeUrl: read.unauthorized.authorizeUrl });
|
|
171
411
|
const pieces = read.carry;
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
holdOwnCredentialValues(held);
|
|
176
|
-
}
|
|
177
|
-
catch {
|
|
178
|
-
throw new PeerSeatFailure("answer_invalid", this.label, "answered an environment value that is the value of a variable every child on this host is handed");
|
|
179
|
-
}
|
|
180
|
-
for (const value of held)
|
|
412
|
+
this.holdAnswered(pieces);
|
|
413
|
+
for (const [name, value] of Object.entries(pieces.env ?? {}))
|
|
414
|
+
if (isSecretEnvKey(name, value))
|
|
181
415
|
this.remember(value);
|
|
182
|
-
}
|
|
183
416
|
if (this.lane === "stdio")
|
|
184
417
|
this.expiresAt = pieces.expiresAt;
|
|
185
418
|
for (const value of Object.values(pieces.headers ?? {}))
|
|
186
419
|
this.remember(value);
|
|
187
420
|
return pieces;
|
|
188
421
|
}
|
|
422
|
+
holdAnswered(answer) {
|
|
423
|
+
let refused;
|
|
424
|
+
for (const value of answeredCredentialValues(answer)) {
|
|
425
|
+
try {
|
|
426
|
+
holdOwnCredentialValues([value]);
|
|
427
|
+
}
|
|
428
|
+
catch (err) {
|
|
429
|
+
refused ??= err instanceof Error ? err.message : "the value of a variable every child on this host is handed";
|
|
430
|
+
}
|
|
431
|
+
if (namesASecret(value) && !this.credentials.includes(value))
|
|
432
|
+
this.credentials.push(value);
|
|
433
|
+
}
|
|
434
|
+
if (refused !== undefined)
|
|
435
|
+
throw new PeerSeatFailure("answer_invalid", this.label, `answered a credential value the engine cannot withhold (${inlineUntrusted(refused, 240)})`);
|
|
436
|
+
}
|
|
189
437
|
remember(value) {
|
|
190
438
|
if (value !== "" && !this.sent.includes(value))
|
|
191
439
|
this.sent.push(value);
|
|
192
440
|
}
|
|
193
441
|
}
|
|
442
|
+
function answeredCredentialValues(answer) {
|
|
443
|
+
const found = new Set();
|
|
444
|
+
const members = readOwnMembers(answer) ?? {};
|
|
445
|
+
for (const [name, value] of stringMembers(members["headers"])) {
|
|
446
|
+
for (const sent of new Set([value, httpTrimmed(value)]))
|
|
447
|
+
for (const credential of credentialHeaderValues({ [name]: sent }))
|
|
448
|
+
found.add(credential);
|
|
449
|
+
}
|
|
450
|
+
for (const [name, value] of stringMembers(members["env"]))
|
|
451
|
+
if (isSecretEnvKey(name, value))
|
|
452
|
+
found.add(value);
|
|
453
|
+
return [...found];
|
|
454
|
+
}
|
|
455
|
+
function stringMembers(record) {
|
|
456
|
+
return Object.entries(readOwnMembers(record) ?? {}).filter((entry) => typeof entry[1] === "string");
|
|
457
|
+
}
|
|
194
458
|
export function carriedHttpHeaders(protocol, carrier, pieces, principalHeader, principal) {
|
|
195
459
|
try {
|
|
196
460
|
return resolveProtocolHttpHeaders(protocol, { ...(pieces.headers !== undefined ? { headers: { ...pieces.headers } } : {}), ...(principalHeader !== undefined ? { principalHeader } : {}) }, principal);
|
|
@@ -212,9 +476,20 @@ export function peerFetch(carrier, principalHeader, principal) {
|
|
|
212
476
|
for (const [name, value] of Object.entries(own ?? {}))
|
|
213
477
|
headers.set(name, value);
|
|
214
478
|
const res = await fetch(url, { ...init, headers, redirect: "manual" });
|
|
215
|
-
if (res.status
|
|
216
|
-
|
|
217
|
-
|
|
479
|
+
if (res.status !== 401 && res.status !== 403)
|
|
480
|
+
return res;
|
|
481
|
+
const challenge = bearerChallengeParams(res.headers.get("www-authenticate"));
|
|
482
|
+
if (res.status === 403 && challenge?.get("error") !== "insufficient_scope")
|
|
483
|
+
return res;
|
|
484
|
+
const resourceMetadataUrl = authorizationUrlOf(challenge?.get("resource_metadata"));
|
|
485
|
+
const body = init?.method === "POST" ? await bodyHead(res, REFUSAL_BODY_MAX) : void (await res.body?.cancel().catch(() => undefined));
|
|
486
|
+
const reask = res.status === 401 ? await carrier.rejected(pieces, signal) : undefined;
|
|
487
|
+
throw new PeerAuthorizationRefused(res.status === 401 ? "rejected" : "scope", {
|
|
488
|
+
...(resourceMetadataUrl !== undefined ? { resourceMetadataUrl } : {}),
|
|
489
|
+
...(reask?.authorizeUrl !== undefined ? { authorizeUrl: reask.authorizeUrl } : {}),
|
|
490
|
+
renewed: reask?.renewed === true,
|
|
491
|
+
...(body !== undefined ? { body } : {}),
|
|
492
|
+
});
|
|
218
493
|
};
|
|
219
494
|
}
|
|
220
495
|
export const RETIRED_VALUE_MEMBERS = Object.freeze({ mcp: Object.freeze([Object.freeze(["transport", "headers"]), Object.freeze(["transport", "env"])]), a2a: Object.freeze([Object.freeze(["headers"])]) });
|
|
@@ -240,7 +515,7 @@ export function declaredCredentials(copy, at) {
|
|
|
240
515
|
if (read.ok)
|
|
241
516
|
return { ref: read.ref };
|
|
242
517
|
const p = read.problem;
|
|
243
|
-
return { problem: `${p.reason}${"kind" in p && p.kind !== undefined ? ` (kind ${
|
|
518
|
+
return { problem: `${p.reason}${"kind" in p && p.kind !== undefined ? ` (kind ${callerText(p.kind)})` : ""}${"field" in p ? ` at ${JSON.stringify(p.field)}` : ""}` };
|
|
244
519
|
}
|
|
245
520
|
export function peerSeatMissing(subject, credentials, seat) {
|
|
246
521
|
if (credentials === undefined || seat !== undefined)
|
|
@@ -249,8 +524,10 @@ export function peerSeatMissing(subject, credentials, seat) {
|
|
|
249
524
|
}
|
|
250
525
|
export function mcpPeerTarget(spec, kind) {
|
|
251
526
|
const t = spec.transport;
|
|
527
|
+
if (kind === "host")
|
|
528
|
+
return { protocol: "mcp", server: spec.name, transport: "host" };
|
|
252
529
|
const fingerprint = typeof spec.fingerprint === "string" ? { fingerprint: spec.fingerprint } : {};
|
|
253
|
-
const credentials = t.credentials !== undefined ? { credentials: t.credentials } : {};
|
|
530
|
+
const credentials = "credentials" in t && t.credentials !== undefined ? { credentials: t.credentials } : {};
|
|
254
531
|
if (kind === "stdio" && "command" in t)
|
|
255
532
|
return { protocol: "mcp", server: spec.name, transport: "stdio", command: t.command, args: [...(t.args ?? [])], ...credentials, ...fingerprint };
|
|
256
533
|
return { protocol: "mcp", server: spec.name, transport: "http", url: "url" in t ? t.url : "", ...credentials, ...fingerprint };
|
|
@@ -271,12 +548,12 @@ export class Reauthorized {
|
|
|
271
548
|
}
|
|
272
549
|
}
|
|
273
550
|
export async function sentOnceMore(attempt, mayResend) {
|
|
274
|
-
const first = await attempt();
|
|
551
|
+
const first = await attempt(false);
|
|
275
552
|
if (!(first instanceof Reauthorized))
|
|
276
553
|
return first;
|
|
277
554
|
if (!mayResend())
|
|
278
555
|
throw first.error;
|
|
279
|
-
const again = await attempt().catch((err) => {
|
|
556
|
+
const again = await attempt(true).catch((err) => {
|
|
280
557
|
const details = readMember(err, "details");
|
|
281
558
|
throw typeof details === "object" && details !== null && readMember(details, "delivered") === "no" ? first.error : err;
|
|
282
559
|
});
|
|
@@ -567,27 +567,6 @@ export interface ImportPreview {
|
|
|
567
567
|
rule: string;
|
|
568
568
|
reason: string;
|
|
569
569
|
}>;
|
|
570
|
-
/**
|
|
571
|
-
* ALWAYS EMPTY in this version — a compatibility seat (RL-1336-import-translated), kept on the wire shape so an existing reader
|
|
572
|
-
* keeps finding the key (removing a wire field would break readers for no gain).
|
|
573
|
-
*
|
|
574
|
-
* The seat once carried the entries whose MATCH FORM was rewritten on the way in (the space-star
|
|
575
|
-
* suggestion form of the other product translated to this lane's colon-star form, one row per
|
|
576
|
-
* translated candidate with its `scope`). That translation is retired: the space-star wildcard is
|
|
577
|
-
* now a first-class match form of this lane's own grammar, so an entry's match form imports as the
|
|
578
|
-
* file states it — `Bash(npm run *)` lands as `Bash(npm run *)`, never as a colon-star — and nothing
|
|
579
|
-
* is ever pushed here. What `candidates` carries is the grammar's CANONICAL re-projection of each
|
|
580
|
-
* entry (the parser folds spacing: `Bash(npm<TAB>run *)` lands as `Bash(npm run *)`); that is the
|
|
581
|
-
* ordinary normalization every rule text in this lane undergoes, the same one the store applies,
|
|
582
|
-
* and not a translation this seat reports. An entry whose star placement has no rule form is
|
|
583
|
-
* refused into `skipped` under `unsupported.wildcard`, named as the file writes it. A reader
|
|
584
|
-
* rendering a "rewritten spellings" column from this seat renders an empty column, correctly.
|
|
585
|
-
*/
|
|
586
|
-
translated: Array<{
|
|
587
|
-
from: string;
|
|
588
|
-
to: string;
|
|
589
|
-
scope: RuleScope;
|
|
590
|
-
}>;
|
|
591
570
|
layers: Array<{
|
|
592
571
|
path: string;
|
|
593
572
|
layer: ImportedSettingsLayer;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { randomBytes } from "node:crypto";
|
|
2
|
-
import { COMMAND_RULE_TOOL, cardRuleFormOf, escapeForDisclosure, hasUnrenderableCharacters, parseRuleText, ruleAdmitsCommand, ruleBreadthWarningsOf, segmentCoverageOf, suggestRuleForHost, suggestRuleForName, suggestRuleForTool, suggestRulesForCommand, EDITED_RULE_BREADTH_WARNING_CODES, RULE_OFFER_KINDS, UNCOVERED_SEGMENT_REASONS, RULE_BEHAVIORS, RULE_BEHAVIOR_PRECEDENCE, isRuleBehavior, } from "./permission-rule-model.js";
|
|
2
|
+
import { COMMAND_RULE_TOOL, cardRuleFormOf, escapeForDisclosure, foldSpacing, hasUnrenderableCharacters, parseRuleText, ruleAdmitsCommand, ruleBreadthWarningsOf, segmentCoverageOf, suggestRuleForHost, suggestRuleForName, suggestRuleForTool, suggestRulesForCommand, EDITED_RULE_BREADTH_WARNING_CODES, RULE_OFFER_KINDS, UNCOVERED_SEGMENT_REASONS, RULE_BEHAVIORS, RULE_BEHAVIOR_PRECEDENCE, isRuleBehavior, } from "./permission-rule-model.js";
|
|
3
3
|
import { readRuleOwner, sameRuleOwner } from "./rule-owner.js";
|
|
4
4
|
import { principalNameOf, readPrincipal } from "./principal-name.js";
|
|
5
5
|
import { isPlainRecord } from "./mods/kernel/receive.js";
|
|
@@ -535,12 +535,18 @@ export async function confirmRuleApproval(opts) {
|
|
|
535
535
|
return settled === chosen ? { ok: true } : no("selection_mismatch");
|
|
536
536
|
}
|
|
537
537
|
function normalizeEditedSpelling(text) {
|
|
538
|
-
const m = /^([A-Za-z][A-Za-z0-9_]*)\((.+)
|
|
538
|
+
const m = /^([A-Za-z][A-Za-z0-9_]*)\((.+)\)$/.exec(text);
|
|
539
539
|
if (m === null)
|
|
540
540
|
return text;
|
|
541
541
|
const head = m[1];
|
|
542
|
-
const
|
|
543
|
-
if (head === undefined ||
|
|
542
|
+
const content = m[2];
|
|
543
|
+
if (head === undefined || content === undefined)
|
|
544
|
+
return text;
|
|
545
|
+
const read = head === COMMAND_RULE_TOOL ? foldSpacing(content) : content;
|
|
546
|
+
if (read === undefined)
|
|
547
|
+
return text;
|
|
548
|
+
const body = /^(.+) \*$/.exec(read)?.[1];
|
|
549
|
+
if (body === undefined || body.includes("*"))
|
|
544
550
|
return text;
|
|
545
551
|
return `${head}(${body}:*)`;
|
|
546
552
|
}
|
|
@@ -782,7 +788,6 @@ export async function prepareCcImport(opts) {
|
|
|
782
788
|
const owner = resolveCallerOwner(opts.principal, opts.owner, "prepareCcImport");
|
|
783
789
|
const candidates = [];
|
|
784
790
|
const skipped = [];
|
|
785
|
-
const translated = [];
|
|
786
791
|
const layers = [];
|
|
787
792
|
for (const layer of opts.layers) {
|
|
788
793
|
let raw;
|
|
@@ -861,7 +866,7 @@ export async function prepareCcImport(opts) {
|
|
|
861
866
|
}
|
|
862
867
|
}
|
|
863
868
|
}
|
|
864
|
-
const preview = { candidates, skipped,
|
|
869
|
+
const preview = { candidates, skipped, layers, uncovered: { ...IMPORT_UNCOVERED_LAYERS } };
|
|
865
870
|
if (candidates.length === 0)
|
|
866
871
|
return { preview };
|
|
867
872
|
const record = {
|
|
@@ -628,6 +628,22 @@ export declare const SHELL_RESERVED_WORDS: ReadonlySet<string>;
|
|
|
628
628
|
* misled.
|
|
629
629
|
*/
|
|
630
630
|
export declare const SUGGESTION_LEXICON: readonly string[];
|
|
631
|
+
/**
|
|
632
|
+
* Collapse space/tab runs that are OUTSIDE quotes, and refuse a command whose quoting does not balance.
|
|
633
|
+
*
|
|
634
|
+
* A blanket fold is unsound here, and unsound in the direction that matters: an exact approval of
|
|
635
|
+
* `rm 'safe file'` would be stored as `rm 'safe file'` and would then admit a command naming a
|
|
636
|
+
* DIFFERENT path. An exact rule has exactly one job — to mean the action the person approved — so
|
|
637
|
+
* whitespace inside a quoted argument is data and is preserved verbatim.
|
|
638
|
+
*
|
|
639
|
+
* Unbalanced quoting yields `undefined`: the command's real argv is then not determinable from the text,
|
|
640
|
+
* and a rule lane that cannot determine what it is looking at does not match. It treats a backslash as text: a matched
|
|
641
|
+
* command has passed the simple-command floor (which rejects backslashes) before it is folded, and a rule text that holds
|
|
642
|
+
* one (a pattern's `\*` aside) is refused by that floor after its form is read.
|
|
643
|
+
*
|
|
644
|
+
* Exported so the card-edit face's spelling normalizer reads a command rule's content through THIS fold and no second one.
|
|
645
|
+
*/
|
|
646
|
+
export declare function foldSpacing(s: string): string | undefined;
|
|
631
647
|
/**
|
|
632
648
|
* THE spelling of a content rule on a call's tool under one behavior — its rule word and grammar with a placeholder for the
|
|
633
649
|
* content, never a rule minted for the call — or undefined: the tool takes no content rule (the catalog gives it no grammar,
|
|
@@ -1294,9 +1310,11 @@ export declare function adjudicatePersistedDomainRules(rules: readonly Persisted
|
|
|
1294
1310
|
* THE predicate of a whole-tool rule (`match: "tool"`) over one call: the rule reaches the call iff the call answers to the name it
|
|
1295
1311
|
* spells, under every name the call answers to (the model's spelling, the wire name, the aliases that resolve to it) — the
|
|
1296
1312
|
* reference's tool-wide matcher. Every reader of a rule with no content asks it: an entry list's whole-tool row and a person's stored
|
|
1297
|
-
* whole-tool row alike.
|
|
1313
|
+
* whole-tool row alike. A row of a list that RESTRICTS (`behavior` deny / ask) whose MCP name the lookup reads more than one way
|
|
1314
|
+
* ({@link peerReadingsOf}: `mcp__a__b` is tool `b` of server `a` and every tool of server `a__b`) reaches the call under any of its
|
|
1315
|
+
* readings; a granting row keeps the one name it spells — an ambiguous spelling never widens a grant.
|
|
1298
1316
|
*/
|
|
1299
|
-
export declare function wholeToolRuleReaches(tool: string, call: NamedCall): boolean;
|
|
1317
|
+
export declare function wholeToolRuleReaches(tool: string, call: NamedCall, behavior?: RuleBehavior): boolean;
|
|
1300
1318
|
/**
|
|
1301
1319
|
* The whole-tool sibling of {@link adjudicatePersistedRules}: the same precedence walk (deny > ask > allow) over the whole-tool rows
|
|
1302
1320
|
* (`match: "tool"`) that reach the call ({@link wholeToolRuleReaches}) and are eligible under their own tool ({@link eligiblePersisted},
|
|
@@ -3,8 +3,8 @@ import { shellWordsOf } from "../shell/shell-words.js";
|
|
|
3
3
|
import { lexShell } from "../shell/lex.js";
|
|
4
4
|
import { readProgramPosition } from "../tools/fs/bash-program-position.js";
|
|
5
5
|
import { isNameableToolName, parsePermissionRule, ruleSpellingOf } from "./permission-rule-syntax.js";
|
|
6
|
-
import {
|
|
7
|
-
import { toolNameFaultOf } from "./tool-name-aliases.js";
|
|
6
|
+
import { namesASetOfTools, ruleNameCovers } from "./namespaced-rule-name.js";
|
|
7
|
+
import { peerReadingsOf, readsNameGlob, toolNameFaultOf } from "./tool-name-aliases.js";
|
|
8
8
|
import { compileReadDeny } from "../tools/fs/read-deny.js";
|
|
9
9
|
import { carriesShellRedirection, parseLeadingCommandName, splitShellCompoundSegments } from "../tools/fs/bash-readonly-classifier.js";
|
|
10
10
|
import { INLINE_TRUNCATION_MARK, inlineUntrusted } from "./untrusted-text.js";
|
|
@@ -275,7 +275,7 @@ function longestReviewedBody(tokens) {
|
|
|
275
275
|
}
|
|
276
276
|
return best?.join(" ");
|
|
277
277
|
}
|
|
278
|
-
function foldSpacing(s) {
|
|
278
|
+
export function foldSpacing(s) {
|
|
279
279
|
let out = "";
|
|
280
280
|
let quote;
|
|
281
281
|
let pendingGap = false;
|
|
@@ -426,7 +426,7 @@ export function respelledRuleTextOf(text, behavior) {
|
|
|
426
426
|
return "rule" in read ? read.rule.rule : undefined;
|
|
427
427
|
}
|
|
428
428
|
function parseWholeToolRule(text, tool, behavior) {
|
|
429
|
-
if (!isNameableToolName(tool) ||
|
|
429
|
+
if (!isNameableToolName(tool) || namesASetOfTools(tool, behavior)) {
|
|
430
430
|
return reject("invalid.grammar", `"${text}" names a set of tools — a stored rule names one tool, or one tool's content; a set of tools is a list entry's form`);
|
|
431
431
|
}
|
|
432
432
|
const fault = toolNameFaultOf(tool, catalogToolNames(), behavior);
|
|
@@ -1458,13 +1458,14 @@ export function adjudicatePersistedDomainRules(rules, call) {
|
|
|
1458
1458
|
}
|
|
1459
1459
|
return undefined;
|
|
1460
1460
|
}
|
|
1461
|
-
export function wholeToolRuleReaches(tool, call) {
|
|
1462
|
-
|
|
1461
|
+
export function wholeToolRuleReaches(tool, call, behavior) {
|
|
1462
|
+
const readsOtherServers = readsNameGlob(behavior) && peerReadingsOf(tool).length > 0;
|
|
1463
|
+
return heldBy("policy.persistedToolRule", { has: (name) => name === tool || (readsOtherServers && ruleNameCovers(tool, name)) }, call);
|
|
1463
1464
|
}
|
|
1464
1465
|
export function adjudicatePersistedToolRules(rules, call) {
|
|
1465
1466
|
const at = { cwd: call.cwd, ...(call.sessionId !== undefined ? { sessionId: call.sessionId } : {}), ...(call.scopeIdentity !== undefined ? { scopeIdentity: call.scopeIdentity } : {}) };
|
|
1466
1467
|
for (const behavior of RULE_BEHAVIORS_BY_PRECEDENCE) {
|
|
1467
|
-
const row = rules.find((rule) => rule.match === "tool" && wholeToolRuleReaches(rule.tool, call.request) && eligiblePersisted(rule, { ...at, tool: rule.tool }, behavior));
|
|
1468
|
+
const row = rules.find((rule) => rule.match === "tool" && wholeToolRuleReaches(rule.tool, call.request, behavior) && eligiblePersisted(rule, { ...at, tool: rule.tool }, behavior));
|
|
1468
1469
|
if (row !== undefined)
|
|
1469
1470
|
return { behavior, rules: [row] };
|
|
1470
1471
|
}
|