@c4t4/heyamigo 0.8.10 → 0.8.12

package/config/config.example.json

@@ -36,6 +36,12 @@
     "contextWindow": 200000
   },
 
+  "codex": {
+    "yolo": true,
+    "skipGitRepoCheck": true,
+    "extraArgs": []
+  },
+
   "bootstrap": {
     "historyDepth": 50,
     "includeHistory": true,

package/dist/ai/codex.js

@@ -8,13 +8,19 @@
 //   - --add-dir for extra writable roots
 //   - --sandbox for tier (read-only / workspace-write / danger-full-access)
 //   - `resume <id>` subcommand for session continuation (not a flag)
-//   - prompt passed on stdin (matches the spawn plumbing that already
-//     pipes input to child.stdin)
+//   - prompt passed as positional arg
+//
+// Configurable via config.codex:
+//   - yolo (default true): adds --yolo, which bundles no-approvals +
+//     full sandbox + skip-trust-check. The right default for a headless
+//     owner-bot; set false to honor runTask's mode-driven sandbox.
+//   - skipGitRepoCheck (default true): adds --skip-git-repo-check when
+//     yolo is off. Codex refuses to run in untrusted cwds without it.
+//   - extraArgs: appended verbatim. Escape hatch for version drift.
 //
 // What's deliberately coarse:
 //   - allowedTools is ignored on this provider. Codex has no per-tool
-//     allowlist; the sandbox mode is the only knob. The mode argument
-//     covers the practical cases (read vs. write vs. full).
+//     allowlist; the sandbox mode is the only knob.
 import { readFileSync } from 'fs';
 import { resolve } from 'path';
 import { config } from '../config.js';
@@ -57,8 +63,20 @@ function laneTimeoutMs(lane) {
     return TIMEOUT_MS[lane];
 }
 function buildExecArgs(params) {
+    const cfg = config.codex;
     const args = ['exec', '--json'];
-    args.push('--sandbox', sandboxFor(params.mode));
+    if (cfg.yolo) {
+        // --yolo: no approvals, full sandbox, skip trust check. Single switch
+        // that covers the owner-bot case. mode is ignored on this path.
+        args.push('--yolo');
+    }
+    else {
+        if (cfg.skipGitRepoCheck)
+            args.push('--skip-git-repo-check');
+        args.push('--sandbox', sandboxFor(params.mode));
+    }
+    for (const extra of cfg.extraArgs)
+        args.push(extra);
     if (params.sessionId) {
         // Resume is a subcommand of exec, not a flag: `codex exec [opts] resume
         // <SESSION_ID> [prompt]`. System prompt and add-dirs were baked in on
@@ -82,6 +100,27 @@ function buildExecArgs(params) {
     args.push(params.prompt);
     return args;
 }
+function extractReply(ev) {
+    // Primary shape: item.completed with item.type === 'agent_message'
+    if (ev.type === 'item.completed' &&
+        ev.item &&
+        ev.item.type === 'agent_message' &&
+        typeof ev.item.text === 'string') {
+        return ev.item.text;
+    }
+    // Older shape: msg.type === 'agent_message' with msg.message
+    if (ev.msg &&
+        ev.msg.type === 'agent_message' &&
+        typeof ev.msg.message === 'string') {
+        return ev.msg.message;
+    }
+    // Last-ditch top-level fields
+    if (typeof ev.message === 'string')
+        return ev.message;
+    if (typeof ev.text === 'string')
+        return ev.text;
+    return null;
+}
 function parseCodexOutput(stdout) {
     const events = [];
     for (const line of stdout.split(/\r?\n/)) {
@@ -97,37 +136,29 @@ function parseCodexOutput(stdout) {
     }
     if (events.length === 0)
         return null;
-    // Find the final agent message. Codex labels it variously across
-    // versions — try the common shapes in order.
+    // Latest agent message wins (handles multi-turn output).
     let reply = null;
     for (let i = events.length - 1; i >= 0; i--) {
-        const ev = events[i];
-        if (ev.msg?.type === 'agent_message' &&
-            typeof ev.msg.message === 'string') {
-            reply = ev.msg.message;
-            break;
-        }
-        if (typeof ev.message === 'string') {
-            reply = ev.message;
-            break;
-        }
-        if (typeof ev.text === 'string') {
-            reply = ev.text;
+        const r = extractReply(events[i]);
+        if (r !== null) {
+            reply = r;
             break;
         }
     }
     if (reply === null)
         return null;
-    // Session id — Codex uses different field names across versions.
+    // Session id — `thread_id` on thread.started in current Codex; older
+    // builds used session_id / conversation_id / response_id.
     let sessionId;
     for (const ev of events) {
-        const id = ev.session_id ?? ev.conversation_id ?? ev.response_id;
+        const id = ev.thread_id ?? ev.session_id ?? ev.conversation_id ?? ev.response_id;
         if (typeof id === 'string' && id) {
             sessionId = id;
             break;
         }
     }
-    // Usage — last event with a usage object wins (final turn totals).
+    // Usage — turn.completed carries final totals; fall back to any event
+    // with a usage object if the type marker is missing.
     let inputTokens = 0;
     let outputTokens = 0;
     let cacheReadTokens = 0;

package/dist/config.js

@@ -36,6 +36,20 @@ const ConfigSchema = z.object({
         outputFormat: z.enum(['json', 'text', 'stream-json']),
         contextWindow: z.number(),
     }),
+    codex: z
+        .object({
+        // --yolo on the Codex CLI bundles "no approvals + full sandbox + no
+        // trust prompts". Right default for a headless owner-bot; flip to
+        // false if you want runTask's mode to drive the sandbox tier instead.
+        yolo: z.boolean().default(true),
+        // When yolo=false, still bypass the trust-directory prompt. Codex
+        // refuses to run in an "untrusted" cwd otherwise.
+        skipGitRepoCheck: z.boolean().default(true),
+        // Appended verbatim to every `codex exec` invocation. Escape hatch
+        // for version-specific flags we haven't first-classed.
+        extraArgs: z.array(z.string()).default([]),
+    })
+        .default({}),
     bootstrap: z.object({
         historyDepth: z.number(),
         includeHistory: z.boolean(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@c4t4/heyamigo",
-  "version": "0.8.10",
+  "version": "0.8.12",
   "description": "WhatsApp AI bot powered by Claude with long-term memory, browser control, and role-based access",
   "type": "module",
   "main": "dist/index.js",