@jx-grxf/patchpilot 0.4.0 → 1.2.0

package/dist/tui/App.js

@@ -1,23 +1,37 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useCallback, useEffect, useRef, useState } from "react";
-import { Box, useApp, useInput, useStdout } from "ink";
+import { statSync } from "node:fs";
+import { Box, Text, useApp, useInput, useStdout } from "ink";
 import { AgentRunner } from "../core/agent.js";
+import { cleanupPatchPilot, readCleanupTarget } from "../core/cleanup.js";
 import { defaultCodexModel, hasCodexCliOAuth } from "../core/codex.js";
 import { describeComputeTarget } from "../core/compute.js";
+import { ContextStore } from "../core/contextStore.js";
 import { runDoctor } from "../core/doctor.js";
 import { savePatchPilotEnvValues } from "../core/env.js";
 import { defaultGeminiModel, readGeminiApiKey } from "../core/gemini.js";
+import { defaultGeminiWrapperModel, geminiWrapperCuratedModels, geminiWrapperShortcutModels, geminiWrapperRequiresApiKey, readGeminiWrapperApiKey, readGeminiWrapperBaseUrl, readGeminiWrapperCookiesJson, readGeminiWrapperMode, readGeminiWrapperPythonCommand, importGeminiWrapperBrowserCookies, saveGeminiWrapperCookieFile } from "../core/geminiWrapper.js";
 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 { ensurePatchPilotGitignore, patchPilotInitPrompt } from "../core/projectInit.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 { buildSessionResumeContext, listWorkspaceSessions, loadSessionSummary, SessionStore } from "../core/session.js";
+import { addTelemetryToSession, emptySessionTelemetry, estimateComparableApiCost, estimateTokens } from "../core/tokenAccounting.js";
+import { checkForPatchPilotUpdate, installPatchPilotUpdate } from "../core/updateCheck.js";
+import { getToolSpec, WorkspaceTools } from "../core/workspace.js";
 import { ApprovalPanel } from "./components/ApprovalPanel.js";
+import { clipboardHasImage, clipboardImageHint, readClipboardImage } from "../core/clipboard.js";
 import { CommandSuggestions } from "./components/CommandSuggestions.js";
 import { Composer, FooterHints } from "./components/Composer.js";
+import { ExperimentalPanel, experimentalFlagAt, experimentalFlagCount } from "./components/ExperimentalPanel.js";
+import { runContextSlashCommand } from "./contextCommands.js";
+import { ExperimentalShell } from "./experimental/ExperimentalShell.js";
+import { ThemePicker } from "./experimental/ThemePicker.js";
+import { attachmentKindForPath, attachmentLabel, attachmentTypeForPath, formatSessionArtifactContext } from "./experimental/attachments.js";
+import { describeUltraModes, parseUltraModes } from "./experimental/ultraModes.js";
+import { formatCompletionSummary } from "./runStatus.js";
 import { Header } from "./components/Header.js";
 import { OnboardingPanel } from "./components/OnboardingPanel.js";
 import { Sidebar } from "./components/Sidebar.js";
@@ -25,21 +39,53 @@ 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 { initialAgentMode, modeDescription, modePermissionLabel, nextAgentMode, permissionsForMode } from "./modes.js";
+import { computeComposerLayout } from "./layout.js";
+import { initialAgentMode, modeDescription, modePermissionLabel, nextAgentMode, permissionsForMode, shouldBypassApproval } from "./modes.js";
 import { selectableModels } from "./modelSelection.js";
+import { cyclePreference, modePermissions as preferencesModePermissions, preferenceRows, preferencesEnvValues, readOnboardingPreferences } from "./onboardingPreferences.js";
 import { readGpuStats, readSystemStats } from "./systemStats.js";
 import { maxTranscriptLines } from "./types.js";
+const themeOptions = [
+    {
+        value: "new",
+        label: "New",
+        description: "Experimental fullscreen shell: compact header, scrolling transcript, command palette, animated run status."
+    },
+    {
+        value: "legacy",
+        label: "Legacy",
+        description: "Original PatchPilot TUI with the sidebar and split-pane layout."
+    }
+];
+function readUiTheme() {
+    return process.env.PATCHPILOT_UI_THEME?.trim().toLowerCase() === "legacy" ? "legacy" : "new";
+}
+/** Heuristic: does this Gemini-Wrapper error look like expired/invalid cookies? */
+function isGeminiCookieError(message) {
+    return /cookie|secure_1psid|psidts|expired|sign[ -]?in|auth(?:enticat|oriz)|401|403|session.*(?:invalid|expired)/i.test(message);
+}
 const modelCacheTtlMs = 5 * 60_000;
 const modelCache = new Map();
+const modelDescriptorIndex = new Map();
 export function App(props) {
     const { exit } = useApp();
     const { stdout } = useStdout();
     const [input, setInput] = useState(props.initialTask ?? "");
     const didRunInitialTask = useRef(false);
     const didOpenDefaultOnboarding = useRef(false);
+    const didCheckForUpdates = useRef(false);
     const abortControllerRef = useRef(null);
+    const softStopRequestedRef = useRef(false);
+    const lastEscapeStopAtRef = useRef(0);
+    const lastAttachmentWarningRef = useRef("");
     const sessionStoreRef = useRef(new SessionStore({ workspace: props.workspace }));
+    const contextStoreRef = useRef(new ContextStore({ workspace: props.workspace, sessionId: sessionStoreRef.current.sessionId }));
     const approvalResolverRef = useRef(null);
+    const runtimeStateRef = useRef({
+        isRunning: false,
+        hasPendingApproval: false,
+        lastSigintAt: 0
+    });
     const grantedPermissionsRef = useRef({
         allowWrite: props.allowWrite,
         allowShell: props.allowShell
@@ -47,14 +93,24 @@ export function App(props) {
     const activeHostSyncInFlightRef = useRef(false);
     const autoLoadKeysRef = useRef(new Set());
     const usedOllamaModelsRef = useRef(new Set());
+    // Rolling session memory: short digests of earlier turns so a later prompt
+    // ("now do X") still knows what the user asked for and where.
+    const conversationTurnsRef = useRef([]);
     const [lines, setLines] = useState([]);
     const [advisorNotes, setAdvisorNotes] = useState([]);
+    const [todos, setTodos] = useState([]);
+    const [todoFrame, setTodoFrame] = useState(0);
+    const [verbTick, setVerbTick] = useState(0);
     const [isRunning, setIsRunning] = useState(false);
     const [status, setStatus] = useState("idle");
     const [workState, setWorkState] = useState("idle");
     const [pendingApproval, setPendingApproval] = useState(null);
+    const [updatePrompt, setUpdatePrompt] = useState(null);
+    const [updateBusy, setUpdateBusy] = useState(false);
     const [telemetry, setTelemetry] = useState(null);
     const [sessionTelemetry, setSessionTelemetry] = useState(() => emptySessionTelemetry());
+    const [toolTelemetry, setToolTelemetry] = useState(() => emptyToolTelemetry());
+    const [resumeContext, setResumeContext] = useState("");
     const [systemStats, setSystemStats] = useState(() => readSystemStats().stats);
     const [gpuStats, setGpuStats] = useState(null);
     const [agentMode, setAgentMode] = useState(() => initialAgentMode({ allowWrite: props.allowWrite, allowShell: props.allowShell }));
@@ -65,6 +121,26 @@ export function App(props) {
     const [modelOptions, setModelOptions] = useState([]);
     const [isLoadingModels, setIsLoadingModels] = useState(false);
     const [onboarding, setOnboarding] = useState(null);
+    const [experimentalOpen, setExperimentalOpen] = useState(false);
+    const [experimentalIndex, setExperimentalIndex] = useState(0);
+    const [experimentalFlags, setExperimentalFlags] = useState({
+        fileAnalysis: readBooleanEnv(process.env.PATCHPILOT_EXPERIMENTAL_FILE_ANALYSIS, false),
+        memory: readBooleanEnv(process.env.PATCHPILOT_EXPERIMENTAL_MEMORY, false),
+        subagents: props.subagents,
+        shellMetacharacters: readBooleanEnv(process.env.PATCHPILOT_EXPERIMENTAL_SHELL_METACHARACTERS, false)
+    });
+    const [uiTheme, setUiTheme] = useState(() => readUiTheme());
+    const [themePickerOpen, setThemePickerOpen] = useState(false);
+    const [themePickerIndex, setThemePickerIndex] = useState(0);
+    const [ultramaxxRun, setUltramaxxRun] = useState(false);
+    const [reauthPrompt, setReauthPrompt] = useState(null);
+    const [reauthBusy, setReauthBusy] = useState(false);
+    const [artifacts, setArtifacts] = useState([]);
+    const artifactsRef = useRef([]);
+    const pendingAttachmentsRef = useRef([]);
+    // Tracks whether the "image in clipboard" hint was already shown for the
+    // current clipboard contents, so the poll does not repeat it every tick.
+    const clipboardHintShownRef = useRef(false);
     const [onboardingIndex, setOnboardingIndex] = useState(0);
     const [onboardingInput, setOnboardingInput] = useState("");
     const [onboardingBusyMessage, setOnboardingBusyMessage] = useState(null);
@@ -88,7 +164,11 @@ export function App(props) {
     const draftTokens = estimateTokens(input);
     const terminalRows = stdout.rows ?? 40;
     const terminalColumns = stdout.columns ?? 120;
-    const paletteItems = !isRunning && !onboarding
+    const reauthPromptActive = Boolean(reauthPrompt || reauthBusy);
+    const updatePromptActive = !reauthPromptActive && Boolean(updatePrompt || updateBusy);
+    const approvalPromptActive = !reauthPromptActive && !updatePromptActive && Boolean(pendingApproval || bypassConfirmation);
+    const blockingPromptActive = reauthPromptActive || updatePromptActive || approvalPromptActive;
+    const paletteItems = !isRunning && !onboarding && !experimentalOpen && !blockingPromptActive
         ? buildCommandSuggestionItems({
             input,
             provider: settings.provider,
@@ -101,44 +181,239 @@ export function App(props) {
         : [];
     const rootHeight = Math.max(24, terminalRows);
     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;
-    const approvalReservedHeight = !onboarding && (pendingApproval || bypassConfirmation) ? 6 : 0;
-    const panelHeight = Math.max(8, rootHeight - headerReservedHeight - composerReservedHeight - paletteReservedHeight - footerReservedHeight - approvalReservedHeight);
     const transcriptWidth = Math.max(42, terminalColumns - 38);
-    const scrollStep = Math.max(4, Math.floor(panelHeight * 0.8));
+    const paletteReservedHeight = !onboarding && paletteItems.length > 0 ? Math.min(8, paletteItems.length) + 7 : 0;
+    const composerReservedHeight = onboarding || experimentalOpen ? 0 : computeComposerLayout({ input, width: transcriptWidth, promptWidth: 8 }).height;
+    const footerReservedHeight = onboarding || experimentalOpen ? 0 : 1;
+    const approvalReservedHeight = !onboarding && !experimentalOpen && blockingPromptActive ? 7 : 0;
+    const bodyHeight = Math.max(8, rootHeight - headerReservedHeight);
+    const transcriptHeight = Math.max(4, bodyHeight - composerReservedHeight - paletteReservedHeight - footerReservedHeight - approvalReservedHeight);
+    const panelHeight = onboarding || experimentalOpen ? bodyHeight : transcriptHeight;
+    const scrollStep = Math.max(4, Math.floor(transcriptHeight * 0.8));
     const appendLine = useCallback((line) => {
         setLines((currentLines) => [
-            ...currentLines.slice(-maxTranscriptLines),
+            ...currentLines,
             {
                 ...line,
                 kind: line.kind ?? defaultLogKind(line),
                 id: Date.now() + Math.random()
             }
-        ]);
+        ].slice(-maxTranscriptLines));
+    }, []);
+    const pushArtifact = useCallback((artifact) => {
+        artifactsRef.current = [...artifactsRef.current, artifact].slice(-40);
+        setArtifacts(artifactsRef.current);
+        void contextStoreRef.current.append({
+            kind: artifact.origin === "attached" ? "attachment" : "artifact",
+            source: artifact.origin === "attached" ? "user" : "tool",
+            label: artifact.label,
+            path: artifact.path,
+            priority: artifact.origin === "attached" ? 85 : 75,
+            meta: {
+                artifactKind: artifact.kind,
+                origin: artifact.origin
+            }
+        }).catch(() => undefined);
     }, []);
+    // Registers a pasted document as an attachment chip; returns the chip label
+    // ("[PNG #1]") for the composer to insert inline.
+    const attachFile = useCallback((path) => {
+        const kind = attachmentKindForPath(path) ?? "file";
+        const type = attachmentTypeForPath(path);
+        const sameType = artifactsRef.current.filter((item) => item.origin === "attached" && attachmentTypeForPath(item.path) === type).length;
+        const label = attachmentLabel(kind, sameType + 1, path);
+        pushArtifact({ id: Date.now() + Math.random(), kind, path, label, origin: "attached" });
+        const nextPendingAttachments = [...pendingAttachmentsRef.current, path];
+        pendingAttachmentsRef.current = nextPendingAttachments;
+        appendLine({
+            tone: "accent",
+            label: "attach",
+            text: `${label} attached`,
+            detail: path
+        });
+        const warning = attachmentLimitWarning(nextPendingAttachments, settings.provider);
+        if (warning && warning !== lastAttachmentWarningRef.current) {
+            lastAttachmentWarningRef.current = warning;
+            appendLine({
+                tone: "warning",
+                label: "attach",
+                text: warning,
+                detail: "For Gemini/Gemini-Wrapper, send large batches in smaller prompts or ask PatchPilot to inspect the files in separate calls."
+            });
+        }
+        return label;
+    }, [appendLine, pushArtifact, settings.provider]);
+    // Ctrl+V: pull an image straight out of the OS clipboard, save it to a temp
+    // file, and attach it — no need to save the screenshot to disk first.
+    const handleClipboardImagePaste = useCallback(async () => {
+        appendLine({ kind: "status", tone: "muted", label: "clipboard", text: "Zwischenablage wird gelesen…" });
+        const imagePath = await readClipboardImage();
+        if (!imagePath) {
+            appendLine({
+                kind: "status",
+                tone: "warning",
+                label: "clipboard",
+                text: "Kein Bild in der Zwischenablage gefunden.",
+                detail: "Kopiere ein Bild (z. B. einen Screenshot) und drücke erneut Ctrl+V."
+            });
+            return;
+        }
+        const label = attachFile(imagePath);
+        setInput((current) => {
+            if (current.length === 0) {
+                return `${label} `;
+            }
+            return `${current}${current.endsWith(" ") ? "" : " "}${label} `;
+        });
+        clipboardHintShownRef.current = true;
+    }, [appendLine, attachFile]);
+    // Watch the OS clipboard while idle: when an image appears, tell the user
+    // once that they can attach it with Ctrl+V (reset when the image is gone).
+    useEffect(() => {
+        if (isRunning) {
+            return;
+        }
+        let cancelled = false;
+        const poll = async () => {
+            const present = await clipboardHasImage();
+            if (cancelled) {
+                return;
+            }
+            if (present && !clipboardHintShownRef.current) {
+                clipboardHintShownRef.current = true;
+                appendLine({ kind: "status", tone: "accent", label: "clipboard", text: clipboardImageHint() });
+            }
+            else if (!present) {
+                clipboardHintShownRef.current = false;
+            }
+        };
+        void poll();
+        const timer = setInterval(() => void poll(), 7000);
+        return () => {
+            cancelled = true;
+            clearInterval(timer);
+        };
+    }, [isRunning, appendLine]);
+    // Best-effort: record a document PatchPilot wrote during a run.
+    const registerCreatedArtifact = useCallback((path) => {
+        const kind = attachmentKindForPath(path);
+        if (!kind || artifactsRef.current.some((item) => item.path === path)) {
+            return;
+        }
+        const type = attachmentTypeForPath(path);
+        const sameType = artifactsRef.current.filter((item) => item.origin === "created" && attachmentTypeForPath(item.path) === type).length;
+        pushArtifact({
+            id: Date.now() + Math.random(),
+            kind,
+            path,
+            label: attachmentLabel(kind, sameType + 1, path),
+            origin: "created"
+        });
+    }, [pushArtifact]);
+    useEffect(() => {
+        if (!isRunning || todos.every((todo) => todo.status !== "in_progress")) {
+            setTodoFrame(0);
+            return;
+        }
+        const timer = setInterval(() => {
+            setTodoFrame((currentFrame) => (currentFrame + 1) % 4);
+        }, 180);
+        return () => {
+            clearInterval(timer);
+        };
+    }, [isRunning, todos]);
+    // Slow run-status verb tick: the verb only advances every 10s while the fast
+    // spinner glyph keeps animating, so the status line never flickers.
+    useEffect(() => {
+        if (!isRunning) {
+            setVerbTick(randomLegacyVerbIndex());
+            return;
+        }
+        setVerbTick(randomLegacyVerbIndex());
+        const timer = setInterval(() => {
+            setVerbTick((currentTick) => {
+                let nextTick = randomLegacyVerbIndex();
+                if (nextTick === currentTick) {
+                    nextTick += 1;
+                }
+                return nextTick;
+            });
+        }, 10_000);
+        return () => {
+            clearInterval(timer);
+        };
+    }, [isRunning]);
     const resolveApproval = useCallback((decision) => {
         if (!pendingApproval || !approvalResolverRef.current) {
             return;
         }
         approvalResolverRef.current(decision);
         approvalResolverRef.current = null;
+        const nextWorkState = decision === "deny" ? "error" : workStateForApprovalTool(pendingApproval.tool);
+        setInput("");
+        setStatus(decision === "deny" ? `${pendingApproval.tool} denied` : `${pendingApproval.tool} approved; running`);
+        setWorkState(nextWorkState);
         appendLine({
             kind: "approval",
             tone: decision === "deny" ? "warning" : "success",
             label: "approval",
             text: `${pendingApproval.tool} ${decision.replace("_", " ")}`,
             detail: pendingApproval.preview,
-            workState: "waiting_approval",
+            workState: nextWorkState,
             tool: pendingApproval.tool
         });
         setPendingApproval(null);
     }, [appendLine, pendingApproval]);
+    const resolveUpdatePrompt = useCallback(async (accept) => {
+        const pending = updatePrompt;
+        if (!pending || updateBusy) {
+            return;
+        }
+        if (!accept) {
+            setUpdatePrompt(null);
+            setStatus("idle");
+            appendLine({
+                tone: "muted",
+                label: "update",
+                text: `Skipped PatchPilot ${pending.latestVersion}.`,
+                detail: `Manual command: ${pending.command}`
+            });
+            return;
+        }
+        setUpdateBusy(true);
+        setStatus(`updating to ${pending.latestVersion}`);
+        appendLine({
+            tone: "accent",
+            label: "update",
+            text: `Running ${pending.command}`
+        });
+        try {
+            const result = await installPatchPilotUpdate(pending.latestVersion);
+            setUpdatePrompt(null);
+            appendLine({
+                tone: "success",
+                label: "update",
+                text: `⚡ Successfully updated to v${result.version}. Please restart PatchPilot.`,
+                detail: result.command
+            });
+        }
+        catch (error) {
+            appendLine({
+                tone: "danger",
+                label: "update",
+                text: error instanceof Error ? error.message : String(error),
+                detail: `Automatic update failed. Manual command: ${pending.command}`
+            });
+        }
+        finally {
+            setUpdateBusy(false);
+        }
+    }, [appendLine, updateBusy, updatePrompt]);
     const applyMode = useCallback((nextMode, announce = true) => {
         const permissions = permissionsForMode(nextMode);
         setAgentMode(nextMode);
         setBypassConfirmation(false);
+        grantedPermissionsRef.current = permissions;
         setSettings((currentSettings) => ({
             ...currentSettings,
             allowWrite: permissions.allowWrite,
@@ -166,9 +441,24 @@ export function App(props) {
         setWorkState("waiting_approval");
     }, [bypassConfirmation]);
     const confirmBypassMode = useCallback(() => {
+        setInput("");
         applyMode("bypass");
     }, [applyMode]);
+    const setExplicitPermission = useCallback((permission, enabled) => {
+        const nextPermissions = {
+            allowWrite: permission === "write" ? enabled : settings.allowWrite,
+            allowShell: permission === "shell" ? enabled : settings.allowShell
+        };
+        grantedPermissionsRef.current = nextPermissions;
+        setBypassConfirmation(false);
+        setAgentMode(nextPermissions.allowWrite && nextPermissions.allowShell ? "bypass" : nextPermissions.allowWrite || nextPermissions.allowShell ? "build" : "plan");
+        setSettings((currentSettings) => ({
+            ...currentSettings,
+            ...nextPermissions
+        }));
+    }, [settings.allowShell, settings.allowWrite]);
     const cancelBypassMode = useCallback(() => {
+        setInput("");
         setBypassConfirmation(false);
         setStatus("idle");
         setWorkState("idle");
@@ -258,6 +548,7 @@ export function App(props) {
         setModelOptions(details.models);
         modelCache.set(`ollama:${verifiedHost.url}`, {
             models: details.models,
+            descriptors: details.models.map((model) => ({ id: model, displayName: model })),
             expiresAt: Date.now() + modelCacheTtlMs
         });
         setSettings((currentSettings) => ({
@@ -291,13 +582,14 @@ export function App(props) {
         setTelemetry(null);
         setOnboardingInput("");
         setOnboardingNotice(null);
-        setOnboardingBusyMessage(`Loading ${provider} models...`);
+        setOnboardingBusyMessage(null);
         const nextModel = defaultModelForProvider(provider, options.currentModel ?? settings.model);
         setSettings((currentSettings) => ({
             ...currentSettings,
             provider,
             model: nextModel
         }));
+        setOnboardingBusyMessage(`Loading ${provider} models...`);
         try {
             const models = await loadAvailableModels(provider, options.ollamaUrl ?? settings.ollamaUrl, setModelOptions, true);
             if (models.length === 0) {
@@ -307,9 +599,13 @@ export function App(props) {
                         ? "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.",
+                            : provider === "gemini-wrapper"
+                                ? "No Gemini-Wrapper models listed. Check the bridge install and cookie setup."
+                                : provider === "openrouter"
+                                    ? "No OpenRouter models listed. Check the API key."
+                                    : provider === "nvidia"
+                                        ? "No NVIDIA models listed. Check the API key."
+                                        : "No Codex OAuth models listed.",
                     detail: "Use the back key to choose another provider or retry after fixing the provider setup."
                 });
                 return;
@@ -349,12 +645,25 @@ export function App(props) {
         setOnboardingNotice(null);
         setOnboardingIndex(0);
         switch (onboarding.step) {
+            case "welcome":
+                setOnboarding(null);
+                return;
+            case "disclaimer":
+                setOnboarding({
+                    step: "welcome"
+                });
+                return;
             case "entry":
                 setOnboarding(null);
                 return;
             case "host":
             case "api-key-choice":
             case "gemini-key":
+            case "gemini-wrapper-url":
+            case "gemini-wrapper-psid":
+            case "gemini-wrapper-psidts":
+            case "gemini-wrapper-model-mode":
+            case "gemini-wrapper-key":
             case "openrouter-key":
             case "nvidia-key":
             case "codex-login":
@@ -368,6 +677,15 @@ export function App(props) {
                     hosts: hostOptions
                 });
                 return;
+            case "preferences":
+                if (onboarding.provider === "gemini-wrapper") {
+                    setOnboarding({
+                        step: "gemini-wrapper-model-mode"
+                    });
+                    return;
+                }
+                void openModelSelection(onboarding.provider, { currentModel: onboarding.model });
+                return;
             case "model":
                 if (onboarding.provider === "ollama" && activeHost?.host.kind !== "local") {
                     setOnboarding({
@@ -380,6 +698,12 @@ export function App(props) {
                     openApiKeyChoice("gemini", setOnboarding, setOnboardingIndex);
                     return;
                 }
+                if (onboarding.provider === "gemini-wrapper") {
+                    setOnboarding({
+                        step: "gemini-wrapper-model-mode"
+                    });
+                    return;
+                }
                 if (onboarding.provider === "nvidia") {
                     openApiKeyChoice("nvidia", setOnboarding, setOnboardingIndex);
                     return;
@@ -398,7 +722,7 @@ export function App(props) {
                     step: "entry"
                 });
         }
-    }, [activeHost?.host.kind, hostOptions, onboarding]);
+    }, [activeHost?.host.kind, hostOptions, onboarding, openModelSelection]);
     const handleOnboardingSubmit = useCallback(async (value) => {
         if (!onboarding) {
             return;
@@ -407,6 +731,33 @@ export function App(props) {
             return;
         }
         setOnboardingNotice(null);
+        if (onboarding.step === "welcome") {
+            setOnboarding({
+                step: "disclaimer"
+            });
+            setOnboardingIndex(0);
+            return;
+        }
+        if (onboarding.step === "disclaimer") {
+            const normalizedValue = value.trim().toLowerCase();
+            if (normalizedValue !== "y" && normalizedValue !== "yes" && normalizedValue !== "1") {
+                setOnboardingNotice({
+                    tone: "warning",
+                    text: "Accept the use-at-your-own-risk notice to continue.",
+                    detail: "Press y to continue, or Escape to go back."
+                });
+                return;
+            }
+            savePatchPilotEnvValues({
+                PATCHPILOT_DISCLAIMER_ACCEPTED: "2026-05-22"
+            });
+            process.env.PATCHPILOT_DISCLAIMER_ACCEPTED = "2026-05-22";
+            setOnboarding({
+                step: "entry"
+            });
+            setOnboardingIndex(0);
+            return;
+        }
         if (onboarding.step === "entry") {
             const selection = readEntrySelection(value, onboardingIndex);
             if (!selection) {
@@ -452,7 +803,7 @@ export function App(props) {
                 }
                 return;
             }
-            if (selection === "gemini" || selection === "openrouter" || selection === "nvidia") {
+            if (selection === "gemini" || selection === "gemini-wrapper" || selection === "openrouter" || selection === "nvidia") {
                 openApiKeyChoice(selection, setOnboarding, setOnboardingIndex);
                 return;
             }
@@ -537,6 +888,58 @@ export function App(props) {
             if (choice === null) {
                 return;
             }
+            if (onboarding.provider === "gemini-wrapper") {
+                if (choice === 0 && onboarding.hasExistingKey) {
+                    setOnboarding({
+                        step: "gemini-wrapper-model-mode"
+                    });
+                    setOnboardingInput("");
+                    setOnboardingIndex(0);
+                    return;
+                }
+                const importChoice = onboarding.hasExistingKey ? 1 : 0;
+                if (choice === importChoice) {
+                    setOnboardingBusyMessage("Importing Gemini browser cookies...");
+                    try {
+                        const result = await importGeminiWrapperBrowserCookies();
+                        process.env.PATCHPILOT_GEMINI_WRAPPER_MODE = "python";
+                        process.env.PATCHPILOT_GEMINI_WRAPPER_COOKIES_JSON = result.cookiesPath;
+                        savePatchPilotEnvValues({
+                            PATCHPILOT_PROVIDER: "gemini-wrapper",
+                            PATCHPILOT_MODEL: defaultGeminiWrapperModel,
+                            PATCHPILOT_GEMINI_WRAPPER_MODE: "python",
+                            PATCHPILOT_GEMINI_WRAPPER_COOKIES_JSON: result.cookiesPath
+                        });
+                        setOnboardingNotice({
+                            tone: "success",
+                            text: `Imported ${result.cookieCount} Gemini browser cookies from ${result.source}.`,
+                            detail: `${result.cookiesPath} was written with owner-only permissions. Secret values were not printed.`
+                        });
+                        setOnboarding({
+                            step: "gemini-wrapper-model-mode"
+                        });
+                        setOnboardingInput("");
+                        setOnboardingIndex(0);
+                    }
+                    catch (error) {
+                        setOnboardingNotice({
+                            tone: "warning",
+                            text: "Gemini browser cookie import failed.",
+                            detail: error instanceof Error ? error.message : String(error)
+                        });
+                    }
+                    finally {
+                        setOnboardingBusyMessage(null);
+                    }
+                    return;
+                }
+                setOnboarding({
+                    step: "gemini-wrapper-psid"
+                });
+                setOnboardingInput("");
+                setOnboardingIndex(0);
+                return;
+            }
             if (choice === 0 && onboarding.hasExistingKey) {
                 await openModelSelection(onboarding.provider, {
                     currentModel: defaultModelForProvider(onboarding.provider, settings.model)
@@ -574,6 +977,159 @@ export function App(props) {
             });
             return;
         }
+        if (onboarding.step === "gemini-wrapper-psid") {
+            const secure1psid = value.trim();
+            if (!secure1psid) {
+                setOnboardingNotice({
+                    tone: "warning",
+                    text: "__Secure-1PSID cannot be empty.",
+                    detail: "Paste the cookie value manually. PatchPilot will not scan browser profiles."
+                });
+                return;
+            }
+            setOnboarding({
+                step: "gemini-wrapper-psidts",
+                secure1psid
+            });
+            setOnboardingInput("");
+            setOnboardingIndex(0);
+            return;
+        }
+        if (onboarding.step === "gemini-wrapper-psidts") {
+            const secure1psidts = value.trim();
+            const cookiesPath = saveGeminiWrapperCookieFile({
+                secure1psid: onboarding.secure1psid,
+                secure1psidts
+            });
+            process.env.PATCHPILOT_GEMINI_WRAPPER_MODE = "python";
+            process.env.PATCHPILOT_GEMINI_WRAPPER_COOKIES_JSON = cookiesPath;
+            savePatchPilotEnvValues({
+                PATCHPILOT_PROVIDER: "gemini-wrapper",
+                PATCHPILOT_MODEL: defaultGeminiWrapperModel,
+                PATCHPILOT_GEMINI_WRAPPER_MODE: "python",
+                PATCHPILOT_GEMINI_WRAPPER_COOKIES_JSON: cookiesPath
+            });
+            setOnboardingNotice({
+                tone: "success",
+                text: "Gemini-API bridge cookies saved to PatchPilot config.",
+                detail: `${cookiesPath} was written with owner-only permissions. PatchPilot will run gemini_webapi through python3.`
+            });
+            setOnboarding({
+                step: "gemini-wrapper-model-mode"
+            });
+            setOnboardingInput("");
+            setOnboardingIndex(0);
+            return;
+        }
+        if (onboarding.step === "gemini-wrapper-model-mode") {
+            const choice = readIndexedSelection(value, onboardingIndex);
+            if (choice === null) {
+                return;
+            }
+            const curatedModel = geminiWrapperShortcutModels[choice];
+            if (curatedModel) {
+                setTelemetry(null);
+                const shortcutDescriptors = geminiWrapperShortcutModels.map((model) => ({ id: model, displayName: model }));
+                rememberModelDescriptors(shortcutDescriptors);
+                setModelOptions([...geminiWrapperShortcutModels]);
+                setSettings((currentSettings) => ({
+                    ...currentSettings,
+                    provider: "gemini-wrapper",
+                    model: curatedModel
+                }));
+                savePatchPilotEnvValues({
+                    PATCHPILOT_PROVIDER: "gemini-wrapper",
+                    PATCHPILOT_MODEL: curatedModel,
+                    PATCHPILOT_GEMINI_WRAPPER_MODE: "python"
+                });
+                setOnboarding({
+                    step: "preferences",
+                    provider: "gemini-wrapper",
+                    model: curatedModel,
+                    preferences: readOnboardingPreferences()
+                });
+                setOnboardingInput("");
+                setOnboardingIndex(preferenceRows.length);
+                return;
+            }
+            await openModelSelection("gemini-wrapper", {
+                currentModel: settings.model
+            });
+            return;
+        }
+        if (onboarding.step === "gemini-wrapper-url") {
+            const baseUrl = value.trim().replace(/\/$/, "");
+            if (!baseUrl) {
+                setOnboardingNotice({
+                    tone: "warning",
+                    text: "Gemini-Wrapper URL cannot be empty."
+                });
+                return;
+            }
+            try {
+                new URL(baseUrl);
+            }
+            catch {
+                setOnboardingNotice({
+                    tone: "warning",
+                    text: "Gemini-Wrapper URL must be a valid URL.",
+                    detail: "Example: http://localhost:8787/v1"
+                });
+                return;
+            }
+            process.env.PATCHPILOT_GEMINI_WRAPPER_BASE_URL = baseUrl;
+            process.env.PATCHPILOT_GEMINI_WRAPPER_MODE = "http";
+            savePatchPilotEnvValues({
+                PATCHPILOT_PROVIDER: "gemini-wrapper",
+                PATCHPILOT_MODEL: defaultGeminiWrapperModel,
+                PATCHPILOT_GEMINI_WRAPPER_BASE_URL: baseUrl,
+                PATCHPILOT_GEMINI_WRAPPER_MODE: "http"
+            });
+            setOnboardingNotice({
+                tone: "success",
+                text: "Gemini-Wrapper URL saved to PatchPilot config.",
+                detail: "PatchPilot uses only this explicit URL and never reads browser cookies."
+            });
+            if (geminiWrapperRequiresApiKey(baseUrl) && !readGeminiWrapperApiKey()) {
+                setOnboarding({
+                    step: "gemini-wrapper-key",
+                    baseUrl
+                });
+                setOnboardingInput("");
+                setOnboardingIndex(0);
+                return;
+            }
+            await openModelSelection("gemini-wrapper", {
+                currentModel: defaultGeminiWrapperModel
+            });
+            return;
+        }
+        if (onboarding.step === "gemini-wrapper-key") {
+            const apiKey = value.trim();
+            if (geminiWrapperRequiresApiKey(onboarding.baseUrl) && !apiKey) {
+                setOnboardingNotice({
+                    tone: "warning",
+                    text: "Gemini-Wrapper API key cannot be empty for remote wrapper URLs."
+                });
+                return;
+            }
+            process.env.PATCHPILOT_GEMINI_WRAPPER_API_KEY = apiKey;
+            savePatchPilotEnvValues({
+                PATCHPILOT_PROVIDER: "gemini-wrapper",
+                PATCHPILOT_MODEL: defaultGeminiWrapperModel,
+                PATCHPILOT_GEMINI_WRAPPER_BASE_URL: onboarding.baseUrl,
+                PATCHPILOT_GEMINI_WRAPPER_MODE: "http",
+                ...(apiKey ? { PATCHPILOT_GEMINI_WRAPPER_API_KEY: apiKey } : {})
+            });
+            setOnboardingNotice({
+                tone: "success",
+                text: apiKey ? "Gemini-Wrapper API key saved to PatchPilot config." : "Gemini-Wrapper local URL saved without an API key."
+            });
+            await openModelSelection("gemini-wrapper", {
+                currentModel: defaultGeminiWrapperModel
+            });
+            return;
+        }
         if (onboarding.step === "openrouter-key") {
             const apiKey = value.trim();
             if (!apiKey) {
@@ -636,9 +1192,56 @@ export function App(props) {
             });
             return;
         }
-        const visibleModels = selectableModels(onboardingInput, onboarding.models);
+        if (onboarding.step === "preferences") {
+            const confirmIndex = preferenceRows.length;
+            const selection = readIndexedSelection(value, onboardingIndex);
+            if (selection !== confirmIndex) {
+                return;
+            }
+            const prefs = onboarding.preferences;
+            const permissions = preferencesModePermissions(prefs.mode);
+            setTelemetry(null);
+            setAgentMode(prefs.mode);
+            grantedPermissionsRef.current = permissions;
+            setExperimentalFlags((currentFlags) => ({ ...currentFlags, subagents: prefs.subagents }));
+            setSettings((currentSettings) => ({
+                ...currentSettings,
+                provider: onboarding.provider,
+                model: onboarding.model,
+                allowWrite: permissions.allowWrite,
+                allowShell: permissions.allowShell,
+                thinkingMode: prefs.thinking,
+                reasoningEffort: prefs.reasoning,
+                subagents: prefs.subagents
+            }));
+            savePatchPilotEnvValues({
+                PATCHPILOT_PROVIDER: onboarding.provider,
+                PATCHPILOT_MODEL: onboarding.model,
+                PATCHPILOT_ONBOARDING_COMPLETE: "1",
+                ...preferencesEnvValues(prefs),
+                ...(onboarding.provider === "ollama" ? { PATCHPILOT_OLLAMA_URL: activeHost?.host.url ?? settings.ollamaUrl } : {})
+            });
+            process.env.PATCHPILOT_ONBOARDING_COMPLETE = "1";
+            appendLine({
+                tone: "success",
+                label: "onboarding",
+                text: `ready: ${onboarding.provider} using ${onboarding.model}`,
+                detail: `mode ${prefs.mode} · reasoning ${prefs.reasoning} · thinking ${prefs.thinking} · subagents ${prefs.subagents ? "on" : "off"}`
+            });
+            if (onboarding.provider === "openrouter" && isOpenRouterFreeModel(onboarding.model)) {
+                appendLine({
+                    tone: "warning",
+                    label: "openrouter",
+                    text: "Free OpenRouter models are rate-limited.",
+                    detail: "OpenRouter documents 20 requests/minute for :free models, plus daily limits depending on account credits."
+                });
+            }
+            closeOnboarding();
+            return;
+        }
+        const visibleModels = selectableModels(onboardingInput, onboarding.models, formatModelLabel);
         const selectedModel = visibleModels[onboardingIndex] ?? selectModelFromInput(value, visibleModels, onboardingIndex, {
-            allowManual: onboarding.provider !== "ollama"
+            allowManual: onboarding.provider !== "ollama" && onboarding.provider !== "gemini-wrapper"
         });
         if (!selectedModel) {
             setOnboardingNotice({
@@ -647,39 +1250,65 @@ export function App(props) {
             });
             return;
         }
-        setTelemetry(null);
-        setSettings((currentSettings) => ({
-            ...currentSettings,
+        setOnboarding({
+            step: "preferences",
             provider: onboarding.provider,
-            model: selectedModel
-        }));
-        savePatchPilotEnvValues({
-            PATCHPILOT_PROVIDER: onboarding.provider,
-            PATCHPILOT_MODEL: selectedModel,
-            PATCHPILOT_ONBOARDING_COMPLETE: "1",
-            ...(onboarding.provider === "ollama" ? { PATCHPILOT_OLLAMA_URL: activeHost?.host.url ?? settings.ollamaUrl } : {})
-        });
-        appendLine({
-            tone: "success",
-            label: "onboarding",
-            text: `ready: ${onboarding.provider} using ${selectedModel}`
+            model: selectedModel,
+            preferences: readOnboardingPreferences()
         });
-        if (onboarding.provider === "openrouter" && isOpenRouterFreeModel(selectedModel)) {
+        setOnboardingInput("");
+        setOnboardingIndex(preferenceRows.length);
+    }, [activeHost?.host.url, appendLine, closeOnboarding, connectToHost, loadHostSuggestions, onboarding, onboardingBusyMessage, onboardingIndex, openModelSelection, settings.ollamaUrl]);
+    const runTask = useCallback(async (task, overrides = {}) => {
+        if (!task.trim() || isRunning) {
+            return;
+        }
+        // Ultra-modes: power-mode keywords (ultramaxx / ultracheap / ultrafocus /
+        // ultraloop) found anywhere in the prompt. Several may combine; an
+        // incompatible pair blocks the send so a contradictory run never starts.
+        const ultra = parseUltraModes(task);
+        if (ultra.conflict) {
+            appendLine({
+                kind: "status",
+                tone: "danger",
+                label: "ultra",
+                text: ultra.conflict,
+                detail: "Remove one of the conflicting keywords, then send again."
+            });
+            return;
+        }
+        const ultramaxx = ultra.modes.includes("maxx");
+        const ultracheap = ultra.modes.includes("cheap");
+        const ultrafast = ultra.modes.includes("fast");
+        const ultrafocus = ultra.modes.includes("focus");
+        const ultraloop = ultra.modes.includes("loop");
+        // ultracheap and ultrafast both run the lean pipeline (low reasoning,
+        // fixed short thinking, no advisors, capped steps).
+        const ultraLean = ultracheap || ultrafast;
+        const effectiveTask = ultra.modes.length > 0 ? ultra.cleaned : task;
+        if (ultra.modes.length > 0 && !effectiveTask) {
             appendLine({
                 tone: "warning",
-                label: "openrouter",
-                text: "Free OpenRouter models are rate-limited.",
-                detail: "OpenRouter documents 20 requests/minute for :free models, plus daily limits depending on account credits."
+                label: "ultra",
+                text: `${describeUltraModes(ultra.modes)} needs an actual task after the keyword.`
             });
+            return;
         }
-        closeOnboarding();
-    }, [activeHost?.host.url, appendLine, closeOnboarding, connectToHost, loadHostSuggestions, onboarding, onboardingBusyMessage, onboardingIndex, openModelSelection, settings.ollamaUrl]);
-    const runTask = useCallback(async (task) => {
-        if (!task.trim() || isRunning) {
+        if (ultrafocus && !ultra.focusPath) {
+            appendLine({
+                tone: "warning",
+                label: "ultra",
+                text: "ultrafocus needs a path — write ultrafocus:src/file.ts or ultrafocus \"my dir\"."
+            });
             return;
         }
+        const runStartedAt = Date.now();
+        softStopRequestedRef.current = false;
+        lastEscapeStopAtRef.current = 0;
         setInput("");
         setTranscriptScrollOffset(0);
+        setTodos([]);
+        setUltramaxxRun(ultramaxx);
         setIsRunning(true);
         appendLine({
             kind: "user",
@@ -687,20 +1316,100 @@ export function App(props) {
             label: "you",
             text: task
         });
+        if (ultra.modes.length > 0) {
+            const engagedDetail = [];
+            if (ultramaxx) {
+                engagedDetail.push("ultramaxx: xhigh reasoning, expanded step budget, advisors on.");
+            }
+            if (ultracheap) {
+                engagedDetail.push("ultracheap: low reasoning, terse output, advisors off.");
+            }
+            if (ultrafast) {
+                engagedDetail.push("ultrafast: lowest-latency pipeline — low reasoning, fixed short thinking, advisors off.");
+            }
+            if (ultrafocus) {
+                engagedDetail.push(`ultrafocus: the agent stays inside ${ultra.focusPath}.`);
+            }
+            if (ultraloop) {
+                engagedDetail.push("ultraloop: expanded budget with explicit final self-check before finishing.");
+            }
+            appendLine({
+                tone: "accent",
+                label: "ultra",
+                text: `✻ ${describeUltraModes(ultra.modes).toUpperCase()} engaged`,
+                detail: engagedDetail.join("\n")
+            });
+        }
+        let finalMessage = "";
+        let turnAttachmentPaths = [];
         try {
-            const runnableSettings = await resolveRunnableSettings(settings, modelOptions, appendLine, setModelOptions);
+            const runnableSettings = await resolveRunnableSettings(settings, modelOptions, appendLine, setModelOptions, (message) => {
+                if (settings.provider === "gemini-wrapper" && isGeminiCookieError(message)) {
+                    setReauthPrompt({ task });
+                    setStatus("gemini cookies expired");
+                    setWorkState("waiting_approval");
+                }
+            });
             if (!runnableSettings) {
                 return;
             }
             const abortController = new AbortController();
             abortControllerRef.current = abortController;
+            const effectiveMode = overrides.mode ?? agentMode;
+            // Carry earlier-turn context forward so a follow-up prompt still knows
+            // what the user was doing and where. Advisory only — it never changes
+            // the workspace root or restricts the agent.
+            const sessionMemory = conversationTurnsRef.current.length > 0
+                ? `Earlier in this PatchPilot session (most recent last), for continuity only — the request below still takes priority and is not restricted to these paths:\n${conversationTurnsRef.current.join("\n")}`
+                : "";
+            const artifactContext = formatSessionArtifactContext(artifactsRef.current);
+            const persistedContext = await contextStoreRef.current
+                .buildContextBlock({
+                maxItems: 12,
+                title: "Known session context"
+            })
+                .catch(() => "");
+            // Ultra-mode run instructions — injected as advisory context so each
+            // mode shapes the run without changing the workspace root.
+            const ultraInstructions = [];
+            if (ultrafocus && ultra.focusPath) {
+                ultraInstructions.push(`ULTRAFOCUS is active. Restrict every read, edit, and command to \`${ultra.focusPath}\` and the files it directly depends on. Do not modify anything outside that path; if the task genuinely needs other files, stop and say so instead.`);
+            }
+            if (ultraloop) {
+                ultraInstructions.push("ULTRALOOP is active. Do not finish until the user's actual goal is fully achieved and verified — not merely attempted. Before any final answer, restate the goal, list what is done, list any remaining gap, and keep working if something is still missing.");
+            }
+            if (ultracheap) {
+                ultraInstructions.push("ULTRACHEAP is active. Keep output terse, avoid unnecessary tool calls, and take the most direct path to a correct result.");
+            }
+            if (ultrafast) {
+                ultraInstructions.push("ULTRAFAST is active. Optimise for speed: minimal reasoning, the fewest tool calls that still get it right, no exploratory detours. Answer as directly as possible.");
+            }
+            const effectiveResumeContext = [resumeContext, sessionMemory, artifactContext, persistedContext, ultraInstructions.join("\n\n")]
+                .filter(Boolean)
+                .join("\n\n");
             const taskRunner = new AgentRunner({
                 ...runnableSettings,
-                mode: agentMode,
+                maxSteps: ultraloop
+                    ? Math.max(runnableSettings.maxSteps, 60)
+                    : ultramaxx
+                        ? Math.max(runnableSettings.maxSteps, 40)
+                        : ultraLean
+                            ? Math.min(runnableSettings.maxSteps, 12)
+                            : runnableSettings.maxSteps,
+                reasoningEffort: ultramaxx ? "xhigh" : ultraLean ? "low" : runnableSettings.reasoningEffort,
+                thinkingMode: ultramaxx || ultraloop ? "adaptive" : ultraLean ? "fixed" : runnableSettings.thinkingMode,
+                subagents: ultramaxx || ultraloop ? true : ultraLean ? false : runnableSettings.subagents,
+                ultramaxx,
+                allowExternalFileAnalysis: experimentalFlags.fileAnalysis,
+                allowShellMetacharacters: experimentalFlags.shellMetacharacters,
+                memoryEnabled: experimentalFlags.memory,
+                mode: effectiveMode,
                 signal: abortController.signal,
+                shouldStopAfterStep: () => softStopRequestedRef.current,
                 sessionStore: sessionStoreRef.current,
+                resumeContext: effectiveResumeContext,
                 approvalHandler: (request) => new Promise((resolve) => {
-                    if (agentMode === "plan") {
+                    if (effectiveMode === "plan") {
                         appendLine({
                             kind: "approval",
                             tone: "warning",
@@ -714,7 +1423,13 @@ export function App(props) {
                         resolve("deny");
                         return;
                     }
-                    if (agentMode === "bypass") {
+                    if (request.bypassable !== false &&
+                        shouldBypassApproval({
+                            mode: effectiveMode,
+                            permission: request.permission,
+                            permissions: runnableSettings,
+                            allowExternalFileAnalysis: experimentalFlags.fileAnalysis
+                        })) {
                         resolve("allow_session");
                         return;
                     }
@@ -735,7 +1450,15 @@ export function App(props) {
                     approvalResolverRef.current = resolve;
                 })
             });
-            for await (const event of taskRunner.run(task)) {
+            // Hand any documents the user attached this turn to the agent so it
+            // can read/analyse them with its file tools.
+            const pendingAttachments = pendingAttachmentsRef.current;
+            turnAttachmentPaths = pendingAttachments;
+            pendingAttachmentsRef.current = [];
+            const taskWithAttachments = pendingAttachments.length > 0
+                ? `${effectiveTask}\n\n[Attached documents for this task — read or analyse them as needed with inspect_document. Paths are JSON-escaped and may contain spaces:\n${formatAttachedDocuments(pendingAttachments)}\n]`
+                : effectiveTask;
+            for await (const event of taskRunner.run(taskWithAttachments)) {
                 setWorkState(event.workState);
                 if (event.type === "metrics") {
                     if (runnableSettings.provider === "ollama") {
@@ -748,31 +1471,154 @@ export function App(props) {
                 if (event.type === "subagent") {
                     setTelemetry(event.metrics);
                     setSessionTelemetry((currentSession) => addTelemetryToSession(currentSession, event.metrics));
+                    setToolTelemetry((currentTools) => addToolTelemetry(currentTools, "subagent", true));
                     setAdvisorNotes((currentNotes) => upsertAdvisorNote(currentNotes, {
                         role: event.role,
                         message: event.message
                     }));
                 }
+                if (event.type === "todo") {
+                    setTodos(event.items);
+                    setStatus(event.summary);
+                    setToolTelemetry((currentTools) => addToolTelemetry(currentTools, "update_todo", true));
+                    continue;
+                }
+                if (event.type === "final") {
+                    finalMessage = event.message;
+                }
+                // Best-effort: list documents PatchPilot wrote in the artifacts bar.
+                if (event.type === "tool" && event.ok && /write|create|pdf|save|export/i.test(event.name)) {
+                    const created = /((?:\/|~|\.\/|[\w.-]+\/)[\w./-]+\.(?:pdf|docx?|md|txt|jsonl?|csv|ya?ml|toml|xml|html?|css|tsx?|jsx?|mjs|cjs|py|sh|zsh|bash|sql|log|diff|patch|png|jpe?g|gif|webp|bmp|heic|svg))/i.exec(`${event.summary ?? ""} ${event.preview ?? ""}`);
+                    if (created?.[1]) {
+                        registerCreatedArtifact(created[1]);
+                    }
+                }
+                if (event.type === "tool") {
+                    setToolTelemetry((currentTools) => addToolTelemetry(currentTools, event.name, event.ok));
+                }
+                if (event.type === "approval") {
+                    setToolTelemetry((currentTools) => addApprovalTelemetry(currentTools, event.decision));
+                }
+                // Expired Gemini-Wrapper cookies arrive as an error event (the run
+                // does not throw) — offer the y/n re-auth prompt here too.
+                if (event.type === "error" &&
+                    settings.provider === "gemini-wrapper" &&
+                    isGeminiCookieError(event.message)) {
+                    setReauthPrompt({ task });
+                    setWorkState("waiting_approval");
+                }
                 setStatus(eventToStatus(event));
                 appendLine(eventToLine(event));
             }
         }
         catch (error) {
+            if (abortControllerRef.current?.signal.aborted) {
+                appendLine({
+                    kind: "status",
+                    tone: "warning",
+                    label: "stop",
+                    text: "Stopped by user.",
+                    workState: "done"
+                });
+                return;
+            }
+            const message = error instanceof Error ? error.message : String(error);
             appendLine({
                 kind: "error",
                 tone: "danger",
                 label: "error",
-                text: error instanceof Error ? error.message : String(error),
+                text: message,
                 workState: "error"
             });
+            // Expired Gemini-Wrapper cookies: offer a one-key re-auth + retry
+            // instead of making the user restart and re-type the prompt.
+            if (settings.provider === "gemini-wrapper" && isGeminiCookieError(message)) {
+                setReauthPrompt({ task });
+                setStatus("gemini cookies expired");
+                setWorkState("waiting_approval");
+            }
         }
         finally {
             abortControllerRef.current = null;
+            setIsRunning(false);
+            setUltramaxxRun(false);
+            // Record a short digest of this turn for cross-run continuity.
+            conversationTurnsRef.current = [
+                ...conversationTurnsRef.current,
+                `- Asked: "${task.replace(/\s+/g, " ").trim().slice(0, 220)}"${turnAttachmentPaths.length > 0 ? ` attachments: ${turnAttachmentPaths.map(formatAttachmentDigestPath).join(", ")}` : ""}${finalMessage ? ` → outcome: ${finalMessage.replace(/\s+/g, " ").trim().slice(0, 220)}` : ""}`
+            ].slice(-6);
+            void contextStoreRef.current.append({
+                kind: "turn",
+                source: "user",
+                label: task.replace(/\s+/g, " ").trim().slice(0, 120) || "PatchPilot turn",
+                text: [
+                    `Asked: ${task.replace(/\s+/g, " ").trim()}`,
+                    turnAttachmentPaths.length > 0 ? `Attachments: ${turnAttachmentPaths.join(", ")}` : "",
+                    finalMessage ? `Outcome: ${finalMessage.replace(/\s+/g, " ").trim().slice(0, 500)}` : ""
+                ]
+                    .filter(Boolean)
+                    .join("\n"),
+                priority: turnAttachmentPaths.length > 0 ? 65 : 35
+            }).catch(() => undefined);
+            appendLine({
+                kind: "status",
+                tone: "muted",
+                label: "done",
+                text: `✻ ${formatCompletionSummary(Date.now() - runStartedAt, runStartedAt)}`,
+                workState: "done"
+            });
+        }
+    }, [agentMode, appendLine, experimentalFlags, isRunning, modelOptions, registerCreatedArtifact, resumeContext, settings]);
+    const resolveReauthPrompt = useCallback(async (accept) => {
+        const pending = reauthPrompt;
+        if (!pending || reauthBusy) {
+            return;
+        }
+        if (!accept) {
+            setReauthPrompt(null);
             setStatus("idle");
             setWorkState("idle");
-            setIsRunning(false);
+            appendLine({
+                tone: "warning",
+                label: "gemini",
+                text: "Cookie refresh declined.",
+                detail: "Run /onboarding to re-authenticate Gemini-Wrapper when you are ready."
+            });
+            return;
+        }
+        // Keep the panel on screen and show the busy animation while the
+        // browser cookies are imported.
+        setReauthBusy(true);
+        try {
+            const result = await importGeminiWrapperBrowserCookies();
+            process.env.PATCHPILOT_GEMINI_WRAPPER_MODE = "python";
+            process.env.PATCHPILOT_GEMINI_WRAPPER_COOKIES_JSON = result.cookiesPath;
+            savePatchPilotEnvValues({
+                PATCHPILOT_GEMINI_WRAPPER_MODE: "python",
+                PATCHPILOT_GEMINI_WRAPPER_COOKIES_JSON: result.cookiesPath
+            });
+            setReauthBusy(false);
+            setReauthPrompt(null);
+            appendLine({
+                tone: "success",
+                label: "gemini",
+                text: `Imported ${result.cookieCount} fresh cookies from ${result.source}. Retrying your task...`
+            });
+            await runTask(pending.task);
+        }
+        catch (error) {
+            setReauthBusy(false);
+            setReauthPrompt(null);
+            setStatus("idle");
+            setWorkState("idle");
+            appendLine({
+                tone: "danger",
+                label: "gemini",
+                text: error instanceof Error ? error.message : String(error),
+                detail: "Cookie refresh failed. Sign in to Gemini in your browser, then retry the prompt."
+            });
         }
-    }, [agentMode, appendLine, isRunning, modelOptions, settings]);
+    }, [appendLine, reauthBusy, reauthPrompt, runTask]);
     const handleSlashCommand = useCallback(async (rawCommand) => {
         const [commandName = "", ...args] = rawCommand.slice(1).trim().split(/\s+/);
         const command = commandName.toLowerCase();
@@ -815,17 +1661,17 @@ export function App(props) {
                 appendLine({
                     tone: "accent",
                     label: "permissions",
-                    text: `mode ${agentMode} | write ${modePermissionLabel(agentMode, "write")} | shell ${modePermissionLabel(agentMode, "shell")} | subagents ${settings.subagents ? "on" : "off"}`,
+                    text: `mode ${agentMode} | write ${modePermissionLabel(agentMode, "write", settings)} | shell ${modePermissionLabel(agentMode, "shell", settings)} | subagents ${settings.subagents ? "on" : "off"}`,
                     detail: modeDescription(agentMode)
                 });
                 return;
             case "provider": {
                 const nextProvider = args[0]?.toLowerCase();
-                if (nextProvider !== "ollama" && nextProvider !== "gemini" && nextProvider !== "codex" && nextProvider !== "openrouter" && nextProvider !== "nvidia") {
+                if (nextProvider !== "ollama" && nextProvider !== "gemini" && nextProvider !== "gemini-wrapper" && nextProvider !== "codex" && nextProvider !== "openrouter" && nextProvider !== "nvidia") {
                     appendLine({
                         tone: "accent",
                         label: "provider",
-                        text: `current ${settings.provider}. Use /provider ollama, gemini, openrouter, nvidia, or codex.`
+                        text: `current ${settings.provider}. Use /provider ollama, gemini, gemini-wrapper, openrouter, nvidia, or codex.`
                     });
                     return;
                 }
@@ -848,14 +1694,14 @@ export function App(props) {
                     tone: needsApiKey(nextProvider) && !hasApiKey(nextProvider) ? "warning" : "success",
                     label: "provider",
                     text: needsApiKey(nextProvider) && !hasApiKey(nextProvider)
-                        ? `${nextProvider} needs an API key. Setup opened.`
+                        ? `${nextProvider} needs setup. Setup opened.`
                         : `switched to ${nextProvider} using ${nextModel}`
                 });
                 return;
             }
             case "onboarding":
                 setOnboarding({
-                    step: "entry"
+                    step: "welcome"
                 });
                 setOnboardingIndex(0);
                 setOnboardingInput("");
@@ -868,6 +1714,10 @@ export function App(props) {
                     ...currentSettings,
                     subagents: subagentsEnabled
                 }));
+                setExperimentalFlags((currentFlags) => ({
+                    ...currentFlags,
+                    subagents: subagentsEnabled
+                }));
                 appendLine({
                     tone: "success",
                     label: "agents",
@@ -926,14 +1776,18 @@ export function App(props) {
                 const writeEnabled = readToggle(args[0], !settings.allowWrite);
                 if (writeEnabled) {
                     requestBypassMode();
+                    appendLine({
+                        tone: "warning",
+                        label: "write",
+                        text: "write bypass needs trusted-workspace confirmation"
+                    });
                     return;
                 }
-                grantedPermissionsRef.current.allowWrite = writeEnabled;
-                applyMode("build", false);
+                setExplicitPermission("write", writeEnabled);
                 appendLine({
                     tone: "success",
                     label: "write",
-                    text: "workspace writes require approval in build mode"
+                    text: writeEnabled ? "workspace writes are allowed; shell remains separately controlled" : "workspace writes disabled"
                 });
                 return;
             }
@@ -941,21 +1795,27 @@ export function App(props) {
                 const shellEnabled = readToggle(args[0], !settings.allowShell);
                 if (shellEnabled) {
                     requestBypassMode();
+                    appendLine({
+                        tone: "warning",
+                        label: "shell",
+                        text: "shell bypass needs trusted-workspace confirmation"
+                    });
                     return;
                 }
-                grantedPermissionsRef.current.allowShell = shellEnabled;
-                applyMode("build", false);
+                setExplicitPermission("shell", shellEnabled);
                 appendLine({
                     tone: "success",
                     label: "shell",
-                    text: "shell commands require approval in build mode"
+                    text: shellEnabled ? "shell commands are allowed; writes remain separately controlled" : "shell commands disabled"
                 });
                 return;
             }
             case "model": {
                 const requestedModel = normalizeModelAlias(args.join(" ").trim());
                 if (!requestedModel) {
-                    const models = await loadKnownOrAvailableModels(settings.provider, settings.ollamaUrl, modelOptions, setModelOptions, appendLine);
+                    const models = await loadKnownOrAvailableModels(settings.provider, settings.ollamaUrl, modelOptions, setModelOptions, appendLine, {
+                        refresh: settings.provider === "gemini-wrapper"
+                    });
                     if (!models) {
                         return;
                     }
@@ -968,7 +1828,9 @@ export function App(props) {
                     return;
                 }
                 {
-                    const models = await loadKnownOrAvailableModels(settings.provider, settings.ollamaUrl, modelOptions, setModelOptions, appendLine);
+                    const models = await loadKnownOrAvailableModels(settings.provider, settings.ollamaUrl, modelOptions, setModelOptions, appendLine, {
+                        refresh: settings.provider === "gemini-wrapper"
+                    });
                     if (!models) {
                         return;
                     }
@@ -980,7 +1842,7 @@ export function App(props) {
                             tone: "warning",
                             label: "model",
                             text: `No unique model match for "${requestedModel}".`,
-                            detail: formatModelOptions(selectableModels(requestedModel, models).slice(0, 12), settings.model)
+                            detail: formatModelOptions(selectableModels(requestedModel, models, formatModelLabel).slice(0, 12), settings.model)
                         });
                         return;
                     }
@@ -991,7 +1853,9 @@ export function App(props) {
             case "models": {
                 const requestedModel = args.join(" ").trim();
                 if (requestedModel) {
-                    const installedModels = await loadKnownOrAvailableModels(settings.provider, settings.ollamaUrl, modelOptions, setModelOptions, appendLine);
+                    const installedModels = await loadKnownOrAvailableModels(settings.provider, settings.ollamaUrl, modelOptions, setModelOptions, appendLine, {
+                        refresh: settings.provider === "gemini-wrapper"
+                    });
                     if (!installedModels) {
                         return;
                     }
@@ -1025,7 +1889,13 @@ export function App(props) {
                                 ? "Pull a model on the selected host first."
                                 : settings.provider === "gemini"
                                     ? "Check GEMINI_API_KEY in PatchPilot config."
-                                    : "Run codex login first."
+                                    : settings.provider === "gemini-wrapper"
+                                        ? "Check gemini_webapi install and PATCHPILOT_GEMINI_WRAPPER_COOKIES_JSON in PatchPilot config."
+                                        : settings.provider === "openrouter"
+                                            ? "Check OPENROUTER_API_KEY in PatchPilot config."
+                                            : settings.provider === "nvidia"
+                                                ? "Check NVIDIA_API_KEY in PatchPilot config."
+                                                : "Run codex login first."
                         });
                         return;
                     }
@@ -1049,13 +1919,59 @@ export function App(props) {
             }
             case "status":
                 appendLine({
+                    kind: "status",
                     tone: "accent",
                     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"} | mode ${agentMode} | write ${modePermissionLabel(agentMode, "write")} | shell ${modePermissionLabel(agentMode, "shell")} | 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)} | mode ${agentMode} | write ${modePermissionLabel(agentMode, "write")} | shell ${modePermissionLabel(agentMode, "shell")} | draft ${draftTokens} tok | last ${formatTokens(telemetry)} | session ${formatSessionTokens(sessionTelemetry)} | cost ${formatCost(sessionTelemetry.estimatedCostUsd)}`
+                    text: `mode ${agentMode} · write ${modePermissionLabel(agentMode, "write", settings)} · shell ${modePermissionLabel(agentMode, "shell", settings)} · ${settings.provider}/${settings.model} · subagents ${settings.subagents ? "on" : "off"}`,
+                    detail: formatStatusDock({
+                        provider: settings.provider,
+                        model: settings.model,
+                        agentMode,
+                        subagents: settings.subagents,
+                        thinkingMode: settings.thinkingMode,
+                        reasoningEffort: settings.reasoningEffort,
+                        workspace: settings.workspace,
+                        ollamaUrl: settings.ollamaUrl,
+                        sessionId: sessionStoreRef.current.sessionId,
+                        activeHost,
+                        advisorNotes,
+                        toolTelemetry,
+                        sessionTelemetry,
+                        telemetry,
+                        draftTokens
+                    })
+                });
+                return;
+            case "usage":
+                appendLine({
+                    tone: "accent",
+                    label: "usage",
+                    text: formatUsageSummary({
+                        provider: settings.provider,
+                        model: settings.model,
+                        telemetry,
+                        sessionTelemetry,
+                        toolTelemetry
+                    }),
+                    detail: formatUsageDetail({
+                        provider: settings.provider,
+                        model: settings.model,
+                        sessionTelemetry,
+                        toolTelemetry
+                    })
                 });
                 return;
+            case "context":
+            case "ctx":
+            case "compact":
+            case "compress":
+                appendLine(await runContextSlashCommand({
+                    workspace: settings.workspace,
+                    sessionId: sessionStoreRef.current.sessionId,
+                    command: command === "compact" || command === "compress" ? "compact" : "context",
+                    args
+                }));
+                return;
             case "sessions": {
                 const sessions = await listWorkspaceSessions(settings.workspace);
                 appendLine({
@@ -1074,11 +1990,31 @@ export function App(props) {
                 const sessionId = args[0] ?? "";
                 const sessions = await listWorkspaceSessions(settings.workspace);
                 const selectedSession = sessionId ? await loadSessionSummary(settings.workspace, sessionId) : sessions[0] ?? null;
+                if (selectedSession) {
+                    sessionStoreRef.current = new SessionStore({
+                        workspace: settings.workspace,
+                        sessionId: selectedSession.sessionId
+                    });
+                    contextStoreRef.current = new ContextStore({
+                        workspace: settings.workspace,
+                        sessionId: selectedSession.sessionId
+                    });
+                    await contextStoreRef.current.bootstrapFromSession(await sessionStoreRef.current.loadEvents());
+                    await sessionStoreRef.current.append({
+                        type: "session.resumed",
+                        sessionId: selectedSession.sessionId,
+                        workspace: settings.workspace,
+                        resumedAt: new Date().toISOString()
+                    });
+                    setResumeContext(await buildSessionResumeContext(settings.workspace, selectedSession.sessionId));
+                    setSessionTelemetry(emptySessionTelemetry());
+                    setTelemetry(null);
+                }
                 appendLine({
                     kind: "status",
                     tone: selectedSession ? "accent" : "warning",
                     label: "resume",
-                    text: selectedSession ? `Loaded session ${selectedSession.sessionId}` : "No session available to resume.",
+                    text: selectedSession ? `Loaded session ${selectedSession.sessionId} and will inject its summary into the next run.` : "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."
@@ -1179,45 +2115,208 @@ export function App(props) {
                 if (ejectedModels.length === 0) {
                     appendLine({
                         tone: "warning",
-                        label: "eject",
-                        text: "No Ollama model was ejected."
+                        label: "eject",
+                        text: "No Ollama model was ejected."
+                    });
+                    return;
+                }
+                appendLine({
+                    tone: "success",
+                    label: "eject",
+                    text: `ejected ${ejectedModels.join(", ")}`
+                });
+                if (activeHost) {
+                    const details = await readOllamaHostDetails(activeHost.host, true).catch(() => activeHost);
+                    setActiveHost(details);
+                }
+                return;
+            }
+            case "doctor": {
+                const shouldFix = args.some((arg) => arg.toLowerCase() === "fix" || arg.toLowerCase() === "--fix");
+                appendLine({
+                    tone: "muted",
+                    label: "doctor",
+                    text: shouldFix ? "checking local requirements and applying safe fixes..." : "checking local requirements..."
+                });
+                const doctorResults = await runDoctor(settings.provider, settings.ollamaUrl, settings.model, {
+                    fix: shouldFix
+                });
+                for (const result of doctorResults) {
+                    appendLine({
+                        tone: result.ok ? "success" : "danger",
+                        label: result.name,
+                        text: result.action && result.action !== "check" ? `${result.action}: ${result.details}` : result.details
+                    });
+                }
+                if (!shouldFix && doctorResults.some((result) => result.action === "skipped")) {
+                    appendLine({
+                        tone: "accent",
+                        label: "doctor",
+                        text: "Some safe fixes are available. Run /doctor fix to approve them."
+                    });
+                }
+                return;
+            }
+            case "cleanup": {
+                const target = readCleanupTarget(args[0]);
+                if (!target) {
+                    appendLine({
+                        tone: "accent",
+                        label: "cleanup",
+                        text: "Choose what to clean: /cleanup cache, /cleanup sessions, /cleanup temp, or /cleanup all.",
+                        detail: "Sessions deletes saved workspace transcripts. Cache/temp are safe first choices."
+                    });
+                    return;
+                }
+                const removed = await cleanupPatchPilot(settings.workspace, target);
+                if (target === "sessions" || target === "all") {
+                    sessionStoreRef.current = new SessionStore({
+                        workspace: settings.workspace
+                    });
+                    await sessionStoreRef.current.create();
+                    setResumeContext("");
+                    setLines([]);
+                    setAdvisorNotes([]);
+                    setTelemetry(null);
+                    setSessionTelemetry(emptySessionTelemetry());
+                    setToolTelemetry(emptyToolTelemetry());
+                }
+                appendLine({
+                    tone: "success",
+                    label: "cleanup",
+                    text: `cleaned ${removed.join(", ") || target}`
+                });
+                return;
+            }
+            case "experimental": {
+                const requestedFlag = args[0]?.toLowerCase();
+                const requestedValue = args[1]?.toLowerCase();
+                if (!requestedFlag) {
+                    setExperimentalOpen(true);
+                    setExperimentalIndex(0);
+                    setInput("");
+                    return;
+                }
+                const normalizedFlag = normalizeExperimentalFlag(requestedFlag);
+                if (!normalizedFlag) {
+                    appendLine({
+                        tone: "warning",
+                        label: "experimental",
+                        text: `unknown flag ${requestedFlag}`,
+                        detail: "Use file-analysis, memory, subagents, or shell-metacharacters."
                     });
                     return;
                 }
+                const enabled = readToggle(requestedValue, true);
+                if (normalizedFlag === "subagents") {
+                    setSettings((currentSettings) => ({
+                        ...currentSettings,
+                        subagents: enabled
+                    }));
+                }
+                savePatchPilotEnvValues({
+                    [experimentalFlagEnvName(normalizedFlag)]: enabled ? "1" : "0"
+                });
+                setExperimentalFlags((currentFlags) => ({
+                    ...currentFlags,
+                    ...(normalizedFlag === "fileAnalysis"
+                        ? { fileAnalysis: enabled }
+                        : normalizedFlag === "memory"
+                            ? { memory: enabled }
+                            : normalizedFlag === "subagents"
+                                ? { subagents: enabled }
+                                : { shellMetacharacters: enabled })
+                }));
                 appendLine({
                     tone: "success",
-                    label: "eject",
-                    text: `ejected ${ejectedModels.join(", ")}`
+                    label: "experimental",
+                    text: `${experimentalFlagCommandName(normalizedFlag)} ${enabled ? "enabled" : "disabled"}`
                 });
-                if (activeHost) {
-                    const details = await readOllamaHostDetails(activeHost.host, true).catch(() => activeHost);
-                    setActiveHost(details);
-                }
                 return;
             }
-            case "doctor": {
-                appendLine({
-                    tone: "muted",
-                    label: "doctor",
-                    text: "checking local requirements..."
-                });
-                const doctorResults = await runDoctor(settings.provider, settings.ollamaUrl, settings.model);
-                for (const result of doctorResults) {
+            case "theme": {
+                const requested = args[0]?.toLowerCase();
+                if (requested === "new" || requested === "legacy") {
+                    setUiTheme(requested);
+                    savePatchPilotEnvValues({ PATCHPILOT_UI_THEME: requested });
                     appendLine({
-                        tone: result.ok ? "success" : "danger",
-                        label: result.name,
-                        text: result.details
+                        tone: "success",
+                        label: "theme",
+                        text: `switched to the ${requested} UI`
                     });
+                    return;
                 }
+                setThemePickerOpen(true);
+                setThemePickerIndex(themeOptions.findIndex((option) => option.value === uiTheme));
+                setInput("");
+                return;
+            }
+            case "init": {
+                await ensurePatchPilotGitignore(settings.workspace);
+                appendLine({
+                    tone: "accent",
+                    label: "init",
+                    text: "starting model-driven project init",
+                    detail: "PatchPilot will inspect the repository and create or update PATCHPILOT.md with approval-gated writes."
+                });
+                await runTask(patchPilotInitPrompt, {
+                    mode: "build"
+                });
                 return;
             }
             case "clear":
                 setLines([]);
                 setAdvisorNotes([]);
+                setTodos([]);
+                setTelemetry(null);
+                setResumeContext("");
+                setSessionTelemetry(emptySessionTelemetry());
+                setToolTelemetry(emptyToolTelemetry());
+                setTranscriptScrollOffset(0);
+                setSessionScrollOffset(0);
+                conversationTurnsRef.current = [];
+                artifactsRef.current = [];
+                pendingAttachmentsRef.current = [];
+                setArtifacts([]);
+                return;
+            case "new":
+                if (isRunning) {
+                    appendLine({
+                        tone: "warning",
+                        label: "new",
+                        text: "Cannot start a new session while a run is active.",
+                        detail: "Stop the current run first, then use /new again."
+                    });
+                    return;
+                }
+                sessionStoreRef.current = new SessionStore({
+                    workspace: settings.workspace
+                });
+                contextStoreRef.current = new ContextStore({
+                    workspace: settings.workspace,
+                    sessionId: sessionStoreRef.current.sessionId
+                });
+                await sessionStoreRef.current.create();
+                setLines([]);
+                setAdvisorNotes([]);
+                setTodos([]);
                 setTelemetry(null);
                 setSessionTelemetry(emptySessionTelemetry());
+                setToolTelemetry(emptyToolTelemetry());
+                setPendingApproval(null);
+                approvalResolverRef.current = null;
+                setBypassConfirmation(false);
+                setInput("");
                 setTranscriptScrollOffset(0);
                 setSessionScrollOffset(0);
+                setStatus("idle");
+                setWorkState("idle");
+                conversationTurnsRef.current = [];
+                artifactsRef.current = [];
+                pendingAttachmentsRef.current = [];
+                setArtifacts([]);
+                // Leave the transcript empty so the startup banner shows again,
+                // exactly like a fresh launch.
                 return;
             case "exit":
             case "quit":
@@ -1245,6 +2344,7 @@ export function App(props) {
         loadHostSuggestions,
         loadProviderModels,
         modelOptions,
+        isRunning,
         resolveApproval,
         sessionTelemetry,
         settings,
@@ -1286,6 +2386,39 @@ export function App(props) {
     useEffect(() => {
         void sessionStoreRef.current.create();
     }, []);
+    useEffect(() => {
+        if (didCheckForUpdates.current || process.env.PATCHPILOT_UPDATE_CHECK === "0") {
+            return;
+        }
+        didCheckForUpdates.current = true;
+        const controller = new AbortController();
+        const timer = setTimeout(() => controller.abort(), 5000);
+        setStatus("checking for updates");
+        void checkForPatchPilotUpdate(props.packageVersion ?? "0.0.0", controller.signal)
+            .then((result) => {
+            if (result.available) {
+                setUpdatePrompt(result);
+                setStatus(`update available ${result.currentVersion} -> ${result.latestVersion}`);
+            }
+            else {
+                setStatus((current) => (current === "checking for updates" ? "idle" : current));
+            }
+        })
+            .catch(() => {
+            setStatus((current) => (current === "checking for updates" ? "idle" : current));
+        })
+            .finally(() => {
+            clearTimeout(timer);
+        });
+        return () => {
+            clearTimeout(timer);
+            controller.abort();
+        };
+    }, [props.packageVersion]);
+    useEffect(() => {
+        runtimeStateRef.current.isRunning = isRunning;
+        runtimeStateRef.current.hasPendingApproval = Boolean(pendingApproval || bypassConfirmation || updatePrompt || updateBusy);
+    }, [bypassConfirmation, isRunning, pendingApproval, updateBusy, updatePrompt]);
     useEffect(() => {
         if (!props.initialTask || didRunInitialTask.current || onboarding || process.env.PATCHPILOT_ONBOARDING_COMPLETE !== "1") {
             return;
@@ -1302,7 +2435,7 @@ export function App(props) {
         }
         didOpenDefaultOnboarding.current = true;
         setOnboarding({
-            step: "entry"
+            step: "welcome"
         });
         setOnboardingIndex(0);
         setOnboardingInput("");
@@ -1374,10 +2507,81 @@ export function App(props) {
         }
     }, [hostOptions.length, input, isLoadingHosts, isLoadingModels, isRunning, loadHostSuggestions, loadProviderModels, modelOptions.length, onboarding, settings.provider]);
     useInput((inputValue, key) => {
+        if (themePickerOpen) {
+            if (key.upArrow) {
+                setThemePickerIndex((currentIndex) => (currentIndex - 1 + themeOptions.length) % themeOptions.length);
+                return;
+            }
+            if (key.downArrow) {
+                setThemePickerIndex((currentIndex) => (currentIndex + 1) % themeOptions.length);
+                return;
+            }
+            if (key.escape || key.leftArrow) {
+                setThemePickerOpen(false);
+                setInput("");
+                return;
+            }
+            if (key.return) {
+                const chosen = themeOptions[themePickerIndex]?.value ?? "new";
+                setUiTheme(chosen);
+                savePatchPilotEnvValues({ PATCHPILOT_UI_THEME: chosen });
+                setThemePickerOpen(false);
+                setInput("");
+                appendLine({
+                    tone: "success",
+                    label: "theme",
+                    text: `switched to the ${chosen} UI`
+                });
+                return;
+            }
+            return;
+        }
+        if (experimentalOpen) {
+            if (key.upArrow) {
+                setExperimentalIndex((currentIndex) => (currentIndex - 1 + experimentalFlagCount()) % experimentalFlagCount());
+                return;
+            }
+            if (key.downArrow) {
+                setExperimentalIndex((currentIndex) => (currentIndex + 1) % experimentalFlagCount());
+                return;
+            }
+            if (inputValue === " ") {
+                const flag = experimentalFlagAt(experimentalIndex);
+                setExperimentalFlags((currentFlags) => {
+                    const nextFlags = {
+                        ...currentFlags,
+                        [flag]: !currentFlags[flag]
+                    };
+                    if (flag === "subagents") {
+                        setSettings((currentSettings) => ({
+                            ...currentSettings,
+                            subagents: nextFlags.subagents
+                        }));
+                    }
+                    savePatchPilotEnvValues({
+                        PATCHPILOT_EXPERIMENTAL_FILE_ANALYSIS: nextFlags.fileAnalysis ? "1" : "0",
+                        PATCHPILOT_EXPERIMENTAL_MEMORY: nextFlags.memory ? "1" : "0",
+                        PATCHPILOT_EXPERIMENTAL_SUBAGENTS: nextFlags.subagents ? "1" : "0",
+                        PATCHPILOT_EXPERIMENTAL_SHELL_METACHARACTERS: nextFlags.shellMetacharacters ? "1" : "0"
+                    });
+                    return nextFlags;
+                });
+                return;
+            }
+            if (key.return || key.escape || key.leftArrow) {
+                setExperimentalOpen(false);
+                setInput("");
+                return;
+            }
+            return;
+        }
         if (bypassConfirmation) {
             const normalizedInput = inputValue.toLowerCase();
+            // While the bypass confirmation is pending, tab continues the mode
+            // cycle straight back to plan — no need to confirm bypass first.
             if (key.tab) {
-                cancelBypassMode();
+                setInput("");
+                applyMode("plan");
                 return;
             }
             if (normalizedInput === "y") {
@@ -1389,6 +2593,36 @@ export function App(props) {
                 return;
             }
         }
+        if (reauthBusy) {
+            return;
+        }
+        if (updateBusy) {
+            return;
+        }
+        if (updatePrompt) {
+            const normalizedInput = inputValue.toLowerCase();
+            if (normalizedInput === "y") {
+                void resolveUpdatePrompt(true);
+                return;
+            }
+            if (normalizedInput === "n" || key.escape) {
+                void resolveUpdatePrompt(false);
+                return;
+            }
+            return;
+        }
+        if (reauthPrompt) {
+            const normalizedInput = inputValue.toLowerCase();
+            if (normalizedInput === "y") {
+                void resolveReauthPrompt(true);
+                return;
+            }
+            if (normalizedInput === "n" || key.escape) {
+                void resolveReauthPrompt(false);
+                return;
+            }
+            return;
+        }
         if (pendingApproval) {
             const normalizedInput = inputValue.toLowerCase();
             if (normalizedInput === "y") {
@@ -1405,25 +2639,77 @@ export function App(props) {
             }
         }
         if (isRunning && key.escape) {
-            abortControllerRef.current?.abort();
+            const now = Date.now();
+            const isDoubleEscape = now - lastEscapeStopAtRef.current <= 700;
+            lastEscapeStopAtRef.current = now;
+            if (isDoubleEscape) {
+                abortControllerRef.current?.abort();
+                appendLine({
+                    kind: "status",
+                    tone: "warning",
+                    label: "stop",
+                    text: "Force stopping current task now..."
+                });
+                setStatus("force stopping");
+                return;
+            }
+            softStopRequestedRef.current = true;
             appendLine({
                 kind: "status",
                 tone: "warning",
                 label: "stop",
-                text: "Stopping current task..."
+                text: "Will stop after the current step. Press esc again quickly to force stop now."
             });
-            setStatus("stopping");
+            setStatus("stopping after current step");
+            return;
+        }
+        // Ctrl+V — paste an image from the OS clipboard as an attachment. Bound to
+        // Ctrl+V on every platform because terminals capture ⌘V / the native paste
+        // shortcut for their own text paste.
+        if (key.ctrl && (inputValue === "v" || inputValue === "V") && !onboarding && !isRunning) {
+            void handleClipboardImagePaste();
             return;
         }
         if (onboarding) {
-            if (key.escape || key.leftArrow) {
+            if (key.escape) {
                 goBackOnboarding();
                 return;
             }
             if (onboardingBusyMessage) {
                 return;
             }
-            const optionCount = onboarding.step === "model" ? selectableModels(onboardingInput, onboarding.models).length : getOnboardingOptionCount(onboarding);
+            // Preferences step: left/right cycle the selected row's value in place;
+            // left only goes back when no row is highlighted (the confirm row).
+            if (onboarding.step === "preferences") {
+                const confirmIndex = preferenceRows.length;
+                if ((key.leftArrow || key.rightArrow) && onboardingIndex < confirmIndex) {
+                    const row = preferenceRows[onboardingIndex];
+                    if (row) {
+                        setOnboarding((current) => current && current.step === "preferences"
+                            ? { ...current, preferences: cyclePreference(current.preferences, row.key, key.leftArrow ? -1 : 1) }
+                            : current);
+                    }
+                    return;
+                }
+                if (key.leftArrow) {
+                    goBackOnboarding();
+                    return;
+                }
+            }
+            else if (key.leftArrow) {
+                goBackOnboarding();
+                return;
+            }
+            if (onboarding.step === "disclaimer") {
+                if (inputValue.toLowerCase() === "y") {
+                    void handleOnboardingSubmit("y");
+                }
+                else if (inputValue.toLowerCase() === "n") {
+                    goBackOnboarding();
+                }
+                return;
+            }
+            const optionCount = onboarding.step === "model" ? selectableModels(onboardingInput, onboarding.models, formatModelLabel).length : getOnboardingOptionCount(onboarding);
             if (optionCount > 0 && key.upArrow) {
                 setOnboardingIndex((currentIndex) => (currentIndex - 1 + optionCount) % optionCount);
                 return;
@@ -1432,7 +2718,7 @@ export function App(props) {
                 setOnboardingIndex((currentIndex) => (currentIndex + 1) % optionCount);
                 return;
             }
-            if (optionCount > 0 && key.return && onboarding.step !== "model") {
+            if (optionCount > 0 && key.return) {
                 void handleOnboardingSubmit(String(onboardingIndex + 1));
                 return;
             }
@@ -1457,6 +2743,16 @@ export function App(props) {
             }
         }
         const canUsePanelKeys = input.length === 0 || isRunning;
+        if (canUsePanelKeys && key.upArrow && paletteItems.length === 0) {
+            const setOffset = activeScrollPane === "session" ? setSessionScrollOffset : setTranscriptScrollOffset;
+            setOffset((currentOffset) => currentOffset + 1);
+            return;
+        }
+        if (canUsePanelKeys && key.downArrow && paletteItems.length === 0) {
+            const setOffset = activeScrollPane === "session" ? setSessionScrollOffset : setTranscriptScrollOffset;
+            setOffset((currentOffset) => Math.max(0, currentOffset - 1));
+            return;
+        }
         if (canUsePanelKeys && key.leftArrow) {
             setActiveScrollPane("session");
             return;
@@ -1485,24 +2781,46 @@ export function App(props) {
             toggleMode();
             return;
         }
-        if (!isRunning && input.length === 0 && inputValue === "q") {
-            void unloadUsedOllamaModels(usedOllamaModelsRef.current).finally(exit);
-        }
     });
     useEffect(() => {
+        const gracefulStopOrExit = () => {
+            const now = Date.now();
+            const state = runtimeStateRef.current;
+            if ((state.isRunning || state.hasPendingApproval) && now - state.lastSigintAt > 1500) {
+                state.lastSigintAt = now;
+                abortControllerRef.current?.abort();
+                approvalResolverRef.current?.("deny");
+                approvalResolverRef.current = null;
+                setPendingApproval(null);
+                setBypassConfirmation(false);
+                setInput("");
+                setStatus("stopping");
+                setWorkState("idle");
+                appendLine({
+                    kind: "status",
+                    tone: "warning",
+                    label: "stop",
+                    text: "Stopping current task. Press Ctrl-C again to quit."
+                });
+                return;
+            }
+            void unloadUsedOllamaModels(usedOllamaModelsRef.current).finally(() => {
+                process.exit(0);
+            });
+        };
         const unloadAndExit = () => {
             void unloadUsedOllamaModels(usedOllamaModelsRef.current).finally(() => {
                 process.exit(0);
             });
         };
-        process.once("SIGINT", unloadAndExit);
-        process.once("SIGTERM", unloadAndExit);
+        process.on("SIGINT", gracefulStopOrExit);
+        process.on("SIGTERM", unloadAndExit);
         return () => {
-            process.off("SIGINT", unloadAndExit);
+            process.off("SIGINT", gracefulStopOrExit);
             process.off("SIGTERM", unloadAndExit);
             void unloadUsedOllamaModels(usedOllamaModelsRef.current);
         };
-    }, []);
+    }, [appendLine]);
     useEffect(() => {
         let previousSnapshot = readSystemStats().snapshot;
         const timer = setInterval(() => {
@@ -1531,29 +2849,71 @@ 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, 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 + approvalReservedHeight + 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 + approvalReservedHeight + composerReservedHeight + paletteReservedHeight + footerReservedHeight, overflowY: "hidden", children: [_jsx(Transcript, { lines: lines, isRunning: isRunning, isActive: activeScrollPane === "transcript", height: panelHeight, width: transcriptWidth, scrollOffset: transcriptScrollOffset }), _jsx(ApprovalPanel, { request: pendingApproval, bypassConfirmation: bypassConfirmation }), _jsx(Composer, { input: input, isRunning: isRunning, status: status, draftTokens: draftTokens, isApprovalWaiting: Boolean(pendingApproval || bypassConfirmation), onChange: setInput, onSubmit: (value) => void handleSubmit(value) }), paletteItems.length > 0 ? _jsx(CommandSuggestions, { items: paletteItems, selectedIndex: paletteIndex }) : null, _jsx(FooterHints, { activePane: activeScrollPane })] })] }))] }));
+    if (themePickerOpen) {
+        return (_jsx(Box, { flexDirection: "column", paddingX: 1, height: rootHeight, overflowY: "hidden", children: _jsx(ThemePicker, { options: themeOptions, selectedIndex: themePickerIndex, currentValue: uiTheme, height: rootHeight - 2 }) }));
+    }
+    if (uiTheme === "new" && !experimentalOpen) {
+        if (onboarding) {
+            return (_jsxs(Box, { flexDirection: "column", paddingX: 1, height: rootHeight, overflowY: "hidden", children: [_jsxs(Box, { borderStyle: "round", borderColor: "cyan", paddingX: 1, children: [_jsx(Text, { color: "cyan", bold: true, children: "\u25C6 PatchPilot" }), _jsx(Text, { color: "gray", children: " \u00B7 guided setup \u00B7 the new shell starts once setup is done" })] }), _jsx(OnboardingPanel, { state: onboarding, height: rootHeight - 3, selectedIndex: onboardingIndex, input: onboardingInput, busyMessage: onboardingBusyMessage, notice: onboardingNotice, formatModelLabel: formatModelLabel, formatModelDescription: formatModelDescription, onInputChange: setOnboardingInput, onInputSubmit: (value) => void handleOnboardingSubmit(value) })] }));
+        }
+        return (_jsx(ExperimentalShell, { provider: settings.provider, model: settings.model, workspace: settings.workspace, sessionId: sessionStoreRef.current.sessionId, agentMode: agentMode, allowWrite: settings.allowWrite, allowShell: settings.allowShell, subagents: settings.subagents, workState: workState, status: status, isRunning: isRunning, ultramaxxRun: ultramaxxRun, telemetry: telemetry, sessionTelemetry: sessionTelemetry, draftTokens: draftTokens, lines: lines, todos: todos, todoFrame: todoFrame, pendingApproval: pendingApproval, bypassConfirmation: bypassConfirmation, updatePrompt: updatePrompt, updateBusy: updateBusy, reauthActive: Boolean(reauthPrompt) || reauthBusy, reauthBusy: reauthBusy, transcriptScrollOffset: transcriptScrollOffset, input: input, paletteItems: paletteItems, paletteIndex: paletteIndex, rows: terminalRows, columns: terminalColumns, activeHost: activeHost, artifacts: artifacts, onChange: setInput, onSubmit: (value) => void handleSubmit(value), onAttach: attachFile }));
+    }
+    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 }), experimentalOpen ? (_jsx(ExperimentalPanel, { flags: experimentalFlags, selectedIndex: experimentalIndex, height: bodyHeight })) : onboarding ? (_jsx(OnboardingPanel, { state: onboarding, height: bodyHeight, selectedIndex: onboardingIndex, input: onboardingInput, busyMessage: onboardingBusyMessage, notice: onboardingNotice, formatModelLabel: formatModelLabel, formatModelDescription: formatModelDescription, onInputChange: setOnboardingInput, onInputSubmit: (value) => void handleOnboardingSubmit(value) })) : (_jsxs(Box, { flexDirection: "row", height: bodyHeight, 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: bodyHeight, scrollOffset: sessionScrollOffset, advisors: advisorNotes, isActive: activeScrollPane === "session", activeHost: activeHost }), _jsxs(Box, { flexDirection: "column", flexGrow: 1, height: bodyHeight, overflowY: "hidden", children: [_jsx(Transcript, { lines: lines, isRunning: isRunning, isActive: activeScrollPane === "transcript", height: transcriptHeight, width: transcriptWidth, scrollOffset: transcriptScrollOffset, todos: todos, todoFrame: todoFrame, verbIndex: verbTick, status: status, workState: workState, isApprovalWaiting: blockingPromptActive }), _jsx(ReauthPromptPanel, { active: reauthPromptActive, busy: reauthBusy }), _jsx(UpdatePromptPanel, { prompt: updatePromptActive ? updatePrompt : null, busy: updatePromptActive && updateBusy }), _jsx(ApprovalPanel, { request: approvalPromptActive ? pendingApproval : null, bypassConfirmation: approvalPromptActive && bypassConfirmation }), _jsx(Composer, { input: input, isRunning: isRunning, status: status, workState: workState, draftTokens: draftTokens, width: transcriptWidth, isApprovalWaiting: blockingPromptActive, 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"}`;
+    const cacheKey = modelCacheKey(provider, ollamaUrl);
     const cachedModels = modelCache.get(cacheKey);
     if (!refresh && cachedModels && cachedModels.expiresAt > Date.now()) {
+        rememberModelDescriptors(cachedModels.descriptors);
         setModelOptions(cachedModels.models);
         return cachedModels.models;
     }
-    const models = await createModelClient({
+    const client = createModelClient({
         provider,
         ollamaUrl
-    }).listModels();
+    });
+    const descriptors = client.listModelDescriptors
+        ? await client.listModelDescriptors()
+        : (await client.listModels()).map((model) => ({ id: model, displayName: model }));
+    const models = descriptors.map((model) => model.id);
+    rememberModelDescriptors(descriptors);
     modelCache.set(cacheKey, {
         models,
+        descriptors,
         expiresAt: Date.now() + modelCacheTtlMs
     });
     setModelOptions(models);
     return models;
 }
-async function loadKnownOrAvailableModels(provider, ollamaUrl, modelOptions, setModelOptions, appendLine) {
+function modelCacheKey(provider, ollamaUrl) {
+    if (provider === "ollama") {
+        return `${provider}:${ollamaUrl}`;
+    }
+    if (provider === "gemini-wrapper") {
+        return [
+            provider,
+            readGeminiWrapperMode(),
+            readGeminiWrapperBaseUrl() || "python",
+            readGeminiWrapperPythonCommand(),
+            readGeminiWrapperCookiesJson()
+        ].join(":");
+    }
+    return `${provider}:default`;
+}
+function rememberModelDescriptors(descriptors) {
+    for (const descriptor of descriptors) {
+        modelDescriptorIndex.set(descriptor.id, descriptor);
+        if (descriptor.modelName) {
+            modelDescriptorIndex.set(descriptor.modelName, descriptor);
+        }
+        if (descriptor.displayName) {
+            modelDescriptorIndex.set(descriptor.displayName, descriptor);
+        }
+    }
+}
+async function loadKnownOrAvailableModels(provider, ollamaUrl, modelOptions, setModelOptions, appendLine, options = {}) {
     try {
-        return modelOptions.length > 0 ? modelOptions : await loadAvailableModels(provider, ollamaUrl, setModelOptions);
+        return !options.refresh && modelOptions.length > 0 ? modelOptions : await loadAvailableModels(provider, ollamaUrl, setModelOptions, options.refresh);
     }
     catch (error) {
         appendLine({
@@ -1577,7 +2937,7 @@ async function switchModel(provider, nextModel, ollamaUrl, currentModel, appendL
     if (!installedModels) {
         return;
     }
-    if (!installedModels.includes(nextModel) && !(provider !== "ollama" && isPlausibleCloudModelId(nextModel))) {
+    if (!installedModels.includes(nextModel) && !canUseUnverifiedCloudModel(provider, nextModel)) {
         appendLine({
             tone: "warning",
             label: "model",
@@ -1588,9 +2948,11 @@ async function switchModel(provider, nextModel, ollamaUrl, currentModel, appendL
                     ? "No models installed on the selected host."
                     : provider === "gemini"
                         ? "Check GEMINI_API_KEY in PatchPilot config."
-                        : provider === "openrouter"
-                            ? "Check OPENROUTER_API_KEY in PatchPilot config."
-                            : "Run codex login first."
+                        : provider === "gemini-wrapper"
+                            ? "Check PATCHPILOT_GEMINI_WRAPPER_BASE_URL in PatchPilot config."
+                            : provider === "openrouter"
+                                ? "Check OPENROUTER_API_KEY in PatchPilot config."
+                                : "Run codex login first."
         });
         return;
     }
@@ -1606,7 +2968,7 @@ async function switchModel(provider, nextModel, ollamaUrl, currentModel, appendL
     appendLine({
         tone: installedModels.includes(nextModel) ? "success" : "warning",
         label: "model",
-        text: installedModels.includes(nextModel) ? `switched to ${nextModel}` : `switched to unverified ${provider} model ${nextModel}`,
+        text: installedModels.includes(nextModel) ? `switched to ${formatModelLabel(nextModel)}` : `switched to unverified ${provider} model ${nextModel}`,
         detail: installedModels.includes(nextModel) ? undefined : "The provider did not list this model in discovery. PatchPilot will try it and surface the provider error if it is unavailable."
     });
     if (provider === "openrouter" && isOpenRouterFreeModel(nextModel)) {
@@ -1618,7 +2980,7 @@ async function switchModel(provider, nextModel, ollamaUrl, currentModel, appendL
         });
     }
 }
-async function resolveRunnableSettings(settings, modelOptions, appendLine, setModelOptions) {
+async function resolveRunnableSettings(settings, modelOptions, appendLine, setModelOptions, onProviderError) {
     let installedModels;
     try {
         installedModels = modelOptions.includes(settings.model)
@@ -1626,14 +2988,16 @@ async function resolveRunnableSettings(settings, modelOptions, appendLine, setMo
             : await loadAvailableModels(settings.provider, settings.ollamaUrl, setModelOptions);
     }
     catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
         appendLine({
             tone: "danger",
             label: settings.provider,
-            text: error instanceof Error ? error.message : String(error)
+            text: message
         });
+        onProviderError?.(message);
         return null;
     }
-    if (installedModels.includes(settings.model) || (settings.provider !== "ollama" && isPlausibleCloudModelId(settings.model))) {
+    if (installedModels.includes(settings.model) || canUseUnverifiedCloudModel(settings.provider, settings.model)) {
         if (!installedModels.includes(settings.model)) {
             appendLine({
                 tone: "warning",
@@ -1654,9 +3018,11 @@ async function resolveRunnableSettings(settings, modelOptions, appendLine, setMo
                 ? "No models installed on the selected host."
                 : settings.provider === "gemini"
                     ? "No Gemini models listed. Check GEMINI_API_KEY in PatchPilot config."
-                    : settings.provider === "openrouter"
-                        ? "No OpenRouter models listed. Check OPENROUTER_API_KEY in PatchPilot config."
-                        : "Codex OAuth is not ready. Run codex login."
+                    : settings.provider === "gemini-wrapper"
+                        ? "No Gemini-Wrapper models listed. Check gemini_webapi install and PATCHPILOT_GEMINI_WRAPPER_COOKIES_JSON in PatchPilot config."
+                        : settings.provider === "openrouter"
+                            ? "No OpenRouter models listed. Check OPENROUTER_API_KEY in PatchPilot config."
+                            : "Codex OAuth is not ready. Run codex login."
     });
     return null;
 }
@@ -1666,7 +3032,6 @@ function buildCommandSuggestionItems(options) {
     }
     const trimmedInput = options.input.trimStart().toLowerCase();
     const items = filterSlashCommands(options.input)
-        .slice(0, 6)
         .map((command) => {
         const baseCommand = `/${command.name}`;
         return {
@@ -1701,7 +3066,7 @@ function buildCommandSuggestionItems(options) {
             })));
         }
     }
-    if (trimmedInput === "/models" || trimmedInput.startsWith("/models") || trimmedInput === "/model" || trimmedInput.startsWith("/model")) {
+    if (trimmedInput.startsWith("/models ") || trimmedInput.startsWith("/model ")) {
         const modelQuery = trimmedInput.replace(/^\/models?/, "").trim();
         if (options.isLoadingModels) {
             items.unshift({
@@ -1714,28 +3079,39 @@ function buildCommandSuggestionItems(options) {
             });
         }
         else {
-            items.unshift(...selectableModels(modelQuery, options.modelOptions).slice(0, 8).map((model) => ({
+            items.unshift(...selectableModels(modelQuery, options.modelOptions, formatModelLabel).slice(0, 8).map((model) => ({
                 key: `model-${model}`,
                 category: "model",
-                label: model,
-                detail: `${model === options.currentModel ? "current" : "available"}  ${options.provider}`,
+                label: formatModelLabel(model),
+                detail: `${model === options.currentModel ? "current" : "available"}  ${options.provider}${formatModelDescription(model)}`,
                 command: `/model ${model}`,
                 execute: true
             })));
         }
     }
-    return items.slice(0, 8);
+    return items;
 }
 function getOnboardingOptionCount(onboarding) {
     switch (onboarding.step) {
+        case "welcome":
+            return 1;
+        case "disclaimer":
+            return 0;
         case "entry":
-            return 6;
+            return 7;
         case "host":
             return onboarding.hosts.length + 1;
         case "api-key-choice":
+            if (onboarding.provider === "gemini-wrapper") {
+                return onboarding.hasExistingKey ? 3 : 2;
+            }
             return onboarding.hasExistingKey ? 2 : 1;
+        case "gemini-wrapper-model-mode":
+            return geminiWrapperShortcutModels.length + 1;
         case "model":
             return onboarding.models.length;
+        case "preferences":
+            return preferenceRows.length + 1;
         default:
             return 0;
     }
@@ -1743,7 +3119,7 @@ function getOnboardingOptionCount(onboarding) {
 function readEntrySelection(value, selectedIndex) {
     const normalizedValue = value.trim().toLowerCase();
     if (!normalizedValue) {
-        return ["local", "host", "gemini", "openrouter", "nvidia", "codex"][selectedIndex];
+        return ["local", "host", "gemini", "gemini-wrapper", "openrouter", "nvidia", "codex"][selectedIndex];
     }
     if (normalizedValue === "1" || normalizedValue === "local" || normalizedValue === "this device") {
         return "local";
@@ -1754,17 +3130,64 @@ function readEntrySelection(value, selectedIndex) {
     if (normalizedValue === "3" || normalizedValue === "gemini" || normalizedValue === "google") {
         return "gemini";
     }
-    if (normalizedValue === "4" || normalizedValue === "openrouter" || normalizedValue === "open-router") {
+    if (normalizedValue === "4" || normalizedValue === "gemini-wrapper" || normalizedValue === "geminiwrapper" || normalizedValue === "google-wrapper") {
+        return "gemini-wrapper";
+    }
+    if (normalizedValue === "5" || normalizedValue === "openrouter" || normalizedValue === "open-router") {
         return "openrouter";
     }
-    if (normalizedValue === "5" || normalizedValue === "nvidia" || normalizedValue === "nim") {
+    if (normalizedValue === "6" || normalizedValue === "nvidia" || normalizedValue === "nim") {
         return "nvidia";
     }
-    if (normalizedValue === "6" || normalizedValue === "codex") {
+    if (normalizedValue === "7" || normalizedValue === "codex") {
         return "codex";
     }
     return null;
 }
+function readBooleanEnv(value, fallback) {
+    if (!value) {
+        return fallback;
+    }
+    const normalizedValue = value.trim().toLowerCase();
+    if (["1", "true", "yes", "on", "enabled"].includes(normalizedValue)) {
+        return true;
+    }
+    if (["0", "false", "no", "off", "disabled"].includes(normalizedValue)) {
+        return false;
+    }
+    return fallback;
+}
+function normalizeExperimentalFlag(value) {
+    switch (value.trim().toLowerCase()) {
+        case "file-analysis":
+        case "fileanalysis":
+        case "files":
+            return "fileAnalysis";
+        case "memory":
+            return "memory";
+        case "subagents":
+        case "agents":
+            return "subagents";
+        case "shell-metacharacters":
+        case "shell-metachars":
+        case "metacharacters":
+        case "metachars":
+        case "shell":
+            return "shellMetacharacters";
+        default:
+            return null;
+    }
+}
+function experimentalFlagCommandName(flag) {
+    return flag === "fileAnalysis"
+        ? "file-analysis"
+        : flag === "shellMetacharacters"
+            ? "shell-metacharacters"
+            : flag;
+}
+function experimentalFlagEnvName(flag) {
+    return `PATCHPILOT_EXPERIMENTAL_${experimentalFlagCommandName(flag).replace(/-/g, "_").toUpperCase()}`;
+}
 function readIndexedSelection(value, selectedIndex) {
     const normalizedValue = value.trim();
     if (!normalizedValue) {
@@ -1788,7 +3211,11 @@ function selectModelFromInput(value, models, selectedIndex, options = {}) {
     if (models.includes(normalizedValue)) {
         return normalizedValue;
     }
-    const matches = selectableModels(normalizedValue, models);
+    const labelMatch = models.find((model) => formatModelLabel(model).toLowerCase() === normalizedValue.toLowerCase());
+    if (labelMatch) {
+        return labelMatch;
+    }
+    const matches = selectableModels(normalizedValue, models, formatModelLabel);
     if (matches.length === 1) {
         return matches[0] ?? null;
     }
@@ -1797,6 +3224,9 @@ function selectModelFromInput(value, models, selectedIndex, options = {}) {
 function isPlausibleCloudModelId(value) {
     return /^[A-Za-z0-9][A-Za-z0-9._:/+-]*$/.test(value) && value.length >= 3;
 }
+function canUseUnverifiedCloudModel(provider, model) {
+    return provider !== "ollama" && isPlausibleCloudModelId(model);
+}
 function defaultModelForProvider(provider, currentModel) {
     if (provider === "nvidia") {
         return currentModel.includes("/") && !currentModel.startsWith("openrouter/") ? currentModel : defaultNvidiaModel;
@@ -1804,6 +3234,9 @@ function defaultModelForProvider(provider, currentModel) {
     if (provider === "openrouter") {
         return currentModel.includes("/") ? currentModel : defaultOpenRouterModel;
     }
+    if (provider === "gemini-wrapper") {
+        return geminiWrapperCuratedModels.includes(currentModel) || currentModel.startsWith("gemini-") || modelDescriptorIndex.has(currentModel) ? currentModel : defaultGeminiWrapperModel;
+    }
     if (provider === "gemini") {
         return currentModel.startsWith("gemini-") ? currentModel : defaultGeminiModel;
     }
@@ -1821,12 +3254,19 @@ function openApiKeyChoice(provider, setOnboarding, setOnboardingIndex) {
     setOnboardingIndex(0);
 }
 function needsApiKey(provider) {
-    return provider === "gemini" || provider === "openrouter" || provider === "nvidia";
+    return provider === "gemini" || provider === "gemini-wrapper" || provider === "openrouter" || provider === "nvidia";
 }
 function hasApiKey(provider) {
     if (provider === "gemini") {
         return Boolean(readGeminiApiKey());
     }
+    if (provider === "gemini-wrapper") {
+        const baseUrl = readGeminiWrapperBaseUrl();
+        if (readGeminiWrapperMode() === "http") {
+            return !geminiWrapperRequiresApiKey(baseUrl) || Boolean(readGeminiWrapperApiKey());
+        }
+        return Boolean(readGeminiWrapperCookiesJson());
+    }
     if (provider === "openrouter") {
         return Boolean(readOpenRouterApiKey());
     }
@@ -1874,6 +3314,219 @@ function upsertAdvisorNote(notes, nextNote) {
     const nextNotes = notes.filter((note) => note.role !== nextNote.role);
     return [...nextNotes, nextNote].slice(-2);
 }
+function UpdatePromptPanel(props) {
+    if (!props.prompt && !props.busy) {
+        return null;
+    }
+    const command = props.prompt?.command ?? "npm update -g @jx-grxf/patchpilot";
+    return (_jsxs(Box, { borderStyle: "double", borderColor: "yellow", flexDirection: "column", paddingX: 1, children: [_jsx(Text, { color: "yellow", bold: true, children: "UPDATE AVAILABLE" }), props.busy ? (_jsxs(_Fragment, { children: [_jsx(Text, { color: "cyan", children: "Updating PatchPilot..." }), _jsx(Text, { color: "gray", children: command })] })) : (_jsxs(_Fragment, { children: [_jsxs(Text, { color: "white", children: ["Install PatchPilot ", props.prompt?.latestVersion, " now?"] }), _jsxs(Text, { color: "gray", children: ["Current ", props.prompt?.currentVersion, " \u00B7 source ", props.prompt?.source, " \u00B7 ", command] }), _jsxs(Text, { children: [_jsx(Text, { color: "green", bold: true, children: "[y]" }), _jsx(Text, { color: "gray", children: " update   " }), _jsx(Text, { color: "red", bold: true, children: "[n / esc]" }), _jsx(Text, { color: "gray", children: " skip" })] })] }))] }));
+}
+function ReauthPromptPanel(props) {
+    if (!props.active) {
+        return null;
+    }
+    return (_jsxs(Box, { borderStyle: "double", borderColor: "yellow", flexDirection: "column", paddingX: 1, children: [_jsx(Text, { color: "yellow", bold: true, children: "GEMINI COOKIES EXPIRED" }), props.busy ? (_jsxs(_Fragment, { children: [_jsx(Text, { color: "cyan", children: "Refreshing Gemini browser cookies..." }), _jsx(Text, { color: "gray", children: "PatchPilot will retry the prompt automatically on success." })] })) : (_jsxs(_Fragment, { children: [_jsx(Text, { color: "white", children: "Refresh Gemini browser cookies and retry the last prompt?" }), _jsx(Text, { color: "gray", children: "Secret cookie values are imported from your signed-in browser and are not printed." }), _jsxs(Text, { children: [_jsx(Text, { color: "green", bold: true, children: "[y]" }), _jsx(Text, { color: "gray", children: " refresh & retry   " }), _jsx(Text, { color: "red", bold: true, children: "[n / esc]" }), _jsx(Text, { color: "gray", children: " dismiss" })] })] }))] }));
+}
+function emptyToolTelemetry() {
+    return {
+        total: 0,
+        succeeded: 0,
+        failed: 0,
+        approvals: 0,
+        denied: 0,
+        byTool: {}
+    };
+}
+function addToolTelemetry(current, tool, ok) {
+    return {
+        ...current,
+        total: current.total + 1,
+        succeeded: current.succeeded + (ok ? 1 : 0),
+        failed: current.failed + (ok ? 0 : 1),
+        byTool: {
+            ...current.byTool,
+            [tool]: (current.byTool[tool] ?? 0) + 1
+        }
+    };
+}
+function addApprovalTelemetry(current, decision) {
+    return {
+        ...current,
+        approvals: current.approvals + (decision === "deny" ? 0 : 1),
+        denied: current.denied + (decision === "deny" ? 1 : 0)
+    };
+}
+/**
+ * Dense operational status dock for `/status` — restores the always-available
+ * "what mode am I in and what can happen" view the legacy sidebar provided,
+ * without spending fixed screen rows in the new shell's header.
+ */
+function formatStatusDock(options) {
+    const isOllama = options.provider === "ollama";
+    const hostLine = isOllama
+        ? `${options.activeHost?.host.deviceName ?? "ollama"}  ${options.activeHost?.host.url ?? options.ollamaUrl}`
+        : `${options.provider} api`;
+    const computeKind = isOllama ? describeComputeTarget(options.ollamaUrl).kind : "cloud";
+    const reasoning = isOllama
+        ? `think ${options.thinkingMode}`
+        : `think ${options.thinkingMode} · reasoning ${formatReasoningSupport(options.provider, options.model, options.reasoningEffort === "adaptive" ? undefined : options.reasoningEffort)}`;
+    const toolCounters = Object.entries(options.toolTelemetry.byTool)
+        .sort((left, right) => right[1] - left[1] || left[0].localeCompare(right[0]))
+        .slice(0, 6)
+        .map(([tool, count]) => `${tool} ${count}`)
+        .join(" · ");
+    const advisors = options.advisorNotes.length > 0
+        ? options.advisorNotes.map((note) => `  ${note.role}: ${note.message.replace(/\s+/g, " ").slice(0, 88)}`).join("\n")
+        : "  none yet";
+    return [
+        `provider   ${options.provider}/${options.model}`,
+        `host       ${hostLine}  ·  compute ${computeKind}  ·  tools local`,
+        `mode       ${options.agentMode}  ·  write ${modePermissionLabel(options.agentMode, "write")}  ·  shell ${modePermissionLabel(options.agentMode, "shell")}`,
+        `model cfg  ${reasoning}  ·  subagents ${options.subagents ? "on" : "off"}`,
+        `workspace  ${options.workspace}`,
+        `session    ${options.sessionId}`,
+        `tokens     draft ${options.draftTokens} · last ${formatTokens(options.telemetry)} · session ${formatSessionTokens(options.sessionTelemetry)} · cost ${formatCost(options.sessionTelemetry.estimatedCostUsd)}`,
+        options.toolTelemetry.total > 0
+            ? `tools      ${options.toolTelemetry.total} calls · ${options.toolTelemetry.succeeded} ok · ${options.toolTelemetry.failed} failed · ${options.toolTelemetry.approvals} approved · ${options.toolTelemetry.denied} denied`
+            : "tools      none yet",
+        toolCounters ? `counters   ${toolCounters}` : "",
+        `advisors\n${advisors}`,
+    ]
+        .filter(Boolean)
+        .join("\n");
+}
+function formatUsageSummary(options) {
+    const session = options.sessionTelemetry;
+    const cost = formatCost(session.estimatedCostUsd);
+    const saved = estimateSessionSavings(options.provider, options.model, session);
+    const pricingNote = pricingSourceLabel(session.costSource, saved.source);
+    return [
+        `${session.requests} request${session.requests === 1 ? "" : "s"}`,
+        `${session.promptTokens} in`,
+        `${session.responseTokens} out`,
+        `${session.cachedPromptTokens} cached`,
+        `${options.toolTelemetry.total} tool call${options.toolTelemetry.total === 1 ? "" : "s"}`,
+        `cost ${cost}`,
+        saved.costUsd !== null ? `saved ${formatCost(saved.costUsd)}` : "saved -",
+        pricingNote
+    ].join(" · ");
+}
+function formatUsageDetail(options) {
+    const session = options.sessionTelemetry;
+    const saved = estimateSessionSavings(options.provider, options.model, session);
+    const toolRows = Object.entries(options.toolTelemetry.byTool)
+        .sort((left, right) => right[1] - left[1] || left[0].localeCompare(right[0]))
+        .map(([tool, count]) => `${tool}: ${count}`)
+        .join("\n");
+    return [
+        `model: ${options.provider}/${options.model}`,
+        `tokens: ${session.promptTokens} input, ${session.responseTokens} output, ${session.cachedPromptTokens} cached, ${session.cacheWriteTokens} cache-write, ${session.totalTokens} total`,
+        `cost: ${formatCost(session.estimatedCostUsd)} (${session.costSource})`,
+        saved.costUsd !== null ? `lifetime saved this session: ${formatCost(saved.costUsd)} (${saved.source})` : "lifetime saved this session: -",
+        options.toolTelemetry.total > 0
+            ? `tools: ${options.toolTelemetry.total} total, ${options.toolTelemetry.succeeded} ok, ${options.toolTelemetry.failed} failed, ${options.toolTelemetry.approvals} approved, ${options.toolTelemetry.denied} denied`
+            : "tools: none yet",
+        toolRows ? `tool counters:\n${toolRows}` : "",
+        session.costSource === "fallback-pricing" || saved.source === "fallback-pricing"
+            ? "pricing note: exact model pricing was not available, so PatchPilot used a conservative general cloud-model estimate."
+            : session.costSource === "unknown"
+                ? "pricing note: exact pricing is unavailable for this provider/model."
+                : ""
+    ]
+        .filter(Boolean)
+        .join("\n");
+}
+function estimateSessionSavings(provider, model, session) {
+    return estimateComparableApiCost(provider, model, session.promptTokens, session.responseTokens, session.cachedPromptTokens);
+}
+function pricingSourceLabel(costSource, savedSource) {
+    if (costSource === "fallback-pricing" || savedSource === "fallback-pricing") {
+        return "fallback pricing";
+    }
+    if (costSource === "unknown" && savedSource === "unknown") {
+        return "pricing unknown";
+    }
+    if (costSource === "free-route") {
+        return "free route";
+    }
+    if (costSource === "mixed") {
+        return "mixed pricing";
+    }
+    return "priced";
+}
+const bytesPerMiB = 1024 * 1024;
+const geminiAppsPromptFileLimit = 10;
+const geminiNonVideoFileLimitBytes = 100 * bytesPerMiB;
+const geminiApiPdfLimitBytes = 50 * bytesPerMiB;
+const geminiPdfCautionBytes = 20 * bytesPerMiB;
+const geminiInlineRequestWarnBytes = 25 * bytesPerMiB;
+function attachmentLimitWarning(paths, provider) {
+    if (paths.length === 0 || (provider !== "gemini" && provider !== "gemini-wrapper")) {
+        return null;
+    }
+    const files = paths.map((filePath) => ({
+        path: filePath,
+        type: attachmentTypeForPath(filePath),
+        size: readFileSize(filePath)
+    }));
+    const knownTotalBytes = files.reduce((total, file) => total + (file.size ?? 0), 0);
+    const tooLargePdf = files.find((file) => file.type === "PDF" && typeof file.size === "number" && file.size > geminiApiPdfLimitBytes);
+    const largePdf = files.find((file) => file.type === "PDF" && typeof file.size === "number" && file.size > geminiPdfCautionBytes);
+    const tooLargeFile = files.find((file) => typeof file.size === "number" && file.size > geminiNonVideoFileLimitBytes);
+    if (paths.length > geminiAppsPromptFileLimit) {
+        return `Attached ${paths.length} files; Gemini web-style uploads are capped around ${geminiAppsPromptFileLimit} files per prompt. Split this into smaller batches.`;
+    }
+    if (tooLargePdf) {
+        return `${attachmentTypeForPath(tooLargePdf.path)} file ${attachmentBasename(tooLargePdf.path)} is over 50 MiB; Gemini API PDF input can reject it.`;
+    }
+    if (tooLargeFile) {
+        return `${attachmentTypeForPath(tooLargeFile.path)} file ${attachmentBasename(tooLargeFile.path)} is over 100 MiB; Gemini file prompts may reject it.`;
+    }
+    if (largePdf) {
+        return `${attachmentTypeForPath(largePdf.path)} file ${attachmentBasename(largePdf.path)} is over 20 MiB; Gemini PDF analysis can be slow or incomplete.`;
+    }
+    if (knownTotalBytes > geminiInlineRequestWarnBytes) {
+        return `Attached files total about ${formatMiB(knownTotalBytes)}; Gemini analysis is more reliable in smaller batches.`;
+    }
+    if (paths.length > 3) {
+        return `Attached ${paths.length} files; PatchPilot will reference them, but Gemini/Gemini-Wrapper is more reliable if you split large batches.`;
+    }
+    return null;
+}
+function readFileSize(filePath) {
+    try {
+        const stats = statSync(filePath);
+        return stats.isFile() ? stats.size : null;
+    }
+    catch {
+        return null;
+    }
+}
+function formatMiB(bytes) {
+    return `${Math.round((bytes / bytesPerMiB) * 10) / 10} MiB`;
+}
+function formatAttachedDocuments(paths) {
+    const counts = new Map();
+    return paths
+        .map((filePath) => {
+        const kind = attachmentKindForPath(filePath) ?? "file";
+        const type = attachmentTypeForPath(filePath);
+        const index = (counts.get(type) ?? 0) + 1;
+        counts.set(type, index);
+        return `- ${attachmentLabel(kind, index, filePath)} path=${JSON.stringify(filePath)}`;
+    })
+        .join("\n");
+}
+/** Last path segment, splitting on both POSIX and Windows separators. */
+function attachmentBasename(filePath) {
+    return filePath.split(/[\\/]/).filter(Boolean).at(-1) ?? filePath;
+}
+function formatAttachmentDigestPath(filePath) {
+    return JSON.stringify(filePath.split(/[\\/]/).filter(Boolean).at(-1) ?? filePath);
+}
+function randomLegacyVerbIndex() {
+    return Math.floor(Math.random() * 1_000_000);
+}
 function eventToLine(event) {
     switch (event.type) {
         case "status":
@@ -1907,12 +3560,21 @@ function eventToLine(event) {
                 tone: event.ok ? "success" : "warning",
                 label: event.name,
                 text: event.summary,
+                detail: event.ok ? previewToolContent(event.content) : event.content,
                 workState: event.workState,
                 tool: event.name,
                 toolCallId: event.toolCallId,
                 category: event.category,
                 preview: event.preview
             };
+        case "todo":
+            return {
+                kind: "status",
+                tone: "muted",
+                label: "todo",
+                text: event.summary,
+                workState: event.workState
+            };
         case "approval":
             return {
                 kind: "approval",
@@ -1950,6 +3612,16 @@ function eventToLine(event) {
             };
     }
 }
+function previewToolContent(content) {
+    const value = content?.trim();
+    if (!value) {
+        return undefined;
+    }
+    const lines = value.split(/\r?\n/);
+    const preview = lines.slice(0, 6).join("\n");
+    const suffix = lines.length > 6 ? `\n...[${lines.length - 6} more lines]` : "";
+    return `${preview}${suffix}`;
+}
 function eventToStatus(event) {
     if (event.type === "status") {
         return event.message;
@@ -1957,6 +3629,9 @@ function eventToStatus(event) {
     if (event.type === "tool") {
         return `${event.name}: ${event.summary}`;
     }
+    if (event.type === "todo") {
+        return event.summary;
+    }
     if (event.type === "subagent") {
         return `${event.role} subagent`;
     }
@@ -1965,6 +3640,19 @@ function eventToStatus(event) {
     }
     return event.type;
 }
+function workStateForApprovalTool(tool) {
+    const category = getToolSpec(tool).category;
+    if (category === "write") {
+        return "editing";
+    }
+    if (category === "shell" || category === "test") {
+        return "verifying";
+    }
+    if (category === "read" || category === "search" || category === "document" || category === "git") {
+        return "reading";
+    }
+    return "inspecting";
+}
 function defaultLogKind(line) {
     if (line.kind) {
         return line.kind;
@@ -1992,8 +3680,21 @@ function formatModelOptions(models, currentModel) {
     return models
         .map((model, index) => {
         const currentMarker = model === currentModel ? "  current" : "";
-        return `${index + 1}. ${model}${currentMarker}`;
+        return `${index + 1}. ${formatModelLabel(model)}${formatModelDescription(model)}${currentMarker}`;
     })
         .join("\n");
 }
+function formatModelLabel(model) {
+    const descriptor = modelDescriptorIndex.get(model);
+    const label = descriptor?.displayName || descriptor?.modelName || model;
+    return label === model ? model : `${label} (${model})`;
+}
+function formatModelDescription(model) {
+    const descriptor = modelDescriptorIndex.get(model);
+    if (!descriptor?.description) {
+        return "";
+    }
+    const legacySuffix = descriptor.legacy ? " legacy" : "";
+    return `  ${descriptor.description}${legacySuffix}`;
+}
 //# sourceMappingURL=App.js.map