oh-my-opencode-slim 2.0.1 → 2.0.3

package/dist/index.js

@@ -30,8 +30,160 @@ var __toESM = (mod, isNodeMode, target) => {
   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: __exportSetter.bind(all, name)
+    });
+};
+var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
+// src/utils/compat.ts
+import { spawn as nodeSpawn } from "node:child_process";
+import { writeFile as fsWriteFile } from "node:fs/promises";
+function collectStream(stream) {
+  if (!stream)
+    return () => Promise.resolve("");
+  const chunks = [];
+  stream.on("data", (chunk) => chunks.push(chunk));
+  return () => new Promise((resolve, reject) => {
+    if (!stream.readable) {
+      resolve(Buffer.concat(chunks).toString("utf-8"));
+      return;
+    }
+    stream.on("end", () => resolve(Buffer.concat(chunks).toString("utf-8")));
+    stream.on("error", reject);
+  });
+}
+function crossSpawn(command, options) {
+  const [cmd, ...args] = command;
+  const proc = nodeSpawn(cmd, args, {
+    stdio: [
+      options?.stdin ?? "ignore",
+      options?.stdout ?? "pipe",
+      options?.stderr ?? "pipe"
+    ],
+    cwd: options?.cwd,
+    env: options?.env
+  });
+  const stdoutCollector = collectStream(proc.stdout);
+  const stderrCollector = collectStream(proc.stderr);
+  const exited = new Promise((resolve, reject) => {
+    proc.on("error", reject);
+    proc.on("close", (code) => resolve(code ?? 1));
+  });
+  return {
+    proc,
+    stdout: stdoutCollector,
+    stderr: stderrCollector,
+    exited,
+    kill: (signal) => proc.kill(signal),
+    get exitCode() {
+      return proc.exitCode;
+    }
+  };
+}
+async function crossWrite(path, data) {
+  await fsWriteFile(path, Buffer.from(data));
+}
+var init_compat = () => {};
+
+// src/utils/zip-extractor.ts
+var exports_zip_extractor = {};
+__export(exports_zip_extractor, {
+  extractZip: () => extractZip
+});
+import { spawnSync } from "node:child_process";
+import { release } from "node:os";
+function getWindowsBuildNumber() {
+  if (process.platform !== "win32")
+    return null;
+  const parts = release().split(".");
+  if (parts.length >= 3) {
+    const build = parseInt(parts[2], 10);
+    if (!Number.isNaN(build))
+      return build;
+  }
+  return null;
+}
+function isPwshAvailable() {
+  if (process.platform !== "win32")
+    return false;
+  const result = spawnSync("where", ["pwsh"], {
+    stdio: ["ignore", "pipe", "pipe"]
+  });
+  return result.status === 0;
+}
+function escapePowerShellPath(path4) {
+  return path4.replace(/'/g, "''");
+}
+function getWindowsZipExtractor() {
+  const buildNumber = getWindowsBuildNumber();
+  if (buildNumber !== null && buildNumber >= WINDOWS_BUILD_WITH_TAR) {
+    return "tar";
+  }
+  if (isPwshAvailable()) {
+    return "pwsh";
+  }
+  return "powershell";
+}
+async function extractZip(archivePath, destDir) {
+  let proc;
+  if (process.platform === "win32") {
+    const extractor = getWindowsZipExtractor();
+    switch (extractor) {
+      case "tar":
+        proc = crossSpawn(["tar", "-xf", archivePath, "-C", destDir], {
+          stdout: "ignore",
+          stderr: "pipe"
+        });
+        break;
+      case "pwsh":
+        proc = crossSpawn([
+          "pwsh",
+          "-Command",
+          `Expand-Archive -Path '${escapePowerShellPath(archivePath)}' -DestinationPath '${escapePowerShellPath(destDir)}' -Force`
+        ], {
+          stdout: "ignore",
+          stderr: "pipe"
+        });
+        break;
+      default:
+        proc = crossSpawn([
+          "powershell",
+          "-Command",
+          `Expand-Archive -Path '${escapePowerShellPath(archivePath)}' -DestinationPath '${escapePowerShellPath(destDir)}' -Force`
+        ], {
+          stdout: "ignore",
+          stderr: "pipe"
+        });
+        break;
+    }
+  } else {
+    proc = crossSpawn(["unzip", "-o", archivePath, "-d", destDir], {
+      stdout: "ignore",
+      stderr: "pipe"
+    });
+  }
+  const exitCode = await proc.exited;
+  if (exitCode !== 0) {
+    const stderr = await proc.stderr();
+    throw new Error(`zip extraction failed (exit ${exitCode}): ${stderr}`);
+  }
+}
+var WINDOWS_BUILD_WITH_TAR = 17134;
+var init_zip_extractor = __esm(() => {
+  init_compat();
+});
+
 // node_modules/.pnpm/@mozilla+readability@0.6.0/node_modules/@mozilla/readability/Readability.js
 var require_Readability = __commonJS((exports, module) => {
   function Readability(doc, options) {
@@ -6246,33 +6398,33 @@ var require_URL = __commonJS((exports, module) => {
         else
           return basepath.substring(0, lastslash + 1) + refpath;
       }
-      function remove_dot_segments(path16) {
-        if (!path16)
-          return path16;
+      function remove_dot_segments(path19) {
+        if (!path19)
+          return path19;
         var output = "";
-        while (path16.length > 0) {
-          if (path16 === "." || path16 === "..") {
-            path16 = "";
+        while (path19.length > 0) {
+          if (path19 === "." || path19 === "..") {
+            path19 = "";
             break;
           }
-          var twochars = path16.substring(0, 2);
-          var threechars = path16.substring(0, 3);
-          var fourchars = path16.substring(0, 4);
+          var twochars = path19.substring(0, 2);
+          var threechars = path19.substring(0, 3);
+          var fourchars = path19.substring(0, 4);
           if (threechars === "../") {
-            path16 = path16.substring(3);
+            path19 = path19.substring(3);
           } else if (twochars === "./") {
-            path16 = path16.substring(2);
+            path19 = path19.substring(2);
           } else if (threechars === "/./") {
-            path16 = "/" + path16.substring(3);
-          } else if (twochars === "/." && path16.length === 2) {
-            path16 = "/";
-          } else if (fourchars === "/../" || threechars === "/.." && path16.length === 3) {
-            path16 = "/" + path16.substring(4);
+            path19 = "/" + path19.substring(3);
+          } else if (twochars === "/." && path19.length === 2) {
+            path19 = "/";
+          } else if (fourchars === "/../" || threechars === "/.." && path19.length === 3) {
+            path19 = "/" + path19.substring(4);
             output = output.replace(/\/?[^\/]*$/, "");
           } else {
-            var segment = path16.match(/(\/?([^\/]*))/)[0];
+            var segment = path19.match(/(\/?([^\/]*))/)[0];
             output += segment;
-            path16 = path16.substring(segment.length);
+            path19 = path19.substring(segment.length);
           }
         }
         return output;
@@ -18150,14 +18302,14 @@ var require_turndown_cjs = __commonJS((exports, module) => {
       } else if (node.nodeType === 1) {
         replacement = replacementForNode.call(self, node);
       }
-      return join14(output, replacement);
+      return join17(output, replacement);
     }, "");
   }
   function postProcess(output) {
     var self = this;
     this.rules.forEach(function(rule) {
       if (typeof rule.append === "function") {
-        output = join14(output, rule.append(self.options));
+        output = join17(output, rule.append(self.options));
       }
     });
     return output.replace(/^[\t\r\n]+/, "").replace(/[\t\r\n\s]+$/, "");
@@ -18170,7 +18322,7 @@ var require_turndown_cjs = __commonJS((exports, module) => {
       content = content.trim();
     return whitespace.leading + rule.replacement(content, node, this.options) + whitespace.trailing;
   }
-  function join14(output, replacement) {
+  function join17(output, replacement) {
     var s1 = trimTrailingNewlines(output);
     var s2 = trimLeadingNewlines(replacement);
     var nls = Math.max(output.length - s1.length, replacement.length - s2.length);
@@ -18240,11 +18392,23 @@ var CUSTOM_SKILLS = [
     allowedAgents: ["orchestrator"],
     sourcePath: "src/skills/deepwork"
   },
+  {
+    name: "reflect",
+    description: "Review repeated work and suggest reusable workflow improvements",
+    allowedAgents: ["orchestrator"],
+    sourcePath: "src/skills/reflect"
+  },
   {
     name: "oh-my-opencode-slim",
     description: "Configure, customize, and safely improve oh-my-opencode-slim setups",
     allowedAgents: ["orchestrator"],
     sourcePath: "src/skills/oh-my-opencode-slim"
+  },
+  {
+    name: "worktrees",
+    description: "Manage Git worktrees as OMO safe isolated coding lanes for complex/risky/parallel work",
+    allowedAgents: ["orchestrator"],
+    sourcePath: "src/skills/worktrees"
   }
 ];
 
@@ -18303,8 +18467,7 @@ var SUBAGENT_NAMES = [
   "council",
   "councillor"
 ];
-var ORCHESTRATOR_NAME = "orchestrator";
-var ALL_AGENT_NAMES = [ORCHESTRATOR_NAME, ...SUBAGENT_NAMES];
+var ALL_AGENT_NAMES = ["orchestrator", ...SUBAGENT_NAMES];
 var PROTECTED_AGENTS = new Set(["orchestrator", "councillor"]);
 var DEFAULT_MODELS = {
   orchestrator: undefined,
@@ -18318,10 +18481,10 @@ var DEFAULT_MODELS = {
   councillor: "openai/gpt-5.4-mini"
 };
 var POLL_INTERVAL_BACKGROUND_MS = 2000;
-var DEFAULT_TIMEOUT_MS = 2 * 60 * 1000;
 var MAX_POLL_TIME_MS = 5 * 60 * 1000;
 var DEFAULT_MAX_SUBAGENT_DEPTH = 3;
 var PHASE_REMINDER_TEXT = `!IMPORTANT! Scheduler workflow: plan lanes/dependencies → dispatch background specialists → track task IDs → wait for hook-driven completion → reconcile terminal results → verify. Do not poll running jobs, consume running-job output, or advance dependent work. !END!`;
+var PHASE_REMINDER = `<internal_reminder>${PHASE_REMINDER_TEXT}</internal_reminder>`;
 var WRITABLE_FILE_OPERATIONS_RULES = `**File Operations Rules**:
 - Prefer dedicated file tools for normal code work: glob/grep/ast_grep_search for discovery, read for file contents, and edit/write/apply_patch for targeted source changes.
 - Use bash for execution and automation: git, package managers, tests, builds, scripts, diagnostics, and shell-native filesystem operations.
@@ -18386,17 +18549,11 @@ var CouncilConfigSchema = z.object({
   default_preset: z.string().default("default"),
   councillor_execution_mode: CouncillorExecutionModeSchema.describe('Execution mode for councillors. "serial" runs them one at a time (required for single-model systems). "parallel" runs them concurrently (default, faster for multi-model systems).'),
   councillor_retries: z.number().int().min(0).max(5).default(3).describe("Number of retry attempts for councillors that return empty responses " + "(e.g. due to provider rate limiting). Default: 3 retries."),
-  master: z.unknown().optional().describe("DEPRECATED — ignored. Council agent synthesizes directly."),
-  master_timeout: z.unknown().optional().describe('DEPRECATED — ignored. Use "timeout" instead.'),
-  master_fallback: z.unknown().optional().describe("DEPRECATED — ignored. No separate master session.")
+  master: z.unknown().optional().describe("DEPRECATED — ignored. Council agent synthesizes directly.")
 }).transform((data) => {
   const deprecated = [];
   if (data.master !== undefined)
     deprecated.push("master");
-  if (data.master_timeout !== undefined)
-    deprecated.push("master_timeout");
-  if (data.master_fallback !== undefined)
-    deprecated.push("master_fallback");
   const legacyMasterModel = typeof data.master === "object" && data.master !== null && "model" in data.master && typeof data.master.model === "string" ? data.master.model : undefined;
   return {
     presets: data.presets,
@@ -18412,55 +18569,8 @@ var CouncilConfigSchema = z.object({
 import * as fs from "node:fs";
 import * as path from "node:path";
 
-// src/utils/compat.ts
-import { spawn as nodeSpawn } from "node:child_process";
-import { writeFile as fsWriteFile } from "node:fs/promises";
-var isBun = typeof globalThis.Bun !== "undefined";
-function collectStream(stream) {
-  if (!stream)
-    return () => Promise.resolve("");
-  const chunks = [];
-  stream.on("data", (chunk) => chunks.push(chunk));
-  return () => new Promise((resolve, reject) => {
-    if (!stream.readable) {
-      resolve(Buffer.concat(chunks).toString("utf-8"));
-      return;
-    }
-    stream.on("end", () => resolve(Buffer.concat(chunks).toString("utf-8")));
-    stream.on("error", reject);
-  });
-}
-function crossSpawn(command, options) {
-  const [cmd, ...args] = command;
-  const proc = nodeSpawn(cmd, args, {
-    stdio: [
-      options?.stdin ?? "ignore",
-      options?.stdout ?? "pipe",
-      options?.stderr ?? "pipe"
-    ],
-    cwd: options?.cwd,
-    env: options?.env
-  });
-  const stdoutCollector = collectStream(proc.stdout);
-  const stderrCollector = collectStream(proc.stderr);
-  const exited = new Promise((resolve, reject) => {
-    proc.on("error", reject);
-    proc.on("close", (code) => resolve(code ?? 1));
-  });
-  return {
-    proc,
-    stdout: stdoutCollector,
-    stderr: stderrCollector,
-    exited,
-    kill: (signal) => proc.kill(signal),
-    get exitCode() {
-      return proc.exitCode;
-    }
-  };
-}
-async function crossWrite(path, data) {
-  await fsWriteFile(path, Buffer.from(data));
-}
+// src/cli/config-io.ts
+init_compat();
 
 // src/config/agent-mcps.ts
 var DEFAULT_AGENT_MCPS = {
@@ -18534,15 +18644,6 @@ var ManualPlanSchema = z2.object({
   librarian: ManualAgentPlanSchema,
   fixer: ManualAgentPlanSchema
 }).strict();
-var AgentModelChainSchema = z2.array(z2.string()).min(1);
-var FallbackChainsSchema = z2.object({
-  orchestrator: AgentModelChainSchema.optional(),
-  oracle: AgentModelChainSchema.optional(),
-  designer: AgentModelChainSchema.optional(),
-  explorer: AgentModelChainSchema.optional(),
-  librarian: AgentModelChainSchema.optional(),
-  fixer: AgentModelChainSchema.optional()
-}).catchall(AgentModelChainSchema);
 var AgentOverrideConfigSchema = z2.object({
   model: z2.union([
     z2.string(),
@@ -18605,14 +18706,32 @@ var FailoverConfigSchema = z2.object({
   enabled: z2.boolean().default(true),
   timeoutMs: z2.number().min(0).default(15000),
   retryDelayMs: z2.number().min(0).default(500),
-  chains: FallbackChainsSchema.default({}),
   retry_on_empty: z2.boolean().default(true).describe("When true (default), empty provider responses are treated as failures, " + "triggering fallback/retry. Set to false to treat them as successes.")
-});
+}).strict();
 var CompanionConfigSchema = z2.object({
   enabled: z2.boolean().optional(),
+  binaryPath: z2.string().min(1).optional().describe("Path to a custom companion binary to launch."),
   position: z2.enum(["bottom-right", "bottom-left", "top-right", "top-left"]).optional(),
-  size: z2.enum(["small", "medium", "large"]).optional()
+  size: z2.enum(["small", "medium", "large"]).optional(),
+  gifPack: z2.enum(["default"]).optional().describe("Bundled companion animation pack to use."),
+  loopStyle: z2.enum(["classic", "smooth"]).optional().describe("Companion animation playback style: classic loops or smooth ping-pong playback."),
+  speed: z2.number().min(0.25).max(4).optional().describe("Companion animation playback speed multiplier. Defaults to 1."),
+  debug: z2.boolean().optional().describe("Enable verbose native companion debug logs.")
 });
+var AcpAgentPermissionModeSchema = z2.enum(["ask", "allow", "reject"]);
+var AcpAgentConfigSchema = z2.object({
+  command: z2.string().min(1),
+  args: z2.array(z2.string()).default([]),
+  env: z2.record(z2.string(), z2.string()).default({}),
+  cwd: z2.string().min(1).optional(),
+  description: z2.string().min(1).optional(),
+  prompt: z2.string().min(1).optional(),
+  orchestratorPrompt: z2.string().min(1).optional(),
+  wrapperModel: ProviderModelIdSchema.optional(),
+  timeoutMs: z2.number().int().min(1000).max(900000).default(300000),
+  permissionMode: AcpAgentPermissionModeSchema.default("ask")
+}).strict();
+var AcpAgentsConfigSchema = z2.record(z2.string(), AcpAgentConfigSchema);
 function validateCustomOnlyPromptFields(overrides, ctx, pathPrefix) {
   for (const [name, override] of Object.entries(overrides)) {
     const isBuiltInOrAlias = ALL_AGENT_NAMES.includes(name) || AGENT_ALIASES[name] !== undefined;
@@ -18638,10 +18757,7 @@ function validateCustomOnlyPromptFields(overrides, ctx, pathPrefix) {
 var PluginConfigSchema = z2.object({
   preset: z2.string().optional(),
   setDefaultAgent: z2.boolean().optional(),
-  scoringEngineVersion: z2.enum(["v1", "v2-shadow", "v2"]).optional(),
-  balanceProviderUsage: z2.boolean().optional(),
   autoUpdate: z2.boolean().optional().describe("Disable automatic installation of plugin updates when false. Defaults to true."),
-  manualPlan: ManualPlanSchema.optional(),
   presets: z2.record(z2.string(), PresetSchema).optional(),
   agents: z2.record(z2.string(), AgentOverrideConfigSchema).optional(),
   disabled_agents: z2.array(z2.string()).optional().describe("Agent names to disable completely. " + "Disabled agents are not instantiated and cannot be delegated to. " + "Orchestrator and council internal agents (councillor) cannot be disabled. " + "By default, 'observer' is disabled. Remove it from this list and configure a vision-capable model to enable."),
@@ -18653,7 +18769,8 @@ var PluginConfigSchema = z2.object({
   backgroundJobs: BackgroundJobsConfigSchema.optional(),
   fallback: FailoverConfigSchema.optional(),
   council: CouncilConfigSchema.optional(),
-  companion: CompanionConfigSchema.optional()
+  companion: CompanionConfigSchema.optional(),
+  acpAgents: AcpAgentsConfigSchema.optional()
 }).superRefine((value, ctx) => {
   if (value.agents) {
     validateCustomOnlyPromptFields(value.agents, ctx, ["agents"]);
@@ -18753,6 +18870,7 @@ function mergePluginConfigs(base, override) {
     backgroundJobs: deepMerge(base.backgroundJobs, override.backgroundJobs),
     fallback: deepMerge(base.fallback, override.fallback),
     council: deepMerge(base.council, override.council),
+    acpAgents: deepMerge(base.acpAgents, override.acpAgents),
     companion: deepMerge(base.companion, override.companion)
   };
 }
@@ -18806,8 +18924,13 @@ function loadPluginConfig(directory, options) {
   if (config.companion) {
     config.companion = {
       enabled: config.companion.enabled ?? false,
+      binaryPath: config.companion.binaryPath,
       position: config.companion.position ?? "bottom-right",
-      size: config.companion.size ?? "medium"
+      size: config.companion.size ?? "medium",
+      gifPack: config.companion.gifPack ?? "default",
+      loopStyle: config.companion.loopStyle ?? "classic",
+      speed: config.companion.speed ?? 1,
+      debug: config.companion.debug ?? false
     };
   }
   return config;
@@ -18868,6 +18991,9 @@ function getCustomAgentNames(config) {
     return !ALL_AGENT_NAMES.includes(name);
   });
 }
+function getAcpAgentNames(config) {
+  return Object.keys(config?.acpAgents ?? {});
+}
 // src/utils/session.ts
 var SESSION_ABORT_TIMEOUT_MS = 1000;
 
@@ -19201,7 +19327,6 @@ When user's approach seems problematic:
 </Communication>
 `;
 }
-var ORCHESTRATOR_PROMPT = buildOrchestratorPrompt();
 function createOrchestratorAgent(model, customPrompt, customAppendPrompt, disabledAgents) {
   const basePrompt = buildOrchestratorPrompt(disabledAgents);
   const prompt = resolvePrompt(basePrompt, customPrompt, customAppendPrompt);
@@ -19744,6 +19869,39 @@ function normalizeDisplayName(displayName) {
   const trimmed = displayName.trim();
   return trimmed.startsWith("@") ? trimmed.slice(1) : trimmed;
 }
+function buildAcpAgentDefinition(name, config) {
+  const description = config.description ?? `External ACP agent '${name}' via ${config.command}`;
+  const prompt = config.prompt ?? [
+    `You are the ${name} ACP wrapper agent.`,
+    "",
+    "Your only job is to send the user task to the configured external ACP agent using the acp_run tool, then return the ACP agent result.",
+    `Always call acp_run with agent: ${JSON.stringify(name)} and pass the full user task as prompt.`,
+    "Do not edit files yourself unless the ACP result explicitly asks you to report a local follow-up to the orchestrator."
+  ].join(`
+`);
+  return {
+    name,
+    description,
+    config: {
+      model: config.wrapperModel ?? DEFAULT_MODELS.fixer ?? DEFAULT_MODELS.librarian ?? DEFAULT_MODELS.orchestrator ?? DEFAULT_MODELS.oracle,
+      temperature: 0,
+      prompt,
+      permission: {
+        read: "deny",
+        edit: "deny",
+        bash: "deny",
+        task: "deny",
+        glob: "deny",
+        grep: "deny",
+        list: "deny",
+        webfetch: "deny",
+        question: "deny",
+        skill: "deny",
+        acp_run: "allow"
+      }
+    }
+  };
+}
 function isSafeDisplayName(displayName) {
   return SAFE_AGENT_ALIAS_RE.test(displayName);
 }
@@ -19883,6 +20041,24 @@ function createAgents(config) {
       buildCustomAgentDefinition(name, override, customPrompts.prompt, customPrompts.appendPrompt)
     ];
   });
+  const acpAgentNames = getAcpAgentNames(config).map(normalizeCustomAgentName).filter((name) => name.length > 0).filter((name) => {
+    if (!SAFE_AGENT_ALIAS_RE.test(name)) {
+      throw new Error(`ACP agent name '${name}' must match /^[a-z][a-z0-9_-]*$/i`);
+    }
+    if (isKnownAgentName(name) || AGENT_ALIASES[name] !== undefined) {
+      throw new Error(`ACP agent '${name}' conflicts with a built-in agent name or alias`);
+    }
+    if (customAgentNames.includes(name)) {
+      throw new Error(`ACP agent '${name}' conflicts with a custom agent of the same name`);
+    }
+    return !disabled.has(name);
+  });
+  const protoAcpAgents = acpAgentNames.map((name) => {
+    const acp = config?.acpAgents?.[name];
+    if (!acp)
+      throw new Error(`ACP agent '${name}' is missing config`);
+    return buildAcpAgentDefinition(name, acp);
+  });
   const builtInSubAgents = protoSubAgents.map((agent) => {
     const override = getAgentOverride(config, agent.name);
     if (override) {
@@ -19906,7 +20082,15 @@ function createAgents(config) {
     applyDefaultPermissions(agent, override?.skills);
     return agent;
   });
-  const allSubAgents = [...builtInSubAgents, ...customSubAgents];
+  const acpSubAgents = protoAcpAgents.map((agent) => {
+    applyDefaultPermissions(agent);
+    return agent;
+  });
+  const allSubAgents = [
+    ...builtInSubAgents,
+    ...customSubAgents,
+    ...acpSubAgents
+  ];
   const orchestratorOverride = getAgentOverride(config, "orchestrator");
   const orchestratorModel = orchestratorOverride?.model ?? DEFAULT_MODELS.orchestrator;
   const orchestratorPrompts = loadAgentPrompt("orchestrator", config?.preset);
@@ -19928,6 +20112,20 @@ function createAgents(config) {
     const override = getAgentOverride(config, agent.name);
     return override?.orchestratorPrompt;
   }).filter((prompt) => Boolean(prompt));
+  const acpOrchestratorPrompts = acpSubAgents.map((agent) => {
+    const acp = config?.acpAgents?.[agent.name];
+    if (acp?.orchestratorPrompt)
+      return acp.orchestratorPrompt;
+    return [
+      `@${agent.name}`,
+      `- Lane: External ACP-connected agent (${acp?.command ?? "unknown command"})`,
+      `- Role: ${agent.description ?? `External ACP agent ${agent.name}`}`,
+      "- **Delegate when:** The user explicitly asks for this ACP-backed agent, or the task matches its role and benefits from software/subscription-specific capabilities outside OpenCode.",
+      "- **Do not delegate when:** The built-in specialists can handle the task more directly or local file ownership would conflict with another writer lane.",
+      "- **Result handling:** Treat returned output as external-agent work. Reconcile any reported file changes before continuing."
+    ].join(`
+`);
+  });
   const usedDisplayNames = new Set;
   for (const [, displayName] of displayNameMap) {
     const normalizedDisplayName = normalizeDisplayName(displayName);
@@ -19940,13 +20138,17 @@ function createAgents(config) {
     usedDisplayNames.add(normalizedDisplayName);
   }
   for (const displayName of usedDisplayNames) {
-    if (ALL_AGENT_NAMES.includes(displayName) || customAgentNames.includes(displayName)) {
+    if (ALL_AGENT_NAMES.includes(displayName) || customAgentNames.includes(displayName) || acpAgentNames.includes(displayName)) {
       throw new Error(`displayName '${displayName}' conflicts with an agent name`);
     }
   }
   injectDisplayNames(orchestrator, displayNameMap);
-  if (customOrchestratorPrompts.length > 0) {
-    const rewrittenPrompts = customOrchestratorPrompts.map((promptText) => {
+  const extraOrchestratorPrompts = [
+    ...customOrchestratorPrompts,
+    ...acpOrchestratorPrompts
+  ];
+  if (extraOrchestratorPrompts.length > 0) {
+    const rewrittenPrompts = extraOrchestratorPrompts.map((promptText) => {
       let text = promptText;
       for (const [internalName, displayName] of displayNameMap) {
         text = text.replace(new RegExp(`@${escapeRegExp(internalName)}\\b`, "g"), `@${normalizeDisplayName(displayName)}`);
@@ -20018,6 +20220,7 @@ import {
   mkdirSync as mkdirSync2,
   readFileSync as readFileSync2,
   renameSync,
+  rmSync,
   writeFileSync
 } from "node:fs";
 import * as os2 from "node:os";
@@ -20106,11 +20309,15 @@ function stateFilePath() {
   const base = xdg && path3.isAbsolute(xdg) ? xdg : path3.join(os2.homedir(), ".local", "share");
   return path3.join(base, "opencode", "storage", "oh-my-opencode-slim", "companion-state.json");
 }
-function binaryPath() {
+function defaultBinaryPath() {
   const xdg = process.env.XDG_DATA_HOME?.trim();
   const base = xdg && path3.isAbsolute(xdg) ? xdg : path3.join(os2.homedir(), ".local", "share");
   const binaryName = os2.platform() === "win32" ? "oh-my-opencode-slim-companion.exe" : "oh-my-opencode-slim-companion";
-  const bin = path3.join(base, "opencode", "storage", "oh-my-opencode-slim", "bin", binaryName);
+  return path3.join(base, "opencode", "storage", "oh-my-opencode-slim", "bin", binaryName);
+}
+function resolveCompanionBinaryPath(config) {
+  const configured = config?.binaryPath?.trim();
+  const bin = configured || defaultBinaryPath();
   return existsSync2(bin) ? bin : null;
 }
 function readState() {
@@ -20123,17 +20330,43 @@ function readState() {
   } catch {}
   return { version: 1, sessions: [] };
 }
-function writeState(state) {
+function writeState(mutator) {
   const file = stateFilePath();
   try {
     mkdirSync2(path3.dirname(file), { recursive: true });
-    const tmp = `${file}.tmp`;
-    writeFileSync(tmp, JSON.stringify(state));
-    renameSync(tmp, file);
+    const release = acquireStateLock(file);
+    try {
+      const state = readState();
+      mutator(state);
+      const tmp = `${file}.${process.pid}.${Date.now()}.tmp`;
+      writeFileSync(tmp, JSON.stringify(state));
+      renameSync(tmp, file);
+    } finally {
+      release();
+    }
   } catch (err) {
     log("[companion] write failed", String(err));
   }
 }
+function acquireStateLock(file) {
+  const lock = `${file}.lock`;
+  for (let attempt = 0;attempt < 40; attempt++) {
+    try {
+      mkdirSync2(lock);
+      return () => {
+        try {
+          rmSync(lock, { recursive: true, force: true });
+        } catch {}
+      };
+    } catch (err) {
+      const code = err.code;
+      if (code !== "EEXIST")
+        throw err;
+      Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 25);
+    }
+  }
+  throw new Error("timed out waiting for companion state lock");
+}
 
 class CompanionManager {
   id;
@@ -20149,12 +20382,11 @@ class CompanionManager {
   onLoad() {
     if (this.config?.enabled !== true) {
       try {
-        const state = readState();
-        const filtered = state.sessions.filter((s) => s.session_id !== this.id);
-        if (filtered.length !== state.sessions.length) {
-          state.sessions = filtered;
-          writeState(state);
-        }
+        if (!existsSync2(stateFilePath()))
+          return;
+        writeState((state) => {
+          state.sessions = state.sessions.filter((s) => s.session_id !== this.id);
+        });
       } catch {}
       return;
     }
@@ -20206,9 +20438,9 @@ class CompanionManager {
   onExit() {
     if (this.config?.enabled !== true)
       return;
-    const state = readState();
-    state.sessions = state.sessions.filter((s) => s.session_id !== this.id);
-    writeState(state);
+    writeState((state) => {
+      state.sessions = state.sessions.filter((s) => s.session_id !== this.id);
+    });
   }
   activeAgents() {
     const agents = Array.from(this.busyAgentSessions.values());
@@ -20224,28 +20456,41 @@ class CompanionManager {
     if (this.config?.enabled !== true)
       return;
     try {
-      const state = readState();
       const entry = {
         session_id: this.id,
         cwd: this.cwd,
         active_agents: this.activeAgents(),
         status: this.status,
-        pid: process.pid
-      };
-      const idx = state.sessions.findIndex((s) => s.session_id === this.id);
-      if (idx >= 0) {
-        state.sessions[idx] = entry;
-      } else {
-        state.sessions.push(entry);
-      }
-      if (this.config) {
-        state.config = {
+        pid: process.pid,
+        config: this.config ? {
           enabled: this.config.enabled ?? false,
           position: this.config.position ?? "bottom-right",
-          size: this.config.size ?? "medium"
-        };
-      }
-      writeState(state);
+          size: this.config.size ?? "medium",
+          gifPack: this.config.gifPack ?? "default",
+          loopStyle: this.config.loopStyle ?? "classic",
+          speed: this.config.speed ?? 1,
+          debug: this.config.debug ?? false
+        } : undefined
+      };
+      writeState((state) => {
+        const idx = state.sessions.findIndex((s) => s.session_id === this.id);
+        if (idx >= 0) {
+          state.sessions[idx] = entry;
+        } else {
+          state.sessions.push(entry);
+        }
+        if (this.config) {
+          state.config = {
+            enabled: this.config.enabled ?? false,
+            position: this.config.position ?? "bottom-right",
+            size: this.config.size ?? "medium",
+            gifPack: this.config.gifPack ?? "default",
+            loopStyle: this.config.loopStyle ?? "classic",
+            speed: this.config.speed ?? 1,
+            debug: this.config.debug ?? false
+          };
+        }
+      });
     } catch (err) {
       log("[companion] flush failed", String(err));
     }
@@ -20253,51 +20498,356 @@ class CompanionManager {
   spawnIfAvailable() {
     if (this.config?.enabled !== true)
       return;
-    const bin = binaryPath();
+    const bin = resolveCompanionBinaryPath(this.config);
     if (!bin) {
-      const xdg = process.env.XDG_DATA_HOME?.trim();
-      const base = xdg && path3.isAbsolute(xdg) ? xdg : path3.join(os2.homedir(), ".local", "share");
-      const expected = path3.join(base, "o‍pencode", "storage", "oh-my-o‍pencode-slim", "bin", "oh-my-o‍pencode-slim-companion");
+      const expected = this.config.binaryPath?.trim() || defaultBinaryPath();
       log(`[companion] enabled but companion binary not found at expected path: ${expected}. Please install/download the companion binary separately.`);
       return;
     }
     try {
-      const child = spawn(bin, [], { detached: true, stdio: "ignore" });
+      const child = spawn(bin, [], {
+        detached: true,
+        env: {
+          ...process.env,
+          OH_MY_OPENCODE_SLIM_COMPANION_SESSION_ID: this.id,
+          ...this.config.debug === true ? { OH_MY_OPENCODE_SLIM_COMPANION_DEBUG: "1" } : {}
+        },
+        stdio: "ignore"
+      });
       child.unref();
-      log("[companion] spawned", bin);
+      log("[companion] spawned", JSON.stringify({
+        bin,
+        sessionId: this.id,
+        debug: this.config.debug === true
+      }));
     } catch (err) {
       log("[companion] spawn failed", String(err));
     }
   }
 }
 
-// src/config/fallback-chains.ts
-function normalizeFallbackChainsForPreset(chains, presetName) {
-  const normalized = {};
-  for (const [rawKey, chainModels] of Object.entries(chains)) {
-    if (!chainModels?.length)
-      continue;
-    const separatorIndex = rawKey.indexOf(":");
-    const hasPresetScope = separatorIndex !== -1;
-    const scopedPreset = hasPresetScope ? rawKey.slice(0, separatorIndex) : "";
-    const agentName = hasPresetScope ? rawKey.slice(separatorIndex + 1) : rawKey;
-    if (!agentName)
-      continue;
-    if (hasPresetScope && scopedPreset !== presetName)
-      continue;
-    const existing = normalized[agentName] ?? [];
-    const seen = new Set(existing);
-    for (const chainModel of chainModels) {
-      if (seen.has(chainModel))
-        continue;
-      seen.add(chainModel);
-      existing.push(chainModel);
+// src/companion/updater.ts
+init_compat();
+import { createHash } from "node:crypto";
+import {
+  chmodSync,
+  copyFileSync,
+  existsSync as existsSync3,
+  mkdirSync as mkdirSync3,
+  mkdtempSync,
+  readFileSync as readFileSync3,
+  renameSync as renameSync2,
+  rmSync as rmSync2,
+  statSync as statSync2,
+  writeFileSync as writeFileSync2
+} from "node:fs";
+import { homedir as homedir4, platform as platform2, tmpdir } from "node:os";
+import * as path4 from "node:path";
+import { setTimeout as delay } from "node:timers/promises";
+var DOWNLOAD_TIMEOUT_MS = 30000;
+var LOCK_TIMEOUT_MS = 2000;
+var STALE_LOCK_MS = 5 * 60000;
+var FIRST_METADATA_VERSION = "0.1.2";
+var COMPANION_MANIFEST = {
+  version: "0.1.3",
+  tag: "companion-v0.1.3",
+  repo: "alvinunreal/oh-my-opencode-slim",
+  checksums: {
+    "oh-my-opencode-slim-companion-v0.1.3-aarch64-apple-darwin.tar.gz": "b4885f9b1900c02376e5f8f5ae6f3b8a89d26f7514b03f836d7e3d618164a0ed",
+    "oh-my-opencode-slim-companion-v0.1.3-aarch64-unknown-linux-gnu.tar.gz": "ed7cffc583e1eaa78c9bea702e6b6aa3bbc5bb4d881713fb2050237ba6b7aca5",
+    "oh-my-opencode-slim-companion-v0.1.3-x86_64-apple-darwin.tar.gz": "98d8ea7c7bc4415b18e0d4c524adb4eb9a84c872919840fdc021f0f50c61f808",
+    "oh-my-opencode-slim-companion-v0.1.3-x86_64-pc-windows-msvc.zip": "9316a49bf01f3b4fb1ce2d62edfc46094e73bb153d6ce023fb7df085afcf77bd",
+    "oh-my-opencode-slim-companion-v0.1.3-x86_64-unknown-linux-gnu.tar.gz": "33f5fd4b6c80155a019391e5efb13904ca9531ba8dd8c6cba30a161f1b07b764"
+  }
+};
+function getCompanionTarget() {
+  const p = process.platform;
+  const a = process.arch;
+  if (p === "darwin") {
+    if (a === "arm64")
+      return "aarch64-apple-darwin";
+    if (a === "x64")
+      return "x86_64-apple-darwin";
+  } else if (p === "linux") {
+    if (a === "x64")
+      return "x86_64-unknown-linux-gnu";
+    if (a === "arm64")
+      return "aarch64-unknown-linux-gnu";
+  } else if (p === "win32") {
+    if (a === "x64")
+      return "x86_64-pc-windows-msvc";
+  }
+  return null;
+}
+function getCompanionBinaryPath() {
+  const xdg = process.env.XDG_DATA_HOME?.trim();
+  const base = xdg && path4.isAbsolute(xdg) ? xdg : path4.join(homedir4(), ".local", "share");
+  return path4.join(base, "opencode", "storage", "oh-my-opencode-slim", "bin", platform2() === "win32" ? "oh-my-opencode-slim-companion.exe" : "oh-my-opencode-slim-companion");
+}
+function loadCompanionManifestFromPackageRoot(packageRoot) {
+  const manifestPath = path4.join(packageRoot, "src", "companion", "companion-manifest.json");
+  try {
+    const parsed = JSON.parse(readFileSync3(manifestPath, "utf8"));
+    if (parsed.version && parsed.tag && parsed.repo) {
+      return {
+        version: parsed.version,
+        tag: parsed.tag,
+        repo: parsed.repo,
+        checksums: parsed.checksums
+      };
+    }
+  } catch {}
+  return null;
+}
+async function ensureCompanionVersion(options) {
+  const { config, dryRun = false } = options;
+  const manifest = options.manifest ?? COMPANION_MANIFEST;
+  const binaryPath = getCompanionBinaryPath();
+  if (config?.enabled !== true) {
+    return { status: "skipped", reason: "disabled", binaryPath };
+  }
+  if (config.binaryPath?.trim()) {
+    return { status: "skipped", reason: "custom-binary", binaryPath };
+  }
+  const target = getCompanionTarget();
+  if (!target) {
+    return {
+      status: "failed",
+      binaryPath,
+      error: `Unsupported platform/architecture: ${process.platform} ${process.arch}`
+    };
+  }
+  const current = readInstallMetadata(binaryPath);
+  if (existsSync3(binaryPath) && !current && manifest.version === FIRST_METADATA_VERSION) {
+    const archiveName = companionArchiveName(manifest.version, target);
+    writeInstallMetadata(binaryPath, {
+      version: manifest.version,
+      tag: manifest.tag,
+      target,
+      installedAt: new Date().toISOString(),
+      archiveName,
+      checksum: manifest.checksums?.[archiveName]
+    });
+    return { status: "current", binaryPath, version: manifest.version };
+  }
+  if (existsSync3(binaryPath) && current?.target === target && compareSemver(current.version, manifest.version) >= 0) {
+    return { status: "current", binaryPath, version: current.version };
+  }
+  if (dryRun) {
+    return { status: "installed", binaryPath, version: manifest.version };
+  }
+  return withCompanionInstallLock(binaryPath, options.lockTimeoutMs, options.lockStaleMs, async () => {
+    const lockedCurrent = readInstallMetadata(binaryPath);
+    if (existsSync3(binaryPath) && !lockedCurrent && manifest.version === FIRST_METADATA_VERSION) {
+      const archiveName = companionArchiveName(manifest.version, target);
+      writeInstallMetadata(binaryPath, {
+        version: manifest.version,
+        tag: manifest.tag,
+        target,
+        installedAt: new Date().toISOString(),
+        archiveName,
+        checksum: manifest.checksums?.[archiveName]
+      });
+      return { status: "current", binaryPath, version: manifest.version };
     }
-    if (existing.length > 0) {
-      normalized[agentName] = existing;
+    if (existsSync3(binaryPath) && lockedCurrent?.target === target && compareSemver(lockedCurrent.version, manifest.version) >= 0) {
+      return {
+        status: "current",
+        binaryPath,
+        version: lockedCurrent.version
+      };
     }
+    return installCompanionArchive(binaryPath, target, manifest, options.downloadTimeoutMs ?? DOWNLOAD_TIMEOUT_MS);
+  });
+}
+async function installCompanionArchive(finalBinaryPath, target, manifest, downloadTimeoutMs) {
+  const isWindows = process.platform === "win32";
+  const archiveName = companionArchiveName(manifest.version, target, isWindows);
+  const downloadUrl = `https://github.com/${manifest.repo}/releases/download/${manifest.tag}/${archiveName}`;
+  const expectedChecksum = manifest.checksums?.[archiveName];
+  if (!expectedChecksum) {
+    return {
+      status: "failed",
+      binaryPath: finalBinaryPath,
+      error: `Missing SHA256 checksum for companion archive: ${archiveName}`
+    };
   }
-  return normalized;
+  let buffer;
+  const controller = new AbortController;
+  const timeout = setTimeout(() => controller.abort(), downloadTimeoutMs);
+  try {
+    const res = await fetch(downloadUrl, { signal: controller.signal });
+    if (!res.ok) {
+      return {
+        status: "failed",
+        binaryPath: finalBinaryPath,
+        error: `Failed to download companion binary (HTTP ${res.status}): ${res.statusText}`
+      };
+    }
+    buffer = await res.arrayBuffer();
+  } catch (err) {
+    return {
+      status: "failed",
+      binaryPath: finalBinaryPath,
+      error: `Failed to fetch companion archive: ${formatError(err)}`
+    };
+  } finally {
+    clearTimeout(timeout);
+  }
+  const checksum = createHash("sha256").update(Buffer.from(buffer)).digest("hex");
+  if (checksum !== expectedChecksum) {
+    return {
+      status: "failed",
+      binaryPath: finalBinaryPath,
+      error: "Companion archive checksum mismatch"
+    };
+  }
+  let tempDir = "";
+  try {
+    tempDir = mkdtempSync(path4.join(tmpdir(), "companion-install-"));
+    const archivePath = path4.join(tempDir, archiveName);
+    writeFileSync2(archivePath, Buffer.from(buffer));
+    const extractedDir = path4.join(tempDir, "extracted");
+    mkdirSync3(extractedDir, { recursive: true });
+    if (isWindows) {
+      const { extractZip: extractZip2 } = await Promise.resolve().then(() => (init_zip_extractor(), exports_zip_extractor));
+      await extractZip2(archivePath, extractedDir);
+    } else {
+      const proc = crossSpawn(["tar", "-xzf", archivePath, "-C", extractedDir]);
+      const exitCode = await proc.exited;
+      if (exitCode !== 0) {
+        const stderr = await proc.stderr();
+        return {
+          status: "failed",
+          binaryPath: finalBinaryPath,
+          error: `Archive extraction failed (tar exited with ${exitCode}): ${stderr}`
+        };
+      }
+    }
+    const binaryName = isWindows ? "oh-my-opencode-slim-companion.exe" : "oh-my-opencode-slim-companion";
+    const extractedBinaryPath = path4.join(extractedDir, binaryName);
+    if (!existsSync3(extractedBinaryPath)) {
+      return {
+        status: "failed",
+        binaryPath: finalBinaryPath,
+        error: `Binary ${binaryName} not found in extracted archive`
+      };
+    }
+    const binDir = path4.dirname(finalBinaryPath);
+    mkdirSync3(binDir, { recursive: true });
+    const tmpFinalPath = `${finalBinaryPath}.tmp`;
+    copyFileSync(extractedBinaryPath, tmpFinalPath);
+    if (!isWindows) {
+      chmodSync(tmpFinalPath, 493);
+    }
+    renameSync2(tmpFinalPath, finalBinaryPath);
+    writeInstallMetadata(finalBinaryPath, {
+      version: manifest.version,
+      tag: manifest.tag,
+      target,
+      installedAt: new Date().toISOString(),
+      archiveName,
+      checksum
+    });
+    return {
+      status: "installed",
+      binaryPath: finalBinaryPath,
+      version: manifest.version
+    };
+  } catch (err) {
+    return {
+      status: "failed",
+      binaryPath: finalBinaryPath,
+      error: `Failed to install companion: ${formatError(err)}`
+    };
+  } finally {
+    if (tempDir) {
+      try {
+        rmSync2(tempDir, { recursive: true, force: true });
+      } catch {}
+    }
+  }
+}
+function readInstallMetadata(binaryPath) {
+  try {
+    const parsed = JSON.parse(readFileSync3(metadataPath(binaryPath), "utf8"));
+    if (parsed?.version && parsed.tag && parsed.target) {
+      return parsed;
+    }
+  } catch {}
+  return null;
+}
+function writeInstallMetadata(binaryPath, metadata) {
+  writeFileSync2(metadataPath(binaryPath), JSON.stringify(metadata, null, 2));
+}
+function metadataPath(binaryPath) {
+  return `${binaryPath}.json`;
+}
+async function withCompanionInstallLock(binaryPath, timeoutMs, staleMs, run) {
+  const lock = `${binaryPath}.lock`;
+  const deadline = Date.now() + (timeoutMs ?? LOCK_TIMEOUT_MS);
+  const staleAfterMs = staleMs ?? STALE_LOCK_MS;
+  mkdirSync3(path4.dirname(binaryPath), { recursive: true });
+  while (Date.now() <= deadline) {
+    try {
+      mkdirSync3(lock);
+      try {
+        return await run();
+      } finally {
+        try {
+          rmSync2(lock, { recursive: true, force: true });
+        } catch {}
+      }
+    } catch (err) {
+      const code = err.code;
+      if (code !== "EEXIST")
+        throw err;
+      try {
+        const ageMs = Date.now() - statSync2(lock).mtimeMs;
+        if (ageMs > staleAfterMs) {
+          rmSync2(lock, { recursive: true, force: true });
+          log("[companion] removed stale install lock", lock);
+          continue;
+        }
+      } catch (statErr) {
+        const statCode = statErr.code;
+        if (statCode !== "ENOENT")
+          throw statErr;
+      }
+      await delay(25);
+    }
+  }
+  log("[companion] install lock timed out", lock);
+  return {
+    status: "failed",
+    binaryPath,
+    error: "Timed out waiting for companion install lock"
+  };
+}
+function companionArchiveName(version, target, isWindows = process.platform === "win32") {
+  const ext = isWindows ? "zip" : "tar.gz";
+  return `oh-my-opencode-slim-companion-v${version}-${target}.${ext}`;
+}
+function compareSemver(a, b) {
+  const left = parseSemver(a);
+  const right = parseSemver(b);
+  if (!left || !right)
+    return a.localeCompare(b);
+  for (let i = 0;i < 3; i++) {
+    const diff = left[i] - right[i];
+    if (diff !== 0)
+      return diff;
+  }
+  return 0;
+}
+function parseSemver(version) {
+  const match = version.match(/^(\d+)\.(\d+)\.(\d+)(?:[-+].*)?$/);
+  if (!match)
+    return null;
+  return [Number(match[1]), Number(match[2]), Number(match[3])];
+}
+function formatError(err) {
+  return err instanceof Error ? err.message : String(err);
 }
 
 // src/config/runtime-preset.ts
@@ -20636,7 +21186,7 @@ function ensureApplyPatchError(error, context) {
 
 // src/hooks/apply-patch/execution-context.ts
 import * as fs3 from "node:fs/promises";
-import path4 from "node:path";
+import path5 from "node:path";
 
 // src/hooks/apply-patch/codec.ts
 function normalizeLineEndings(text) {
@@ -21505,7 +22055,7 @@ function isMissingPathError(error) {
 }
 async function real(target) {
   const parts = [];
-  let current = path4.resolve(target);
+  let current = path5.resolve(target);
   while (true) {
     const exact = await fs3.realpath(current).catch((error) => {
       if (isMissingPathError(error)) {
@@ -21514,19 +22064,19 @@ async function real(target) {
       throw createApplyPatchInternalError(`Failed to resolve real path: ${current}`, error);
     });
     if (exact) {
-      return parts.length === 0 ? exact : path4.join(exact, ...parts.reverse());
+      return parts.length === 0 ? exact : path5.join(exact, ...parts.reverse());
     }
-    const parent = path4.dirname(current);
+    const parent = path5.dirname(current);
     if (parent === current) {
-      return parts.length === 0 ? current : path4.join(current, ...parts.reverse());
+      return parts.length === 0 ? current : path5.join(current, ...parts.reverse());
     }
-    parts.push(path4.basename(current));
+    parts.push(path5.basename(current));
     current = parent;
   }
 }
 function inside(root, target) {
-  const rel = path4.relative(root, target);
-  return rel === "" || !rel.startsWith("..") && !path4.isAbsolute(rel);
+  const rel = path5.relative(root, target);
+  return rel === "" || !rel.startsWith("..") && !path5.isAbsolute(rel);
 }
 function createPathGuardContext(root, worktree) {
   return {
@@ -21536,7 +22086,7 @@ function createPathGuardContext(root, worktree) {
   };
 }
 async function realCached(ctx, target) {
-  const resolvedTarget = path4.resolve(target);
+  const resolvedTarget = path5.resolve(target);
   let pending = ctx.realCache.get(resolvedTarget);
   if (!pending) {
     pending = real(resolvedTarget);
@@ -21587,22 +22137,22 @@ async function assertRegularFile(ctx, filePath, verb) {
 function collectPatchTargets(root, hunks) {
   const targets = new Set;
   for (const hunk of hunks) {
-    targets.add(path4.resolve(root, hunk.path));
+    targets.add(path5.resolve(root, hunk.path));
     if (hunk.type === "update" && hunk.move_path) {
-      targets.add(path4.resolve(root, hunk.move_path));
+      targets.add(path5.resolve(root, hunk.move_path));
     }
   }
   return [...targets];
 }
 function toRelativePatchPath(root, target) {
-  const relative = path4.relative(root, target);
+  const relative = path5.relative(root, target);
   return (relative.length === 0 ? "." : relative).replaceAll("\\", "/");
 }
 function normalizePatchPath(root, value) {
-  return path4.isAbsolute(value) ? toRelativePatchPath(root, path4.resolve(value)) : value;
+  return path5.isAbsolute(value) ? toRelativePatchPath(root, path5.resolve(value)) : value;
 }
 function normalizePatchPaths(root, hunks) {
-  const resolvedRoot = path4.resolve(root);
+  const resolvedRoot = path5.resolve(root);
   const normalized = [];
   let changed = false;
   for (const hunk of hunks) {
@@ -21726,7 +22276,7 @@ function stageAddedText(contents) {
 `;
 }
 // src/hooks/apply-patch/rewrite.ts
-import path5 from "node:path";
+import path6 from "node:path";
 function normalizeTextLineEndings(text) {
   return text.replace(/\r\n/g, `
 `).replace(/\r/g, `
@@ -21883,7 +22433,7 @@ async function rewritePatch(root, patchText, cfg, worktree) {
     const dependencyGroups = new Map;
     for (const hunk of hunks) {
       if (hunk.type === "add") {
-        const filePath2 = path5.resolve(root, hunk.path);
+        const filePath2 = path6.resolve(root, hunk.path);
         await assertPreparedPathMissing(filePath2, "add");
         rewritten.push(hunk);
         clearDependencyGroup(filePath2);
@@ -21905,20 +22455,20 @@ async function rewritePatch(root, patchText, cfg, worktree) {
         continue;
       }
       if (hunk.type === "delete") {
-        const filePath2 = path5.resolve(root, hunk.path);
+        const filePath2 = path6.resolve(root, hunk.path);
         await getPreparedFileState(filePath2, "delete");
         clearDependencyGroup(filePath2);
         rewritten.push(hunk);
         staged.set(filePath2, { exists: false, derived: true });
         continue;
       }
-      const filePath = path5.resolve(root, hunk.path);
+      const filePath = path6.resolve(root, hunk.path);
       const currentDependency = dependencyGroups.get(filePath);
       const current = await getPreparedFileState(filePath, "update");
       if (!current.exists) {
         throw createApplyPatchVerificationError(`Failed to read file to update: ${filePath}`);
       }
-      const movePath = hunk.move_path ? path5.resolve(root, hunk.move_path) : undefined;
+      const movePath = hunk.move_path ? path6.resolve(root, hunk.move_path) : undefined;
       if (movePath && movePath !== filePath) {
         await assertPreparedPathMissing(movePath, "move");
       }
@@ -22083,29 +22633,35 @@ function createApplyPatchHook(ctx) {
     }
   };
 }
+// src/hooks/auto-update-checker/index.ts
+import * as path11 from "node:path";
+init_compat();
+
 // src/hooks/auto-update-checker/cache.ts
 import * as fs5 from "node:fs";
-import * as path8 from "node:path";
+import * as path9 from "node:path";
+// src/cli/system.ts
+init_compat();
 // src/hooks/auto-update-checker/checker.ts
 import * as fs4 from "node:fs";
-import * as path7 from "node:path";
+import * as path8 from "node:path";
 import { fileURLToPath } from "node:url";
 
 // src/hooks/auto-update-checker/constants.ts
 import * as os3 from "node:os";
-import * as path6 from "node:path";
+import * as path7 from "node:path";
 var PACKAGE_NAME = "oh-my-opencode-slim";
 var NPM_REGISTRY_URL = `https://registry.npmjs.org/-/package/${PACKAGE_NAME}/dist-tags`;
 var NPM_PACKAGE_URL = `https://registry.npmjs.org/${PACKAGE_NAME}`;
 var NPM_FETCH_TIMEOUT = 5000;
 function getCacheDir() {
   if (process.platform === "win32") {
-    return path6.join(process.env.LOCALAPPDATA ?? os3.homedir(), "opencode");
+    return path7.join(process.env.LOCALAPPDATA ?? os3.homedir(), "opencode");
   }
-  return path6.join(os3.homedir(), ".cache", "opencode");
+  return path7.join(os3.homedir(), ".cache", "opencode");
 }
 var CACHE_DIR = getCacheDir();
-var INSTALLED_PACKAGE_JSON = path6.join(CACHE_DIR, "node_modules", PACKAGE_NAME, "package.json");
+var INSTALLED_PACKAGE_JSON = path7.join(CACHE_DIR, "node_modules", PACKAGE_NAME, "package.json");
 var configPaths = getOpenCodeConfigPaths();
 var USER_OPENCODE_CONFIG = configPaths[0];
 var USER_OPENCODE_CONFIG_JSONC = configPaths[1];
@@ -22217,8 +22773,8 @@ function extractChannel(version) {
 }
 function getConfigPaths(directory) {
   return [
-    path7.join(directory, ".opencode", "opencode.json"),
-    path7.join(directory, ".opencode", "opencode.jsonc"),
+    path8.join(directory, ".opencode", "opencode.json"),
+    path8.join(directory, ".opencode", "opencode.jsonc"),
     USER_OPENCODE_CONFIG,
     USER_OPENCODE_CONFIG_JSONC
   ];
@@ -22247,9 +22803,9 @@ function getLocalDevPath(directory) {
 function findPackageJsonUp(startPath) {
   try {
     const stat2 = fs4.statSync(startPath);
-    let dir = stat2.isDirectory() ? startPath : path7.dirname(startPath);
+    let dir = stat2.isDirectory() ? startPath : path8.dirname(startPath);
     for (let i = 0;i < 10; i++) {
-      const pkgPath = path7.join(dir, "package.json");
+      const pkgPath = path8.join(dir, "package.json");
       if (fs4.existsSync(pkgPath)) {
         try {
           const content = fs4.readFileSync(pkgPath, "utf-8");
@@ -22258,7 +22814,7 @@ function findPackageJsonUp(startPath) {
             return pkgPath;
         } catch {}
       }
-      const parent = path7.dirname(dir);
+      const parent = path8.dirname(dir);
       if (parent === dir)
         break;
       dir = parent;
@@ -22283,7 +22839,7 @@ function getLocalDevVersion(directory) {
 }
 function getCurrentRuntimePackageJsonPath(currentModuleUrl = import.meta.url) {
   try {
-    const currentDir = path7.dirname(fileURLToPath(currentModuleUrl));
+    const currentDir = path8.dirname(fileURLToPath(currentModuleUrl));
     return findPackageJsonUp(currentDir);
   } catch (err) {
     log("[auto-update-checker] Failed to resolve runtime package path:", err);
@@ -22442,7 +22998,7 @@ function getBlockingMajorVersion(current, candidates) {
 
 // src/hooks/auto-update-checker/cache.ts
 function removeFromBunLock(installDir, packageName) {
-  const lockPath = path8.join(installDir, "bun.lock");
+  const lockPath = path9.join(installDir, "bun.lock");
   if (!fs5.existsSync(lockPath))
     return false;
   try {
@@ -22493,7 +23049,7 @@ function ensureDependencyVersion(packageJsonPath, packageName, version) {
   }
 }
 function removeInstalledPackage(installDir, packageName) {
-  const pkgDir = path8.join(installDir, "node_modules", packageName);
+  const pkgDir = path9.join(installDir, "node_modules", packageName);
   if (!fs5.existsSync(pkgDir))
     return false;
   fs5.rmSync(pkgDir, { recursive: true, force: true });
@@ -22502,18 +23058,18 @@ function removeInstalledPackage(installDir, packageName) {
 }
 function resolveInstallContext(runtimePackageJsonPath = getCurrentRuntimePackageJsonPath()) {
   if (runtimePackageJsonPath) {
-    const packageDir = path8.dirname(runtimePackageJsonPath);
-    const nodeModulesDir = path8.dirname(packageDir);
-    if (path8.basename(packageDir) === PACKAGE_NAME && path8.basename(nodeModulesDir) === "node_modules") {
-      const installDir = path8.dirname(nodeModulesDir);
-      const packageJsonPath = path8.join(installDir, "package.json");
+    const packageDir = path9.dirname(runtimePackageJsonPath);
+    const nodeModulesDir = path9.dirname(packageDir);
+    if (path9.basename(packageDir) === PACKAGE_NAME && path9.basename(nodeModulesDir) === "node_modules") {
+      const installDir = path9.dirname(nodeModulesDir);
+      const packageJsonPath = path9.join(installDir, "package.json");
       if (fs5.existsSync(packageJsonPath)) {
         return { installDir, packageJsonPath };
       }
     }
     return null;
   }
-  const legacyPackageJsonPath = path8.join(CACHE_DIR, "package.json");
+  const legacyPackageJsonPath = path9.join(CACHE_DIR, "package.json");
   if (fs5.existsSync(legacyPackageJsonPath)) {
     return { installDir: CACHE_DIR, packageJsonPath: legacyPackageJsonPath };
   }
@@ -22542,9 +23098,136 @@ function preparePackageUpdate(version, packageName = PACKAGE_NAME, runtimePackag
   }
 }
 
+// src/hooks/auto-update-checker/skill-sync.ts
+import {
+  copyFileSync as copyFileSync2,
+  existsSync as existsSync6,
+  lstatSync,
+  mkdirSync as mkdirSync4,
+  mkdtempSync as mkdtempSync2,
+  readdirSync as readdirSync2,
+  renameSync as renameSync3,
+  rmSync as rmSync4
+} from "node:fs";
+import * as path10 from "node:path";
+function copyDirRecursive(src, dest) {
+  const stat2 = lstatSync(src);
+  if (stat2.isSymbolicLink()) {
+    return;
+  }
+  if (stat2.isDirectory()) {
+    mkdirSync4(dest, { recursive: true });
+    const entries = readdirSync2(src);
+    for (const entry of entries) {
+      copyDirRecursive(path10.join(src, entry), path10.join(dest, entry));
+    }
+  } else if (stat2.isFile()) {
+    const destDir = path10.dirname(dest);
+    if (!existsSync6(destDir)) {
+      mkdirSync4(destDir, { recursive: true });
+    }
+    copyFileSync2(src, dest);
+  }
+}
+function syncBundledSkillsFromPackage(packageRoot) {
+  const installed = [];
+  const skippedExisting = [];
+  const failed = [];
+  const sourceSkillsDir = path10.join(packageRoot, "src", "skills");
+  try {
+    const stat2 = lstatSync(sourceSkillsDir);
+    if (stat2.isSymbolicLink() || !stat2.isDirectory()) {
+      log(`[skill-sync] Source skills directory is not a valid directory: ${sourceSkillsDir}`);
+      return { installed, skippedExisting, failed };
+    }
+  } catch {
+    log(`[skill-sync] Source skills directory does not exist or is unreadable: ${sourceSkillsDir}`);
+    return { installed, skippedExisting, failed };
+  }
+  const destSkillsDir = path10.join(getConfigDir(), "skills");
+  try {
+    if (!existsSync6(destSkillsDir)) {
+      mkdirSync4(destSkillsDir, { recursive: true });
+    }
+  } catch (err) {
+    log(`[skill-sync] Failed to create destination skills directory: ${destSkillsDir}`, err);
+  }
+  let entries = [];
+  try {
+    entries = readdirSync2(sourceSkillsDir);
+  } catch (err) {
+    log(`[skill-sync] Failed to read source skills directory: ${sourceSkillsDir}`, err);
+    return { installed, skippedExisting, failed };
+  }
+  for (const entry of entries) {
+    const entryPath = path10.join(sourceSkillsDir, entry);
+    try {
+      if (entry.startsWith(".")) {
+        continue;
+      }
+      const entryStat = lstatSync(entryPath);
+      if (entryStat.isSymbolicLink() || !entryStat.isDirectory()) {
+        continue;
+      }
+      const skillMdPath = path10.join(entryPath, "SKILL.md");
+      try {
+        const skillMdStat = lstatSync(skillMdPath);
+        if (skillMdStat.isSymbolicLink() || !skillMdStat.isFile()) {
+          continue;
+        }
+      } catch {
+        continue;
+      }
+      const destPath = path10.join(destSkillsDir, entry);
+      let destExists = false;
+      try {
+        lstatSync(destPath);
+        destExists = true;
+      } catch {}
+      if (destExists) {
+        log(`[skill-sync] Skill already exists in destination: ${entry}`);
+        skippedExisting.push(entry);
+        continue;
+      }
+      const stagingDir = mkdtempSync2(path10.join(destSkillsDir, `.sync-staging-${entry}-`));
+      try {
+        copyDirRecursive(entryPath, stagingDir);
+        let destExistsLate = false;
+        try {
+          lstatSync(destPath);
+          destExistsLate = true;
+        } catch {}
+        if (destExistsLate) {
+          log(`[skill-sync] Destination path was created during staging for ${entry}, skipping promotion.`);
+          skippedExisting.push(entry);
+        } else {
+          renameSync3(stagingDir, destPath);
+          installed.push(entry);
+          log(`[skill-sync] Successfully synced skill: ${entry}`);
+        }
+      } catch (err) {
+        log(`[skill-sync] Failed to sync skill ${entry}:`, err);
+        failed.push(entry);
+      } finally {
+        try {
+          if (existsSync6(stagingDir)) {
+            rmSync4(stagingDir, { recursive: true, force: true });
+          }
+        } catch (err) {
+          log(`[skill-sync] Failed to clean up staging directory ${stagingDir}:`, err);
+        }
+      }
+    } catch (err) {
+      log(`[skill-sync] Error processing source entry ${entry}:`, err);
+      failed.push(entry);
+    }
+  }
+  return { installed, skippedExisting, failed };
+}
+
 // src/hooks/auto-update-checker/index.ts
 function createAutoUpdateCheckerHook(ctx, options = {}) {
-  const { autoUpdate = true } = options;
+  const { autoUpdate = true, companion } = options;
   let hasChecked = false;
   return {
     event: ({ event }) => {
@@ -22562,14 +23245,14 @@ function createAutoUpdateCheckerHook(ctx, options = {}) {
           log("[auto-update-checker] Local development mode");
           return;
         }
-        runBackgroundUpdateCheck(ctx, autoUpdate).catch((err) => {
+        runBackgroundUpdateCheck(ctx, autoUpdate, companion).catch((err) => {
           log("[auto-update-checker] Background update check failed:", err);
         });
       }, 0);
     }
   };
 }
-async function runBackgroundUpdateCheck(ctx, autoUpdate) {
+async function runBackgroundUpdateCheck(ctx, autoUpdate, companion) {
   const pluginInfo = findPluginEntry(ctx.directory);
   if (!pluginInfo) {
     log("[auto-update-checker] Plugin not found in config");
@@ -22624,8 +23307,54 @@ Version is pinned. Update your plugin config to apply.`, "info", 8000);
   }
   const installSuccess = await runBunInstallSafe(installDir);
   if (installSuccess) {
-    showToast(ctx, "OMO-Slim Updated!", `v${currentVersion} → v${latestVersion}
-Restart OpenCode to apply.`, "success", 8000);
+    let installedSkills = [];
+    let companionUpdated = false;
+    let companionWillRetry = false;
+    const packageRoot = path11.join(installDir, "node_modules", PACKAGE_NAME);
+    try {
+      const syncResult = syncBundledSkillsFromPackage(packageRoot);
+      installedSkills = syncResult.installed;
+      if (syncResult.failed.length > 0) {
+        log(`[auto-update-checker] Skill sync warnings/failures: ${syncResult.failed.join(", ")}`);
+      }
+      if (syncResult.skippedExisting.length > 0) {
+        log(`[auto-update-checker] Skill sync skipped existing: ${syncResult.skippedExisting.join(", ")}`);
+      }
+    } catch (err) {
+      log("[auto-update-checker] Skill sync failed silently:", err);
+    }
+    if (companion?.enabled === true) {
+      try {
+        const manifest = loadCompanionManifestFromPackageRoot(packageRoot);
+        const companionResult = await ensureCompanionVersion({
+          config: companion,
+          manifest: manifest ?? undefined
+        });
+        if (companionResult.status === "installed") {
+          companionUpdated = true;
+        } else if (companionResult.status === "failed") {
+          companionWillRetry = true;
+          log("[auto-update-checker] Companion update failed; will retry on restart:", companionResult.error);
+        } else if (companionResult.status === "skipped") {
+          log("[auto-update-checker] Companion update skipped:", companionResult.reason);
+        }
+      } catch (err) {
+        companionWillRetry = true;
+        log("[auto-update-checker] Companion update failed silently; will retry on restart:", err);
+      }
+    }
+    const messageLines = [`v${currentVersion} → v${latestVersion}`];
+    if (installedSkills.length > 0) {
+      messageLines.push(`Added bundled skills: ${installedSkills.join(", ")}`);
+    }
+    if (companionUpdated) {
+      messageLines.push("Companion updated.");
+    } else if (companionWillRetry) {
+      messageLines.push("Companion update will retry on restart.");
+    }
+    messageLines.push("Restart OpenCode to apply.");
+    showToast(ctx, "OMO-Slim Updated!", messageLines.join(`
+`), "success", 8000);
     log(`[auto-update-checker] Update installed: ${currentVersion} → ${latestVersion}`);
   } else {
     showToast(ctx, `OMO-Slim ${latestVersion}`, `v${latestVersion} available, but auto-update failed to install it. Check logs or retry manually.`, "error", 8000);
@@ -22728,10 +23457,6 @@ function createDisplayNameMentionRewriter(config) {
   };
 }
 // src/utils/task.ts
-var TRANSIENT_PROCESS_ERROR_TEXT = new Set([
-  "Task is not running in this process and has no final output.",
-  "Task is not running in this process and has not produced output."
-]);
 function parseTaskIdFromTaskOutput(output) {
   const xmlMatch = /<task\s+[^>]*\bid=["']([^"']+)["'][^>]*>/i.exec(output);
   if (xmlMatch)
@@ -23012,7 +23737,7 @@ class BackgroundJobBoard {
         existing.set(file.path, { ...file });
       }
     }
-    const contextFiles = [...existing.values()].filter((file) => file.lineCount >= this.readContextMinLines).sort((a, b) => b.lastReadAt - a.lastReadAt).slice(0, this.readContextMaxFiles + 1);
+    const contextFiles = [...existing.values()].filter((file) => file.lineCount >= this.readContextMinLines).sort((a, b) => b.lineCount - a.lineCount || b.lastReadAt - a.lastReadAt || a.path.localeCompare(b.path)).slice(0, this.readContextMaxFiles + 1);
     this.jobs.set(taskID, { ...job, contextFiles });
   }
   list(parentSessionID) {
@@ -23134,11 +23859,13 @@ function normalizeCancelReason(reason) {
   const normalized = reason?.replace(/\s+/g, " ").trim();
   return normalized ? `cancelled: ${normalized}` : "cancelled";
 }
-// src/utils/internal-initiator.ts
-var SLIM_INTERNAL_INITIATOR_MARKER = "<!-- SLIM_INTERNAL_INITIATOR -->";
+// src/utils/guards.ts
 function isRecord(value) {
   return typeof value === "object" && value !== null;
 }
+
+// src/utils/internal-initiator.ts
+var SLIM_INTERNAL_INITIATOR_MARKER = "<!-- SLIM_INTERNAL_INITIATOR -->";
 function createInternalAgentTextPart(text) {
   return {
     type: "text",
@@ -23155,86 +23882,10 @@ function hasInternalInitiatorMarker(part) {
   }
   return part.text.includes(SLIM_INTERNAL_INITIATOR_MARKER);
 }
-// src/utils/zip-extractor.ts
-import { spawnSync } from "node:child_process";
-import { release } from "node:os";
-var WINDOWS_BUILD_WITH_TAR = 17134;
-function getWindowsBuildNumber() {
-  if (process.platform !== "win32")
-    return null;
-  const parts = release().split(".");
-  if (parts.length >= 3) {
-    const build = parseInt(parts[2], 10);
-    if (!Number.isNaN(build))
-      return build;
-  }
-  return null;
-}
-function isPwshAvailable() {
-  if (process.platform !== "win32")
-    return false;
-  const result = spawnSync("where", ["pwsh"], {
-    stdio: ["ignore", "pipe", "pipe"]
-  });
-  return result.status === 0;
-}
-function escapePowerShellPath(path9) {
-  return path9.replace(/'/g, "''");
-}
-function getWindowsZipExtractor() {
-  const buildNumber = getWindowsBuildNumber();
-  if (buildNumber !== null && buildNumber >= WINDOWS_BUILD_WITH_TAR) {
-    return "tar";
-  }
-  if (isPwshAvailable()) {
-    return "pwsh";
-  }
-  return "powershell";
-}
-async function extractZip(archivePath, destDir) {
-  let proc;
-  if (process.platform === "win32") {
-    const extractor = getWindowsZipExtractor();
-    switch (extractor) {
-      case "tar":
-        proc = crossSpawn(["tar", "-xf", archivePath, "-C", destDir], {
-          stdout: "ignore",
-          stderr: "pipe"
-        });
-        break;
-      case "pwsh":
-        proc = crossSpawn([
-          "pwsh",
-          "-Command",
-          `Expand-Archive -Path '${escapePowerShellPath(archivePath)}' -DestinationPath '${escapePowerShellPath(destDir)}' -Force`
-        ], {
-          stdout: "ignore",
-          stderr: "pipe"
-        });
-        break;
-      default:
-        proc = crossSpawn([
-          "powershell",
-          "-Command",
-          `Expand-Archive -Path '${escapePowerShellPath(archivePath)}' -DestinationPath '${escapePowerShellPath(destDir)}' -Force`
-        ], {
-          stdout: "ignore",
-          stderr: "pipe"
-        });
-        break;
-    }
-  } else {
-    proc = crossSpawn(["unzip", "-o", archivePath, "-d", destDir], {
-      stdout: "ignore",
-      stderr: "pipe"
-    });
-  }
-  const exitCode = await proc.exited;
-  if (exitCode !== 0) {
-    const stderr = await proc.stderr();
-    throw new Error(`zip extraction failed (exit ${exitCode}): ${stderr}`);
-  }
-}
+
+// src/utils/index.ts
+init_zip_extractor();
+
 // src/hooks/chat-headers.ts
 var INTERNAL_MARKER_CACHE_LIMIT = 1000;
 var internalMarkerCache = new Map;
@@ -23392,7 +24043,7 @@ function detectDelegateTaskError(output) {
   return null;
 }
 
-// src/hooks/delegate-task-retry/guidance.ts
+// src/hooks/delegate-task-retry/hook.ts
 function extractAvailableList(output) {
   const match = output.match(/Allowed agents:\s*(.+)$/m);
   if (match)
@@ -23422,7 +24073,6 @@ function buildRetryGuidance(errorInfo) {
   return lines.join(`
 `);
 }
-// src/hooks/delegate-task-retry/hook.ts
 function createDelegateTaskRetryHook(_ctx) {
   return {
     "tool.execute.after": async (input, output) => {
@@ -23548,12 +24198,6 @@ function isRateLimitError(error) {
   ].join(" ");
   return RATE_LIMIT_PATTERNS.some((p) => p.test(text));
 }
-function parseModel(model) {
-  const slash = model.indexOf("/");
-  if (slash <= 0 || slash >= model.length - 1)
-    return null;
-  return { providerID: model.slice(0, slash), modelID: model.slice(slash + 1) };
-}
 var DEDUP_WINDOW_MS = 5000;
 var REPROMPT_DELAY_MS = 500;
 
@@ -23671,7 +24315,7 @@ class ForegroundFallbackManager {
         return;
       }
       tried.add(nextModel);
-      const ref = parseModel(nextModel);
+      const ref = parseModelReference(nextModel);
       if (!ref) {
         log("[foreground-fallback] invalid model format", {
           sessionID,
@@ -23746,17 +24390,17 @@ class ForegroundFallbackManager {
   }
 }
 // src/hooks/image-hook.ts
-import { createHash } from "node:crypto";
+import { createHash as createHash2 } from "node:crypto";
 import {
-  existsSync as existsSync5,
-  mkdirSync as mkdirSync3,
-  readdirSync as readdirSync2,
+  existsSync as existsSync7,
+  mkdirSync as mkdirSync5,
+  readdirSync as readdirSync3,
   rmdirSync,
-  statSync as statSync3,
+  statSync as statSync4,
   unlinkSync as unlinkSync2,
-  writeFileSync as writeFileSync4
+  writeFileSync as writeFileSync5
 } from "node:fs";
-import { basename as basename2, extname, join as join8 } from "node:path";
+import { basename as basename2, extname, join as join11 } from "node:path";
 var lastCleanupByDir = new Map;
 var CLEANUP_INTERVAL = 10 * 60 * 1000;
 function isImagePart(p) {
@@ -23803,13 +24447,13 @@ function cleanupAllSessions(saveDir) {
   const maxAge = 60 * 60 * 1000;
   const dirsToScan = [];
   try {
-    for (const entry of readdirSync2(saveDir, { withFileTypes: true })) {
-      const fp = join8(saveDir, entry.name);
+    for (const entry of readdirSync3(saveDir, { withFileTypes: true })) {
+      const fp = join11(saveDir, entry.name);
       if (entry.isDirectory()) {
         dirsToScan.push(fp);
       } else {
         try {
-          if (now - statSync3(fp).mtimeMs > maxAge)
+          if (now - statSync4(fp).mtimeMs > maxAge)
             unlinkSync2(fp);
         } catch {}
       }
@@ -23819,11 +24463,11 @@ function cleanupAllSessions(saveDir) {
     try {
       let isEmpty = true;
       let allRemoved = true;
-      for (const f of readdirSync2(dir)) {
+      for (const f of readdirSync3(dir)) {
         isEmpty = false;
-        const fp = join8(dir, f);
+        const fp = join11(dir, f);
         try {
-          if (now - statSync3(fp).mtimeMs > maxAge) {
+          if (now - statSync4(fp).mtimeMs > maxAge) {
             unlinkSync2(fp);
           } else {
             allRemoved = false;
@@ -23843,20 +24487,20 @@ function cleanupAllSessions(saveDir) {
 function writeUniqueFile(dir, name, data, log2) {
   const ext = extname(name);
   const base = basename2(name, ext) || name;
-  let candidate = join8(dir, name);
-  if (existsSync5(candidate)) {
+  let candidate = join11(dir, name);
+  if (existsSync7(candidate)) {
     return candidate;
   }
   let counter = 0;
   const MAX_ATTEMPTS = 1000;
   for (let attempt = 0;attempt < MAX_ATTEMPTS; attempt++) {
     try {
-      writeFileSync4(candidate, data, { flag: "wx" });
+      writeFileSync5(candidate, data, { flag: "wx" });
       return candidate;
     } catch (e) {
       if (e instanceof Error && e.code === "EEXIST") {
         counter += 1;
-        candidate = join8(dir, `${base}-${counter}${ext}`);
+        candidate = join11(dir, `${base}-${counter}${ext}`);
         continue;
       }
       log2(`[image-hook] failed to save image: ${e}`);
@@ -23880,17 +24524,17 @@ function processImageAttachments(args) {
       messagesWithImages.push({ msg, imageParts });
     }
   }
-  const saveDir = join8(workDir, ".opencode", "images");
+  const saveDir = join11(workDir, ".opencode", "images");
   if (messagesWithImages.length === 0) {
-    if (existsSync5(saveDir))
+    if (existsSync7(saveDir))
       cleanupAllSessions(saveDir);
     return;
   }
-  const gitignorePath = join8(workDir, ".opencode", ".gitignore");
+  const gitignorePath = join11(workDir, ".opencode", ".gitignore");
   try {
-    mkdirSync3(saveDir, { recursive: true });
-    if (!existsSync5(gitignorePath))
-      writeFileSync4(gitignorePath, `*
+    mkdirSync5(saveDir, { recursive: true });
+    if (!existsSync7(gitignorePath))
+      writeFileSync5(gitignorePath, `*
 `);
   } catch (e) {
     log2(`[image-hook] failed to create image directory: ${e}`);
@@ -23898,9 +24542,9 @@ function processImageAttachments(args) {
   cleanupAllSessions(saveDir);
   for (const { msg, imageParts } of messagesWithImages) {
     const sessionSubdir = msg.info.sessionID ? sanitizeFilename(msg.info.sessionID) : undefined;
-    const targetDir = sessionSubdir ? join8(saveDir, sessionSubdir) : saveDir;
+    const targetDir = sessionSubdir ? join11(saveDir, sessionSubdir) : saveDir;
     try {
-      mkdirSync3(targetDir, { recursive: true });
+      mkdirSync5(targetDir, { recursive: true });
     } catch (e) {
       log2(`[image-hook] failed to create target image directory: ${e}`);
     }
@@ -23911,7 +24555,7 @@ function processImageAttachments(args) {
       if (url) {
         const decoded = decodeDataUrl(url);
         if (decoded) {
-          const hash = createHash("sha1").update(decoded.data).digest("hex").slice(0, 8);
+          const hash = createHash2("sha1").update(decoded.data).digest("hex").slice(0, 8);
           const sanitizedFilename = filename ? sanitizeFilename(filename) : undefined;
           const baseName = sanitizedFilename ? sanitizedFilename.replace(/\.[^.]+$/, "") || "image" : "image";
           const ext = sanitizedFilename ? extname(sanitizedFilename) || extFromMime(decoded.mime) : extFromMime(decoded.mime);
@@ -23984,7 +24628,6 @@ ${JSON_ERROR_REMINDER}`;
   };
 }
 // src/hooks/phase-reminder/index.ts
-var PHASE_REMINDER = `<internal_reminder>${PHASE_REMINDER_TEXT}</internal_reminder>`;
 function createPhaseReminderHook() {
   return {
     "experimental.chat.messages.transform": async (_input, output) => {
@@ -24026,24 +24669,18 @@ function createPhaseReminderHook() {
   };
 }
 // src/hooks/post-file-tool-nudge/index.ts
-var POST_FILE_TOOL_NUDGE = PHASE_REMINDER_TEXT;
 var FILE_TOOLS = new Set(["Read", "read", "Write", "write"]);
 function createPostFileToolNudgeHook(options = {}) {
   function appendReminder(output) {
     if (typeof output.output !== "string") {
       return;
     }
-    if (output.output.includes(POST_FILE_TOOL_NUDGE)) {
+    if (output.output.includes(PHASE_REMINDER)) {
       return;
     }
-    output.output = [
-      output.output,
-      "",
-      "<internal_reminder>",
-      POST_FILE_TOOL_NUDGE,
-      "</internal_reminder>"
-    ].join(`
-`);
+    output.output = `${output.output}
+
+${PHASE_REMINDER}`;
   }
   return {
     "tool.execute.after": async (input, output) => {
@@ -24057,8 +24694,59 @@ function createPostFileToolNudgeHook(options = {}) {
     }
   };
 }
+// src/hooks/reflect/index.ts
+var COMMAND_NAME2 = "reflect";
+function activationPrompt2(focus) {
+  const focusBlock = focus ? ["Focus:", focus] : [
+    "Focus:",
+    "Review recent work broadly and identify repeated workflow friction worth improving."
+  ];
+  return [
+    "Use the reflect skill for this request.",
+    "",
+    "Reflect requirements:",
+    "- inspect existing skills, commands, agents, prompt overrides, MCP permissions, config, and project playbooks before suggesting anything new;",
+    "- find repeated workflow patterns from the current conversation, project notes, local memories, logs, or session artifacts that are available and safe to inspect;",
+    "- prefer evidence from repeated recent behavior over speculation;",
+    "- recommend the smallest useful improvement: prompt/config rule, skill, command, custom agent, MCP/tool permission change, project playbook, or skip;",
+    "- treat creating nothing as a valid result when evidence is weak;",
+    "- ask before changing prompts, skills, commands, agents, MCP access, or config unless the user explicitly requested the exact edit;",
+    "- return a compact report with findings, recommended changes, skipped candidates, and items needing more evidence.",
+    "",
+    ...focusBlock
+  ].join(`
+`);
+}
+function createReflectCommandHook() {
+  let shouldHandleCommand = false;
+  return {
+    registerCommand: (opencodeConfig) => {
+      const commandConfig = opencodeConfig.command;
+      if (commandConfig?.[COMMAND_NAME2]) {
+        shouldHandleCommand = false;
+        return;
+      }
+      if (!opencodeConfig.command)
+        opencodeConfig.command = {};
+      opencodeConfig.command[COMMAND_NAME2] = {
+        template: "Review repeated work and suggest workflow improvements",
+        description: "Use reflect to learn from repeated workflows and suggest reusable improvements"
+      };
+      shouldHandleCommand = true;
+    },
+    handleCommandExecuteBefore: async (input, output) => {
+      if (input.command !== COMMAND_NAME2 || !shouldHandleCommand)
+        return;
+      output.parts.length = 0;
+      output.parts.push({
+        type: "text",
+        text: activationPrompt2(input.arguments.trim())
+      });
+    }
+  };
+}
 // src/hooks/task-session-manager/index.ts
-import path9 from "node:path";
+import path12 from "node:path";
 var AGENT_NAME_SET = new Set([
   "orchestrator",
   "oracle",
@@ -24104,9 +24792,6 @@ function createOccurrenceId(part, message, partIndex) {
 function isAgentName(value) {
   return typeof value === "string" && AGENT_NAME_SET.has(value);
 }
-function isObjectRecord(value) {
-  return typeof value === "object" && value !== null;
-}
 function extractPath(output) {
   return /<path>([^<]+)<\/path>/.exec(output)?.[1];
 }
@@ -24115,8 +24800,8 @@ function extractTaskSummary(output) {
   return summary?.trim() || undefined;
 }
 function normalizePath(root, file) {
-  const relative = path9.relative(root, file);
-  if (!relative || relative.startsWith("..") || path9.isAbsolute(relative)) {
+  const relative = path12.relative(root, file);
+  if (!relative || relative.startsWith("..") || path12.isAbsolute(relative)) {
     return file;
   }
   return relative;
@@ -24384,7 +25069,7 @@ function createTaskSessionManagerHook(_ctx, options) {
       if (!input.sessionID || !options.shouldManageSession(input.sessionID)) {
         return;
       }
-      if (!isObjectRecord(output.args))
+      if (!isRecord(output.args))
         return;
       const args = output.args;
       if (!isAgentName(args.subagent_type)) {
@@ -24658,7 +25343,7 @@ function createTaskSessionManagerHook(_ctx, options) {
       result: status.result
     });
     output.output = formatCancelledTaskStatusOutput(status.taskID, existing?.resultSummary);
-    if (isObjectRecord(output) && isObjectRecord(output.metadata)) {
+    if (isRecord(output) && isRecord(output.metadata)) {
       output.metadata.state = "cancelled";
     }
   }
@@ -24682,7 +25367,7 @@ function formatCancelledTaskStatusOutput(taskID, summary = "cancelled") {
 `);
 }
 // src/interview/manager.ts
-import path13 from "node:path";
+import path16 from "node:path";
 
 // src/interview/dashboard.ts
 import crypto from "node:crypto";
@@ -24692,27 +25377,27 @@ import {
   createServer
 } from "node:http";
 import os4 from "node:os";
-import path11 from "node:path";
+import path14 from "node:path";
 import { URL as URL2 } from "node:url";
 
 // src/interview/document.ts
 import * as fsSync from "node:fs";
 import * as fs6 from "node:fs/promises";
-import * as path10 from "node:path";
+import * as path13 from "node:path";
 var DEFAULT_OUTPUT_FOLDER = "interview";
 function normalizeOutputFolder(outputFolder) {
   const normalized = outputFolder.trim().replace(/^\/+|\/+$/g, "");
   return normalized || DEFAULT_OUTPUT_FOLDER;
 }
 function createInterviewDirectoryPath(directory, outputFolder) {
-  return path10.join(directory, normalizeOutputFolder(outputFolder));
+  return path13.join(directory, normalizeOutputFolder(outputFolder));
 }
 function createInterviewFilePath(directory, outputFolder, idea) {
   const fileName = `${slugify(idea) || "interview"}.md`;
-  return path10.join(createInterviewDirectoryPath(directory, outputFolder), fileName);
+  return path13.join(createInterviewDirectoryPath(directory, outputFolder), fileName);
 }
 function relativeInterviewPath(directory, filePath) {
-  return path10.relative(directory, filePath) || path10.basename(filePath);
+  return path13.relative(directory, filePath) || path13.basename(filePath);
 }
 function resolveExistingInterviewPath(directory, outputFolder, value) {
   const trimmed = value.trim();
@@ -24721,22 +25406,22 @@ function resolveExistingInterviewPath(directory, outputFolder, value) {
   }
   const outputDir = createInterviewDirectoryPath(directory, outputFolder);
   const candidates = new Set;
-  const resolvedRoot = path10.resolve(directory);
-  if (path10.isAbsolute(trimmed)) {
+  const resolvedRoot = path13.resolve(directory);
+  if (path13.isAbsolute(trimmed)) {
     candidates.add(trimmed);
   } else {
-    candidates.add(path10.resolve(directory, trimmed));
-    candidates.add(path10.join(outputDir, trimmed));
+    candidates.add(path13.resolve(directory, trimmed));
+    candidates.add(path13.join(outputDir, trimmed));
     if (!trimmed.endsWith(".md")) {
-      candidates.add(path10.join(outputDir, `${trimmed}.md`));
+      candidates.add(path13.join(outputDir, `${trimmed}.md`));
     }
   }
   for (const candidate of candidates) {
-    if (path10.extname(candidate) !== ".md") {
+    if (path13.extname(candidate) !== ".md") {
       continue;
     }
-    const resolved = path10.resolve(candidate);
-    if (!resolved.startsWith(resolvedRoot + path10.sep) && resolved !== resolvedRoot) {
+    const resolved = path13.resolve(candidate);
+    if (!resolved.startsWith(resolvedRoot + path13.sep) && resolved !== resolvedRoot) {
       continue;
     }
     if (fsSync.existsSync(candidate)) {
@@ -24816,7 +25501,7 @@ function parseFrontmatter(content) {
   return result;
 }
 async function ensureInterviewFile(record) {
-  await fs6.mkdir(path10.dirname(record.markdownPath), { recursive: true });
+  await fs6.mkdir(path13.dirname(record.markdownPath), { recursive: true });
   try {
     await fs6.access(record.markdownPath);
   } catch {
@@ -26486,12 +27171,12 @@ function renderInterviewPage(interviewId, resumeSlug) {
 
 // src/interview/dashboard.ts
 function getAuthFilePath(port) {
-  const dataHome = process.env.XDG_DATA_HOME || path11.join(os4.homedir(), ".local", "share");
-  return path11.join(dataHome, "opencode", `.dashboard-${port}.json`);
+  const dataHome = process.env.XDG_DATA_HOME || path14.join(os4.homedir(), ".local", "share");
+  return path14.join(dataHome, "opencode", `.dashboard-${port}.json`);
 }
 function writeAuthFile(port, token) {
   const filePath = getAuthFilePath(port);
-  const dir = path11.dirname(filePath);
+  const dir = path14.dirname(filePath);
   try {
     fsSync2.mkdirSync(dir, { recursive: true });
   } catch {}
@@ -26628,7 +27313,7 @@ function createDashboardServer(config) {
     const directories = getKnownDirectories();
     const items = [];
     for (const dir of directories) {
-      const interviewDir = path11.join(dir, config.outputFolder);
+      const interviewDir = path14.join(dir, config.outputFolder);
       let entries;
       try {
         entries = await fs7.readdir(interviewDir);
@@ -26640,7 +27325,7 @@ function createDashboardServer(config) {
           continue;
         let content;
         try {
-          content = await fs7.readFile(path11.join(interviewDir, entry), "utf8");
+          content = await fs7.readFile(path14.join(interviewDir, entry), "utf8");
         } catch {
           continue;
         }
@@ -26666,7 +27351,7 @@ function createDashboardServer(config) {
     const directories = getKnownDirectories();
     let rebuilt = 0;
     for (const dir of directories) {
-      const interviewDir = path11.join(dir, config.outputFolder);
+      const interviewDir = path14.join(dir, config.outputFolder);
       let entries;
       try {
         entries = await fs7.readdir(interviewDir);
@@ -26678,7 +27363,7 @@ function createDashboardServer(config) {
           continue;
         let content;
         try {
-          content = await fs7.readFile(path11.join(interviewDir, entry), "utf8");
+          content = await fs7.readFile(path14.join(interviewDir, entry), "utf8");
         } catch {
           continue;
         }
@@ -26704,7 +27389,7 @@ function createDashboardServer(config) {
           questions: [],
           pendingAnswers: null,
           lastUpdatedAt: fm.updatedAt ? new Date(fm.updatedAt).getTime() : Date.now(),
-          filePath: path11.join(interviewDir, entry),
+          filePath: path14.join(interviewDir, entry),
           nudgeAction: null
         });
         if (!sessions.has(fm.sessionID)) {
@@ -26968,7 +27653,7 @@ function createDashboardServer(config) {
         const dirs = getKnownDirectories();
         for (const dir of dirs) {
           const slug = extractResumeSlug(interviewId);
-          const candidate = path11.join(dir, config.outputFolder, `${slug}.md`);
+          const candidate = path14.join(dir, config.outputFolder, `${slug}.md`);
           try {
             document = await fs7.readFile(candidate, "utf8");
             markdownPath = candidate;
@@ -27496,7 +28181,7 @@ function createInterviewServer(deps) {
 // src/interview/service.ts
 import { spawn as spawn2 } from "node:child_process";
 import * as fs8 from "node:fs/promises";
-import * as path12 from "node:path";
+import * as path15 from "node:path";
 
 // src/interview/types.ts
 import { z as z3 } from "zod";
@@ -27668,7 +28353,7 @@ function buildAnswerPrompt(answers, questions, maxQuestions) {
 }
 
 // src/interview/service.ts
-var COMMAND_NAME2 = "interview";
+var COMMAND_NAME3 = "interview";
 var DEFAULT_MAX_QUESTIONS = 2;
 function isTruthyEnvFlag(value) {
   if (!value) {
@@ -27676,21 +28361,21 @@ function isTruthyEnvFlag(value) {
   }
   return value !== "0" && value.toLowerCase() !== "false";
 }
-function isAutomatedRuntime(env2) {
-  return env2.NODE_ENV === "test" || isTruthyEnvFlag(env2.CI) || isTruthyEnvFlag(env2.BUN_TEST) || isTruthyEnvFlag(env2.VITEST) || env2.JEST_WORKER_ID !== undefined;
+function isAutomatedRuntime(env) {
+  return env.NODE_ENV === "test" || isTruthyEnvFlag(env.CI) || isTruthyEnvFlag(env.BUN_TEST) || isTruthyEnvFlag(env.VITEST) || env.JEST_WORKER_ID !== undefined;
 }
-function shouldAutoOpenBrowser(config, env2) {
+function shouldAutoOpenBrowser(config, env) {
   const requested = config?.autoOpenBrowser ?? true;
-  return requested && !isAutomatedRuntime(env2);
+  return requested && !isAutomatedRuntime(env);
 }
 function openBrowser(url) {
-  const platform2 = process.platform;
+  const platform3 = process.platform;
   let command;
   let args;
-  if (platform2 === "darwin") {
+  if (platform3 === "darwin") {
     command = "open";
     args = [url];
-  } else if (platform2 === "win32") {
+  } else if (platform3 === "win32") {
     command = "cmd";
     args = ["/c", "start", "", url];
   } else {
@@ -27763,12 +28448,12 @@ function createInterviewService(ctx, config, deps) {
     if (!newSlug) {
       return;
     }
-    const currentFileName = path12.basename(interview.markdownPath, ".md");
+    const currentFileName = path15.basename(interview.markdownPath, ".md");
     if (currentFileName === newSlug) {
       return;
     }
-    const dir = path12.dirname(interview.markdownPath);
-    const newPath = path12.join(dir, `${newSlug}.md`);
+    const dir = path15.dirname(interview.markdownPath);
+    const newPath = path15.join(dir, `${newSlug}.md`);
     try {
       await fs8.access(newPath);
       return;
@@ -27844,9 +28529,9 @@ function createInterviewService(ctx, config, deps) {
     const messages = await loadMessages(sessionID);
     const title = extractTitle(document);
     const record = {
-      id: `${Date.now()}-${++idCounter}-${slugify(path12.basename(markdownPath, ".md")) || "interview"}`,
+      id: `${Date.now()}-${++idCounter}-${slugify(path15.basename(markdownPath, ".md")) || "interview"}`,
       sessionID,
-      idea: title || path12.basename(markdownPath, ".md"),
+      idea: title || path15.basename(markdownPath, ".md"),
       markdownPath,
       createdAt: nowIso(),
       status: "active",
@@ -27915,11 +28600,11 @@ function createInterviewService(ctx, config, deps) {
   }
   function registerCommand(opencodeConfig) {
     const configCommand = opencodeConfig.command;
-    if (!configCommand?.[COMMAND_NAME2]) {
+    if (!configCommand?.[COMMAND_NAME3]) {
       if (!opencodeConfig.command) {
         opencodeConfig.command = {};
       }
-      opencodeConfig.command[COMMAND_NAME2] = {
+      opencodeConfig.command[COMMAND_NAME3] = {
         template: "Start an interview and write a live markdown spec",
         description: "Open a localhost interview UI linked to the current OpenCode session"
       };
@@ -27993,7 +28678,7 @@ function createInterviewService(ctx, config, deps) {
     }
   }
   async function handleCommandExecuteBefore(input, output) {
-    if (input.command !== COMMAND_NAME2) {
+    if (input.command !== COMMAND_NAME3) {
       return;
     }
     const idea = input.arguments.trim();
@@ -28073,7 +28758,7 @@ function createInterviewService(ctx, config, deps) {
       return fileCache.items;
     }
     const outputDir = createInterviewDirectoryPath(ctx.directory, outputFolder);
-    const activePaths = new Set([...interviewsById.values()].filter((i) => i.status === "active").map((i) => path12.resolve(i.markdownPath)));
+    const activePaths = new Set([...interviewsById.values()].filter((i) => i.status === "active").map((i) => path15.resolve(i.markdownPath)));
     let entries;
     try {
       entries = await fs8.readdir(outputDir);
@@ -28084,8 +28769,8 @@ function createInterviewService(ctx, config, deps) {
     for (const entry of entries) {
       if (!entry.endsWith(".md"))
         continue;
-      const fullPath = path12.join(outputDir, entry);
-      if (activePaths.has(path12.resolve(fullPath)))
+      const fullPath = path15.join(outputDir, entry);
+      if (activePaths.has(path15.resolve(fullPath)))
         continue;
       let content;
       try {
@@ -28184,7 +28869,7 @@ function createInterviewManager(ctx, config) {
   const outputFolder = interviewConfig?.outputFolder ?? "interview";
   if (!dashboardEnabled) {
     const service2 = createInterviewService(ctx, interviewConfig);
-    const resolvedOutputPath = path13.join(ctx.directory, outputFolder);
+    const resolvedOutputPath = path16.join(ctx.directory, outputFolder);
     const server = createInterviewServer({
       getState: async (interviewId) => service2.getInterviewState(interviewId),
       listInterviewFiles: async () => service2.listInterviewFiles(),
@@ -28289,7 +28974,7 @@ function createInterviewManager(ctx, config) {
               listInterviews: () => service.listInterviews(),
               submitAnswers: async (interviewId, answers) => service.submitAnswers(interviewId, answers),
               handleNudgeAction: async (interviewId, action) => service.handleNudgeAction(interviewId, action),
-              outputFolder: path13.join(ctx.directory, outputFolder),
+              outputFolder: path16.join(ctx.directory, outputFolder),
               port: 0
             });
             service.setBaseUrlResolver(() => perSessionServer.ensureStarted());
@@ -28557,6 +29242,7 @@ function createBuiltinMcps(disabledMcps = [], websearchConfig) {
 }
 
 // src/multiplexer/tmux/index.ts
+init_compat();
 var TMUX_LAYOUT_DEBOUNCE_MS = 150;
 
 class TmuxMultiplexer {
@@ -28774,23 +29460,23 @@ class TmuxMultiplexer {
         return null;
       }
       const stdout = await proc.stdout();
-      const path14 = stdout.trim().split(`
+      const path17 = stdout.trim().split(`
 `)[0];
-      if (!path14) {
+      if (!path17) {
         log("[tmux] findBinary: no path in output");
         return null;
       }
-      const verifyProc = crossSpawn([path14, "-V"], {
+      const verifyProc = crossSpawn([path17, "-V"], {
         stdout: "pipe",
         stderr: "pipe"
       });
       const verifyExit = await verifyProc.exited;
       if (verifyExit !== 0) {
-        log("[tmux] findBinary: tmux -V failed", { path: path14, verifyExit });
+        log("[tmux] findBinary: tmux -V failed", { path: path17, verifyExit });
         return null;
       }
-      log("[tmux] findBinary: found", { path: path14 });
-      return path14;
+      log("[tmux] findBinary: found", { path: path17 });
+      return path17;
     } catch (err) {
       log("[tmux] findBinary: exception", { error: String(err) });
       return null;
@@ -28802,6 +29488,8 @@ function quoteShellArg(value) {
 }
 
 // src/multiplexer/zellij/index.ts
+init_compat();
+
 class ZellijMultiplexer {
   paneMode;
   type = "zellij";
@@ -29741,22 +30429,359 @@ async function isServerRunning(serverUrl, timeoutMs = 3000, maxAttempts = 2) {
   }
   return false;
 }
-// src/tools/ast-grep/tools.ts
+// src/tools/acp-run.ts
+import { spawn as spawn3 } from "node:child_process";
+import { createInterface } from "node:readline";
 import { tool } from "@opencode-ai/plugin";
+var z4 = tool.schema;
+
+class AcpClient {
+  name;
+  config;
+  cwd;
+  ask;
+  child;
+  next = 1;
+  pending = new Map;
+  chunks = [];
+  errors = [];
+  sessionId;
+  lastUpdate = Date.now();
+  authMethods = [];
+  active = false;
+  activeRequests = 0;
+  constructor(name, config, cwd, ask) {
+    this.name = name;
+    this.config = config;
+    this.cwd = cwd;
+    this.ask = ask;
+    this.child = spawn3(config.command, config.args, {
+      cwd,
+      env: { ...process.env, ...config.env },
+      stdio: "pipe"
+    });
+    this.child.stderr.on("data", (chunk) => {
+      this.errors.push(String(chunk));
+    });
+    this.child.stdin.on("error", (error) => {
+      this.errors.push(String(error));
+      this.rejectPending(error);
+    });
+    this.child.on("error", (error) => {
+      this.rejectPending(error);
+    });
+    this.child.on("exit", (code, signal) => {
+      if (this.pending.size === 0)
+        return;
+      this.rejectPending(new Error(`ACP agent '${name}' exited before replying (code ${code ?? "null"}, signal ${signal ?? "null"})`));
+    });
+    createInterface({ input: this.child.stdout }).on("line", (line) => {
+      this.receive(line).catch((error) => {
+        this.errors.push(String(error));
+      });
+    });
+  }
+  async run(prompt) {
+    const init = await this.request("initialize", {
+      protocolVersion: 1,
+      clientCapabilities: {},
+      clientInfo: {
+        name: "oh-my-opencode-slim",
+        title: "oh-my-opencode-slim ACP bridge"
+      }
+    });
+    this.authMethods = readAuthMethods(init);
+    const created = await this.newSession();
+    const sessionId = readSessionId(created);
+    this.sessionId = sessionId;
+    this.active = true;
+    await this.request("session/prompt", {
+      sessionId,
+      prompt: [{ type: "text", text: prompt }]
+    });
+    await this.drain();
+    this.active = false;
+    return this.output();
+  }
+  async newSession() {
+    try {
+      return await this.request("session/new", {
+        cwd: this.cwd,
+        mcpServers: []
+      });
+    } catch (error) {
+      if (!isAuthError(error) || this.authMethods.length === 0)
+        throw error;
+      const method = this.authMethods[0];
+      if (typeof method.id !== "string")
+        throw error;
+      await this.request("authenticate", { methodId: method.id });
+      return await this.request("session/new", {
+        cwd: this.cwd,
+        mcpServers: []
+      });
+    }
+  }
+  close() {
+    if (this.active && this.sessionId && !this.child.killed) {
+      this.notify("session/cancel", { sessionId: this.sessionId });
+    }
+    if (!this.child.killed)
+      this.child.kill("SIGTERM");
+  }
+  request(method, params) {
+    const id = this.next++;
+    const payload = { jsonrpc: "2.0", id, method, params };
+    return new Promise((resolve3, reject) => {
+      this.pending.set(id, { resolve: resolve3, reject });
+      this.child.stdin.write(`${JSON.stringify(payload)}
+`, (error) => {
+        if (!error)
+          return;
+        this.pending.delete(id);
+        reject(error);
+      });
+    });
+  }
+  notify(method, params) {
+    this.child.stdin.write(`${JSON.stringify({ jsonrpc: "2.0", method, params })}
+`);
+  }
+  async drain() {
+    this.lastUpdate = Date.now();
+    while (this.activeRequests > 0 || Date.now() - this.lastUpdate < 100) {
+      await new Promise((resolve3) => setTimeout(resolve3, 25));
+    }
+  }
+  async receive(line) {
+    if (!line.trim())
+      return;
+    let message;
+    try {
+      message = JSON.parse(line);
+    } catch {
+      const error = new Error(`ACP agent '${this.name}' wrote non-JSON stdout: ${line.slice(0, 200)}`);
+      this.errors.push(error.message);
+      this.rejectPending(error);
+      this.close();
+      return;
+    }
+    if ("id" in message && (("result" in message) || ("error" in message))) {
+      const pending = this.pending.get(message.id);
+      if (!pending)
+        return;
+      this.pending.delete(message.id);
+      if (message.error) {
+        pending.reject(rpcError(message.error));
+        return;
+      }
+      pending.resolve(message.result);
+      return;
+    }
+    if ("id" in message && "method" in message) {
+      this.activeRequests++;
+      try {
+        await this.handleRequest(message);
+      } finally {
+        this.activeRequests--;
+        this.lastUpdate = Date.now();
+      }
+      return;
+    }
+    if ("method" in message)
+      this.handleNotification(message);
+  }
+  rejectPending(error) {
+    for (const item of this.pending.values())
+      item.reject(error);
+    this.pending.clear();
+  }
+  async handleRequest(message) {
+    if (message.method === "session/request_permission") {
+      const title = readPermissionTitle(message.params);
+      try {
+        if (this.config.permissionMode === "ask") {
+          await this.ask(title, message.params ?? {});
+        }
+        const optionId = selectPermissionOption(message.params, this.config.permissionMode);
+        if (!optionId)
+          throw new Error("ACP permission request had no usable option");
+        this.reply(message.id, {
+          outcome: { outcome: "selected", optionId }
+        });
+      } catch {
+        const optionId = selectPermissionOption(message.params, "reject");
+        if (optionId) {
+          this.reply(message.id, {
+            outcome: { outcome: "selected", optionId }
+          });
+          return;
+        }
+        this.reply(message.id, { outcome: { outcome: "cancelled" } });
+      }
+      return;
+    }
+    this.replyError(message.id, `Unsupported ACP client method: ${message.method}`);
+  }
+  handleNotification(message) {
+    if (message.method !== "session/update")
+      return;
+    this.lastUpdate = Date.now();
+    const update = message.params?.update;
+    if (!isRecord2(update))
+      return;
+    collectText(update, this.chunks);
+  }
+  reply(id, result) {
+    this.child.stdin.write(`${JSON.stringify({ jsonrpc: "2.0", id, result })}
+`);
+  }
+  replyError(id, message) {
+    this.child.stdin.write(`${JSON.stringify({ jsonrpc: "2.0", id, error: { code: -32601, message } })}
+`);
+  }
+  output() {
+    const text = this.chunks.join("").trim();
+    if (text)
+      return text;
+    const err = this.errors.join("").trim();
+    return err ? `ACP agent '${this.name}' completed without text output. stderr:
+${err}` : `ACP agent '${this.name}' completed without text output.`;
+  }
+}
+function createAcpRunTool(agents = {}) {
+  return tool({
+    description: "Run a configured external ACP-compatible coding agent and return its streamed result. Use for configured ACP agents such as Claude Code ACP, Gemini ACP, or custom ACP servers.",
+    args: {
+      agent: z4.string().describe("Configured ACP agent name"),
+      prompt: z4.string().describe("Task or question to send to the ACP agent"),
+      cwd: z4.string().optional().describe("Optional absolute working directory override"),
+      timeout_ms: z4.number().int().min(1000).max(900000).optional().describe("Optional timeout override in milliseconds")
+    },
+    async execute(args, ctx) {
+      if (ctx.agent !== args.agent) {
+        throw new Error(`acp_run for '${args.agent}' can only be used by @${args.agent}`);
+      }
+      const config = agents[args.agent];
+      if (!config) {
+        throw new Error(`Unknown ACP agent '${args.agent}'. Configured agents: ${Object.keys(agents).join(", ") || "(none)"}`);
+      }
+      const cwd = args.cwd ?? config.cwd ?? ctx.directory;
+      if (!cwd)
+        throw new Error("acp_run requires a working directory");
+      await ctx.ask({
+        permission: "bash",
+        patterns: [`${config.command} ${config.args.join(" ")}`.trim()],
+        always: [],
+        metadata: {
+          agent: args.agent,
+          cwd,
+          command: config.command,
+          args: config.args
+        }
+      });
+      const client = new AcpClient(args.agent, config, cwd, async (title, metadata) => {
+        if (config.permissionMode === "reject")
+          return;
+        await ctx.ask({
+          permission: "bash",
+          patterns: [`acp:${args.agent}:${title}`],
+          always: [],
+          metadata
+        });
+      });
+      const timeoutMs = args.timeout_ms ?? config.timeoutMs;
+      let timer;
+      const timeout = new Promise((_, reject) => timer = setTimeout(() => reject(new Error(`ACP agent '${args.agent}' timed out after ${timeoutMs}ms`)), timeoutMs));
+      const abort = () => client.close();
+      ctx.abort.addEventListener("abort", abort, { once: true });
+      try {
+        return await Promise.race([client.run(args.prompt), timeout]);
+      } finally {
+        if (timer)
+          clearTimeout(timer);
+        ctx.abort.removeEventListener("abort", abort);
+        client.close();
+      }
+    }
+  });
+}
+function readSessionId(value) {
+  if (!isRecord2(value) || typeof value.sessionId !== "string") {
+    throw new Error("ACP agent did not return a sessionId");
+  }
+  return value.sessionId;
+}
+function readAuthMethods(value) {
+  if (!isRecord2(value) || !Array.isArray(value.authMethods))
+    return [];
+  const methods = value.authMethods;
+  return methods.filter(isRecord2);
+}
+function rpcError(error) {
+  const err = new Error(error.message ?? "ACP request failed");
+  err.code = error.code;
+  err.data = error.data;
+  return err;
+}
+function isAuthError(error) {
+  if (!(error instanceof Error))
+    return false;
+  const meta = error;
+  return meta.code === -32001 || error.message.toLowerCase().includes("auth_required") || error.message.toLowerCase().includes("auth required");
+}
+function isRecord2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function readPermissionTitle(params) {
+  const tool2 = isRecord2(params?.toolCall) ? params.toolCall : undefined;
+  if (typeof tool2?.title === "string")
+    return tool2.title;
+  if (typeof params?.permission === "string")
+    return params.permission;
+  return "ACP permission request";
+}
+function selectPermissionOption(params, mode) {
+  const options = Array.isArray(params?.options) ? params.options : [];
+  const choices = options.filter(isRecord2).filter((item) => typeof item.optionId === "string");
+  const reject = choices.find((item) => typeof item.kind === "string" && item.kind.startsWith("reject"));
+  if (mode === "reject")
+    return reject?.optionId;
+  const allow = choices.find((item) => typeof item.kind === "string" && item.kind.startsWith("allow"));
+  return allow?.optionId ?? reject?.optionId;
+}
+function collectText(update, chunks) {
+  if (update.sessionUpdate !== "agent_message_chunk")
+    return;
+  const text = readText(update.delta) ?? readText(update.content);
+  if (text)
+    chunks.push(text);
+}
+function readText(value) {
+  if (typeof value === "string")
+    return value;
+  if (isRecord2(value) && typeof value.text === "string")
+    return value.text;
+  return;
+}
+// src/tools/ast-grep/tools.ts
+import { tool as tool2 } from "@opencode-ai/plugin";
 
 // src/tools/ast-grep/cli.ts
-import { existsSync as existsSync9 } from "node:fs";
+init_compat();
+import { existsSync as existsSync11 } from "node:fs";
 
 // src/tools/ast-grep/constants.ts
-import { existsSync as existsSync8, statSync as statSync4 } from "node:fs";
+import { existsSync as existsSync10, statSync as statSync5 } from "node:fs";
 import { createRequire as createRequire3 } from "node:module";
-import { dirname as dirname7, join as join12 } from "node:path";
+import { dirname as dirname9, join as join15 } from "node:path";
 
 // src/tools/ast-grep/downloader.ts
-import { chmodSync, existsSync as existsSync7, mkdirSync as mkdirSync5, unlinkSync as unlinkSync4 } from "node:fs";
+import { chmodSync as chmodSync2, existsSync as existsSync9, mkdirSync as mkdirSync7, unlinkSync as unlinkSync4 } from "node:fs";
 import { createRequire as createRequire2 } from "node:module";
-import { homedir as homedir5 } from "node:os";
-import { join as join11 } from "node:path";
+import { homedir as homedir6 } from "node:os";
+import { join as join14 } from "node:path";
+init_compat();
 var REPO = "ast-grep/ast-grep";
 var DEFAULT_VERSION = "0.40.0";
 function getAstGrepVersion() {
@@ -29780,19 +30805,19 @@ var PLATFORM_MAP = {
 function getCacheDir2() {
   if (process.platform === "win32") {
     const localAppData = process.env.LOCALAPPDATA || process.env.APPDATA;
-    const base2 = localAppData || join11(homedir5(), "AppData", "Local");
-    return join11(base2, "oh-my-opencode-slim", "bin");
+    const base2 = localAppData || join14(homedir6(), "AppData", "Local");
+    return join14(base2, "oh-my-opencode-slim", "bin");
   }
   const xdgCache = process.env.XDG_CACHE_HOME;
-  const base = xdgCache || join11(homedir5(), ".cache");
-  return join11(base, "oh-my-opencode-slim", "bin");
+  const base = xdgCache || join14(homedir6(), ".cache");
+  return join14(base, "oh-my-opencode-slim", "bin");
 }
 function getBinaryName() {
   return process.platform === "win32" ? "sg.exe" : "sg";
 }
 function getCachedBinaryPath() {
-  const binaryPath2 = join11(getCacheDir2(), getBinaryName());
-  return existsSync7(binaryPath2) ? binaryPath2 : null;
+  const binaryPath = join14(getCacheDir2(), getBinaryName());
+  return existsSync9(binaryPath) ? binaryPath : null;
 }
 async function downloadAstGrep(version = DEFAULT_VERSION) {
   const platformKey = `${process.platform}-${process.arch}`;
@@ -29803,34 +30828,34 @@ async function downloadAstGrep(version = DEFAULT_VERSION) {
   }
   const cacheDir = getCacheDir2();
   const binaryName = getBinaryName();
-  const binaryPath2 = join11(cacheDir, binaryName);
-  if (existsSync7(binaryPath2)) {
-    return binaryPath2;
+  const binaryPath = join14(cacheDir, binaryName);
+  if (existsSync9(binaryPath)) {
+    return binaryPath;
   }
   const { arch, os: os5 } = platformInfo;
   const assetName = `app-${arch}-${os5}.zip`;
   const downloadUrl = `https://github.com/${REPO}/releases/download/${version}/${assetName}`;
   console.log(`[oh-my-opencode-slim] Downloading ast-grep binary...`);
   try {
-    if (!existsSync7(cacheDir)) {
-      mkdirSync5(cacheDir, { recursive: true });
+    if (!existsSync9(cacheDir)) {
+      mkdirSync7(cacheDir, { recursive: true });
     }
     const response = await fetch(downloadUrl, { redirect: "follow" });
     if (!response.ok) {
       throw new Error(`HTTP ${response.status}: ${response.statusText}`);
     }
-    const archivePath = join11(cacheDir, assetName);
+    const archivePath = join14(cacheDir, assetName);
     const arrayBuffer = await response.arrayBuffer();
     await crossWrite(archivePath, arrayBuffer);
     await extractZip(archivePath, cacheDir);
-    if (existsSync7(archivePath)) {
+    if (existsSync9(archivePath)) {
       unlinkSync4(archivePath);
     }
-    if (process.platform !== "win32" && existsSync7(binaryPath2)) {
-      chmodSync(binaryPath2, 493);
+    if (process.platform !== "win32" && existsSync9(binaryPath)) {
+      chmodSync2(binaryPath, 493);
     }
     console.log(`[oh-my-opencode-slim] ast-grep binary ready.`);
-    return binaryPath2;
+    return binaryPath;
   } catch (err) {
     console.error(`[oh-my-opencode-slim] Failed to download ast-grep: ${err instanceof Error ? err.message : err}`);
     return null;
@@ -29878,13 +30903,13 @@ var CLI_LANGUAGES = [
 var MIN_BINARY_SIZE = 1e4;
 function isValidBinary(filePath) {
   try {
-    return statSync4(filePath).size > MIN_BINARY_SIZE;
+    return statSync5(filePath).size > MIN_BINARY_SIZE;
   } catch {
     return false;
   }
 }
 function getPlatformPackageName() {
-  const platform2 = process.platform;
+  const platform3 = process.platform;
   const arch = process.arch;
   const platformMap = {
     "darwin-arm64": "@ast-grep/cli-darwin-arm64",
@@ -29895,7 +30920,7 @@ function getPlatformPackageName() {
     "win32-arm64": "@ast-grep/cli-win32-arm64-msvc",
     "win32-ia32": "@ast-grep/cli-win32-ia32-msvc"
   };
-  return platformMap[`${platform2}-${arch}`] ?? null;
+  return platformMap[`${platform3}-${arch}`] ?? null;
 }
 var resolvedCliPath = null;
 function findSgCliPathSync() {
@@ -29907,9 +30932,9 @@ function findSgCliPathSync() {
   try {
     const require2 = createRequire3(import.meta.url);
     const cliPkgPath = require2.resolve("@ast-grep/cli/package.json");
-    const cliDir = dirname7(cliPkgPath);
-    const sgPath = join12(cliDir, binaryName);
-    if (existsSync8(sgPath) && isValidBinary(sgPath)) {
+    const cliDir = dirname9(cliPkgPath);
+    const sgPath = join15(cliDir, binaryName);
+    if (existsSync10(sgPath) && isValidBinary(sgPath)) {
       return sgPath;
     }
   } catch {}
@@ -29918,19 +30943,19 @@ function findSgCliPathSync() {
     try {
       const require2 = createRequire3(import.meta.url);
       const pkgPath = require2.resolve(`${platformPkg}/package.json`);
-      const pkgDir = dirname7(pkgPath);
+      const pkgDir = dirname9(pkgPath);
       const astGrepName = process.platform === "win32" ? "ast-grep.exe" : "ast-grep";
-      const binaryPath2 = join12(pkgDir, astGrepName);
-      if (existsSync8(binaryPath2) && isValidBinary(binaryPath2)) {
-        return binaryPath2;
+      const binaryPath = join15(pkgDir, astGrepName);
+      if (existsSync10(binaryPath) && isValidBinary(binaryPath)) {
+        return binaryPath;
       }
     } catch {}
   }
   if (process.platform === "darwin") {
     const homebrewPaths = ["/opt/homebrew/bin/sg", "/usr/local/bin/sg"];
-    for (const path14 of homebrewPaths) {
-      if (existsSync8(path14) && isValidBinary(path14)) {
-        return path14;
+    for (const path17 of homebrewPaths) {
+      if (existsSync10(path17) && isValidBinary(path17)) {
+        return path17;
       }
     }
   }
@@ -29947,10 +30972,10 @@ function getSgCliPath() {
   }
   return "sg";
 }
-function setSgCliPath(path14) {
-  resolvedCliPath = path14;
+function setSgCliPath(path17) {
+  resolvedCliPath = path17;
 }
-var DEFAULT_TIMEOUT_MS2 = 300000;
+var DEFAULT_TIMEOUT_MS = 300000;
 var DEFAULT_MAX_OUTPUT_BYTES = 1 * 1024 * 1024;
 var DEFAULT_MAX_MATCHES = 500;
 
@@ -29958,7 +30983,7 @@ var DEFAULT_MAX_MATCHES = 500;
 var initPromise = null;
 async function getAstGrepPath() {
   const currentPath = getSgCliPath();
-  if (currentPath !== "sg" && existsSync9(currentPath)) {
+  if (currentPath !== "sg" && existsSync11(currentPath)) {
     return currentPath;
   }
   if (initPromise) {
@@ -29966,7 +30991,7 @@ async function getAstGrepPath() {
   }
   initPromise = (async () => {
     const syncPath = findSgCliPathSync();
-    if (syncPath && existsSync9(syncPath)) {
+    if (syncPath && existsSync11(syncPath)) {
       setSgCliPath(syncPath);
       return syncPath;
     }
@@ -30005,13 +31030,13 @@ async function runSg(options) {
   const paths2 = options.paths && options.paths.length > 0 ? options.paths : ["."];
   args.push(...paths2);
   let cliPath = getSgCliPath();
-  if (!existsSync9(cliPath) && cliPath !== "sg") {
+  if (!existsSync11(cliPath) && cliPath !== "sg") {
     const downloadedPath = await getAstGrepPath();
     if (downloadedPath) {
       cliPath = downloadedPath;
     }
   }
-  const timeout = DEFAULT_TIMEOUT_MS2;
+  const timeout = DEFAULT_TIMEOUT_MS;
   const proc = crossSpawn([cliPath, ...args], {
     stdout: "pipe",
     stderr: "pipe"
@@ -30221,14 +31246,14 @@ function showOutputToUser(context, output) {
   const ctx = context;
   ctx.metadata?.({ metadata: { output } });
 }
-var ast_grep_search = tool({
+var ast_grep_search = tool2({
   description: "Search code patterns across filesystem using AST-aware matching. Supports 25 languages. " + "Use meta-variables: $VAR (single node), $$$ (multiple nodes). " + "IMPORTANT: Patterns must be complete AST nodes (valid code). " + "For functions, include params and body: 'export async function $NAME($$$) { $$$ }' not 'export async function $NAME'. " + "Examples: 'console.log($MSG)', 'def $FUNC($$$):', 'async function $NAME($$$)'",
   args: {
-    pattern: tool.schema.string().describe("AST pattern with meta-variables ($VAR, $$$). Must be complete AST node."),
-    lang: tool.schema.enum(CLI_LANGUAGES).describe("Target language"),
-    paths: tool.schema.array(tool.schema.string()).optional().describe("Paths to search (default: ['.'])"),
-    globs: tool.schema.array(tool.schema.string()).optional().describe("Include/exclude globs (prefix ! to exclude)"),
-    context: tool.schema.number().optional().describe("Context lines around match")
+    pattern: tool2.schema.string().describe("AST pattern with meta-variables ($VAR, $$$). Must be complete AST node."),
+    lang: tool2.schema.enum(CLI_LANGUAGES).describe("Target language"),
+    paths: tool2.schema.array(tool2.schema.string()).optional().describe("Paths to search (default: ['.'])"),
+    globs: tool2.schema.array(tool2.schema.string()).optional().describe("Include/exclude globs (prefix ! to exclude)"),
+    context: tool2.schema.number().optional().describe("Context lines around match")
   },
   execute: async (args, context) => {
     try {
@@ -30257,15 +31282,15 @@ ${hint}`;
     }
   }
 });
-var ast_grep_replace = tool({
+var ast_grep_replace = tool2({
   description: "Replace code patterns across filesystem with AST-aware rewriting. " + "Dry-run by default. Use meta-variables in rewrite to preserve matched content. " + "Example: pattern='console.log($MSG)' rewrite='logger.info($MSG)'",
   args: {
-    pattern: tool.schema.string().describe("AST pattern to match"),
-    rewrite: tool.schema.string().describe("Replacement pattern (can use $VAR from pattern)"),
-    lang: tool.schema.enum(CLI_LANGUAGES).describe("Target language"),
-    paths: tool.schema.array(tool.schema.string()).optional().describe("Paths to search"),
-    globs: tool.schema.array(tool.schema.string()).optional().describe("Include/exclude globs"),
-    dryRun: tool.schema.boolean().optional().describe("Preview changes without applying (default: true)")
+    pattern: tool2.schema.string().describe("AST pattern to match"),
+    rewrite: tool2.schema.string().describe("Replacement pattern (can use $VAR from pattern)"),
+    lang: tool2.schema.enum(CLI_LANGUAGES).describe("Target language"),
+    paths: tool2.schema.array(tool2.schema.string()).optional().describe("Paths to search"),
+    globs: tool2.schema.array(tool2.schema.string()).optional().describe("Include/exclude globs"),
+    dryRun: tool2.schema.boolean().optional().describe("Preview changes without applying (default: true)")
   },
   execute: async (args, context) => {
     try {
@@ -30289,20 +31314,20 @@ var ast_grep_replace = tool({
 });
 // src/tools/cancel-task.ts
 import {
-  tool as tool2
+  tool as tool3
 } from "@opencode-ai/plugin";
-var z4 = tool2.schema;
+var z5 = tool3.schema;
 
 class SessionStillRunningError extends Error {
 }
 function createCancelTaskTool(options) {
-  const cancel_task = tool2({
+  const cancel_task = tool3({
     description: `Cancel a tracked background specialist task.
 
 Use only for obsolete, wrong, conflicting, or user-requested cancellation. Accepts either the native task_id/session ID or the parent-scoped alias shown in the Background Job Board. Cancellation is not rollback: if cancelling a writer, inspect and reconcile partial file changes before replacing the lane.`,
     args: {
-      task_id: z4.string().describe("Tracked background task ID or Background Job Board alias"),
-      reason: z4.string().optional().describe("Short cancellation reason")
+      task_id: z5.string().describe("Tracked background task ID or Background Job Board alias"),
+      reason: z5.string().optional().describe("Short cancellation reason")
     },
     async execute(args, toolContext) {
       const parentSessionID = toolContext?.sessionID;
@@ -30515,7 +31540,7 @@ async function abortAndVerifySession(options, taskID) {
         attempts,
         status: statusSnapshot.status
       });
-      await delay(retryIntervalMs);
+      await delay2(retryIntervalMs);
       continue;
     }
     stableStoppedSince ??= Date.now();
@@ -30528,7 +31553,7 @@ async function abortAndVerifySession(options, taskID) {
       });
       return;
     }
-    await delay(retryIntervalMs);
+    await delay2(retryIntervalMs);
   }
   log("[cancel-task] abort verification timed out", {
     taskID,
@@ -30596,13 +31621,13 @@ async function deleteAndVerifySession(options, taskID, reason) {
     });
     if (status.status === "busy" || status.status === "retry") {
       stableStoppedSince = undefined;
-      await delay(retryIntervalMs);
+      await delay2(retryIntervalMs);
       continue;
     }
     stableStoppedSince ??= Date.now();
     if (Date.now() - stableStoppedSince >= stableStoppedMs)
       return;
-    await delay(retryIntervalMs);
+    await delay2(retryIntervalMs);
   }
   throw new SessionStillRunningError(`Session delete returned but task did not stay stopped: ${taskID} (${lastStatus ?? "unknown"})`);
 }
@@ -30614,7 +31639,7 @@ async function getSessionStatus(client, taskID) {
   try {
     const result = await client.session.status();
     const data = result.data;
-    if (!isObjectRecord2(data)) {
+    if (!isRecord(data)) {
       return { status: undefined, source: "invalid-data", keys: [] };
     }
     const keys = Object.keys(data).slice(0, 20);
@@ -30622,14 +31647,14 @@ async function getSessionStatus(client, taskID) {
     if (item === undefined) {
       return { status: "idle", source: "missing-from-map", keys };
     }
-    if (isObjectRecord2(item) && typeof item.type === "string") {
+    if (isRecord(item) && typeof item.type === "string") {
       return { status: item.type, source: "task-map-entry", keys };
     }
     if (typeof data.type === "string") {
       return { status: data.type, source: "legacy-data-type", keys };
     }
     const nested = data.status;
-    if (isObjectRecord2(nested) && typeof nested.type === "string") {
+    if (isRecord(nested) && typeof nested.type === "string") {
       return { status: nested.type, source: "legacy-data-status", keys };
     }
     return { status: undefined, source: "unknown-shape", keys };
@@ -30641,12 +31666,9 @@ async function getSessionStatus(client, taskID) {
     return { status: undefined, source: "lookup-error", keys: [] };
   }
 }
-function delay(ms) {
+function delay2(ms) {
   return new Promise((resolve3) => setTimeout(resolve3, ms));
 }
-function isObjectRecord2(value) {
-  return typeof value === "object" && value !== null;
-}
 function isSessionID(value) {
   return /^ses_[\w-]+$/.test(value);
 }
@@ -30661,7 +31683,7 @@ async function getSessionParentID(client, taskID) {
   try {
     const response = await session2.get({ path: { id: taskID } });
     const data = response.data;
-    if (!isObjectRecord2(data))
+    if (!isRecord(data))
       return;
     const parentID = data.parentID;
     return typeof parentID === "string" ? parentID : undefined;
@@ -30686,9 +31708,9 @@ function unknownTaskOutput(taskID, message) {
 }
 // src/tools/council.ts
 import {
-  tool as tool3
+  tool as tool4
 } from "@opencode-ai/plugin";
-var z5 = tool3.schema;
+var z6 = tool4.schema;
 function formatModelComposition(councillorResults) {
   return councillorResults.map((cr) => {
     const shortModel = shortModelLabel(cr.model);
@@ -30696,15 +31718,15 @@ function formatModelComposition(councillorResults) {
   }).join(", ");
 }
 function createCouncilTool(_ctx, councilManager) {
-  const council_session = tool3({
+  const council_session = tool4({
     description: `Launch a multi-LLM council session for consensus-based analysis.
 
 Sends the prompt to multiple models (councillors) in parallel and returns their formatted responses for you to synthesize.
 
 Returns the councillor responses with a summary footer.`,
     args: {
-      prompt: z5.string().describe("The prompt to send to all councillors"),
-      preset: z5.string().optional().describe('Council preset to use (default: "default"). Must match a preset in the council config.')
+      prompt: z6.string().describe("The prompt to send to all councillors"),
+      preset: z6.string().optional().describe('Council preset to use (default: "default"). Must match a preset in the council config.')
     },
     async execute(args, toolContext) {
       if (!toolContext || typeof toolContext !== "object" || !("sessionID" in toolContext)) {
@@ -30756,14 +31778,14 @@ import * as fs10 from "node:fs";
 // src/tui-state.ts
 import * as fs9 from "node:fs";
 import * as os5 from "node:os";
-import * as path14 from "node:path";
+import * as path17 from "node:path";
 var STATE_DIR = "oh-my-opencode-slim";
 var STATE_FILE = "tui-state.json";
 function dataDir() {
-  return process.env.XDG_DATA_HOME ?? path14.join(os5.homedir(), ".local", "share");
+  return process.env.XDG_DATA_HOME ?? path17.join(os5.homedir(), ".local", "share");
 }
 function getTuiStatePath() {
-  return path14.join(dataDir(), "opencode", "storage", STATE_DIR, STATE_FILE);
+  return path17.join(dataDir(), "opencode", "storage", STATE_DIR, STATE_FILE);
 }
 function emptySnapshot() {
   return {
@@ -30799,7 +31821,7 @@ async function readTuiSnapshotAsync() {
 function writeTuiSnapshot(snapshot) {
   try {
     const filePath = getTuiStatePath();
-    fs9.mkdirSync(path14.dirname(filePath), { recursive: true });
+    fs9.mkdirSync(path17.dirname(filePath), { recursive: true });
     fs9.writeFileSync(filePath, `${JSON.stringify(snapshot)}
 `);
   } catch {}
@@ -30822,11 +31844,11 @@ function recordTuiAgentModel(input) {
 }
 
 // src/tools/preset-manager.ts
-var COMMAND_NAME3 = "preset";
+var COMMAND_NAME4 = "preset";
 function createPresetManager(ctx, config) {
   let activePreset = getActiveRuntimePreset() ?? config.preset ?? null;
   async function handleCommandExecuteBefore(input, output) {
-    if (input.command !== COMMAND_NAME3) {
+    if (input.command !== COMMAND_NAME4) {
       return;
     }
     output.parts.length = 0;
@@ -30845,11 +31867,11 @@ function createPresetManager(ctx, config) {
   }
   function registerCommand(opencodeConfig) {
     const configCommand = opencodeConfig.command;
-    if (!configCommand?.[COMMAND_NAME3]) {
+    if (!configCommand?.[COMMAND_NAME4]) {
       if (!opencodeConfig.command) {
         opencodeConfig.command = {};
       }
-      opencodeConfig.command[COMMAND_NAME3] = {
+      opencodeConfig.command[COMMAND_NAME4] = {
         template: "List available presets and switch between them",
         description: "Switch agent presets at runtime (e.g., /preset cheap, /preset powerful)"
       };
@@ -30999,14 +32021,14 @@ var BINARY_PREFIXES = [
 var WEBFETCH_DESCRIPTION = "Fetch a URL with better extraction for static/docs pages. Supports llms.txt probing, content-focused HTML extraction, metadata, redirects, and an optional prompt processed by a cheap secondary model.";
 // src/tools/smartfetch/tool.ts
 import os6 from "node:os";
-import path18 from "node:path";
+import path21 from "node:path";
 import {
-  tool as tool4
+  tool as tool5
 } from "@opencode-ai/plugin";
 
 // src/tools/smartfetch/binary.ts
 import { mkdir as mkdir2, writeFile as writeFile2 } from "node:fs/promises";
-import path15 from "node:path";
+import path18 from "node:path";
 function extensionForMime(contentType) {
   const mime = contentType.split(";")[0]?.trim().toLowerCase();
   const map = {
@@ -31027,10 +32049,10 @@ function buildBinaryResultMessage(fetchResult, savedPath) {
 async function saveBinary(binaryDir, data, contentType, filename) {
   await mkdir2(binaryDir, { recursive: true });
   const initialName = filename || `webfetch-${Date.now()}.${extensionForMime(contentType)}`;
-  const parsed = path15.parse(initialName);
+  const parsed = path18.parse(initialName);
   for (let attempt = 0;attempt < 1000; attempt++) {
     const candidateName = attempt === 0 ? initialName : `${parsed.name}-${attempt}${parsed.ext || `.${extensionForMime(contentType)}`}`;
-    const file = path15.join(binaryDir, candidateName);
+    const file = path18.join(binaryDir, candidateName);
     try {
       await writeFile2(file, data, { flag: "wx" });
       return file;
@@ -31169,7 +32191,7 @@ var M = class u2 {
     return this.#S;
   }
   constructor(e) {
-    let { max: t = 0, ttl: i, ttlResolution: s = 1, ttlAutopurge: n, updateAgeOnGet: o, updateAgeOnHas: r, allowStale: h, dispose: l, onInsert: c, disposeAfter: f, noDisposeOnSet: g, noUpdateTTL: p, maxSize: T = 0, maxEntrySize: w = 0, sizeCalculation: y, fetchMethod: a, memoMethod: m, noDeleteOnFetchRejection: _, noDeleteOnStaleGet: b, allowStaleOnFetchRejection: d, allowStaleOnFetchAbort: A, ignoreFetchAbort: z6, perf: x } = e;
+    let { max: t = 0, ttl: i, ttlResolution: s = 1, ttlAutopurge: n, updateAgeOnGet: o, updateAgeOnHas: r, allowStale: h, dispose: l, onInsert: c, disposeAfter: f, noDisposeOnSet: g, noUpdateTTL: p, maxSize: T = 0, maxEntrySize: w = 0, sizeCalculation: y, fetchMethod: a, memoMethod: m, noDeleteOnFetchRejection: _, noDeleteOnStaleGet: b, allowStaleOnFetchRejection: d, allowStaleOnFetchAbort: A, ignoreFetchAbort: z7, perf: x } = e;
     if (x !== undefined && typeof x?.now != "function")
       throw new TypeError("perf option must have a now() method if specified");
     if (this.#m = x ?? C, t !== 0 && !F(t))
@@ -31187,7 +32209,7 @@ var M = class u2 {
       throw new TypeError("memoMethod must be a function if defined");
     if (this.#U = m, a !== undefined && typeof a != "function")
       throw new TypeError("fetchMethod must be a function if specified");
-    if (this.#M = a, this.#W = !!a, this.#s = new Map, this.#i = Array.from({ length: t }).fill(undefined), this.#t = Array.from({ length: t }).fill(undefined), this.#a = new v(t), this.#c = new v(t), this.#l = 0, this.#h = 0, this.#y = R.create(t), this.#n = 0, this.#b = 0, typeof l == "function" && (this.#w = l), typeof c == "function" && (this.#x = c), typeof f == "function" ? (this.#S = f, this.#r = []) : (this.#S = undefined, this.#r = undefined), this.#T = !!this.#w, this.#j = !!this.#x, this.#f = !!this.#S, this.noDisposeOnSet = !!g, this.noUpdateTTL = !!p, this.noDeleteOnFetchRejection = !!_, this.allowStaleOnFetchRejection = !!d, this.allowStaleOnFetchAbort = !!A, this.ignoreFetchAbort = !!z6, this.maxEntrySize !== 0) {
+    if (this.#M = a, this.#W = !!a, this.#s = new Map, this.#i = Array.from({ length: t }).fill(undefined), this.#t = Array.from({ length: t }).fill(undefined), this.#a = new v(t), this.#c = new v(t), this.#l = 0, this.#h = 0, this.#y = R.create(t), this.#n = 0, this.#b = 0, typeof l == "function" && (this.#w = l), typeof c == "function" && (this.#x = c), typeof f == "function" ? (this.#S = f, this.#r = []) : (this.#S = undefined, this.#r = undefined), this.#T = !!this.#w, this.#j = !!this.#x, this.#f = !!this.#S, this.noDisposeOnSet = !!g, this.noUpdateTTL = !!p, this.noDeleteOnFetchRejection = !!_, this.allowStaleOnFetchRejection = !!d, this.allowStaleOnFetchAbort = !!A, this.ignoreFetchAbort = !!z7, this.maxEntrySize !== 0) {
       if (this.#u !== 0 && !F(this.#u))
         throw new TypeError("maxSize must be a positive integer if specified");
       if (!F(this.maxEntrySize))
@@ -31567,8 +32589,8 @@ var M = class u2 {
       let A = this.#p(b);
       if (!y && !A)
         return a && (a.fetch = "hit"), this.#L(b), s && this.#D(b), a && this.#E(a, b), d;
-      let z6 = this.#P(e, b, _, w), v = z6.__staleWhileFetching !== undefined && i;
-      return a && (a.fetch = A ? "stale" : "refresh", v && A && (a.returnedStale = true)), v ? z6.__staleWhileFetching : z6.__returned = z6;
+      let z7 = this.#P(e, b, _, w), v = z7.__staleWhileFetching !== undefined && i;
+      return a && (a.fetch = A ? "stale" : "refresh", v && A && (a.returnedStale = true)), v ? z7.__staleWhileFetching : z7.__returned = z7;
     }
   }
   forceFetch(e, t = {}) {
@@ -31684,7 +32706,7 @@ var M = class u2 {
 };
 
 // src/tools/smartfetch/network.ts
-import path16 from "node:path";
+import path19 from "node:path";
 
 // src/tools/smartfetch/utils.ts
 var import_readability = __toESM(require_readability(), 1);
@@ -32409,7 +33431,7 @@ function inferFilenameFromUrl(url) {
 function truncateFilename(name, maxLength = 180) {
   if (name.length <= maxLength)
     return name;
-  const parsed = path16.parse(name);
+  const parsed = path19.parse(name);
   const ext = parsed.ext || "";
   const baseLimit = Math.max(1, maxLength - ext.length);
   return `${parsed.name.slice(0, baseLimit)}${ext}`;
@@ -32579,9 +33601,9 @@ function isInvalidLlmsResult(fetchResult) {
 }
 
 // src/tools/smartfetch/secondary-model.ts
-import { existsSync as existsSync10 } from "node:fs";
+import { existsSync as existsSync12 } from "node:fs";
 import { readFile as readFile4 } from "node:fs/promises";
-import path17 from "node:path";
+import path20 from "node:path";
 function parseModelRef(value) {
   if (!value)
     return;
@@ -32607,8 +33629,8 @@ function pickAgentModelRef(value) {
 }
 function findPreferredOpenCodeConfigPath(baseDir) {
   for (const file of ["opencode.jsonc", "opencode.json"]) {
-    const fullPath = path17.join(baseDir, file);
-    if (existsSync10(fullPath))
+    const fullPath = path20.join(baseDir, file);
+    if (existsSync12(fullPath))
       return fullPath;
   }
   return;
@@ -32624,7 +33646,7 @@ async function readOpenCodeConfigFile(configPath) {
   }
 }
 async function readEffectiveOpenCodeConfig(directory) {
-  const projectDir = path17.join(directory, ".opencode");
+  const projectDir = path20.join(directory, ".opencode");
   const userDirs = getConfigSearchDirs();
   const projectPath = findPreferredOpenCodeConfigPath(projectDir);
   const userPath = userDirs.map((configDir) => findPreferredOpenCodeConfigPath(configDir)).find(Boolean);
@@ -32705,6 +33727,29 @@ function isUsableSecondaryText(text) {
     return false;
   return true;
 }
+var SESSION_DELETE_RETRIES = 3;
+var SESSION_DELETE_RETRY_DELAY_MS = 500;
+var SECONDARY_MODEL_TIMEOUT_MS = 30000;
+var _testConfig = {
+  deleteRetryDelayMs: SESSION_DELETE_RETRY_DELAY_MS
+};
+async function deleteSessionSafely(client, sessionId, directory) {
+  for (let attempt = 1;attempt <= SESSION_DELETE_RETRIES; attempt++) {
+    try {
+      await client.session.delete({
+        path: { id: sessionId },
+        query: { directory }
+      });
+      return;
+    } catch (error) {
+      if (attempt >= SESSION_DELETE_RETRIES) {
+        console.warn(`[smartfetch] Failed to clean up secondary session ${sessionId} ` + `after ${SESSION_DELETE_RETRIES} attempts: ` + (error instanceof Error ? error.message : String(error)));
+        return;
+      }
+      await new Promise((resolve3) => setTimeout(resolve3, _testConfig.deleteRetryDelayMs));
+    }
+  }
+}
 async function runSecondaryModel(client, directory, model, prompt, content) {
   const session2 = await client.session.create({
     responseStyle: "data",
@@ -32731,23 +33776,26 @@ Note: only the first ${inputChars} characters of a longer fetched document were
     const toolIDsData = toolIDsResponse;
     const toolIDs = Array.isArray(toolIDsData.data) ? toolIDsData.data : Array.isArray(toolIDsResponse) ? toolIDsResponse : [];
     const disabledTools = Object.fromEntries((toolIDs || []).map((id) => [id, false]));
-    const result = await client.session.prompt({
-      responseStyle: "data",
-      throwOnError: true,
-      path: { id: sessionId },
-      query: { directory },
-      body: {
-        model,
-        system: "Answer only from the supplied content. Do not use tools or outside knowledge.",
-        tools: disabledTools,
-        parts: [
-          {
-            type: "text",
-            text: buildPrompt(truncatedContent, effectivePrompt)
-          }
-        ]
-      }
-    });
+    const result = await Promise.race([
+      client.session.prompt({
+        responseStyle: "data",
+        throwOnError: true,
+        path: { id: sessionId },
+        query: { directory },
+        body: {
+          model,
+          system: "Answer only from the supplied content. Do not use tools or outside knowledge.",
+          tools: disabledTools,
+          parts: [
+            {
+              type: "text",
+              text: buildPrompt(truncatedContent, effectivePrompt)
+            }
+          ]
+        }
+      }),
+      new Promise((_, reject) => setTimeout(() => reject(new Error("Secondary model timed out")), SECONDARY_MODEL_TIMEOUT_MS))
+    ]);
     const parts = result?.data?.parts ?? result?.parts ?? [];
     const text = parts.map((part) => part?.type === "text" ? part.text || "" : "").join("").trim();
     return {
@@ -32757,12 +33805,7 @@ Note: only the first ${inputChars} characters of a longer fetched document were
       sourceChars
     };
   } finally {
-    await client.session.delete({
-      path: { id: sessionId },
-      query: { directory }
-    }).catch(() => {
-      return;
-    });
+    await deleteSessionSafely(client, sessionId, directory);
   }
 }
 async function runSecondaryModelWithFallback(client, directory, models, prompt, content) {
@@ -32783,20 +33826,20 @@ async function runSecondaryModelWithFallback(client, directory, models, prompt,
 }
 
 // src/tools/smartfetch/tool.ts
-var z6 = tool4.schema;
+var z7 = tool5.schema;
 function createWebfetchTool(pluginCtx, options = {}) {
-  const binaryDir = options.binaryDir || path18.join(os6.tmpdir(), "opencode-smartfetch");
-  return tool4({
+  const binaryDir = options.binaryDir || path21.join(os6.tmpdir(), "opencode-smartfetch");
+  return tool5({
     description: WEBFETCH_DESCRIPTION,
     args: {
-      url: z6.httpUrl(),
-      format: z6.enum(["text", "markdown", "html"]).default("markdown"),
-      timeout: z6.number().positive().max(MAX_TIMEOUT_SECONDS).optional().describe("Timeout in seconds, max 120."),
-      prompt: z6.string().optional().describe("Optional extraction task to run on the fetched content using a cheap secondary model."),
-      extract_main: z6.boolean().default(true),
-      prefer_llms_txt: z6.enum(["auto", "always", "never"]).default("auto"),
-      include_metadata: z6.boolean().default(true),
-      save_binary: z6.boolean().default(false).describe("Save binary payload to disk when it fits within the active download limit.")
+      url: z7.httpUrl(),
+      format: z7.enum(["text", "markdown", "html"]).default("markdown"),
+      timeout: z7.number().positive().max(MAX_TIMEOUT_SECONDS).optional().describe("Timeout in seconds, max 120."),
+      prompt: z7.string().optional().describe("Optional extraction task to run on the fetched content using a cheap secondary model."),
+      extract_main: z7.boolean().default(true),
+      prefer_llms_txt: z7.enum(["auto", "always", "never"]).default("auto"),
+      include_metadata: z7.boolean().default(true),
+      save_binary: z7.boolean().default(false).describe("Save binary payload to disk when it fits within the active download limit.")
     },
     async execute(args, ctx) {
       const secondaryModels = await readSecondaryModelFromConfig(ctx.directory || pluginCtx.directory);
@@ -33341,7 +34384,7 @@ async function appLog(ctx, level, message) {
 }
 var HEALTH_CHECK = {
   minAgents: 5,
-  minTools: 5,
+  minTools: 4,
   minMcps: 1
 };
 async function probeJSDOM() {
@@ -33378,6 +34421,7 @@ var OhMyOpenCodeLite = async (ctx) => {
   let jsonErrorRecoveryHook;
   let foregroundFallback;
   let deepworkCommandHook;
+  let reflectCommandHook;
   let taskSessionManagerHook;
   let backgroundJobBoard;
   let interviewManager;
@@ -33385,6 +34429,7 @@ var OhMyOpenCodeLite = async (ctx) => {
   let companionManager;
   let councilTools;
   let cancelTaskTools;
+  let acpRunTools;
   let webfetch;
   let rewriteDisplayNameMentions;
   let toolCount = 0;
@@ -33403,32 +34448,13 @@ var OhMyOpenCodeLite = async (ctx) => {
     agentDefs = createAgents(config);
     agents = getAgentConfigs(config);
     modelArrayMap = {};
-    for (const agentDef of agentDefs) {
-      if (agentDef._modelArray && agentDef._modelArray.length > 0) {
-        modelArrayMap[agentDef.name] = agentDef._modelArray;
-      }
-    }
     runtimeChains = {};
     for (const agentDef of agentDefs) {
       if (agentDef._modelArray?.length) {
+        modelArrayMap[agentDef.name] = agentDef._modelArray;
         runtimeChains[agentDef.name] = agentDef._modelArray.map((m) => m.id);
       }
     }
-    const activePresetForFallback = getActiveRuntimePreset() ?? config.preset ?? null;
-    if (config.fallback?.enabled !== false) {
-      const chains = normalizeFallbackChainsForPreset(config.fallback?.chains ?? {}, activePresetForFallback);
-      for (const [agentName, chainModels] of Object.entries(chains)) {
-        const existing = runtimeChains[agentName] ?? [];
-        const seen = new Set(existing);
-        for (const m of chainModels) {
-          if (!seen.has(m)) {
-            seen.add(m);
-            existing.push(m);
-          }
-        }
-        runtimeChains[agentName] = existing;
-      }
-    }
     multiplexerConfig = {
       type: config.multiplexer?.type ?? "none",
       layout: config.multiplexer?.layout ?? "main-vertical",
@@ -33448,6 +34474,7 @@ var OhMyOpenCodeLite = async (ctx) => {
     depthTracker = new SubagentDepthTracker;
     councilTools = config.council ? createCouncilTool(ctx, new CouncilManager(ctx, config, depthTracker, multiplexerEnabled)) : {};
     mcps = createBuiltinMcps(config.disabled_mcps, config.websearch);
+    acpRunTools = Object.keys(config.acpAgents ?? {}).length > 0 ? { acp_run: createAcpRunTool(config.acpAgents) } : {};
     webfetch = createWebfetchTool(ctx);
     backgroundJobBoard = new BackgroundJobBoard({
       maxReusablePerAgent: config.backgroundJobs?.maxSessionsPerAgent ?? 2,
@@ -33456,7 +34483,8 @@ var OhMyOpenCodeLite = async (ctx) => {
     });
     multiplexerSessionManager = new MultiplexerSessionManager(ctx, multiplexerConfig, backgroundJobBoard);
     autoUpdateChecker = createAutoUpdateCheckerHook(ctx, {
-      autoUpdate: config.autoUpdate ?? true
+      autoUpdate: config.autoUpdate ?? true,
+      companion: config.companion
     });
     phaseReminderHook = createPhaseReminderHook();
     filterAvailableSkillsHook = createFilterAvailableSkillsHook(ctx, config);
@@ -33470,6 +34498,7 @@ var OhMyOpenCodeLite = async (ctx) => {
     jsonErrorRecoveryHook = createJsonErrorRecoveryHook(ctx);
     foregroundFallback = new ForegroundFallbackManager(ctx.client, runtimeChains, config.fallback?.enabled !== false && Object.keys(runtimeChains).length > 0);
     deepworkCommandHook = createDeepworkCommandHook();
+    reflectCommandHook = createReflectCommandHook();
     taskSessionManagerHook = createTaskSessionManagerHook(ctx, {
       maxSessionsPerAgent: config.backgroundJobs?.maxSessionsPerAgent ?? 2,
       readContextMinLines: config.backgroundJobs?.readContextMinLines ?? 10,
@@ -33485,7 +34514,7 @@ var OhMyOpenCodeLite = async (ctx) => {
       backgroundJobBoard,
       shouldManageSession: (sessionID) => sessionAgentMap.get(sessionID) === "orchestrator"
     });
-    toolCount = Object.keys(councilTools).length + Object.keys(cancelTaskTools).length + 1 + 2;
+    toolCount = Object.keys(councilTools).length + Object.keys(cancelTaskTools).length + Object.keys(acpRunTools).length + 1 + 2;
   } catch (err) {
     log("[plugin] FATAL: init failed", String(err));
     await appLog(ctx, "error", `INIT FAILED: ${String(err)}. Report at github.com/alvinunreal/oh-my-opencode-slim/issues/310`);
@@ -33521,6 +34550,22 @@ var OhMyOpenCodeLite = async (ctx) => {
       appLog(ctx, "warn", msg).catch(() => {});
     }
   });
+  if (config.companion?.enabled === true) {
+    try {
+      const companionResult = await ensureCompanionVersion({
+        config: config.companion,
+        downloadTimeoutMs: 3000,
+        lockTimeoutMs: 500
+      });
+      if (companionResult.status === "installed") {
+        log("[companion] updated before startup", companionResult.version);
+      } else if (companionResult.status === "failed") {
+        log("[companion] startup update failed", companionResult.error);
+      }
+    } catch (err) {
+      log("[companion] startup update failed", String(err));
+    }
+  }
   companionManager.onLoad();
   return {
     name: "oh-my-opencode-slim",
@@ -33528,6 +34573,7 @@ var OhMyOpenCodeLite = async (ctx) => {
     tool: {
       ...councilTools,
       ...cancelTaskTools,
+      ...acpRunTools,
       webfetch,
       ast_grep_search,
       ast_grep_replace
@@ -33555,34 +34601,11 @@ var OhMyOpenCodeLite = async (ctx) => {
         }
       }
       const configAgent = opencodeConfig.agent;
-      const activePresetForFallback = getActiveRuntimePreset() ?? config.preset ?? null;
-      const fallbackChainsEnabled = config.fallback?.enabled !== false;
-      const fallbackChains = fallbackChainsEnabled ? normalizeFallbackChainsForPreset(config.fallback?.chains ?? {}, activePresetForFallback) : {};
-      const effectiveArrays = {};
-      for (const [agentName, models] of Object.entries(modelArrayMap)) {
-        effectiveArrays[agentName] = [...models];
-      }
-      for (const [agentName, chainModels] of Object.entries(fallbackChains)) {
-        if (!chainModels || chainModels.length === 0)
-          continue;
-        if (!effectiveArrays[agentName]) {
-          const entry = configAgent[agentName];
-          const currentModel = typeof entry?.model === "string" ? entry.model : undefined;
-          effectiveArrays[agentName] = currentModel ? [{ id: currentModel }] : [];
-        }
-        const seen = new Set(effectiveArrays[agentName].map((m) => m.id));
-        for (const chainModel of chainModels) {
-          if (!seen.has(chainModel)) {
-            seen.add(chainModel);
-            effectiveArrays[agentName].push({ id: chainModel });
-          }
-        }
-      }
-      if (Object.keys(effectiveArrays).length > 0) {
-        for (const [agentName, modelArray] of Object.entries(effectiveArrays)) {
-          if (modelArray.length === 0)
+      if (Object.keys(modelArrayMap).length > 0) {
+        for (const [agentName, models] of Object.entries(modelArrayMap)) {
+          if (models.length === 0)
             continue;
-          const chosen = modelArray[0];
+          const chosen = models[0];
           const entry = configAgent[agentName];
           if (entry) {
             entry.model = chosen.id;
@@ -33718,6 +34741,7 @@ var OhMyOpenCodeLite = async (ctx) => {
       }
       interviewManager.registerCommand(opencodeConfig);
       deepworkCommandHook.registerCommand(opencodeConfig);
+      reflectCommandHook.registerCommand(opencodeConfig);
       presetManager.registerCommand(opencodeConfig);
     },
     event: async (input) => {
@@ -33784,6 +34808,7 @@ var OhMyOpenCodeLite = async (ctx) => {
       await interviewManager.handleCommandExecuteBefore(input, output);
       await presetManager.handleCommandExecuteBefore(input, output);
       await deepworkCommandHook.handleCommandExecuteBefore(input, output);
+      await reflectCommandHook.handleCommandExecuteBefore(input, output);
     },
     "chat.headers": chatHeadersHook["chat.headers"],
     "chat.message": async (input, output) => {