@c4t4/heyamigo 0.8.11 → 0.8.13

package/dist/ai/codex.js

@@ -11,9 +11,12 @@
 //   - 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.
+//   - model: optional `-m <model>` override. Default = Codex's default.
+//   - yolo (default true): emits --dangerously-bypass-approvals-and-sandbox
+//     (the documented canonical flag; --yolo is an alias in newer builds).
+//     Bundles no-approvals + full sandbox + skip-trust-check. 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.
@@ -65,10 +68,15 @@ function laneTimeoutMs(lane) {
 function buildExecArgs(params) {
     const cfg = config.codex;
     const args = ['exec', '--json'];
+    if (cfg.model) {
+        args.push('-m', cfg.model);
+    }
     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');
+        // Canonical "no approvals + full sandbox + no trust check" switch.
+        // Some newer Codex builds expose --yolo as an alias for the same
+        // behavior; we use the documented name to stay portable. mode is
+        // ignored on this path.
+        args.push('--dangerously-bypass-approvals-and-sandbox');
     }
     else {
         if (cfg.skipGitRepoCheck)
@@ -100,6 +108,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/)) {
@@ -115,37 +144,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

@@ -38,15 +38,21 @@ const ConfigSchema = z.object({
     }),
     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.
+        // Optional model override. If unset, Codex uses its default. Passed
+        // as `-m <model>` to `codex exec`.
+        model: z.string().optional(),
+        // Field name kept catchy, but the actual flag emitted is the
+        // documented one: --dangerously-bypass-approvals-and-sandbox. Some
+        // newer Codex builds also accept --yolo as an alias; we use the
+        // canonical name for portability. Right default for a headless
+        // owner-bot. Set to false to honor runTask's mode-driven sandbox.
         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.
+        // for version-specific flags we haven't first-classed (e.g. flip
+        // back to --yolo if the canonical name ever goes away).
         extraArgs: z.array(z.string()).default([]),
     })
         .default({}),

package/package.json

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