very-happy-cli 0.2.187 → 0.2.189

package/dist/{codexAppServerClient-Csc-XsRV.mjs → codexAppServerClient-BlVmpjR-.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-SAU4uSs4.mjs';
+import { l as logger } from './logger-DOKH3Zbh.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-BMBwnCn3.mjs';
-import { s as shouldReadCodexRateLimits, i as isUnsupportedCodexMethodError } from './rateLimitWindows-B6IAWYN5.mjs';
+import { p as packageJson } from './package-DTcaIhjW.mjs';
+import { s as shouldReadCodexRateLimits, i as isUnsupportedCodexMethodError } from './rateLimitWindows-5vIuNjko.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();
@@ -127,6 +131,12 @@ class CodexAppServerClient {
   // 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;
@@ -140,6 +150,8 @@ class CodexAppServerClient {
   completedTurnIds = /* @__PURE__ */ new Set();
   /** B-625: turns whose failure has already been forwarded, so a second failed frame is not. */
   failedTurnIds = /* @__PURE__ */ new Set();
+  /** The turn the last pending completion was resolved for (runTurnAndWait reads its verdict). */
+  lastResolvedTurnId = null;
   // B-625: the app-server speaks for every thread it hosts — the session's own and the
   // children `spawn_agent` opens — so a lifecycle frame (turn/started, turn/completed,
   // thread/status/changed, error, thread/closed) is the session's only when its `threadId`
@@ -190,6 +202,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;
   }
@@ -640,6 +656,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) {
@@ -742,6 +759,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 };
@@ -768,6 +786,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,
@@ -797,6 +816,7 @@ ${text}`.slice(-400);
     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,
@@ -844,6 +864,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;
     }
@@ -858,6 +879,7 @@ ${text}`.slice(-400);
   }
   resolvePendingTurn(aborted) {
     if (!this.pendingTurnCompletion) return;
+    this.lastResolvedTurnId = this.pendingTurnCompletion.turnId;
     this.clearTurnWatchdog();
     this.clearThreadStopGrace();
     this.pendingTurnCompletion.resolve(aborted);
@@ -992,6 +1014,7 @@ ${text}`.slice(-400);
       );
       return;
     }
+    if (!pending.turnId && turnId) pending.turnId = turnId;
     this.resolvePendingTurn(aborted);
   }
   async waitForTurnCompletion(timeoutMs) {
@@ -1074,6 +1097,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;
@@ -1091,6 +1118,24 @@ ${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);
+    return { aborted };
+  }
+  /**
+   * `/compact`: Codex compacts the thread in a turn of its own
+   * (`thread/compact/start` answers `{}`, then `turn/started` →
+   * `contextCompaction` item → `turn/completed`, probed on codex-cli 0.154).
+   * Waits for that turn like any other; `failed` is the turn's own verdict.
+   */
+  async compactThreadAndWait(opts) {
+    return this.runTurnAndWait(async () => {
+      if (!this._threadId) {
+        throw new Error("No active thread. Call startThread first.");
+      }
+      await this.request("thread/compact/start", { threadId: this._threadId });
+    }, opts);
+  }
+  async runTurnAndWait(start, opts) {
     if (this.pendingInterrupt) {
       await this.pendingInterrupt;
       await new Promise((resolve) => setTimeout(resolve, 0));
@@ -1108,7 +1153,7 @@ ${text}`.slice(-400);
       this.armTurnWatchdog(timeoutMs);
     });
     try {
-      await this.sendTurn(prompt, opts);
+      await start();
     } catch (err) {
       this.clearTurnWatchdog();
       this.pendingTurnCompletion = null;
@@ -1117,7 +1162,8 @@ ${text}`.slice(-400);
     }
     const aborted = await completion;
     this.clearTurnWatchdog();
-    return { aborted };
+    const turnId = this.lastResolvedTurnId;
+    return { aborted, failed: turnId !== null && this.failedTurnIds.has(turnId) };
   }
   armTurnWatchdog(timeoutMs) {
     this.clearTurnWatchdog();
@@ -1185,6 +1231,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();
@@ -1208,6 +1255,17 @@ ${text}`.slice(-400);
     } while (cursor);
     return models;
   }
+  /**
+   * B-844: the model Codex's effective configuration pins (config.toml,
+   * profile, CLI overrides) via `config/read`; null = nothing pinned.
+   * Throws when this Codex has no `config/read` — the caller then reports
+   * nothing (unknown) and the web sends no model.
+   */
+  async readConfiguredModel(cwd) {
+    const response = await this.request("config/read", { cwd }, 1e4);
+    const model = response?.config?.model;
+    return typeof model === "string" && model.trim() ? model.trim() : null;
+  }
   request(method, params, timeoutMs) {
     const timeout = timeoutMs ?? CodexAppServerClient.REQUEST_TIMEOUT_MS;
     return new Promise((resolve, reject) => {

package/dist/{codexAppServerClient-g8npaIU9.cjs → codexAppServerClient-CO9f4Jr8.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-BILSzq2s.cjs');
+var logger = require('./logger-BP1SW7Cs.cjs');
 var contentLogMetadata = require('./contentLogMetadata-ZSFk_NjQ.cjs');
 var manager = require('./manager-HrEj442o.cjs');
-var _package = require('./package-Bbfq2KR7.cjs');
-var rateLimitWindows = require('./rateLimitWindows-bfwC81Z-.cjs');
+var _package = require('./package-CYDdLA6R.cjs');
+var rateLimitWindows = require('./rateLimitWindows-Cs56YJCH.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();
@@ -129,6 +133,12 @@ class CodexAppServerClient {
   // 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;
@@ -142,6 +152,8 @@ class CodexAppServerClient {
   completedTurnIds = /* @__PURE__ */ new Set();
   /** B-625: turns whose failure has already been forwarded, so a second failed frame is not. */
   failedTurnIds = /* @__PURE__ */ new Set();
+  /** The turn the last pending completion was resolved for (runTurnAndWait reads its verdict). */
+  lastResolvedTurnId = null;
   // B-625: the app-server speaks for every thread it hosts — the session's own and the
   // children `spawn_agent` opens — so a lifecycle frame (turn/started, turn/completed,
   // thread/status/changed, error, thread/closed) is the session's only when its `threadId`
@@ -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;
   }
@@ -642,6 +658,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 +761,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 };
@@ -770,6 +788,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,
@@ -799,6 +818,7 @@ ${text}`.slice(-400);
     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 +866,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;
     }
@@ -860,6 +881,7 @@ ${text}`.slice(-400);
   }
   resolvePendingTurn(aborted) {
     if (!this.pendingTurnCompletion) return;
+    this.lastResolvedTurnId = this.pendingTurnCompletion.turnId;
     this.clearTurnWatchdog();
     this.clearThreadStopGrace();
     this.pendingTurnCompletion.resolve(aborted);
@@ -994,6 +1016,7 @@ ${text}`.slice(-400);
       );
       return;
     }
+    if (!pending.turnId && turnId) pending.turnId = turnId;
     this.resolvePendingTurn(aborted);
   }
   async waitForTurnCompletion(timeoutMs) {
@@ -1076,6 +1099,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;
@@ -1093,6 +1120,24 @@ ${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);
+    return { aborted };
+  }
+  /**
+   * `/compact`: Codex compacts the thread in a turn of its own
+   * (`thread/compact/start` answers `{}`, then `turn/started` →
+   * `contextCompaction` item → `turn/completed`, probed on codex-cli 0.154).
+   * Waits for that turn like any other; `failed` is the turn's own verdict.
+   */
+  async compactThreadAndWait(opts) {
+    return this.runTurnAndWait(async () => {
+      if (!this._threadId) {
+        throw new Error("No active thread. Call startThread first.");
+      }
+      await this.request("thread/compact/start", { threadId: this._threadId });
+    }, opts);
+  }
+  async runTurnAndWait(start, opts) {
     if (this.pendingInterrupt) {
       await this.pendingInterrupt;
       await new Promise((resolve) => setTimeout(resolve, 0));
@@ -1110,7 +1155,7 @@ ${text}`.slice(-400);
       this.armTurnWatchdog(timeoutMs);
     });
     try {
-      await this.sendTurn(prompt, opts);
+      await start();
     } catch (err) {
       this.clearTurnWatchdog();
       this.pendingTurnCompletion = null;
@@ -1119,7 +1164,8 @@ ${text}`.slice(-400);
     }
     const aborted = await completion;
     this.clearTurnWatchdog();
-    return { aborted };
+    const turnId = this.lastResolvedTurnId;
+    return { aborted, failed: turnId !== null && this.failedTurnIds.has(turnId) };
   }
   armTurnWatchdog(timeoutMs) {
     this.clearTurnWatchdog();
@@ -1187,6 +1233,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();
@@ -1210,6 +1257,17 @@ ${text}`.slice(-400);
     } while (cursor);
     return models;
   }
+  /**
+   * B-844: the model Codex's effective configuration pins (config.toml,
+   * profile, CLI overrides) via `config/read`; null = nothing pinned.
+   * Throws when this Codex has no `config/read` — the caller then reports
+   * nothing (unknown) and the web sends no model.
+   */
+  async readConfiguredModel(cwd) {
+    const response = await this.request("config/read", { cwd }, 1e4);
+    const model = response?.config?.model;
+    return typeof model === "string" && model.trim() ? model.trim() : null;
+  }
   request(method, params, timeoutMs) {
     const timeout = timeoutMs ?? CodexAppServerClient.REQUEST_TIMEOUT_MS;
     return new Promise((resolve, reject) => {