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
|
@@ -2,7 +2,6 @@ import { randomUUID } from 'node:crypto';
|
|
|
2
2
|
import { clean } from '../../../shared/clean.mjs';
|
|
3
3
|
import { compactSessionTitle } from './session-title.mjs';
|
|
4
4
|
import { MAX_GOAL_TIME_LIMIT_MS } from './goal-tool-defs.mjs';
|
|
5
|
-
import { goalTaskProgress, normalizeGoalTasks } from './goal-tasks.mjs';
|
|
6
5
|
import { SESSION_ID_PATTERN } from './session-id.mjs';
|
|
7
6
|
|
|
8
7
|
export const DEFAULT_GOAL_TIME_LIMIT_MS = 0;
|
|
@@ -10,6 +9,9 @@ export const DEFAULT_COMPLETED_GOAL_TTL_MS = 24 * 60 * 60 * 1000;
|
|
|
10
9
|
export const DEFAULT_GOAL_DEADLINE_WARNING_MS = Object.freeze([10 * 60_000, 5 * 60_000]);
|
|
11
10
|
export const NO_DEADLINE_WARNING_MS = Number.MAX_SAFE_INTEGER;
|
|
12
11
|
export const GOAL_FILE_VERSION = 1;
|
|
12
|
+
// A live runtime re-stamps an active Goal's `liveAt` this often; a longer gap
|
|
13
|
+
// means nothing was running it (app closed, PC asleep).
|
|
14
|
+
export const GOAL_LIVE_HEARTBEAT_MS = 60_000;
|
|
13
15
|
export const SESSION_ID = SESSION_ID_PATTERN;
|
|
14
16
|
export const GOAL_STATUS_VALUES = Object.freeze([
|
|
15
17
|
'active',
|
|
@@ -23,14 +25,6 @@ export const GOAL_STATUS_VALUES = Object.freeze([
|
|
|
23
25
|
|
|
24
26
|
const MAX_OBJECTIVE_LENGTH = 4_000;
|
|
25
27
|
const MAX_GOAL_BLOCKER_LENGTH = 1_000;
|
|
26
|
-
const ACTIVE_AGENT_STATUSES = new Set([
|
|
27
|
-
'connecting',
|
|
28
|
-
'requesting',
|
|
29
|
-
'streaming',
|
|
30
|
-
'tool_running',
|
|
31
|
-
'running',
|
|
32
|
-
'cancelling',
|
|
33
|
-
]);
|
|
34
28
|
|
|
35
29
|
export function assertSessionId(value) {
|
|
36
30
|
const sessionId = clean(value);
|
|
@@ -56,12 +50,6 @@ export function validateGoalBlocker(value) {
|
|
|
56
50
|
return blocker;
|
|
57
51
|
}
|
|
58
52
|
|
|
59
|
-
export function goalTimeMode(value, fallback = 'max') {
|
|
60
|
-
if (value == null || value === '') return fallback;
|
|
61
|
-
if (!['max', 'duration'].includes(value)) throw new Error('goal timeMode must be max or duration');
|
|
62
|
-
return value;
|
|
63
|
-
}
|
|
64
|
-
|
|
65
53
|
export function parseGoalDuration(value) {
|
|
66
54
|
if (typeof value === 'number') {
|
|
67
55
|
if (!Number.isFinite(value) || value <= 0) throw new Error('goal duration must be positive');
|
|
@@ -100,12 +88,10 @@ export function parseUserCommand(command) {
|
|
|
100
88
|
|
|
101
89
|
let objective = value;
|
|
102
90
|
let duration = null;
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
objective = objective.replace(modeMatch[0], ' ').trim();
|
|
108
|
-
}
|
|
91
|
+
// The user's confirmation that a new Goal replaces a stalled one, naming it:
|
|
92
|
+
// `--replace=<goal id>`.
|
|
93
|
+
const replaceMatch = objective.match(/(?:^|\s)--replace(?:=(\S+))?(?=\s|$)/i);
|
|
94
|
+
if (replaceMatch) objective = objective.replace(replaceMatch[0], ' ').trim();
|
|
109
95
|
const equalsMatch = objective.match(/(?:^|\s)--time=([^\s]+)/i);
|
|
110
96
|
if (equalsMatch) {
|
|
111
97
|
duration = equalsMatch[1];
|
|
@@ -117,7 +103,12 @@ export function parseUserCommand(command) {
|
|
|
117
103
|
objective = objective.replace(spacedMatch[0], ' ').trim();
|
|
118
104
|
}
|
|
119
105
|
}
|
|
120
|
-
return {
|
|
106
|
+
return {
|
|
107
|
+
action: 'create',
|
|
108
|
+
objective,
|
|
109
|
+
duration,
|
|
110
|
+
...(replaceMatch ? { replace: true, ...(replaceMatch[1] ? { expectedGoalId: replaceMatch[1] } : {}) } : {}),
|
|
111
|
+
};
|
|
121
112
|
}
|
|
122
113
|
|
|
123
114
|
function storedTimeLimitMs(value) {
|
|
@@ -125,11 +116,19 @@ function storedTimeLimitMs(value) {
|
|
|
125
116
|
return Number.isFinite(stored) && stored > 0 ? Math.min(MAX_GOAL_TIME_LIMIT_MS, Math.max(60_000, stored)) : 0;
|
|
126
117
|
}
|
|
127
118
|
|
|
128
|
-
//
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
return
|
|
119
|
+
// Tasks a record written before the todo list carried: kept on the record
|
|
120
|
+
// only until the session's todo list adopts them (todo-list.mjs).
|
|
121
|
+
function storedLegacyTasks(value) {
|
|
122
|
+
const tasks = value.legacyTasks ?? value.tasks ?? value.criteria;
|
|
123
|
+
return Array.isArray(tasks) && tasks.length
|
|
124
|
+
? tasks
|
|
125
|
+
.filter((task) => task && typeof task === 'object' && clean(task.text ?? task.content))
|
|
126
|
+
.map((task) => ({
|
|
127
|
+
text: clean(task.text ?? task.content),
|
|
128
|
+
// A criterion written before task statuses carried `satisfied`.
|
|
129
|
+
status: clean(task.status) || (task.satisfied === true ? 'completed' : 'pending'),
|
|
130
|
+
}))
|
|
131
|
+
: [];
|
|
133
132
|
}
|
|
134
133
|
|
|
135
134
|
export function normalizeStoredGoal(value, sessionId, resumedAt = Date.now()) {
|
|
@@ -139,31 +138,35 @@ export function normalizeStoredGoal(value, sessionId, resumedAt = Date.now()) {
|
|
|
139
138
|
if (!GOAL_STATUS_VALUES.includes(status)) throw new Error(`invalid stored Goal status: ${status}`);
|
|
140
139
|
return {
|
|
141
140
|
id: clean(value.id) || randomUUID(),
|
|
142
|
-
revision: Math.max(1, Math.floor(Number(value.revision) || 1)),
|
|
143
|
-
objectiveRevision: Math.max(1, Math.floor(Number(value.objectiveRevision) || 1)),
|
|
144
|
-
tasksObjectiveRevision: Math.max(1, Math.floor(Number(value.tasksObjectiveRevision) || 1)),
|
|
145
141
|
sessionId,
|
|
146
142
|
objective: validateObjective(value.objective),
|
|
147
143
|
title: compactSessionTitle(value.title || value.objective),
|
|
144
|
+
// Advances on every objective edit, so a settlement can tell whether the
|
|
145
|
+
// turn it answers saw the current wording.
|
|
146
|
+
objectiveRevision: Math.max(0, Math.floor(Number(value.objectiveRevision) || 0)),
|
|
148
147
|
status,
|
|
149
|
-
|
|
148
|
+
legacyTasks: storedLegacyTasks(value),
|
|
150
149
|
blocker: clean(value.blocker),
|
|
151
150
|
pauseReason: ['waiting', 'cancelled'].includes(value.pauseReason) ? value.pauseReason : 'user',
|
|
152
151
|
failureReason: clean(value.failureReason),
|
|
153
152
|
failureCount: Math.max(0, Math.floor(Number(value.failureCount) || 0)),
|
|
154
153
|
// Observations report progress; they never decide when work is complete.
|
|
155
154
|
turnCount: Math.max(0, Math.floor(Number(value.turnCount) || 0)),
|
|
156
|
-
lastDropTurn: storedLastDropTurn(value),
|
|
157
|
-
tasksUpdatedAt: Number(value.tasksUpdatedAt) > 0 ? Number(value.tasksUpdatedAt) : null,
|
|
158
155
|
timeLimitMs: storedTimeLimitMs(value),
|
|
159
|
-
//
|
|
160
|
-
|
|
161
|
-
|
|
156
|
+
// Time is an upper bound only: a legacy `duration` record reads as a cap.
|
|
157
|
+
// A record exhausted by an older build may carry wall-clock time past its
|
|
158
|
+
// cap; the cap is what was spent.
|
|
159
|
+
timeUsedMs: cappedTimeUsedMs(
|
|
160
|
+
status === 'duration_reached' ? storedTimeLimitMs(value) : 0,
|
|
161
|
+
Math.max(0, Number(value.timeUsedMs) || 0)
|
|
162
|
+
),
|
|
162
163
|
createdAt: Math.max(0, Number(value.createdAt) || Date.now()),
|
|
163
164
|
updatedAt: Math.max(0, Number(value.updatedAt) || Date.now()),
|
|
164
165
|
// Preserve the open segment across task writes, eviction, and restart.
|
|
165
166
|
lastStartedAt:
|
|
166
167
|
status === 'active' ? Math.max(0, Number(value.lastStartedAt) || Number(resumedAt) || Date.now()) : null,
|
|
168
|
+
// The last moment a live runtime was running this Goal's open segment.
|
|
169
|
+
liveAt: Math.max(0, Number(value.liveAt) || 0),
|
|
167
170
|
completedAt: Number(value.completedAt) > 0 ? Number(value.completedAt) : null,
|
|
168
171
|
stoppedAt: Number(value.stoppedAt) > 0 ? Number(value.stoppedAt) : null,
|
|
169
172
|
archivedAt: Number(value.archivedAt) > 0 ? Number(value.archivedAt) : null,
|
|
@@ -172,6 +175,51 @@ export function normalizeStoredGoal(value, sessionId, resumedAt = Date.now()) {
|
|
|
172
175
|
};
|
|
173
176
|
}
|
|
174
177
|
|
|
178
|
+
function cappedTimeUsedMs(limitMs, usedMs) {
|
|
179
|
+
return limitMs > 0 ? Math.min(limitMs, usedMs) : usedMs;
|
|
180
|
+
}
|
|
181
|
+
|
|
182
|
+
/** Drop the part of an active Goal's open segment that no live runtime ran
|
|
183
|
+
* (the app was closed, the PC slept): the segment start moves forward by the
|
|
184
|
+
* unobserved gap. Returns whether anything was dropped. */
|
|
185
|
+
export function discardUnobservedTime(goal, at, toleranceMs = 0) {
|
|
186
|
+
if (goal?.status !== 'active' || !(Number(goal.lastStartedAt) > 0)) return false;
|
|
187
|
+
const seenAt = Math.max(Number(goal.lastStartedAt), Number(goal.liveAt) || 0);
|
|
188
|
+
const gap = at - seenAt;
|
|
189
|
+
// The tolerance covers heartbeat jitter inside a live runtime only; a load
|
|
190
|
+
// after downtime passes none, so no closed-app interval is ever credited.
|
|
191
|
+
if (gap <= toleranceMs) return false;
|
|
192
|
+
goal.lastStartedAt = Number(goal.lastStartedAt) + gap;
|
|
193
|
+
goal.liveAt = at;
|
|
194
|
+
return true;
|
|
195
|
+
}
|
|
196
|
+
|
|
197
|
+
/** Drop `suspendedMs` — time a live runtime provably did not run (the OS was
|
|
198
|
+
* suspended) — from an active Goal's open segment, never more than the gap
|
|
199
|
+
* since it was last seen. Returns whether anything was dropped. */
|
|
200
|
+
export function discardSuspendedTime(goal, at, suspendedMs) {
|
|
201
|
+
if (goal?.status !== 'active' || !(Number(goal.lastStartedAt) > 0)) return false;
|
|
202
|
+
const seenAt = Math.max(Number(goal.lastStartedAt), Number(goal.liveAt) || 0);
|
|
203
|
+
const dropped = Math.min(Math.floor(Number(suspendedMs) || 0), Math.max(0, at - seenAt));
|
|
204
|
+
if (!(dropped > 0)) return false;
|
|
205
|
+
goal.lastStartedAt = Number(goal.lastStartedAt) + dropped;
|
|
206
|
+
goal.liveAt = at;
|
|
207
|
+
return true;
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
/** The Goal as a reader without a runtime sees it. Such a reader cannot know
|
|
211
|
+
* whether anything is running the Goal, so it uses no clock: the open
|
|
212
|
+
* segment counts only up to `liveAt`, the last moment a runtime persisted as
|
|
213
|
+
* having run it (at most one heartbeat behind). That makes the usage a pure
|
|
214
|
+
* function of the record — never above what the runtime has stored, never
|
|
215
|
+
* charging downtime, never moving backward between reads. */
|
|
216
|
+
export function freezeUnobservedSegment(goal) {
|
|
217
|
+
if (goal?.status !== 'active' || !(Number(goal.lastStartedAt) > 0)) return;
|
|
218
|
+
const observedMs = Math.max(0, (Number(goal.liveAt) || 0) - Number(goal.lastStartedAt));
|
|
219
|
+
goal.timeUsedMs = Math.max(0, Number(goal.timeUsedMs) || 0) + observedMs;
|
|
220
|
+
goal.lastStartedAt = null;
|
|
221
|
+
}
|
|
222
|
+
|
|
175
223
|
export function activeElapsedMs(goal, now = Date.now()) {
|
|
176
224
|
const committed = Math.max(0, Number(goal?.timeUsedMs) || 0);
|
|
177
225
|
if (goal?.status !== 'active' || !(Number(goal?.lastStartedAt) > 0)) return committed;
|
|
@@ -186,28 +234,23 @@ export function normalizeDeadlineWarnedMs(value) {
|
|
|
186
234
|
|
|
187
235
|
export function publicGoal(goal, now = Date.now()) {
|
|
188
236
|
if (!goal) return null;
|
|
189
|
-
const timeUsedMs = activeElapsedMs(goal, now);
|
|
190
237
|
const hasTimeLimit = Number(goal.timeLimitMs) > 0;
|
|
238
|
+
// Never above the cap: a read that lands after the deadline but before the
|
|
239
|
+
// expiry commit reports the cap, not the overshoot.
|
|
240
|
+
const timeUsedMs = cappedTimeUsedMs(Number(goal.timeLimitMs) || 0, activeElapsedMs(goal, now));
|
|
191
241
|
const remainingMs = hasTimeLimit ? Math.max(0, Number(goal.timeLimitMs) - timeUsedMs) : null;
|
|
192
|
-
const tasks = normalizeGoalTasks(goal.tasks || []);
|
|
193
242
|
return {
|
|
194
243
|
id: goal.id,
|
|
195
|
-
|
|
196
|
-
// Warning delivery does not invalidate the actionable task revision.
|
|
244
|
+
// Advances once per delivered deadline warning (deadline-delivery.mjs).
|
|
197
245
|
warningRevision: Math.max(0, Math.floor(Number(goal.warningRevision) || 0)),
|
|
198
|
-
needsTaskReview: goal.tasksObjectiveRevision !== goal.objectiveRevision,
|
|
199
246
|
sessionId: goal.sessionId,
|
|
200
247
|
objective: goal.objective,
|
|
201
248
|
title: goal.title || compactSessionTitle(goal.objective),
|
|
202
249
|
status: goal.status,
|
|
203
|
-
tasks,
|
|
204
250
|
turnCount: Math.max(0, Math.floor(Number(goal.turnCount) || 0)),
|
|
205
|
-
tasksUpdatedAt: Number(goal.tasksUpdatedAt) > 0 ? Number(goal.tasksUpdatedAt) : null,
|
|
206
|
-
...goalTaskProgress(tasks),
|
|
207
251
|
blocker: goal.blocker || '',
|
|
208
252
|
pauseReason: goal.pauseReason || 'user',
|
|
209
253
|
timeLimitMs: goal.timeLimitMs,
|
|
210
|
-
timeMode: goal.timeMode,
|
|
211
254
|
timeUsedMs,
|
|
212
255
|
remainingMs,
|
|
213
256
|
deadlineAt: hasTimeLimit && goal.status === 'active' && goal.lastStartedAt ? now + remainingMs : null,
|
|
@@ -310,14 +353,3 @@ export function resumeGoalState(goal, at, added = null) {
|
|
|
310
353
|
export function startActiveClock(goal, now = Date.now()) {
|
|
311
354
|
if (goal.status === 'active' && !goal.lastStartedAt) goal.lastStartedAt = now;
|
|
312
355
|
}
|
|
313
|
-
|
|
314
|
-
export function runningAgentWork(agentStatus) {
|
|
315
|
-
const jobs = Array.isArray(agentStatus?.agentJobs) ? agentStatus.agentJobs : [];
|
|
316
|
-
if (jobs.some((job) => clean(job?.status).toLowerCase() === 'running')) return true;
|
|
317
|
-
const workers = Array.isArray(agentStatus?.agentWorkers) ? agentStatus.agentWorkers : [];
|
|
318
|
-
return workers.some((worker) => {
|
|
319
|
-
const status = clean(worker?.status).toLowerCase();
|
|
320
|
-
const stage = clean(worker?.stage || worker?.worker_stage).toLowerCase();
|
|
321
|
-
return ACTIVE_AGENT_STATUSES.has(status) || ACTIVE_AGENT_STATUSES.has(stage);
|
|
322
|
-
});
|
|
323
|
-
}
|
|
@@ -15,6 +15,7 @@ import {
|
|
|
15
15
|
SESSION_ID,
|
|
16
16
|
assertSessionId,
|
|
17
17
|
completedGoalExpired,
|
|
18
|
+
freezeUnobservedSegment,
|
|
18
19
|
normalizeStoredGoal,
|
|
19
20
|
publicGoal,
|
|
20
21
|
} from './goal-state.mjs';
|
|
@@ -40,7 +41,9 @@ export function deleteStoredGoalFile(dataDir, sessionId) {
|
|
|
40
41
|
function readStoredGoalFile(dataDir, sessionId, at = Date.now()) {
|
|
41
42
|
const id = assertSessionId(sessionId);
|
|
42
43
|
try {
|
|
43
|
-
|
|
44
|
+
const goal = readGoalRecordFile(goalFilePath(dataDir, id), id, normalizeStoredGoal, at).goal;
|
|
45
|
+
freezeUnobservedSegment(goal);
|
|
46
|
+
return goal;
|
|
44
47
|
} catch (error) {
|
|
45
48
|
reportGoalStorageError(error);
|
|
46
49
|
return null;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* goal-store.mjs — the per-session Goal record: serialized mutations, the
|
|
3
|
-
*
|
|
3
|
+
* commit, listener publication and the visible/stored
|
|
4
4
|
* snapshots. Everything here reads and writes through the shared runtime
|
|
5
5
|
* record (`ctx`) assembled by createGoalRuntime.
|
|
6
6
|
*/
|
|
@@ -11,38 +11,44 @@ import {
|
|
|
11
11
|
GOAL_FILE_VERSION,
|
|
12
12
|
assertSessionId,
|
|
13
13
|
completedGoalExpired,
|
|
14
|
+
discardUnobservedTime,
|
|
14
15
|
normalizeStoredGoal,
|
|
15
16
|
publicGoal,
|
|
16
17
|
} from './goal-state.mjs';
|
|
17
18
|
|
|
18
|
-
// Clock checkpoints and generated titles must not invalidate a model's task
|
|
19
|
-
// update. Only changes to the actionable state advance the revision.
|
|
20
|
-
const REVISION_STATE_FIELDS = [
|
|
21
|
-
'objective',
|
|
22
|
-
'tasks',
|
|
23
|
-
'status',
|
|
24
|
-
'blocker',
|
|
25
|
-
'timeLimitMs',
|
|
26
|
-
'archivedAt',
|
|
27
|
-
'tasksObjectiveRevision',
|
|
28
|
-
'timeMode',
|
|
29
|
-
'pauseReason',
|
|
30
|
-
];
|
|
31
|
-
|
|
32
|
-
function revisionStateKey(goal) {
|
|
33
|
-
return JSON.stringify(REVISION_STATE_FIELDS.map((field) => goal?.[field]));
|
|
34
|
-
}
|
|
35
|
-
|
|
36
19
|
export function createGoalStore(ctx) {
|
|
37
20
|
const { root, dataDir, now, onStorageError, completedRetentionMs, listeners, mutationChains } = ctx;
|
|
38
21
|
const pathFor = (sessionId) => join(root, `${assertSessionId(sessionId)}.json`);
|
|
22
|
+
// The first load of a session's record in this runtime: whatever stretch of
|
|
23
|
+
// an open clock segment no live runtime ran (closed app, sleeping PC) is not
|
|
24
|
+
// time the Goal spent. Later re-reads are this runtime's own writes.
|
|
25
|
+
const adopted = new Set();
|
|
39
26
|
const storage = createGoalStorage({
|
|
40
27
|
pathFor,
|
|
41
|
-
normalizeGoal
|
|
28
|
+
normalizeGoal(value, sessionId, at) {
|
|
29
|
+
const goal = normalizeStoredGoal(value, sessionId, at);
|
|
30
|
+
if (goal && !adopted.has(sessionId)) {
|
|
31
|
+
adopted.add(sessionId);
|
|
32
|
+
discardUnobservedTime(goal, at);
|
|
33
|
+
}
|
|
34
|
+
return goal;
|
|
35
|
+
},
|
|
42
36
|
now,
|
|
43
37
|
writeRecord: ctx.writeGoalRecord,
|
|
44
38
|
});
|
|
45
|
-
|
|
39
|
+
// The committed record, exactly as stored. Only the deadline controller reads
|
|
40
|
+
// it this way: it does its own suspend accounting and needs to see whether a
|
|
41
|
+
// read changed anything.
|
|
42
|
+
const readStoredRecord = storage.read;
|
|
43
|
+
// Every other caller edits what it reads and commits it, and moves
|
|
44
|
+
// `lastStartedAt` or the status on the way. Charging a pending suspend here,
|
|
45
|
+
// before any caller sees the working copy, means no checkpoint or status
|
|
46
|
+
// transition can charge the sleep to the Goal, now or in a future caller.
|
|
47
|
+
const readRecord = (sessionId) => {
|
|
48
|
+
const record = readStoredRecord(sessionId);
|
|
49
|
+
ctx.deadlines.settleSuspended(sessionId, record.goal, now());
|
|
50
|
+
return record;
|
|
51
|
+
};
|
|
46
52
|
|
|
47
53
|
const withMutation = (sessionId, operation) => {
|
|
48
54
|
const id = assertSessionId(sessionId);
|
|
@@ -88,18 +94,17 @@ export function createGoalStore(ctx) {
|
|
|
88
94
|
|
|
89
95
|
const commit = async (sessionId, goal, { isCurrent, accept } = {}) => {
|
|
90
96
|
const id = assertSessionId(sessionId);
|
|
91
|
-
|
|
97
|
+
// Rollback restores exactly what was stored, not a settled working copy.
|
|
98
|
+
const previous = goal ? readStoredRecord(id).goal : null;
|
|
92
99
|
let committedGoal = null;
|
|
100
|
+
const stampedAt = now();
|
|
93
101
|
if (goal) {
|
|
94
|
-
committedGoal = {
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
previous?.id === goal.id
|
|
101
|
-
? previous.revision + Number(revisionStateKey(previous) !== revisionStateKey(committedGoal))
|
|
102
|
-
: 1;
|
|
102
|
+
committedGoal = { ...goal, sessionId: id };
|
|
103
|
+
if (committedGoal.status === 'active') {
|
|
104
|
+
// Stamping liveAt would hide a suspend nobody has charged yet.
|
|
105
|
+
ctx.deadlines.settleSuspended(id, committedGoal, stampedAt);
|
|
106
|
+
committedGoal.liveAt = stampedAt;
|
|
107
|
+
}
|
|
103
108
|
}
|
|
104
109
|
const rollback = async () => {
|
|
105
110
|
try {
|
|
@@ -130,16 +135,30 @@ export function createGoalStore(ctx) {
|
|
|
130
135
|
return null;
|
|
131
136
|
}
|
|
132
137
|
}
|
|
138
|
+
ctx.deadlines.refreshAnchor(id, stampedAt, committedGoal);
|
|
133
139
|
ctx.deadlines.armDeadline(id);
|
|
134
140
|
emit(id);
|
|
135
141
|
return publicGoal(committedGoal, now());
|
|
136
142
|
};
|
|
137
143
|
|
|
144
|
+
// The heartbeat's write: durable liveness only, nothing for listeners.
|
|
145
|
+
const stampLive = (id, goal) => storage.write(id, { version: GOAL_FILE_VERSION, goal: { ...goal, sessionId: id } });
|
|
146
|
+
|
|
138
147
|
const requireGoal = (sessionId) => {
|
|
139
148
|
const record = readRecord(sessionId);
|
|
140
149
|
if (!record.goal) throw new Error('no Goal exists for this session');
|
|
141
150
|
return record.goal;
|
|
142
151
|
};
|
|
143
152
|
|
|
144
|
-
return {
|
|
153
|
+
return {
|
|
154
|
+
readRecord,
|
|
155
|
+
readStoredRecord,
|
|
156
|
+
withMutation,
|
|
157
|
+
storedSnapshot,
|
|
158
|
+
visibleSnapshot,
|
|
159
|
+
emit,
|
|
160
|
+
commit,
|
|
161
|
+
stampLive,
|
|
162
|
+
requireGoal,
|
|
163
|
+
};
|
|
145
164
|
}
|