@jx-grxf/patchpilot 0.2.1 → 0.3.0

package/dist/tui/App.js

@@ -11,7 +11,10 @@ import { createModelClient } from "../core/modelClient.js";
 import { defaultNvidiaModel, readNvidiaApiKey } from "../core/nvidia.js";
 import { defaultOllamaModel, OllamaClient } from "../core/ollama.js";
 import { defaultOpenRouterModel, isOpenRouterFreeModel, readOpenRouterApiKey } from "../core/openrouter.js";
+import { formatReasoningSupport } from "../core/reasoning.js";
+import { listWorkspaceSessions, loadSessionSummary, SessionStore } from "../core/session.js";
 import { addTelemetryToSession, emptySessionTelemetry, estimateTokens } from "../core/tokenAccounting.js";
+import { WorkspaceTools } from "../core/workspace.js";
 import { CommandSuggestions } from "./components/CommandSuggestions.js";
 import { Composer, FooterHints } from "./components/Composer.js";
 import { Header } from "./components/Header.js";
@@ -21,6 +24,7 @@ import { Transcript } from "./components/Transcript.js";
 import { filterSlashCommands, formatCommandDetail, formatCommandHelp } from "./commands.js";
 import { formatCost, formatSessionTokens, formatTokens, normalizeModelAlias, readToggle } from "./format.js";
 import { checkOllamaHost, discoverOllamaHosts, normalizeOllamaUrl, readOllamaHostDetails, startLocalOllamaAppAndWait } from "./hosts.js";
+import { selectableModels } from "./modelSelection.js";
 import { readGpuStats, readSystemStats } from "./systemStats.js";
 import { maxTranscriptLines } from "./types.js";
 const modelCacheTtlMs = 5 * 60_000;
@@ -32,11 +36,21 @@ export function App(props) {
     const didRunInitialTask = useRef(false);
     const didOpenDefaultOnboarding = useRef(false);
     const abortControllerRef = useRef(null);
+    const sessionStoreRef = useRef(new SessionStore({ workspace: props.workspace }));
+    const approvalResolverRef = useRef(null);
+    const grantedPermissionsRef = useRef({
+        allowWrite: props.allowWrite,
+        allowShell: props.allowShell
+    });
+    const activeHostSyncInFlightRef = useRef(false);
+    const autoLoadKeysRef = useRef(new Set());
     const usedOllamaModelsRef = useRef(new Set());
     const [lines, setLines] = useState([]);
     const [advisorNotes, setAdvisorNotes] = useState([]);
     const [isRunning, setIsRunning] = useState(false);
     const [status, setStatus] = useState("idle");
+    const [workState, setWorkState] = useState("idle");
+    const [pendingApproval, setPendingApproval] = useState(null);
     const [telemetry, setTelemetry] = useState(null);
     const [sessionTelemetry, setSessionTelemetry] = useState(() => emptySessionTelemetry());
     const [systemStats, setSystemStats] = useState(() => readSystemStats().stats);
@@ -51,6 +65,7 @@ export function App(props) {
     const [onboardingIndex, setOnboardingIndex] = useState(0);
     const [onboardingInput, setOnboardingInput] = useState("");
     const [onboardingBusyMessage, setOnboardingBusyMessage] = useState(null);
+    const [onboardingNotice, setOnboardingNotice] = useState(null);
     const [paletteIndex, setPaletteIndex] = useState(0);
     const [activeScrollPane, setActiveScrollPane] = useState("transcript");
     const [transcriptScrollOffset, setTranscriptScrollOffset] = useState(0);
@@ -82,7 +97,7 @@ export function App(props) {
         })
         : [];
     const rootHeight = Math.max(24, terminalRows);
-    const headerReservedHeight = 8;
+    const headerReservedHeight = 5;
     const paletteReservedHeight = !onboarding && paletteItems.length > 0 ? Math.min(8, paletteItems.length) + 4 : 0;
     const composerReservedHeight = onboarding ? 0 : 2;
     const footerReservedHeight = onboarding ? 0 : 1;
@@ -94,16 +109,34 @@ export function App(props) {
             ...currentLines.slice(-maxTranscriptLines),
             {
                 ...line,
+                kind: line.kind ?? defaultLogKind(line),
                 id: Date.now() + Math.random()
             }
         ]);
     }, []);
+    const resolveApproval = useCallback((decision) => {
+        if (!pendingApproval || !approvalResolverRef.current) {
+            return;
+        }
+        approvalResolverRef.current(decision);
+        approvalResolverRef.current = null;
+        appendLine({
+            kind: "approval",
+            tone: decision === "deny" ? "warning" : "success",
+            label: "approval",
+            text: `${pendingApproval.tool} ${decision.replace("_", " ")}`,
+            detail: pendingApproval.preview,
+            workState: "waiting_approval",
+            tool: pendingApproval.tool
+        });
+        setPendingApproval(null);
+    }, [appendLine, pendingApproval]);
     const applyMode = useCallback((nextMode, announce = true) => {
         setAgentMode(nextMode);
         setSettings((currentSettings) => ({
             ...currentSettings,
-            allowWrite: nextMode === "build" ? currentSettings.allowWrite : false,
-            allowShell: nextMode === "build" ? currentSettings.allowShell : false
+            allowWrite: nextMode === "build" ? grantedPermissionsRef.current.allowWrite : false,
+            allowShell: nextMode === "build" ? grantedPermissionsRef.current.allowShell : false
         }));
         if (announce) {
             appendLine({
@@ -217,6 +250,8 @@ export function App(props) {
     }, [appendLine, settings.model]);
     const openModelSelection = useCallback(async (provider, options = {}) => {
         setTelemetry(null);
+        setOnboardingInput("");
+        setOnboardingNotice(null);
         setOnboardingBusyMessage(`Loading ${provider} models...`);
         const nextModel = defaultModelForProvider(provider, options.currentModel ?? settings.model);
         setSettings((currentSettings) => ({
@@ -227,16 +262,16 @@ export function App(props) {
         try {
             const models = await loadAvailableModels(provider, options.ollamaUrl ?? settings.ollamaUrl, setModelOptions, true);
             if (models.length === 0) {
-                appendLine({
+                setOnboardingNotice({
                     tone: "warning",
-                    label: "onboarding",
                     text: provider === "ollama"
                         ? "No Ollama models found on that host."
                         : provider === "gemini"
                             ? "No Gemini models listed. Check the API key."
                             : provider === "openrouter"
                                 ? "No OpenRouter models listed. Check the API key."
-                                : "No Codex OAuth models listed."
+                                : "No Codex OAuth models listed.",
+                    detail: "Use the back key to choose another provider or retry after fixing the provider setup."
                 });
                 return;
             }
@@ -249,21 +284,22 @@ export function App(props) {
             setOnboardingIndex(0);
         }
         catch (error) {
-            appendLine({
+            setOnboardingNotice({
                 tone: "danger",
-                label: "onboarding",
-                text: error instanceof Error ? error.message : String(error)
+                text: error instanceof Error ? error.message : String(error),
+                detail: "Fix the provider setup, then press Enter or go back and retry."
             });
         }
         finally {
             setOnboardingBusyMessage(null);
         }
-    }, [appendLine, settings.model, settings.ollamaUrl]);
+    }, [settings.model, settings.ollamaUrl]);
     const closeOnboarding = useCallback(() => {
         setOnboarding(null);
         setOnboardingIndex(0);
         setOnboardingInput("");
         setOnboardingBusyMessage(null);
+        setOnboardingNotice(null);
     }, []);
     const goBackOnboarding = useCallback(() => {
         if (!onboarding) {
@@ -271,6 +307,7 @@ export function App(props) {
         }
         setOnboardingBusyMessage(null);
         setOnboardingInput("");
+        setOnboardingNotice(null);
         setOnboardingIndex(0);
         switch (onboarding.step) {
             case "entry":
@@ -327,6 +364,10 @@ export function App(props) {
         if (!onboarding) {
             return;
         }
+        if (onboardingBusyMessage) {
+            return;
+        }
+        setOnboardingNotice(null);
         if (onboarding.step === "entry") {
             const selection = readEntrySelection(value, onboardingIndex);
             if (!selection) {
@@ -343,7 +384,12 @@ export function App(props) {
                     details = startedHost ? await connectToHost(startedHost, { announce: false }) : null;
                 }
                 if (!details) {
-                    setOnboardingBusyMessage("Local Ollama is not reachable. Start Ollama.app or run `ollama serve`, then press Enter again.");
+                    setOnboardingBusyMessage(null);
+                    setOnboardingNotice({
+                        tone: "warning",
+                        text: "Local Ollama is not reachable.",
+                        detail: "Start Ollama.app or run `ollama serve`, then press Enter to retry."
+                    });
                     return;
                 }
                 await openModelSelection("ollama", {
@@ -394,9 +440,8 @@ export function App(props) {
             }
             const selectedHost = onboarding.hosts[selectionIndex - 1];
             if (!selectedHost) {
-                appendLine({
+                setOnboardingNotice({
                     tone: "warning",
-                    label: "onboarding",
                     text: "Unknown host selection."
                 });
                 return;
@@ -407,6 +452,11 @@ export function App(props) {
             });
             if (!details) {
                 setOnboardingBusyMessage(null);
+                setOnboardingNotice({
+                    tone: "warning",
+                    text: `No Ollama server answered at ${selectedHost.url}.`,
+                    detail: "Check firewall, MagicDNS/IP, and whether Ollama is listening on that machine."
+                });
                 return;
             }
             await openModelSelection("ollama", {
@@ -418,9 +468,8 @@ export function App(props) {
         if (onboarding.step === "host-input") {
             const hostValue = value.trim();
             if (!hostValue) {
-                appendLine({
+                setOnboardingNotice({
                     tone: "warning",
-                    label: "onboarding",
                     text: "Host cannot be empty."
                 });
                 return;
@@ -431,6 +480,11 @@ export function App(props) {
             });
             if (!details) {
                 setOnboardingBusyMessage(null);
+                setOnboardingNotice({
+                    tone: "warning",
+                    text: `No Ollama server answered at ${hostValue}.`,
+                    detail: "Check the IP, MagicDNS name, firewall rules, and whether Ollama is running."
+                });
                 return;
             }
             await openModelSelection("ollama", {
@@ -460,9 +514,8 @@ export function App(props) {
         if (onboarding.step === "gemini-key") {
             const apiKey = value.trim();
             if (!apiKey) {
-                appendLine({
+                setOnboardingNotice({
                     tone: "warning",
-                    label: "onboarding",
                     text: "Gemini API key cannot be empty."
                 });
                 return;
@@ -473,9 +526,8 @@ export function App(props) {
                 PATCHPILOT_MODEL: defaultGeminiModel,
                 GEMINI_API_KEY: apiKey
             });
-            appendLine({
+            setOnboardingNotice({
                 tone: "success",
-                label: "onboarding",
                 text: "Gemini API key saved to PatchPilot config."
             });
             await openModelSelection("gemini", {
@@ -486,9 +538,8 @@ export function App(props) {
         if (onboarding.step === "openrouter-key") {
             const apiKey = value.trim();
             if (!apiKey) {
-                appendLine({
+                setOnboardingNotice({
                     tone: "warning",
-                    label: "onboarding",
                     text: "OpenRouter API key cannot be empty."
                 });
                 return;
@@ -499,9 +550,8 @@ export function App(props) {
                 PATCHPILOT_MODEL: defaultOpenRouterModel,
                 OPENROUTER_API_KEY: apiKey
             });
-            appendLine({
+            setOnboardingNotice({
                 tone: "success",
-                label: "onboarding",
                 text: "OpenRouter API key saved to PatchPilot config."
             });
             await openModelSelection("openrouter", {
@@ -512,9 +562,8 @@ export function App(props) {
         if (onboarding.step === "nvidia-key") {
             const apiKey = value.trim();
             if (!apiKey) {
-                appendLine({
+                setOnboardingNotice({
                     tone: "warning",
-                    label: "onboarding",
                     text: "NVIDIA API key cannot be empty."
                 });
                 return;
@@ -525,9 +574,8 @@ export function App(props) {
                 PATCHPILOT_MODEL: defaultNvidiaModel,
                 NVIDIA_API_KEY: apiKey
             });
-            appendLine({
+            setOnboardingNotice({
                 tone: "success",
-                label: "onboarding",
                 text: "NVIDIA API key saved to PatchPilot config."
             });
             await openModelSelection("nvidia", {
@@ -537,10 +585,10 @@ export function App(props) {
         }
         if (onboarding.step === "codex-login") {
             if (!hasCodexCliOAuth()) {
-                appendLine({
+                setOnboardingNotice({
                     tone: "warning",
-                    label: "onboarding",
-                    text: "Codex OAuth is still missing. Run `codex login`, then press Enter again."
+                    text: "Codex OAuth is still missing.",
+                    detail: "Run `codex login` in another terminal, then press Enter to retry."
                 });
                 return;
             }
@@ -549,14 +597,13 @@ export function App(props) {
             });
             return;
         }
-        const selectableModels = filterModelOptions(onboardingInput, onboarding.models);
-        const selectedModel = selectModelFromInput(value, selectableModels, onboardingIndex, {
+        const visibleModels = selectableModels(onboardingInput, onboarding.models);
+        const selectedModel = selectModelFromInput(value, visibleModels, onboardingIndex, {
             allowManual: onboarding.provider !== "ollama"
         });
         if (!selectedModel) {
-            appendLine({
+            setOnboardingNotice({
                 tone: "warning",
-                label: "onboarding",
                 text: "Unknown model selection. Pick a listed model."
             });
             return;
@@ -587,7 +634,7 @@ export function App(props) {
             });
         }
         closeOnboarding();
-    }, [activeHost?.host.url, appendLine, closeOnboarding, connectToHost, loadHostSuggestions, onboarding, onboardingIndex, openModelSelection, settings.ollamaUrl]);
+    }, [activeHost?.host.url, appendLine, closeOnboarding, connectToHost, loadHostSuggestions, onboarding, onboardingBusyMessage, onboardingIndex, openModelSelection, settings.ollamaUrl]);
     const runTask = useCallback(async (task) => {
         if (!task.trim() || isRunning) {
             return;
@@ -596,6 +643,7 @@ export function App(props) {
         setTranscriptScrollOffset(0);
         setIsRunning(true);
         appendLine({
+            kind: "user",
             tone: "normal",
             label: "you",
             text: task
@@ -609,9 +657,41 @@ export function App(props) {
             abortControllerRef.current = abortController;
             const taskRunner = new AgentRunner({
                 ...runnableSettings,
-                signal: abortController.signal
+                signal: abortController.signal,
+                sessionStore: sessionStoreRef.current,
+                approvalHandler: (request) => new Promise((resolve) => {
+                    if (agentMode === "plan") {
+                        appendLine({
+                            kind: "approval",
+                            tone: "warning",
+                            label: "approval",
+                            text: `${request.tool} blocked in plan mode`,
+                            detail: "Switch to /mode build before approving write, script, test, or shell tools.",
+                            workState: "waiting_approval",
+                            tool: request.tool,
+                            preview: request.preview
+                        });
+                        resolve("deny");
+                        return;
+                    }
+                    setPendingApproval(request);
+                    setWorkState("waiting_approval");
+                    setStatus(`approval needed for ${request.tool}`);
+                    appendLine({
+                        kind: "approval",
+                        tone: "warning",
+                        label: "approval",
+                        text: `${request.tool} needs ${request.permission} approval`,
+                        detail: `${request.preview}  Press y once, a session, or n deny.`,
+                        workState: "waiting_approval",
+                        tool: request.tool,
+                        preview: request.preview
+                    });
+                    approvalResolverRef.current = resolve;
+                })
             });
             for await (const event of taskRunner.run(task)) {
+                setWorkState(event.workState);
                 if (event.type === "metrics") {
                     if (runnableSettings.provider === "ollama") {
                         usedOllamaModelsRef.current.add(`${runnableSettings.ollamaUrl}|${runnableSettings.model}`);
@@ -634,17 +714,20 @@ export function App(props) {
         }
         catch (error) {
             appendLine({
+                kind: "error",
                 tone: "danger",
                 label: "error",
-                text: error instanceof Error ? error.message : String(error)
+                text: error instanceof Error ? error.message : String(error),
+                workState: "error"
             });
         }
         finally {
             abortControllerRef.current = null;
             setStatus("idle");
+            setWorkState("idle");
             setIsRunning(false);
         }
-    }, [appendLine, isRunning, modelOptions, settings]);
+    }, [agentMode, appendLine, isRunning, modelOptions, settings]);
     const handleSlashCommand = useCallback(async (rawCommand) => {
         const [commandName = "", ...args] = rawCommand.slice(1).trim().split(/\s+/);
         const command = commandName.toLowerCase();
@@ -769,7 +852,7 @@ export function App(props) {
                     appendLine({
                         tone: "accent",
                         label: "reasoning",
-                        text: `current ${settings.reasoningEffort}. Use /reasoning low, medium, high, xhigh, or adaptive.`
+                        text: `current ${settings.reasoningEffort}. Use /reasoning none, low, medium, high, xhigh, or adaptive.`
                     });
                     return;
                 }
@@ -783,7 +866,7 @@ export function App(props) {
                 appendLine({
                     tone: "success",
                     label: "reasoning",
-                    text: `provider reasoning ${nextEffort}${settings.provider === "ollama" ? " (Ollama ignores common reasoning effort)" : ""}`
+                    text: formatReasoningSupport(settings.provider, settings.model, nextEffort === "adaptive" ? undefined : nextEffort)
                 });
                 return;
             }
@@ -793,6 +876,7 @@ export function App(props) {
                 if (writeEnabled) {
                     setAgentMode("build");
                 }
+                grantedPermissionsRef.current.allowWrite = writeEnabled;
                 setSettings((currentSettings) => ({
                     ...currentSettings,
                     allowWrite: writeEnabled
@@ -809,6 +893,7 @@ export function App(props) {
                 if (shellEnabled) {
                     setAgentMode("build");
                 }
+                grantedPermissionsRef.current.allowShell = shellEnabled;
                 setSettings((currentSettings) => ({
                     ...currentSettings,
                     allowShell: shellEnabled
@@ -848,7 +933,7 @@ export function App(props) {
                             tone: "warning",
                             label: "model",
                             text: `No unique model match for "${requestedModel}".`,
-                            detail: formatModelOptions(filterModelOptions(requestedModel, models).slice(0, 12), settings.model)
+                            detail: formatModelOptions(selectableModels(requestedModel, models).slice(0, 12), settings.model)
                         });
                         return;
                     }
@@ -897,6 +982,8 @@ export function App(props) {
                         });
                         return;
                     }
+                    setInput("/models ");
+                    setPaletteIndex(0);
                     appendLine({
                         tone: "accent",
                         label: "models",
@@ -919,9 +1006,65 @@ export function App(props) {
                     label: "status",
                     text: settings.provider === "ollama"
                         ? `provider ollama | model ${settings.model} | host ${activeHost?.host.deviceName ?? settings.ollamaUrl} | route ${activeHost?.host.url ?? settings.ollamaUrl} | compute ${describeComputeTarget(settings.ollamaUrl).kind} | tools local | agents ${settings.subagents ? "on" : "off"} | write ${settings.allowWrite ? "on" : "off"} | shell ${settings.allowShell ? "on" : "off"} | draft ${draftTokens} tok | last ${formatTokens(telemetry)} | session ${formatSessionTokens(sessionTelemetry)} | cost ${formatCost(sessionTelemetry.estimatedCostUsd)}`
-                        : `provider ${settings.provider} | model ${settings.model} | host ${settings.provider} api | compute cloud | agents ${settings.subagents ? "on" : "off"} | think ${settings.thinkingMode} | reasoning ${settings.reasoningEffort} | write ${settings.allowWrite ? "on" : "off"} | shell ${settings.allowShell ? "on" : "off"} | draft ${draftTokens} tok | last ${formatTokens(telemetry)} | session ${formatSessionTokens(sessionTelemetry)} | cost ${formatCost(sessionTelemetry.estimatedCostUsd)}`
+                        : `provider ${settings.provider} | model ${settings.model} | host ${settings.provider} api | compute cloud | agents ${settings.subagents ? "on" : "off"} | think ${settings.thinkingMode} | reasoning ${formatReasoningSupport(settings.provider, settings.model, settings.reasoningEffort === "adaptive" ? undefined : settings.reasoningEffort)} | write ${settings.allowWrite ? "on" : "off"} | shell ${settings.allowShell ? "on" : "off"} | draft ${draftTokens} tok | last ${formatTokens(telemetry)} | session ${formatSessionTokens(sessionTelemetry)} | cost ${formatCost(sessionTelemetry.estimatedCostUsd)}`
+                });
+                return;
+            case "sessions": {
+                const sessions = await listWorkspaceSessions(settings.workspace);
+                appendLine({
+                    kind: "status",
+                    tone: sessions.length > 0 ? "accent" : "muted",
+                    label: "sessions",
+                    text: sessions.length > 0 ? `Found ${sessions.length} workspace session${sessions.length === 1 ? "" : "s"}.` : "No workspace sessions yet.",
+                    detail: sessions
+                        .slice(0, 8)
+                        .map((session, index) => `${index + 1}. ${session.sessionId}  ${session.updatedAt}  ${session.lastTask ?? "no task"}`)
+                        .join("\n")
+                });
+                return;
+            }
+            case "resume": {
+                const sessionId = args[0] ?? "";
+                const sessions = await listWorkspaceSessions(settings.workspace);
+                const selectedSession = sessionId ? await loadSessionSummary(settings.workspace, sessionId) : sessions[0] ?? null;
+                appendLine({
+                    kind: "status",
+                    tone: selectedSession ? "accent" : "warning",
+                    label: "resume",
+                    text: selectedSession ? `Loaded session ${selectedSession.sessionId}` : "No session available to resume.",
+                    detail: selectedSession
+                        ? `workspace ${selectedSession.workspace}\nupdated ${selectedSession.updatedAt}\nmodel ${selectedSession.provider ?? "-"} ${selectedSession.model ?? "-"}\nlast task ${selectedSession.lastTask ?? "-"}`
+                        : "Run /sessions after at least one PatchPilot run."
                 });
                 return;
+            }
+            case "diff": {
+                const result = await new WorkspaceTools({
+                    root: settings.workspace,
+                    allowWrite: false,
+                    allowShell: false
+                }).execute({
+                    name: "git_diff",
+                    arguments: {}
+                });
+                appendLine({
+                    kind: "diff",
+                    tone: result.ok ? "accent" : "warning",
+                    label: "diff",
+                    text: result.summary,
+                    detail: result.content,
+                    tool: "git_diff"
+                });
+                return;
+            }
+            case "approve": {
+                const decision = args[0] === "session" ? "allow_session" : "allow_once";
+                resolveApproval(decision);
+                return;
+            }
+            case "deny":
+                resolveApproval("deny");
+                return;
             case "connect":
             case "host":
             case "ollama":
@@ -940,6 +1083,8 @@ export function App(props) {
                         text: "Scanning LAN and Tailscale for Ollama hosts..."
                     });
                     await loadHostSuggestions(true, true);
+                    setInput("/connect ");
+                    setPaletteIndex(0);
                     return;
                 }
                 if (args.join(" ").trim().toLowerCase() === "local") {
@@ -965,6 +1110,8 @@ export function App(props) {
                     text: "Scanning LAN and Tailscale for Ollama hosts..."
                 });
                 await loadHostSuggestions(true, true);
+                setInput("/connect ");
+                setPaletteIndex(0);
                 return;
             case "eject": {
                 if (settings.provider !== "ollama") {
@@ -1050,6 +1197,7 @@ export function App(props) {
         loadHostSuggestions,
         loadProviderModels,
         modelOptions,
+        resolveApproval,
         sessionTelemetry,
         settings,
         telemetry
@@ -1081,7 +1229,10 @@ export function App(props) {
         await runTask(nextValue);
     }, [handleOnboardingSubmit, handleSlashCommand, isRunning, onboarding, paletteIndex, paletteItems, runTask]);
     useEffect(() => {
-        if (!props.initialTask || didRunInitialTask.current || onboarding) {
+        void sessionStoreRef.current.create();
+    }, []);
+    useEffect(() => {
+        if (!props.initialTask || didRunInitialTask.current || onboarding || process.env.PATCHPILOT_ONBOARDING_COMPLETE !== "1") {
             return;
         }
         didRunInitialTask.current = true;
@@ -1091,7 +1242,7 @@ export function App(props) {
         setPaletteIndex(0);
     }, [hostOptions, input, modelOptions, onboarding, settings.model, settings.provider]);
     useEffect(() => {
-        if (didOpenDefaultOnboarding.current || props.initialTask || onboarding || process.env.PATCHPILOT_ONBOARDING_COMPLETE === "1") {
+        if (didOpenDefaultOnboarding.current || onboarding || process.env.PATCHPILOT_ONBOARDING_COMPLETE === "1") {
             return;
         }
         didOpenDefaultOnboarding.current = true;
@@ -1109,6 +1260,10 @@ export function App(props) {
         }
         let cancelled = false;
         async function syncActiveHost() {
+            if (activeHostSyncInFlightRef.current) {
+                return;
+            }
+            activeHostSyncInFlightRef.current = true;
             const verifiedHost = await checkOllamaHost(settings.ollamaUrl, {
                 timeoutMs: 800
             });
@@ -1116,6 +1271,7 @@ export function App(props) {
                 if (!cancelled) {
                     setActiveHost((currentHost) => (currentHost?.host.url === settings.ollamaUrl ? currentHost : null));
                 }
+                activeHostSyncInFlightRef.current = false;
                 return;
             }
             const details = await readOllamaHostDetails(verifiedHost).catch(() => ({
@@ -1124,6 +1280,7 @@ export function App(props) {
                 runningModels: [],
                 fetchedAt: Date.now()
             }));
+            activeHostSyncInFlightRef.current = false;
             if (cancelled) {
                 return;
             }
@@ -1147,16 +1304,40 @@ export function App(props) {
         }
         const trimmedInput = input.trim();
         if (settings.provider === "ollama" && (trimmedInput === "/connect" || trimmedInput === "/hosts") && hostOptions.length === 0 && !isLoadingHosts) {
-            void loadHostSuggestions(false, false);
+            const key = `${settings.provider}:${settings.ollamaUrl}:${trimmedInput}:hosts`;
+            if (!autoLoadKeysRef.current.has(key)) {
+                autoLoadKeysRef.current.add(key);
+                void loadHostSuggestions(false, false);
+            }
         }
         if ((trimmedInput === "/models" || trimmedInput === "/model") && modelOptions.length === 0 && !isLoadingModels) {
-            void loadProviderModels(false);
+            const key = `${settings.provider}:${settings.ollamaUrl}:${trimmedInput}:models`;
+            if (!autoLoadKeysRef.current.has(key)) {
+                autoLoadKeysRef.current.add(key);
+                void loadProviderModels(false);
+            }
         }
     }, [hostOptions.length, input, isLoadingHosts, isLoadingModels, isRunning, loadHostSuggestions, loadProviderModels, modelOptions.length, onboarding, settings.provider]);
     useInput((inputValue, key) => {
+        if (pendingApproval) {
+            const normalizedInput = inputValue.toLowerCase();
+            if (normalizedInput === "y") {
+                resolveApproval("allow_once");
+                return;
+            }
+            if (normalizedInput === "a") {
+                resolveApproval("allow_session");
+                return;
+            }
+            if (normalizedInput === "n" || key.escape) {
+                resolveApproval("deny");
+                return;
+            }
+        }
         if (isRunning && key.escape) {
             abortControllerRef.current?.abort();
             appendLine({
+                kind: "status",
                 tone: "warning",
                 label: "stop",
                 text: "Stopping current task..."
@@ -1169,7 +1350,10 @@ export function App(props) {
                 goBackOnboarding();
                 return;
             }
-            const optionCount = onboarding.step === "model" ? filterModelOptions(onboardingInput, onboarding.models).length : getOnboardingOptionCount(onboarding);
+            if (onboardingBusyMessage) {
+                return;
+            }
+            const optionCount = onboarding.step === "model" ? selectableModels(onboardingInput, onboarding.models).length : getOnboardingOptionCount(onboarding);
             if (optionCount > 0 && key.upArrow) {
                 setOnboardingIndex((currentIndex) => (currentIndex - 1 + optionCount) % optionCount);
                 return;
@@ -1277,7 +1461,7 @@ export function App(props) {
             clearInterval(timer);
         };
     }, []);
-    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, height: rootHeight, overflowY: "hidden", children: [_jsx(Header, { model: settings.model, provider: settings.provider, workspace: settings.workspace, status: status, allowWrite: settings.allowWrite, allowShell: settings.allowShell, agentMode: agentMode, subagents: settings.subagents, thinkingMode: settings.thinkingMode, reasoningEffort: settings.reasoningEffort, ollamaUrl: settings.ollamaUrl, telemetry: telemetry, sessionTelemetry: sessionTelemetry, draftTokens: draftTokens, systemStats: systemStats, gpuStats: gpuStats, activeHost: activeHost }), onboarding ? (_jsx(OnboardingPanel, { state: onboarding, height: panelHeight, selectedIndex: onboardingIndex, input: onboardingInput, busyMessage: onboardingBusyMessage, onInputChange: setOnboardingInput, onInputSubmit: (value) => void handleOnboardingSubmit(value) })) : (_jsxs(Box, { flexDirection: "row", height: panelHeight + composerReservedHeight + paletteReservedHeight + footerReservedHeight, overflowY: "hidden", children: [_jsx(Sidebar, { workspace: settings.workspace, model: settings.model, provider: settings.provider, ollamaUrl: settings.ollamaUrl, agentMode: agentMode, allowWrite: settings.allowWrite, allowShell: settings.allowShell, subagents: settings.subagents, telemetry: telemetry, sessionTelemetry: sessionTelemetry, draftTokens: draftTokens, height: panelHeight, scrollOffset: sessionScrollOffset, advisors: advisorNotes, isActive: activeScrollPane === "session", activeHost: activeHost }), _jsxs(Box, { flexDirection: "column", flexGrow: 1, height: panelHeight + composerReservedHeight + paletteReservedHeight + footerReservedHeight, overflowY: "hidden", children: [_jsx(Transcript, { lines: lines, isRunning: isRunning, isActive: activeScrollPane === "transcript", height: panelHeight, width: transcriptWidth, scrollOffset: transcriptScrollOffset }), _jsx(Composer, { input: input, isRunning: isRunning, status: status, draftTokens: draftTokens, onChange: setInput, onSubmit: (value) => void handleSubmit(value) }), paletteItems.length > 0 ? _jsx(CommandSuggestions, { items: paletteItems, selectedIndex: paletteIndex }) : null, _jsx(FooterHints, { activePane: activeScrollPane })] })] }))] }));
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, height: rootHeight, overflowY: "hidden", children: [_jsx(Header, { model: settings.model, provider: settings.provider, workspace: settings.workspace, status: status, workState: workState, allowWrite: settings.allowWrite, allowShell: settings.allowShell, agentMode: agentMode, subagents: settings.subagents, thinkingMode: settings.thinkingMode, reasoningEffort: settings.reasoningEffort, ollamaUrl: settings.ollamaUrl, telemetry: telemetry, sessionTelemetry: sessionTelemetry, draftTokens: draftTokens, systemStats: systemStats, gpuStats: gpuStats, activeHost: activeHost }), onboarding ? (_jsx(OnboardingPanel, { state: onboarding, height: panelHeight, selectedIndex: onboardingIndex, input: onboardingInput, busyMessage: onboardingBusyMessage, notice: onboardingNotice, onInputChange: setOnboardingInput, onInputSubmit: (value) => void handleOnboardingSubmit(value) })) : (_jsxs(Box, { flexDirection: "row", height: panelHeight + composerReservedHeight + paletteReservedHeight + footerReservedHeight, overflowY: "hidden", children: [_jsx(Sidebar, { workspace: settings.workspace, model: settings.model, provider: settings.provider, ollamaUrl: settings.ollamaUrl, agentMode: agentMode, allowWrite: settings.allowWrite, allowShell: settings.allowShell, subagents: settings.subagents, workState: workState, sessionId: sessionStoreRef.current.sessionId, systemStats: systemStats, gpuStats: gpuStats, telemetry: telemetry, sessionTelemetry: sessionTelemetry, draftTokens: draftTokens, height: panelHeight, scrollOffset: sessionScrollOffset, advisors: advisorNotes, isActive: activeScrollPane === "session", activeHost: activeHost }), _jsxs(Box, { flexDirection: "column", flexGrow: 1, height: panelHeight + composerReservedHeight + paletteReservedHeight + footerReservedHeight, overflowY: "hidden", children: [_jsx(Transcript, { lines: lines, isRunning: isRunning, isActive: activeScrollPane === "transcript", height: panelHeight, width: transcriptWidth, scrollOffset: transcriptScrollOffset }), _jsx(Composer, { input: input, isRunning: isRunning, status: status, draftTokens: draftTokens, onChange: setInput, onSubmit: (value) => void handleSubmit(value) }), paletteItems.length > 0 ? _jsx(CommandSuggestions, { items: paletteItems, selectedIndex: paletteIndex }) : null, _jsx(FooterHints, { activePane: activeScrollPane })] })] }))] }));
 }
 async function loadAvailableModels(provider, ollamaUrl, setModelOptions, refresh = false) {
     const cacheKey = `${provider}:${provider === "ollama" ? ollamaUrl : "default"}`;
@@ -1451,7 +1635,7 @@ function buildCommandSuggestionItems(options) {
             });
         }
         else {
-            items.unshift(...filterModelOptions(modelQuery, options.modelOptions).slice(0, 8).map((model) => ({
+            items.unshift(...selectableModels(modelQuery, options.modelOptions).slice(0, 8).map((model) => ({
                 key: `model-${model}`,
                 category: "model",
                 label: model,
@@ -1470,7 +1654,7 @@ function getOnboardingOptionCount(onboarding) {
         case "host":
             return onboarding.hosts.length + 1;
         case "api-key-choice":
-            return 2;
+            return onboarding.hasExistingKey ? 2 : 1;
         case "model":
             return onboarding.models.length;
         default:
@@ -1525,7 +1709,7 @@ function selectModelFromInput(value, models, selectedIndex, options = {}) {
     if (models.includes(normalizedValue)) {
         return normalizedValue;
     }
-    const matches = filterModelOptions(normalizedValue, models);
+    const matches = selectableModels(normalizedValue, models);
     if (matches.length === 1) {
         return matches[0] ?? null;
     }
@@ -1534,34 +1718,6 @@ function selectModelFromInput(value, models, selectedIndex, options = {}) {
 function isPlausibleCloudModelId(value) {
     return /^[A-Za-z0-9][A-Za-z0-9._:/+-]*$/.test(value) && value.length >= 3;
 }
-function filterModelOptions(query, models) {
-    const normalizedQuery = query.trim().toLowerCase();
-    if (!normalizedQuery) {
-        return models;
-    }
-    return models
-        .map((model) => ({
-        model,
-        score: scoreModelMatch(model, normalizedQuery)
-    }))
-        .filter((item) => item.score !== null)
-        .sort((left, right) => left.score - right.score || left.model.localeCompare(right.model))
-        .map((item) => item.model);
-}
-function scoreModelMatch(model, query) {
-    const normalizedModel = model.toLowerCase();
-    if (normalizedModel === query) {
-        return 0;
-    }
-    if (normalizedModel.startsWith(query)) {
-        return 1;
-    }
-    if (normalizedModel.includes(query)) {
-        return 2 + normalizedModel.indexOf(query) / 1000;
-    }
-    const tokens = query.split(/[\s/:_-]+/).filter(Boolean);
-    return tokens.length > 0 && tokens.every((token) => normalizedModel.includes(token)) ? 10 : null;
-}
 function defaultModelForProvider(provider, currentModel) {
     if (provider === "nvidia") {
         return currentModel.includes("/") && !currentModel.startsWith("openrouter/") ? currentModel : defaultNvidiaModel;
@@ -1633,7 +1789,7 @@ async function ejectOllamaModels(options) {
     return ejected;
 }
 function isReasoningEffort(value) {
-    return value === "low" || value === "medium" || value === "high" || value === "xhigh" || value === "adaptive";
+    return value === "none" || value === "low" || value === "medium" || value === "high" || value === "xhigh" || value === "adaptive";
 }
 function upsertAdvisorNote(notes, nextNote) {
     const nextNotes = notes.filter((note) => note.role !== nextNote.role);
@@ -1643,46 +1799,75 @@ function eventToLine(event) {
     switch (event.type) {
         case "status":
             return {
+                kind: "status",
                 tone: "muted",
-                label: "thinking",
-                text: event.message
+                label: event.workState,
+                text: event.message,
+                workState: event.workState
             };
         case "assistant":
             return {
+                kind: "assistant",
                 tone: "accent",
                 label: "pilot",
-                text: event.message
+                text: event.message,
+                workState: event.workState
             };
         case "subagent":
             return {
+                kind: "assistant",
                 tone: "accent",
                 label: event.role,
                 text: "advisor brief updated",
-                detail: event.message
+                detail: event.message,
+                workState: event.workState
             };
         case "tool":
             return {
+                kind: event.name === "git_diff" ? "diff" : "tool",
                 tone: event.ok ? "success" : "warning",
                 label: event.name,
-                text: event.summary
+                text: event.summary,
+                workState: event.workState,
+                tool: event.name,
+                toolCallId: event.toolCallId,
+                category: event.category,
+                preview: event.preview
+            };
+        case "approval":
+            return {
+                kind: "approval",
+                tone: event.decision === "deny" ? "warning" : "success",
+                label: "approval",
+                text: `${event.request.tool} ${event.decision.replace("_", " ")}`,
+                detail: event.request.preview,
+                workState: event.workState,
+                tool: event.request.tool,
+                preview: event.request.preview
             };
         case "final":
             return {
+                kind: "final",
                 tone: "success",
                 label: "final",
-                text: event.message
+                text: event.message,
+                workState: event.workState
             };
         case "error":
             return {
+                kind: "error",
                 tone: "danger",
                 label: "error",
-                text: event.message
+                text: event.message,
+                workState: event.workState
             };
         case "metrics":
             return {
+                kind: "status",
                 tone: "muted",
                 label: "metrics",
-                text: formatTokens(event.metrics)
+                text: formatTokens(event.metrics),
+                workState: event.workState
             };
     }
 }
@@ -1696,8 +1881,26 @@ function eventToStatus(event) {
     if (event.type === "subagent") {
         return `${event.role} subagent`;
     }
+    if (event.type === "approval") {
+        return `${event.request.tool}: ${event.decision.replace("_", " ")}`;
+    }
     return event.type;
 }
+function defaultLogKind(line) {
+    if (line.kind) {
+        return line.kind;
+    }
+    if (line.label === "you") {
+        return "user";
+    }
+    if (line.label === "error") {
+        return "error";
+    }
+    if (line.label === "final") {
+        return "final";
+    }
+    return "status";
+}
 function formatHostOptions(hosts) {
     return hosts
         .map((host, index) => {