prompts-gpt 0.2.14 → 0.2.15

package/dist/cli.js

@@ -1,8 +1,9 @@
 #!/usr/bin/env node
 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, normalizeOrchestrationAgent, ORCHESTRATION_AGENT_PROFILES, runBatch, runPrompt, resolveRunProvider, warnModelProviderMismatch, sweepPrompt, validateRunConfig, discoverWorkspaceAssets, SUPPORTED_AGENT_TARGETS, detectProviders, loadLocalCredentials, saveLocalCredentials, syncPrompts, writeAgentFiles, writePromptManifest, writePromptMarkdownFiles, ensureGitignoreEntry, } 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, 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, } from "./index.js";
 const CLI_EXIT_CODES = {
     success: 0,
     general: 1,
@@ -12,7 +13,7 @@ const CLI_EXIT_CODES = {
     usage: 64,
 };
 const VALID_TOOLS = ["Codex", "Claude Code", "Cursor", "GitHub Copilot", "ChatGPT", "Gemini", "Perplexity", "Grok", "DeepSeek", "Claude"];
-const COMMANDS = ["setup", "init", "project", "pull", "generate", "sync", "run", "run-batch", "sweep", "list", "status", "validate", "providers", "models", "sync-models", "doctor", "load-config", "quickstart", "version", "help"];
+const COMMANDS = ["setup", "init", "project", "pull", "generate", "sync", "run", "run-batch", "sweep", "orchestrate", "diff", "list", "status", "validate", "providers", "models", "sync-models", "doctor", "load-config", "quickstart", "version", "help"];
 const MAX_STDIN_TOKEN_LENGTH = 4_096;
 class CliError extends Error {
     exitCode;
@@ -79,7 +80,7 @@ async function main() {
     }
     const command = asCommandName(first);
     if (!command) {
-        const suggestion = COMMANDS.find((c) => c.startsWith(first.slice(0, 3)));
+        const suggestion = findClosestCommand(first);
         const hint = suggestion ? ` Did you mean \`prompts-gpt ${suggestion}\`?` : "";
         const installHint = "\nIf you installed from npm, ensure you have the latest version: npm install -g prompts-gpt@latest";
         throw new CliError(`Unknown command: ${first}.${hint}${installHint}`, CLI_EXIT_CODES.usage);
@@ -106,10 +107,11 @@ async function runCommand(command, flags) {
         }
         console.log(`Workspace: ${cwd}\n`);
         for (const provider of providers) {
-            const icon = provider.available ? "✓" : "✗";
-            console.log(`${icon} ${provider.provider}: ${provider.available ? "available" : "missing"} | bin=${provider.bin} | model=${provider.modelDefault}${provider.version ? ` | ${provider.version}` : ""}`);
+            const icon = provider.available ? sym("✓", "+") : sym("✗", "x");
+            const statusColor = provider.available ? "\x1b[32m" : "\x1b[31m";
+            console.log(`${colorize(icon, statusColor)} ${provider.provider}: ${provider.available ? "available" : "missing"} | bin=${provider.bin} | model=${provider.modelDefault}${provider.version ? ` | ${provider.version}` : ""}`);
             if (!provider.available) {
-                console.log(`  → ${provider.installHint}`);
+                console.log(`  ${sym("→", "->")} ${provider.installHint}`);
             }
         }
         const noneAvailable = providers.every((p) => !p.available);
@@ -165,7 +167,7 @@ async function runCommand(command, flags) {
         const availableCount = result.providerSummary.filter((p) => p.available).length;
         console.log(`Providers: ${availableCount}/${result.providerSummary.length} available`);
         if (availableCount === 0) {
-            console.log("⚠ No provider CLIs detected. Install codex, cursor agent, claude, or copilot.");
+            console.log(`${sym("⚠", "!")} No provider CLIs detected. Install codex, cursor agent, claude, or copilot.`);
         }
         const setupAssets = await discoverWorkspaceAssets(cwd);
         if (isTTYInteractive() && (setupAssets.sweeps.length > 0 || setupAssets.prompts.length > 0)) {
@@ -208,9 +210,24 @@ async function runCommand(command, flags) {
     }
     if (command === "models") {
         const cwd = getResolvedCwd(flags);
-        const config = await loadRunConfig(cwd);
+        let config;
+        try {
+            config = await loadRunConfig(cwd);
+        }
+        catch (configErr) {
+            console.error(`Failed to load config: ${configErr instanceof Error ? configErr.message : String(configErr)}`);
+            console.error(`Fix or delete ${cwd}/.prompts-gpt/config.json and retry.`);
+            process.exitCode = CLI_EXIT_CODES.general;
+            return;
+        }
         const providerFilter = getStringFlag(flags, "provider") || getStringFlag(flags, "agent");
-        const providers = providerFilter ? [providerFilter] : Object.keys(PROVIDER_MODELS);
+        const validProviders = Object.keys(PROVIDER_MODELS);
+        if (providerFilter && !validProviders.includes(providerFilter)) {
+            console.error(`Unknown provider "${providerFilter}". Valid providers: ${validProviders.join(", ")}`);
+            process.exitCode = CLI_EXIT_CODES.validation;
+            return;
+        }
+        const providers = providerFilter ? [providerFilter] : validProviders;
         if (Boolean(flags.json)) {
             const result = {};
             for (const p of providers) {
@@ -253,7 +270,8 @@ async function runCommand(command, flags) {
         if (addFlag && providerFilter) {
             const modelNamePattern = /^[a-zA-Z0-9][a-zA-Z0-9._-]{0,63}$/;
             const addModels = addFlag.split(",").map((m) => m.trim()).filter(Boolean);
-            const invalidModels = addModels.filter((m) => !modelNamePattern.test(m));
+            const dangerousKeys = new Set(["__proto__", "constructor", "prototype"]);
+            const invalidModels = addModels.filter((m) => !modelNamePattern.test(m) || dangerousKeys.has(m));
             if (invalidModels.length > 0) {
                 console.error(`Invalid model name(s): ${invalidModels.join(", ")}. Model names must be alphanumeric with dots, hyphens, or underscores.`);
                 process.exitCode = CLI_EXIT_CODES.validation;
@@ -381,16 +399,16 @@ async function runCommand(command, flags) {
         console.log("Prompts-GPT Doctor");
         console.log("==================\n");
         console.log("System:");
-        console.log(`  ${report.nodeVersion.startsWith("v18") || report.nodeVersion.startsWith("v2") ? "✓" : "⚠"} Node: ${report.nodeVersion}`);
-        console.log(`  ✓ OS: ${report.osPlatform}/${report.osArch} | CPUs: ${report.cpuCount}`);
-        console.log(`  ${report.configFound ? "✓" : "✗"} Config: ${report.configFound ? report.configPath : "not found — run \`prompts-gpt setup\`"}`);
+        console.log(`  ${report.nodeVersion.startsWith("v18") || report.nodeVersion.startsWith("v2") ? sym("✓", "+") : sym("⚠", "!")} Node: ${report.nodeVersion}`);
+        console.log(`  ${sym("✓", "+")} OS: ${report.osPlatform}/${report.osArch} | CPUs: ${report.cpuCount}`);
+        console.log(`  ${report.configFound ? sym("✓", "+") : sym("✗", "x")} Config: ${report.configFound ? report.configPath : "not found — run \`prompts-gpt setup\`"}`);
         console.log(`\n  Workspace: ${report.cwd}\n`);
         console.log("Providers:");
         for (const provider of report.providers) {
-            const icon = provider.available ? "✓" : "✗";
+            const icon = provider.available ? sym("✓", "+") : sym("✗", "x");
             console.log(`  ${icon} ${provider.provider}: ${provider.available ? `${provider.bin}` : "not found"}${provider.version ? ` (${provider.version})` : ""}`);
             if (!provider.available) {
-                console.log(`    → ${provider.installHint}`);
+                console.log(`    ${sym("→", "->")} ${provider.installHint}`);
             }
         }
         const configNotes = report.notes.filter((n) => n.includes("config") || n.includes("Config") || n.includes("provider order") || n.includes("Router"));
@@ -399,17 +417,17 @@ async function runCommand(command, flags) {
         if (configNotes.length > 0) {
             console.log("\nConfiguration:");
             for (const n of configNotes)
-                console.log(`  ℹ ${n}`);
+                console.log(`  ${sym("ℹ", "i")} ${n}`);
         }
         if (sweepNotes.length > 0) {
             console.log("\nSweep:");
             for (const n of sweepNotes)
-                console.log(`  ℹ ${n}`);
+                console.log(`  ${sym("ℹ", "i")} ${n}`);
         }
         if (otherNotes.length > 0) {
             console.log("\nNotes:");
             for (const n of otherNotes)
-                console.log(`  ℹ ${n}`);
+                console.log(`  ${sym("ℹ", "i")} ${n}`);
         }
         try {
             const config = await loadRunConfig(cwd);
@@ -425,7 +443,7 @@ async function runCommand(command, flags) {
             if (modelIssues.length > 0) {
                 console.log("\nModel Overrides:");
                 for (const issue of modelIssues)
-                    console.log(`  ⚠ ${issue}`);
+                    console.log(`  ${sym("⚠", "!")} ${issue}`);
             }
             const cachedModelsPath = path.resolve(cwd, DEFAULT_PROMPTS_GPT_OUT_DIR, ".models.json");
             if (existsSync(cachedModelsPath)) {
@@ -446,25 +464,25 @@ async function runCommand(command, flags) {
         catch { /* skip config check */ }
         console.log("\nAPI Connectivity:");
         if (typeof globalThis.fetch !== "function") {
-            console.log("  ⚠ fetch is not available (Node.js 18.18+ required). Skipping API check.");
+            console.log(`  ${sym("⚠", "!")} fetch is not available (Node.js 18.18+ required). Skipping API check.`);
         }
         else {
             try {
                 const siteCheck = await checkPromptsGptSiteReachable(DEFAULT_PROMPTS_GPT_API_URL);
                 if (siteCheck.ok) {
-                    console.log(`  ✓ prompts-gpt.com reachable`);
+                    console.log(`  ${sym("✓", "+")} prompts-gpt.com reachable`);
                 }
                 else {
-                    console.log(`  ⚠ prompts-gpt.com responded with status ${siteCheck.status ?? "unknown"}`);
+                    console.log(`  ${sym("⚠", "!")} prompts-gpt.com responded with status ${siteCheck.status ?? "unknown"}`);
                 }
             }
             catch (err) {
                 const msg = err instanceof Error ? err.message : "";
                 if (msg.includes("ECONNREFUSED") || msg.includes("ENOTFOUND")) {
-                    console.log("  ✗ prompts-gpt.com unreachable — check network or proxy settings (HTTPS_PROXY)");
+                    console.log(`  ${sym("✗", "x")} prompts-gpt.com unreachable — check network or proxy settings (HTTPS_PROXY)`);
                 }
                 else {
-                    console.log("  ✗ prompts-gpt.com unreachable — check network connection");
+                    console.log(`  ${sym("✗", "x")} prompts-gpt.com unreachable — check network connection`);
                 }
             }
         }
@@ -473,6 +491,50 @@ async function runCommand(command, flags) {
             console.log(`\nSDK Version: ${pkgData.version ?? "unknown"}`);
         }
         catch { /* skip */ }
+        // --fix mode: auto-fix common issues (idempotent — safe to run repeatedly)
+        if (Boolean(flags.fix)) {
+            const { mkdir: fsMkdir } = await import("node:fs/promises");
+            const uc = supportsColor();
+            const ok = uc ? "✓" : "[ok]";
+            const warn = uc ? "⚠" : "[!]";
+            const info = uc ? "ℹ" : "[i]";
+            console.log("\nAuto-fix:");
+            let fixCount = 0;
+            if (!report.configFound) {
+                try {
+                    await initRunConfig({ cwd, overwrite: false });
+                    console.log(`  ${ok} Created default config`);
+                    fixCount++;
+                }
+                catch {
+                    console.log(`  ${warn} Could not create config (may already exist)`);
+                }
+            }
+            const promptsDir = path.resolve(cwd, DEFAULT_PROMPTS_GPT_OUT_DIR);
+            if (!existsSync(promptsDir)) {
+                try {
+                    await fsMkdir(promptsDir, { recursive: true });
+                    console.log(`  ${ok} Created ${DEFAULT_PROMPTS_GPT_OUT_DIR}/ directory`);
+                    fixCount++;
+                }
+                catch {
+                    console.log(`  ${warn} Could not create ${DEFAULT_PROMPTS_GPT_OUT_DIR}/ directory`);
+                }
+            }
+            try {
+                await ensureGitignoreEntry(cwd, ".prompts-gpt/.credentials.json");
+                await ensureGitignoreEntry(cwd, ".prompts-gpt/.models.json");
+                console.log(`  ${ok} Updated .gitignore with sensitive file patterns`);
+                fixCount++;
+            }
+            catch { /* gitignore update is best-effort */ }
+            if (report.providers.every((p) => !p.available)) {
+                console.log(`  ${info} No providers found. Install one:`);
+                console.log("    npm install -g @openai/codex");
+                console.log("    npm install -g @anthropic-ai/claude-code");
+            }
+            console.log(`\n  ${fixCount} fix${fixCount === 1 ? "" : "es"} applied.`);
+        }
         return;
     }
     if (command === "list") {
@@ -589,26 +651,30 @@ async function runCommand(command, flags) {
         }
         console.log(`Workspace: ${cwd}`);
         console.log("");
+        const docUc = supportsColor();
+        const docOk = docUc ? "✓" : "[ok]";
+        const docNo = docUc ? "✗" : "[x]";
+        const docDash = docUc ? "—" : "-";
         console.log("Readiness:");
-        console.log(`  Credentials:  ${assets.credentialsFound ? "✓" : "✗ — run \`prompts-gpt init --token <token>\`"}`);
-        console.log(`  Config:       ${assets.configFound ? "✓" : "✗ — run \`prompts-gpt setup\`"}`);
-        console.log(`  Manifest:     ${assets.manifestFound ? "✓" : "✗ — run \`prompts-gpt sync\`"}`);
+        console.log(`  Credentials:  ${assets.credentialsFound ? docOk : `${docNo} ${docDash} run \`prompts-gpt init --token <token>\``}`);
+        console.log(`  Config:       ${assets.configFound ? docOk : `${docNo} ${docDash} run \`prompts-gpt setup\``}`);
+        console.log(`  Manifest:     ${assets.manifestFound ? docOk : `${docNo} ${docDash} run \`prompts-gpt sync\``}`);
         const cloudCount = assets.prompts.filter((p) => p.source === "library" || p.source === "generated").length;
         const localCount = assets.prompts.filter((p) => p.source === "local").length;
         const promptSummary = assets.prompts.length > 0
-            ? `✓ (${assets.prompts.length}${cloudCount > 0 ? `, ${cloudCount} synced` : ""}${localCount > 0 ? `, ${localCount} local-only` : ""})`
-            : "✗ — none found";
+            ? `${docOk} (${assets.prompts.length}${cloudCount > 0 ? `, ${cloudCount} synced` : ""}${localCount > 0 ? `, ${localCount} local-only` : ""})`
+            : `${docNo} ${docDash} none found`;
         console.log(`  Prompts:      ${promptSummary}`);
-        console.log(`  Sweeps:       ${assets.sweeps.length > 0 ? `✓ (${assets.sweeps.length})` : "— none found"}`);
-        console.log(`  Agents:       ${assets.agents.length > 0 ? `✓ (${assets.agents.length} targets)` : "✗ — run \`prompts-gpt sync\`"}`);
+        console.log(`  Sweeps:       ${assets.sweeps.length > 0 ? `${docOk} (${assets.sweeps.length})` : `${docDash} none found`}`);
+        console.log(`  Agents:       ${assets.agents.length > 0 ? `${docOk} (${assets.agents.length} targets)` : `${docNo} ${docDash} run \`prompts-gpt sync\``}`);
         if (availableProviders.length > 0) {
-            console.log(`  Providers:    ✓`);
+            console.log(`  Providers:    ${docOk}`);
             for (const p of availableProviders) {
                 console.log(`    ${p.provider}: ${p.bin} | model: ${p.modelDefault}${p.version ? ` | ${p.version}` : ""}`);
             }
         }
         else {
-            console.log("  Providers:    ✗ — no CLI found. Install one:");
+            console.log(`  Providers:    ${docNo} ${docDash} no CLI found. Install one:`);
             console.log("    npm install -g @openai/codex            # Codex");
             console.log("    npm install -g @anthropic-ai/claude-code # Claude Code");
             console.log("    # Cursor: install Cursor IDE (includes agent CLI)");
@@ -620,7 +686,7 @@ async function runCommand(command, flags) {
                 const mStat = statSync(statusModelCache);
                 const ageMs = Date.now() - mStat.mtimeMs;
                 const ageDays = Math.floor(ageMs / (1000 * 60 * 60 * 24));
-                console.log(`  Models:       ${ageDays <= 7 ? "✓" : "⚠"} synced ${ageDays === 0 ? "today" : `${ageDays}d ago`}${ageDays > 7 ? " — run 'prompts-gpt sync-models'" : ""}`);
+                console.log(`  Models:       ${ageDays <= 7 ? docOk : (docUc ? "⚠" : "[!]")} synced ${ageDays === 0 ? "today" : `${ageDays}d ago`}${ageDays > 7 ? ` ${docDash} run 'prompts-gpt sync-models'` : ""}`);
             }
             catch { /* skip */ }
         }
@@ -679,8 +745,10 @@ async function runCommand(command, flags) {
                     issues.push("no iterations in frontmatter");
                 if (!fm.title)
                     issues.push("no title heading");
-                const icon = issues.length === 0 ? "✓" : "⚠";
-                console.log(`  ${icon} ${s.name}${issues.length > 0 ? ` — ${issues.join(", ")}` : ""}`);
+                const valUc = supportsColor();
+                const icon = issues.length === 0 ? (valUc ? "✓" : "[ok]") : (valUc ? "⚠" : "[!]");
+                const sep = issues.length > 0 ? (valUc ? " — " : " - ") : "";
+                console.log(`  ${icon} ${s.name}${issues.length > 0 ? `${sep}${issues.join(", ")}` : ""}`);
             }
         }
         const modelCachePath = path.resolve(cwd, DEFAULT_PROMPTS_GPT_OUT_DIR, ".models.json");
@@ -690,14 +758,14 @@ async function runCommand(command, flags) {
             const ageMs = Date.now() - mStat.mtimeMs;
             const ageDays = Math.floor(ageMs / (1000 * 60 * 60 * 24));
             if (ageDays > 7) {
-                console.log(`\n⚠ Model registry is ${ageDays} days old. Run 'prompts-gpt sync-models' to refresh.`);
+                console.log(`\n${sym("⚠", "!")} Model registry is ${ageDays} days old. Run 'prompts-gpt sync-models' to refresh.`);
             }
             else {
-                console.log(`\n✓ Model registry: synced ${ageDays === 0 ? "today" : `${ageDays}d ago`}`);
+                console.log(`\n${sym("✓", "+")} Model registry: synced ${ageDays === 0 ? "today" : `${ageDays}d ago`}`);
             }
         }
         catch {
-            console.log("\n⚠ Model registry not synced. Run 'prompts-gpt sync-models'.");
+            console.log(`\n${sym("⚠", "!")} Model registry not synced. Run 'prompts-gpt sync-models'.`);
         }
         if (result.valid && result.errors.length === 0 && result.warnings.length === 0) {
             console.log("  No issues found.");
@@ -862,6 +930,86 @@ async function runCommand(command, flags) {
                 console.error(`[warning] ${mismatchWarning}`);
             }
         }
+        // Watch mode — re-run on file change
+        if (Boolean(flags.watch)) {
+            const watchTarget = getStringFlag(flags, "prompt-file") || config.defaultPromptFile;
+            if (!watchTarget) {
+                throw new CliError("--watch requires a prompt file (use --prompt-file or set a default)", CLI_EXIT_CODES.usage);
+            }
+            const resolvedWatch = path.resolve(cwd, watchTarget);
+            console.log(`Watching ${path.basename(resolvedWatch)} for changes... (Ctrl+C to stop)\n`);
+            const { watch: fsWatch } = await import("node:fs");
+            let running = false;
+            const doRun = async () => {
+                if (running)
+                    return;
+                running = true;
+                console.log(`\n${colorize("▶ Running...", "\x1b[36m")} (${new Date().toLocaleTimeString()})`);
+                try {
+                    const r = await runPrompt({
+                        cwd,
+                        promptFile: watchTarget,
+                        agent,
+                        model: modelFlag,
+                        timeoutSeconds: parsePositiveIntFlag(getStringFlag(flags, "timeout"), "timeout"),
+                        artifactsDir: getStringFlag(flags, "artifacts-dir"),
+                        approveMcps: !Boolean(flags["no-approve-mcps"]),
+                        sandboxMode: getStringFlag(flags, "sandbox"),
+                        permissionMode: getStringFlag(flags, "permission-mode"),
+                    });
+                    const icon = r.exitCode === 0 ? colorize("✓", "\x1b[32m") : colorize("✗", "\x1b[31m");
+                    console.log(`${icon} ${r.provider} exit=${r.exitCode} (${formatDuration(r.durationMs)})`);
+                }
+                catch (err) {
+                    console.error(`  Error: ${err instanceof Error ? err.message : String(err)}`);
+                }
+                finally {
+                    running = false;
+                    console.log(`\n  Watching for changes...`);
+                }
+            };
+            await doRun();
+            let debounce = null;
+            const watcher = fsWatch(resolvedWatch, () => {
+                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();
+            });
+            await new Promise((resolve) => {
+                let settled = false;
+                const settle = () => { if (settled)
+                    return; settled = true; watcher.close(); if (debounce) {
+                    clearTimeout(debounce);
+                    debounce = null;
+                } resolve(); };
+                const onSignal = () => { settle(); };
+                process.on("SIGINT", onSignal);
+                process.on("SIGTERM", onSignal);
+                watcher.on("close", () => {
+                    process.removeListener("SIGINT", onSignal);
+                    process.removeListener("SIGTERM", onSignal);
+                    settle();
+                });
+            });
+            return;
+        }
+        // B4: --verbose shows detailed execution info
+        if (Boolean(flags.verbose) && !Boolean(flags.json)) {
+            const providers = await detectProviders(cwd);
+            const resolved = resolveRunProvider(agent, providers, config.providerOrder);
+            const resolvedModel = modelFlag?.trim() || config.modelOverrides[resolved]?.trim() || "(default)";
+            console.log(colorize("[verbose]", "\x1b[90m") + ` provider=${resolved} model=${resolvedModel} agent=${agent} timeout=${getStringFlag(flags, "timeout") || config.timeoutSeconds}s`);
+        }
         const result = await runPrompt({
             cwd,
             promptFile,
@@ -879,8 +1027,8 @@ async function runCommand(command, flags) {
             console.log(JSON.stringify(result, null, 2));
             return;
         }
-        const agentLabel = getStringFlag(flags, "agent") ? result.provider : `${result.provider} (auto — first available from provider order)`;
-        console.log(`Run ID: ${result.runId}`);
+        const agentLabel = getStringFlag(flags, "agent") ? result.provider : `${result.provider} (auto-selected)`;
+        console.log(`\n${sym("▸", ">")} Run ID: ${result.runId}`);
         console.log(`Provider: ${agentLabel} | Model: ${result.model}`);
         console.log(`Exit code: ${result.exitCode}`);
         console.log(`Duration: ${formatDuration(result.durationMs)}`);
@@ -890,6 +1038,7 @@ async function runCommand(command, flags) {
         console.log(`Run dir: ${result.runDir}`);
         console.log(`Summary: ${result.summaryFile}`);
         console.log(`Log: ${result.logFile}`);
+        console.log(`Diff: prompts-gpt diff ${result.runId}`);
         if (result.exitCode === 0) {
             try {
                 const { readFile: fsRead } = await import("node:fs/promises");
@@ -981,6 +1130,22 @@ async function runCommand(command, flags) {
     }
     if (command === "sweep") {
         const cwd = getResolvedCwd(flags);
+        // B1: Handle --force-unlock to clear stale sweep locks
+        if (Boolean(flags["force-unlock"])) {
+            const { forceReleaseSweepLock } = await import("./index.js");
+            const released = await forceReleaseSweepLock(cwd);
+            if (released) {
+                console.log("Sweep lock forcefully released.");
+            }
+            else {
+                console.log("No sweep lock found.");
+            }
+            return;
+        }
+        // Auto-detect CI and force non-interactive mode
+        if (isCI() && !flags["non-interactive"]) {
+            flags["non-interactive"] = true;
+        }
         const sweepPromptFile = getStringFlag(flags, "prompt-file");
         const config = await loadRunConfig(cwd);
         warnOnConfigIssues(config);
@@ -1188,8 +1353,14 @@ async function runCommand(command, flags) {
         const quiet = Boolean(flags.quiet);
         const summaryLineCount = parsePositiveIntFlag(getStringFlag(flags, "summary-lines"), "summary-lines") ?? 40;
         const sweepDurations = [];
+        const sweepUc = supportsColor();
+        // B11: When --json, emit NDJSON progress lines instead of silencing
         const onProgress = Boolean(flags.json)
-            ? undefined
+            ? (event) => {
+                if (event.type !== "message" && event.type !== "tool") {
+                    console.log(JSON.stringify(event));
+                }
+            }
             : (event) => {
                 if (event.type === "preflight") {
                     const report = JSON.parse(event.message);
@@ -1208,97 +1379,118 @@ async function runCommand(command, flags) {
                     const maxRunDirs = parsePositiveIntFlag(getStringFlag(flags, "max-run-dirs"), "max-run-dirs") ?? 20;
                     console.log(`Log rotation: keep ${maxRunDirs} runs`);
                     for (const w of report.warnings)
-                        console.log(`⚠ ${w}`);
+                        console.log(`${sweepUc ? "⚠" : "[!]"} ${w}`);
                 }
                 else if (event.type === "iteration_start") {
-                    console.log(`\n${colorize("══════════════════════════════════════════════════════════════", "\x1b[35m")}`);
+                    const progressBar = buildProgressBar(event.iteration - 1, event.total, 40);
+                    const divider = supportsColor() ? "\u2550".repeat(62) : "=".repeat(62);
+                    console.log(`\n${colorize(divider, "\x1b[35m")}`);
                     console.log(colorize(`[${new Date().toLocaleTimeString()}] Iteration ${event.iteration}/${event.total}: ${event.provider} (${event.model})`, "\x1b[1;35m"));
-                    console.log(colorize("══════════════════════════════════════════════════════════════", "\x1b[35m"));
+                    console.log(`  ${progressBar}`);
+                    console.log(colorize(divider, "\x1b[35m"));
                 }
                 else if (event.type === "message") {
                     if (!quiet) {
                         const truncText = event.text.length > 120 ? `${event.text.slice(0, 117)}...` : event.text;
-                        console.log(`  ${colorize(`[${event.elapsed}]`, "\x1b[36m")} 💬 ${truncText}`);
+                        console.log(`  ${colorize(`[${event.elapsed}]`, "\x1b[36m")} ${sweepUc ? "💬" : "[msg]"} ${truncText}`);
                     }
                 }
                 else if (event.type === "tool") {
                     if (!quiet) {
                         const c = event.counts;
-                        let icon = "🔧";
+                        let icon = sweepUc ? "🔧" : "[tool]";
                         let friendlyAction = event.action;
                         if (event.action.includes("read")) {
-                            icon = "📖";
+                            icon = sweepUc ? "📖" : "[read]";
                             friendlyAction = "read";
                         }
                         else if (event.action.includes("write") || event.action.includes("edit") || event.action === "str_replace") {
-                            icon = "✏️ ";
+                            icon = sweepUc ? "✏️ " : "[write]";
                             friendlyAction = "write";
                         }
                         else if (event.action.includes("shell") || event.action === "bash") {
-                            icon = "⚡";
+                            icon = sweepUc ? "⚡" : "[shell]";
                             friendlyAction = "shell";
                         }
                         else if (event.action.includes("search") || event.action.includes("grep") || event.action.includes("glob")) {
-                            icon = "🔍";
+                            icon = sweepUc ? "🔍" : "[find]";
                             friendlyAction = "search";
                         }
                         else if (event.action.includes("todo")) {
-                            icon = "📋";
+                            icon = sweepUc ? "📋" : "[todo]";
                             friendlyAction = "todo";
                         }
                         else if (event.action.includes("web") || event.action.includes("fetch")) {
-                            icon = "🌐";
+                            icon = sweepUc ? "🌐" : "[web]";
                             friendlyAction = "web";
                         }
                         else {
                             friendlyAction = event.action.replace(/ToolCall$/i, "").replace(/Tool$/i, "");
                         }
                         const fileStr = event.file ? ` ${colorize(event.file, "\x1b[90m")}` : "";
-                        const countStr = colorize(`(R:${c.reads} W:${c.writes} S:${c.shells} 🔍:${c.searches})`, "\x1b[90m");
+                        const searchIcon = sweepUc ? "🔍" : "Q";
+                        const countStr = colorize(`(R:${c.reads} W:${c.writes} S:${c.shells} ${searchIcon}:${c.searches})`, "\x1b[90m");
                         console.log(`  ${icon} ${friendlyAction}${fileStr}  ${countStr}`);
                     }
                 }
                 else if (event.type === "iteration_end") {
                     const elapsed = formatDuration(event.durationMs);
-                    const icon = event.status === "success" ? colorize("✓", "\x1b[32m") : colorize("✗", "\x1b[31m");
+                    const icon = event.status === "success" ? colorize(sweepUc ? "✓" : "OK", "\x1b[32m") : colorize(sweepUc ? "✗" : "FAIL", "\x1b[31m");
                     sweepDurations.push(event.durationMs);
                     const remaining = ((parseInt(String(getStringFlag(flags, "iterations"))) || 1) - event.iteration);
                     let etaStr = "";
                     if (remaining > 0 && sweepDurations.length > 0) {
-                        const avgMs = sweepDurations.reduce((a, b) => a + b, 0) / sweepDurations.length;
+                        // Use exponentially weighted moving average for better ETA (recent iterations weigh more)
+                        const n = sweepDurations.length;
+                        let avgMs;
+                        if (n <= 2) {
+                            avgMs = sweepDurations.reduce((a, b) => a + b, 0) / n;
+                        }
+                        else {
+                            const recentWeight = 0.7;
+                            const recentCount = Math.max(1, Math.floor(n / 2));
+                            const recentAvg = sweepDurations.slice(-recentCount).reduce((a, b) => a + b, 0) / recentCount;
+                            const overallAvg = sweepDurations.reduce((a, b) => a + b, 0) / n;
+                            avgMs = recentAvg * recentWeight + overallAvg * (1 - recentWeight);
+                        }
                         etaStr = ` | ETA: ~${formatDuration(avgMs * remaining)}`;
                     }
                     console.log(`${icon} Iteration ${event.iteration} ${event.status} (${elapsed})${etaStr}`);
                 }
                 else if (event.type === "attempt_retry") {
-                    console.log(colorize(`  ⟳ Retry ${event.attempt}/${event.maxAttempts} for iteration ${event.iteration}, backoff ${event.backoffMs}ms`, "\x1b[33m"));
+                    console.log(colorize(`  ${sweepUc ? "⟳" : "[retry]"} Retry ${event.attempt}/${event.maxAttempts} for iteration ${event.iteration}, backoff ${event.backoffMs}ms`, "\x1b[33m"));
                 }
                 else if (event.type === "summary") {
                     if (summaryLineCount > 0) {
                         const preview = event.lines.slice(0, summaryLineCount);
-                        console.log(`\n── Summary (iteration ${event.iteration}, ${preview.length}/${event.lines.length} lines) ──`);
+                        const sumDash = sweepUc ? "──" : "--";
+                        console.log(`\n${sumDash} Summary (iteration ${event.iteration}, ${preview.length}/${event.lines.length} lines) ${sumDash}`);
                         for (const line of preview)
                             console.log(`  ${line}`);
                         if (event.lines.length > summaryLineCount) {
                             console.log(`  ... (${event.lines.length - summaryLineCount} more lines)`);
                         }
-                        console.log("── End summary ──");
+                        console.log(`${sumDash} End summary ${sumDash}`);
                     }
                 }
                 else if (event.type === "sweep_end") {
                     const r = event.result;
                     const cW = 62;
-                    const cBar = "═".repeat(cW);
+                    const uc = supportsColor();
+                    const [boxTL, boxH, boxTR, boxV, boxML, boxMR, boxBL, boxBR] = uc
+                        ? ["\u2554", "\u2550", "\u2557", "\u2551", "\u2560", "\u2563", "\u255A", "\u255D"]
+                        : ["+", "=", "+", "|", "+", "+", "+", "+"];
+                    const cBar = boxH.repeat(cW);
                     const cRow = (label, val) => {
                         const plain = `  ${label.padEnd(12)} ${val}`;
-                        console.log(`${colorize("║", "\x1b[36m")}${plain.padEnd(cW)}${colorize("║", "\x1b[36m")}`);
+                        console.log(`${colorize(boxV, "\x1b[36m")}${plain.padEnd(cW)}${colorize(boxV, "\x1b[36m")}`);
                     };
                     console.log("");
-                    console.log(colorize(`╔${cBar}╗`, "\x1b[36m"));
+                    console.log(colorize(`${boxTL}${cBar}${boxTR}`, "\x1b[36m"));
                     const cTitle = "Sweep Complete";
                     const cTitlePad = Math.floor((cW - cTitle.length) / 2);
-                    console.log(colorize(`║${" ".repeat(cTitlePad)}${cTitle}${" ".repeat(cW - cTitlePad - cTitle.length)}║`, "\x1b[36m"));
-                    console.log(colorize(`╠${cBar}╣`, "\x1b[36m"));
+                    console.log(colorize(`${boxV}${" ".repeat(cTitlePad)}${cTitle}${" ".repeat(cW - cTitlePad - cTitle.length)}${boxV}`, "\x1b[36m"));
+                    console.log(colorize(`${boxML}${cBar}${boxMR}`, "\x1b[36m"));
                     cRow("Model:", r.model);
                     cRow("Duration:", formatDuration(r.totalDurationMs));
                     cRow("Iterations:", String(r.totalIterations));
@@ -1306,13 +1498,13 @@ async function runCommand(command, flags) {
                     if (r.failed > 0) {
                         cRow("Failed:", String(r.failed));
                     }
-                    console.log(colorize(`╠${cBar}╣`, "\x1b[36m"));
+                    console.log(colorize(`${boxML}${cBar}${boxMR}`, "\x1b[36m"));
                     for (const iter of r.iterations) {
-                        const statusIcon = iter.status === "success" ? "✓" : "✗";
+                        const statusIcon = iter.status === "success" ? (uc ? "\u2713" : "+") : (uc ? "\u2717" : "x");
                         const plain = `  ${statusIcon} Iter ${iter.iteration}:  ${iter.status.padEnd(16)} ${formatDuration(iter.durationMs)}`;
-                        console.log(`${colorize("║", "\x1b[36m")}${plain.padEnd(cW)}${colorize("║", "\x1b[36m")}`);
+                        console.log(`${colorize(boxV, "\x1b[36m")}${plain.padEnd(cW)}${colorize(boxV, "\x1b[36m")}`);
                     }
-                    console.log(colorize(`╚${cBar}╝`, "\x1b[36m"));
+                    console.log(colorize(`${boxBL}${cBar}${boxBR}`, "\x1b[36m"));
                     if (hasTokenUsage(r.tokenUsage)) {
                         const tu = r.tokenUsage;
                         console.log(`Tokens: ${formatTokenUsage(tu)}`);
@@ -1323,6 +1515,72 @@ async function runCommand(command, flags) {
                     }
                 }
             };
+        // Build eval config if --eval flag is set
+        const evalConfig = Boolean(flags.eval) ? {
+            enabled: true,
+            evaluatorAgent: getStringFlag(flags, "eval-agent"),
+            criteria: getStringFlag(flags, "eval-criteria")?.split(",").map((c) => c.trim()),
+        } : undefined;
+        // Parallel sweep — run N iterations concurrently
+        const parallelCount = parsePositiveIntFlag(getStringFlag(flags, "parallel"), "parallel");
+        if (parallelCount && parallelCount > 1) {
+            const totalIterations = parsePositiveIntFlag(getStringFlag(flags, "iterations"), "iterations") ?? 1;
+            const batchSize = Math.min(parallelCount, totalIterations);
+            if (totalIterations > 1) {
+                console.log(`Note: Parallel sweep runs independent iterations (no inter-iteration summary chaining).`);
+            }
+            console.log(`Running ${totalIterations} iterations with parallelism=${batchSize}...`);
+            const allResults = [];
+            const parallelWallClockStart = Date.now();
+            for (let batchStart = 0; batchStart < totalIterations; batchStart += batchSize) {
+                const batchEnd = Math.min(batchStart + batchSize, totalIterations);
+                const batchPromises = [];
+                for (let i = batchStart; i < batchEnd; i++) {
+                    batchPromises.push(sweepPrompt({
+                        cwd,
+                        promptFile: getStringFlag(flags, "prompt-file"),
+                        agent,
+                        model: getStringFlag(flags, "model"),
+                        iterations: 1,
+                        iterationTimeoutSeconds: parsePositiveIntFlag(getStringFlag(flags, "iteration-timeout"), "iteration-timeout"),
+                        maxRetries: parseNonNegativeIntFlag(getStringFlag(flags, "max-retries"), "max-retries"),
+                        artifactsDir: getStringFlag(flags, "artifacts-dir"),
+                        runId: `${getStringFlag(flags, "run-id") || "sweep"}-parallel-${i + 1}`,
+                        approveMcps: !Boolean(flags["no-approve-mcps"]),
+                        sandboxMode: getStringFlag(flags, "sandbox"),
+                        phase: getStringFlag(flags, "phase"),
+                        dryRun: Boolean(flags["dry-run"]),
+                        maxRunDirs: parsePositiveIntFlag(getStringFlag(flags, "max-run-dirs"), "max-run-dirs"),
+                        summaryLines: parsePositiveIntFlag(getStringFlag(flags, "summary-lines"), "summary-lines"),
+                        background: Boolean(flags.background),
+                        permissionMode: getStringFlag(flags, "permission-mode"),
+                        evalAfterEachIteration: evalConfig,
+                    }));
+                }
+                const batchResults = await Promise.allSettled(batchPromises);
+                for (const br of batchResults) {
+                    if (br.status === "fulfilled")
+                        allResults.push(br.value);
+                }
+            }
+            const totalSucceeded = allResults.reduce((s, r) => s + r.succeeded, 0);
+            const totalFailed = allResults.reduce((s, r) => s + r.failed, 0);
+            const totalDuration = Date.now() - parallelWallClockStart;
+            if (Boolean(flags.json)) {
+                const jsonResults = allResults.map((r) => ({
+                    ...r,
+                    iterations: r.iterations.map((it) => ({ ...it, toolCounts: it.toolCounts ?? null })),
+                }));
+                console.log(JSON.stringify({ parallel: true, results: jsonResults, totalSucceeded, totalFailed, totalDurationMs: totalDuration }, null, 2));
+            }
+            else {
+                console.log(`\nParallel sweep complete: ${totalSucceeded}/${totalIterations} succeeded, ${totalFailed} failed`);
+                console.log(`Total wall-clock time: ${formatDuration(totalDuration)}`);
+            }
+            if (totalFailed > 0)
+                process.exitCode = 1;
+            return;
+        }
         const result = await sweepPrompt({
             cwd,
             promptFile: getStringFlag(flags, "prompt-file"),
@@ -1341,6 +1599,7 @@ async function runCommand(command, flags) {
             summaryLines: parsePositiveIntFlag(getStringFlag(flags, "summary-lines"), "summary-lines"),
             background: Boolean(flags.background),
             permissionMode: getStringFlag(flags, "permission-mode"),
+            evalAfterEachIteration: evalConfig,
             onProgress,
         });
         if (Boolean(flags.json)) {
@@ -1439,6 +1698,223 @@ async function runCommand(command, flags) {
         }
         return;
     }
+    if (command === "orchestrate") {
+        const cwd = getResolvedCwd(flags);
+        const mode = getStringFlag(flags, "mode");
+        if (!mode || !["parallel", "pipeline", "eval"].includes(mode)) {
+            throw new CliError("The --mode flag is required and must be one of: parallel, pipeline, eval", CLI_EXIT_CODES.usage);
+        }
+        const dryRun = Boolean(flags["dry-run"]);
+        const jsonOutput = Boolean(flags.json);
+        const timeoutSeconds = parsePositiveIntFlag(getStringFlag(flags, "timeout"), "timeout");
+        const orchUc = supportsColor();
+        const orchBar = orchUc ? "═══" : "===";
+        const onProgress = jsonOutput
+            ? undefined
+            : (event) => {
+                if (event.type === "orchestrate_start") {
+                    console.log(`\n${colorize(`${orchBar} Orchestration`, "\x1b[35m")} mode=${event.mode}${event.providers ? ` providers=${event.providers.join(",")}` : ""} ${colorize(orchBar, "\x1b[35m")}`);
+                }
+                else if (event.type === "provider_start") {
+                    const stepLabel = event.step ? ` [${event.step}]` : "";
+                    console.log(`  ${orchUc ? "▶" : ">"} ${event.provider}${stepLabel} starting...`);
+                }
+                else if (event.type === "provider_end") {
+                    const icon = event.exitCode === 0 ? colorize(orchUc ? "✓" : "OK", "\x1b[32m") : colorize(orchUc ? "✗" : "FAIL", "\x1b[31m");
+                    console.log(`  ${icon} ${event.provider} finished (${formatDuration(event.durationMs)}, exit=${event.exitCode})`);
+                }
+                else if (event.type === "eval_start") {
+                    console.log(`  ${orchUc ? "🧪" : "[eval]"} Evaluating with ${event.evaluator}...`);
+                }
+                else if (event.type === "eval_end") {
+                    console.log(`  ${orchUc ? "📊" : "[score]"} Score: ${event.score}/100`);
+                }
+                else if (event.type === "orchestrate_end") {
+                    console.log(`\n${colorize(orchBar, "\x1b[35m")} Done in ${formatDuration(event.totalDurationMs)}${event.winner ? ` | Winner: ${event.winner}` : ""} ${colorize(orchBar, "\x1b[35m")}\n`);
+                }
+            };
+        if (mode === "parallel") {
+            const providersStr = getStringFlag(flags, "providers");
+            if (!providersStr) {
+                throw new CliError("--providers is required for parallel mode (e.g. --providers codex,claude,cursor)", CLI_EXIT_CODES.usage);
+            }
+            const providers = providersStr.split(",").map((p) => p.trim()).filter(Boolean);
+            const promptFile = getStringFlag(flags, "prompt-file");
+            if (!promptFile) {
+                throw new CliError("--prompt-file is required for orchestrate", CLI_EXIT_CODES.usage);
+            }
+            const criteriaStr = getStringFlag(flags, "criteria");
+            const criteria = criteriaStr ? criteriaStr.split(",").map((c) => c.trim()) : undefined;
+            const evaluator = getStringFlag(flags, "evaluator");
+            const result = await orchestrateParallel({
+                cwd,
+                promptFile,
+                providers,
+                scoringCriteria: criteria,
+                evaluatorProvider: evaluator,
+                timeoutSeconds,
+                dryRun,
+                onProgress,
+            });
+            if (jsonOutput) {
+                console.log(JSON.stringify(result, null, 2));
+            }
+            else {
+                console.log("Results:");
+                for (const run of result.runs) {
+                    const icon = run.result.exitCode === 0 ? sym("✓", "+") : sym("✗", "x");
+                    console.log(`  ${icon} ${run.provider}: ${run.score}/100 — ${run.reasoning}`);
+                }
+                if (result.winner) {
+                    console.log(`\n  ${sym("🏆", "[W]")} Winner: ${result.winner.provider} (${result.winner.score}/100)`);
+                }
+            }
+            return;
+        }
+        if (mode === "pipeline") {
+            const stepsFile = getStringFlag(flags, "steps");
+            if (!stepsFile) {
+                throw new CliError("--steps <pipeline-config.json> is required for pipeline mode", CLI_EXIT_CODES.usage);
+            }
+            if (!existsSync(stepsFile)) {
+                throw new CliError(`Pipeline steps file not found: ${stepsFile}`, CLI_EXIT_CODES.usage);
+            }
+            const stepsJson = JSON.parse(readFileSync(stepsFile, "utf8"));
+            if (!Array.isArray(stepsJson) || stepsJson.length === 0) {
+                throw new CliError("Pipeline steps file must contain a non-empty JSON array", CLI_EXIT_CODES.usage);
+            }
+            for (const step of stepsJson) {
+                if (step.promptFile && !existsSync(path.resolve(cwd, step.promptFile))) {
+                    throw new CliError(`Pipeline step "${step.name}" references missing prompt file: ${step.promptFile}`, CLI_EXIT_CODES.usage);
+                }
+            }
+            const result = await orchestratePipeline({
+                cwd,
+                steps: stepsJson,
+                timeoutSeconds,
+                dryRun,
+                onProgress,
+            });
+            if (jsonOutput) {
+                console.log(JSON.stringify(result, null, 2));
+            }
+            else {
+                console.log("Pipeline Results:");
+                for (const step of result.steps) {
+                    const icon = step.result.exitCode === 0 ? sym("✓", "+") : sym("✗", "x");
+                    console.log(`  ${icon} ${step.name} (${step.provider}) — ${formatDuration(step.durationMs)}`);
+                }
+                console.log(`\n  Total: ${formatDuration(result.totalDurationMs)}`);
+            }
+            return;
+        }
+        if (mode === "eval") {
+            const promptFile = getStringFlag(flags, "prompt-file");
+            if (!promptFile) {
+                throw new CliError("--prompt-file is required for orchestrate eval mode", CLI_EXIT_CODES.usage);
+            }
+            const agent = getStringFlag(flags, "agent");
+            const evaluator = getStringFlag(flags, "evaluator");
+            const criteriaStr = getStringFlag(flags, "criteria");
+            const criteria = criteriaStr ? criteriaStr.split(",").map((c) => c.trim()) : undefined;
+            const result = await orchestrateEval({
+                cwd,
+                promptFile,
+                agent,
+                evaluatorAgent: evaluator,
+                criteria,
+                timeoutSeconds,
+                dryRun,
+                onProgress,
+            });
+            if (jsonOutput) {
+                console.log(JSON.stringify(result, null, 2));
+            }
+            else {
+                console.log(`Run: exit=${result.run.exitCode ?? "?"} provider=${result.run.provider ?? "?"}`);
+                console.log(`\nEvaluation:`);
+                console.log(`  Score: ${result.evaluation.score}/${result.evaluation.maxScore}`);
+                console.log(`  Reasoning: ${result.evaluation.reasoning}`);
+                if (Object.keys(result.evaluation.criteriaScores).length > 0) {
+                    console.log(`  Criteria:`);
+                    for (const [key, value] of Object.entries(result.evaluation.criteriaScores)) {
+                        console.log(`    ${key}: ${value}/10`);
+                    }
+                }
+                if (result.evaluation.suggestions.length > 0) {
+                    console.log(`  Suggestions:`);
+                    for (const s of result.evaluation.suggestions) {
+                        console.log(`    - ${s}`);
+                    }
+                }
+            }
+            return;
+        }
+        return;
+    }
+    if (command === "diff") {
+        const cwd = getResolvedCwd(flags);
+        const runId = getStringFlag(flags, "run-id");
+        const config = await loadRunConfig(cwd);
+        const artifactsDir = path.resolve(cwd, config.artifactsDir);
+        if (!runId) {
+            if (!existsSync(artifactsDir)) {
+                throw new CliError("No artifacts directory found. Run a sweep or prompt first.", CLI_EXIT_CODES.usage);
+            }
+            const { readdirSync: listDir } = await import("node:fs");
+            const dirs = listDir(artifactsDir).filter((d) => {
+                try {
+                    return statSync(path.join(artifactsDir, d)).isDirectory();
+                }
+                catch {
+                    return false;
+                }
+            }).sort().reverse().slice(0, 10);
+            if (dirs.length === 0) {
+                throw new CliError("No run directories found in artifacts.", CLI_EXIT_CODES.usage);
+            }
+            console.log("Recent runs:");
+            for (const d of dirs)
+                console.log(`  ${d}`);
+            console.log(`\nUsage: prompts-gpt diff <run-id>`);
+            return;
+        }
+        const runDir = path.resolve(artifactsDir, runId);
+        const caseInsensitive = process.platform === "win32";
+        const runDirCheck = caseInsensitive ? runDir.toLowerCase() : runDir;
+        const artDirCheck = caseInsensitive ? artifactsDir.toLowerCase() : artifactsDir;
+        if (!runDirCheck.startsWith(artDirCheck + path.sep) && runDirCheck !== artDirCheck) {
+            throw new CliError("Invalid run-id: path escapes the artifacts directory.", CLI_EXIT_CODES.usage);
+        }
+        if (!existsSync(runDir)) {
+            throw new CliError(`Run directory not found: ${runDir}`, CLI_EXIT_CODES.usage);
+        }
+        const { readFile: fsRead } = await import("node:fs/promises");
+        const deltaFile = path.join(runDir, "worktree-delta.diff");
+        if (existsSync(deltaFile)) {
+            const delta = await fsRead(deltaFile, "utf8");
+            if (delta.trim()) {
+                console.log(delta);
+            }
+            else {
+                console.log("No worktree changes recorded for this run.");
+            }
+        }
+        else {
+            const beforeFile = path.join(runDir, "worktree-before.txt");
+            const afterFile = path.join(runDir, "worktree-after.txt");
+            if (existsSync(beforeFile) && existsSync(afterFile)) {
+                const before = await fsRead(beforeFile, "utf8");
+                const after = await fsRead(afterFile, "utf8");
+                console.log("Before:\n" + before.slice(0, 2000));
+                console.log("\nAfter:\n" + after.slice(0, 2000));
+            }
+            else {
+                console.log("No diff data available for this run.");
+            }
+        }
+        return;
+    }
     if (command === "quickstart") {
         const cwd = getResolvedCwd(flags);
         const assets = await discoverWorkspaceAssets(cwd);
@@ -1450,7 +1926,7 @@ async function runCommand(command, flags) {
         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 });
         if (gitResult.status !== 0) {
-            console.log("⚠ Not inside a git repository. Prompts-GPT works best in a git repo for worktree tracking.");
+            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");
         }
         if (!assets.credentialsFound) {
@@ -1462,7 +1938,7 @@ async function runCommand(command, flags) {
                 networkOk = false;
             }
             if (!networkOk) {
-                console.log("⚠ Network unavailable. Quickstart requires internet for token validation.\n");
+                console.log(`${sym("⚠", "!")} Network unavailable. Quickstart requires internet for token validation.\n`);
                 console.log("You can still use local sweep files without a network connection:");
                 console.log("  1. Create .prompts-gpt/sweeps/<name>.md with your sweep prompt");
                 console.log("  2. Run: prompts-gpt sweep");
@@ -1477,29 +1953,29 @@ async function runCommand(command, flags) {
             console.log("Run `prompts-gpt quickstart` again after saving your token.");
             return;
         }
-        console.log("✓ Credentials found");
+        console.log(`${sym("✓", "+")} Credentials found`);
         if (!assets.configFound) {
-            console.log("→ Setting up config...");
+            console.log(`${sym("→", "->")} Setting up config...`);
             try {
                 await initRunConfig({ cwd, overwrite: false });
-                console.log("✓ Config created");
+                console.log(`${sym("✓", "+")} Config created`);
             }
             catch {
-                console.log("✓ Config already exists");
+                console.log(`${sym("✓", "+")} Config already exists`);
             }
         }
         else {
-            console.log("✓ Config found");
+            console.log(`${sym("✓", "+")} Config found`);
         }
         if (availableProviders.length === 0) {
             console.log("");
-            console.log("✗ No provider CLIs found. Install at least one:");
+            console.log(`${sym("✗", "x")} No provider CLIs found. Install at least one:`);
             console.log("  - codex:  npm install -g @openai/codex");
             console.log("  - claude: npm install -g @anthropic-ai/claude-code");
             console.log("  - cursor: Install Cursor IDE (includes `agent` CLI)");
             return;
         }
-        console.log(`✓ Providers: ${availableProviders.map((p) => p.provider).join(", ")}`);
+        console.log(`${sym("✓", "+")} Providers: ${availableProviders.map((p) => p.provider).join(", ")}`);
         if (assets.prompts.length === 0 && assets.sweeps.length === 0) {
             console.log("");
             console.log("→ No prompts found. Syncing from Prompts Studio...");
@@ -2163,6 +2639,7 @@ function getCommandOptions(command) {
             "non-interactive": { type: "boolean" },
             verbose: { type: "boolean", short: "v" },
             open: { type: "boolean" },
+            watch: { type: "boolean", short: "w" },
             "list-models": { type: "boolean" },
         };
     }
@@ -2191,7 +2668,38 @@ function getCommandOptions(command) {
             verbose: { type: "boolean", short: "v" },
             open: { type: "boolean" },
             quiet: { type: "boolean", short: "q" },
+            parallel: { type: "string" },
+            eval: { type: "boolean" },
+            "eval-criteria": { type: "string" },
+            "eval-agent": { type: "string" },
             "list-models": { type: "boolean" },
+            "force-unlock": { type: "boolean" },
+            "allow-destructive-git": { type: "boolean" },
+        };
+    }
+    if (command === "orchestrate") {
+        return {
+            help: { type: "boolean" },
+            cwd: { type: "string" },
+            json: { type: "boolean" },
+            mode: { type: "string" },
+            "prompt-file": { type: "string", short: "f" },
+            providers: { type: "string" },
+            evaluator: { type: "string" },
+            criteria: { type: "string" },
+            steps: { type: "string" },
+            agent: { type: "string" },
+            model: { type: "string" },
+            timeout: { type: "string" },
+            "dry-run": { type: "boolean" },
+            "non-interactive": { type: "boolean" },
+        };
+    }
+    if (command === "diff") {
+        return {
+            help: { type: "boolean" },
+            cwd: { type: "string" },
+            "run-id": { type: "string" },
         };
     }
     if (command === "models") {
@@ -2228,7 +2736,15 @@ function getCommandOptions(command) {
             agent: { type: "string" },
         };
     }
-    if (command === "quickstart" || command === "list" || command === "status" || command === "validate" || command === "providers" || command === "doctor") {
+    if (command === "doctor") {
+        return {
+            help: { type: "boolean" },
+            cwd: { type: "string" },
+            json: { type: "boolean" },
+            fix: { type: "boolean" },
+        };
+    }
+    if (command === "quickstart" || command === "list" || command === "status" || command === "validate" || command === "providers") {
         return {
             help: { type: "boolean" },
             cwd: { type: "string" },
@@ -2498,7 +3014,10 @@ function validateProviderOrderFlag(values) {
     }
 }
 function getResolvedCwd(flags) {
-    return path.resolve(getStringFlag(flags, "cwd") || process.cwd());
+    const raw = getStringFlag(flags, "cwd")?.trim();
+    // B19: Strip surrounding quotes that may appear when shell doesn't consume them
+    const cleaned = raw?.replace(/^["']|["']$/g, "");
+    return path.resolve(cleaned || process.cwd());
 }
 function getStringFlag(flags, name) {
     const value = flags[name];
@@ -2618,11 +3137,22 @@ Global options:
   --json          Output structured JSON (for run, sweep, list, etc.)
 
 Environment variables:
-  PROMPTS_GPT_TOKEN         Project token (overrides stored credentials)
-  PROMPTS_GPT_API_URL       API URL (default: https://prompts-gpt.com)
-  PROMPTS_GPT_MODEL         Global model override (applied to all providers)
-  PROMPTS_GPT_NON_INTERACTIVE=1  Disable interactive prompts
-  NO_COLOR=1                Disable colored output
+  PROMPTS_GPT_TOKEN                Project token (overrides stored credentials)
+  PROMPTS_GPT_API_URL              API URL (default: https://prompts-gpt.com)
+  PROMPTS_GPT_MODEL                Global model override (all providers)
+  PROMPTS_GPT_RUN_MODEL_CODEX     Model override for codex provider
+  PROMPTS_GPT_RUN_MODEL_CLAUDE    Model override for claude provider
+  PROMPTS_GPT_RUN_MODEL_CURSOR    Model override for cursor provider
+  PROMPTS_GPT_RUN_MODEL_COPILOT   Model override for copilot provider
+  PROMPTS_GPT_RUN_AGENT            Default agent (codex|claude|cursor|copilot|router)
+  PROMPTS_GPT_RUN_PROVIDER_ORDER   Provider priority (comma-separated)
+  PROMPTS_GPT_RUN_TIMEOUT_SECONDS  Default timeout for runs
+  PROMPTS_GPT_RUN_RETRY_COUNT      Number of retries on transient failures
+  PROMPTS_GPT_RUN_ARTIFACTS_DIR    Custom artifacts directory
+  PROMPTS_GPT_RUN_DISALLOW_DESTRUCTIVE_GIT  Block git stash/reset (true/false)
+  PROMPTS_GPT_DEBUG=1              Enable debug logging
+  PROMPTS_GPT_NON_INTERACTIVE=1    Disable interactive prompts
+  NO_COLOR=1                       Disable colored output
 
 Providers: ${ORCHESTRATION_AGENT_PROFILES.filter((p) => p !== "router").join(", ")} (or router for auto-select)
 Agent targets: ${SUPPORTED_AGENT_TARGETS.join(", ")}
@@ -2707,24 +3237,29 @@ const PROVIDER_MODELS = Object.freeze({
         { 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 — previous gen codex", tier: "standard" },
+        { 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: "gpt-5.2-codex", label: "gpt-5.2-codex — API key auth recommended", tier: "standard" },
         { value: "o4-mini", label: "o4-mini — fast reasoning", tier: "fast" },
         { value: "o3", label: "o3 — advanced reasoning", tier: "frontier" },
         { value: "gpt-5.1-codex", label: "gpt-5.1-codex — legacy codex", tier: "budget" },
+        { value: "gpt-5.1-codex-mini", label: "gpt-5.1-codex-mini — small legacy", tier: "budget" },
         { value: "gpt-4.1", label: "gpt-4.1 — legacy", tier: "budget" },
     ],
     claude: [
+        { value: "claude-opus-4-7", label: "claude-opus-4-7 — most capable model", tier: "frontier" },
         { value: "claude-sonnet-4-6", label: "claude-sonnet-4-6 — speed + intelligence ★", tier: "standard" },
-        { value: "claude-opus-4-5", label: "claude-opus-4-5 — previous gen opus", tier: "frontier" },
+        { value: "claude-opus-4-6", label: "claude-opus-4-6 — previous gen frontier", tier: "frontier" },
+        { value: "claude-opus-4-5", label: "claude-opus-4-5 — legacy opus", tier: "standard" },
         { value: "claude-haiku-4-5", label: "claude-haiku-4-5 — fastest near-frontier", tier: "fast" },
     ],
     cursor: [
         { value: "auto", label: "auto — Cursor auto-selects best", tier: "standard" },
+        { value: "opus-4.7", label: "opus-4.7 — Claude Opus latest", tier: "frontier" },
         { value: "claude-4.6-opus-high", label: "claude-4.6-opus-high — frontier reasoning", tier: "frontier" },
         { value: "claude-4.6-opus-high-thinking", label: "claude-4.6-opus-high-thinking — reasoning + thinking", tier: "frontier" },
         { value: "claude-4.6-sonnet-high", label: "claude-4.6-sonnet-high — fast + smart", tier: "standard" },
-        { value: "gpt-5.5-medium", label: "gpt-5.5-medium — GPT frontier", tier: "frontier" },
+        { value: "gpt-5.5-high-fast", label: "gpt-5.5-high-fast — GPT frontier", tier: "frontier" },
         { value: "composer-2", label: "composer-2 — balanced multi-file", tier: "standard" },
         { value: "composer-2-fast", label: "composer-2-fast — speed optimized", tier: "fast" },
         { value: "gpt-5.3-codex", label: "gpt-5.3-codex — OpenAI codex", tier: "standard" },
@@ -2735,14 +3270,21 @@ const PROVIDER_MODELS = Object.freeze({
     ],
     copilot: [
         { value: "auto", label: "auto — Copilot auto-selects", tier: "standard" },
-        { value: "gpt-5.5", label: "gpt-5.5 — frontier", tier: "frontier" },
-        { value: "gpt-5.4-mini", label: "gpt-5.4-mini — fast", tier: "fast" },
-        { value: "claude-sonnet-4-6", label: "claude-sonnet-4-6 — Anthropic", tier: "standard" },
-        { value: "claude-opus-4-5", label: "claude-opus-4-5 — 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: "gpt-5.3-codex", label: "gpt-5.3-codex — OpenAI coding", tier: "standard" },
+        { value: "gpt-5.2-codex", label: "gpt-5.2-codex — OpenAI API key auth", tier: "standard" },
+        { value: "gpt-5.1-codex-max", label: "gpt-5.1-codex-max — extended compute", tier: "frontier" },
+        { value: "gemini-3-pro", label: "gemini-3-pro — Google frontier", tier: "frontier" },
+        { value: "gpt-5-mini", label: "gpt-5-mini — fast included", tier: "fast" },
+        { value: "gpt-4.1", label: "gpt-4.1 — included with subscription", tier: "budget" },
+        { value: "claude-haiku-4-5", label: "claude-haiku-4-5 — fastest", tier: "fast" },
     ],
 });
 const MODEL_ALIASES = {
-    opus: "claude-opus-4-5",
+    opus: "claude-opus-4-7",
     sonnet: "claude-sonnet-4-6",
     haiku: "claude-haiku-4-5",
     codex: "gpt-5.3-codex",
@@ -3106,6 +3648,8 @@ Options:
   --quiet, -q                  Suppress live tool/message logs (keep iteration headers).
   --list-models                List available models for the selected provider.
   --non-interactive            Skip all interactive prompts (same as CI mode).
+  --force-unlock               Force-release a stale sweep lock file.
+  --allow-destructive-git      Allow agents to run git stash/reset/checkout.
   --json                       Print machine-readable JSON output.
   --cwd <path>                 Project directory.
   --help                       Show this command help.
@@ -3115,6 +3659,7 @@ Environment:
   PROMPTS_GPT_MODEL              Global model override.
   PROMPTS_GPT_NON_INTERACTIVE=1  Skip interactive prompts.
   NO_COLOR=1                     Disable colored output.
+  PROMPTS_GPT_DEBUG=1            Enable debug logging.
 
 Model aliases: ${Object.entries(MODEL_ALIASES).map(([k, v]) => `${k} → ${v}`).join(", ")}
 
@@ -3306,13 +3851,56 @@ function supportsColor() {
 function colorize(text, code) {
     return supportsColor() ? `${code}${text}\x1b[0m` : text;
 }
+function supportsUnicode() {
+    if (process.platform === "win32") {
+        return Boolean(process.env.WT_SESSION || process.env.TERM_PROGRAM);
+    }
+    return true;
+}
+function sym(unicode, ascii) {
+    return supportsUnicode() ? unicode : ascii;
+}
+function buildProgressBar(completed, total, width) {
+    const safeTotal = Math.max(total, 1);
+    const safeCompleted = Math.max(0, Math.min(completed, safeTotal));
+    const fraction = safeCompleted / safeTotal;
+    const filled = Math.round(fraction * width);
+    const empty = width - filled;
+    const pct = Math.round(fraction * 100);
+    if (supportsColor()) {
+        const bar = "\u2588".repeat(filled) + "\u2591".repeat(empty);
+        return `\x1b[32m${bar}\x1b[0m ${pct}% (${safeCompleted}/${safeTotal})`;
+    }
+    const bar = "#".repeat(filled) + "-".repeat(empty);
+    return `[${bar}] ${pct}% (${safeCompleted}/${safeTotal})`;
+}
+// B2: Simple spinner for long-running operations
+function createSpinner(label) {
+    if (!process.stdout.isTTY || process.env.NO_COLOR || process.env.CI) {
+        process.stdout.write(`${label}...\n`);
+        return { stop: (text) => { if (text)
+                console.log(text); } };
+    }
+    const frames = supportsUnicode() ? ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"] : ["-", "\\", "|", "/"];
+    let i = 0;
+    const timer = setInterval(() => {
+        process.stdout.write(`\r${frames[i++ % frames.length]} ${label}`);
+    }, 80);
+    return {
+        stop: (finalText) => {
+            clearInterval(timer);
+            process.stdout.write(`\r${" ".repeat(label.length + 4)}\r`);
+            if (finalText)
+                console.log(finalText);
+        },
+    };
+}
 const viewFileCmd = process.platform === "win32" ? "type" : "cat";
 const listDirCmd = process.platform === "win32" ? "dir" : "ls";
 function resolveCliEntry() {
     if (process.argv[1])
         return process.argv[1];
     try {
-        const { fileURLToPath } = require("node:url");
         return fileURLToPath(import.meta.url);
     }
     catch {
@@ -3355,7 +3943,8 @@ function interactiveSelect(prompt, options) {
         let cursor = 0;
         let escBuf = "";
         let filterText = "";
-        const termRows = typeof process.stdout.rows === "number" && process.stdout.rows > 2 ? process.stdout.rows : 24;
+        const rawRows = typeof process.stdout.rows === "number" ? process.stdout.rows : 0;
+        const termRows = rawRows > 2 ? rawRows : 24;
         const maxVisible = Math.min(options.length, Math.max(3, termRows - 4));
         const useUnicode = supportsColor();
         const pointer = useUnicode ? "❯" : ">";
@@ -3581,13 +4170,24 @@ async function interactiveInput(prompt, defaultValue) {
             resolved = true;
             resolve(defaultValue || "");
         });
+        rl.on("SIGINT", () => {
+            if (resolved)
+                return;
+            resolved = true;
+            rl.close();
+            rl.removeAllListeners();
+            resolve(defaultValue || "");
+        });
     });
 }
 async function checkPromptsGptSiteReachable(apiUrl) {
     const target = new URL("/", apiUrl).toString();
     const request = (method) => Promise.race([
         globalThis.fetch(target, { method }),
-        new Promise((_, rej) => setTimeout(() => rej(new Error("timeout")), 5000)),
+        new Promise((_, rej) => {
+            const timer = setTimeout(() => rej(new Error("timeout")), 5000);
+            timer.unref?.();
+        }),
     ]);
     let response = await request("HEAD");
     if (response.status === 405) {
@@ -3633,7 +4233,7 @@ function buildGenerateInput(flags) {
         includeWebSearch: Boolean(flags["web-search"]),
     };
 }
-function sanitizeGenerateInput(value) {
+function redactSecrets(value) {
     return value
         .replace(/pgpt_[a-zA-Z0-9]{4,}/g, "pgpt_***")
         .replace(/sk-[a-zA-Z0-9]{20,}/g, "sk-***")
@@ -3644,6 +4244,9 @@ function sanitizeGenerateInput(value) {
         .replace(/ANTHROPIC_API_KEY=[^\s]+/gi, "ANTHROPIC_API_KEY=***")
         .replace(/OPENAI_API_KEY=[^\s]+/gi, "OPENAI_API_KEY=***");
 }
+function sanitizeGenerateInput(value) {
+    return redactSecrets(value);
+}
 function printDataTransmissionNotice(command, input) {
     console.log(`[notice] The --goal text${input.context ? ", --context" : ""}${input.constraints ? ", --constraints" : ""} you provided will be sent to prompts-gpt.com to generate a prompt.`);
     console.log("[notice] Do not include PII, secrets, or confidential data in these flags.");
@@ -3680,9 +4283,9 @@ main().catch((error) => {
     }
     const msg = error instanceof Error ? error.message : String(error);
     try {
-        console.error(msg.replace(/pgpt_[a-zA-Z0-9]{4,}/g, "pgpt_***"));
+        console.error(redactSecrets(msg));
         if (process.env.PROMPTS_GPT_DEBUG === "1" && error instanceof Error && error.stack) {
-            console.error(error.stack.replace(/pgpt_[a-zA-Z0-9]{4,}/g, "pgpt_***"));
+            console.error(redactSecrets(error.stack));
         }
     }
     catch { /* stderr closed or broken pipe */ }
@@ -3769,4 +4372,42 @@ function formatTokenUsage(usage) {
     }
     return parts.join(" | ");
 }
+function findClosestCommand(input) {
+    const lower = input.toLowerCase();
+    // Exact prefix match
+    const prefixMatch = COMMANDS.find((c) => c.startsWith(lower.slice(0, 3)));
+    if (prefixMatch)
+        return prefixMatch;
+    // Levenshtein-like: find command within edit distance 2
+    let bestMatch = null;
+    let bestDist = 3;
+    for (const cmd of COMMANDS) {
+        const dist = editDistance(lower, cmd);
+        if (dist < bestDist) {
+            bestDist = dist;
+            bestMatch = cmd;
+        }
+    }
+    return bestMatch;
+}
+function editDistance(a, b) {
+    if (a.length === 0)
+        return b.length;
+    if (b.length === 0)
+        return a.length;
+    const matrix = [];
+    for (let i = 0; i <= a.length; i++) {
+        matrix[i] = [i];
+    }
+    for (let j = 0; j <= b.length; j++) {
+        matrix[0][j] = j;
+    }
+    for (let i = 1; i <= a.length; i++) {
+        for (let j = 1; j <= b.length; j++) {
+            const cost = a[i - 1] === b[j - 1] ? 0 : 1;
+            matrix[i][j] = Math.min(matrix[i - 1][j] + 1, matrix[i][j - 1] + 1, matrix[i - 1][j - 1] + cost);
+        }
+    }
+    return matrix[a.length][b.length];
+}
 //# sourceMappingURL=cli.js.map