very-happy-cli 0.2.192 → 0.2.194

package/dist/{spawn-CL3cUc7b.mjs → spawn-BPioepNz.mjs}

@@ -1,19 +1,19 @@
-import { r as resolveSpawnPermissionMode, c as chooseProject, j as joinProject, a as resolveFirstMessageMeta, w as waitsForModelCatalog, s as sanitizeSpawnPermissionMode, A as ALLOWED_SPAWN_PERMISSION_MODES, S as SPAWN_AGENTS } from './spawnAgents-CRMfOJhh.mjs';
-import { s as sharedProjectsClient } from './client-Bm4oKvW7.mjs';
+import { r as resolveSpawnPermissionMode, c as chooseProject, j as joinProject, a as resolveFirstMessageMeta, w as waitsForModelCatalog, s as sanitizeSpawnPermissionMode, A as ALLOWED_SPAWN_PERMISSION_MODES, S as SPAWN_AGENTS } from './spawnAgents-I29H9nO8.mjs';
+import { s as sharedProjectsClient } from './client-Cbxr9VUE.mjs';
 import chalk from 'chalk';
 import { readFileSync, statSync } from 'node:fs';
 import { resolve } from 'node:path';
-import { b as checkIfDaemonRunningAndCleanupStaleState, f as spawnDaemonSession, h as stopDaemonSession } from './controlClient-8ILulwjc.mjs';
-import { c as readPersistedSessions } from './persistence-DWcHe035.mjs';
-import { t as parseLatestModelTable } from './index-DYD3GM1m.mjs';
-import { c as configuration } from './configuration-IhRiLDVe.mjs';
+import { b as checkIfDaemonRunningAndCleanupStaleState, f as spawnDaemonSession, h as stopDaemonSession } from './controlClient-BIdGnYBo.mjs';
+import { c as readPersistedSessions, r as readSettings } from './persistence-mr4Y484W.mjs';
+import { u as parseLatestModelTable, v as resolveLaunchAgentProfile } from './index-D1YnIih6.mjs';
+import { c as configuration } from './configuration-rTcdHkhE.mjs';
 import { g as getProjectPath } from './path-D2wdaNSk.mjs';
-import { f as forkSession, F as ForkSourceMissingError } from './claudeSessionFork-8AA47z8Y.mjs';
-import { C as CodexAppServerClient } from './codexAppServerClient-BWJbLCQn.mjs';
-import { f as forkCodexThread } from './codexThreadFork-DobPd19R.mjs';
-import { e as sendUserMessage, f as readSessionMetadata, g as waitForSessionKey, s as sessionWebUrl } from './sessionOps-gU88-W9F.mjs';
-import { i as isValidSpawnOrigin } from './createSessionMetadata-oyaTZm1b.mjs';
-import { l as logger } from './logger-Fd_rNvgd.mjs';
+import { f as forkSession, a as forkCompletedTurns, F as ForkSourceMissingError } from './claudeSessionFork-BrJTncNL.mjs';
+import { C as CodexAppServerClient } from './codexAppServerClient-HKAm8f_D.mjs';
+import { f as forkCodexThread, a as forkCodexCompletedTurns } from './codexThreadFork-CVzAqELg.mjs';
+import { e as sendUserMessage, f as readSessionMetadata, g as waitForSessionKey, s as sessionWebUrl, h as analyzeLatestTurn, i as readSessionLog, j as TURN_WINDOW } from './sessionOps-C9wRmCBg.mjs';
+import { i as isValidSpawnOrigin } from './createSessionMetadata-PrN-dT7K.mjs';
+import { l as logger } from './logger-SGCwRIV5.mjs';
 import { w as waitForForkBackfill } from './forkBackfill-DYIjlN1Z.mjs';
 import 'node:fs/promises';
 import 'zod';
@@ -22,17 +22,17 @@ import 'node:crypto';
 import 'tweetnacl';
 import '@paralleldrive/cuid2';
 import 'node:os';
-import './package-6KkRAops.mjs';
+import './package-Q_ELj5DL.mjs';
 import 'node:readline';
 import 'node:child_process';
 import 'cross-spawn';
 import './contentLogMetadata-BlWI0egu.mjs';
 import './manager-BEsI4qt3.mjs';
 import '@anthropic-ai/sandbox-runtime';
-import './rateLimitWindows-Da5AR-4u.mjs';
+import './rateLimitWindows-a2yE3kCv.mjs';
 import './processTree-CP5IvQ2Z.mjs';
 import 'axios';
-import './time-bzmet4s5.mjs';
+import './time-0Ru4clBD.mjs';
 import './specialCommands-MXUN0wfI.mjs';
 import 'socket.io-client';
 import './backgroundTaskActivity-8PdPxrvy.mjs';
@@ -80,10 +80,14 @@ function resolveForkSource(sessionId, persisted) {
   if (!nonEmpty(metadata.claudeSessionId)) throw new Error(`Session ${sessionId} has no Claude conversation id yet (it never ran a turn) \u2014 nothing to fork.`);
   return { agent: "claude", directory, claudeSessionId: metadata.claudeSessionId, permissionMode, parentSessionId: sessionId };
 }
-async function forkProviderConversation(source) {
+async function forkProviderConversation(source, opts = {}) {
   if (source.agent === "claude") {
     try {
-      return { resumeClaudeSessionId: await forkSession(getProjectPath(source.directory), source.claudeSessionId) };
+      const projectDir = getProjectPath(source.directory);
+      if (!opts.running) return { resumeClaudeSessionId: await forkSession(projectDir, source.claudeSessionId) };
+      const result = await forkCompletedTurns(projectDir, source.claudeSessionId);
+      if ("startFresh" in result) throw new Error(NO_COMPLETED_TURN);
+      return { resumeClaudeSessionId: result.newClaudeSessionId, excludedPrompts: result.excludedPrompts };
     } catch (error) {
       if (error instanceof ForkSourceMissingError) throw new Error("Claude session file not found on this machine");
       throw error;
@@ -92,12 +96,18 @@ async function forkProviderConversation(source) {
   const client = new CodexAppServerClient();
   await client.connect();
   try {
-    const result = await forkCodexThread(client, { threadId: source.codexThreadId, cwd: source.directory });
-    return { resumeCodexThreadId: result.newCodexThreadId };
+    if (!opts.running) {
+      const result2 = await forkCodexThread(client, { threadId: source.codexThreadId, cwd: source.directory });
+      return { resumeCodexThreadId: result2.newCodexThreadId };
+    }
+    const result = await forkCodexCompletedTurns(client, { threadId: source.codexThreadId, cwd: source.directory });
+    if ("startFresh" in result) throw new Error(NO_COMPLETED_TURN);
+    return { resumeCodexThreadId: result.newCodexThreadId, excludedPrompts: result.excludedPrompts };
   } finally {
     await client.disconnect();
   }
 }
+const NO_COMPLETED_TURN = "the session is running its first turn \u2014 nothing has completed yet to fork; retry once it ends.";
 
 function spawnEnvironmentVariables(env, hasPrompt) {
   return hasPrompt ? { ...env, HAPPY_FIRST_MESSAGE_FROM_CLI: "1" } : env;
@@ -222,7 +232,7 @@ ${chalk.bold("Options:")}
                             machine runs (claude: newest Opus; codex: newest
                             sol its Codex lists; gemini: newest pro), else the
                             machine default. 'default' = the machine default.
-  --account <id>         Claude account on this machine (\`very-happy account
+  --account <id>         Claude / Codex account on this machine (\`very-happy account
                             list\`); 'machine' = the machine's own login.
                             Default = the machine's default account, if set. A
                             missing or expired account fails the spawn.
@@ -230,6 +240,9 @@ ${chalk.bold("Options:")}
                             web's fork): copies its conversation and continues
                             it in a new session, in the same directory and with
                             the same agent (so --dir / --agent are not needed).
+                            A source mid-turn forks its completed turns only;
+                            the prompt left out is printed (--json:
+                            excludedPrompts). The source is not interrupted.
   --env KEY=VALUE        Extra environment for the session process. Repeatable.
                             \${VAR} is expanded against the daemon's environment;
                             an unresolved reference fails the spawn.
@@ -264,6 +277,16 @@ const defaultFirstMessageDeps = {
   sendUserMessage,
   warn: (message) => console.error(chalk.yellow("Warning:"), message)
 };
+async function sourceTurnRunning(sessionId) {
+  const persisted = readPersistedSessions()[sessionId];
+  if (!persisted) return false;
+  try {
+    return !analyzeLatestTurn(await readSessionLog(sessionId, persisted, TURN_WINDOW)).ended;
+  } catch (error) {
+    console.error(chalk.dim(`(could not read whether ${sessionId} is mid-turn \u2014 forking everything: ${error instanceof Error ? error.message : String(error)})`));
+    return false;
+  }
+}
 async function waitForModelCatalog(readMetadata, initial, knobs = {}) {
   const timeoutMs = knobs.timeoutMs ?? 8e3;
   const pollMs = knobs.pollMs ?? 400;
@@ -369,14 +392,28 @@ async function handleSpawnCommand(args) {
     process.exit(1);
   }
   let resumeIds = {};
+  let excludedPrompts = [];
   if (forkSource) {
     try {
-      resumeIds = await forkProviderConversation(forkSource);
+      const running = await sourceTurnRunning(forkSource.parentSessionId);
+      const { excludedPrompts: excluded = [], ...ids } = await forkProviderConversation(forkSource, { running });
+      resumeIds = ids;
+      excludedPrompts = excluded;
     } catch (error) {
       console.error(chalk.red("Error:"), `Failed to fork session ${forkSource.parentSessionId}: ${error instanceof Error ? error.message : String(error)}`);
       process.exit(1);
     }
   }
+  let accountChoice = options.account ? options.account === "machine" ? null : options.account : void 0;
+  if (accountChoice === void 0 && options.project && !forkSource) {
+    try {
+      const defaults = await sharedProjectsClient().defaults(options.project);
+      const machineId = (await readSettings()).machineId;
+      if (machineId) accountChoice = resolveLaunchAgentProfile({ project: defaults.agentProfiles, agent: agent ?? "claude", machineId }).agentProfileId;
+    } catch (error) {
+      console.error(chalk.dim(`(project ${options.project}: defaults unavailable \u2014 using the machine default account: ${error instanceof Error ? error.message : String(error)})`));
+    }
+  }
   logger.debug(`[SPAWN CMD] Spawning session in ${directory}${forkSource ? ` (fork of ${forkSource.parentSessionId})` : ""}`);
   const result = await spawnDaemonSession(directory, void 0, {
     spawnedBy: options.spawnedBy,
@@ -389,7 +426,7 @@ async function handleSpawnCommand(args) {
     environmentVariables: spawnEnvironmentVariables(options.env, prompt !== void 0),
     ...resumeIds,
     ...forkSource ? { parentSessionId: forkSource.parentSessionId } : {},
-    ...options.account ? { agentProfileId: options.account === "machine" ? null : options.account } : {}
+    ...accountChoice !== void 0 ? { agentProfileId: accountChoice } : {}
   });
   if (result?.error || !result?.success || !result?.sessionId) {
     const message = result?.error || "Daemon returned no session ID";
@@ -441,6 +478,9 @@ async function handleSpawnCommand(args) {
     if (forkSource) {
       payload.forkedFrom = forkSource.parentSessionId;
     }
+    if (excludedPrompts.length > 0) {
+      payload.excludedPrompts = excludedPrompts;
+    }
     if (projectOutcome.joined) {
       payload.project = { id: projectOutcome.projectId, via: projectOutcome.via };
     }
@@ -460,6 +500,10 @@ async function handleSpawnCommand(args) {
     if (prompt !== void 0 && promptError === null) {
       console.log(chalk.green("First message sent."));
     }
+    if (excludedPrompts.length > 0) {
+      console.log(chalk.yellow("The source was mid-turn: the fork holds its completed turns only. Left out (send it again if you want it):"));
+      for (const text of excludedPrompts) console.log(text.split("\n").map((line) => `  > ${line}`).join("\n"));
+    }
   }
   if (promptError !== null) {
     console.error(chalk.red("Error:"), `Session ${sessionId} was spawned, but sending the first message failed: ${promptError}`);

package/dist/{spawn-DMB6rRPA.cjs → spawn-Crprnq9Z.cjs}

@@ -1,21 +1,21 @@
 'use strict';
 
-var spawnAgents = require('./spawnAgents-CClb7buD.cjs');
-var client = require('./client-D8XROyZc.cjs');
+var spawnAgents = require('./spawnAgents-B9olJ8xn.cjs');
+var client = require('./client-CsfPUxLy.cjs');
 var chalk = require('chalk');
 var node_fs = require('node:fs');
 var path$1 = require('node:path');
-var controlClient = require('./controlClient-j7p5p3_7.cjs');
-var persistence = require('./persistence-B4ttN-fR.cjs');
-var index = require('./index-BzAYnYct.cjs');
-var configuration = require('./configuration-CXEVKAyF.cjs');
+var controlClient = require('./controlClient-CIqHL07h.cjs');
+var persistence = require('./persistence-D0gNvqXe.cjs');
+var index = require('./index-BUFrKZeQ.cjs');
+var configuration = require('./configuration-2Pbg3a0H.cjs');
 var path = require('./path-B7zW-WwE.cjs');
-var claudeSessionFork = require('./claudeSessionFork-YiktY55n.cjs');
-var codexAppServerClient = require('./codexAppServerClient-q8GHQhyC.cjs');
-var codexThreadFork = require('./codexThreadFork-5kwoKjMu.cjs');
-var sessionOps = require('./sessionOps-DvnEH4PL.cjs');
-var createSessionMetadata = require('./createSessionMetadata-DwdD_uVo.cjs');
-var logger = require('./logger-8su64lqR.cjs');
+var claudeSessionFork = require('./claudeSessionFork-4g6-Sk3Q.cjs');
+var codexAppServerClient = require('./codexAppServerClient-Bj5vN7sb.cjs');
+var codexThreadFork = require('./codexThreadFork-C6ZmcT2z.cjs');
+var sessionOps = require('./sessionOps-BUlpeaUe.cjs');
+var createSessionMetadata = require('./createSessionMetadata-BHjzRzPc.cjs');
+var logger = require('./logger-CepF8C5Z.cjs');
 var forkBackfill = require('./forkBackfill-8eLDeS73.cjs');
 require('node:fs/promises');
 require('zod');
@@ -24,17 +24,17 @@ require('node:crypto');
 require('tweetnacl');
 require('@paralleldrive/cuid2');
 require('node:os');
-require('./package-iuLlSiSF.cjs');
+require('./package-C7WgesIw.cjs');
 require('node:readline');
 require('node:child_process');
 require('cross-spawn');
 require('./contentLogMetadata-ZSFk_NjQ.cjs');
 require('./manager-HrEj442o.cjs');
 require('@anthropic-ai/sandbox-runtime');
-require('./rateLimitWindows-DBfiuYeg.cjs');
+require('./rateLimitWindows-B9PERFm1.cjs');
 require('./processTree-CMHWlVse.cjs');
 require('axios');
-require('./time-CaUlWSNJ.cjs');
+require('./time-Da5GIiCa.cjs');
 require('./specialCommands-J3JFOq0J.cjs');
 require('socket.io-client');
 require('./backgroundTaskActivity-CBvUdj39.cjs');
@@ -82,10 +82,14 @@ function resolveForkSource(sessionId, persisted) {
   if (!nonEmpty(metadata.claudeSessionId)) throw new Error(`Session ${sessionId} has no Claude conversation id yet (it never ran a turn) \u2014 nothing to fork.`);
   return { agent: "claude", directory, claudeSessionId: metadata.claudeSessionId, permissionMode, parentSessionId: sessionId };
 }
-async function forkProviderConversation(source) {
+async function forkProviderConversation(source, opts = {}) {
   if (source.agent === "claude") {
     try {
-      return { resumeClaudeSessionId: await claudeSessionFork.forkSession(path.getProjectPath(source.directory), source.claudeSessionId) };
+      const projectDir = path.getProjectPath(source.directory);
+      if (!opts.running) return { resumeClaudeSessionId: await claudeSessionFork.forkSession(projectDir, source.claudeSessionId) };
+      const result = await claudeSessionFork.forkCompletedTurns(projectDir, source.claudeSessionId);
+      if ("startFresh" in result) throw new Error(NO_COMPLETED_TURN);
+      return { resumeClaudeSessionId: result.newClaudeSessionId, excludedPrompts: result.excludedPrompts };
     } catch (error) {
       if (error instanceof claudeSessionFork.ForkSourceMissingError) throw new Error("Claude session file not found on this machine");
       throw error;
@@ -94,12 +98,18 @@ async function forkProviderConversation(source) {
   const client = new codexAppServerClient.CodexAppServerClient();
   await client.connect();
   try {
-    const result = await codexThreadFork.forkCodexThread(client, { threadId: source.codexThreadId, cwd: source.directory });
-    return { resumeCodexThreadId: result.newCodexThreadId };
+    if (!opts.running) {
+      const result2 = await codexThreadFork.forkCodexThread(client, { threadId: source.codexThreadId, cwd: source.directory });
+      return { resumeCodexThreadId: result2.newCodexThreadId };
+    }
+    const result = await codexThreadFork.forkCodexCompletedTurns(client, { threadId: source.codexThreadId, cwd: source.directory });
+    if ("startFresh" in result) throw new Error(NO_COMPLETED_TURN);
+    return { resumeCodexThreadId: result.newCodexThreadId, excludedPrompts: result.excludedPrompts };
   } finally {
     await client.disconnect();
   }
 }
+const NO_COMPLETED_TURN = "the session is running its first turn \u2014 nothing has completed yet to fork; retry once it ends.";
 
 function spawnEnvironmentVariables(env, hasPrompt) {
   return hasPrompt ? { ...env, HAPPY_FIRST_MESSAGE_FROM_CLI: "1" } : env;
@@ -224,7 +234,7 @@ ${chalk.bold("Options:")}
                             machine runs (claude: newest Opus; codex: newest
                             sol its Codex lists; gemini: newest pro), else the
                             machine default. 'default' = the machine default.
-  --account <id>         Claude account on this machine (\`very-happy account
+  --account <id>         Claude / Codex account on this machine (\`very-happy account
                             list\`); 'machine' = the machine's own login.
                             Default = the machine's default account, if set. A
                             missing or expired account fails the spawn.
@@ -232,6 +242,9 @@ ${chalk.bold("Options:")}
                             web's fork): copies its conversation and continues
                             it in a new session, in the same directory and with
                             the same agent (so --dir / --agent are not needed).
+                            A source mid-turn forks its completed turns only;
+                            the prompt left out is printed (--json:
+                            excludedPrompts). The source is not interrupted.
   --env KEY=VALUE        Extra environment for the session process. Repeatable.
                             \${VAR} is expanded against the daemon's environment;
                             an unresolved reference fails the spawn.
@@ -266,6 +279,16 @@ const defaultFirstMessageDeps = {
   sendUserMessage: sessionOps.sendUserMessage,
   warn: (message) => console.error(chalk.yellow("Warning:"), message)
 };
+async function sourceTurnRunning(sessionId) {
+  const persisted = persistence.readPersistedSessions()[sessionId];
+  if (!persisted) return false;
+  try {
+    return !sessionOps.analyzeLatestTurn(await sessionOps.readSessionLog(sessionId, persisted, sessionOps.TURN_WINDOW)).ended;
+  } catch (error) {
+    console.error(chalk.dim(`(could not read whether ${sessionId} is mid-turn \u2014 forking everything: ${error instanceof Error ? error.message : String(error)})`));
+    return false;
+  }
+}
 async function waitForModelCatalog(readMetadata, initial, knobs = {}) {
   const timeoutMs = knobs.timeoutMs ?? 8e3;
   const pollMs = knobs.pollMs ?? 400;
@@ -371,14 +394,28 @@ async function handleSpawnCommand(args) {
     process.exit(1);
   }
   let resumeIds = {};
+  let excludedPrompts = [];
   if (forkSource) {
     try {
-      resumeIds = await forkProviderConversation(forkSource);
+      const running = await sourceTurnRunning(forkSource.parentSessionId);
+      const { excludedPrompts: excluded = [], ...ids } = await forkProviderConversation(forkSource, { running });
+      resumeIds = ids;
+      excludedPrompts = excluded;
     } catch (error) {
       console.error(chalk.red("Error:"), `Failed to fork session ${forkSource.parentSessionId}: ${error instanceof Error ? error.message : String(error)}`);
       process.exit(1);
     }
   }
+  let accountChoice = options.account ? options.account === "machine" ? null : options.account : void 0;
+  if (accountChoice === void 0 && options.project && !forkSource) {
+    try {
+      const defaults = await client.sharedProjectsClient().defaults(options.project);
+      const machineId = (await persistence.readSettings()).machineId;
+      if (machineId) accountChoice = index.resolveLaunchAgentProfile({ project: defaults.agentProfiles, agent: agent ?? "claude", machineId }).agentProfileId;
+    } catch (error) {
+      console.error(chalk.dim(`(project ${options.project}: defaults unavailable \u2014 using the machine default account: ${error instanceof Error ? error.message : String(error)})`));
+    }
+  }
   logger.logger.debug(`[SPAWN CMD] Spawning session in ${directory}${forkSource ? ` (fork of ${forkSource.parentSessionId})` : ""}`);
   const result = await controlClient.spawnDaemonSession(directory, void 0, {
     spawnedBy: options.spawnedBy,
@@ -391,7 +428,7 @@ async function handleSpawnCommand(args) {
     environmentVariables: spawnEnvironmentVariables(options.env, prompt !== void 0),
     ...resumeIds,
     ...forkSource ? { parentSessionId: forkSource.parentSessionId } : {},
-    ...options.account ? { agentProfileId: options.account === "machine" ? null : options.account } : {}
+    ...accountChoice !== void 0 ? { agentProfileId: accountChoice } : {}
   });
   if (result?.error || !result?.success || !result?.sessionId) {
     const message = result?.error || "Daemon returned no session ID";
@@ -443,6 +480,9 @@ async function handleSpawnCommand(args) {
     if (forkSource) {
       payload.forkedFrom = forkSource.parentSessionId;
     }
+    if (excludedPrompts.length > 0) {
+      payload.excludedPrompts = excludedPrompts;
+    }
     if (projectOutcome.joined) {
       payload.project = { id: projectOutcome.projectId, via: projectOutcome.via };
     }
@@ -462,6 +502,10 @@ async function handleSpawnCommand(args) {
     if (prompt !== void 0 && promptError === null) {
       console.log(chalk.green("First message sent."));
     }
+    if (excludedPrompts.length > 0) {
+      console.log(chalk.yellow("The source was mid-turn: the fork holds its completed turns only. Left out (send it again if you want it):"));
+      for (const text of excludedPrompts) console.log(text.split("\n").map((line) => `  > ${line}`).join("\n"));
+    }
   }
   if (promptError !== null) {
     console.error(chalk.red("Error:"), `Session ${sessionId} was spawned, but sending the first message failed: ${promptError}`);

package/dist/{spawnAgents-CClb7buD.cjs → spawnAgents-B9olJ8xn.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-BzAYnYct.cjs');
+var index = require('./index-BUFrKZeQ.cjs');
 
 function chooseProject(opts) {
   if (opts.project) return { kind: "explicit", projectId: opts.project };

package/dist/{spawnAgents-CRMfOJhh.mjs → spawnAgents-I29H9nO8.mjs}

@@ -1,4 +1,4 @@
-import { I as getAgentCodeDefaults, J as isLatestModelMode, K as resolveLatestModel, L as LATEST_MODEL_MODE, M as EFFORT_INTENT_AUTO, N as normalizeAgentKey } from './index-DYD3GM1m.mjs';
+import { L as getAgentCodeDefaults, M as isLatestModelMode, N as resolveLatestModel, O as LATEST_MODEL_MODE, Q as EFFORT_INTENT_AUTO, T as normalizeAgentKey } from './index-D1YnIih6.mjs';
 
 function chooseProject(opts) {
   if (opts.project) return { kind: "explicit", projectId: opts.project };

package/dist/{spawnHappyCLI-Cj_6IICe.mjs → spawnHappyCLI-BA1bTIiO.mjs}

@@ -1,7 +1,7 @@
 import { spawn } from 'cross-spawn';
 import { join } from 'node:path';
 import { p as projectPath } from './projectPath-BTBIMB57.mjs';
-import { l as logger } from './logger-Fd_rNvgd.mjs';
+import { l as logger } from './logger-SGCwRIV5.mjs';
 import { existsSync } from 'node:fs';
 
 let cachedRuntime = null;

package/dist/{spawnHappyCLI-DJdhX_Qx.cjs → spawnHappyCLI-C0XAWy8V.cjs}

@@ -3,7 +3,7 @@
 var spawn = require('cross-spawn');
 var path = require('node:path');
 var projectPath = require('./projectPath-C3ioB4Bu.cjs');
-var logger = require('./logger-8su64lqR.cjs');
+var logger = require('./logger-CepF8C5Z.cjs');
 var node_fs = require('node:fs');
 
 let cachedRuntime = null;

package/dist/{startFileWatcher-DikVa8kg.mjs → startFileWatcher-COCEjNT8.mjs}

@@ -1,4 +1,4 @@
-import { l as logger } from './logger-Fd_rNvgd.mjs';
+import { l as logger } from './logger-SGCwRIV5.mjs';
 import { watch } from 'fs/promises';
 
 function startFileWatcher(file, onFileChange, options = {}) {

package/dist/{startFileWatcher-LnOmVW6H.cjs → startFileWatcher-Ca5izs24.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var logger = require('./logger-8su64lqR.cjs');
+var logger = require('./logger-CepF8C5Z.cjs');
 var fs = require('fs/promises');
 
 function startFileWatcher(file, onFileChange, options = {}) {

package/dist/{startupSessionCreate-CDdaLaMq.mjs → startupSessionCreate-BnEPBxsJ.mjs}

@@ -1,6 +1,6 @@
-import { l as logger } from './logger-Fd_rNvgd.mjs';
-import { e as evaluateWrapperIdle, j as isQuiescent, k as HIBERNATION_UNSUPPORTED_BACKOFF_MS } from './persistence-DWcHe035.mjs';
-import { c as connectionState } from './api-_LeBScjg.mjs';
+import { l as logger } from './logger-SGCwRIV5.mjs';
+import { e as evaluateWrapperIdle, j as isQuiescent, k as HIBERNATION_UNSUPPORTED_BACKOFF_MS } from './persistence-mr4Y484W.mjs';
+import { c as connectionState } from './api-aE60mNjs.mjs';
 
 const PRESENCE_SETTLE_MS = 6e3;
 async function commitHibernation(deps) {

package/dist/{startupSessionCreate-B3ND-917.cjs → startupSessionCreate-Cmg1gkKS.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
-var logger = require('./logger-8su64lqR.cjs');
-var persistence = require('./persistence-B4ttN-fR.cjs');
-var api = require('./api-hMDsC6Wg.cjs');
+var logger = require('./logger-CepF8C5Z.cjs');
+var persistence = require('./persistence-D0gNvqXe.cjs');
+var api = require('./api-wYwQCJml.cjs');
 
 const PRESENCE_SETTLE_MS = 6e3;
 async function commitHibernation(deps) {

package/dist/{store-DV__wCvP.cjs → store-CkNa6oj4.cjs}

@@ -3,6 +3,7 @@
 var node_fs = require('node:fs');
 var os = require('node:os');
 var path = require('node:path');
+var index = require('./index-BUFrKZeQ.cjs');
 
 function providersPath(happyHomeDir) {
   return path.join(happyHomeDir, "providers.json");
@@ -50,6 +51,15 @@ function parseSessionProvidersFile(raw) {
   return out;
 }
 
+const KIND_AGENT = {
+  "claude-subscription": "claude",
+  "claude-api": "claude",
+  "codex-chatgpt": "codex",
+  "codex-provider": "codex"
+};
+function isApiKind(kind) {
+  return kind === "claude-api" || kind === "codex-provider";
+}
 const SPAWN_ACCOUNT_ENV = "VH_AGENT_PROFILE_ID";
 const SUBSCRIPTION_TOKEN_TTL_MS = 365 * 24 * 60 * 60 * 1e3;
 const ACCOUNT_ID_PATTERN = /^[a-z0-9][a-z0-9-]{0,47}$/;
@@ -60,6 +70,10 @@ function accountSecretPath(home, id) {
   if (!ACCOUNT_ID_PATTERN.test(id)) throw new Error(`invalid account id "${id}"`);
   return path.join(home, "accounts", id, "secret");
 }
+function accountCodexHomePath(home, id) {
+  if (!ACCOUNT_ID_PATTERN.test(id)) throw new Error(`invalid account id "${id}"`);
+  return path.join(home, "accounts", id, "codex-home");
+}
 function sessionAccountsPath(home) {
   return path.join(home, "session-accounts.json");
 }
@@ -97,14 +111,26 @@ function parseAccountsFile(raw) {
     for (const [id, value] of Object.entries(src)) {
       if (!ACCOUNT_ID_PATTERN.test(id) || !value || typeof value !== "object") continue;
       const a = value;
-      if (a.agent !== "claude" || a.kind !== "claude-subscription" && a.kind !== "claude-api") continue;
+      const kind = a.kind;
+      if (typeof a.kind !== "string" || !(a.kind in KIND_AGENT) || a.agent !== KIND_AGENT[kind]) continue;
       const label = typeof a.label === "string" && a.label.trim() ? a.label.trim() : id;
-      const rec = { label, agent: "claude", kind: a.kind, createdAt: typeof a.createdAt === "number" ? a.createdAt : 0 };
-      if (a.kind === "claude-api") {
-        if (typeof a.baseUrl !== "string" || !/^https?:\/\//.test(a.baseUrl)) continue;
+      const rec = { label, agent: KIND_AGENT[kind], kind, createdAt: typeof a.createdAt === "number" ? a.createdAt : 0 };
+      const baseUrl = typeof a.baseUrl === "string" && /^https?:\/\//.test(a.baseUrl) ? a.baseUrl.replace(/\/+$/, "") : void 0;
+      if (kind === "codex-provider") {
+        const provider = typeof a.provider === "string" && /^[A-Za-z0-9_-]{1,64}$/.test(a.provider) ? a.provider : void 0;
+        if (!provider && !baseUrl) continue;
+        if (provider) rec.provider = provider;
+        if (a.wireApi === "responses" || a.wireApi === "chat") rec.wireApi = a.wireApi;
+      }
+      if (kind === "codex-chatgpt") {
+        if (typeof a.email === "string" && a.email) rec.email = a.email;
+        if (typeof a.planType === "string" && a.planType) rec.planType = a.planType;
+      }
+      if (isApiKind(kind)) {
+        if (kind === "claude-api" && !baseUrl) continue;
         const key = parseKey(a.key);
         if (!key) continue;
-        rec.baseUrl = a.baseUrl.replace(/\/+$/, "");
+        if (baseUrl) rec.baseUrl = baseUrl;
         rec.key = key;
         if (Array.isArray(a.models)) rec.models = a.models.filter((m) => typeof m === "string" && m.length > 0);
         if (a.contextWindows && typeof a.contextWindows === "object") {
@@ -208,15 +234,22 @@ function writeAccountSecret(home, id, secret) {
 function removeAccountSecret(home, id) {
   node_fs.rmSync(path.dirname(accountSecretPath(home, id)), { recursive: true, force: true });
 }
+const KIND_ID_BASE = {
+  "claude-subscription": "claude-sub",
+  "claude-api": "claude-api",
+  "codex-chatgpt": "chatgpt",
+  "codex-provider": "codex-api"
+};
 function newAccountId(label, kind, taken) {
   const used = new Set(taken);
   const ascii = /^[\x20-\x7e]*$/.test(label);
   const slug = ascii ? label.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 40) : "";
-  const base = slug && /^[a-z0-9]/.test(slug) ? slug : kind === "claude-subscription" ? "claude-sub" : "claude-api";
+  const base = slug && /^[a-z0-9]/.test(slug) ? slug : KIND_ID_BASE[kind];
   if (!used.has(base)) return base;
   for (let n = 2; ; n++) if (!used.has(`${base}-${n}`)) return `${base}-${n}`;
 }
 function secretPresent(home, id, a, probe) {
+  if (a.kind === "codex-chatgpt") return probe.fileReadable(path.join(accountCodexHomePath(home, id), "auth.json"));
   if (a.kind === "claude-subscription" || a.key?.source === "stored") return probe.fileReadable(accountSecretPath(home, id));
   if (a.key?.source === "file") return probe.fileReadable(expandHome(a.key.path));
   if (a.key?.source === "env") return !!probe.env[a.key.name]?.trim();
@@ -230,7 +263,7 @@ function accountStatus(home, id, a, probe, now) {
 }
 function summarizeAccount(home, id, a, probe, now) {
   const { status, detail } = accountStatus(home, id, a, probe, now);
-  const keySource = a.kind === "claude-subscription" ? "stored" : a.key?.source;
+  const keySource = a.kind === "claude-subscription" || a.kind === "codex-chatgpt" ? "stored" : a.key?.source;
   const keyRef = a.key?.source === "file" ? a.key.path : a.key?.source === "env" ? a.key.name : void 0;
   return {
     id,
@@ -246,7 +279,10 @@ function summarizeAccount(home, id, a, probe, now) {
     ...a.models ? { models: a.models } : {},
     ...keySource ? { keySource } : {},
     ...keyRef ? { keyRef } : {},
-    ...a.legacy ? { legacy: true } : {}
+    ...a.legacy ? { legacy: true } : {},
+    ...a.provider ? { provider: a.provider } : {},
+    ...a.email ? { email: a.email } : {},
+    ...a.planType ? { planType: a.planType } : {}
   };
 }
 function defaultSecretProbe(env = process.env) {
@@ -265,11 +301,12 @@ function buildAgentProfilesState(home, file, probe, now, daemonPid) {
   const accounts = Object.entries(file.accounts).map(([id, a]) => summarizeAccount(home, id, a, probe, now)).sort((x, y) => (x.createdAt ?? 0) - (y.createdAt ?? 0) || x.id.localeCompare(y.id));
   const defaults = {};
   for (const [agent, id] of Object.entries(file.defaults)) if (file.accounts[id]) defaults[agent] = id;
-  return { daemonPid, updatedAt: now, accounts, defaults };
+  return { daemonPid, updatedAt: now, accounts, defaults, kinds: [...index.AGENT_PROFILE_KINDS] };
 }
 
 exports.SPAWN_ACCOUNT_ENV = SPAWN_ACCOUNT_ENV;
 exports.SUBSCRIPTION_TOKEN_TTL_MS = SUBSCRIPTION_TOKEN_TTL_MS;
+exports.accountCodexHomePath = accountCodexHomePath;
 exports.accountSecretPath = accountSecretPath;
 exports.accountsPath = accountsPath;
 exports.buildAgentProfilesState = buildAgentProfilesState;