@sema-agent/core 7.59.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 +564 -0
- 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/child-model-seat.js +6 -3
- 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/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 +11 -38
- package/dist/agents/subagent.d.ts +51 -17
- package/dist/agents/subagent.js +117 -78
- 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/degrading.js +3 -1
- package/dist/brain/route-adjudicator.js +3 -1
- package/dist/brain/status-sink.d.ts +7 -1
- package/dist/brain/status-sink.js +6 -0
- package/dist/brain/timeout.d.ts +3 -1
- package/dist/brain/timeout.js +18 -5
- package/dist/core/a2a.d.ts +15 -5
- package/dist/core/a2a.js +34 -19
- package/dist/core/agent-definition.d.ts +20 -0
- package/dist/core/allow-entry.d.ts +2 -0
- package/dist/core/allow-entry.js +3 -1
- package/dist/core/artifact-host.d.ts +0 -2
- package/dist/core/artifact-host.js +0 -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 +10 -1
- 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-store.d.ts +8 -13
- package/dist/core/checkpoint-store.js +4 -3
- package/dist/core/compliance.d.ts +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/engine-notice.d.ts +58 -15
- package/dist/core/frame-settlement.d.ts +5 -0
- package/dist/core/frame-settlement.js +4 -0
- package/dist/core/gate-fold.js +7 -5
- package/dist/core/gate-lanes.js +39 -8
- package/dist/core/governance-codes.d.ts +9 -1
- package/dist/core/governance-codes.js +12 -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 +39 -56
- package/dist/core/hooks.js +123 -77
- package/dist/core/image-admission.d.ts +104 -51
- package/dist/core/image-admission.js +170 -46
- 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 +54 -3
- package/dist/core/locked-config.js +81 -50
- 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 +9 -3
- package/dist/core/mcp-failure.js +10 -0
- 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-spec.d.ts +38 -9
- package/dist/core/mcp-server-spec.js +55 -21
- package/dist/core/mcp.d.ts +17 -6
- package/dist/core/mcp.js +67 -55
- package/dist/core/memory-admission.d.ts +23 -6
- package/dist/core/memory-admission.js +19 -9
- 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/index.d.ts +2 -1
- package/dist/core/memory-engine/index.js +2 -1
- 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 +45 -11
- package/dist/core/memory-engine/sync-client.js +82 -11
- 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 +4 -2
- 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/kernel/dispatch.d.ts +5 -1
- package/dist/core/mods/kernel/dispatch.js +4 -4
- package/dist/core/mods/kernel/events.d.ts +10 -4
- package/dist/core/mods/kernel/events.js +10 -6
- package/dist/core/mods/kernel/receive.d.ts +5 -0
- package/dist/core/mods/kernel/receive.js +10 -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 +51 -59
- package/dist/core/mods/stations.js +32 -42
- 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/park-selfcheck.js +8 -8
- package/dist/core/peer-seat.d.ts +63 -8
- package/dist/core/peer-seat.js +179 -34
- package/dist/core/permission-rule-consent.d.ts +0 -21
- package/dist/core/permission-rule-consent.js +1 -2
- package/dist/core/permission-rule-model.d.ts +4 -2
- package/dist/core/permission-rule-model.js +7 -6
- 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/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 +12 -5
- package/dist/core/rewrite-rejudge.js +9 -5
- package/dist/core/roles.d.ts +37 -3
- package/dist/core/roles.js +126 -78
- package/dist/core/rule-owner.d.ts +3 -0
- 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 +21 -10
- 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 +62 -41
- 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/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 +75 -7
- package/dist/core/runner/gate-exit.js +20 -1
- package/dist/core/runner/git-status-frame.d.ts +5 -2
- package/dist/core/runner/git-status-frame.js +3 -4
- 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 +4 -4
- package/dist/core/runner/permission-rule-lanes.js +1 -1
- package/dist/core/runner/prepare-boundary-parks.d.ts +2 -2
- package/dist/core/runner/prepare-boundary-parks.js +3 -3
- package/dist/core/runner/prepare-caps-and-workflow.d.ts +4 -0
- package/dist/core/runner/prepare-caps-and-workflow.js +4 -3
- package/dist/core/runner/prepare-config-doors.d.ts +6 -1
- package/dist/core/runner/prepare-config-doors.js +14 -9
- package/dist/core/runner/prepare-delegation-surface.d.ts +5 -3
- package/dist/core/runner/prepare-delegation-surface.js +4 -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 +3 -1
- package/dist/core/runner/prepare-hands-readface.js +15 -7
- package/dist/core/runner/prepare-inherited-gate.d.ts +5 -4
- package/dist/core/runner/prepare-inherited-gate.js +9 -5
- package/dist/core/runner/prepare-memory-engine-session.js +1 -1
- package/dist/core/runner/prepare-memory.d.ts +2 -2
- package/dist/core/runner/prepare-memory.js +2 -2
- package/dist/core/runner/prepare-park-ask.d.ts +3 -5
- package/dist/core/runner/prepare-park-ask.js +3 -8
- package/dist/core/runner/prepare-policy-chain.d.ts +5 -4
- package/dist/core/runner/prepare-policy-chain.js +120 -108
- package/dist/core/runner/prepare-project-context.js +8 -5
- package/dist/core/runner/prepare-prompt-inputs.d.ts +4 -1
- package/dist/core/runner/prepare-prompt-inputs.js +3 -2
- package/dist/core/runner/prepare-protocol-tools.d.ts +5 -3
- package/dist/core/runner/prepare-protocol-tools.js +9 -2
- package/dist/core/runner/prepare-suspend-saga.d.ts +0 -2
- package/dist/core/runner/prepare-suspend-saga.js +5 -7
- package/dist/core/runner/prepare-task.js +41 -27
- 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 +4 -3
- package/dist/core/runner/prepare-wiring-manifest.js +32 -18
- package/dist/core/runner/prepare-workspace-restore.js +3 -3
- package/dist/core/runner/resume-checkpoint-screen.js +4 -4
- package/dist/core/runner/retired-runner-deps.js +4 -1
- package/dist/core/runner/run-attachment-seats.js +3 -3
- package/dist/core/runner/run-brain-sinks.js +1 -0
- package/dist/core/runner/run-git-lane.d.ts +3 -1
- package/dist/core/runner/run-git-lane.js +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.js +1 -1
- package/dist/core/runner/run-leg.js +26 -28
- 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 +12 -4
- package/dist/core/runner/run-turn-boundary.js +12 -7
- package/dist/core/runner/runtask.d.ts +7 -4
- package/dist/core/runner/runtask.js +19 -11
- package/dist/core/runner/skills-seat.js +2 -2
- package/dist/core/runner/sub-agent-deny-lists.js +10 -7
- package/dist/core/runner/synthetic-tools.js +2 -2
- package/dist/core/runner/tool-disclosure.js +0 -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-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 +3 -5
- package/dist/core/runner/turn-attachments.js +3 -16
- package/dist/core/runner-deps.d.ts +31 -18
- package/dist/core/secret-env.d.ts +3 -2
- package/dist/core/session-policy-store.d.ts +9 -2
- package/dist/core/session-policy-store.js +16 -1
- package/dist/core/session-store.d.ts +3 -2
- package/dist/core/session-store.js +50 -11
- package/dist/core/skill-grant.d.ts +9 -0
- package/dist/core/skill-grant.js +18 -0
- 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/task-event.d.ts +18 -2
- package/dist/core/task-notification.d.ts +88 -5
- package/dist/core/task-notification.js +130 -7
- package/dist/core/task-registry-agent.d.ts +18 -12
- package/dist/core/task-registry-agent.js +18 -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 +38 -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 +3 -6
- package/dist/core/task-stream.d.ts +1 -1
- package/dist/core/tool-catalog-entries.js +1 -1
- 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 +5 -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-spec.d.ts +20 -4
- package/dist/core/trace.d.ts +0 -1
- package/dist/core/types.d.ts +3 -3
- package/dist/core/types.js +1 -1
- package/dist/core/untrusted-text.js +1 -1
- package/dist/core/user-attachment.d.ts +10 -5
- package/dist/core/user-attachment.js +14 -6
- package/dist/engine/execution-env/node-execution-env.d.ts +7 -2
- package/dist/engine/execution-env/node-execution-env.js +12 -1
- package/dist/engine/harness/agent-harness.d.ts +1 -1
- package/dist/engine/harness/agent-harness.js +8 -4
- package/dist/engine/harness/types.d.ts +112 -29
- package/dist/engine/loop/agent-loop.d.ts +12 -12
- package/dist/engine/loop/agent-loop.js +153 -21
- package/dist/engine/loop/types.d.ts +9 -2
- package/dist/engine/lsp/node-lsp-manager.d.ts +3 -3
- package/dist/engine/lsp/node-lsp-manager.js +32 -13
- package/dist/index.d.ts +22 -14
- package/dist/index.js +15 -10
- package/dist/internal/harness-types.d.ts +1 -1
- 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.d.ts +4 -0
- package/dist/orchestration/workflow.js +25 -4
- package/dist/prompts/default.d.ts +1 -10
- package/dist/prompts/default.js +0 -2
- package/dist/stores/file/background-agent-store.d.ts +1 -1
- package/dist/stores/file/background-agent-store.js +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 +3 -1
- 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 +8 -4
- package/dist/tools/fs/fs-bash.js +26 -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 +8 -4
- package/dist/tools/fs/read-floor.d.ts +44 -1
- package/dist/tools/fs/read-floor.js +35 -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/monitor.d.ts +5 -4
- package/dist/tools/monitor.js +15 -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 +4 -2
- package/test/export-surface.snapshot.json +75 -21
- package/wire-changes/core-stores-sql@7.60.0.json +30 -0
- package/wire-changes/core@7.60.0.json +3274 -0
- package/wire-changes/mods-kernel@7.60.0.json +62 -0
- package/wire-changes/primitives@7.60.0.json +30 -0
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { type AgentTool, type ExecutionEnv } from "../../internal/harness.js";
|
|
2
2
|
import { type TaskRegistry } from "../../core/task-registry.js";
|
|
3
|
+
import { type ImageDownsampler } from "../../core/image-downsample.js";
|
|
3
4
|
import { type CwdRef } from "./fs-shared.js";
|
|
4
5
|
import type { ReversibilityVerdict } from "../../core/types.js";
|
|
5
6
|
import type { ShellReadAdmission } from "./shell-read-check.js";
|
|
@@ -122,10 +123,9 @@ export declare function createBashTool(env: ExecutionEnv, rootCanonical: string,
|
|
|
122
123
|
/**
|
|
123
124
|
* Mirrors {@link import("../../core/types.js").TaskSpec.oneShot}: this run has no later
|
|
124
125
|
* turn for an async background notification to land in (a headless `-p` process exits once the
|
|
125
|
-
* turn ends)
|
|
126
|
-
*
|
|
127
|
-
*
|
|
128
|
-
* one-shot process loses the result — the process exits with nothing left alive to receive it).
|
|
126
|
+
* turn ends), and its ending waits for loop-type background tasks only — never for a command's
|
|
127
|
+
* process. Branches the background-launch receipt to {@link ONE_SHOT_BACKGROUND_COMMAND_NOTE}
|
|
128
|
+
* instead of "you will be notified — do not poll".
|
|
129
129
|
*/
|
|
130
130
|
oneShot?: boolean;
|
|
131
131
|
/**
|
|
@@ -148,6 +148,8 @@ export declare function createBashTool(env: ExecutionEnv, rootCanonical: string,
|
|
|
148
148
|
/** The byte floor's seat (read-floor.ts): every command this leg starts, foreground or background, carries the
|
|
149
149
|
* read-deny table its call judges with to the environment. Absent ⇒ no table, the starts carry nothing. */
|
|
150
150
|
readFloor?: ReadFloorSeat;
|
|
151
|
+
/** The run's image processor seat (`RunnerDeps.imageProcessor`), for an image-data-URI stdout. */
|
|
152
|
+
imageProcessor?: ImageDownsampler | false;
|
|
151
153
|
/** Override of the `timeout` parameter's DEFAULT budget, in ms — see
|
|
152
154
|
* {@link import("./index.js").HandsToolkitOptions.bashDefaultTimeoutMs} for the resolution
|
|
153
155
|
* contract (options over env over constant; invalid values discarded). */
|
|
@@ -207,6 +209,8 @@ export declare function createBashReadonlyTool(env: ExecutionEnv, rootCanonical:
|
|
|
207
209
|
shellReadAdmission?: ShellReadAdmission;
|
|
208
210
|
/** The byte floor's seat — the SAME one the full shell leg takes (read-floor.ts). */
|
|
209
211
|
readFloor?: ReadFloorSeat;
|
|
212
|
+
/** The image processor seat — the SAME one the full shell leg takes. */
|
|
213
|
+
imageProcessor?: ImageDownsampler | false;
|
|
210
214
|
/** The run's tool-progress sink — the SAME seat the full shell leg takes, for the same reason its
|
|
211
215
|
* two neighbours above are shared: both foreground legs run through `runShell`, so a long command
|
|
212
216
|
* must breathe on both or a person watching one of them is told nothing. This face has no detach
|
package/dist/tools/fs/fs-bash.js
CHANGED
|
@@ -6,15 +6,16 @@ import { defaultTaskRegistry } from "../../core/task-registry.js";
|
|
|
6
6
|
import { accountDroppedBytes, spoolDropNote } from "../../core/task-registry-shared.js";
|
|
7
7
|
import { RollingTailBuffer } from "../../core/exec-output-tail.js";
|
|
8
8
|
import { TASK_OUTPUT_TOOL_NAME, TASK_STOP_TOOL_NAME, TASK_OUTPUT_MISSING_ID_MESSAGE, TASK_STOP_MISSING_ID_MESSAGE, TASK_STOP_PARAMS, resolveTaskIdArg, ENV_DIRECT_TASK_TOOL_CAPS, composeTaskOutputDescription, composeTaskOutputParams, composeTaskStopDescription, } from "../../core/task-tool-shape.js";
|
|
9
|
-
import { envDeclaresRetain, hasBackgroundShell, retainsBackgroundProcesses } from "../../core/background-shell.js";
|
|
9
|
+
import { createBackgroundOutputFile, envDeclaresRetain, hasBackgroundShell, retainsBackgroundProcesses } from "../../core/background-shell.js";
|
|
10
10
|
import { delimitUntrusted } from "../../core/untrusted-text.js";
|
|
11
|
-
import {
|
|
11
|
+
import { resolveImageProcessor } from "../../core/image-downsample.js";
|
|
12
12
|
import { withinAnyRoot } from "./safety.js";
|
|
13
|
-
import {
|
|
13
|
+
import { admitImageBytes, sniffImageMime } from "../../core/image-admission.js";
|
|
14
14
|
import { isDeadCwd, diagnoseDeadCwd } from "./dead-cwd.js";
|
|
15
15
|
import { boundaryIsTheSandbox, hasDestroy, isIsolated } from "../../core/remote-env.js";
|
|
16
16
|
import { ghRateLimitHint } from "./gh-rate-limit.js";
|
|
17
|
-
import { backgroundLifetimeNote } from "./fs-bash-background-text.js";
|
|
17
|
+
import { backgroundLifetimeNote, ONE_SHOT_BACKGROUND_COMMAND_NOTE } from "./fs-bash-background-text.js";
|
|
18
|
+
import { resolveCompletionSink } from "../../core/task-notification.js";
|
|
18
19
|
import { resolveBashTimeoutCaps, bashTimeoutCapsSec, bashTimeoutArgRefusal, bashTimeoutParamDescription, envErrorDetail, bashMaxOutputChars, clipShellOutput, writeShellOverflowFile, shellRecoveryHint, CWD_SENTINEL, stripCwdSentinel, } from "./fs-shared.js";
|
|
19
20
|
import { bashClassifyDefaultAllow, BASH_READONLY_DEFAULT_ALLOW, classifyBoundedReadonlyPollLoopDetailed, classifyCompoundReadonlyDetailed, parseLeadingCommandName } from "./bash-readonly-classifier.js";
|
|
20
21
|
import { readOnlyShellVerdict } from "../../core/read-only-shell.js";
|
|
@@ -92,20 +93,17 @@ export function bashExitOneInterpretation(command) {
|
|
|
92
93
|
}
|
|
93
94
|
return EXIT1_INTERPRETATION[name];
|
|
94
95
|
}
|
|
95
|
-
function dataUriImageFromStdout(stdout) {
|
|
96
|
+
async function dataUriImageFromStdout(stdout, imageProcessor) {
|
|
96
97
|
const t = stdout.trim();
|
|
97
98
|
const m = /^data:image\/[a-z0-9.+_-]+;base64,([A-Za-z0-9+/=\s]+)$/i.exec(t);
|
|
98
99
|
if (!m)
|
|
99
100
|
return undefined;
|
|
100
|
-
const
|
|
101
|
-
|
|
101
|
+
const bytes = Buffer.from(m[1].replace(/\s/g, ""), "base64");
|
|
102
|
+
const mime = sniffImageMime(bytes);
|
|
103
|
+
if (mime === undefined)
|
|
102
104
|
return undefined;
|
|
103
|
-
const
|
|
104
|
-
|
|
105
|
-
if (imageMagicMatches(bytes, mime))
|
|
106
|
-
return { data, mime };
|
|
107
|
-
}
|
|
108
|
-
return undefined;
|
|
105
|
+
const admitted = await admitImageBytes(bytes, mime, await resolveImageProcessor(imageProcessor));
|
|
106
|
+
return admitted.ok ? admitted.block : undefined;
|
|
109
107
|
}
|
|
110
108
|
const AUTO_BACKGROUND_BLOCKED_FIRST_WORDS = new Set(["sleep"]);
|
|
111
109
|
function pastAutoBackgroundWrapperPrefixes(words) {
|
|
@@ -292,7 +290,7 @@ function startLivenessTicks(onTick, filterStderr) {
|
|
|
292
290
|
stop: () => clearInterval(timer),
|
|
293
291
|
};
|
|
294
292
|
}
|
|
295
|
-
async function runShell(env, cwd, toolName, command, timeoutSec, caps, signal, cwdRef, detach, readOnly, containmentRoots, onTick, readFloor) {
|
|
293
|
+
async function runShell(env, cwd, toolName, command, timeoutSec, caps, signal, cwdRef, detach, readOnly, containmentRoots, onTick, readFloor, imageProcessor) {
|
|
296
294
|
const requestedSec = Math.max(1, Math.floor(timeoutSec ?? caps.defaultSec));
|
|
297
295
|
let timeout = Math.min(caps.maxSec, requestedSec);
|
|
298
296
|
const cappedByMaxTimeout = requestedSec > caps.maxSec;
|
|
@@ -449,13 +447,13 @@ async function runShell(env, cwd, toolName, command, timeoutSec, caps, signal, c
|
|
|
449
447
|
: "";
|
|
450
448
|
const clippedStdout = clipShellOutput(stdout);
|
|
451
449
|
const clippedStderr = clipShellOutput(stderr);
|
|
452
|
-
const stdoutImage = dataUriImageFromStdout(stdout);
|
|
450
|
+
const stdoutImage = await dataUriImageFromStdout(stdout, imageProcessor);
|
|
453
451
|
if (stdoutImage) {
|
|
454
452
|
const imgOverflowFile = stderr.length > bashMaxOutputChars() ? await writeShellOverflowFile(env, "", stderr) : undefined;
|
|
455
453
|
const imgOverflowNote = imgOverflowFile !== undefined ? shellRecoveryHint(imgOverflowFile, readOnly) : "";
|
|
456
454
|
return {
|
|
457
455
|
content: [
|
|
458
|
-
|
|
456
|
+
stdoutImage,
|
|
459
457
|
{ type: "text", text: `exit code: ${exitCode}\n[Image data detected in stdout and shown above]${stderr.trim() !== "" ? `\n--- stderr ---\n${clippedStderr}` : ""}${imgOverflowNote}${cwdOutsideNote ? `\n${cwdOutsideNote}` : ""}${survivedCapNote ? `\n${survivedCapNote}` : ""}` },
|
|
460
458
|
],
|
|
461
459
|
details: { type: "bash", stdout: "[image data]", stderr: clippedStderr, exitCode, isImage: true, ...(imgOverflowFile !== undefined ? { output_file: imgOverflowFile } : {}), ...(cappedByMaxTimeout ? { requestedTimeoutSec: requestedSec, cappedToMaxTimeoutSec: caps.maxSec } : {}) },
|
|
@@ -492,7 +490,7 @@ function bashDescription(coAuthor, caps, bgNotifies = false, bgRetained = false,
|
|
|
492
490
|
: `- End git commit messages with:\nCo-Authored-By: ${coAuthor}`;
|
|
493
491
|
return `Executes a bash command and returns its output.
|
|
494
492
|
|
|
495
|
-
- Working directory persists between calls, but prefer absolute paths — a \`cd\` carries over and moves the base for every later command. Shell state (env vars, functions) does not persist; the shell is re-initialized each call
|
|
493
|
+
- Working directory persists between calls, but prefer absolute paths — each call starts in the directory the previous call ended in, so a \`cd\` carries over and moves the base for every later command. Shell state (env vars, functions) does not persist; the shell is re-initialized each call.
|
|
496
494
|
- IMPORTANT: Avoid using this tool to run \`cat\`, \`head\`, \`tail\`, \`sed\`, \`awk\`, or \`echo\` commands, unless explicitly instructed or after you have verified that a dedicated tool cannot accomplish your task. Instead, use the appropriate dedicated tool as this will provide a much better experience for the user.
|
|
497
495
|
- File search by name: use the Glob tool (NOT \`find\` or \`ls\`); content search: use the Grep tool (NOT \`grep\`/\`rg\` in the shell).
|
|
498
496
|
- \`timeout\` is in milliseconds: default ${caps.defaultMs}, max ${caps.maxMs}.
|
|
@@ -509,19 +507,12 @@ ${coAuthorLines}
|
|
|
509
507
|
- Treat evidence of a deployment restriction — "Operation not permitted", "Read-only file system", a denied path, or a network failure — as a boundary, not a bug: adjust within the allowed scope or report the limit; don't reach for a destructive or privilege-escalating workaround.`;
|
|
510
508
|
}
|
|
511
509
|
async function adoptBackgroundShell(req) {
|
|
512
|
-
const { env, shellId, registry, description, toolUseId, ctxTaskId, ctxPrincipal, wiring } = req;
|
|
510
|
+
const { env, shellId, registry, description, toolUseId, ctxTaskId, ctxPrincipal, ctxTaskArtifacts, wiring } = req;
|
|
513
511
|
const sessionScoped = wiring.sessionId !== undefined;
|
|
514
512
|
const owner = sessionScoped ? wiring.sessionId : (ctxTaskId ?? wiring.taskOwner);
|
|
515
513
|
const scope = ctxPrincipal ?? wiring.taskScope;
|
|
516
514
|
const onNotify = wiring.onNotify;
|
|
517
|
-
|
|
518
|
-
if (onNotify !== undefined) {
|
|
519
|
-
const tf = await env.createTempFile({ prefix: "bash-task-", suffix: ".output" });
|
|
520
|
-
if (tf.ok) {
|
|
521
|
-
const tfCanon = await env.canonicalPath(tf.value);
|
|
522
|
-
outputFile = tfCanon.ok ? tfCanon.value : tf.value;
|
|
523
|
-
}
|
|
524
|
-
}
|
|
515
|
+
const outputFile = onNotify !== undefined ? await createBackgroundOutputFile(env, "bash-task-") : undefined;
|
|
525
516
|
try {
|
|
526
517
|
const taskId = registry.registerBackgroundBash({
|
|
527
518
|
env,
|
|
@@ -532,6 +523,7 @@ async function adoptBackgroundShell(req) {
|
|
|
532
523
|
...(scope !== undefined ? { scope } : {}),
|
|
533
524
|
...(sessionScoped ? { sessionScoped: true } : {}),
|
|
534
525
|
...(outputFile !== undefined ? { outputFile } : {}),
|
|
526
|
+
...(ctxTaskArtifacts !== undefined ? { taskArtifacts: ctxTaskArtifacts } : {}),
|
|
535
527
|
...(onNotify !== undefined ? { onTerminal: (n) => onNotify(n, { priority: "next" }) } : {}),
|
|
536
528
|
...(wiring.retainBackgroundProcesses !== undefined ? { retainBackgroundProcesses: wiring.retainBackgroundProcesses } : {}),
|
|
537
529
|
});
|
|
@@ -629,7 +621,7 @@ export function createBashTool(env, rootCanonical, coAuthor = false, cwdRef = {
|
|
|
629
621
|
const lifetimeNote = backgroundLifetimeNote(bgRetained, bgSessionScoped, bgEnvIsolatedOwned);
|
|
630
622
|
const registry = taskOpts.taskRegistry;
|
|
631
623
|
if (registry !== undefined) {
|
|
632
|
-
const onNotify = taskOpts.onTaskNotification;
|
|
624
|
+
const onNotify = resolveCompletionSink(ctx.onTaskNotification, taskOpts.onTaskNotification);
|
|
633
625
|
const adopted = await adoptBackgroundShell({
|
|
634
626
|
env,
|
|
635
627
|
shellId: r.value.shellId,
|
|
@@ -638,6 +630,7 @@ export function createBashTool(env, rootCanonical, coAuthor = false, cwdRef = {
|
|
|
638
630
|
toolUseId: ctx.toolCallId,
|
|
639
631
|
ctxTaskId: ctx.taskId,
|
|
640
632
|
ctxPrincipal: ctx.principal,
|
|
633
|
+
ctxTaskArtifacts: ctx.taskArtifacts,
|
|
641
634
|
wiring: { sessionId: taskOpts.sessionId, taskOwner: taskOpts.taskOwner, taskScope: taskOpts.taskScope, onNotify, retainBackgroundProcesses: taskOpts.retainBackgroundProcesses },
|
|
642
635
|
});
|
|
643
636
|
if (!adopted.ok) {
|
|
@@ -657,9 +650,7 @@ export function createBashTool(env, rootCanonical, coAuthor = false, cwdRef = {
|
|
|
657
650
|
? ` Output file: ${outputFile} (full output is appended there — Read it any time).`
|
|
658
651
|
: ` Use TaskOutput("${taskId}") to check interim output.`;
|
|
659
652
|
if (taskOpts.oneShot === true && onNotify !== undefined) {
|
|
660
|
-
return
|
|
661
|
-
budgetNote +
|
|
662
|
-
lifetimeNote);
|
|
653
|
+
return `Command running in background; task_id=${taskId}.${interimNote} ${ONE_SHOT_BACKGROUND_COMMAND_NOTE} TaskStop("${taskId}") to stop.` + budgetNote + lifetimeNote;
|
|
663
654
|
}
|
|
664
655
|
return onNotify !== undefined
|
|
665
656
|
? `Command running in background; task_id=${taskId}.${interimNote} You will be notified when it completes — do not poll; ` +
|
|
@@ -701,7 +692,7 @@ export function createBashTool(env, rootCanonical, coAuthor = false, cwdRef = {
|
|
|
701
692
|
? {
|
|
702
693
|
signal: detachHub.signalFor(ctx.toolCallId),
|
|
703
694
|
onDetached: async (shellId, stdoutSoFar, stderrSoFar, cause) => {
|
|
704
|
-
const onNotify = taskOpts.onTaskNotification;
|
|
695
|
+
const onNotify = resolveCompletionSink(ctx.onTaskNotification, taskOpts.onTaskNotification);
|
|
705
696
|
const adopted = await adoptBackgroundShell({
|
|
706
697
|
env: detachEnv,
|
|
707
698
|
shellId: shellId,
|
|
@@ -710,6 +701,7 @@ export function createBashTool(env, rootCanonical, coAuthor = false, cwdRef = {
|
|
|
710
701
|
toolUseId: ctx.toolCallId,
|
|
711
702
|
ctxTaskId: ctx.taskId,
|
|
712
703
|
ctxPrincipal: ctx.principal,
|
|
704
|
+
ctxTaskArtifacts: ctx.taskArtifacts,
|
|
713
705
|
wiring: { sessionId: taskOpts.sessionId, taskOwner: taskOpts.taskOwner, taskScope: taskOpts.taskScope, onNotify, retainBackgroundProcesses: taskOpts.retainBackgroundProcesses },
|
|
714
706
|
});
|
|
715
707
|
if (!adopted.ok) {
|
|
@@ -752,8 +744,7 @@ export function createBashTool(env, rootCanonical, coAuthor = false, cwdRef = {
|
|
|
752
744
|
: `Use TaskOutput("${taskId}") to read its output. `) +
|
|
753
745
|
`TaskStop("${taskId}") to stop it. ` +
|
|
754
746
|
(taskOpts.oneShot === true && onNotify !== undefined
|
|
755
|
-
?
|
|
756
|
-
`This is a ONE-SHOT submission — there is no later turn for a background notification to land in, so do NOT end your turn expecting one. Actively wait instead: TaskOutput({ task_id: "${taskId}", block: true }).`
|
|
747
|
+
? ONE_SHOT_BACKGROUND_COMMAND_NOTE
|
|
757
748
|
: onNotify !== undefined
|
|
758
749
|
? `You will be notified when it completes — do not poll.`
|
|
759
750
|
: `Poll TaskOutput until its status is no longer "running".`) +
|
|
@@ -768,7 +759,7 @@ export function createBashTool(env, rootCanonical, coAuthor = false, cwdRef = {
|
|
|
768
759
|
: undefined;
|
|
769
760
|
let res;
|
|
770
761
|
try {
|
|
771
|
-
res = await runShell(env, rootCanonical, "Bash", command, msTimeoutToRequestedSec(timeout), timeoutCapsSecView, ctx.signal, cwdRef, detachChain, false, [rootCanonical, ...(taskOpts.additionalRoots ?? [])], onTick, taskOpts.readFloor?.(ctx.toolCallId));
|
|
762
|
+
res = await runShell(env, rootCanonical, "Bash", command, msTimeoutToRequestedSec(timeout), timeoutCapsSecView, ctx.signal, cwdRef, detachChain, false, [rootCanonical, ...(taskOpts.additionalRoots ?? [])], onTick, taskOpts.readFloor?.(ctx.toolCallId), taskOpts.imageProcessor);
|
|
772
763
|
}
|
|
773
764
|
finally {
|
|
774
765
|
taskOpts.detachHub?.gc(ctx.toolCallId);
|
|
@@ -814,7 +805,7 @@ export function createBashReadonlyTool(env, rootCanonical, allow, opts) {
|
|
|
814
805
|
if (refused !== undefined)
|
|
815
806
|
return refused;
|
|
816
807
|
const readOnlyTick = opts?.onToolProgress === undefined ? undefined : (t) => describeSafely(opts.onToolProgress, { toolCallId: ctx.toolCallId, toolName: "Bash", ...t });
|
|
817
|
-
return await runShell(env, rootCanonical, "Bash", command, msTimeoutToRequestedSec(timeout), timeoutCapsSecView, ctx.signal, undefined, undefined, true, undefined, readOnlyTick, opts?.readFloor?.(ctx.toolCallId));
|
|
808
|
+
return await runShell(env, rootCanonical, "Bash", command, msTimeoutToRequestedSec(timeout), timeoutCapsSecView, ctx.signal, undefined, undefined, true, undefined, readOnlyTick, opts?.readFloor?.(ctx.toolCallId), opts?.imageProcessor);
|
|
818
809
|
},
|
|
819
810
|
});
|
|
820
811
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { DocumentContent, ImageContent, TextContent } from "../../internal/llm.js";
|
|
2
2
|
import type { ExecutionEnv } from "../../internal/harness-types.js";
|
|
3
|
+
import { type ImageDownsampler } from "../../core/image-downsample.js";
|
|
3
4
|
import { type PdfModelCapabilities } from "./pdf.js";
|
|
4
|
-
import { type ReadImageDownsamplerOption } from "./fs-shared.js";
|
|
5
5
|
import { type ReminderDisclosureEffects } from "../../core/reminder-disclosure.js";
|
|
6
6
|
/** The reader's disclosure state, threaded into the PDF TEXT legs (the two `pdftotext` extraction arms —
|
|
7
7
|
* the only PDF returns with a model-facing text projection of the document; the native document block and
|
|
@@ -44,4 +44,4 @@ type ReadPdfReturn = string | {
|
|
|
44
44
|
* Every degraded return carries `details.fallback = { level, reason }` (telemetry on the structured frame).
|
|
45
45
|
* `caps` absent ⇒ fully capable (native document block; the brain placeholder still guards).
|
|
46
46
|
*/
|
|
47
|
-
export declare function readPdfFile(env: ExecutionEnv, path: string, key: string, pages: string | undefined, signal: AbortSignal | undefined,
|
|
47
|
+
export declare function readPdfFile(env: ExecutionEnv, path: string, key: string, pages: string | undefined, signal: AbortSignal | undefined, imageProcessor: ImageDownsampler | false | undefined, cwd: string, preRead?: Uint8Array, caps?: PdfModelCapabilities, readDeny?: import("./read-deny.js").ReadDenyMatcher, disclosure?: PdfReminderDisclosure): Promise<ReadPdfReturn>;
|
package/dist/tools/fs/fs-pdf.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { delimitUntrusted } from "../../core/untrusted-text.js";
|
|
2
|
-
import {
|
|
2
|
+
import { resolveImageProcessor } from "../../core/image-downsample.js";
|
|
3
3
|
import { PDF_FALLBACK_RENDER_PAGES, PDF_INLINE_PAGE_THRESHOLD, PDF_MAX_EXTRACT_SIZE, PDF_MAX_PAGES_PER_READ, extractPdfPagesAsImages, extractPdfTextLayer, getPdfPageCount, parsePdfPageRange, pdfCutWords, } from "./pdf.js";
|
|
4
|
-
import { PDF_TARGET_RAW_SIZE, pdfMagicMatches } from "../../core/image-admission.js";
|
|
5
|
-
import {
|
|
4
|
+
import { admitImageBytes, IMAGE_ADMISSION, PDF_TARGET_RAW_SIZE, pdfMagicMatches, unprocessedSizeClause } from "../../core/image-admission.js";
|
|
5
|
+
import { enoentMessage, MAX_READ_BYTES } from "./fs-shared.js";
|
|
6
6
|
import { planReminderDisclosure, renderReminderDisclosureTrailer } from "../../core/reminder-disclosure.js";
|
|
7
7
|
import { MARKED_BLOCK_AFTER_DATA } from "../../core/reminder-mint.js";
|
|
8
8
|
function pdfDisclosureTrailer(body, d) {
|
|
@@ -14,33 +14,38 @@ function pdfDisclosureTrailer(body, d) {
|
|
|
14
14
|
return trailer !== undefined ? `${MARKED_BLOCK_AFTER_DATA}${trailer}` : "";
|
|
15
15
|
}
|
|
16
16
|
export { pdfModelCapabilitiesOf } from "./pdf.js";
|
|
17
|
-
async function pdfPagesToImageBlocks(pages, path,
|
|
18
|
-
const
|
|
17
|
+
async function pdfPagesToImageBlocks(pages, path, imageProcessor) {
|
|
18
|
+
const processor = await resolveImageProcessor(imageProcessor);
|
|
19
19
|
const blocks = [];
|
|
20
20
|
for (const p of pages) {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
const out = await downsampler(Buffer.from(p.jpeg), "image/jpeg").catch(() => undefined);
|
|
25
|
-
if (out) {
|
|
26
|
-
b64 = out.base64;
|
|
27
|
-
mime = out.mimeType;
|
|
28
|
-
}
|
|
29
|
-
}
|
|
30
|
-
b64 ??= Buffer.from(p.jpeg).toString("base64");
|
|
31
|
-
if (b64.length > MCP_IMAGE_MAX_BASE64) {
|
|
32
|
-
return `Error (Read): rendered page ${p.pageNumber} of "${path}" is too large to send (base64 ${b64.length} chars exceeds the ${MCP_IMAGE_MAX_BASE64}-char / 5MB API image limit); narrow the range or extract text via Bash (e.g. \`pdftotext\`).`;
|
|
21
|
+
const admitted = await admitImageBytes(p.jpeg, "image/jpeg", processor);
|
|
22
|
+
if (!admitted.ok) {
|
|
23
|
+
return `Error (Read): rendered page ${p.pageNumber} of "${path}" cannot be sent (${pageRefusal(admitted)}); narrow the range or extract text via Bash (e.g. \`pdftotext\`).`;
|
|
33
24
|
}
|
|
34
|
-
blocks.push(
|
|
25
|
+
blocks.push(admitted.block);
|
|
35
26
|
}
|
|
36
27
|
return blocks;
|
|
37
28
|
}
|
|
29
|
+
function pageRefusal(a) {
|
|
30
|
+
switch (a.reason) {
|
|
31
|
+
case "mime_unsupported":
|
|
32
|
+
case "magic_mismatch":
|
|
33
|
+
return "the renderer's output is not a valid JPEG";
|
|
34
|
+
case "raw_too_large":
|
|
35
|
+
return `${a.rawBytes} bytes, over the ${a.cap}-byte read cap`;
|
|
36
|
+
case "dimensions_unreadable":
|
|
37
|
+
case "dimensions_too_large":
|
|
38
|
+
return unprocessedSizeClause(a);
|
|
39
|
+
case "base64_too_large":
|
|
40
|
+
return `base64 ${a.base64.length} chars exceeds the ${IMAGE_ADMISSION.hard.imageBase64Chars}-char / 5MB API image limit`;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
38
43
|
function boundPdfExtractedText(text) {
|
|
39
44
|
if (Buffer.byteLength(text, "utf8") <= MAX_READ_BYTES)
|
|
40
45
|
return { body: text, truncated: false };
|
|
41
46
|
return { body: text.slice(0, MAX_READ_BYTES), truncated: true };
|
|
42
47
|
}
|
|
43
|
-
export async function readPdfFile(env, path, key, pages, signal,
|
|
48
|
+
export async function readPdfFile(env, path, key, pages, signal, imageProcessor, cwd, preRead, caps, readDeny, disclosure) {
|
|
44
49
|
const cap = caps ?? { document: true, vision: true };
|
|
45
50
|
const meta = await env.fileInfo(key, signal);
|
|
46
51
|
if (!meta.ok) {
|
|
@@ -125,7 +130,7 @@ export async function readPdfFile(env, path, key, pages, signal, downsamplerOpt,
|
|
|
125
130
|
}
|
|
126
131
|
return `Error (Read): PDF page extraction failed for "${path}": ${extract.error}`;
|
|
127
132
|
}
|
|
128
|
-
const blocks = await pdfPagesToImageBlocks(extract.pages, path,
|
|
133
|
+
const blocks = await pdfPagesToImageBlocks(extract.pages, path, imageProcessor);
|
|
129
134
|
if (typeof blocks === "string")
|
|
130
135
|
return blocks;
|
|
131
136
|
const requestedPages = last - range.first + 1;
|
|
@@ -192,7 +197,7 @@ export async function readPdfFile(env, path, key, pages, signal, downsamplerOpt,
|
|
|
192
197
|
const n = Math.min(PDF_FALLBACK_RENDER_PAGES, pageCount ?? PDF_FALLBACK_RENDER_PAGES);
|
|
193
198
|
const extract = await extractPdfPagesAsImages(env, key, 1, n, signal);
|
|
194
199
|
if (extract.ok) {
|
|
195
|
-
const blocks = await pdfPagesToImageBlocks(extract.pages, path,
|
|
200
|
+
const blocks = await pdfPagesToImageBlocks(extract.pages, path, imageProcessor);
|
|
196
201
|
if (typeof blocks !== "string") {
|
|
197
202
|
const renderTimeoutNote = extract.cut !== undefined ? ` pdftoppm ${pdfCutWords(extract.cut).clause} — only the pages that finished rendering are included.` : "";
|
|
198
203
|
return {
|
|
@@ -3,9 +3,9 @@ import type { AgentTool, ExecutionEnv } from "../../internal/harness-types.js";
|
|
|
3
3
|
import { errorResult } from "../../core/tools.js";
|
|
4
4
|
import type { ToolReturn } from "../../core/tool-spec.js";
|
|
5
5
|
import { type ReadEntry, type ReadFileState, type RootsSeat } from "./safety.js";
|
|
6
|
-
import { type ImageDimensions } from "../../core/
|
|
6
|
+
import { type ImageDimensions, type ImageDownsampler } from "../../core/image-downsample.js";
|
|
7
7
|
import { type PdfModelCapabilities } from "./pdf.js";
|
|
8
|
-
import { type
|
|
8
|
+
import { type CwdRef } from "./fs-shared.js";
|
|
9
9
|
import { type ReminderDisclosureCounts, type ReminderDisclosureEffects, type ReminderDisclosureVerdict } from "../../core/reminder-disclosure.js";
|
|
10
10
|
import { type DirectoryListing } from "./dir-entries.js";
|
|
11
11
|
import { FileError, type BoundFileObject, type Result } from "../../internal/harness.js";
|
|
@@ -174,7 +174,8 @@ export interface ModelFileReaderOptions {
|
|
|
174
174
|
rootCanonical: string;
|
|
175
175
|
cwdRef?: CwdRef;
|
|
176
176
|
additionalRoots?: RootsSeat;
|
|
177
|
-
|
|
177
|
+
/** The run's image processor seat (`RunnerDeps.imageProcessor`): a processor, `false` (none), absent = auto-detect. */
|
|
178
|
+
imageProcessor?: ImageDownsampler | false;
|
|
178
179
|
pdfCapabilities?: PdfModelCapabilities;
|
|
179
180
|
/** See createReadFileTool's seat of the same name. */
|
|
180
181
|
bgOutputReadExemption?: (canonicalKey: string, ctx: {
|
|
@@ -229,7 +230,7 @@ export declare function createModelFileReader(opts: ModelFileReaderOptions): Mod
|
|
|
229
230
|
export declare function renderReadNoteForTool(note: ReadNote, mark: string | undefined): string;
|
|
230
231
|
/** The Read tool's result for one read — the composition each lane has always returned. */
|
|
231
232
|
export declare function renderReadToolResult(r: ReadForModelResult, mark: string | undefined): ToolReturn;
|
|
232
|
-
export declare function createReadFileTool(env: ExecutionEnv, state: ReadFileState, rootCanonical: string, cwdRef?: CwdRef, additionalRoots?: RootsSeat,
|
|
233
|
+
export declare function createReadFileTool(env: ExecutionEnv, state: ReadFileState, rootCanonical: string, cwdRef?: CwdRef, additionalRoots?: RootsSeat, imageProcessor?: ImageDownsampler | false, pdfCapabilities?: PdfModelCapabilities, bgOutputReadExemption?: (canonicalKey: string, ctx: {
|
|
233
234
|
taskId?: string;
|
|
234
235
|
principal?: string;
|
|
235
236
|
toolCallId?: string;
|
package/dist/tools/fs/fs-read.js
CHANGED
|
@@ -3,9 +3,9 @@ import { defineTool, errorResult } from "../../core/tools.js";
|
|
|
3
3
|
import { sha256, resolveKey, violationText, violationDetails, binaryMagicFormat, hasBinaryExtension, isBinaryContent, imageMimeForRead, } from "./safety.js";
|
|
4
4
|
import { decodeTextBytes } from "./encoding.js";
|
|
5
5
|
import { isNotebookPath, parseNotebookCells, renderNotebookCells, stripNotebookImageData, NOTEBOOK_IMAGE_BASE64_BUDGET } from "./notebook.js";
|
|
6
|
-
import {
|
|
6
|
+
import { resolveImageProcessor } from "../../core/image-downsample.js";
|
|
7
7
|
import { countPdfPagesFromBytes, PDF_MAX_PAGES_PER_READ } from "./pdf.js";
|
|
8
|
-
import { MAX_READ_BYTES, SLICED_READ_MAX_BYTES, NO_DOWNSAMPLER_IMAGE_CAP_HINT,
|
|
8
|
+
import { MAX_READ_BYTES, SLICED_READ_MAX_BYTES, NO_DOWNSAMPLER_IMAGE_CAP_HINT, MAX_READ_OUTPUT_CHARS, FILE_PATH_PARAMS, countLines, seededFileUnchangedReminder, enoentMessage, } from "./fs-shared.js";
|
|
9
9
|
import { readPdfFile } from "./fs-pdf.js";
|
|
10
10
|
import { seatForCall, seatReady } from "./read-deny.js";
|
|
11
11
|
import { thrownText } from "../../core/thrown-value.js";
|
|
@@ -13,14 +13,28 @@ import { MARKED_BLOCK_AFTER_DATA, openSystemReminder } from "../../core/reminder
|
|
|
13
13
|
import { planReminderDisclosure, commitReminderDisclosureEffects, renderReminderDisclosureTrailer, } from "../../core/reminder-disclosure.js";
|
|
14
14
|
import { toolFace } from "../../core/tool-catalog-entries.js";
|
|
15
15
|
import { fileArgPath } from "../../core/tool-registry.js";
|
|
16
|
-
import { admitImageBytes, imageReadCap, PDF_TARGET_RAW_SIZE, pdfMagicMatches } from "../../core/image-admission.js";
|
|
16
|
+
import { admitImageBytes, IMAGE_ADMISSION, imageReadCap, PDF_TARGET_RAW_SIZE, pdfMagicMatches, unprocessedSizeClause } from "../../core/image-admission.js";
|
|
17
17
|
import { createEntryDenyJudge, enumerateDirectory } from "./dir-entries.js";
|
|
18
18
|
import { FileError } from "../../internal/harness.js";
|
|
19
19
|
export const READ_OUTCOMES = Object.freeze(["attached", "partial", "unchanged", "not_attached"]);
|
|
20
20
|
const UNBINDABLE = "this environment cannot bind a read to the file that was checked, so it was not read";
|
|
21
21
|
const NO_EFFECTS = () => ({ disclosure: [] });
|
|
22
|
+
async function admitNotebookImages(blocks, imageProcessor) {
|
|
23
|
+
if (!blocks.some((b) => b.type === "image"))
|
|
24
|
+
return blocks;
|
|
25
|
+
const processor = await resolveImageProcessor(imageProcessor);
|
|
26
|
+
return Promise.all(blocks.map(async (b) => {
|
|
27
|
+
if (b.type !== "image")
|
|
28
|
+
return b;
|
|
29
|
+
const a = await admitImageBytes(Buffer.from(b.data, "base64"), b.mimeType, processor);
|
|
30
|
+
if (a.ok)
|
|
31
|
+
return a.block;
|
|
32
|
+
const why = a.reason === "dimensions_unreadable" || a.reason === "dimensions_too_large" ? `: ${unprocessedSizeClause(a)}` : "";
|
|
33
|
+
return { type: "text", text: `[image output not shown (media admission: ${a.reason})${why}]` };
|
|
34
|
+
}));
|
|
35
|
+
}
|
|
22
36
|
export function createModelFileReader(opts) {
|
|
23
|
-
const { env, state, rootCanonical, cwdRef,
|
|
37
|
+
const { env, state, rootCanonical, cwdRef, imageProcessor, pdfCapabilities, bgOutputReadExemption, readFace, reminderMark, readDeny: readDenySeat, additionalRoots: rootsSeat } = opts;
|
|
24
38
|
const windows = opts.disclosureWindows ?? new Map();
|
|
25
39
|
const refuse = (envelope, kind) => ({
|
|
26
40
|
outcome: "not_attached",
|
|
@@ -77,16 +91,16 @@ export function createModelFileReader(opts) {
|
|
|
77
91
|
return refuse(errorResult(`Error (Read): ${await enoentMessage(env, r.key, cwdRef?.current ?? rootCanonical, ctx.signal, readDeny)}`), "image");
|
|
78
92
|
return refuse(errorResult(`Error (Read): cannot stat image "${path}" to verify its size before reading: ${meta.error.message}`), "image");
|
|
79
93
|
}
|
|
80
|
-
const
|
|
81
|
-
const readCap = imageReadCap(
|
|
82
|
-
const
|
|
83
|
-
|
|
94
|
+
const processor = await resolveImageProcessor(imageProcessor);
|
|
95
|
+
const readCap = imageReadCap(processor);
|
|
96
|
+
const noProcessorHint = processor === "none" ? ` ${NO_DOWNSAMPLER_IMAGE_CAP_HINT}` : "";
|
|
97
|
+
const tooLargeToRead = (bytes) => `Error (Read): image "${path}" is too large to read (${bytes} bytes > ${readCap}-byte cap).${noProcessorHint}`;
|
|
84
98
|
if (meta.value.size > readCap)
|
|
85
99
|
return refuse(errorResult(tooLargeToRead(meta.value.size)), "image");
|
|
86
100
|
const bin = await readBytes(r.key, readCap);
|
|
87
101
|
if (!bin.ok)
|
|
88
102
|
return refuse(errorResult(`Error (Read): cannot read image "${path}": ${bin.error.message}`), "image");
|
|
89
|
-
const admitted = await admitImageBytes(bin.value, imageMime,
|
|
103
|
+
const admitted = await admitImageBytes(bin.value, imageMime, processor);
|
|
90
104
|
if (!admitted.ok) {
|
|
91
105
|
switch (admitted.reason) {
|
|
92
106
|
case "raw_too_large":
|
|
@@ -94,11 +108,14 @@ export function createModelFileReader(opts) {
|
|
|
94
108
|
case "magic_mismatch":
|
|
95
109
|
case "mime_unsupported":
|
|
96
110
|
return refuse(errorResult(`Error (Read): "${path}" has an image extension but its content is not a valid ${imageMime} (empty, truncated, or mis-named).`), "image");
|
|
111
|
+
case "dimensions_unreadable":
|
|
112
|
+
case "dimensions_too_large":
|
|
113
|
+
return refuse(errorResult(`Error (Read): image "${path}" cannot be sent: ${unprocessedSizeClause(admitted)}.${noProcessorHint}`), "image");
|
|
97
114
|
case "base64_too_large":
|
|
98
|
-
return refuse(errorResult(`Error (Read): image "${path}" is too large to send (${bin.value.byteLength} bytes; base64 ${admitted.base64.length} chars exceeds the ${
|
|
99
|
-
(
|
|
100
|
-
? ";
|
|
101
|
-
: `; raw images over ${
|
|
115
|
+
return refuse(errorResult(`Error (Read): image "${path}" is too large to send (${bin.value.byteLength} bytes; base64 ${admitted.base64.length} chars exceeds the ${IMAGE_ADMISSION.hard.imageBase64Chars}-char / 5MB API image limit` +
|
|
116
|
+
(processor !== "none"
|
|
117
|
+
? "; processing could not bring it under the limit)."
|
|
118
|
+
: `; raw images over ${IMAGE_ADMISSION.soft.rawBytes} bytes always exceed it — shrink it first, e.g. with an image tool via bash).`)), "image");
|
|
102
119
|
}
|
|
103
120
|
}
|
|
104
121
|
const { block, dimensions, originalSize, resized } = admitted;
|
|
@@ -135,7 +152,7 @@ export function createModelFileReader(opts) {
|
|
|
135
152
|
};
|
|
136
153
|
}
|
|
137
154
|
const effects = [];
|
|
138
|
-
const out = await readPdfFile(env, path, r.key, pages, ctx.signal,
|
|
155
|
+
const out = await readPdfFile(env, path, r.key, pages, ctx.signal, imageProcessor, cwdRef?.current ?? rootCanonical, preRead, pdfCapabilities, readDeny, {
|
|
139
156
|
mark: reminderMark,
|
|
140
157
|
windows,
|
|
141
158
|
key: r.key,
|
|
@@ -195,7 +212,7 @@ export function createModelFileReader(opts) {
|
|
|
195
212
|
`this tool reads UTF-8 and BOM-marked UTF-16LE text only. Inspect or convert it with bash instead.`), "text");
|
|
196
213
|
}
|
|
197
214
|
const decoded = decodeTextBytes(readBin.value);
|
|
198
|
-
if (decoded.malformed) {
|
|
215
|
+
if (decoded.malformed === "truncated_utf16") {
|
|
199
216
|
return refuse(errorResult(`Error (Read): "${path}" has a UTF-16 BOM but a truncated (odd-length) body — the file is corrupt or mis-labelled; repair/convert it with bash (e.g. \`iconv\`) first.`), "text");
|
|
200
217
|
}
|
|
201
218
|
const content = decoded.text;
|
|
@@ -249,7 +266,7 @@ export function createModelFileReader(opts) {
|
|
|
249
266
|
return {
|
|
250
267
|
outcome: "attached",
|
|
251
268
|
kind: "notebook",
|
|
252
|
-
data: rendered.blocks,
|
|
269
|
+
data: await admitNotebookImages(rendered.blocks, imageProcessor),
|
|
253
270
|
notes,
|
|
254
271
|
details: { type: "notebook", file: { filePath: path, cells: parsed.cells.map(stripNotebookImageData) } },
|
|
255
272
|
observation,
|
|
@@ -435,14 +452,14 @@ export function renderReadToolResult(r, mark) {
|
|
|
435
452
|
}
|
|
436
453
|
}
|
|
437
454
|
}
|
|
438
|
-
export function createReadFileTool(env, state, rootCanonical, cwdRef, additionalRoots,
|
|
455
|
+
export function createReadFileTool(env, state, rootCanonical, cwdRef, additionalRoots, imageProcessor, pdfCapabilities, bgOutputReadExemption, readDeny, readFace, reminderMark, reminderDisclosureCounts, sharedReader) {
|
|
439
456
|
const reader = sharedReader ?? createModelFileReader({
|
|
440
457
|
env,
|
|
441
458
|
state,
|
|
442
459
|
rootCanonical,
|
|
443
460
|
...(cwdRef !== undefined ? { cwdRef } : {}),
|
|
444
461
|
...(additionalRoots !== undefined ? { additionalRoots } : {}),
|
|
445
|
-
|
|
462
|
+
imageProcessor,
|
|
446
463
|
...(pdfCapabilities !== undefined ? { pdfCapabilities } : {}),
|
|
447
464
|
...(bgOutputReadExemption !== undefined ? { bgOutputReadExemption } : {}),
|
|
448
465
|
...(readDeny !== undefined ? { readDeny } : {}),
|
|
@@ -3,6 +3,7 @@ import { defineTool, errorResult } from "../../core/tools.js";
|
|
|
3
3
|
import { clipSpelling, pathFamilyOf, resolveKey, violationText, violationDetails, WIN32_NAMESPACE_REFUSAL_TEXT } from "./safety.js";
|
|
4
4
|
import { runGrepDetailed, runGlobDetailed, invalidGlobTokens } from "./search.js";
|
|
5
5
|
import { seatForCall } from "./read-deny.js";
|
|
6
|
+
import { readFloorSeat } from "./read-floor.js";
|
|
6
7
|
import { toolFace } from "../../core/tool-catalog-entries.js";
|
|
7
8
|
import { pathTargetBaseOf, splitAbsoluteGlobPattern } from "../../core/effective-path-target.js";
|
|
8
9
|
import { pathTargetValue } from "../../core/tool-registry.js";
|
|
@@ -77,6 +78,7 @@ export function grepDetailFields(text, mode, offset, structuredRows) {
|
|
|
77
78
|
}
|
|
78
79
|
export function createGrepTool(env, rootCanonical, rootsSeat, denySeat, readFace, cwdRef, readAdmission) {
|
|
79
80
|
const declaredTarget = toolFace("grep").pathTarget;
|
|
81
|
+
const grepReadFloor = readFloorSeat(denySeat);
|
|
80
82
|
return defineTool({
|
|
81
83
|
name: "Grep",
|
|
82
84
|
...toolFace("grep"),
|
|
@@ -115,6 +117,7 @@ export function createGrepTool(env, rootCanonical, rootsSeat, denySeat, readFace
|
|
|
115
117
|
execute: async (args, ctx) => {
|
|
116
118
|
const readDeny = seatForCall(denySeat, ctx.toolCallId);
|
|
117
119
|
const additionalRoots = seatForCall(rootsSeat, ctx.toolCallId);
|
|
120
|
+
const readFloor = grepReadFloor?.(ctx.toolCallId);
|
|
118
121
|
const retired = args;
|
|
119
122
|
for (const [name, repair] of [
|
|
120
123
|
["regex", "the `pattern` is ALWAYS evaluated as a regular expression (ripgrep semantics) — drop the key; to match text literally, escape the regex metacharacters in `pattern`"],
|
|
@@ -167,7 +170,7 @@ export function createGrepTool(env, rootCanonical, rootsSeat, denySeat, readFace
|
|
|
167
170
|
context_before: a.context_before ?? a["-B"],
|
|
168
171
|
ignore_case: a.ignore_case ?? a["-i"],
|
|
169
172
|
only_matching: a.only_matching ?? a["-o"],
|
|
170
|
-
}, ctx.signal, readDeny);
|
|
173
|
+
}, ctx.signal, readDeny, readFloor);
|
|
171
174
|
const text = grepRun.text;
|
|
172
175
|
if (text.startsWith("Error (grep)") || text.startsWith("Error (Grep)"))
|
|
173
176
|
return errorResult(text);
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import { Type } from "typebox";
|
|
2
2
|
import type { ExecutionEnv } from "../../internal/harness-types.js";
|
|
3
3
|
import { type FsViolation, type ReadEntry, type ReadFileState } from "./safety.js";
|
|
4
|
-
import { type DecodedTextFile } from "./encoding.js";
|
|
4
|
+
import { type DecodedTextFile, type MalformedBody } from "./encoding.js";
|
|
5
5
|
import { type HomeViewsCarrier } from "./read-deny-home.js";
|
|
6
|
-
import { type ImageDownsampler } from "../../core/mcp.js";
|
|
7
6
|
import { type EngineNotice } from "../../core/types.js";
|
|
8
7
|
/**
|
|
9
8
|
* The "hand" tool band — built per task over an injected {@link ExecutionEnv} and a per-task
|
|
@@ -60,6 +59,11 @@ export declare function tooLargeToEditMessage(path: string, bytes: number): stri
|
|
|
60
59
|
/** The truncated-UTF-16 repair instruction, parameterized by the tool that refused. The condition is one
|
|
61
60
|
* condition — an odd-length UTF-16 body cannot be decoded — reached from Edit, Write and NotebookEdit. */
|
|
62
61
|
export declare function truncatedUtf16BodyMessage(tool: string, path: string): string;
|
|
62
|
+
/** The refusal of a body that is not valid UTF-8 (`not_utf8`), parameterized by the tool that refused: nothing was written,
|
|
63
|
+
* and the ways to make the change without converting the file. */
|
|
64
|
+
export declare function notUtf8BodyMessage(tool: string, path: string): string;
|
|
65
|
+
/** The write lanes' one refusal of a body they cannot write back byte for byte, by why ({@link MalformedBody}). */
|
|
66
|
+
export declare function malformedBodyMessage(tool: string, path: string, why: MalformedBody): string;
|
|
63
67
|
/** Why a bash_readonly refusal is terminal rather than escalated. Appended by every arm of that refusal
|
|
64
68
|
* family; the arms differ in what they found, never in what the model can do about it. */
|
|
65
69
|
export declare const BASH_READONLY_CONFINEMENT_NOTE = "bash_readonly is confined to the workspace roots; it has no approval path, so the call is refused rather than escalated.";
|
|
@@ -111,18 +115,12 @@ export declare function applyRecordedEdit(text: string, edit: RecordedEdit): str
|
|
|
111
115
|
* both sharper shapes describe files Read handled successfully, so the encoding-deadlock sentence
|
|
112
116
|
* would be false there — and stacking two escape routes on one refusal buries the one that applies. */
|
|
113
117
|
export declare function notReadRefusalText(env: ExecutionEnv, toolName: string, key: string, v: Pick<FsViolation, "code" | "message" | "partialView">, signal?: AbortSignal, fallbackHint?: string): Promise<string>;
|
|
114
|
-
/** The no-
|
|
115
|
-
* read like a hard ceiling. Whether the higher cap is reachable depends on an OPTIONAL dependency the
|
|
118
|
+
/** The no-processor read cap (`IMAGE_ADMISSION.hard.readBytes.withoutProcessor`) is a DELIBERATE bound and does not move — but its
|
|
119
|
+
* refusal must not read like a hard ceiling. Whether the higher cap is reachable depends on an OPTIONAL dependency the
|
|
116
120
|
* caller can install, and only this package knows that, so the refusal names the move instead of
|
|
117
|
-
* leaving the caller to guess that the limit is negotiable. Appended ONLY on the no-
|
|
118
|
-
* branch: with
|
|
119
|
-
export declare const NO_DOWNSAMPLER_IMAGE_CAP_HINT
|
|
120
|
-
/** Read-image downsampler seam: `undefined` → auto-detect sharp; `false` → force-disabled (deterministic
|
|
121
|
-
* no-sharp path, used by tests + envs that must not touch native deps); a function → injected. */
|
|
122
|
-
export type ReadImageDownsamplerOption = ImageDownsampler | false | undefined;
|
|
123
|
-
/** Resolve (and memoize) the auto-detected sharp downsampler, process-wide. Shared accessor for the two
|
|
124
|
-
* consumers of the module-private {@link autoDownsampler} cache. */
|
|
125
|
-
export declare function resolveAutoDownsampler(): Promise<ImageDownsampler | undefined>;
|
|
121
|
+
* leaving the caller to guess that the limit is negotiable. Appended ONLY on the no-processor
|
|
122
|
+
* branch: with a processor already resolved the hint would be false advice. */
|
|
123
|
+
export declare const NO_DOWNSAMPLER_IMAGE_CAP_HINT: string;
|
|
126
124
|
/** Output-token cap as a char proxy (CC's 25000, at ~4 chars/token). Caps the shown body so 2000 very
|
|
127
125
|
* long lines cannot blow the context budget.
|
|
128
126
|
*
|
|
@@ -5,8 +5,7 @@ import { decodeTextBytes, normalizeFileText } from "./encoding.js";
|
|
|
5
5
|
import { shellQuote } from "./search.js";
|
|
6
6
|
import { isNotebookPath } from "./notebook.js";
|
|
7
7
|
import { homeViewsOf } from "./read-deny-home.js";
|
|
8
|
-
import {
|
|
9
|
-
import { MAX_IMAGE_DOWNSAMPLE_INPUT_BYTES } from "../../core/image-admission.js";
|
|
8
|
+
import { IMAGE_ADMISSION } from "../../core/image-admission.js";
|
|
10
9
|
import { deliverEngineNotice } from "../../core/types.js";
|
|
11
10
|
import { resolveEnvBudget } from "../../core/env-budget.js";
|
|
12
11
|
import { openSystemReminder } from "../../core/reminder-mint.js";
|
|
@@ -38,6 +37,15 @@ export function tooLargeToEditMessage(path, bytes) {
|
|
|
38
37
|
export function truncatedUtf16BodyMessage(tool, path) {
|
|
39
38
|
return `Error (${tool}): "${path}" has a truncated UTF-16 body; repair/convert it with bash first.`;
|
|
40
39
|
}
|
|
40
|
+
export function notUtf8BodyMessage(tool, path) {
|
|
41
|
+
return (`Error (${tool}): "${path}" is not valid UTF-8: it uses an older encoding such as Windows-1252, Shift-JIS or GBK, or it is binary. ` +
|
|
42
|
+
`These tools write UTF-8 (or UTF-16LE behind its byte-order mark) and never convert a file's encoding on their own, so nothing was written. ` +
|
|
43
|
+
`If the file is text, make the change with a shell command that reads and writes it in its own encoding (iconv), or ask the user whether to convert it to UTF-8 first. ` +
|
|
44
|
+
`To replace the whole file with new UTF-8 text anyway, delete it first, then Write it.`);
|
|
45
|
+
}
|
|
46
|
+
export function malformedBodyMessage(tool, path, why) {
|
|
47
|
+
return why === "truncated_utf16" ? truncatedUtf16BodyMessage(tool, path) : notUtf8BodyMessage(tool, path);
|
|
48
|
+
}
|
|
41
49
|
export const BASH_READONLY_CONFINEMENT_NOTE = "bash_readonly is confined to the workspace roots; it has no approval path, so the call is refused rather than escalated.";
|
|
42
50
|
export function persistedTextOf(encoded) {
|
|
43
51
|
return decodeTextBytes(typeof encoded === "string" ? Buffer.from(encoded, "utf8") : encoded).text;
|
|
@@ -56,11 +64,7 @@ export async function notReadRefusalText(env, toolName, key, v, signal, fallback
|
|
|
56
64
|
return `${base} ${OVERSIZE_READ_ESCAPE_HINT}`;
|
|
57
65
|
return fallbackHint === undefined ? base : `${base} ${fallbackHint}`;
|
|
58
66
|
}
|
|
59
|
-
export const NO_DOWNSAMPLER_IMAGE_CAP_HINT = `Install the optional "sharp" dependency (declared in this package's optionalDependencies) to read images up to ${
|
|
60
|
-
let autoDownsampler;
|
|
61
|
-
export function resolveAutoDownsampler() {
|
|
62
|
-
return (autoDownsampler ??= sharpImageDownsampler());
|
|
63
|
-
}
|
|
67
|
+
export const NO_DOWNSAMPLER_IMAGE_CAP_HINT = `Install the optional "sharp" dependency (declared in this package's optionalDependencies) to read images up to ${IMAGE_ADMISSION.hard.readBytes.withProcessor} bytes — it downsamples them to fit the API image limit.`;
|
|
64
68
|
export const MAX_READ_OUTPUT_CHARS = 100_000;
|
|
65
69
|
export const BASH_DEFAULT_TIMEOUT_SEC = 120;
|
|
66
70
|
export const BASH_MAX_TIMEOUT_SEC = 600;
|