prompts-gpt 0.3.3 → 0.3.4

package/dist/cli.js

@@ -3,7 +3,8 @@ import { existsSync, readFileSync, statSync, readdirSync } from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { parseArgs } from "node:util";
-import { hasTokenUsage, DEFAULT_PROMPTS_GPT_API_URL, DEFAULT_PROMPTS_GPT_OUT_DIR, DEFAULT_RUN_CONFIG_PATH, PROMPTS_GPT_CREDENTIALS_FILE, PromptsGptApiError, PromptsGptClient, doctor, initRunConfig, loadRunConfig, normalizeConcreteProvider, normalizeOrchestrationAgent, ORCHESTRATION_AGENT_PROFILES, runBatch, runPrompt, resolveRunProvider, warnModelProviderMismatch, sweepPrompt, validateRunConfig, discoverWorkspaceAssets, SUPPORTED_AGENT_TARGETS, detectProviders, loadLocalCredentials, saveLocalCredentials, syncPrompts, writeAgentFiles, writePromptManifest, writePromptMarkdownFiles, ensureGitignoreEntry, isCI, orchestrateParallel, orchestratePipeline, orchestrateEval, captureGitBranch, resolveModelWithWarning, getModelCostTier, estimateTokenCost, DEFAULT_MODELS, } from "./index.js";
+import { hasTokenUsage, DEFAULT_PROMPTS_GPT_API_URL, DEFAULT_PROMPTS_GPT_OUT_DIR, DEFAULT_RUN_CONFIG_PATH, PROMPTS_GPT_CREDENTIALS_FILE, PromptsGptApiError, PromptsGptClient, doctor, initRunConfig, loadRunConfig, normalizeConcreteProvider, normalizeOrchestrationAgent, ORCHESTRATION_AGENT_PROFILES, runBatch, runPrompt, resolveRunProvider, warnModelProviderMismatch, sweepPrompt, validateRunConfig, discoverWorkspaceAssets, SUPPORTED_AGENT_TARGETS, detectProviders, loadLocalCredentials, saveLocalCredentials, syncPrompts, writeAgentFiles, writePromptManifest, writePromptMarkdownFiles, ensureGitignoreEntry, isProcessAlive, isCI, orchestrateParallel, orchestratePipeline, orchestrateEval, captureGitBranch, resolveModelWithWarning, getModelCostTier, estimateTokenCost, DEFAULT_MODELS, } from "./index.js";
+import { PROVIDER_MODELS } from "./model-registry.js";
 const CLI_EXIT_CODES = {
     success: 0,
     general: 1,
@@ -210,7 +211,7 @@ async function runCommand(command, flags) {
             if (setupPicked === "list") {
                 const { spawnSync: spSync } = await import("node:child_process");
                 const cliEntry = resolveCliEntry();
-                spSync(process.execPath, [cliEntry, "list"], { stdio: "inherit", cwd });
+                spSync(process.execPath, [cliEntry, "list"], { stdio: "inherit", cwd, shell: false, windowsHide: true });
             }
             else if (setupPicked !== "done") {
                 const [action, file] = setupPicked.split(":", 2);
@@ -218,7 +219,7 @@ async function runCommand(command, flags) {
                 console.log(`\nRunning: prompts-gpt ${cmd} -f ${file}\n`);
                 const { spawnSync: spSync } = await import("node:child_process");
                 const cliEntry = resolveCliEntry();
-                const setupResult = spSync(process.execPath, [cliEntry, cmd, "-f", file], { stdio: "inherit", cwd });
+                const setupResult = spSync(process.execPath, [cliEntry, cmd, "-f", file], { stdio: "inherit", cwd, shell: false, windowsHide: true });
                 process.exitCode = setupResult.status ?? 1;
             }
         }
@@ -496,12 +497,7 @@ async function runCommand(command, flags) {
                 const lockContent = JSON.parse(readFileSync(sweepLockPath, "utf8"));
                 const lockAge = Date.now() - new Date(lockContent.startedAt ?? 0).getTime();
                 const lockAgeHours = lockAge / (60 * 60 * 1000);
-                let holderAlive = false;
-                try {
-                    process.kill(lockContent.pid ?? 0, 0);
-                    holderAlive = true;
-                }
-                catch { /* dead */ }
+                const holderAlive = isProcessAlive(lockContent.pid);
                 if (!holderAlive) {
                     console.log(`\n${sym("⚠", "!")} Stale sweep lock detected (PID ${lockContent.pid} is no longer running)`);
                     console.log(`  Started: ${lockContent.startedAt ?? "unknown"}`);
@@ -673,7 +669,7 @@ async function runCommand(command, flags) {
                     console.log(`\nRunning: prompts-gpt ${cmd} -f ${file}\n`);
                     const { spawnSync: spSync } = await import("node:child_process");
                     const cliEntry = resolveCliEntry();
-                    const result = spSync(process.execPath, [cliEntry, cmd, "-f", file], { stdio: "inherit", cwd });
+                    const result = spSync(process.execPath, [cliEntry, cmd, "-f", file], { stdio: "inherit", cwd, shell: false, windowsHide: true });
                     process.exitCode = result.status ?? 1;
                 }
             }
@@ -826,6 +822,9 @@ async function runCommand(command, flags) {
     }
     if (command === "run") {
         const cwd = getResolvedCwd(flags);
+        if (isCI() && !flags["non-interactive"]) {
+            flags["non-interactive"] = true;
+        }
         const promptFile = getStringFlag(flags, "prompt-file");
         const config = await loadRunConfig(cwd);
         warnOnConfigIssues(config);
@@ -1014,6 +1013,10 @@ async function runCommand(command, flags) {
             const doRun = async () => {
                 if (running)
                     return;
+                if (!existsSync(resolvedWatch)) {
+                    console.log(`  File deleted: ${resolvedWatch}. Skipping run.`);
+                    return;
+                }
                 running = true;
                 console.log(`\n${colorize("▶ Running...", "\x1b[36m")} (${new Date().toLocaleTimeString()})`);
                 try {
@@ -1041,20 +1044,28 @@ async function runCommand(command, flags) {
             };
             await doRun();
             let debounce = null;
+            const closeWatcher = (message) => {
+                if (debounce) {
+                    clearTimeout(debounce);
+                    debounce = null;
+                }
+                if (message)
+                    console.log(message);
+                watcher.close();
+            };
             const watcher = fsWatch(resolvedWatch, () => {
+                if (!existsSync(resolvedWatch)) {
+                    closeWatcher(`  File deleted: ${resolvedWatch}. Exiting watch mode.`);
+                    return;
+                }
                 if (debounce)
                     clearTimeout(debounce);
                 debounce = setTimeout(doRun, 500);
                 debounce.unref?.();
             });
             watcher.on("error", (err) => {
-                if (debounce) {
-                    clearTimeout(debounce);
-                    debounce = null;
-                }
                 console.error(`Watch error: ${err instanceof Error ? err.message : String(err)}`);
-                console.log("File may have been deleted. Exiting watch mode.");
-                watcher.close();
+                closeWatcher("File may have been deleted. Exiting watch mode.");
             });
             await new Promise((resolve) => {
                 let settled = false;
@@ -1141,11 +1152,11 @@ async function runCommand(command, flags) {
             try {
                 const { spawn: openSpawn } = await import("node:child_process");
                 if (process.platform === "win32") {
-                    openSpawn("cmd", ["/c", "start", "", result.summaryFile], { detached: true, stdio: "ignore", windowsHide: true }).unref();
+                    openSpawn("cmd", ["/c", "start", "", result.summaryFile], { detached: true, stdio: "ignore", windowsHide: true, shell: false }).unref();
                 }
                 else {
                     const openCmd = process.platform === "darwin" ? "open" : "xdg-open";
-                    openSpawn(openCmd, [result.summaryFile], { detached: true, stdio: "ignore" }).unref();
+                    openSpawn(openCmd, [result.summaryFile], { detached: true, stdio: "ignore", shell: false }).unref();
                 }
             }
             catch { /* ignore */ }
@@ -1965,11 +1976,11 @@ async function runCommand(command, flags) {
             try {
                 const { spawn: openSpawn } = await import("node:child_process");
                 if (process.platform === "win32") {
-                    openSpawn("cmd", ["/c", "start", "", result.manifestFile], { detached: true, stdio: "ignore", windowsHide: true }).unref();
+                    openSpawn("cmd", ["/c", "start", "", result.manifestFile], { detached: true, stdio: "ignore", windowsHide: true, shell: false }).unref();
                 }
                 else {
                     const openCmd = process.platform === "darwin" ? "open" : "xdg-open";
-                    openSpawn(openCmd, [result.manifestFile], { detached: true, stdio: "ignore" }).unref();
+                    openSpawn(openCmd, [result.manifestFile], { detached: true, stdio: "ignore", shell: false }).unref();
                 }
             }
             catch { /* ignore */ }
@@ -2181,15 +2192,12 @@ async function runCommand(command, flags) {
             let pipelineDefaults = {};
             try {
                 const parsed = JSON.parse(readFileSync(resolvedStepsFile, "utf8"));
-                if (Array.isArray(parsed)) {
+                if (isPipelineStepArray(parsed)) {
                     stepsJson = parsed;
                 }
-                else if (parsed && typeof parsed === "object" && Array.isArray(parsed.steps)) {
-                    const wrapper = parsed;
-                    stepsJson = wrapper.steps;
-                    if (wrapper.defaults && typeof wrapper.defaults === "object") {
-                        pipelineDefaults = wrapper.defaults;
-                    }
+                else if (isPipelineConfigObject(parsed)) {
+                    stepsJson = parsed.steps;
+                    pipelineDefaults = parsed.defaults ?? {};
                 }
                 else {
                     throw new Error("Pipeline config must be an array of steps or an object with { defaults?, steps }.");
@@ -2213,9 +2221,13 @@ async function runCommand(command, flags) {
                 if (!step || typeof step.name !== "string" || typeof step.promptFile !== "string") {
                     throw new CliError(`Pipeline step entries must include name and promptFile fields: ${resolvedStepsFile}`, CLI_EXIT_CODES.validation);
                 }
-                if (step.promptFile && !existsSync(path.resolve(cwd, step.promptFile))) {
+                const stepPromptPath = path.resolve(cwd, step.promptFile);
+                if (!existsSync(stepPromptPath)) {
                     throw new CliError(`Pipeline step "${step.name}" references missing prompt file: ${step.promptFile}`, CLI_EXIT_CODES.usage);
                 }
+                if (!statSync(stepPromptPath).isFile()) {
+                    throw new CliError(`Pipeline step "${step.name}" promptFile is not a file: ${step.promptFile}`, CLI_EXIT_CODES.usage);
+                }
                 const effectiveAgent = typeof step.agent === "string" && step.agent.trim() ? step.agent : defaultPipelineAgent;
                 normalizeOrchestrationAgent(effectiveAgent);
                 step.agent = effectiveAgent;
@@ -2441,7 +2453,19 @@ async function runCommand(command, flags) {
         if (!existsSync(runDir)) {
             throw new CliError(`Run directory not found: ${runDir}`, CLI_EXIT_CODES.usage);
         }
-        const { readFile: fsRead } = await import("node:fs/promises");
+        const { lstat: fsLstat, readFile: fsRead, realpath: fsRealpath } = await import("node:fs/promises");
+        const runDirStat = await fsLstat(runDir).catch((error) => {
+            throw new CliError(`Cannot inspect run directory ${runDir}: ${error instanceof Error ? error.message : String(error)}`, CLI_EXIT_CODES.usage);
+        });
+        if (!runDirStat.isDirectory() || runDirStat.isSymbolicLink()) {
+            throw new CliError(`Invalid run-id: ${runId} is not a regular run directory.`, CLI_EXIT_CODES.usage);
+        }
+        const [realRunDir, realArtifactsDir] = await Promise.all([fsRealpath(runDir), fsRealpath(artifactsDir)]);
+        const realRunDirCheck = caseInsensitive ? realRunDir.toLowerCase() : realRunDir;
+        const realArtifactsDirCheck = caseInsensitive ? realArtifactsDir.toLowerCase() : realArtifactsDir;
+        if (!realRunDirCheck.startsWith(realArtifactsDirCheck + path.sep) && realRunDirCheck !== realArtifactsDirCheck) {
+            throw new CliError("Invalid run-id: resolved path escapes the artifacts directory.", CLI_EXIT_CODES.usage);
+        }
         const deltaFile = path.join(runDir, "worktree-delta.diff");
         if (existsSync(deltaFile)) {
             const delta = await fsRead(deltaFile, "utf8");
@@ -2484,7 +2508,7 @@ async function runCommand(command, flags) {
         console.log("======================");
         console.log("");
         const { spawnSync: gitCheck } = await import("node:child_process");
-        const gitResult = gitCheck("git", ["rev-parse", "--is-inside-work-tree"], { cwd, encoding: "utf8", timeout: 5000, windowsHide: true });
+        const gitResult = gitCheck("git", ["rev-parse", "--is-inside-work-tree"], { cwd, encoding: "utf8", timeout: 5000, windowsHide: true, shell: false });
         if (gitResult.status !== 0) {
             console.log(`${sym("⚠", "!")} Not inside a git repository. Prompts-GPT works best in a git repo for worktree tracking.`);
             console.log("  Run: git init\n");
@@ -2619,7 +2643,7 @@ async function runCommand(command, flags) {
                 console.log(`\nRunning: prompts-gpt ${cmd} -f ${file}\n`);
                 const { spawnSync: spSync } = await import("node:child_process");
                 const cliEntry = resolveCliEntry();
-                const result = spSync(process.execPath, [cliEntry, cmd, "-f", file], { stdio: "inherit", cwd });
+                const result = spSync(process.execPath, [cliEntry, cmd, "-f", file], { stdio: "inherit", cwd, shell: false, windowsHide: true });
                 process.exitCode = result.status ?? 1;
                 return;
             }
@@ -2757,7 +2781,7 @@ async function runCommand(command, flags) {
             if (runQs.toLowerCase() !== "n" && runQs.toLowerCase() !== "no") {
                 const { spawnSync: spSync } = await import("node:child_process");
                 const cliEntry = resolveCliEntry();
-                const qsResult = spSync(process.execPath, [cliEntry, "quickstart", "--cwd", cwd], { stdio: "inherit", cwd });
+                const qsResult = spSync(process.execPath, [cliEntry, "quickstart", "--cwd", cwd], { stdio: "inherit", cwd, shell: false, windowsHide: true });
                 process.exitCode = qsResult.status ?? 1;
                 return;
             }
@@ -2865,7 +2889,7 @@ async function runCommand(command, flags) {
                     console.log(`\nRunning: prompts-gpt run -f ${genFile}\n`);
                     const { spawnSync: spSync } = await import("node:child_process");
                     const cliEntry = resolveCliEntry();
-                    const genResult = spSync(process.execPath, [cliEntry, "run", "-f", genFile], { stdio: "inherit", cwd });
+                    const genResult = spSync(process.execPath, [cliEntry, "run", "-f", genFile], { stdio: "inherit", cwd, shell: false, windowsHide: true });
                     process.exitCode = genResult.status ?? 1;
                 }
             }
@@ -3153,7 +3177,7 @@ async function runCommand(command, flags) {
                 const { spawnSync: spSync } = await import("node:child_process");
                 const cliEntry = resolveCliEntry();
                 const projCwd = getResolvedCwd(flags);
-                const syncResult = spSync(process.execPath, [cliEntry, "sync", "--cwd", projCwd], { stdio: "inherit", cwd: projCwd });
+                const syncResult = spSync(process.execPath, [cliEntry, "sync", "--cwd", projCwd], { stdio: "inherit", cwd: projCwd, shell: false, windowsHide: true });
                 process.exitCode = syncResult.status ?? 1;
             }
         }
@@ -3748,6 +3772,7 @@ function readTokenFromPrompt(command) {
             stdin.setRawMode?.(true);
         }
         catch {
+            cleanup();
             reject(new CliError("Cannot enable raw mode for token prompt. Use --token-stdin instead.", CLI_EXIT_CODES.usage, { helpCommand: command }));
             return;
         }
@@ -3835,15 +3860,54 @@ async function applyDoctorFixes(cwd) {
         skipped.push(`${DEFAULT_PROMPTS_GPT_OUT_DIR}/ directory already exists`);
     }
     try {
-        await ensureGitignoreEntry(cwd, ".prompts-gpt/.credentials.json");
-        await ensureGitignoreEntry(cwd, ".prompts-gpt/.models.json");
-        await ensureGitignoreEntry(cwd, ".scripts/runs/");
-        await ensureGitignoreEntry(cwd, ".sweep.lock");
-        applied.push("Updated .gitignore with sensitive file and sweep artifact patterns");
+        const gitignoreEntries = [
+            ".prompts-gpt/.credentials.json",
+            ".prompts-gpt/.models.json",
+            ".scripts/runs",
+            ".sweep.lock",
+        ];
+        const gitignoreUpdates = [];
+        for (const entry of gitignoreEntries) {
+            gitignoreUpdates.push(await ensureGitignoreEntry(cwd, entry));
+        }
+        if (gitignoreUpdates.some(Boolean)) {
+            applied.push("Updated .gitignore with sensitive file and sweep artifact patterns");
+        }
+        else {
+            skipped.push(".gitignore already contains sensitive file and sweep artifact patterns");
+        }
     }
     catch {
         failed.push("Could not update .gitignore with sensitive file and sweep artifact patterns");
     }
+    const sweepLockPath = path.resolve(cwd, ".sweep.lock");
+    if (existsSync(sweepLockPath)) {
+        try {
+            const lockRaw = readFileSync(sweepLockPath, "utf8");
+            const lockData = JSON.parse(lockRaw);
+            const lockAge = Date.now() - new Date(lockData.startedAt ?? 0).getTime();
+            const lockAgeHours = lockAge / (60 * 60 * 1000);
+            const holderAlive = isProcessAlive(lockData.pid);
+            if (!holderAlive || (Number.isFinite(lockAgeHours) && lockAgeHours >= 4)) {
+                const { rm: fsRm } = await import("node:fs/promises");
+                await fsRm(sweepLockPath, { force: true });
+                applied.push("Removed stale sweep lock");
+            }
+            else {
+                skipped.push("Sweep lock is active (held by running process)");
+            }
+        }
+        catch {
+            try {
+                const { rm: fsRm } = await import("node:fs/promises");
+                await fsRm(sweepLockPath, { force: true });
+                applied.push("Removed corrupt sweep lock file");
+            }
+            catch {
+                failed.push("Could not remove corrupt sweep lock file");
+            }
+        }
+    }
     return { applied, skipped, failed };
 }
 function getStringFlag(flags, name) {
@@ -3939,6 +4003,51 @@ function truncatePreview(text, maxLen) {
         return clean;
     return clean.slice(0, maxLen - 3) + "...";
 }
+function isPlainRecord(value) {
+    return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+function isOptionalString(value) {
+    return value === undefined || typeof value === "string";
+}
+function isOptionalNumber(value) {
+    return value === undefined || (typeof value === "number" && Number.isFinite(value));
+}
+function isStringRecord(value) {
+    if (value === undefined)
+        return true;
+    if (!isPlainRecord(value))
+        return false;
+    return Object.entries(value).every(([key, entry]) => key !== "__proto__" && key !== "constructor" && key !== "prototype" && typeof entry === "string");
+}
+function isPipelineStepEntry(value) {
+    if (!isPlainRecord(value))
+        return false;
+    return typeof value.name === "string" &&
+        typeof value.promptFile === "string" &&
+        isOptionalString(value.agent) &&
+        isOptionalString(value.model) &&
+        isOptionalNumber(value.timeout) &&
+        isOptionalNumber(value.retries) &&
+        isOptionalString(value.sandboxMode) &&
+        isStringRecord(value.env);
+}
+function isPipelineStepArray(value) {
+    return Array.isArray(value) && value.every(isPipelineStepEntry);
+}
+function isPipelineDefaults(value) {
+    if (value === undefined)
+        return true;
+    if (!isPlainRecord(value))
+        return false;
+    return isOptionalString(value.agent) &&
+        isOptionalString(value.model) &&
+        isOptionalNumber(value.timeout) &&
+        isOptionalNumber(value.retries) &&
+        isOptionalString(value.sandboxMode);
+}
+function isPipelineConfigObject(value) {
+    return isPlainRecord(value) && isPipelineStepArray(value.steps) && isPipelineDefaults(value.defaults);
+}
 function formatList(values) {
     if (!Array.isArray(values) || values.length === 0)
         return "None";
@@ -4149,82 +4258,6 @@ async function saveLastUsedModel(cwd, provider, model) {
 }
 const CODEX_API_KEY_ENV_NAMES = ["OPENAI_API_KEY", "CODEX_API_KEY", "OPENAI_API_KEY_FILE"];
 const CODEX_CHATGPT_UNSUPPORTED_MODELS = new Set(["gpt-5.5-pro", "gpt-5.4-pro", "gpt-5.5-high-fast"]);
-const PROVIDER_MODELS = Object.freeze({
-    codex: [
-        { value: "gpt-5.5", label: "gpt-5.5 — frontier coding & reasoning", tier: "frontier" },
-        { value: "gpt-5.5-pro", label: "gpt-5.5-pro — smarter, more precise", tier: "frontier" },
-        { value: "gpt-5.4", label: "gpt-5.4 — strong coding model", tier: "standard" },
-        { value: "gpt-5.4-pro", label: "gpt-5.4-pro — enhanced responses", tier: "standard" },
-        { value: "gpt-5.4-mini", label: "gpt-5.4-mini — fast coding & subagents", tier: "fast" },
-        { value: "gpt-5.4-nano", label: "gpt-5.4-nano — cheapest high-volume", tier: "budget" },
-        { value: "gpt-5.3-codex", label: "gpt-5.3-codex — merged GPT-5 + Codex", tier: "standard" },
-        { value: "gpt-5.3-codex-spark", label: "gpt-5.3-codex-spark — 15x faster gen", tier: "fast" },
-        { value: "o3", label: "o3 — advanced reasoning", tier: "frontier" },
-    ],
-    claude: [
-        { value: "claude-opus-4-7", label: "claude-opus-4-7 — most capable model", tier: "frontier" },
-        { value: "claude-opus-4-6", label: "claude-opus-4-6 — previous gen opus", tier: "frontier" },
-        { value: "claude-sonnet-4-6", label: "claude-sonnet-4-6 — balanced default", tier: "standard" },
-        { value: "claude-sonnet-4-5", label: "claude-sonnet-4-5 — previous gen sonnet", tier: "standard" },
-        { value: "claude-3-5-haiku", label: "claude-3-5-haiku — fastest & cheapest", tier: "fast" },
-        { value: "claude-haiku-4-5", label: "claude-haiku-4-5 — fast haiku", tier: "fast" },
-    ],
-    cursor: [
-        { value: "auto", label: "auto — Cursor auto-selects best", tier: "standard" },
-        { value: "claude-4.7-opus", label: "claude-4.7-opus — Claude Opus 4.7", tier: "frontier" },
-        { value: "claude-4.7-opus-fast", label: "claude-4.7-opus-fast — Claude Opus 4.7 Fast", tier: "frontier" },
-        { value: "claude-4.6-opus-high", label: "claude-4.6-opus-high — Claude Opus 4.6 High", tier: "frontier" },
-        { value: "claude-4.6-opus-high-thinking", label: "claude-4.6-opus-high-thinking — Claude Opus 4.6 Thinking", tier: "frontier" },
-        { value: "claude-4.6-sonnet-high", label: "claude-4.6-sonnet-high — fast + smart", tier: "standard" },
-        { value: "gpt-5.5", label: "gpt-5.5 — OpenAI frontier", tier: "frontier" },
-        { value: "gpt-5.5-high-fast", label: "gpt-5.5-high-fast — GPT frontier fast", tier: "frontier" },
-        { value: "gpt-5.4", label: "gpt-5.4 — OpenAI strong coding", tier: "standard" },
-        { value: "gpt-5.4-mini", label: "gpt-5.4-mini — fast & affordable", tier: "fast" },
-        { value: "gpt-5.4-nano", label: "gpt-5.4-nano — cheapest", tier: "budget" },
-        { value: "gpt-5.3-codex", label: "gpt-5.3-codex — OpenAI codex", tier: "standard" },
-        { value: "gpt-5.2", label: "gpt-5.2 — OpenAI coding", tier: "standard" },
-        { value: "gpt-5", label: "gpt-5 — OpenAI base", tier: "standard" },
-        { value: "gpt-5-fast", label: "gpt-5-fast — faster GPT-5", tier: "standard" },
-        { value: "gpt-5-mini", label: "gpt-5-mini — small GPT-5", tier: "fast" },
-        { value: "o3-pro-high", label: "o3-pro-high — advanced reasoning", tier: "frontier" },
-        { value: "composer-2.5", label: "composer-2.5 — Cursor latest model", tier: "standard" },
-        { value: "composer-2", label: "composer-2 — balanced multi-file", tier: "standard" },
-        { value: "composer-2-fast", label: "composer-2-fast — speed optimized", tier: "fast" },
-        { value: "composer-1.5", label: "composer-1.5 — legacy capable", tier: "standard" },
-        { value: "composer-1", label: "composer-1 — legacy model", tier: "fast" },
-        { value: "gemini-3.1-pro", label: "gemini-3.1-pro — Google latest", tier: "standard" },
-        { value: "gemini-3-pro", label: "gemini-3-pro — Google frontier", tier: "standard" },
-        { value: "gemini-3-flash", label: "gemini-3-flash — Google fast", tier: "fast" },
-        { value: "gemini-2.5-flash", label: "gemini-2.5-flash — Google budget", tier: "fast" },
-        { value: "grok-4.3", label: "grok-4.3 — xAI frontier", tier: "frontier" },
-        { value: "grok-4.20", label: "grok-4.20 — xAI standard", tier: "standard" },
-        { value: "kimi-k2.5", label: "kimi-k2.5 — Moonshot coding", tier: "standard" },
-        { value: "claude-4.5-opus", label: "claude-4.5-opus — previous gen opus", tier: "standard" },
-        { value: "claude-4.5-haiku", label: "claude-4.5-haiku — fast haiku", tier: "fast" },
-    ],
-    copilot: [
-        { value: "auto", label: "auto — Copilot auto-selects", tier: "standard" },
-        { value: "claude-opus-4.7", label: "claude-opus-4.7 — Anthropic frontier", tier: "frontier" },
-        { value: "claude-opus-4.6", label: "claude-opus-4.6 — Anthropic frontier", tier: "frontier" },
-        { value: "claude-sonnet-4.6", label: "claude-sonnet-4.6 — Anthropic balanced", tier: "standard" },
-        { value: "claude-sonnet-4.5", label: "claude-sonnet-4.5 — Anthropic previous gen", tier: "standard" },
-        { value: "claude-opus-4.5", label: "claude-opus-4.5 — Anthropic legacy opus", tier: "standard" },
-        { value: "claude-haiku-4.5", label: "claude-haiku-4.5 — fastest", tier: "fast" },
-        { value: "gpt-5.5", label: "gpt-5.5 — OpenAI frontier", tier: "frontier" },
-        { value: "gpt-5.4", label: "gpt-5.4 — OpenAI standard", tier: "standard" },
-        { value: "gpt-5.4-mini", label: "gpt-5.4-mini — fast included", tier: "fast" },
-        { value: "gpt-5.4-nano", label: "gpt-5.4-nano — cheapest high-volume", tier: "budget" },
-        { value: "gpt-5.3-codex", label: "gpt-5.3-codex — OpenAI coding", tier: "standard" },
-        { value: "gpt-5-mini", label: "gpt-5-mini — included fast model", tier: "fast" },
-        { value: "gemini-3.1-pro", label: "gemini-3.1-pro — Google latest", tier: "frontier" },
-        { value: "gemini-3-pro", label: "gemini-3-pro — Google frontier", tier: "standard" },
-        { value: "gemini-2.5-pro", label: "gemini-2.5-pro — Google frontier", tier: "standard" },
-        { value: "gemini-2.5-flash", label: "gemini-2.5-flash — Google fast & affordable", tier: "fast" },
-        { value: "gemini-3-flash", label: "gemini-3-flash — Google fast", tier: "fast" },
-        { value: "raptor-mini", label: "raptor-mini — preview tuned mini", tier: "fast" },
-        { value: "goldeneye", label: "goldeneye — preview tuned coding model", tier: "budget" },
-    ],
-});
 // Model names are used directly — no alias resolution needed
 function hasCodexApiKeyAuth(env = process.env) {
     return CODEX_API_KEY_ENV_NAMES.some((name) => String(env[name] ?? "").trim().length > 0);
@@ -5185,8 +5218,8 @@ function slugifyFilename(text, fallback) {
 }
 function buildProgressBar(completed, total, width) {
     const safeWidth = Number.isFinite(width) && width > 0 ? Math.trunc(width) : 20;
-    const safeTotal = Math.max(total, 1);
-    const safeCompleted = Math.max(0, Math.min(completed, safeTotal));
+    const safeTotal = Number.isFinite(total) && total > 0 ? Math.trunc(total) : 1;
+    const safeCompleted = Number.isFinite(completed) ? Math.max(0, Math.min(Math.trunc(completed), safeTotal)) : 0;
     const fraction = safeCompleted / safeTotal;
     const filled = Math.min(Math.floor(fraction * safeWidth), safeWidth);
     const empty = safeWidth - filled;
@@ -5272,9 +5305,12 @@ function interactiveSelect(prompt, options) {
         const maxVisible = Math.min(options.length, Math.max(3, termRows - 4));
         const useUnicode = supportsUnicode();
         const pointer = useUnicode ? "\u276f" : ">";
-        const formatLine = (entry, index, selected) => {
-            const numberWidth = String(getVisibleOptions().length).length;
-            const num = String(index + 1).padStart(numberWidth, " ");
+        const getScrollStart = (visible) => visible.length <= maxVisible
+            ? 0
+            : Math.max(0, Math.min(cursor - Math.floor(maxVisible / 2), visible.length - maxVisible));
+        const formatLine = (entry, shortcutIndex, selected) => {
+            const numberWidth = String(Math.min(9, maxVisible)).length;
+            const num = shortcutIndex <= 9 ? String(shortcutIndex).padStart(numberWidth, " ") : " ".repeat(numberWidth);
             const prefix = selected ? colorize(pointer, "\x1b[36m") : " ";
             const label = selected ? colorize(entry.label, "\x1b[1m") : entry.label;
             return `  ${prefix} ${num}. ${label}`;
@@ -5295,15 +5331,13 @@ function interactiveSelect(prompt, options) {
             const visibleCount = Math.min(maxVisible, visible.length);
             const posLabel = visible.length > 1 ? ` (${cursor + 1}/${visible.length})` : "";
             const filterLabel = filterText ? colorize(` filter: "${filterText}"`, "\x1b[33m") : "";
-            const scrollStart = visible.length <= maxVisible
-                ? 0
-                : Math.max(0, Math.min(cursor - Math.floor(maxVisible / 2), visible.length - maxVisible));
+            const scrollStart = getScrollStart(visible);
             const lines = [];
             lines.push(`${prompt}${posLabel}${filterLabel}`);
             for (let vi = 0; vi < visibleCount; vi++) {
                 const i = scrollStart + vi;
                 if (i < visible.length) {
-                    lines.push(formatLine(visible[i], i, i === cursor));
+                    lines.push(formatLine(visible[i], vi + 1, i === cursor));
                 }
             }
             if (visible.length > maxVisible) {
@@ -5360,7 +5394,7 @@ function interactiveSelect(prompt, options) {
             return;
         }
         stdin.resume();
-        const onSigint = () => {
+        const cancelSelection = () => {
             if (settled)
                 return;
             settled = true;
@@ -5371,11 +5405,17 @@ function interactiveSelect(prompt, options) {
             catch { /* stdout may be closed */ }
             reject(new CliError("Selection cancelled.", CLI_EXIT_CODES.general));
         };
+        const onSigint = () => { cancelSelection(); };
+        const onSigterm = () => { cancelSelection(); };
         const cleanup = () => {
             try {
                 process.removeListener("SIGINT", onSigint);
             }
             catch { /* ignore */ }
+            try {
+                process.removeListener("SIGTERM", onSigterm);
+            }
+            catch { /* ignore */ }
             try {
                 stdin.removeListener("data", onData);
             }
@@ -5407,6 +5447,7 @@ function interactiveSelect(prompt, options) {
         stdin.on("end", onEnd);
         stdin.on("error", onError);
         process.on("SIGINT", onSigint);
+        process.on("SIGTERM", onSigterm);
         const onData = (data) => {
             const visible = getVisibleOptions();
             for (let ci = 0; ci < data.length; ci++) {
@@ -5542,17 +5583,18 @@ function interactiveSelect(prompt, options) {
                 }
                 else if (ch >= "1" && ch <= "9" && !filterText) {
                     const idx = parseInt(ch, 10) - 1;
-                    if (idx < visible.length && idx < 9) {
+                    const visibleIndex = getScrollStart(visible) + idx;
+                    if (visibleIndex < visible.length && idx < 9) {
                         if (settled)
                             return;
                         settled = true;
                         cleanup();
                         stdout.write("\n");
-                        resolve(visible[idx].value);
+                        resolve(visible[visibleIndex].value);
                         return;
                     }
                 }
-                else if (ch >= " " && ch <= "~") {
+                else if (isPrintableInteractiveInput(ch)) {
                     filterText += ch;
                     cursor = 0;
                     render();
@@ -5562,6 +5604,11 @@ function interactiveSelect(prompt, options) {
         stdin.on("data", onData);
     });
 }
+function isPrintableInteractiveInput(value) {
+    if (!value)
+        return false;
+    return !/[\x00-\x1f\x7f]/.test(value);
+}
 async function interactiveInput(prompt, defaultValue) {
     if (!process.stdin.isTTY || !process.stdout.isTTY) {
         throw new CliError("Interactive input requires a TTY.", CLI_EXIT_CODES.usage);
@@ -5585,6 +5632,14 @@ async function interactiveInput(prompt, defaultValue) {
             resolved = true;
             resolve(defaultValue || "");
         });
+        rl.on("error", (err) => {
+            if (resolved)
+                return;
+            resolved = true;
+            rl.close();
+            rl.removeAllListeners();
+            reject(new CliError(`Input stream error: ${err.message}`, CLI_EXIT_CODES.general));
+        });
         rl.on("SIGINT", () => {
             if (resolved)
                 return;
@@ -5596,14 +5651,26 @@ async function interactiveInput(prompt, defaultValue) {
     });
 }
 async function checkPromptsGptSiteReachable(apiUrl) {
+    if (typeof globalThis.fetch !== "function") {
+        return { ok: false, status: null };
+    }
     const target = new URL("/", apiUrl).toString();
-    const request = (method) => Promise.race([
-        globalThis.fetch(target, { method }),
-        new Promise((_, rej) => {
-            const timer = setTimeout(() => rej(new Error("timeout")), 5000);
-            timer.unref?.();
-        }),
-    ]);
+    const request = async (method) => {
+        let timer = null;
+        try {
+            return await Promise.race([
+                globalThis.fetch(target, { method }),
+                new Promise((_, reject) => {
+                    timer = setTimeout(() => reject(new Error("timeout")), 5000);
+                    timer.unref?.();
+                }),
+            ]);
+        }
+        finally {
+            if (timer)
+                clearTimeout(timer);
+        }
+    };
     let response = await request("HEAD");
     if (response.status === 405) {
         response = await request("GET");