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
|
@@ -18,9 +18,12 @@ import { resetOutputLimitRecovery, resolveOutputLimit } from './no-tool-turn/out
|
|
|
18
18
|
import { resolveRefusal } from './no-tool-turn/refusal.mjs';
|
|
19
19
|
import { resumeContinuation } from './no-tool-turn/continuation.mjs';
|
|
20
20
|
import { nudgeEmptyTurn } from './no-tool-turn/empty-nudge.mjs';
|
|
21
|
+
import { noteTodoProgress, staleTodoReminder, todoCompletionReminder } from './no-tool-turn/todo-check.mjs';
|
|
21
22
|
import { isReactionSuccess, reactionCallIds, takeReactionTarget } from '../../runtime-core/reaction-tool-defs.mjs';
|
|
22
23
|
import { messageIdOf } from '../message-ids.mjs';
|
|
23
24
|
import { isReactableMessage } from '../message-reactions.mjs';
|
|
25
|
+
import { joinReports, withEarlierReport } from './turn-report.mjs';
|
|
26
|
+
import { TODO_TOOL } from '../../runtime-core/todo-tool-defs.mjs';
|
|
24
27
|
|
|
25
28
|
// `escalateMaxTokens()` asks the live provider for a higher one-shot max_tokens
|
|
26
29
|
// (number) or reports none (null/undefined) — the loop stays provider-agnostic.
|
|
@@ -32,6 +35,7 @@ export function createNoToolTurnResolver({
|
|
|
32
35
|
drainSteering,
|
|
33
36
|
escalateMaxTokens = () => null,
|
|
34
37
|
streamedChars = () => 0,
|
|
38
|
+
turnLimited = () => false,
|
|
35
39
|
}) {
|
|
36
40
|
const segments = createTurnSegments({ messages, opts });
|
|
37
41
|
// Per-turn recovery counters shared by the ladders.
|
|
@@ -51,6 +55,14 @@ export function createNoToolTurnResolver({
|
|
|
51
55
|
// Continuations since the last executed tool batch — bounds the text-only
|
|
52
56
|
// continuation runaway (see PROVIDER_CONTINUATION_NO_TOOL_LIMIT).
|
|
53
57
|
continuationsSinceToolBatch: 0,
|
|
58
|
+
// Answers the turn went on past (keepEndedAnswer): those still in the
|
|
59
|
+
// segments (parts before endedPartsEnd), and those a tool batch cleared
|
|
60
|
+
// from them.
|
|
61
|
+
endedPartsEnd: 0,
|
|
62
|
+
carriedAnswers: [],
|
|
63
|
+
// The newest kept answer was followed by nothing but todo bookkeeping:
|
|
64
|
+
// it is the turn's answer, and an empty end after it is no failure.
|
|
65
|
+
reportStands: false,
|
|
54
66
|
};
|
|
55
67
|
// The stable id (message-ids.mjs, kept across compaction) of the newest
|
|
56
68
|
// real user input; runtime reminders and notices are not reactable.
|
|
@@ -112,60 +124,108 @@ export function createNoToolTurnResolver({
|
|
|
112
124
|
};
|
|
113
125
|
};
|
|
114
126
|
|
|
127
|
+
// An answer the turn goes on past (queued input or a todo reminder arrived
|
|
128
|
+
// after it) is committed like any segment and also kept as part of the
|
|
129
|
+
// turn's report: a tool batch clears the segments, and the caller (an
|
|
130
|
+
// agent's owner) must still receive that answer, not only the short reply
|
|
131
|
+
// that follows it. The answer is every part since the previous one or the
|
|
132
|
+
// last tool batch (an output-limit cut and its resumption included).
|
|
133
|
+
const keepEndedAnswer = (response, hasContent) => {
|
|
134
|
+
if (!segments.commitIntermediate(response) || !hasContent) return false;
|
|
135
|
+
segments.record(response.content, { committed: true });
|
|
136
|
+
state.endedPartsEnd = segments.parts.length;
|
|
137
|
+
return true;
|
|
138
|
+
};
|
|
139
|
+
const endedReport = () =>
|
|
140
|
+
joinReports([...state.carriedAnswers, segments.parts.slice(0, state.endedPartsEnd).join('')]);
|
|
141
|
+
// Answers still in the segments are in the response's own aggregate.
|
|
142
|
+
const finalize = (response) =>
|
|
143
|
+
state.carriedAnswers.length === 0 ? response : withEarlierReport(response, joinReports(state.carriedAnswers));
|
|
144
|
+
|
|
145
|
+
async function resolveTurn(response, iteration) {
|
|
146
|
+
const hasContent = typeof response.content === 'string' && response.content.trim().length > 0;
|
|
147
|
+
const stopReason = response.stopReason ?? response.stop_reason ?? null;
|
|
148
|
+
const isOutputLimitStop = isOutputLimitStopReason(stopReason);
|
|
149
|
+
if (isOutputLimitStop || (hasContent && response.streamCut === true)) {
|
|
150
|
+
return resolveOutputLimit(response, ladder);
|
|
151
|
+
}
|
|
152
|
+
if (stopReason === 'refusal') return resolveRefusal(response, hasContent, ladder);
|
|
153
|
+
// Output-limit stops keep the bounded max-output ladder above and
|
|
154
|
+
// refusals (already returned) keep the bounded refusal retry; both
|
|
155
|
+
// own their own continuation semantics. No lexical/progress-text
|
|
156
|
+
// heuristic is consulted.
|
|
157
|
+
const continuationSignal = isOutputLimitStop ? null : providerContinuationSignal(response);
|
|
158
|
+
if (
|
|
159
|
+
continuationSignal &&
|
|
160
|
+
resumeContinuation(response, { iteration, signal: continuationSignal, hasContent, stopReason }, ladder)
|
|
161
|
+
) {
|
|
162
|
+
return { action: 'continue', response };
|
|
163
|
+
}
|
|
164
|
+
// Hidden roles are exempt from the empty-turn nudge: their own role
|
|
165
|
+
// rules define a different output contract (pipe-separated chunker
|
|
166
|
+
// output, …) and a text-only terminal turn is the correct shape —
|
|
167
|
+
// nudging them produces a contradictory user message that traps the
|
|
168
|
+
// model in a tool-call-blocked vs contract-required oscillation.
|
|
169
|
+
// A turn that left a reaction on the user's message may end with no
|
|
170
|
+
// text: the reaction is its answer (react tool), never an empty turn.
|
|
171
|
+
// Nor does a turn whose kept answer only todo bookkeeping followed: that
|
|
172
|
+
// answer is its reply.
|
|
173
|
+
if (!hasContent && !HIDDEN_AGENT_NAMES.has(sessionAgent) && !reactionAnswersLatest() && !state.reportStands) {
|
|
174
|
+
return nudgeEmptyTurn(
|
|
175
|
+
response,
|
|
176
|
+
{ stopReason, isIncompleteStop: stopReason && INCOMPLETE_STOP_REASONS.has(stopReason) },
|
|
177
|
+
ladder
|
|
178
|
+
);
|
|
179
|
+
}
|
|
180
|
+
// Pending-input rule: queued user input is folded into
|
|
181
|
+
// needs_follow_up before terminal completion. Commit the terminal
|
|
182
|
+
// text first (beforeAppend), then resume.
|
|
183
|
+
if (
|
|
184
|
+
drainSteering('terminal', {
|
|
185
|
+
maxPriority: 'next',
|
|
186
|
+
beforeAppend: () => keepEndedAnswer(response, hasContent),
|
|
187
|
+
})
|
|
188
|
+
) {
|
|
189
|
+
state.emptyNudgeStreak = 0;
|
|
190
|
+
resetOutputLimitRecovery(state);
|
|
191
|
+
return { action: 'continue', response };
|
|
192
|
+
}
|
|
193
|
+
const reminder = todoCompletionReminder(opts.session, {
|
|
194
|
+
sessionId,
|
|
195
|
+
sessionAgent,
|
|
196
|
+
turnLimited: turnLimited(),
|
|
197
|
+
});
|
|
198
|
+
if (reminder) {
|
|
199
|
+
if (keepEndedAnswer(response, hasContent)) state.reportStands = true;
|
|
200
|
+
messages.push({ role: 'user', content: reminder });
|
|
201
|
+
return { action: 'continue', response };
|
|
202
|
+
}
|
|
203
|
+
return finishTurn(response);
|
|
204
|
+
}
|
|
205
|
+
|
|
115
206
|
return {
|
|
116
207
|
// { action: 'continue' | 'break', response }. 'continue' means the
|
|
117
208
|
// recovery appended to the transcript and the loop must re-send;
|
|
118
|
-
// 'break' returns the (possibly aggregated) terminal response
|
|
209
|
+
// 'break' returns the (possibly aggregated) terminal response, with the
|
|
210
|
+
// ended answers a tool batch cleared from it as its report.
|
|
119
211
|
async resolve(response, iteration) {
|
|
120
|
-
const
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
}
|
|
138
|
-
// Hidden roles are exempt from the empty-turn nudge: their own role
|
|
139
|
-
// rules define a different output contract (pipe-separated chunker
|
|
140
|
-
// output, …) and a text-only terminal turn is the correct shape —
|
|
141
|
-
// nudging them produces a contradictory user message that traps the
|
|
142
|
-
// model in a tool-call-blocked vs contract-required oscillation.
|
|
143
|
-
// A turn that left a reaction on the user's message may end with no
|
|
144
|
-
// text: the reaction is its answer (react tool), never an empty turn.
|
|
145
|
-
if (!hasContent && !HIDDEN_AGENT_NAMES.has(sessionAgent) && !reactionAnswersLatest()) {
|
|
146
|
-
return nudgeEmptyTurn(
|
|
147
|
-
response,
|
|
148
|
-
{ stopReason, isIncompleteStop: stopReason && INCOMPLETE_STOP_REASONS.has(stopReason) },
|
|
149
|
-
ladder
|
|
150
|
-
);
|
|
151
|
-
}
|
|
152
|
-
// Pending-input rule: queued user input is folded into
|
|
153
|
-
// needs_follow_up before terminal completion. Commit the terminal
|
|
154
|
-
// text first (beforeAppend), then resume.
|
|
155
|
-
if (
|
|
156
|
-
drainSteering('terminal', {
|
|
157
|
-
maxPriority: 'next',
|
|
158
|
-
beforeAppend: () => {
|
|
159
|
-
if (segments.commitIntermediate(response) && hasContent)
|
|
160
|
-
segments.record(response.content, { committed: true });
|
|
161
|
-
},
|
|
162
|
-
})
|
|
163
|
-
) {
|
|
164
|
-
state.emptyNudgeStreak = 0;
|
|
165
|
-
resetOutputLimitRecovery(state);
|
|
166
|
-
return { action: 'continue', response };
|
|
167
|
-
}
|
|
168
|
-
return finishTurn(response);
|
|
212
|
+
const outcome = await resolveTurn(response, iteration);
|
|
213
|
+
if (outcome.action !== 'break') return outcome;
|
|
214
|
+
return { ...outcome, response: finalize(outcome.response) };
|
|
215
|
+
},
|
|
216
|
+
// The terminal response of a turn that ended any other way (a capped
|
|
217
|
+
// turn's overrun) gets the same report.
|
|
218
|
+
finalize,
|
|
219
|
+
// Every answer the turn went on past, for a turn that fails after them.
|
|
220
|
+
endedReport,
|
|
221
|
+
// Input the turn took in (steering at any boundary) is new work: its
|
|
222
|
+
// outcome is the turn's, not the kept answer's.
|
|
223
|
+
noteNewInput() {
|
|
224
|
+
state.reportStands = false;
|
|
225
|
+
},
|
|
226
|
+
// An empty end after the kept answer is that answer's turn ending.
|
|
227
|
+
get reportStands() {
|
|
228
|
+
return state.reportStands;
|
|
169
229
|
},
|
|
170
230
|
// A turn that produced tool calls is never an empty contract violation,
|
|
171
231
|
// and it is real progress: a later output-limit cut starts a fresh ladder.
|
|
@@ -177,6 +237,12 @@ export function createNoToolTurnResolver({
|
|
|
177
237
|
// succeeded marks the turn as having reacted.
|
|
178
238
|
noteToolBatchCompleted(calls = [], results = []) {
|
|
179
239
|
state.continuationsSinceToolBatch = 0;
|
|
240
|
+
noteTodoProgress(opts.session);
|
|
241
|
+
const stale = staleTodoReminder(opts.session, calls, results, { sessionAgent });
|
|
242
|
+
if (stale) messages.push({ role: 'user', content: stale, meta: 'hook' });
|
|
243
|
+
if (state.endedPartsEnd > 0) state.carriedAnswers.push(segments.parts.slice(0, state.endedPartsEnd).join(''));
|
|
244
|
+
state.endedPartsEnd = 0;
|
|
245
|
+
if (calls.some((call) => (call?.name ?? call?.function?.name) !== TODO_TOOL.name)) state.reportStands = false;
|
|
180
246
|
segments.clear();
|
|
181
247
|
state.reactions.push(...batchReactions(calls, results));
|
|
182
248
|
},
|
|
@@ -14,7 +14,11 @@
|
|
|
14
14
|
import { isAgentOwner } from '../../agent-owner.mjs';
|
|
15
15
|
import { isOffReadonlySurface } from './deferred-call-through.mjs';
|
|
16
16
|
import { BRIDGE_CALL_TOOL_NAME, bridgeErrorText, isToolBridgeEnabled } from '../../runtime-core/tool-bridge.mjs';
|
|
17
|
-
import {
|
|
17
|
+
import {
|
|
18
|
+
sessionAllowlistExcludes,
|
|
19
|
+
sessionDisallows,
|
|
20
|
+
sessionFeatureDenies,
|
|
21
|
+
} from '../../runtime-core/deferred-tool-availability.mjs';
|
|
18
22
|
import { providerToolExclusionReason } from './provider-tool-exclusions.mjs';
|
|
19
23
|
import { workflowOverlayDenial } from '../manager/workflow-switch-notice.mjs';
|
|
20
24
|
import { agentMcpToolPermission, connectorPolicyAgentOf, projectMcpToolDisabled } from '../../mcp/agent-connectors.mjs';
|
|
@@ -125,6 +129,9 @@ export function preDispatchDenyForSession(sessionRef, call) {
|
|
|
125
129
|
const workflowDenial = workflowOverlayDenial(sessionRef, schemaName);
|
|
126
130
|
if (workflowDenial) return workflowDenial;
|
|
127
131
|
if (sessionDisallows(sessionRef, schemaName)) {
|
|
132
|
+
if (sessionFeatureDenies(sessionRef, schemaName)) {
|
|
133
|
+
return `Error: tool "${schemaName}" is disabled in settings by the user. Do not retry unless the user turns it back on.`;
|
|
134
|
+
}
|
|
128
135
|
return `Error: tool "${name}" is not available in this session.`;
|
|
129
136
|
}
|
|
130
137
|
// An agent's connectors: a tool of a server it does not mount, or one set
|
|
@@ -43,7 +43,7 @@ export function beginProviderToolExclusions(sessionRef) {
|
|
|
43
43
|
if (isSessionRef(sessionRef)) sessions.get(sessionRef)?.current.clear();
|
|
44
44
|
}
|
|
45
45
|
|
|
46
|
-
|
|
46
|
+
function excludedToolNoticeText({ name, pointer, reason }) {
|
|
47
47
|
return `Tool "${name}" was excluded from this session's requests: its input schema is invalid at ${pointer || '/'} (${reason}). Fix the tool's schema or disable the tool.`;
|
|
48
48
|
}
|
|
49
49
|
|
|
@@ -38,7 +38,7 @@ const HOP_REASONS = {
|
|
|
38
38
|
const routeLabel = (route) => displayModelName(route.model, route.provider) || `${route.provider}/${route.model}`;
|
|
39
39
|
|
|
40
40
|
/** The muted transcript line for a hop: `<from> <reason> — switched to <to>.` */
|
|
41
|
-
|
|
41
|
+
function routeFallbackNoticeText(from, to, error) {
|
|
42
42
|
const reason = HOP_REASONS[providerErrorKind(error).kind] || 'unavailable';
|
|
43
43
|
return `${routeLabel(from)} ${reason} — switched to ${routeLabel(to)}.`;
|
|
44
44
|
}
|
|
@@ -198,7 +198,8 @@ function injectSteeringEntry(merged, { messages, opts, stage, onSkillPrompt }) {
|
|
|
198
198
|
// The drain is synchronous (terminal guards depend on that) and returns whether
|
|
199
199
|
// anything was injected. `onSkillPrompt` receives each typed entry so the loop
|
|
200
200
|
// can run its policy-checked skill selection before the next provider snapshot.
|
|
201
|
-
|
|
201
|
+
// `onInjected` learns of every drain that added input, whatever its stage.
|
|
202
|
+
export function createSteeringDrain({ messages, opts, sessionId, onSkillPrompt, onInjected = () => {} }) {
|
|
202
203
|
return function drainSteeringIntoMessages(stage = 'mid-turn', options = {}) {
|
|
203
204
|
if (typeof opts.drainSteering !== 'function') return false;
|
|
204
205
|
let steerMsgs = [];
|
|
@@ -232,6 +233,7 @@ export function createSteeringDrain({ messages, opts, sessionId, onSkillPrompt }
|
|
|
232
233
|
totalTextLen += injected.textLength;
|
|
233
234
|
maxQueueWaitMs = Math.max(maxQueueWaitMs, injected.queueWaitMs);
|
|
234
235
|
}
|
|
236
|
+
onInjected(stage);
|
|
235
237
|
if (sessionId) {
|
|
236
238
|
try {
|
|
237
239
|
process.stderr.write(
|
|
@@ -6,12 +6,11 @@
|
|
|
6
6
|
// copy `[mixdog compacted …]` back as literal patch input.
|
|
7
7
|
//
|
|
8
8
|
// Mutation bodies (patch / old_string / new_string / content / rewrite) are
|
|
9
|
-
// never collapsed after the fact.
|
|
10
|
-
//
|
|
11
|
-
//
|
|
12
|
-
//
|
|
13
|
-
//
|
|
14
|
-
// REMAINING turns, and a task rarely has enough of them left. Bodies now stay
|
|
9
|
+
// never collapsed after the fact. A later sweep would rewrite a prefix the
|
|
10
|
+
// provider has already cached, and every rewrite re-bills that whole request at
|
|
11
|
+
// the uncached rate. Measured over one 89-task run: $1.20 lost to recover
|
|
12
|
+
// $0.16, because the collapsed tokens only come back at the cached rate over
|
|
13
|
+
// the REMAINING turns, and a task rarely has enough of them left. Bodies stay
|
|
15
14
|
// verbatim in history, so the prefix — and its cache — survives the session.
|
|
16
15
|
import { createHash } from 'node:crypto';
|
|
17
16
|
|
|
@@ -16,6 +16,7 @@ import {
|
|
|
16
16
|
} from '../../human-gate/gate.mjs';
|
|
17
17
|
import { applyEditedArgs } from '../../human-gate/requests.mjs';
|
|
18
18
|
import { effectiveToolCwd } from '../../../tools/builtin/bash-tool/shell-cwd.mjs';
|
|
19
|
+
import { noteTodoUserWait } from '../no-tool-turn/todo-check.mjs';
|
|
19
20
|
|
|
20
21
|
const isArgsObject = (value) => value && typeof value === 'object' && !Array.isArray(value);
|
|
21
22
|
|
|
@@ -56,7 +57,11 @@ async function askApproval(
|
|
|
56
57
|
}
|
|
57
58
|
const approval = askOutcome.approval;
|
|
58
59
|
await recordHumanDecision(gate, approval);
|
|
59
|
-
if (askOutcome.denial)
|
|
60
|
+
if (askOutcome.denial) {
|
|
61
|
+
// The user said no: this turn may end waiting on them (todo-check.mjs).
|
|
62
|
+
noteTodoUserWait(callerSessionId);
|
|
63
|
+
return { denial: askOutcome.denial };
|
|
64
|
+
}
|
|
60
65
|
if (approval && typeof approval === 'object' && isArgsObject(approval.args)) call.args = approval.args;
|
|
61
66
|
// The card's edited text replaces the model's before the call runs.
|
|
62
67
|
if (request?.kind === 'outbound' && approval?.editedArgs) {
|
|
@@ -19,7 +19,9 @@ import {
|
|
|
19
19
|
} from '../../../tools/builtin.mjs';
|
|
20
20
|
import { executePatchTool } from '../../../tools/patch.mjs';
|
|
21
21
|
import { executeInternalTool, isInternalTool } from '../../../internal-tools.mjs';
|
|
22
|
+
import { settingDisabledTool } from '../../../runtime-core/tool-availability.mjs';
|
|
22
23
|
import { buildSkillsListResponse, viewSkill } from '../tool-helpers.mjs';
|
|
24
|
+
import { executeTodoTool } from '../../../runtime-core/todo-list.mjs';
|
|
23
25
|
import { isOnDeferredToolSurface } from '../deferred-call-through.mjs';
|
|
24
26
|
import { _executeCodeGraphToolLazy } from '../../manager/runtime-loaders.mjs';
|
|
25
27
|
import { requiresReadBody } from '../tool-classify.mjs';
|
|
@@ -57,8 +59,8 @@ function dispatchMcp(name, args, { cwd, callerSessionId, sessionRef, executeOpts
|
|
|
57
59
|
return formatUnknownBuiltinToolMessage(name, args, 'tool');
|
|
58
60
|
}
|
|
59
61
|
// 24h trace data shows ~24% of external MCP calls are cwd-sensitive
|
|
60
|
-
// (bash / grep / read / list / glob etc.)
|
|
61
|
-
// cwd
|
|
62
|
+
// (bash / grep / read / list / glob etc.), so the worker session's
|
|
63
|
+
// cwd must reach them. Inject cwd only when the tool's
|
|
62
64
|
// inputSchema declares the field — schemas without it would reject
|
|
63
65
|
// an unknown argument.
|
|
64
66
|
const needsCwdInjection = cwd && mcpToolHasField(name, 'cwd', mcpScopeId) && (args == null || args.cwd == null);
|
|
@@ -120,8 +122,20 @@ function dispatchInternal(
|
|
|
120
122
|
*/
|
|
121
123
|
export function dispatchToolCall({ name, args }, ctx) {
|
|
122
124
|
const { cwd, callerSessionId, sessionRef, executeOpts, toolOpts, completionToolOpts } = ctx;
|
|
125
|
+
const disabled = settingDisabledTool(name, sessionRef?.mcpScopeId);
|
|
126
|
+
if (disabled) {
|
|
127
|
+
return `Error: tool "${disabled}" is disabled in settings by the user; do not retry unless the user turns it back on`;
|
|
128
|
+
}
|
|
123
129
|
if (name === 'Skill' || name === 'skill_view') return viewSkill(cwd, args?.name, sessionRef);
|
|
124
130
|
if (name === 'skills_list') return buildSkillsListResponse(cwd);
|
|
131
|
+
// The step list belongs to the calling session itself (Lead or agent).
|
|
132
|
+
if (name === 'todo') {
|
|
133
|
+
try {
|
|
134
|
+
return executeTodoTool(sessionRef, args || {});
|
|
135
|
+
} catch (error) {
|
|
136
|
+
return `Error: ${error?.message || String(error)}`;
|
|
137
|
+
}
|
|
138
|
+
}
|
|
125
139
|
if (isMcpTool(name)) return dispatchMcp(name, args, ctx);
|
|
126
140
|
if (name === 'code_graph') {
|
|
127
141
|
// cwd chain: args.cwd (caller-explicit) → session cwd → undefined (handler throws)
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
// The report a finished ask hands its caller (an agent's owner).
|
|
2
|
+
//
|
|
3
|
+
// A turn's `content` is what the live view still needs at its end: the text
|
|
4
|
+
// since the last tool batch. An answer the turn kept going past (a todo
|
|
5
|
+
// reminder or queued input arrived after it) and a turn that queued input
|
|
6
|
+
// followed in the same ask are both older than that, so the result carries
|
|
7
|
+
// them in `reportContent`, ahead of the newest text.
|
|
8
|
+
|
|
9
|
+
export function joinReports(parts) {
|
|
10
|
+
return parts
|
|
11
|
+
.map((part) => String(part || '').trim())
|
|
12
|
+
.filter(Boolean)
|
|
13
|
+
.join('\n\n');
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
/** The whole report of a result: `reportContent` when the ask carried earlier
|
|
17
|
+
* answers, else its content. */
|
|
18
|
+
export function turnReportText(result) {
|
|
19
|
+
if (typeof result?.reportContent === 'string') return result.reportContent;
|
|
20
|
+
return typeof result?.content === 'string' ? result.content : '';
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
/** `result` with `earlier` answers ahead of its own report. */
|
|
24
|
+
export function withEarlierReport(result, earlier) {
|
|
25
|
+
if (!earlier) return result;
|
|
26
|
+
return { ...result, reportContent: joinReports([earlier, turnReportText(result)]) };
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
/** A turn that fails after such answers still hands them on: `error` carries
|
|
30
|
+
* them (`carriedReport`, earliest first) to whoever reports the failure. */
|
|
31
|
+
export function carryReportOnError(error, earlier) {
|
|
32
|
+
if (!earlier || !error || typeof error !== 'object') return error;
|
|
33
|
+
error.carriedReport = joinReports([earlier, typeof error.carriedReport === 'string' ? error.carriedReport : '']);
|
|
34
|
+
return error;
|
|
35
|
+
}
|
|
@@ -90,7 +90,7 @@ const SUMMED_USAGE_FIELDS = [
|
|
|
90
90
|
];
|
|
91
91
|
|
|
92
92
|
/** What `total` added after the running total `earlier` (both from addUsage); null when nothing. */
|
|
93
|
-
|
|
93
|
+
function usageSince(total, earlier) {
|
|
94
94
|
if (!total) return null;
|
|
95
95
|
if (!earlier) return { ...total };
|
|
96
96
|
const delta = {};
|
|
@@ -15,9 +15,10 @@ import { drainPendingMessages, hydratePendingMessages } from './pending-messages
|
|
|
15
15
|
import { _unlinkParentAbortListener, _getRuntimeEntry, _evictTerminalSessionRuntime } from './runtime-liveness.mjs';
|
|
16
16
|
import { acquireSessionLock } from './session-lock.mjs';
|
|
17
17
|
import { createAskPromptQueue } from './ask-queue.mjs';
|
|
18
|
-
import { armTurnDurability, claimTurnRuntime } from './ask-turn-open.mjs';
|
|
18
|
+
import { armTurnDurability, claimTurnRuntime, settleTurnBase } from './ask-turn-open.mjs';
|
|
19
19
|
import { prepareAskTurn, runAskAgentLoop } from './ask-turn-execute.mjs';
|
|
20
20
|
import { commitAskTurn, publishAskTurn } from './ask-turn-settle.mjs';
|
|
21
|
+
import { carryReportOnError, turnReportText, withEarlierReport } from '../loop/turn-report.mjs';
|
|
21
22
|
import { finalizeAskTurnFailure } from './ask-turn-failure.mjs';
|
|
22
23
|
import { armTurnTimeoutOnProviderError, reapTurnShellJobs } from './turn-reap.mjs';
|
|
23
24
|
import { cacheWarmTurnKind, endCacheWarmTurn, failedTurnProvenance, noteCacheWarmTurn } from '../cache-warm.mjs';
|
|
@@ -78,7 +79,17 @@ export function createAskTranscriptMeta(rawTranscriptMeta) {
|
|
|
78
79
|
/** One opened turn from provider call to terminal publish; a failure unwinds
|
|
79
80
|
* the turn state and rethrows. Returns the terminal result preview and the
|
|
80
81
|
* follow-ups drained right after the provider accepted the turn. */
|
|
81
|
-
async function runAskTurn({
|
|
82
|
+
async function runAskTurn({
|
|
83
|
+
sessionId,
|
|
84
|
+
opened,
|
|
85
|
+
input,
|
|
86
|
+
askOpts,
|
|
87
|
+
onToolCall,
|
|
88
|
+
cwdOverride,
|
|
89
|
+
transcript,
|
|
90
|
+
askStartedAt,
|
|
91
|
+
earlierReport,
|
|
92
|
+
}) {
|
|
82
93
|
let releaseWorkspace;
|
|
83
94
|
try {
|
|
84
95
|
releaseWorkspace = await admitWorkspaceActivity(
|
|
@@ -98,6 +109,8 @@ async function runAskTurn({ sessionId, opened, input, askOpts, onToolCall, cwdOv
|
|
|
98
109
|
// them with what the model was told. Asked again for every user turn
|
|
99
110
|
// the ask runs, queued and background follow-ups included.
|
|
100
111
|
currentAgents: askOpts?.agentsNow?.(),
|
|
112
|
+
// The session runtime's in-memory settings (the file trails them).
|
|
113
|
+
agentConfig: askOpts?.agentConfig?.() || null,
|
|
101
114
|
});
|
|
102
115
|
const result = await runAskAgentLoop({
|
|
103
116
|
sessionId,
|
|
@@ -108,14 +121,19 @@ async function runAskTurn({ sessionId, opened, input, askOpts, onToolCall, cwdOv
|
|
|
108
121
|
onToolCall,
|
|
109
122
|
takeAssistantTranscriptMetadata: transcript.takeAssistant,
|
|
110
123
|
});
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
124
|
+
// The earlier turns of this ask relayed nothing (publishAskTurn relays
|
|
125
|
+
// only a turn no queued input follows): their reports lead this one's.
|
|
126
|
+
const terminalResultPreview = withEarlierReport(
|
|
127
|
+
await commitAskTurn({
|
|
128
|
+
sessionId,
|
|
129
|
+
opened,
|
|
130
|
+
prepared,
|
|
131
|
+
result,
|
|
132
|
+
rawTranscriptMeta: transcript.raw,
|
|
133
|
+
askStartedAt,
|
|
134
|
+
}),
|
|
135
|
+
earlierReport
|
|
136
|
+
);
|
|
119
137
|
const drained = publishAskTurn({
|
|
120
138
|
sessionId,
|
|
121
139
|
opened,
|
|
@@ -143,7 +161,8 @@ async function runAskTurn({ sessionId, opened, input, askOpts, onToolCall, cwdOv
|
|
|
143
161
|
askStartedAt,
|
|
144
162
|
});
|
|
145
163
|
reapTurnShellJobs(sessionId, opened.runtime);
|
|
146
|
-
|
|
164
|
+
// Queued work that fails still hands on the reports of the turns before it.
|
|
165
|
+
throw carryReportOnError(err, earlierReport);
|
|
147
166
|
} finally {
|
|
148
167
|
// The result is already published; this only holds the session lock until
|
|
149
168
|
// the reader lease is removed, so the next turn's admission follows it. A
|
|
@@ -255,21 +274,32 @@ export async function askSession(sessionId, prompt, context, onToolCall, cwdOver
|
|
|
255
274
|
input.retryAttemptId = askOpts.retryAttemptId;
|
|
256
275
|
retryTurnId = null;
|
|
257
276
|
}
|
|
258
|
-
//
|
|
259
|
-
//
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
277
|
+
// The earlier turns of this ask relayed nothing (publishAskTurn relays
|
|
278
|
+
// only a turn no queued input follows): this turn failing before it
|
|
279
|
+
// runs (runAskTurn carries the report once it has) still hands them on.
|
|
280
|
+
const earlierReport = result ? turnReportText(result) : '';
|
|
281
|
+
let opened;
|
|
282
|
+
try {
|
|
283
|
+
// The previous turn's save has landed and this turn's base is on disk
|
|
284
|
+
// before the turn touches the session (one unsettled turn per session).
|
|
285
|
+
await settleTurnBase(sessionId, { recoverCheckpoint: firstTurn });
|
|
286
|
+
// Synchronous pre-await setup (must happen before any await so
|
|
287
|
+
// closeSession() can't interleave between load and registration).
|
|
288
|
+
const claimed = claimTurnRuntime({
|
|
289
|
+
sessionId,
|
|
290
|
+
askOpts,
|
|
291
|
+
emitStart: firstTurn,
|
|
292
|
+
});
|
|
293
|
+
warmTurn = noteTurnForCacheWarm(sessionId, claimed, input);
|
|
294
|
+
firstTurn = false;
|
|
295
|
+
askGeneration = claimed.askGeneration;
|
|
296
|
+
opened = {
|
|
297
|
+
...claimed,
|
|
298
|
+
...armTurnDurability({ sessionId, ...claimed, pendingEntries: input.pendingEntries }),
|
|
299
|
+
};
|
|
300
|
+
} catch (error) {
|
|
301
|
+
throw carryReportOnError(error, earlierReport);
|
|
302
|
+
}
|
|
273
303
|
// From here the turn's own unwind (ask-turn-failure) acks or releases
|
|
274
304
|
// its entries; the queue keeps owning only the not-yet-started ones.
|
|
275
305
|
queue.markStarted();
|
|
@@ -282,6 +312,7 @@ export async function askSession(sessionId, prompt, context, onToolCall, cwdOver
|
|
|
282
312
|
cwdOverride,
|
|
283
313
|
transcript,
|
|
284
314
|
askStartedAt,
|
|
315
|
+
earlierReport,
|
|
285
316
|
});
|
|
286
317
|
result = turn.result;
|
|
287
318
|
endCacheWarmTurn(sessionId, warmTurn);
|
|
@@ -50,19 +50,21 @@ export function turnStepAutoEffort(autoEffort, effortConfiguration) {
|
|
|
50
50
|
: null;
|
|
51
51
|
}
|
|
52
52
|
|
|
53
|
-
|
|
53
|
+
// `config`: a session runtime's in-memory agent config (its file copy trails
|
|
54
|
+
// it by a debounce); other callers read the file.
|
|
55
|
+
export function autoEffortMode(config = null) {
|
|
54
56
|
if (process.env.MIXDOG_AUTO_EFFORT) return normalizeAutoEffortMode(process.env.MIXDOG_AUTO_EFFORT);
|
|
55
57
|
try {
|
|
56
|
-
return builtinFeatureActive(readSection('agent'), 'autoEffort') ? 'on' : 'off';
|
|
58
|
+
return builtinFeatureActive(config || readSection('agent'), 'autoEffort') ? 'on' : 'off';
|
|
57
59
|
} catch {
|
|
58
60
|
return 'off';
|
|
59
61
|
}
|
|
60
62
|
}
|
|
61
63
|
|
|
62
64
|
/** The global "Auto reasoning base" setting; absent or unreadable is medium. */
|
|
63
|
-
export function autoEffortBaseSetting() {
|
|
65
|
+
export function autoEffortBaseSetting(config = null) {
|
|
64
66
|
try {
|
|
65
|
-
return autoEffortBase(readSection('agent')?.autoEffortBase);
|
|
67
|
+
return autoEffortBase((config || readSection('agent'))?.autoEffortBase);
|
|
66
68
|
} catch {
|
|
67
69
|
return autoEffortBase(undefined);
|
|
68
70
|
}
|
|
@@ -99,8 +101,8 @@ function lastText(messages, role) {
|
|
|
99
101
|
* briefly (its first-use load is the longest wait): a missing, still-loading,
|
|
100
102
|
* or slow model yields null and the default effort.
|
|
101
103
|
*/
|
|
102
|
-
export async function resolveTurnAutoEffort({ sessionId, session, provider, input }) {
|
|
103
|
-
const mode = autoEffortMode();
|
|
104
|
+
export async function resolveTurnAutoEffort({ sessionId, session, provider, input, config = null }) {
|
|
105
|
+
const mode = autoEffortMode(config);
|
|
104
106
|
// promptSource marks runtime-injected turns (completion notices, queued work).
|
|
105
107
|
// Agent sessions are judged like any other: their spawn brief and later Lead
|
|
106
108
|
// `send` messages arrive as plain prompts.
|
|
@@ -113,7 +115,7 @@ export async function resolveTurnAutoEffort({ sessionId, session, provider, inpu
|
|
|
113
115
|
if (!turnEffortConfigurationMode(session, provider)) return null;
|
|
114
116
|
const chosen = String(session.effort || '').toLowerCase();
|
|
115
117
|
const options = effortOptionsFor(session.provider, autoEffortModel(session.provider, provider, session.model));
|
|
116
|
-
const setting = autoEffortBaseSetting();
|
|
118
|
+
const setting = autoEffortBaseSetting(config);
|
|
117
119
|
const base = clampAutoEffortBase({ base: setting, options }) ?? autoEffortBase(setting);
|
|
118
120
|
const record = {
|
|
119
121
|
at: new Date().toISOString(),
|
|
@@ -59,7 +59,13 @@ function retainedUserTurn(session, retained, transcriptMeta, currentAgents) {
|
|
|
59
59
|
},
|
|
60
60
|
currentAgents
|
|
61
61
|
);
|
|
62
|
-
|
|
62
|
+
const noticeRevision = retained.message.meta?.promptSettingsNoticeRevision;
|
|
63
|
+
return {
|
|
64
|
+
historyMessages,
|
|
65
|
+
userTurnMessage,
|
|
66
|
+
outgoing: [...historyMessages, userTurnMessage],
|
|
67
|
+
promptSettingsNotice: noticeRevision ? { revision: noticeRevision } : null,
|
|
68
|
+
};
|
|
63
69
|
}
|
|
64
70
|
|
|
65
71
|
// The turn's user message: the retained one of a retried failed turn, or a
|
|
@@ -147,7 +153,15 @@ function persistTurnPreflight(session, { turnToken, startedAt, checkpoint, askGe
|
|
|
147
153
|
|
|
148
154
|
/** Resolves the provider, builds the user turn and pre-commits it; returns
|
|
149
155
|
* what the loop and the commit need from this preparation. */
|
|
150
|
-
export async function prepareAskTurn({
|
|
156
|
+
export async function prepareAskTurn({
|
|
157
|
+
sessionId,
|
|
158
|
+
opened,
|
|
159
|
+
input,
|
|
160
|
+
cwdOverride,
|
|
161
|
+
transcriptMeta,
|
|
162
|
+
currentAgents,
|
|
163
|
+
agentConfig = null,
|
|
164
|
+
}) {
|
|
151
165
|
const { turn, runtime, turnSignal, askGeneration, checkpoint, turnToken, startedAt, codexTurnId } = opened;
|
|
152
166
|
const session = turn.session;
|
|
153
167
|
// Where the turn sits in a bot-to-bot chain (session-runtime/bot-hops.mjs).
|
|
@@ -167,7 +181,7 @@ export async function prepareAskTurn({ sessionId, opened, input, cwdOverride, tr
|
|
|
167
181
|
// reads the session as the turn found it (synchronously, on this call).
|
|
168
182
|
// The first request still carries its decision: it is awaited below,
|
|
169
183
|
// together with the user turn, before the effort configuration is stamped.
|
|
170
|
-
const autoEffortPending = resolveTurnAutoEffort({ sessionId, session, provider, input });
|
|
184
|
+
const autoEffortPending = resolveTurnAutoEffort({ sessionId, session, provider, input, config: agentConfig });
|
|
171
185
|
autoEffortPending.catch(() => {});
|
|
172
186
|
applyTurnContextMeta(session, provider);
|
|
173
187
|
const effectiveCwd = cwdOverride || session.cwd;
|
|
@@ -206,6 +220,9 @@ export async function prepareAskTurn({ sessionId, opened, input, cwdOverride, tr
|
|
|
206
220
|
if (effortConfiguration) stampTurnEffort(userTurn.userTurnMessage, effortConfiguration);
|
|
207
221
|
const { historyMessages, outgoing } = userTurn;
|
|
208
222
|
turn.userTurnContent = userTurn.userTurnMessage.content;
|
|
223
|
+
// The turn opens right after the history it was built on: its checkpoint
|
|
224
|
+
// boundary, never looked up again by the prompt's text.
|
|
225
|
+
turn.boundary = historyMessages.length;
|
|
209
226
|
turn.outgoing = outgoing;
|
|
210
227
|
precommitUserTurn(session, outgoing, historyMessages, input);
|
|
211
228
|
persistTurnPreflight(session, { turnToken, startedAt, checkpoint, askGeneration });
|
|
@@ -236,6 +253,7 @@ export async function prepareAskTurn({ sessionId, opened, input, cwdOverride, tr
|
|
|
236
253
|
deferredToolDelta: userTurn.deferredToolDelta,
|
|
237
254
|
goalReminder: userTurn.goalReminder,
|
|
238
255
|
workflowNotice: userTurn.workflowNotice,
|
|
256
|
+
promptSettingsNotice: userTurn.promptSettingsNotice,
|
|
239
257
|
orchestrationModeNotice: userTurn.orchestrationModeNotice,
|
|
240
258
|
workspaceNotice: userTurn.workspaceNotice,
|
|
241
259
|
setupNotice: userTurn.setupNotice,
|