muonroi-cli 1.8.5 → 1.9.0

package/dist/src/ui/use-app-logic.js

@@ -6,11 +6,13 @@ import { useKeyboard, useRenderer, useTerminalDimensions } from "@opentui/react"
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { clearLastSurfacedMatches, getDefaultEEClient, getLastSurfacedMatches } from "../ee/intercept.js";
 import { deliberateCompact } from "../flow/compaction/index.js";
+import { stageProgress } from "../flow/compaction/progress.js";
 import { writeScaffoldCheckpoint } from "../flow/scaffold-checkpoint.js";
 import { appendCrashLog, setActiveEeYield } from "../index.js";
 import { POPULAR_MCP_CATALOG } from "../mcp/catalog.js";
 import { parseEnvLines, parseHeaderLines } from "../mcp/parse-headers.js";
 import { toMcpServerId, validateMcpServerConfig } from "../mcp/validate.js";
+import { ASK_USER_DISMISSED, buildAskUserQuestion } from "../orchestrator/ask-user.js";
 import { createCompactionSummaryMessage } from "../orchestrator/compaction.js";
 import { Agent } from "../orchestrator/orchestrator.js";
 import { buildCompactResumeMessage, detectProactiveCompactRequest, } from "../orchestrator/proactive-compact-detector.js";
@@ -39,9 +41,12 @@ import { initialCardState, reduceCardKey, } from "./components/council-question-
 import { cycleRoundSelection } from "./components/council-rail-rounds.js";
 import { reapStatuses, upsertStatus } from "./components/council-status-list.js";
 import { BB_TEMPLATE_OPTIONS, FE_STACK_OPTIONS, initialInitNewFormState, } from "./components/init-new-form-card.js";
+import { findLastCollapsibleIndex } from "./components/message-view.js";
+import { groupToolEntries } from "./utils/group-tool-entries.js";
 import { initialPointToExistingFormState, } from "./components/point-to-existing-form-card.js";
 import { useRolePalette } from "./components/role-palette.js";
 import { usePairQuoteBuffer } from "./components/use-pair-quote-buffer.js";
+import { mapCouncilStatusToSpeakerEvent } from "./council-harness-event.js";
 import { useAgentEditor } from "./hooks/use-agent-editor.js";
 import { useMcpEditor } from "./hooks/use-mcp-editor.js";
 import { useModelPicker } from "./hooks/use-model-picker.js";
@@ -599,7 +604,11 @@ export function useAppLogic(props) {
             setConfiguredProviders(resolvePickerProviders(SPLASH_PROVIDERS, configured, (p) => getModelsForProvider(p).length > 0));
             setProvidersWithKey(new Set(configured));
         }
-        catch {
+        catch (err) {
+            // This resets every chip to "no key — press K". Silently, that reads as
+            // "the key I just set was not saved" when the credentials are in fact on
+            // disk and only the lookup failed — so say so instead of swallowing it.
+            console.error(`[providers] credential lookup failed; chips will show no key: ${err instanceof Error ? err.message : String(err)}`);
             setConfiguredProviders([...SPLASH_PROVIDERS]);
             setProvidersWithKey(new Set());
         }
@@ -629,9 +638,19 @@ export function useAppLogic(props) {
         try {
             const ok = await setKeyForProvider(apiKeyPrompt.provider, key);
             if (!ok) {
-                setApiKeyPrompt({ ...apiKeyPrompt, error: "Keychain unavailable — set env var instead" });
+                setApiKeyPrompt({ ...apiKeyPrompt, error: "Could not store key. Try `export <PROVIDER>_API_KEY=…`." });
                 return;
             }
+            // Same reason as the OAuth path: boot skips a provider with no
+            // credentials, so without this the key is stored but the provider stays
+            // unusable until the next start.
+            try {
+                const { rewarmProviderFactory } = await import("../providers/warm.js");
+                await rewarmProviderFactory(apiKeyPrompt.provider);
+            }
+            catch (err) {
+                console.error(`[providers] ${apiKeyPrompt.provider} key stored but its factory could not be rebuilt; a restart may be needed: ${err instanceof Error ? err.message : String(err)}`);
+            }
             await refreshProvidersWithKey();
             setApiKeyPrompt(null);
         }
@@ -639,85 +658,92 @@ export function useAppLogic(props) {
             setApiKeyPrompt({ ...apiKeyPrompt, error: e.message });
         }
     }, [apiKeyPrompt, refreshProvidersWithKey]);
-    const [bwSync, setBwSync] = useState(null);
-    const submitBwPassword = useCallback(async () => {
-        if (!bwSync || bwSync.phase !== "password")
-            return;
-        const password = bwSync.value;
-        if (password.length < 4) {
-            setBwSync({ ...bwSync, error: "Master password too short" });
-            return;
-        }
-        setBwSync({ ...bwSync, loading: true, error: null });
+    // ── OAuth subscription login (browser-based) for openai / xai ───────────
+    // One auth mode per provider: a successful OAuth login clears any stored API
+    // key for that provider (exclusivity). Runs the registry login() flow, which
+    // opens the browser and resolves when the loopback callback completes.
+    const [oauthProviders, setOAuthProviders] = useState(() => new Set());
+    const [oauthLogin, setOAuthLogin] = useState(null);
+    const oauthCancelRef = useRef(false);
+    // Aborts the in-flight sign-in itself, not just the UI's interest in it —
+    // see cancelProviderOAuth.
+    const oauthAbortRef = useRef(null);
+    // Populate the OAuth-capable provider set once, from the OAuth registry.
+    useEffect(() => {
+        let alive = true;
+        void (async () => {
+            try {
+                const { listOAuthProviderIds } = await import("../providers/auth/registry.js");
+                const ids = await listOAuthProviderIds();
+                if (alive)
+                    setOAuthProviders(new Set(ids));
+            }
+            catch {
+                /* registry unavailable — no OAuth affordance */
+            }
+        })();
+        return () => {
+            alive = false;
+        };
+    }, []);
+    const startProviderOAuth = useCallback(async (provider) => {
+        oauthCancelRef.current = false;
+        // Abort the PREVIOUS attempt's server before starting another: the
+        // browser flow binds a loopback callback on a two-port set, so a
+        // still-running one would make this attempt fail to bind.
+        oauthAbortRef.current?.abort();
+        oauthAbortRef.current = new AbortController();
+        setOAuthLogin({ provider, error: null });
         try {
-            const { unlockWithPassword, listSecureNotesByPrefix } = await import("../cli/bw-vault.js");
-            const unlock = await unlockWithPassword(password);
-            if (!unlock.ok || !unlock.session) {
-                setBwSync({ ...bwSync, loading: false, error: unlock.error ?? "bw unlock failed" });
+            const { getOAuthProviderConfig } = await import("../providers/auth/registry.js");
+            const cfg = await getOAuthProviderConfig(provider);
+            if (!cfg) {
+                setOAuthLogin({ provider, error: "OAuth is not available for this provider." });
                 return;
             }
-            const prefix = "muonroi-cli/";
-            const list = await listSecureNotesByPrefix(unlock.session, prefix);
-            if (!list.ok) {
-                setBwSync({ ...bwSync, loading: false, error: list.error });
+            const tokens = await cfg.provider.login({ signal: oauthAbortRef.current?.signal });
+            if (oauthCancelRef.current)
                 return;
+            const { saveTokens } = await import("../providers/auth/token-store.js");
+            await saveTokens(provider, tokens);
+            // Exclusivity: OAuth login clears any stored API key for this provider.
+            try {
+                const { clearEnvVar } = await import("../providers/env-store.js");
+                const { ENV_BY_PROVIDER } = await import("../providers/keychain.js");
+                clearEnvVar(ENV_BY_PROVIDER[provider]);
             }
-            const matched = [];
-            for (const it of list.items) {
-                const providerName = it.name.slice(prefix.length);
-                if (SPLASH_PROVIDERS.includes(providerName) && it.notes.length >= 20) {
-                    matched.push({ provider: providerName, key: it.notes });
-                }
-            }
-            if (matched.length === 0) {
-                setBwSync({
-                    ...bwSync,
-                    loading: false,
-                    error: `No items found in vault with prefix '${prefix}<provider>'`,
-                });
-                return;
+            catch (err) {
+                console.error(`[providers] could not clear the stored ${provider} key after OAuth login: ${err instanceof Error ? err.message : String(err)}`);
             }
-            setBwSync({
-                phase: "picker",
-                session: unlock.session,
-                items: matched,
-                selected: new Set(matched.map((m) => m.provider)),
-                focusIndex: 0,
-                loading: false,
-                error: null,
-            });
-        }
-        catch (e) {
-            setBwSync({ ...bwSync, loading: false, error: e.message });
-        }
-    }, [bwSync]);
-    const commitBwImport = useCallback(async () => {
-        if (!bwSync || bwSync.phase !== "picker")
-            return;
-        setBwSync({ ...bwSync, loading: true, error: null });
-        let imported = 0;
-        let failed = 0;
-        for (const item of bwSync.items) {
-            if (!bwSync.selected.has(item.provider))
-                continue;
+            // The factory bakes in the auth it saw when it was built, so the tokens
+            // we just saved reach nothing until it is rebuilt — that is why signing
+            // in only took effect after restarting the session.
             try {
-                const ok = await setKeyForProvider(item.provider, item.key);
-                if (ok)
-                    imported++;
-                else
-                    failed++;
+                const { rewarmProviderFactory } = await import("../providers/warm.js");
+                await rewarmProviderFactory(provider);
             }
-            catch {
-                failed++;
+            catch (err) {
+                console.error(`[providers] ${provider} signed in but its factory could not be rebuilt; a restart may be needed: ${err instanceof Error ? err.message : String(err)}`);
             }
+            await refreshProvidersWithKey();
+            setOAuthLogin(null);
         }
-        await refreshProvidersWithKey();
-        if (failed > 0 && imported === 0) {
-            setBwSync({ ...bwSync, loading: false, error: `Imported 0; ${failed} failed (keychain unavailable?)` });
-            return;
-        }
-        setBwSync(null);
-    }, [bwSync, refreshProvidersWithKey]);
+        catch (e) {
+            if (oauthCancelRef.current)
+                return;
+            setOAuthLogin({ provider, error: e.message });
+        }
+    }, [refreshProvidersWithKey]);
+    const cancelProviderOAuth = useCallback(() => {
+        oauthCancelRef.current = true;
+        // Esc used to close the card and leave the sign-in running: its loopback
+        // server kept port 1455/1457 for the full 5-minute callback timeout, so the
+        // next attempt could not bind and only restarting the CLI recovered it.
+        // Abort ends the flow, which closes the server and frees the port now.
+        oauthAbortRef.current?.abort();
+        oauthAbortRef.current = null;
+        setOAuthLogin(null);
+    }, []);
     // Sync React model state with status bar store so chat input reflects
     // per-turn router upgrades (brain EE upgrade, warm/cold routing, etc.)
     useEffect(() => {
@@ -728,7 +754,7 @@ export function useAppLogic(props) {
     }, [setModel]);
     const initialHasApiKey = agent.hasApiKey();
     const [hasApiKey, setHasApiKey] = useState(initialHasApiKey);
-    const [messages, setMessages] = useState(() => agent.getChatEntries());
+    const [messages, setMessages] = useState(() => groupToolEntries(agent.getChatEntries()));
     const [streamContent, setStreamContent] = useState("");
     // Reasoning state: track activity + last-elapsed for a "💭 Thought for Ns"
     // pill instead of dumping CoT into the chat (saves 80–120 setState/sec on
@@ -808,6 +834,8 @@ export function useAppLogic(props) {
     // Peek toggle (ctrl+e) for the todo panel while it auto-collapses during a
     // council debate. Default collapsed; expands back to the full panel on demand.
     const [councilTodoExpanded, setCouncilTodoExpanded] = useState(false);
+    // Non-null only while a /compact is in flight; drives CompactProgressCard.
+    const [compactRun, setCompactRun] = useState(null);
     const [councilInfoCards, setCouncilInfoCards] = useState([]);
     // P3 — council metadata for the context rail (leader/panel/budget/research/
     // cost), upsert-merged from incremental council_meta patches.
@@ -824,6 +852,14 @@ export function useAppLogic(props) {
     // global (all/live rounds). Mirrored into a ref so the global key handler can
     // read the current round list without re-subscribing on every round update.
     const [selectedRound, setSelectedRound] = useState(null);
+    // Mirrors councilStatuses for the global key handler: ctrl+e only belongs to
+    // the council todo panel while that panel is actually auto-collapsed, which
+    // app.tsx gates on `councilStatuses.length > 0`. Reading it from a ref keeps
+    // handleKey off the councilStatuses dep list.
+    const councilStatusesRef = useRef([]);
+    useEffect(() => {
+        councilStatusesRef.current = councilStatuses;
+    }, [councilStatuses]);
     const councilRoundsRef = useRef([]);
     useEffect(() => {
         councilRoundsRef.current = councilRounds;
@@ -1018,6 +1054,10 @@ export function useAppLogic(props) {
     // Pending resolvers for safety-override askcards. Keyed by questionId; populated
     // by setSafetyOverrideHandler, drained by the askcard answer/cancel branches.
     const safetyOverrideResolversRef = useRef(new Map());
+    // Pending resolvers for ask_user askcards (the model-callable ask_user tool).
+    // Keyed by questionId; populated by setAskUserHandler, drained by the askcard
+    // answer/cancel branches. Resolve value = the human's answer string.
+    const askUserResolversRef = useRef(new Map());
     // Current todo snapshot (Claude-style sticky checklist). Updated by
     // `task_list_update` chunks emitted after every `todo_write` tool call.
     // Auto-hides ~2s after 100% completion so the panel doesn't linger.
@@ -1032,7 +1072,9 @@ export function useAppLogic(props) {
     // throws (internal try/catch → []).
     // biome-ignore lint/correctness/useExhaustiveDependencies: sessionId + messages.length are intentional recompute signals (getSessionTree reads the current session internally)
     const sessionTree = useMemo(() => agent.getSessionTree(), [agent, sessionId, messages.length]);
-    const [showApiKeyModal, setShowApiKeyModal] = useState(() => !initialHasApiKey);
+    // Boot straight to chat: no forced API-key modal on start. Auth is on-demand
+    // via the provider picker (opens on a no-auth send, or via /providers).
+    const [showApiKeyModal, setShowApiKeyModal] = useState(false);
     const [apiKeyError, setApiKeyError] = useState(null);
     const [showSlashMenu, setShowSlashMenu] = useState(false);
     // Ref stays current synchronously so keyboard-burst handlers read the right value
@@ -1085,6 +1127,18 @@ export function useAppLogic(props) {
     const newSinceLockRef = useRef(0);
     const [newSinceLock, setNewSinceLock] = useState(0);
     const [scrollLockedAway, setScrollLockedAway] = useState(false);
+    // Transcript length when the user last left the bottom. The pill counts new
+    // *entries* against this watermark. It must NOT count scrollToBottom() calls:
+    // those fire per 32ms stream flush and per tool event, so a single streaming
+    // answer used to push the pill into the hundreds ("251 new below").
+    const lockedAtCountRef = useRef(0);
+    // Ref mirror of scrollLockedAway so the scroll helpers can read the current
+    // lock state synchronously (React state lags a render behind).
+    const lockedAwayRef = useRef(false);
+    const messageCountRef = useRef(0);
+    useEffect(() => {
+        messageCountRef.current = messages.length;
+    }, [messages.length]);
     // Context rail (MUONROI_CONTEXT_RAIL): user can hide/show the right metadata
     // panel with Ctrl+B. Defaults visible; the rail also auto-hides below 100 cols
     // (decided in app.tsx where terminal width is known).
@@ -1103,29 +1157,49 @@ export function useAppLogic(props) {
         const vpH = sb.viewport.height ?? 0;
         return sb.scrollTop + vpH >= sb.scrollHeight - 2;
     }, []);
+    // Retire the jump-to-latest pill. Single writer for the three lock fields so
+    // the ref mirror can never drift from the rendered state.
+    const clearScrollLock = useCallback(() => {
+        lockedAwayRef.current = false;
+        lockedAtCountRef.current = messageCountRef.current;
+        if (newSinceLockRef.current !== 0) {
+            newSinceLockRef.current = 0;
+            setNewSinceLock(0);
+        }
+        setScrollLockedAway(false);
+    }, []);
+    // Engage the lock. Single writer, mirroring clearScrollLock. The first call
+    // after leaving the bottom sets the watermark; later calls are no-ops, so
+    // repeated scroll attempts for the SAME content (32ms stream flushes, tool
+    // events) can never inflate the pill.
+    const engageScrollLock = useCallback(() => {
+        if (!isScrollLockEnabled() || lockedAwayRef.current)
+            return;
+        lockedAwayRef.current = true;
+        lockedAtCountRef.current = messageCountRef.current;
+        setScrollLockedAway(true);
+    }, []);
     // Soft scroll: respects scroll-lock. New content that arrives while the user
     // reads history does NOT move the viewport; it just increments the pill count.
     const scrollToBottom = useCallback(() => {
         if (isScrollLockEnabled() && !isPinnedToBottom()) {
-            newSinceLockRef.current += 1;
-            setNewSinceLock(newSinceLockRef.current);
-            setScrollLockedAway(true);
+            engageScrollLock();
+            const fresh = Math.max(0, messageCountRef.current - lockedAtCountRef.current);
+            newSinceLockRef.current = fresh;
+            setNewSinceLock(fresh);
             return;
         }
         // Pinned (or lock off): scroll, and if the user had manually scrolled back
         // to the bottom on their own, retire the jump-to-latest pill.
-        if (newSinceLockRef.current !== 0) {
-            newSinceLockRef.current = 0;
-            setNewSinceLock(0);
-            setScrollLockedAway(false);
-        }
+        if (lockedAwayRef.current || newSinceLockRef.current !== 0)
+            clearScrollLock();
         try {
             scrollRef.current?.scrollTo(scrollRef.current?.scrollHeight ?? 99999);
         }
         catch {
             /* */
         }
-    }, [isPinnedToBottom]);
+    }, [isPinnedToBottom, clearScrollLock, engageScrollLock]);
     // Hard scroll: re-arms native sticky and jumps to the latest line regardless
     // of manual-scroll state. Used by explicit user actions (new prompt submit,
     // jump-to-latest pill) that intend to return to the live tail.
@@ -1141,10 +1215,8 @@ export function useAppLogic(props) {
                 /* */
             }
         }
-        newSinceLockRef.current = 0;
-        setNewSinceLock(0);
-        setScrollLockedAway(false);
-    }, []);
+        clearScrollLock();
+    }, [clearScrollLock]);
     const { width, height } = useTerminalDimensions();
     const processedInitial = useRef(false);
     const contentAccRef = useRef("");
@@ -1156,7 +1228,7 @@ export function useAppLogic(props) {
     const originalIdealPromptRef = useRef(null);
     const isProcessingRef = useRef(false);
     const hasApiKeyRef = useRef(initialHasApiKey);
-    const showApiKeyModalRef = useRef(!initialHasApiKey);
+    const showApiKeyModalRef = useRef(false);
     const queuedMessagesRef = useRef([]);
     const processMessageRef = useRef(() => { });
     const [queuedMessages, setQueuedMessages] = useState([]);
@@ -1789,6 +1861,16 @@ export function useAppLogic(props) {
         setCouncilRounds([]);
         setSelectedRound(null);
         setCouncilPlaceholders(new Map());
+        // The auto-council path drives councilPhases through the MAIN stream loop,
+        // which — unlike the nested /council and /ideal loops — never reset it on
+        // turn end. On a hung/watchdog-aborted council turn the running phase never
+        // emits its `state:"done"` event, so <CouncilPhaseTimeline> stays frozen at
+        // "Council working… elapsed Ns" forever and the session LOOKS hung even after
+        // the turn actually finalized (live: reasoning-model hang c1d461439618).
+        // Clearing here (called at both beginLiveTurn and finalizeActiveTurn) tears
+        // the timeline down on every turn boundary. The completed phases were already
+        // rendered live; the persisted [Council Decision] message is the durable record.
+        setCouncilPhases([]);
         councilTopicRef.current = undefined;
     }, []);
     const finishTurnProcessing = useCallback(() => {
@@ -2102,6 +2184,39 @@ export function useAppLogic(props) {
             safetyOverrideResolversRef.current.clear();
         };
     }, [agent, setPendingCouncilQuestionSync, setCouncilCardStateSync]);
+    // ask_user handler — surfaces an AGENT-authored card (question + options come
+    // ONLY from the model's tool input; the CLI synthesises nothing) and blocks
+    // until the human answers or dismisses. The resolved string becomes the tool
+    // result the agent reads to decide its next step.
+    useEffect(() => {
+        agent.setAskUserHandler(async (info) => {
+            return new Promise((resolve) => {
+                const qid = `ask-user-${Date.now()}`;
+                askUserResolversRef.current.set(qid, resolve);
+                const question = buildAskUserQuestion(info, qid);
+                setPendingCouncilQuestionSync(question);
+                setCouncilCardStateSync(initialCardState(question));
+                try {
+                    agentRuntime?.emitEvent({
+                        t: "event",
+                        kind: "askcard-open",
+                        questionId: qid,
+                        question: question.question,
+                        phase: "ask-user",
+                        optionCount: question.options?.length ?? 0,
+                        defaultIndex: question.defaultIndex ?? 0,
+                    });
+                }
+                catch {
+                    /* best-effort */
+                }
+            });
+        });
+        return () => {
+            agent.setAskUserHandler(null);
+            askUserResolversRef.current.clear();
+        };
+    }, [agent, setPendingCouncilQuestionSync, setCouncilCardStateSync]);
     const finalizeActiveTurn = useCallback(({ wasInterrupted = false, hadError = false } = {}) => {
         const activeTurn = activeTurnRef.current;
         if (!activeTurn) {
@@ -2134,7 +2249,11 @@ export function useAppLogic(props) {
                             prevUserIdx++;
                         }
                     }
-                    return fresh;
+                    // The persisted transcript has one tool_result per call and no
+                    // tool_group, so this resync used to wipe the group the live turn
+                    // built and leave a flat "→ <tool>" line per call on screen — the
+                    // state the user actually reads after the answer lands. Re-fold them.
+                    return groupToolEntries(fresh);
                 });
                 setSessionTitle(activeTurn.agent.getSessionTitle());
                 setSessionId(activeTurn.agent.getSessionId());
@@ -2691,6 +2810,22 @@ export function useAppLogic(props) {
         showApiKeyModal,
         showSlashMenu,
     ]);
+    // Retire the pill when the user scrolls back to the bottom BY HAND (mouse
+    // wheel / trackpad). Previously only End (scrollToBottomForced) or new content
+    // arriving while pinned could clear it, so wheeling down to the newest line
+    // left a stale "N new below" sitting there — the reported bug.
+    // ScrollBoxRenderable exposes no scroll event (checked @opentui/core 0.1.107:
+    // scrollTo/scrollBy/scrollTop, no emitter), so a poll is the only hook. It
+    // runs ONLY while the pill is up, and stops the moment it clears.
+    useEffect(() => {
+        if (!scrollLockedAway)
+            return;
+        const id = setInterval(() => {
+            if (isPinnedToBottom())
+                clearScrollLock();
+        }, 200);
+        return () => clearInterval(id);
+    }, [scrollLockedAway, isPinnedToBottom, clearScrollLock]);
     useEffect(() => {
         const onRawInput = (sequence) => {
             const parsed = parseKeypress(sequence, { useKittyKeyboard: renderer.useKittyKeyboard });
@@ -2718,7 +2853,7 @@ export function useAppLogic(props) {
     }, [interruptActiveRun, renderer]);
     const resetToNewSession = useCallback(() => {
         const snapshot = agent.startNewSession();
-        setMessages(snapshot?.entries ?? []);
+        setMessages(groupToolEntries(snapshot?.entries ?? []));
         setExpandedMessages(new Set());
         activeTurnRef.current = null;
         clearLiveTurnUi();
@@ -2987,14 +3122,10 @@ export function useAppLogic(props) {
                                 }
                                 setCouncilStatuses((prev) => upsertStatus(prev, cs));
                                 // Task 2.2b — emit council-speaker harness event (agent-mode only).
+                                // Carries state:"tick" + elapsedMs so a harness poller can tell
+                                // a long-running research phase (alive) from a hung one.
                                 try {
-                                    agentRuntime?.emitEvent({
-                                        t: "event",
-                                        kind: "council-speaker",
-                                        role: cs.role ?? cs.label ?? "unknown",
-                                        status: cs.state === "start" ? "start" : "done",
-                                        correlationId: cs.statusId,
-                                    });
+                                    agentRuntime?.emitEvent(mapCouncilStatusToSpeakerEvent(cs));
                                 }
                                 catch {
                                     /* best-effort */
@@ -3160,7 +3291,7 @@ export function useAppLogic(props) {
                                     appendCompaction(sessionId, nextSeq, cr.summary, cr.tokensBeforeCompress);
                                 }
                                 agent.setMessages([createCompactionSummaryMessage(cr.summary)]);
-                                setMessages(agent.getChatEntries());
+                                setMessages(groupToolEntries(agent.getChatEntries()));
                                 setMessages((prev) => [
                                     ...prev,
                                     buildAssistantEntry(`⋯ Đã tự nén ngữ cảnh (${cr.tokensBeforeCompress} → ${cr.tokensAfterCompress} tokens, giữ ${cr.decisionsExtracted} quyết định; kết quả tool vẫn rehydrate được qua ee_query). Tiếp tục tác vụ...`),
@@ -3533,8 +3664,10 @@ export function useAppLogic(props) {
                     const match = result.match(/Instructions:\s*(.+)/);
                     const instructions = match ? match[1].trim() : "";
                     const flowDir = path.join(agent.getCwd(), ".muonroi-flow");
+                    const startedAt = Date.now();
+                    setCompactRun({ progress: stageProgress("artifacts"), startedAt });
                     try {
-                        const cr = await deliberateCompact(flowDir, agent.getMessages(), "", 4096, agent.getProvider(), model, instructions);
+                        const cr = await deliberateCompact(flowDir, agent.getMessages(), "", 4096, model, instructions, (p) => setCompactRun((prev) => (prev ? { ...prev, progress: p } : prev)));
                         const sessionId = agent.getSessionId();
                         if (sessionId) {
                             const nextSeq = getNextMessageSequence(sessionId);
@@ -3542,7 +3675,7 @@ export function useAppLogic(props) {
                         }
                         const summaryMsg = createCompactionSummaryMessage(cr.summary);
                         agent.setMessages([summaryMsg]);
-                        setMessages(agent.getChatEntries());
+                        setMessages(groupToolEntries(agent.getChatEntries()));
                         setMessages((prev) => [
                             ...prev,
                             buildAssistantEntry(`Compaction: ${cr.decisionsExtracted} decisions extracted, ${cr.tokensBeforeCompress} → ${cr.tokensAfterCompress} tokens.\nSnapshot: ${cr.historyPath}`),
@@ -3551,6 +3684,9 @@ export function useAppLogic(props) {
                     catch (e) {
                         setMessages((prev) => [...prev, buildAssistantEntry(`Compaction failed: ${e}`)]);
                     }
+                    finally {
+                        setCompactRun(null);
+                    }
                     return;
                 }
                 if (result.startsWith("__EXPAND__") || result.startsWith("__EXPAND_JSON__")) {
@@ -3564,7 +3700,7 @@ export function useAppLogic(props) {
                                 revertLatestCompaction(sessionId);
                             }
                             agent.setMessages(restoredMessages);
-                            setMessages(agent.getChatEntries());
+                            setMessages(groupToolEntries(agent.getChatEntries()));
                             const text = lines.slice(2).join("\n");
                             setMessages((prev) => [...prev, buildAssistantEntry(text)]);
                             return;
@@ -3807,13 +3943,7 @@ export function useAppLogic(props) {
                                 setCouncilStatuses((prev) => upsertStatus(prev, cs));
                                 // Task 2.2b — emit council-speaker in branch 2 (agent-mode only).
                                 try {
-                                    agentRuntime?.emitEvent({
-                                        t: "event",
-                                        kind: "council-speaker",
-                                        role: cs.role ?? cs.label ?? "unknown",
-                                        status: cs.state === "start" ? "start" : "done",
-                                        correlationId: cs.statusId,
-                                    });
+                                    agentRuntime?.emitEvent(mapCouncilStatusToSpeakerEvent(cs));
                                 }
                                 catch {
                                     /* best-effort */
@@ -3982,7 +4112,7 @@ export function useAppLogic(props) {
                     isProcessingRef.current = true;
                     setIsProcessing(true);
                     try {
-                        const gen = agent.runCouncilV2(topic);
+                        const gen = agent.runCouncilV2(topic, { convenePath: true });
                         for await (const chunk of gen) {
                             // Council emitted a chunk — clear the "Waiting for next phase"
                             // inter-card heartbeat started after the last askcard answer.
@@ -4102,13 +4232,7 @@ export function useAppLogic(props) {
                                 setCouncilStatuses((prev) => upsertStatus(prev, cs));
                                 // Task 2.2b — emit council-speaker in branch 3 (agent-mode only).
                                 try {
-                                    agentRuntime?.emitEvent({
-                                        t: "event",
-                                        kind: "council-speaker",
-                                        role: cs.role ?? cs.label ?? "unknown",
-                                        status: cs.state === "start" ? "start" : "done",
-                                        correlationId: cs.statusId,
-                                    });
+                                    agentRuntime?.emitEvent(mapCouncilStatusToSpeakerEvent(cs));
                                 }
                                 catch {
                                     /* best-effort */
@@ -4354,8 +4478,10 @@ export function useAppLogic(props) {
                         const match = result.match(/Instructions:\s*(.+)/);
                         const instructions = match ? match[1].trim() : "";
                         const flowDir = path.join(agent.getCwd(), ".muonroi-flow");
+                        const startedAt = Date.now();
+                        setCompactRun({ progress: stageProgress("artifacts"), startedAt });
                         try {
-                            const cr = await deliberateCompact(flowDir, agent.getMessages(), "", 4096, agent.getProvider(), model, instructions);
+                            const cr = await deliberateCompact(flowDir, agent.getMessages(), "", 4096, model, instructions, (p) => setCompactRun((prev) => (prev ? { ...prev, progress: p } : prev)));
                             const sessionId = agent.getSessionId();
                             if (sessionId) {
                                 const nextSeq = getNextMessageSequence(sessionId);
@@ -4363,7 +4489,7 @@ export function useAppLogic(props) {
                             }
                             const summaryMsg = createCompactionSummaryMessage(cr.summary);
                             agent.setMessages([summaryMsg]);
-                            setMessages(agent.getChatEntries());
+                            setMessages(groupToolEntries(agent.getChatEntries()));
                             setMessages((prev) => [
                                 ...prev,
                                 buildAssistantEntry(`Compaction: ${cr.decisionsExtracted} decisions extracted, ${cr.tokensBeforeCompress} → ${cr.tokensAfterCompress} tokens.\nSnapshot: ${cr.historyPath}`),
@@ -4372,6 +4498,9 @@ export function useAppLogic(props) {
                         catch (e) {
                             setMessages((prev) => [...prev, buildAssistantEntry(`Compaction failed: ${e}`)]);
                         }
+                        finally {
+                            setCompactRun(null);
+                        }
                         return;
                     }
                     if (result.startsWith("__EXPAND__") || result.startsWith("__EXPAND_JSON__")) {
@@ -4385,7 +4514,7 @@ export function useAppLogic(props) {
                                     revertLatestCompaction(sessionId);
                                 }
                                 agent.setMessages(restoredMessages);
-                                setMessages(agent.getChatEntries());
+                                setMessages(groupToolEntries(agent.getChatEntries()));
                                 const text = lines.slice(2).join("\n");
                                 setMessages((prev) => [...prev, buildAssistantEntry(text)]);
                                 return;
@@ -4628,9 +4757,12 @@ export function useAppLogic(props) {
         }
         // Ctrl+E — peek the full todo panel while it is auto-collapsed during a
         // council debate (app.tsx collapses it to one line so the debate scrollbox
-        // keeps its height). Global + unconditional toggle; a no-op visually when
-        // no todo snapshot exists or no council is active.
-        if (key.name === "e" && key.ctrl && !key.meta) {
+        // keeps its height). Scoped to an ACTIVE council: app.tsx only collapses
+        // the panel when `councilStatuses.length > 0`, so outside a debate this
+        // toggle is invisible — and an unconditional `return` here swallowed the
+        // key before the transcript expand handler below could ever see it,
+        // making every "ctrl+e expand" affordance in the message log dead.
+        if (key.name === "e" && key.ctrl && !key.meta && councilStatusesRef.current.length > 0) {
             setCouncilTodoExpanded((v) => !v);
             return;
         }
@@ -4678,11 +4810,16 @@ export function useAppLogic(props) {
                         /* */
                     }
                     // Paging up leaves the tail; paging back to bottom clears the pill.
-                    if (key.name === "pagedown" && isPinnedToBottom()) {
-                        newSinceLockRef.current = 0;
-                        setNewSinceLock(0);
-                        setScrollLockedAway(false);
-                    }
+                    // Engaging on pageup is what was missing: the lock was only ever set
+                    // from scrollToBottom(), i.e. when new content ARRIVED while away
+                    // from the tail. Paging up therefore surfaced the pill only if a
+                    // render happened to follow — measured as engaging on one run and
+                    // not the next. Setting it here makes it depend on the key, not on
+                    // whether the stream was still flushing.
+                    if (key.name === "pageup" && !isPinnedToBottom())
+                        engageScrollLock();
+                    if (key.name === "pagedown" && isPinnedToBottom())
+                        clearScrollLock();
                 }
                 return;
             }
@@ -5183,6 +5320,32 @@ export function useAppLogic(props) {
                         });
                         return;
                     }
+                    // ask_user askcard: resolve the stored promise with the user's
+                    // answer string (option value or free text) — becomes the tool result.
+                    if (pendingQuestion.phase === "ask-user") {
+                        const resolver = askUserResolversRef.current.get(qid);
+                        askUserResolversRef.current.delete(qid);
+                        setPendingCouncilQuestionSync(null);
+                        setCouncilCardStateSync(null);
+                        resolver?.(ans.text);
+                        try {
+                            agentRuntime?.emitEvent({
+                                t: "event",
+                                kind: "askcard-answered",
+                                questionId: qid,
+                                answerKind: ans.kind ?? "choice",
+                                answerText: ans.text,
+                            });
+                        }
+                        catch {
+                            /* best-effort */
+                        }
+                        logUIInteraction(agent.getSessionId() ?? undefined, {
+                            subtype: "askcard_answered",
+                            data: { questionId: qid, answerKind: ans.kind ?? "choice", answerText: ans.text },
+                        });
+                        return;
+                    }
                     // Resolve the label of the option that was selected. For "choice"
                     // and "freetext" the option index lives on the card state; for
                     // "chat" the user typed a free reply and there is no option to
@@ -5270,6 +5433,23 @@ export function useAppLogic(props) {
                         }
                         return;
                     }
+                    // ask_user cancel (Esc) → resolve with the dismissed sentinel; the
+                    // agent reads it and decides its own follow-up (never CLI-forced).
+                    if (pendingQuestion.phase === "ask-user") {
+                        const resolver = askUserResolversRef.current.get(qid);
+                        askUserResolversRef.current.delete(qid);
+                        setPendingCouncilQuestionSync(null);
+                        setCouncilCardStateSync(null);
+                        clearInterCardHeartbeat();
+                        resolver?.(ASK_USER_DISMISSED);
+                        try {
+                            agentRuntime?.emitEvent({ t: "event", kind: "askcard-cancel", questionId: qid });
+                        }
+                        catch {
+                            /* best-effort */
+                        }
+                        return;
+                    }
                     setPendingCouncilQuestionSync(null);
                     setCouncilCardStateSync(null);
                     clearInterCardHeartbeat();
@@ -5848,61 +6028,11 @@ export function useAppLogic(props) {
             return;
         }
         if (showModelPicker) {
-            // Sub-modal: BW sync (password + provider picker phases).
-            if (bwSync) {
+            // Sub-modal: OAuth login in progress (browser-based). Only Esc (cancel)
+            // is actionable — the flow completes via the browser/loopback callback.
+            if (oauthLogin) {
                 if (isEscapeKey(key)) {
-                    setBwSync(null);
-                    return;
-                }
-                if (bwSync.phase === "password") {
-                    if (bwSync.loading)
-                        return;
-                    if (key.name === "return") {
-                        void submitBwPassword();
-                        return;
-                    }
-                    if (key.name === "backspace") {
-                        // Functional updater — burst-safe (see API-key prompt above).
-                        setBwSync((bw) => bw && bw.phase === "password" ? { ...bw, value: bw.value.slice(0, -1), error: null } : bw);
-                        return;
-                    }
-                    if (key.sequence && !key.ctrl && !key.meta) {
-                        // Keep spaces: a master password may legitimately contain them.
-                        const cleaned = stripControlBytes(key.sequence);
-                        if (cleaned.length === 0)
-                            return;
-                        setBwSync((bw) => bw && bw.phase === "password" ? { ...bw, value: bw.value + cleaned, error: null } : bw);
-                        return;
-                    }
-                    return;
-                }
-                if (bwSync.phase === "picker") {
-                    if (bwSync.loading)
-                        return;
-                    if (key.name === "up") {
-                        setBwSync({ ...bwSync, focusIndex: Math.max(0, bwSync.focusIndex - 1) });
-                        return;
-                    }
-                    if (key.name === "down") {
-                        setBwSync({ ...bwSync, focusIndex: Math.min(bwSync.items.length - 1, bwSync.focusIndex + 1) });
-                        return;
-                    }
-                    if (key.name === "space" || key.sequence === " ") {
-                        const item = bwSync.items[bwSync.focusIndex];
-                        if (item) {
-                            const next = new Set(bwSync.selected);
-                            if (next.has(item.provider))
-                                next.delete(item.provider);
-                            else
-                                next.add(item.provider);
-                            setBwSync({ ...bwSync, selected: next });
-                        }
-                        return;
-                    }
-                    if (key.name === "return") {
-                        void commitBwImport();
-                        return;
-                    }
+                    cancelProviderOAuth();
                     return;
                 }
                 return;
@@ -5963,8 +6093,10 @@ export function useAppLogic(props) {
                     setApiKeyPrompt({ provider: p, value: "", error: null });
                 return;
             }
-            if (key.name === "b") {
-                setBwSync({ phase: "password", value: "", error: null, loading: false });
+            if (key.name === "o") {
+                const p = configuredProviders[providerChipIndex];
+                if (p && oauthProviders.has(p))
+                    void startProviderOAuth(p);
                 return;
             }
             if (key.name === "space" || key.sequence === " ") {
@@ -5975,8 +6107,17 @@ export function useAppLogic(props) {
             }
             if (key.name === "d" || key.name === "return") {
                 const p = configuredProviders[providerChipIndex];
-                if (p && providersWithKey.has(p))
+                if (!p)
+                    return;
+                // Enter means "use this provider". With credentials that means making
+                // it the default; with none it means signing in, which is the only
+                // useful thing left to do on the row (Enter was a dead key there).
+                // /login is gone, so this picker is the single auth surface: K adds a
+                // key, Enter signs in via OAuth where the provider supports it.
+                if (providersWithKey.has(p))
                     setAsDefaultProvider(p);
+                else if (oauthProviders.has(p))
+                    void startProviderOAuth(p);
                 return;
             }
             return;
@@ -6188,10 +6329,8 @@ export function useAppLogic(props) {
             key.stopPropagation();
             return;
         }
-        if (!hasApiKeyRef.current && shouldOpenApiKeyModalForKey(key)) {
-            openApiKeyModal();
-            return;
-        }
+        // No forced modal on keystroke when unauthenticated — the user can type
+        // freely; the provider picker opens on send instead (see handleSubmit).
         if (key.sequence === "/" && !isProcessing) {
             const text = inputRef.current?.plainText || "";
             if (!text.trim()) {
@@ -6208,20 +6347,18 @@ export function useAppLogic(props) {
             }
         }
         if (key.name === "e" && key.ctrl) {
-            let lastUserIdx = -1;
-            for (let i = messages.length - 1; i >= 0; i--) {
-                if (messages[i].type === "user") {
-                    lastUserIdx = i;
-                    break;
-                }
-            }
-            if (lastUserIdx >= 0) {
+            // Toggle the NEWEST entry that actually renders a "ctrl+e" affordance —
+            // long user text, collapsed model narration, chain-of-thought, or a done
+            // tool group. Targeting only the last *user* message meant the key did
+            // nothing for every other affordance that advertises it.
+            const idx = findLastCollapsibleIndex(messages);
+            if (idx >= 0) {
                 setExpandedMessages((prev) => {
                     const next = new Set(prev);
-                    if (next.has(lastUserIdx))
-                        next.delete(lastUserIdx);
+                    if (next.has(idx))
+                        next.delete(idx);
                     else
-                        next.add(lastUserIdx);
+                        next.add(idx);
                     return next;
                 });
             }
@@ -6418,10 +6555,11 @@ export function useAppLogic(props) {
         // these directly; omitting them froze the closure on a stale `null`, which
         // is why typing/pasting into the per-provider key prompt did nothing.
         apiKeyPrompt,
-        bwSync,
+        oauthLogin,
+        oauthProviders,
         submitProviderKey,
-        submitBwPassword,
-        commitBwImport,
+        startProviderOAuth,
+        cancelProviderOAuth,
         openApiKeyModal,
         openCatalogMcp,
         openMcpEditor,
@@ -6473,7 +6611,6 @@ export function useAppLogic(props) {
         toggleModelDisabled,
         pointToExistingForm,
         setApiKeyPrompt,
-        setBwSync,
         setCouncilCardStateSync,
         setPendingCouncilQuestionSync,
         setShowSlashMenuSync,
@@ -6491,6 +6628,7 @@ export function useAppLogic(props) {
         setSessionPickerIndex,
         scrollToBottomForced,
         isPinnedToBottom,
+        clearScrollLock,
     ]);
     useKeyboard(handleKey);
     const handlePaste = useCallback((event) => {
@@ -6504,21 +6642,6 @@ export function useAppLogic(props) {
                 setApiKeyPrompt((s) => (s ? { ...s, value: s.value + pasted, error: null } : s));
             return;
         }
-        if (bwSync && bwSync.phase === "password") {
-            event.preventDefault();
-            // Master passwords may contain spaces — keep them; only drop guards,
-            // control bytes and line breaks (which a trailing paste newline adds).
-            const pasted = stripControlBytes(decodePasteBytes(event.bytes)).replace(/[\r\n]+/g, "");
-            if (pasted) {
-                setBwSync((s) => (s && s.phase === "password" ? { ...s, value: s.value + pasted, error: null } : s));
-            }
-            return;
-        }
-        if (!hasApiKeyRef.current) {
-            event.preventDefault();
-            openApiKeyModal();
-            return;
-        }
         const text = decodePasteBytes(event.bytes);
         const trimmed = text.trim();
         const imageExts = /\.(png|jpe?g|gif|webp|svg|bmp|ico|tiff?)$/i;
@@ -6538,7 +6661,7 @@ export function useAppLogic(props) {
         const block = { id, content: text, lines: lineCount };
         replacePasteBlocks([...pasteBlocksRef.current, block]);
         inputRef.current?.insertText(getPasteBlockToken(block));
-    }, [apiKeyPrompt, bwSync, openApiKeyModal, replacePasteBlocks]);
+    }, [apiKeyPrompt, replacePasteBlocks]);
     const handleSubmit = useCallback(() => {
         const raw = inputRef.current?.plainText || "";
         if (raw.trim()) {
@@ -6562,6 +6685,14 @@ export function useAppLogic(props) {
             }
             return;
         }
+        // No provider configured yet: open the picker so the user can sign in
+        // (OAuth) or add a key. Keep the composer text so the same message can be
+        // resent as soon as a provider is connected.
+        if (!hasApiKeyRef.current) {
+            setShowModelPicker(true);
+            setModelPickerIndex(0);
+            return;
+        }
         inputRef.current?.clear();
         let message = raw;
         const blocks = [...pasteBlocksRef.current];
@@ -6619,10 +6750,6 @@ export function useAppLogic(props) {
         }
         if (!message.trim())
             return;
-        if (!hasApiKeyRef.current) {
-            openApiKeyModal();
-            return;
-        }
         // Council question response — route answer back to council generator.
         // The card now owns keyboard input; this branch survives only for the
         // legacy code path where the user typed an answer in the main prompt
@@ -6662,7 +6789,6 @@ export function useAppLogic(props) {
         agent,
         clearLiveTurnUi,
         handleCommand,
-        openApiKeyModal,
         processMessage,
         replacePasteBlocks,
         scrollToBottom,
@@ -6672,6 +6798,8 @@ export function useAppLogic(props) {
         setShowSlashMenuSync,
         setPendingCouncilQuestionSync,
         setCouncilCardStateSync,
+        setShowModelPicker,
+        setModelPickerIndex,
     ]);
     // Switch to the "messages" branch (which renders log + halt-card + init-new-form +
     // point-to-existing-form + council-progress) whenever ANY of these overlays
@@ -6709,7 +6837,8 @@ export function useAppLogic(props) {
         apiKeyPrompt,
         blockPrompt,
         btwState,
-        bwSync,
+        oauthLogin,
+        oauthProviders,
         configuredProviders,
         connectModalIndex,
         contextStats,
@@ -6723,6 +6852,7 @@ export function useAppLogic(props) {
         councilMessages,
         councilTranscriptExpanded,
         councilTodoExpanded,
+        compactRun,
         councilPhases,
         councilPlaceholders,
         councilProgress,