very-happy-cli 0.2.192 → 0.2.194

package/dist/{codexCommand-BgpGg-Zy.cjs → codexCommand-DtbDjHZp.cjs}

@@ -1,110 +1,114 @@
 'use strict';
 
-var auth = require('./auth-C9NvNHhL.cjs');
-var index = require('./index-BzAYnYct.cjs');
-var defaultPermissionMode = require('./defaultPermissionMode-BFShzF55.cjs');
-var deterministicJson = require('./deterministicJson-DUN0v3St.cjs');
-var client = require('./client-D8XROyZc.cjs');
+var auth = require('./auth-boIcb7iq.cjs');
+var index = require('./index-BUFrKZeQ.cjs');
+var defaultPermissionMode = require('./defaultPermissionMode-BakXiqRr.cjs');
+var deterministicJson = require('./deterministicJson-ZBFn1jtS.cjs');
+var client = require('./client-CsfPUxLy.cjs');
 var promises = require('node:fs/promises');
 var forkBackfill = require('./forkBackfill-8eLDeS73.cjs');
 var node_crypto = require('node:crypto');
 var cuid2 = require('@paralleldrive/cuid2');
-var api = require('./api-hMDsC6Wg.cjs');
+var api = require('./api-wYwQCJml.cjs');
 var heldInput = require('./heldInput-BOtqFO2r.cjs');
-var attachmentContent = require('./attachmentContent-BEeT2J5n.cjs');
+var attachmentContent = require('./attachmentContent-DB8ZsxGE.cjs');
 var ink = require('ink');
-var sessionLock = require('./sessionLock-BDtSzzKS.cjs');
+var sessionLock = require('./sessionLock-BJ1ngLgm.cjs');
 var React = require('react');
-var codexAppServerClient = require('./codexAppServerClient-q8GHQhyC.cjs');
-var rateLimitReporter = require('./rateLimitReporter-DK5SQuCc.cjs');
-var logger = require('./logger-8su64lqR.cjs');
-var BasePermissionHandler = require('./BasePermissionHandler-N6Ip3tFt.cjs');
-var codexTermination = require('./codexTermination-CVUF0X75.cjs');
+var codexAppServerClient = require('./codexAppServerClient-Bj5vN7sb.cjs');
+var rateLimitReporter = require('./rateLimitReporter-M_IKRRS7.cjs');
+var logger = require('./logger-CepF8C5Z.cjs');
+var BasePermissionHandler = require('./BasePermissionHandler-DKzNFVCh.cjs');
+var codexTermination = require('./codexTermination-CX_FHKT5.cjs');
 var node_child_process = require('node:child_process');
-var persistence = require('./persistence-B4ttN-fR.cjs');
-var machineMetadata = require('./machineMetadata-DYXt3p6u.cjs');
-var configuration = require('./configuration-CXEVKAyF.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-BAOIa_Fs.cjs');
+var persistence = require('./persistence-D0gNvqXe.cjs');
+var machineMetadata = require('./machineMetadata-ObK4hjF0.cjs');
+var configuration = require('./configuration-2Pbg3a0H.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-DQKsD9CW.cjs');
 var projectPath = require('./projectPath-C3ioB4Bu.cjs');
 var path = require('node:path');
-var createSessionMetadata = require('./createSessionMetadata-DwdD_uVo.cjs');
+var createSessionMetadata = require('./createSessionMetadata-BHjzRzPc.cjs');
 var sessionExitLifecycle = require('./sessionExitLifecycle-DFltxXU8.cjs');
-var controlClient = require('./controlClient-j7p5p3_7.cjs');
-var startupSessionCreate = require('./startupSessionCreate-B3ND-917.cjs');
+var controlClient = require('./controlClient-CIqHL07h.cjs');
+var startupSessionCreate = require('./startupSessionCreate-Cmg1gkKS.cjs');
 var authRelay = require('./authRelay-Dy1qU9td.cjs');
-var setupOfflineReconnection = require('./setupOfflineReconnection-DduOsw6p.cjs');
+var setupOfflineReconnection = require('./setupOfflineReconnection-Bd6XsWhA.cjs');
 var trimIdent = require('./trimIdent-4gvk9Wk6.cjs');
 var specialCommands = require('./specialCommands-J3JFOq0J.cjs');
 var constants = require('./constants-VJ0N6WuG.cjs');
 var editPaths = require('./editPaths-Bqp4OFPw.cjs');
 var reconnectEnv = require('./reconnectEnv-B31lY4nR.cjs');
-var ensureDaemonRunning = require('./ensureDaemonRunning-Cq4FYI5Q.cjs');
+var store = require('./store-CkNa6oj4.cjs');
+var node_fs = require('node:fs');
+var codexAccount = require('./codexAccount-BDQjRbtI.cjs');
+var wrapperAccount = require('./wrapperAccount-D2A4DuZy.cjs');
+var ensureDaemonRunning = require('./ensureDaemonRunning-D2ny0yon.cjs');
 require('tweetnacl');
 require('axios');
-require('./time-CaUlWSNJ.cjs');
-require('./browser-Ft0ASDm7.cjs');
+require('./time-Da5GIiCa.cjs');
+require('./browser-Do2MFdq6.cjs');
 require('open');
 require('zod');
 require('./prompt-Bof2aQkI.cjs');
-require('./reportProgressTool-DpFs7pSe.cjs');
-require('./client-Crh8_cNx.cjs');
+require('./reportProgressTool-BLw2_Ohi.cjs');
+require('./client-BIg2LPVx.cjs');
 require('./precheckCompat-CWOi5c9L.cjs');
 require('./agentGuidance-BtBx2xxE.cjs');
-require('node:fs');
 require('node:os');
 require('./pi-DlsrPCTa.cjs');
 require('./fileStore-7qhnbs6N.cjs');
-require('./client-CFHZfh9x.cjs');
+require('./client-BfDga3xi.cjs');
 require('node:util');
-require('./context-3_S_mWz9.cjs');
-require('./sessionOps-DvnEH4PL.cjs');
+require('./context-CLTyu_tQ.cjs');
+require('./sessionOps-BUlpeaUe.cjs');
 require('socket.io-client');
 require('./backgroundTaskActivity-CBvUdj39.cjs');
 require('./resources-BZ_Be0qM.cjs');
-require('./tools-BnmmFZji.cjs');
-require('./peerTools-CANTX_mG.cjs');
+require('./tools-hPD2Hvei.cjs');
+require('./peerTools-BcZAbqBL.cjs');
 require('./ids-B6ZC0HGt.cjs');
-require('./remoteSessionClient-iJMXRN_D.cjs');
+require('./remoteSessionClient-DOWgca08.cjs');
 require('@modelcontextprotocol/sdk/server/mcp.js');
 require('node:http');
 require('@modelcontextprotocol/sdk/server/streamableHttp.js');
 require('./limits-C-a7gr04.cjs');
-require('./downloadTarget-BrrQEDxg.cjs');
+require('./downloadTarget-DlmqPQp9.cjs');
 require('./terminals-B_bfC9c2.cjs');
 require('./terminalTitleSuggest-DhvRFX3H.cjs');
 require('./tmuxSocket-D-Xt6Vn-.cjs');
-require('./bootstrap-DsZGc69k.cjs');
-require('./package-iuLlSiSF.cjs');
+require('./bootstrap-kywZ0tvD.cjs');
+require('./package-C7WgesIw.cjs');
 require('./webPanels-FCgFKvVe.cjs');
-require('./pushNotifications-BqFoLye2.cjs');
+require('./pushNotifications-CH0XVPQe.cjs');
 require('./contentLogMetadata-ZSFk_NjQ.cjs');
 require('./previewPath-B0rBdhy1.cjs');
 require('crypto');
-require('./lidState-DqoN7zH4.cjs');
+require('./lidState-DYeb7Wud.cjs');
 require('os');
 require('child_process');
 require('node:events');
-require('./registerCommonHandlers-m6pxxf2J.cjs');
+require('./registerCommonHandlers-D4uXC0he.cjs');
 require('util');
 require('fs/promises');
 require('path');
 require('cross-spawn');
-require('./sync-_2lsZ1U2.cjs');
+require('./sync-BfrnSdL1.cjs');
 require('chalk');
 require('./cliUpdate-DsKXPFYp.cjs');
 require('./processTreeSnapshot-mDbnuojn.cjs');
 require('node:readline');
 require('./manager-HrEj442o.cjs');
 require('@anthropic-ai/sandbox-runtime');
-require('./rateLimitWindows-DBfiuYeg.cjs');
+require('./rateLimitWindows-B9PERFm1.cjs');
 require('./processTree-CMHWlVse.cjs');
 require('./detectCLI-BuYR_Qxe.cjs');
 require('fs');
-require('./localHappyAgentAuth-BnGCpHRX.cjs');
+require('./localHappyAgentAuth-CScN2McN.cjs');
 require('./fsMkdir-0K3yENml.cjs');
 require('./types-CRS-srZK.cjs');
 require('url');
-require('./spawnHappyCLI-DJdhX_Qx.cjs');
+require('./claudeAccountEnv-CEX_EMZr.cjs');
+require('./spawnHappyCLI-C0XAWy8V.cjs');
 require('./doctorReadiness-Dl6yRQCy.cjs');
 
 function getStartedSubagents(state) {
@@ -1186,7 +1190,8 @@ async function resumeExistingThread(opts) {
     const resumedThread = await opts.client.resumeThread({
       threadId: opts.threadId,
       cwd: opts.cwd,
-      mcpServers: opts.mcpServers
+      mcpServers: opts.mcpServers,
+      ...opts.model ? { model: opts.model } : {}
     });
     opts.session.updateMetadata((currentMetadata) => ({
       ...currentMetadata,
@@ -1464,6 +1469,70 @@ function codexPublishablePermissionMode(mode) {
   return typeof mode === "string" && CODEX_REMOTE_PERMISSION_MODES.includes(mode) ? mode : null;
 }
 
+const MACHINE_CODEX_ACCOUNT = { profile: null, overrides: { env: {} }, unavailable: false, notices: [], cleanup: () => {
+} };
+function loadCodexWrapperAccount(happyHome, sessionId, spawnAccountId, env = process.env, now = Date.now()) {
+  let bindings = store.readSessionBindings(happyHome);
+  if (wrapperAccount.shouldRecordSpawnAccount(spawnAccountId, sessionId in bindings)) {
+    store.writeSessionBinding(happyHome, sessionId, { account: spawnAccountId });
+    bindings = { ...bindings, [sessionId]: { account: spawnAccountId } };
+  }
+  const probe = store.defaultSecretProbe(env);
+  const resolution = codexAccount.resolveCodexAccount(sessionId, {
+    home: happyHome,
+    accounts: store.readAccounts(happyHome),
+    bindings,
+    providers: codexAccount.readCodexProviders(env),
+    fileReadable: probe.fileReadable,
+    env,
+    nodePath: process.execPath,
+    envKeyCopyPath: (id) => path.join(happyHome, "tmp", "accounts", `key-${process.pid}-${id}`)
+  });
+  if (resolution.kind === "machine") return MACHINE_CODEX_ACCOUNT;
+  let cleanup = () => {
+  };
+  if (resolution.kind === "active" && resolution.envKeyCopy) {
+    const { name, path: path$1 } = resolution.envKeyCopy;
+    node_fs.mkdirSync(path.dirname(path$1), { recursive: true, mode: 448 });
+    node_fs.writeFileSync(path$1, (env[name] ?? "").trim() + "\n", { mode: 384 });
+    node_fs.chmodSync(path$1, 384);
+    cleanup = () => node_fs.rmSync(path$1, { force: true });
+  }
+  for (const key of resolution.unset) delete env[key];
+  if (resolution.kind === "active" && resolution.envKeyCopy) delete env[resolution.envKeyCopy.name];
+  if (resolution.kind === "unavailable") {
+    return { profile: resolution.profile, overrides: { env: {} }, unavailable: true, notices: [wrapperAccount.unavailableNotice(resolution.profile)], cleanup };
+  }
+  const overrides = { env: {}, modelProvider: resolution.modelProvider, ...resolution.config ? { config: resolution.config } : {} };
+  if (resolution.codexHome) {
+    codexAccount.syncCodexOverlay(resolution.codexHome, codexAccount.baseCodexHome(env), now);
+    overrides.env.CODEX_HOME = resolution.codexHome;
+  }
+  return {
+    profile: resolution.profile,
+    overrides,
+    ...resolution.pinnedModel ? { pinnedModel: resolution.pinnedModel } : {},
+    ...resolution.models ? { models: resolution.models } : {},
+    unavailable: false,
+    notices: [],
+    cleanup
+  };
+}
+function markCodexAccountRejected(happyHome, accountId, now = Date.now()) {
+  try {
+    const file = store.readAccountsFileV2(happyHome);
+    const record = file.accounts[accountId];
+    if (!record || record.agent !== "codex") return null;
+    const status = record.kind === "codex-chatgpt" ? "expired" : "invalid";
+    if (record.check?.status === status) return status;
+    record.check = { status, at: now, detail: "rejected during a session" };
+    store.writeAccountsFile(happyHome, file);
+    return status;
+  } catch {
+    return null;
+  }
+}
+
 const DEFAULT_CODEX_MODEL = void 0;
 const DEFAULT_CODEX_EFFORT = "medium";
 async function runCodex(opts) {
@@ -1480,6 +1549,8 @@ async function runCodex(opts) {
     console.error("  \x1B[36mvery-happy claude\x1B[0m\n");
     process.exit(1);
   }
+  const spawnAccountId = process.env[store.SPAWN_ACCOUNT_ENV] || void 0;
+  delete process.env[store.SPAWN_ACCOUNT_ENV];
   const sessionTag = node_crypto.randomUUID();
   api.connectionState.setBackend("Codex");
   const api$1 = await api.ApiClient.create(opts.credentials);
@@ -1508,7 +1579,7 @@ async function runCodex(opts) {
     dangerouslySkipPermissions: initialPermissionMode === "yolo" || initialPermissionMode === "bypassPermissions",
     ...forkedFromSessionId ? { parentSessionId: forkedFromSessionId } : {},
     ...forkedFromMessageId ? { forkedFromMessageId } : {},
-    capabilities: [index.PROMPT_QUEUE_CAPABILITY, forkBackfill.FORK_BACKFILL_CAPABILITY, persistence.HIBERNATION_CAPABILITY, sessionLock.AUTO_RESTART_CAPABILITY, index.CODEX_STEER_CAPABILITY, index.PROJECT_SESSION_CAPABILITY, index.CODEX_COMPACT_CAPABILITY, index.RUN_INTENT_CAPABILITY]
+    capabilities: [index.PROMPT_QUEUE_CAPABILITY, forkBackfill.FORK_BACKFILL_CAPABILITY, persistence.HIBERNATION_CAPABILITY, sessionLock.AUTO_RESTART_CAPABILITY, index.CODEX_STEER_CAPABILITY, index.PROJECT_SESSION_CAPABILITY, index.CODEX_COMPACT_CAPABILITY, index.RUN_INTENT_CAPABILITY, index.AGENT_PROFILE_SESSION_CAPABILITY]
   });
   metadata.attachmentKinds = [...attachmentContent.CLAUDE_ATTACHMENT_KINDS];
   metadata.stickyModel = null;
@@ -1570,6 +1641,21 @@ async function runCodex(opts) {
     }
   }
   const resumedEffort = reconnectSeeded && response ? index.restoredEffort(response.metadata, { useReportedLevel: true }) : void 0;
+  let codexAccount$1 = MACHINE_CODEX_ACCOUNT;
+  if (response) {
+    try {
+      codexAccount$1 = loadCodexWrapperAccount(configuration.configuration.happyHomeDir, response.id, spawnAccountId);
+    } catch (error) {
+      const reason = error instanceof Error ? error.message : String(error);
+      logger.logger.debug(`[START] B-850b account resolution failed: ${reason}`);
+      if (spawnAccountId) {
+        codexAccount$1 = { ...MACHINE_CODEX_ACCOUNT, profile: { id: spawnAccountId, label: spawnAccountId, kind: "unknown", status: "unavailable", reason: "error" }, unavailable: true, notices: [`Account "${spawnAccountId}" could not be loaded: ${reason}`] };
+      }
+    }
+  }
+  const accountSwitched = !!reconnectSessionId && reconnectSeeded && !!response && codexAccount.codexAccountSwitched(response.metadata?.agentProfile, codexAccount$1.profile);
+  if (accountSwitched && !codexAccount$1.profile) codexAccount$1 = { ...codexAccount$1, overrides: { env: {}, modelProvider: codexAccount.readCodexDefaultProvider() } };
+  logger.logger.debug(`[START] B-850b account: ${codexAccount$1.profile ? `${codexAccount$1.profile.id} ${codexAccount$1.profile.kind} ${codexAccount$1.profile.status}` : "machine login"}${accountSwitched ? " (switched)" : ""}`);
   let session;
   let permissionHandler;
   let client$1;
@@ -1598,6 +1684,25 @@ async function runCodex(opts) {
     if (!wakingFromHibernation) void session.cancelUndeliveredQueuedInputs(reconnectReplay ? { maxSeq: reconnectReplay.seq } : void 0);
     session.updateMetadata((meta) => sessionLock.mergeReconnectMetadata(meta, metadata, Date.now()));
   }
+  session.updateMetadata((current) => ({
+    ...current,
+    agentProfile: codexAccount$1.profile,
+    ...accountSwitched ? { stickyModel: null, modelIntent: null } : {}
+  }));
+  for (const notice of codexAccount$1.notices) {
+    session.sendSessionEvent({ type: "message", message: notice, kind: codexAccount$1.unavailable ? "agent-profile-unavailable" : "agent-profile-warning" });
+  }
+  let historyRejectionReported = false;
+  const noteAccountFailure = (text) => {
+    if (!codexAccount$1.profile || codexAccount$1.unavailable) return;
+    if (accountSwitched && !historyRejectionReported && codexAccount.isHistoryRejectedError(text)) {
+      historyRejectionReported = true;
+      session.sendSessionEvent({ type: "message", message: `This conversation's history cannot continue on account "${codexAccount$1.profile.label}". Start a new session on it, or switch back to the previous account.`, kind: "agent-profile-history-rejected" });
+    } else if (codexAccount.isCodexAuthRejection(text)) {
+      const marked = markCodexAccountRejected(configuration.configuration.happyHomeDir, codexAccount$1.profile.id);
+      if (marked) session.sendSessionEvent({ type: "message", message: `Account "${codexAccount$1.profile.label}" was rejected (${marked}). Sign in again or switch accounts.`, kind: "agent-profile-auth-failed" });
+    }
+  };
   if (response) {
     try {
       logger.logger.debug(`[START] Reporting session ${response.id} to daemon`);
@@ -1690,6 +1795,11 @@ async function runCodex(opts) {
   };
   let userMessageDelivery = Promise.resolve();
   session.onUserMessage((message) => {
+    if (codexAccount$1.unavailable && codexAccount$1.profile) {
+      if (message.localKey) session.sendQueueCancelReason([message.localKey], "failed");
+      session.sendSessionEvent({ type: "message", message: codexAccount$1.notices[0] ?? `Account "${codexAccount$1.profile.label}" is unavailable.`, kind: "agent-profile-unavailable" });
+      return;
+    }
     const downloads = session.drainAttachmentsForUserMessage();
     userMessageDelivery = userMessageDelivery.then(async () => {
       const attachments = await downloads;
@@ -1954,6 +2064,7 @@ async function runCodex(opts) {
     process.stdin.setEncoding("utf8");
   }
   client$1 = new codexAppServerClient.CodexAppServerClient(sandboxConfig);
+  client$1.setAccountOverrides(codexAccount$1.overrides);
   const idleRelease = new CodexIdleReleaseTimer({
     delayMs: resolveCodexIdleReleaseMs(process.env[CODEX_IDLE_RELEASE_ENV]),
     isIdle: () => shouldReleaseIdleCodex({
@@ -2023,6 +2134,7 @@ async function runCodex(opts) {
       if (failure) {
         messageBuffer.addMessage(`Task failed: ${failure}`, "status");
         session.sendSessionEvent({ type: "message", message: `Codex error: ${failure}` });
+        noteAccountFailure(failure);
       } else {
         messageBuffer.addMessage("Task completed", "status");
       }
@@ -2031,6 +2143,7 @@ async function runCodex(opts) {
       if (failure) {
         messageBuffer.addMessage(`Turn aborted: ${failure}`, "status");
         session.sendSessionEvent({ type: "message", message: `Codex error: ${failure}` });
+        noteAccountFailure(failure);
       } else {
         messageBuffer.addMessage("Turn aborted", "status");
       }
@@ -2137,6 +2250,11 @@ async function runCodex(opts) {
         logger.logger.debug("[Codex] config/read unavailable", safeCodexErrorMetadata(error));
       }
       machineDefaultModel = configured?.model ?? discoveredModels.find((model) => model.isDefault)?.model;
+      const accountDefault = codexAccount.codexAccountDefaultModel(codexAccount$1, configured?.model ?? null, discoveredModels);
+      if (codexAccount$1.profile && !codexAccount$1.unavailable) {
+        machineDefaultModel = accountDefault;
+        if (codexAccount$1.models?.length) discoveredModels = codexAccount.accountModelsAsCatalog(codexAccount$1.models, discoveredModels);
+      }
       if (discoveredModels.length > 0 || configured) {
         session.updateMetadata((metadata2) => ({
           ...metadata2,
@@ -2149,22 +2267,30 @@ async function runCodex(opts) {
               defaultReasoningEffort: model.defaultReasoningEffort
             }))
           } : {},
-          defaultModelCode: configured?.model ?? discoveredModels.find((model) => model.isDefault)?.model,
-          ...configured ? { configuredModel: configured.model } : {}
+          defaultModelCode: codexAccount$1.profile && !codexAccount$1.unavailable ? accountDefault : configured?.model ?? discoveredModels.find((model) => model.isDefault)?.model,
+          ...configured ? { configuredModel: codexAccount$1.profile && !codexAccount$1.unavailable ? accountDefault ?? null : configured.model } : {}
         }));
       }
     } catch (error) {
       logger.logger.debug("[Codex] Model discovery unavailable; using compatibility fallback", safeCodexErrorMetadata(error));
     }
-    if (opts.resumeThreadId) {
-      await resumeExistingThread({
-        client: client$1,
-        session,
-        messageBuffer,
-        threadId: opts.resumeThreadId,
-        cwd: process.cwd(),
-        mcpServers
-      });
+    if (opts.resumeThreadId && !codexAccount$1.unavailable) {
+      try {
+        await resumeExistingThread({
+          client: client$1,
+          session,
+          messageBuffer,
+          threadId: opts.resumeThreadId,
+          cwd: process.cwd(),
+          mcpServers,
+          // B-850b: after an account switch the thread moves to the
+          // new account's model (its old one is sticky otherwise).
+          ...accountSwitched && machineDefaultModel ? { model: machineDefaultModel } : {}
+        });
+      } catch (error) {
+        noteAccountFailure(error instanceof Error ? error.message : String(error));
+        throw error;
+      }
       first = false;
       appendSystemPromptInjected = true;
     }
@@ -2360,7 +2486,10 @@ async function runCodex(opts) {
         }
         if (!client$1.hasActiveThread()) {
           const startedThread = await client$1.startThread({
-            model: turnModel,
+            // B-850b: a new thread on an account starts on the account's
+            // model — Codex would otherwise pick config.toml's, which
+            // belongs to the machine's own provider.
+            model: turnModel ?? (codexAccount$1.profile && !codexAccount$1.unavailable ? machineDefaultModel : void 0),
             cwd: process.cwd(),
             approvalPolicy: executionPolicy.approvalPolicy,
             sandbox: executionPolicy.sandbox,
@@ -2415,6 +2544,7 @@ async function runCodex(opts) {
         if (reason) {
           messageBuffer.addMessage(`Task failed: ${reason}`, "status");
           session.sendSessionEvent({ type: "message", message: `Codex error: ${reason}` });
+          noteAccountFailure(reason);
         } else {
           const tail = codexStderrTailOf(error);
           messageBuffer.addMessage("Process exited unexpectedly", "status");

package/dist/{codexTermination-CVUF0X75.cjs → codexTermination-CX_FHKT5.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 var node_crypto = require('node:crypto');
-var logger = require('./logger-8su64lqR.cjs');
+var logger = require('./logger-CepF8C5Z.cjs');
 var sessionExitLifecycle = require('./sessionExitLifecycle-DFltxXU8.cjs');
 
 class BaseReasoningProcessor {

package/dist/{codexTermination-s9fd1gkA.mjs → codexTermination-DxLR-bb5.mjs}

@@ -1,5 +1,5 @@
 import { randomUUID } from 'node:crypto';
-import { l as logger } from './logger-Fd_rNvgd.mjs';
+import { l as logger } from './logger-SGCwRIV5.mjs';
 import { O as OFFLINE_EXIT_STAMP_TIMEOUT_MS } from './sessionExitLifecycle-CzkLIgNZ.mjs';
 
 class BaseReasoningProcessor {

package/dist/{codexThreadFork-5kwoKjMu.cjs → codexThreadFork-C6ZmcT2z.cjs}

@@ -112,7 +112,9 @@ async function forkCodexBeforeUserMessage(client, opts) {
     throw new Error("Cannot safely rewind a user message inside an existing turn");
   }
   if (sourceCut.index === 0) return { type: "success", startFresh: true };
-  const kept = (source.turns ?? []).slice(0, sourceCut.index);
+  return forkThroughTurns(client, opts, (source.turns ?? []).slice(0, sourceCut.index));
+}
+async function forkThroughTurns(client, opts, kept) {
   const expected = kept.map(firstItemId);
   const forked = await client.forkThread({ threadId: opts.threadId, cwd: opts.cwd, lastTurnId: kept[kept.length - 1].id });
   if (forked.threadId === opts.threadId) throw new Error("Codex did not create an independent fork");
@@ -125,8 +127,27 @@ async function forkCodexBeforeUserMessage(client, opts) {
   }
   return { type: "success", newCodexThreadId: forked.threadId };
 }
+function isUnfinishedTurn(turn) {
+  return turn?.status === "inProgress" || turn?.status === "interrupted";
+}
+async function forkCodexCompletedTurns(client, opts) {
+  const { thread: source } = await client.readThread({ threadId: opts.threadId, includeTurns: true });
+  const turns = source.turns ?? [];
+  const last = turns[turns.length - 1];
+  if (!isUnfinishedTurn(last)) {
+    return { ...await forkCodexThread(client, opts), excludedPrompts: [] };
+  }
+  const excludedPrompts = (last.items ?? []).flatMap((item) => {
+    const text = textFromUserItem(item);
+    return text ? [text] : [];
+  });
+  const kept = turns.slice(0, -1);
+  if (kept.length === 0) return { type: "success", startFresh: true, excludedPrompts };
+  return { ...await forkThroughTurns(client, opts, kept), excludedPrompts };
+}
 
 exports.CodexForkRewindPointNotFoundError = CodexForkRewindPointNotFoundError;
 exports.forkCodexBeforeUserMessage = forkCodexBeforeUserMessage;
+exports.forkCodexCompletedTurns = forkCodexCompletedTurns;
 exports.forkCodexThread = forkCodexThread;
 exports.listCodexRewindPoints = listCodexRewindPoints;

package/dist/{codexThreadFork-DobPd19R.mjs → codexThreadFork-CVzAqELg.mjs}

@@ -110,7 +110,9 @@ async function forkCodexBeforeUserMessage(client, opts) {
     throw new Error("Cannot safely rewind a user message inside an existing turn");
   }
   if (sourceCut.index === 0) return { type: "success", startFresh: true };
-  const kept = (source.turns ?? []).slice(0, sourceCut.index);
+  return forkThroughTurns(client, opts, (source.turns ?? []).slice(0, sourceCut.index));
+}
+async function forkThroughTurns(client, opts, kept) {
   const expected = kept.map(firstItemId);
   const forked = await client.forkThread({ threadId: opts.threadId, cwd: opts.cwd, lastTurnId: kept[kept.length - 1].id });
   if (forked.threadId === opts.threadId) throw new Error("Codex did not create an independent fork");
@@ -123,5 +125,23 @@ async function forkCodexBeforeUserMessage(client, opts) {
   }
   return { type: "success", newCodexThreadId: forked.threadId };
 }
+function isUnfinishedTurn(turn) {
+  return turn?.status === "inProgress" || turn?.status === "interrupted";
+}
+async function forkCodexCompletedTurns(client, opts) {
+  const { thread: source } = await client.readThread({ threadId: opts.threadId, includeTurns: true });
+  const turns = source.turns ?? [];
+  const last = turns[turns.length - 1];
+  if (!isUnfinishedTurn(last)) {
+    return { ...await forkCodexThread(client, opts), excludedPrompts: [] };
+  }
+  const excludedPrompts = (last.items ?? []).flatMap((item) => {
+    const text = textFromUserItem(item);
+    return text ? [text] : [];
+  });
+  const kept = turns.slice(0, -1);
+  if (kept.length === 0) return { type: "success", startFresh: true, excludedPrompts };
+  return { ...await forkThroughTurns(client, opts, kept), excludedPrompts };
+}
 
-export { CodexForkRewindPointNotFoundError as C, forkCodexBeforeUserMessage as a, forkCodexThread as f, listCodexRewindPoints as l };
+export { CodexForkRewindPointNotFoundError as C, forkCodexCompletedTurns as a, forkCodexBeforeUserMessage as b, forkCodexThread as f, listCodexRewindPoints as l };

package/dist/{config-BF8XgLyc.mjs → config-CIvXVGlP.mjs}

@@ -2,15 +2,15 @@ import { existsSync, readFileSync, mkdirSync, writeFileSync } from 'fs';
 import { join } from 'path';
 import { homedir } from 'os';
 import { execSync } from 'child_process';
-import { l as logger } from './logger-Fd_rNvgd.mjs';
+import { l as logger } from './logger-SGCwRIV5.mjs';
 import { D as DEFAULT_GEMINI_MODEL, G as GEMINI_MODEL_ENV } from './constants-BC4St0xd.mjs';
 import 'chalk';
 import 'node:util';
-import './configuration-IhRiLDVe.mjs';
+import './configuration-rTcdHkhE.mjs';
 import 'node:fs';
 import 'node:os';
 import 'node:path';
-import './package-6KkRAops.mjs';
+import './package-Q_ELj5DL.mjs';
 import 'node:fs/promises';
 import './trimIdent-BAjmv_TG.mjs';
 

package/dist/{config-BAjyTyYp.cjs → config-Cv-A-Bw0.cjs}

@@ -4,15 +4,15 @@ var require$$0 = require('fs');
 var require$$1 = require('path');
 var os = require('os');
 var child_process = require('child_process');
-var logger = require('./logger-8su64lqR.cjs');
+var logger = require('./logger-CepF8C5Z.cjs');
 var constants = require('./constants-VJ0N6WuG.cjs');
 require('chalk');
 require('node:util');
-require('./configuration-CXEVKAyF.cjs');
+require('./configuration-2Pbg3a0H.cjs');
 require('node:fs');
 require('node:os');
 require('node:path');
-require('./package-iuLlSiSF.cjs');
+require('./package-C7WgesIw.cjs');
 require('node:fs/promises');
 require('./trimIdent-4gvk9Wk6.cjs');
 

package/dist/{configuration-CXEVKAyF.cjs → configuration-2Pbg3a0H.cjs}

@@ -3,7 +3,7 @@
 var node_fs = require('node:fs');
 var os = require('node:os');
 var path = require('node:path');
-var _package = require('./package-iuLlSiSF.cjs');
+var _package = require('./package-C7WgesIw.cjs');
 var promises = require('node:fs/promises');
 
 const PRIVATE_DIRECTORY_MODE = 448;

package/dist/{configuration-IhRiLDVe.mjs → configuration-rTcdHkhE.mjs}

@@ -1,7 +1,7 @@
 import { mkdirSync, chmodSync, readdirSync, statSync, appendFileSync, writeFileSync, existsSync, readFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
-import { p as packageJson } from './package-6KkRAops.mjs';
+import { p as packageJson } from './package-Q_ELj5DL.mjs';
 import { mkdir, chmod, writeFile } from 'node:fs/promises';
 
 const PRIVATE_DIRECTORY_MODE = 448;

package/dist/{connect-LZh1gr08.mjs → connect-B9Bl68PF.mjs}

@@ -1,12 +1,12 @@
 import chalk from 'chalk';
 import { homedir } from 'os';
 import { join } from 'path';
-import { b as readCredentialsForConfiguredRelay } from './persistence-DWcHe035.mjs';
-import { A as ApiClient } from './api-_LeBScjg.mjs';
-import { f as ensurePrivateDirectorySync, w as writePrivateFileSync } from './configuration-IhRiLDVe.mjs';
+import { b as readCredentialsForConfiguredRelay } from './persistence-mr4Y484W.mjs';
+import { A as ApiClient } from './api-aE60mNjs.mjs';
+import { f as ensurePrivateDirectorySync, w as writePrivateFileSync } from './configuration-rTcdHkhE.mjs';
 import { createServer } from 'http';
 import { randomBytes, createHash } from 'crypto';
-import { o as openBrowser } from './browser-BUIaSHK2.mjs';
+import { o as openBrowser } from './browser-CFfZM3yg.mjs';
 import { exec } from 'child_process';
 import { promisify } from 'util';
 import 'node:fs/promises';
@@ -15,29 +15,29 @@ import 'zod';
 import './authRelay-DhQhkBvX.mjs';
 import 'node:crypto';
 import 'tweetnacl';
-import './logger-Fd_rNvgd.mjs';
+import './logger-SGCwRIV5.mjs';
 import 'node:util';
 import 'node:path';
 import 'axios';
-import './lidState-CZOXXdzv.mjs';
+import './lidState-zy20u7T3.mjs';
 import 'node:events';
 import 'socket.io-client';
-import './pushNotifications-DkQ0yvFs.mjs';
-import './index-DYD3GM1m.mjs';
+import './pushNotifications-DjEl8G0a.mjs';
+import './index-D1YnIih6.mjs';
 import '@paralleldrive/cuid2';
 import './contentLogMetadata-BlWI0egu.mjs';
 import './limits-DIo7rEBR.mjs';
-import './time-bzmet4s5.mjs';
-import './registerCommonHandlers-yQ7Ru-l0.mjs';
+import './time-0Ru4clBD.mjs';
+import './registerCommonHandlers-CND00Dpj.mjs';
 import 'fs/promises';
 import 'cross-spawn';
 import './projectPath-BTBIMB57.mjs';
 import 'url';
-import './sync-JoEZKRo8.mjs';
+import './sync-DVcNkv8e.mjs';
 import './backgroundTaskActivity-8PdPxrvy.mjs';
-import './controlClient-8ILulwjc.mjs';
+import './controlClient-BIdGnYBo.mjs';
 import 'node:os';
-import './package-6KkRAops.mjs';
+import './package-Q_ELj5DL.mjs';
 import 'open';
 
 const CLIENT_ID$2 = "app_EMoamEEZ73f0CkXaXp7hrann";