oh-my-opencode 3.7.2 → 3.7.4

package/dist/cli/index.js

@@ -6513,6 +6513,7 @@ var init_hook_names = __esm(() => {
   HOOK_NAME_MAP = {
     "anthropic-auto-compact": "anthropic-context-window-limit-recovery",
     "sisyphus-orchestrator": "atlas",
+    "sisyphus-gpt-hephaestus-reminder": "no-sisyphus-gpt",
     "empty-message-sanitizer": null
   };
 });
@@ -6550,7 +6551,8 @@ var MODEL_VERSION_MAP;
 var init_model_versions = __esm(() => {
   MODEL_VERSION_MAP = {
     "openai/gpt-5.2-codex": "openai/gpt-5.3-codex",
-    "anthropic/claude-opus-4-5": "anthropic/claude-opus-4-6"
+    "anthropic/claude-opus-4-5": "anthropic/claude-opus-4-6",
+    "anthropic/claude-sonnet-4-5": "anthropic/claude-sonnet-4-6"
   };
 });
 
@@ -6786,7 +6788,7 @@ var init_model_requirements = __esm(() => {
         { providers: ["kimi-for-coding"], model: "k2p5" },
         { providers: ["opencode"], model: "kimi-k2.5-free" },
         { providers: ["zai-coding-plan"], model: "glm-4.7" },
-        { providers: ["opencode"], model: "glm-4.7-free" }
+        { providers: ["opencode"], model: "big-pickle" }
       ],
       requiresAnyModel: true
     },
@@ -6806,8 +6808,8 @@ var init_model_requirements = __esm(() => {
     librarian: {
       fallbackChain: [
         { providers: ["zai-coding-plan"], model: "glm-4.7" },
-        { providers: ["opencode"], model: "glm-4.7-free" },
-        { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-sonnet-4-5" }
+        { providers: ["opencode"], model: "big-pickle" },
+        { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-sonnet-4-6" }
       ]
     },
     explore: {
@@ -6857,7 +6859,7 @@ var init_model_requirements = __esm(() => {
       fallbackChain: [
         { providers: ["kimi-for-coding"], model: "k2p5" },
         { providers: ["opencode"], model: "kimi-k2.5-free" },
-        { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-sonnet-4-5" },
+        { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-sonnet-4-6" },
         { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.2" },
         { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro" }
       ]
@@ -6904,7 +6906,7 @@ var init_model_requirements = __esm(() => {
     },
     "unspecified-low": {
       fallbackChain: [
-        { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-sonnet-4-5" },
+        { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-sonnet-4-6" },
         { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.3-codex", variant: "medium" },
         { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-flash" }
       ]
@@ -6920,7 +6922,7 @@ var init_model_requirements = __esm(() => {
       fallbackChain: [
         { providers: ["kimi-for-coding"], model: "k2p5" },
         { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-flash" },
-        { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-sonnet-4-5" }
+        { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-sonnet-4-6" }
       ]
     }
   };
@@ -7268,6 +7270,17 @@ var init_safe_create_hook = __esm(() => {
 // src/shared/session-directory-resolver.ts
 var init_session_directory_resolver = () => {};
 
+// src/shared/session-tools-store.ts
+var store;
+var init_session_tools_store = __esm(() => {
+  store = new Map;
+});
+
+// src/shared/prompt-tools.ts
+var init_prompt_tools = __esm(() => {
+  init_session_tools_store();
+});
+
 // src/shared/index.ts
 var init_shared = __esm(() => {
   init_model_resolution_pipeline();
@@ -7311,6 +7324,7 @@ var init_shared = __esm(() => {
   init_opencode_storage_paths();
   init_opencode_message_dir();
   init_session_directory_resolver();
+  init_prompt_tools();
 });
 
 // src/cli/config-manager/config-context.ts
@@ -7581,7 +7595,7 @@ function isProviderAvailable(provider, availability) {
 // src/cli/provider-model-id-transform.ts
 function transformModelForProvider(provider, model) {
   if (provider === "github-copilot") {
-    return model.replace("claude-opus-4-6", "claude-opus-4.6").replace("claude-sonnet-4-5", "claude-sonnet-4.5").replace("claude-haiku-4-5", "claude-haiku-4.5").replace("claude-sonnet-4", "claude-sonnet-4").replace("gemini-3-pro", "gemini-3-pro-preview").replace("gemini-3-flash", "gemini-3-flash-preview");
+    return model.replace("claude-opus-4-6", "claude-opus-4.6").replace("claude-sonnet-4-6", "claude-sonnet-4.6").replace("claude-haiku-4-5", "claude-haiku-4.5").replace("claude-sonnet-4", "claude-sonnet-4").replace("gemini-3-pro", "gemini-3-pro-preview").replace("gemini-3-flash", "gemini-3-flash-preview");
   }
   return model;
 }
@@ -7655,6 +7669,14 @@ function generateModelConfig(config) {
       if (req.requiresAnyModel && !isAnyFallbackEntryAvailable(fallbackChain, avail)) {
         continue;
       }
+      if (avail.native.claude && !avail.isMaxPlan) {
+        agents[role] = {
+          model: "anthropic/claude-sonnet-4-6",
+          variant: "max",
+          ultrawork: { model: "anthropic/claude-opus-4-6", variant: "max" }
+        };
+        continue;
+      }
       const resolved2 = resolveModelFromChain(fallbackChain, avail);
       if (resolved2) {
         const variant = resolved2.variant ?? req.variant;
@@ -7698,7 +7720,7 @@ function generateModelConfig(config) {
     categories
   };
 }
-var ZAI_MODEL = "zai-coding-plan/glm-4.7", ULTIMATE_FALLBACK = "opencode/glm-4.7-free", SCHEMA_URL = "https://raw.githubusercontent.com/code-yeongyu/oh-my-opencode/master/assets/oh-my-opencode.schema.json";
+var ZAI_MODEL = "zai-coding-plan/glm-4.7", ULTIMATE_FALLBACK = "opencode/big-pickle", SCHEMA_URL = "https://raw.githubusercontent.com/code-yeongyu/oh-my-opencode/master/assets/oh-my-opencode.schema.json";
 var init_model_fallback = __esm(() => {
   init_model_requirements();
   init_fallback_chain_resolution();
@@ -7983,13 +8005,13 @@ var init_antigravity_provider_configuration = __esm(() => {
             high: { thinkingLevel: "high" }
           }
         },
-        "antigravity-claude-sonnet-4-5": {
-          name: "Claude Sonnet 4.5 (Antigravity)",
+        "antigravity-claude-sonnet-4-6": {
+          name: "Claude Sonnet 4.6 (Antigravity)",
           limit: { context: 200000, output: 64000 },
           modalities: { input: ["text", "image", "pdf"], output: ["text"] }
         },
-        "antigravity-claude-sonnet-4-5-thinking": {
-          name: "Claude Sonnet 4.5 Thinking (Antigravity)",
+        "antigravity-claude-sonnet-4-6-thinking": {
+          name: "Claude Sonnet 4.6 Thinking (Antigravity)",
           limit: { context: 200000, output: 64000 },
           modalities: { input: ["text", "image", "pdf"], output: ["text"] },
           variants: {
@@ -9053,7 +9075,7 @@ var {
 // package.json
 var package_default = {
   name: "oh-my-opencode",
-  version: "3.7.2",
+  version: "3.7.4",
   description: "The Best AI Agent Harness - Batteries-Included OpenCode Plugin with Multi-Model Orchestration, Parallel Background Agents, and Crafted LSP/AST Tools",
   main: "dist/index.js",
   types: "dist/index.d.ts",
@@ -9127,13 +9149,13 @@ var package_default = {
     typescript: "^5.7.3"
   },
   optionalDependencies: {
-    "oh-my-opencode-darwin-arm64": "3.7.2",
-    "oh-my-opencode-darwin-x64": "3.7.2",
-    "oh-my-opencode-linux-arm64": "3.7.2",
-    "oh-my-opencode-linux-arm64-musl": "3.7.2",
-    "oh-my-opencode-linux-x64": "3.7.2",
-    "oh-my-opencode-linux-x64-musl": "3.7.2",
-    "oh-my-opencode-windows-x64": "3.7.2"
+    "oh-my-opencode-darwin-arm64": "3.7.4",
+    "oh-my-opencode-darwin-x64": "3.7.4",
+    "oh-my-opencode-linux-arm64": "3.7.4",
+    "oh-my-opencode-linux-arm64-musl": "3.7.4",
+    "oh-my-opencode-linux-x64": "3.7.4",
+    "oh-my-opencode-linux-x64-musl": "3.7.4",
+    "oh-my-opencode-windows-x64": "3.7.4"
   },
   trustedDependencies: [
     "@ast-grep/cli",
@@ -9366,7 +9388,7 @@ async function runCliInstaller(args, version) {
     console.log();
   }
   if (!config.hasClaude && !config.hasOpenAI && !config.hasGemini && !config.hasCopilot && !config.hasOpencodeZen) {
-    printWarning("No model providers configured. Using opencode/glm-4.7-free as fallback.");
+    printWarning("No model providers configured. Using opencode/big-pickle as fallback.");
   }
   console.log(`${SYMBOLS.star} ${import_picocolors2.default.bold(import_picocolors2.default.green(isUpdate ? "Configuration updated!" : "Installation complete!"))}`);
   console.log(`  Run ${import_picocolors2.default.cyan("opencode")} to start!`);
@@ -9992,9 +10014,9 @@ async function promptInstallConfig(detected) {
   const claude = await selectOrCancel({
     message: "Do you have a Claude Pro/Max subscription?",
     options: [
-      { value: "no", label: "No", hint: "Will use opencode/glm-4.7-free as fallback" },
+      { value: "no", label: "No", hint: "Will use opencode/big-pickle as fallback" },
       { value: "yes", label: "Yes (standard)", hint: "Claude Opus 4.5 for orchestration" },
-      { value: "max20", label: "Yes (max20 mode)", hint: "Full power with Claude Sonnet 4.5 for Librarian" }
+      { value: "max20", label: "Yes (max20 mode)", hint: "Full power with Claude Sonnet 4.6 for Librarian" }
     ],
     initialValue: initial.claude
   });
@@ -10147,7 +10169,7 @@ async function runTuiInstaller(args, version) {
     console.log();
   }
   if (!config.hasClaude && !config.hasOpenAI && !config.hasGemini && !config.hasCopilot && !config.hasOpencodeZen) {
-    M2.warn("No model providers configured. Using opencode/glm-4.7-free as fallback.");
+    M2.warn("No model providers configured. Using opencode/big-pickle as fallback.");
   }
   Me(formatConfigSummary(config), isUpdate ? "Updated Configuration" : "Installation Complete");
   M2.success(import_picocolors4.default.bold(isUpdate ? "Configuration updated!" : "Installation complete!"));
@@ -10212,7 +10234,9 @@ function createEventState() {
     lastThinkingSummary: "",
     textAtLineStart: true,
     thinkingAtLineStart: false,
-    currentMessageId: null
+    currentMessageId: null,
+    messageStartedAtById: {},
+    completionMetaPrintedByMessageId: {}
   };
 }
 // src/cli/run/event-formatting.ts
@@ -10572,6 +10596,19 @@ function getPartMessageId(props) {
 function getDeltaMessageId(props) {
   return props?.messageID;
 }
+function renderCompletionMetaLine(state, messageID) {
+  if (state.completionMetaPrintedByMessageId[messageID])
+    return;
+  const startedAt = state.messageStartedAtById[messageID];
+  const elapsedSec = startedAt ? ((Date.now() - startedAt) / 1000).toFixed(1) : "0.0";
+  const agent = state.currentAgent ?? "assistant";
+  const model = state.currentModel ?? "unknown-model";
+  const variant = state.currentVariant ? ` (${state.currentVariant})` : "";
+  process.stdout.write(import_picocolors7.default.dim(`
+  ${displayChars.treeEnd} ${agent} \xB7 ${model}${variant} \xB7 ${elapsedSec}s  
+`));
+  state.completionMetaPrintedByMessageId[messageID] = true;
+}
 function handleSessionIdle(ctx, payload, state) {
   if (payload.type !== "session.idle")
     return;
@@ -10646,6 +10683,12 @@ function handleMessagePartUpdated(ctx, payload, state) {
       state.hasReceivedMeaningfulWork = true;
     }
     state.lastPartText = part.text;
+    if (part.time?.end) {
+      const messageID = part.messageID ?? state.currentMessageId;
+      if (messageID) {
+        renderCompletionMetaLine(state, messageID);
+      }
+    }
   }
   if (part.type === "tool") {
     handleToolPart(ctx, part, state);
@@ -10740,6 +10783,10 @@ function handleMessageUpdated(ctx, payload, state) {
     state.textAtLineStart = true;
     state.thinkingAtLineStart = false;
     closeThinkBlockIfNeeded(state);
+    if (messageID) {
+      state.messageStartedAtById[messageID] = Date.now();
+      state.completionMetaPrintedByMessageId[messageID] = false;
+    }
   }
   const agent = props?.info?.agent ?? null;
   const model = props?.info?.modelID ?? null;
@@ -23244,6 +23291,10 @@ var AgentOverrideConfigSchema = exports_external.object({
     type: exports_external.enum(["enabled", "disabled"]),
     budgetTokens: exports_external.number().optional()
   }).optional(),
+  ultrawork: exports_external.object({
+    model: exports_external.string(),
+    variant: exports_external.string().optional()
+  }).optional(),
   reasoningEffort: exports_external.enum(["low", "medium", "high", "xhigh"]).optional(),
   textVerbosity: exports_external.enum(["low", "medium", "high"]).optional(),
   providerOptions: exports_external.record(exports_external.string(), exports_external.unknown()).optional()
@@ -23413,6 +23464,7 @@ var HookNameSchema = exports_external.enum([
   "non-interactive-env",
   "interactive-bash-session",
   "thinking-block-validator",
+  "ultrawork-model-override",
   "ralph-loop",
   "category-skill-reminder",
   "compaction-context-injector",
@@ -23424,7 +23476,7 @@ var HookNameSchema = exports_external.enum([
   "delegate-task-retry",
   "prometheus-md-only",
   "sisyphus-junior-notepad",
-  "sisyphus-gpt-hephaestus-reminder",
+  "no-sisyphus-gpt",
   "start-work",
   "atlas",
   "unstable-agent-babysitter",
@@ -25192,34 +25244,31 @@ async function withWorkingOpencodePath(startServer, finder = findWorkingOpencode
   }
 }
 
-// src/cli/run/opencode-bin-path.ts
-import { delimiter as delimiter2, dirname as dirname2 } from "path";
-import { createRequire } from "module";
-var resolveFromCurrentModule = createRequire(import.meta.url).resolve;
-function prependResolvedOpencodeBinToPath(env = process.env, resolve2 = resolveFromCurrentModule) {
-  let resolvedPath;
-  try {
-    resolvedPath = resolve2("opencode-ai/bin/opencode");
-  } catch {
-    return;
+// src/cli/run/server-connection.ts
+function isPortStartFailure(error45, port) {
+  if (!(error45 instanceof Error)) {
+    return false;
   }
-  const opencodeBinDir = dirname2(resolvedPath);
-  const currentPath = env.PATH ?? "";
-  const pathSegments = currentPath ? currentPath.split(delimiter2) : [];
-  if (pathSegments.includes(opencodeBinDir)) {
-    return;
+  return error45.message.includes(`Failed to start server on port ${port}`);
+}
+function isPortRangeExhausted(error45) {
+  if (!(error45 instanceof Error)) {
+    return false;
   }
-  env.PATH = currentPath ? `${opencodeBinDir}${delimiter2}${currentPath}` : opencodeBinDir;
+  return error45.message.includes("No available port found in range");
+}
+async function startServer(options) {
+  const { signal, port } = options;
+  const { client: client3, server: server2 } = await withWorkingOpencodePath(() => createOpencode({ signal, port, hostname: "127.0.0.1" }));
+  console.log(import_picocolors9.default.dim("Server listening at"), import_picocolors9.default.cyan(server2.url));
+  return { client: client3, cleanup: () => server2.close() };
 }
-
-// src/cli/run/server-connection.ts
 async function createServerConnection(options) {
-  prependResolvedOpencodeBinToPath();
   const { port, attach, signal } = options;
   if (attach !== undefined) {
     console.log(import_picocolors9.default.dim("Attaching to existing server at"), import_picocolors9.default.cyan(attach));
-    const client4 = createOpencodeClient({ baseUrl: attach });
-    return { client: client4, cleanup: () => {} };
+    const client3 = createOpencodeClient({ baseUrl: attach });
+    return { client: client3, cleanup: () => {} };
   }
   if (port !== undefined) {
     if (port < 1 || port > 65535) {
@@ -25228,23 +25277,58 @@ async function createServerConnection(options) {
     const available = await isPortAvailable(port, "127.0.0.1");
     if (available) {
       console.log(import_picocolors9.default.dim("Starting server on port"), import_picocolors9.default.cyan(port.toString()));
-      const { client: client5, server: server3 } = await withWorkingOpencodePath(() => createOpencode({ signal, port, hostname: "127.0.0.1" }));
-      console.log(import_picocolors9.default.dim("Server listening at"), import_picocolors9.default.cyan(server3.url));
-      return { client: client5, cleanup: () => server3.close() };
+      try {
+        return await startServer({ signal, port });
+      } catch (error45) {
+        if (!isPortStartFailure(error45, port)) {
+          throw error45;
+        }
+        const stillAvailable = await isPortAvailable(port, "127.0.0.1");
+        if (stillAvailable) {
+          throw error45;
+        }
+        console.log(import_picocolors9.default.dim("Port"), import_picocolors9.default.cyan(port.toString()), import_picocolors9.default.dim("became occupied, attaching to existing server"));
+        const client4 = createOpencodeClient({ baseUrl: `http://127.0.0.1:${port}` });
+        return { client: client4, cleanup: () => {} };
+      }
     }
     console.log(import_picocolors9.default.dim("Port"), import_picocolors9.default.cyan(port.toString()), import_picocolors9.default.dim("is occupied, attaching to existing server"));
-    const client4 = createOpencodeClient({ baseUrl: `http://127.0.0.1:${port}` });
-    return { client: client4, cleanup: () => {} };
+    const client3 = createOpencodeClient({ baseUrl: `http://127.0.0.1:${port}` });
+    return { client: client3, cleanup: () => {} };
+  }
+  let selectedPort;
+  let wasAutoSelected;
+  try {
+    const selected = await getAvailableServerPort(DEFAULT_SERVER_PORT, "127.0.0.1");
+    selectedPort = selected.port;
+    wasAutoSelected = selected.wasAutoSelected;
+  } catch (error45) {
+    if (!isPortRangeExhausted(error45)) {
+      throw error45;
+    }
+    const defaultPortIsAvailable = await isPortAvailable(DEFAULT_SERVER_PORT, "127.0.0.1");
+    if (defaultPortIsAvailable) {
+      throw error45;
+    }
+    console.log(import_picocolors9.default.dim("Port range exhausted, attaching to existing server on"), import_picocolors9.default.cyan(DEFAULT_SERVER_PORT.toString()));
+    const client3 = createOpencodeClient({ baseUrl: `http://127.0.0.1:${DEFAULT_SERVER_PORT}` });
+    return { client: client3, cleanup: () => {} };
   }
-  const { port: selectedPort, wasAutoSelected } = await getAvailableServerPort(DEFAULT_SERVER_PORT, "127.0.0.1");
   if (wasAutoSelected) {
     console.log(import_picocolors9.default.dim("Auto-selected port"), import_picocolors9.default.cyan(selectedPort.toString()));
   } else {
     console.log(import_picocolors9.default.dim("Starting server on port"), import_picocolors9.default.cyan(selectedPort.toString()));
   }
-  const { client: client3, server: server2 } = await withWorkingOpencodePath(() => createOpencode({ signal, port: selectedPort, hostname: "127.0.0.1" }));
-  console.log(import_picocolors9.default.dim("Server listening at"), import_picocolors9.default.cyan(server2.url));
-  return { client: client3, cleanup: () => server2.close() };
+  try {
+    return await startServer({ signal, port: selectedPort });
+  } catch (error45) {
+    if (!isPortStartFailure(error45, selectedPort)) {
+      throw error45;
+    }
+    const { port: retryPort } = await getAvailableServerPort(selectedPort + 1, "127.0.0.1");
+    console.log(import_picocolors9.default.dim("Retrying server start on port"), import_picocolors9.default.cyan(retryPort.toString()));
+    return await startServer({ signal, port: retryPort });
+  }
 }
 
 // src/cli/run/session-resolver.ts
@@ -25427,7 +25511,7 @@ var NOTEPAD_DIR = "notepads";
 var NOTEPAD_BASE_PATH = `${BOULDER_DIR}/${NOTEPAD_DIR}`;
 // src/features/boulder-state/storage.ts
 import { existsSync as existsSync11, readFileSync as readFileSync11, writeFileSync as writeFileSync7, mkdirSync as mkdirSync3, readdirSync } from "fs";
-import { dirname as dirname3, join as join9, basename } from "path";
+import { dirname as dirname2, join as join9, basename } from "path";
 function getBoulderFilePath(directory) {
   return join9(directory, BOULDER_DIR, BOULDER_FILE);
 }
@@ -25508,7 +25592,7 @@ function getActiveContinuationMarkerReason(marker) {
 // src/hooks/ralph-loop/storage.ts
 init_frontmatter();
 import { existsSync as existsSync13, readFileSync as readFileSync13, writeFileSync as writeFileSync9, unlinkSync, mkdirSync as mkdirSync5 } from "fs";
-import { dirname as dirname4, join as join11 } from "path";
+import { dirname as dirname3, join as join11 } from "path";
 
 // src/hooks/ralph-loop/constants.ts
 var DEFAULT_STATE_FILE = ".sisyphus/ralph-loop.local.md";
@@ -25593,7 +25677,7 @@ async function checkCompletionConditions(ctx) {
     const continuationState = getContinuationState(ctx.directory, ctx.sessionID);
     if (continuationState.hasActiveHookMarker) {
       const reason = continuationState.activeHookMarkerReason ?? "continuation hook is active";
-      console.log(import_picocolors13.default.dim(`  Waiting: ${reason}`));
+      logWaiting(ctx, reason);
       return false;
     }
     if (!continuationState.hasTodoHookMarker && !await areAllTodosComplete(ctx)) {
@@ -25602,7 +25686,7 @@ async function checkCompletionConditions(ctx) {
     if (!await areAllChildrenIdle(ctx)) {
       return false;
     }
-    if (!areContinuationHooksIdle(continuationState)) {
+    if (!areContinuationHooksIdle(ctx, continuationState)) {
       return false;
     }
     return true;
@@ -25611,13 +25695,13 @@ async function checkCompletionConditions(ctx) {
     return false;
   }
 }
-function areContinuationHooksIdle(continuationState) {
+function areContinuationHooksIdle(ctx, continuationState) {
   if (continuationState.hasActiveBoulder) {
-    console.log(import_picocolors13.default.dim("  Waiting: boulder continuation is active"));
+    logWaiting(ctx, "boulder continuation is active");
     return false;
   }
   if (continuationState.hasActiveRalphLoop) {
-    console.log(import_picocolors13.default.dim("  Waiting: ralph-loop continuation is active"));
+    logWaiting(ctx, "ralph-loop continuation is active");
     return false;
   }
   return true;
@@ -25630,7 +25714,7 @@ async function areAllTodosComplete(ctx) {
   const todos = normalizeSDKResponse(todosRes, []);
   const incompleteTodos = todos.filter((t) => t.status !== "completed" && t.status !== "cancelled");
   if (incompleteTodos.length > 0) {
-    console.log(import_picocolors13.default.dim(`  Waiting: ${incompleteTodos.length} todos remaining`));
+    logWaiting(ctx, `${incompleteTodos.length} todos remaining`);
     return false;
   }
   return true;
@@ -25654,7 +25738,7 @@ async function areAllDescendantsIdle(ctx, sessionID, allStatuses) {
   for (const child of children) {
     const status = allStatuses[child.id];
     if (status && status.type !== "idle") {
-      console.log(import_picocolors13.default.dim(`  Waiting: session ${child.id.slice(0, 8)}... is ${status.type}`));
+      logWaiting(ctx, `session ${child.id.slice(0, 8)}... is ${status.type}`);
       return false;
     }
     const descendantsIdle = await areAllDescendantsIdle(ctx, child.id, allStatuses);
@@ -25664,6 +25748,12 @@ async function areAllDescendantsIdle(ctx, sessionID, allStatuses) {
   }
   return true;
 }
+function logWaiting(ctx, message) {
+  if (!ctx.verbose) {
+    return;
+  }
+  console.log(import_picocolors13.default.dim(`  Waiting: ${message}`));
+}
 
 // src/cli/run/poll-for-completion.ts
 init_shared();
@@ -25783,6 +25873,41 @@ async function loadAgentProfileColors(client3) {
   }
 }
 
+// src/cli/run/stdin-suppression.ts
+function includesCtrlC(chunk) {
+  const text = typeof chunk === "string" ? chunk : Buffer.from(chunk).toString("utf8");
+  return text.includes("\x03");
+}
+function suppressRunInput(stdin = process.stdin, onInterrupt = () => {
+  process.kill(process.pid, "SIGINT");
+}) {
+  if (!stdin.isTTY) {
+    return () => {};
+  }
+  const wasRaw = stdin.isRaw === true;
+  const wasPaused = stdin.isPaused?.() ?? false;
+  const canSetRawMode = typeof stdin.setRawMode === "function";
+  const onData = (chunk) => {
+    if (includesCtrlC(chunk)) {
+      onInterrupt();
+    }
+  };
+  if (canSetRawMode) {
+    stdin.setRawMode(true);
+  }
+  stdin.on("data", onData);
+  stdin.resume();
+  return () => {
+    stdin.removeListener("data", onData);
+    if (canSetRawMode) {
+      stdin.setRawMode(wasRaw);
+    }
+    if (wasPaused) {
+      stdin.pause();
+    }
+  };
+}
+
 // src/cli/run/runner.ts
 var EVENT_PROCESSOR_SHUTDOWN_TIMEOUT_MS = 2000;
 async function waitForEventProcessorShutdown(eventProcessor, timeoutMs = EVENT_PROCESSOR_SHUTDOWN_TIMEOUT_MS) {
@@ -25813,12 +25938,15 @@ async function run(options) {
     const cleanup = () => {
       serverCleanup();
     };
-    process.on("SIGINT", () => {
+    const restoreInput = suppressRunInput();
+    const handleSigint = () => {
       console.log(import_picocolors15.default.yellow(`
 Interrupted. Shutting down...`));
+      restoreInput();
       cleanup();
       process.exit(130);
-    });
+    };
+    process.on("SIGINT", handleSigint);
     try {
       const sessionID = await resolveSession({
         client: client3,
@@ -25841,6 +25969,9 @@ Interrupted. Shutting down...`));
         path: { id: sessionID },
         body: {
           agent: resolvedAgent,
+          tools: {
+            question: false
+          },
           parts: [{ type: "text", text: message }]
         },
         query: { directory }
@@ -25872,6 +26003,9 @@ Interrupted. Shutting down...`));
     } catch (err) {
       cleanup();
       throw err;
+    } finally {
+      process.removeListener("SIGINT", handleSigint);
+      restoreInput();
     }
   } catch (err) {
     if (jsonManager)
@@ -26750,8 +26884,8 @@ async function checkConfig() {
 
 // src/cli/doctor/checks/dependencies.ts
 import { existsSync as existsSync24 } from "fs";
-import { createRequire as createRequire2 } from "module";
-import { dirname as dirname7, join as join22 } from "path";
+import { createRequire } from "module";
+import { dirname as dirname6, join as join22 } from "path";
 async function checkBinaryExists(binary2) {
   try {
     const path9 = Bun.which(binary2);
@@ -26838,9 +26972,9 @@ async function checkAstGrepNapi() {
 function findCommentCheckerPackageBinary() {
   const binaryName = process.platform === "win32" ? "comment-checker.exe" : "comment-checker";
   try {
-    const require2 = createRequire2(import.meta.url);
+    const require2 = createRequire(import.meta.url);
     const pkgPath = require2.resolve("@code-yeongyu/comment-checker/package.json");
-    const binaryPath = join22(dirname7(pkgPath), "bin", binaryName);
+    const binaryPath = join22(dirname6(pkgPath), "bin", binaryName);
     if (existsSync24(binaryPath))
       return binaryPath;
   } catch {}
@@ -27458,7 +27592,7 @@ async function doctor(options = { mode: "default" }) {
 // src/features/mcp-oauth/storage.ts
 init_shared();
 import { chmodSync, existsSync as existsSync27, mkdirSync as mkdirSync6, readFileSync as readFileSync28, unlinkSync as unlinkSync2, writeFileSync as writeFileSync12 } from "fs";
-import { dirname as dirname8, join as join25 } from "path";
+import { dirname as dirname7, join as join25 } from "path";
 var STORAGE_FILE_NAME = "mcp-oauth.json";
 function getMcpOauthStoragePath() {
   return join25(getOpenCodeConfigDir({ binary: "opencode" }), STORAGE_FILE_NAME);
@@ -27508,14 +27642,14 @@ function readStore() {
     return null;
   }
 }
-function writeStore(store) {
+function writeStore(store2) {
   const filePath = getMcpOauthStoragePath();
   try {
-    const dir = dirname8(filePath);
+    const dir = dirname7(filePath);
     if (!existsSync27(dir)) {
       mkdirSync6(dir, { recursive: true });
     }
-    writeFileSync12(filePath, JSON.stringify(store, null, 2), { encoding: "utf-8", mode: 384 });
+    writeFileSync12(filePath, JSON.stringify(store2, null, 2), { encoding: "utf-8", mode: 384 });
     chmodSync(filePath, 384);
     return true;
   } catch {
@@ -27523,28 +27657,28 @@ function writeStore(store) {
   }
 }
 function loadToken(serverHost, resource) {
-  const store = readStore();
-  if (!store)
+  const store2 = readStore();
+  if (!store2)
     return null;
   const key = buildKey(serverHost, resource);
-  return store[key] ?? null;
+  return store2[key] ?? null;
 }
 function saveToken(serverHost, resource, token) {
-  const store = readStore() ?? {};
+  const store2 = readStore() ?? {};
   const key = buildKey(serverHost, resource);
-  store[key] = token;
-  return writeStore(store);
+  store2[key] = token;
+  return writeStore(store2);
 }
 function deleteToken(serverHost, resource) {
-  const store = readStore();
-  if (!store)
+  const store2 = readStore();
+  if (!store2)
     return true;
   const key = buildKey(serverHost, resource);
-  if (!(key in store)) {
+  if (!(key in store2)) {
     return true;
   }
-  delete store[key];
-  if (Object.keys(store).length === 0) {
+  delete store2[key];
+  if (Object.keys(store2).length === 0) {
     try {
       const filePath = getMcpOauthStoragePath();
       if (existsSync27(filePath)) {
@@ -27555,16 +27689,16 @@ function deleteToken(serverHost, resource) {
       return false;
     }
   }
-  return writeStore(store);
+  return writeStore(store2);
 }
 function listTokensByHost(serverHost) {
-  const store = readStore();
-  if (!store)
+  const store2 = readStore();
+  if (!store2)
     return {};
   const host = normalizeHost(serverHost);
   const prefix = `${host}/`;
   const result = {};
-  for (const [key, value] of Object.entries(store)) {
+  for (const [key, value] of Object.entries(store2)) {
     if (key.startsWith(prefix)) {
       result[key] = value;
     }