oh-my-opencode-slim 2.0.2 → 2.0.4

package/README.ja-JP.md

@@ -595,6 +595,7 @@ Worktrees は、Git worktree を `.slim/worktrees/<slug>/` 配下の安全で隔
 |-----|----------------|
 | **[Council](docs/council.md)** | 複数のモデルを並列実行し、`@council` で 1 つの回答に統合します |
 | **[Custom Agents](docs/configuration.md#custom-agents)** | カスタムプロンプト、モデル、MCP アクセス、Orchestrator の委譲ルールを備えた独自の専門エージェントを定義します |
+| **[ACP Agents](docs/acp-agents.md)** | Claude Code ACP や Gemini ACP などの外部 ACP 互換エージェントを委譲可能なサブエージェントとして接続します |
 | **[Multiplexer Integration](docs/multiplexer-integration.md)** | エージェントの動作を Tmux や Zellij のペインでライブ表示します |
 | **[Codemap](docs/codemap.md)** | 階層的なコードマップを生成し、大規模コードベースを迅速に理解します |
 | **[Clonedeps](docs/clonedeps.md)** | 選択した依存関係のソースを ignore 済みのローカルワークスペースにクローンし、調査できるようにします |

package/README.ko-KR.md

@@ -593,6 +593,7 @@ Worktrees는 Git worktree를 `.slim/worktrees/<slug>/` 아래의 안전하고
 |-----|------|
 | **[Council](docs/council.md)** | `@council`로 여러 모델을 병렬 실행하고 하나의 답변으로 종합 |
 | **[Custom Agents](docs/configuration.md#custom-agents)** | 커스텀 프롬프트, 모델, MCP 접근, Orchestrator 위임 규칙으로 커스텀 전문 에이전트 정의 |
+| **[ACP Agents](docs/acp-agents.md)** | Claude Code ACP 또는 Gemini ACP 같은 외부 ACP 호환 에이전트를 위임 가능한 서브에이전트로 연결 |
 | **[Multiplexer Integration](docs/multiplexer-integration.md)** | Tmux 또는 Zellij 페인에서 에이전트 작업을 실시간으로 확인 |
 | **[Codemap](docs/codemap.md)** | 계층형 코드맵을 생성하여 대규모 코드베이스를 빠르게 파악 |
 | **[Clonedeps](docs/clonedeps.md)** | 선택한 의존성 소스를 무시된 로컬 워크스페이스에 복제하여 검사 |

package/README.md

@@ -619,6 +619,7 @@ Use this section as a map: start with installation, then jump to features, confi
 |-----|----------------|
 | **[Council](docs/council.md)** | Run multiple models in parallel and synthesize a single answer with `@council` |
 | **[Custom Agents](docs/configuration.md#custom-agents)** | Define your own specialists with custom prompts, models, MCP access, and Orchestrator delegation rules |
+| **[ACP Agents](docs/acp-agents.md)** | Connect external ACP-compatible agents such as Claude Code ACP or Gemini ACP as delegatable subagents |
 | **[Multiplexer Integration](docs/multiplexer-integration.md)** | Watch agents work live in Tmux or Zellij panes |
 | **[Codemap](docs/codemap.md)** | Generate hierarchical codemaps to understand large codebases faster |
 | **[Clonedeps](docs/clonedeps.md)** | Clone selected dependency source into an ignored local workspace for inspection |
@@ -656,7 +657,7 @@ Use this section as a map: start with installation, then jump to features, confi
   <p><sub>Every merged contribution leaves a mark on the realm.</sub></p>
 
   <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-60-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-63-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 </div>
 
@@ -747,6 +748,11 @@ Use this section as a map: start with installation, then jump to features, confi
       <td align="center" valign="top" width="16.66%"><a href="https://github.com/smatheusblu"><img src="https://avatars.githubusercontent.com/u/5666794?v=4?s=100" width="100px;" alt="Matheus Nogueira Silveira"/><br /><sub><b>Matheus Nogueira Silveira</b></sub></a><br /><a href="https://github.com/alvinunreal/oh-my-opencode-slim/commits?author=smatheusblu" title="Code">💻</a></td>
       <td align="center" valign="top" width="16.66%"><a href="https://github.com/sktr"><img src="https://avatars.githubusercontent.com/u/44969514?v=4?s=100" width="100px;" alt="sktr"/><br /><sub><b>sktr</b></sub></a><br /><a href="https://github.com/alvinunreal/oh-my-opencode-slim/commits?author=sktr" title="Code">💻</a></td>
     </tr>
+    <tr>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/bobbyunknown"><img src="https://avatars.githubusercontent.com/u/62272380?v=4?s=100" width="100px;" alt="Insomnia"/><br /><sub><b>Insomnia</b></sub></a><br /><a href="https://github.com/alvinunreal/oh-my-opencode-slim/commits?author=bobbyunknown" title="Code">💻</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/andrescastane"><img src="https://avatars.githubusercontent.com/u/13487870?v=4?s=100" width="100px;" alt="Andres Castañeda"/><br /><sub><b>Andres Castañeda</b></sub></a><br /><a href="https://github.com/alvinunreal/oh-my-opencode-slim/commits?author=andrescastane" title="Code">💻</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://zaradacht.com/"><img src="https://avatars.githubusercontent.com/u/24251016?v=4?s=100" width="100px;" alt="Zaradacht Taifour (Zack)"/><br /><sub><b>Zaradacht Taifour (Zack)</b></sub></a><br /><a href="https://github.com/alvinunreal/oh-my-opencode-slim/commits?author=Zaradacht" title="Code">💻</a></td>
+    </tr>
   </tbody>
 </table>
 

package/README.zh-CN.md

@@ -590,6 +590,7 @@ Worktrees 将 Git worktree 作为安全、隔离的编码通道管理，默认
 |-----|----------------|
 | **[Council](docs/council.md)** | 使用 `@council` 并行运行多个模型并合成单一答案 |
 | **[自定义智能体](docs/configuration.md#custom-agents)** | 使用自定义提示词、模型、MCP 访问和 Orchestrator 委派规则定义自己的专家 |
+| **[ACP Agents](docs/acp-agents.md)** | 将 Claude Code ACP 或 Gemini ACP 等外部 ACP 兼容智能体连接为可委派子智能体 |
 | **[多路复用器集成](docs/multiplexer-integration.md)** | 在 Tmux 或 Zellij 窗格中实时观看智能体工作 |
 | **[Codemap](docs/codemap.md)** | 生成层级代码地图，更快理解大型代码库 |
 | **[Clonedeps](docs/clonedeps.md)** | 将选定的依赖源码克隆到被忽略的本地工作区中以供检查 |

package/dist/cli/companion.d.ts

@@ -1,4 +1,4 @@
+import { getCompanionBinaryPath, getCompanionTarget } from '../companion/updater';
 import type { ConfigMergeResult, InstallConfig } from './types';
-export declare function getCompanionTarget(): string | null;
-export declare function getCompanionBinaryPath(): string;
+export { getCompanionBinaryPath, getCompanionTarget };
 export declare function installCompanion(config: InstallConfig): Promise<ConfigMergeResult>;

package/dist/cli/index.js

@@ -19,13 +19,7 @@ var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 // src/utils/compat.ts
-var exports_compat = {};
-__export(exports_compat, {
-  crossWrite: () => crossWrite,
-  crossSpawn: () => crossSpawn
-});
 import { spawn as nodeSpawn } from "node:child_process";
-import { writeFile as fsWriteFile } from "node:fs/promises";
 function collectStream(stream) {
   if (!stream)
     return () => Promise.resolve("");
@@ -68,9 +62,6 @@ function crossSpawn(command, options) {
     }
   };
 }
-async function crossWrite(path, data) {
-  await fsWriteFile(path, Buffer.from(data));
-}
 var init_compat = () => {};
 
 // src/utils/zip-extractor.ts
@@ -465,9 +456,28 @@ var FailoverConfigSchema = z2.object({
 }).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;
@@ -505,7 +515,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"]);
@@ -726,7 +737,11 @@ function generateLiteConfig(installConfig) {
     config.companion = {
       enabled: true,
       position: "bottom-right",
-      size: "medium"
+      size: "medium",
+      gifPack: "default",
+      loopStyle: "classic",
+      speed: 1,
+      debug: false
     };
   }
   return config;
@@ -734,15 +749,24 @@ function generateLiteConfig(installConfig) {
 
 // src/cli/config-io.ts
 var PACKAGE_NAME = "oh-my-opencode-slim";
-var DEFAULT_OPENCODE_AGENTS_TO_DISABLE = [
-  "build",
-  "explore",
-  "general",
-  "plan"
-];
+var DEFAULT_OPENCODE_AGENTS_TO_DISABLE = ["explore", "general"];
 function isString(value) {
   return typeof value === "string";
 }
+function getModelIds(model) {
+  if (isString(model))
+    return [model];
+  if (!Array.isArray(model))
+    return [];
+  return model.flatMap((entry) => {
+    if (isString(entry))
+      return [entry];
+    if (entry && typeof entry === "object" && isString(entry.id)) {
+      return [entry.id];
+    }
+    return [];
+  });
+}
 function getPlugins(config) {
   return Array.isArray(config.plugin) ? config.plugin : [];
 }
@@ -1207,17 +1231,17 @@ function detectCurrentConfig() {
     const presetName = configObj.preset;
     const presets = configObj.presets;
     const agents = presets?.[presetName];
-    if (agents) {
-      const models = Object.values(agents).map((a) => a?.model).filter(Boolean);
-      result.hasOpenAI = models.some((m) => m?.startsWith("openai/"));
-      result.hasAnthropic = models.some((m) => m?.startsWith("anthropic/"));
-      result.hasCopilot = models.some((m) => m?.startsWith("github-copilot/"));
-      result.hasZaiPlan = models.some((m) => m?.startsWith("zai-coding-plan/"));
-      result.hasOpencodeZen = models.some((m) => m?.startsWith("opencode/"));
-      if (models.some((m) => m?.startsWith("google/"))) {
+    if (agents && typeof agents === "object") {
+      const models = Object.values(agents).filter((a) => a && typeof a === "object").flatMap((a) => getModelIds(a.model));
+      result.hasOpenAI ||= models.some((m) => m.startsWith("openai/"));
+      result.hasAnthropic ||= models.some((m) => m.startsWith("anthropic/"));
+      result.hasCopilot ||= models.some((m) => m.startsWith("github-copilot/"));
+      result.hasZaiPlan ||= models.some((m) => m.startsWith("zai-coding-plan/"));
+      result.hasOpencodeZen ||= models.some((m) => m.startsWith("opencode/"));
+      if (models.some((m) => m.startsWith("google/"))) {
         result.hasAntigravity = true;
       }
-      if (models.some((m) => m?.startsWith("chutes/"))) {
+      if (models.some((m) => m.startsWith("chutes/"))) {
         result.hasChutes = true;
       }
     }
@@ -1267,6 +1291,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)
   };
 }
@@ -1582,28 +1607,75 @@ function writeBackgroundSubagentsBlock(targetPath) {
   writeFileSync2(targetPath, nextContent);
 }
 
-// src/cli/companion.ts
+// src/companion/updater.ts
+init_compat();
+import { createHash } from "node:crypto";
 import {
   chmodSync,
   copyFileSync as copyFileSync3,
   existsSync as existsSync6,
   mkdirSync as mkdirSync5,
   mkdtempSync,
+  readFileSync as readFileSync5,
   renameSync as renameSync2,
   rmSync as rmSync2,
+  statSync as statSync4,
   writeFileSync as writeFileSync3
 } from "node:fs";
-import { homedir as homedir4, tmpdir } from "node:os";
+import { homedir as homedir4, platform, tmpdir } from "node:os";
 import * as path2 from "node:path";
-var COMPANION_VERSION = "0.1.2";
-var COMPANION_TAG = "companion-v0.1.2";
-var GITHUB_REPO = "alvinunreal/oh-my-opencode-slim";
+import { setTimeout as delay } from "node:timers/promises";
+
+// src/utils/logger.ts
+import { appendFile } from "node:fs/promises";
+var RETENTION_MS = 7 * 24 * 60 * 60 * 1000;
+var logFile = null;
+var writeChain = Promise.resolve();
+function log(message, data) {
+  const target = logFile;
+  if (!target)
+    return;
+  try {
+    const timestamp = new Date().toISOString();
+    let dataStr = "";
+    if (data !== undefined) {
+      try {
+        dataStr = JSON.stringify(data);
+      } catch {
+        dataStr = "[unserializable]";
+      }
+    }
+    const logEntry = `[${timestamp}] ${message} ${dataStr}
+`;
+    writeChain = writeChain.then(() => appendFile(target, logEntry)).catch(() => {});
+  } catch {}
+}
+
+// src/companion/updater.ts
+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";
@@ -1618,47 +1690,109 @@ function getCompanionTarget() {
 function getCompanionBinaryPath() {
   const xdg = process.env.XDG_DATA_HOME?.trim();
   const base = xdg && path2.isAbsolute(xdg) ? xdg : path2.join(homedir4(), ".local", "share");
-  return path2.join(base, "opencode", "storage", "oh-my-opencode-slim", "bin", process.platform === "win32" ? "oh-my-opencode-slim-companion.exe" : "oh-my-opencode-slim-companion");
+  return path2.join(base, "opencode", "storage", "oh-my-opencode-slim", "bin", platform() === "win32" ? "oh-my-opencode-slim-companion.exe" : "oh-my-opencode-slim-companion");
 }
-async function installCompanion(config) {
+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();
-  const finalBinaryPath = getCompanionBinaryPath();
   if (!target) {
     return {
-      success: false,
-      configPath: finalBinaryPath,
+      status: "failed",
+      binaryPath,
       error: `Unsupported platform/architecture: ${process.platform} ${process.arch}`
     };
   }
+  const current = readInstallMetadata(binaryPath);
+  if (existsSync6(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 (existsSync6(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 (existsSync6(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 (existsSync6(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 ext = isWindows ? "zip" : "tar.gz";
-  const archiveName = `oh-my-opencode-slim-companion-v${COMPANION_VERSION}-${target}.${ext}`;
-  const downloadUrl = `https://github.com/${GITHUB_REPO}/releases/download/${COMPANION_TAG}/${archiveName}`;
-  if (config.dryRun) {
-    console.log(`  [dry-run] Detected companion target: ${target}`);
-    console.log(`  [dry-run] Would download archive: ${downloadUrl}`);
-    console.log(`  [dry-run] Would extract and install to: ${finalBinaryPath}`);
+  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 {
-      success: true,
-      configPath: finalBinaryPath
+      status: "failed",
+      binaryPath: finalBinaryPath,
+      error: `Missing SHA256 checksum for companion archive: ${archiveName}`
     };
   }
   let buffer;
+  const controller = new AbortController;
+  const timeout = setTimeout(() => controller.abort(), downloadTimeoutMs);
   try {
-    const res = await fetch(downloadUrl);
+    const res = await fetch(downloadUrl, { signal: controller.signal });
     if (!res.ok) {
       return {
-        success: false,
-        configPath: finalBinaryPath,
+        status: "failed",
+        binaryPath: finalBinaryPath,
         error: `Failed to download companion binary (HTTP ${res.status}): ${res.statusText}`
       };
     }
     buffer = await res.arrayBuffer();
   } catch (err) {
     return {
-      success: false,
-      configPath: finalBinaryPath,
-      error: `Failed to fetch companion archive: ${err instanceof Error ? err.message : String(err)}`
+      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 = "";
@@ -1672,14 +1806,13 @@ async function installCompanion(config) {
       const { extractZip: extractZip2 } = await Promise.resolve().then(() => (init_zip_extractor(), exports_zip_extractor));
       await extractZip2(archivePath, extractedDir);
     } else {
-      const { crossSpawn: crossSpawn2 } = await Promise.resolve().then(() => (init_compat(), exports_compat));
-      const proc = crossSpawn2(["tar", "-xzf", archivePath, "-C", extractedDir]);
+      const proc = crossSpawn(["tar", "-xzf", archivePath, "-C", extractedDir]);
       const exitCode = await proc.exited;
       if (exitCode !== 0) {
         const stderr = await proc.stderr();
         return {
-          success: false,
-          configPath: finalBinaryPath,
+          status: "failed",
+          binaryPath: finalBinaryPath,
           error: `Archive extraction failed (tar exited with ${exitCode}): ${stderr}`
         };
       }
@@ -1688,8 +1821,8 @@ async function installCompanion(config) {
     const extractedBinaryPath = path2.join(extractedDir, binaryName);
     if (!existsSync6(extractedBinaryPath)) {
       return {
-        success: false,
-        configPath: finalBinaryPath,
+        status: "failed",
+        binaryPath: finalBinaryPath,
         error: `Binary ${binaryName} not found in extracted archive`
       };
     }
@@ -1701,15 +1834,24 @@ async function installCompanion(config) {
       chmodSync(tmpFinalPath, 493);
     }
     renameSync2(tmpFinalPath, finalBinaryPath);
+    writeInstallMetadata(finalBinaryPath, {
+      version: manifest.version,
+      tag: manifest.tag,
+      target,
+      installedAt: new Date().toISOString(),
+      archiveName,
+      checksum
+    });
     return {
-      success: true,
-      configPath: finalBinaryPath
+      status: "installed",
+      binaryPath: finalBinaryPath,
+      version: manifest.version
     };
   } catch (err) {
     return {
-      success: false,
-      configPath: finalBinaryPath,
-      error: `Failed to install companion: ${err instanceof Error ? err.message : String(err)}`
+      status: "failed",
+      binaryPath: finalBinaryPath,
+      error: `Failed to install companion: ${formatError(err)}`
     };
   } finally {
     if (tempDir) {
@@ -1719,10 +1861,131 @@ async function installCompanion(config) {
     }
   }
 }
+function readInstallMetadata(binaryPath) {
+  try {
+    const parsed = JSON.parse(readFileSync5(metadataPath(binaryPath), "utf8"));
+    if (parsed?.version && parsed.tag && parsed.target) {
+      return parsed;
+    }
+  } catch {}
+  return null;
+}
+function writeInstallMetadata(binaryPath, metadata) {
+  writeFileSync3(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;
+  mkdirSync5(path2.dirname(binaryPath), { recursive: true });
+  while (Date.now() <= deadline) {
+    try {
+      mkdirSync5(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() - statSync4(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/cli/companion.ts
+async function installCompanion(config) {
+  const target = getCompanionTarget();
+  const finalBinaryPath = getCompanionBinaryPath();
+  if (!target) {
+    return {
+      success: false,
+      configPath: finalBinaryPath,
+      error: `Unsupported platform/architecture: ${process.platform} ${process.arch}`
+    };
+  }
+  const ext = process.platform === "win32" ? "zip" : "tar.gz";
+  const archiveName = `oh-my-opencode-slim-companion-v${COMPANION_MANIFEST.version}-${target}.${ext}`;
+  const downloadUrl = `https://github.com/${COMPANION_MANIFEST.repo}/releases/download/${COMPANION_MANIFEST.tag}/${archiveName}`;
+  if (config.dryRun) {
+    console.log(`  [dry-run] Detected companion target: ${target}`);
+    console.log(`  [dry-run] Would download archive: ${downloadUrl}`);
+    console.log(`  [dry-run] Would extract and install to: ${finalBinaryPath}`);
+    return {
+      success: true,
+      configPath: finalBinaryPath
+    };
+  }
+  const result = await ensureCompanionVersion({
+    config: { enabled: true },
+    manifest: COMPANION_MANIFEST
+  });
+  if (result.status === "installed" || result.status === "current") {
+    return {
+      success: true,
+      configPath: finalBinaryPath
+    };
+  }
+  return {
+    success: false,
+    configPath: finalBinaryPath,
+    error: result.status === "failed" ? result.error : `Companion install skipped: ${result.reason}`
+  };
+}
 // src/cli/system.ts
 init_compat();
 import { spawnSync as spawnSync2 } from "node:child_process";
-import { statSync as statSync4 } from "node:fs";
+import { statSync as statSync5 } from "node:fs";
 var cachedOpenCodePath = null;
 function resolvePathCommand(command) {
   try {
@@ -1795,7 +2058,7 @@ function resolveOpenCodePath() {
     if (opencodePath === "opencode")
       continue;
     try {
-      const stat = statSync4(opencodePath);
+      const stat = statSync5(opencodePath);
       if (stat.isFile()) {
         cachedOpenCodePath = opencodePath;
         return opencodePath;
@@ -1864,8 +2127,8 @@ var SYMBOLS = {
   warn: `${YELLOW}[!]${RESET}`,
   star: `${YELLOW}★${RESET}`
 };
-var GITHUB_REPO2 = "alvinunreal/oh-my-opencode-slim";
-var GITHUB_URL = `https://github.com/${GITHUB_REPO2}`;
+var GITHUB_REPO = "alvinunreal/oh-my-opencode-slim";
+var GITHUB_URL = `https://github.com/${GITHUB_REPO}`;
 function printHeader(isUpdate) {
   console.log();
   console.log(`${BOLD}oh-my-opencode-slim ${isUpdate ? "Update" : "Install"}${RESET}`);
@@ -1908,7 +2171,7 @@ async function askToStarRepo(config) {
     return;
   try {
     const { execFileSync } = await import("node:child_process");
-    execFileSync("gh", ["api", "--silent", "--method", "PUT", `/user/starred/${GITHUB_REPO2}`], { stdio: "ignore", timeout: 1e4 });
+    execFileSync("gh", ["api", "--silent", "--method", "PUT", `/user/starred/${GITHUB_REPO}`], { stdio: "ignore", timeout: 1e4 });
     printSuccess("Thanks for starring! ★");
   } catch {
     printInfo(`Couldn't star automatically. You can star manually:

package/dist/companion/manager.d.ts

@@ -1,5 +1,6 @@
 import type { CompanionConfig } from '../config/schema';
 export declare function stateFilePath(): string;
+export declare function resolveCompanionBinaryPath(config?: CompanionConfig): string | null;
 /**
  * Tracks live agent activity per session and mirrors it to the companion
  * state file. Source of truth is OpenCode's session.status events: every
@@ -15,6 +16,7 @@ export declare class CompanionManager {
     /** sessionId → agent name, for sessions currently busy. */
     private readonly busyAgentSessions;
     private readonly config?;
+    private companionProcess;
     constructor(sessionId: string, cwd: string, config?: CompanionConfig);
     onLoad(): void;
     /**