@jx-grxf/patchpilot 0.4.0 → 1.0.0

package/dist/tui/App.js

@@ -2,22 +2,26 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { Box, 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 { runDoctor } from "../core/doctor.js";
 import { savePatchPilotEnvValues } from "../core/env.js";
 import { defaultGeminiModel, readGeminiApiKey } from "../core/gemini.js";
+import { defaultGeminiWrapperModel, geminiWrapperRequiresApiKey, readGeminiWrapperApiKey, readGeminiWrapperBaseUrl, readGeminiWrapperCookiesJson, readGeminiWrapperMode, readGeminiWrapperPythonCommand, 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 { buildSessionResumeContext, listWorkspaceSessions, loadSessionSummary, SessionStore } from "../core/session.js";
 import { addTelemetryToSession, emptySessionTelemetry, estimateTokens } from "../core/tokenAccounting.js";
 import { WorkspaceTools } from "../core/workspace.js";
 import { ApprovalPanel } from "./components/ApprovalPanel.js";
 import { CommandSuggestions } from "./components/CommandSuggestions.js";
 import { Composer, FooterHints } from "./components/Composer.js";
+import { ExperimentalPanel, experimentalFlagAt, experimentalFlagCount } from "./components/ExperimentalPanel.js";
 import { Header } from "./components/Header.js";
 import { OnboardingPanel } from "./components/OnboardingPanel.js";
 import { Sidebar } from "./components/Sidebar.js";
@@ -40,6 +44,11 @@ export function App(props) {
     const abortControllerRef = useRef(null);
     const sessionStoreRef = useRef(new SessionStore({ workspace: props.workspace }));
     const approvalResolverRef = useRef(null);
+    const runtimeStateRef = useRef({
+        isRunning: false,
+        hasPendingApproval: false,
+        lastSigintAt: 0
+    });
     const grantedPermissionsRef = useRef({
         allowWrite: props.allowWrite,
         allowShell: props.allowShell
@@ -55,6 +64,7 @@ export function App(props) {
     const [pendingApproval, setPendingApproval] = useState(null);
     const [telemetry, setTelemetry] = useState(null);
     const [sessionTelemetry, setSessionTelemetry] = useState(() => emptySessionTelemetry());
+    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 +75,13 @@ 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
+    });
     const [onboardingIndex, setOnboardingIndex] = useState(0);
     const [onboardingInput, setOnboardingInput] = useState("");
     const [onboardingBusyMessage, setOnboardingBusyMessage] = useState(null);
@@ -88,7 +105,7 @@ export function App(props) {
     const draftTokens = estimateTokens(input);
     const terminalRows = stdout.rows ?? 40;
     const terminalColumns = stdout.columns ?? 120;
-    const paletteItems = !isRunning && !onboarding
+    const paletteItems = !isRunning && !onboarding && !experimentalOpen
         ? buildCommandSuggestionItems({
             input,
             provider: settings.provider,
@@ -102,9 +119,9 @@ 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 composerReservedHeight = onboarding || experimentalOpen ? 0 : 2;
+    const footerReservedHeight = onboarding || experimentalOpen ? 0 : 1;
+    const approvalReservedHeight = !onboarding && !experimentalOpen && (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));
@@ -124,6 +141,7 @@ export function App(props) {
         }
         approvalResolverRef.current(decision);
         approvalResolverRef.current = null;
+        setInput("");
         appendLine({
             kind: "approval",
             tone: decision === "deny" ? "warning" : "success",
@@ -139,6 +157,7 @@ export function App(props) {
         const permissions = permissionsForMode(nextMode);
         setAgentMode(nextMode);
         setBypassConfirmation(false);
+        grantedPermissionsRef.current = permissions;
         setSettings((currentSettings) => ({
             ...currentSettings,
             allowWrite: permissions.allowWrite,
@@ -166,9 +185,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");
@@ -291,13 +325,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 +342,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;
@@ -355,6 +394,11 @@ export function App(props) {
             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":
@@ -380,6 +424,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;
@@ -452,7 +502,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;
             }
@@ -538,12 +588,20 @@ export function App(props) {
                 return;
             }
             if (choice === 0 && onboarding.hasExistingKey) {
+                if (onboarding.provider === "gemini-wrapper") {
+                    setOnboarding({
+                        step: "gemini-wrapper-model-mode"
+                    });
+                    setOnboardingInput("");
+                    setOnboardingIndex(0);
+                    return;
+                }
                 await openModelSelection(onboarding.provider, {
                     currentModel: defaultModelForProvider(onboarding.provider, settings.model)
                 });
                 return;
             }
-            setOnboarding({
+            setOnboarding(onboarding.provider === "gemini-wrapper" ? { step: "gemini-wrapper-psid" } : {
                 step: `${onboarding.provider}-key`
             });
             setOnboardingInput("");
@@ -574,6 +632,151 @@ 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;
+            }
+            if (choice === 0) {
+                setTelemetry(null);
+                setModelOptions([defaultGeminiWrapperModel]);
+                setSettings((currentSettings) => ({
+                    ...currentSettings,
+                    provider: "gemini-wrapper",
+                    model: defaultGeminiWrapperModel
+                }));
+                savePatchPilotEnvValues({
+                    PATCHPILOT_PROVIDER: "gemini-wrapper",
+                    PATCHPILOT_MODEL: defaultGeminiWrapperModel,
+                    PATCHPILOT_ONBOARDING_COMPLETE: "1"
+                });
+                appendLine({
+                    tone: "success",
+                    label: "onboarding",
+                    text: `ready: gemini-wrapper using ${defaultGeminiWrapperModel}`
+                });
+                closeOnboarding();
+                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;
+            savePatchPilotEnvValues({
+                PATCHPILOT_PROVIDER: "gemini-wrapper",
+                PATCHPILOT_MODEL: defaultGeminiWrapperModel,
+                PATCHPILOT_GEMINI_WRAPPER_BASE_URL: baseUrl
+            });
+            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,
+                ...(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) {
@@ -638,7 +841,7 @@ export function App(props) {
         }
         const visibleModels = selectableModels(onboardingInput, onboarding.models);
         const selectedModel = visibleModels[onboardingIndex] ?? selectModelFromInput(value, visibleModels, onboardingIndex, {
-            allowManual: onboarding.provider !== "ollama"
+            allowManual: onboarding.provider !== "ollama" && onboarding.provider !== "gemini-wrapper"
         });
         if (!selectedModel) {
             setOnboardingNotice({
@@ -674,7 +877,7 @@ export function App(props) {
         }
         closeOnboarding();
     }, [activeHost?.host.url, appendLine, closeOnboarding, connectToHost, loadHostSuggestions, onboarding, onboardingBusyMessage, onboardingIndex, openModelSelection, settings.ollamaUrl]);
-    const runTask = useCallback(async (task) => {
+    const runTask = useCallback(async (task, overrides = {}) => {
         if (!task.trim() || isRunning) {
             return;
         }
@@ -694,13 +897,17 @@ export function App(props) {
             }
             const abortController = new AbortController();
             abortControllerRef.current = abortController;
+            const effectiveMode = overrides.mode ?? agentMode;
             const taskRunner = new AgentRunner({
                 ...runnableSettings,
-                mode: agentMode,
+                allowExternalFileAnalysis: experimentalFlags.fileAnalysis,
+                memoryEnabled: experimentalFlags.memory,
+                mode: effectiveMode,
                 signal: abortController.signal,
                 sessionStore: sessionStoreRef.current,
+                resumeContext,
                 approvalHandler: (request) => new Promise((resolve) => {
-                    if (agentMode === "plan") {
+                    if (effectiveMode === "plan") {
                         appendLine({
                             kind: "approval",
                             tone: "warning",
@@ -714,7 +921,7 @@ export function App(props) {
                         resolve("deny");
                         return;
                     }
-                    if (agentMode === "bypass") {
+                    if (effectiveMode === "bypass" && ((request.permission === "write" && runnableSettings.allowWrite) || (request.permission === "shell" && runnableSettings.allowShell))) {
                         resolve("allow_session");
                         return;
                     }
@@ -772,7 +979,7 @@ export function App(props) {
             setWorkState("idle");
             setIsRunning(false);
         }
-    }, [agentMode, appendLine, isRunning, modelOptions, settings]);
+    }, [agentMode, appendLine, experimentalFlags, isRunning, modelOptions, resumeContext, settings]);
     const handleSlashCommand = useCallback(async (rawCommand) => {
         const [commandName = "", ...args] = rawCommand.slice(1).trim().split(/\s+/);
         const command = commandName.toLowerCase();
@@ -821,11 +1028,11 @@ export function App(props) {
                 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,7 +1055,7 @@ 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;
@@ -868,6 +1075,10 @@ export function App(props) {
                     ...currentSettings,
                     subagents: subagentsEnabled
                 }));
+                setExperimentalFlags((currentFlags) => ({
+                    ...currentFlags,
+                    subagents: subagentsEnabled
+                }));
                 appendLine({
                     tone: "success",
                     label: "agents",
@@ -924,38 +1135,30 @@ export function App(props) {
             case "write":
             case "apply": {
                 const writeEnabled = readToggle(args[0], !settings.allowWrite);
-                if (writeEnabled) {
-                    requestBypassMode();
-                    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;
             }
             case "shell": {
                 const shellEnabled = readToggle(args[0], !settings.allowShell);
-                if (shellEnabled) {
-                    requestBypassMode();
-                    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,12 +1171,14 @@ 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;
                     }
                     const nextModel = selectModelFromInput(requestedModel, models, undefined, {
-                        allowManual: settings.provider !== "ollama"
+                        allowManual: settings.provider !== "ollama" && settings.provider !== "gemini-wrapper"
                     });
                     if (!nextModel) {
                         appendLine({
@@ -991,12 +1196,14 @@ 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;
                     }
                     const nextModel = selectModelFromInput(requestedModel, installedModels, undefined, {
-                        allowManual: settings.provider !== "ollama"
+                        allowManual: settings.provider !== "ollama" && settings.provider !== "gemini-wrapper"
                     });
                     if (!nextModel) {
                         appendLine({
@@ -1074,11 +1281,26 @@ 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
+                    });
+                    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."
@@ -1196,29 +1418,151 @@ export function App(props) {
                 return;
             }
             case "doctor": {
+                const shouldFix = args.some((arg) => arg.toLowerCase() === "fix" || arg.toLowerCase() === "--fix");
                 appendLine({
                     tone: "muted",
                     label: "doctor",
-                    text: "checking local requirements..."
+                    text: shouldFix ? "checking local requirements and applying safe fixes..." : "checking local requirements..."
+                });
+                const doctorResults = await runDoctor(settings.provider, settings.ollamaUrl, settings.model, {
+                    fix: shouldFix
                 });
-                const doctorResults = await runDoctor(settings.provider, settings.ollamaUrl, settings.model);
                 for (const result of doctorResults) {
                     appendLine({
                         tone: result.ok ? "success" : "danger",
                         label: result.name,
-                        text: result.details
+                        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());
+                }
+                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 enabled = readToggle(requestedValue, true);
+                if (requestedFlag === "subagents" || requestedFlag === "agents") {
+                    setSettings((currentSettings) => ({
+                        ...currentSettings,
+                        subagents: enabled
+                    }));
+                }
+                savePatchPilotEnvValues({
+                    [`PATCHPILOT_EXPERIMENTAL_${requestedFlag.replace(/-/g, "_").toUpperCase()}`]: enabled ? "1" : "0"
+                });
+                setExperimentalFlags((currentFlags) => ({
+                    ...currentFlags,
+                    ...(requestedFlag === "file-analysis"
+                        ? { fileAnalysis: enabled }
+                        : requestedFlag === "memory"
+                            ? { memory: enabled }
+                            : requestedFlag === "subagents" || requestedFlag === "agents"
+                                ? { subagents: enabled }
+                                : {})
+                }));
+                appendLine({
+                    tone: "success",
+                    label: "experimental",
+                    text: `${requestedFlag} ${enabled ? "enabled" : "disabled"}`
+                });
+                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([]);
                 setTelemetry(null);
+                setResumeContext("");
                 setSessionTelemetry(emptySessionTelemetry());
                 setTranscriptScrollOffset(0);
                 setSessionScrollOffset(0);
                 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
+                });
+                await sessionStoreRef.current.create();
+                setLines([]);
+                setAdvisorNotes([]);
+                setTelemetry(null);
+                setSessionTelemetry(emptySessionTelemetry());
+                setPendingApproval(null);
+                approvalResolverRef.current = null;
+                setBypassConfirmation(false);
+                setInput("");
+                setTranscriptScrollOffset(0);
+                setSessionScrollOffset(0);
+                setStatus("idle");
+                setWorkState("idle");
+                appendLine({
+                    tone: "success",
+                    label: "new",
+                    text: `started session ${sessionStoreRef.current.sessionId}`
+                });
+                return;
             case "exit":
             case "quit":
             case "q":
@@ -1245,6 +1589,7 @@ export function App(props) {
         loadHostSuggestions,
         loadProviderModels,
         modelOptions,
+        isRunning,
         resolveApproval,
         sessionTelemetry,
         settings,
@@ -1286,6 +1631,10 @@ export function App(props) {
     useEffect(() => {
         void sessionStoreRef.current.create();
     }, []);
+    useEffect(() => {
+        runtimeStateRef.current.isRunning = isRunning;
+        runtimeStateRef.current.hasPendingApproval = Boolean(pendingApproval || bypassConfirmation);
+    }, [bypassConfirmation, isRunning, pendingApproval]);
     useEffect(() => {
         if (!props.initialTask || didRunInitialTask.current || onboarding || process.env.PATCHPILOT_ONBOARDING_COMPLETE !== "1") {
             return;
@@ -1374,6 +1723,44 @@ export function App(props) {
         }
     }, [hostOptions.length, input, isLoadingHosts, isLoadingModels, isRunning, loadHostSuggestions, loadProviderModels, modelOptions.length, onboarding, settings.provider]);
     useInput((inputValue, key) => {
+        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"
+                    });
+                    return nextFlags;
+                });
+                return;
+            }
+            if (key.return || key.escape || key.leftArrow) {
+                setExperimentalOpen(false);
+                setInput("");
+                return;
+            }
+            return;
+        }
         if (bypassConfirmation) {
             const normalizedInput = inputValue.toLowerCase();
             if (key.tab) {
@@ -1432,7 +1819,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 +1844,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;
@@ -1490,19 +1887,44 @@ export function App(props) {
         }
     });
     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,10 +1953,10 @@ 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 })] })] }))] }));
+    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: panelHeight })) : 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 })] })] }))] }));
 }
 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()) {
         setModelOptions(cachedModels.models);
@@ -1551,9 +1973,24 @@ async function loadAvailableModels(provider, ollamaUrl, setModelOptions, refresh
     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`;
+}
+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 +2014,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 +2025,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;
     }
@@ -1633,7 +2072,7 @@ async function resolveRunnableSettings(settings, modelOptions, appendLine, setMo
         });
         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 +2093,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 +2107,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 +2141,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({
@@ -1724,16 +2164,18 @@ function buildCommandSuggestionItems(options) {
             })));
         }
     }
-    return items.slice(0, 8);
+    return items;
 }
 function getOnboardingOptionCount(onboarding) {
     switch (onboarding.step) {
         case "entry":
-            return 6;
+            return 7;
         case "host":
             return onboarding.hosts.length + 1;
         case "api-key-choice":
             return onboarding.hasExistingKey ? 2 : 1;
+        case "gemini-wrapper-model-mode":
+            return 2;
         case "model":
             return onboarding.models.length;
         default:
@@ -1743,7 +2185,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 +2196,33 @@ 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 readIndexedSelection(value, selectedIndex) {
     const normalizedValue = value.trim();
     if (!normalizedValue) {
@@ -1797,6 +2255,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" && provider !== "gemini-wrapper" && isPlausibleCloudModelId(model);
+}
 function defaultModelForProvider(provider, currentModel) {
     if (provider === "nvidia") {
         return currentModel.includes("/") && !currentModel.startsWith("openrouter/") ? currentModel : defaultNvidiaModel;
@@ -1804,6 +2265,9 @@ function defaultModelForProvider(provider, currentModel) {
     if (provider === "openrouter") {
         return currentModel.includes("/") ? currentModel : defaultOpenRouterModel;
     }
+    if (provider === "gemini-wrapper") {
+        return currentModel === defaultGeminiWrapperModel || currentModel.startsWith("gemini-3-") ? currentModel : defaultGeminiWrapperModel;
+    }
     if (provider === "gemini") {
         return currentModel.startsWith("gemini-") ? currentModel : defaultGeminiModel;
     }
@@ -1821,12 +2285,15 @@ 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") {
+        return Boolean(readGeminiWrapperBaseUrl() || readGeminiWrapperCookiesJson());
+    }
     if (provider === "openrouter") {
         return Boolean(readOpenRouterApiKey());
     }