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
|
@@ -16,7 +16,7 @@ import {
|
|
|
16
16
|
} from './pending-messages.mjs';
|
|
17
17
|
import { _getRuntimeEntry, markSessionCancelled, markSessionError } from './runtime-liveness.mjs';
|
|
18
18
|
import { SessionClosedError } from './session-errors.mjs';
|
|
19
|
-
import {
|
|
19
|
+
import { holdTurnUntilDurable, turnCoveredOnDisk } from './turn-durability.mjs';
|
|
20
20
|
import { attachFailedTurnCompletion } from './ask-turn-settle.mjs';
|
|
21
21
|
import { turnFailureRecord } from '../turn-failure.mjs';
|
|
22
22
|
import { transcriptRouteMetadataFields } from '../../../../shared/transcript-metadata.mjs';
|
|
@@ -97,6 +97,17 @@ async function persistFinalizedSession({ session, sessionId, generation, pending
|
|
|
97
97
|
}
|
|
98
98
|
}
|
|
99
99
|
|
|
100
|
+
/** Keep the failed turn's checkpoint until a landed save covers its
|
|
101
|
+
* finalized transcript (turn-durability.mjs); returns the save issued for
|
|
102
|
+
* it, or null when an earlier one already landed it. */
|
|
103
|
+
function holdFinalizedTurn({ sessionId, session, turnToken, generation }) {
|
|
104
|
+
const save = turnCoveredOnDisk(session, turnToken)
|
|
105
|
+
? null
|
|
106
|
+
: saveSessionAsync(session, { expectedGeneration: generation });
|
|
107
|
+
holdTurnUntilDurable({ sessionId, session, turnToken, generation, save });
|
|
108
|
+
return save;
|
|
109
|
+
}
|
|
110
|
+
|
|
100
111
|
/** A SessionClosedError unwind: keeps the interruption snapshot unless the
|
|
101
112
|
* runtime already closed, in which case the consumed queue entries are
|
|
102
113
|
* released untouched. */
|
|
@@ -119,14 +130,14 @@ async function finalizeCancelledTurn({
|
|
|
119
130
|
if (currentRuntime?.prepareCloseSnapshot === prepareCloseSnapshot) {
|
|
120
131
|
currentRuntime.prepareCloseSnapshot = null;
|
|
121
132
|
}
|
|
122
|
-
|
|
133
|
+
await persistFinalizedSession({
|
|
123
134
|
session,
|
|
124
135
|
sessionId,
|
|
125
136
|
generation,
|
|
126
137
|
pendingEntries: turn.pendingEntries,
|
|
127
138
|
promptSurvived: finalized.responsePreserved,
|
|
128
139
|
});
|
|
129
|
-
|
|
140
|
+
holdFinalizedTurn({ sessionId, session, turnToken: turnCheckpointToken, generation });
|
|
130
141
|
if (currentRuntime) currentRuntime.session = session;
|
|
131
142
|
markSessionCancelled(sessionId);
|
|
132
143
|
}
|
|
@@ -169,6 +180,9 @@ export async function finalizeAskTurnFailure({
|
|
|
169
180
|
if (session) {
|
|
170
181
|
session.liveTurnMessages = null;
|
|
171
182
|
delete session.activeTurnCheckpoint;
|
|
183
|
+
// Every record saved from here on carries this turn as finalized: a
|
|
184
|
+
// crash after one lands deletes the checkpoint instead of replaying it.
|
|
185
|
+
session.turnCoverage = turnCheckpointToken;
|
|
172
186
|
// The provider prefix snapshot commits per successful send INSIDE the
|
|
173
187
|
// turn, while the transcript unwinds to its pre-turn/finalized shape
|
|
174
188
|
// below. A surviving mid-turn snapshot flags every retry as
|
|
@@ -206,7 +220,8 @@ export async function finalizeAskTurnFailure({
|
|
|
206
220
|
// contract answers "did the provider produce output we must commit?" for
|
|
207
221
|
// every transport. Anthropic's stall/truncation errors carry neither
|
|
208
222
|
// liveTextEmitted nor unsafeToRetry — only partialContent/partialToolCalls
|
|
209
|
-
// —
|
|
223
|
+
// — so consulting the flags would drop the streamed summary from history on
|
|
224
|
+
// that provider.
|
|
210
225
|
const providerOutcome = readStreamOutcome(err);
|
|
211
226
|
const preserveProviderPartial =
|
|
212
227
|
restoredResetText ||
|
|
@@ -252,15 +267,16 @@ export async function finalizeAskTurnFailure({
|
|
|
252
267
|
releasePendingMessages(sessionId, turn.pendingEntries);
|
|
253
268
|
}
|
|
254
269
|
}
|
|
255
|
-
if (
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
270
|
+
if (session) {
|
|
271
|
+
const save = holdFinalizedTurn({ sessionId, session, turnToken: turnCheckpointToken, generation });
|
|
272
|
+
if (save && !errorStateDurable) {
|
|
273
|
+
try {
|
|
274
|
+
await settleAskCleanup(save);
|
|
275
|
+
} catch {
|
|
276
|
+
/* the checkpoint stays until a save covering the turn lands */
|
|
277
|
+
}
|
|
261
278
|
}
|
|
262
279
|
}
|
|
263
|
-
if (errorStateDurable) clearTurnCheckpoint(sessionId, turnCheckpointToken);
|
|
264
280
|
logAskError(sessionId, err, providerOutcome);
|
|
265
281
|
markSessionError(sessionId, err?.message ? err.message : String(err));
|
|
266
282
|
}
|
|
@@ -1,25 +1,50 @@
|
|
|
1
1
|
// manager/ask-turn-open.mjs
|
|
2
|
-
// Opening one turn:
|
|
2
|
+
// Opening one turn: settle the previous turn's durability and the durable
|
|
3
|
+
// base this turn opens on (settleTurnBase, awaited before anything below),
|
|
4
|
+
// load and reconcile the stored session and claim the
|
|
3
5
|
// runtime entry with a fresh abort controller (claimTurnRuntime), then arm
|
|
4
6
|
// the turn's durability — the crash-checkpoint scheduler and the close
|
|
5
7
|
// snapshot hook (armTurnDurability). Both are synchronous so closeSession()
|
|
6
8
|
// cannot interleave between load and registration.
|
|
7
9
|
import { randomUUID } from 'node:crypto';
|
|
8
|
-
import { loadSession
|
|
10
|
+
import { loadSession } from '../store.mjs';
|
|
11
|
+
import { durableTranscriptBase } from '../store/transcript-durability.mjs';
|
|
9
12
|
import { createAbortController } from '../../../../shared/abort-controller.mjs';
|
|
10
13
|
import { normalizeStaleCompactingStage } from './compaction-runner.mjs';
|
|
11
14
|
import { linkParentSignalToSession, markSessionAskStart, _touchRuntime } from './runtime-liveness.mjs';
|
|
12
15
|
import { SessionClosedError } from './session-errors.mjs';
|
|
13
16
|
import { ensureCodexWireSessionId, mintUuidV7 } from './session-id.mjs';
|
|
14
17
|
import { createTurnInterruptionTracker } from './turn-interruption.mjs';
|
|
15
|
-
import {
|
|
18
|
+
import { _recoverTurnCheckpointDurably, setAsideUnrecoveredCheckpoint } from './turn-checkpoint-recovery.mjs';
|
|
19
|
+
import { adoptDiskGeneration, awaitPreviousTurnDurable, ensureDurableTranscript } from './turn-durability.mjs';
|
|
16
20
|
import { emitAskSessionStart } from './ask-support.mjs';
|
|
21
|
+
import { applyHeldSessionRoute } from './session-lifecycle.mjs';
|
|
17
22
|
import { createAskTurnState, createCloseSnapshot, createTurnCheckpointScheduler } from './ask-turn-state.mjs';
|
|
18
23
|
|
|
24
|
+
/** Before a turn claims the session: the previous turn's finalized
|
|
25
|
+
* transcript is durably saved (its checkpoint deleted only then), a crashed
|
|
26
|
+
* turn's checkpoint is recovered (`recoverCheckpoint`, once per ask), and
|
|
27
|
+
* the transcript the turn opens on is the one a landed save holds — so the
|
|
28
|
+
* new checkpoint names a base that is on disk. Throws TurnPersistenceError
|
|
29
|
+
* when a save does not land; other sessions never wait on this one. */
|
|
30
|
+
export async function settleTurnBase(sessionId, { recoverCheckpoint }) {
|
|
31
|
+
await awaitPreviousTurnDurable(sessionId);
|
|
32
|
+
const session = loadSession(sessionId);
|
|
33
|
+
// claimTurnRuntime reports a missing or closed session.
|
|
34
|
+
if (!session || session.closed === true) return;
|
|
35
|
+
adoptDiskGeneration(session, sessionId);
|
|
36
|
+
if (recoverCheckpoint) _recoverTurnCheckpointDurably(session, sessionId);
|
|
37
|
+
await ensureDurableTranscript(session);
|
|
38
|
+
// This turn's checkpoint replaces the session's checkpoint file. Whatever
|
|
39
|
+
// is still there (a conflict, an unreadable header, a crashed turn this
|
|
40
|
+
// ask did not recover) is set aside first, never overwritten.
|
|
41
|
+
setAsideUnrecoveredCheckpoint(session, sessionId);
|
|
42
|
+
}
|
|
43
|
+
|
|
19
44
|
/** Loads the session for a new turn and reconciles its on-disk lifecycle:
|
|
20
|
-
*
|
|
21
|
-
*
|
|
22
|
-
function loadTurnSession(sessionId
|
|
45
|
+
* a stale compacting stage and split-brain re-adoption of a disk generation
|
|
46
|
+
* another surface bumped. */
|
|
47
|
+
function loadTurnSession(sessionId) {
|
|
23
48
|
const session = loadSession(sessionId);
|
|
24
49
|
if (!session) {
|
|
25
50
|
throw new Error(`Session "${sessionId}" not found`);
|
|
@@ -28,44 +53,21 @@ function loadTurnSession(sessionId, { recoverCheckpoint }) {
|
|
|
28
53
|
throw new SessionClosedError(sessionId, 'session already closed');
|
|
29
54
|
}
|
|
30
55
|
const codexWireSessionId = ensureCodexWireSessionId(session);
|
|
31
|
-
if (recoverCheckpoint) {
|
|
32
|
-
const recovery = recoverTurnCheckpoint(session);
|
|
33
|
-
if (recovery.changed) {
|
|
34
|
-
saveSession(session, {
|
|
35
|
-
sync: true,
|
|
36
|
-
expectedGeneration: session.generation,
|
|
37
|
-
});
|
|
38
|
-
if (recovery.turnToken) clearTurnCheckpoint(sessionId, recovery.turnToken);
|
|
39
|
-
}
|
|
40
|
-
}
|
|
41
56
|
// A prior crash/partial-save during compaction may have pinned
|
|
42
57
|
// compaction.lastStage='compacting'. This ask is starting fresh, so
|
|
43
58
|
// recover the stale transient stage before the loop's pre-send compact
|
|
44
59
|
// path runs (it will overwrite lastStage with real telemetry).
|
|
45
60
|
normalizeStaleCompactingStage(session);
|
|
46
|
-
|
|
47
|
-
//
|
|
48
|
-
|
|
49
|
-
// while the conversation kept going here. Every save from this process
|
|
50
|
-
// would then be silently dropped by _shouldDrop's ownership rule and
|
|
51
|
-
// the on-disk transcript would freeze at the last landed save. A new
|
|
52
|
-
// ask on a NON-closed session is an explicit ownership claim: adopt
|
|
53
|
-
// the disk generation so this turn's commits land and heal the file.
|
|
54
|
-
const diskLifecycle = readSessionLifecycleFromDisk(sessionId);
|
|
55
|
-
if (
|
|
56
|
-
diskLifecycle &&
|
|
57
|
-
diskLifecycle.closed !== true &&
|
|
58
|
-
diskLifecycle.generation > (typeof session.generation === 'number' ? session.generation : 0)
|
|
59
|
-
) {
|
|
60
|
-
session.generation = diskLifecycle.generation;
|
|
61
|
-
}
|
|
61
|
+
adoptDiskGeneration(session, sessionId);
|
|
62
|
+
// A route saved while the previous turn ran applies from this turn.
|
|
63
|
+
applyHeldSessionRoute(session);
|
|
62
64
|
return { session, codexWireSessionId };
|
|
63
65
|
}
|
|
64
66
|
|
|
65
67
|
/** Loads the session and installs this turn's controller on the runtime
|
|
66
68
|
* entry, re-cascading any parent abort link and marking the ask started. */
|
|
67
|
-
export function claimTurnRuntime({ sessionId, askOpts,
|
|
68
|
-
const { session: preSession, codexWireSessionId } = loadTurnSession(sessionId
|
|
69
|
+
export function claimTurnRuntime({ sessionId, askOpts, emitStart }) {
|
|
70
|
+
const { session: preSession, codexWireSessionId } = loadTurnSession(sessionId);
|
|
69
71
|
const askGeneration = typeof preSession.generation === 'number' ? preSession.generation : 0;
|
|
70
72
|
const runtime = _touchRuntime(sessionId);
|
|
71
73
|
// Preserve any parent-abort link agent-dispatch established BEFORE we
|
|
@@ -121,6 +123,7 @@ export function armTurnDurability({
|
|
|
121
123
|
startedAt,
|
|
122
124
|
turn,
|
|
123
125
|
interruption,
|
|
126
|
+
base: durableTranscriptBase(preSession),
|
|
124
127
|
});
|
|
125
128
|
const prepareCloseSnapshot = createCloseSnapshot({ turn, interruption, checkpoint, runtime });
|
|
126
129
|
// closeSession is synchronous and generation-first by design. Expose a
|
|
@@ -9,6 +9,7 @@ import { positiveInt } from '../../../../shared/numbers.mjs';
|
|
|
9
9
|
import { appendAgentTrace } from '../../agent-trace.mjs';
|
|
10
10
|
import { snapshotPendingDeferredToolDelta } from '../../runtime-core/deferred-tool-delta.mjs';
|
|
11
11
|
import { snapshotPendingGoalReminder } from '../../runtime-core/goal-reminder.mjs';
|
|
12
|
+
import { beginTodoTurn, todoStartReminder } from '../loop/no-tool-turn/todo-check.mjs';
|
|
12
13
|
import { resolveSessionContextMeta } from './context-meta.mjs';
|
|
13
14
|
import {
|
|
14
15
|
promptContentText,
|
|
@@ -20,6 +21,7 @@ import {
|
|
|
20
21
|
snapshotPendingSetupNotice,
|
|
21
22
|
} from './prompt-utils.mjs';
|
|
22
23
|
import { snapshotPendingWorkflowNotice } from './workflow-switch-notice.mjs';
|
|
24
|
+
import { snapshotPendingPromptSettingsNotice } from './prompt-settings.mjs';
|
|
23
25
|
import { snapshotPendingOrchestrationModeNotice } from './orchestration-mode-switch-notice.mjs';
|
|
24
26
|
import { buildAgentListingNotice } from './agent-listing-notice.mjs';
|
|
25
27
|
import { codexWireSendOpts } from './session-id.mjs';
|
|
@@ -175,6 +177,12 @@ export async function buildUserTurn({
|
|
|
175
177
|
}
|
|
176
178
|
const currentTimeBlock = buildCurrentTimeBlock(prompt);
|
|
177
179
|
const deferredToolDelta = snapshotPendingDeferredToolDelta(session);
|
|
180
|
+
// A real prompt (no runtime source: not a Goal turn or task notification)
|
|
181
|
+
// opens a new todo reminder cycle; every turn clears the last turn's waits.
|
|
182
|
+
const genuinePrompt = !turnPromptSource?.source;
|
|
183
|
+
beginTodoTurn(session, { genuine: genuinePrompt });
|
|
184
|
+
// An agent's new brief or follow-up with no open list asks for one, once.
|
|
185
|
+
const todoStart = genuinePrompt ? todoStartReminder(session) : null;
|
|
178
186
|
// Read paused state after hydration and queue selection, not at
|
|
179
187
|
// input intake: either can precede the previous turn's pause.
|
|
180
188
|
// This supplies context only; it never resumes the Goal.
|
|
@@ -192,8 +200,11 @@ export async function buildUserTurn({
|
|
|
192
200
|
const orchestrationModeNotice = snapshotPendingOrchestrationModeNotice(session);
|
|
193
201
|
// Agents enabled or switched off since the conversation was last told.
|
|
194
202
|
const agentListingNotice = buildAgentListingNotice(session, currentAgents);
|
|
203
|
+
// Prompt-shaping settings changed since the prompt was built (told once).
|
|
204
|
+
const promptSettingsNotice = snapshotPendingPromptSettingsNotice(session);
|
|
195
205
|
const reminderBlock = [
|
|
196
206
|
workflowNotice?.content || '',
|
|
207
|
+
promptSettingsNotice?.content || '',
|
|
197
208
|
orchestrationModeNotice?.content || '',
|
|
198
209
|
agentListingNotice?.content || '',
|
|
199
210
|
workspaceNotice?.content || '',
|
|
@@ -201,6 +212,7 @@ export async function buildUserTurn({
|
|
|
201
212
|
currentTimeBlock ? `<system-reminder>\n# Current Time\n${currentTimeBlock}\n</system-reminder>` : '',
|
|
202
213
|
deferredToolDelta?.content || '',
|
|
203
214
|
goalReminder?.content || '',
|
|
215
|
+
todoStart || '',
|
|
204
216
|
]
|
|
205
217
|
.filter(Boolean)
|
|
206
218
|
.join('\n\n');
|
|
@@ -212,6 +224,8 @@ export async function buildUserTurn({
|
|
|
212
224
|
...(effortConfiguration ? { effortConfiguration } : {}),
|
|
213
225
|
// What its reminder told, read back by later turns (agent-listing-notice.mjs).
|
|
214
226
|
...(agentListingNotice ? { agentListing: agentListingNotice.meta } : {}),
|
|
227
|
+
// A retry resubmits this message as is: it acknowledges the same notice.
|
|
228
|
+
...(promptSettingsNotice ? { promptSettingsNoticeRevision: promptSettingsNotice.revision } : {}),
|
|
215
229
|
};
|
|
216
230
|
const userTurnMessage = withRuntimeUserContext(
|
|
217
231
|
{
|
|
@@ -228,6 +242,7 @@ export async function buildUserTurn({
|
|
|
228
242
|
goalReminder,
|
|
229
243
|
workflowNotice,
|
|
230
244
|
orchestrationModeNotice,
|
|
245
|
+
promptSettingsNotice,
|
|
231
246
|
agentListingNotice,
|
|
232
247
|
workspaceNotice,
|
|
233
248
|
setupNotice,
|
|
@@ -10,6 +10,7 @@ import { acknowledgePendingDeferredToolDelta } from '../../runtime-core/deferred
|
|
|
10
10
|
import { acknowledgePendingGoalReminder } from '../../runtime-core/goal-reminder.mjs';
|
|
11
11
|
import { acknowledgePendingSetupNotice, acknowledgePendingWorkspaceNotice } from './prompt-utils.mjs';
|
|
12
12
|
import { acknowledgePendingWorkflowNotice } from './workflow-switch-notice.mjs';
|
|
13
|
+
import { acknowledgePendingPromptSettingsNotice } from './prompt-settings.mjs';
|
|
13
14
|
import { acknowledgePendingOrchestrationModeNotice } from './orchestration-mode-switch-notice.mjs';
|
|
14
15
|
import {
|
|
15
16
|
finalizePendingMessageDelivery,
|
|
@@ -20,7 +21,7 @@ import { applyAskTerminalUsageTotals } from './usage-metrics.mjs';
|
|
|
20
21
|
import { markSessionDone, markSessionEmptyFinal, _getRuntimeEntry } from './runtime-liveness.mjs';
|
|
21
22
|
import { SessionClosedError } from './session-errors.mjs';
|
|
22
23
|
import { filterModelVisibleSessionMessages } from './message-sanitize.mjs';
|
|
23
|
-
import {
|
|
24
|
+
import { holdTurnUntilDurable } from './turn-durability.mjs';
|
|
24
25
|
import { recordProviderContextBaseline } from '../loop/compact-policy.mjs';
|
|
25
26
|
import { throwIfAborted } from '../../../../shared/abort-race.mjs';
|
|
26
27
|
import { appendAssistantTurnMessage, persistProviderState, recordAskUsage } from './ask-turn-commit.mjs';
|
|
@@ -94,7 +95,7 @@ export function attachFailedTurnCompletion(messages, completion) {
|
|
|
94
95
|
/** Commits the loop result into the session: messages, usage, provider state
|
|
95
96
|
* and queue acknowledgements. Returns the terminal result preview. */
|
|
96
97
|
export async function commitAskTurn({ sessionId, opened, prepared, result, rawTranscriptMeta, askStartedAt }) {
|
|
97
|
-
const { turn, runtime, turnSignal, askGeneration,
|
|
98
|
+
const { turn, runtime, turnSignal, askGeneration, prepareCloseSnapshot } = opened;
|
|
98
99
|
const session = turn.session;
|
|
99
100
|
throwIfAborted(turnSignal);
|
|
100
101
|
// Post-loop validation: if closeSession() landed while we were awaiting,
|
|
@@ -111,7 +112,8 @@ export async function commitAskTurn({ sessionId, opened, prepared, result, rawTr
|
|
|
111
112
|
// Turn committed into session.messages; drop the live-turn alias so
|
|
112
113
|
// contextStatus() reverts to the authoritative committed transcript.
|
|
113
114
|
session.liveTurnMessages = null;
|
|
114
|
-
checkpoint
|
|
115
|
+
// The checkpoint keeps recording until publishAskTurn seals the finished
|
|
116
|
+
// transcript into it.
|
|
115
117
|
delete session.activeTurnCheckpoint;
|
|
116
118
|
appendAssistantTurnMessage({
|
|
117
119
|
session,
|
|
@@ -142,6 +144,9 @@ export async function commitAskTurn({ sessionId, opened, prepared, result, rawTr
|
|
|
142
144
|
acknowledgePendingGoalReminder(session, prepared.goalReminder.revision);
|
|
143
145
|
}
|
|
144
146
|
if (prepared.workflowNotice) acknowledgePendingWorkflowNotice(session, prepared.workflowNotice.revision);
|
|
147
|
+
if (prepared.promptSettingsNotice) {
|
|
148
|
+
acknowledgePendingPromptSettingsNotice(session, prepared.promptSettingsNotice.revision);
|
|
149
|
+
}
|
|
145
150
|
if (prepared.orchestrationModeNotice) {
|
|
146
151
|
acknowledgePendingOrchestrationModeNotice(session, prepared.orchestrationModeNotice.revision);
|
|
147
152
|
}
|
|
@@ -160,7 +165,7 @@ export async function commitAskTurn({ sessionId, opened, prepared, result, rawTr
|
|
|
160
165
|
* starts the durable save and marks the session done. Returns the
|
|
161
166
|
* follow-up entries drained right after the provider accepted the turn. */
|
|
162
167
|
export function publishAskTurn({ sessionId, opened, terminalResultPreview, askOpts, rawTranscriptMeta, askStartedAt }) {
|
|
163
|
-
const { turn, runtime, askGeneration, turnToken } = opened;
|
|
168
|
+
const { turn, runtime, askGeneration, turnToken, checkpoint } = opened;
|
|
164
169
|
const session = turn.session;
|
|
165
170
|
// The provider accepted this queued turn: only now remove its
|
|
166
171
|
// durable ids. A crash before here leaves them for at-least-once
|
|
@@ -197,19 +202,23 @@ export function publishAskTurn({ sessionId, opened, terminalResultPreview, askOp
|
|
|
197
202
|
// query/provider send (agentLoop pre-send), not after the previous
|
|
198
203
|
// answer. This lets queued follow-up prompts resume immediately;
|
|
199
204
|
// if they need compaction, their own spinner shows compacting first.
|
|
200
|
-
//
|
|
201
|
-
//
|
|
202
|
-
//
|
|
203
|
-
//
|
|
204
|
-
|
|
205
|
-
|
|
205
|
+
// The finished transcript (final assistant message, completion) is sealed
|
|
206
|
+
// into the checkpoint, and the record the terminal save writes names the
|
|
207
|
+
// turn it covers: a crash before that save lands replays the sealed turn,
|
|
208
|
+
// one after it deletes the checkpoint without a duplicate.
|
|
209
|
+
session.turnCoverage = turnToken;
|
|
210
|
+
checkpoint.seal();
|
|
211
|
+
// Terminal save. The result is already produced and (for agent surfaces)
|
|
212
|
+
// relayed via onTerminalResult above. When completion was relayed to the
|
|
213
|
+
// UI, yield before postMessage structured-clones the full session. Queued
|
|
214
|
+
// follow-up turns retain the original immediate-save ordering. Its landed
|
|
215
|
+
// acknowledgement is this session's next-turn gate (turn-durability.mjs),
|
|
216
|
+
// which alone deletes the checkpoint.
|
|
206
217
|
const saveTerminalSession = terminalRelayed ? saveSessionAsyncDeferred : saveSessionAsync;
|
|
207
218
|
const terminalSave = saveTerminalSession(session, { expectedGeneration: askGeneration });
|
|
219
|
+
holdTurnUntilDurable({ sessionId, session, turnToken, generation: askGeneration, save: terminalSave });
|
|
208
220
|
terminalSave.then(
|
|
209
|
-
() =>
|
|
210
|
-
clearTurnCheckpoint(sessionId, turnToken);
|
|
211
|
-
ingestSessionTurn(session);
|
|
212
|
-
},
|
|
221
|
+
() => ingestSessionTurn(session),
|
|
213
222
|
() => {}
|
|
214
223
|
);
|
|
215
224
|
finalizePendingMessageDelivery(session, turn.pendingEntries, terminalSave, () =>
|
|
@@ -227,7 +236,8 @@ export function publishAskTurn({ sessionId, opened, terminalResultPreview, askOp
|
|
|
227
236
|
const isEmptyFinal =
|
|
228
237
|
!terminalResultPreview.content &&
|
|
229
238
|
!terminalResultPreview.reasoningContent &&
|
|
230
|
-
!terminalResultPreview.reactionCompleted
|
|
239
|
+
!terminalResultPreview.reactionCompleted &&
|
|
240
|
+
!terminalResultPreview.reportContent;
|
|
231
241
|
if (isEmptyFinal) {
|
|
232
242
|
markSessionEmptyFinal(sessionId);
|
|
233
243
|
}
|
|
@@ -6,6 +6,7 @@ import { captureTurnCheckpointContextState, createTurnCheckpointRecorder } from
|
|
|
6
6
|
import { finalizeTurnInterruptionSnapshot } from './turn-interruption.mjs';
|
|
7
7
|
import { onSensitiveValuesMarked } from '../sensitive-values.mjs';
|
|
8
8
|
import { saveSessionAsync } from '../store.mjs';
|
|
9
|
+
import { setTranscriptSnapshotHook } from '../store/transcript-durability.mjs';
|
|
9
10
|
import { ingestSessionTurn } from '../../../../session-search/session-search-ingest.mjs';
|
|
10
11
|
|
|
11
12
|
// Coalescing window for streaming-delta flushes. Each flush journals only the
|
|
@@ -22,6 +23,8 @@ export function createAskTurnState(session) {
|
|
|
22
23
|
outgoing: null,
|
|
23
24
|
/** The user turn exactly as sent, kept for interruption finalization. */
|
|
24
25
|
userTurnContent: '',
|
|
26
|
+
/** Index of the user turn in `outgoing` when it was assembled. */
|
|
27
|
+
boundary: null,
|
|
25
28
|
/** Queue entries this turn consumed: acked on commit, released on failure. */
|
|
26
29
|
pendingEntries: [],
|
|
27
30
|
};
|
|
@@ -29,34 +32,60 @@ export function createAskTurnState(session) {
|
|
|
29
32
|
|
|
30
33
|
/** The recorder writes this turn's header synchronously on its first flush
|
|
31
34
|
* (the crash-durability anchor for the prompt, landing before the provider
|
|
32
|
-
* runs) and appends bounded deltas afterwards.
|
|
33
|
-
|
|
35
|
+
* runs) and appends bounded deltas afterwards. `base` is the durable
|
|
36
|
+
* transcript the turn opens on (store/transcript-durability.mjs). Every
|
|
37
|
+
* save of the session flushes first, so a history rewrite is in the
|
|
38
|
+
* checkpoint before any record carries its new epoch. */
|
|
39
|
+
export function createTurnCheckpointScheduler({
|
|
40
|
+
sessionId,
|
|
41
|
+
generation,
|
|
42
|
+
turnToken,
|
|
43
|
+
startedAt,
|
|
44
|
+
turn,
|
|
45
|
+
interruption,
|
|
46
|
+
base,
|
|
47
|
+
}) {
|
|
34
48
|
let timer = null;
|
|
35
49
|
let stopped = false;
|
|
36
50
|
let lastAt = 0;
|
|
37
51
|
let warned = false;
|
|
38
|
-
let
|
|
39
|
-
const recorder = createTurnCheckpointRecorder({
|
|
52
|
+
let contextDirty = false;
|
|
53
|
+
const recorder = createTurnCheckpointRecorder({
|
|
54
|
+
session: turn.session,
|
|
55
|
+
sessionId,
|
|
56
|
+
generation,
|
|
57
|
+
turnToken,
|
|
58
|
+
startedAt,
|
|
59
|
+
base,
|
|
60
|
+
});
|
|
61
|
+
const record = (messages, extra = {}) =>
|
|
62
|
+
recorder.record({
|
|
63
|
+
boundary: turn.boundary,
|
|
64
|
+
currentUserContent: turn.userTurnContent,
|
|
65
|
+
turnOutgoing: messages,
|
|
66
|
+
interruption,
|
|
67
|
+
captureContext: (boundary) => captureTurnCheckpointContextState(turn.session, messages, boundary),
|
|
68
|
+
contextDirty,
|
|
69
|
+
...extra,
|
|
70
|
+
});
|
|
71
|
+
const warn = (error) => {
|
|
72
|
+
if (warned) return;
|
|
73
|
+
warned = true;
|
|
74
|
+
try {
|
|
75
|
+
process.stderr.write(`[turn-checkpoint] write failed session=${sessionId}: ${error?.message || error}\n`);
|
|
76
|
+
} catch {
|
|
77
|
+
// stderr may be closed; the checkpoint failure is only reported
|
|
78
|
+
}
|
|
79
|
+
};
|
|
40
80
|
const flush = () => {
|
|
41
81
|
if (stopped || !turn.outgoing || !turn.userTurnContent) return false;
|
|
42
82
|
try {
|
|
43
|
-
const written =
|
|
44
|
-
|
|
45
|
-
turnOutgoing: turn.outgoing,
|
|
46
|
-
interruption,
|
|
47
|
-
contextState,
|
|
48
|
-
});
|
|
83
|
+
const written = record(turn.outgoing);
|
|
84
|
+
contextDirty = false;
|
|
49
85
|
if (written) lastAt = Date.now();
|
|
50
86
|
return written;
|
|
51
87
|
} catch (error) {
|
|
52
|
-
|
|
53
|
-
warned = true;
|
|
54
|
-
try {
|
|
55
|
-
process.stderr.write(`[turn-checkpoint] write failed session=${sessionId}: ${error?.message || error}\n`);
|
|
56
|
-
} catch {
|
|
57
|
-
// stderr may be closed; the checkpoint failure is only reported
|
|
58
|
-
}
|
|
59
|
-
}
|
|
88
|
+
warn(error);
|
|
60
89
|
return false;
|
|
61
90
|
}
|
|
62
91
|
};
|
|
@@ -83,9 +112,20 @@ export function createTurnCheckpointScheduler({ sessionId, generation, turnToken
|
|
|
83
112
|
});
|
|
84
113
|
ingestSessionTurn(turn.session);
|
|
85
114
|
});
|
|
115
|
+
const unhookSaves = setTranscriptSnapshotHook(turn.session, () => {
|
|
116
|
+
if (!stopped && turn.outgoing) flushNow();
|
|
117
|
+
});
|
|
118
|
+
const halt = (options) => {
|
|
119
|
+
stopped = true;
|
|
120
|
+
stopMarks();
|
|
121
|
+
unhookSaves();
|
|
122
|
+
if (timer) clearTimeout(timer);
|
|
123
|
+
timer = null;
|
|
124
|
+
recorder.stop(options);
|
|
125
|
+
};
|
|
86
126
|
return {
|
|
87
127
|
refreshContextState() {
|
|
88
|
-
|
|
128
|
+
contextDirty = true;
|
|
89
129
|
},
|
|
90
130
|
schedule(immediate = false) {
|
|
91
131
|
if (stopped || !turn.outgoing) return;
|
|
@@ -101,12 +141,27 @@ export function createTurnCheckpointScheduler({ sessionId, generation, turnToken
|
|
|
101
141
|
}, waitMs);
|
|
102
142
|
timer.unref?.();
|
|
103
143
|
},
|
|
144
|
+
/** Record the finished transcript (`turn.session.messages`, with the
|
|
145
|
+
* final assistant message and its completion) as sealed, then stop: a
|
|
146
|
+
* crash before a save covers the turn replays it as finished, not as
|
|
147
|
+
* interrupted. */
|
|
148
|
+
seal() {
|
|
149
|
+
if (stopped) return false;
|
|
150
|
+
let written = false;
|
|
151
|
+
if (turn.outgoing && turn.userTurnContent) {
|
|
152
|
+
try {
|
|
153
|
+
contextDirty = true;
|
|
154
|
+
written = record(turn.session.messages, { sealed: true });
|
|
155
|
+
} catch (error) {
|
|
156
|
+
warn(error);
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
halt({ keepQueued: true });
|
|
160
|
+
return written;
|
|
161
|
+
},
|
|
104
162
|
stop() {
|
|
105
|
-
stopped
|
|
106
|
-
|
|
107
|
-
if (timer) clearTimeout(timer);
|
|
108
|
-
timer = null;
|
|
109
|
-
recorder.stop();
|
|
163
|
+
if (stopped) return;
|
|
164
|
+
halt();
|
|
110
165
|
},
|
|
111
166
|
};
|
|
112
167
|
}
|
|
@@ -44,6 +44,9 @@ export function createAskSteeringDrain({ sessionId, turn, askOpts }) {
|
|
|
44
44
|
// nothing. Entries consumed here join the turn's pending entries: their
|
|
45
45
|
// delivery/ack (and release on failure) rides this turn, and the
|
|
46
46
|
// post-loop drain can no longer see them.
|
|
47
|
+
// A route saved while this turn runs (session.heldRoute) leaves the
|
|
48
|
+
// queued entries to the next turn, which opens on that route.
|
|
49
|
+
if (turn.session?.heldRoute) return out;
|
|
47
50
|
if (drainOptions?.stage === 'terminal' || pendingQueueHoldsOnlyNotifications(sessionId)) {
|
|
48
51
|
const pendingNow = drainPendingMessages(sessionId);
|
|
49
52
|
if (pendingNow.length > 0) {
|
|
@@ -36,7 +36,8 @@ import {
|
|
|
36
36
|
resolveWorkerCompactPolicy,
|
|
37
37
|
shouldCompactForRequestMedia,
|
|
38
38
|
} from '../loop/compact-policy.mjs';
|
|
39
|
-
import { snapshotProviderRequestTools } from '../../runtime-core/tool-catalog.mjs';
|
|
39
|
+
import { rearmLateDeferredTools, snapshotProviderRequestTools } from '../../runtime-core/tool-catalog.mjs';
|
|
40
|
+
import { rearmPromptSettingsNotice } from './prompt-settings.mjs';
|
|
40
41
|
import { prepareCompactionArchive, stampCompactionMessageIds } from '../compaction-archive-capture.mjs';
|
|
41
42
|
|
|
42
43
|
// 'compacting' is a transient in-flight stage written just before Compact
|
|
@@ -724,6 +725,16 @@ async function commitSessionCompaction(plan, run, compactStartedAt) {
|
|
|
724
725
|
// break instead of logging an unexplained input_prefix_mismatch.
|
|
725
726
|
if (changed) {
|
|
726
727
|
session.pendingCacheBreakIntent = mode === 'auto' ? 'post_turn_compaction' : 'manual_compaction';
|
|
728
|
+
// The compacted history no longer holds the late-tool announcements
|
|
729
|
+
// (connected MCP tools, built-ins a setting opened); a worker gets no
|
|
730
|
+
// prompt fold to list them, so they ride the next prompt again, as the
|
|
731
|
+
// pre-send compaction does.
|
|
732
|
+
try {
|
|
733
|
+
rearmLateDeferredTools(session);
|
|
734
|
+
rearmPromptSettingsNotice(session);
|
|
735
|
+
} catch {
|
|
736
|
+
/* a tool reminder never fails the compaction */
|
|
737
|
+
}
|
|
727
738
|
}
|
|
728
739
|
recordCompactionTiming(plan, freshContextResult, { startedAt: compactStartedAt, commitStartedAt, afterTokens });
|
|
729
740
|
return compactionResult(
|
|
@@ -154,7 +154,7 @@ export function resolveSessionContextMeta(provider, model, seed = {}, { wholeWin
|
|
|
154
154
|
// Legacy-data migration: old implementations derived autoCompactTokenLimit
|
|
155
155
|
// from the full effective/raw window and persisted it onto the session.
|
|
156
156
|
// A resumed session therefore re-seeds autoCompactTokenLimit == boundary
|
|
157
|
-
// (or the raw window), which compactTriggerForSession / loop policy
|
|
157
|
+
// (or the raw window), which compactTriggerForSession / loop policy would
|
|
158
158
|
// honor as an explicit trigger, collapsing the compaction buffer to 0. Only
|
|
159
159
|
// accept an explicit limit that is STRICTLY BELOW the boundary; a value at
|
|
160
160
|
// or above the boundary is a derived full-window artifact and is dropped to
|
|
@@ -9,6 +9,7 @@ import {
|
|
|
9
9
|
evictIdleLiveSessions,
|
|
10
10
|
} from '../store.mjs';
|
|
11
11
|
import { sweepOrphanedPendingMessages } from './pending-messages.mjs';
|
|
12
|
+
import { sweepOrphanTurnJournals } from './turn-checkpoint-recovery.mjs';
|
|
12
13
|
import { applySessionSidebarChange, readSessionSidebarState } from '../../../../shared/session-sidebar-host.mjs';
|
|
13
14
|
import {
|
|
14
15
|
IN_FLIGHT_STAGES,
|
|
@@ -184,7 +185,7 @@ function _runCleanupCycle() {
|
|
|
184
185
|
await sweepOrphanedPendingMessages();
|
|
185
186
|
await sweepIdleSessions({ includeTombstones: true });
|
|
186
187
|
// Reclaim same-process session snapshots whose state is durable on disk
|
|
187
|
-
// (memory-leak guard: _liveSessions
|
|
188
|
+
// (memory-leak guard: _liveSessions would otherwise grow for process lifetime).
|
|
188
189
|
try {
|
|
189
190
|
evictIdleLiveSessions({ isSessionLive: _isSessionLive });
|
|
190
191
|
} catch {
|
|
@@ -213,6 +214,10 @@ function _startCleanupInterval() {
|
|
|
213
214
|
|
|
214
215
|
export function startIdleCleanup() {
|
|
215
216
|
if (_cleanupTimer || _cleanupInitialTimer) return;
|
|
217
|
+
// Once per start, ahead of the first delayed cycle: checkpoint journals a
|
|
218
|
+
// previous run could not delete (their sessions may never be reopened).
|
|
219
|
+
// Only the daemon owner sweeps (it checks); the daemon runs in worker mode.
|
|
220
|
+
void sweepOrphanTurnJournals().catch(() => {});
|
|
216
221
|
if (CLEANUP_INITIAL_DELAY_MS <= 0) {
|
|
217
222
|
void _runCleanupCycle();
|
|
218
223
|
_startCleanupInterval();
|
|
@@ -490,6 +490,14 @@ registerTaskWaitSteeringCheck((sessionId) => {
|
|
|
490
490
|
return wake;
|
|
491
491
|
});
|
|
492
492
|
|
|
493
|
+
/** Whether anything waits in this session's queue (memory or takeover-hydrated). */
|
|
494
|
+
export function hasPendingMessages(sessionId) {
|
|
495
|
+
return (
|
|
496
|
+
(_sessionPendingMessages.get(sessionId)?.length ?? 0) > 0 ||
|
|
497
|
+
(_hydratedPendingMessages.get(sessionId)?.length ?? 0) > 0
|
|
498
|
+
);
|
|
499
|
+
}
|
|
500
|
+
|
|
493
501
|
// True when this session's queue holds task notifications and nothing else:
|
|
494
502
|
// the mid-chain boundary may then take the whole queue without bypassing the
|
|
495
503
|
// prompt filters that keep queued prompts for the terminal boundary.
|
|
@@ -583,7 +591,7 @@ export function drainPendingMessages(sessionId) {
|
|
|
583
591
|
);
|
|
584
592
|
}
|
|
585
593
|
// Only materialize the ledger when there is an id to suppress: an empty
|
|
586
|
-
// drain
|
|
594
|
+
// drain would leave a dead Set behind on every call.
|
|
587
595
|
const claimedIds = accepted.filter((entry) => entry.id);
|
|
588
596
|
if (claimedIds.length > 0) {
|
|
589
597
|
const inDelivery = pendingIdSet(_inDeliveryPendingIds, sessionId);
|
|
@@ -9,8 +9,8 @@ export const PENDING_MESSAGES_MODE = 0o600;
|
|
|
9
9
|
// Layout: one file (and one lock) per pending key under `session-pending/`.
|
|
10
10
|
// A key is an orchestrator session id or a `tui_<lead session id>` steering
|
|
11
11
|
// bucket, so operations on different sessions never share a lock.
|
|
12
|
-
|
|
13
|
-
|
|
12
|
+
const PENDING_SHARD_DIR_NAME = 'session-pending';
|
|
13
|
+
const LEGACY_PENDING_FILE_NAME = 'session-pending-messages.json';
|
|
14
14
|
|
|
15
15
|
export function pendingShardDir() {
|
|
16
16
|
return join(resolvePluginData(), PENDING_SHARD_DIR_NAME);
|
|
@@ -9,7 +9,7 @@ import { legacyPendingMessagesPath, pendingMessagesPath, PENDING_MESSAGES_MODE }
|
|
|
9
9
|
const SHARD_KEY_RE = /^[A-Za-z0-9_-]+$/;
|
|
10
10
|
const MIGRATION_LOCK_TIMEOUT_MS = 15_000;
|
|
11
11
|
|
|
12
|
-
|
|
12
|
+
function isShardKey(key) {
|
|
13
13
|
return typeof key === 'string' && SHARD_KEY_RE.test(key);
|
|
14
14
|
}
|
|
15
15
|
|