muonroi-cli 1.8.4 → 1.9.0

package/dist/src/ui/components/tool-group.js

@@ -4,17 +4,23 @@ import { jsx as _jsx, jsxs as _jsxs } from "@opentui/react/jsx-runtime";
  *
  * Claude-Code-style "tool streak" panel — replaces the previous one-line-per-
  * tool render. Lifecycle:
- *   - active  → header "● <Verb>… (N tools · Ms)" + indented item list
- *   - done    → collapsed "● Done (N tool uses · Ms)  ctrl+e to expand"
+ *   - active  → header "● Reading 2 files… (N tools · Ms)" + indented item list
+ *   - done    → collapsed "● Read 2 files, ran 1 shell command  ctrl+e to expand"
  *   - failed  → always-expanded header + items, error item flagged red
  *
+ * The header names the work per CATEGORY (see utils/tool-summary.ts) rather
+ * than saying "Done": once the group collapses that line is all the user has,
+ * so it has to carry the meaning. Items add the detail a glance needs — the
+ * full shell command for bash, "Wrote N lines to <path>" before a write diff.
+ *
  * The active group lives at the tail of the message stream as a regular
  * ChatEntry of type "tool_group"; closing the streak (assistant text arrives
  * or stream ends) flips its state to done/failed in place.
  */
 import { Semantic } from "@muonroi/agent-harness-opentui";
 import { trunc } from "../utils/text.js";
-import { dominantVerb, toolLabel } from "../utils/tools.js";
+import { activeToolGroupHeader, doneToolGroupSummary } from "../utils/tool-summary.js";
+import { toolLabel } from "../utils/tools.js";
 import { DiffView } from "./diff-view.js";
 // Tools whose result carries a FileDiff worth rendering inline under the item
 // line. Mirrors the per-tool branch in message-view.tsx so grouped edits show
@@ -33,6 +39,42 @@ function fmtElapsed(ms) {
     const remS = Math.floor(s % 60);
     return `${m}m ${remS.toString().padStart(2, "0")}s`;
 }
+// Max command lines rendered inline for a bash item; the rest are elided so a
+// 40-line heredoc can't take over the transcript.
+const BASH_INLINE_LINES = 8;
+/** The command a bash item ran, split for multi-line display. Null when absent. */
+export function bashCommandLines(tc) {
+    let cmd;
+    try {
+        cmd = JSON.parse(tc.function.arguments)?.command;
+    }
+    catch (err) {
+        // Arguments stream in as partial JSON while the call is still assembling —
+        // an unparseable value here is expected, not an error worth surfacing.
+        return null;
+    }
+    if (typeof cmd !== "string" || !cmd.trim())
+        return null;
+    const lines = cmd.replace(/\r\n/g, "\n").split("\n");
+    if (lines.length <= BASH_INLINE_LINES)
+        return lines;
+    const hidden = lines.length - BASH_INLINE_LINES;
+    return [...lines.slice(0, BASH_INLINE_LINES), `… +${hidden} more line${hidden > 1 ? "s" : ""}`];
+}
+/**
+ * One-line prose outcome for a write/edit, e.g. "Wrote 161 lines to a.ts" or
+ * "Edited a.ts (+12 -3)". Null when the tool isn't a file mutation.
+ */
+export function writeOutcomeLine(toolName, diff) {
+    if (toolName === "write_file") {
+        const n = diff.additions;
+        return `Wrote ${n} line${n === 1 ? "" : "s"} to ${diff.filePath}`;
+    }
+    if (toolName === "edit_file") {
+        return `Edited ${diff.filePath} (+${diff.additions} -${diff.removals})`;
+    }
+    return null;
+}
 function itemGlyph(item) {
     if (item.failed)
         return "✗";
@@ -51,21 +93,23 @@ export function ToolGroupView({ entry, t, expanded, modeColor }) {
     const g = entry.toolGroup;
     if (!g)
         return null;
-    const verb = dominantVerb(g.items.map((it) => it.toolCall.function.name));
+    const toolNames = g.items.map((it) => it.toolCall.function.name);
     const elapsed = (g.finishedAt ?? Date.now()) - g.startedAt;
     const errorCount = g.items.filter((it) => it.failed).length;
     const total = g.items.length;
     // Decide whether the items list is visible. Active and failed always show
     // items; done collapses unless user expanded with ctrl+e.
     const showItems = g.state === "active" || g.state === "failed" || expanded;
-    // Header text mirrors Claude Code phrasing:
-    //   active: "Reading…"
-    //   done:   "Done"
+    // Header names the actual work, counted per category:
+    //   active: "Reading 2 files…"
+    //   done:   "Read 2 files, ran 1 shell command"
     //   failed: "Failed (k errors)"
+    // A bare "Done" told the user nothing about what just happened; the recap is
+    // the only line left once the group collapses, so it carries the meaning.
     let headerVerb;
     let headerColor;
     if (g.state === "active") {
-        headerVerb = `${verb}…`;
+        headerVerb = activeToolGroupHeader(toolNames);
         headerColor = entry.modeColor || modeColor || t.accent;
     }
     else if (g.state === "failed") {
@@ -73,10 +117,14 @@ export function ToolGroupView({ entry, t, expanded, modeColor }) {
         headerColor = t.diffRemovedFg;
     }
     else {
-        headerVerb = "Done";
+        headerVerb = doneToolGroupSummary(toolNames);
         headerColor = t.diffAddedFg;
     }
-    const stats = `${total} tool${total !== 1 ? "s" : ""} · ${fmtElapsed(elapsed)}`;
+    // A restored group's timestamps are write-time, not a measured span — print
+    // the count only rather than a fabricated duration.
+    const stats = g.restored
+        ? `${total} tool${total !== 1 ? "s" : ""}`
+        : `${total} tool${total !== 1 ? "s" : ""} · ${fmtElapsed(elapsed)}`;
     // Items to render: active capped at ACTIVE_INLINE_LIMIT (overflow line);
     // expanded done/failed shows everything.
     const overflow = g.state === "active" && total > ACTIVE_INLINE_LIMIT ? total - ACTIVE_INLINE_LIMIT : 0;
@@ -85,7 +133,17 @@ export function ToolGroupView({ entry, t, expanded, modeColor }) {
                             const label = trunc(toolLabel(it.toolCall), 90);
                             const errSuffix = it.failed && it.result?.error ? `  — ${trunc(it.result.error.replace(/\s+/g, " "), 60)}` : "";
                             const diff = !it.failed && DIFF_TOOLS.has(it.toolCall.function.name) ? it.result?.diff : undefined;
-                            return (_jsxs("box", { flexDirection: "column", children: [_jsxs("text", { children: [_jsx("span", { style: { fg: itemColor(it, t) }, children: `${itemGlyph(it)} ` }), _jsx("span", { style: { fg: t.textMuted }, children: label }), errSuffix && _jsx("span", { style: { fg: t.diffRemovedFg }, children: errSuffix })] }), diff && _jsx(DiffView, { t: t, diff: diff })] }, it.toolCall.id));
+                            // A bash call's whole point is WHICH command ran; truncating it to
+                            // one elided line hides that. Show every line, indented under the
+                            // item, the way a shell transcript reads.
+                            const bashLines = it.toolCall.function.name === "bash" ? bashCommandLines(it.toolCall) : null;
+                            // Shell transcript shape: "$ <first line>" on the item line, any
+                            // continuation lines aligned under it.
+                            const headLine = bashLines ? `$ ${bashLines[0]}` : label;
+                            const restLines = bashLines ? bashLines.slice(1) : [];
+                            return (_jsxs("box", { flexDirection: "column", children: [_jsxs("text", { children: [_jsx("span", { style: { fg: itemColor(it, t) }, children: `${itemGlyph(it)} ` }), _jsx("span", { style: { fg: t.textMuted }, children: trunc(headLine, 100) }), errSuffix && _jsx("span", { style: { fg: t.diffRemovedFg }, children: errSuffix })] }), restLines.map((line, li) => (
+                                    // biome-ignore lint/suspicious/noArrayIndexKey: command lines are positional and immutable
+                                    _jsx("box", { paddingLeft: 2, children: _jsx("text", { fg: t.textMuted, children: trunc(line, 100) }) }, `${it.toolCall.id}-cmd-${li}`))), diff && writeOutcomeLine(it.toolCall.function.name, diff) && (_jsx("box", { paddingLeft: 2, children: _jsx("text", { fg: t.textMuted, children: writeOutcomeLine(it.toolCall.function.name, diff) }) })), diff && _jsx(DiffView, { t: t, diff: diff })] }, it.toolCall.id));
                         })] })), g.state === "done" && !expanded && total > 0 && (_jsx("box", { paddingLeft: 2, children: _jsx("text", { fg: t.textDim, children: "ctrl+e to expand" }) }))] }) }));
 }
 //# sourceMappingURL=tool-group.js.map

package/dist/src/ui/containers/modals-layer.d.ts

@@ -1,3 +1,4 @@
+import type { ResumeEntry } from "../../types/index.js";
 export interface ModalsLayerProps {
     agentRows: any;
     agentsEditorDraft: any;
@@ -10,7 +11,8 @@ export interface ModalsLayerProps {
     apiKeyError: any;
     apiKeyInputRef: any;
     apiKeyPrompt: any;
-    bwSync: any;
+    oauthProviders: any;
+    oauthLogin: any;
     configuredProviders: any;
     connectModalIndex: any;
     defaultProvider: any;
@@ -50,7 +52,7 @@ export interface ModalsLayerProps {
     scheduleRows: any;
     scheduleSearchQuery: any;
     sessionPickerIndex: any;
-    sessionPickerList: any;
+    sessionPickerList: ResumeEntry[];
     showAgentsEditor: any;
     showAgentsModal: any;
     showApiKeyModal: any;

package/dist/src/ui/containers/modals-layer.js

@@ -12,7 +12,7 @@ import { UpdateModal } from "../modals/update-modal.js";
 import { WalletPickerModal } from "../modals/wallet-picker-modal.js";
 import { ScheduleBrowserModal } from "../schedule-modal.js";
 export function ModalsLayer(props) {
-    const { agentRows, agentsEditorDraft, agentsEditorError, agentsEditorField, agentsEditorModelIndex, agentsEditorSyncKey, agentsModalIndex, agentsSearchQuery, apiKeyError, apiKeyInputRef, apiKeyPrompt, bwSync, configuredProviders, connectModalIndex, defaultProvider, disabledModels, disabledProviders, editingMcpId, editingSubagent, filteredModels, height, mcpArgsRef, mcpCommandRef, mcpCwdRef, mcpEditorDraft, mcpEditorError, mcpEditorField, mcpEditorSyncKey, mcpEnvRef, mcpHeadersRef, mcpLabelRef, mcpModalIndex, mcpRows, mcpSearchQuery, mcpUrlRef, model, modelPickerFocus, modelPickerIndex, modelSearchQuery, providerChipIndex, providersWithKey, reasoningEffortByModel, sandboxMode, sandboxSettings, sandboxSettingsEditBuffer, sandboxSettingsEditing, sandboxSettingsFocusIndex, scheduleModalIndex, scheduleRows, scheduleSearchQuery, sessionPickerIndex, sessionPickerList, showAgentsEditor, showAgentsModal, showApiKeyModal, showConnectModal, showMcpEditor, showMcpModal, showModelPicker, showSandboxPicker, showScheduleModal, showSessionPicker, showTelegramPairModal, showTelegramTokenModal, showUpdateModal, showWalletPicker, startupConfig, subagentInstructionRef, subagentNameRef, submitApiKey, submitMcpEditor, submitSubagentEditor, submitTelegramPair, submitTelegramToken, t, telegramPairError, telegramPairInputRef, telegramTokenError, telegramTokenInputRef, updateInfo, walletDisplayInfo, walletFocusIndex, walletSettings, width, } = props;
-    return (_jsxs(_Fragment, { children: [showApiKeyModal && (_jsx(ApiKeyModal, { t: t, width: width, height: height, inputRef: apiKeyInputRef, error: apiKeyError, onSubmit: submitApiKey })), showUpdateModal && updateInfo && (_jsx(UpdateModal, { t: t, width: width, height: height, currentVersion: startupConfig.version, latestVersion: updateInfo.latestVersion })), showMcpModal && !showMcpEditor && (_jsx(McpBrowserModal, { t: t, width: width, height: height, selectedIndex: mcpModalIndex, searchQuery: mcpSearchQuery, rows: mcpRows })), showMcpEditor && (_jsx(McpEditorModal, { t: t, width: width, height: height, draft: mcpEditorDraft, focusedField: mcpEditorField, syncKey: mcpEditorSyncKey, error: mcpEditorError, title: editingMcpId ? "Edit MCP Server" : "Add MCP Server", labelRef: mcpLabelRef, urlRef: mcpUrlRef, headersRef: mcpHeadersRef, commandRef: mcpCommandRef, argsRef: mcpArgsRef, cwdRef: mcpCwdRef, envRef: mcpEnvRef, onSubmit: submitMcpEditor })), showScheduleModal && (_jsx(ScheduleBrowserModal, { t: t, width: width, height: height, selectedIndex: scheduleModalIndex, searchQuery: scheduleSearchQuery, rows: scheduleRows })), showAgentsModal && !showAgentsEditor && (_jsx(SubagentsBrowserModal, { t: t, width: width, height: height, selectedIndex: agentsModalIndex, searchQuery: agentsSearchQuery, rows: agentRows })), showAgentsEditor && (_jsx(SubagentEditorModal, { t: t, width: width, height: height, draft: agentsEditorDraft, focusedField: agentsEditorField, modelIndex: agentsEditorModelIndex, error: agentsEditorError, title: editingSubagent ? `Edit sub-agent: ${formatSubagentName(editingSubagent.name)}` : "Add sub-agent", nameRef: subagentNameRef, instructionRef: subagentInstructionRef, onSubmit: submitSubagentEditor, showRemoveHint: !!editingSubagent }, `subagent-editor-${agentsEditorSyncKey}`)), showModelPicker && (_jsx(ModelPickerModal, { t: t, currentModel: model, selectedIndex: modelPickerIndex, width: width, height: height, searchQuery: modelSearchQuery, filteredModels: filteredModels, reasoningEffortByModel: reasoningEffortByModel, configuredProviders: configuredProviders, disabledProviders: disabledProviders, disabledModels: disabledModels, defaultProvider: defaultProvider, focus: modelPickerFocus, providerChipIndex: providerChipIndex, providersWithKey: providersWithKey, apiKeyPrompt: apiKeyPrompt, bwSync: bwSync })), showSessionPicker && (_jsx(SessionPickerModal, { t: t, sessions: sessionPickerList, focusIndex: sessionPickerIndex, width: width, height: height })), showWalletPicker && (_jsx(WalletPickerModal, { t: t, settings: walletSettings, walletInfo: walletDisplayInfo, focusIndex: walletFocusIndex, width: width, height: height })), showSandboxPicker && (_jsx(SandboxPickerModal, { t: t, currentMode: sandboxMode, settings: sandboxSettings, focusIndex: sandboxSettingsFocusIndex, editing: sandboxSettingsEditing, editBuffer: sandboxSettingsEditBuffer, width: width, height: height })), showConnectModal && (_jsx(ConnectModal, { t: t, width: width, height: height, selectedIndex: connectModalIndex, channels: CONNECT_CHANNELS })), showTelegramTokenModal && (_jsx(TelegramTokenModal, { t: t, width: width, height: height, inputRef: telegramTokenInputRef, error: telegramTokenError, onSubmit: submitTelegramToken })), showTelegramPairModal && (_jsx(TelegramPairModal, { t: t, width: width, height: height, inputRef: telegramPairInputRef, error: telegramPairError, onSubmit: () => void submitTelegramPair() }))] }));
+    const { agentRows, agentsEditorDraft, agentsEditorError, agentsEditorField, agentsEditorModelIndex, agentsEditorSyncKey, agentsModalIndex, agentsSearchQuery, apiKeyError, apiKeyInputRef, apiKeyPrompt, oauthProviders, oauthLogin, configuredProviders, connectModalIndex, defaultProvider, disabledModels, disabledProviders, editingMcpId, editingSubagent, filteredModels, height, mcpArgsRef, mcpCommandRef, mcpCwdRef, mcpEditorDraft, mcpEditorError, mcpEditorField, mcpEditorSyncKey, mcpEnvRef, mcpHeadersRef, mcpLabelRef, mcpModalIndex, mcpRows, mcpSearchQuery, mcpUrlRef, model, modelPickerFocus, modelPickerIndex, modelSearchQuery, providerChipIndex, providersWithKey, reasoningEffortByModel, sandboxMode, sandboxSettings, sandboxSettingsEditBuffer, sandboxSettingsEditing, sandboxSettingsFocusIndex, scheduleModalIndex, scheduleRows, scheduleSearchQuery, sessionPickerIndex, sessionPickerList, showAgentsEditor, showAgentsModal, showApiKeyModal, showConnectModal, showMcpEditor, showMcpModal, showModelPicker, showSandboxPicker, showScheduleModal, showSessionPicker, showTelegramPairModal, showTelegramTokenModal, showUpdateModal, showWalletPicker, startupConfig, subagentInstructionRef, subagentNameRef, submitApiKey, submitMcpEditor, submitSubagentEditor, submitTelegramPair, submitTelegramToken, t, telegramPairError, telegramPairInputRef, telegramTokenError, telegramTokenInputRef, updateInfo, walletDisplayInfo, walletFocusIndex, walletSettings, width, } = props;
+    return (_jsxs(_Fragment, { children: [showApiKeyModal && (_jsx(ApiKeyModal, { t: t, width: width, height: height, inputRef: apiKeyInputRef, error: apiKeyError, onSubmit: submitApiKey })), showUpdateModal && updateInfo && (_jsx(UpdateModal, { t: t, width: width, height: height, currentVersion: startupConfig.version, latestVersion: updateInfo.latestVersion })), showMcpModal && !showMcpEditor && (_jsx(McpBrowserModal, { t: t, width: width, height: height, selectedIndex: mcpModalIndex, searchQuery: mcpSearchQuery, rows: mcpRows })), showMcpEditor && (_jsx(McpEditorModal, { t: t, width: width, height: height, draft: mcpEditorDraft, focusedField: mcpEditorField, syncKey: mcpEditorSyncKey, error: mcpEditorError, title: editingMcpId ? "Edit MCP Server" : "Add MCP Server", labelRef: mcpLabelRef, urlRef: mcpUrlRef, headersRef: mcpHeadersRef, commandRef: mcpCommandRef, argsRef: mcpArgsRef, cwdRef: mcpCwdRef, envRef: mcpEnvRef, onSubmit: submitMcpEditor })), showScheduleModal && (_jsx(ScheduleBrowserModal, { t: t, width: width, height: height, selectedIndex: scheduleModalIndex, searchQuery: scheduleSearchQuery, rows: scheduleRows })), showAgentsModal && !showAgentsEditor && (_jsx(SubagentsBrowserModal, { t: t, width: width, height: height, selectedIndex: agentsModalIndex, searchQuery: agentsSearchQuery, rows: agentRows })), showAgentsEditor && (_jsx(SubagentEditorModal, { t: t, width: width, height: height, draft: agentsEditorDraft, focusedField: agentsEditorField, modelIndex: agentsEditorModelIndex, error: agentsEditorError, title: editingSubagent ? `Edit sub-agent: ${formatSubagentName(editingSubagent.name)}` : "Add sub-agent", nameRef: subagentNameRef, instructionRef: subagentInstructionRef, onSubmit: submitSubagentEditor, showRemoveHint: !!editingSubagent }, `subagent-editor-${agentsEditorSyncKey}`)), showModelPicker && (_jsx(ModelPickerModal, { t: t, currentModel: model, selectedIndex: modelPickerIndex, width: width, height: height, searchQuery: modelSearchQuery, filteredModels: filteredModels, reasoningEffortByModel: reasoningEffortByModel, configuredProviders: configuredProviders, disabledProviders: disabledProviders, disabledModels: disabledModels, defaultProvider: defaultProvider, focus: modelPickerFocus, providerChipIndex: providerChipIndex, providersWithKey: providersWithKey, apiKeyPrompt: apiKeyPrompt, oauthProviders: oauthProviders, oauthLogin: oauthLogin })), showSessionPicker && (_jsx(SessionPickerModal, { t: t, sessions: sessionPickerList, focusIndex: sessionPickerIndex, width: width, height: height })), showWalletPicker && (_jsx(WalletPickerModal, { t: t, settings: walletSettings, walletInfo: walletDisplayInfo, focusIndex: walletFocusIndex, width: width, height: height })), showSandboxPicker && (_jsx(SandboxPickerModal, { t: t, currentMode: sandboxMode, settings: sandboxSettings, focusIndex: sandboxSettingsFocusIndex, editing: sandboxSettingsEditing, editBuffer: sandboxSettingsEditBuffer, width: width, height: height })), showConnectModal && (_jsx(ConnectModal, { t: t, width: width, height: height, selectedIndex: connectModalIndex, channels: CONNECT_CHANNELS })), showTelegramTokenModal && (_jsx(TelegramTokenModal, { t: t, width: width, height: height, inputRef: telegramTokenInputRef, error: telegramTokenError, onSubmit: submitTelegramToken })), showTelegramPairModal && (_jsx(TelegramPairModal, { t: t, width: width, height: height, inputRef: telegramPairInputRef, error: telegramPairError, onSubmit: () => void submitTelegramPair() }))] }));
 }
 //# sourceMappingURL=modals-layer.js.map

package/dist/src/ui/council-harness-event.d.ts

@@ -0,0 +1,57 @@
+/**
+ * src/ui/council-harness-event.ts
+ *
+ * Pure mapping from a council `CouncilStatusData` chunk to the harness
+ * `council-speaker` LiveEvent payload.
+ *
+ * Why this exists. The long research phase (`llm.research`, up to ~10 min /
+ * 15 tool steps) runs as a single internal `generateText` — the MAIN stream is
+ * quiet the whole time, so `tui_wait_for(idle)` reports a FALSE idle and an
+ * agent driving the TUI misjudges the run as hung. The only signal during that
+ * window is the 1s `council_status` heartbeat (`state:"tick"`, advancing
+ * `elapsedMs`) emitted by `tracedAsync`. Previously the emit site collapsed
+ * every non-start state to `status:"done"` and DROPPED `elapsedMs`, so a poller
+ * reading `tui_last_event("council-speaker")` saw a frozen "done" event and
+ * concluded the speaker had finished — the exact false-stall this fixes.
+ *
+ * Carrying `state:"tick"` + `elapsedMs` through lets a harness monitor
+ * distinguish ALIVE (elapsedMs advancing across polls) from HUNG (elapsedMs
+ * frozen past a threshold) with a single `tui_last_event` call.
+ */
+import type { CouncilStatusState } from "../types/index.js";
+/** Harness `council-speaker` status: adds "tick" progress heartbeat to start/done. */
+export type CouncilSpeakerStatus = "start" | "tick" | "done";
+export interface CouncilStatusLike {
+    state: CouncilStatusState;
+    statusId: string;
+    role?: string;
+    label?: string;
+    elapsedMs?: number;
+    streamedChars?: number;
+    lastDeltaAgeMs?: number;
+}
+export interface CouncilSpeakerEvent {
+    t: "event";
+    kind: "council-speaker";
+    role: string;
+    status: CouncilSpeakerStatus;
+    correlationId: string;
+    elapsedMs?: number;
+    /** Chars (text + reasoning deltas) streamed since this phase began. */
+    streamedChars?: number;
+    /** Age of the most recent stream delta, in ms. */
+    lastDeltaAgeMs?: number;
+}
+/**
+ * Map a council status chunk to the `council-speaker` harness event payload.
+ * `start`→"start", `tick`→"tick" (progress heartbeat), `done`/`error`→"done".
+ * `elapsedMs` is passed through unchanged so a poller can measure progress.
+ *
+ * `streamedChars` / `lastDeltaAgeMs` ride along when the council emitted them.
+ * `elapsedMs` can freeze even on a healthy call — the tick generator only
+ * advances when its consumer pulls, and a round awaiting pairs via Promise.all
+ * does not pull. These two are pushed from the token stream itself, so they
+ * separate SLOW-BUT-ALIVE (chars growing, small delta age) from STUCK (chars
+ * static, delta age growing) without depending on generator pumping.
+ */
+export declare function mapCouncilStatusToSpeakerEvent(cs: CouncilStatusLike): CouncilSpeakerEvent;

package/dist/src/ui/council-harness-event.js

@@ -0,0 +1,46 @@
+/**
+ * src/ui/council-harness-event.ts
+ *
+ * Pure mapping from a council `CouncilStatusData` chunk to the harness
+ * `council-speaker` LiveEvent payload.
+ *
+ * Why this exists. The long research phase (`llm.research`, up to ~10 min /
+ * 15 tool steps) runs as a single internal `generateText` — the MAIN stream is
+ * quiet the whole time, so `tui_wait_for(idle)` reports a FALSE idle and an
+ * agent driving the TUI misjudges the run as hung. The only signal during that
+ * window is the 1s `council_status` heartbeat (`state:"tick"`, advancing
+ * `elapsedMs`) emitted by `tracedAsync`. Previously the emit site collapsed
+ * every non-start state to `status:"done"` and DROPPED `elapsedMs`, so a poller
+ * reading `tui_last_event("council-speaker")` saw a frozen "done" event and
+ * concluded the speaker had finished — the exact false-stall this fixes.
+ *
+ * Carrying `state:"tick"` + `elapsedMs` through lets a harness monitor
+ * distinguish ALIVE (elapsedMs advancing across polls) from HUNG (elapsedMs
+ * frozen past a threshold) with a single `tui_last_event` call.
+ */
+/**
+ * Map a council status chunk to the `council-speaker` harness event payload.
+ * `start`→"start", `tick`→"tick" (progress heartbeat), `done`/`error`→"done".
+ * `elapsedMs` is passed through unchanged so a poller can measure progress.
+ *
+ * `streamedChars` / `lastDeltaAgeMs` ride along when the council emitted them.
+ * `elapsedMs` can freeze even on a healthy call — the tick generator only
+ * advances when its consumer pulls, and a round awaiting pairs via Promise.all
+ * does not pull. These two are pushed from the token stream itself, so they
+ * separate SLOW-BUT-ALIVE (chars growing, small delta age) from STUCK (chars
+ * static, delta age growing) without depending on generator pumping.
+ */
+export function mapCouncilStatusToSpeakerEvent(cs) {
+    const status = cs.state === "start" ? "start" : cs.state === "tick" ? "tick" : "done";
+    return {
+        t: "event",
+        kind: "council-speaker",
+        role: cs.role ?? cs.label ?? "unknown",
+        status,
+        correlationId: cs.statusId,
+        ...(typeof cs.elapsedMs === "number" ? { elapsedMs: cs.elapsedMs } : {}),
+        ...(typeof cs.streamedChars === "number" ? { streamedChars: cs.streamedChars } : {}),
+        ...(typeof cs.lastDeltaAgeMs === "number" ? { lastDeltaAgeMs: cs.lastDeltaAgeMs } : {}),
+    };
+}
+//# sourceMappingURL=council-harness-event.js.map

package/dist/src/ui/heartbeat-debug.d.ts

@@ -0,0 +1,29 @@
+/**
+ * src/ui/heartbeat-debug.ts
+ *
+ * Env-gated instrumentation to pinpoint the council rail "frozen elapsed / static
+ * spinner" during long phases. Live evidence (harness 60Hz dedup frames identical
+ * for 110s + braille spinner not rotating) shows a real in-phase render/paint
+ * freeze, but NOT which link starves: (T) the setInterval TIMER not firing, (R)
+ * the timer fires but React does not re-render/commit, or (P) React commits but
+ * OpenTUI does not repaint.
+ *
+ * When `MUONROI_HEARTBEAT_DEBUG` is set to a file path, we append one JSONL line
+ * per event so a single instrumented council run answers T/R/P:
+ *   - kind:"timer"  → a setInterval callback actually fired  (rules in/out T)
+ *   - kind:"render" → a component's render body ran           (rules in/out R)
+ * Compare timestamps against the sidechannel council-step timeline: if `timer`
+ * lines keep landing every ~100/1000ms through a phase but the harness frame is
+ * frozen, the starve is at paint (P); if `timer` lines STOP during the phase, the
+ * event loop / timer is starved (T).
+ *
+ * Unset → a single boolean check per call, zero file I/O, zero behaviour change.
+ */
+export declare function heartbeatDebugEnabled(): boolean;
+/**
+ * Append one instrumentation record. No-op unless MUONROI_HEARTBEAT_DEBUG points
+ * at a file. `kind` is "timer" (a setInterval callback fired) or "render" (a
+ * component render body executed). `extra` carries component-specific detail
+ * (frame index, computed elapsedMs, phase label).
+ */
+export declare function heartbeatDebug(component: string, kind: "timer" | "render", extra?: Record<string, unknown>): void;

package/dist/src/ui/heartbeat-debug.js

@@ -0,0 +1,45 @@
+/**
+ * src/ui/heartbeat-debug.ts
+ *
+ * Env-gated instrumentation to pinpoint the council rail "frozen elapsed / static
+ * spinner" during long phases. Live evidence (harness 60Hz dedup frames identical
+ * for 110s + braille spinner not rotating) shows a real in-phase render/paint
+ * freeze, but NOT which link starves: (T) the setInterval TIMER not firing, (R)
+ * the timer fires but React does not re-render/commit, or (P) React commits but
+ * OpenTUI does not repaint.
+ *
+ * When `MUONROI_HEARTBEAT_DEBUG` is set to a file path, we append one JSONL line
+ * per event so a single instrumented council run answers T/R/P:
+ *   - kind:"timer"  → a setInterval callback actually fired  (rules in/out T)
+ *   - kind:"render" → a component's render body ran           (rules in/out R)
+ * Compare timestamps against the sidechannel council-step timeline: if `timer`
+ * lines keep landing every ~100/1000ms through a phase but the harness frame is
+ * frozen, the starve is at paint (P); if `timer` lines STOP during the phase, the
+ * event loop / timer is starved (T).
+ *
+ * Unset → a single boolean check per call, zero file I/O, zero behaviour change.
+ */
+import { appendFileSync } from "node:fs";
+const SINK = process.env.MUONROI_HEARTBEAT_DEBUG?.trim() || null;
+export function heartbeatDebugEnabled() {
+    return SINK !== null;
+}
+/**
+ * Append one instrumentation record. No-op unless MUONROI_HEARTBEAT_DEBUG points
+ * at a file. `kind` is "timer" (a setInterval callback fired) or "render" (a
+ * component render body executed). `extra` carries component-specific detail
+ * (frame index, computed elapsedMs, phase label).
+ */
+export function heartbeatDebug(component, kind, extra) {
+    if (SINK === null)
+        return;
+    try {
+        const rec = { ts: Date.now(), component, kind, ...(extra ?? {}) };
+        appendFileSync(SINK, `${JSON.stringify(rec)}\n`);
+    }
+    catch (err) {
+        // Instrumentation must never break the UI; surface once at debug level.
+        console.error(`[heartbeat-debug] append failed: ${err?.message}`);
+    }
+}
+//# sourceMappingURL=heartbeat-debug.js.map

package/dist/src/ui/hooks/use-session-picker.d.ts

@@ -1,4 +1,4 @@
-import type { SessionInfo } from "../../types/index.js";
+import type { ResumeEntry } from "../../types/index.js";
 /**
  * State for the /sessions picker modal. Sessions are loaded lazily when the
  * picker is opened (the SQLite query is cheap — ORDER BY updated_at LIMIT 20
@@ -9,6 +9,6 @@ export declare function useSessionPicker(): {
     setShowSessionPicker: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     sessionPickerIndex: number;
     setSessionPickerIndex: import("react").Dispatch<import("react").SetStateAction<number>>;
-    sessions: SessionInfo[];
-    setSessions: import("react").Dispatch<import("react").SetStateAction<SessionInfo[]>>;
+    sessions: ResumeEntry[];
+    setSessions: import("react").Dispatch<import("react").SetStateAction<ResumeEntry[]>>;
 };

package/dist/src/ui/mcp-modal.js

@@ -53,8 +53,7 @@ export function McpBrowserModal({ t, width, height, selectedIndex, searchQuery,
     const contentHeight = itemCount + 7;
     const maxHeight = Math.floor(height * 0.68);
     const panelHeight = Math.min(contentHeight, maxHeight);
-    const overlayBg = "#000000cc";
-    return (_jsx(Semantic, { id: "mcp-modal", role: "dialog", name: "MCP Servers", isModal: true, children: _jsx("box", { position: "absolute", left: 0, top: 0, width: width, height: height, alignItems: "center", paddingTop: bottomAlignedModalTop(height, panelHeight), backgroundColor: overlayBg, children: _jsxs("box", { width: Math.min(96, width - 4), height: panelHeight, backgroundColor: t.backgroundPanel, paddingTop: 1, paddingBottom: 1, flexDirection: "column", children: [_jsxs("box", { flexShrink: 0, flexDirection: "row", justifyContent: "space-between", paddingLeft: 2, paddingRight: 2, children: [_jsx("text", { fg: t.primary, children: _jsx("b", { children: "MCP Servers" }) }), _jsx("text", { fg: t.textMuted, children: "esc" })] }), _jsx("box", { flexShrink: 0, paddingLeft: 2, paddingRight: 2, paddingTop: 1, paddingBottom: 1, children: _jsx("text", { fg: t.text, children: searchQuery || _jsx("span", { style: { fg: t.textMuted }, children: "Search servers..." }) }) }), _jsx(Semantic, { id: "mcp-list", role: "listbox", children: _jsx("scrollbox", { ref: listRef, flexGrow: 1, minHeight: 0, children: rows.map((row, idx) => {
+    return (_jsx(Semantic, { id: "mcp-modal", role: "dialog", name: "MCP Servers", isModal: true, children: _jsx("box", { position: "absolute", left: 0, top: 0, width: width, height: height, alignItems: "center", paddingTop: bottomAlignedModalTop(height, panelHeight), backgroundColor: t.overlay, children: _jsxs("box", { width: Math.min(96, width - 4), height: panelHeight, backgroundColor: t.backgroundPanel, paddingTop: 1, paddingBottom: 1, flexDirection: "column", children: [_jsxs("box", { flexShrink: 0, flexDirection: "row", justifyContent: "space-between", paddingLeft: 2, paddingRight: 2, children: [_jsx("text", { fg: t.primary, children: _jsx("b", { children: "MCP Servers" }) }), _jsx("text", { fg: t.textMuted, children: "esc" })] }), _jsx("box", { flexShrink: 0, paddingLeft: 2, paddingRight: 2, paddingTop: 1, paddingBottom: 1, children: _jsx("text", { fg: t.text, children: searchQuery || _jsx("span", { style: { fg: t.textMuted }, children: "Search servers..." }) }) }), _jsx(Semantic, { id: "mcp-list", role: "listbox", children: _jsx("scrollbox", { ref: listRef, flexGrow: 1, minHeight: 0, children: rows.map((row, idx) => {
                                 const selected = idx === selectedIndex;
                                 if (row.kind === "server") {
                                     const enabledColor = row.server.enabled ? t.diffAddedFg : selected ? t.selected : t.text;
@@ -74,7 +73,6 @@ function syncRef(ref, value) {
 }
 export function McpEditorModal({ t, width, height, draft, focusedField, syncKey, error, title, labelRef, urlRef, headersRef, commandRef, argsRef, cwdRef, envRef, onSubmit, }) {
     const panelHeight = Math.min(30, Math.floor(height * 0.82));
-    const overlayBg = "#000000cc";
     const isRemote = draft.transport === "http" || draft.transport === "sse";
     // biome-ignore lint/correctness/useExhaustiveDependencies: syncKey is an intentional cache-bust prop
     useEffect(() => {
@@ -86,7 +84,7 @@ export function McpEditorModal({ t, width, height, draft, focusedField, syncKey,
         syncRef(cwdRef, draft.cwd);
         syncRef(envRef, draft.envText);
     }, [draft, syncKey, labelRef, urlRef, headersRef, commandRef, argsRef, cwdRef, envRef]);
-    return (_jsx(Semantic, { id: "mcp-editor", role: "dialog", name: title, isModal: true, children: _jsx("box", { position: "absolute", left: 0, top: 0, width: width, height: height, alignItems: "center", paddingTop: bottomAlignedModalTop(height, panelHeight), backgroundColor: overlayBg, children: _jsxs("box", { width: Math.min(86, width - 6), height: panelHeight, backgroundColor: t.backgroundPanel, paddingTop: 1, paddingBottom: 1, flexDirection: "column", children: [_jsxs("box", { flexShrink: 0, flexDirection: "row", justifyContent: "space-between", paddingLeft: 2, paddingRight: 2, children: [_jsx("text", { fg: t.primary, children: _jsx("b", { children: title }) }), _jsx("text", { fg: t.textMuted, children: "esc" })] }), _jsx("box", { flexShrink: 0, paddingLeft: 2, paddingRight: 2, paddingTop: 1, children: _jsxs("box", { flexDirection: "row", gap: 1, alignItems: "center", children: [_jsx("text", { fg: focusedField === "transport" ? t.primary : t.textMuted, children: "Transport" }), ["stdio", "http", "sse"].map((option) => {
+    return (_jsx(Semantic, { id: "mcp-editor", role: "dialog", name: title, isModal: true, children: _jsx("box", { position: "absolute", left: 0, top: 0, width: width, height: height, alignItems: "center", paddingTop: bottomAlignedModalTop(height, panelHeight), backgroundColor: t.overlay, children: _jsxs("box", { width: Math.min(86, width - 6), height: panelHeight, backgroundColor: t.backgroundPanel, paddingTop: 1, paddingBottom: 1, flexDirection: "column", children: [_jsxs("box", { flexShrink: 0, flexDirection: "row", justifyContent: "space-between", paddingLeft: 2, paddingRight: 2, children: [_jsx("text", { fg: t.primary, children: _jsx("b", { children: title }) }), _jsx("text", { fg: t.textMuted, children: "esc" })] }), _jsx("box", { flexShrink: 0, paddingLeft: 2, paddingRight: 2, paddingTop: 1, children: _jsxs("box", { flexDirection: "row", gap: 1, alignItems: "center", children: [_jsx("text", { fg: focusedField === "transport" ? t.primary : t.textMuted, children: "Transport" }), ["stdio", "http", "sse"].map((option) => {
                                     const active = draft.transport === option;
                                     const focused = focusedField === "transport";
                                     return (_jsx("box", { backgroundColor: active ? (focused ? t.selectedBg : t.backgroundElement) : undefined, paddingLeft: 1, paddingRight: 1, children: _jsx("text", { fg: active ? (focused ? t.primary : t.text) : t.textMuted, children: option }) }, option));

package/dist/src/ui/modals/api-key-modal.js

@@ -10,6 +10,6 @@ export function ApiKeyModal({ t, width, height, inputRef, error, onSubmit, }) {
     const panelWidth = Math.min(68, width - 6);
     const panelHeight = 13;
     const top = bottomAlignedModalTop(height, panelHeight);
-    return (_jsx(Semantic, { id: "api-key-modal", role: "dialog", name: "API Key", isModal: true, children: _jsx("box", { position: "absolute", left: 0, top: 0, width: width, height: height, alignItems: "center", paddingTop: top, backgroundColor: overlayBg, children: _jsxs("box", { width: panelWidth, height: panelHeight, backgroundColor: t.backgroundPanel, paddingTop: 1, paddingBottom: 1, flexDirection: "column", children: [_jsxs("box", { flexShrink: 0, flexDirection: "row", justifyContent: "space-between", paddingLeft: 2, paddingRight: 2, children: [_jsx("text", { fg: t.primary, children: _jsx("b", { children: "Add API key" }) }), _jsx("text", { fg: t.textMuted, children: "esc" })] }), _jsx("box", { paddingLeft: 2, paddingRight: 2, paddingTop: 1, children: _jsx("text", { fg: t.text, children: "Paste your DeepSeek or SiliconFlow API key to unlock chat. Esc hides this prompt." }) }), _jsx("box", { paddingLeft: 2, paddingRight: 2, paddingTop: 1, children: _jsx("box", { backgroundColor: t.backgroundElement, paddingLeft: 1, paddingRight: 1, width: "100%", children: _jsx(Semantic, { id: "api-key-input", role: "textbox", children: _jsx("textarea", { ref: inputRef, focused: true, placeholder: "sk-...", textColor: t.text, backgroundColor: t.backgroundElement, placeholderColor: t.textMuted, minHeight: 1, maxHeight: 3, wrapMode: "word", keyBindings: TEXTAREA_KEYBINDINGS, onSubmit: onSubmit }) }) }) }), _jsx("box", { flexGrow: 1, minHeight: 0 }), _jsx("box", { paddingLeft: 2, paddingRight: 2, paddingTop: 2, paddingBottom: 1, children: error ? (_jsx("text", { fg: t.diffRemovedFg, children: error })) : (_jsxs("text", { children: [_jsx("span", { style: { fg: t.primary }, children: "enter " }), _jsx("span", { style: { fg: t.textMuted }, children: "save key  ·  " }), _jsx("span", { style: { fg: t.primary }, children: "esc " }), _jsx("span", { style: { fg: t.textMuted }, children: "hide" })] })) })] }) }) }));
+    return (_jsx(Semantic, { id: "api-key-modal", role: "dialog", name: "API Key", isModal: true, children: _jsx("box", { position: "absolute", left: 0, top: 0, width: width, height: height, alignItems: "center", paddingTop: top, backgroundColor: overlayBg, children: _jsxs("box", { width: panelWidth, height: panelHeight, backgroundColor: t.backgroundPanel, paddingTop: 1, paddingBottom: 1, flexDirection: "column", children: [_jsxs("box", { flexShrink: 0, flexDirection: "row", justifyContent: "space-between", paddingLeft: 2, paddingRight: 2, children: [_jsx("text", { fg: t.primary, children: _jsx("b", { children: "Add API key" }) }), _jsx("text", { fg: t.textMuted, children: "esc" })] }), _jsx("box", { paddingLeft: 2, paddingRight: 2, paddingTop: 1, children: _jsx("text", { fg: t.text, children: "Paste a provider API key, or press Esc and use /providers to sign in (OAuth)." }) }), _jsx("box", { paddingLeft: 2, paddingRight: 2, paddingTop: 1, children: _jsx("box", { backgroundColor: t.backgroundElement, paddingLeft: 1, paddingRight: 1, width: "100%", children: _jsx(Semantic, { id: "api-key-input", role: "textbox", children: _jsx("textarea", { ref: inputRef, focused: true, placeholder: "sk-...", textColor: t.text, backgroundColor: t.backgroundElement, placeholderColor: t.textMuted, minHeight: 1, maxHeight: 3, wrapMode: "word", keyBindings: TEXTAREA_KEYBINDINGS, onSubmit: onSubmit }) }) }) }), _jsx("box", { flexGrow: 1, minHeight: 0 }), _jsx("box", { paddingLeft: 2, paddingRight: 2, paddingTop: 2, paddingBottom: 1, children: error ? (_jsx("text", { fg: t.diffRemovedFg, children: error })) : (_jsxs("text", { children: [_jsx("span", { style: { fg: t.primary }, children: "enter " }), _jsx("span", { style: { fg: t.textMuted }, children: "save key  ·  " }), _jsx("span", { style: { fg: t.primary }, children: "esc " }), _jsx("span", { style: { fg: t.textMuted }, children: "hide" })] })) })] }) }) }));
 }
 //# sourceMappingURL=api-key-modal.js.map

package/dist/src/ui/modals/connect-modal.js

@@ -1,5 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "@opentui/react/jsx-runtime";
 import { useEffect, useRef } from "react";
+import { Dialog } from "../primitives/index.js";
 import { bottomAlignedModalTop } from "../utils/modal.js";
 const TEXTAREA_KEYBINDINGS = [
     { name: "return", action: "submit" },
@@ -15,20 +16,20 @@ export function ConnectModal({ t, width, height, selectedIndex, channels, }) {
     const panelHeight = Math.min(channels.length + 9, Math.floor(height * 0.5));
     const top = bottomAlignedModalTop(height, panelHeight);
     const overlayBg = "#000000cc";
-    return (_jsx("box", { position: "absolute", left: 0, top: 0, width: width, height: height, alignItems: "center", paddingTop: top, backgroundColor: overlayBg, children: _jsxs("box", { width: Math.min(56, width - 6), height: panelHeight, backgroundColor: t.backgroundPanel, paddingTop: 1, paddingBottom: 1, flexDirection: "column", children: [_jsxs("box", { flexShrink: 0, flexDirection: "row", justifyContent: "space-between", paddingLeft: 2, paddingRight: 2, children: [_jsx("text", { fg: t.primary, children: _jsx("b", { children: "Connect" }) }), _jsx("text", { fg: t.textMuted, children: "esc" })] }), _jsx("box", { flexShrink: 0, paddingLeft: 2, paddingRight: 2, paddingTop: 1, paddingBottom: 1, children: _jsx("text", { fg: t.textMuted, children: "Choose a channel" }) }), _jsx("scrollbox", { ref: listRef, flexGrow: 1, minHeight: 0, children: channels.map((ch, idx) => (_jsx("box", { id: `connect-${ch.id}`, backgroundColor: idx === selectedIndex ? t.selectedBg : undefined, paddingLeft: 2, paddingRight: 2, children: _jsxs("box", { flexDirection: "row", justifyContent: "space-between", children: [_jsx("text", { fg: idx === selectedIndex ? t.selected : t.text, children: ch.label }), _jsx("text", { fg: t.textMuted, children: ch.description })] }) }, ch.id))) }), _jsx("box", { flexShrink: 0, paddingLeft: 2, paddingRight: 2, paddingTop: 2, paddingBottom: 1, children: _jsxs("text", { children: [_jsx("span", { style: { fg: t.primary }, children: "enter " }), _jsx("span", { style: { fg: t.textMuted }, children: "select  ·  " }), _jsx("span", { style: { fg: t.primary }, children: "↑↓ " }), _jsx("span", { style: { fg: t.textMuted }, children: "navigate  ·  " }), _jsx("span", { style: { fg: t.primary }, children: "esc " }), _jsx("span", { style: { fg: t.textMuted }, children: "close" })] }) })] }) }));
+    return (_jsx(Dialog, { id: "connect-modal", name: "Connect", children: _jsx("box", { position: "absolute", left: 0, top: 0, width: width, height: height, alignItems: "center", paddingTop: top, backgroundColor: overlayBg, children: _jsxs("box", { width: Math.min(56, width - 6), height: panelHeight, backgroundColor: t.backgroundPanel, paddingTop: 1, paddingBottom: 1, flexDirection: "column", children: [_jsxs("box", { flexShrink: 0, flexDirection: "row", justifyContent: "space-between", paddingLeft: 2, paddingRight: 2, children: [_jsx("text", { fg: t.primary, children: _jsx("b", { children: "Connect" }) }), _jsx("text", { fg: t.textMuted, children: "esc" })] }), _jsx("box", { flexShrink: 0, paddingLeft: 2, paddingRight: 2, paddingTop: 1, paddingBottom: 1, children: _jsx("text", { fg: t.textMuted, children: "Choose a channel" }) }), _jsx("scrollbox", { ref: listRef, flexGrow: 1, minHeight: 0, children: channels.map((ch, idx) => (_jsx("box", { id: `connect-${ch.id}`, backgroundColor: idx === selectedIndex ? t.selectedBg : undefined, paddingLeft: 2, paddingRight: 2, children: _jsxs("box", { flexDirection: "row", justifyContent: "space-between", children: [_jsx("text", { fg: idx === selectedIndex ? t.selected : t.text, children: ch.label }), _jsx("text", { fg: t.textMuted, children: ch.description })] }) }, ch.id))) }), _jsx("box", { flexShrink: 0, paddingLeft: 2, paddingRight: 2, paddingTop: 2, paddingBottom: 1, children: _jsxs("text", { children: [_jsx("span", { style: { fg: t.primary }, children: "enter " }), _jsx("span", { style: { fg: t.textMuted }, children: "select  ·  " }), _jsx("span", { style: { fg: t.primary }, children: "↑↓ " }), _jsx("span", { style: { fg: t.textMuted }, children: "navigate  ·  " }), _jsx("span", { style: { fg: t.primary }, children: "esc " }), _jsx("span", { style: { fg: t.textMuted }, children: "close" })] }) })] }) }) }));
 }
 export function TelegramTokenModal({ t, width, height, inputRef, error, onSubmit, }) {
     const overlayBg = "#000000cc";
     const panelWidth = Math.min(68, width - 6);
     const panelHeight = 14;
     const top = bottomAlignedModalTop(height, panelHeight);
-    return (_jsx("box", { position: "absolute", left: 0, top: 0, width: width, height: height, alignItems: "center", paddingTop: top, backgroundColor: overlayBg, children: _jsxs("box", { width: panelWidth, height: panelHeight, backgroundColor: t.backgroundPanel, paddingTop: 1, paddingBottom: 1, flexDirection: "column", children: [_jsxs("box", { flexShrink: 0, flexDirection: "row", justifyContent: "space-between", paddingLeft: 2, paddingRight: 2, children: [_jsx("text", { fg: t.primary, children: _jsx("b", { children: "Telegram bot token" }) }), _jsx("text", { fg: t.textMuted, children: "esc" })] }), _jsx("box", { paddingLeft: 2, paddingRight: 2, paddingTop: 1, children: _jsx("text", { fg: t.text, children: "From @BotFather: /newbot, then paste the token here. Stored in ~/.muonroi-cli/user-settings.json." }) }), _jsx("box", { paddingLeft: 2, paddingRight: 2, paddingTop: 1, children: _jsx("box", { backgroundColor: t.backgroundElement, paddingLeft: 1, paddingRight: 1, width: "100%", children: _jsx("textarea", { ref: inputRef, focused: true, placeholder: "123456:ABC...", textColor: t.text, backgroundColor: t.backgroundElement, placeholderColor: t.textMuted, minHeight: 1, maxHeight: 3, wrapMode: "word", keyBindings: TEXTAREA_KEYBINDINGS, onSubmit: onSubmit }) }) }), _jsx("box", { flexGrow: 1, minHeight: 0 }), _jsx("box", { paddingLeft: 2, paddingRight: 2, paddingTop: 2, paddingBottom: 1, children: error ? (_jsx("text", { fg: t.diffRemovedFg, children: error })) : (_jsxs("text", { children: [_jsx("span", { style: { fg: t.primary }, children: "enter " }), _jsx("span", { style: { fg: t.textMuted }, children: "save token  ·  " }), _jsx("span", { style: { fg: t.primary }, children: "esc " }), _jsx("span", { style: { fg: t.textMuted }, children: "close" })] })) })] }) }));
+    return (_jsx(Dialog, { id: "telegram-token-modal", name: "Telegram bot token", children: _jsx("box", { position: "absolute", left: 0, top: 0, width: width, height: height, alignItems: "center", paddingTop: top, backgroundColor: overlayBg, children: _jsxs("box", { width: panelWidth, height: panelHeight, backgroundColor: t.backgroundPanel, paddingTop: 1, paddingBottom: 1, flexDirection: "column", children: [_jsxs("box", { flexShrink: 0, flexDirection: "row", justifyContent: "space-between", paddingLeft: 2, paddingRight: 2, children: [_jsx("text", { fg: t.primary, children: _jsx("b", { children: "Telegram bot token" }) }), _jsx("text", { fg: t.textMuted, children: "esc" })] }), _jsx("box", { paddingLeft: 2, paddingRight: 2, paddingTop: 1, children: _jsx("text", { fg: t.text, children: "From @BotFather: /newbot, then paste the token here. Stored in ~/.muonroi-cli/user-settings.json." }) }), _jsx("box", { paddingLeft: 2, paddingRight: 2, paddingTop: 1, children: _jsx("box", { backgroundColor: t.backgroundElement, paddingLeft: 1, paddingRight: 1, width: "100%", children: _jsx("textarea", { ref: inputRef, focused: true, placeholder: "123456:ABC...", textColor: t.text, backgroundColor: t.backgroundElement, placeholderColor: t.textMuted, minHeight: 1, maxHeight: 3, wrapMode: "word", keyBindings: TEXTAREA_KEYBINDINGS, onSubmit: onSubmit }) }) }), _jsx("box", { flexGrow: 1, minHeight: 0 }), _jsx("box", { paddingLeft: 2, paddingRight: 2, paddingTop: 2, paddingBottom: 1, children: error ? (_jsx("text", { fg: t.diffRemovedFg, children: error })) : (_jsxs("text", { children: [_jsx("span", { style: { fg: t.primary }, children: "enter " }), _jsx("span", { style: { fg: t.textMuted }, children: "save token  ·  " }), _jsx("span", { style: { fg: t.primary }, children: "esc " }), _jsx("span", { style: { fg: t.textMuted }, children: "close" })] })) })] }) }) }));
 }
 export function TelegramPairModal({ t, width, height, inputRef, error, onSubmit, }) {
     const overlayBg = "#000000cc";
     const panelWidth = Math.min(68, width - 6);
     const panelHeight = 13;
     const top = bottomAlignedModalTop(height, panelHeight);
-    return (_jsx("box", { position: "absolute", left: 0, top: 0, width: width, height: height, alignItems: "center", paddingTop: top, backgroundColor: overlayBg, children: _jsxs("box", { width: panelWidth, height: panelHeight, backgroundColor: t.backgroundPanel, paddingTop: 1, paddingBottom: 1, flexDirection: "column", children: [_jsxs("box", { flexShrink: 0, flexDirection: "row", justifyContent: "space-between", paddingLeft: 2, paddingRight: 2, children: [_jsx("text", { fg: t.primary, children: _jsx("b", { children: "Pairing code" }) }), _jsx("text", { fg: t.textMuted, children: "esc" })] }), _jsx("box", { paddingLeft: 2, paddingRight: 2, paddingTop: 1, children: _jsx("text", { fg: t.text, children: "DM your bot with /pair, then paste the 6-character code." }) }), _jsx("box", { paddingLeft: 2, paddingRight: 2, paddingTop: 1, children: _jsx("box", { backgroundColor: t.backgroundElement, paddingLeft: 1, paddingRight: 1, width: "100%", children: _jsx("textarea", { ref: inputRef, focused: true, placeholder: "ABC123", textColor: t.text, backgroundColor: t.backgroundElement, placeholderColor: t.textMuted, minHeight: 1, maxHeight: 2, wrapMode: "word", keyBindings: TEXTAREA_KEYBINDINGS, onSubmit: onSubmit }) }) }), _jsx("box", { flexGrow: 1, minHeight: 0 }), _jsx("box", { paddingLeft: 2, paddingRight: 2, paddingTop: 2, paddingBottom: 1, children: error ? (_jsx("text", { fg: t.diffRemovedFg, children: error })) : (_jsxs("text", { children: [_jsx("span", { style: { fg: t.primary }, children: "enter " }), _jsx("span", { style: { fg: t.textMuted }, children: "approve pairing  ·  " }), _jsx("span", { style: { fg: t.primary }, children: "esc " }), _jsx("span", { style: { fg: t.textMuted }, children: "close" })] })) })] }) }));
+    return (_jsx(Dialog, { id: "telegram-pair-modal", name: "Pairing code", children: _jsx("box", { position: "absolute", left: 0, top: 0, width: width, height: height, alignItems: "center", paddingTop: top, backgroundColor: overlayBg, children: _jsxs("box", { width: panelWidth, height: panelHeight, backgroundColor: t.backgroundPanel, paddingTop: 1, paddingBottom: 1, flexDirection: "column", children: [_jsxs("box", { flexShrink: 0, flexDirection: "row", justifyContent: "space-between", paddingLeft: 2, paddingRight: 2, children: [_jsx("text", { fg: t.primary, children: _jsx("b", { children: "Pairing code" }) }), _jsx("text", { fg: t.textMuted, children: "esc" })] }), _jsx("box", { paddingLeft: 2, paddingRight: 2, paddingTop: 1, children: _jsx("text", { fg: t.text, children: "DM your bot with /pair, then paste the 6-character code." }) }), _jsx("box", { paddingLeft: 2, paddingRight: 2, paddingTop: 1, children: _jsx("box", { backgroundColor: t.backgroundElement, paddingLeft: 1, paddingRight: 1, width: "100%", children: _jsx("textarea", { ref: inputRef, focused: true, placeholder: "ABC123", textColor: t.text, backgroundColor: t.backgroundElement, placeholderColor: t.textMuted, minHeight: 1, maxHeight: 2, wrapMode: "word", keyBindings: TEXTAREA_KEYBINDINGS, onSubmit: onSubmit }) }) }), _jsx("box", { flexGrow: 1, minHeight: 0 }), _jsx("box", { paddingLeft: 2, paddingRight: 2, paddingTop: 2, paddingBottom: 1, children: error ? (_jsx("text", { fg: t.diffRemovedFg, children: error })) : (_jsxs("text", { children: [_jsx("span", { style: { fg: t.primary }, children: "enter " }), _jsx("span", { style: { fg: t.textMuted }, children: "approve pairing  ·  " }), _jsx("span", { style: { fg: t.primary }, children: "esc " }), _jsx("span", { style: { fg: t.textMuted }, children: "close" })] })) })] }) }) }));
 }
 //# sourceMappingURL=connect-modal.js.map

package/dist/src/ui/modals/model-picker-modal.d.ts

@@ -14,24 +14,12 @@ export interface ApiKeyPromptState {
     /** When true the field shows the raw key instead of mask dots (Ctrl+R). */
     reveal?: boolean;
 }
-export type BwSyncState = {
-    phase: "password";
-    value: string;
-    error: string | null;
-    loading: boolean;
-} | {
-    phase: "picker";
-    session: string;
-    items: Array<{
-        provider: ProviderId;
-        key: string;
-    }>;
-    selected: Set<ProviderId>;
-    focusIndex: number;
-    loading: boolean;
+/** In-progress OAuth login overlay state (browser-based subscription sign-in). */
+export interface OAuthLoginState {
+    provider: ProviderId;
     error: string | null;
-};
-export declare function ModelPickerModal({ t, width, height, configuredProviders, disabledProviders, defaultProvider, providerChipIndex, providersWithKey, apiKeyPrompt, bwSync, }: {
+}
+export declare function ModelPickerModal({ t, width, height, configuredProviders, disabledProviders, defaultProvider, providerChipIndex, providersWithKey, apiKeyPrompt, oauthProviders, oauthLogin, }: {
     t: Theme;
     currentModel?: string;
     selectedIndex?: number;
@@ -48,5 +36,7 @@ export declare function ModelPickerModal({ t, width, height, configuredProviders
     providerChipIndex: number;
     providersWithKey?: ReadonlySet<ProviderId>;
     apiKeyPrompt?: ApiKeyPromptState | null;
-    bwSync?: BwSyncState | null;
+    /** Providers that support OAuth subscription login (openai, xai). */
+    oauthProviders?: ReadonlySet<ProviderId>;
+    oauthLogin?: OAuthLoginState | null;
 }): import("react").ReactNode;

package/dist/src/ui/modals/model-picker-modal.js

@@ -21,9 +21,10 @@ export function groupModelsByTier(models) {
     const order = ["premium", "balanced", "fast", "other"];
     return order.filter((t) => map.has(t)).map((t) => ({ tier: t, items: map.get(t) }));
 }
-export function ModelPickerModal({ t, width, height, configuredProviders, disabledProviders, defaultProvider, providerChipIndex, providersWithKey, apiKeyPrompt, bwSync, }) {
+export function ModelPickerModal({ t, width, height, configuredProviders, disabledProviders, defaultProvider, providerChipIndex, providersWithKey, apiKeyPrompt, oauthProviders, oauthLogin, }) {
     const disabledSet = new Set(disabledProviders);
     const keyedSet = providersWithKey ?? new Set();
+    const oauthSet = oauthProviders ?? new Set();
     const panelWidth = Math.min(64, width - 6);
     const rowCount = Math.max(configuredProviders.length, 1);
     const contentHeight = rowCount + 7;
@@ -32,13 +33,9 @@ export function ModelPickerModal({ t, width, height, configuredProviders, disabl
     const top = bottomAlignedModalTop(height, panelHeight);
     const overlayBg = "#000000cc";
     // Sub-modal: API key prompt overlay (rendered on top of the picker).
-    const subModal = apiKeyPrompt ? (_jsx(Semantic, { id: "provider-key-prompt", role: "dialog", isModal: true, name: `Set ${apiKeyPrompt.provider} key`, children: _jsx("box", { position: "absolute", left: 0, top: 0, width: width, height: height, alignItems: "center", paddingTop: Math.floor(height / 3), backgroundColor: "#000000dd", children: _jsxs("box", { width: Math.min(60, width - 8), backgroundColor: t.backgroundPanel, paddingTop: 1, paddingBottom: 1, paddingLeft: 2, paddingRight: 2, flexDirection: "column", children: [_jsx("text", { fg: t.primary, children: _jsx("b", { children: `Set API key — ${apiKeyPrompt.provider}` }) }), _jsx("box", { paddingTop: 1, children: _jsx("text", { fg: t.textMuted, children: "Key is saved to the OS keychain (keytar). Bitwarden sync via `muonroi-cli keys import-bw`." }) }), _jsx(Semantic, { id: "provider-key-input", role: "textbox", name: `${apiKeyPrompt.provider} API key`, focus: true, value: apiKeyPrompt.value, children: _jsxs("box", { paddingTop: 1, backgroundColor: t.backgroundElement, paddingLeft: 1, paddingRight: 1, flexDirection: "row", justifyContent: "space-between", children: [apiKeyPrompt.value.length > 0 ? (_jsx("text", { fg: t.text, children: `${apiKeyPrompt.reveal ? apiKeyPrompt.value.slice(0, 40) : "•".repeat(Math.min(apiKeyPrompt.value.length, 40))}▏` })) : (_jsx("text", { fg: t.textDim, children: "▏(type or paste key)" })), apiKeyPrompt.value.length > 0 ? (_jsx("text", { fg: t.textMuted, children: `${apiKeyPrompt.reveal ? "shown" : "hidden"} · ${apiKeyPrompt.value.length} chars` })) : null] }) }), apiKeyPrompt.error ? (_jsx("box", { paddingTop: 1, children: _jsx("text", { fg: t.initFormError, children: apiKeyPrompt.error }) })) : null, _jsx("box", { paddingTop: 1, children: _jsx("text", { fg: t.textMuted, children: "Enter save · Esc cancel · Ctrl+R reveal · paste works" }) })] }) }) })) : null;
-    // Sub-modal: Bitwarden sync (Option A) — password phase, then provider picker.
-    const bwModal = bwSync ? (_jsx(Semantic, { id: "provider-bw-sync", role: "dialog", isModal: true, name: "Bitwarden sync", children: _jsx("box", { position: "absolute", left: 0, top: 0, width: width, height: height, alignItems: "center", paddingTop: Math.floor(height / 4), backgroundColor: "#000000dd", children: _jsx("box", { width: Math.min(64, width - 8), backgroundColor: t.backgroundPanel, paddingTop: 1, paddingBottom: 1, paddingLeft: 2, paddingRight: 2, flexDirection: "column", children: bwSync.phase === "password" ? (_jsxs(_Fragment, { children: [_jsx("text", { fg: t.primary, children: _jsx("b", { children: "Sync from Bitwarden" }) }), _jsx("box", { paddingTop: 1, children: _jsx("text", { fg: t.textMuted, children: "Unlocks vault with master password, finds items named 'muonroi-cli/<provider>', imports keys." }) }), _jsx(Semantic, { id: "bw-password-input", role: "textbox", name: "Bitwarden master password", focus: true, value: bwSync.value, children: _jsxs("box", { paddingTop: 1, backgroundColor: t.backgroundElement, paddingLeft: 1, paddingRight: 1, flexDirection: "row", justifyContent: "space-between", children: [bwSync.value.length > 0 ? (_jsx("text", { fg: t.text, children: `${"•".repeat(Math.min(bwSync.value.length, 40))}▏` })) : (_jsx("text", { fg: t.textDim, children: "▏(master password)" })), bwSync.value.length > 0 ? _jsx("text", { fg: t.textMuted, children: `${bwSync.value.length} chars` }) : null] }) }), bwSync.error ? (_jsx("box", { paddingTop: 1, children: _jsx("text", { fg: t.initFormError, children: bwSync.error }) })) : null, _jsx("box", { paddingTop: 1, children: _jsx("text", { fg: t.textMuted, children: bwSync.loading ? "unlocking..." : "Enter unlock  Esc cancel" }) })] })) : (_jsxs(_Fragment, { children: [_jsx("text", { fg: t.primary, children: _jsx("b", { children: `Import from Bitwarden (${bwSync.items.length} found)` }) }), _jsx("box", { paddingTop: 1, flexDirection: "column", children: bwSync.items.map((item, i) => {
-                                const focused = i === bwSync.focusIndex;
-                                const checked = bwSync.selected.has(item.provider);
-                                return (_jsx("box", { paddingLeft: 1, paddingRight: 1, backgroundColor: focused ? t.selectedBg : undefined, children: _jsx("text", { fg: focused ? t.accent : t.text, children: `${focused ? "›" : " "} [${checked ? "x" : " "}] ${item.provider}` }) }, item.provider));
-                            }) }), bwSync.error ? (_jsx("box", { paddingTop: 1, children: _jsx("text", { fg: t.initFormError, children: bwSync.error }) })) : null, _jsx("box", { paddingTop: 1, children: _jsx("text", { fg: t.textMuted, children: bwSync.loading ? "importing..." : "↑↓ nav  Space toggle  Enter import  Esc cancel" }) })] })) }) }) })) : null;
+    const subModal = apiKeyPrompt ? (_jsx(Semantic, { id: "provider-key-prompt", role: "dialog", isModal: true, name: `Set ${apiKeyPrompt.provider} key`, children: _jsx("box", { position: "absolute", left: 0, top: 0, width: width, height: height, alignItems: "center", paddingTop: Math.floor(height / 3), backgroundColor: "#000000dd", children: _jsxs("box", { width: Math.min(60, width - 8), backgroundColor: t.backgroundPanel, paddingTop: 1, paddingBottom: 1, paddingLeft: 2, paddingRight: 2, flexDirection: "column", children: [_jsx("text", { fg: t.primary, children: _jsx("b", { children: `Set API key — ${apiKeyPrompt.provider}` }) }), _jsx("box", { paddingTop: 1, children: _jsx("text", { fg: t.textMuted, children: "Key is stored as an environment variable (~/.muonroi-cli/.env, mirrored to your OS env)." }) }), _jsx(Semantic, { id: "provider-key-input", role: "textbox", name: `${apiKeyPrompt.provider} API key`, focus: true, value: apiKeyPrompt.value, children: _jsxs("box", { paddingTop: 1, backgroundColor: t.backgroundElement, paddingLeft: 1, paddingRight: 1, flexDirection: "row", justifyContent: "space-between", children: [apiKeyPrompt.value.length > 0 ? (_jsx("text", { fg: t.text, children: `${apiKeyPrompt.reveal ? apiKeyPrompt.value.slice(0, 40) : "•".repeat(Math.min(apiKeyPrompt.value.length, 40))}▏` })) : (_jsx("text", { fg: t.textDim, children: "▏(type or paste key)" })), apiKeyPrompt.value.length > 0 ? (_jsx("text", { fg: t.textMuted, children: `${apiKeyPrompt.reveal ? "shown" : "hidden"} · ${apiKeyPrompt.value.length} chars` })) : null] }) }), apiKeyPrompt.error ? (_jsx("box", { paddingTop: 1, children: _jsx("text", { fg: t.initFormError, children: apiKeyPrompt.error }) })) : null, _jsx("box", { paddingTop: 1, children: _jsx("text", { fg: t.textMuted, children: "Enter save · Esc cancel · Ctrl+R reveal · paste works" }) })] }) }) })) : null;
+    // Sub-modal: OAuth subscription login (browser-based) for openai / xai.
+    const oauthModal = oauthLogin ? (_jsx(Semantic, { id: "provider-oauth-login", role: "dialog", isModal: true, name: `Sign in to ${oauthLogin.provider}`, children: _jsx("box", { position: "absolute", left: 0, top: 0, width: width, height: height, alignItems: "center", paddingTop: Math.floor(height / 3), backgroundColor: "#000000dd", children: _jsxs("box", { width: Math.min(60, width - 8), backgroundColor: t.backgroundPanel, paddingTop: 1, paddingBottom: 1, paddingLeft: 2, paddingRight: 2, flexDirection: "column", children: [_jsx("text", { fg: t.primary, children: _jsx("b", { children: `Sign in to ${oauthLogin.provider} (OAuth)` }) }), _jsx("box", { paddingTop: 1, children: _jsx("text", { fg: t.textMuted, children: "A browser window is opening. Complete the sign-in there; this returns automatically." }) }), oauthLogin.error ? (_jsx("box", { paddingTop: 1, children: _jsx("text", { fg: t.initFormError, children: oauthLogin.error }) })) : (_jsx("box", { paddingTop: 1, children: _jsx("text", { fg: t.textMuted, children: "Waiting for authorization…  Esc cancel" }) }))] }) }) })) : null;
     return (_jsxs(_Fragment, { children: [_jsx(Semantic, { id: "model-picker", role: "dialog", isModal: true, name: "Providers", children: _jsx("box", { position: "absolute", left: 0, top: 0, width: width, height: height, alignItems: "center", paddingTop: top, backgroundColor: overlayBg, children: _jsxs("box", { width: panelWidth, height: panelHeight, backgroundColor: t.backgroundPanel, paddingTop: 1, paddingBottom: 1, flexDirection: "column", children: [_jsxs("box", { flexShrink: 0, flexDirection: "row", justifyContent: "space-between", paddingLeft: 2, paddingRight: 2, children: [_jsx("text", { fg: t.primary, children: _jsx("b", { children: "Providers" }) }), _jsx("text", { fg: t.textMuted, children: "esc" })] }), _jsx("box", { flexShrink: 0, paddingLeft: 2, paddingRight: 2, paddingTop: 1, flexDirection: "column", children: configuredProviders.length === 0 ? (_jsx("text", { fg: t.textMuted, children: "No providers configured" })) : (configuredProviders.map((p, i) => {
                                     const hasKey = keyedSet.has(p);
                                     const enabled = hasKey && !disabledSet.has(p);
@@ -48,8 +45,9 @@ export function ModelPickerModal({ t, width, height, configuredProviders, disabl
                                     const star = isDefault ? "★" : " ";
                                     const fg = focused ? t.accent : enabled ? t.text : t.textMuted;
                                     const starFg = isDefault ? t.primary : t.textDim;
-                                    const suffix = !hasKey ? "  (no key — press K)" : "";
+                                    const canOAuth = oauthSet.has(p);
+                                    const suffix = !hasKey ? (canOAuth ? "  (Enter sign in · K key)" : "  (no key — press K)") : "";
                                     return (_jsx(Semantic, { id: `provider-chip-${p}`, role: "button", selected: enabled ? true : undefined, disabled: !hasKey ? true : undefined, name: p, children: _jsxs("box", { paddingLeft: 1, paddingRight: 1, backgroundColor: focused ? t.selectedBg : undefined, width: "100%", flexDirection: "row", children: [_jsx("text", { fg: fg, children: `${focused ? "›" : " "} ${mark} ` }), _jsx("text", { fg: starFg, children: `${star} ` }), _jsx("text", { fg: fg, children: p }), suffix ? _jsx("text", { fg: t.textMuted, children: suffix }) : null] }) }, p));
-                                })) }), _jsx("box", { flexGrow: 1, minHeight: 0 }), _jsx("box", { flexShrink: 0, paddingLeft: 2, paddingRight: 2, paddingTop: 1, children: _jsx("text", { fg: t.textMuted, children: "↑↓ nav  Space toggle  D default  K set key  B sync BW  Esc close" }) })] }) }) }), subModal, bwModal] }));
+                                })) }), _jsx("box", { flexGrow: 1, minHeight: 0 }), _jsx("box", { flexShrink: 0, paddingLeft: 2, paddingRight: 2, paddingTop: 1, children: _jsx("text", { fg: t.textMuted, children: "↑↓ nav  Space toggle  D default  O sign in  K set key  Esc close" }) })] }) }) }), subModal, oauthModal] }));
 }
 //# sourceMappingURL=model-picker-modal.js.map

package/dist/src/ui/modals/session-picker-modal.d.ts

@@ -1,4 +1,4 @@
-import type { SessionInfo } from "../../types/index.js";
+import type { ResumeEntry } from "../../types/index.js";
 import type { Theme } from "../theme.js";
 /**
  * Recent-sessions picker. Opened by `/sessions` or `/session`. Selecting a
@@ -7,7 +7,7 @@ import type { Theme } from "../theme.js";
  */
 export declare function SessionPickerModal({ t, sessions, focusIndex, width, height, }: {
     t: Theme;
-    sessions: SessionInfo[];
+    sessions: ResumeEntry[];
     focusIndex: number;
     width: number;
     height: number;