mixdog 1.4.2 → 1.4.4
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/package.json +2 -2
- package/scripts/build-shipped-history.mjs +15 -5
- package/scripts/gate-local.mjs +65 -19
- package/scripts/graph-parity.mjs +8 -3
- package/scripts/lib/gate-scheduler.mjs +2 -1
- package/scripts/lib/run-node-tests.mjs +17 -5
- package/scripts/lib/test-failure-summary.mjs +1 -8
- package/scripts/lib/test-spawn-ledger.mjs +33 -2
- package/scripts/post-release-check.mjs +26 -16
- package/scripts/provider-pingpong-live.mjs +1 -1
- package/scripts/prune-embedding-runtime.mjs +3 -1
- package/scripts/release-paths.mjs +7 -1
- package/src/defaults/shipped-history.json +24 -0
- package/src/defaults/skills/computer-use/SKILL.md +14 -3
- package/src/defaults/skills/memory-management/SKILL.md +10 -5
- package/src/defaults/skills/setup/SKILL.md +2 -2
- package/src/defaults/skills/setup/references/actions.md +17 -4
- package/src/defaults/skills/setup/references/surfaces.md +3 -0
- package/src/defaults/skills/setup-guide/SKILL.md +6 -1
- package/src/lib/instruction-text.cjs +36 -0
- package/src/lib/rules-builder.cjs +34 -20
- package/src/orchestration/balanced.md +23 -0
- package/src/orchestration/focused.md +22 -0
- package/src/orchestration/none.md +5 -0
- package/src/orchestration/swarm.md +24 -0
- package/src/rules/agent-mode/AGENT_MODE.md +3 -1
- package/src/rules/agent-mode/MIXY.md +5 -3
- package/src/runtime/agent/orchestrator/agent-runtime/agent-dispatch/session-prep.mjs +3 -3
- package/src/runtime/agent/orchestrator/agent-runtime/agent-dispatch.mjs +0 -1
- package/src/runtime/agent/orchestrator/agent-runtime/agent-progress-watchdog.mjs +4 -2
- package/src/runtime/agent/orchestrator/agent-runtime/cache-strategy.mjs +0 -9
- package/src/runtime/agent/orchestrator/agent-runtime/heartbeat-completion.mjs +2 -2
- package/src/runtime/agent/orchestrator/agent-runtime/session-builder.mjs +67 -0
- package/src/runtime/agent/orchestrator/agent-trace-format.mjs +1 -0
- package/src/runtime/agent/orchestrator/context/role-instructions.mjs +4 -4
- package/src/runtime/agent/orchestrator/mcp/agent-connectors.mjs +3 -1
- package/src/runtime/agent/orchestrator/mcp/child-tree.mjs +199 -46
- package/src/runtime/agent/orchestrator/mcp/client-config.mjs +3 -5
- package/src/runtime/agent/orchestrator/mcp/client-transport.mjs +9 -3
- package/src/runtime/agent/orchestrator/mcp/client.mjs +3 -5
- package/src/runtime/agent/orchestrator/mcp/oauth-client.mjs +1 -1
- package/src/runtime/agent/orchestrator/mcp/oauth-credentials.mjs +8 -2
- package/src/runtime/agent/orchestrator/mcp/oauth-probe.mjs +1 -1
- package/src/runtime/agent/orchestrator/mcp/oauth-provider.mjs +14 -0
- package/src/runtime/agent/orchestrator/mcp/oauth.mjs +1 -1
- package/src/runtime/agent/orchestrator/providers/admission-scheduler.mjs +2 -1
- package/src/runtime/agent/orchestrator/providers/anthropic-api-request.mjs +11 -1
- package/src/runtime/agent/orchestrator/providers/anthropic-oauth-client-version.mjs +1 -1
- package/src/runtime/agent/orchestrator/providers/anthropic-sse-turn/turn-events/content-block-start.mjs +4 -0
- package/src/runtime/agent/orchestrator/providers/anthropic-sse-turn/turn-events/content-block-stop.mjs +3 -3
- package/src/runtime/agent/orchestrator/providers/anthropic-sse-turn/turn-outcome.mjs +2 -0
- package/src/runtime/agent/orchestrator/providers/anthropic-turn-result.mjs +2 -0
- package/src/runtime/agent/orchestrator/providers/anthropic.mjs +2 -0
- package/src/runtime/agent/orchestrator/providers/codex-client-meta.mjs +1 -1
- package/src/runtime/agent/orchestrator/providers/custom-provider-config.mjs +121 -9
- package/src/runtime/agent/orchestrator/providers/custom-provider.mjs +4 -1
- package/src/runtime/agent/orchestrator/providers/gemini-thinking.mjs +2 -2
- package/src/runtime/agent/orchestrator/providers/lib/generation-window.mjs +9 -0
- package/src/runtime/agent/orchestrator/providers/openai-compat-chat-send.mjs +9 -1
- package/src/runtime/agent/orchestrator/providers/openai-compat-chat-stream/stream-result.mjs +2 -0
- package/src/runtime/agent/orchestrator/providers/openai-compat-chat-stream/stream-state.mjs +5 -0
- package/src/runtime/agent/orchestrator/providers/openai-compat-options.mjs +3 -0
- package/src/runtime/agent/orchestrator/providers/openai-compat-response-normalization.mjs +6 -6
- package/src/runtime/agent/orchestrator/providers/openai-compat-responses-head-parity.json +2784 -2872
- package/src/runtime/agent/orchestrator/providers/openai-compat-responses.mjs +10 -1
- package/src/runtime/agent/orchestrator/providers/openai-compat-xai.mjs +5 -8
- package/src/runtime/agent/orchestrator/providers/openai-http-sse-response-state/response-events.mjs +3 -0
- package/src/runtime/agent/orchestrator/providers/openai-http-sse-response-state/response-outcome.mjs +2 -0
- package/src/runtime/agent/orchestrator/providers/openai-responses-payload-parity.fixture.json +288 -300
- package/src/runtime/agent/orchestrator/providers/openai-ws-response-state.mjs +9 -2
- package/src/runtime/agent/orchestrator/providers/openrouter-provider-routing.mjs +28 -0
- package/src/runtime/agent/orchestrator/providers/openrouter.mjs +4 -1
- package/src/runtime/agent/orchestrator/providers/registry.mjs +30 -25
- package/src/runtime/agent/orchestrator/providers/vertex-ai.mjs +10 -1
- package/src/runtime/agent/orchestrator/providers/xai-tool-search-head-parity.json +10 -30
- package/src/runtime/agent/orchestrator/runtime-core/ask-user-result.mjs +66 -0
- package/src/runtime/agent/orchestrator/runtime-core/builtin-features.mjs +30 -0
- package/src/runtime/agent/orchestrator/runtime-core/config-helpers.mjs +0 -11
- package/src/runtime/agent/orchestrator/runtime-core/deferred-tool-availability.mjs +8 -0
- package/src/runtime/agent/orchestrator/runtime-core/deferred-tool-delta.mjs +17 -3
- package/src/runtime/agent/orchestrator/runtime-core/goal-control.mjs +47 -27
- package/src/runtime/agent/orchestrator/runtime-core/goal-deadlines.mjs +141 -10
- package/src/runtime/agent/orchestrator/runtime-core/goal-mutations.mjs +26 -63
- package/src/runtime/agent/orchestrator/runtime-core/goal-reminder.mjs +28 -3
- package/src/runtime/agent/orchestrator/runtime-core/goal-runtime.mjs +36 -11
- package/src/runtime/agent/orchestrator/runtime-core/goal-state.mjs +88 -56
- package/src/runtime/agent/orchestrator/runtime-core/goal-storage.mjs +4 -1
- package/src/runtime/agent/orchestrator/runtime-core/goal-store.mjs +51 -32
- package/src/runtime/agent/orchestrator/runtime-core/goal-text.mjs +45 -145
- package/src/runtime/agent/orchestrator/runtime-core/goal-tool-defs.mjs +15 -98
- package/src/runtime/agent/orchestrator/runtime-core/goal-tool-exec.mjs +32 -99
- package/src/runtime/agent/orchestrator/runtime-core/goal-turns.mjs +23 -78
- package/src/runtime/agent/orchestrator/runtime-core/orchestration.mjs +69 -48
- package/src/runtime/agent/orchestrator/runtime-core/todo-list.mjs +367 -0
- package/src/runtime/agent/orchestrator/runtime-core/todo-tool-defs.mjs +47 -0
- package/src/runtime/agent/orchestrator/runtime-core/tool-availability.mjs +155 -0
- package/src/runtime/agent/orchestrator/runtime-core/tool-catalog-data.mjs +9 -0
- package/src/runtime/agent/orchestrator/runtime-core/tool-catalog.mjs +119 -35
- package/src/runtime/agent/orchestrator/runtime-core/tool-defs.mjs +1 -1
- package/src/runtime/agent/orchestrator/runtime-core/workflow/context.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/agent-loop.mjs +28 -22
- package/src/runtime/agent/orchestrator/session/agent-pool-progress.mjs +30 -0
- package/src/runtime/agent/orchestrator/session/attachment-preflight.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/cache-warm.mjs +2 -2
- package/src/runtime/agent/orchestrator/session/catalog-db/index.mjs +2 -2
- package/src/runtime/agent/orchestrator/session/catalog-db/schema.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/compact/execution-tail.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/compact/runner.mjs +3 -0
- package/src/runtime/agent/orchestrator/session/compact/summary-route.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/context-utils.mjs +8 -12
- package/src/runtime/agent/orchestrator/session/conversation-import/claude.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/conversation-import/codex.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/conversation-import/convert.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/conversation-import/imported-session.mjs +7 -3
- package/src/runtime/agent/orchestrator/session/human-gate/held-message.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/human-gate/requests.mjs +1 -2
- package/src/runtime/agent/orchestrator/session/human-gate/run-policy.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/image-strip-recovery.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/loop/completion-guards.mjs +11 -1
- package/src/runtime/agent/orchestrator/session/loop/context-overflow.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/loop/loop-state.mjs +8 -1
- package/src/runtime/agent/orchestrator/session/loop/no-tool-turn/todo-check.mjs +196 -0
- package/src/runtime/agent/orchestrator/session/loop/no-tool-turn.mjs +116 -50
- package/src/runtime/agent/orchestrator/session/loop/pre-dispatch-deny.mjs +8 -1
- package/src/runtime/agent/orchestrator/session/loop/provider-tool-exclusions.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/loop/route-fallback.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/loop/steering.mjs +3 -1
- package/src/runtime/agent/orchestrator/session/loop/stored-tool-args.mjs +5 -6
- package/src/runtime/agent/orchestrator/session/loop/tool-exec/before-hook.mjs +6 -1
- package/src/runtime/agent/orchestrator/session/loop/tool-exec/dispatch.mjs +16 -2
- package/src/runtime/agent/orchestrator/session/loop/turn-report.mjs +35 -0
- package/src/runtime/agent/orchestrator/session/loop/usage.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/manager/ask-session.mjs +57 -26
- package/src/runtime/agent/orchestrator/session/manager/ask-turn-auto-effort.mjs +9 -7
- package/src/runtime/agent/orchestrator/session/manager/ask-turn-execute.mjs +21 -3
- package/src/runtime/agent/orchestrator/session/manager/ask-turn-failure.mjs +27 -11
- package/src/runtime/agent/orchestrator/session/manager/ask-turn-open.mjs +37 -34
- package/src/runtime/agent/orchestrator/session/manager/ask-turn-prepare.mjs +15 -0
- package/src/runtime/agent/orchestrator/session/manager/ask-turn-settle.mjs +25 -15
- package/src/runtime/agent/orchestrator/session/manager/ask-turn-state.mjs +79 -24
- package/src/runtime/agent/orchestrator/session/manager/ask-turn-steering-drain.mjs +3 -0
- package/src/runtime/agent/orchestrator/session/manager/compaction-runner.mjs +12 -1
- package/src/runtime/agent/orchestrator/session/manager/context-meta.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/manager/idle-cleanup.mjs +6 -1
- package/src/runtime/agent/orchestrator/session/manager/pending-messages.mjs +9 -1
- package/src/runtime/agent/orchestrator/session/manager/pending-spool-path.mjs +2 -2
- package/src/runtime/agent/orchestrator/session/manager/pending-spool-shard.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/manager/prompt-settings.mjs +598 -0
- package/src/runtime/agent/orchestrator/session/manager/prompt-utils.mjs +19 -0
- package/src/runtime/agent/orchestrator/session/manager/rules-cache.mjs +19 -10
- package/src/runtime/agent/orchestrator/session/manager/runtime-liveness.mjs +8 -1
- package/src/runtime/agent/orchestrator/session/manager/session-close.mjs +5 -0
- package/src/runtime/agent/orchestrator/session/manager/session-fallback-title.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/manager/session-lifecycle.mjs +31 -0
- package/src/runtime/agent/orchestrator/session/manager/session-lock.mjs +31 -0
- package/src/runtime/agent/orchestrator/session/manager/session-prompt-composition.mjs +42 -6
- package/src/runtime/agent/orchestrator/session/manager/session-record.mjs +2 -0
- package/src/runtime/agent/orchestrator/session/manager/tool-resolution.mjs +11 -1
- package/src/runtime/agent/orchestrator/session/manager/turn-checkpoint-context.mjs +8 -9
- package/src/runtime/agent/orchestrator/session/manager/turn-checkpoint-journal.mjs +339 -88
- package/src/runtime/agent/orchestrator/session/manager/turn-checkpoint-recovery.mjs +135 -11
- package/src/runtime/agent/orchestrator/session/manager/turn-checkpoint.mjs +377 -104
- package/src/runtime/agent/orchestrator/session/manager/turn-durability.mjs +144 -0
- package/src/runtime/agent/orchestrator/session/manager/turn-interruption.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/manager/usage-metrics.mjs +4 -0
- package/src/runtime/agent/orchestrator/session/manager.mjs +6 -0
- package/src/runtime/agent/orchestrator/session/mixy-name.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/pre-send-compact.mjs +8 -1
- package/src/runtime/agent/orchestrator/session/save-session-worker.mjs +5 -1
- package/src/runtime/agent/orchestrator/session/store/canonical-reader.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/store/liveness-veto.mjs +2 -2
- package/src/runtime/agent/orchestrator/session/store/save-worker.mjs +23 -2
- package/src/runtime/agent/orchestrator/session/store/sweep/sub-agent-retention.mjs +3 -3
- package/src/runtime/agent/orchestrator/session/store/transcript-durability.mjs +88 -0
- package/src/runtime/agent/orchestrator/session/store-agent-worker-rows.mjs +5 -0
- package/src/runtime/agent/orchestrator/session/store-summary-log.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/store-transcript-projection.mjs +14 -5
- package/src/runtime/agent/orchestrator/session/store-transcript-worker.mjs +2 -2
- package/src/runtime/agent/orchestrator/session/store.mjs +17 -6
- package/src/runtime/agent/orchestrator/session/synthetic-user-envelope.mjs +7 -1
- package/src/runtime/agent/orchestrator/session/tail-reminder-rules.mjs +9 -1
- package/src/runtime/agent/orchestrator/session/transcript-restore/agent-envelope.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/transcript-restore/restore.mjs +3 -1
- package/src/runtime/agent/orchestrator/session/transcript-restore/user-text.mjs +2 -2
- package/src/runtime/agent/orchestrator/stall-policy.mjs +3 -5
- package/src/runtime/agent/orchestrator/tools/builtin/bash-tool/backgrounded-result.mjs +4 -1
- package/src/runtime/agent/orchestrator/tools/builtin/bash-tool/misuse-guard.mjs +21 -3
- package/src/runtime/agent/orchestrator/tools/builtin/bash-tool/result-format.mjs +1 -1
- package/src/runtime/agent/orchestrator/tools/builtin/bash-tool/worktree-add-guard.mjs +77 -0
- package/src/runtime/agent/orchestrator/tools/builtin/bash-tool.mjs +0 -1
- package/src/runtime/agent/orchestrator/tools/builtin/git-command-tool.mjs +7 -3
- package/src/runtime/agent/orchestrator/tools/builtin/git-worktree-tool.mjs +27 -9
- package/src/runtime/agent/orchestrator/tools/builtin/lib/search-input-helpers.mjs +2 -2
- package/src/runtime/agent/orchestrator/tools/builtin/lib/shell-output-silence.mjs +64 -0
- package/src/runtime/agent/orchestrator/tools/builtin/lib/shell-task-output.mjs +20 -6
- package/src/runtime/agent/orchestrator/tools/builtin/read-range-index.mjs +1 -1
- package/src/runtime/agent/orchestrator/tools/builtin/read-single-fast-paths.mjs +0 -1
- package/src/runtime/agent/orchestrator/tools/builtin/search-tool.mjs +0 -10
- package/src/runtime/agent/orchestrator/tools/builtin/shell-jobs.mjs +1 -2
- package/src/runtime/agent/orchestrator/tools/builtin/task-tool.mjs +12 -1
- package/src/runtime/agent/orchestrator/tools/builtin.mjs +1 -24
- package/src/runtime/agent/orchestrator/tools/code-graph/graph-binary/child-kill.mjs +4 -3
- package/src/runtime/agent/orchestrator/tools/code-graph/graph-binary.mjs +1 -2
- package/src/runtime/agent/orchestrator/tools/code-graph/modes/calls.mjs +1 -1
- package/src/runtime/agent/orchestrator/tools/code-graph/modes/symbols.mjs +2 -2
- package/src/runtime/agent/orchestrator/tools/code-graph/search.mjs +4 -5
- package/src/runtime/agent/orchestrator/tools/code-graph/symbol-index.mjs +3 -4
- package/src/runtime/agent/orchestrator/tools/code-graph.mjs +4 -22
- package/src/runtime/agent/orchestrator/tools/lib/shell-descendants.mjs +2 -2
- package/src/runtime/agent/orchestrator/tools/lib/shell-run-state.mjs +1 -1
- package/src/runtime/agent/orchestrator/tools/shell-command.mjs +0 -4
- package/src/runtime/agent/orchestrator/tools/shell-policy.mjs +0 -1
- package/src/runtime/attachments/attachment-reference.mjs +1 -1
- package/src/runtime/attachments/pdf-extract.mjs +1 -1
- package/src/runtime/attachments/store.d.mts +1 -0
- package/src/runtime/attachments/store.mjs +2 -2
- package/src/runtime/channels/lib/config-reload-watch.mjs +42 -0
- package/src/runtime/channels/lib/owned-runtime/config-reload.mjs +29 -9
- package/src/runtime/channels/lib/routines-db.mjs +35 -0
- package/src/runtime/channels/lib/scheduler.mjs +33 -0
- package/src/runtime/channels/lib/schedules-db.mjs +15 -4
- package/src/runtime/channels/lib/webhook/session-dispatch.mjs +4 -1
- package/src/runtime/channels/lib/webhooks-db.mjs +13 -3
- package/src/runtime/channels/lib/whisper-server.mjs +12 -12
- package/src/runtime/channels/lib/worker-main.mjs +9 -31
- package/src/runtime/computer-bridge/action-schema.mjs +2 -2
- package/src/runtime/computer-bridge/core-actions.mjs +16 -2
- package/src/runtime/computer-bridge/linux-readiness.mjs +10 -14
- package/src/runtime/computer-bridge/result-canonical.mjs +6 -0
- package/src/runtime/connectors/connector-accounts-mcp.mjs +169 -33
- package/src/runtime/connectors/gmail-app-password.mjs +2 -2
- package/src/runtime/connectors/google-mcp.mjs +1 -1
- package/src/runtime/effort-judge/judge-client.mjs +2 -2
- package/src/runtime/effort-judge/judge-input.mjs +4 -4
- package/src/runtime/explore/explorer.mjs +0 -5
- package/src/runtime/explore/tool.mjs +3 -3
- package/src/runtime/local-provider/hardware.mjs +1 -1
- package/src/runtime/media/adapters/codex-image.mjs +3 -3
- package/src/runtime/media/adapters/gemini-video.mjs +1 -1
- package/src/runtime/media/media-usage.mjs +1 -1
- package/src/runtime/media/store.mjs +1 -1
- package/src/runtime/memory/index.mjs +11 -1
- package/src/runtime/memory/lib/embedding-reindex.mjs +27 -0
- package/src/runtime/memory/lib/memory-embed.mjs +83 -14
- package/src/runtime/memory/lib/memory-process-lock.mjs +159 -36
- package/src/runtime/memory/lib/memory-text-utils.mjs +6 -1
- package/src/runtime/memory/lib/memory.mjs +17 -0
- package/src/runtime/memory/lib/pg/process.mjs +1 -1
- package/src/runtime/memory/lib/pg/supervisor.mjs +16 -96
- package/src/runtime/memory/lib/recall-hybrid/hybrid-sql.mjs +12 -3
- package/src/runtime/memory/tool-defs.mjs +1 -1
- package/src/runtime/office/authoring/docx-html-runner.mjs +1 -1
- package/src/runtime/office/authoring/pptx-author-action.mjs +1 -1
- package/src/runtime/office/authoring/xlsx-html-build.mjs +1 -1
- package/src/runtime/office/authoring/xlsx-html-runner.mjs +1 -1
- package/src/runtime/office/capabilities.mjs +1 -1
- package/src/runtime/office/core/office-core.mjs +1 -1
- package/src/runtime/office/design/content-model.mjs +3 -3
- package/src/runtime/office/design/docx/design-docx/section.mjs +6 -6
- package/src/runtime/office/design/xlsx/design-xlsx-components.mjs +1 -1
- package/src/runtime/office/design/xlsx/design-xlsx.mjs +1 -1
- package/src/runtime/office/pdf/ocr-engine.mjs +1 -1
- package/src/runtime/office/pdf/pdf-writer.mjs +4 -4
- package/src/runtime/office/portable/portable-docx-operations.mjs +2 -2
- package/src/runtime/office/portable/portable-soffice.mjs +8 -6
- package/src/runtime/office/portable/xlsx-contract.mjs +1 -1
- package/src/runtime/shared/atomic-file.d.mts +8 -0
- package/src/runtime/shared/background-tasks.mjs +22 -4
- package/src/runtime/shared/background-wait.mjs +66 -0
- package/src/runtime/shared/child-guardian.mjs +17 -7
- package/src/runtime/shared/config.mjs +313 -16
- package/src/runtime/shared/connector-catalog.d.mts +4 -5
- package/src/runtime/shared/connector-catalog.mjs +11 -1
- package/src/runtime/shared/file-lock.mjs +8 -3
- package/src/runtime/shared/git-runner.mjs +7 -2
- package/src/runtime/shared/idle-gc.mjs +30 -7
- package/src/runtime/shared/llm/http-agent.mjs +8 -5
- package/src/runtime/shared/llm/system-proxy.mjs +2 -1
- package/src/runtime/shared/llm/usage-accounting.mjs +110 -19
- package/src/runtime/shared/llm/usage-context.mjs +1 -1
- package/src/runtime/shared/llm/usage-ledger-quota.mjs +33 -12
- package/src/runtime/shared/llm/usage-ledger-requests.mjs +183 -0
- package/src/runtime/shared/llm/usage-ledger-rollup.mjs +90 -10
- package/src/runtime/shared/llm/usage-ledger-worker.mjs +2 -0
- package/src/runtime/shared/llm/usage-ledger.mjs +60 -1
- package/src/runtime/shared/llm/usage-request-status.mjs +48 -0
- package/src/runtime/shared/llm/usage-rollup.mjs +48 -0
- package/src/runtime/shared/maintenance-schedule.mjs +109 -0
- package/src/runtime/shared/process-runner.mjs +8 -4
- package/src/runtime/shared/routine-trigger.d.mts +13 -0
- package/src/runtime/shared/routine-trigger.mjs +34 -0
- package/src/runtime/shared/run-child.d.mts +2 -1
- package/src/runtime/shared/run-child.mjs +70 -18
- package/src/runtime/shared/session-scratch.mjs +14 -2
- package/src/runtime/shared/shipped-definitions.mjs +7 -1
- package/src/runtime/shared/tool-card-model.golden.json +3 -12
- package/src/runtime/shared/tool-execution-contract.mjs +2 -0
- package/src/runtime/shared/tool-result-summary.mjs +1 -1
- package/src/runtime/shared/tool-work-units.mjs +31 -6
- package/src/runtime/shared/turn-snapshot.mjs +26 -4
- package/src/runtime/shared/turn-worktree-snapshot.mjs +6 -11
- package/src/runtime/shared/worker-requests.mjs +17 -3
- package/src/runtime/shared/worktrees/branch-management.mjs +1 -5
- package/src/runtime/shared/worktrees/contract.mjs +16 -6
- package/src/runtime/shared/worktrees/dependencies.mjs +127 -89
- package/src/runtime/shared/worktrees/disk.mjs +79 -2
- package/src/runtime/shared/worktrees/git.mjs +44 -11
- package/src/runtime/shared/worktrees/include.mjs +6 -4
- package/src/runtime/shared/worktrees/maintenance.mjs +422 -30
- package/src/runtime/shared/worktrees/manager.mjs +772 -75
- package/src/runtime/shared/worktrees/settings.mjs +33 -7
- package/src/runtime/shared/worktrees/test-support.mjs +5 -1
- package/src/runtime/shared/worktrees/worker-snapshots.mjs +82 -0
- package/src/runtime/tidy/process.mjs +2 -1
- package/src/runtime/web-search/index.mjs +3 -22
- package/src/runtime/web-search/lib/web-tools.mjs +2 -2
- package/src/runtime/web-search/tool-defs.mjs +17 -26
- package/src/session-runtime/agent-home-delivery.mjs +76 -8
- package/src/session-runtime/agent-profile-changes.mjs +55 -4
- package/src/session-runtime/agent-task-sessions.mjs +63 -22
- package/src/session-runtime/boot/apis.mjs +42 -4
- package/src/session-runtime/boot/begin.mjs +2 -0
- package/src/session-runtime/boot/config.mjs +10 -1
- package/src/session-runtime/boot/facade.mjs +1 -0
- package/src/session-runtime/boot/providers.mjs +70 -3
- package/src/session-runtime/boot/session.mjs +2 -0
- package/src/session-runtime/boot/tools.mjs +75 -25
- package/src/session-runtime/channel-config-api.mjs +1 -0
- package/src/session-runtime/config-change-effects.mjs +179 -0
- package/src/session-runtime/config-lifecycle/config-writers.mjs +1 -0
- package/src/session-runtime/config-lifecycle.mjs +160 -24
- package/src/session-runtime/conversation-import/discovery.mjs +86 -7
- package/src/session-runtime/conversation-import/service.mjs +3 -2
- package/src/session-runtime/goal-facade-api.mjs +49 -3
- package/src/session-runtime/internal-tool-executor/ask-user-tool.mjs +5 -57
- package/src/session-runtime/internal-tool-executor/bridge-tools.mjs +3 -2
- package/src/session-runtime/internal-tool-executor/feature-tools.mjs +3 -11
- package/src/session-runtime/internal-tool-executor/workspace-tools.mjs +18 -4
- package/src/session-runtime/internal-tool-executor.mjs +12 -19
- package/src/session-runtime/lifecycle/cold-heir.mjs +7 -0
- package/src/session-runtime/lifecycle/memory-ingest.mjs +3 -3
- package/src/session-runtime/lifecycle/session-switch/session-delete.mjs +53 -5
- package/src/session-runtime/lifecycle/session-switch.mjs +13 -2
- package/src/session-runtime/lifecycle/teardown/session-close.mjs +4 -4
- package/src/session-runtime/lifecycle-api.mjs +1 -0
- package/src/session-runtime/mcp-glue/server-catalog.mjs +14 -3
- package/src/session-runtime/mcp-glue/server-connection.mjs +34 -8
- package/src/session-runtime/model-route/route-persist.mjs +12 -4
- package/src/session-runtime/model-route/set-route.mjs +40 -7
- package/src/session-runtime/native-web-search/routes.mjs +3 -3
- package/src/session-runtime/provider-auth/refresh.mjs +6 -3
- package/src/session-runtime/provider-auth/setup.mjs +1 -1
- package/src/session-runtime/provider-models/row-hydration.mjs +2 -0
- package/src/session-runtime/provider-readiness.mjs +53 -4
- package/src/session-runtime/resource-api.mjs +1 -1
- package/src/session-runtime/resource-extension-sync.mjs +4 -8
- package/src/session-runtime/resource-mcp-connector-accounts.mjs +5 -1
- package/src/session-runtime/resource-mcp-secrets.mjs +3 -3
- package/src/session-runtime/resource-plugins-api.mjs +4 -0
- package/src/session-runtime/routine-executor.mjs +152 -0
- package/src/session-runtime/routine-home-turn.mjs +46 -5
- package/src/session-runtime/routine-owner.mjs +9 -3
- package/src/session-runtime/runtime-facade.mjs +5 -0
- package/src/session-runtime/runtime-feature-gates.mjs +2 -11
- package/src/session-runtime/schedule-session-run.mjs +1 -0
- package/src/session-runtime/services/agent-task-status.mjs +29 -1
- package/src/session-runtime/services/agent-tool/job-task-reconcile.mjs +6 -1
- package/src/session-runtime/services/agent-tool/job-views/session-progress.mjs +10 -0
- package/src/session-runtime/services/agent-tool/render.mjs +6 -1
- package/src/session-runtime/services/agent-tool/send-flow.mjs +110 -6
- package/src/session-runtime/services/agent-tool/spawn-flow/job-start.mjs +12 -0
- package/src/session-runtime/services/agent-tool/spawn-flow/spawn-plan.mjs +5 -0
- package/src/session-runtime/services/agent-tool/spawn-flow/spawn-run.mjs +24 -6
- package/src/session-runtime/services/agent-tool.mjs +51 -1
- package/src/session-runtime/services/channel-admin.mjs +62 -3
- package/src/session-runtime/services/hook-bus/command-handler.mjs +7 -11
- package/src/session-runtime/services/plugin-admin.mjs +50 -7
- package/src/session-runtime/services/provider-admin.mjs +5 -0
- package/src/session-runtime/services/seeds.mjs +7 -0
- package/src/session-runtime/services/usage-stats-model.mjs +32 -11
- package/src/session-runtime/session-create/materialize.mjs +4 -2
- package/src/session-runtime/session-create/session-options.mjs +2 -0
- package/src/session-runtime/settings-builtin-tools-api.mjs +1 -9
- package/src/session-runtime/setup-tool/agent-settings-actions.mjs +1 -1
- package/src/session-runtime/setup-tool/connector-widen-approval.mjs +1 -1
- package/src/session-runtime/setup-tool/executor.mjs +9 -2
- package/src/session-runtime/setup-tool/extended-actions.mjs +3 -1
- package/src/session-runtime/setup-tool/settings-contract.mjs +30 -2
- package/src/session-runtime/setup-tool/tool-defs.mjs +26 -1
- package/src/session-runtime/tool-policy/agent-profile-fold.mjs +40 -43
- package/src/session-runtime/tool-policy/mode-switch.mjs +1 -1
- package/src/session-runtime/tool-policy/policy-stage.mjs +106 -8
- package/src/session-runtime/tool-policy/workflow-overlay.mjs +2 -1
- package/src/session-runtime/tool-policy-refresh.mjs +182 -5
- package/src/session-runtime/tool-surface.mjs +38 -1
- package/src/session-runtime/turn/agent-ops.mjs +10 -2
- package/src/session-runtime/turn/session-ops.mjs +2 -0
- package/src/session-runtime/turn/turn-run/turn-prepare.mjs +5 -0
- package/src/session-runtime/turn/turn-run.mjs +1 -1
- package/src/session-runtime/usage-stats-api.mjs +117 -1
- package/src/session-runtime/webhook-session-run.mjs +2 -0
- package/src/session-runtime/workflow-agents-api/agent-connectors.mjs +37 -33
- package/src/session-runtime/workflow-agents-api/agent-editor.mjs +183 -23
- package/src/session-runtime/workflow-agents-api/agent-route.mjs +3 -10
- package/src/session-runtime/workflow-agents-api/instruction-files.mjs +165 -0
- package/src/session-runtime/workflow-agents-api/style-and-mode.mjs +5 -4
- package/src/session-runtime/workflow-agents-api/workflow-packs.mjs +2 -3
- package/src/session-runtime/workflow-agents-api.mjs +2 -0
- package/src/session-runtime/workspace/project-branches.mjs +1 -1
- package/src/session-runtime/workspace/session-view.mjs +1 -1
- package/src/session-runtime/workspace/transitions.mjs +20 -4
- package/src/session-runtime/workspace/worktree-maintenance.mjs +126 -6
- package/src/session-runtime/workspace/worktree-setup.mjs +13 -1
- package/src/session-runtime/workspace/worktree-tool.mjs +16 -0
- package/src/standalone/daemon-agent-control.mjs +25 -8
- package/src/standalone/daemon-desktop-runtime.mjs +6 -2
- package/src/standalone/daemon-lag-profiler.mjs +7 -7
- package/src/standalone/daemon.mjs +54 -2
- package/src/standalone/local-session-runtime.mjs +16 -0
- package/src/standalone/session-client/daemon-unavailable.mjs +1 -1
- package/src/standalone/session-protocol.mjs +12 -0
- package/src/standalone/session-service/agent-route-follow.mjs +23 -20
- package/src/standalone/session-service/agent-tree/agent-turns.mjs +18 -6
- package/src/standalone/session-service/quota-resume.mjs +9 -0
- package/src/standalone/session-service/retention/busy.mjs +3 -2
- package/src/standalone/session-service/session-calls/session-action.mjs +51 -1
- package/src/standalone/session-service/session-calls/session-turns.mjs +37 -18
- package/src/standalone/session-service/session-calls/turn-gate.mjs +34 -0
- package/src/standalone/session-service/session-calls.mjs +2 -1
- package/src/tui/App.jsx +8 -0
- package/src/tui/app/clipboard.mjs +1 -1
- package/src/tui/app/create-app-pickers.mjs +2 -0
- package/src/tui/app/doctor.mjs +2 -2
- package/src/tui/app/model-picker/model-footer.mjs +1 -1
- package/src/tui/app/model-picker/provider-models-list.mjs +7 -3
- package/src/tui/app/model-picker/route-selection/fast-parameters.mjs +23 -3
- package/src/tui/app/model-picker/route-selection.mjs +1 -0
- package/src/tui/app/panel-signature.mjs +1 -1
- package/src/tui/app/settings-picker.mjs +53 -8
- package/src/tui/app/shell-layout/row-budgets.mjs +2 -2
- package/src/tui/app/slash-commands.mjs +1 -1
- package/src/tui/app/slash-dispatch/route-commands.mjs +1 -1
- package/src/tui/app/slash-dispatch/session-commands.mjs +1 -1
- package/src/tui/app/use-prompt-queue-history.mjs +2 -2
- package/src/tui/app/use-transcript-activity.mjs +1 -1
- package/src/tui/app/use-transcript-window/geometry.mjs +1 -1
- package/src/tui/components/prompt-input/escape-policy.d.mts +0 -1
- package/src/tui/components/prompt-input/escape-policy.mjs +1 -1
- package/src/tui/components/question-panel-model.mjs +4 -4
- package/src/tui/components/tool-execution/standard-card.jsx +3 -4
- package/src/tui/components/user-message-skills.mjs +1 -1
- package/src/tui/dist/index.mjs +350 -37
- package/src/tui/markdown/render-ansi.mjs +1 -1
- package/src/tui/session/agent-job-feed/notification-router.mjs +10 -0
- package/src/tui/session/agent-job-feed.mjs +2 -0
- package/src/tui/session/context-state.mjs +3 -0
- package/src/tui/session/quota-resume.mjs +1 -1
- package/src/tui/session/session-api/integrations.mjs +3 -0
- package/src/tui/session/session-api/lifecycle/dispose.mjs +1 -0
- package/src/tui/session/session-api/lifecycle/session-reset.mjs +7 -0
- package/src/tui/session/session-api/routes-agent-definitions.mjs +5 -0
- package/src/tui/session/session-api/worktree.mjs +13 -1
- package/src/tui/session/session-flow/drain.mjs +11 -14
- package/src/tui/session/tool-approval-settle.mjs +24 -4
- package/src/tui/session/tool-approval.mjs +35 -10
- package/src/tui/session/tool-card-results/grouped-result.mjs +2 -2
- package/src/tui/session/turn-quiet.mjs +1 -1
- package/src/tui/session/turn.mjs +3 -0
- package/src/tui/session/worktree-setup-notice.mjs +1 -1
- package/src/tui/spinner-meta.mjs +3 -3
- package/src/tui/spinner-verbs.mjs +2 -2
- package/src/defaults/skills/goal-management/SKILL.md +0 -169
- package/src/runtime/agent/orchestrator/runtime-core/goal-tasks.mjs +0 -156
- package/src/session-runtime/goal-tasks.mjs +0 -1
|
@@ -45,6 +45,11 @@ const RUNTIME_CONTROL_SOURCES = new Set([
|
|
|
45
45
|
'task-notification',
|
|
46
46
|
]);
|
|
47
47
|
const ENVELOPE_OPEN_RE = new RegExp(`^\\s*<${SYNTHETIC_USER_ENVELOPE_TAG}\\b`, 'i');
|
|
48
|
+
// The stored crash marker reads like a user cancel ("Request interrupted ..."),
|
|
49
|
+
// and models answered it with "stopped as you asked" and dropped the work.
|
|
50
|
+
// On the wire it names the restart and asks to resume.
|
|
51
|
+
const PROCESS_RESTART_MARKER = '[Request interrupted by process restart]';
|
|
52
|
+
const PROCESS_RESTART_WIRE_TEXT = '[mixdog-runtime] The app restarted mid-turn. Continue from where you left off.';
|
|
48
53
|
|
|
49
54
|
function messageText(message) {
|
|
50
55
|
if (typeof message?.content === 'string') return message.content;
|
|
@@ -128,7 +133,8 @@ export function projectSyntheticUserEnvelopes(messages) {
|
|
|
128
133
|
const projected = messages.map((message) => {
|
|
129
134
|
const kind = classifySyntheticUserMessage(message);
|
|
130
135
|
if (!kind) return message;
|
|
131
|
-
const
|
|
136
|
+
const source = messageText(message).trim() === PROCESS_RESTART_MARKER ? PROCESS_RESTART_WIRE_TEXT : message.content;
|
|
137
|
+
const content = envelopeContent(source, kind);
|
|
132
138
|
if (content === message.content) return message;
|
|
133
139
|
changed = true;
|
|
134
140
|
stats.wrapped += 1;
|
|
@@ -119,7 +119,15 @@ export function matchTailReminder(context, rules = TAIL_REMINDER_RULES) {
|
|
|
119
119
|
}
|
|
120
120
|
|
|
121
121
|
/** `messages` plus the tail reminder for this request (a copy; the input is untouched). */
|
|
122
|
-
|
|
122
|
+
// The session's own response language (as its prompt and settings notices
|
|
123
|
+
// carry it, session/manager/prompt-settings.mjs); a session without one (an
|
|
124
|
+
// agent, an older record) reads the config.
|
|
125
|
+
export function withTailReminder(
|
|
126
|
+
messages,
|
|
127
|
+
{ session, provider, model },
|
|
128
|
+
// null is a recorded "no language", not a missing record.
|
|
129
|
+
language = session?.responseLanguage !== undefined ? session.responseLanguage : _buildLeadLanguage()
|
|
130
|
+
) {
|
|
123
131
|
const text = matchTailReminder({
|
|
124
132
|
provider: session?.provider || provider?.name || '',
|
|
125
133
|
model,
|
|
@@ -260,7 +260,7 @@ export function isStatusOnlyAgentCompletionNotification(text) {
|
|
|
260
260
|
return !(hasAgentResponseResultText(result) || hasAgentResponseResultText(text));
|
|
261
261
|
}
|
|
262
262
|
|
|
263
|
-
|
|
263
|
+
function hasAgentResponseResultText(text) {
|
|
264
264
|
const value = String(text || '').trim();
|
|
265
265
|
if (!value) return false;
|
|
266
266
|
const notification = parseTaskNotification(value);
|
|
@@ -685,7 +685,9 @@ export function restoreTranscriptItems(messages, { sessionId = 'session', itemLi
|
|
|
685
685
|
export function sessionContextSnapshotProjection(session, contextStatus) {
|
|
686
686
|
if (!contextStatus) return {};
|
|
687
687
|
return {
|
|
688
|
-
|
|
688
|
+
// The composer's usage readout reads the session totals from the same
|
|
689
|
+
// stats a live runtime publishes; a cold open has no runtime to add them.
|
|
690
|
+
stats: { ...contextMeasurementStats(contextStatus), usageReadout: contextStatus.usage?.usageReadout ?? null },
|
|
689
691
|
contextWindow: Math.max(0, Number(session?.contextWindow || contextStatus.effectiveContextWindow || 0)),
|
|
690
692
|
rawContextWindow: Math.max(0, Number(session?.rawContextWindow || contextStatus.rawContextWindow || 0)),
|
|
691
693
|
effectiveContextWindowPercent: Number(
|
|
@@ -99,7 +99,7 @@ function feedbackDisplay(body) {
|
|
|
99
99
|
return lines.join('\n');
|
|
100
100
|
}
|
|
101
101
|
|
|
102
|
-
|
|
102
|
+
function withVisualizeFeedbackDisplay(text) {
|
|
103
103
|
const value = String(text ?? '');
|
|
104
104
|
if (!value.includes(FEEDBACK_OPEN)) return value;
|
|
105
105
|
return value.replace(FEEDBACK_BLOCK, (_block, body) => feedbackDisplay(body));
|
|
@@ -121,7 +121,7 @@ const PASTED_LINES = /· (\d+) lines?$/;
|
|
|
121
121
|
const PASTED_TEXT_MAX_BYTES = 1024 * 1024;
|
|
122
122
|
/** Blob bytes one transcript load may read to count the lines of pastes
|
|
123
123
|
* whose stored name does not carry the count (pastes stored before it did). */
|
|
124
|
-
|
|
124
|
+
const PASTED_LINE_READ_BUDGET_BYTES = 4 * 1024 * 1024;
|
|
125
125
|
|
|
126
126
|
/** A stored plain-text prompt part's text within the load's byte budget, else ''. */
|
|
127
127
|
function offloadedPromptText(part, budget) {
|
|
@@ -137,11 +137,9 @@ export const PROVIDER_SSE_IDLE_TIMEOUT_MS = resolveTimeoutMs('MIXDOG_PROVIDER_SS
|
|
|
137
137
|
// silent-window token rate a steady ~92 tok/s, i.e. live generation, not a
|
|
138
138
|
// wedge). So a "semantic-silent" stream is NOT necessarily dead.
|
|
139
139
|
//
|
|
140
|
-
//
|
|
141
|
-
//
|
|
142
|
-
//
|
|
143
|
-
// live long-thinking turns (regex-chess / circuit-fibsqrt: ttft ~1.5s, then
|
|
144
|
-
// killed at exactly 135s of silent thinking, 4 attempts ≈ 552s per turn).
|
|
140
|
+
// Deriving this window from the agent stall budget (warn − tick ≈ 285s) would
|
|
141
|
+
// let a harness that tightens STALL_TIMEOUT_S to 300s collapse it to 135s,
|
|
142
|
+
// which deterministically beheads live long-thinking turns.
|
|
145
143
|
// Reference behavior: abort only after a 300s single-gap silence, and fall
|
|
146
144
|
// back to non-streaming instead of killing the turn. The default is
|
|
147
145
|
// therefore a FIXED 300s, decoupled from the warn math. The only remaining
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { registerBackgroundTask, renderBackgroundTask } from '../../../../../shared/background-tasks.mjs';
|
|
2
|
+
import { stampShellJobCycle } from '../../../../../shared/background-wait.mjs';
|
|
2
3
|
import { killShellJob, watchBackgroundShellJob } from '../shell-jobs.mjs';
|
|
3
4
|
import { renderBackgroundPartialOutput } from '../shell-output.mjs';
|
|
4
5
|
import { readShellTaskOutput } from '../lib/shell-task-output.mjs';
|
|
@@ -65,7 +66,9 @@ export function renderBackgroundedResult({
|
|
|
65
66
|
}) {
|
|
66
67
|
let task = null;
|
|
67
68
|
if (result.jobId) {
|
|
68
|
-
|
|
69
|
+
// The owner's user cycle at start decides whether it is waited on
|
|
70
|
+
// (background-wait.mjs), however the job reached the background.
|
|
71
|
+
task = stampShellJobCycle(registerPromotedTask({ result, command, cwd, options, startedAtMs }));
|
|
69
72
|
try {
|
|
70
73
|
watchBackgroundShellJob(result.jobId, {
|
|
71
74
|
notifyFn: typeof options?.notifyFn === 'function' ? options.notifyFn : null,
|
|
@@ -5,13 +5,16 @@
|
|
|
5
5
|
// to background + task wait);
|
|
6
6
|
// 2. a plain leading `cd <dir>` moves into the `cwd` argument;
|
|
7
7
|
// 3. a shell file read (cat/Get-Content/grep/ls …) gets a pointer to the
|
|
8
|
-
// read / grep / list tools — a note now, a rejection when the mode flips
|
|
8
|
+
// read / grep / list tools — a note now, a rejection when the mode flips;
|
|
9
|
+
// 4. a command mentioning `git … worktree add` is rejected (worktrees go
|
|
10
|
+
// through the git tool; a textual check, so mentions as data are too).
|
|
9
11
|
import { shellSplitPipelineSegments, shellSplitSegments, shellTokenize } from '../shell-analysis.mjs';
|
|
10
12
|
import { resolveShellFor } from '../shell-runtime.mjs';
|
|
11
13
|
import { formatShellToolFailure } from './result-format.mjs';
|
|
14
|
+
import { addsUnmanagedWorktree } from './worktree-add-guard.mjs';
|
|
12
15
|
|
|
13
16
|
/** `warn` runs the read with a note; `reject` returns the block without running. */
|
|
14
|
-
|
|
17
|
+
const SHELL_FILE_READ_MODE = 'warn';
|
|
15
18
|
export const SHELL_FILE_READ_NOTE = 'Note: use the read / grep / list tools for files instead of the shell.';
|
|
16
19
|
const SHELL_FILE_READ_BLOCK =
|
|
17
20
|
'Blocked: use read / grep / list for files instead of the shell (read takes offset/limit for a window of a large file).';
|
|
@@ -194,6 +197,20 @@ function detectShellFileRead(command, shellType) {
|
|
|
194
197
|
return operands.length >= minOperands ? { tool, command: name } : null;
|
|
195
198
|
}
|
|
196
199
|
|
|
200
|
+
// ── 4. unmanaged worktrees ───────────────────────────────────────────────────
|
|
201
|
+
|
|
202
|
+
// A worktree added from the shell is invisible to the managed cleanup and
|
|
203
|
+
// outlives the session that made it, so `git … worktree add` never runs here.
|
|
204
|
+
// The check is textual (worktree-add-guard.mjs): a command that only mentions
|
|
205
|
+
// the phrase is refused too, so the message says how to go on either way.
|
|
206
|
+
const SHELL_WORKTREE_ADD_BLOCK =
|
|
207
|
+
'Blocked: this shell command mentions `git … worktree add`, which does not run from the shell; ' +
|
|
208
|
+
'Mixdog manages worktrees so they are cleaned up. To create one, use the git tool: command ' +
|
|
209
|
+
'"git worktree add --detach <path> [<commit>]" makes a read-only snapshot (removed when the turn ends; ' +
|
|
210
|
+
'delegated workers too), and the Lead uses "git worktree add -b <branch> <path>" or action:"worktree" for a ' +
|
|
211
|
+
'branch worktree. The check is textual: to search for that text use the grep tool, and keep the phrase out ' +
|
|
212
|
+
'of shell commands (echo, commit messages, heredocs).';
|
|
213
|
+
|
|
197
214
|
// ── the guard ────────────────────────────────────────────────────────────────
|
|
198
215
|
|
|
199
216
|
/** The syntax family of the shell a call asks for (`args.shell`, as foreign adapters set it), else the default shell's. */
|
|
@@ -209,7 +226,7 @@ function recordFileRead(telemetry, entry) {
|
|
|
209
226
|
}
|
|
210
227
|
|
|
211
228
|
/**
|
|
212
|
-
* Apply the
|
|
229
|
+
* Apply the four guards to a shell call.
|
|
213
230
|
* @returns {{ failure: string } | { args: object, notes: string[] }} the
|
|
214
231
|
* rejection, or the call to run (a leading `cd` moved into `cwd`) with the
|
|
215
232
|
* lines to add to its result.
|
|
@@ -230,6 +247,7 @@ export function guardShellCall(
|
|
|
230
247
|
const sleepFailure = leadingSleepFailure(guarded.command, shellType);
|
|
231
248
|
if (sleepFailure) return { failure: sleepFailure };
|
|
232
249
|
}
|
|
250
|
+
if (addsUnmanagedWorktree(guarded.command)) return { failure: formatShellToolFailure(SHELL_WORKTREE_ADD_BLOCK) };
|
|
233
251
|
const read = detectShellFileRead(guarded.command, shellType);
|
|
234
252
|
if (read) {
|
|
235
253
|
recordFileRead(telemetry, { mode: fileReadMode, tool: read.tool, command: read.command, agent, sessionId });
|
|
@@ -75,7 +75,7 @@ export function _finalizeShellResult(completedExit, text) {
|
|
|
75
75
|
|
|
76
76
|
export function _shellFailureStatus(result, timeout) {
|
|
77
77
|
// Prefer the signal reported by the process. `killed` is only a fallback
|
|
78
|
-
// for platforms (notably
|
|
78
|
+
// for platforms (notably a Windows tree kill) that close without one.
|
|
79
79
|
const signal = result.signal || (result.killed ? 'SIGKILL' : null);
|
|
80
80
|
const exitCode = signal ? null : result.exitCode;
|
|
81
81
|
const shellToolFailed = result.failurePhase === 'tool' || !!result.outputCaptureError;
|
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
// Whether a shell command mentions `git … worktree add`. A worktree added from
|
|
2
|
+
// the shell is invisible to the managed cleanup and outlives the session that
|
|
3
|
+
// made it, so the shell guard refuses it and points to the git tool.
|
|
4
|
+
//
|
|
5
|
+
// Deliberately textual, conservative and linear-time: no shell is parsed. The
|
|
6
|
+
// command is normalized once (escape and quote characters of every shell
|
|
7
|
+
// dropped, whitespace collapsed; a PowerShell -EncodedCommand decoded), then
|
|
8
|
+
// refused when `git` is followed anywhere later by `worktree … add`. Commands
|
|
9
|
+
// that only mention the phrase as data (echo, grep, a heredoc, a commit
|
|
10
|
+
// message) are refused too; the refusal says how to proceed.
|
|
11
|
+
|
|
12
|
+
const QUOTES = /['"\u2018\u2019\u201a\u201b\u201c\u201d\u201e]/g;
|
|
13
|
+
const GIT_WORD = /\bgit\b/i;
|
|
14
|
+
// `worktree` ending a token that is not an option: `worktree`, `$(worktree`, `alias.wa=worktree`.
|
|
15
|
+
const WORKTREE_TOKEN = /(?:^|[^\w-])worktree$/i;
|
|
16
|
+
const ADD_TOKEN = /^add\b/i;
|
|
17
|
+
// powershell/pwsh -EncodedCommand (any accepted prefix: -e, -ec, -enc, …) and its base64 argument.
|
|
18
|
+
const ENCODED_COMMAND = /(?:^|[\s'"])[-/]e(?:c|n[a-z]*)?\s+['"]?([A-Za-z0-9+/]{4,}={0,2})/gi;
|
|
19
|
+
|
|
20
|
+
/** The command with every shell's escapes and quotes dropped and whitespace collapsed.
|
|
21
|
+
* `joiner` replaces a line continuation: '' as POSIX joins `a\<newline>dd` into one
|
|
22
|
+
* word, ' ' where the continuation separates words. */
|
|
23
|
+
function normalize(text, joiner) {
|
|
24
|
+
return (
|
|
25
|
+
text
|
|
26
|
+
.replace(/[\\`]\r?\n/g, joiner)
|
|
27
|
+
// Hex escapes ($'\x61dd', "\x61dd").
|
|
28
|
+
.replace(/\\x([0-9a-fA-F]{2})/g, (_, hex) => String.fromCharCode(Number.parseInt(hex, 16)))
|
|
29
|
+
// The `$` of a POSIX $'…' / $"…" string.
|
|
30
|
+
.replace(/\$(?=['"])/g, '')
|
|
31
|
+
// PowerShell backtick and cmd caret escapes.
|
|
32
|
+
.replace(/[`^]/g, '')
|
|
33
|
+
.replace(QUOTES, '')
|
|
34
|
+
.replace(/\s+/g, ' ')
|
|
35
|
+
);
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/** True when some `git` word comes before a `worktree … add` in `text`. One pass
|
|
39
|
+
* over the tokens: options (`-…`) between `worktree` and `add` are skipped and
|
|
40
|
+
* never start a match, so every token is visited once. */
|
|
41
|
+
function gitThenWorktreeAdd(text) {
|
|
42
|
+
const tokens = text.split(/[\s,]+/);
|
|
43
|
+
let gitSeen = false;
|
|
44
|
+
for (let i = 0; i < tokens.length; i += 1) {
|
|
45
|
+
const token = tokens[i];
|
|
46
|
+
if (!gitSeen) {
|
|
47
|
+
gitSeen = GIT_WORD.test(token);
|
|
48
|
+
continue;
|
|
49
|
+
}
|
|
50
|
+
if (token.startsWith('-') || !WORKTREE_TOKEN.test(token)) continue;
|
|
51
|
+
let next = i + 1;
|
|
52
|
+
while (next < tokens.length && tokens[next].startsWith('-')) next += 1;
|
|
53
|
+
if (next < tokens.length && ADD_TOKEN.test(tokens[next])) return true;
|
|
54
|
+
i = next - 1;
|
|
55
|
+
}
|
|
56
|
+
return false;
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
/** True when `command` would (or might) run `git … worktree add`. */
|
|
60
|
+
export function addsUnmanagedWorktree(command) {
|
|
61
|
+
const raw = String(command ?? '');
|
|
62
|
+
const texts = [raw];
|
|
63
|
+
for (const [, encoded] of raw.matchAll(ENCODED_COMMAND)) {
|
|
64
|
+
texts.push(Buffer.from(encoded, 'base64').toString('utf16le'));
|
|
65
|
+
}
|
|
66
|
+
return texts.some((text) =>
|
|
67
|
+
['', ' '].some((joiner) => {
|
|
68
|
+
const normalized = normalize(text, joiner);
|
|
69
|
+
// A backslash is a POSIX escape (`a\dd` is `add`) or a Windows path separator
|
|
70
|
+
// (`C:\Git\cmd\git.exe`): both readings are checked.
|
|
71
|
+
return (
|
|
72
|
+
gitThenWorktreeAdd(normalized.replace(/\\(?=[A-Za-z])/g, '')) ||
|
|
73
|
+
gitThenWorktreeAdd(normalized.replaceAll('\\', '/'))
|
|
74
|
+
);
|
|
75
|
+
})
|
|
76
|
+
);
|
|
77
|
+
}
|
|
@@ -98,7 +98,7 @@ export const GIT_TOOL_DEF = {
|
|
|
98
98
|
openWorldHint: true,
|
|
99
99
|
compressible: true,
|
|
100
100
|
},
|
|
101
|
-
description: `${GIT_DESCRIPTION_HEAD} Worktrees are managed only: action:worktree; git worktree add/remove/list/prune map to managed operations (add -b keeps the session in place; add --detach makes a read-only snapshot worktree, removed when its turn ends; list --porcelain stays raw git; move/lock/unlock/repair are refused). Merge or remove only when the user asks.`,
|
|
101
|
+
description: `${GIT_DESCRIPTION_HEAD} Worktrees are managed only: action:worktree; git worktree add/remove/list/prune map to managed operations (add -b keeps the session in place; add --detach makes a read-only snapshot worktree, removed when its turn ends, and is the one add a delegated worker may run; list --porcelain stays raw git; move/lock/unlock/repair are refused). Merge or remove only when the user asks.`,
|
|
102
102
|
inputSchema: {
|
|
103
103
|
type: 'object',
|
|
104
104
|
properties: {
|
|
@@ -144,7 +144,10 @@ export const GIT_TOOL_DEF = {
|
|
|
144
144
|
description: 'enter/return/merge/remove: another session (it must be idle); default the caller.',
|
|
145
145
|
},
|
|
146
146
|
name: { type: 'string', description: 'enter: the new worktree name (branch <prefix><name>).' },
|
|
147
|
-
branch: {
|
|
147
|
+
branch: {
|
|
148
|
+
type: 'string',
|
|
149
|
+
description: "enter: use the worktree of this branch instead. remove: this session's worktree of that branch.",
|
|
150
|
+
},
|
|
148
151
|
create: { type: 'boolean', description: 'enter with branch: create that branch.' },
|
|
149
152
|
carry: {
|
|
150
153
|
type: 'string',
|
|
@@ -580,7 +583,8 @@ function commandFailure(plan, result, limit = GIT_OUTPUT_LINES_DEFAULT) {
|
|
|
580
583
|
function runGit(plan, argv, options = {}) {
|
|
581
584
|
return startGit(
|
|
582
585
|
gitToolEnvironment(!options.readOnly),
|
|
583
|
-
(command, env) =>
|
|
586
|
+
(command, env) =>
|
|
587
|
+
runProcess(command, [...plan.globalArgs, ...argv], { cwd: plan.cwd, signal: options.signal, env }),
|
|
584
588
|
(result) => result.error
|
|
585
589
|
);
|
|
586
590
|
}
|
|
@@ -15,7 +15,9 @@
|
|
|
15
15
|
*
|
|
16
16
|
* Every operation but `list` belongs to the Lead: the session runtime that
|
|
17
17
|
* hosts the caller registers its host (shared/worktrees/tool-host.mjs); a
|
|
18
|
-
* caller no host claims (a delegated worker) is refused
|
|
18
|
+
* caller no host claims (a delegated worker) is refused, except for a
|
|
19
|
+
* read-only `add --detach` snapshot held by its own session and removed when
|
|
20
|
+
* its turn settles (shared/worktrees/worker-snapshots.mjs).
|
|
19
21
|
*/
|
|
20
22
|
import { basename, resolve } from 'node:path';
|
|
21
23
|
import { isPlainObject } from '../../../../shared/object.mjs';
|
|
@@ -23,6 +25,7 @@ import { WORKTREE_REFUSAL_REASONS } from '../../../../shared/worktrees/contract.
|
|
|
23
25
|
import { firstLine, listWorktrees, runGit } from '../../../../shared/worktrees/git.mjs';
|
|
24
26
|
import { canonicalPath, samePath } from '../../../../shared/worktrees/paths.mjs';
|
|
25
27
|
import { worktreeToolHost } from '../../../../shared/worktrees/tool-host.mjs';
|
|
28
|
+
import { createWorkerSnapshot } from '../../../../shared/worktrees/worker-snapshots.mjs';
|
|
26
29
|
|
|
27
30
|
export const WORKTREE_TOOL_ACTIONS = Object.freeze(['enter', 'return', 'merge', 'remove', 'list', 'prune']);
|
|
28
31
|
const CARRY_CHOICES = ['leave', 'carry'];
|
|
@@ -327,7 +330,12 @@ async function rawAdd(plan, input, options) {
|
|
|
327
330
|
const [path, commitish = null] = positional;
|
|
328
331
|
if (!path || positional.length > 2) throw new Error('git worktree add requires <path> [<commit-ish>]');
|
|
329
332
|
if (detach && branch) throw new Error('git worktree add: --detach excludes -b/-B');
|
|
330
|
-
const host =
|
|
333
|
+
const host = worktreeToolHost(options?.sessionId);
|
|
334
|
+
if (!host && !detach) {
|
|
335
|
+
throw new Error(
|
|
336
|
+
'git worktree add belongs to the Lead session; a delegated worker may only make a read-only snapshot: git worktree add --detach <path> [<commit>]'
|
|
337
|
+
);
|
|
338
|
+
}
|
|
331
339
|
const repo = await repositoryAt(plan.cwd);
|
|
332
340
|
if (!repo) throw new Error(`git worktree add: ${plan.cwd} is not a git repository`);
|
|
333
341
|
const confirmLarge = input.confirm_large === true;
|
|
@@ -340,11 +348,16 @@ async function rawAdd(plan, input, options) {
|
|
|
340
348
|
if (snapshotCommit) {
|
|
341
349
|
const commit = await commitIn(plan.cwd, snapshotCommit);
|
|
342
350
|
if (!commit) throw new Error(`git worktree add: ${snapshotCommit} is not a commit`);
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
{ op: 'snapshot', commit, confirmLarge, txId, repoCommonDir: repo.repoCommonDir },
|
|
346
|
-
|
|
347
|
-
|
|
351
|
+
// A delegated worker's snapshot is held by its own session and removed when its turn settles.
|
|
352
|
+
const entry = host
|
|
353
|
+
? await runOn(host, { op: 'snapshot', commit, confirmLarge, txId, repoCommonDir: repo.repoCommonDir }, options)
|
|
354
|
+
: await createWorkerSnapshot({
|
|
355
|
+
sessionId: options?.sessionId,
|
|
356
|
+
projectPath: plan.cwd,
|
|
357
|
+
commit,
|
|
358
|
+
txId,
|
|
359
|
+
confirmLarge,
|
|
360
|
+
});
|
|
348
361
|
return okJson({
|
|
349
362
|
...mapped,
|
|
350
363
|
snapshot: true,
|
|
@@ -512,7 +525,7 @@ function worktreeInputError(input) {
|
|
|
512
525
|
const misplaced =
|
|
513
526
|
only('session_id', ['enter', 'return', 'merge', 'remove']) ||
|
|
514
527
|
only('name', ['enter']) ||
|
|
515
|
-
only('branch', ['enter']) ||
|
|
528
|
+
only('branch', ['enter', 'remove']) ||
|
|
516
529
|
only('create', ['enter']) ||
|
|
517
530
|
only('carry', ['enter']) ||
|
|
518
531
|
only('confirm_large', ['enter']) ||
|
|
@@ -529,6 +542,9 @@ function worktreeInputError(input) {
|
|
|
529
542
|
return 'branch excludes name and carry (the branch names the worktree; changes stay in the project folder)';
|
|
530
543
|
}
|
|
531
544
|
if (input.carry !== undefined && !CARRY_CHOICES.includes(input.carry)) return 'carry must be leave or carry';
|
|
545
|
+
if (action === 'remove' && input.branch !== undefined && input.session_id !== undefined) {
|
|
546
|
+
return "branch names one of this session's own worktrees; it excludes session_id";
|
|
547
|
+
}
|
|
532
548
|
return null;
|
|
533
549
|
}
|
|
534
550
|
|
|
@@ -554,7 +570,9 @@ export async function executeWorktreeAction(input, workDir, options = {}) {
|
|
|
554
570
|
confirmLarge: input.confirm_large === true,
|
|
555
571
|
}
|
|
556
572
|
: {}),
|
|
557
|
-
...(action === 'remove'
|
|
573
|
+
...(action === 'remove'
|
|
574
|
+
? { force: input.force === true, ...(input.branch?.trim() ? { branch: input.branch.trim() } : {}) }
|
|
575
|
+
: {}),
|
|
558
576
|
...(action === 'prune'
|
|
559
577
|
? { repoCommonDir: (await repositoryAt(resolve(workDir || process.cwd())))?.repoCommonDir ?? null }
|
|
560
578
|
: {}),
|
|
@@ -34,7 +34,7 @@ export function uniqueStrings(values) {
|
|
|
34
34
|
return Array.from(new Set(values.filter((value) => typeof value === 'string' && value)));
|
|
35
35
|
}
|
|
36
36
|
|
|
37
|
-
|
|
37
|
+
function coerceNonNegInt(value) {
|
|
38
38
|
if (value === undefined || value === null || value === '') return null;
|
|
39
39
|
const n = Number(value);
|
|
40
40
|
if (!Number.isFinite(n) || n < 0) return NaN;
|
|
@@ -49,7 +49,7 @@ export function stringList(value) {
|
|
|
49
49
|
|
|
50
50
|
// head_limit shared by the single-path flow and the path[] fan-out:
|
|
51
51
|
// absent → the default cap, 0 → unlimited, otherwise the coerced integer.
|
|
52
|
-
|
|
52
|
+
function resolveHeadLimit(coerced, defaultLimit) {
|
|
53
53
|
if (coerced === null) return defaultLimit;
|
|
54
54
|
return coerced === 0 ? Infinity : coerced;
|
|
55
55
|
}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
// How long a running shell job has gone without writing to stdout or stderr.
|
|
2
|
+
// Silence is read from the capture files' mtime (the writer is the child, so
|
|
3
|
+
// nothing has to poll), floored at the job's start. It is a warning only:
|
|
4
|
+
// builds and installs can be legitimately quiet, so nothing is ever killed
|
|
5
|
+
// from here, and any output at all resets the clock.
|
|
6
|
+
import { statSync } from 'node:fs';
|
|
7
|
+
import { formatDuration } from '../../../../../shared/time-format.mjs';
|
|
8
|
+
import { getBackgroundTask } from '../../../../../shared/background-tasks.mjs';
|
|
9
|
+
import { STALL_ABORT_S, resolveTimeoutMs } from '../../../stall-policy.mjs';
|
|
10
|
+
|
|
11
|
+
// Defaults to the agent stall budget (600 s): a quiet job past the point where
|
|
12
|
+
// a silent model turn would be reaped is worth a look.
|
|
13
|
+
export const SHELL_OUTPUT_SILENCE_WARN_MS = resolveTimeoutMs(
|
|
14
|
+
'MIXDOG_SHELL_OUTPUT_SILENCE_WARN_MS',
|
|
15
|
+
STALL_ABORT_S * 1000
|
|
16
|
+
);
|
|
17
|
+
|
|
18
|
+
/** Milliseconds since the job last wrote to stdout/stderr (or started), or null
|
|
19
|
+
* when silence is unknown. The spawner creates both capture files before the
|
|
20
|
+
* command runs (mixdog-spawn open_capture_files, or the paired spill open), so
|
|
21
|
+
* a stream whose file cannot be stat'd (even ENOENT) is unknown, not quiet:
|
|
22
|
+
* its recent output could be what we cannot see. `task` is the background
|
|
23
|
+
* task; the stream paths come from `result` or the task meta. */
|
|
24
|
+
export function shellOutputSilenceMs(task, { now = Date.now(), result = task?.result } = {}) {
|
|
25
|
+
let last = null;
|
|
26
|
+
for (const path of [result?.stdout_path || task?.meta?.stdout, result?.stderr_path || task?.meta?.stderr]) {
|
|
27
|
+
if (!path) continue;
|
|
28
|
+
try {
|
|
29
|
+
last = Math.max(last ?? 0, statSync(path).mtimeMs);
|
|
30
|
+
} catch {
|
|
31
|
+
return null;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
if (last == null) return null;
|
|
35
|
+
return Math.max(0, now - Math.max(last, Number(task?.startedAtMs) || 0));
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/** The warning text for a silence at or past the threshold, else null. */
|
|
39
|
+
export function describeShellOutputSilence(silentMs, warnMs = SHELL_OUTPUT_SILENCE_WARN_MS) {
|
|
40
|
+
if (!(silentMs >= warnMs)) return null;
|
|
41
|
+
return `no output for ${formatDuration(silentMs, { mostSignificantOnly: true })} — may be hung; inspect or cancel`;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
const isRunningShell = (task) => task?.surface === 'shell' && task.status === 'running';
|
|
45
|
+
|
|
46
|
+
/** The warning for one running shell task, else null. */
|
|
47
|
+
export function shellTaskSilenceNote(task, { now = Date.now(), warnMs = SHELL_OUTPUT_SILENCE_WARN_MS, result } = {}) {
|
|
48
|
+
if (!isRunningShell(task)) return null;
|
|
49
|
+
return describeShellOutputSilence(shellOutputSilenceMs(task, { now, result: result ?? task.result }), warnMs);
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
/** The quietest of the running shell jobs an agent's `task wait` is parked on:
|
|
53
|
+
* `{ taskId, silentMs, hung }`, or null when it waits on none. */
|
|
54
|
+
export function waitedJobSilence(taskIds, { now = Date.now(), warnMs = SHELL_OUTPUT_SILENCE_WARN_MS } = {}) {
|
|
55
|
+
let worst = null;
|
|
56
|
+
for (const taskId of taskIds || []) {
|
|
57
|
+
const task = getBackgroundTask(taskId);
|
|
58
|
+
if (!isRunningShell(task)) continue;
|
|
59
|
+
const silentMs = shellOutputSilenceMs(task, { now });
|
|
60
|
+
if (silentMs != null && (!worst || silentMs > worst.silentMs))
|
|
61
|
+
worst = { taskId, silentMs, hung: silentMs >= warnMs };
|
|
62
|
+
}
|
|
63
|
+
return worst;
|
|
64
|
+
}
|
|
@@ -20,6 +20,11 @@ import {
|
|
|
20
20
|
prepareShellText,
|
|
21
21
|
textPiece,
|
|
22
22
|
} from './shell-delivery.mjs';
|
|
23
|
+
import {
|
|
24
|
+
SHELL_OUTPUT_SILENCE_WARN_MS,
|
|
25
|
+
describeShellOutputSilence,
|
|
26
|
+
shellOutputSilenceMs,
|
|
27
|
+
} from './shell-output-silence.mjs';
|
|
23
28
|
|
|
24
29
|
const cursors = new WeakMap();
|
|
25
30
|
const ESC = '\x1b';
|
|
@@ -121,16 +126,16 @@ function lastMatch(pattern, text) {
|
|
|
121
126
|
|
|
122
127
|
/** What changed since the agent last saw the job: growth, last line, any
|
|
123
128
|
* visible percent/ETA. Used where a still-running job is reported. */
|
|
124
|
-
function progressDigest(growth) {
|
|
129
|
+
function progressDigest(growth, hung) {
|
|
125
130
|
const bytes = growth.reduce((sum, entry) => sum + entry.bytes, 0);
|
|
126
131
|
const lines = growth.reduce((sum, entry) => sum + entry.lines, 0);
|
|
127
132
|
const text = growth
|
|
128
133
|
.map((entry) => entry.text)
|
|
129
134
|
.filter(Boolean)
|
|
130
135
|
.join('\n');
|
|
131
|
-
const parts = [
|
|
132
|
-
|
|
133
|
-
|
|
136
|
+
const parts = [];
|
|
137
|
+
if (bytes > 0) parts.push(`+${formatKb(bytes)}, +${lines} lines since you last saw it`);
|
|
138
|
+
else if (!hung) parts.push('no new output since you last saw it');
|
|
134
139
|
const last = text
|
|
135
140
|
.split('\n')
|
|
136
141
|
.reverse()
|
|
@@ -140,6 +145,8 @@ function progressDigest(growth) {
|
|
|
140
145
|
if (percent && Number(percent[1]) <= 100) parts.push(`${percent[1]}%`);
|
|
141
146
|
const eta = lastMatch(ETA_RE, text);
|
|
142
147
|
if (eta) parts.push(`ETA ${eta[1].trim()}`);
|
|
148
|
+
// A job quiet past the threshold is no longer reassured as "not an error".
|
|
149
|
+
if (hung) return `[progress] ${[...parts, hung].join(' · ')}`;
|
|
143
150
|
return `[progress] ${parts.join(' · ')} — still running, not an error`;
|
|
144
151
|
}
|
|
145
152
|
|
|
@@ -169,7 +176,13 @@ export function shellLogPiece(path) {
|
|
|
169
176
|
export function readShellTaskOutput(
|
|
170
177
|
task,
|
|
171
178
|
result = {},
|
|
172
|
-
{
|
|
179
|
+
{
|
|
180
|
+
output = 'new',
|
|
181
|
+
terminal = task.status !== 'running',
|
|
182
|
+
digest = false,
|
|
183
|
+
now = Date.now(),
|
|
184
|
+
silenceWarnMs = SHELL_OUTPUT_SILENCE_WARN_MS,
|
|
185
|
+
} = {}
|
|
173
186
|
) {
|
|
174
187
|
const replay = output === 'tail';
|
|
175
188
|
const growth = [];
|
|
@@ -253,5 +266,6 @@ export function readShellTaskOutput(
|
|
|
253
266
|
const body =
|
|
254
267
|
sections.map((item) => (item.piece ? `${item.prefix}${bodies[pieces.indexOf(item)]}` : item)).join('\n\n') ||
|
|
255
268
|
(replay ? '(no output)' : '(no new output)');
|
|
256
|
-
|
|
269
|
+
const hung = digest ? describeShellOutputSilence(shellOutputSilenceMs(task, { now, result }), silenceWarnMs) : null;
|
|
270
|
+
return escapeHarnessTags(digest ? `${progressDigest(growth, hung)}\n\n${body}` : body);
|
|
257
271
|
}
|
|
@@ -293,7 +293,7 @@ function requestReadRangeIndexPersist(key, job) {
|
|
|
293
293
|
})();
|
|
294
294
|
}
|
|
295
295
|
|
|
296
|
-
|
|
296
|
+
function scheduleReadRangeIndexPersist(index) {
|
|
297
297
|
if (!READ_RANGE_INDEX_DISK_DIR || !currentReadRangeIndex(index)) return;
|
|
298
298
|
const key = canonicalCachePath(index.fullPath);
|
|
299
299
|
const inflight = READ_RANGE_INDEX_INFLIGHT.get(key);
|
|
@@ -11,7 +11,6 @@ import { invalidateBuiltinResultCache } from './cache-layers.mjs';
|
|
|
11
11
|
import { getReadSnapshot } from './read-snapshot-runtime.mjs';
|
|
12
12
|
import { snapshotCoversFullFile, statMatchesSnapshot } from './snapshot-helpers.mjs';
|
|
13
13
|
import { canCacheReadFile, READ_PREFIX_HASH_BYTES } from './read-cache-policy.mjs';
|
|
14
|
-
export { READ_PREFIX_HASH_BYTES } from './read-cache-policy.mjs';
|
|
15
14
|
|
|
16
15
|
// A mutation snapshot claims the full file because it knows the bytes it
|
|
17
16
|
// wrote; it proves the session holds the body only when bodyDelivered says so.
|
|
@@ -1,12 +1,2 @@
|
|
|
1
|
-
export {
|
|
2
|
-
_suggestIndexedPaths,
|
|
3
|
-
basePathDiagnostic,
|
|
4
|
-
buildNotFoundHint,
|
|
5
|
-
isUncOrSmbPath,
|
|
6
|
-
relativePathPrefix,
|
|
7
|
-
relativeSearchResultPath,
|
|
8
|
-
resolveSearchScope,
|
|
9
|
-
uncRefusalMessage,
|
|
10
|
-
} from './search-path-diagnostics.mjs';
|
|
11
1
|
export { executeGrepTool } from './search-grep-tool.mjs';
|
|
12
2
|
export { executeGlobTool } from './search-glob-tool.mjs';
|
|
@@ -209,8 +209,7 @@ async function trackShellJobRecord(task, options) {
|
|
|
209
209
|
// settle does. A killed one relies on the snapshot taken before the kill.
|
|
210
210
|
const killed = entry.killed || detail.killed || detail.timedOut || String(detail.status) === 'cancelled';
|
|
211
211
|
if (!killed) tracker.acceptExitObservation();
|
|
212
|
-
const watched =
|
|
213
|
-
contained && (killed || detail.treeOutcome === 'empty') ? containedJobTracker(jobId) : tracker;
|
|
212
|
+
const watched = contained && (killed || detail.treeOutcome === 'empty') ? containedJobTracker(jobId) : tracker;
|
|
214
213
|
// The completion notice is already on its way (watchBackgroundShellJob);
|
|
215
214
|
// the record — and with it the workspace admission — completes only once
|
|
216
215
|
// every process is confirmed gone, or the user releases it explicitly.
|
|
@@ -32,6 +32,7 @@ import { recordDeliveredCompletion } from '../../session/manager/delivered-compl
|
|
|
32
32
|
import { listShellJobRecords, readShellJobRecord } from './lib/shell-job-records.mjs';
|
|
33
33
|
import { resourceAdmission } from '../../../../shared/resource-admission.mjs';
|
|
34
34
|
import { readShellTaskOutput } from './lib/shell-task-output.mjs';
|
|
35
|
+
import { shellTaskSilenceNote } from './lib/shell-output-silence.mjs';
|
|
35
36
|
|
|
36
37
|
// Ceiling for confirming that a cancelled task's process really exited. The
|
|
37
38
|
// wait returns the moment the native task settles, so this only bounds a
|
|
@@ -89,6 +90,11 @@ function refreshShellTask(taskId, { includeRunning = false } = {}) {
|
|
|
89
90
|
if (task) {
|
|
90
91
|
task.result = publicResult;
|
|
91
92
|
task.resultText = JSON.stringify(publicResult, null, 2);
|
|
93
|
+
// The job's own status line: set while it is quiet past the threshold,
|
|
94
|
+
// gone again the moment it prints.
|
|
95
|
+
const silence = shellTaskSilenceNote(task);
|
|
96
|
+
if (silence) task.meta = { ...task.meta, output_silence: silence };
|
|
97
|
+
else if (task.meta?.output_silence) delete task.meta.output_silence;
|
|
92
98
|
}
|
|
93
99
|
}
|
|
94
100
|
return job;
|
|
@@ -144,6 +150,11 @@ async function listTasks(options) {
|
|
|
144
150
|
(record) => recoveredTaskMatches(record, options) && !liveIds.has(record.jobId)
|
|
145
151
|
);
|
|
146
152
|
const sections = [rendered];
|
|
153
|
+
const quiet = listBackgroundTasks({ context: options, surface: 'shell' })
|
|
154
|
+
.map((row) => [row.task_id, shellTaskSilenceNote(getBackgroundTask(row.task_id))])
|
|
155
|
+
.filter(([, note]) => note)
|
|
156
|
+
.map(([id, note]) => `- ${id} ${note}`);
|
|
157
|
+
if (quiet.length > 0) sections.push(`[output silence]\n${quiet.join('\n')}`);
|
|
147
158
|
if (recovered.length > 0) {
|
|
148
159
|
const rows = recovered.map(
|
|
149
160
|
(record) =>
|
|
@@ -175,7 +186,7 @@ async function waitForShellTask(task, taskId, args, options) {
|
|
|
175
186
|
turnSignal = null;
|
|
176
187
|
}
|
|
177
188
|
const waitControl = beginInterruptibleTaskWait(options?.sessionId, turnSignal);
|
|
178
|
-
const releaseWaitState = beginSessionTaskWait(options?.sessionId);
|
|
189
|
+
const releaseWaitState = beginSessionTaskWait(options?.sessionId, taskId);
|
|
179
190
|
const waitSignal = waitControl.signal;
|
|
180
191
|
const waitTimeoutMs = resolveTaskWaitTimeoutMs(args.timeout_ms, await defaultTaskWaitMs(options?.sessionId));
|
|
181
192
|
let interruptedByUser = false;
|