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
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
// The model-facing `todo` step list. Its description is the only guidance the
|
|
2
|
+
// model gets about it: nothing is added to the system prompt or rules.
|
|
3
|
+
export const TODO_OPS = Object.freeze(['init', 'start', 'done', 'drop', 'block', 'unblock', 'append', 'rm', 'view']);
|
|
4
|
+
export const TODO_STATUSES = Object.freeze(['pending', 'in_progress', 'completed', 'abandoned', 'blocked']);
|
|
5
|
+
export const MAX_TODO_ITEMS = 50;
|
|
6
|
+
export const MAX_TODO_TEXT_LENGTH = 200;
|
|
7
|
+
|
|
8
|
+
const itemList = { type: 'array', items: { type: 'string' }, minItems: 1, maxItems: MAX_TODO_ITEMS };
|
|
9
|
+
|
|
10
|
+
export const TODO_TOOL = Object.freeze({
|
|
11
|
+
name: 'todo',
|
|
12
|
+
title: 'Todo',
|
|
13
|
+
annotations: {
|
|
14
|
+
title: 'Todo',
|
|
15
|
+
readOnlyHint: false,
|
|
16
|
+
destructiveHint: false,
|
|
17
|
+
idempotentHint: false,
|
|
18
|
+
openWorldHint: false,
|
|
19
|
+
agentHidden: false,
|
|
20
|
+
},
|
|
21
|
+
description:
|
|
22
|
+
'The step list for this request; the Lead and each agent keep their own. Use it whenever the work has three or more steps or several asks (a delegated brief with several parts counts); skip it only for a single step or a plain answer. Create it before the first real action: init with every ask as its own item, in order, covering investigation through verification. A follow-up that adds to the request: append its asks and any steps you discover; init is for a new, unrelated request and refuses while items are open. An item is named by its outcome in 3-8 words and keeps that exact wording; it is how you refer to it — lost the wording: view, never guess. Keep it current while you work, not at the end: the moment an item is finished and its result is read, mark it done with your next call — never batch completions. The runtime keeps exactly one item in progress; done moves it to the next. Send todo beside your next real tool call; when no real call is due, call it alone rather than skip the update. Waiting on the user, an agent or a shell: block it with a reason; unblock when it can move; done only after reading the result.',
|
|
23
|
+
inputSchema: {
|
|
24
|
+
type: 'object',
|
|
25
|
+
properties: {
|
|
26
|
+
op: { type: 'string', enum: TODO_OPS },
|
|
27
|
+
items: { ...itemList, description: 'init (one default phase) / append: item wordings.' },
|
|
28
|
+
phases: {
|
|
29
|
+
type: 'array',
|
|
30
|
+
minItems: 1,
|
|
31
|
+
items: {
|
|
32
|
+
type: 'object',
|
|
33
|
+
properties: { name: { type: 'string' }, items: itemList },
|
|
34
|
+
required: ['name', 'items'],
|
|
35
|
+
additionalProperties: false,
|
|
36
|
+
},
|
|
37
|
+
description: 'init: named phases instead of items.',
|
|
38
|
+
},
|
|
39
|
+
item: { type: 'string', description: 'start/done/drop/block/unblock/rm: exact item wording.' },
|
|
40
|
+
phase: { type: 'string', description: 'append: target phase (default last; new name adds one).' },
|
|
41
|
+
note: { type: 'string', description: 'done: optional one-line evidence.' },
|
|
42
|
+
reason: { type: 'string', description: 'block: what it waits on.' },
|
|
43
|
+
},
|
|
44
|
+
required: ['op'],
|
|
45
|
+
additionalProperties: false,
|
|
46
|
+
},
|
|
47
|
+
});
|
|
@@ -0,0 +1,155 @@
|
|
|
1
|
+
// Settings-gated tool availability for a live session. A session records the
|
|
2
|
+
// gates it was built with in `disallowedTools`; when a gate moves, a
|
|
3
|
+
// conversation is never re-prefixed: an opened tool joins the late deferred
|
|
4
|
+
// catalog (deferredLateToolCatalog — never the boot catalog, whose bytes a
|
|
5
|
+
// native request keeps) and a closed one joins the enforced deny set. The next
|
|
6
|
+
// prompt's deferred_tools_delta names both, and the prompt is folded at the
|
|
7
|
+
// next cache-cold point (promptFoldPending).
|
|
8
|
+
import { clean } from './session-text.mjs';
|
|
9
|
+
import { FEATURE_GATED_TOOL_NAMES, SETTING_GATED_TOOL_NAMES, featureDisallowedToolsFor } from './builtin-features.mjs';
|
|
10
|
+
import { mergePendingDeferredToolDelta } from './deferred-tool-delta.mjs';
|
|
11
|
+
import { sessionAllowlistExcludes } from './deferred-tool-availability.mjs';
|
|
12
|
+
import { isAgentOwner } from '../agent-owner.mjs';
|
|
13
|
+
import { agentMcpToolPermission, connectorPolicyAgentOf, projectMcpToolDisabled } from '../mcp/agent-connectors.mjs';
|
|
14
|
+
import { reactionDisabled } from '../session/manager/session-tool-surface.mjs';
|
|
15
|
+
import { browserBridgeAvailableSync } from '../../../browser-bridge/client.mjs';
|
|
16
|
+
import { computerBridgeAvailableSync } from '../../../computer-bridge/client.mjs';
|
|
17
|
+
import { terminalBridgeAvailableSync } from '../../../terminal-bridge/client.mjs';
|
|
18
|
+
|
|
19
|
+
const GATED = new Set(FEATURE_GATED_TOOL_NAMES);
|
|
20
|
+
const SETTING_GATED = new Set(SETTING_GATED_TOOL_NAMES);
|
|
21
|
+
// web_fetch keeps its gate under the transports it is routed to (pre-dispatch-deny.mjs).
|
|
22
|
+
const FETCH_TRANSPORTS = new Set(['local_fetch', 'image_fetch']);
|
|
23
|
+
|
|
24
|
+
// MCP scope → the live gate list of the session runtime serving it.
|
|
25
|
+
const liveGateSources = new Map();
|
|
26
|
+
|
|
27
|
+
/** A session runtime's live gate list (its in-memory settings) for model
|
|
28
|
+
* calls in its MCP scope. Returns the unregister function. */
|
|
29
|
+
export function registerLiveFeatureGates(scopeId, featureDisallowedTools) {
|
|
30
|
+
const key = scopeId ?? null;
|
|
31
|
+
liveGateSources.set(key, featureDisallowedTools);
|
|
32
|
+
return () => {
|
|
33
|
+
if (liveGateSources.get(key) === featureDisallowedTools) liveGateSources.delete(key);
|
|
34
|
+
};
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
/**
|
|
38
|
+
* The setting that turns off `name` right now, or null. A session's deny set
|
|
39
|
+
* takes moved gates at its next turn start; this covers a turn already
|
|
40
|
+
* running when a setting changed.
|
|
41
|
+
*/
|
|
42
|
+
export function settingDisabledTool(name, scopeId) {
|
|
43
|
+
const source = liveGateSources.get(scopeId ?? null);
|
|
44
|
+
return typeof source === 'function' ? settingDisabledIn(name, source()) : null;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
/** The setting of the live gate list `denied` that turns off `name`, or null. */
|
|
48
|
+
export function settingDisabledIn(name, denied) {
|
|
49
|
+
const gated = FETCH_TRANSPORTS.has(name) ? 'web_fetch' : name;
|
|
50
|
+
return SETTING_GATED.has(gated) && (denied || []).includes(gated) ? gated : null;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
/** The feature gates as they stand: `config` plus live desktop-bridge presence. */
|
|
54
|
+
export function liveFeatureDisallowedTools(config, { toolProfile } = {}) {
|
|
55
|
+
return featureDisallowedToolsFor(config, {
|
|
56
|
+
browserAvailable: browserBridgeAvailableSync(),
|
|
57
|
+
computerAvailable: computerBridgeAvailableSync(),
|
|
58
|
+
terminalAvailable: terminalBridgeAvailableSync(),
|
|
59
|
+
toolProfile,
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
function knownTools(session) {
|
|
64
|
+
const known = new Map();
|
|
65
|
+
for (const key of ['tools', 'deferredToolCatalog', 'deferredLateToolCatalog']) {
|
|
66
|
+
for (const tool of Array.isArray(session?.[key]) ? session[key] : []) {
|
|
67
|
+
const name = clean(tool?.name);
|
|
68
|
+
if (name && !known.has(name)) known.set(name, tool);
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
return known;
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
/**
|
|
75
|
+
* Bring `session`'s settings-gated tools to `featureDenied` (the live gate
|
|
76
|
+
* list) without touching its request prefix. `definitionsFor(names)` supplies
|
|
77
|
+
* definitions for opened tools the session never held. Returns
|
|
78
|
+
* `{ added, removed }` when a gate moved, else null.
|
|
79
|
+
*/
|
|
80
|
+
export function stageToolAvailability(session, featureDenied, definitionsFor = () => []) {
|
|
81
|
+
if (!session || !Array.isArray(session.tools)) return null;
|
|
82
|
+
const live = new Set((featureDenied || []).map(String).filter((name) => GATED.has(name)));
|
|
83
|
+
session.featureDeniedTools = [...live].sort();
|
|
84
|
+
const disallowed = (session.disallowedTools || []).map(String);
|
|
85
|
+
const denied = new Set(disallowed);
|
|
86
|
+
// Denials that are not settings: the caller's, and react outside a bot chat.
|
|
87
|
+
const fixed = new Set((session.callerDisallowedTools || []).map(String));
|
|
88
|
+
if (reactionDisabled(session, isAgentOwner(session))) fixed.add('react');
|
|
89
|
+
const closed = [...live].filter((name) => !denied.has(name));
|
|
90
|
+
const opened = disallowed.filter((name) => GATED.has(name) && !live.has(name) && !fixed.has(name));
|
|
91
|
+
if (!closed.length && !opened.length) return null;
|
|
92
|
+
const known = knownTools(session);
|
|
93
|
+
const missing = opened.filter((name) => !known.has(name));
|
|
94
|
+
const fresh = missing.length
|
|
95
|
+
? (definitionsFor(missing) || []).filter((tool) => missing.includes(clean(tool?.name)))
|
|
96
|
+
: [];
|
|
97
|
+
for (const tool of fresh) {
|
|
98
|
+
if (!known.has(clean(tool.name))) known.set(clean(tool.name), tool);
|
|
99
|
+
}
|
|
100
|
+
if (fresh.length) {
|
|
101
|
+
session.deferredLateToolCatalog = [...(session.deferredLateToolCatalog || []), ...fresh];
|
|
102
|
+
}
|
|
103
|
+
const openedSet = new Set(opened);
|
|
104
|
+
session.disallowedTools = [...disallowed.filter((name) => !openedSet.has(name)), ...closed];
|
|
105
|
+
const visible = (name) => known.has(name) && !sessionAllowlistExcludes(session, name);
|
|
106
|
+
const added = opened.filter(visible);
|
|
107
|
+
const removed = closed.filter(visible);
|
|
108
|
+
mergePendingDeferredToolDelta(session, {
|
|
109
|
+
added: added.map((name) => ({ name, description: known.get(name)?.description || '' })),
|
|
110
|
+
removed,
|
|
111
|
+
});
|
|
112
|
+
// A delegated worker is never folded (agent-profile-fold.mjs): its opened
|
|
113
|
+
// tools are re-announced after a compaction instead (rearmLateDeferredTools).
|
|
114
|
+
if (!isAgentOwner(session)) session.promptFoldPending = true;
|
|
115
|
+
session.updatedAt = Date.now();
|
|
116
|
+
return { added, removed };
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
// The connector tools among the session's known tools that its agent's
|
|
120
|
+
// connector policy and its project's connector switches let it run now.
|
|
121
|
+
function permittedConnectorTools(session, known) {
|
|
122
|
+
const agent = connectorPolicyAgentOf(session);
|
|
123
|
+
return [...known.keys()]
|
|
124
|
+
.filter(
|
|
125
|
+
(name) =>
|
|
126
|
+
name.startsWith('mcp__') &&
|
|
127
|
+
agentMcpToolPermission(agent, name) !== 'disabled' &&
|
|
128
|
+
!projectMcpToolDisabled(session, name)
|
|
129
|
+
)
|
|
130
|
+
.sort();
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
/**
|
|
134
|
+
* Connector switches (an agent's policy, a project's connector off/on) gate
|
|
135
|
+
* MCP tools at call time (pre-dispatch-deny.mjs); this tells the model. The
|
|
136
|
+
* first call records the baseline; later moves join the deferred_tools_delta.
|
|
137
|
+
* Returns `{ added, removed }` when the permitted set moved, else null.
|
|
138
|
+
*/
|
|
139
|
+
export function stageConnectorAvailability(session) {
|
|
140
|
+
if (!session || !Array.isArray(session.tools)) return null;
|
|
141
|
+
const known = knownTools(session);
|
|
142
|
+
const permitted = permittedConnectorTools(session, known);
|
|
143
|
+
const previous = session.agentConnectorTools;
|
|
144
|
+
session.agentConnectorTools = permitted;
|
|
145
|
+
if (!Array.isArray(previous)) return null;
|
|
146
|
+
const added = permitted.filter((name) => !previous.includes(name));
|
|
147
|
+
const removed = previous.filter((name) => !permitted.includes(name));
|
|
148
|
+
if (!added.length && !removed.length) return null;
|
|
149
|
+
mergePendingDeferredToolDelta(session, {
|
|
150
|
+
added: added.map((name) => ({ name, description: known.get(name)?.description || '' })),
|
|
151
|
+
removed,
|
|
152
|
+
});
|
|
153
|
+
session.updatedAt = Date.now();
|
|
154
|
+
return { added, removed };
|
|
155
|
+
}
|
|
@@ -45,6 +45,11 @@ export const DEFERRED_DEFAULT_FULL_TOOLS = Object.freeze([
|
|
|
45
45
|
'read',
|
|
46
46
|
'edit',
|
|
47
47
|
'apply_patch',
|
|
48
|
+
// Loaded up front so looking something up never costs a load_tool hop;
|
|
49
|
+
// web_fetch stays deferred (it usually follows a search).
|
|
50
|
+
'web_search',
|
|
51
|
+
// Every session's own step list: always loaded, never a load_tool hop.
|
|
52
|
+
'todo',
|
|
48
53
|
'Skill',
|
|
49
54
|
'load_tool',
|
|
50
55
|
]);
|
|
@@ -55,6 +60,8 @@ export const DEFERRED_DEFAULT_READONLY_TOOLS = Object.freeze([
|
|
|
55
60
|
'grep',
|
|
56
61
|
'code_graph',
|
|
57
62
|
'read',
|
|
63
|
+
'web_search',
|
|
64
|
+
'todo',
|
|
58
65
|
'Skill',
|
|
59
66
|
'load_tool',
|
|
60
67
|
]);
|
|
@@ -83,6 +90,8 @@ export const DEFERRED_DEFAULT_LEAD_TOOLS = Object.freeze([
|
|
|
83
90
|
// A bot's reaction, likewise: only a bot's chat with the user has it at all
|
|
84
91
|
// (session-tool-surface.mjs reactionDisabled).
|
|
85
92
|
'react',
|
|
93
|
+
'web_search',
|
|
94
|
+
'todo',
|
|
86
95
|
'Skill',
|
|
87
96
|
'load_tool',
|
|
88
97
|
]);
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
// Deferred-tool catalog: measured-usage ordering, kind/bucket classification,
|
|
2
2
|
// tool_search ranking + auto-selection, and the session tool-surface
|
|
3
3
|
// application/selection logic. Pure module (session objects passed in).
|
|
4
|
+
import { createHash } from 'node:crypto';
|
|
4
5
|
import { clean } from './session-text.mjs';
|
|
5
|
-
import { mergePendingDeferredToolDelta } from './deferred-tool-delta.mjs';
|
|
6
|
+
import { dropPendingDeferredToolAdds, mergePendingDeferredToolDelta } from './deferred-tool-delta.mjs';
|
|
7
|
+
import { isAgentOwner } from '../agent-owner.mjs';
|
|
6
8
|
import { applyInitialDeferredToolManifestToBp2 } from '../context/collect.mjs';
|
|
7
9
|
import {
|
|
8
10
|
listedDeferredToolNames,
|
|
@@ -12,7 +14,11 @@ import {
|
|
|
12
14
|
import { parseMcpToolName } from '../../../shared/tool-primitives.mjs';
|
|
13
15
|
import { getMcpServerInstructionsMap, getMcpTools, getMcpToolGeneration } from '../mcp/client.mjs';
|
|
14
16
|
import { filterMcpToolsForSession } from './extension-scopes.mjs';
|
|
15
|
-
import {
|
|
17
|
+
import {
|
|
18
|
+
isDeferredToolAvailable,
|
|
19
|
+
isToolPermittedBySessionPolicy,
|
|
20
|
+
sessionFeatureDenies,
|
|
21
|
+
} from './deferred-tool-availability.mjs';
|
|
16
22
|
import { routeToolExclusionReason } from '../session/loop/provider-tool-exclusions.mjs';
|
|
17
23
|
import { isResponsesFreeformTool, toResponsesCustomTool } from '../providers/custom-tool-wire.mjs';
|
|
18
24
|
import {
|
|
@@ -46,21 +52,8 @@ import {
|
|
|
46
52
|
toolExposureModeForProvider,
|
|
47
53
|
} from './tool-exposure.mjs';
|
|
48
54
|
import { TOOL_BRIDGE_TOOLS } from './tool-defs.mjs';
|
|
49
|
-
export {
|
|
50
|
-
toolKind,
|
|
51
|
-
toolSchemaBucket,
|
|
52
|
-
estimateToolSchemaBreakdown,
|
|
53
|
-
measuredToolUsage,
|
|
54
|
-
parseToolSelection,
|
|
55
|
-
sortedCatalogByMeasuredUsage,
|
|
56
|
-
} from './tool-catalog-schema.mjs';
|
|
55
|
+
export { estimateToolSchemaBreakdown } from './tool-catalog-schema.mjs';
|
|
57
56
|
export { snapshotProviderRequestTools } from './provider-request-snapshot.mjs';
|
|
58
|
-
export {
|
|
59
|
-
DEFERRED_DEFAULT_FULL_TOOLS,
|
|
60
|
-
DEFERRED_DEFAULT_LEAD_TOOLS,
|
|
61
|
-
DEFERRED_DEFAULT_READONLY_TOOLS,
|
|
62
|
-
MEASURED_TOOL_USAGE,
|
|
63
|
-
} from './tool-catalog-data.mjs';
|
|
64
57
|
|
|
65
58
|
// Provider modes without native tool search. Their bridge-v1 sessions
|
|
66
59
|
// (tool-exposure.mjs) get the native roster and late delta notices; only a
|
|
@@ -548,24 +541,30 @@ export function rebuildDeferredToolSurfaceForProvider(session, provider) {
|
|
|
548
541
|
// <available-deferred-tools> manifest IN PLACE and pre-mark names announced;
|
|
549
542
|
// bridge-v1 sessions do the same (roster + bridge guidance). Only a fixed
|
|
550
543
|
// surface not yet on the bridge updates its scoped catalog alone. Fully sync
|
|
551
|
-
// and idempotent: no
|
|
544
|
+
// and idempotent: no MCP name added or gone => no-op / no mutation.
|
|
552
545
|
export function refreshInitialDeferredMcpSurface(session, liveMcpTools) {
|
|
553
546
|
if (!session || !Array.isArray(session.messages)) return false;
|
|
554
547
|
if (session.deferredProviderMode === 'full') return false;
|
|
555
548
|
const live = filterDisallowedTools(Array.isArray(liveMcpTools) ? liveMcpTools : [], session.disallowedTools);
|
|
549
|
+
const liveNames = new Set(live.map((tool) => clean(tool?.name)).filter(isMcpToolName));
|
|
556
550
|
const byName = new Map();
|
|
551
|
+
// Nothing was sent yet: a server gone since create leaves the initial surface.
|
|
552
|
+
let changed = false;
|
|
557
553
|
for (const tool of Array.isArray(session.deferredToolCatalog) ? session.deferredToolCatalog : []) {
|
|
558
554
|
const name = clean(tool?.name);
|
|
555
|
+
if (isMcpToolName(name) && !liveNames.has(name)) {
|
|
556
|
+
changed = true;
|
|
557
|
+
continue;
|
|
558
|
+
}
|
|
559
559
|
if (name && !byName.has(name)) byName.set(name, tool);
|
|
560
560
|
}
|
|
561
|
-
let added = false;
|
|
562
561
|
for (const tool of live) {
|
|
563
562
|
const name = clean(tool?.name);
|
|
564
563
|
if (!name || !isMcpToolName(name) || byName.has(name)) continue;
|
|
565
564
|
byName.set(name, activeToolForSurface(tool));
|
|
566
|
-
|
|
565
|
+
changed = true;
|
|
567
566
|
}
|
|
568
|
-
if (!
|
|
567
|
+
if (!changed) return false;
|
|
569
568
|
session.deferredToolCatalog = sortedCatalogByMeasuredUsage([...byName.values()]);
|
|
570
569
|
if (fixedSurfaceSession(session)) {
|
|
571
570
|
session.updatedAt = Date.now();
|
|
@@ -720,10 +719,12 @@ function reconcileDeferredMcpToolCatalogUncached(session, liveMcpTools) {
|
|
|
720
719
|
// connected OR the tool is already loaded, including native history-only
|
|
721
720
|
// discoveries. Availability is determined by deferredMcpToolNames, not this pool.
|
|
722
721
|
const nextByName = new Map();
|
|
722
|
+
// A built-in a settings gate opened (tool-availability.mjs) is no MCP tool:
|
|
723
|
+
// its availability is the session's deny set, so it stays.
|
|
723
724
|
for (const tool of lateCatalog) {
|
|
724
725
|
const name = clean(tool?.name);
|
|
725
726
|
if (!name || nextByName.has(name)) continue;
|
|
726
|
-
if (!liveMcpByName.has(name) && !active.has(name)) continue;
|
|
727
|
+
if (isMcpToolName(name) && !liveMcpByName.has(name) && !active.has(name)) continue;
|
|
727
728
|
nextByName.set(name, tool);
|
|
728
729
|
}
|
|
729
730
|
for (const [name, tool] of liveMcpByName) nextByName.set(name, tool);
|
|
@@ -773,28 +774,84 @@ function reconcileDeferredMcpToolCatalogUncached(session, liveMcpTools) {
|
|
|
773
774
|
* connected tool the boot manifest never listed and the session has not loaded
|
|
774
775
|
* or discovered rides the next real prompt as one more delta, acknowledged
|
|
775
776
|
* only once the provider accepts that turn.
|
|
777
|
+
* Only a session whose prompt is never rebuilt at a cold point (a delegated
|
|
778
|
+
* worker, or a prompt without a recorded identity) is re-armed, by name; any
|
|
779
|
+
* other session folds its late tools into the rebuilt manifest instead
|
|
780
|
+
* (foldLateDeferredTools).
|
|
776
781
|
* Returns the re-armed names, or null when there are none.
|
|
777
782
|
*/
|
|
778
783
|
export function rearmLateDeferredTools(session) {
|
|
779
784
|
// The compaction also drops the load results that carried a server's
|
|
780
|
-
// instruction text
|
|
781
|
-
|
|
785
|
+
// instruction text (the account and configuration guidance, which no prompt
|
|
786
|
+
// manifest carries), so the next load of its tools delivers it again. It
|
|
787
|
+
// rides a tool result, never the cached prefix, and ordinary turns still
|
|
788
|
+
// send it once.
|
|
789
|
+
if (session) {
|
|
790
|
+
delete session.mcpInstructionsAnnounced;
|
|
791
|
+
delete session.mcpInstructionHashes;
|
|
792
|
+
}
|
|
782
793
|
if (!session || !Array.isArray(session.tools) || fixedSurfaceSession(session)) return null;
|
|
783
|
-
if (
|
|
794
|
+
if (session.promptIdentity && !isAgentOwner(session)) return null;
|
|
795
|
+
if (!Array.isArray(session.deferredAnnouncedTools)) return null;
|
|
784
796
|
// Listed in the boot manifest, or already loaded/discovered: still visible.
|
|
785
797
|
const listed = new Set([...session.deferredAnnouncedTools, ...persistentToolSurfaceNames(session)]);
|
|
786
|
-
const connected = new Set(session.deferredMcpToolNames);
|
|
798
|
+
const connected = new Set(Array.isArray(session.deferredMcpToolNames) ? session.deferredMcpToolNames : []);
|
|
787
799
|
const added = [];
|
|
788
800
|
for (const tool of Array.isArray(session.deferredLateToolCatalog) ? session.deferredLateToolCatalog : []) {
|
|
789
801
|
const name = clean(tool?.name);
|
|
790
|
-
if (!name ||
|
|
791
|
-
|
|
802
|
+
if (!name || listed.has(name) || !rosterPermits(session, tool)) continue;
|
|
803
|
+
// MCP tools while connected; a built-in a settings gate opened while permitted.
|
|
804
|
+
if (isMcpToolName(name) ? !connected.has(name) : !isToolPermittedBySessionPolicy(session, name)) continue;
|
|
805
|
+
// Names only: the model was told the description before.
|
|
806
|
+
added.push({ name, description: '' });
|
|
792
807
|
}
|
|
793
808
|
if (!added.length) return null;
|
|
794
809
|
mergePendingDeferredToolDelta(session, { added });
|
|
795
810
|
return added.map((entry) => entry.name);
|
|
796
811
|
}
|
|
797
812
|
|
|
813
|
+
/**
|
|
814
|
+
* A cold point (a compaction, a rebuilt prompt): the late tools join the boot
|
|
815
|
+
* catalog and the rebuilt BP2 manifest lists them, so nothing about them rides
|
|
816
|
+
* a notice. Pending
|
|
817
|
+
* announcements the manifest now carries are dropped. Returns the folded names.
|
|
818
|
+
*/
|
|
819
|
+
export function foldLateDeferredTools(session) {
|
|
820
|
+
if (!session || !Array.isArray(session.tools) || fixedSurfaceSession(session)) return [];
|
|
821
|
+
const late = Array.isArray(session.deferredLateToolCatalog) ? session.deferredLateToolCatalog : [];
|
|
822
|
+
const connected = new Set(Array.isArray(session.deferredMcpToolNames) ? session.deferredMcpToolNames : []);
|
|
823
|
+
const byName = new Map();
|
|
824
|
+
for (const tool of Array.isArray(session.deferredToolCatalog) ? session.deferredToolCatalog : []) {
|
|
825
|
+
const name = clean(tool?.name);
|
|
826
|
+
if (name && !byName.has(name)) byName.set(name, tool);
|
|
827
|
+
}
|
|
828
|
+
const folded = [];
|
|
829
|
+
for (const tool of late) {
|
|
830
|
+
const name = clean(tool?.name);
|
|
831
|
+
if (!name || byName.has(name) || !rosterPermits(session, tool)) continue;
|
|
832
|
+
if (isMcpToolName(name) ? !connected.has(name) : !isToolPermittedBySessionPolicy(session, name)) continue;
|
|
833
|
+
byName.set(name, activeToolForSurface(tool));
|
|
834
|
+
folded.push(name);
|
|
835
|
+
}
|
|
836
|
+
session.deferredToolCatalog = sortedCatalogByMeasuredUsage([...byName.values()]);
|
|
837
|
+
// Whatever the boot catalog holds now (folded here, or by the rebuilt surface) leaves the late pool.
|
|
838
|
+
session.deferredLateToolCatalog = late.filter((tool) => !byName.has(clean(tool?.name)));
|
|
839
|
+
session.mcpServerInstructions = getMcpServerInstructionsMap(session.mcpScopeId);
|
|
840
|
+
if (Array.isArray(session.messages) && session.messages.some((m) => m?.role === 'system')) {
|
|
841
|
+
applyInitialDeferredToolManifestToBp2(session, deferredPoolToolNames(session), { rebuild: true });
|
|
842
|
+
session.deferredAnnouncedTools = listedDeferredToolNames(
|
|
843
|
+
session,
|
|
844
|
+
deferredPoolToolNames(session),
|
|
845
|
+
renderedDeferredManifest(session)
|
|
846
|
+
);
|
|
847
|
+
}
|
|
848
|
+
// The manifest lists only short triggers, never a server's instruction text:
|
|
849
|
+
// what a load has told stays as recorded (a compaction clears it).
|
|
850
|
+
const listed = new Set(Array.isArray(session.deferredAnnouncedTools) ? session.deferredAnnouncedTools : []);
|
|
851
|
+
dropPendingDeferredToolAdds(session, listed);
|
|
852
|
+
return folded;
|
|
853
|
+
}
|
|
854
|
+
|
|
798
855
|
export function scopedMcpToolsFor(session, config = null) {
|
|
799
856
|
return filterMcpToolsForSession(getMcpTools(session?.mcpScopeId), session?.cwd || null, config);
|
|
800
857
|
}
|
|
@@ -916,24 +973,41 @@ function resolvableCatalog(session) {
|
|
|
916
973
|
return filterSessionToolPolicy(tools, session);
|
|
917
974
|
}
|
|
918
975
|
|
|
976
|
+
const instructionHash = (text) =>
|
|
977
|
+
createHash('sha256')
|
|
978
|
+
.update(String(text || ''))
|
|
979
|
+
.digest('hex')
|
|
980
|
+
.slice(0, 16);
|
|
981
|
+
|
|
919
982
|
// A server's instruction text rides the first load_tool naming any of its
|
|
920
|
-
// tools (loaded now, already active, or described on the bridge), once
|
|
921
|
-
//
|
|
922
|
-
//
|
|
923
|
-
//
|
|
983
|
+
// tools (loaded now, already active, or described on the bridge), once per
|
|
984
|
+
// text (`mcpInstructionsAnnounced`, `mcpInstructionHashes`: a connector whose
|
|
985
|
+
// accounts changed sends its new text again; a compaction clears the record,
|
|
986
|
+
// rearmLateDeferredTools): `## <server>` + body,
|
|
987
|
+
// sanitized and capped (sanitizeMcpInstructionText, well under 4 KB). No
|
|
988
|
+
// text, nothing sent or recorded.
|
|
924
989
|
function pendingMcpInstructions(session, catalog, names) {
|
|
925
990
|
const map = session?.mcpServerInstructions;
|
|
926
991
|
if (!map || typeof map !== 'object' || !names.length) return [];
|
|
927
992
|
const byName = new Map(catalog.map((tool) => [clean(tool?.name), tool]));
|
|
928
993
|
const announced = new Set(Array.isArray(session.mcpInstructionsAnnounced) ? session.mcpInstructionsAnnounced : []);
|
|
994
|
+
const hashes =
|
|
995
|
+
session.mcpInstructionHashes && typeof session.mcpInstructionHashes === 'object'
|
|
996
|
+
? session.mcpInstructionHashes
|
|
997
|
+
: {};
|
|
998
|
+
const seen = new Set();
|
|
929
999
|
const pending = [];
|
|
930
1000
|
for (const name of names) {
|
|
931
1001
|
const server = parseMcpToolName(byName.get(name) || name)?.server;
|
|
932
|
-
if (!server ||
|
|
1002
|
+
if (!server || seen.has(server) || !mcpServerManifestLabel(server)) continue;
|
|
933
1003
|
const text = sanitizeMcpInstructionText(map[server]);
|
|
934
1004
|
if (!text) continue;
|
|
935
|
-
|
|
936
|
-
|
|
1005
|
+
const hash = instructionHash(text);
|
|
1006
|
+
// Told already, and the text is the one told. A record from before hashes
|
|
1007
|
+
// were kept cannot tell which text it carried: sent once more, and hashed.
|
|
1008
|
+
if (announced.has(server) && hashes[server] === hash) continue;
|
|
1009
|
+
seen.add(server);
|
|
1010
|
+
pending.push({ server, hash, block: `## ${server}\n${text}` });
|
|
937
1011
|
}
|
|
938
1012
|
return pending;
|
|
939
1013
|
}
|
|
@@ -943,6 +1017,10 @@ function announceMcpServers(session, pending) {
|
|
|
943
1017
|
session.mcpInstructionsAnnounced = [
|
|
944
1018
|
...new Set([...(session.mcpInstructionsAnnounced || []), ...pending.map((entry) => entry.server)]),
|
|
945
1019
|
];
|
|
1020
|
+
session.mcpInstructionHashes = {
|
|
1021
|
+
...(session.mcpInstructionHashes || {}),
|
|
1022
|
+
...Object.fromEntries(pending.map((entry) => [entry.server, entry.hash])),
|
|
1023
|
+
};
|
|
946
1024
|
}
|
|
947
1025
|
|
|
948
1026
|
function claimMcpServerInstructions(session, catalog, names) {
|
|
@@ -1016,7 +1094,9 @@ export function renderToolSearch(args = {}, session, mode = 'full', options = {}
|
|
|
1016
1094
|
]);
|
|
1017
1095
|
const loaded = toolSelection.added || [];
|
|
1018
1096
|
const alreadyActive = toolSelection.already || [];
|
|
1019
|
-
|
|
1097
|
+
// A tool a settings gate closed is named as such, not as unknown.
|
|
1098
|
+
const disabledInSettings = (toolSelection.missing || []).filter((name) => sessionFeatureDenies(session, name));
|
|
1099
|
+
const missing = (toolSelection.missing || []).filter((name) => !disabledInSettings.includes(name));
|
|
1020
1100
|
const blocked = toolSelection.blocked || [];
|
|
1021
1101
|
// Native discovery is history-driven: an explicit re-selection must emit
|
|
1022
1102
|
// the tool reference/spec again even when the callable registry already has
|
|
@@ -1040,6 +1120,9 @@ export function renderToolSearch(args = {}, session, mode = 'full', options = {}
|
|
|
1040
1120
|
? { ...nativeToolSearchBase, summary: nativeSummary || nativeToolSearchBase.summary }
|
|
1041
1121
|
: null;
|
|
1042
1122
|
const notes = [];
|
|
1123
|
+
if (disabledInSettings.length) {
|
|
1124
|
+
notes.push(`Disabled in settings: ${disabledInSettings.join(', ')}. Do not retry unless the user turns it on.`);
|
|
1125
|
+
}
|
|
1043
1126
|
if (missing.length && pendingMcpServers.length) {
|
|
1044
1127
|
notes.push('Some requested names may belong to an MCP server still connecting — retry next turn.');
|
|
1045
1128
|
}
|
|
@@ -1059,6 +1142,7 @@ export function renderToolSearch(args = {}, session, mode = 'full', options = {}
|
|
|
1059
1142
|
alreadyActive,
|
|
1060
1143
|
...(alreadyActiveSchemas.length ? { alreadyActiveSchemas } : {}),
|
|
1061
1144
|
missing,
|
|
1145
|
+
...(disabledInSettings.length ? { disabledInSettings } : {}),
|
|
1062
1146
|
...(blocked.length ? { blocked } : {}),
|
|
1063
1147
|
...mcpFields,
|
|
1064
1148
|
activeTools: sortedNamesByMeasuredUsage(
|
|
@@ -101,7 +101,7 @@ export const SESSION_TOOL = {
|
|
|
101
101
|
'suggest',
|
|
102
102
|
],
|
|
103
103
|
description:
|
|
104
|
-
'status defaults to current; list pages sessions, without sub-agent or archived ones unless include_agents/include_archived; bots shows each bot’s activity, work, approvals, routines and attention flags, or with session_id (a bot id or its chat) its routines and recent sessions; read returns latest items; send queues prompt (reportsBack: the turn result reports back here); cancel stops the turn; delete removes the session. create (bot conversations) starts a visible agent task session from brief (started, not done yet); unknown Project: list-projects first, still ambiguous: ask the user. compact runs after this turn; fork copies it without switching. suggest (Mixy’s chat only) records a proposal made to the user under key; value false records that the user declined it.',
|
|
104
|
+
'status defaults to current; list pages sessions, without sub-agent or archived ones unless include_agents/include_archived; bots shows each bot’s activity, work, approvals, routines and attention flags, or with session_id (a bot id or its chat) its routines and recent sessions; read returns latest items; send queues prompt (reportsBack: the turn result reports back here); cancel stops the turn; delete removes the session. create (bot conversations; only for a big multi-step plan, smaller work goes to agent) starts a visible agent task session from brief (started, not done yet); unknown Project: list-projects first, still ambiguous: ask the user. compact runs after this turn; fork copies it without switching. suggest (Mixy’s chat only) records a proposal made to the user under key; value false records that the user declined it.',
|
|
105
105
|
},
|
|
106
106
|
title: {
|
|
107
107
|
type: 'string',
|
|
@@ -32,7 +32,7 @@ export function createWorkflowContext({ packs, agents }) {
|
|
|
32
32
|
function workflowContextBlockFromPack(pack) {
|
|
33
33
|
if (!pack) return '';
|
|
34
34
|
// The pack body opens with its own `# <name>` title, so header + description
|
|
35
|
-
// + body
|
|
35
|
+
// + body would repeat the workflow name three times in the prompt. Emit one
|
|
36
36
|
// header line and drop the body's duplicate title (only when it matches).
|
|
37
37
|
const rawBody = String(pack.body || '');
|
|
38
38
|
const firstBreak = rawBody.indexOf('\n');
|
|
@@ -14,6 +14,7 @@ import { clearReactionTargets } from '../runtime-core/reaction-tool-defs.mjs';
|
|
|
14
14
|
import { applyRetryAction, beginIteration, sendProviderRequest, settleSendResult } from './loop/send-phase.mjs';
|
|
15
15
|
import { runToolPhase } from './loop/tool-phase.mjs';
|
|
16
16
|
import { endedWithoutReply } from './loop/turn-limits.mjs';
|
|
17
|
+
import { carryReportOnError } from './loop/turn-report.mjs';
|
|
17
18
|
|
|
18
19
|
// Facade re-exports: these symbols live in ./loop/ modules and are part of
|
|
19
20
|
// loop.mjs's public surface (imported by scripts/tests and other runtime
|
|
@@ -62,29 +63,34 @@ async function runAgentLoop(provider, messages, model, tools, onToolCall, cwd, s
|
|
|
62
63
|
resetAccountProbePacing();
|
|
63
64
|
const state = createLoopState({ provider, messages, model, tools, cwd, sendOpts });
|
|
64
65
|
// Completion, cancellation, and terminal failures end execution.
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
66
|
+
try {
|
|
67
|
+
while (true) {
|
|
68
|
+
const round = await beginIteration(state);
|
|
69
|
+
const sent = await sendProviderRequest(state, round);
|
|
70
|
+
if (applyRetryAction(state, sent.result)) continue;
|
|
71
|
+
settleSendResult(state, round, sent);
|
|
72
|
+
// A turn without client tool calls is not automatically the final answer:
|
|
73
|
+
// the provider may have hit its output ceiling, been cut by a safety
|
|
74
|
+
// classifier, declared the turn unfinished, or returned nothing. Each case
|
|
75
|
+
// owns a bounded recovery ladder in ./loop/no-tool-turn.mjs, which either
|
|
76
|
+
// appended a recovery turn ('continue') or produced the terminal response.
|
|
77
|
+
if (!state.response.toolCalls?.length) {
|
|
78
|
+
const outcome = await state.noToolTurn.resolve(state.response, state.iterations);
|
|
79
|
+
state.response = outcome.response;
|
|
80
|
+
if (outcome.action === 'continue') continue;
|
|
81
|
+
break;
|
|
82
|
+
}
|
|
83
|
+
await runToolPhase(state, round, sent, onToolCall);
|
|
84
|
+
// A capped turn that kept calling tools after it was told to reply ends
|
|
85
|
+
// here with no reply (./loop/turn-limits.mjs), keeping the answers it
|
|
86
|
+
// went past.
|
|
87
|
+
if (state.turnLimitEnded) {
|
|
88
|
+
state.response = state.noToolTurn.finalize(endedWithoutReply(state.response));
|
|
89
|
+
break;
|
|
90
|
+
}
|
|
87
91
|
}
|
|
92
|
+
} catch (error) {
|
|
93
|
+
throw carryReportOnError(error, state.noToolTurn.endedReport());
|
|
88
94
|
}
|
|
89
95
|
return finishLoop(state);
|
|
90
96
|
}
|
|
@@ -4,6 +4,36 @@
|
|
|
4
4
|
// only — nothing here reads or changes the watchdog's abort policy.
|
|
5
5
|
import { displayProgressStage, lastProgressAt } from '../../../shared/quiet-progress.mjs';
|
|
6
6
|
import { resolveAgentStallThresholds } from '../stall-policy.mjs';
|
|
7
|
+
import { todoProgress } from '../runtime-core/todo-list.mjs';
|
|
8
|
+
import { sessionUsageTotals } from '../../../shared/session-usage-totals.mjs';
|
|
9
|
+
|
|
10
|
+
/** `rows` with each agent's todo progress taken from its live session when
|
|
11
|
+
* this process holds one: the list changes before the session is saved, and
|
|
12
|
+
* the stored copy lags. A live session is authoritative, so one without a
|
|
13
|
+
* list (cleared) drops the row's stored `todo`; rows with no live session
|
|
14
|
+
* keep the stored one. */
|
|
15
|
+
export function withLiveTodo(rows, liveSession) {
|
|
16
|
+
return rows.map((row) => {
|
|
17
|
+
const live = row?.sessionId ? liveSession(row.sessionId) : null;
|
|
18
|
+
if (!live) return row;
|
|
19
|
+
const { todo: _stored, ...rest } = row;
|
|
20
|
+
const todo = todoProgress(live);
|
|
21
|
+
return todo ? { ...rest, todo } : rest;
|
|
22
|
+
});
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
/** `rows` with each agent's running token and tool-call totals taken from its
|
|
26
|
+
* live session when this process holds one: the counters advance with every
|
|
27
|
+
* model response, while the stored copy follows a throttled save. A total the
|
|
28
|
+
* live session does not know keeps the stored one. */
|
|
29
|
+
export function withLiveUsage(rows, liveSession) {
|
|
30
|
+
return rows.map((row) => {
|
|
31
|
+
const live = row?.sessionId ? liveSession(row.sessionId) : null;
|
|
32
|
+
if (!live) return row;
|
|
33
|
+
const { usage, toolCalls } = sessionUsageTotals(live);
|
|
34
|
+
return { ...row, ...(usage ? { usage } : {}), ...(toolCalls === null ? {} : { toolCalls }) };
|
|
35
|
+
});
|
|
36
|
+
}
|
|
7
37
|
|
|
8
38
|
/** `rows` with progress fields on every row `runtimeEntry(sessionId)` reports
|
|
9
39
|
* in flight. `awaitingTask` marks a row whose agent waits on its background
|
|
@@ -11,7 +11,7 @@ import { imagePartAllowance, pdfPartAllowance } from './context-utils.mjs';
|
|
|
11
11
|
// over the transcript. The rest stays for the conversation, tool results and
|
|
12
12
|
// the answer; above it the read-what-you-need path costs far less than the
|
|
13
13
|
// whole files.
|
|
14
|
-
|
|
14
|
+
const ATTACHMENT_INLINE_SHARE = 0.25;
|
|
15
15
|
|
|
16
16
|
/** The inline-attachment budget of a model window (0 when unknown). */
|
|
17
17
|
export function attachmentInlineBudget(contextWindow) {
|