oh-my-opencode 3.8.4 → 3.9.0

package/dist/cli/index.js

@@ -5,25 +5,43 @@ var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+function __accessProp(key) {
+  return this[key];
+}
+var __toESMCache_node;
+var __toESMCache_esm;
 var __toESM = (mod, isNodeMode, target) => {
+  var canCache = mod != null && typeof mod === "object";
+  if (canCache) {
+    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
+    var cached = cache.get(mod);
+    if (cached)
+      return cached;
+  }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
   for (let key of __getOwnPropNames(mod))
     if (!__hasOwnProp.call(to, key))
       __defProp(to, key, {
-        get: () => mod[key],
+        get: __accessProp.bind(mod, key),
         enumerable: true
       });
+  if (canCache)
+    cache.set(mod, to);
   return to;
 };
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
+var __returnValue = (v) => v;
+function __exportSetter(name, newValue) {
+  this[name] = __returnValue.bind(null, newValue);
+}
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: (newValue) => all[name] = () => newValue
+      set: __exportSetter.bind(all, name)
     });
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
@@ -6805,14 +6823,15 @@ var init_model_requirements = __esm(() => {
     },
     hephaestus: {
       fallbackChain: [
-        { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.3-codex", variant: "medium" }
+        { providers: ["openai", "venice", "opencode"], model: "gpt-5.3-codex", variant: "medium" },
+        { providers: ["github-copilot"], model: "gpt-5.2", variant: "medium" }
       ],
-      requiresProvider: ["openai", "github-copilot", "opencode"]
+      requiresProvider: ["openai", "github-copilot", "venice", "opencode"]
     },
     oracle: {
       fallbackChain: [
         { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.2", variant: "high" },
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "high" },
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3.1-pro", variant: "high" },
         { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-opus-4-6", variant: "max" }
       ]
     },
@@ -6845,7 +6864,7 @@ var init_model_requirements = __esm(() => {
         { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-opus-4-6", variant: "max" },
         { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.2", variant: "high" },
         { providers: ["opencode"], model: "kimi-k2.5-free" },
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro" }
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3.1-pro" }
       ]
     },
     metis: {
@@ -6853,14 +6872,14 @@ var init_model_requirements = __esm(() => {
         { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-opus-4-6", variant: "max" },
         { providers: ["opencode"], model: "kimi-k2.5-free" },
         { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.2", variant: "high" },
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "high" }
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3.1-pro", variant: "high" }
       ]
     },
     momus: {
       fallbackChain: [
         { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.2", variant: "medium" },
         { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-opus-4-6", variant: "max" },
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "high" }
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3.1-pro", variant: "high" }
       ]
     },
     atlas: {
@@ -6874,33 +6893,33 @@ var init_model_requirements = __esm(() => {
   CATEGORY_MODEL_REQUIREMENTS = {
     "visual-engineering": {
       fallbackChain: [
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "high" },
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3.1-pro", variant: "high" },
         { providers: ["zai-coding-plan", "opencode"], model: "glm-5" },
         { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-opus-4-6", variant: "max" }
       ]
     },
     ultrabrain: {
       fallbackChain: [
-        { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.3-codex", variant: "xhigh" },
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "high" },
+        { providers: ["openai", "opencode"], model: "gpt-5.3-codex", variant: "xhigh" },
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3.1-pro", variant: "high" },
         { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-opus-4-6", variant: "max" }
       ]
     },
     deep: {
       fallbackChain: [
-        { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.3-codex", variant: "medium" },
+        { providers: ["openai", "opencode"], model: "gpt-5.3-codex", variant: "medium" },
         { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-opus-4-6", variant: "max" },
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "high" }
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3.1-pro", variant: "high" }
       ],
       requiresModel: "gpt-5.3-codex"
     },
     artistry: {
       fallbackChain: [
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "high" },
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3.1-pro", variant: "high" },
         { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-opus-4-6", variant: "max" },
         { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.2" }
       ],
-      requiresModel: "gemini-3-pro"
+      requiresModel: "gemini-3.1-pro"
     },
     quick: {
       fallbackChain: [
@@ -6912,7 +6931,7 @@ var init_model_requirements = __esm(() => {
     "unspecified-low": {
       fallbackChain: [
         { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-sonnet-4-6" },
-        { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.3-codex", variant: "medium" },
+        { providers: ["openai", "opencode"], model: "gpt-5.3-codex", variant: "medium" },
         { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-flash" }
       ]
     },
@@ -6920,11 +6939,12 @@ var init_model_requirements = __esm(() => {
       fallbackChain: [
         { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-opus-4-6", variant: "max" },
         { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.2", variant: "high" },
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro" }
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3.1-pro" }
       ]
     },
     writing: {
       fallbackChain: [
+        { providers: ["opencode"], model: "kimi-k2.5-free" },
         { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-flash" },
         { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-sonnet-4-6" }
       ]
@@ -7051,10 +7071,10 @@ var init_model_availability = __esm(() => {
 // src/shared/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-6", "claude-sonnet-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(?!-)/g, "gemini-3-pro-preview").replace(/gemini-3-flash(?!-)/g, "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-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\.1-pro(?!-)/g, "gemini-3.1-pro-preview").replace(/gemini-3-flash(?!-)/g, "gemini-3-flash-preview");
   }
   if (provider === "google") {
-    return model.replace(/gemini-3-pro(?!-)/g, "gemini-3-pro-preview").replace(/gemini-3-flash(?!-)/g, "gemini-3-flash-preview");
+    return model.replace(/gemini-3\.1-pro(?!-)/g, "gemini-3.1-pro-preview").replace(/gemini-3-flash(?!-)/g, "gemini-3-flash-preview");
   }
   return model;
 }
@@ -7214,7 +7234,6 @@ var init_tmux = __esm(() => {
   init_constants2();
   init_tmux_utils();
 });
-
 // src/shared/model-suggestion-retry.ts
 var init_model_suggestion_retry = __esm(() => {
   init_logger();
@@ -7605,14 +7624,14 @@ var init_model_fallback_requirements = __esm(() => {
     },
     hephaestus: {
       fallbackChain: [
-        { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.3-codex", variant: "medium" }
+        { providers: ["openai", "opencode"], model: "gpt-5.3-codex", variant: "medium" }
       ],
-      requiresProvider: ["openai", "github-copilot", "opencode"]
+      requiresProvider: ["openai", "opencode"]
     },
     oracle: {
       fallbackChain: [
         { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.2", variant: "high" },
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "high" },
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3.1-pro", variant: "high" },
         { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-opus-4-6", variant: "max" }
       ]
     },
@@ -7647,7 +7666,7 @@ var init_model_fallback_requirements = __esm(() => {
         { providers: ["kimi-for-coding"], model: "k2p5" },
         { providers: ["opencode"], model: "kimi-k2.5-free" },
         { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.2", variant: "high" },
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro" }
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3.1-pro" }
       ]
     },
     metis: {
@@ -7656,14 +7675,14 @@ var init_model_fallback_requirements = __esm(() => {
         { providers: ["kimi-for-coding"], model: "k2p5" },
         { providers: ["opencode"], model: "kimi-k2.5-free" },
         { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.2", variant: "high" },
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "high" }
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3.1-pro", variant: "high" }
       ]
     },
     momus: {
       fallbackChain: [
         { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.2", variant: "medium" },
         { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-opus-4-6", variant: "max" },
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "high" }
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3.1-pro", variant: "high" }
       ]
     },
     atlas: {
@@ -7672,14 +7691,14 @@ var init_model_fallback_requirements = __esm(() => {
         { providers: ["opencode"], model: "kimi-k2.5-free" },
         { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-sonnet-4-5" },
         { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.2" },
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro" }
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3.1-pro" }
       ]
     }
   };
   CLI_CATEGORY_MODEL_REQUIREMENTS = {
     "visual-engineering": {
       fallbackChain: [
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "high" },
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3.1-pro", variant: "high" },
         { providers: ["zai-coding-plan"], model: "glm-5" },
         { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-opus-4-6", variant: "max" },
         { providers: ["kimi-for-coding"], model: "k2p5" }
@@ -7687,26 +7706,26 @@ var init_model_fallback_requirements = __esm(() => {
     },
     ultrabrain: {
       fallbackChain: [
-        { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.3-codex", variant: "xhigh" },
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "high" },
+        { providers: ["openai", "opencode"], model: "gpt-5.3-codex", variant: "xhigh" },
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3.1-pro", variant: "high" },
         { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-opus-4-6", variant: "max" }
       ]
     },
     deep: {
       fallbackChain: [
-        { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.3-codex", variant: "medium" },
+        { providers: ["openai", "opencode"], model: "gpt-5.3-codex", variant: "medium" },
         { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-opus-4-6", variant: "max" },
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "high" }
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3.1-pro", variant: "high" }
       ],
       requiresModel: "gpt-5.3-codex"
     },
     artistry: {
       fallbackChain: [
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "high" },
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3.1-pro", variant: "high" },
         { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-opus-4-6", variant: "max" },
         { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.2" }
       ],
-      requiresModel: "gemini-3-pro"
+      requiresModel: "gemini-3.1-pro"
     },
     quick: {
       fallbackChain: [
@@ -7718,7 +7737,7 @@ var init_model_fallback_requirements = __esm(() => {
     "unspecified-low": {
       fallbackChain: [
         { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-sonnet-4-5" },
-        { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.3-codex", variant: "medium" },
+        { providers: ["openai", "opencode"], model: "gpt-5.3-codex", variant: "medium" },
         { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-flash" }
       ]
     },
@@ -7726,7 +7745,7 @@ var init_model_fallback_requirements = __esm(() => {
       fallbackChain: [
         { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-opus-4-6", variant: "max" },
         { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.2", variant: "high" },
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro" }
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3.1-pro" }
       ]
     },
     writing: {
@@ -7947,7 +7966,7 @@ function writeOmoConfig(installConfig) {
 `);
           return { success: true, configPath: omoConfigPath };
         }
-        const merged = deepMergeRecord(existing, newConfig);
+        const merged = deepMergeRecord(newConfig, existing);
         writeFileSync4(omoConfigPath, JSON.stringify(merged, null, 2) + `
 `);
       } catch (parseErr) {
@@ -7978,11 +7997,71 @@ var init_write_omo_config = __esm(() => {
   init_generate_omo_config();
 });
 
+// src/shared/spawn-with-windows-hide.ts
+var {spawn: bunSpawn } = globalThis.Bun;
+import { spawn as nodeSpawn } from "child_process";
+import { Readable } from "stream";
+function toReadableStream(stream) {
+  if (!stream) {
+    return;
+  }
+  return Readable.toWeb(stream);
+}
+function wrapNodeProcess(proc) {
+  let resolveExited;
+  let exitCode = null;
+  const exited = new Promise((resolve2) => {
+    resolveExited = resolve2;
+  });
+  proc.on("exit", (code) => {
+    exitCode = code ?? 1;
+    resolveExited(exitCode);
+  });
+  proc.on("error", () => {
+    if (exitCode === null) {
+      exitCode = 1;
+      resolveExited(1);
+    }
+  });
+  return {
+    get exitCode() {
+      return exitCode;
+    },
+    exited,
+    stdout: toReadableStream(proc.stdout),
+    stderr: toReadableStream(proc.stderr),
+    kill(signal) {
+      try {
+        if (!signal) {
+          proc.kill();
+          return;
+        }
+        proc.kill(signal);
+      } catch {}
+    }
+  };
+}
+function spawnWithWindowsHide(command, options) {
+  if (process.platform !== "win32") {
+    return bunSpawn(command, options);
+  }
+  const [cmd, ...args] = command;
+  const proc = nodeSpawn(cmd, args, {
+    cwd: options.cwd,
+    env: options.env,
+    stdio: [options.stdin ?? "pipe", options.stdout ?? "pipe", options.stderr ?? "pipe"],
+    windowsHide: true,
+    shell: true
+  });
+  return wrapNodeProcess(proc);
+}
+var init_spawn_with_windows_hide = () => {};
+
 // src/cli/config-manager/opencode-binary.ts
 async function findOpenCodeBinaryWithVersion() {
   for (const binary2 of OPENCODE_BINARIES) {
     try {
-      const proc = Bun.spawn([binary2, "--version"], {
+      const proc = spawnWithWindowsHide([binary2, "--version"], {
         stdout: "pipe",
         stderr: "pipe"
       });
@@ -8009,6 +8088,7 @@ async function getOpenCodeVersion() {
 }
 var OPENCODE_BINARIES;
 var init_opencode_binary = __esm(() => {
+  init_spawn_with_windows_hide();
   init_config_context();
   OPENCODE_BINARIES = ["opencode", "opencode-desktop"];
 });
@@ -8130,7 +8210,7 @@ var init_antigravity_provider_configuration = __esm(() => {
     google: {
       name: "Google",
       models: {
-        "antigravity-gemini-3-pro": {
+        "antigravity-gemini-3.1-pro": {
           name: "Gemini 3 Pro (Antigravity)",
           limit: { context: 1048576, output: 65535 },
           modalities: { input: ["text", "image", "pdf"], output: ["text"] },
@@ -8332,7 +8412,7 @@ async function runBunInstall() {
 }
 async function runBunInstallWithDetails() {
   try {
-    const proc = Bun.spawn(["bun", "install"], {
+    const proc = spawnWithWindowsHide(["bun", "install"], {
       cwd: getConfigDir(),
       stdout: "inherit",
       stderr: "inherit"
@@ -8372,6 +8452,7 @@ async function runBunInstallWithDetails() {
 var BUN_INSTALL_TIMEOUT_SECONDS = 60, BUN_INSTALL_TIMEOUT_MS;
 var init_bun_install = __esm(() => {
   init_config_context();
+  init_spawn_with_windows_hide();
   BUN_INSTALL_TIMEOUT_MS = BUN_INSTALL_TIMEOUT_SECONDS * 1000;
 });
 
@@ -9248,7 +9329,7 @@ var {
 // package.json
 var package_default = {
   name: "oh-my-opencode",
-  version: "3.8.4",
+  version: "3.9.0",
   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",
@@ -9308,6 +9389,7 @@ var package_default = {
     "@opencode-ai/sdk": "^1.1.19",
     commander: "^14.0.2",
     "detect-libc": "^2.0.0",
+    diff: "^8.0.3",
     "js-yaml": "^4.1.1",
     "jsonc-parser": "^3.3.1",
     picocolors: "^1.1.1",
@@ -9322,13 +9404,17 @@ var package_default = {
     typescript: "^5.7.3"
   },
   optionalDependencies: {
-    "oh-my-opencode-darwin-arm64": "3.8.4",
-    "oh-my-opencode-darwin-x64": "3.8.4",
-    "oh-my-opencode-linux-arm64": "3.8.4",
-    "oh-my-opencode-linux-arm64-musl": "3.8.4",
-    "oh-my-opencode-linux-x64": "3.8.4",
-    "oh-my-opencode-linux-x64-musl": "3.8.4",
-    "oh-my-opencode-windows-x64": "3.8.4"
+    "oh-my-opencode-darwin-arm64": "3.9.0",
+    "oh-my-opencode-darwin-x64": "3.9.0",
+    "oh-my-opencode-darwin-x64-baseline": "3.9.0",
+    "oh-my-opencode-linux-arm64": "3.9.0",
+    "oh-my-opencode-linux-arm64-musl": "3.9.0",
+    "oh-my-opencode-linux-x64": "3.9.0",
+    "oh-my-opencode-linux-x64-baseline": "3.9.0",
+    "oh-my-opencode-linux-x64-musl": "3.9.0",
+    "oh-my-opencode-linux-x64-musl-baseline": "3.9.0",
+    "oh-my-opencode-windows-x64": "3.9.0",
+    "oh-my-opencode-windows-x64-baseline": "3.9.0"
   },
   trustedDependencies: [
     "@ast-grep/cli",
@@ -10392,6 +10478,7 @@ function createEventState() {
     lastPartText: "",
     currentTool: null,
     hasReceivedMeaningfulWork: false,
+    lastEventTimestamp: Date.now(),
     messageCount: 0,
     currentAgent: null,
     currentModel: null,
@@ -11059,6 +11146,7 @@ async function processEvents(ctx, stream, state) {
       if (ctx.verbose) {
         logEventVerbose(ctx, payload);
       }
+      state.lastEventTimestamp = Date.now();
       handleSessionError(ctx, payload, state);
       handleSessionIdle(ctx, payload, state);
       handleSessionStatus(ctx, payload, state);
@@ -23484,7 +23572,9 @@ var AgentOverridesSchema = exports_external.object({
   build: AgentOverrideConfigSchema.optional(),
   plan: AgentOverrideConfigSchema.optional(),
   sisyphus: AgentOverrideConfigSchema.optional(),
-  hephaestus: AgentOverrideConfigSchema.optional(),
+  hephaestus: AgentOverrideConfigSchema.extend({
+    allow_non_gpt_model: exports_external.boolean().optional()
+  }).optional(),
   "sisyphus-junior": AgentOverrideConfigSchema.optional(),
   "OpenCode-Builder": AgentOverrideConfigSchema.optional(),
   prometheus: AgentOverrideConfigSchema.optional(),
@@ -23535,6 +23625,7 @@ var CategoryConfigSchema = exports_external.object({
   textVerbosity: exports_external.enum(["low", "medium", "high"]).optional(),
   tools: exports_external.record(exports_external.string(), exports_external.boolean()).optional(),
   prompt_append: exports_external.string().optional(),
+  max_prompt_tokens: exports_external.number().int().positive().optional(),
   is_unstable_agent: exports_external.boolean().optional(),
   disable: exports_external.boolean().optional()
 });
@@ -23777,7 +23868,7 @@ var OhMyOpenCodeConfigSchema = exports_external.object({
   new_task_system_enabled: exports_external.boolean().optional(),
   default_run_agent: exports_external.string().optional(),
   disabled_mcps: exports_external.array(AnyMcpNameSchema).optional(),
-  disabled_agents: exports_external.array(BuiltinAgentNameSchema).optional(),
+  disabled_agents: exports_external.array(exports_external.string()).optional(),
   disabled_skills: exports_external.array(BuiltinSkillNameSchema).optional(),
   disabled_hooks: exports_external.array(exports_external.string()).optional(),
   disabled_commands: exports_external.array(BuiltinCommandNameSchema).optional(),
@@ -25374,6 +25465,7 @@ init_port_utils();
 var import_picocolors9 = __toESM(require_picocolors(), 1);
 
 // src/cli/run/opencode-binary-resolver.ts
+init_spawn_with_windows_hide();
 import { delimiter, dirname, join as join8 } from "path";
 var OPENCODE_COMMANDS = ["opencode", "opencode-desktop"];
 var WINDOWS_SUFFIXES = ["", ".exe", ".cmd", ".bat", ".ps1"];
@@ -25404,7 +25496,7 @@ function collectCandidateBinaryPaths(pathEnv, which = Bun.which, platform = proc
 }
 async function canExecuteBinary(binaryPath) {
   try {
-    const proc = Bun.spawn([binaryPath, "--version"], {
+    const proc = spawnWithWindowsHide([binaryPath, "--version"], {
       stdout: "pipe",
       stderr: "pipe"
     });
@@ -25610,6 +25702,7 @@ function createJsonOutputManager(options = {}) {
 }
 
 // src/cli/run/on-complete-hook.ts
+init_spawn_with_windows_hide();
 var import_picocolors11 = __toESM(require_picocolors(), 1);
 async function executeOnCompleteHook(options) {
   const { command, sessionId, exitCode, durationMs, messageCount } = options;
@@ -25619,7 +25712,7 @@ async function executeOnCompleteHook(options) {
   }
   console.error(import_picocolors11.default.dim(`Running on-complete hook: ${trimmedCommand}`));
   try {
-    const proc = Bun.spawn(["sh", "-c", trimmedCommand], {
+    const proc = spawnWithWindowsHide(["sh", "-c", trimmedCommand], {
       env: {
         ...process.env,
         SESSION_ID: sessionId,
@@ -25738,8 +25831,8 @@ function getPlanProgress(planPath) {
   }
   try {
     const content = readFileSync11(planPath, "utf-8");
-    const uncheckedMatches = content.match(/^[-*]\s*\[\s*\]/gm) || [];
-    const checkedMatches = content.match(/^[-*]\s*\[[xX]\]/gm) || [];
+    const uncheckedMatches = content.match(/^\s*[-*]\s*\[\s*\]/gm) || [];
+    const checkedMatches = content.match(/^\s*[-*]\s*\[[xX]\]/gm) || [];
     const total = uncheckedMatches.length + checkedMatches.length;
     const completed = checkedMatches.length;
     return {
@@ -25827,6 +25920,7 @@ function readState(directory, customPath) {
       active: isActive,
       iteration: iterationNum,
       max_iterations: Number(data.max_iterations) || DEFAULT_MAX_ITERATIONS,
+      message_count_at_start: typeof data.message_count_at_start === "number" ? data.message_count_at_start : typeof data.message_count_at_start === "string" && data.message_count_at_start.trim() !== "" ? Number(data.message_count_at_start) : undefined,
       completion_promise: stripQuotes(data.completion_promise) || DEFAULT_COMPLETION_PROMISE,
       started_at: stripQuotes(data.started_at) || new Date().toISOString(),
       prompt: body.trim(),
@@ -25960,14 +26054,19 @@ var DEFAULT_POLL_INTERVAL_MS = 500;
 var DEFAULT_REQUIRED_CONSECUTIVE = 1;
 var ERROR_GRACE_CYCLES = 3;
 var MIN_STABILIZATION_MS = 1000;
+var DEFAULT_EVENT_WATCHDOG_MS = 30000;
+var DEFAULT_SECONDARY_MEANINGFUL_WORK_TIMEOUT_MS = 60000;
 async function pollForCompletion(ctx, eventState, abortController, options = {}) {
   const pollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
   const requiredConsecutive = options.requiredConsecutive ?? DEFAULT_REQUIRED_CONSECUTIVE;
   const rawMinStabilizationMs = options.minStabilizationMs ?? MIN_STABILIZATION_MS;
   const minStabilizationMs = rawMinStabilizationMs > 0 ? rawMinStabilizationMs : MIN_STABILIZATION_MS;
+  const eventWatchdogMs = options.eventWatchdogMs ?? DEFAULT_EVENT_WATCHDOG_MS;
+  const secondaryMeaningfulWorkTimeoutMs = options.secondaryMeaningfulWorkTimeoutMs ?? DEFAULT_SECONDARY_MEANINGFUL_WORK_TIMEOUT_MS;
   let consecutiveCompleteChecks = 0;
   let errorCycleCount = 0;
   let firstWorkTimestamp = null;
+  let secondaryTimeoutChecked = false;
   const pollStartTimestamp = Date.now();
   while (!abortController.signal.aborted) {
     await new Promise((resolve2) => setTimeout(resolve2, pollIntervalMs));
@@ -25987,7 +26086,24 @@ Session ended with error: ${eventState.lastError}`));
     } else {
       errorCycleCount = 0;
     }
-    const mainSessionStatus = await getMainSessionStatus(ctx);
+    let mainSessionStatus = null;
+    if (eventState.lastEventTimestamp !== null) {
+      const timeSinceLastEvent = Date.now() - eventState.lastEventTimestamp;
+      if (timeSinceLastEvent > eventWatchdogMs) {
+        console.log(import_picocolors14.default.yellow(`
+  No events for ${Math.round(timeSinceLastEvent / 1000)}s, verifying session status...`));
+        mainSessionStatus = await getMainSessionStatus(ctx);
+        if (mainSessionStatus === "idle") {
+          eventState.mainSessionIdle = true;
+        } else if (mainSessionStatus === "busy" || mainSessionStatus === "retry") {
+          eventState.mainSessionIdle = false;
+        }
+        eventState.lastEventTimestamp = Date.now();
+      }
+    }
+    if (mainSessionStatus === null) {
+      mainSessionStatus = await getMainSessionStatus(ctx);
+    }
     if (mainSessionStatus === "busy" || mainSessionStatus === "retry") {
       eventState.mainSessionIdle = false;
     } else if (mainSessionStatus === "idle") {
@@ -26006,6 +26122,27 @@ Session ended with error: ${eventState.lastError}`));
         consecutiveCompleteChecks = 0;
         continue;
       }
+      if (Date.now() - pollStartTimestamp > secondaryMeaningfulWorkTimeoutMs && !secondaryTimeoutChecked) {
+        secondaryTimeoutChecked = true;
+        const childrenRes = await ctx.client.session.children({
+          path: { id: ctx.sessionID },
+          query: { directory: ctx.directory }
+        });
+        const children = normalizeSDKResponse(childrenRes, []);
+        const todosRes = await ctx.client.session.todo({
+          path: { id: ctx.sessionID },
+          query: { directory: ctx.directory }
+        });
+        const todos = normalizeSDKResponse(todosRes, []);
+        const hasActiveChildren = Array.isArray(children) && children.length > 0;
+        const hasActiveTodos = Array.isArray(todos) && todos.some((t) => t?.status !== "completed" && t?.status !== "cancelled");
+        const hasActiveWork = hasActiveChildren || hasActiveTodos;
+        if (hasActiveWork) {
+          eventState.hasReceivedMeaningfulWork = true;
+          console.log(import_picocolors14.default.yellow(`
+  No meaningful work events for ${Math.round(secondaryMeaningfulWorkTimeoutMs / 1000)}s but session has active work - assuming in progress`));
+        }
+      }
     } else {
       if (firstWorkTimestamp === null) {
         firstWorkTimestamp = Date.now();
@@ -26459,6 +26596,7 @@ var OPENCODE_BINARIES2 = ["opencode", "opencode-desktop"];
 import { existsSync as existsSync22, readFileSync as readFileSync23 } from "fs";
 
 // src/cli/doctor/checks/system-binary.ts
+init_spawn_with_windows_hide();
 import { existsSync as existsSync19 } from "fs";
 import { homedir as homedir5 } from "os";
 import { join as join16 } from "path";
@@ -26519,7 +26657,7 @@ async function findOpenCodeBinary() {
 async function getOpenCodeVersion2(binaryPath, platform = process.platform) {
   try {
     const command = buildVersionCommand(binaryPath, platform);
-    const processResult = Bun.spawn(command, { stdout: "pipe", stderr: "pipe" });
+    const processResult = spawnWithWindowsHide(command, { stdout: "pipe", stderr: "pipe" });
     const output = await new Response(processResult.stdout).text();
     await processResult.exited;
     if (processResult.exitCode !== 0)
@@ -27135,6 +27273,7 @@ async function checkConfig() {
 }
 
 // src/cli/doctor/checks/dependencies.ts
+init_spawn_with_windows_hide();
 import { existsSync as existsSync24 } from "fs";
 import { createRequire } from "module";
 import { dirname as dirname6, join as join22 } from "path";
@@ -27149,7 +27288,7 @@ async function checkBinaryExists(binary2) {
 }
 async function getBinaryVersion(binary2) {
   try {
-    const proc = Bun.spawn([binary2, "--version"], { stdout: "pipe", stderr: "pipe" });
+    const proc = spawnWithWindowsHide([binary2, "--version"], { stdout: "pipe", stderr: "pipe" });
     const output = await new Response(proc.stdout).text();
     await proc.exited;
     if (proc.exitCode === 0) {
@@ -27256,6 +27395,7 @@ async function checkCommentChecker() {
 }
 
 // src/cli/doctor/checks/tools-gh.ts
+init_spawn_with_windows_hide();
 async function checkBinaryExists2(binary2) {
   try {
     const binaryPath = Bun.which(binary2);
@@ -27266,7 +27406,7 @@ async function checkBinaryExists2(binary2) {
 }
 async function getGhVersion() {
   try {
-    const processResult = Bun.spawn(["gh", "--version"], { stdout: "pipe", stderr: "pipe" });
+    const processResult = spawnWithWindowsHide(["gh", "--version"], { stdout: "pipe", stderr: "pipe" });
     const output = await new Response(processResult.stdout).text();
     await processResult.exited;
     if (processResult.exitCode !== 0)
@@ -27280,7 +27420,7 @@ async function getGhVersion() {
 }
 async function getGhAuthStatus() {
   try {
-    const processResult = Bun.spawn(["gh", "auth", "status"], {
+    const processResult = spawnWithWindowsHide(["gh", "auth", "status"], {
       stdout: "pipe",
       stderr: "pipe",
       env: { ...process.env, GH_NO_UPDATE_NOTIFIER: "1" }