@sema-agent/core 7.60.0 → 7.62.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 +917 -0
- package/README.md +2 -2
- package/dist/agents/agent-transcript-tool.d.ts +2 -2
- package/dist/agents/agent-transcript-tool.js +1 -1
- package/dist/agents/cascade.d.ts +71 -12
- package/dist/agents/cascade.js +61 -21
- package/dist/agents/composition-allowance.d.ts +53 -0
- package/dist/agents/composition-allowance.js +49 -0
- package/dist/agents/composition-placement.d.ts +29 -0
- package/dist/agents/composition-placement.js +24 -0
- package/dist/agents/cumulative-stats.d.ts +4 -0
- package/dist/agents/cumulative-stats.js +3 -0
- package/dist/agents/inherited-tool-pool.d.ts +5 -3
- package/dist/agents/inherited-tool-pool.js +2 -2
- package/dist/agents/list-agents-tool.d.ts +1 -1
- package/dist/agents/peer-held-queue.d.ts +27 -4
- package/dist/agents/peer-held-queue.js +81 -36
- package/dist/agents/peer-notice-route.d.ts +1 -1
- package/dist/agents/peer-notice-route.js +4 -3
- package/dist/agents/peer-notices.d.ts +4 -4
- package/dist/agents/peer-notices.js +8 -4
- package/dist/agents/peer-session-drain.d.ts +8 -1
- package/dist/agents/peer-session-drain.js +49 -10
- package/dist/agents/repair-loop.js +16 -6
- package/dist/agents/retain-ledger.js +3 -1
- package/dist/agents/roster-store.d.ts +1 -1
- package/dist/agents/roster-store.js +7 -4
- package/dist/agents/send-message-tool.d.ts +8 -10
- package/dist/agents/send-message-tool.js +43 -23
- package/dist/agents/subagent-completion-gate.d.ts +35 -0
- package/dist/agents/subagent-completion-gate.js +62 -0
- package/dist/agents/subagent-steps.d.ts +7 -6
- package/dist/agents/subagent.d.ts +36 -41
- package/dist/agents/subagent.js +245 -200
- package/dist/agents/suspend-guard.d.ts +47 -16
- package/dist/agents/suspend-guard.js +13 -4
- package/dist/agents/verify.d.ts +41 -14
- package/dist/agents/verify.js +41 -30
- package/dist/brain/anthropic.js +1 -0
- package/dist/brain/errors.d.ts +7 -1
- package/dist/brain/errors.js +6 -0
- package/dist/brain/failover.js +2 -1
- package/dist/brain/open-responses.js +1 -0
- package/dist/brain/openai.js +1 -0
- package/dist/brain/provider-dialect.d.ts +10 -0
- package/dist/brain/provider-dialect.js +13 -2
- package/dist/brain/stream-engine.d.ts +3 -0
- package/dist/brain/stream-engine.js +4 -0
- package/dist/core/agent-state.d.ts +1 -1
- package/dist/core/allow-entry.d.ts +59 -23
- package/dist/core/allow-entry.js +131 -38
- package/dist/core/ask-origin.d.ts +79 -0
- package/dist/core/ask-origin.js +76 -0
- package/dist/core/ask-question.d.ts +19 -13
- package/dist/core/ask-question.js +8 -2
- package/dist/core/auto-compaction.d.ts +2 -0
- package/dist/core/auto-compaction.js +2 -1
- package/dist/core/auto-mode.js +3 -5
- package/dist/core/background-agent-store.d.ts +7 -5
- package/dist/core/background-agent-store.js +12 -11
- package/dist/core/checkpoint-features.d.ts +722 -0
- package/dist/core/checkpoint-features.js +98 -0
- package/dist/core/checkpoint-requirements.d.ts +33 -5
- package/dist/core/checkpoint-requirements.js +18 -5
- package/dist/core/checkpoint-row-verdict.d.ts +99 -0
- package/dist/core/checkpoint-row-verdict.js +225 -0
- package/dist/core/checkpoint-store.d.ts +107 -738
- package/dist/core/checkpoint-store.js +45 -143
- package/dist/core/child-clamp-seats.d.ts +3 -2
- package/dist/core/child-clamp-seats.js +4 -3
- package/dist/core/closest-name.d.ts +13 -0
- package/dist/core/closest-name.js +35 -0
- package/dist/core/context-settings.js +3 -5
- package/dist/core/cross-boundary-taint.d.ts +1 -1
- package/dist/core/decision-receipt.d.ts +14 -1
- package/dist/core/decision-receipt.js +6 -3
- package/dist/core/delegation-frames.d.ts +13 -9
- package/dist/core/effective-path-target.js +2 -3
- package/dist/core/engine-attestation.d.ts +11 -1
- package/dist/core/engine-attestation.js +2 -0
- package/dist/core/engine-notice.d.ts +68 -21
- package/dist/core/engine-notice.js +9 -2
- package/dist/core/file-history-retention.d.ts +8 -0
- package/dist/core/file-history-retention.js +14 -11
- package/dist/core/file-history-store.d.ts +31 -1
- package/dist/core/file-history-store.js +31 -2
- package/dist/core/frame-settlement.d.ts +10 -0
- package/dist/core/frame-settlement.js +6 -1
- package/dist/core/fs-write-gate-policy.d.ts +3 -3
- package/dist/core/fs-write-gate-policy.js +8 -7
- package/dist/core/gate-fold.js +4 -3
- package/dist/core/gate-lanes.js +7 -4
- package/dist/core/gate-outcome.d.ts +40 -1
- package/dist/core/gate-outcome.js +10 -0
- package/dist/core/git-worktree-env.d.ts +7 -3
- package/dist/core/git-worktree-env.js +16 -13
- package/dist/core/governance-codes.d.ts +14 -4
- package/dist/core/governance-codes.js +19 -4
- package/dist/core/hooks.d.ts +25 -4
- package/dist/core/hooks.js +11 -4
- package/dist/core/host-floor.js +3 -5
- 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 +47 -7
- package/dist/core/image-admission.js +35 -4
- package/dist/core/input-author.d.ts +36 -0
- package/dist/core/input-author.js +39 -0
- package/dist/core/leg-identity.d.ts +62 -0
- package/dist/core/leg-identity.js +18 -0
- package/dist/core/locked-config.d.ts +4 -3
- package/dist/core/locked-config.js +5 -3
- package/dist/core/lsp.d.ts +5 -3
- package/dist/core/lsp.js +3 -2
- package/dist/core/mailbox-store.d.ts +85 -10
- package/dist/core/mailbox-store.js +31 -10
- package/dist/core/mcp-connection-pool.d.ts +6 -20
- package/dist/core/mcp-connection-pool.js +10 -28
- package/dist/core/mcp-failure.d.ts +76 -15
- package/dist/core/mcp-failure.js +60 -33
- package/dist/core/mcp-host-seat.d.ts +92 -53
- package/dist/core/mcp-host-seat.js +225 -46
- package/dist/core/mcp-probe.js +2 -2
- package/dist/core/mcp-server-link.d.ts +18 -6
- package/dist/core/mcp-server-link.js +19 -4
- package/dist/core/mcp-server-spec.d.ts +2 -1
- package/dist/core/mcp-session-end.d.ts +1 -2
- package/dist/core/mcp-session-end.js +1 -1
- package/dist/core/mcp.d.ts +6 -49
- package/dist/core/mcp.js +115 -111
- package/dist/core/media-byte-cap.d.ts +21 -46
- package/dist/core/media-byte-cap.js +55 -55
- package/dist/core/member-group.d.ts +7 -0
- package/dist/core/member-group.js +35 -0
- package/dist/core/memory-engine/consolidation-driver.d.ts +1 -1
- package/dist/core/memory-engine/consolidation.d.ts +1 -1
- package/dist/core/memory-engine/consolidation.js +7 -1
- package/dist/core/memory-engine/dual-root.d.ts +31 -0
- package/dist/core/memory-engine/dual-root.js +59 -11
- package/dist/core/memory-engine/engine.js +27 -24
- package/dist/core/memory-engine/file-backend.d.ts +13 -0
- package/dist/core/memory-engine/file-backend.js +35 -15
- package/dist/core/memory-engine/layout.d.ts +3 -0
- package/dist/core/memory-engine/layout.js +13 -3
- package/dist/core/memory-engine/memory-deployment.d.ts +110 -0
- package/dist/core/memory-engine/memory-deployment.js +182 -0
- package/dist/core/memory-engine/sync-client.d.ts +39 -18
- package/dist/core/memory-engine/sync-client.js +72 -14
- package/dist/core/memory-engine/sync-report.d.ts +7 -4
- package/dist/core/memory-engine/sync.d.ts +9 -1
- package/dist/core/memory-vector.d.ts +1 -1
- package/dist/core/memory.d.ts +10 -10
- package/dist/core/mode-policy.d.ts +8 -8
- package/dist/core/mode-policy.js +8 -6
- package/dist/core/mods/agent-stations.d.ts +39 -4
- package/dist/core/mods/agent-stations.js +59 -10
- package/dist/core/mods/classic-events.d.ts +9 -1
- package/dist/core/mods/dollar.d.ts +94 -1
- package/dist/core/mods/dollar.js +13 -1
- package/dist/core/mods/extension-call.d.ts +15 -1
- package/dist/core/mods/extension-call.js +7 -2
- package/dist/core/mods/kernel/dispatch.d.ts +4 -3
- package/dist/core/mods/kernel/dispatch.js +4 -4
- package/dist/core/mods/kernel/events.d.ts +14 -3
- package/dist/core/mods/kernel/events.js +18 -15
- package/dist/core/mods/kernel/registration.d.ts +3 -0
- package/dist/core/mods/kernel/registration.js +5 -0
- package/dist/core/mods/kernel/site-rules.d.ts +6 -3
- package/dist/core/mods/kernel/site-rules.js +10 -2
- package/dist/core/mods/lifecycle-stations.d.ts +36 -4
- package/dist/core/mods/lifecycle-stations.js +44 -9
- package/dist/core/mods/session-append.d.ts +118 -0
- package/dist/core/mods/session-append.js +318 -0
- package/dist/core/mods/session-compact.d.ts +48 -0
- package/dist/core/mods/session-compact.js +194 -0
- package/dist/core/mods/session-receive.d.ts +93 -0
- package/dist/core/mods/session-receive.js +138 -0
- package/dist/core/mods/session-send.d.ts +72 -0
- package/dist/core/mods/session-send.js +88 -0
- package/dist/core/mods/stations.d.ts +88 -21
- package/dist/core/mods/stations.js +149 -11
- package/dist/core/mods/tool-call.d.ts +2 -0
- package/dist/core/mods/tool-call.js +4 -4
- package/dist/core/output-style.js +3 -4
- package/dist/core/own-property-receipt.d.ts +68 -2
- package/dist/core/own-property-receipt.js +45 -2
- package/dist/core/park-selfcheck.js +4 -2
- package/dist/core/path-identity.d.ts +11 -0
- package/dist/core/path-identity.js +4 -0
- package/dist/core/path-rule-binding.d.ts +3 -1
- package/dist/core/path-rule-binding.js +3 -1
- package/dist/core/peer-seat.d.ts +3 -3
- package/dist/core/peer-seat.js +20 -8
- package/dist/core/permission-rule-consent.d.ts +21 -5
- package/dist/core/permission-rule-consent.js +21 -1
- package/dist/core/permission-rule-model.d.ts +34 -11
- package/dist/core/permission-rule-model.js +47 -10
- package/dist/core/permission-rule-org.d.ts +1 -1
- package/dist/core/permission-rule-provider.js +4 -1
- package/dist/core/permission-rules.d.ts +4 -0
- package/dist/core/permission-rules.js +11 -16
- package/dist/core/read-root-candidate.js +1 -1
- package/dist/core/remote-env.d.ts +74 -26
- package/dist/core/remote-env.js +20 -0
- package/dist/core/resume-startup-cause.d.ts +5 -4
- package/dist/core/retention-policy.d.ts +24 -23
- package/dist/core/retention-policy.js +36 -2
- package/dist/core/retention.d.ts +4 -1
- package/dist/core/retired-keys.d.ts +4 -4
- package/dist/core/row-admission.d.ts +10 -0
- package/dist/core/row-admission.js +5 -0
- package/dist/core/runner/advisor-instructions.d.ts +2 -1
- package/dist/core/runner/advisor-instructions.js +2 -1
- package/dist/core/runner/announce-once-ledger.d.ts +4 -4
- package/dist/core/runner/assemble-result.d.ts +13 -3
- package/dist/core/runner/assemble-result.js +12 -7
- package/dist/core/runner/caller-roster.d.ts +12 -9
- package/dist/core/runner/caller-roster.js +5 -2
- package/dist/core/runner/checkpoint-scope.d.ts +16 -1
- package/dist/core/runner/checkpoint-scope.js +21 -0
- package/dist/core/runner/compact-session.js +18 -3
- package/dist/core/runner/compaction-call-options.d.ts +1 -1
- package/dist/core/runner/compaction-restate.d.ts +2 -2
- package/dist/core/runner/compaction-restate.js +4 -3
- package/dist/core/runner/construction-doors.d.ts +2 -2
- package/dist/core/runner/construction-doors.js +2 -2
- package/dist/core/runner/contracts.d.ts +116 -34
- package/dist/core/runner/cross-boundary-lane.d.ts +1 -1
- package/dist/core/runner/decide-continuation.d.ts +4 -2
- package/dist/core/runner/decide-continuation.js +7 -4
- package/dist/core/runner/delegation-owner.d.ts +43 -0
- package/dist/core/runner/delegation-owner.js +59 -0
- package/dist/core/runner/denial-limit-arms.d.ts +15 -21
- package/dist/core/runner/denial-limit-arms.js +17 -10
- package/dist/core/runner/expire-settle.d.ts +44 -0
- package/dist/core/runner/expire-settle.js +55 -0
- package/dist/core/runner/git-status-frame.d.ts +3 -3
- package/dist/core/runner/git-status-frame.js +2 -1
- package/dist/core/runner/halt-attribution.d.ts +2 -1
- package/dist/core/runner/halt-attribution.js +2 -1
- package/dist/core/runner/lineage-reroot-view.d.ts +56 -0
- package/dist/core/runner/lineage-reroot-view.js +108 -0
- package/dist/core/runner/local-claims.d.ts +17 -0
- package/dist/core/runner/local-claims.js +18 -0
- package/dist/core/runner/media-removed-seat.d.ts +46 -0
- package/dist/core/runner/media-removed-seat.js +88 -0
- package/dist/core/runner/park-commit.d.ts +2 -2
- package/dist/core/runner/permission-rule-lanes.d.ts +7 -2
- package/dist/core/runner/permission-rule-lanes.js +28 -9
- package/dist/core/runner/person-path-rows.d.ts +15 -0
- package/dist/core/runner/person-path-rows.js +27 -4
- package/dist/core/runner/placement-fence.d.ts +26 -0
- package/dist/core/runner/placement-fence.js +38 -0
- package/dist/core/runner/prepare-acquire-reconcile.d.ts +4 -1
- package/dist/core/runner/prepare-acquire-reconcile.js +7 -2
- package/dist/core/runner/prepare-ask-lane.d.ts +6 -12
- package/dist/core/runner/prepare-ask-lane.js +4 -4
- package/dist/core/runner/prepare-boundary-parks.d.ts +4 -1
- package/dist/core/runner/prepare-boundary-parks.js +2 -2
- package/dist/core/runner/prepare-caps-and-workflow.d.ts +3 -0
- package/dist/core/runner/prepare-caps-and-workflow.js +2 -1
- package/dist/core/runner/prepare-config-doors.d.ts +6 -6
- package/dist/core/runner/prepare-config-doors.js +19 -21
- package/dist/core/runner/prepare-context-lane.d.ts +6 -2
- package/dist/core/runner/prepare-context-lane.js +13 -13
- package/dist/core/runner/prepare-delegation-surface.d.ts +9 -9
- package/dist/core/runner/prepare-delegation-surface.js +4 -5
- package/dist/core/runner/prepare-execution-env.d.ts +5 -2
- package/dist/core/runner/prepare-execution-env.js +7 -4
- package/dist/core/runner/prepare-gate-stations.d.ts +19 -14
- package/dist/core/runner/prepare-gate-stations.js +6 -4
- package/dist/core/runner/prepare-hands-readface.d.ts +6 -6
- package/dist/core/runner/prepare-hands-readface.js +32 -11
- package/dist/core/runner/prepare-inherited-gate.d.ts +8 -0
- package/dist/core/runner/prepare-inherited-gate.js +10 -3
- package/dist/core/runner/prepare-lsp.d.ts +3 -0
- package/dist/core/runner/prepare-lsp.js +2 -2
- package/dist/core/runner/prepare-park-ask.d.ts +5 -2
- package/dist/core/runner/prepare-park-ask.js +4 -5
- package/dist/core/runner/prepare-policy-chain.d.ts +10 -21
- package/dist/core/runner/prepare-policy-chain.js +16 -25
- package/dist/core/runner/prepare-project-context.d.ts +2 -2
- package/dist/core/runner/prepare-prompt-inputs.d.ts +5 -4
- package/dist/core/runner/prepare-prompt-inputs.js +3 -2
- package/dist/core/runner/prepare-question-face.d.ts +6 -4
- package/dist/core/runner/prepare-question-face.js +2 -2
- package/dist/core/runner/prepare-run-refs.d.ts +3 -0
- package/dist/core/runner/prepare-run-refs.js +2 -2
- package/dist/core/runner/prepare-suspend-saga.d.ts +11 -7
- package/dist/core/runner/prepare-suspend-saga.js +17 -7
- package/dist/core/runner/prepare-task.d.ts +1 -1
- package/dist/core/runner/prepare-task.js +61 -30
- package/dist/core/runner/prepare-tool-disclosure-mount.d.ts +6 -0
- package/dist/core/runner/prepare-tool-disclosure-mount.js +3 -1
- package/dist/core/runner/prepare-wiring-manifest.d.ts +3 -0
- package/dist/core/runner/prepare-wiring-manifest.js +2 -1
- package/dist/core/runner/prepare-workspace-restore.d.ts +5 -0
- package/dist/core/runner/prepare-workspace-restore.js +10 -6
- package/dist/core/runner/read-root-grant.d.ts +1 -1
- package/dist/core/runner/read-root-grant.js +2 -1
- package/dist/core/runner/resume-admission.d.ts +8 -6
- package/dist/core/runner/resume-admission.js +23 -6
- package/dist/core/runner/resume-apply.d.ts +4 -0
- package/dist/core/runner/resume-apply.js +14 -5
- package/dist/core/runner/resume-checkpoint-screen.d.ts +9 -0
- package/dist/core/runner/resume-checkpoint-screen.js +4 -84
- package/dist/core/runner/resume-claim.d.ts +8 -3
- package/dist/core/runner/resume-claim.js +28 -12
- package/dist/core/runner/resume-internals-and-config.d.ts +2 -2
- package/dist/core/runner/resume-internals-and-config.js +10 -1
- package/dist/core/runner/resume-preflight.d.ts +3 -2
- package/dist/core/runner/resume-preflight.js +13 -26
- package/dist/core/runner/retired-runner-deps.js +2 -0
- package/dist/core/runner/run-git-lane.d.ts +2 -0
- package/dist/core/runner/run-git-lane.js +6 -2
- package/dist/core/runner/run-harness-handlers.d.ts +2 -0
- package/dist/core/runner/run-harness-handlers.js +5 -4
- package/dist/core/runner/run-identity-wiring.d.ts +2 -2
- package/dist/core/runner/run-identity-wiring.js +14 -5
- package/dist/core/runner/run-leg.d.ts +3 -3
- package/dist/core/runner/run-leg.js +64 -36
- package/dist/core/runner/run-notification-lane.js +20 -2
- package/dist/core/runner/run-recovery-lanes.js +3 -2
- package/dist/core/runner/run-settle-and-teardown.js +12 -9
- package/dist/core/runner/run-stop-and-final-verify.js +2 -1
- package/dist/core/runner/run-telemetry-and-budget-seats.d.ts +1 -1
- package/dist/core/runner/run-terminal-adoption.d.ts +1 -1
- package/dist/core/runner/run-terminal-adoption.js +26 -17
- package/dist/core/runner/run-turn-boundary.js +34 -18
- package/dist/core/runner/runtask.d.ts +18 -3
- package/dist/core/runner/runtask.js +33 -17
- package/dist/core/runner/session-rule-policy.d.ts +1 -1
- package/dist/core/runner/session-rule-policy.js +6 -1
- package/dist/core/runner/shell-env-withheld.d.ts +1 -1
- package/dist/core/runner/steering-preview.d.ts +9 -0
- package/dist/core/runner/steering-preview.js +5 -0
- package/dist/core/runner/stream-halt-verbs.d.ts +1 -14
- package/dist/core/runner/stream-halt-verbs.js +4 -3
- package/dist/core/runner/stream-reap.d.ts +7 -6
- package/dist/core/runner/stream-reap.js +13 -16
- package/dist/core/runner/stream-settle-backstop.d.ts +3 -2
- package/dist/core/runner/stream-settle-backstop.js +5 -3
- package/dist/core/runner/stream-steer-verb.d.ts +5 -2
- package/dist/core/runner/stream-steer-verb.js +16 -7
- package/dist/core/runner/terminal-account.d.ts +11 -1
- package/dist/core/runner/terminal-account.js +20 -0
- package/dist/core/runner/terminal-projection.d.ts +8 -2
- package/dist/core/runner/terminal-projection.js +2 -2
- package/dist/core/runner/tool-disclosure.d.ts +3 -0
- package/dist/core/runner/tool-disclosure.js +5 -2
- package/dist/core/runner/tool-end-body.d.ts +3 -3
- package/dist/core/runner/tool-end-body.js +1 -1
- package/dist/core/runner/tool-face-overlay.js +2 -0
- package/dist/core/runner/tool-output-projection.d.ts +3 -3
- package/dist/core/runner/tool-output-projection.js +7 -6
- package/dist/core/runner/tool-table-view.d.ts +56 -0
- package/dist/core/runner/tool-table-view.js +51 -0
- package/dist/core/runner/turn-attachments.d.ts +8 -2
- package/dist/core/runner/turn-attachments.js +2 -2
- package/dist/core/runner/void-verifier-pause.d.ts +33 -0
- package/dist/core/runner/void-verifier-pause.js +41 -0
- package/dist/core/runner-deps.d.ts +26 -27
- package/dist/core/secret-env.d.ts +19 -16
- package/dist/core/secret-env.js +45 -27
- package/dist/core/session-log-transfer.js +9 -10
- package/dist/core/session-policy-store.d.ts +1 -1
- package/dist/core/session-policy-store.js +5 -2
- package/dist/core/session-reconcile.d.ts +3 -2
- package/dist/core/session-reconcile.js +7 -4
- package/dist/core/session-store.d.ts +3 -1
- package/dist/core/session-store.js +10 -8
- package/dist/core/session.d.ts +16 -5
- package/dist/core/shell-confinement.d.ts +37 -0
- package/dist/core/shell-confinement.js +56 -0
- package/dist/core/skill-grant.js +1 -1
- package/dist/core/store-contracts/checkpoint-store-contract.d.ts +8 -2
- package/dist/core/store-contracts/checkpoint-store-contract.js +83 -2
- package/dist/core/store-contracts/file-history-store-contract.d.ts +5 -2
- package/dist/core/store-contracts/file-history-store-contract.js +25 -1
- package/dist/core/store-contracts/mailbox-store-contract.d.ts +12 -5
- package/dist/core/store-contracts/mailbox-store-contract.js +156 -9
- package/dist/core/store-contracts/session-store-contract.js +22 -8
- package/dist/core/store-contracts/tool-result-store-contract.d.ts +1 -1
- package/dist/core/store-contracts/tool-result-store-contract.js +30 -0
- package/dist/core/task-event.d.ts +24 -9
- package/dist/core/task-limits.d.ts +5 -0
- package/dist/core/task-notification.d.ts +89 -12
- package/dist/core/task-notification.js +89 -14
- package/dist/core/task-registry-agent.d.ts +32 -50
- package/dist/core/task-registry-agent.js +36 -56
- package/dist/core/task-registry-monitor.d.ts +1 -1
- package/dist/core/task-registry-monitor.js +15 -60
- package/dist/core/task-registry-shared.d.ts +22 -112
- package/dist/core/task-registry-shared.js +3 -41
- package/dist/core/task-registry-workflow.js +5 -21
- package/dist/core/task-registry.d.ts +32 -62
- package/dist/core/task-registry.js +30 -110
- package/dist/core/task-result.d.ts +29 -12
- package/dist/core/task-spec-members.d.ts +39 -0
- package/dist/core/task-spec-members.js +92 -0
- package/dist/core/task-spec.d.ts +11 -11
- package/dist/core/task-tool-shape.d.ts +7 -57
- package/dist/core/task-tool-shape.js +7 -66
- package/dist/core/terminal-cause.d.ts +36 -6
- package/dist/core/terminal-cause.js +1 -0
- package/dist/core/tool-catalog-entries.js +2 -5
- package/dist/core/tool-check-reading.js +16 -10
- package/dist/core/tool-conformance.js +1 -2
- package/dist/core/tool-errors.d.ts +6 -3
- package/dist/core/tool-errors.js +2 -0
- package/dist/core/tool-face-reader.js +3 -2
- package/dist/core/tool-face.d.ts +8 -5
- package/dist/core/tool-face.js +1 -1
- package/dist/core/tool-name-aliases.d.ts +5 -29
- package/dist/core/tool-name-aliases.js +9 -5
- package/dist/core/tool-name-readings.d.ts +14 -3
- package/dist/core/tool-name-readings.js +2 -0
- package/dist/core/tool-policy.d.ts +109 -18
- package/dist/core/tool-policy.js +84 -14
- package/dist/core/tool-result-store.d.ts +23 -0
- package/dist/core/tool-result-store.js +3 -2
- package/dist/core/tool-roster.d.ts +4 -4
- package/dist/core/tool-spec.d.ts +23 -6
- package/dist/core/trace.d.ts +18 -1
- package/dist/core/types.d.ts +1 -1
- package/dist/core/types.js +1 -1
- package/dist/core/user-attachment.js +26 -21
- package/dist/core/workflow-journal-store.d.ts +1 -1
- package/dist/core/workflow-run-store.d.ts +2 -0
- package/dist/core/workflow-run-store.js +6 -5
- package/dist/core/workflow-settled-run.d.ts +5 -0
- package/dist/core/workflow-settled-run.js +7 -0
- package/dist/engine/execution-env/node-execution-env.d.ts +37 -9
- package/dist/engine/execution-env/node-execution-env.js +221 -22
- package/dist/engine/harness/agent-harness.d.ts +65 -18
- package/dist/engine/harness/agent-harness.js +90 -23
- package/dist/engine/harness/messages.d.ts +4 -3
- package/dist/engine/harness/messages.js +2 -2
- package/dist/engine/harness/types.d.ts +52 -7
- package/dist/engine/llm/media-removed.d.ts +14 -0
- package/dist/engine/llm/media-removed.js +9 -0
- package/dist/engine/llm/rejected-images.d.ts +35 -25
- package/dist/engine/llm/rejected-images.js +59 -10
- package/dist/engine/llm/types.d.ts +24 -3
- package/dist/engine/llm/types.js +7 -3
- package/dist/engine/loop/agent-loop.d.ts +6 -1
- package/dist/engine/loop/agent-loop.js +20 -11
- package/dist/engine/loop/types.d.ts +12 -3
- package/dist/engine/session/import-validate.js +7 -0
- package/dist/engine/session/parent-chain-guard.d.ts +3 -3
- package/dist/engine/session/parent-chain-guard.js +1 -1
- package/dist/engine/session/path-to-root.d.ts +18 -3
- package/dist/engine/session/path-to-root.js +15 -1
- package/dist/engine/session/repo-utils.d.ts +12 -1
- package/dist/engine/session/repo-utils.js +41 -0
- package/dist/engine/session/session.js +1 -1
- package/dist/engine/session/storage-base.d.ts +20 -0
- package/dist/engine/session/storage-base.js +28 -9
- package/dist/fixtures/index.d.ts +7 -5
- package/dist/fixtures/index.js +5 -3
- package/dist/index.d.ts +29 -18
- package/dist/index.js +19 -11
- package/dist/internal/harness-types.d.ts +2 -0
- package/dist/internal/harness.d.ts +4 -3
- package/dist/internal/harness.js +3 -2
- package/dist/internal/llm.d.ts +2 -1
- package/dist/internal/llm.js +1 -0
- package/dist/orchestration/goal.d.ts +6 -2
- package/dist/orchestration/goal.js +6 -3
- package/dist/orchestration/run-workflow-tool.d.ts +14 -17
- package/dist/orchestration/run-workflow-tool.js +43 -50
- package/dist/orchestration/workflow-types.d.ts +2 -2
- package/dist/orchestration/workflow.d.ts +7 -0
- package/dist/orchestration/workflow.js +10 -12
- package/dist/stores/file/background-agent-store.js +18 -15
- package/dist/stores/file/checkpoint-store.d.ts +2 -0
- package/dist/stores/file/checkpoint-store.js +13 -9
- package/dist/stores/file/file-history-store.js +3 -2
- package/dist/stores/file/fs-atomic.d.ts +0 -22
- package/dist/stores/file/fs-atomic.js +0 -17
- package/dist/stores/file/index.d.ts +7 -12
- package/dist/stores/file/index.js +25 -12
- package/dist/stores/file/ledger-tuning.d.ts +23 -0
- package/dist/stores/file/ledger-tuning.js +21 -0
- package/dist/stores/file/mailbox-store.js +42 -22
- package/dist/stores/file/memory-store.js +3 -2
- package/dist/stores/file/permission-rule-adopt.js +24 -21
- package/dist/stores/file/permission-rule-store.js +6 -3
- package/dist/stores/file/session-policy-store.js +3 -2
- package/dist/stores/file/session-store.d.ts +26 -7
- package/dist/stores/file/session-store.js +59 -35
- package/dist/stores/file/tool-result-store.d.ts +11 -0
- package/dist/stores/file/tool-result-store.js +57 -3
- package/dist/stores/file/usage-window-store.js +3 -2
- package/dist/stores/file/workflow-journal-store.d.ts +0 -2
- package/dist/stores/file/workflow-journal-store.js +3 -18
- package/dist/stores/file/workflow-run-store.d.ts +1 -1
- package/dist/stores/file/workflow-run-store.js +15 -10
- package/dist/tools/fs/bash-program-position.d.ts +3 -2
- package/dist/tools/fs/bash-program-position.js +7 -7
- package/dist/tools/fs/dead-cwd.d.ts +5 -5
- package/dist/tools/fs/dead-cwd.js +4 -11
- package/dist/tools/fs/fs-bash-background-text.d.ts +6 -0
- package/dist/tools/fs/fs-bash-background-text.js +6 -0
- package/dist/tools/fs/fs-bash.d.ts +3 -18
- package/dist/tools/fs/fs-bash.js +37 -124
- package/dist/tools/fs/fs-pdf.js +8 -6
- package/dist/tools/fs/fs-read.js +2 -2
- package/dist/tools/fs/fs-shared.d.ts +28 -3
- package/dist/tools/fs/fs-shared.js +15 -0
- package/dist/tools/fs/index.d.ts +1 -1
- package/dist/tools/fs/index.js +4 -14
- package/dist/tools/fs/pdf.d.ts +4 -4
- package/dist/tools/fs/pdf.js +6 -6
- package/dist/tools/fs/read-deny-home.js +8 -1
- package/dist/tools/fs/read-deny.d.ts +26 -2
- package/dist/tools/fs/read-deny.js +9 -2
- package/dist/tools/fs/read-floor.d.ts +13 -5
- package/dist/tools/fs/read-floor.js +206 -2
- package/dist/tools/fs/removal-targets.js +2 -2
- package/dist/tools/fs/search.d.ts +3 -2
- package/dist/tools/fs/search.js +6 -6
- package/dist/tools/fs/shell-read-argv.d.ts +4 -2
- package/dist/tools/fs/shell-read-argv.js +14 -3
- package/dist/tools/fs/shell-read-bindings.d.ts +18 -2
- package/dist/tools/fs/shell-read-bindings.js +148 -68
- package/dist/tools/fs/shell-read-check.js +20 -4
- package/dist/tools/fs/shell-read-establish.js +25 -9
- package/dist/tools/fs/shell-read-functions.js +2 -2
- package/dist/tools/fs/shell-read-identity.d.ts +3 -1
- package/dist/tools/fs/shell-read-identity.js +4 -2
- package/dist/tools/fs/shell-read-judge.d.ts +7 -1
- package/dist/tools/fs/shell-read-judge.js +1 -1
- package/dist/tools/fs/shell-read-object-path.d.ts +59 -0
- package/dist/tools/fs/shell-read-object-path.js +119 -0
- package/dist/tools/fs/shell-read-plan.d.ts +8 -0
- package/dist/tools/fs/shell-read-plan.js +47 -30
- package/dist/tools/fs/shell-read-start.d.ts +66 -13
- package/dist/tools/fs/shell-read-start.js +89 -17
- package/dist/tools/fs/shell-read-workdir.d.ts +29 -8
- package/dist/tools/fs/shell-read-workdir.js +31 -8
- package/dist/tools/monitor.d.ts +8 -7
- package/dist/tools/monitor.js +12 -10
- package/dist/tools/worktree.d.ts +5 -1
- package/dist/tools/worktree.js +20 -17
- package/package.json +6 -3
- package/test/export-surface.snapshot.json +112 -42
- package/wire-changes/core-stores-sql@7.61.0.json +480 -0
- package/wire-changes/core-stores-sql@7.62.0.json +30 -0
- package/wire-changes/core@7.61.0.json +4405 -0
- package/wire-changes/core@7.62.0.json +2181 -0
- package/wire-changes/mods-kernel@7.61.0.json +65 -0
- package/wire-changes/mods-kernel@7.62.0.json +42 -0
- package/wire-changes/primitives@7.61.0.json +30 -0
- package/wire-changes/primitives@7.62.0.json +30 -0
- package/dist/core/consolidate-scope.d.ts +0 -93
- package/dist/core/consolidate-scope.js +0 -98
- package/dist/core/runner/image-removed-seat.d.ts +0 -12
- package/dist/core/runner/image-removed-seat.js +0 -19
- package/dist/core/runner/memory-consolidation.d.ts +0 -109
- package/dist/core/runner/memory-consolidation.js +0 -251
package/dist/tools/fs/search.js
CHANGED
|
@@ -1022,11 +1022,11 @@ export async function jsGrep(env, root, p, signal, guards, deny, denyOut) {
|
|
|
1022
1022
|
return (await jsGrepDetailed(env, root, p, signal, guards, deny, denyOut)).text;
|
|
1023
1023
|
}
|
|
1024
1024
|
const rgCache = new WeakMap();
|
|
1025
|
-
export function detectRipgrep(env) {
|
|
1025
|
+
export function detectRipgrep(env, readFloor) {
|
|
1026
1026
|
let cached = rgCache.get(env);
|
|
1027
1027
|
if (!cached) {
|
|
1028
1028
|
cached = env
|
|
1029
|
-
.exec("rg --version", { timeout: 10 })
|
|
1029
|
+
.exec("rg --version", { timeout: 10, ...(readFloor !== undefined ? { readFloor } : {}) })
|
|
1030
1030
|
.then((r) => r.ok && r.value.exitCode === 0)
|
|
1031
1031
|
.catch(() => false);
|
|
1032
1032
|
rgCache.set(env, cached);
|
|
@@ -1244,7 +1244,7 @@ export async function rgGrepDetailed(env, root, p, signal, deny, readFloor) {
|
|
|
1244
1244
|
if (info.ok && info.value.kind === "file")
|
|
1245
1245
|
return { note: "" };
|
|
1246
1246
|
}
|
|
1247
|
-
const withheld = await rgDenyExistenceProbe(env, root, deny, target, signal);
|
|
1247
|
+
const withheld = await rgDenyExistenceProbe(env, root, deny, target, signal, readFloor);
|
|
1248
1248
|
if (withheld === undefined)
|
|
1249
1249
|
return { note: "" };
|
|
1250
1250
|
const note = withheld.kind === "existence"
|
|
@@ -1284,14 +1284,14 @@ export async function rgGrepDetailed(env, root, p, signal, deny, readFloor) {
|
|
|
1284
1284
|
const formatted = formatRgRecords(ordered, p);
|
|
1285
1285
|
return { text: formatted.text + d.note, rows: formatted.served, ...(d.withheld !== undefined ? { withheld: d.withheld } : {}) };
|
|
1286
1286
|
}
|
|
1287
|
-
async function rgDenyExistenceProbe(env, root, deny, target, signal) {
|
|
1287
|
+
async function rgDenyExistenceProbe(env, root, deny, target, signal, readFloor) {
|
|
1288
1288
|
const probeFlags = ["--files", "--hidden", "--no-require-git", "--no-messages"];
|
|
1289
1289
|
for (const d of VCS_DIRS)
|
|
1290
1290
|
probeFlags.push("--glob", `!${d}`);
|
|
1291
1291
|
for (const g of deny.rgProbeGlobs)
|
|
1292
1292
|
probeFlags.push(g.flag, shellQuote(g.glob));
|
|
1293
1293
|
try {
|
|
1294
|
-
const res = await env.exec(`( rg ${probeFlags.join(" ")} -- ${target}; echo "__RG_PROBE_EXIT_$?" 1>&2 ) | head -n 1`, { cwd: root, timeout: 10, abortSignal: signal });
|
|
1294
|
+
const res = await env.exec(`( rg ${probeFlags.join(" ")} -- ${target}; echo "__RG_PROBE_EXIT_$?" 1>&2 ) | head -n 1`, { cwd: root, timeout: 10, abortSignal: signal, ...(readFloor !== undefined ? { readFloor } : {}) });
|
|
1295
1295
|
if (!res.ok)
|
|
1296
1296
|
return { kind: "probe_failed" };
|
|
1297
1297
|
const first = res.value.stdout.split("\n").find((l) => l.trim().length > 0);
|
|
@@ -1325,7 +1325,7 @@ export async function runGrepDetailed(env, root, p, signal, deny, readFloor) {
|
|
|
1325
1325
|
return false;
|
|
1326
1326
|
return deny.unexcludableUnder(scope) || (home.view !== undefined && deny.unexcludableUnder(home.view));
|
|
1327
1327
|
};
|
|
1328
|
-
if (!(await unexcludableUnder()) && (await detectRipgrep(env)))
|
|
1328
|
+
if (!(await unexcludableUnder()) && (await detectRipgrep(env, readFloor)))
|
|
1329
1329
|
return rgGrepDetailed(env, root, p, signal, deny, readFloor);
|
|
1330
1330
|
const denyOut = {};
|
|
1331
1331
|
const { text, rows } = await jsGrepDetailed(env, root, p, signal, undefined, deny, denyOut);
|
|
@@ -10,10 +10,12 @@ import { type Read } from "./shell-read-word.js";
|
|
|
10
10
|
import { type BindingTable, type FloorValue } from "./shell-read-bindings.js";
|
|
11
11
|
import { subcommandOf, type ArgRole, type ProgramRow } from "./program-read-model.js";
|
|
12
12
|
import type { ReadCandidate, ReadCandidateProvenance } from "./shell-read-plan.js";
|
|
13
|
+
import { type ObjectPathRepository } from "./shell-read-object-path.js";
|
|
13
14
|
/** A candidate before the threading fills its bases. `floors`: the spellings its word's names left for the deny judge
|
|
14
|
-
* alone (a word whose names are unknown here). */
|
|
15
|
+
* alone (a word whose names are unknown here); `repository`: an object path's, what the program's options say of it. */
|
|
15
16
|
export type Bare = Omit<ReadCandidate, "bases"> & {
|
|
16
17
|
readonly floors?: readonly FloorValue[];
|
|
18
|
+
readonly repository?: ObjectPathRepository;
|
|
17
19
|
};
|
|
18
20
|
/** What reading a segment's words found beside its candidates. */
|
|
19
21
|
export interface WordContext {
|
|
@@ -61,7 +63,7 @@ export declare function roleReads(r: Read, provenance: ReadCandidateProvenance,
|
|
|
61
63
|
* NAME makes it the whole value, so it is a candidate too. A value that is a substitution is the nested plan
|
|
62
64
|
* its body already is, never a candidate of its own text (its placeholder is not a path).
|
|
63
65
|
*/
|
|
64
|
-
export declare function pushAssignment(reads: Bare[], w: LexedWord, provenance: ReadCandidateProvenance): void;
|
|
66
|
+
export declare function pushAssignment(reads: Bare[], w: LexedWord, provenance: ReadCandidateProvenance, bound?: boolean): void;
|
|
65
67
|
/** Every word of a segment whose program's grammar this parser does not model, from `from` onward: option
|
|
66
68
|
* payloads and path-shaped option words included, the launcher chain's own words excluded, a program declared
|
|
67
69
|
* to open no path operand handing only the environment words in front of it. A program with NO row is read the
|
|
@@ -1,8 +1,15 @@
|
|
|
1
1
|
import { literalTildeSpelling } from "../../shell/lex.js";
|
|
2
2
|
import { expandsOf, partPattern, readOfText, rewritten } from "./shell-read-word.js";
|
|
3
|
-
import { arithmeticSubstitutions } from "./shell-read-bindings.js";
|
|
3
|
+
import { arithmeticSubstitutions, bindsArrayElement } from "./shell-read-bindings.js";
|
|
4
4
|
import { argvProgramOf, attachedOptionPayloads, isPathShapedToken } from "./bash-readonly-classifier.js";
|
|
5
5
|
import { assignmentArgumentsAreNotPaths, deliversOperands, evaluatesOperands, messageWords, moduleTailOf, objectPathsOf, opensNoOperand, programRow, programTextMayOpen, programTextOpensOf, readArgs, readOptionSlot, selectsContentsTraversal, slotValueCandidates, subcommandOf, valuesAreLiteral, walksCwdWithoutOperand, wordsReadBySomeImplementations, } from "./program-read-model.js";
|
|
6
|
+
import { objectPathRepositoryOf } from "./shell-read-object-path.js";
|
|
7
|
+
function inRepository(reads, from, row, globals) {
|
|
8
|
+
let repository;
|
|
9
|
+
for (let i = from; i < reads.length; i++)
|
|
10
|
+
if (reads[i].provenance === "object_path")
|
|
11
|
+
reads[i] = { ...reads[i], repository: (repository ??= objectPathRepositoryOf(row, globals)) };
|
|
12
|
+
}
|
|
6
13
|
export function pathSubcommandOf(row, args) {
|
|
7
14
|
const sub = subcommandOf(row, args);
|
|
8
15
|
return sub !== undefined && (sub.row.operands !== undefined || sub.row.traversal !== undefined) ? sub : undefined;
|
|
@@ -162,9 +169,9 @@ function programTextReads(r, provenance, text, language, ctx) {
|
|
|
162
169
|
ctx.programText ??= programTextSentence(language);
|
|
163
170
|
return [{ ...bare(r, provenance, text), denyOnly: true }];
|
|
164
171
|
}
|
|
165
|
-
export function pushAssignment(reads, w, provenance) {
|
|
172
|
+
export function pushAssignment(reads, w, provenance, bound = false) {
|
|
166
173
|
const a = w.assignment;
|
|
167
|
-
if (a === undefined || a.form === "compound")
|
|
174
|
+
if (a === undefined || a.form === "compound" || (bound && bindsArrayElement(a)))
|
|
168
175
|
return;
|
|
169
176
|
const expandsTilde = a.value.expansions.some((p) => p.expansion?.kind === "tilde");
|
|
170
177
|
const value = expandsTilde ? a.value.folded : literalTildeSpelling(a.value.folded);
|
|
@@ -300,7 +307,9 @@ export function unlistedWords(reads, toks, from, launcherIndices, provenance, ct
|
|
|
300
307
|
gathered.restart();
|
|
301
308
|
base = new OperandBase();
|
|
302
309
|
unsettledAt.length = 0;
|
|
310
|
+
const subFrom = reads.length;
|
|
303
311
|
walk(sub.row, walkFrom, toks.length, true);
|
|
312
|
+
inRepository(reads, subFrom, slotRow, toks.slice(argvStart + 1, argvStart + 1 + sub.at));
|
|
304
313
|
}
|
|
305
314
|
else
|
|
306
315
|
walk(slotRow, argvStart + 1, toks.length, "program-text");
|
|
@@ -413,7 +422,9 @@ export function listedVerbCandidates(name, argReads, reads, ctx) {
|
|
|
413
422
|
const tail = moduleTailOf(row, args);
|
|
414
423
|
if (sub !== undefined) {
|
|
415
424
|
walkListed(row, argReads, 0, sub.at, expanding, reads, ctx, false);
|
|
425
|
+
const from = reads.length;
|
|
416
426
|
walkListed(sub.row, argReads, sub.at + 1, argReads.length, expanding, reads, ctx, sub.relocated);
|
|
427
|
+
inRepository(reads, from, row, argReads.slice(0, sub.at));
|
|
417
428
|
}
|
|
418
429
|
else
|
|
419
430
|
walkListed(row, argReads, 0, tail !== undefined ? tail.from : argReads.length, expanding, reads, ctx, false);
|
|
@@ -27,6 +27,7 @@
|
|
|
27
27
|
* The shell's own variables (the ones bash sets, holds read-only or evaluates itself) are never bound from text.
|
|
28
28
|
*/
|
|
29
29
|
import { type LexedRedirect, type LexedSegment, type LexedToken, type LexedWord } from "../../shell/lex.js";
|
|
30
|
+
import { readProgramPosition } from "./bash-program-position.js";
|
|
30
31
|
import { type DeclaredAttribute } from "./program-read-model.js";
|
|
31
32
|
import { type BuiltinState } from "./shell-read-builtins.js";
|
|
32
33
|
/** A value a name may hold — the text the program receives ({@link spelled}: what a shell re-parsing it reads), literal
|
|
@@ -181,14 +182,16 @@ export interface SegmentShape {
|
|
|
181
182
|
}
|
|
182
183
|
/** The argv projection of a lexed segment: structure that names nothing that runs here is dropped — a subshell
|
|
183
184
|
* parenthesis, a bare `{` / `}`, a function definition's head (`NAME ()`, and `function NAME [()]` with a name of
|
|
184
|
-
* any spelling, {@link dropDefinitionHeads}), a `case`
|
|
185
|
+
* any spelling, {@link dropDefinitionHeads}), a `case` command's own words ({@link caseWordsOf}), and the block words
|
|
185
186
|
* at the head. */
|
|
186
187
|
export interface ProjectedSegment extends SegmentShape {
|
|
187
188
|
readonly argv: readonly LexedWord[];
|
|
188
189
|
readonly redirects: readonly LexedRedirect[];
|
|
189
190
|
readonly grouped: boolean;
|
|
190
191
|
}
|
|
191
|
-
|
|
192
|
+
/** The argv projection of every segment of one text ({@link projectSegment}): a `case` command's own words are read across
|
|
193
|
+
* the segments ({@link caseWordsOf}). */
|
|
194
|
+
export declare function projectSegments(segments: readonly LexedSegment[]): ProjectedSegment[];
|
|
192
195
|
/** A function definition's head names nothing that runs here and is dropped from a segment's tokens, in place:
|
|
193
196
|
* `NAME ( )` ({@link isDefinitionName}), and `function NAME [( )]` — a bare `function` at command position, a name of any
|
|
194
197
|
* spelling. The lexer puts the body's compound command back at command position after the head, so a definition
|
|
@@ -240,6 +243,16 @@ export declare function loopListHeadAt(argv: readonly LexedWord[]): number | und
|
|
|
240
243
|
* ({@link BuiltinState}) — `disabled`: the word finds no command and binds nothing, `maybe`: as a function that may stand.
|
|
241
244
|
*/
|
|
242
245
|
export declare function bindingEffectOf(segment: LexedSegment, argv: readonly LexedWord[], shape: SegmentShape, readValue: ValueReader, shadow?: "named" | "maybe", availability?: (builtin: string) => BuiltinState): BindingEffect;
|
|
246
|
+
/** Does this assignment store ARRAY ELEMENTS — a compound value `(…)`, or a subscripted name `a[k]=v`? Bash never exports
|
|
247
|
+
* an array (an element assigned to an exported scalar makes it an array, gone from every child's environment): what it
|
|
248
|
+
* stores reaches a program only through a word that reads an element — the element floor it leaves here ({@link
|
|
249
|
+
* arrayElementFloor}) — never through an environment. One predicate for both spellings. Where the shell may NOT bind the
|
|
250
|
+
* word (a prefix, a launcher's or a declaration builtin's operand) it is handed on as written: the read plan keeps that
|
|
251
|
+
* word's text a candidate. */
|
|
252
|
+
export declare function bindsArrayElement(a: Pick<NonNullable<LexedWord["assignment"]>, "form" | "subscript">): boolean;
|
|
253
|
+
/** Do a segment's leading assignment words stand alone — the shell itself binds them — rather than prefix a command whose
|
|
254
|
+
* environment they are? The binding rule and the read plan's environment candidates ask the same question. */
|
|
255
|
+
export declare function assignsAsStatement(pos: ReturnType<typeof readProgramPosition>): boolean;
|
|
243
256
|
/**
|
|
244
257
|
* The names an ARITHMETIC text may assign: every identifier in a text that carries an assignment operator (`=` that is no
|
|
245
258
|
* comparison, `+=` and its kin, `++`, `--`) — read whole, not parsed: a name only compared there is made unknown too.
|
|
@@ -425,6 +438,9 @@ export declare class BindingThread {
|
|
|
425
438
|
* scope, so it can). What a reader in ANOTHER body loses ({@link unreadableBy}); a call to the body changes it unless a
|
|
426
439
|
* declaration the body certainly ran covers the name ({@link functionBound}). */
|
|
427
440
|
private bodyBinding;
|
|
441
|
+
/** Does what segment `at` does to this shell — a binding it makes where it stands, a move of the working directory —
|
|
442
|
+
* reach a reader at segment `j` (`j` absent: the text's end)? The one visibility rule ({@link visible}). */
|
|
443
|
+
reaches(at: number, j?: number): boolean;
|
|
428
444
|
/** Does segment `at` stand in a function body (it runs at a call, not here)? */
|
|
429
445
|
inFunctionBody(at: number): boolean;
|
|
430
446
|
/** Does segment `at` run in a subshell (a `( … )` group, a pipeline member that is not the last, a background job) or a
|
|
@@ -89,11 +89,14 @@ export function inheritedExportedFunctions(names) {
|
|
|
89
89
|
}
|
|
90
90
|
const ATTRIBUTE_KINDS = { integer: "integer", transformed: "transformed", frozen: "frozen" };
|
|
91
91
|
const EVERY_ATTRIBUTE = Object.values(ATTRIBUTE_KINDS).map((kind) => ({ kind }));
|
|
92
|
-
export function
|
|
93
|
-
const
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
92
|
+
export function projectSegments(segments) {
|
|
93
|
+
const { dropped, arms } = segmentStructure(segments);
|
|
94
|
+
return segments.map((segment, si) => projectSegment(segment, dropped[si], arms[si]));
|
|
95
|
+
}
|
|
96
|
+
function projectSegment(segment, dropped, arm) {
|
|
97
|
+
let grouped = segment.tokens.some((t) => t.kind === "group");
|
|
98
|
+
const defines = dropped.heads.flat();
|
|
99
|
+
const tokens = dropped.tokens.slice(arm.own.size === 0 ? 0 : Math.max(...arm.own) + 1);
|
|
97
100
|
const words = tokens.filter((t) => {
|
|
98
101
|
if (t.kind !== "word")
|
|
99
102
|
return false;
|
|
@@ -127,31 +130,96 @@ export function dropDefinitionHeads(tokens) {
|
|
|
127
130
|
}
|
|
128
131
|
return heads;
|
|
129
132
|
}
|
|
130
|
-
function
|
|
131
|
-
const
|
|
132
|
-
|
|
133
|
-
tokens.splice(0, end + 1);
|
|
133
|
+
function withoutDefinitionHeads(segment) {
|
|
134
|
+
const tokens = [...segment.tokens];
|
|
135
|
+
return { tokens, heads: dropDefinitionHeads(tokens) };
|
|
134
136
|
}
|
|
135
|
-
function
|
|
136
|
-
const
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
137
|
+
function segmentStructure(segments) {
|
|
138
|
+
const dropped = segments.map((segment) => withoutDefinitionHeads(segment));
|
|
139
|
+
const tokens = dropped.map((d) => d.tokens);
|
|
140
|
+
const operands = operandsOf(tokens, segments.map((segment) => isArithmeticCommand(segment)));
|
|
141
|
+
return { dropped, operands, arms: caseWordsOf(tokens, segments.map((s) => s.connector), operands) };
|
|
142
|
+
}
|
|
143
|
+
function operandsOf(segments, arithmetic) {
|
|
144
|
+
let conditional = false;
|
|
145
|
+
let parens = 0;
|
|
146
|
+
return segments.map((tokens, si) => {
|
|
147
|
+
const out = new Set();
|
|
148
|
+
tokens.forEach((t, k) => {
|
|
149
|
+
if (parens === 0 && !conditional) {
|
|
150
|
+
if (t.kind === "word" && t.atCommandPosition && t.raw === "[[")
|
|
151
|
+
conditional = true;
|
|
152
|
+
else if (t.kind === "group" && t.op === "(" && ((k === 0 && arithmetic[si] === true) || extglobParen(tokens, k))) {
|
|
153
|
+
parens = 1;
|
|
154
|
+
out.add(k);
|
|
155
|
+
}
|
|
156
|
+
return;
|
|
157
|
+
}
|
|
158
|
+
if (parens === 0 && t.kind === "word" && t.raw === "]]") {
|
|
159
|
+
conditional = false;
|
|
160
|
+
return;
|
|
161
|
+
}
|
|
162
|
+
out.add(k);
|
|
163
|
+
if (parens > 0 && t.kind === "group")
|
|
164
|
+
parens += t.op === "(" ? 1 : -1;
|
|
165
|
+
});
|
|
166
|
+
return out;
|
|
167
|
+
});
|
|
168
|
+
}
|
|
169
|
+
function caseWordsOf(segments, connectors, operands) {
|
|
170
|
+
const frames = [];
|
|
171
|
+
const toPattern = (f) => { f.state = "pattern"; f.started = false; };
|
|
172
|
+
return segments.map((tokens, si) => {
|
|
173
|
+
const top = frames[frames.length - 1];
|
|
174
|
+
const next = connectors[si + 1];
|
|
175
|
+
if (top?.state === "arm" && tokens.length === 0 && connectors[si] === ";" && (next === ";" || next === "&"))
|
|
176
|
+
toPattern(top);
|
|
177
|
+
const own = new Set();
|
|
178
|
+
let end = -1;
|
|
179
|
+
tokens.forEach((t, k) => {
|
|
180
|
+
if (operands[si].has(k))
|
|
181
|
+
return;
|
|
182
|
+
const f = frames[frames.length - 1];
|
|
183
|
+
if (f === undefined || f.state === "arm") {
|
|
184
|
+
const keyword = t.kind === "word" && t.atCommandPosition && t.raw === t.folded ? t.folded : undefined;
|
|
185
|
+
if (keyword === "case")
|
|
186
|
+
frames.push({ state: "subject", started: false });
|
|
187
|
+
else if (keyword === "esac" && f !== undefined)
|
|
188
|
+
frames.pop();
|
|
189
|
+
return;
|
|
190
|
+
}
|
|
191
|
+
if (f.state === "subject") {
|
|
192
|
+
if (t.kind === "word") {
|
|
193
|
+
own.add(k);
|
|
194
|
+
f.state = "in";
|
|
195
|
+
}
|
|
196
|
+
else
|
|
197
|
+
frames.pop();
|
|
198
|
+
return;
|
|
199
|
+
}
|
|
200
|
+
if (f.state === "in") {
|
|
201
|
+
if (t.kind === "word" && t.raw === "in") {
|
|
202
|
+
own.add(k);
|
|
203
|
+
toPattern(f);
|
|
204
|
+
}
|
|
205
|
+
else
|
|
206
|
+
frames.pop();
|
|
207
|
+
return;
|
|
208
|
+
}
|
|
209
|
+
if (!f.started && t.kind === "word" && t.raw === "esac") {
|
|
210
|
+
frames.pop();
|
|
211
|
+
return;
|
|
212
|
+
}
|
|
213
|
+
own.add(k);
|
|
214
|
+
if (t.kind === "group" && t.op === ")") {
|
|
215
|
+
end = k;
|
|
216
|
+
f.state = "arm";
|
|
217
|
+
return;
|
|
218
|
+
}
|
|
219
|
+
f.started = true;
|
|
220
|
+
});
|
|
221
|
+
return { own, end };
|
|
222
|
+
});
|
|
155
223
|
}
|
|
156
224
|
function extglobParen(tokens, at) {
|
|
157
225
|
const before = tokens[at - 1];
|
|
@@ -174,9 +242,11 @@ function blockStructure(segments) {
|
|
|
174
242
|
while (frames.length > 0 && frames[frames.length - 1].opened && depth <= frames[frames.length - 1].body.base)
|
|
175
243
|
frames.pop();
|
|
176
244
|
};
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
const heads =
|
|
245
|
+
const { dropped, operands, arms } = segmentStructure(segments);
|
|
246
|
+
return segments.map((segment, si) => {
|
|
247
|
+
const { tokens, heads } = dropped[si];
|
|
248
|
+
const arm = arms[si];
|
|
249
|
+
const operand = operands[si];
|
|
180
250
|
const defs = [];
|
|
181
251
|
const startBodies = (k) => {
|
|
182
252
|
for (const name of heads[k]) {
|
|
@@ -186,40 +256,32 @@ function blockStructure(segments) {
|
|
|
186
256
|
}
|
|
187
257
|
};
|
|
188
258
|
const arithmetic = isArithmeticCommand(segment);
|
|
189
|
-
const patternEnd = casePatternEnd(tokens);
|
|
190
|
-
const skipped = new Set();
|
|
191
|
-
const open = [];
|
|
192
259
|
let lowest = depth;
|
|
193
260
|
let words;
|
|
194
261
|
let subshells;
|
|
195
262
|
let body;
|
|
263
|
+
let within = [];
|
|
196
264
|
const switches = [];
|
|
197
265
|
const innermost = () => [...frames].reverse().find((f) => f.opened)?.body;
|
|
266
|
+
const openBodies = () => frames.filter((f) => f.opened).map((f) => f.body.id);
|
|
267
|
+
const place = () => { words ??= depth; subshells ??= [...subshellStack]; body = innermost(); within = openBodies(); };
|
|
198
268
|
const visit = (t, k) => {
|
|
269
|
+
if (arm.own.has(k)) {
|
|
270
|
+
if (k === arm.end)
|
|
271
|
+
switches.push(depth);
|
|
272
|
+
return;
|
|
273
|
+
}
|
|
274
|
+
if (operand.has(k)) {
|
|
275
|
+
if (t.kind === "word")
|
|
276
|
+
place();
|
|
277
|
+
return;
|
|
278
|
+
}
|
|
199
279
|
if (t.kind === "group") {
|
|
200
|
-
if (arithmetic || skipped.has(k))
|
|
201
|
-
return;
|
|
202
280
|
if (t.op === "(") {
|
|
203
|
-
if (extglobParen(tokens, k)) {
|
|
204
|
-
skipped.add(k);
|
|
205
|
-
open.push(-1);
|
|
206
|
-
return;
|
|
207
|
-
}
|
|
208
|
-
open.push(k);
|
|
209
|
-
if (k <= patternEnd)
|
|
210
|
-
return;
|
|
211
281
|
deeper();
|
|
212
282
|
subshellStack.push(subshellIds++);
|
|
213
283
|
return;
|
|
214
284
|
}
|
|
215
|
-
const from = open.pop();
|
|
216
|
-
if (from === -1)
|
|
217
|
-
return;
|
|
218
|
-
if (k <= patternEnd) {
|
|
219
|
-
if (k === patternEnd)
|
|
220
|
-
switches.push(depth);
|
|
221
|
-
return;
|
|
222
|
-
}
|
|
223
285
|
shallower();
|
|
224
286
|
subshellStack.pop();
|
|
225
287
|
lowest = Math.min(lowest, depth);
|
|
@@ -236,11 +298,8 @@ function blockStructure(segments) {
|
|
|
236
298
|
}
|
|
237
299
|
else if (keyword !== undefined && SWITCHING_WORDS.has(keyword))
|
|
238
300
|
switches.push(depth);
|
|
239
|
-
else
|
|
240
|
-
|
|
241
|
-
subshells ??= [...subshellStack];
|
|
242
|
-
body = innermost();
|
|
243
|
-
}
|
|
301
|
+
else
|
|
302
|
+
place();
|
|
244
303
|
};
|
|
245
304
|
tokens.forEach((t, k) => {
|
|
246
305
|
startBodies(k);
|
|
@@ -257,8 +316,10 @@ function blockStructure(segments) {
|
|
|
257
316
|
else
|
|
258
317
|
f.flat = true;
|
|
259
318
|
}
|
|
260
|
-
if (settled && t.kind === "word")
|
|
319
|
+
if (settled && t.kind === "word") {
|
|
261
320
|
body = innermost();
|
|
321
|
+
within = openBodies();
|
|
322
|
+
}
|
|
262
323
|
const top = frames[frames.length - 1];
|
|
263
324
|
if (top?.parens !== undefined && t.kind === "group") {
|
|
264
325
|
top.parens += t.op === "(" ? 1 : -1;
|
|
@@ -272,7 +333,7 @@ function blockStructure(segments) {
|
|
|
272
333
|
while (frames.length > 0 && frames[frames.length - 1].flat === true)
|
|
273
334
|
frames.pop();
|
|
274
335
|
startBodies(tokens.length);
|
|
275
|
-
return { words: words ?? depth, after: depth, lowest, switches, subshells: subshells ?? [...subshellStack], defs, ...(body !== undefined ? { body } : {}) };
|
|
336
|
+
return { words: words ?? depth, after: depth, lowest, switches, subshells: subshells ?? [...subshellStack], defs, placed: words !== undefined, within, ...(body !== undefined ? { body } : {}) };
|
|
276
337
|
});
|
|
277
338
|
}
|
|
278
339
|
const READABLE_VALUE = /^[^\\~()]*$/;
|
|
@@ -547,13 +608,13 @@ export function bindingEffectOf(segment, argv, shape, readValue, shadow, availab
|
|
|
547
608
|
const pos = readProgramPosition(argv);
|
|
548
609
|
const program = pos.program;
|
|
549
610
|
const row = program === undefined ? undefined : programRow(program.basename);
|
|
550
|
-
const statement =
|
|
611
|
+
const statement = assignsAsStatement(pos);
|
|
551
612
|
for (const k of pos.assignments) {
|
|
552
613
|
const a = argv[k].assignment;
|
|
553
614
|
if (a === undefined)
|
|
554
615
|
continue;
|
|
555
616
|
if (statement)
|
|
556
|
-
bind({ name: a.name, state: assignedState(a, readValue, overlay), ...(a
|
|
617
|
+
bind({ name: a.name, state: assignedState(a, readValue, overlay), ...(bindsArrayElement(a) ? { floor: arrayElementFloor(a, readValue, overlay) } : {}) });
|
|
557
618
|
else if (program !== undefined && SPECIAL_BUILTINS.has(program.basename))
|
|
558
619
|
bind({ name: a.name, state: assignedState(a, readValue, overlay), prefix: true });
|
|
559
620
|
}
|
|
@@ -607,8 +668,8 @@ export function bindingEffectOf(segment, argv, shape, readValue, shadow, availab
|
|
|
607
668
|
if (name === undefined)
|
|
608
669
|
continue;
|
|
609
670
|
const refused = attributes.some((x) => x.name === undefined || x.name === name);
|
|
610
|
-
if (a
|
|
611
|
-
bind({ name, state: "unknown", floor:
|
|
671
|
+
if (a !== undefined && bindsArrayElement(a))
|
|
672
|
+
bind({ name, state: "unknown", floor: arrayElementFloor(a, readValue, expanded) });
|
|
612
673
|
else if (a === undefined || !storesText || refused)
|
|
613
674
|
kill(name);
|
|
614
675
|
else
|
|
@@ -686,8 +747,15 @@ function compoundElementWords(raw) {
|
|
|
686
747
|
return [prefix === undefined ? element : value, ...(folded !== undefined ? [{ pieces: element.pieces, folded: element.folded.slice(folded.length), tail: true }] : [])].filter((w) => w !== undefined);
|
|
687
748
|
});
|
|
688
749
|
}
|
|
689
|
-
function
|
|
690
|
-
return
|
|
750
|
+
export function bindsArrayElement(a) {
|
|
751
|
+
return a.form === "compound" || a.subscript !== undefined;
|
|
752
|
+
}
|
|
753
|
+
export function assignsAsStatement(pos) {
|
|
754
|
+
return pos.program === undefined && pos.launchers.length === 0 && pos.refusal === undefined;
|
|
755
|
+
}
|
|
756
|
+
function arrayElementFloor(a, readValue, overlay) {
|
|
757
|
+
const words = a.form === "compound" ? compoundElementWords(a.value.raw) : [{ pieces: a.value.pieces, folded: a.value.folded }];
|
|
758
|
+
return words.flatMap((w) => {
|
|
691
759
|
const v = w.tail === true ? "unknown" : readValue(w, true, overlay);
|
|
692
760
|
if (v !== "unknown")
|
|
693
761
|
return v.map(floorOf);
|
|
@@ -725,8 +793,9 @@ export function namesBoundIn(text, depth = 0) {
|
|
|
725
793
|
return "all";
|
|
726
794
|
const names = new Set();
|
|
727
795
|
const nothing = () => "unknown";
|
|
728
|
-
|
|
729
|
-
|
|
796
|
+
const projected = projectSegments(lexed.segments);
|
|
797
|
+
for (const [si, segment] of lexed.segments.entries()) {
|
|
798
|
+
const p = projected[si];
|
|
730
799
|
const effect = bindingEffectOf(segment, p.argv, p, nothing);
|
|
731
800
|
if (effect.all === "unknown")
|
|
732
801
|
return "all";
|
|
@@ -909,6 +978,17 @@ export class BindingThread {
|
|
|
909
978
|
const own = this.standingOf(at, b.name).body;
|
|
910
979
|
return own !== undefined && b.scope !== "local" ? own : undefined;
|
|
911
980
|
}
|
|
981
|
+
reaches(at, j) {
|
|
982
|
+
if (j !== undefined && !this.blocks[j].placed)
|
|
983
|
+
return true;
|
|
984
|
+
const s = this.standingOf(at);
|
|
985
|
+
const reader = j === undefined ? undefined : this.blocks[j];
|
|
986
|
+
if (s.body !== undefined && !(reader?.within ?? []).includes(s.body.id))
|
|
987
|
+
return false;
|
|
988
|
+
if (j !== at && this.ownSubshellAt(at, s))
|
|
989
|
+
return false;
|
|
990
|
+
return s.subshells.every((id) => (reader?.subshells ?? []).includes(id));
|
|
991
|
+
}
|
|
912
992
|
inFunctionBody(at) {
|
|
913
993
|
return this.blocks[at].body !== undefined;
|
|
914
994
|
}
|
|
@@ -303,13 +303,28 @@ function refusalOf(tool, fold, boundary, paths) {
|
|
|
303
303
|
const target = w.read.target ?? w.deny.matchedView;
|
|
304
304
|
const write = w.deny.face === "write";
|
|
305
305
|
const core = readDenySentence({ target, pattern: w.deny.pattern, matchedView: w.deny.matchedView, ...(write ? { face: "write" } : {}) });
|
|
306
|
-
const
|
|
306
|
+
const through = deniedThrough(w.read, boundary);
|
|
307
|
+
const sentence = `Error (${tool}): ${core} ${write ? WRITE_DENY_REFUSAL_NOTE : DENY_REFUSAL_NOTE}${through !== undefined ? ` ${DENIED_THROUGH_NOTE[through]}` : ""}`;
|
|
307
308
|
return { sentence, ...(write ? {} : { details: violationDetails({ code: "read_path_denied", message: sentence, target, pattern: w.deny.pattern }) }) };
|
|
308
309
|
}
|
|
309
310
|
const account = findingAccount(fold, boundary);
|
|
310
311
|
const sentence = `Error (${tool}): ${account}. ${BASH_READONLY_CONFINEMENT_NOTE}`;
|
|
311
312
|
return { sentence, details: findingDetails(fold.finding, paths) };
|
|
312
313
|
}
|
|
314
|
+
const DENIED_THROUGH_NOTE = {
|
|
315
|
+
home: "The word was judged as spelled with the environment's declared home: the command may rebind HOME before it, or hands " +
|
|
316
|
+
"the program a literal ~ it may expand itself — the shell may open another file, and a deny row is refused wherever the command may read it.",
|
|
317
|
+
floor: "The working directory at this word is not settled — a move before it may fail or is one this boundary does not follow — " +
|
|
318
|
+
"so the word was also judged where the command stood before that move (a bare cd stands it in the declared home).",
|
|
319
|
+
};
|
|
320
|
+
function deniedThrough(read, boundary) {
|
|
321
|
+
if (read.established === "unestablishable" && read.candidate.bases === "unmodelled")
|
|
322
|
+
return "floor";
|
|
323
|
+
const home = boundary.homeDir;
|
|
324
|
+
if (read.candidate.denyOnly === true && home !== undefined && withinAnyRoot([home], read.candidate.spelled) && /~|HOME/.test(read.candidate.raw))
|
|
325
|
+
return "home";
|
|
326
|
+
return undefined;
|
|
327
|
+
}
|
|
313
328
|
const WRITE_DENY_REFUSAL_NOTE = "The boundary judges this command's write targets — its output redirections and the operands of mkdir, touch, rm, " +
|
|
314
329
|
"rmdir, mv, cp, tee and an in-place sed — against the write deny list; a denied write is refused here rather than escalated.";
|
|
315
330
|
const DENY_REFUSAL_NOTE = "The read boundary judges the paths this command names — as written and, where a filesystem can be consulted, where " +
|
|
@@ -343,8 +358,9 @@ function verdictOf(tool, seat, fold, judged, boundary) {
|
|
|
343
358
|
...(grant !== undefined ? { readRootCandidate: { dir: grant.dir, ...(grant.covers !== undefined ? { covers: grant.covers } : {}), clearsThisAsk: true } } : {}),
|
|
344
359
|
};
|
|
345
360
|
}
|
|
346
|
-
function declarationsOf(boundary, readers, cdPath) {
|
|
347
|
-
|
|
361
|
+
function declarationsOf(boundary, readers, cdPath, receivedEnvNames) {
|
|
362
|
+
const names = Array.isArray(receivedEnvNames) && receivedEnvNames.every((n) => typeof n === "string") ? { receivedEnvNames: receivedEnvNames } : {};
|
|
363
|
+
return { readers, cwd: boundary.cwd ?? boundary.roots[0] ?? "", roots: boundary.roots, cdPath, ...names, ...(boundary.homeDir !== undefined ? { homeDir: boundary.homeDir } : {}), ...(boundary.face !== undefined ? { face: boundary.face } : {}) };
|
|
348
364
|
}
|
|
349
365
|
function judgePlan(plan, established, boundary) {
|
|
350
366
|
return judgeEstablishedPlan(plan, established.reads, boundary, (n) => {
|
|
@@ -381,7 +397,7 @@ async function applyAlsoInside(judged, boundary) {
|
|
|
381
397
|
return rewrite(judged);
|
|
382
398
|
}
|
|
383
399
|
async function runShellReadStation(tool, command, declared, seat, readers, establisher, env, signal) {
|
|
384
|
-
const plan = planShellReads(command, declarationsOf(declared, readers, env.cdPath));
|
|
400
|
+
const plan = planShellReads(command, declarationsOf(declared, readers, env.cdPath, env.receivedEnvNames));
|
|
385
401
|
const door = observeEnvironment(env);
|
|
386
402
|
const established = await establisher.establish(plan, declared, signal, door);
|
|
387
403
|
const boundary = { ...declared, roots: established.roots };
|
|
@@ -6,6 +6,8 @@ import { judgedCandidatesOf, sedBackupNames } from "./shell-read-write-targets.j
|
|
|
6
6
|
import { movedReads, withHomeViews } from "./shell-read-identity.js";
|
|
7
7
|
import { passesUnasked } from "./shell-read-device.js";
|
|
8
8
|
import { compileFsGlob, fsGlobClass } from "./fs-glob.js";
|
|
9
|
+
import { chainHopsOrNone, leafChainMayHold, symlinkChainHops } from "../../core/path-identity.js";
|
|
10
|
+
import { everyAncestor, repositoryTopOf } from "./shell-read-object-path.js";
|
|
9
11
|
const GLOB_METACHAR_RE = /[*?[]/;
|
|
10
12
|
export const MAX_GLOB_DIRS = 256;
|
|
11
13
|
export const MAX_GLOB_MATCHES = 8192;
|
|
@@ -91,17 +93,17 @@ function pathSegmentsFrom(p, from, posix = false) {
|
|
|
91
93
|
function basesFor(candidate, boundary) {
|
|
92
94
|
if (candidate.bases === "unmodelled")
|
|
93
95
|
return "unmodelled";
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
return [boundary.cwd ?? boundary.roots[0] ?? ""];
|
|
96
|
+
const bases = candidate.bases.length > 0 ? candidate.bases : [boundary.cwd ?? boundary.roots[0] ?? ""];
|
|
97
|
+
return candidate.repositoryTop !== undefined ? everyAncestor(bases) : bases;
|
|
97
98
|
}
|
|
98
|
-
function lexicalReadsOf(candidate, boundary) {
|
|
99
|
+
function lexicalReadsOf(candidate, boundary, placed) {
|
|
99
100
|
if (candidate.expands === "unresolvable") {
|
|
100
101
|
return [{ candidate, established: "unestablishable", spellings: [candidate.spelled], cause: `"${candidate.raw}" is rewritten by the shell before the program sees it` }];
|
|
101
102
|
}
|
|
102
|
-
const bases = basesFor(candidate, boundary);
|
|
103
|
+
const bases = placed ?? basesFor(candidate, boundary);
|
|
103
104
|
if (bases === "unmodelled") {
|
|
104
|
-
const
|
|
105
|
+
const floorsAt = candidate.floorBases ?? [boundary.cwd ?? boundary.roots[0] ?? ""];
|
|
106
|
+
const floors = candidate.repositoryTop !== undefined ? everyAncestor(floorsAt) : floorsAt;
|
|
105
107
|
const spellings = [candidate.spelled];
|
|
106
108
|
for (const floorBase of floors) {
|
|
107
109
|
const viaFloor = floorBase === "" ? undefined : resolveOperandSpellings(floorBase, candidate.spelled, boundary.homeDir);
|
|
@@ -225,6 +227,18 @@ function establishLegOver(seen, readRoots) {
|
|
|
225
227
|
const SEP = family === "posix" ? /\// : /[\\/]/;
|
|
226
228
|
const TRAILING_SEP = family === "posix" ? /\/+$/ : /[\\/]+$/;
|
|
227
229
|
const joinUnder = (dir, name) => `${dir.replace(TRAILING_SEP, "")}/${name}`;
|
|
230
|
+
const tops = new Map();
|
|
231
|
+
const atRepositoryTops = async (starts, signal) => {
|
|
232
|
+
const out = new Set();
|
|
233
|
+
for (const start of starts) {
|
|
234
|
+
if (!tops.has(start))
|
|
235
|
+
tops.set(start, repositoryTopOf(env, start, family, signal));
|
|
236
|
+
const top = await tops.get(start);
|
|
237
|
+
for (const b of top !== undefined ? [top] : everyAncestor([start]))
|
|
238
|
+
out.add(b);
|
|
239
|
+
}
|
|
240
|
+
return [...out];
|
|
241
|
+
};
|
|
228
242
|
const resolveWithoutParentSteps = async (p, signal, writeTarget = false, linkHops = WRITE_LINK_HOPS) => {
|
|
229
243
|
const parts = p.split(SEP);
|
|
230
244
|
const tail = [];
|
|
@@ -391,7 +405,8 @@ function establishLegOver(seen, readRoots) {
|
|
|
391
405
|
if (!real.exact && real.missing !== true) {
|
|
392
406
|
return { candidate, established: "unestablishable", spellings, ...(origin !== undefined ? { origin } : {}), cause: `"${spelling}" cannot be resolved to verify where it reads`, unresolved: true };
|
|
393
407
|
}
|
|
394
|
-
|
|
408
|
+
const hops = seat === "landing" && leafChainMayHold([spelling], !real.exact || real.value !== normalizeAbsPathLexically(spelling), family) ? chainHopsOrNone(await symlinkChainHops(env, spelling, signal, family)) : [];
|
|
409
|
+
return { candidate, established, target: real.value, spellings, ...(origin !== undefined ? { origin } : {}), ...(hops.length > 0 ? { hops } : {}) };
|
|
395
410
|
};
|
|
396
411
|
const followedName = async (spelled, base, homeDir, signal) => {
|
|
397
412
|
let name = spelled;
|
|
@@ -519,7 +534,8 @@ function establishLegOver(seen, readRoots) {
|
|
|
519
534
|
const node = await rootKindOf(read.target, signal);
|
|
520
535
|
out.push({ ...read, ...(node !== undefined ? { node } : {}) });
|
|
521
536
|
};
|
|
522
|
-
|
|
537
|
+
const placed = candidate.repositoryTop === "discovered" && candidate.bases !== "unmodelled" && candidate.bases.length > 0 ? await atRepositoryTops(candidate.bases, signal) : undefined;
|
|
538
|
+
for (const [i, lexical] of lexicalReadsOf(candidate, boundary, placed).entries()) {
|
|
523
539
|
if (lexical.established !== "lexical" || passesUnasked(candidate)) {
|
|
524
540
|
out.push(writtenAt(lexical, writtenSeats, writtenSeats.written.includes("landing") ? "landing" : "entry"));
|
|
525
541
|
continue;
|
|
@@ -529,7 +545,7 @@ function establishLegOver(seen, readRoots) {
|
|
|
529
545
|
const walked = spellings.find((s) => s !== folded) ?? folded;
|
|
530
546
|
if (candidate.expands === "glob") {
|
|
531
547
|
let matched = false;
|
|
532
|
-
for (const p of candidate.pattern === undefined ? spellings : lexicalReadsOf({ ...candidate, spelled: candidate.pattern }, boundary)[i]?.spellings ?? spellings) {
|
|
548
|
+
for (const p of candidate.pattern === undefined ? spellings : lexicalReadsOf({ ...candidate, spelled: candidate.pattern }, boundary, placed)[i]?.spellings ?? spellings) {
|
|
533
549
|
const expanded = await expandGlobCandidate(p, roots, signal);
|
|
534
550
|
if (expanded !== undefined && "unverifiable" in expanded) {
|
|
535
551
|
out.push({ candidate, established: "unestablishable", spellings, origin: folded, cause: expanded.unverifiable });
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { lexShell, literalTextOf } from "../../shell/lex.js";
|
|
2
2
|
import { readProgramPosition } from "./bash-program-position.js";
|
|
3
|
-
import { SPECIAL_BUILTINS,
|
|
3
|
+
import { SPECIAL_BUILTINS, projectSegments } from "./shell-read-bindings.js";
|
|
4
4
|
import { reentryText } from "./shell-reentry-text.js";
|
|
5
5
|
export function functionCallOf(argv, functions, stateOf = () => "maybe") {
|
|
6
6
|
const pos = readProgramPosition(argv);
|
|
@@ -23,7 +23,7 @@ export function evalDefinedFunctions(argvs, depth = 0) {
|
|
|
23
23
|
const lexed = words.length > 0 && words.every((t) => t !== undefined) ? lexShell(reentryText("eval", words) ?? "") : undefined;
|
|
24
24
|
if (lexed === undefined || "parseFailure" in lexed)
|
|
25
25
|
return [];
|
|
26
|
-
const inner = lexed.segments
|
|
26
|
+
const inner = projectSegments(lexed.segments);
|
|
27
27
|
return [...inner.flatMap((p) => p.defines), ...evalDefinedFunctions(inner.map((p) => p.argv), depth + 1)];
|
|
28
28
|
});
|
|
29
29
|
}
|