very-happy-cli 0.2.188 → 0.2.190

package/dist/{codexAppServerClient-DgE99i7X.mjs → codexAppServerClient-CLc5nhLT.mjs}

@@ -1,11 +1,11 @@
 import { execSync } from 'node:child_process';
 import { spawn } from 'cross-spawn';
 import { createInterface } from 'node:readline';
-import { l as logger } from './logger-RpzJ4d8V.mjs';
+import { l as logger } from './logger-CL7pin9b.mjs';
 import { e as errorLogMetadata, c as contentLogMetadata } from './contentLogMetadata-BlWI0egu.mjs';
 import { i as initializeSandbox, w as wrapForMcpTransport } from './manager-BEsI4qt3.mjs';
-import { p as packageJson } from './package-CwB8rFJt.mjs';
-import { s as shouldReadCodexRateLimits, i as isUnsupportedCodexMethodError } from './rateLimitWindows-CQ4tIQnx.mjs';
+import { p as packageJson } from './package-C6uiXULx.mjs';
+import { s as shouldReadCodexRateLimits, i as isUnsupportedCodexMethodError } from './rateLimitWindows-CEn0DXaX.mjs';
 import { s as stopProcessGracefully, k as killProcessTree } from './processTree-CP5IvQ2Z.mjs';
 
 const CODEX_HELPER_LABEL_MAX_CHARS = 80;
@@ -47,6 +47,10 @@ function jsonRpcErrorCodeOf(error) {
   const code = error?.jsonRpcCode;
   return typeof code === "number" ? code : null;
 }
+function threadModelOf(result) {
+  const model = result?.model ?? result?.thread?.model;
+  return typeof model === "string" && model.trim() ? model.trim() : null;
+}
 function isAppServerAvailable() {
   try {
     const version = execSync("codex --version", { encoding: "utf8", windowsHide: true }).trim();
@@ -121,12 +125,20 @@ class CodexAppServerClient {
   pending = /* @__PURE__ */ new Map();
   processEpoch = 0;
   connected = false;
+  /** B-852: agent version from the last `initialize` (null = unknown). */
+  serverVersion = null;
   sandboxConfig;
   sandboxCleanup = null;
   sandboxEnabled = false;
   // Session state
   _threadId = null;
   _turnId = null;
+  /**
+   * B-844d: the model the thread really runs. Codex keeps a thread's model
+   * (thread/start, thread/resume, a turn/start that named one) for every
+   * later turn that omits it, and reports it on start/resume/fork.
+   */
+  _threadModel = null;
   threadDefaults = null;
   // Turn completion tracking for the currently active sendTurnAndWait call.
   pendingTurnCompletion = null;
@@ -192,6 +204,10 @@ class CodexAppServerClient {
   get turnId() {
     return this._turnId;
   }
+  /** B-844d: the model the current thread runs for turns that name none (null = unknown). */
+  get threadModel() {
+    return this._threadModel;
+  }
   setEventHandler(handler) {
     this.eventHandler = handler;
   }
@@ -611,7 +627,8 @@ ${text}`.slice(-400);
         experimentalApi: true
       }
     };
-    await this.request("initialize", initParams);
+    const initialized = await this.request("initialize", initParams);
+    this.serverVersion = typeof initialized?.userAgent === "string" ? initialized.userAgent.match(/\/(\d+\.\d+\.\d+)\b/)?.[1] ?? null : null;
     this.notify("initialized");
     this.connected = true;
     logger.debug("[CodexAppServer] Connected and initialized");
@@ -642,6 +659,7 @@ ${text}`.slice(-400);
     this.clearThreadStopGrace();
     if (!opts?.preserveThreadState) {
       this._threadId = null;
+      this._threadModel = null;
       this.threadDefaults = null;
     }
     for (const [id, req] of this.pending) {
@@ -744,6 +762,7 @@ ${text}`.slice(-400);
     const result = await this.request("thread/start", params);
     this._threadId = result.thread.id;
     this._turnId = null;
+    this._threadModel = threadModelOf(result);
     this.rememberThreadDefaults(opts);
     logger.debug("[CodexAppServer] Thread started:", this._threadId);
     return { threadId: result.thread.id, model: result.model };
@@ -770,6 +789,7 @@ ${text}`.slice(-400);
     const result = await this.request("thread/resume", params);
     this._threadId = result.thread.id;
     this._turnId = null;
+    this._threadModel = threadModelOf(result);
     this.rememberThreadDefaults({
       model: opts?.model ?? defaults.model,
       cwd: opts?.cwd ?? defaults.cwd,
@@ -794,11 +814,13 @@ ${text}`.slice(-400);
       baseInstructions: null,
       developerInstructions: null,
       ephemeral: false,
-      threadSource: null
+      threadSource: null,
+      ...opts.lastTurnId ? { lastTurnId: opts.lastTurnId } : {}
     };
     const result = await this.request("thread/fork", params);
     this._threadId = result.thread.id;
     this._turnId = null;
+    this._threadModel = threadModelOf(result);
     this.rememberThreadDefaults({
       model: opts.model ?? defaults.model,
       cwd: opts.cwd ?? defaults.cwd,
@@ -846,6 +868,7 @@ ${text}`.slice(-400);
     } catch (error) {
       logger.warn("[CodexAppServer] Failed to resume thread after reconnect", error);
       this._threadId = null;
+      this._threadModel = null;
       this.threadDefaults = null;
       return false;
     }
@@ -1078,6 +1101,10 @@ ${text}`.slice(-400);
       }
     }
     const result = await this.request("turn/start", params);
+    if (opts?.model) {
+      this._threadModel = opts.model;
+      if (this.threadDefaults) this.threadDefaults.model = opts.model;
+    }
     const turnId = result?.turn?.id;
     if (typeof turnId === "string" && turnId.length > 0) {
       this._turnId = turnId;
@@ -1095,7 +1122,10 @@ ${text}`.slice(-400);
    * Returns { aborted: true } if the turn was aborted (user cancel, permission reject, etc.).
    */
   async sendTurnAndWait(prompt, opts) {
-    const { aborted } = await this.runTurnAndWait(() => this.sendTurn(prompt, opts), opts);
+    const { aborted } = await this.runTurnAndWait(async () => {
+      await this.sendTurn(prompt, opts);
+      opts?.onTurnStarted?.();
+    }, opts);
     return { aborted };
   }
   /**
@@ -1208,6 +1238,7 @@ ${text}`.slice(-400);
     this.resolvePendingTurn(true);
     this._threadId = null;
     this._turnId = null;
+    this._threadModel = null;
     this.threadDefaults = null;
     this.completedTurnIds.clear();
     this.failedTurnIds.clear();

package/dist/{codexAppServerClient-DwzC8LR0.cjs → codexAppServerClient-CpT9F6EM.cjs}

@@ -3,11 +3,11 @@
 var node_child_process = require('node:child_process');
 var spawn = require('cross-spawn');
 var node_readline = require('node:readline');
-var logger = require('./logger-C3vZG6Q0.cjs');
+var logger = require('./logger-BBRTTVsQ.cjs');
 var contentLogMetadata = require('./contentLogMetadata-ZSFk_NjQ.cjs');
 var manager = require('./manager-HrEj442o.cjs');
-var _package = require('./package-Gnf_935w.cjs');
-var rateLimitWindows = require('./rateLimitWindows-Bm_dcQGW.cjs');
+var _package = require('./package-DrY090nZ.cjs');
+var rateLimitWindows = require('./rateLimitWindows-Bx3ROBP5.cjs');
 var processTree = require('./processTree-CMHWlVse.cjs');
 
 const CODEX_HELPER_LABEL_MAX_CHARS = 80;
@@ -49,6 +49,10 @@ function jsonRpcErrorCodeOf(error) {
   const code = error?.jsonRpcCode;
   return typeof code === "number" ? code : null;
 }
+function threadModelOf(result) {
+  const model = result?.model ?? result?.thread?.model;
+  return typeof model === "string" && model.trim() ? model.trim() : null;
+}
 function isAppServerAvailable() {
   try {
     const version = node_child_process.execSync("codex --version", { encoding: "utf8", windowsHide: true }).trim();
@@ -123,12 +127,20 @@ class CodexAppServerClient {
   pending = /* @__PURE__ */ new Map();
   processEpoch = 0;
   connected = false;
+  /** B-852: agent version from the last `initialize` (null = unknown). */
+  serverVersion = null;
   sandboxConfig;
   sandboxCleanup = null;
   sandboxEnabled = false;
   // Session state
   _threadId = null;
   _turnId = null;
+  /**
+   * B-844d: the model the thread really runs. Codex keeps a thread's model
+   * (thread/start, thread/resume, a turn/start that named one) for every
+   * later turn that omits it, and reports it on start/resume/fork.
+   */
+  _threadModel = null;
   threadDefaults = null;
   // Turn completion tracking for the currently active sendTurnAndWait call.
   pendingTurnCompletion = null;
@@ -194,6 +206,10 @@ class CodexAppServerClient {
   get turnId() {
     return this._turnId;
   }
+  /** B-844d: the model the current thread runs for turns that name none (null = unknown). */
+  get threadModel() {
+    return this._threadModel;
+  }
   setEventHandler(handler) {
     this.eventHandler = handler;
   }
@@ -613,7 +629,8 @@ ${text}`.slice(-400);
         experimentalApi: true
       }
     };
-    await this.request("initialize", initParams);
+    const initialized = await this.request("initialize", initParams);
+    this.serverVersion = typeof initialized?.userAgent === "string" ? initialized.userAgent.match(/\/(\d+\.\d+\.\d+)\b/)?.[1] ?? null : null;
     this.notify("initialized");
     this.connected = true;
     logger.logger.debug("[CodexAppServer] Connected and initialized");
@@ -644,6 +661,7 @@ ${text}`.slice(-400);
     this.clearThreadStopGrace();
     if (!opts?.preserveThreadState) {
       this._threadId = null;
+      this._threadModel = null;
       this.threadDefaults = null;
     }
     for (const [id, req] of this.pending) {
@@ -746,6 +764,7 @@ ${text}`.slice(-400);
     const result = await this.request("thread/start", params);
     this._threadId = result.thread.id;
     this._turnId = null;
+    this._threadModel = threadModelOf(result);
     this.rememberThreadDefaults(opts);
     logger.logger.debug("[CodexAppServer] Thread started:", this._threadId);
     return { threadId: result.thread.id, model: result.model };
@@ -772,6 +791,7 @@ ${text}`.slice(-400);
     const result = await this.request("thread/resume", params);
     this._threadId = result.thread.id;
     this._turnId = null;
+    this._threadModel = threadModelOf(result);
     this.rememberThreadDefaults({
       model: opts?.model ?? defaults.model,
       cwd: opts?.cwd ?? defaults.cwd,
@@ -796,11 +816,13 @@ ${text}`.slice(-400);
       baseInstructions: null,
       developerInstructions: null,
       ephemeral: false,
-      threadSource: null
+      threadSource: null,
+      ...opts.lastTurnId ? { lastTurnId: opts.lastTurnId } : {}
     };
     const result = await this.request("thread/fork", params);
     this._threadId = result.thread.id;
     this._turnId = null;
+    this._threadModel = threadModelOf(result);
     this.rememberThreadDefaults({
       model: opts.model ?? defaults.model,
       cwd: opts.cwd ?? defaults.cwd,
@@ -848,6 +870,7 @@ ${text}`.slice(-400);
     } catch (error) {
       logger.logger.warn("[CodexAppServer] Failed to resume thread after reconnect", error);
       this._threadId = null;
+      this._threadModel = null;
       this.threadDefaults = null;
       return false;
     }
@@ -1080,6 +1103,10 @@ ${text}`.slice(-400);
       }
     }
     const result = await this.request("turn/start", params);
+    if (opts?.model) {
+      this._threadModel = opts.model;
+      if (this.threadDefaults) this.threadDefaults.model = opts.model;
+    }
     const turnId = result?.turn?.id;
     if (typeof turnId === "string" && turnId.length > 0) {
       this._turnId = turnId;
@@ -1097,7 +1124,10 @@ ${text}`.slice(-400);
    * Returns { aborted: true } if the turn was aborted (user cancel, permission reject, etc.).
    */
   async sendTurnAndWait(prompt, opts) {
-    const { aborted } = await this.runTurnAndWait(() => this.sendTurn(prompt, opts), opts);
+    const { aborted } = await this.runTurnAndWait(async () => {
+      await this.sendTurn(prompt, opts);
+      opts?.onTurnStarted?.();
+    }, opts);
     return { aborted };
   }
   /**
@@ -1210,6 +1240,7 @@ ${text}`.slice(-400);
     this.resolvePendingTurn(true);
     this._threadId = null;
     this._turnId = null;
+    this._threadModel = null;
     this.threadDefaults = null;
     this.completedTurnIds.clear();
     this.failedTurnIds.clear();