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
|
@@ -1,6 +1,15 @@
|
|
|
1
1
|
import { markPendingGoalReminder } from '../runtime/agent/orchestrator/runtime-core/goal-reminder.mjs';
|
|
2
|
+
import { adoptLegacyGoalTasks, todoContextBlock } from '../runtime/agent/orchestrator/runtime-core/todo-list.mjs';
|
|
3
|
+
import { SAVE_OUTCOME_SAVED } from '../runtime/agent/orchestrator/session/store/live-state.mjs';
|
|
2
4
|
|
|
3
|
-
export function createGoalFacadeApi({
|
|
5
|
+
export function createGoalFacadeApi({
|
|
6
|
+
agentStatusState,
|
|
7
|
+
createCurrentSession,
|
|
8
|
+
getSession,
|
|
9
|
+
getSessionId,
|
|
10
|
+
goalRuntime,
|
|
11
|
+
persistSession,
|
|
12
|
+
}) {
|
|
4
13
|
const markGoalReminder = (reason = '') => {
|
|
5
14
|
try {
|
|
6
15
|
const pending = markPendingGoalReminder(getSession(), reason);
|
|
@@ -14,10 +23,39 @@ export function createGoalFacadeApi({ agentStatusState, createCurrentSession, ge
|
|
|
14
23
|
return null;
|
|
15
24
|
}
|
|
16
25
|
};
|
|
26
|
+
// A Goal record written before the todo list still carries its tasks: the
|
|
27
|
+
// session's list adopts them, and only once that session is saved does the
|
|
28
|
+
// record let them go. A failed save keeps them on the record, so the next
|
|
29
|
+
// load adopts again (items already listed are skipped, never duplicated).
|
|
30
|
+
const adopting = new Map();
|
|
31
|
+
const adoptLegacyTasks = (sessionId) => {
|
|
32
|
+
if (adopting.has(sessionId)) return adopting.get(sessionId);
|
|
33
|
+
const tasks = goalRuntime.legacyTasks?.(sessionId) || [];
|
|
34
|
+
if (!tasks.length) return null;
|
|
35
|
+
const session = getSession();
|
|
36
|
+
if (session?.id !== sessionId) return null;
|
|
37
|
+
adoptLegacyGoalTasks(session, tasks);
|
|
38
|
+
const adoption = (async () => {
|
|
39
|
+
try {
|
|
40
|
+
// Only an explicit committed write lets the record go: a dropped or
|
|
41
|
+
// stale save resolves too, without the list on disk.
|
|
42
|
+
if ((await persistSession(session)) !== SAVE_OUTCOME_SAVED) return;
|
|
43
|
+
await goalRuntime.clearLegacyTasks(sessionId);
|
|
44
|
+
} catch {
|
|
45
|
+
// Kept on the record; retried on the next load.
|
|
46
|
+
} finally {
|
|
47
|
+
adopting.delete(sessionId);
|
|
48
|
+
}
|
|
49
|
+
})();
|
|
50
|
+
adopting.set(sessionId, adoption);
|
|
51
|
+
return adoption;
|
|
52
|
+
};
|
|
17
53
|
return {
|
|
18
54
|
goalStatus() {
|
|
19
55
|
const sessionId = getSessionId();
|
|
20
|
-
|
|
56
|
+
if (!sessionId) return null;
|
|
57
|
+
adoptLegacyTasks(sessionId);
|
|
58
|
+
return goalRuntime.snapshot(sessionId);
|
|
21
59
|
},
|
|
22
60
|
async goalControl(args = {}) {
|
|
23
61
|
let sessionId = getSessionId();
|
|
@@ -31,10 +69,18 @@ export function createGoalFacadeApi({ agentStatusState, createCurrentSession, ge
|
|
|
31
69
|
return result;
|
|
32
70
|
},
|
|
33
71
|
markGoalReminder,
|
|
72
|
+
/** Settles once a legacy Goal record's tasks are adopted and saved (or kept after a failed save). */
|
|
73
|
+
adoptLegacyGoalTasks(sessionId = getSessionId()) {
|
|
74
|
+
return Promise.resolve(sessionId ? adoptLegacyTasks(sessionId) : null);
|
|
75
|
+
},
|
|
34
76
|
goalContinuation() {
|
|
35
77
|
const sessionId = getSessionId();
|
|
36
78
|
if (!sessionId) return { run: false, reason: 'missing-session', goal: null };
|
|
37
|
-
|
|
79
|
+
adoptLegacyTasks(sessionId);
|
|
80
|
+
return goalRuntime.continuation(sessionId, {
|
|
81
|
+
agentStatus: agentStatusState(),
|
|
82
|
+
todo: todoContextBlock(getSession(), 'Todo list for this Goal (exact wordings):', { whole: true }),
|
|
83
|
+
});
|
|
38
84
|
},
|
|
39
85
|
goalTurnStarted() {
|
|
40
86
|
const sessionId = getSessionId();
|
|
@@ -5,9 +5,10 @@ import { randomUUID } from 'node:crypto';
|
|
|
5
5
|
import {
|
|
6
6
|
validateUserHandoff,
|
|
7
7
|
validateAskUserQuestions,
|
|
8
|
-
ASK_USER_MAX_TEXT,
|
|
9
8
|
} from '../../runtime/agent/orchestrator/runtime-core/ask-user-tool-defs.mjs';
|
|
9
|
+
import { askUserResultText } from '../../runtime/agent/orchestrator/runtime-core/ask-user-result.mjs';
|
|
10
10
|
import { createCallerContextResolvers } from './caller-context.mjs';
|
|
11
|
+
import { noteTodoUserWait } from '../../runtime/agent/orchestrator/session/loop/no-tool-turn/todo-check.mjs';
|
|
11
12
|
import { runAbortable } from '../../runtime/shared/abort-race.mjs';
|
|
12
13
|
import {
|
|
13
14
|
HANDOFF_OUTCOMES as AGENT_OUTCOMES,
|
|
@@ -226,55 +227,6 @@ export function handoffSite(handoff) {
|
|
|
226
227
|
|
|
227
228
|
const NO_USER =
|
|
228
229
|
'No user is available to answer in this session. Proceed with your best judgment and state the choices you made.';
|
|
229
|
-
const DISMISSED =
|
|
230
|
-
'User closed the questions without answering. Proceed with your best judgment; ask again only if something new depends on it.';
|
|
231
|
-
|
|
232
|
-
/** Wire answers -> array aligned with questions; invalid entries become null. */
|
|
233
|
-
function normalizeAskUserAnswers(answers, questions) {
|
|
234
|
-
const list = Array.isArray(answers) ? answers.slice(0, 4) : [];
|
|
235
|
-
return questions.map((q, i) => {
|
|
236
|
-
const entry = list[i];
|
|
237
|
-
if (!entry || typeof entry !== 'object') return null;
|
|
238
|
-
const labels = new Set(q.options.map((o) => o.label));
|
|
239
|
-
const rawSelected = entry.selected == null ? [] : entry.selected;
|
|
240
|
-
if (!Array.isArray(rawSelected) || !rawSelected.every((l) => typeof l === 'string' && labels.has(l))) return null;
|
|
241
|
-
if (entry.text != null && (typeof entry.text !== 'string' || entry.text.length > ASK_USER_MAX_TEXT)) return null;
|
|
242
|
-
const selected = q.multi_select === true ? [...new Set(rawSelected)] : rawSelected.slice(0, 1);
|
|
243
|
-
const text = typeof entry.text === 'string' ? entry.text.trim() : '';
|
|
244
|
-
if (!selected.length && !text) return null;
|
|
245
|
-
return text ? { selected, text } : { selected };
|
|
246
|
-
});
|
|
247
|
-
}
|
|
248
|
-
|
|
249
|
-
// Strings are JSON-quoted so a quote inside one cannot end it early; typed
|
|
250
|
-
// text stays apart from the picked labels (`"picked" + "typed" (typed)`).
|
|
251
|
-
function formatAskUserAnswers(questions, answers) {
|
|
252
|
-
const quote = (text) => JSON.stringify(text);
|
|
253
|
-
const parts = questions.map((q, i) => {
|
|
254
|
-
const a = answers[i];
|
|
255
|
-
if (!a) return `${quote(q.question)}=(no answer)`;
|
|
256
|
-
const picked = a.selected.length ? quote(a.selected.join(', ')) : '';
|
|
257
|
-
const typed = a.text ? `${quote(a.text)} (typed)` : '';
|
|
258
|
-
return `${quote(q.question)}=${[picked, typed].filter(Boolean).join(' + ')}`;
|
|
259
|
-
});
|
|
260
|
-
return `User has answered your questions: ${parts.join('; ')}. You can now continue with these answers in mind.`;
|
|
261
|
-
}
|
|
262
|
-
|
|
263
|
-
/** A composer message sent instead of (or with) picking: kept when it is a
|
|
264
|
-
* non-empty string within the typed-answer limit, else dropped. */
|
|
265
|
-
function normalizeAskUserReply(reply) {
|
|
266
|
-
if (typeof reply !== 'string' || reply.length > ASK_USER_MAX_TEXT) return '';
|
|
267
|
-
return reply.trim();
|
|
268
|
-
}
|
|
269
|
-
|
|
270
|
-
// `User replied in chat: "<reply>". ` leads, then the usual picks sentence
|
|
271
|
-
// when any question was answered, else just the closing sentence.
|
|
272
|
-
function formatAskUserResult(questions, answers, reply) {
|
|
273
|
-
if (!reply) return formatAskUserAnswers(questions, answers);
|
|
274
|
-
const lead = `User replied in chat: ${JSON.stringify(reply)}. `;
|
|
275
|
-
if (answers.some(Boolean)) return `${lead}${formatAskUserAnswers(questions, answers)}`;
|
|
276
|
-
return `${lead}You can now continue with these answers in mind.`;
|
|
277
|
-
}
|
|
278
230
|
|
|
279
231
|
export function createAskUserToolHandlers({ rt }) {
|
|
280
232
|
const { sessionIdFor, signalFor } = createCallerContextResolvers(rt);
|
|
@@ -303,13 +255,9 @@ export function createAskUserToolHandlers({ rt }) {
|
|
|
303
255
|
toolCallId: callerCtx?.toolCallId || null,
|
|
304
256
|
})
|
|
305
257
|
);
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
normalizeAskUserAnswers(result.answers, questions),
|
|
310
|
-
normalizeAskUserReply(result.reply)
|
|
311
|
-
);
|
|
312
|
-
return DISMISSED;
|
|
258
|
+
// A question left unanswered: the turn may end waiting on the user.
|
|
259
|
+
if (result?.approved !== true) noteTodoUserWait(sessionIdFor(callerCtx));
|
|
260
|
+
return askUserResultText(questions, result);
|
|
313
261
|
},
|
|
314
262
|
};
|
|
315
263
|
}
|
|
@@ -68,8 +68,9 @@ export function createBridgeToolHandlers({ rt }) {
|
|
|
68
68
|
if (environmentDisabled(callerCtx, 'MIXDOG_FEATURE_VISUALIZE')) {
|
|
69
69
|
throw new Error('the visualize tool is disabled in this environment');
|
|
70
70
|
}
|
|
71
|
-
//
|
|
72
|
-
//
|
|
71
|
+
// The Settings toggle at execution time too: it reaches a turn already
|
|
72
|
+
// running and callers outside the session's deny set (an env override
|
|
73
|
+
// wins, as in builtinFeatureActive).
|
|
73
74
|
if (!(featureEnvOverride('MIXDOG_FEATURE_VISUALIZE') ?? moduleEnabled(rt.config, 'visualize', true))) {
|
|
74
75
|
return {
|
|
75
76
|
content: [
|
|
@@ -1,19 +1,13 @@
|
|
|
1
|
-
// Optional feature tools
|
|
2
|
-
//
|
|
1
|
+
// Optional feature tools: office, media and tidy (each loaded on first use;
|
|
2
|
+
// their settings gates apply in the executor), and the setup tool.
|
|
3
3
|
import { standaloneDataDir } from '../runtime-paths.mjs';
|
|
4
4
|
import { createCallerContextResolvers } from './caller-context.mjs';
|
|
5
5
|
|
|
6
|
-
export function createFeatureToolHandlers({ rt, setupTool
|
|
6
|
+
export function createFeatureToolHandlers({ rt, setupTool }) {
|
|
7
7
|
const { sessionIdFor, signalFor } = createCallerContextResolvers(rt);
|
|
8
|
-
const requireEnabled = (callerCtx, enabled, label) => {
|
|
9
|
-
if (callerCtx?.invocationSource === 'model-tool' && !enabled()) {
|
|
10
|
-
throw new Error(`${label} is disabled in settings; start a new session to refresh the tool list`);
|
|
11
|
-
}
|
|
12
|
-
};
|
|
13
8
|
|
|
14
9
|
return {
|
|
15
10
|
office: async (args, { callerCtx, callerCwd }) => {
|
|
16
|
-
requireEnabled(callerCtx, officeToolsEnabled, 'office');
|
|
17
11
|
const { executeOfficeTool } = await import('../../runtime/office/index.mjs');
|
|
18
12
|
return await executeOfficeTool(args, {
|
|
19
13
|
cwd: callerCwd,
|
|
@@ -25,7 +19,6 @@ export function createFeatureToolHandlers({ rt, setupTool, officeToolsEnabled, m
|
|
|
25
19
|
});
|
|
26
20
|
},
|
|
27
21
|
media: async (args, { callerCtx, callerCwd }) => {
|
|
28
|
-
requireEnabled(callerCtx, mediaToolEnabled, 'media');
|
|
29
22
|
const { executeMediaTool } = await import('../../runtime/media/tool.mjs');
|
|
30
23
|
const { getSession } = await import('../../runtime/agent/orchestrator/session/manager/session-crud.mjs');
|
|
31
24
|
// Generation spend is attributed to the calling session in the usage ledger.
|
|
@@ -38,7 +31,6 @@ export function createFeatureToolHandlers({ rt, setupTool, officeToolsEnabled, m
|
|
|
38
31
|
});
|
|
39
32
|
},
|
|
40
33
|
tidy: async (args, { callerCtx, callerCwd }) => {
|
|
41
|
-
requireEnabled(callerCtx, tidyToolEnabled, 'tidy');
|
|
42
34
|
const { executeTidyTool } = await import('../../runtime/tidy/tool.mjs');
|
|
43
35
|
return await executeTidyTool(args, {
|
|
44
36
|
cwd: callerCwd,
|
|
@@ -17,6 +17,7 @@ import { scheduleCallerScope } from '../services/schedule-access.mjs';
|
|
|
17
17
|
import { worktreeCallerScope } from '../services/worktree-access.mjs';
|
|
18
18
|
import { resolveHandoffAttachments, sessionRoots } from '../handoff-attachments.mjs';
|
|
19
19
|
import { delegationChainOf } from '../bot-chain.mjs';
|
|
20
|
+
import { openTodoItems } from '../../runtime/agent/orchestrator/runtime-core/todo-list.mjs';
|
|
20
21
|
import { BOT_TARGET_ACTIONS, resolveBotTarget } from '../bot-target.mjs';
|
|
21
22
|
|
|
22
23
|
const USER_TITLE_ERROR = 'session: the user already titled this session; the title was not changed';
|
|
@@ -322,9 +323,21 @@ export function createWorkspaceToolHandlers({
|
|
|
322
323
|
goal: async (args, { name, callerCtx }) => {
|
|
323
324
|
// A Goal keeps working in its session across turns: a heartbeat's would
|
|
324
325
|
// run on unseen in the hidden session.
|
|
325
|
-
|
|
326
|
+
const action = clean(args?.action).toLowerCase();
|
|
327
|
+
if (action === 'create' && callerIsHeartbeat(callerCtx)) {
|
|
326
328
|
throw new Error(`goal: ${HEARTBEAT_NO_HANDOFF}`);
|
|
327
329
|
}
|
|
330
|
+
// A completion claim with steps still open in the session's own list
|
|
331
|
+
// has not finished the work it recorded.
|
|
332
|
+
const callerSessionId = callerCtx?.callerSessionId || rt.session?.id || null;
|
|
333
|
+
if (action === 'complete' && rt.session?.id === callerSessionId) {
|
|
334
|
+
const open = openTodoItems(rt.session);
|
|
335
|
+
if (open.length) {
|
|
336
|
+
throw new Error(
|
|
337
|
+
`goal: cannot complete with ${open.length} open todo item(s) (${open.map((task) => task.content).join('; ')}); finish them, or drop or block each with its reason`
|
|
338
|
+
);
|
|
339
|
+
}
|
|
340
|
+
}
|
|
328
341
|
return await goalRuntime.executeTool(name, args || {}, {
|
|
329
342
|
callerSessionId: callerCtx?.callerSessionId || rt.session?.id || rt.reservedSessionId || null,
|
|
330
343
|
});
|
|
@@ -335,9 +348,10 @@ export function createWorkspaceToolHandlers({
|
|
|
335
348
|
if (['spawn', 'send'].includes((clean(args?.type) || 'spawn').toLowerCase()) && callerIsHeartbeat(callerCtx)) {
|
|
336
349
|
throw new Error(`agent: ${HEARTBEAT_NO_HANDOFF}`);
|
|
337
350
|
}
|
|
338
|
-
// `attachmentParts`
|
|
339
|
-
// `attachments` reach the agent's turn
|
|
340
|
-
|
|
351
|
+
// `attachmentParts` and `skillSelection` are never the model's to set:
|
|
352
|
+
// only the resolved `attachments` reach the agent's turn, and its skills
|
|
353
|
+
// are selected from its whole prompt.
|
|
354
|
+
const { attachments, attachmentParts: _ignored, skillSelection: _selection, ...rest } = args || {};
|
|
341
355
|
const attachmentParts = callerAttachmentParts(rt, { attachments }, callerCwd, 'agent');
|
|
342
356
|
return await agentTool.execute(attachmentParts.length ? { ...rest, attachmentParts } : rest, {
|
|
343
357
|
callerCwd,
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
* to channel tools.
|
|
7
7
|
*/
|
|
8
8
|
import { clean } from '../runtime/agent/orchestrator/runtime-core/session-text.mjs';
|
|
9
|
+
import { settingDisabledIn } from '../runtime/agent/orchestrator/runtime-core/tool-availability.mjs';
|
|
9
10
|
import { createAskUserToolHandlers } from './internal-tool-executor/ask-user-tool.mjs';
|
|
10
11
|
import { createBridgeToolHandlers } from './internal-tool-executor/bridge-tools.mjs';
|
|
11
12
|
import { createFeatureToolHandlers } from './internal-tool-executor/feature-tools.mjs';
|
|
@@ -19,11 +20,7 @@ export function createInternalToolExecutor({
|
|
|
19
20
|
goalRuntime,
|
|
20
21
|
agentTool,
|
|
21
22
|
setupTool,
|
|
22
|
-
|
|
23
|
-
memoryToolsEnabled,
|
|
24
|
-
officeToolsEnabled,
|
|
25
|
-
mediaToolEnabled,
|
|
26
|
-
tidyToolEnabled = () => true,
|
|
23
|
+
featureDisallowedTools = () => [],
|
|
27
24
|
getWebSearchModule,
|
|
28
25
|
getMemoryModule,
|
|
29
26
|
getCodeGraphModule,
|
|
@@ -42,7 +39,7 @@ export function createInternalToolExecutor({
|
|
|
42
39
|
...createBridgeToolHandlers({ rt }),
|
|
43
40
|
...createAskUserToolHandlers({ rt }),
|
|
44
41
|
...createReactionToolHandlers({ rt }),
|
|
45
|
-
...createFeatureToolHandlers({ rt, setupTool
|
|
42
|
+
...createFeatureToolHandlers({ rt, setupTool }),
|
|
46
43
|
...createKnowledgeToolHandlers({
|
|
47
44
|
rt,
|
|
48
45
|
getWebSearchModule,
|
|
@@ -67,24 +64,20 @@ export function createInternalToolExecutor({
|
|
|
67
64
|
}),
|
|
68
65
|
};
|
|
69
66
|
|
|
70
|
-
//
|
|
71
|
-
//
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
throw new Error('web search is disabled in settings; start a new session to refresh the tool list');
|
|
75
|
-
}
|
|
76
|
-
if ((name === 'memory' || name === 'recall') && !memoryToolsEnabled()) {
|
|
77
|
-
throw new Error(
|
|
78
|
-
'memory tools are disabled in settings; background memory and manual core memory remain available'
|
|
79
|
-
);
|
|
80
|
-
}
|
|
81
|
-
};
|
|
67
|
+
// A model call of a tool a setting turned off is refused at dispatch
|
|
68
|
+
// (tool-exec/dispatch.mjs settingDisabledTool, built-ins such as git
|
|
69
|
+
// included); a model-tool call reaching this executor directly takes the
|
|
70
|
+
// same check against this runtime's live gate list.
|
|
82
71
|
|
|
83
72
|
return async (name, args, callerCtx = {}) => {
|
|
84
73
|
const callerCwd = clean(callerCtx?.callerCwd) || rt.currentCwd;
|
|
85
74
|
// The Reactions setting gates the tool whoever calls it, not only the model.
|
|
86
75
|
if (name === 'react' && rt.config?.reactions === false) throw new Error('reactions are turned off in settings');
|
|
87
|
-
|
|
76
|
+
const disabled =
|
|
77
|
+
callerCtx?.invocationSource === 'model-tool' ? settingDisabledIn(name, featureDisallowedTools()) : null;
|
|
78
|
+
if (disabled) {
|
|
79
|
+
throw new Error(`${disabled} is disabled in settings by the user; do not retry unless the user turns it back on`);
|
|
80
|
+
}
|
|
88
81
|
if (Object.hasOwn(handlers, name)) return handlers[name](args, { name, callerCtx, callerCwd });
|
|
89
82
|
if (channels.isChannelTool(name)) {
|
|
90
83
|
return await channels.execute(name, args || {});
|
|
@@ -35,9 +35,16 @@ const SOURCE_RUNTIME_FIELDS = [
|
|
|
35
35
|
'toolApprovalHook',
|
|
36
36
|
'_providerPrefixGuardState',
|
|
37
37
|
'activeTurnCheckpoint',
|
|
38
|
+
// The source's durable transcript identity (store/transcript-durability.mjs).
|
|
39
|
+
'transcriptEpoch',
|
|
40
|
+
'turnCoverage',
|
|
38
41
|
'deferredInitialRefreshPending',
|
|
39
42
|
'pendingGoalReminder',
|
|
40
43
|
'goalReminderRevision',
|
|
44
|
+
'goalStalledNotice',
|
|
45
|
+
// The source's own step list and its reminder cycle.
|
|
46
|
+
'todo',
|
|
47
|
+
'todoCheck',
|
|
41
48
|
'pendingCacheBreakIntent',
|
|
42
49
|
'contextPressureUnanchoredAfterRestart',
|
|
43
50
|
'contextPressureUnanchoredReason',
|
|
@@ -4,9 +4,9 @@
|
|
|
4
4
|
*/
|
|
5
5
|
const INGEST_DEADLINE_MS = 2500;
|
|
6
6
|
|
|
7
|
-
// Sessions that never compacted
|
|
8
|
-
//
|
|
9
|
-
//
|
|
7
|
+
// Sessions that never compacted have no session-sourced rows unless ingested
|
|
8
|
+
// here, and recall could not reconstruct the most recent conversations
|
|
9
|
+
// without them. Deadline-capped: the row inserts are fast
|
|
10
10
|
// and committed even if the bounded wait elapses during the trailing
|
|
11
11
|
// embedding flush (the raw-embedding backlog sweep embeds them later). Never
|
|
12
12
|
// loads the memory runtime just for this — a null module promise means
|
|
@@ -14,6 +14,7 @@ import {
|
|
|
14
14
|
import { SESSION_ID_PATTERN, closeManagedSession } from '../shared.mjs';
|
|
15
15
|
import { replacementSessionCwd } from '../../workspace/workspace-state.mjs';
|
|
16
16
|
import { isHistoricalAutomaticClosure } from '../../../runtime/agent/orchestrator/session/historical-session-closure.mjs';
|
|
17
|
+
import { readSessionSidebarState } from '../../../runtime/shared/session-sidebar-host.mjs';
|
|
17
18
|
|
|
18
19
|
export function createSessionDelete(deps, { cancelBackgroundTasks }) {
|
|
19
20
|
const {
|
|
@@ -38,12 +39,13 @@ export function createSessionDelete(deps, { cancelBackgroundTasks }) {
|
|
|
38
39
|
// Availability is one strict read of the session's own file, filtered like
|
|
39
40
|
// the session catalog (an unreadable, foreign, closed or non-catalogued
|
|
40
41
|
// record is not deletable). No catalog rebuild, no folder scan.
|
|
41
|
-
function
|
|
42
|
+
function availableRecord(sessionId) {
|
|
42
43
|
const stored = _storedSessionFromFile(getStoreDir(), `${sessionId}.json`);
|
|
43
|
-
if (!stored || stored === STORED_SESSION_UNREADABLE) return
|
|
44
|
-
if (stored.closed === true && !isHistoricalAutomaticClosure(stored)) return
|
|
45
|
-
return leadSessionRow(stored) !== null;
|
|
44
|
+
if (!stored || stored === STORED_SESSION_UNREADABLE) return null;
|
|
45
|
+
if (stored.closed === true && !isHistoricalAutomaticClosure(stored)) return null;
|
|
46
|
+
return leadSessionRow(stored) !== null ? stored : null;
|
|
46
47
|
}
|
|
48
|
+
const isAvailableSession = (sessionId) => availableRecord(sessionId) !== null;
|
|
47
49
|
|
|
48
50
|
// The deleted task's worktree: the autoCleanup setting decides (clean and
|
|
49
51
|
// merged → removed; otherwise kept). Off the deletion path; never fails it.
|
|
@@ -102,5 +104,51 @@ export function createSessionDelete(deps, { cancelBackgroundTasks }) {
|
|
|
102
104
|
return true;
|
|
103
105
|
}
|
|
104
106
|
|
|
105
|
-
|
|
107
|
+
/**
|
|
108
|
+
* The desktop's auto-delete of an archived session: only one that is still
|
|
109
|
+
* archived, not a favorite, idle (no turn running, waiting for its ask lock
|
|
110
|
+
* or queued) and unchanged since the caller looked (`expected.lastUsedAt`,
|
|
111
|
+
* which every turn moves). It holds the session's ask lock, which every
|
|
112
|
+
* turn takes, and runs its last checks, the close and the delete in one
|
|
113
|
+
* synchronous stretch, so no turn can start in between. A refusal closes
|
|
114
|
+
* and deletes nothing: `{ deleted: false, reason }`. `isHostedBusy` (the
|
|
115
|
+
* session service) reports queued input in a runtime hosting the session.
|
|
116
|
+
*/
|
|
117
|
+
async function deleteSessionIfIdle(id, expected = {}, { isHostedBusy = null } = {}) {
|
|
118
|
+
const sessionId = clean(id);
|
|
119
|
+
const refuse = (reason) => ({ deleted: false, reason });
|
|
120
|
+
if (!sessionId || !SESSION_ID_PATTERN.test(sessionId)) return refuse('invalid');
|
|
121
|
+
if (typeof isHostedBusy !== 'function') return refuse('unguarded');
|
|
122
|
+
if (getSession()?.id === sessionId) return refuse('current');
|
|
123
|
+
const unlock = mgr.tryAcquireSessionLock(sessionId);
|
|
124
|
+
if (!unlock) return refuse('busy');
|
|
125
|
+
try {
|
|
126
|
+
// The archive and favorite flags are the desktop's.
|
|
127
|
+
const sidebar = await readSessionSidebarState();
|
|
128
|
+
if (!sidebar || !Object.hasOwn(sidebar.archived ?? {}, sessionId)) return refuse('not-archived');
|
|
129
|
+
if (Object.hasOwn(sidebar.favorites ?? {}, sessionId)) return refuse('favorite');
|
|
130
|
+
// From here to the delete: synchronous.
|
|
131
|
+
if (mgr.sessionLockContended(sessionId)) return refuse('turn-waiting');
|
|
132
|
+
if (mgr.isSessionTurnInFlight(sessionId) || mgr.hasUnsettledTurn(sessionId)) return refuse('busy');
|
|
133
|
+
if (mgr.hasPendingMessages(sessionId) || isHostedBusy(sessionId)) return refuse('queued');
|
|
134
|
+
const stored = availableRecord(sessionId);
|
|
135
|
+
if (!stored) return refuse('missing');
|
|
136
|
+
if ((Number(stored.lastUsedAt) || 0) !== (Number(expected?.lastUsedAt) || 0)) return refuse('changed');
|
|
137
|
+
const reason = 'desktop-auto-delete';
|
|
138
|
+
// The blocking close: its barrier lands before this stretch yields.
|
|
139
|
+
if (closeManagedSession(mgr, sessionId, reason, { tombstone: false }, false) !== true) {
|
|
140
|
+
return refuse('close-failed');
|
|
141
|
+
}
|
|
142
|
+
agentTool?.forgetLeadSession?.(sessionId);
|
|
143
|
+
releaseSessionWork(sessionId, reason);
|
|
144
|
+
if (mgr.deleteSession(sessionId, { fenceWrites: true }) !== true) return refuse('delete-failed');
|
|
145
|
+
void forgetSessionSearch(sessionId);
|
|
146
|
+
void releaseDeletedWorktree(sessionId);
|
|
147
|
+
return { deleted: true };
|
|
148
|
+
} finally {
|
|
149
|
+
unlock();
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
return { releaseSessionWork, deleteSession, deleteSessionIfIdle };
|
|
106
154
|
}
|
|
@@ -15,7 +15,9 @@ export { resolveResumeCwd } from './session-switch/resume.mjs';
|
|
|
15
15
|
|
|
16
16
|
export function createSessionSwitching(deps, { ingestSessionIntoMemory, closeSurfaceSession, cancelBackgroundTasks }) {
|
|
17
17
|
const { mgr, getMode } = deps;
|
|
18
|
-
const { releaseSessionWork, deleteSession } = createSessionDelete(deps, {
|
|
18
|
+
const { releaseSessionWork, deleteSession, deleteSessionIfIdle } = createSessionDelete(deps, {
|
|
19
|
+
cancelBackgroundTasks,
|
|
20
|
+
});
|
|
19
21
|
const { switchContext, newSession } = createContextSwitch(deps, {
|
|
20
22
|
ingestSessionIntoMemory,
|
|
21
23
|
closeSurfaceSession,
|
|
@@ -41,5 +43,14 @@ export function createSessionSwitching(deps, { ingestSessionIntoMemory, closeSur
|
|
|
41
43
|
return mgr.prefetchSession?.(id, toolSpecForMode(getMode())) === true;
|
|
42
44
|
}
|
|
43
45
|
|
|
44
|
-
return {
|
|
46
|
+
return {
|
|
47
|
+
listSessions,
|
|
48
|
+
sessionStoreDir,
|
|
49
|
+
deleteSession,
|
|
50
|
+
deleteSessionIfIdle,
|
|
51
|
+
switchContext,
|
|
52
|
+
newSession,
|
|
53
|
+
prefetchSession,
|
|
54
|
+
resume,
|
|
55
|
+
};
|
|
45
56
|
}
|
|
@@ -35,10 +35,10 @@ export async function dispatchSessionEnd(deps, reason) {
|
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
37
|
|
|
38
|
-
// Runtime stop/exit (TUI Ctrl-C, process exit)
|
|
39
|
-
//
|
|
40
|
-
//
|
|
41
|
-
// tombstone
|
|
38
|
+
// Runtime stop/exit (TUI Ctrl-C, process exit) must not tombstone a session
|
|
39
|
+
// you were mid-conversation in: it would vanish from the Resume list the
|
|
40
|
+
// instant you quit and be hard-deleted by the 24h tombstone sweep. Only
|
|
41
|
+
// tombstone truly-empty scratch sessions.
|
|
42
42
|
export function closeOwnSession(deps, closeSurfaceSession, reason) {
|
|
43
43
|
const {
|
|
44
44
|
getSession,
|
|
@@ -38,6 +38,7 @@ export function createLifecycleApi(deps) {
|
|
|
38
38
|
listSessions: switching.listSessions,
|
|
39
39
|
sessionStoreDir: switching.sessionStoreDir,
|
|
40
40
|
deleteSession: switching.deleteSession,
|
|
41
|
+
deleteSessionIfIdle: switching.deleteSessionIfIdle,
|
|
41
42
|
switchContext: switching.switchContext,
|
|
42
43
|
newSession: switching.newSession,
|
|
43
44
|
prefetchSession: switching.prefetchSession,
|
|
@@ -4,12 +4,16 @@
|
|
|
4
4
|
import { clean } from '../../runtime/agent/orchestrator/runtime-core/session-text.mjs';
|
|
5
5
|
import {
|
|
6
6
|
connectorAccountEnabled,
|
|
7
|
+
connectorAccountId,
|
|
7
8
|
connectorAccountServer,
|
|
8
9
|
connectorAccountsOf,
|
|
9
10
|
connectorOfServer,
|
|
10
11
|
gmailAppPasswordAccount,
|
|
11
12
|
} from '../../runtime/shared/connector-catalog.mjs';
|
|
12
|
-
import {
|
|
13
|
+
import {
|
|
14
|
+
connectorAccountHealth,
|
|
15
|
+
connectorAccountInUseRecord,
|
|
16
|
+
} from '../../runtime/connectors/connector-accounts-mcp.mjs';
|
|
13
17
|
import { googleOAuthClient } from '../../runtime/shared/google-oauth-client.mjs';
|
|
14
18
|
import { envFlag } from '../../runtime/shared/env.mjs';
|
|
15
19
|
import { resolveMcpServerCatalog } from './plugin-servers.mjs';
|
|
@@ -158,8 +162,15 @@ export function createMcpServerCatalog({
|
|
|
158
162
|
const stored = entry.owner ? [] : connectorAccountsOf(cfg);
|
|
159
163
|
// The connector's last-used account (none when that one was removed),
|
|
160
164
|
// else its topmost switched-on one.
|
|
161
|
-
|
|
162
|
-
|
|
165
|
+
// A record names an account only while that account is still it (a new
|
|
166
|
+
// account given a removed one's name is not).
|
|
167
|
+
const record = stored.length ? connectorAccountInUseRecord(connectorOfServer(cfg)) : null;
|
|
168
|
+
const recorded = record
|
|
169
|
+
? stored.find(
|
|
170
|
+
(account) => account.name === record.name && record.id && connectorAccountId(cfg, account) === record.id
|
|
171
|
+
)?.name
|
|
172
|
+
: '';
|
|
173
|
+
const inUse = record ? recorded : stored.find(connectorAccountEnabled)?.name;
|
|
163
174
|
const accounts = stored.map((account) =>
|
|
164
175
|
accountRow(connectorAccountServer(cfg, account), connectorAccountEnabled(account), account.name === inUse)
|
|
165
176
|
);
|
|
@@ -18,20 +18,23 @@ export function createServerConnection({
|
|
|
18
18
|
// change never triggers a full disconnectAll()/reconnect freeze. Only an
|
|
19
19
|
// explicit sign-in passes `login` ({ openBrowser }): every other connect is
|
|
20
20
|
// non-interactive and reports a server that needs one as sign-in required.
|
|
21
|
+
// Answers the connect's failure (recorded in state.mcpFailures), null once
|
|
22
|
+
// it connected or disconnected. The server's fingerprint is recorded only
|
|
23
|
+
// once it connected, so one that failed is connected again by the next
|
|
24
|
+
// reconcile although its config is unchanged.
|
|
21
25
|
async function applyMcpServerConnection(name, enabled, servers = resolveEffectiveMcpServers().servers, login = null) {
|
|
22
26
|
const target = clean(name);
|
|
23
|
-
if (!target) return;
|
|
27
|
+
if (!target) return null;
|
|
24
28
|
// Changing this server's state clears any stale failure record for it.
|
|
25
29
|
if (Array.isArray(state.mcpFailures)) {
|
|
26
30
|
state.mcpFailures = state.mcpFailures.filter((row) => row.name !== target);
|
|
27
31
|
}
|
|
28
32
|
const cfg = servers[target];
|
|
33
|
+
applied().delete(target);
|
|
29
34
|
if (enabled === false || !cfg || cfg.enabled === false) {
|
|
30
|
-
applied().delete(target);
|
|
31
35
|
await mcpClient.disconnectMcpServer?.(target, scopeOptions());
|
|
32
|
-
return;
|
|
36
|
+
return null;
|
|
33
37
|
}
|
|
34
|
-
applied().set(target, fingerprint(cfg));
|
|
35
38
|
// Close-then-connect as one generation-guarded op: a shutdown landing
|
|
36
39
|
// between the close and the connect never resurrects the server.
|
|
37
40
|
try {
|
|
@@ -42,29 +45,52 @@ export function createServerConnection({
|
|
|
42
45
|
cfg,
|
|
43
46
|
login ? { interactive: true, openBrowser: login.openBrowser } : {}
|
|
44
47
|
);
|
|
48
|
+
applied().set(target, fingerprint(cfg));
|
|
49
|
+
return null;
|
|
45
50
|
} catch (error) {
|
|
46
51
|
const failure = { name: target, msg: error?.message || String(error) };
|
|
47
52
|
if (error?.authRequired) failure.authRequired = true;
|
|
48
53
|
const failures = Array.isArray(error?.failures) ? error.failures : [failure];
|
|
49
54
|
state.mcpFailures = [...(state.mcpFailures || []), ...failures];
|
|
55
|
+
return failure;
|
|
50
56
|
}
|
|
51
57
|
}
|
|
52
58
|
|
|
53
59
|
// Bring the registry in line with the effective set: drop servers that are
|
|
54
60
|
// gone or disabled, (re)connect servers that are new or whose resolved
|
|
55
|
-
// config changed; untouched servers keep their connection.
|
|
61
|
+
// config changed; untouched servers keep their connection. A server whose
|
|
62
|
+
// last connect failed is retried too (one the full connect recorded as
|
|
63
|
+
// connected included): reconcile also runs when a sign-in or a stored
|
|
64
|
+
// credential changed (possibly in another process), which leaves its
|
|
65
|
+
// config, and so its fingerprint, as it was; so is a connection the client
|
|
66
|
+
// reports dead. Answers the failures of this run that are not a needed
|
|
67
|
+
// sign-in (that waits on the user, whose sign-in reconciles again); they
|
|
68
|
+
// stay in the status, which the change step checks to retry them.
|
|
56
69
|
async function reconcileServers() {
|
|
57
70
|
syncScopeRoot();
|
|
58
71
|
const { servers } = resolveEffectiveMcpServers();
|
|
59
72
|
const known = applied();
|
|
60
|
-
const
|
|
73
|
+
const dead = (mcpClient.getMcpServerStatus?.(getMcpScopeId()) || [])
|
|
74
|
+
.filter((row) => row.alive === false || row.connected === false)
|
|
75
|
+
.map((row) => row.name);
|
|
76
|
+
const failed = new Set([
|
|
77
|
+
...(Array.isArray(state.mcpFailures) ? state.mcpFailures : []).map((row) => row.name),
|
|
78
|
+
...dead,
|
|
79
|
+
]);
|
|
80
|
+
const drops = [...new Set([...known.keys(), ...failed])].filter(
|
|
81
|
+
(name) => !servers[name] || servers[name].enabled === false
|
|
82
|
+
);
|
|
61
83
|
const connects = Object.entries(servers)
|
|
62
|
-
.filter(([name, cfg]) => cfg?.enabled !== false && known.get(name) !== fingerprint(cfg))
|
|
84
|
+
.filter(([name, cfg]) => cfg?.enabled !== false && (known.get(name) !== fingerprint(cfg) || failed.has(name)))
|
|
63
85
|
.map(([name]) => name);
|
|
64
|
-
await Promise.allSettled([
|
|
86
|
+
const results = await Promise.allSettled([
|
|
65
87
|
...drops.map((name) => applyMcpServerConnection(name, false, servers)),
|
|
66
88
|
...connects.map((name) => applyMcpServerConnection(name, true, servers)),
|
|
67
89
|
]);
|
|
90
|
+
return results.flatMap((one) => {
|
|
91
|
+
if (one.status === 'rejected') return [{ msg: one.reason?.message || String(one.reason) }];
|
|
92
|
+
return one.value && !one.value.authRequired ? [one.value] : [];
|
|
93
|
+
});
|
|
68
94
|
}
|
|
69
95
|
|
|
70
96
|
return { applyMcpServerConnection, reconcileServers };
|
|
@@ -4,9 +4,12 @@
|
|
|
4
4
|
* fast/effort tuning of a session that runs on the selected route.
|
|
5
5
|
*/
|
|
6
6
|
import { saveModelSettings } from '../../runtime/agent/orchestrator/runtime-core/model-capabilities.mjs';
|
|
7
|
+
import { OPENROUTER_SORT_PARAMETER } from '../../runtime/agent/orchestrator/providers/openrouter-provider-routing.mjs';
|
|
7
8
|
import { writeStatuslineRoute } from '../statusline-route.mjs';
|
|
8
9
|
import { sessionUsesRoute } from '../../runtime/agent/orchestrator/runtime-core/session-route-policy.mjs';
|
|
9
10
|
|
|
11
|
+
const TUNED_PARAMETERS = ['serviceTier', OPENROUTER_SORT_PARAMETER];
|
|
12
|
+
|
|
10
13
|
/** Re-tuning the live model (effort, Fast, context, or re-picking it) is not a
|
|
11
14
|
* main-model choice: new tasks keep their main model unless it is that model. */
|
|
12
15
|
function tunesNonMainModel(liveRoute, route, mainRoute) {
|
|
@@ -57,10 +60,15 @@ export function createRoutePersistence(deps) {
|
|
|
57
60
|
if (route.autoEffort === false) session.autoEffort = false;
|
|
58
61
|
else delete session.autoEffort;
|
|
59
62
|
session.effort = route.effectiveEffort || null;
|
|
60
|
-
// The request path reads session.modelParameters; keep only
|
|
61
|
-
|
|
62
|
-
const
|
|
63
|
-
|
|
63
|
+
// The request path reads session.modelParameters; keep only the tuned
|
|
64
|
+
// parameters (serviceTier, OpenRouter's providerSort) in step.
|
|
65
|
+
const otherParameters = { ...(session.modelParameters || {}) };
|
|
66
|
+
for (const key of TUNED_PARAMETERS) {
|
|
67
|
+
delete otherParameters[key];
|
|
68
|
+
const value = route.modelParameters?.[key];
|
|
69
|
+
if (value) otherParameters[key] = value;
|
|
70
|
+
}
|
|
71
|
+
session.modelParameters = otherParameters;
|
|
64
72
|
writeStatuslineRoute(statusRoutes, session, route);
|
|
65
73
|
invalidateContextStatusCache();
|
|
66
74
|
},
|