mixdog 1.2.1 → 1.2.3
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/README.md +18 -0
- package/package.json +2 -1
- package/scripts/gate-local.mjs +19 -3
- package/scripts/model-catalog-audit.mjs +1 -15
- package/scripts/provider-pingpong-live.mjs +509 -0
- package/src/agents/advisor/AGENT.md +1 -1
- package/src/agents/advisor/agent.json +1 -1
- package/src/agents/reviewer/AGENT.md +3 -3
- package/src/agents/reviewer/agent.json +1 -1
- package/src/defaults/shipped-history.json +6 -0
- package/src/defaults/skills/setup/SKILL.md +6 -1
- package/src/defaults/skills/setup/references/actions.md +44 -22
- package/src/defaults/skills/setup/references/surfaces.md +10 -8
- package/src/headless-exec.mjs +15 -8
- package/src/lib/keychain-cjs.cjs +7 -4
- package/src/output-styles/common.md +11 -10
- package/src/repl/slash-commands.mjs +16 -1
- package/src/rules/agent/AGENT.md +5 -5
- package/src/rules/lead/LEAD.md +5 -5
- package/src/runtime/agent/orchestrator/agent-runtime/agent-progress-watchdog.mjs +29 -4
- package/src/runtime/agent/orchestrator/agent-runtime/cache-strategy.mjs +10 -0
- package/src/runtime/agent/orchestrator/agent-trace-io.mjs +92 -61
- package/src/runtime/agent/orchestrator/cache-mtime.mjs +10 -1
- package/src/runtime/agent/orchestrator/config-providers-merge.mjs +7 -0
- package/src/runtime/agent/orchestrator/config.mjs +5 -0
- package/src/runtime/agent/orchestrator/context/collect.mjs +1 -0
- package/src/runtime/agent/orchestrator/context/deferred-tools.mjs +26 -7
- package/src/runtime/agent/orchestrator/context/skill-catalog.mjs +112 -7
- package/src/runtime/agent/orchestrator/mcp/client-config.mjs +36 -7
- package/src/runtime/agent/orchestrator/mcp/client-handshake.mjs +49 -10
- package/src/runtime/agent/orchestrator/mcp/client-transport.mjs +40 -3
- package/src/runtime/agent/orchestrator/mcp/client.mjs +230 -96
- package/src/runtime/agent/orchestrator/mcp/oauth-callback.mjs +103 -0
- package/src/runtime/agent/orchestrator/mcp/oauth-credentials.mjs +150 -0
- package/src/runtime/agent/orchestrator/mcp/oauth-login.mjs +111 -0
- package/src/runtime/agent/orchestrator/mcp/oauth-probe.mjs +87 -0
- package/src/runtime/agent/orchestrator/mcp/oauth-provider.mjs +95 -0
- package/src/runtime/agent/orchestrator/mcp/oauth-request.mjs +122 -0
- package/src/runtime/agent/orchestrator/mcp/oauth-shared.mjs +9 -0
- package/src/runtime/agent/orchestrator/mcp/oauth.mjs +229 -0
- package/src/runtime/agent/orchestrator/providers/account-pool.mjs +188 -29
- package/src/runtime/agent/orchestrator/providers/anthropic-api-recovery.mjs +2 -1
- package/src/runtime/agent/orchestrator/providers/anthropic-api-request.mjs +48 -20
- package/src/runtime/agent/orchestrator/providers/anthropic-api-transport.mjs +94 -31
- package/src/runtime/agent/orchestrator/providers/anthropic-error-contract.mjs +98 -0
- package/src/runtime/agent/orchestrator/providers/anthropic-fast-mode.mjs +39 -18
- package/src/runtime/agent/orchestrator/providers/anthropic-max-tokens-recovery.mjs +55 -0
- package/src/runtime/agent/orchestrator/providers/anthropic-max-tokens.mjs +48 -37
- package/src/runtime/agent/orchestrator/providers/anthropic-messages.mjs +10 -7
- package/src/runtime/agent/orchestrator/providers/anthropic-midstream-recovery.mjs +18 -4
- package/src/runtime/agent/orchestrator/providers/anthropic-model-resolve.mjs +13 -1
- package/src/runtime/agent/orchestrator/providers/anthropic-oauth-client-version.mjs +1 -1
- package/src/runtime/agent/orchestrator/providers/anthropic-oauth-midstream.mjs +10 -1
- package/src/runtime/agent/orchestrator/providers/anthropic-oauth-recovery.mjs +23 -9
- package/src/runtime/agent/orchestrator/providers/anthropic-oauth-request/initial-status.mjs +46 -20
- package/src/runtime/agent/orchestrator/providers/anthropic-oauth-request.mjs +14 -9
- package/src/runtime/agent/orchestrator/providers/anthropic-oauth.mjs +102 -45
- package/src/runtime/agent/orchestrator/providers/anthropic-overload-fallback.mjs +69 -0
- package/src/runtime/agent/orchestrator/providers/anthropic-server-fallback.mjs +4 -0
- package/src/runtime/agent/orchestrator/providers/anthropic-sse-turn/turn-blocks.mjs +20 -1
- package/src/runtime/agent/orchestrator/providers/anthropic-sse-turn/turn-events/content-block-delta.mjs +15 -2
- package/src/runtime/agent/orchestrator/providers/anthropic-sse-turn/turn-events/content-block-start.mjs +11 -4
- package/src/runtime/agent/orchestrator/providers/anthropic-sse-turn/turn-events/message-events.mjs +3 -0
- package/src/runtime/agent/orchestrator/providers/anthropic-sse-turn/turn-events.mjs +12 -5
- package/src/runtime/agent/orchestrator/providers/anthropic-sse-turn/turn-outcome.mjs +1 -0
- package/src/runtime/agent/orchestrator/providers/anthropic-sse-turn/turn-state.mjs +14 -0
- package/src/runtime/agent/orchestrator/providers/anthropic-sse.mjs +10 -1
- package/src/runtime/agent/orchestrator/providers/anthropic-turn-result.mjs +9 -0
- package/src/runtime/agent/orchestrator/providers/anthropic.mjs +40 -7
- package/src/runtime/agent/orchestrator/providers/antigravity-oauth-catalog.mjs +30 -9
- package/src/runtime/agent/orchestrator/providers/antigravity-oauth.mjs +7 -0
- package/src/runtime/agent/orchestrator/providers/antigravity-request.mjs +88 -21
- package/src/runtime/agent/orchestrator/providers/antigravity-response.mjs +30 -10
- package/src/runtime/agent/orchestrator/providers/antigravity-retry-policy.mjs +106 -0
- package/src/runtime/agent/orchestrator/providers/antigravity-stream.mjs +10 -61
- package/src/runtime/agent/orchestrator/providers/antigravity-transport.mjs +94 -15
- package/src/runtime/agent/orchestrator/providers/codex-client-meta.mjs +1 -1
- package/src/runtime/agent/orchestrator/providers/command-code-oauth.mjs +117 -72
- package/src/runtime/agent/orchestrator/providers/compat-request-policy.mjs +78 -2
- package/src/runtime/agent/orchestrator/providers/cursor-auth.mjs +75 -10
- package/src/runtime/agent/orchestrator/providers/cursor-client-version.mjs +1 -1
- package/src/runtime/agent/orchestrator/providers/cursor-wire-guards.mjs +97 -2
- package/src/runtime/agent/orchestrator/providers/cursor-wire-stream-bridge.mjs +103 -23
- package/src/runtime/agent/orchestrator/providers/cursor-wire-stream-messages.mjs +43 -2
- package/src/runtime/agent/orchestrator/providers/cursor-wire-transport.mjs +103 -33
- package/src/runtime/agent/orchestrator/providers/cursor-wire.mjs +32 -6
- package/src/runtime/agent/orchestrator/providers/cursor.mjs +27 -3
- package/src/runtime/agent/orchestrator/providers/custom-provider-config.mjs +64 -1
- package/src/runtime/agent/orchestrator/providers/custom-provider.mjs +70 -6
- package/src/runtime/agent/orchestrator/providers/custom-reasoning.mjs +34 -7
- package/src/runtime/agent/orchestrator/providers/custom-tool-wire.mjs +32 -6
- package/src/runtime/agent/orchestrator/providers/deepseek.mjs +67 -0
- package/src/runtime/agent/orchestrator/providers/effort-configuration.mjs +80 -18
- package/src/runtime/agent/orchestrator/providers/gemini-cache-policy.mjs +11 -4
- package/src/runtime/agent/orchestrator/providers/gemini-cache.mjs +46 -8
- package/src/runtime/agent/orchestrator/providers/gemini-error-contract.mjs +273 -0
- package/src/runtime/agent/orchestrator/providers/gemini-family.mjs +9 -0
- package/src/runtime/agent/orchestrator/providers/gemini-history-signatures.mjs +9 -4
- package/src/runtime/agent/orchestrator/providers/gemini-request-body.mjs +41 -5
- package/src/runtime/agent/orchestrator/providers/gemini-response.mjs +3 -1
- package/src/runtime/agent/orchestrator/providers/gemini-retry-policy.mjs +180 -0
- package/src/runtime/agent/orchestrator/providers/gemini-schema.mjs +369 -112
- package/src/runtime/agent/orchestrator/providers/gemini-sdk-request.mjs +3 -1
- package/src/runtime/agent/orchestrator/providers/gemini-stream.mjs +140 -35
- package/src/runtime/agent/orchestrator/providers/gemini-thinking.mjs +70 -24
- package/src/runtime/agent/orchestrator/providers/gemini.mjs +80 -29
- package/src/runtime/agent/orchestrator/providers/grok-client-version.mjs +1 -1
- package/src/runtime/agent/orchestrator/providers/grok-oauth-tokens.mjs +3 -0
- package/src/runtime/agent/orchestrator/providers/grok-oauth.mjs +69 -19
- package/src/runtime/agent/orchestrator/providers/lib/action-input-contract.mjs +60 -0
- package/src/runtime/agent/orchestrator/providers/lib/anthropic-native-blocks.mjs +1 -0
- package/src/runtime/agent/orchestrator/providers/lib/anthropic-request-utils.mjs +246 -42
- package/src/runtime/agent/orchestrator/providers/lib/anthropic-server-tool-usage.mjs +18 -0
- package/src/runtime/agent/orchestrator/providers/lib/anthropic-system-blocks.mjs +27 -6
- package/src/runtime/agent/orchestrator/providers/lib/claude-bridge-schema.mjs +388 -0
- package/src/runtime/agent/orchestrator/providers/lib/inclusive-usage.mjs +54 -0
- package/src/runtime/agent/orchestrator/providers/lib/origin-bound-fetch.mjs +16 -0
- package/src/runtime/agent/orchestrator/providers/lib/responses-terminal-fields.mjs +11 -0
- package/src/runtime/agent/orchestrator/providers/lib/usage-primitives.mjs +8 -0
- package/src/runtime/agent/orchestrator/providers/lib/wire-pairing.mjs +48 -22
- package/src/runtime/agent/orchestrator/providers/media-normalization.mjs +119 -18
- package/src/runtime/agent/orchestrator/providers/mimo-oauth-profile.mjs +13 -15
- package/src/runtime/agent/orchestrator/providers/mimo-oauth.mjs +3 -0
- package/src/runtime/agent/orchestrator/providers/model-list-sanitize.mjs +2 -1
- package/src/runtime/agent/orchestrator/providers/model-proxy-channel.d.mts +1 -1
- package/src/runtime/agent/orchestrator/providers/model-proxy-channel.mjs +1 -0
- package/src/runtime/agent/orchestrator/providers/model-proxy-provider.mjs +33 -1
- package/src/runtime/agent/orchestrator/providers/muse-code-oauth.mjs +4 -9
- package/src/runtime/agent/orchestrator/providers/oauth-credential-probes.mjs +2 -0
- package/src/runtime/agent/orchestrator/providers/openai-codex-metadata.mjs +2 -0
- package/src/runtime/agent/orchestrator/providers/openai-compat-chat-send.mjs +123 -61
- package/src/runtime/agent/orchestrator/providers/openai-compat-chat-stream/chunk-events.mjs +35 -14
- package/src/runtime/agent/orchestrator/providers/openai-compat-chat-stream/stream-result.mjs +27 -2
- package/src/runtime/agent/orchestrator/providers/openai-compat-chat-stream/stream-state.mjs +37 -7
- package/src/runtime/agent/orchestrator/providers/openai-compat-chat-stream/tool-call-acc.mjs +2 -9
- package/src/runtime/agent/orchestrator/providers/openai-compat-chat-stream.mjs +1 -0
- package/src/runtime/agent/orchestrator/providers/openai-compat-error-contract.mjs +50 -0
- package/src/runtime/agent/orchestrator/providers/openai-compat-models.mjs +47 -2
- package/src/runtime/agent/orchestrator/providers/openai-compat-options.mjs +47 -25
- package/src/runtime/agent/orchestrator/providers/openai-compat-presets.mjs +5 -1
- package/src/runtime/agent/orchestrator/providers/openai-compat-reasoning-field.mjs +151 -0
- package/src/runtime/agent/orchestrator/providers/openai-compat-response-normalization.mjs +64 -23
- package/src/runtime/agent/orchestrator/providers/openai-compat-responses-events.mjs +79 -33
- package/src/runtime/agent/orchestrator/providers/openai-compat-responses-head-parity.json +2901 -0
- package/src/runtime/agent/orchestrator/providers/openai-compat-responses-parity.fixtures.mjs +172 -0
- package/src/runtime/agent/orchestrator/providers/openai-compat-responses-state.mjs +3 -2
- package/src/runtime/agent/orchestrator/providers/openai-compat-responses.mjs +144 -15
- package/src/runtime/agent/orchestrator/providers/openai-compat-retry-profile.mjs +193 -0
- package/src/runtime/agent/orchestrator/providers/openai-compat-stream-common.mjs +66 -2
- package/src/runtime/agent/orchestrator/providers/openai-compat-stream.mjs +9 -2
- package/src/runtime/agent/orchestrator/providers/openai-compat-trace.mjs +2 -0
- package/src/runtime/agent/orchestrator/providers/openai-compat-wire.mjs +109 -26
- package/src/runtime/agent/orchestrator/providers/openai-compat-xai-send.mjs +27 -6
- package/src/runtime/agent/orchestrator/providers/openai-compat-xai.mjs +34 -20
- package/src/runtime/agent/orchestrator/providers/openai-compat.mjs +23 -4
- package/src/runtime/agent/orchestrator/providers/openai-direct-request.mjs +37 -28
- package/src/runtime/agent/orchestrator/providers/openai-error-contract.mjs +274 -0
- package/src/runtime/agent/orchestrator/providers/openai-http-sse-request.mjs +72 -32
- package/src/runtime/agent/orchestrator/providers/openai-http-sse-response-state/response-events/output-items.mjs +23 -10
- package/src/runtime/agent/orchestrator/providers/openai-http-sse-response-state/response-events/terminal-frames.mjs +43 -15
- package/src/runtime/agent/orchestrator/providers/openai-http-sse-response-state/response-events.mjs +10 -0
- package/src/runtime/agent/orchestrator/providers/openai-http-sse-response-state/response-items.mjs +18 -7
- package/src/runtime/agent/orchestrator/providers/openai-http-sse-response-state/response-outcome.mjs +5 -2
- package/src/runtime/agent/orchestrator/providers/openai-http-sse-response-state/response-stamps.mjs +2 -2
- package/src/runtime/agent/orchestrator/providers/openai-http-sse-response-state/response-state.mjs +7 -3
- package/src/runtime/agent/orchestrator/providers/openai-http-sse-response-state/text-relay.mjs +9 -1
- package/src/runtime/agent/orchestrator/providers/openai-http-sse-response-state.mjs +2 -2
- package/src/runtime/agent/orchestrator/providers/openai-http-sse-watchdogs.mjs +1 -3
- package/src/runtime/agent/orchestrator/providers/openai-model-capabilities.mjs +80 -0
- package/src/runtime/agent/orchestrator/providers/openai-oauth-dispatch.mjs +37 -4
- package/src/runtime/agent/orchestrator/providers/openai-oauth-http-sse.mjs +12 -1
- package/src/runtime/agent/orchestrator/providers/openai-oauth-tokens.mjs +22 -2
- package/src/runtime/agent/orchestrator/providers/openai-oauth.mjs +12 -1
- package/src/runtime/agent/orchestrator/providers/openai-responses-input.mjs +76 -33
- package/src/runtime/agent/orchestrator/providers/openai-responses-payload-parity.fixture.json +323 -0
- package/src/runtime/agent/orchestrator/providers/openai-responses-payload.mjs +44 -16
- package/src/runtime/agent/orchestrator/providers/openai-retry-policy.mjs +9 -0
- package/src/runtime/agent/orchestrator/providers/openai-ws-delta.mjs +7 -16
- package/src/runtime/agent/orchestrator/providers/openai-ws-handshake.mjs +16 -8
- package/src/runtime/agent/orchestrator/providers/openai-ws-response-state/refusals.mjs +60 -0
- package/src/runtime/agent/orchestrator/providers/openai-ws-response-state/tool-calls.mjs +51 -35
- package/src/runtime/agent/orchestrator/providers/openai-ws-response-state.mjs +30 -0
- package/src/runtime/agent/orchestrator/providers/openai-ws-send-attempts/attempt-context.mjs +1 -2
- package/src/runtime/agent/orchestrator/providers/openai-ws-send-attempts/policy.mjs +25 -14
- package/src/runtime/agent/orchestrator/providers/openai-ws-stream/event-switch.mjs +12 -0
- package/src/runtime/agent/orchestrator/providers/openai-ws-stream/terminal-frames.mjs +25 -6
- package/src/runtime/agent/orchestrator/providers/openai-ws-terminal.mjs +18 -11
- package/src/runtime/agent/orchestrator/providers/openai-ws.mjs +41 -22
- package/src/runtime/agent/orchestrator/providers/opencode-go-gemini.mjs +170 -0
- package/src/runtime/agent/orchestrator/providers/opencode-go.mjs +75 -70
- package/src/runtime/agent/orchestrator/providers/openrouter.mjs +75 -0
- package/src/runtime/agent/orchestrator/providers/provider-error-kind.mjs +720 -0
- package/src/runtime/agent/orchestrator/providers/registry.mjs +4 -1
- package/src/runtime/agent/orchestrator/providers/retry-backoff.mjs +46 -7
- package/src/runtime/agent/orchestrator/providers/retry-classification.mjs +123 -219
- package/src/runtime/agent/orchestrator/providers/retry-classifier.mjs +2 -0
- package/src/runtime/agent/orchestrator/providers/retry-executor.mjs +148 -45
- package/src/runtime/agent/orchestrator/providers/retry-midstream.mjs +81 -16
- package/src/runtime/agent/orchestrator/providers/transport-scope.d.mts +6 -0
- package/src/runtime/agent/orchestrator/providers/transport-scope.mjs +28 -0
- package/src/runtime/agent/orchestrator/providers/wire-gateway.mjs +157 -0
- package/src/runtime/agent/orchestrator/providers/wire-route.mjs +512 -0
- package/src/runtime/agent/orchestrator/providers/xai-tool-search-head-parity.json +1131 -0
- package/src/runtime/agent/orchestrator/providers/xai-tool-search.fixtures.mjs +183 -0
- package/src/runtime/agent/orchestrator/runtime-core/ask-user-tool-defs.mjs +100 -0
- package/src/runtime/agent/orchestrator/runtime-core/config-helpers.mjs +3 -0
- package/src/runtime/agent/orchestrator/runtime-core/deferred-tool-availability.mjs +21 -0
- package/src/runtime/agent/orchestrator/runtime-core/effort.mjs +15 -0
- package/src/runtime/agent/orchestrator/runtime-core/goal-reminder.mjs +0 -18
- package/src/runtime/agent/orchestrator/runtime-core/model-capabilities.mjs +57 -28
- package/src/runtime/agent/orchestrator/runtime-core/orchestration.mjs +19 -16
- package/src/runtime/agent/orchestrator/runtime-core/plugin-mcp.mjs +1 -97
- package/src/runtime/agent/orchestrator/runtime-core/provider-request-snapshot.mjs +7 -3
- package/src/runtime/agent/orchestrator/runtime-core/session-title.mjs +21 -1
- package/src/runtime/agent/orchestrator/runtime-core/skill-tool-loading.mjs +14 -3
- package/src/runtime/agent/orchestrator/runtime-core/tool-bridge.mjs +526 -0
- package/src/runtime/agent/orchestrator/runtime-core/tool-catalog-data.mjs +3 -0
- package/src/runtime/agent/orchestrator/runtime-core/tool-catalog-schema.mjs +10 -7
- package/src/runtime/agent/orchestrator/runtime-core/tool-catalog.mjs +176 -71
- package/src/runtime/agent/orchestrator/runtime-core/tool-defs.mjs +62 -10
- package/src/runtime/agent/orchestrator/runtime-core/tool-exposure.mjs +96 -0
- package/src/runtime/agent/orchestrator/session/catalog-db/schema.mjs +5 -1
- package/src/runtime/agent/orchestrator/session/compact/constants.mjs +3 -2
- package/src/runtime/agent/orchestrator/session/compact/messages.mjs +14 -93
- package/src/runtime/agent/orchestrator/session/compact/summary-anchor.mjs +5 -0
- package/src/runtime/agent/orchestrator/session/compact/user-message-kind.mjs +120 -0
- package/src/runtime/agent/orchestrator/session/context-tool-schema.mjs +17 -2
- package/src/runtime/agent/orchestrator/session/context-utils.mjs +8 -4
- package/src/runtime/agent/orchestrator/session/eager-dispatch/admission.mjs +2 -1
- package/src/runtime/agent/orchestrator/session/eager-dispatch.mjs +6 -1
- package/src/runtime/agent/orchestrator/session/loop/compact-policy.mjs +91 -1
- package/src/runtime/agent/orchestrator/session/loop/completion-guards.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/loop/context-overflow.mjs +56 -0
- package/src/runtime/agent/orchestrator/session/loop/deferred-call-through.mjs +18 -8
- package/src/runtime/agent/orchestrator/session/loop/loop-state.mjs +1 -0
- package/src/runtime/agent/orchestrator/session/loop/pre-dispatch-deny.mjs +21 -10
- package/src/runtime/agent/orchestrator/session/loop/provider-tool-exclusions.mjs +132 -0
- package/src/runtime/agent/orchestrator/session/loop/request-boundary.mjs +30 -0
- package/src/runtime/agent/orchestrator/session/loop/send-phase.mjs +67 -20
- package/src/runtime/agent/orchestrator/session/loop/step-auto-effort.mjs +104 -19
- package/src/runtime/agent/orchestrator/session/loop/tool-call-resolution.mjs +95 -0
- package/src/runtime/agent/orchestrator/session/loop/tool-exec/before-hook.mjs +30 -3
- package/src/runtime/agent/orchestrator/session/loop/tool-exec/dispatch.mjs +15 -4
- package/src/runtime/agent/orchestrator/session/loop/tool-exec.mjs +15 -1
- package/src/runtime/agent/orchestrator/session/loop/tool-exposure-migration.mjs +150 -0
- package/src/runtime/agent/orchestrator/session/loop/tool-phase.mjs +7 -2
- package/src/runtime/agent/orchestrator/session/manager/ask-queue.mjs +30 -2
- package/src/runtime/agent/orchestrator/session/manager/ask-session.mjs +11 -2
- package/src/runtime/agent/orchestrator/session/manager/ask-turn-auto-effort.mjs +2 -1
- package/src/runtime/agent/orchestrator/session/manager/ask-turn-commit.mjs +34 -12
- package/src/runtime/agent/orchestrator/session/manager/ask-turn-execute.mjs +57 -21
- package/src/runtime/agent/orchestrator/session/manager/ask-turn-loop-options.mjs +57 -25
- package/src/runtime/agent/orchestrator/session/manager/ask-turn-prepare.mjs +6 -0
- package/src/runtime/agent/orchestrator/session/manager/ask-turn-settle.mjs +4 -0
- package/src/runtime/agent/orchestrator/session/manager/compaction-runner.mjs +8 -0
- package/src/runtime/agent/orchestrator/session/manager/pending-message-entry.mjs +5 -10
- package/src/runtime/agent/orchestrator/session/manager/prompt-utils.mjs +208 -14
- package/src/runtime/agent/orchestrator/session/manager/session-close.mjs +16 -4
- package/src/runtime/agent/orchestrator/session/manager/session-crud.mjs +25 -3
- package/src/runtime/agent/orchestrator/session/manager/session-fallback-title.mjs +82 -0
- package/src/runtime/agent/orchestrator/session/manager/session-lifecycle.mjs +19 -2
- package/src/runtime/agent/orchestrator/session/manager/session-record.mjs +3 -0
- package/src/runtime/agent/orchestrator/session/manager/tool-resolution.mjs +4 -1
- package/src/runtime/agent/orchestrator/session/manager/turn-interruption.mjs +18 -7
- package/src/runtime/agent/orchestrator/session/manager.mjs +2 -1
- package/src/runtime/agent/orchestrator/session/pre-send-compact.mjs +6 -0
- package/src/runtime/agent/orchestrator/session/send-with-recovery.mjs +168 -29
- package/src/runtime/agent/orchestrator/session/side-question-store.mjs +96 -0
- package/src/runtime/agent/orchestrator/session/side-question.mjs +192 -0
- package/src/runtime/agent/orchestrator/session/store/lifecycle-barriers.mjs +17 -3
- package/src/runtime/agent/orchestrator/session/store/live-state.mjs +23 -0
- package/src/runtime/agent/orchestrator/session/store/paths-heartbeat.mjs +58 -2
- package/src/runtime/agent/orchestrator/session/store/save-worker.mjs +6 -3
- package/src/runtime/agent/orchestrator/session/store/session-delete.mjs +41 -28
- package/src/runtime/agent/orchestrator/session/store/session-observers.mjs +4 -2
- package/src/runtime/agent/orchestrator/session/store/sweep/sweep-finish.mjs +12 -1
- package/src/runtime/agent/orchestrator/session/store/write-admission.mjs +3 -1
- package/src/runtime/agent/orchestrator/session/store/write-guards.mjs +16 -0
- package/src/runtime/agent/orchestrator/session/store-agent-worker-rows.mjs +22 -10
- package/src/runtime/agent/orchestrator/session/store-summary-archived-agent.mjs +34 -15
- package/src/runtime/agent/orchestrator/session/store-summary-catalog.mjs +6 -0
- package/src/runtime/agent/orchestrator/session/store-summary-fields.mjs +13 -0
- package/src/runtime/agent/orchestrator/session/store-summary-index.mjs +13 -1
- package/src/runtime/agent/orchestrator/session/store-summary-reader.mjs +10 -2
- package/src/runtime/agent/orchestrator/session/store.mjs +19 -3
- package/src/runtime/agent/orchestrator/session/tool-batch/execute-call.mjs +1 -0
- package/src/runtime/agent/orchestrator/session/tool-batch/finalize.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/tool-batch/record-outcome.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/tool-batch/state.mjs +7 -1
- package/src/runtime/agent/orchestrator/session/tool-result-offload.mjs +4 -0
- package/src/runtime/agent/orchestrator/session/tool-schema-rejection.mjs +77 -0
- package/src/runtime/agent/orchestrator/session/transcript-restore/restore.mjs +20 -1
- package/src/runtime/agent/orchestrator/tools/bash-policy-scan.mjs +8 -2
- package/src/runtime/agent/orchestrator/tools/builtin/arg-guard.mjs +2 -2
- package/src/runtime/agent/orchestrator/tools/builtin/bash-tool/command-preflight.mjs +3 -3
- package/src/runtime/agent/orchestrator/tools/builtin/bash-tool/deadline-plan.mjs +12 -15
- package/src/runtime/agent/orchestrator/tools/builtin/bash-tool.mjs +4 -1
- package/src/runtime/agent/orchestrator/tools/builtin/builtin-tools.mjs +5 -5
- package/src/runtime/agent/orchestrator/tools/builtin/external-tool-adapters.mjs +14 -10
- package/src/runtime/agent/orchestrator/tools/builtin/lib/shell-job-records.mjs +49 -34
- package/src/runtime/agent/orchestrator/tools/builtin/runtime-capabilities.mjs +23 -1
- package/src/runtime/agent/orchestrator/tools/code-graph/dispatch/root-resolution.mjs +1 -1
- package/src/runtime/agent/orchestrator/tools/code-graph/search.mjs +1 -1
- package/src/runtime/agent/orchestrator/tools/patch/ui-diff.mjs +73 -39
- package/src/runtime/agent/orchestrator/tools/progress-message.mjs +18 -1
- package/src/runtime/agent/orchestrator/tools/shell-command.mjs +7 -4
- package/src/runtime/agent/orchestrator/tools/shell-exec-policy.mjs +88 -12
- package/src/runtime/agent/orchestrator/tools/shell-policy.mjs +2 -0
- package/src/runtime/computer-bridge/action-schema.mjs +44 -21
- package/src/runtime/github/tool.mjs +92 -2
- package/src/runtime/memory/index.mjs +1 -0
- package/src/runtime/memory/lib/http-router/ingest-routes.mjs +22 -1
- package/src/runtime/memory/lib/ingest/transcript-offsets.mjs +2 -0
- package/src/runtime/memory/lib/pg/adapter.mjs +98 -1
- package/src/runtime/memory/lib/pg/process.mjs +65 -50
- package/src/runtime/memory/lib/pg/run-child.mjs +49 -0
- package/src/runtime/memory/lib/pg/supervisor.mjs +124 -16
- package/src/runtime/memory/lib/runtime-fetcher.mjs +12 -13
- package/src/runtime/memory/lib/transcript-ingest.mjs +14 -0
- package/src/runtime/office/README.md +2 -2
- package/src/runtime/office/authoring/html-document-author.mjs +2 -0
- package/src/runtime/office/authoring/pptx-contact-sheet.mjs +2 -0
- package/src/runtime/office/authoring/pptx-html-measure.mjs +2 -0
- package/src/runtime/office/authoring/pptx-html-runner.mjs +2 -0
- package/src/runtime/office/authoring/xlsx-html-runner.mjs +2 -0
- package/src/runtime/office/core/office-actions-read.mjs +3 -0
- package/src/runtime/office/core/office-render-preview.mjs +2 -0
- package/src/runtime/office/core/office-session-dispatch.mjs +7 -0
- package/src/runtime/office/core/office-sessionless-actions.mjs +8 -0
- package/src/runtime/office/core/office-sessions.mjs +5 -0
- package/src/runtime/office/core/office-transactions.mjs +3 -0
- package/src/runtime/office/core/office-write-ledger.mjs +98 -0
- package/src/runtime/office/design/library/templates/mixdog-executive.mixdog-edit.pptx +0 -0
- package/src/runtime/office/index.mjs +30 -0
- package/src/runtime/office/pdf/pdf-edit-document.mjs +2 -0
- package/src/runtime/office/pdf/pdf-render.mjs +23 -7
- package/src/runtime/office/pdf/pdf-security.mjs +2 -0
- package/src/runtime/office/portable/portable-opc.mjs +4 -1
- package/src/runtime/office/quality/visual-diff.mjs +2 -0
- package/src/runtime/office/shared/values.mjs +0 -5
- package/src/runtime/shared/background-tasks.mjs +92 -14
- package/src/runtime/shared/bounded-file-read.mjs +13 -0
- package/src/runtime/shared/bounded-line-diff.mjs +182 -0
- package/src/runtime/shared/buffered-appender.mjs +18 -0
- package/src/runtime/shared/config.mjs +78 -18
- package/src/runtime/shared/err-text.mjs +31 -0
- package/src/runtime/shared/error-presentation.mjs +159 -19
- package/src/runtime/shared/file-permissions.d.mts +6 -1
- package/src/runtime/shared/file-permissions.mjs +54 -6
- package/src/runtime/shared/llm/anthropic-betas.mjs +4 -3
- package/src/runtime/shared/llm/anthropic-effort.mjs +129 -134
- package/src/runtime/shared/llm/anthropic-thinking-contract.mjs +50 -14
- package/src/runtime/shared/llm/model-catalog.mjs +53 -40
- package/src/runtime/shared/llm/openai-daybreak.mjs +4 -16
- package/src/runtime/shared/llm/provider-catalog-registry.mjs +11 -0
- package/src/runtime/shared/llm/provider-model-identities.mjs +13 -4
- package/src/runtime/shared/llm/usage-accounting.mjs +5 -2
- package/src/runtime/shared/llm/usage-ledger-rollup.mjs +3 -0
- package/src/runtime/shared/llm/usage-rollup.mjs +0 -1
- package/src/runtime/shared/loopback-listener.mjs +9 -0
- package/src/runtime/shared/model-display.mjs +13 -0
- package/src/runtime/shared/provider-api-key.mjs +2 -0
- package/src/runtime/shared/quota-resume-store.mjs +11 -0
- package/src/runtime/shared/review-diff.mjs +52 -0
- package/src/runtime/shared/session-baseline-store.mjs +960 -0
- package/src/runtime/shared/session-sidebar-host.d.mts +4 -0
- package/src/runtime/shared/session-sidebar-host.mjs +38 -0
- package/src/runtime/shared/slow-span.mjs +114 -0
- package/src/runtime/shared/statusline/statusline-format.mjs +4 -4
- package/src/runtime/shared/statusline/statusline-segments.mjs +28 -4
- package/src/runtime/shared/task-notification-envelope.mjs +2 -2
- package/src/runtime/shared/tool-card-model/card-header.mjs +6 -1
- package/src/runtime/shared/tool-card-model/generic-detail.mjs +39 -5
- package/src/runtime/shared/tool-card-model.mjs +5 -2
- package/src/runtime/shared/tool-output-limit.mjs +4 -0
- package/src/runtime/shared/tool-primitives.mjs +13 -0
- package/src/runtime/shared/tool-result-summary.mjs +8 -1
- package/src/runtime/shared/tool-surface.mjs +18 -3
- package/src/runtime/shared/tool-work-units.mjs +40 -4
- package/src/runtime/shared/transcript-writer/purge.mjs +74 -0
- package/src/runtime/shared/transcript-writer.mjs +10 -2
- package/src/runtime/shared/turn-changes.mjs +670 -274
- package/src/runtime/shared/turn-review-reply.mjs +8 -39
- package/src/runtime/shared/turn-snapshot-store.mjs +94 -2
- package/src/runtime/shared/turn-snapshot.mjs +986 -690
- package/src/runtime/shared/turn-worktree-snapshot.mjs +279 -262
- package/src/runtime/shared/user-data-guard.mjs +262 -49
- package/src/runtime/shared/worktrees/carry.mjs +531 -0
- package/src/runtime/shared/worktrees/contract.mjs +34 -24
- package/src/runtime/shared/worktrees/file-recovery.mjs +68 -0
- package/src/runtime/shared/worktrees/git-head.mjs +205 -0
- package/src/runtime/shared/worktrees/git.mjs +8 -3
- package/src/runtime/shared/worktrees/maintenance.mjs +1 -1
- package/src/runtime/shared/worktrees/manager.mjs +156 -8
- package/src/runtime/shared/worktrees/merge.mjs +31 -21
- package/src/runtime/shared/worktrees/paths.d.mts +6 -0
- package/src/runtime/shared/worktrees/test-support.mjs +19 -4
- package/src/runtime/terminal-bridge/client.mjs +44 -11
- package/src/runtime/terminal-bridge/tool-defs.mjs +13 -6
- package/src/runtime/tidy/apply.mjs +47 -2
- package/src/runtime/tidy/run-engines.mjs +11 -5
- package/src/session-runtime/agent-tool-routing.mjs +19 -13
- package/src/session-runtime/boot/apis.mjs +19 -5
- package/src/session-runtime/boot/facade.mjs +1 -0
- package/src/session-runtime/boot/infrastructure.mjs +12 -1
- package/src/session-runtime/boot/session.mjs +0 -1
- package/src/session-runtime/boot/tools.mjs +4 -1
- package/src/session-runtime/cwd-plugins/cwd-apply.mjs +12 -5
- package/src/session-runtime/internal-tool-executor/ask-user-tool.mjs +65 -0
- package/src/session-runtime/internal-tool-executor/bridge-tools.mjs +3 -1
- package/src/session-runtime/internal-tool-executor/knowledge-tools.mjs +11 -4
- package/src/session-runtime/internal-tool-executor/workspace-tools.mjs +115 -18
- package/src/session-runtime/internal-tool-executor.mjs +6 -2
- package/src/session-runtime/lifecycle/cold-heir.mjs +188 -0
- package/src/session-runtime/lifecycle/inheritance.mjs +71 -27
- package/src/session-runtime/lifecycle/session-catalog.mjs +14 -3
- package/src/session-runtime/lifecycle/session-switch/resume.mjs +6 -0
- package/src/session-runtime/lifecycle/session-switch/session-delete.mjs +29 -6
- package/src/session-runtime/lifecycle/teardown.mjs +73 -8
- package/src/session-runtime/lifecycle-api.mjs +1 -0
- package/src/session-runtime/mcp-glue/connect.mjs +46 -14
- package/src/session-runtime/mcp-glue/server-catalog.mjs +20 -3
- package/src/session-runtime/mcp-glue.mjs +3 -0
- package/src/session-runtime/mcp-oauth-login.mjs +174 -0
- package/src/session-runtime/model-route/model-switch-target.mjs +34 -0
- package/src/session-runtime/model-route/set-route.mjs +85 -17
- package/src/session-runtime/model-route/web-search-route.mjs +1 -1
- package/src/session-runtime/native-web-search/routes.mjs +22 -3
- package/src/session-runtime/native-web-search-usage.mjs +51 -0
- package/src/session-runtime/native-web-search.mjs +10 -1
- package/src/session-runtime/new-session-config.mjs +4 -2
- package/src/session-runtime/provider-auth/login.mjs +4 -0
- package/src/session-runtime/provider-models/model-meta.mjs +12 -3
- package/src/session-runtime/quick-model-rows/web-search-rows.mjs +13 -8
- package/src/session-runtime/quick-web-search-models.mjs +13 -38
- package/src/session-runtime/resource-extension-sync.mjs +4 -0
- package/src/session-runtime/resource-mcp-api.mjs +98 -2
- package/src/session-runtime/resource-scope-decorate.mjs +10 -3
- package/src/session-runtime/runtime-review-api.mjs +21 -2
- package/src/session-runtime/services/agent-tool/index-write-queue.mjs +81 -20
- package/src/session-runtime/services/agent-tool/job-task-reconcile.mjs +13 -1
- package/src/session-runtime/services/agent-tool/job-views/agent-list.mjs +7 -2
- package/src/session-runtime/services/agent-tool/lead-worker-index/forgotten-leads.mjs +29 -0
- package/src/session-runtime/services/agent-tool/lead-worker-index/index-file.mjs +1 -1
- package/src/session-runtime/services/agent-tool/lead-worker-index.mjs +73 -7
- package/src/session-runtime/services/agent-tool/send-flow.mjs +22 -4
- package/src/session-runtime/services/agent-tool/spawn-flow/job-start.mjs +2 -0
- package/src/session-runtime/services/agent-tool/spawn-flow/spawn-run.mjs +22 -5
- package/src/session-runtime/services/agent-tool/tag-registry.mjs +15 -1
- package/src/session-runtime/services/agent-tool/worker-index/row-liveness.mjs +8 -1
- package/src/session-runtime/services/agent-tool/worker-index/row-shape.mjs +2 -2
- package/src/session-runtime/services/agent-tool/worker-index/row-store.mjs +10 -1
- package/src/session-runtime/services/agent-tool/worker-index.mjs +46 -7
- package/src/session-runtime/services/agent-tool/worker-rows.mjs +17 -0
- package/src/session-runtime/services/agent-tool.mjs +3 -0
- package/src/session-runtime/services/channel-admin.mjs +19 -3
- package/src/session-runtime/services/memory-runtime-proxy/calls.mjs +4 -0
- package/src/session-runtime/services/memory-runtime-proxy.mjs +1 -0
- package/src/session-runtime/services/provider-admin.mjs +81 -15
- package/src/session-runtime/session-transcript-purge.mjs +32 -0
- package/src/session-runtime/session-turn-api.mjs +14 -5
- package/src/session-runtime/settings-builtin-tools-api.mjs +9 -0
- package/src/session-runtime/settings-compaction-api.mjs +1 -0
- package/src/session-runtime/setup-tool/executor.mjs +36 -6
- package/src/session-runtime/setup-tool/extended-actions.mjs +86 -6
- package/src/session-runtime/setup-tool/settings-contract.mjs +13 -3
- package/src/session-runtime/setup-tool/tool-defs.mjs +13 -4
- package/src/session-runtime/skills-api.mjs +3 -5
- package/src/session-runtime/tool-surface.mjs +5 -1
- package/src/session-runtime/turn/compaction-gate.mjs +25 -0
- package/src/session-runtime/turn/session-ops.mjs +7 -5
- package/src/session-runtime/turn/side-question-ops.mjs +22 -0
- package/src/session-runtime/turn/turn-run/ask-callbacks.mjs +5 -1
- package/src/session-runtime/turn/turn-run/turn-prepare.mjs +8 -3
- package/src/session-runtime/turn/turn-run/turn-settle.mjs +10 -0
- package/src/session-runtime/turn/turn-run/turn-timing.mjs +4 -3
- package/src/session-runtime/turn/turn-run.mjs +25 -9
- package/src/session-runtime/usage-stats-api.mjs +43 -11
- package/src/session-runtime/workspace/project-branches.mjs +7 -5
- package/src/session-runtime/workspace/transition-steps.mjs +129 -31
- package/src/session-runtime/workspace/transitions.mjs +190 -15
- package/src/standalone/daemon-agent-control.mjs +9 -1
- package/src/standalone/daemon-drain-policy.mjs +8 -0
- package/src/standalone/daemon-local-session-bridge.mjs +14 -1
- package/src/standalone/daemon-owner.mjs +17 -4
- package/src/standalone/daemon-pg-stop.mjs +51 -0
- package/src/standalone/daemon-stop-budget.d.mts +2 -0
- package/src/standalone/daemon-stop-budget.mjs +18 -0
- package/src/standalone/daemon-stored-session-views.mjs +2 -0
- package/src/standalone/daemon-telemetry.mjs +74 -0
- package/src/standalone/daemon.mjs +64 -8
- package/src/standalone/desktop-service-registry.mjs +5 -0
- package/src/standalone/local-session-runtime.mjs +70 -19
- package/src/standalone/session-client.mjs +42 -0
- package/src/standalone/session-protocol.mjs +14 -0
- package/src/standalone/session-proxy/projection.mjs +41 -4
- package/src/standalone/session-runtime-inline-host/boot-loaders.mjs +15 -1
- package/src/standalone/session-runtime-inline-host.mjs +1 -0
- package/src/standalone/session-service/agent-tree/agent-cancel.mjs +33 -2
- package/src/standalone/session-service/agent-tree/agent-turns.mjs +26 -10
- package/src/standalone/session-service/agent-tree.mjs +12 -0
- package/src/standalone/session-service/quota-resume.mjs +8 -0
- package/src/standalone/session-service/retention/busy.mjs +15 -1
- package/src/standalone/session-service/session-calls/session-action.mjs +18 -3
- package/src/standalone/session-service-api.mjs +11 -1
- package/src/standalone/session-service.mjs +1 -0
- package/src/standalone/session-state-patch.d.mts +2 -1
- package/src/standalone/session-state-patch.mjs +41 -1
- package/src/tui/App.jsx +25 -0
- package/src/tui/app/app-view/floating-panel.jsx +26 -1
- package/src/tui/app/app-view.jsx +1 -0
- package/src/tui/app/btw-controller.mjs +118 -0
- package/src/tui/app/create-app-pickers.mjs +6 -0
- package/src/tui/app/extension-pickers/mcp-login.mjs +107 -0
- package/src/tui/app/extension-pickers/mcp-servers-picker.mjs +2 -1
- package/src/tui/app/extension-pickers.mjs +2 -1
- package/src/tui/app/model-options.mjs +11 -16
- package/src/tui/app/shell-layout/row-budgets.mjs +11 -1
- package/src/tui/app/shell-layout/surfaces.mjs +3 -1
- package/src/tui/app/slash-commands.mjs +20 -5
- package/src/tui/app/slash-dispatch/panel-commands.mjs +16 -1
- package/src/tui/app/slash-dispatch/session-commands.mjs +19 -6
- package/src/tui/app/use-global-key-input/approval-shortcut.mjs +12 -0
- package/src/tui/app/use-global-key-input.mjs +5 -12
- package/src/tui/app/use-prompt-handlers.mjs +11 -0
- package/src/tui/components/BtwPanel.jsx +53 -0
- package/src/tui/components/QuestionPanel.jsx +275 -0
- package/src/tui/components/StatusLine.jsx +2 -0
- package/src/tui/components/question-panel-model.mjs +156 -0
- package/src/tui/components/status-line/local-line.mjs +5 -2
- package/src/tui/components/status-line/use-statusline-text.mjs +7 -1
- package/src/tui/dist/index.mjs +3221 -1500
- package/src/tui/session/context-state.mjs +4 -2
- package/src/tui/session/quota-resume.mjs +46 -14
- package/src/tui/session/session-api/commands.mjs +43 -24
- package/src/tui/session/session-api/controls.mjs +2 -2
- package/src/tui/session/session-api/extensions.mjs +22 -0
- package/src/tui/session/session-api/integrations.mjs +16 -2
- package/src/tui/session/session-api/lifecycle/dispose.mjs +1 -0
- package/src/tui/session/session-api/lifecycle.mjs +7 -2
- package/src/tui/session/session-api/routes.mjs +71 -7
- package/src/tui/session/session-api/settings.mjs +11 -14
- package/src/tui/session/session-api.mjs +1 -0
- package/src/tui/session/session-flow/drain.mjs +7 -1
- package/src/tui/session/session-flow/failed-turn-rewind.mjs +10 -4
- package/src/tui/session/tool-approval.mjs +10 -7
- package/src/tui/session/transcript-spill.mjs +14 -7
- package/src/tui/session/turn-stream.mjs +174 -31
- package/src/tui/session/turn.mjs +46 -16
- package/src/tui/statusline-ansi-bridge.mjs +1 -1
- package/src/ui/statusline-agents.mjs +15 -4
- package/src/ui/statusline.mjs +7 -3
- package/src/ui/streaming-markdown-heal.mjs +34 -3
- package/src/vendor/statusline/src/gateway/claude-current.mjs +14 -4
- package/src/workflows/default/WORKFLOW.md +3 -1
- package/src/runtime/memory/lib/memory-session-merge.mjs +0 -32
- package/src/runtime/shared/llm/usage-session-history.mjs +0 -266
|
@@ -37,6 +37,7 @@ export function createAppPickers({
|
|
|
37
37
|
setSettingsPrompt,
|
|
38
38
|
setOnboardingActive,
|
|
39
39
|
closeUsagePanel,
|
|
40
|
+
btw,
|
|
40
41
|
oauthSubmitRef,
|
|
41
42
|
clearModelCaches,
|
|
42
43
|
onboardingRef,
|
|
@@ -88,6 +89,8 @@ export function createAppPickers({
|
|
|
88
89
|
const {
|
|
89
90
|
openMcpServersPicker,
|
|
90
91
|
openMcpPicker,
|
|
92
|
+
loginMcpServer,
|
|
93
|
+
logoutMcpServer,
|
|
91
94
|
openProjectSkillsPicker,
|
|
92
95
|
openSkillsPicker,
|
|
93
96
|
openSkillDetailPicker,
|
|
@@ -205,6 +208,7 @@ export function createAppPickers({
|
|
|
205
208
|
normalizeSlashCommandName,
|
|
206
209
|
surface,
|
|
207
210
|
closeUsagePanel,
|
|
211
|
+
btw,
|
|
208
212
|
openModelPicker: (...a) => openModelPicker(...a),
|
|
209
213
|
modelSwitchNotice,
|
|
210
214
|
openWebSearchPicker: (...a) => openWebSearchPicker(...a),
|
|
@@ -219,6 +223,8 @@ export function createAppPickers({
|
|
|
219
223
|
enterProject: (...a) => enterProject(...a),
|
|
220
224
|
openProjectPicker: (...a) => openProjectPicker(...a),
|
|
221
225
|
openMcpPicker: (...a) => openMcpPicker(...a),
|
|
226
|
+
loginMcpServer,
|
|
227
|
+
logoutMcpServer,
|
|
222
228
|
openSkillsPicker: (...a) => openSkillsPicker(...a),
|
|
223
229
|
openPluginsPicker: (...a) => openPluginsPicker(...a),
|
|
224
230
|
openProviderSetupPicker: (...a) => openProviderSetupPicker(...a),
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
// extension-pickers/mcp-login.mjs
|
|
2
|
+
// `/mcp login <name>` and `/mcp logout <name>`. The sign-in URL is always
|
|
3
|
+
// printed (and kept in the live prompt); the runtime may open the browser. The
|
|
4
|
+
// flow is polled while a paste prompt (the shared 'oauth-code' provider prompt)
|
|
5
|
+
// accepts the final redirect address. Pasted text is never echoed.
|
|
6
|
+
const POLL_MS = 1500;
|
|
7
|
+
|
|
8
|
+
export function createMcpLogin({ store, setProviderPrompt, pollMs = POLL_MS }) {
|
|
9
|
+
let active = null;
|
|
10
|
+
|
|
11
|
+
const stop = (flow) => {
|
|
12
|
+
flow.finished = true;
|
|
13
|
+
clearTimeout(flow.timer);
|
|
14
|
+
if (active === flow) active = null;
|
|
15
|
+
};
|
|
16
|
+
|
|
17
|
+
const closePrompt = (flow) => setProviderPrompt((prompt) => (prompt === flow.prompt ? null : prompt));
|
|
18
|
+
|
|
19
|
+
const showPrompt = (flow) => {
|
|
20
|
+
if (flow.finished) return;
|
|
21
|
+
const prompt = {
|
|
22
|
+
kind: 'oauth-code',
|
|
23
|
+
providerName: `MCP ${flow.name}`,
|
|
24
|
+
// The shared prompt pushes the one completion notice; no provider picker follows.
|
|
25
|
+
successReturn: () => {},
|
|
26
|
+
label: `MCP sign-in · ${flow.name}`,
|
|
27
|
+
hint: 'If the browser page fails to load, paste its address here.',
|
|
28
|
+
detail: flow.url,
|
|
29
|
+
login: {
|
|
30
|
+
completeCode: async (text) => {
|
|
31
|
+
const result = await store.completeMcpOAuthLogin(flow.id, text);
|
|
32
|
+
if (result?.state !== 'complete') throw new Error(result?.error || 'sign-in did not complete');
|
|
33
|
+
stop(flow);
|
|
34
|
+
},
|
|
35
|
+
cancel: () => {
|
|
36
|
+
if (flow.finished) return;
|
|
37
|
+
stop(flow);
|
|
38
|
+
void Promise.resolve(store.cancelMcpOAuthLogin(flow.id)).catch(() => {});
|
|
39
|
+
store.pushNotice(`MCP sign-in cancelled for ${flow.name}`, 'info');
|
|
40
|
+
},
|
|
41
|
+
},
|
|
42
|
+
failureReturn: () => showPrompt(flow),
|
|
43
|
+
};
|
|
44
|
+
flow.prompt = prompt;
|
|
45
|
+
setProviderPrompt(prompt);
|
|
46
|
+
};
|
|
47
|
+
|
|
48
|
+
const poll = (flow) => {
|
|
49
|
+
flow.timer = setTimeout(async () => {
|
|
50
|
+
if (flow.finished) return;
|
|
51
|
+
let status;
|
|
52
|
+
try {
|
|
53
|
+
status = await store.getMcpOAuthLoginStatus(flow.id);
|
|
54
|
+
} catch (e) {
|
|
55
|
+
if (flow.finished) return;
|
|
56
|
+
stop(flow);
|
|
57
|
+
closePrompt(flow);
|
|
58
|
+
store.pushNotice(`MCP sign-in failed for ${flow.name}: ${e?.message || e}`, 'error');
|
|
59
|
+
return;
|
|
60
|
+
}
|
|
61
|
+
if (flow.finished) return;
|
|
62
|
+
if (status?.state === 'pending') {
|
|
63
|
+
poll(flow);
|
|
64
|
+
return;
|
|
65
|
+
}
|
|
66
|
+
stop(flow);
|
|
67
|
+
closePrompt(flow);
|
|
68
|
+
if (status?.state === 'complete') store.pushNotice(`MCP sign-in complete for ${flow.name}`, 'info');
|
|
69
|
+
else if (status?.state === 'cancelled') store.pushNotice(`MCP sign-in cancelled for ${flow.name}`, 'info');
|
|
70
|
+
else store.pushNotice(`MCP sign-in failed for ${flow.name}${status?.error ? `: ${status.error}` : ''}`, 'error');
|
|
71
|
+
}, pollMs);
|
|
72
|
+
};
|
|
73
|
+
|
|
74
|
+
const loginMcpServer = async (name) => {
|
|
75
|
+
if (active) {
|
|
76
|
+
const previous = active;
|
|
77
|
+
stop(previous);
|
|
78
|
+
closePrompt(previous);
|
|
79
|
+
void Promise.resolve(store.cancelMcpOAuthLogin(previous.id)).catch(() => {});
|
|
80
|
+
}
|
|
81
|
+
try {
|
|
82
|
+
const started = await store.beginMcpOAuthLogin(name, { openBrowser: true });
|
|
83
|
+
if (started?.state === 'complete') {
|
|
84
|
+
store.pushNotice(`MCP sign-in complete for ${name}`, 'info');
|
|
85
|
+
return;
|
|
86
|
+
}
|
|
87
|
+
const flow = { id: started.flowId, name, url: started.url || '', finished: false, timer: null, prompt: null };
|
|
88
|
+
active = flow;
|
|
89
|
+
if (flow.url) store.pushNotice(`Sign in to ${name}: ${flow.url}`, 'info');
|
|
90
|
+
showPrompt(flow);
|
|
91
|
+
poll(flow);
|
|
92
|
+
} catch (e) {
|
|
93
|
+
store.pushNotice(`MCP sign-in failed for ${name}: ${e?.message || e}`, 'error');
|
|
94
|
+
}
|
|
95
|
+
};
|
|
96
|
+
|
|
97
|
+
const logoutMcpServer = async (name) => {
|
|
98
|
+
try {
|
|
99
|
+
await store.signOutMcpServer(name);
|
|
100
|
+
store.pushNotice(`MCP signed out of ${name}`, 'info');
|
|
101
|
+
} catch (e) {
|
|
102
|
+
store.pushNotice(`MCP sign-out failed for ${name}: ${e?.message || e}`, 'error');
|
|
103
|
+
}
|
|
104
|
+
};
|
|
105
|
+
|
|
106
|
+
return { loginMcpServer, logoutMcpServer };
|
|
107
|
+
}
|
|
@@ -8,8 +8,9 @@ const serverDescription = (server, pending, optimistic) => {
|
|
|
8
8
|
const transport = server.transport || 'unknown';
|
|
9
9
|
if (pending) return `${optimistic.enabled ? 'enabling' : 'disabling'}… · ${transport}`;
|
|
10
10
|
const error = server.error ? ` · ${server.error}` : '';
|
|
11
|
+
const signIn = server.authRequired ? ` · sign-in required: /mcp login ${server.name}` : '';
|
|
11
12
|
return withScope(
|
|
12
|
-
`${server.source || 'config'} · ${server.status || 'unknown'} · ${transport} · ${server.toolCount || 0} tools${error}`,
|
|
13
|
+
`${server.source || 'config'} · ${server.status || 'unknown'} · ${transport} · ${server.toolCount || 0} tools${error}${signIn}`,
|
|
13
14
|
server
|
|
14
15
|
);
|
|
15
16
|
};
|
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
* store state, so they can't be pure. openMcpPicker is exposed for the
|
|
8
8
|
* plugin-detail enable-mcp path (also aliased on the App body).
|
|
9
9
|
*/
|
|
10
|
+
import { createMcpLogin } from './extension-pickers/mcp-login.mjs';
|
|
10
11
|
import { createMcpServersPicker } from './extension-pickers/mcp-servers-picker.mjs';
|
|
11
12
|
import { createPluginsPickers } from './extension-pickers/plugins-pickers.mjs';
|
|
12
13
|
import { createSkillsPickers } from './extension-pickers/skills-pickers.mjs';
|
|
@@ -43,5 +44,5 @@ export function createExtensionPickers({
|
|
|
43
44
|
setSettingsPrompt,
|
|
44
45
|
openMcpPicker: mcp.openMcpPicker,
|
|
45
46
|
});
|
|
46
|
-
return { ...mcp, ...skills, ...plugins };
|
|
47
|
+
return { ...mcp, ...createMcpLogin({ store, setProviderPrompt }), ...skills, ...plugins };
|
|
47
48
|
}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* displayModelName formatter.
|
|
7
7
|
*/
|
|
8
8
|
import { theme } from '../theme.mjs';
|
|
9
|
-
import { displayModelName } from '../../runtime/shared/model-display.mjs';
|
|
9
|
+
import { displayModelName, effortDisplayLabel } from '../../runtime/shared/model-display.mjs';
|
|
10
10
|
import { isRollingModelAlias } from '../../runtime/shared/model-alias.mjs';
|
|
11
11
|
import { DAYBREAK_PROVIDER, daybreakBlueOn } from '../../runtime/shared/llm/openai-daybreak.mjs';
|
|
12
12
|
|
|
@@ -248,18 +248,7 @@ const PROVIDER_DISPLAY_RANKS = {
|
|
|
248
248
|
|
|
249
249
|
export const providerDisplayRank = (provider) => PROVIDER_DISPLAY_RANKS[String(provider || '').toLowerCase()] ?? 900;
|
|
250
250
|
|
|
251
|
-
|
|
252
|
-
String(value || '')
|
|
253
|
-
.split(/([\s_-]+)/)
|
|
254
|
-
.map((part) => (/^[\s_-]+$/.test(part) ? part : `${part.charAt(0).toUpperCase()}${part.slice(1).toLowerCase()}`))
|
|
255
|
-
.join('');
|
|
256
|
-
|
|
257
|
-
export const effortDisplayLabel = (value) => {
|
|
258
|
-
const text = String(value || '').trim();
|
|
259
|
-
if (!text) return '';
|
|
260
|
-
if (text.toLowerCase() === 'xhigh') return 'XHigh';
|
|
261
|
-
return titleCaseOption(text);
|
|
262
|
-
};
|
|
251
|
+
export { effortDisplayLabel };
|
|
263
252
|
|
|
264
253
|
export const fastDisplayLabel = (enabled = true) => `Fast ${enabled ? 'On' : 'Off'}`;
|
|
265
254
|
|
|
@@ -330,9 +319,15 @@ export const buildProviderModelItems = (models, provider, currentRoute = null) =
|
|
|
330
319
|
}));
|
|
331
320
|
};
|
|
332
321
|
|
|
333
|
-
//
|
|
322
|
+
// The configured speed tier: Ultrafast when the fast route asks for it.
|
|
323
|
+
const routeSpeedLabel = (route) => {
|
|
324
|
+
if (!route?.fast) return '';
|
|
325
|
+
return route.modelParameters?.serviceTier === 'ultrafast' ? 'Ultrafast' : 'Fast';
|
|
326
|
+
};
|
|
327
|
+
|
|
328
|
+
// Model · Effort · Fast/Ultrafast, dropping the empty parts.
|
|
334
329
|
const routeModelDetails = (route) =>
|
|
335
|
-
[routeModelDisplayName(route), route.effort ? effortDisplayLabel(route.effort) : '', route
|
|
330
|
+
[routeModelDisplayName(route), route.effort ? effortDisplayLabel(route.effort) : '', routeSpeedLabel(route)]
|
|
336
331
|
.filter(Boolean)
|
|
337
332
|
.join(' · ');
|
|
338
333
|
|
|
@@ -348,7 +343,7 @@ export const agentModelProfile = (route) => (route?.model ? routeModelDetails(ro
|
|
|
348
343
|
export const agentModelParts = (route) => [
|
|
349
344
|
{ text: route?.model ? routeModelDisplayName(route) : '', width: 17 },
|
|
350
345
|
{ text: route?.effort ? effortDisplayLabel(route.effort) : '', width: 6 },
|
|
351
|
-
{ text: route
|
|
346
|
+
{ text: routeSpeedLabel(route), width: 9 },
|
|
352
347
|
];
|
|
353
348
|
|
|
354
349
|
export const routeFromModel = (model, effort = null) => ({
|
|
@@ -5,7 +5,9 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { isLiveSpinnerMetaVisible } from '../live-spinner-visibility.mjs';
|
|
7
7
|
import { promptContentRows, wrappedDetailRows, queuedBandRows } from '../text-layout.mjs';
|
|
8
|
+
import { questionPanelRows, questionsOf } from '../../components/question-panel-model.mjs';
|
|
8
9
|
import { CORE_MULTILINE_TEXT_ENTRY_KINDS } from '../panel-signature.mjs';
|
|
10
|
+
import { btwPanelRows } from '../btw-controller.mjs';
|
|
9
11
|
|
|
10
12
|
const SCROLL_HINT_ROWS = 0;
|
|
11
13
|
const LIVE_STATUS_ROWS = 0;
|
|
@@ -114,20 +116,25 @@ function floatingPanelBudget({
|
|
|
114
116
|
picker,
|
|
115
117
|
contextPanel,
|
|
116
118
|
usagePanel,
|
|
119
|
+
btwPanel,
|
|
117
120
|
slashPaletteOpen,
|
|
118
121
|
hasTextEntryPrompt,
|
|
119
122
|
TEXT_ENTRY_ROWS,
|
|
120
123
|
OPTION_PANEL_EXTRA_ROWS,
|
|
121
124
|
maxFloatingPanelRows,
|
|
125
|
+
frameColumns,
|
|
122
126
|
}) {
|
|
123
127
|
let desiredFloatingPanelRows = 0;
|
|
124
|
-
if (toolApproval
|
|
128
|
+
if (toolApproval?.kind === 'question' && questionsOf(toolApproval).length > 0) {
|
|
129
|
+
desiredFloatingPanelRows = questionPanelRows(questionsOf(toolApproval), frameColumns);
|
|
130
|
+
} else if (toolApproval) desiredFloatingPanelRows = PANEL_CHROME_ROWS + 2 + OPTION_PANEL_EXTRA_ROWS;
|
|
125
131
|
else if (picker?.fillAvailable) desiredFloatingPanelRows = maxFloatingPanelRows;
|
|
126
132
|
else if (picker) desiredFloatingPanelRows = PANEL_BASE_ROWS + OPTION_PANEL_EXTRA_ROWS;
|
|
127
133
|
else if (contextPanel) desiredFloatingPanelRows = PANEL_BASE_ROWS + OPTION_PANEL_EXTRA_ROWS + 3;
|
|
128
134
|
else if (usagePanel) desiredFloatingPanelRows = PANEL_BASE_ROWS + OPTION_PANEL_EXTRA_ROWS;
|
|
129
135
|
else if (slashPaletteOpen) desiredFloatingPanelRows = SLASH_PALETTE_ROWS;
|
|
130
136
|
else if (hasTextEntryPrompt) desiredFloatingPanelRows = TEXT_ENTRY_ROWS;
|
|
137
|
+
else if (btwPanel) desiredFloatingPanelRows = btwPanelRows(btwPanel, frameColumns);
|
|
131
138
|
const floatingPanelRows = desiredFloatingPanelRows > 0 ? Math.min(desiredFloatingPanelRows, maxFloatingPanelRows) : 0;
|
|
132
139
|
// Give the list every content row the panel exposes. The panel already grew
|
|
133
140
|
// by OPTION_PANEL_EXTRA_ROWS; previously that growth was subtracted back out
|
|
@@ -174,6 +181,7 @@ export function computeRowBudgets({
|
|
|
174
181
|
picker,
|
|
175
182
|
contextPanel,
|
|
176
183
|
usagePanel,
|
|
184
|
+
btwPanel,
|
|
177
185
|
slashPaletteOpen,
|
|
178
186
|
}) {
|
|
179
187
|
const { textEntryPrompt, hasTextEntryPrompt, hasFloatingPanel, expandedOptionPanel, inputBoxHidden } = surfaces;
|
|
@@ -211,11 +219,13 @@ export function computeRowBudgets({
|
|
|
211
219
|
picker,
|
|
212
220
|
contextPanel,
|
|
213
221
|
usagePanel,
|
|
222
|
+
btwPanel,
|
|
214
223
|
slashPaletteOpen,
|
|
215
224
|
hasTextEntryPrompt,
|
|
216
225
|
TEXT_ENTRY_ROWS: textEntry.TEXT_ENTRY_ROWS,
|
|
217
226
|
OPTION_PANEL_EXTRA_ROWS,
|
|
218
227
|
maxFloatingPanelRows,
|
|
228
|
+
frameColumns,
|
|
219
229
|
});
|
|
220
230
|
const rows = {
|
|
221
231
|
floatingPanelRows: panel.floatingPanelRows,
|
|
@@ -10,6 +10,7 @@ export function deriveSurfaces({
|
|
|
10
10
|
picker,
|
|
11
11
|
contextPanel,
|
|
12
12
|
usagePanel,
|
|
13
|
+
btwPanel,
|
|
13
14
|
slashPaletteOpen,
|
|
14
15
|
tuiReady,
|
|
15
16
|
state,
|
|
@@ -24,7 +25,8 @@ export function deriveSurfaces({
|
|
|
24
25
|
contextPanel ||
|
|
25
26
|
usagePanel ||
|
|
26
27
|
slashPaletteOpen ||
|
|
27
|
-
hasTextEntryPrompt
|
|
28
|
+
hasTextEntryPrompt ||
|
|
29
|
+
btwPanel
|
|
28
30
|
);
|
|
29
31
|
const expandedOptionPanel = !!(toolApproval || picker || contextPanel || usagePanel || hasTextEntryPrompt);
|
|
30
32
|
if (panelTransitionRef.current.signature.includes('picker:project') && !picker) {
|
|
@@ -15,6 +15,12 @@ export const SLASH_COMMANDS = [
|
|
|
15
15
|
description: 'Switch working directory (project)',
|
|
16
16
|
},
|
|
17
17
|
{ name: 'compact', usage: '/compact', description: 'Compact older conversation context' },
|
|
18
|
+
{
|
|
19
|
+
name: 'btw',
|
|
20
|
+
usage: '/btw',
|
|
21
|
+
params: '<question>',
|
|
22
|
+
description: 'Ask a quick side question without interrupting the current work',
|
|
23
|
+
},
|
|
18
24
|
{
|
|
19
25
|
name: 'goal',
|
|
20
26
|
usage: '/goal',
|
|
@@ -30,9 +36,12 @@ export const SLASH_COMMANDS = [
|
|
|
30
36
|
{ name: 'resume', usage: '/resume', params: '[id]', description: 'Resume a saved chat' },
|
|
31
37
|
{ name: 'context', usage: '/context', description: 'Show current context surface' },
|
|
32
38
|
{
|
|
33
|
-
name: '
|
|
34
|
-
usage: '/
|
|
35
|
-
|
|
39
|
+
name: 'fork',
|
|
40
|
+
usage: '/fork',
|
|
41
|
+
aliases: ['inherit'],
|
|
42
|
+
aliasUsage: ['inherit'],
|
|
43
|
+
showAliasUsage: false,
|
|
44
|
+
description: 'Fork this conversation into a new session on the current model',
|
|
36
45
|
},
|
|
37
46
|
{ name: 'usage', usage: '/usage', params: '[refresh]', description: 'Show total provider quota / balance' },
|
|
38
47
|
{ name: 'model', usage: '/model', params: '[name|refresh]', description: 'Switch model for subsequent turns' },
|
|
@@ -50,8 +59,13 @@ export const SLASH_COMMANDS = [
|
|
|
50
59
|
{ name: 'theme', usage: '/theme', params: '[id]', description: 'Change the TUI color theme' },
|
|
51
60
|
{ name: 'agents', usage: '/agents', params: '[refresh]', description: 'Show available workflow agents' },
|
|
52
61
|
{ name: 'effort', usage: '/effort', params: '[level]', description: 'Set reasoning effort for the current model' },
|
|
53
|
-
{
|
|
54
|
-
|
|
62
|
+
{
|
|
63
|
+
name: 'fast',
|
|
64
|
+
usage: '/fast',
|
|
65
|
+
params: '[on|off|ultra]',
|
|
66
|
+
description: 'Set Fast or Ultrafast mode for the current model',
|
|
67
|
+
},
|
|
68
|
+
{ name: 'mcp', usage: '/mcp', params: '[login|logout <name>]', description: 'Manage MCP servers and tools' },
|
|
55
69
|
{ name: 'skills', usage: '/skills', description: 'Choose a skill for the next request' },
|
|
56
70
|
{ name: 'memory', usage: '/memory', params: '[status|core ...]', description: 'List and edit core memories' },
|
|
57
71
|
{ name: 'plugins', usage: '/plugins', description: 'Manage local plugin integrations' },
|
|
@@ -104,6 +118,7 @@ export function overlayBlocksGlobalTranscriptScroll(owner = {}) {
|
|
|
104
118
|
owner.toolApproval ||
|
|
105
119
|
owner.contextPanel ||
|
|
106
120
|
owner.usagePanel ||
|
|
121
|
+
owner.btwPanel ||
|
|
107
122
|
owner.providerPrompt ||
|
|
108
123
|
owner.settingsPrompt
|
|
109
124
|
);
|
|
@@ -14,6 +14,8 @@ const desktopOnlyNotice = (ctx) => {
|
|
|
14
14
|
return true;
|
|
15
15
|
};
|
|
16
16
|
|
|
17
|
+
const openMcpPanel = panelCommand('mcp', 'MCP Servers', (deps) => deps.openMcpPicker());
|
|
18
|
+
|
|
17
19
|
const openSettings = panelCommand('settings', 'Settings', (deps) => deps.openSettingsPicker());
|
|
18
20
|
|
|
19
21
|
export const panelCommands = {
|
|
@@ -26,7 +28,20 @@ export const panelCommands = {
|
|
|
26
28
|
ctx.openSlashPanel('project', 'Projects', () => ctx.deps.openProjectPicker());
|
|
27
29
|
return true;
|
|
28
30
|
},
|
|
29
|
-
mcp
|
|
31
|
+
mcp(ctx, arg) {
|
|
32
|
+
const [sub, ...rest] = arg.trim().split(/\s+/);
|
|
33
|
+
const action = sub?.toLowerCase();
|
|
34
|
+
if (action === 'login' || action === 'logout') {
|
|
35
|
+
const name = rest.join(' ');
|
|
36
|
+
if (!name) {
|
|
37
|
+
ctx.store.pushNotice(`usage: /mcp ${action} <name>`, 'warn');
|
|
38
|
+
return true;
|
|
39
|
+
}
|
|
40
|
+
void (action === 'login' ? ctx.deps.loginMcpServer(name) : ctx.deps.logoutMcpServer(name));
|
|
41
|
+
return true;
|
|
42
|
+
}
|
|
43
|
+
return openMcpPanel(ctx);
|
|
44
|
+
},
|
|
30
45
|
skills: panelCommand('skills', 'Skills', (deps) => deps.openSkillsPicker()),
|
|
31
46
|
plugins: panelCommand('plugins', 'Plugins', (deps) => deps.openPluginsPicker()),
|
|
32
47
|
providers: panelCommand('providers', 'Providers', (deps) => deps.openProviderSetupPicker()),
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
// slash-dispatch/session-commands.mjs
|
|
2
2
|
// Slash commands that act on the session itself: clear/new, compact, goal,
|
|
3
|
-
// resume, inherit, doctor and quit. Busy guards refuse the destructive ones
|
|
3
|
+
// resume, fork (alias inherit), doctor and quit. Busy guards refuse the destructive ones
|
|
4
4
|
// while a turn or session command is running.
|
|
5
5
|
import { presentErrorText } from '../../../runtime/shared/err-text.mjs';
|
|
6
|
+
import { BTW_USAGE_HINT } from '../btw-controller.mjs';
|
|
6
7
|
|
|
7
8
|
function compactFailureNotice(error) {
|
|
8
9
|
if (error == null || String(error).trim() === '') return 'Compact failed.';
|
|
@@ -63,6 +64,18 @@ export const sessionCommands = {
|
|
|
63
64
|
return true;
|
|
64
65
|
},
|
|
65
66
|
|
|
67
|
+
// Side question: allowed mid-turn; never queued, steered, or interrupting.
|
|
68
|
+
btw(ctx, arg) {
|
|
69
|
+
const { store, deps } = ctx;
|
|
70
|
+
const question = String(arg || '').trim();
|
|
71
|
+
if (!question) {
|
|
72
|
+
store.pushNotice(BTW_USAGE_HINT, 'warn');
|
|
73
|
+
return true;
|
|
74
|
+
}
|
|
75
|
+
deps.btw.ask(question);
|
|
76
|
+
return true;
|
|
77
|
+
},
|
|
78
|
+
|
|
66
79
|
goal(ctx, arg) {
|
|
67
80
|
const { store } = ctx;
|
|
68
81
|
void Promise.resolve(store.goalControl?.({ command: arg }))
|
|
@@ -91,18 +104,18 @@ export const sessionCommands = {
|
|
|
91
104
|
return true;
|
|
92
105
|
},
|
|
93
106
|
|
|
94
|
-
|
|
107
|
+
fork(ctx, _arg, rawName) {
|
|
95
108
|
const { state, store } = ctx;
|
|
96
|
-
if (state.busy) return refuseWhileBusy(store, 'inherit');
|
|
109
|
+
if (state.busy) return refuseWhileBusy(store, rawName === 'inherit' ? 'inherit' : 'fork');
|
|
97
110
|
void Promise.resolve(store.inheritSession?.())
|
|
98
111
|
.then((result) => {
|
|
99
112
|
if (!result) {
|
|
100
|
-
store.pushNotice('nothing to
|
|
113
|
+
store.pushNotice('nothing to fork', 'warn');
|
|
101
114
|
return;
|
|
102
115
|
}
|
|
103
|
-
store.pushNotice(`
|
|
116
|
+
store.pushNotice(`forked ${result.messages} messages into ${result.sessionId}`, 'info');
|
|
104
117
|
})
|
|
105
|
-
.catch((e) => store.pushNotice(`
|
|
118
|
+
.catch((e) => store.pushNotice(`fork failed: ${e?.message || e}`, 'error'));
|
|
106
119
|
return true;
|
|
107
120
|
},
|
|
108
121
|
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
// Global tool-approval shortcuts: Esc/d/n deny, a/y approve. Returns the
|
|
2
|
+
// decision to resolve with, or null. Question approvals (ask_user) are
|
|
3
|
+
// answered only inside QuestionPanel, so typed letters and Esc never reach here.
|
|
4
|
+
export function approvalShortcutDecision(toolApproval, input, key) {
|
|
5
|
+
if (!toolApproval || toolApproval.kind === 'question') return null;
|
|
6
|
+
const value = String(input || '')
|
|
7
|
+
.trim()
|
|
8
|
+
.toLowerCase();
|
|
9
|
+
if (key.escape || value === 'd' || value === 'n') return { approved: false, reason: 'denied by user' };
|
|
10
|
+
if (value === 'a' || value === 'y') return { approved: true, reason: 'approved by user' };
|
|
11
|
+
return null;
|
|
12
|
+
}
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
import { useInput } from 'ink';
|
|
9
9
|
import { overlayBlocksGlobalTranscriptScroll } from './slash-commands.mjs';
|
|
10
10
|
import { copyActiveSelection } from './use-global-key-input/copy-first.mjs';
|
|
11
|
+
import { approvalShortcutDecision } from './use-global-key-input/approval-shortcut.mjs';
|
|
11
12
|
import { decodeSelectionMoveChord } from './use-global-key-input/shift-arrow.mjs';
|
|
12
13
|
export function useGlobalKeyInput({
|
|
13
14
|
store,
|
|
@@ -43,18 +44,10 @@ export function useGlobalKeyInput({
|
|
|
43
44
|
// settle it through the same path a real release takes, before any branch
|
|
44
45
|
// below reads the selection.
|
|
45
46
|
settleStuckDrag?.();
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
if (key.escape || value === 'd' || value === 'n') {
|
|
51
|
-
store.resolveToolApproval?.(toolApproval.id, { approved: false, reason: 'denied by user' });
|
|
52
|
-
return;
|
|
53
|
-
}
|
|
54
|
-
if (value === 'a' || value === 'y') {
|
|
55
|
-
store.resolveToolApproval?.(toolApproval.id, { approved: true, reason: 'approved by user' });
|
|
56
|
-
return;
|
|
57
|
-
}
|
|
47
|
+
const decision = approvalShortcutDecision(toolApproval, input, key);
|
|
48
|
+
if (decision) {
|
|
49
|
+
store.resolveToolApproval?.(toolApproval.id, decision);
|
|
50
|
+
return;
|
|
58
51
|
}
|
|
59
52
|
if (key.ctrl && (input === 'c' || input === 'C')) {
|
|
60
53
|
copyActiveSelection({ promptSelectionRef, dragRef, copySelection, showSelectionCopyHint });
|
|
@@ -36,6 +36,8 @@ export function usePromptHandlers({
|
|
|
36
36
|
usagePanel,
|
|
37
37
|
closeUsagePanel,
|
|
38
38
|
contextPanel,
|
|
39
|
+
btwPanel,
|
|
40
|
+
closeBtwPanel,
|
|
39
41
|
// paste-attachment helpers (owned by App, threaded in explicitly)
|
|
40
42
|
installPastedImages,
|
|
41
43
|
clearPastedImagesSnapshot,
|
|
@@ -72,6 +74,13 @@ export function usePromptHandlers({
|
|
|
72
74
|
return true;
|
|
73
75
|
}
|
|
74
76
|
|
|
77
|
+
// /btw side panel: Esc closes it (cancelling a pending ask) before the
|
|
78
|
+
// turn interrupt / draft handling sees the key.
|
|
79
|
+
if (btwPanel) {
|
|
80
|
+
closeBtwPanel();
|
|
81
|
+
return true;
|
|
82
|
+
}
|
|
83
|
+
|
|
75
84
|
if (meta.phase === 'clear-arm') {
|
|
76
85
|
showPromptHint('Esc again to clear', 'plain', PROMPT_ESCAPE_HINT_TIMEOUT_MS);
|
|
77
86
|
return true;
|
|
@@ -107,6 +116,8 @@ export function usePromptHandlers({
|
|
|
107
116
|
},
|
|
108
117
|
[
|
|
109
118
|
contextPanel,
|
|
119
|
+
btwPanel,
|
|
120
|
+
closeBtwPanel,
|
|
110
121
|
surface,
|
|
111
122
|
usagePanel,
|
|
112
123
|
closeUsagePanel,
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* components/BtwPanel.jsx — transient `/btw` side-question panel above the prompt.
|
|
3
|
+
*/
|
|
4
|
+
import { useEffect, useState } from 'react';
|
|
5
|
+
import { Box, Text, useInput } from 'ink';
|
|
6
|
+
import { theme } from '../theme.mjs';
|
|
7
|
+
import { Markdown } from './Markdown.jsx';
|
|
8
|
+
import { BTW_CHROME_ROWS, btwContentRows, btwScrollMax, btwScrollOffset } from '../app/btw-controller.mjs';
|
|
9
|
+
|
|
10
|
+
export function BtwPanel({ panel, columns = 80, panelRows, themeEpoch = 0 }) {
|
|
11
|
+
const bodyRows = Math.max(1, (panelRows ?? BTW_CHROME_ROWS + 1) - BTW_CHROME_ROWS);
|
|
12
|
+
const total = btwContentRows(panel, columns);
|
|
13
|
+
const maxOffset = btwScrollMax(total, bodyRows);
|
|
14
|
+
const [offset, setOffset] = useState(0);
|
|
15
|
+
const top = Math.min(offset, maxOffset);
|
|
16
|
+
const scrollable = maxOffset > 0;
|
|
17
|
+
|
|
18
|
+
// A new question or a settled answer starts from the top.
|
|
19
|
+
useEffect(() => {
|
|
20
|
+
setOffset(0);
|
|
21
|
+
}, [panel.question, panel.status]);
|
|
22
|
+
|
|
23
|
+
useInput((_input, key) => {
|
|
24
|
+
if (!scrollable || (!key.pageUp && !key.pageDown)) return;
|
|
25
|
+
setOffset((current) => btwScrollOffset(key, current, bodyRows, total));
|
|
26
|
+
});
|
|
27
|
+
|
|
28
|
+
let body;
|
|
29
|
+
if (panel.status === 'pending') body = <Text color={theme.inactive}>answering… (Esc to cancel)</Text>;
|
|
30
|
+
else if (panel.status === 'error') body = <Text color={theme.error}>{panel.text}</Text>;
|
|
31
|
+
else
|
|
32
|
+
body = (
|
|
33
|
+
<Markdown themeEpoch={themeEpoch} columns={columns}>
|
|
34
|
+
{panel.text}
|
|
35
|
+
</Markdown>
|
|
36
|
+
);
|
|
37
|
+
return (
|
|
38
|
+
<Box flexDirection="column" flexShrink={0} width="100%">
|
|
39
|
+
<Box borderStyle="round" borderColor={theme.promptBorder} paddingX={1} width="100%" flexDirection="column">
|
|
40
|
+
<Text color={theme.panelTitle} wrap="truncate-end">{`btw · ${panel.question}`}</Text>
|
|
41
|
+
<Box flexDirection="column" height={bodyRows} overflow="hidden">
|
|
42
|
+
<Box flexDirection="column" flexShrink={0} marginTop={-top}>
|
|
43
|
+
{body}
|
|
44
|
+
</Box>
|
|
45
|
+
</Box>
|
|
46
|
+
<Text color={theme.inactive}>
|
|
47
|
+
{scrollable ? `PgUp/PgDn scroll (${top + 1}-${Math.min(total, top + bodyRows)}/${total}) · ` : ''}
|
|
48
|
+
Esc to close · not saved to the conversation
|
|
49
|
+
</Text>
|
|
50
|
+
</Box>
|
|
51
|
+
</Box>
|
|
52
|
+
);
|
|
53
|
+
}
|