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
|
@@ -20,7 +20,7 @@ import { __mixdogMemoryLog } from '../memory-log.mjs';
|
|
|
20
20
|
*/
|
|
21
21
|
|
|
22
22
|
import { createServer } from 'node:net';
|
|
23
|
-
import { existsSync, unlinkSync, readFileSync,
|
|
23
|
+
import { existsSync, unlinkSync, readFileSync, renameSync, statSync, mkdirSync } from 'node:fs';
|
|
24
24
|
import { join, resolve } from 'node:path';
|
|
25
25
|
import {
|
|
26
26
|
discoveryPath as _pgDiscoveryPath,
|
|
@@ -28,6 +28,7 @@ import {
|
|
|
28
28
|
writeServiceAdvert as _writePgServiceAdvert,
|
|
29
29
|
} from '../../../shared/service-discovery.mjs';
|
|
30
30
|
import { withFileLockSync } from '../../../shared/atomic-file.mjs';
|
|
31
|
+
import { withFileLock } from '../../../shared/file-lock.mjs';
|
|
31
32
|
import { isPidAlive } from '../../../shared/pid-liveness.mjs';
|
|
32
33
|
import { envFlag } from '../../../shared/env.mjs';
|
|
33
34
|
import { createSharedAbortable } from '../../../shared/abort-race.mjs';
|
|
@@ -64,92 +65,11 @@ let _ownedExitStopInstalled = false;
|
|
|
64
65
|
const PG_PORT_MIN = 55432;
|
|
65
66
|
const PG_PORT_MAX = 55632;
|
|
66
67
|
const PG_LOG_MAX_BYTES = 10 * 1024 * 1024; // 10 MB
|
|
67
|
-
const SPAWN_LOCK_NAME = 'pg-spawn.lock';
|
|
68
|
-
const LOCK_WAIT_MS = 30_000;
|
|
69
|
-
const LOCK_POLL_MS = 100;
|
|
70
|
-
const LOCK_WARN_MS = 5_000;
|
|
71
|
-
const LOCK_WAIT_CODES = new Set(['EEXIST', 'EPERM', 'EACCES', 'EBUSY']);
|
|
72
68
|
|
|
73
69
|
function attachOnlyMode() {
|
|
74
70
|
return envFlag('MIXDOG_PG_ATTACH_ONLY') || envFlag('MIXDOG_MEMORY_SECONDARY');
|
|
75
71
|
}
|
|
76
72
|
|
|
77
|
-
// ── File lock (O_EXCL pattern from dispatch-persist.mjs / run-mcp.mjs) ───────
|
|
78
|
-
|
|
79
|
-
/**
|
|
80
|
-
* Acquire `${dataDir}/pg-spawn.lock`.
|
|
81
|
-
* Returns the lock-file path on success, or null on timeout (caller proceeds
|
|
82
|
-
* best-effort — worst case: two supervisors race initdb on the same pgdata,
|
|
83
|
-
* but the second will fail pg_ctl start gracefully and healthcheck will
|
|
84
|
-
* converge on the first's port).
|
|
85
|
-
*/
|
|
86
|
-
async function acquireSpawnLock(dataDir, blockedProbe = null) {
|
|
87
|
-
const lp = join(dataDir, SPAWN_LOCK_NAME);
|
|
88
|
-
const deadline = Date.now() + LOCK_WAIT_MS;
|
|
89
|
-
const body = JSON.stringify({ pid: process.pid, startedAt: Date.now() });
|
|
90
|
-
let warned = false;
|
|
91
|
-
for (;;) {
|
|
92
|
-
try {
|
|
93
|
-
// 'wx' = O_CREAT | O_EXCL — atomic, fails with EEXIST if held.
|
|
94
|
-
writeFileSync(lp, body, { flag: 'wx' });
|
|
95
|
-
return { lockPath: lp, reuse: null };
|
|
96
|
-
} catch (err) {
|
|
97
|
-
if (!LOCK_WAIT_CODES.has(err?.code)) {
|
|
98
|
-
__mixdogMemoryLog(`[supervisor-pg] spawn lock error: ${err?.code || err?.message}\n`);
|
|
99
|
-
return { lockPath: null, reuse: null };
|
|
100
|
-
}
|
|
101
|
-
if (blockedProbe) {
|
|
102
|
-
try {
|
|
103
|
-
const reuse = await blockedProbe();
|
|
104
|
-
if (reuse) return { lockPath: null, reuse };
|
|
105
|
-
} catch {}
|
|
106
|
-
}
|
|
107
|
-
// Dead-holder detection: same as run-mcp.mjs acquireLock().
|
|
108
|
-
try {
|
|
109
|
-
const holder = JSON.parse(readFileSync(lp, 'utf8'));
|
|
110
|
-
if (holder?.pid) {
|
|
111
|
-
try {
|
|
112
|
-
process.kill(holder.pid, 0);
|
|
113
|
-
} catch (ke) {
|
|
114
|
-
if (ke.code === 'ESRCH') {
|
|
115
|
-
try {
|
|
116
|
-
unlinkSync(lp);
|
|
117
|
-
} catch {}
|
|
118
|
-
continue; // retry immediately after removing stale lock
|
|
119
|
-
}
|
|
120
|
-
}
|
|
121
|
-
}
|
|
122
|
-
const ageMs = Date.now() - Number(holder?.startedAt || 0);
|
|
123
|
-
if (!warned && ageMs >= LOCK_WARN_MS) {
|
|
124
|
-
warned = true;
|
|
125
|
-
__mixdogMemoryLog(
|
|
126
|
-
`[supervisor-pg] waiting for spawn lock holder pid=${holder?.pid || 'unknown'} ageMs=${ageMs}\n`
|
|
127
|
-
);
|
|
128
|
-
}
|
|
129
|
-
} catch {
|
|
130
|
-
/* unreadable — fall through and wait */
|
|
131
|
-
}
|
|
132
|
-
if (Date.now() >= deadline) {
|
|
133
|
-
if (blockedProbe) {
|
|
134
|
-
try {
|
|
135
|
-
const reuse = await blockedProbe();
|
|
136
|
-
if (reuse) return { lockPath: null, reuse };
|
|
137
|
-
} catch {}
|
|
138
|
-
}
|
|
139
|
-
throw new Error(`[supervisor-pg] spawn-lock acquire timeout (concurrent supervisor risk)`);
|
|
140
|
-
}
|
|
141
|
-
await new Promise((r) => setTimeout(r, LOCK_POLL_MS));
|
|
142
|
-
}
|
|
143
|
-
}
|
|
144
|
-
}
|
|
145
|
-
|
|
146
|
-
function releaseSpawnLock(lp) {
|
|
147
|
-
if (!lp) return;
|
|
148
|
-
try {
|
|
149
|
-
unlinkSync(lp);
|
|
150
|
-
} catch {}
|
|
151
|
-
}
|
|
152
|
-
|
|
153
73
|
// ── Port allocation ──────────────────────────────────────────────────────────
|
|
154
74
|
|
|
155
75
|
function _probePort(port) {
|
|
@@ -602,18 +522,10 @@ async function _doEnsure(dataDir, signal) {
|
|
|
602
522
|
throw new Error('secondary memory runtime requires an existing PG instance');
|
|
603
523
|
}
|
|
604
524
|
|
|
605
|
-
// ──
|
|
606
|
-
|
|
607
|
-
|
|
608
|
-
|
|
609
|
-
runtimeDir,
|
|
610
|
-
healthcheckPg,
|
|
611
|
-
source: 'lock-wait',
|
|
612
|
-
})
|
|
613
|
-
);
|
|
614
|
-
if (acquired?.reuse) return acquired.reuse;
|
|
615
|
-
const lp = acquired?.lockPath ?? null;
|
|
616
|
-
try {
|
|
525
|
+
// ── Spawn lock serializes initdb races (see withFileLock below) ──────────
|
|
526
|
+
let lockEntered = false;
|
|
527
|
+
const spawnUnderLock = async () => {
|
|
528
|
+
lockEntered = true;
|
|
617
529
|
// ── Reuse path: another supervisor already started PG ─────────────────
|
|
618
530
|
const lockedReuse = await tryReusePgInstance({
|
|
619
531
|
pgdata,
|
|
@@ -701,8 +613,16 @@ async function _doEnsure(dataDir, signal) {
|
|
|
701
613
|
// ── Allocate a fresh port and spawn ───────────────────────────────────
|
|
702
614
|
const port = await allocatePort();
|
|
703
615
|
return await _startFresh(dataDir, pgdata, port, runtimeDir);
|
|
704
|
-
}
|
|
705
|
-
|
|
616
|
+
};
|
|
617
|
+
try {
|
|
618
|
+
return await withFileLock(join(dataDir, 'pg-spawn.lock'), spawnUnderLock, { timeoutMs: 30_000 });
|
|
619
|
+
} catch (err) {
|
|
620
|
+
// Only an acquisition timeout (spawnUnderLock never ran) falls back to
|
|
621
|
+
// reuse; failures from inside the locked region propagate untouched.
|
|
622
|
+
if (lockEntered || err?.code !== 'ELOCKTIMEOUT') throw err;
|
|
623
|
+
const reuse = await tryReusePgInstance({ pgdata, runtimeDir, healthcheckPg, source: 'lock-wait' });
|
|
624
|
+
if (reuse) return reuse;
|
|
625
|
+
throw new Error('[supervisor-pg] spawn-lock acquire timeout (concurrent supervisor risk)', { cause: err });
|
|
706
626
|
}
|
|
707
627
|
}
|
|
708
628
|
|
|
@@ -119,6 +119,11 @@ exact AS (
|
|
|
119
119
|
WHERE false
|
|
120
120
|
),`;
|
|
121
121
|
}
|
|
122
|
+
// Each row is lowercased once (OFFSET 0 keeps the subquery from being
|
|
123
|
+
// inlined into the per-term condition) and every term is a literal strpos
|
|
124
|
+
// on that text. Per-term ILIKE re-lowercased the whole content for every
|
|
125
|
+
// term, so a natural-language query's 10+ terms multiplied the scan cost.
|
|
126
|
+
// Terms arrive lowercased from buildExactTerms.
|
|
122
127
|
return `
|
|
123
128
|
exact_matches AS (
|
|
124
129
|
SELECT ee.id,
|
|
@@ -126,10 +131,14 @@ exact_matches AS (
|
|
|
126
131
|
q.term,
|
|
127
132
|
COUNT(*) OVER (PARTITION BY q.term)::float8 AS term_df
|
|
128
133
|
FROM entries ee
|
|
134
|
+
CROSS JOIN LATERAL (
|
|
135
|
+
SELECT lower(ee.content) AS content, lower(ee.element) AS element, lower(ee.summary) AS summary
|
|
136
|
+
OFFSET 0
|
|
137
|
+
) lc
|
|
129
138
|
JOIN LATERAL unnest($${exactTermsParam}::text[]) AS q(term) ON (
|
|
130
|
-
|
|
131
|
-
OR
|
|
132
|
-
OR
|
|
139
|
+
strpos(lc.content, q.term) > 0
|
|
140
|
+
OR strpos(lc.element, q.term) > 0
|
|
141
|
+
OR strpos(lc.summary, q.term) > 0
|
|
133
142
|
)
|
|
134
143
|
WHERE true
|
|
135
144
|
${filters.exactFilterClause}
|
|
@@ -22,7 +22,7 @@ export const TOOL_DEFS = [
|
|
|
22
22
|
openWorldHint: false,
|
|
23
23
|
},
|
|
24
24
|
description:
|
|
25
|
-
|
|
25
|
+
"Manage standing user preferences and constraints. Save what the user asks you to remember and report its exact text and scope; an entry you propose yourself, or one whose scope is unclear, waits for the user's approval. Load memory-management for curation policy; stored history uses recall.",
|
|
26
26
|
inputSchema: {
|
|
27
27
|
type: 'object',
|
|
28
28
|
properties: {
|
|
@@ -17,7 +17,7 @@ import { renderPdfPages } from '../pdf/pdf-render.mjs';
|
|
|
17
17
|
const PX_TO_PT = 0.75;
|
|
18
18
|
|
|
19
19
|
/** Artifacts kept beside the document: its HTML and the browser's print of it. */
|
|
20
|
-
|
|
20
|
+
function docxHtmlArtifacts(target) {
|
|
21
21
|
return {
|
|
22
22
|
source: `${target}.mixdog-source.html`,
|
|
23
23
|
print: `${target}.mixdog-html.pdf`,
|
|
@@ -34,7 +34,7 @@ const PPTX_AUTHOR_NEEDS_SOURCE =
|
|
|
34
34
|
'author requires script: HTML slides or a pptxgenjs script (without one it re-authors from <deck>.pptx.mixdog-source.html, and none is there). Load the `pptx` Skill first (Skill name:"pptx"): it carries the authoring workflow, the HTML contract, the composition grammar, and the device kit, then call author again with path and script.';
|
|
35
35
|
|
|
36
36
|
// HTML opens with markup (a doctype, a comment, an element); a pptxgenjs script never does.
|
|
37
|
-
|
|
37
|
+
function isHtmlSource(source) {
|
|
38
38
|
return /^\s*</.test(String(source || ''));
|
|
39
39
|
}
|
|
40
40
|
|
|
@@ -140,7 +140,7 @@ function resolveRange(text, cells, notes) {
|
|
|
140
140
|
}
|
|
141
141
|
|
|
142
142
|
/** The operations that write one measured workbook; formulas and charts come after every sheet's values. */
|
|
143
|
-
|
|
143
|
+
function xlsxOperationsFromSheets(sheets, { captures = new Map(), notes = [] } = {}) {
|
|
144
144
|
const first = [];
|
|
145
145
|
const later = [];
|
|
146
146
|
const chartData = [];
|
|
@@ -49,7 +49,7 @@ function fillRangeCharts() {
|
|
|
49
49
|
}
|
|
50
50
|
|
|
51
51
|
/** Artifacts kept beside the workbook: its HTML and the browser's picture of each sheet. */
|
|
52
|
-
|
|
52
|
+
function xlsxHtmlArtifacts(target) {
|
|
53
53
|
return {
|
|
54
54
|
source: `${target}.mixdog-source.html`,
|
|
55
55
|
shot: (sheet) => `${target}.mixdog-html-sheet-${sheet}.png`,
|
|
@@ -430,7 +430,7 @@ function docxStyleDefinitionFault(format, name, operation, index) {
|
|
|
430
430
|
|
|
431
431
|
// A Word table has two alignments that read alike: `alignment` places the
|
|
432
432
|
// table on the page and `columnAlignments` sets the text of each column.
|
|
433
|
-
// A list written into the first
|
|
433
|
+
// A list written into the first would be serialized verbatim into the
|
|
434
434
|
// table's justification and refused by Word's schema at finalize.
|
|
435
435
|
function docxTableAlignmentFaults(format, name, operation, index) {
|
|
436
436
|
const properties = operation.properties;
|
|
@@ -118,7 +118,7 @@ export async function ensureOfficeSessionDesign(
|
|
|
118
118
|
session.designRequest = mergeOfficeDesignRequest(session.designRequest, args.design);
|
|
119
119
|
// A native document stays native: the `design` a later call carries is the
|
|
120
120
|
// page review (reviewed, reviewToken, critique) or content, not a request
|
|
121
|
-
// for a preset. Resolving it as one
|
|
121
|
+
// for a preset. Resolving it as one would hand a Word or Excel file the
|
|
122
122
|
// default profile's palette and art direction it never asked for, and put
|
|
123
123
|
// the preset review's gates in front of finalize.
|
|
124
124
|
session.design =
|
|
@@ -108,9 +108,9 @@ export function normalizeOfficeContentModel(value) {
|
|
|
108
108
|
const id = safeId(claim.id, 'claim id', `claim ${index + 1}${claim?.text ? `: ${claim.text}` : ''}`);
|
|
109
109
|
if (claimIds.has(id)) throw new Error(`Office content model has duplicate claim id ${id}`);
|
|
110
110
|
claimIds.add(id);
|
|
111
|
-
// The references are the point of a claim
|
|
112
|
-
//
|
|
113
|
-
//
|
|
111
|
+
// The references are the point of a claim, so `facts` is accepted as an
|
|
112
|
+
// alias of `factIds`: a claim written with either name stays bound to its
|
|
113
|
+
// sources instead of reporting the figure it carried as unsourced.
|
|
114
114
|
let references = [];
|
|
115
115
|
if (Array.isArray(claim.factIds)) references = claim.factIds;
|
|
116
116
|
else if (Array.isArray(claim.facts)) references = claim.facts;
|
|
@@ -39,10 +39,10 @@ function writeSectionHeading(w, section) {
|
|
|
39
39
|
function writeSectionList(w, section, sectionKind, blockFollows = false) {
|
|
40
40
|
const { append, colors, type, bodySize, spacing } = w;
|
|
41
41
|
const sectionBullets = strings(section.bullets);
|
|
42
|
-
// A section that names steps draws them.
|
|
43
|
-
//
|
|
44
|
-
//
|
|
45
|
-
//
|
|
42
|
+
// A section that names steps draws them. Reaching the page only with
|
|
43
|
+
// kind:'roadmap' would land a plan section as a heading with nothing under
|
|
44
|
+
// it - and the audit would report the orphan heading the composer had just
|
|
45
|
+
// written.
|
|
46
46
|
const sectionSteps = Array.isArray(section.steps) ? section.steps : [];
|
|
47
47
|
const stepSource = sectionSteps.length ? sectionSteps : sectionBullets;
|
|
48
48
|
const drewSteps =
|
|
@@ -76,8 +76,8 @@ function writeSectionList(w, section, sectionKind, blockFollows = false) {
|
|
|
76
76
|
});
|
|
77
77
|
}
|
|
78
78
|
|
|
79
|
-
// What a section can carry. A field outside this list
|
|
80
|
-
// page as a heading with nothing under it, and the composer
|
|
79
|
+
// What a section can carry. A field outside this list would vanish: a plan written as `roadmap:[…]` would reach the
|
|
80
|
+
// page as a heading with nothing under it, and the composer would report success.
|
|
81
81
|
const SECTION_FIELDS = new Set([
|
|
82
82
|
'heading',
|
|
83
83
|
'title',
|
|
@@ -197,7 +197,7 @@ export function addXlsxDecisionPanel(
|
|
|
197
197
|
cursor += 1;
|
|
198
198
|
});
|
|
199
199
|
}
|
|
200
|
-
// The actions follow the gates rather than stand in for them: given both, the actions
|
|
200
|
+
// The actions follow the gates rather than stand in for them: given both, the actions would be dropped.
|
|
201
201
|
if (gateRows.length && strings(actions).length) cursor += 1;
|
|
202
202
|
for (const action of strings(actions).slice(0, 4)) {
|
|
203
203
|
mergedBlock(output, {
|
|
@@ -417,7 +417,7 @@ function metricLabelStyle({ colors, type, dashboard }) {
|
|
|
417
417
|
// metric is the one the strip paints as the headline, so the wider card reads
|
|
418
418
|
// as emphasis rather than as a card that ran out of room.
|
|
419
419
|
// More cards than columns wrap onto a second strip rather than pulling the
|
|
420
|
-
// canvas past the table: a three-metric strip over a two-column table
|
|
420
|
+
// canvas past the table: a three-metric strip over a two-column table would
|
|
421
421
|
// make every band half again as wide as the table under it.
|
|
422
422
|
// The text a card's value shows under its number format ("47.0%" for 0.47 under 0.0%, "12명" for 12 under 0"명").
|
|
423
423
|
function metricDisplayText(metric) {
|
|
@@ -9,7 +9,7 @@ import { workerExecArgv } from '../../shared/worker-exec-argv.mjs';
|
|
|
9
9
|
const ENGINE_URL = new URL('./ocr-engine-worker.mjs', import.meta.url);
|
|
10
10
|
|
|
11
11
|
/** The start includes the first-use download; without network it fails or hangs. */
|
|
12
|
-
|
|
12
|
+
const OCR_ENGINE_START_TIMEOUT_MS = 90_000;
|
|
13
13
|
|
|
14
14
|
const engines = new Map();
|
|
15
15
|
|
|
@@ -13,10 +13,10 @@ const HEADING_SIZES = Object.freeze({ 1: 16, 2: 13, 3: 12 });
|
|
|
13
13
|
|
|
14
14
|
const FLOW_FIELDS = ['before', 'after', 'x', 'width', 'color', 'align'];
|
|
15
15
|
|
|
16
|
-
// What each block actually takes. A block the writer cannot read
|
|
17
|
-
// as an empty paragraph: a table or a list written under the wrong key
|
|
18
|
-
// mark on the page and no word in the result, so the report
|
|
19
|
-
// the evidence it was asked for.
|
|
16
|
+
// What each block actually takes. A block the writer cannot read would flow
|
|
17
|
+
// as an empty paragraph: a table or a list written under the wrong key would
|
|
18
|
+
// leave no mark on the page and no word in the result, so the report would ship
|
|
19
|
+
// without the evidence it was asked for.
|
|
20
20
|
const BLOCK_FIELDS = Object.freeze({
|
|
21
21
|
paragraph: Object.freeze({ required: ['text'], optional: [...FLOW_FIELDS, 'size', 'lineHeight'] }),
|
|
22
22
|
heading: Object.freeze({ required: ['text'], optional: [...FLOW_FIELDS, 'size', 'lineHeight', 'level'] }),
|
|
@@ -825,8 +825,8 @@ function styledDocxCell(cell, op) {
|
|
|
825
825
|
}
|
|
826
826
|
|
|
827
827
|
// A merged cell keeps what it carried (its shading, its borders, the bottom alignment a header row sits on, as Word
|
|
828
|
-
// keeps them) and takes the spans; its width becomes the widths it joins.
|
|
829
|
-
// two-level header's merged labels
|
|
828
|
+
// keeps them) and takes the spans; its width becomes the widths it joins. Replacing the whole tcPr would make a
|
|
829
|
+
// two-level header's merged labels rise to the top of their cells on this backend only. Children stay in schema
|
|
830
830
|
// order: cnfStyle, tcW, gridSpan, vMerge, then the rest.
|
|
831
831
|
function mergedCellXml(joined, spans) {
|
|
832
832
|
const existing = /<w:tcPr(?:\s[^>]*)?>([\s\S]*?)<\/w:tcPr>/.exec(joined[0])?.[1] || '';
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { basename, dirname, extname, join } from 'node:path';
|
|
2
2
|
import { homedir, tmpdir } from 'node:os';
|
|
3
3
|
import { execFile, spawn } from 'node:child_process';
|
|
4
|
+
import { treeKillCommand } from '../../agent/orchestrator/mcp/child-tree.mjs';
|
|
4
5
|
import { redactDirectories } from '../../shared/redact-directories.mjs';
|
|
5
6
|
import { removeDirectoryWithRetry } from '../../shared/remove-directory.mjs';
|
|
6
7
|
import { constants as fsConstants, rmSync } from 'node:fs';
|
|
@@ -53,11 +54,11 @@ const SOFFICE_KILL_GRACE_MS = 10_000;
|
|
|
53
54
|
// launcher leaves running (and holding the files it was given); Windows needs
|
|
54
55
|
// the whole tree stopped.
|
|
55
56
|
// The tree is stopped asynchronously and the helper itself is bounded, so a
|
|
56
|
-
// cancellation never blocks the event loop or waits on a stuck
|
|
57
|
-
const
|
|
57
|
+
// cancellation never blocks the event loop or waits on a stuck tree kill.
|
|
58
|
+
const SOFFICE_TREE_KILL_TIMEOUT_MS = 5_000;
|
|
58
59
|
|
|
59
|
-
// The launcher is killed only once
|
|
60
|
-
// that exits first leaves
|
|
60
|
+
// The launcher is killed only once the tree kill is done (or out of time): a
|
|
61
|
+
// launcher that exits first leaves the tree kill with no descendants to find.
|
|
61
62
|
function killProcessTree(child) {
|
|
62
63
|
if (process.platform !== 'win32' || !child.pid) {
|
|
63
64
|
killQuietly(child);
|
|
@@ -71,7 +72,8 @@ function killProcessTree(child) {
|
|
|
71
72
|
};
|
|
72
73
|
let killer = null;
|
|
73
74
|
try {
|
|
74
|
-
|
|
75
|
+
const { command, args } = treeKillCommand([child.pid]);
|
|
76
|
+
killer = spawn(command, args, { windowsHide: true, stdio: 'ignore' });
|
|
75
77
|
} catch {
|
|
76
78
|
killLauncher();
|
|
77
79
|
return;
|
|
@@ -79,7 +81,7 @@ function killProcessTree(child) {
|
|
|
79
81
|
const bound = setTimeout(() => {
|
|
80
82
|
killQuietly(killer);
|
|
81
83
|
killLauncher();
|
|
82
|
-
},
|
|
84
|
+
}, SOFFICE_TREE_KILL_TIMEOUT_MS);
|
|
83
85
|
bound.unref?.();
|
|
84
86
|
const settle = () => {
|
|
85
87
|
clearTimeout(bound);
|
|
@@ -290,7 +290,7 @@ const VALIDATION_CHOICE_RANGE = /^(?:'[^']+'!|[A-Za-z_][\w.]*!)?\$?[A-Z]{1,3}\$?
|
|
|
290
290
|
|
|
291
291
|
// A dropdown names its choices — "서울,부산" — or points at the cells holding
|
|
292
292
|
// them; anything that compares, calls, or tests is a rule the sheet evaluates.
|
|
293
|
-
|
|
293
|
+
function listValidationFormula(formula1) {
|
|
294
294
|
const text = String(formula1 ?? '')
|
|
295
295
|
.trim()
|
|
296
296
|
.replace(/^=/, '');
|
|
@@ -34,6 +34,14 @@ export function writeJsonAtomicSync(
|
|
|
34
34
|
options?: AtomicFileOptions & { compact?: boolean }
|
|
35
35
|
): boolean;
|
|
36
36
|
|
|
37
|
+
/** Locked read-modify-write: `mutator` gets the current value (null when
|
|
38
|
+
* missing) and returns the next one, or undefined to leave the file as is. */
|
|
39
|
+
export function updateJsonAtomic<T = unknown>(
|
|
40
|
+
filePath: string,
|
|
41
|
+
mutator: (current: unknown) => T | undefined,
|
|
42
|
+
options?: AtomicFileOptions & { compact?: boolean }
|
|
43
|
+
): Promise<T | unknown>;
|
|
44
|
+
|
|
37
45
|
export interface JsonStateOptions<T> {
|
|
38
46
|
/** Maps the parsed value; throwing marks the file damaged. */
|
|
39
47
|
validate?: (value: unknown) => T;
|
|
@@ -243,8 +243,13 @@ export function getBackgroundTask(taskId, options = {}) {
|
|
|
243
243
|
return task;
|
|
244
244
|
}
|
|
245
245
|
|
|
246
|
-
function countsAsActive(task, wanted, awaitedOnly) {
|
|
247
|
-
return
|
|
246
|
+
function countsAsActive(task, wanted, awaitedOnly, match = null) {
|
|
247
|
+
return (
|
|
248
|
+
task.status === 'running' &&
|
|
249
|
+
!(awaitedOnly && task.detached === true) &&
|
|
250
|
+
(!wanted || task.surface === wanted) &&
|
|
251
|
+
(!match || match(task) === true)
|
|
252
|
+
);
|
|
248
253
|
}
|
|
249
254
|
|
|
250
255
|
/** Lifetime signal: a session-owned background task remains live
|
|
@@ -256,9 +261,14 @@ function countsAsActive(task, wanted, awaitedOnly) {
|
|
|
256
261
|
export function hasActiveBackgroundTasks(options = {}) {
|
|
257
262
|
const wanted = clean(options.surface);
|
|
258
263
|
const awaitedOnly = options.awaitedOnly === true;
|
|
264
|
+
// Optional caller predicate over the running task (background-wait.mjs).
|
|
265
|
+
const match = typeof options.match === 'function' ? options.match : null;
|
|
259
266
|
const scope = normalizeTaskScope(options);
|
|
260
267
|
for (const task of tasks.values()) {
|
|
261
|
-
if (
|
|
268
|
+
if (
|
|
269
|
+
countsAsActive(task, wanted, awaitedOnly, match) &&
|
|
270
|
+
taskMatchesScope(task, scope, { includeUnattributed: false })
|
|
271
|
+
) {
|
|
262
272
|
return true;
|
|
263
273
|
}
|
|
264
274
|
}
|
|
@@ -565,10 +575,18 @@ export function reconcileBackgroundTask(
|
|
|
565
575
|
|
|
566
576
|
export function renderBackgroundTaskNotification(task) {
|
|
567
577
|
if (!task) return '';
|
|
568
|
-
const
|
|
578
|
+
const body =
|
|
569
579
|
task.surface === 'agent' && typeof task.result?.content === 'string'
|
|
570
580
|
? task.result.content
|
|
571
581
|
: resultTextForTask(task);
|
|
582
|
+
// An owner-supplied trailer (an agent's unfinished todo items).
|
|
583
|
+
let appendix = '';
|
|
584
|
+
try {
|
|
585
|
+
appendix = typeof task.reportAppendix === 'function' ? String(task.reportAppendix() || '') : '';
|
|
586
|
+
} catch {
|
|
587
|
+
appendix = '';
|
|
588
|
+
}
|
|
589
|
+
const result = appendix ? [body, appendix].filter(Boolean).join('\n\n') : body;
|
|
572
590
|
if (task.surface === 'shell') {
|
|
573
591
|
const parsed = parseTaskNotification(result);
|
|
574
592
|
// The completion envelope already carries the result (exit code,
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
// The one rule for "this session is waiting on work that will wake it": an
|
|
2
|
+
// agent it started is still running, or a background shell job it started in
|
|
3
|
+
// the CURRENT user cycle (since its last genuine user prompt) is still
|
|
4
|
+
// running — started with `background: true` or moved to the background after
|
|
5
|
+
// its hold alike; its completion arrives as a task notification. Running jobs
|
|
6
|
+
// from earlier cycles (long-lived servers, watchers) and the processes a
|
|
7
|
+
// finished command left behind (`detached`) never count. The cycle is stamped
|
|
8
|
+
// on the job when it starts (stampShellJobCycle), never read from its command.
|
|
9
|
+
// Shared by the end-of-turn todo completion check and Goal auto-continuation.
|
|
10
|
+
import { clean } from './clean.mjs';
|
|
11
|
+
import { hasActiveBackgroundTasks } from './background-tasks.mjs';
|
|
12
|
+
|
|
13
|
+
// Session id -> its user cycle number. In memory like the shell jobs it
|
|
14
|
+
// stamps: a restarted process has no running jobs from an earlier cycle.
|
|
15
|
+
const userCycles = new Map();
|
|
16
|
+
|
|
17
|
+
/** A genuine user prompt opened a new cycle for `sessionId`. */
|
|
18
|
+
export function beginUserCycle(sessionId) {
|
|
19
|
+
const id = clean(sessionId);
|
|
20
|
+
if (id) userCycles.set(id, (userCycles.get(id) || 0) + 1);
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
const currentUserCycle = (sessionId) => userCycles.get(clean(sessionId)) || 0;
|
|
24
|
+
|
|
25
|
+
/** Record on a starting background shell job the owner's current cycle. */
|
|
26
|
+
export function stampShellJobCycle(task) {
|
|
27
|
+
if (task?.ownerSessionId) task.userCycle = currentUserCycle(task.ownerSessionId);
|
|
28
|
+
return task;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
const ACTIVE_AGENT_STATUSES = new Set([
|
|
32
|
+
'connecting',
|
|
33
|
+
'requesting',
|
|
34
|
+
'streaming',
|
|
35
|
+
'tool_running',
|
|
36
|
+
'running',
|
|
37
|
+
'cancelling',
|
|
38
|
+
]);
|
|
39
|
+
|
|
40
|
+
/** A running agent among published status rows (`agentJobs` / `agentWorkers`). */
|
|
41
|
+
function runningAgentWork(agentStatus) {
|
|
42
|
+
const jobs = Array.isArray(agentStatus?.agentJobs) ? agentStatus.agentJobs : [];
|
|
43
|
+
if (jobs.some((job) => clean(job?.status).toLowerCase() === 'running')) return true;
|
|
44
|
+
const workers = Array.isArray(agentStatus?.agentWorkers) ? agentStatus.agentWorkers : [];
|
|
45
|
+
return workers.some((worker) => {
|
|
46
|
+
const status = clean(worker?.status).toLowerCase();
|
|
47
|
+
const stage = clean(worker?.stage || worker?.worker_stage).toLowerCase();
|
|
48
|
+
return ACTIVE_AGENT_STATUSES.has(status) || ACTIVE_AGENT_STATUSES.has(stage);
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
/** Whether `sessionId` waits on an agent or an awaited background shell. */
|
|
53
|
+
export function awaitingBackgroundWork({ sessionId = null, agentStatus = null } = {}) {
|
|
54
|
+
if (runningAgentWork(agentStatus)) return true;
|
|
55
|
+
const id = clean(sessionId);
|
|
56
|
+
if (!id) return false;
|
|
57
|
+
return (
|
|
58
|
+
hasActiveBackgroundTasks({ callerSessionId: id, surface: 'agent' }) ||
|
|
59
|
+
hasActiveBackgroundTasks({
|
|
60
|
+
callerSessionId: id,
|
|
61
|
+
surface: 'shell',
|
|
62
|
+
awaitedOnly: true,
|
|
63
|
+
match: (task) => task.userCycle === currentUserCycle(id),
|
|
64
|
+
})
|
|
65
|
+
);
|
|
66
|
+
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { spawn } from 'node:child_process';
|
|
2
2
|
import { randomUUID } from 'node:crypto';
|
|
3
|
+
import { TREE_KILL_DEADLINE_MS, treeKillCommand } from '../agent/orchestrator/mcp/child-tree.mjs';
|
|
3
4
|
import { positiveInt } from './numbers.mjs';
|
|
4
5
|
import { isPidAlive } from './pid-liveness.mjs';
|
|
5
6
|
import { detachedSpawnOpts } from './spawn-flags.mjs';
|
|
@@ -46,15 +47,18 @@ function alive(pid) {
|
|
|
46
47
|
try { process.kill(pid, 0); return true; }
|
|
47
48
|
catch (error) { return error && error.code === 'EPERM'; }
|
|
48
49
|
}
|
|
50
|
+
// Windows: the owner's creation-checked tree kill (child-tree.mjs), built when
|
|
51
|
+
// the child was registered. A signal there is a forced kill either way.
|
|
49
52
|
function killTarget(target, force) {
|
|
50
53
|
if (platform === 'win32') {
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
54
|
+
if (target.killCommand) {
|
|
55
|
+
try {
|
|
56
|
+
spawnSync(target.killCommand.command, target.killCommand.args, {
|
|
57
|
+
stdio: 'ignore',
|
|
58
|
+
windowsHide: true,
|
|
59
|
+
timeout: target.killCommand.timeoutMs,
|
|
60
|
+
});
|
|
61
|
+
} catch {}
|
|
58
62
|
}
|
|
59
63
|
return;
|
|
60
64
|
}
|
|
@@ -84,6 +88,8 @@ function accept(message) {
|
|
|
84
88
|
orphanGraceMs: Math.max(100, Number(message.orphanGraceMs) || 3000),
|
|
85
89
|
forceGraceMs: Math.max(100, Number(message.forceGraceMs) || 3000),
|
|
86
90
|
receiptPath: typeof message.receiptPath === 'string' ? message.receiptPath : null,
|
|
91
|
+
killCommand: message.killCommand && typeof message.killCommand.command === 'string'
|
|
92
|
+
&& Array.isArray(message.killCommand.args) && message.killCommand.timeoutMs > 0 ? message.killCommand : null,
|
|
87
93
|
orphanedAt: 0,
|
|
88
94
|
lastPolledAt: 0,
|
|
89
95
|
killing: false,
|
|
@@ -255,6 +261,10 @@ export function startChildGuardian({
|
|
|
255
261
|
orphanGraceMs: Math.max(100, Math.floor(Number(orphanGraceMs) || Number(graceMs) || 3000)),
|
|
256
262
|
forceGraceMs: Math.max(100, Math.floor(Number(forceGraceMs) || Number(graceMs) || 3000)),
|
|
257
263
|
receiptPath: typeof receiptPath === 'string' && receiptPath ? receiptPath : null,
|
|
264
|
+
// The child runs now, so its creation time bounds every later kill.
|
|
265
|
+
// Held to the shared deadline, so a hung pass never stalls the guardian.
|
|
266
|
+
killCommand:
|
|
267
|
+
process.platform === 'win32' ? { ...treeKillCommand([child]), timeoutMs: TREE_KILL_DEADLINE_MS } : null,
|
|
258
268
|
onRemoved: () => {
|
|
259
269
|
stopped = true;
|
|
260
270
|
},
|