oh-my-opencode 3.6.0 → 3.7.1

package/dist/cli/index.js

@@ -4930,10 +4930,7 @@ function normalizeSDKResponse(response, fallback, options) {
 }
 
 // src/shared/dynamic-truncator.ts
-var ANTHROPIC_ACTUAL_LIMIT;
-var init_dynamic_truncator = __esm(() => {
-  ANTHROPIC_ACTUAL_LIMIT = process.env.ANTHROPIC_1M_CONTEXT === "true" || process.env.VERTEX_ANTHROPIC_1M_CONTEXT === "true" ? 1e6 : 200000;
-});
+var init_dynamic_truncator = () => {};
 
 // src/shared/data-path.ts
 import * as path2 from "path";
@@ -7007,6 +7004,18 @@ var init_model_resolver = __esm(() => {
   init_model_resolution_pipeline();
 });
 
+// src/shared/model-name-matcher.ts
+var init_model_name_matcher = __esm(() => {
+  init_logger();
+});
+
+// src/shared/fallback-model-availability.ts
+var init_fallback_model_availability = __esm(() => {
+  init_connected_providers_cache();
+  init_logger();
+  init_model_name_matcher();
+});
+
 // src/features/hook-message-injector/constants.ts
 var init_constants = __esm(() => {
   init_shared();
@@ -7045,6 +7054,26 @@ var init_opencode_message_dir = __esm(() => {
 });
 
 // src/shared/agent-display-names.ts
+function getAgentDisplayName(configKey) {
+  const exactMatch = AGENT_DISPLAY_NAMES[configKey];
+  if (exactMatch !== undefined)
+    return exactMatch;
+  const lowerKey = configKey.toLowerCase();
+  for (const [k, v] of Object.entries(AGENT_DISPLAY_NAMES)) {
+    if (k.toLowerCase() === lowerKey)
+      return v;
+  }
+  return configKey;
+}
+function getAgentConfigKey(agentName) {
+  const lower = agentName.toLowerCase();
+  const reversed = REVERSE_DISPLAY_NAMES[lower];
+  if (reversed !== undefined)
+    return reversed;
+  if (AGENT_DISPLAY_NAMES[lower] !== undefined)
+    return lower;
+  return lower;
+}
 var AGENT_DISPLAY_NAMES, REVERSE_DISPLAY_NAMES;
 var init_agent_display_names = __esm(() => {
   AGENT_DISPLAY_NAMES = {
@@ -7166,10 +7195,15 @@ async function getAvailableServerPort(preferredPort = DEFAULT_SERVER_PORT, hostn
 }
 var DEFAULT_SERVER_PORT = 4096, MAX_PORT_ATTEMPTS = 20;
 var init_port_utils = () => {};
+// src/shared/git-worktree/parse-status-porcelain.ts
+var init_parse_status_porcelain = () => {};
 // src/shared/git-worktree/collect-git-diff-stats.ts
-var init_collect_git_diff_stats = () => {};
+var init_collect_git_diff_stats = __esm(() => {
+  init_parse_status_porcelain();
+});
 // src/shared/git-worktree/index.ts
 var init_git_worktree = __esm(() => {
+  init_parse_status_porcelain();
   init_collect_git_diff_stats();
 });
 
@@ -7177,6 +7211,9 @@ var init_git_worktree = __esm(() => {
 var init_safe_create_hook = __esm(() => {
   init_logger();
 });
+// src/shared/session-directory-resolver.ts
+var init_session_directory_resolver = () => {};
+
 // src/shared/index.ts
 var init_shared = __esm(() => {
   init_model_resolution_pipeline();
@@ -7207,6 +7244,7 @@ var init_shared = __esm(() => {
   init_model_requirements();
   init_model_resolver();
   init_model_availability();
+  init_fallback_model_availability();
   init_connected_providers_cache();
   init_session_utils();
   init_tmux();
@@ -7218,6 +7256,7 @@ var init_shared = __esm(() => {
   init_safe_create_hook();
   init_opencode_storage_paths();
   init_opencode_message_dir();
+  init_session_directory_resolver();
 });
 
 // src/cli/config-manager/config-context.ts
@@ -8868,6 +8907,7 @@ var init_startup_toasts = __esm(() => {
 // src/hooks/auto-update-checker/hook.ts
 function createAutoUpdateCheckerHook(ctx, options = {}) {
   const { showStartupToast = true, isSisyphusEnabled = false, autoUpdate = true } = options;
+  const isCliRunMode = process.env.OPENCODE_CLI_RUN_MODE === "true";
   const getToastMessage = (isUpdate, latestVersion) => {
     if (isSisyphusEnabled) {
       return isUpdate ? `Sisyphus on steroids is steering OpenCode.
@@ -8881,6 +8921,8 @@ v${latestVersion} available. Restart OpenCode to apply.` : "OpenCode is now on S
     event: ({ event }) => {
       if (event.type !== "session.created")
         return;
+      if (isCliRunMode)
+        return;
       if (hasChecked)
         return;
       const props = event.properties;
@@ -8957,7 +8999,7 @@ var {
 // package.json
 var package_default = {
   name: "oh-my-opencode",
-  version: "3.6.0",
+  version: "3.7.1",
   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",
@@ -9031,13 +9073,13 @@ var package_default = {
     typescript: "^5.7.3"
   },
   optionalDependencies: {
-    "oh-my-opencode-darwin-arm64": "3.6.0",
-    "oh-my-opencode-darwin-x64": "3.6.0",
-    "oh-my-opencode-linux-arm64": "3.6.0",
-    "oh-my-opencode-linux-arm64-musl": "3.6.0",
-    "oh-my-opencode-linux-x64": "3.6.0",
-    "oh-my-opencode-linux-x64-musl": "3.6.0",
-    "oh-my-opencode-windows-x64": "3.6.0"
+    "oh-my-opencode-darwin-arm64": "3.7.1",
+    "oh-my-opencode-darwin-x64": "3.7.1",
+    "oh-my-opencode-linux-arm64": "3.7.1",
+    "oh-my-opencode-linux-arm64-musl": "3.7.1",
+    "oh-my-opencode-linux-x64": "3.7.1",
+    "oh-my-opencode-linux-x64-musl": "3.7.1",
+    "oh-my-opencode-windows-x64": "3.7.1"
   },
   trustedDependencies: [
     "@ast-grep/cli",
@@ -10145,7 +10187,8 @@ function serializeError(error) {
 function getSessionTag(ctx, payload) {
   const props = payload.properties;
   const info = props?.info;
-  const sessionID = props?.sessionID ?? info?.sessionID;
+  const part = props?.part;
+  const sessionID = props?.sessionID ?? props?.sessionId ?? info?.sessionID ?? info?.sessionId ?? part?.sessionID ?? part?.sessionId;
   const isMainSession = sessionID === ctx.sessionID;
   if (isMainSession)
     return import_picocolors5.default.green("[MAIN]");
@@ -10166,9 +10209,9 @@ function logEventVerbose(ctx, payload) {
     case "message.part.updated": {
       const partProps = props;
       const part = partProps?.part;
-      if (part?.type === "tool-invocation") {
-        const toolPart = part;
-        console.error(import_picocolors5.default.dim(`${sessionTag} message.part (tool): ${toolPart.toolName} [${toolPart.state}]`));
+      if (part?.type === "tool") {
+        const status = part.state?.status ?? "unknown";
+        console.error(import_picocolors5.default.dim(`${sessionTag} message.part (tool): ${part.tool ?? part.name ?? "?"} [${status}]`));
       } else if (part?.type === "text" && part.text) {
         const preview = part.text.slice(0, 80).replace(/\n/g, "\\n");
         console.error(import_picocolors5.default.dim(`${sessionTag} message.part (text): "${preview}${part.text.length > 80 ? "..." : ""}"`));
@@ -10225,11 +10268,20 @@ var import_picocolors7 = __toESM(require_picocolors(), 1);
 
 // src/cli/run/event-handlers.ts
 var import_picocolors6 = __toESM(require_picocolors(), 1);
+function getSessionId(props) {
+  return props?.sessionID ?? props?.sessionId;
+}
+function getInfoSessionId(props) {
+  return props?.info?.sessionID ?? props?.info?.sessionId;
+}
+function getPartSessionId(props) {
+  return props?.part?.sessionID ?? props?.part?.sessionId;
+}
 function handleSessionIdle(ctx, payload, state) {
   if (payload.type !== "session.idle")
     return;
   const props = payload.properties;
-  if (props?.sessionID === ctx.sessionID) {
+  if (getSessionId(props) === ctx.sessionID) {
     state.mainSessionIdle = true;
   }
 }
@@ -10237,7 +10289,7 @@ function handleSessionStatus(ctx, payload, state) {
   if (payload.type !== "session.status")
     return;
   const props = payload.properties;
-  if (props?.sessionID !== ctx.sessionID)
+  if (getSessionId(props) !== ctx.sessionID)
     return;
   if (props?.status?.type === "busy") {
     state.mainSessionIdle = false;
@@ -10251,7 +10303,7 @@ function handleSessionError(ctx, payload, state) {
   if (payload.type !== "session.error")
     return;
   const props = payload.properties;
-  if (props?.sessionID === ctx.sessionID) {
+  if (getSessionId(props) === ctx.sessionID) {
     state.mainSessionError = true;
     state.lastError = serializeError(props?.error);
     console.error(import_picocolors6.default.red(`
@@ -10262,11 +10314,11 @@ function handleMessagePartUpdated(ctx, payload, state) {
   if (payload.type !== "message.part.updated")
     return;
   const props = payload.properties;
-  if (props?.info?.sessionID !== ctx.sessionID)
-    return;
-  if (props?.info?.role !== "assistant")
+  const partSid = getPartSessionId(props);
+  const infoSid = getInfoSessionId(props);
+  if ((partSid ?? infoSid) !== ctx.sessionID)
     return;
-  const part = props.part;
+  const part = props?.part;
   if (!part)
     return;
   if (part.type === "text" && part.text) {
@@ -10277,12 +10329,53 @@ function handleMessagePartUpdated(ctx, payload, state) {
     }
     state.lastPartText = part.text;
   }
+  if (part.type === "tool") {
+    handleToolPart(ctx, part, state);
+  }
+}
+function handleToolPart(_ctx, part, state) {
+  const toolName = part.tool || part.name || "unknown";
+  const status = part.state?.status;
+  if (status === "running") {
+    state.currentTool = toolName;
+    let inputPreview = "";
+    const input = part.state?.input;
+    if (input) {
+      if (input.command) {
+        inputPreview = ` ${import_picocolors6.default.dim(String(input.command).slice(0, 60))}`;
+      } else if (input.pattern) {
+        inputPreview = ` ${import_picocolors6.default.dim(String(input.pattern).slice(0, 40))}`;
+      } else if (input.filePath) {
+        inputPreview = ` ${import_picocolors6.default.dim(String(input.filePath))}`;
+      } else if (input.query) {
+        inputPreview = ` ${import_picocolors6.default.dim(String(input.query).slice(0, 40))}`;
+      }
+    }
+    state.hasReceivedMeaningfulWork = true;
+    process.stdout.write(`
+${import_picocolors6.default.cyan(">")} ${import_picocolors6.default.bold(toolName)}${inputPreview}
+`);
+  }
+  if (status === "completed" || status === "error") {
+    const output = part.state?.output || "";
+    const maxLen = 200;
+    const preview = output.length > maxLen ? output.slice(0, maxLen) + "..." : output;
+    if (preview.trim()) {
+      const lines = preview.split(`
+`).slice(0, 3);
+      process.stdout.write(import_picocolors6.default.dim(`   \u2514\u2500 ${lines.join(`
+      `)}
+`));
+    }
+    state.currentTool = null;
+    state.lastPartText = "";
+  }
 }
 function handleMessageUpdated(ctx, payload, state) {
   if (payload.type !== "message.updated")
     return;
   const props = payload.properties;
-  if (props?.info?.sessionID !== ctx.sessionID)
+  if (getInfoSessionId(props) !== ctx.sessionID)
     return;
   if (props?.info?.role !== "assistant")
     return;
@@ -10294,7 +10387,7 @@ function handleToolExecute(ctx, payload, state) {
   if (payload.type !== "tool.execute")
     return;
   const props = payload.properties;
-  if (props?.sessionID !== ctx.sessionID)
+  if (getSessionId(props) !== ctx.sessionID)
     return;
   const toolName = props?.name || "unknown";
   state.currentTool = toolName;
@@ -10320,7 +10413,7 @@ function handleToolResult(ctx, payload, state) {
   if (payload.type !== "tool.result")
     return;
   const props = payload.properties;
-  if (props?.sessionID !== ctx.sessionID)
+  if (getSessionId(props) !== ctx.sessionID)
     return;
   const output = props?.output || "";
   const maxLen = 200;
@@ -10335,6 +10428,25 @@ function handleToolResult(ctx, payload, state) {
   state.currentTool = null;
   state.lastPartText = "";
 }
+function handleTuiToast(_ctx, payload, state) {
+  if (payload.type !== "tui.toast.show")
+    return;
+  const props = payload.properties;
+  const title = props?.title ? `${props.title}: ` : "";
+  const message = props?.message?.trim();
+  const variant = props?.variant ?? "info";
+  if (!message)
+    return;
+  if (variant === "error") {
+    state.mainSessionError = true;
+    state.lastError = `${title}${message}`;
+    console.error(import_picocolors6.default.red(`
+[tui.toast.error] ${state.lastError}`));
+    return;
+  }
+  const colorize = variant === "warning" ? import_picocolors6.default.yellow : import_picocolors6.default.dim;
+  console.log(colorize(`[toast:${variant}] ${title}${message}`));
+}
 
 // src/cli/run/event-stream-processor.ts
 async function processEvents(ctx, stream, state) {
@@ -10355,6 +10467,7 @@ async function processEvents(ctx, stream, state) {
       handleMessageUpdated(ctx, payload, state);
       handleToolExecute(ctx, payload, state);
       handleToolResult(ctx, payload, state);
+      handleTuiToast(ctx, payload, state);
     } catch (err) {
       console.error(import_picocolors7.default.red(`[event error] ${err}`));
     }
@@ -22787,7 +22900,8 @@ var BackgroundTaskConfigSchema = exports_external.object({
 var BrowserAutomationProviderSchema = exports_external.enum([
   "playwright",
   "agent-browser",
-  "dev-browser"
+  "dev-browser",
+  "playwright-cli"
 ]);
 var BrowserAutomationConfigSchema = exports_external.object({
   provider: BrowserAutomationProviderSchema.default("playwright")
@@ -22886,7 +23000,8 @@ var ExperimentalConfigSchema = exports_external.object({
   dynamic_context_pruning: DynamicContextPruningConfigSchema.optional(),
   task_system: exports_external.boolean().optional(),
   plugin_load_timeout_ms: exports_external.number().min(1000).optional(),
-  safe_hook_creation: exports_external.boolean().optional()
+  safe_hook_creation: exports_external.boolean().optional(),
+  hashline_edit: exports_external.boolean().optional()
 });
 // src/config/schema/git-master.ts
 var GitMasterConfigSchema = exports_external.object({
@@ -22936,7 +23051,8 @@ var HookNameSchema = exports_external.enum([
   "stop-continuation-guard",
   "tasks-todowrite-disabler",
   "write-existing-file-guard",
-  "anthropic-effort"
+  "anthropic-effort",
+  "hashline-read-enhancer"
 ]);
 // src/config/schema/notification.ts
 var NotificationConfigSchema = exports_external.object({
@@ -24624,7 +24740,99 @@ async function createOpencode(options) {
 // src/cli/run/server-connection.ts
 init_port_utils();
 var import_picocolors8 = __toESM(require_picocolors(), 1);
+
+// src/cli/run/opencode-binary-resolver.ts
+import { delimiter, dirname, join as join8 } from "path";
+var OPENCODE_COMMANDS = ["opencode", "opencode-desktop"];
+var WINDOWS_SUFFIXES = ["", ".exe", ".cmd", ".bat", ".ps1"];
+function getCommandCandidates(platform) {
+  if (platform !== "win32")
+    return [...OPENCODE_COMMANDS];
+  return OPENCODE_COMMANDS.flatMap((command) => WINDOWS_SUFFIXES.map((suffix) => `${command}${suffix}`));
+}
+function collectCandidateBinaryPaths(pathEnv, which = Bun.which, platform = process.platform) {
+  const seen = new Set;
+  const candidates = [];
+  const commandCandidates = getCommandCandidates(platform);
+  const addCandidate = (binaryPath) => {
+    if (!binaryPath || seen.has(binaryPath))
+      return;
+    seen.add(binaryPath);
+    candidates.push(binaryPath);
+  };
+  for (const command of commandCandidates) {
+    addCandidate(which(command));
+  }
+  for (const entry of (pathEnv ?? "").split(delimiter).filter(Boolean)) {
+    for (const command of commandCandidates) {
+      addCandidate(join8(entry, command));
+    }
+  }
+  return candidates;
+}
+async function canExecuteBinary(binaryPath) {
+  try {
+    const proc = Bun.spawn([binaryPath, "--version"], {
+      stdout: "pipe",
+      stderr: "pipe"
+    });
+    await proc.exited;
+    return proc.exitCode === 0;
+  } catch {
+    return false;
+  }
+}
+async function findWorkingOpencodeBinary(pathEnv = process.env.PATH, probe = canExecuteBinary, which = Bun.which, platform = process.platform) {
+  const candidates = collectCandidateBinaryPaths(pathEnv, which, platform);
+  for (const candidate of candidates) {
+    if (await probe(candidate)) {
+      return candidate;
+    }
+  }
+  return null;
+}
+function buildPathWithBinaryFirst(pathEnv, binaryPath) {
+  const preferredDir = dirname(binaryPath);
+  const existing = (pathEnv ?? "").split(delimiter).filter((entry) => entry.length > 0 && entry !== preferredDir);
+  return [preferredDir, ...existing].join(delimiter);
+}
+async function withWorkingOpencodePath(startServer, finder = findWorkingOpencodeBinary) {
+  const originalPath = process.env.PATH;
+  const binaryPath = await finder(originalPath);
+  if (!binaryPath) {
+    return startServer();
+  }
+  process.env.PATH = buildPathWithBinaryFirst(originalPath, binaryPath);
+  try {
+    return await startServer();
+  } finally {
+    process.env.PATH = originalPath;
+  }
+}
+
+// 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;
+  }
+  const opencodeBinDir = dirname2(resolvedPath);
+  const currentPath = env.PATH ?? "";
+  const pathSegments = currentPath ? currentPath.split(delimiter2) : [];
+  if (pathSegments.includes(opencodeBinDir)) {
+    return;
+  }
+  env.PATH = currentPath ? `${opencodeBinDir}${delimiter2}${currentPath}` : opencodeBinDir;
+}
+
+// src/cli/run/server-connection.ts
 async function createServerConnection(options) {
+  prependResolvedOpencodeBinToPath();
   const { port, attach, signal } = options;
   if (attach !== undefined) {
     console.log(import_picocolors8.default.dim("Attaching to existing server at"), import_picocolors8.default.cyan(attach));
@@ -24638,7 +24846,7 @@ async function createServerConnection(options) {
     const available = await isPortAvailable(port, "127.0.0.1");
     if (available) {
       console.log(import_picocolors8.default.dim("Starting server on port"), import_picocolors8.default.cyan(port.toString()));
-      const { client: client5, server: server3 } = await createOpencode({ signal, port, hostname: "127.0.0.1" });
+      const { client: client5, server: server3 } = await withWorkingOpencodePath(() => createOpencode({ signal, port, hostname: "127.0.0.1" }));
       console.log(import_picocolors8.default.dim("Server listening at"), import_picocolors8.default.cyan(server3.url));
       return { client: client5, cleanup: () => server3.close() };
     }
@@ -24652,7 +24860,7 @@ async function createServerConnection(options) {
   } else {
     console.log(import_picocolors8.default.dim("Starting server on port"), import_picocolors8.default.cyan(selectedPort.toString()));
   }
-  const { client: client3, server: server2 } = await createOpencode({ signal, port: selectedPort, hostname: "127.0.0.1" });
+  const { client: client3, server: server2 } = await withWorkingOpencodePath(() => createOpencode({ signal, port: selectedPort, hostname: "127.0.0.1" }));
   console.log(import_picocolors8.default.dim("Server listening at"), import_picocolors8.default.cyan(server2.url));
   return { client: client3, cleanup: () => server2.close() };
 }
@@ -24662,9 +24870,12 @@ var import_picocolors9 = __toESM(require_picocolors(), 1);
 var SESSION_CREATE_MAX_RETRIES = 3;
 var SESSION_CREATE_RETRY_DELAY_MS = 1000;
 async function resolveSession(options) {
-  const { client: client3, sessionId } = options;
+  const { client: client3, sessionId, directory } = options;
   if (sessionId) {
-    const res = await client3.session.get({ path: { id: sessionId } });
+    const res = await client3.session.get({
+      path: { id: sessionId },
+      query: { directory }
+    });
     if (res.error || !res.data) {
       throw new Error(`Session not found: ${sessionId}`);
     }
@@ -24677,7 +24888,8 @@ async function resolveSession(options) {
         permission: [
           { permission: "question", action: "deny", pattern: "*" }
         ]
-      }
+      },
+      query: { directory }
     });
     if (res.error) {
       console.error(import_picocolors9.default.yellow(`Session create attempt ${attempt}/${SESSION_CREATE_MAX_RETRIES} failed:`));
@@ -24764,6 +24976,7 @@ async function executeOnCompleteHook(options) {
 }
 
 // src/cli/run/agent-resolver.ts
+init_agent_display_names();
 var import_picocolors11 = __toESM(require_picocolors(), 1);
 var CORE_AGENT_ORDER = ["sisyphus", "hephaestus", "prometheus", "atlas"];
 var DEFAULT_AGENT = "sisyphus";
@@ -24771,18 +24984,22 @@ var normalizeAgentName = (agent) => {
   if (!agent)
     return;
   const trimmed = agent.trim();
-  if (!trimmed)
+  if (trimmed.length === 0)
     return;
-  const lowered = trimmed.toLowerCase();
-  const coreMatch = CORE_AGENT_ORDER.find((name) => name.toLowerCase() === lowered);
-  return coreMatch ?? trimmed;
+  const configKey = getAgentConfigKey(trimmed);
+  const displayName = getAgentDisplayName(configKey);
+  const isKnownAgent = displayName !== configKey;
+  return {
+    configKey,
+    resolvedName: isKnownAgent ? displayName : trimmed
+  };
 };
-var isAgentDisabled = (agent, config2) => {
-  const lowered = agent.toLowerCase();
-  if (lowered === "sisyphus" && config2.sisyphus_agent?.disabled === true) {
+var isAgentDisabled = (agentConfigKey, config2) => {
+  const lowered = agentConfigKey.toLowerCase();
+  if (lowered === DEFAULT_AGENT && config2.sisyphus_agent?.disabled === true) {
     return true;
   }
-  return (config2.disabled_agents ?? []).some((disabled) => disabled.toLowerCase() === lowered);
+  return (config2.disabled_agents ?? []).some((disabled) => getAgentConfigKey(disabled) === lowered);
 };
 var pickFallbackAgent = (config2) => {
   for (const agent of CORE_AGENT_ORDER) {
@@ -24796,19 +25013,22 @@ var resolveRunAgent = (options, pluginConfig, env = process.env) => {
   const cliAgent = normalizeAgentName(options.agent);
   const envAgent = normalizeAgentName(env.OPENCODE_DEFAULT_AGENT);
   const configAgent = normalizeAgentName(pluginConfig.default_run_agent);
-  const resolved = cliAgent ?? envAgent ?? configAgent ?? DEFAULT_AGENT;
-  const normalized = normalizeAgentName(resolved) ?? DEFAULT_AGENT;
-  if (isAgentDisabled(normalized, pluginConfig)) {
+  const resolved = cliAgent ?? envAgent ?? configAgent ?? {
+    configKey: DEFAULT_AGENT,
+    resolvedName: getAgentDisplayName(DEFAULT_AGENT)
+  };
+  if (isAgentDisabled(resolved.configKey, pluginConfig)) {
     const fallback = pickFallbackAgent(pluginConfig);
+    const fallbackName = getAgentDisplayName(fallback);
     const fallbackDisabled = isAgentDisabled(fallback, pluginConfig);
     if (fallbackDisabled) {
-      console.log(import_picocolors11.default.yellow(`Requested agent "${normalized}" is disabled and no enabled core agent was found. Proceeding with "${fallback}".`));
-      return fallback;
+      console.log(import_picocolors11.default.yellow(`Requested agent "${resolved.resolvedName}" is disabled and no enabled core agent was found. Proceeding with "${fallbackName}".`));
+      return fallbackName;
     }
-    console.log(import_picocolors11.default.yellow(`Requested agent "${normalized}" is disabled. Falling back to "${fallback}".`));
-    return fallback;
+    console.log(import_picocolors11.default.yellow(`Requested agent "${resolved.resolvedName}" is disabled. Falling back to "${fallbackName}".`));
+    return fallbackName;
   }
-  return normalized;
+  return resolved.resolvedName;
 };
 
 // src/cli/run/poll-for-completion.ts
@@ -24832,7 +25052,10 @@ async function checkCompletionConditions(ctx) {
   }
 }
 async function areAllTodosComplete(ctx) {
-  const todosRes = await ctx.client.session.todo({ path: { id: ctx.sessionID } });
+  const todosRes = await ctx.client.session.todo({
+    path: { id: ctx.sessionID },
+    query: { directory: ctx.directory }
+  });
   const todos = normalizeSDKResponse(todosRes, []);
   const incompleteTodos = todos.filter((t) => t.status !== "completed" && t.status !== "cancelled");
   if (incompleteTodos.length > 0) {
@@ -24846,12 +25069,15 @@ async function areAllChildrenIdle(ctx) {
   return areAllDescendantsIdle(ctx, ctx.sessionID, allStatuses);
 }
 async function fetchAllStatuses(ctx) {
-  const statusRes = await ctx.client.session.status();
+  const statusRes = await ctx.client.session.status({
+    query: { directory: ctx.directory }
+  });
   return normalizeSDKResponse(statusRes, {});
 }
 async function areAllDescendantsIdle(ctx, sessionID, allStatuses) {
   const childrenRes = await ctx.client.session.children({
-    path: { id: sessionID }
+    path: { id: sessionID },
+    query: { directory: ctx.directory }
   });
   const children = normalizeSDKResponse(childrenRes, []);
   for (const child of children) {
@@ -24869,6 +25095,7 @@ async function areAllDescendantsIdle(ctx, sessionID, allStatuses) {
 }
 
 // src/cli/run/poll-for-completion.ts
+init_shared();
 var DEFAULT_POLL_INTERVAL_MS = 500;
 var DEFAULT_REQUIRED_CONSECUTIVE = 3;
 var ERROR_GRACE_CYCLES = 3;
@@ -24880,6 +25107,7 @@ async function pollForCompletion(ctx, eventState, abortController, options = {})
   let consecutiveCompleteChecks = 0;
   let errorCycleCount = 0;
   let firstWorkTimestamp = null;
+  const pollStartTimestamp = Date.now();
   while (!abortController.signal.aborted) {
     await new Promise((resolve2) => setTimeout(resolve2, pollIntervalMs));
     if (eventState.mainSessionError) {
@@ -24895,6 +25123,12 @@ Session ended with error: ${eventState.lastError}`));
     } else {
       errorCycleCount = 0;
     }
+    const mainSessionStatus = await getMainSessionStatus(ctx);
+    if (mainSessionStatus === "busy" || mainSessionStatus === "retry") {
+      eventState.mainSessionIdle = false;
+    } else if (mainSessionStatus === "idle") {
+      eventState.mainSessionIdle = true;
+    }
     if (!eventState.mainSessionIdle) {
       consecutiveCompleteChecks = 0;
       continue;
@@ -24904,8 +25138,11 @@ Session ended with error: ${eventState.lastError}`));
       continue;
     }
     if (!eventState.hasReceivedMeaningfulWork) {
+      if (Date.now() - pollStartTimestamp < minStabilizationMs) {
+        consecutiveCompleteChecks = 0;
+        continue;
+      }
       consecutiveCompleteChecks = 0;
-      continue;
     }
     if (firstWorkTimestamp === null) {
       firstWorkTimestamp = Date.now();
@@ -24929,6 +25166,21 @@ All tasks completed.`));
   }
   return 130;
 }
+async function getMainSessionStatus(ctx) {
+  try {
+    const statusesRes = await ctx.client.session.status({
+      query: { directory: ctx.directory }
+    });
+    const statuses = normalizeSDKResponse(statusesRes, {});
+    const status = statuses[ctx.sessionID]?.type;
+    if (status === "idle" || status === "busy" || status === "retry") {
+      return status;
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
 
 // src/cli/run/runner.ts
 var DEFAULT_TIMEOUT_MS = 600000;
@@ -24984,7 +25236,8 @@ Interrupted. Shutting down...`));
     try {
       const sessionID = await resolveSession({
         client: client3,
-        sessionId: options.sessionId
+        sessionId: options.sessionId,
+        directory
       });
       console.log(import_picocolors14.default.dim(`Session: ${sessionID}`));
       const ctx = { client: client3, sessionID, directory, abortController };
@@ -25235,24 +25488,24 @@ import { existsSync as existsSync19, readFileSync as readFileSync20 } from "fs";
 // src/cli/doctor/checks/system-binary.ts
 import { existsSync as existsSync16 } from "fs";
 import { homedir as homedir5 } from "os";
-import { join as join12 } from "path";
+import { join as join13 } from "path";
 function getDesktopAppPaths(platform) {
   const home = homedir5();
   switch (platform) {
     case "darwin":
       return [
         "/Applications/OpenCode.app/Contents/MacOS/OpenCode",
-        join12(home, "Applications", "OpenCode.app", "Contents", "MacOS", "OpenCode")
+        join13(home, "Applications", "OpenCode.app", "Contents", "MacOS", "OpenCode")
       ];
     case "win32": {
       const programFiles = process.env.ProgramFiles;
       const localAppData = process.env.LOCALAPPDATA;
       const paths = [];
       if (programFiles) {
-        paths.push(join12(programFiles, "OpenCode", "OpenCode.exe"));
+        paths.push(join13(programFiles, "OpenCode", "OpenCode.exe"));
       }
       if (localAppData) {
-        paths.push(join12(localAppData, "OpenCode", "OpenCode.exe"));
+        paths.push(join13(localAppData, "OpenCode", "OpenCode.exe"));
       }
       return paths;
     }
@@ -25260,8 +25513,8 @@ function getDesktopAppPaths(platform) {
       return [
         "/usr/bin/opencode",
         "/usr/lib/opencode/opencode",
-        join12(home, "Applications", "opencode-desktop-linux-x86_64.AppImage"),
-        join12(home, "Applications", "opencode-desktop-linux-aarch64.AppImage")
+        join13(home, "Applications", "opencode-desktop-linux-x86_64.AppImage"),
+        join13(home, "Applications", "opencode-desktop-linux-aarch64.AppImage")
       ];
     default:
       return [];
@@ -25401,21 +25654,21 @@ init_checker();
 init_auto_update_checker();
 import { existsSync as existsSync18, readFileSync as readFileSync19 } from "fs";
 import { homedir as homedir6 } from "os";
-import { join as join13 } from "path";
+import { join as join14 } from "path";
 init_shared();
 function getPlatformDefaultCacheDir(platform = process.platform) {
   if (platform === "darwin")
-    return join13(homedir6(), "Library", "Caches");
+    return join14(homedir6(), "Library", "Caches");
   if (platform === "win32")
-    return process.env.LOCALAPPDATA ?? join13(homedir6(), "AppData", "Local");
-  return join13(homedir6(), ".cache");
+    return process.env.LOCALAPPDATA ?? join14(homedir6(), "AppData", "Local");
+  return join14(homedir6(), ".cache");
 }
 function resolveOpenCodeCacheDir() {
   const xdgCacheHome = process.env.XDG_CACHE_HOME;
   if (xdgCacheHome)
-    return join13(xdgCacheHome, "opencode");
+    return join14(xdgCacheHome, "opencode");
   const fromShared = getOpenCodeCacheDir();
-  const platformDefault = join13(getPlatformDefaultCacheDir(), "opencode");
+  const platformDefault = join14(getPlatformDefaultCacheDir(), "opencode");
   if (existsSync18(fromShared) || !existsSync18(platformDefault))
     return fromShared;
   return platformDefault;
@@ -25438,8 +25691,8 @@ function normalizeVersion(value) {
 }
 function getLoadedPluginVersion() {
   const cacheDir = resolveOpenCodeCacheDir();
-  const cachePackagePath = join13(cacheDir, "package.json");
-  const installedPackagePath = join13(cacheDir, "node_modules", PACKAGE_NAME4, "package.json");
+  const cachePackagePath = join14(cacheDir, "package.json");
+  const installedPackagePath = join14(cacheDir, "node_modules", PACKAGE_NAME4, "package.json");
   const cachePackage = readPackageJson(cachePackagePath);
   const installedPackage = readPackageJson(installedPackagePath);
   const expectedVersion = normalizeVersion(cachePackage?.dependencies?.[PACKAGE_NAME4]);
@@ -25568,22 +25821,22 @@ async function checkSystem() {
 
 // src/cli/doctor/checks/config.ts
 import { readFileSync as readFileSync23 } from "fs";
-import { join as join17 } from "path";
+import { join as join18 } from "path";
 init_shared();
 
 // src/cli/doctor/checks/model-resolution-cache.ts
 init_shared();
 import { existsSync as existsSync20, readFileSync as readFileSync21 } from "fs";
 import { homedir as homedir7 } from "os";
-import { join as join14 } from "path";
+import { join as join15 } from "path";
 function getOpenCodeCacheDir2() {
   const xdgCache = process.env.XDG_CACHE_HOME;
   if (xdgCache)
-    return join14(xdgCache, "opencode");
-  return join14(homedir7(), ".cache", "opencode");
+    return join15(xdgCache, "opencode");
+  return join15(homedir7(), ".cache", "opencode");
 }
 function loadAvailableModelsFromCache() {
-  const cacheFile = join14(getOpenCodeCacheDir2(), "models.json");
+  const cacheFile = join15(getOpenCodeCacheDir2(), "models.json");
   if (!existsSync20(cacheFile)) {
     return { providers: [], modelCount: 0, cacheExists: false };
   }
@@ -25610,10 +25863,10 @@ init_model_requirements();
 // src/cli/doctor/checks/model-resolution-config.ts
 init_shared();
 import { readFileSync as readFileSync22 } from "fs";
-import { join as join15 } from "path";
+import { join as join16 } from "path";
 var PACKAGE_NAME5 = "oh-my-opencode";
-var USER_CONFIG_BASE = join15(getOpenCodeConfigPaths({ binary: "opencode", version: null }).configDir, PACKAGE_NAME5);
-var PROJECT_CONFIG_BASE = join15(process.cwd(), ".opencode", PACKAGE_NAME5);
+var USER_CONFIG_BASE = join16(getOpenCodeConfigPaths({ binary: "opencode", version: null }).configDir, PACKAGE_NAME5);
+var PROJECT_CONFIG_BASE = join16(process.cwd(), ".opencode", PACKAGE_NAME5);
 function loadOmoConfig() {
   const projectDetected = detectConfigFile(PROJECT_CONFIG_BASE);
   if (projectDetected.format !== "none") {
@@ -25638,7 +25891,7 @@ function loadOmoConfig() {
 
 // src/cli/doctor/checks/model-resolution-details.ts
 init_shared();
-import { join as join16 } from "path";
+import { join as join17 } from "path";
 
 // src/cli/doctor/checks/model-resolution-variant.ts
 function formatModelWithVariant(model, variant) {
@@ -25677,7 +25930,7 @@ function getCategoryEffectiveVariant(categoryName, requirement, config2) {
 // src/cli/doctor/checks/model-resolution-details.ts
 function buildModelResolutionDetails(options) {
   const details = [];
-  const cacheFile = join16(getOpenCodeCacheDir(), "models.json");
+  const cacheFile = join17(getOpenCodeCacheDir(), "models.json");
   details.push("\u2550\u2550\u2550 Available Models (from cache) \u2550\u2550\u2550");
   details.push("");
   if (options.available.cacheExists) {
@@ -25789,8 +26042,8 @@ async function checkModels() {
 }
 
 // src/cli/doctor/checks/config.ts
-var USER_CONFIG_BASE2 = join17(getOpenCodeConfigDir({ binary: "opencode" }), PACKAGE_NAME4);
-var PROJECT_CONFIG_BASE2 = join17(process.cwd(), ".opencode", PACKAGE_NAME4);
+var USER_CONFIG_BASE2 = join18(getOpenCodeConfigDir({ binary: "opencode" }), PACKAGE_NAME4);
+var PROJECT_CONFIG_BASE2 = join18(process.cwd(), ".opencode", PACKAGE_NAME4);
 function findConfigPath() {
   const projectConfig = detectConfigFile(PROJECT_CONFIG_BASE2);
   if (projectConfig.format !== "none")
@@ -25910,8 +26163,8 @@ async function checkConfig() {
 
 // src/cli/doctor/checks/dependencies.ts
 import { existsSync as existsSync21 } from "fs";
-import { createRequire } from "module";
-import { dirname as dirname3, join as join18 } from "path";
+import { createRequire as createRequire2 } from "module";
+import { dirname as dirname5, join as join19 } from "path";
 async function checkBinaryExists(binary2) {
   try {
     const path9 = Bun.which(binary2);
@@ -25968,11 +26221,11 @@ async function checkAstGrepNapi() {
     };
   } catch {
     const { existsSync: existsSync22 } = await import("fs");
-    const { join: join19 } = await import("path");
+    const { join: join20 } = await import("path");
     const { homedir: homedir8 } = await import("os");
     const pathsToCheck = [
-      join19(homedir8(), ".config", "opencode", "node_modules", "@ast-grep", "napi"),
-      join19(process.cwd(), "node_modules", "@ast-grep", "napi")
+      join20(homedir8(), ".config", "opencode", "node_modules", "@ast-grep", "napi"),
+      join20(process.cwd(), "node_modules", "@ast-grep", "napi")
     ];
     for (const napiPath of pathsToCheck) {
       if (existsSync22(napiPath)) {
@@ -25998,9 +26251,9 @@ async function checkAstGrepNapi() {
 function findCommentCheckerPackageBinary() {
   const binaryName = process.platform === "win32" ? "comment-checker.exe" : "comment-checker";
   try {
-    const require2 = createRequire(import.meta.url);
+    const require2 = createRequire2(import.meta.url);
     const pkgPath = require2.resolve("@code-yeongyu/comment-checker/package.json");
-    const binaryPath = join18(dirname3(pkgPath), "bin", binaryName);
+    const binaryPath = join19(dirname5(pkgPath), "bin", binaryName);
     if (existsSync21(binaryPath))
       return binaryPath;
   } catch {}
@@ -26120,7 +26373,7 @@ init_jsonc_parser();
 // src/tools/lsp/server-installation.ts
 init_shared();
 import { existsSync as existsSync22 } from "fs";
-import { join as join19 } from "path";
+import { join as join20 } from "path";
 function isServerInstalled(command) {
   if (command.length === 0)
     return false;
@@ -26148,23 +26401,23 @@ function isServerInstalled(command) {
   const paths = pathEnv.split(pathSeparator);
   for (const p2 of paths) {
     for (const suffix of exts) {
-      if (existsSync22(join19(p2, cmd + suffix))) {
+      if (existsSync22(join20(p2, cmd + suffix))) {
         return true;
       }
     }
   }
   const cwd = process.cwd();
   const configDir = getOpenCodeConfigDir({ binary: "opencode" });
-  const dataDir = join19(getDataDir(), "opencode");
+  const dataDir = join20(getDataDir(), "opencode");
   const additionalBases = [
-    join19(cwd, "node_modules", ".bin"),
-    join19(configDir, "bin"),
-    join19(configDir, "node_modules", ".bin"),
-    join19(dataDir, "bin")
+    join20(cwd, "node_modules", ".bin"),
+    join20(configDir, "bin"),
+    join20(configDir, "node_modules", ".bin"),
+    join20(dataDir, "bin")
   ];
   for (const base of additionalBases) {
     for (const suffix of exts) {
-      if (existsSync22(join19(base, cmd + suffix))) {
+      if (existsSync22(join20(base, cmd + suffix))) {
         return true;
       }
     }
@@ -26200,13 +26453,13 @@ function getLspServerStats(servers) {
 init_shared();
 import { existsSync as existsSync23, readFileSync as readFileSync24 } from "fs";
 import { homedir as homedir8 } from "os";
-import { join as join20 } from "path";
+import { join as join21 } from "path";
 var BUILTIN_MCP_SERVERS = ["context7", "grep_app"];
 function getMcpConfigPaths() {
   return [
-    join20(homedir8(), ".claude", ".mcp.json"),
-    join20(process.cwd(), ".mcp.json"),
-    join20(process.cwd(), ".claude", ".mcp.json")
+    join21(homedir8(), ".claude", ".mcp.json"),
+    join21(process.cwd(), ".mcp.json"),
+    join21(process.cwd(), ".claude", ".mcp.json")
   ];
 }
 function loadUserMcpConfig() {
@@ -26618,10 +26871,10 @@ async function doctor(options = { mode: "default" }) {
 // src/features/mcp-oauth/storage.ts
 init_shared();
 import { chmodSync, existsSync as existsSync24, mkdirSync as mkdirSync3, readFileSync as readFileSync25, unlinkSync, writeFileSync as writeFileSync9 } from "fs";
-import { dirname as dirname4, join as join21 } from "path";
+import { dirname as dirname6, join as join22 } from "path";
 var STORAGE_FILE_NAME = "mcp-oauth.json";
 function getMcpOauthStoragePath() {
-  return join21(getOpenCodeConfigDir({ binary: "opencode" }), STORAGE_FILE_NAME);
+  return join22(getOpenCodeConfigDir({ binary: "opencode" }), STORAGE_FILE_NAME);
 }
 function normalizeHost(serverHost) {
   let host = serverHost.trim();
@@ -26671,7 +26924,7 @@ function readStore() {
 function writeStore(store) {
   const filePath = getMcpOauthStoragePath();
   try {
-    const dir = dirname4(filePath);
+    const dir = dirname6(filePath);
     if (!existsSync24(dir)) {
       mkdirSync3(dir, { recursive: true });
     }