bloby-bot 0.35.0 → 0.36.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bloby-bot",
-  "version": "0.35.0",
+  "version": "0.36.0",
   "releaseNotes": [
     "1. # voice note (PTT bubble)",
     "2. # audio file + caption",
@@ -54,6 +54,7 @@
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.2.112",
     "@clack/prompts": "^1.1.0",
+    "@openai/codex": "^0.128.0",
     "@streamdown/code": "^1.1.1",
     "@tailwindcss/vite": "^4.2.0",
     "@vitejs/plugin-react": "^6.0.1",

package/supervisor/harnesses/codex.ts

@@ -26,6 +26,7 @@
  */
 
 import { spawn, type ChildProcessWithoutNullStreams } from 'child_process';
+import { createRequire } from 'module';
 import readline from 'readline';
 import fs from 'fs';
 import path from 'path';
@@ -43,6 +44,45 @@ const CLIENT_INFO = { name: 'bloby', title: 'Bloby', version: '1' };
 const REQUEST_TIMEOUT_MS = 60_000;
 const VALID_EFFORTS = new Set(['low', 'medium', 'high', 'xhigh']);
 
+/**
+ * Resolve the `codex` binary. We don't trust $PATH because Bloby may be
+ * installed globally without `@openai/codex` also globally available. Order:
+ *   1. BLOBY_CODEX_BIN env override (advanced users / dev)
+ *   2. The `bin` entry from the bundled `@openai/codex` npm package
+ *      (this is what `npm install bloby-bot` will pull in)
+ *   3. Fall back to `codex` on PATH (works when the user installed codex CLI
+ *      separately, e.g. via apt/brew).
+ */
+let cachedCodexBin: string | null = null;
+function resolveCodexBin(): string {
+  if (cachedCodexBin) return cachedCodexBin;
+
+  if (process.env.BLOBY_CODEX_BIN) {
+    cachedCodexBin = process.env.BLOBY_CODEX_BIN;
+    return cachedCodexBin;
+  }
+
+  try {
+    const requireFromHere = createRequire(import.meta.url);
+    const pkgPath = requireFromHere.resolve('@openai/codex/package.json');
+    const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+    const binEntry = typeof pkg.bin === 'string' ? pkg.bin : pkg.bin?.codex;
+    if (binEntry) {
+      const resolved = path.join(path.dirname(pkgPath), binEntry);
+      if (fs.existsSync(resolved)) {
+        cachedCodexBin = resolved;
+        log.info(`[codex] using bundled binary: ${resolved}`);
+        return cachedCodexBin;
+      }
+    }
+  } catch {
+    // @openai/codex not installed as a dep — fall through.
+  }
+
+  cachedCodexBin = 'codex';
+  return cachedCodexBin;
+}
+
 /* ── Prompt-assembly helpers (duplicated from claude.ts to keep that file
  *    untouched per the project rule) ───────────────────────────────────── */
 
@@ -125,7 +165,7 @@ class CodexRpc {
   private stderrBuf = '';
 
   start(): void {
-    this.proc = spawn('codex', ['app-server'], { stdio: ['pipe', 'pipe', 'pipe'] });
+    this.proc = spawn(resolveCodexBin(), ['app-server'], { stdio: ['pipe', 'pipe', 'pipe'] });
     const rl = readline.createInterface({ input: this.proc.stdout });
     rl.on('line', (line) => this.onLine(line));