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
|
@@ -40,6 +40,7 @@ import fs from 'node:fs';
|
|
|
40
40
|
import { spawn, spawnSync } from 'node:child_process';
|
|
41
41
|
import { setTimeout as delay } from 'node:timers/promises';
|
|
42
42
|
import { windowsSystemRoot } from '../../agent/orchestrator/tools/builtin/windows-roots.mjs';
|
|
43
|
+
import { killProcessTrees } from '../../agent/orchestrator/mcp/child-tree.mjs';
|
|
43
44
|
import { selectWhisperPort, whisperListenerOwned } from './whisper-port.mjs';
|
|
44
45
|
|
|
45
46
|
// ── Tunables (deterministic; no ranges) ──────────────────────────────────────
|
|
@@ -217,16 +218,13 @@ function isOwnedWhisperServer(pid, { modelPath, port } = {}) {
|
|
|
217
218
|
return modelMatch || portMatch;
|
|
218
219
|
}
|
|
219
220
|
|
|
220
|
-
|
|
221
|
+
// `aliveAt`: when `pid` was last known to be the process meant (a live child
|
|
222
|
+
// handle: now; a proven stale child: before its proof). Windows has no graceful
|
|
223
|
+
// stop for a console server, so both steps run the shared tree kill.
|
|
224
|
+
async function killPid(pid, force, aliveAt = Date.now()) {
|
|
221
225
|
if (!pid) return;
|
|
222
226
|
if (IS_WIN) {
|
|
223
|
-
|
|
224
|
-
if (force) args.push('/F');
|
|
225
|
-
try {
|
|
226
|
-
spawnSync('taskkill', args, { windowsHide: true });
|
|
227
|
-
} catch {
|
|
228
|
-
/* best-effort */
|
|
229
|
-
}
|
|
227
|
+
await killProcessTrees([pid], { aliveAt });
|
|
230
228
|
return;
|
|
231
229
|
}
|
|
232
230
|
try {
|
|
@@ -325,10 +323,10 @@ async function teardown(reason) {
|
|
|
325
323
|
resolve();
|
|
326
324
|
}
|
|
327
325
|
});
|
|
328
|
-
killPid(pid, false);
|
|
326
|
+
void killPid(pid, false);
|
|
329
327
|
const raced = await Promise.race([exited, delay(STOP_GRACE_MS, 'timeout')]);
|
|
330
328
|
if (raced === 'timeout') {
|
|
331
|
-
killPid(pid, true); // escalate
|
|
329
|
+
void killPid(pid, true); // escalate
|
|
332
330
|
await Promise.race([exited, delay(STOP_GRACE_MS, 'timeout')]);
|
|
333
331
|
}
|
|
334
332
|
}
|
|
@@ -384,11 +382,13 @@ async function startServer(contract) {
|
|
|
384
382
|
// Prefer the recorded meta's own contract fields; fall back to the contract we
|
|
385
383
|
// are about to start. A non-positive match → never kill (fail closed).
|
|
386
384
|
const ownArgs = { modelPath: meta?.modelPath ?? modelPath, port: meta?.port ?? FIXED_PORT };
|
|
385
|
+
const provenAt = Date.now();
|
|
387
386
|
if (meta && isOwnedWhisperServer(meta.pid, ownArgs)) {
|
|
388
|
-
killPid(meta.pid, false);
|
|
387
|
+
await killPid(meta.pid, false, provenAt);
|
|
389
388
|
await delay(500);
|
|
389
|
+
const reprovenAt = Date.now();
|
|
390
390
|
if (isOwnedWhisperServer(meta.pid, ownArgs)) {
|
|
391
|
-
killPid(meta.pid, true);
|
|
391
|
+
await killPid(meta.pid, true, reprovenAt);
|
|
392
392
|
await delay(500);
|
|
393
393
|
}
|
|
394
394
|
clearPidMeta();
|
|
@@ -18,7 +18,7 @@ import {
|
|
|
18
18
|
cleanupInstanceRuntimeFiles,
|
|
19
19
|
clearServerPid,
|
|
20
20
|
} from './runtime-paths.mjs';
|
|
21
|
-
import {
|
|
21
|
+
import { createConfigReloadWatch } from './config-reload-watch.mjs';
|
|
22
22
|
import { bootProfile, utcTimestamp } from './boot-profile.mjs';
|
|
23
23
|
import {
|
|
24
24
|
isChannelsDegraded,
|
|
@@ -121,9 +121,6 @@ function writeBridgeState(active) {
|
|
|
121
121
|
function isChannelBridgeActive() {
|
|
122
122
|
return channelBridgeActive;
|
|
123
123
|
}
|
|
124
|
-
// Config hot-reload watcher (installed by start(); torn down by stop()).
|
|
125
|
-
let _configWatcher = null;
|
|
126
|
-
let _reloadDebounce = null;
|
|
127
124
|
const STATUS_FILE = getStatusPath(INSTANCE_ID);
|
|
128
125
|
const statusState = new JsonStateFile(STATUS_FILE, {});
|
|
129
126
|
statusState.ensure();
|
|
@@ -201,6 +198,7 @@ function wireWebhookHandlers() {
|
|
|
201
198
|
const run = await runWebhookSession({
|
|
202
199
|
name: context?.endpoint || 'webhook',
|
|
203
200
|
ownerAgentId: context?.owner || null,
|
|
201
|
+
executorAgentId: context?.executor || null,
|
|
204
202
|
cwd: cwd || null,
|
|
205
203
|
attachments: attachments || null,
|
|
206
204
|
event: context?.event || '',
|
|
@@ -252,24 +250,14 @@ const { handleToolCall } = createToolDispatch({
|
|
|
252
250
|
}),
|
|
253
251
|
},
|
|
254
252
|
});
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
try {
|
|
258
|
-
_configWatcher = fs.watch(path.join(DATA_DIR, 'mixdog-config.json'), () => {
|
|
259
|
-
invalidateConfigReadCache();
|
|
260
|
-
if (_reloadDebounce) clearTimeout(_reloadDebounce);
|
|
261
|
-
_reloadDebounce = setTimeout(() => {
|
|
262
|
-
reloadRuntimeConfig().catch(() => {});
|
|
263
|
-
}, 500);
|
|
264
|
-
});
|
|
265
|
-
} catch {}
|
|
266
|
-
}
|
|
253
|
+
// Config hot reload (started by start(); stopped by stop()).
|
|
254
|
+
const configReloadWatch = createConfigReloadWatch(reloadRuntimeConfig);
|
|
267
255
|
async function start(options = {}) {
|
|
268
256
|
if (options?.bridge === false) {
|
|
269
257
|
channelBridgeActive = false;
|
|
270
258
|
writeBridgeState(false);
|
|
271
259
|
await startAutomationRuntime();
|
|
272
|
-
|
|
260
|
+
configReloadWatch.start();
|
|
273
261
|
return;
|
|
274
262
|
}
|
|
275
263
|
channelBridgeActive = true;
|
|
@@ -283,10 +271,9 @@ async function start(options = {}) {
|
|
|
283
271
|
} catch {
|
|
284
272
|
// Non-fatal: owned-runtime start errors degrade to automation-only mode.
|
|
285
273
|
}
|
|
286
|
-
// Hot-reload config on
|
|
287
|
-
//
|
|
288
|
-
|
|
289
|
-
ensureConfigWatcher();
|
|
274
|
+
// Hot-reload config on change (schedules/webhooks/events), in both bridge
|
|
275
|
+
// and automation-only daemon modes.
|
|
276
|
+
configReloadWatch.start();
|
|
290
277
|
// Pre-warm the whisper-server manager once at owner startup so the first
|
|
291
278
|
// voice transcription does not pay cold-start cost. Non-blocking: failures
|
|
292
279
|
// (e.g. runtime not installed) are swallowed; per-request ensureReady retries.
|
|
@@ -314,16 +301,7 @@ async function stop() {
|
|
|
314
301
|
} catch {}
|
|
315
302
|
await stopOwnedRuntime('unified server stop');
|
|
316
303
|
cleanupInstanceRuntimeFiles(INSTANCE_ID);
|
|
317
|
-
|
|
318
|
-
clearTimeout(_reloadDebounce);
|
|
319
|
-
_reloadDebounce = null;
|
|
320
|
-
}
|
|
321
|
-
if (_configWatcher) {
|
|
322
|
-
try {
|
|
323
|
-
_configWatcher.close();
|
|
324
|
-
} catch {}
|
|
325
|
-
_configWatcher = null;
|
|
326
|
-
}
|
|
304
|
+
configReloadWatch.stop();
|
|
327
305
|
}
|
|
328
306
|
// ── IPC worker mode ──────────────────────────────────────────────
|
|
329
307
|
// Skipped under the machine-global host (MIXDOG_DAEMON_HOST=1): the daemon
|
|
@@ -229,13 +229,13 @@ export const COMPUTER_ACTION_CONTRACTS = [
|
|
|
229
229
|
minItems: 1,
|
|
230
230
|
maxItems: 6,
|
|
231
231
|
description:
|
|
232
|
-
'First: an input action. Then type/key/wait reusing focus, or click/double_click/triple_click/scroll/set_value/type/key on a ref from the same observation (no marks or coordinates).
|
|
232
|
+
'First: an input action. Then type/key/wait reusing focus, or click/double_click/triple_click/scroll/set_value/type/key on a ref from the same observation (no marks or coordinates). act already settles after each action; wait is a fixed pause for a known async delay (quiet:true ends it early once windows stop changing; see wait.quiet) and totals ≤10s; use verify for a real condition. Transition/failure or a changed, disabled, or off-screen ref stops the rest.',
|
|
233
233
|
},
|
|
234
234
|
observe: {
|
|
235
235
|
type: 'string',
|
|
236
236
|
enum: ['state', 'ax'],
|
|
237
237
|
description:
|
|
238
|
-
'Returned observation. Default: ax when the first action targets a ref (full state if the tree is unusable), otherwise state. state includes the frame for coordinates or visual checks; ax skips the screenshot.',
|
|
238
|
+
'Returned observation. Default: ax when the first action targets a ref (full state if the tree is unusable), otherwise state. state includes the frame for coordinates or visual checks; ax skips the screenshot. A repeat observation of the same window may send elements_delta instead of elements: unchanged lists "old ref=live ref" ranges for rows that look identical to the list you hold (s1:e0..e4=s9:e0..e4), added has every other row in full, removed the old refs that are gone. Every ref from an earlier observation is retired: act only with the live ref on the right of "=" or on an added row. A new window, a dialog or a large change returns the full elements list, and capture always does.',
|
|
239
239
|
},
|
|
240
240
|
...delivery,
|
|
241
241
|
},
|
|
@@ -90,7 +90,18 @@ export const COMPUTER_CORE_ACTION_SCHEMA = {
|
|
|
90
90
|
'Key name or chord. Keyboard chords with ctrl/shift/alt require explicit foreground delivery; background supports plain keys.',
|
|
91
91
|
pattern: '^[^\\u0000-\\u001F\\u007F-\\u009F]+$',
|
|
92
92
|
},
|
|
93
|
-
duration: {
|
|
93
|
+
duration: {
|
|
94
|
+
type: 'number',
|
|
95
|
+
minimum: 0,
|
|
96
|
+
maximum: 5,
|
|
97
|
+
description:
|
|
98
|
+
'wait: cap in seconds. act already settles after every action; use wait only for a known async delay.',
|
|
99
|
+
},
|
|
100
|
+
quiet: {
|
|
101
|
+
type: 'boolean',
|
|
102
|
+
description:
|
|
103
|
+
'wait: opt-in (default false, a fixed pause). true ends before duration once the window set, foreground, focused window, title and bounds stop changing (3 equal samples 200 ms apart); use it when waiting for a window or dialog to open, close or move. Content changes inside a window (canvas, text) are not seen: use verify for those.',
|
|
104
|
+
},
|
|
94
105
|
},
|
|
95
106
|
required: ['type'],
|
|
96
107
|
additionalProperties: false,
|
|
@@ -114,7 +125,7 @@ const FIELDS_BY_TYPE = {
|
|
|
114
125
|
key: new Set(['type', 'ref', 'keys']),
|
|
115
126
|
key_down: new Set(['type', 'ref', 'keys']),
|
|
116
127
|
key_up: new Set(['type', 'ref', 'keys']),
|
|
117
|
-
wait: new Set(['type', 'duration']),
|
|
128
|
+
wait: new Set(['type', 'duration', 'quiet']),
|
|
118
129
|
};
|
|
119
130
|
|
|
120
131
|
function targetFormError(action, { required = true, frameId = '' } = {}) {
|
|
@@ -153,6 +164,9 @@ function fieldValueError(field, value, label) {
|
|
|
153
164
|
if (schema.type === 'number' && (typeof value !== 'number' || !Number.isFinite(value))) {
|
|
154
165
|
return `${label}.${field} must be a finite number`;
|
|
155
166
|
}
|
|
167
|
+
if (schema.type === 'boolean' && typeof value !== 'boolean') {
|
|
168
|
+
return `${label}.${field} must be a boolean`;
|
|
169
|
+
}
|
|
156
170
|
if (typeof value === 'number') {
|
|
157
171
|
if (schema.minimum !== undefined && value < schema.minimum) {
|
|
158
172
|
return `${label}.${field} must be at least ${schema.minimum}`;
|
|
@@ -10,25 +10,25 @@ import fs from 'node:fs';
|
|
|
10
10
|
import path from 'node:path';
|
|
11
11
|
import { isForegroundWindowCapture, requiredCapabilities } from './linux-action-capabilities.mjs';
|
|
12
12
|
|
|
13
|
-
|
|
13
|
+
const UINPUT_HINT =
|
|
14
14
|
'input_unavailable: Wayland input needs write access to /dev/uinput; add the udev rule `KERNEL=="uinput", GROUP="input", MODE="0660", OPTIONS+="static_node=uinput"`, add your user to the input group, then sign in again';
|
|
15
15
|
export const INPUT_GROUP_SECURITY_NOTE =
|
|
16
16
|
'Security note: membership of the input group lets every program you run read and inject keyboard and mouse input system-wide. Grant it only on a machine and account you trust.';
|
|
17
17
|
export const GNOME_EXTENSION_UUID = 'mixdog-windows@mixdog.io';
|
|
18
18
|
/** The oldest helper interface this app can use (2 added Screenshot and StopRequested, 3 the in-shell indicator). */
|
|
19
19
|
export const MIN_WINDOW_HELPER_VERSION = 3;
|
|
20
|
-
|
|
20
|
+
const WINDOW_HELPER_RELOGIN_HINT =
|
|
21
21
|
'wayland_window_control_unavailable: the Mixdog Windows GNOME extension is installed and enabled but GNOME Shell has not loaded it yet; the user must sign out and sign in again once';
|
|
22
|
-
|
|
22
|
+
const WINDOW_HELPER_ENABLE_HINT =
|
|
23
23
|
'wayland_window_control_unavailable: the Mixdog Windows GNOME extension is not enabled; it could not be enabled automatically (run gnome-extensions enable mixdog-windows@mixdog.io)';
|
|
24
|
-
|
|
24
|
+
const WINDOW_CONTROL_UNSUPPORTED_HINT =
|
|
25
25
|
'wayland_window_control_unavailable: this desktop offers no window control to other programs (supported: GNOME with the Mixdog Windows extension, sway, Hyprland, or an X11 session); screen, pointer, keyboard and clipboard still work';
|
|
26
|
-
|
|
26
|
+
const ACCESSIBILITY_HINT = 'accessibility_unavailable: the AT-SPI bus is not running; install at-spi2-core';
|
|
27
27
|
export const TESSERACT_HINT =
|
|
28
28
|
'ocr_unavailable: install Tesseract (for example `sudo apt install tesseract-ocr tesseract-ocr-kor`) to read text from pixels';
|
|
29
29
|
export const CLIPBOARD_HINT =
|
|
30
30
|
'clipboard_unavailable: install wl-clipboard (`wl-copy`/`wl-paste`) for clipboard access on Wayland';
|
|
31
|
-
|
|
31
|
+
const DISPLAY_HINT =
|
|
32
32
|
'display_unavailable: no graphical session to drive; run inside a desktop session with DISPLAY (X11) or WAYLAND_DISPLAY set';
|
|
33
33
|
|
|
34
34
|
/** Stable code of the whole refusal; the per-capability codes are the native ones. */
|
|
@@ -301,14 +301,10 @@ function capabilityIssue(name, readiness) {
|
|
|
301
301
|
return { code: 'display_unavailable', message: DISPLAY_HINT };
|
|
302
302
|
// Semantic actions fail on whichever of their two prerequisites is missing.
|
|
303
303
|
const gnomeWayland = readiness.session === 'wayland' && readiness.desktop === 'gnome';
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
: 'windows'
|
|
309
|
-
: name === 'capture' && gnomeWayland
|
|
310
|
-
? 'windows'
|
|
311
|
-
: name;
|
|
304
|
+
let target = name;
|
|
305
|
+
if (name === 'semanticActions')
|
|
306
|
+
target = readiness.capabilities.windows.state === 'ready' ? 'accessibility' : 'windows';
|
|
307
|
+
else if (name === 'capture' && gnomeWayland) target = 'windows';
|
|
312
308
|
const capability = readiness.capabilities[target];
|
|
313
309
|
switch (target) {
|
|
314
310
|
case 'windows':
|
|
@@ -111,6 +111,12 @@ function ocrTextLine(row) {
|
|
|
111
111
|
function renderObservationLines(frame) {
|
|
112
112
|
if (!frame || typeof frame !== 'object') return;
|
|
113
113
|
if (Array.isArray(frame.elements)) frame.elements = frame.elements.map(elementLine);
|
|
114
|
+
const delta = frame.elements_delta;
|
|
115
|
+
if (delta && typeof delta === 'object') {
|
|
116
|
+
if (Array.isArray(delta.added)) delta.added = delta.added.map(elementLine);
|
|
117
|
+
// The delta already says what changed; the host's count summary repeats it.
|
|
118
|
+
delete frame.changes;
|
|
119
|
+
}
|
|
114
120
|
for (const key of ['lines', 'words']) {
|
|
115
121
|
if (Array.isArray(frame.ocr?.[key])) frame.ocr[key] = frame.ocr[key].map(ocrTextLine);
|
|
116
122
|
}
|
|
@@ -11,17 +11,21 @@
|
|
|
11
11
|
// conversation, else the connector's last-used account (connectorAccountInUse),
|
|
12
12
|
// else the topmost connected account. A named or remembered account that is
|
|
13
13
|
// switched off, removed or needs a sign-in fails the call with the usable
|
|
14
|
-
// accounts listed; no other account ever stands in for it
|
|
14
|
+
// accounts listed; no other account ever stands in for it, a new account
|
|
15
|
+
// given a removed one's name included (a remembered account is bound to its
|
|
16
|
+
// identity, not its name). A conversation's
|
|
15
17
|
// call (`_meta[CONVERSATION_META]`) makes its account the last used, for the
|
|
16
18
|
// conversation and the connector. Every result of a call made on an account,
|
|
17
19
|
// errors included, says which account answered. A name binds a call to one
|
|
18
20
|
// account; an address or label two accounts share binds none.
|
|
19
21
|
// An account that fails stays listed with why (connectorAccountHealth); the
|
|
20
22
|
// server only fails to start when no account can be used.
|
|
23
|
+
import { randomUUID } from 'node:crypto';
|
|
21
24
|
import { join } from 'node:path';
|
|
22
25
|
import { readJsonStateSync, updateJsonAtomicSync } from '../shared/atomic-file.mjs';
|
|
26
|
+
import { readSection, updateSection } from '../shared/config.mjs';
|
|
23
27
|
import { accountsOfInstructions, connectorAccountsInstructions } from '../shared/connector-accounts.mjs';
|
|
24
|
-
import { connectorById } from '../shared/connector-catalog.mjs';
|
|
28
|
+
import { connectorAccountsOf, connectorById, connectorOfServer } from '../shared/connector-catalog.mjs';
|
|
25
29
|
import { resolvePluginData } from '../shared/plugin-paths.mjs';
|
|
26
30
|
|
|
27
31
|
const PROTOCOL_VERSION = '2025-06-18';
|
|
@@ -49,8 +53,8 @@ export function forgetConnectorAccountHealth(name) {
|
|
|
49
53
|
}
|
|
50
54
|
|
|
51
55
|
// ── The last-used account ───────────────────────────────────────────────────
|
|
52
|
-
// Per connector, in the data dir (every runtime
|
|
53
|
-
//
|
|
56
|
+
// Per connector and per conversation, in the data dir (every runtime and every
|
|
57
|
+
// restart reads the same ones).
|
|
54
58
|
const ACCOUNTS_IN_USE_FILE = 'connector-accounts-in-use.json';
|
|
55
59
|
const inUseFile = () => join(resolvePluginData(), ACCOUNTS_IN_USE_FILE);
|
|
56
60
|
const isRecord = (value) => Boolean(value) && typeof value === 'object' && !Array.isArray(value);
|
|
@@ -59,37 +63,149 @@ const validInUse = (value) => {
|
|
|
59
63
|
return value;
|
|
60
64
|
};
|
|
61
65
|
|
|
66
|
+
// A remembered account is `{ name, id }`: the name it was called by and its
|
|
67
|
+
// identity (connector-catalog.mjs connectorAccountId: the random id stored
|
|
68
|
+
// with it). A name can be given to a new account once the old one is
|
|
69
|
+
// removed; the identity cannot, so it binds the choice to the account.
|
|
70
|
+
const readInUse = () => readJsonStateSync(inUseFile(), { validate: validInUse, fallback: {} });
|
|
71
|
+
|
|
72
|
+
// Set in the accounts-in-use file once its name-only records (from before
|
|
73
|
+
// identities) were bound to the accounts then under those names.
|
|
74
|
+
const IDS_MIGRATED = '#ids';
|
|
75
|
+
|
|
76
|
+
const hasId = (account) => typeof account?.id === 'string' && account.id !== '';
|
|
77
|
+
const missingIds = (servers) =>
|
|
78
|
+
Object.values(isRecord(servers) ? servers : {}).some((cfg) => connectorAccountsOf(cfg).some((one) => !hasId(one)));
|
|
79
|
+
|
|
80
|
+
/** Test seam: runs once the config lock that gave the ids is released, before
|
|
81
|
+
* the binding (where another process's write may land). */
|
|
82
|
+
export const accountIdsDeps = { afterIdsGiven: () => {} };
|
|
83
|
+
|
|
84
|
+
/** `servers` with a random id given to every connector account stored
|
|
85
|
+
* without one; null when every account has one. */
|
|
86
|
+
function withAccountIds(servers) {
|
|
87
|
+
if (!missingIds(servers)) return null;
|
|
88
|
+
return Object.fromEntries(
|
|
89
|
+
Object.entries(servers).map(([name, cfg]) => {
|
|
90
|
+
if (!connectorAccountsOf(cfg).some((one) => !hasId(one))) return [name, cfg];
|
|
91
|
+
const accounts = cfg.accounts.map((account) =>
|
|
92
|
+
isRecord(account) && !hasId(account) ? { ...account, id: randomUUID() } : account
|
|
93
|
+
);
|
|
94
|
+
return [name, { ...cfg, accounts }];
|
|
95
|
+
})
|
|
96
|
+
);
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
/**
|
|
100
|
+
* Every stored connector account gets an identity, once, at every start and
|
|
101
|
+
* after a config change (an account written by hand has none). All under the
|
|
102
|
+
* accounts-in-use file's lock, so concurrent runs (processes, runtimes) and
|
|
103
|
+
* choices serialize: the config is changed only where an id is missing (an id
|
|
104
|
+
* once given is never replaced), and the first run also binds each name-only
|
|
105
|
+
* record (from before identities) to the account then under that name, which
|
|
106
|
+
* is where such a record routed until now, and marks that done. A name-only
|
|
107
|
+
* record found afterwards stays unbound (it fails closed). Records already
|
|
108
|
+
* holding an identity are never touched. True when it changed the config.
|
|
109
|
+
*
|
|
110
|
+
* The binding uses the accounts exactly as the ids were given or confirmed:
|
|
111
|
+
* the config is re-read nowhere after that, so an account replaced under the
|
|
112
|
+
* same name meanwhile (by another process) is never the one bound; it fails
|
|
113
|
+
* the identity check instead.
|
|
114
|
+
*/
|
|
115
|
+
export function ensureConnectorAccountIds() {
|
|
116
|
+
let changed = false;
|
|
117
|
+
updateJsonAtomicSync(inUseFile(), (current) => {
|
|
118
|
+
const stored = isRecord(current) ? current : {};
|
|
119
|
+
// The stored servers whose ids the binding below uses.
|
|
120
|
+
let snapshot = readSection('agent')?.mcpServers;
|
|
121
|
+
if (missingIds(snapshot)) {
|
|
122
|
+
updateSection('agent', (agent) => {
|
|
123
|
+
const servers = withAccountIds(agent.mcpServers);
|
|
124
|
+
snapshot = servers ?? agent.mcpServers;
|
|
125
|
+
if (!servers) return agent;
|
|
126
|
+
changed = true;
|
|
127
|
+
return { ...agent, mcpServers: servers };
|
|
128
|
+
});
|
|
129
|
+
accountIdsDeps.afterIdsGiven();
|
|
130
|
+
}
|
|
131
|
+
if (stored[IDS_MIGRATED]) return undefined;
|
|
132
|
+
const servers = Object.values(isRecord(snapshot) ? snapshot : {});
|
|
133
|
+
const next = { ...stored, [IDS_MIGRATED]: true };
|
|
134
|
+
for (const [connector, name] of Object.entries(stored)) {
|
|
135
|
+
if (typeof name !== 'string' || !name) continue;
|
|
136
|
+
const cfg = servers.find((one) => connectorOfServer(one) === connector && connectorAccountsOf(one).length);
|
|
137
|
+
const account = cfg && connectorAccountsOf(cfg).find((one) => one.name === name);
|
|
138
|
+
if (hasId(account)) next[connector] = { name, id: account.id };
|
|
139
|
+
}
|
|
140
|
+
return next;
|
|
141
|
+
});
|
|
142
|
+
return changed;
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
/** The account catalog connector `connector` used last, null when none was
|
|
146
|
+
* recorded. A name-only record (from before identities, unbound) has an
|
|
147
|
+
* empty `id`. */
|
|
148
|
+
export function connectorAccountInUseRecord(connector) {
|
|
149
|
+
const value = readInUse()[connector];
|
|
150
|
+
if (typeof value === 'string') return value ? { name: value, id: '' } : null;
|
|
151
|
+
if (!isRecord(value) || typeof value.name !== 'string' || !value.name) return null;
|
|
152
|
+
return { name: value.name, id: typeof value.id === 'string' ? value.id : '' };
|
|
153
|
+
}
|
|
154
|
+
|
|
62
155
|
/** The name of the account catalog connector `connector` used last, '' when
|
|
63
156
|
* none was recorded. */
|
|
64
157
|
export function connectorAccountInUse(connector) {
|
|
65
|
-
|
|
66
|
-
return typeof stored[connector] === 'string' ? stored[connector] : '';
|
|
158
|
+
return connectorAccountInUseRecord(connector)?.name || '';
|
|
67
159
|
}
|
|
68
160
|
|
|
69
|
-
function rememberAccountInUse(connector,
|
|
70
|
-
|
|
71
|
-
|
|
161
|
+
function rememberAccountInUse(connector, account) {
|
|
162
|
+
const current = connectorAccountInUseRecord(connector);
|
|
163
|
+
if (current?.name === account.name && current.id === account.id) return;
|
|
164
|
+
updateJsonAtomicSync(inUseFile(), (stored) => ({
|
|
165
|
+
...(isRecord(stored) ? stored : {}),
|
|
166
|
+
[connector]: { name: account.name, id: account.id },
|
|
167
|
+
}));
|
|
72
168
|
}
|
|
73
169
|
|
|
74
|
-
|
|
75
|
-
//
|
|
76
|
-
|
|
170
|
+
// Per conversation, in the data dir too, so a conversation resumed after a
|
|
171
|
+
// restart keeps its own account: conversation (its session id) → { accounts:
|
|
172
|
+
// (connector → { name, id }) }. A binding lives as long as its session: it is
|
|
173
|
+
// dropped only when the session is deleted (forgetConversationConnectorAccounts,
|
|
174
|
+
// a session purge hook), never to make room, so no live conversation falls
|
|
175
|
+
// back to another conversation's choice.
|
|
176
|
+
const CONVERSATION_ACCOUNTS_FILE = 'connector-accounts-by-conversation.json';
|
|
177
|
+
const conversationsFile = () => join(resolvePluginData(), CONVERSATION_ACCOUNTS_FILE);
|
|
77
178
|
|
|
78
|
-
/**
|
|
79
|
-
*
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
179
|
+
/** Drop the connector accounts conversation `conversation` used (its session
|
|
180
|
+
* was deleted). */
|
|
181
|
+
export function forgetConversationConnectorAccounts(conversation) {
|
|
182
|
+
const id = text(conversation);
|
|
183
|
+
if (!id || !Object.hasOwn(readJsonStateSync(conversationsFile(), { validate: validInUse, fallback: {} }), id)) return;
|
|
184
|
+
updateJsonAtomicSync(conversationsFile(), (stored) => {
|
|
185
|
+
const { [id]: _gone, ...rest } = isRecord(stored) ? stored : {};
|
|
186
|
+
return rest;
|
|
187
|
+
});
|
|
85
188
|
}
|
|
86
189
|
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
own.
|
|
91
|
-
|
|
92
|
-
|
|
190
|
+
/** The account conversation `conversation` used last on `connector`, or null. */
|
|
191
|
+
function conversationAccount(conversation, connector) {
|
|
192
|
+
const own = readJsonStateSync(conversationsFile(), { validate: validInUse, fallback: {} })[conversation];
|
|
193
|
+
const value = isRecord(own?.accounts) ? own.accounts[connector] : null;
|
|
194
|
+
if (!isRecord(value) || typeof value.name !== 'string' || !value.name) return null;
|
|
195
|
+
return { name: value.name, id: typeof value.id === 'string' ? value.id : '' };
|
|
196
|
+
}
|
|
197
|
+
|
|
198
|
+
function rememberConversationAccount(conversation, connector, account) {
|
|
199
|
+
const current = conversationAccount(conversation, connector);
|
|
200
|
+
if (current?.name === account.name && current.id === account.id) return;
|
|
201
|
+
updateJsonAtomicSync(conversationsFile(), (stored) => {
|
|
202
|
+
const all = isRecord(stored) ? stored : {};
|
|
203
|
+
const accounts = isRecord(all[conversation]?.accounts) ? all[conversation].accounts : {};
|
|
204
|
+
return {
|
|
205
|
+
...all,
|
|
206
|
+
[conversation]: { accounts: { ...accounts, [connector]: { name: account.name, id: account.id } } },
|
|
207
|
+
};
|
|
208
|
+
});
|
|
93
209
|
}
|
|
94
210
|
|
|
95
211
|
const ACCOUNT_PROPERTY = Object.freeze({
|
|
@@ -102,7 +218,9 @@ const ACCOUNT_PROPERTY = Object.freeze({
|
|
|
102
218
|
const canonical = (value) => {
|
|
103
219
|
if (Array.isArray(value)) return `[${value.map(canonical).join(',')}]`;
|
|
104
220
|
if (isRecord(value)) {
|
|
105
|
-
const keys = Object.keys(value)
|
|
221
|
+
const keys = Object.keys(value)
|
|
222
|
+
.filter((key) => value[key] !== undefined)
|
|
223
|
+
.sort();
|
|
106
224
|
return `{${keys.map((key) => `${JSON.stringify(key)}:${canonical(value[key])}`).join(',')}}`;
|
|
107
225
|
}
|
|
108
226
|
return JSON.stringify(value) ?? 'null';
|
|
@@ -146,7 +264,8 @@ const withAccountNote = (result, service, label) => ({
|
|
|
146
264
|
|
|
147
265
|
/**
|
|
148
266
|
* A `fetch` answering the accounts server of `connector` in-process. Each of
|
|
149
|
-
* `accounts` is `{ name, email, connect(signal), callTool(params, { signal, onprogress }) }
|
|
267
|
+
* `accounts` is `{ name, id, email, connect(signal), callTool(params, { signal, onprogress }) }`
|
|
268
|
+
* (`id`: its identity, connector-catalog.mjs connectorAccountId):
|
|
150
269
|
* `connect` resolves `{ instructions, tools }` of that account's own MCP
|
|
151
270
|
* connection, `callTool` sends it one tools/call (reporting its progress to
|
|
152
271
|
* `onprogress`, when given) and resolves the result; both
|
|
@@ -189,9 +308,25 @@ export function withConnectorAccountsMcp({ connector, accounts }) {
|
|
|
189
308
|
[account] = matches;
|
|
190
309
|
} else {
|
|
191
310
|
const remembered =
|
|
192
|
-
(conversation &&
|
|
193
|
-
|
|
194
|
-
|
|
311
|
+
(conversation && conversationAccount(conversation, connector)) || connectorAccountInUseRecord(connector);
|
|
312
|
+
if (remembered) {
|
|
313
|
+
account = accounts.find((one) => one.name === remembered.name);
|
|
314
|
+
// The name must still be the account it named: one removed and its
|
|
315
|
+
// name given to a new account, or a record without an identity (one
|
|
316
|
+
// ensureConnectorAccountIds did not bind, or an account picked before
|
|
317
|
+
// it had an id), fails closed until an account is picked again.
|
|
318
|
+
if (account && !remembered.id) {
|
|
319
|
+
throw refuse(
|
|
320
|
+
`The ${service} account used last (${remembered.name}) cannot be confirmed as the same account.`
|
|
321
|
+
);
|
|
322
|
+
}
|
|
323
|
+
if (account && account.id !== remembered.id) {
|
|
324
|
+
throw refuse(`The ${service} account used last (${remembered.name} (removed)) is not connected now.`);
|
|
325
|
+
}
|
|
326
|
+
if (!account) throw refuse(`The ${service} account used last (${remembered.name}) is not connected now.`);
|
|
327
|
+
} else {
|
|
328
|
+
account = accounts[0];
|
|
329
|
+
}
|
|
195
330
|
}
|
|
196
331
|
if (!usable(account)) throw refuse(`${labelOf(account)} needs a sign-in in Connectors.`);
|
|
197
332
|
const has = toolsOf.get(account.name);
|
|
@@ -275,8 +410,8 @@ export function withConnectorAccountsMcp({ connector, accounts }) {
|
|
|
275
410
|
try {
|
|
276
411
|
account = choose({ tool: name, wanted, conversation });
|
|
277
412
|
if (conversation) {
|
|
278
|
-
rememberConversationAccount(conversation, connector, account
|
|
279
|
-
rememberAccountInUse(connector, account
|
|
413
|
+
rememberConversationAccount(conversation, connector, account);
|
|
414
|
+
rememberAccountInUse(connector, account);
|
|
280
415
|
}
|
|
281
416
|
} catch (error) {
|
|
282
417
|
return reply(errorResult(error?.message || String(error)));
|
|
@@ -289,7 +424,8 @@ export function withConnectorAccountsMcp({ connector, accounts }) {
|
|
|
289
424
|
const progressToken = params?._meta?.progressToken;
|
|
290
425
|
const onprogress =
|
|
291
426
|
notify && progressToken !== undefined
|
|
292
|
-
? (progress) =>
|
|
427
|
+
? (progress) =>
|
|
428
|
+
notify({ jsonrpc: '2.0', method: 'notifications/progress', params: { ...progress, progressToken } })
|
|
293
429
|
: undefined;
|
|
294
430
|
try {
|
|
295
431
|
// An unlisted tool (one only the approval gate calls) is the account's to answer.
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
// for each call. The password is checked with Gmail before it is saved, and
|
|
8
8
|
// never appears in a config, log, error or tool result.
|
|
9
9
|
import { createHash } from 'node:crypto';
|
|
10
|
-
import keychain from '
|
|
10
|
+
import { keychainSecretStore as keychain } from '../shared/config.mjs';
|
|
11
11
|
import { GMAIL_APP_PASSWORD, gmailAddress } from '../shared/connector-catalog.mjs';
|
|
12
12
|
import { connectorAccountsInstructions } from '../shared/connector-accounts.mjs';
|
|
13
13
|
|
|
@@ -724,7 +724,7 @@ const TOOLS = [
|
|
|
724
724
|
|
|
725
725
|
/** The tool definitions (name, description, schema, annotations) the server
|
|
726
726
|
* lists: never the ones only the approval gate calls. */
|
|
727
|
-
|
|
727
|
+
function gmailAppPasswordTools() {
|
|
728
728
|
return TOOLS.filter((tool) => !tool.hidden).map(({ run, hidden: _hidden, ...tool }) => tool);
|
|
729
729
|
}
|
|
730
730
|
|
|
@@ -331,7 +331,7 @@ const SERVICES = {
|
|
|
331
331
|
|
|
332
332
|
/** The tool definitions (name, description, schema, annotations) of built-in
|
|
333
333
|
* Google service `service` (`gmail`, `calendar`, `drive`). */
|
|
334
|
-
|
|
334
|
+
function googleMcpTools(service) {
|
|
335
335
|
return (SERVICES[service]?.tools || []).map(({ run, ...tool }) => tool);
|
|
336
336
|
}
|
|
337
337
|
|
|
@@ -83,7 +83,7 @@ function waitReady(ms) {
|
|
|
83
83
|
});
|
|
84
84
|
}
|
|
85
85
|
|
|
86
|
-
|
|
86
|
+
function effortJudgeModelDir() {
|
|
87
87
|
return process.env.MIXDOG_EFFORT_JUDGE_DIR || join(resolvePluginData(), 'models', 'effort-judge');
|
|
88
88
|
}
|
|
89
89
|
|
|
@@ -280,7 +280,7 @@ async function runInstall() {
|
|
|
280
280
|
* background. Runs on the first judged turn of the process, never at runtime
|
|
281
281
|
* creation, so booting touches no network.
|
|
282
282
|
*/
|
|
283
|
-
|
|
283
|
+
function refreshEffortJudge() {
|
|
284
284
|
if (!onnxRuntimeSupported()) return;
|
|
285
285
|
installEffortJudge().catch((error) => {
|
|
286
286
|
// An older complete install still works.
|
|
@@ -17,7 +17,7 @@ const HEX = /(?<![0-9A-Za-z])[0-9a-fA-F]{12,}(?![0-9A-Za-z])/g;
|
|
|
17
17
|
const SPACES = /[ \t]+/g;
|
|
18
18
|
const BLANK_LINES = /\n[ \t]*\n[\n \t]*/g;
|
|
19
19
|
|
|
20
|
-
|
|
20
|
+
function cleanJudgeText(text) {
|
|
21
21
|
return String(text || '')
|
|
22
22
|
.replace(/\r\n?/g, '\n')
|
|
23
23
|
.replace(ANSI, '')
|
|
@@ -49,10 +49,10 @@ export function judgeInputClean(request, prev) {
|
|
|
49
49
|
// continues), the previous reply's first line (its topic), then as much of the
|
|
50
50
|
// reply's END (what a short approval answers) as remains. Training builds the
|
|
51
51
|
// same id sequence (clean_text.pack_ids) with the identical tokenizer.
|
|
52
|
-
|
|
52
|
+
const PACK_BUDGET = Object.freeze({ request: 64, prevRequest: 24, replyHead: 16 });
|
|
53
53
|
|
|
54
54
|
/** Split the cleaned previous reply into its first line and the remaining text. */
|
|
55
|
-
|
|
55
|
+
function splitReply(reply) {
|
|
56
56
|
const at = reply.indexOf('\n');
|
|
57
57
|
return at < 0 ? [reply, ''] : [reply.slice(0, at), reply.slice(at + 1)];
|
|
58
58
|
}
|
|
@@ -63,7 +63,7 @@ export function splitReply(reply) {
|
|
|
63
63
|
// A result keeps its start and end (where errors and summaries sit); the
|
|
64
64
|
// stored window (2000 + 1000 code points) bounds the cleaning work on huge
|
|
65
65
|
// outputs. Training builds the same text (clean_text.step_judge_text).
|
|
66
|
-
|
|
66
|
+
const STEP_CALLS = 3;
|
|
67
67
|
|
|
68
68
|
export function stepResultWindow(text) {
|
|
69
69
|
const cps = Array.from(String(text ?? ''));
|
|
@@ -32,11 +32,6 @@ export const EXPLORER_SYSTEM_PROMPT = [
|
|
|
32
32
|
const EXPLORER_TOOLS = readOnlyFilesystemTools();
|
|
33
33
|
export const EXPLORER_TOOL_NAMES = Object.freeze(EXPLORER_TOOLS.map((tool) => tool.name));
|
|
34
34
|
|
|
35
|
-
/** Exact provider prefix inputs, for cache-stability checks. */
|
|
36
|
-
export function explorerPrefix() {
|
|
37
|
-
return { system: EXPLORER_SYSTEM_PROMPT, tools: EXPLORER_TOOLS };
|
|
38
|
-
}
|
|
39
|
-
|
|
40
35
|
/**
|
|
41
36
|
* Answer `query` on `route` with `provider`. Resolves the answer text (on a
|
|
42
37
|
* salvage-flagged abort, the text written so far); rejects on failure.
|