very-happy-cli 0.2.192 → 0.2.194

package/dist/{codexAppServerClient-q8GHQhyC.cjs → codexAppServerClient-Bj5vN7sb.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-8su64lqR.cjs');
+var logger = require('./logger-CepF8C5Z.cjs');
 var contentLogMetadata = require('./contentLogMetadata-ZSFk_NjQ.cjs');
 var manager = require('./manager-HrEj442o.cjs');
-var _package = require('./package-iuLlSiSF.cjs');
-var rateLimitWindows = require('./rateLimitWindows-DBfiuYeg.cjs');
+var _package = require('./package-C7WgesIw.cjs');
+var rateLimitWindows = require('./rateLimitWindows-B9PERFm1.cjs');
 var processTree = require('./processTree-CMHWlVse.cjs');
 
 const CODEX_HELPER_LABEL_MAX_CHARS = 80;
@@ -197,6 +197,15 @@ class CodexAppServerClient {
   rateLimitReadAt = 0;
   rateLimitReadInFlight = false;
   rateLimitReadUnsupported = false;
+  /**
+   * B-850b: the session's account (agentProfiles/codexWrapperAccount.ts) —
+   * env for the app-server (a ChatGPT account's CODEX_HOME overlay) and the
+   * provider every thread runs on. Kept across idle-release respawns.
+   */
+  accountOverrides = { env: {} };
+  setAccountOverrides(overrides) {
+    this.accountOverrides = overrides;
+  }
   constructor(sandboxConfig) {
     this.sandboxConfig = sandboxConfig;
   }
@@ -562,6 +571,7 @@ class CodexAppServerClient {
     if (this.sandboxEnabled) {
       env.CODEX_SANDBOX = "seatbelt";
     }
+    Object.assign(env, this.accountOverrides.env);
     logger.logger.debug(`[CodexAppServer] Spawning: ${command} ${args.join(" ")}`);
     const epoch = ++this.processEpoch;
     const proc = spawn.spawn(command, args, {
@@ -732,7 +742,8 @@ ${text}`.slice(-400);
     }
   }
   buildThreadConfig(mcpServers) {
-    return mcpServers ? { mcp_servers: mcpServers } : null;
+    const config = { ...mcpServers ? { mcp_servers: mcpServers } : {}, ...this.accountOverrides.config };
+    return Object.keys(config).length > 0 ? config : null;
   }
   rememberThreadDefaults(opts) {
     this.threadDefaults = {
@@ -748,7 +759,7 @@ ${text}`.slice(-400);
     await this.ensureConnected();
     const params = {
       model: opts.model ?? null,
-      modelProvider: null,
+      modelProvider: this.accountOverrides.modelProvider ?? null,
       profile: null,
       cwd: opts.cwd ?? process.cwd(),
       approvalPolicy: opts.approvalPolicy ?? null,
@@ -779,7 +790,7 @@ ${text}`.slice(-400);
     const params = {
       threadId,
       model: opts?.model ?? defaults.model ?? null,
-      modelProvider: null,
+      modelProvider: this.accountOverrides.modelProvider ?? null,
       cwd: opts?.cwd ?? defaults.cwd ?? process.cwd(),
       approvalPolicy: opts?.approvalPolicy ?? defaults.approvalPolicy ?? null,
       sandbox: opts?.sandbox ?? defaults.sandbox ?? null,
@@ -808,7 +819,7 @@ ${text}`.slice(-400);
     const params = {
       threadId: opts.threadId,
       model: opts.model ?? defaults.model ?? null,
-      modelProvider: null,
+      modelProvider: this.accountOverrides.modelProvider ?? null,
       cwd: opts.cwd ?? defaults.cwd ?? process.cwd(),
       approvalPolicy: opts.approvalPolicy ?? defaults.approvalPolicy ?? null,
       sandbox: opts.sandbox ?? defaults.sandbox ?? null,

package/dist/{codexAppServerClient-BWJbLCQn.mjs → codexAppServerClient-HKAm8f_D.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-Fd_rNvgd.mjs';
+import { l as logger } from './logger-SGCwRIV5.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-6KkRAops.mjs';
-import { s as shouldReadCodexRateLimits, i as isUnsupportedCodexMethodError } from './rateLimitWindows-Da5AR-4u.mjs';
+import { p as packageJson } from './package-Q_ELj5DL.mjs';
+import { s as shouldReadCodexRateLimits, i as isUnsupportedCodexMethodError } from './rateLimitWindows-a2yE3kCv.mjs';
 import { s as stopProcessGracefully, k as killProcessTree } from './processTree-CP5IvQ2Z.mjs';
 
 const CODEX_HELPER_LABEL_MAX_CHARS = 80;
@@ -195,6 +195,15 @@ class CodexAppServerClient {
   rateLimitReadAt = 0;
   rateLimitReadInFlight = false;
   rateLimitReadUnsupported = false;
+  /**
+   * B-850b: the session's account (agentProfiles/codexWrapperAccount.ts) —
+   * env for the app-server (a ChatGPT account's CODEX_HOME overlay) and the
+   * provider every thread runs on. Kept across idle-release respawns.
+   */
+  accountOverrides = { env: {} };
+  setAccountOverrides(overrides) {
+    this.accountOverrides = overrides;
+  }
   constructor(sandboxConfig) {
     this.sandboxConfig = sandboxConfig;
   }
@@ -560,6 +569,7 @@ class CodexAppServerClient {
     if (this.sandboxEnabled) {
       env.CODEX_SANDBOX = "seatbelt";
     }
+    Object.assign(env, this.accountOverrides.env);
     logger.debug(`[CodexAppServer] Spawning: ${command} ${args.join(" ")}`);
     const epoch = ++this.processEpoch;
     const proc = spawn(command, args, {
@@ -730,7 +740,8 @@ ${text}`.slice(-400);
     }
   }
   buildThreadConfig(mcpServers) {
-    return mcpServers ? { mcp_servers: mcpServers } : null;
+    const config = { ...mcpServers ? { mcp_servers: mcpServers } : {}, ...this.accountOverrides.config };
+    return Object.keys(config).length > 0 ? config : null;
   }
   rememberThreadDefaults(opts) {
     this.threadDefaults = {
@@ -746,7 +757,7 @@ ${text}`.slice(-400);
     await this.ensureConnected();
     const params = {
       model: opts.model ?? null,
-      modelProvider: null,
+      modelProvider: this.accountOverrides.modelProvider ?? null,
       profile: null,
       cwd: opts.cwd ?? process.cwd(),
       approvalPolicy: opts.approvalPolicy ?? null,
@@ -777,7 +788,7 @@ ${text}`.slice(-400);
     const params = {
       threadId,
       model: opts?.model ?? defaults.model ?? null,
-      modelProvider: null,
+      modelProvider: this.accountOverrides.modelProvider ?? null,
       cwd: opts?.cwd ?? defaults.cwd ?? process.cwd(),
       approvalPolicy: opts?.approvalPolicy ?? defaults.approvalPolicy ?? null,
       sandbox: opts?.sandbox ?? defaults.sandbox ?? null,
@@ -806,7 +817,7 @@ ${text}`.slice(-400);
     const params = {
       threadId: opts.threadId,
       model: opts.model ?? defaults.model ?? null,
-      modelProvider: null,
+      modelProvider: this.accountOverrides.modelProvider ?? null,
       cwd: opts.cwd ?? defaults.cwd ?? process.cwd(),
       approvalPolicy: opts.approvalPolicy ?? defaults.approvalPolicy ?? null,
       sandbox: opts.sandbox ?? defaults.sandbox ?? null,

package/dist/{codexCommand-BfXfRQr4.mjs → codexCommand-655pR6CR.mjs}

@@ -1,108 +1,112 @@
-import { a as authAndSetupMachineIfNeeded } from './auth-DL8_J9vu.mjs';
-import { k as createEnvelope, y as BUILTIN_TODO_DISCOVERY, r as restoredEffort, o as readEffortIntent, M as EFFORT_INTENT_AUTO, P as PROMPT_QUEUE_CAPABILITY, a2 as CODEX_STEER_CAPABILITY, a as PROJECT_SESSION_CAPABILITY, a3 as CODEX_COMPACT_CAPABILITY, R as RUN_INTENT_CAPABILITY } from './index-DYD3GM1m.mjs';
-import { a as recordRunIntents, w as withoutEffort, r as registerRunIntentRpc, b as DEFAULT_CODEX_PERMISSION_MODE } from './defaultPermissionMode-Lt3PUCwY.mjs';
-import { h as hashObject, s as startHappyServer, c as createProjectInjector } from './deterministicJson-Dfp-7wUZ.mjs';
-import { s as sharedProjectsClient } from './client-Bm4oKvW7.mjs';
+import { a as authAndSetupMachineIfNeeded } from './auth-CWO6cQ4G.mjs';
+import { k as createEnvelope, w as BUILTIN_TODO_DISCOVERY, r as restoredEffort, o as readEffortIntent, Q as EFFORT_INTENT_AUTO, P as PROMPT_QUEUE_CAPABILITY, a5 as CODEX_STEER_CAPABILITY, a as PROJECT_SESSION_CAPABILITY, a6 as CODEX_COMPACT_CAPABILITY, R as RUN_INTENT_CAPABILITY, A as AGENT_PROFILE_SESSION_CAPABILITY } from './index-D1YnIih6.mjs';
+import { a as recordRunIntents, w as withoutEffort, r as registerRunIntentRpc, b as DEFAULT_CODEX_PERMISSION_MODE } from './defaultPermissionMode-DF5AfeBb.mjs';
+import { h as hashObject, s as startHappyServer, c as createProjectInjector } from './deterministicJson-DFwJ57jR.mjs';
+import { s as sharedProjectsClient } from './client-Cbxr9VUE.mjs';
 import { unlink } from 'node:fs/promises';
 import { p as publishForkBackfillWhenCommitted, F as FORK_BACKFILL_CAPABILITY } from './forkBackfill-DYIjlN1Z.mjs';
 import { randomUUID } from 'node:crypto';
 import { createId } from '@paralleldrive/cuid2';
-import { t as textResultPayload, d as toolResultContentText, c as connectionState, A as ApiClient } from './api-_LeBScjg.mjs';
+import { t as textResultPayload, d as toolResultContentText, c as connectionState, A as ApiClient } from './api-aE60mNjs.mjs';
 import { r as registerAgentAttachmentDownloads, H as HeldInput } from './heldInput-C69lA2dH.mjs';
-import { C as CLAUDE_ATTACHMENT_KINDS, a as stageClaudeAttachments, b as appendStagedAttachmentsToPrompt } from './attachmentContent-CyptLIfq.mjs';
+import { C as CLAUDE_ATTACHMENT_KINDS, a as stageClaudeAttachments, b as appendStagedAttachmentsToPrompt } from './attachmentContent-C2ymY_-w.mjs';
 import { useStdout, useInput, Box, Text, render } from 'ink';
-import { c as claimSessionOrExit, a as applyServerSnapshot, b as applyReconnectReplay, w as withoutServerSnapshot, m as mergeReconnectMetadata, t as takeAutoRestartedEvent, A as AUTO_RESTART_CAPABILITY, e as exitCursorStamp } from './sessionLock-Dl6i7IgA.mjs';
+import { c as claimSessionOrExit, a as applyServerSnapshot, b as applyReconnectReplay, w as withoutServerSnapshot, m as mergeReconnectMetadata, t as takeAutoRestartedEvent, A as AUTO_RESTART_CAPABILITY, e as exitCursorStamp } from './sessionLock-dbi4JPhP.mjs';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
-import { C as CodexAppServerClient } from './codexAppServerClient-BWJbLCQn.mjs';
-import { w as wrapperRateLimitReporter } from './rateLimitReporter-BRbYkmuP.mjs';
-import { l as logger } from './logger-Fd_rNvgd.mjs';
-import { B as BasePermissionHandler } from './BasePermissionHandler-BmTIg376.mjs';
-import { B as BaseReasoningProcessor, s as settleCodexSession } from './codexTermination-s9fd1gkA.mjs';
+import { C as CodexAppServerClient } from './codexAppServerClient-HKAm8f_D.mjs';
+import { w as wrapperRateLimitReporter } from './rateLimitReporter-B_PZClib.mjs';
+import { l as logger } from './logger-SGCwRIV5.mjs';
+import { B as BasePermissionHandler } from './BasePermissionHandler-D2pNcAXn.mjs';
+import { B as BaseReasoningProcessor, s as settleCodexSession } from './codexTermination-DxLR-bb5.mjs';
 import { execSync } from 'node:child_process';
-import { r as readSettings, l as latchKeepAwake, e as evaluateWrapperIdle, a as resolveCheckMs, H as HIBERNATION_CAPABILITY } from './persistence-DWcHe035.mjs';
-import { g as getInitialMachineMetadata } from './machineMetadata-1HIIC7Bc.mjs';
-import { c as configuration } from './configuration-IhRiLDVe.mjs';
-import { M as MessageQueue2, r as registerKillSessionHandler } from './registerKillSessionHandler-BDNpi7YO.mjs';
+import { r as readSettings, l as latchKeepAwake, e as evaluateWrapperIdle, a as resolveCheckMs, H as HIBERNATION_CAPABILITY } from './persistence-mr4Y484W.mjs';
+import { g as getInitialMachineMetadata } from './machineMetadata-ClJfd7ay.mjs';
+import { c as configuration } from './configuration-rTcdHkhE.mjs';
+import { M as MessageQueue2, r as registerKillSessionHandler } from './registerKillSessionHandler-CwyHwm_n.mjs';
 import { p as projectPath } from './projectPath-BTBIMB57.mjs';
-import { join } from 'node:path';
-import { c as createSessionMetadata } from './createSessionMetadata-oyaTZm1b.mjs';
+import { dirname, join } from 'node:path';
+import { c as createSessionMetadata } from './createSessionMetadata-PrN-dT7K.mjs';
 import { M as MessageBuffer } from './sessionExitLifecycle-CzkLIgNZ.mjs';
-import { n as notifyDaemonSessionStarted, o as reportSessionEditToDaemon, c as checkDaemonHibernation } from './controlClient-8ILulwjc.mjs';
-import { c as createSessionForStartup, b as HibernationExitLatch, H as HibernationProbe, a as commitHibernation } from './startupSessionCreate-CDdaLaMq.mjs';
+import { n as notifyDaemonSessionStarted, o as reportSessionEditToDaemon, c as checkDaemonHibernation } from './controlClient-BIdGnYBo.mjs';
+import { c as createSessionForStartup, b as HibernationExitLatch, H as HibernationProbe, a as commitHibernation } from './startupSessionCreate-BnEPBxsJ.mjs';
 import { d as decodeBase64, e as encodeBase64 } from './authRelay-DhQhkBvX.mjs';
-import { s as setupOfflineReconnection } from './setupOfflineReconnection-BGnvhRfb.mjs';
+import { s as setupOfflineReconnection } from './setupOfflineReconnection-BrljmbqX.mjs';
 import { t as trimIdent } from './trimIdent-BAjmv_TG.mjs';
 import { a as parseSpecialCommand, c as compactCommandText, b as parseCompact } from './specialCommands-MXUN0wfI.mjs';
 import { C as CHANGE_TITLE_INSTRUCTION } from './constants-BC4St0xd.mjs';
 import { E as EditReportThrottle, a as extractCodexPatchPaths } from './editPaths-BVfS_FFL.mjs';
 import { t as takeReconnectEnv } from './reconnectEnv-DeSvHl3q.mjs';
-import { a as extractNoSandboxFlag, e as ensureDaemonRunning } from './ensureDaemonRunning-KUMFfIil.mjs';
+import { r as readSessionBindings, w as writeSessionBinding, d as defaultSecretProbe, a as readAccounts, c as readAccountsFileV2, f as writeAccountsFile, S as SPAWN_ACCOUNT_ENV } from './store-Vej_738f.mjs';
+import { mkdirSync, writeFileSync, chmodSync, rmSync } from 'node:fs';
+import { a as resolveCodexAccount, r as readCodexProviders, s as syncCodexOverlay, b as baseCodexHome, c as codexAccountSwitched, d as readCodexDefaultProvider, e as codexAccountDefaultModel, f as accountModelsAsCatalog, i as isHistoryRejectedError, g as isCodexAuthRejection } from './codexAccount-NOX5pmQf.mjs';
+import { s as shouldRecordSpawnAccount, u as unavailableNotice } from './wrapperAccount-BkufO_9g.mjs';
+import { a as extractNoSandboxFlag, e as ensureDaemonRunning } from './ensureDaemonRunning-B6Y-CMWe.mjs';
 import 'tweetnacl';
 import 'axios';
-import './time-bzmet4s5.mjs';
-import './browser-BUIaSHK2.mjs';
+import './time-0Ru4clBD.mjs';
+import './browser-CFfZM3yg.mjs';
 import 'open';
 import 'zod';
 import './prompt-QHuFx9j6.mjs';
-import './reportProgressTool-DfQhPu0s.mjs';
-import './client-Cxlp_D4I.mjs';
+import './reportProgressTool-DTKlUlHv.mjs';
+import './client-OjYRPhZs.mjs';
 import './precheckCompat-DeEbilbr.mjs';
 import './agentGuidance-BDYt2Qy2.mjs';
-import 'node:fs';
 import 'node:os';
 import './pi-CqyoZMjI.mjs';
 import './fileStore-5qpetZS0.mjs';
-import './client-BmPaBnDK.mjs';
+import './client-DS5JEsHs.mjs';
 import 'node:util';
-import './context-DO6F5YwH.mjs';
-import './sessionOps-gU88-W9F.mjs';
+import './context-C7QarZMk.mjs';
+import './sessionOps-C9wRmCBg.mjs';
 import 'socket.io-client';
 import './backgroundTaskActivity-8PdPxrvy.mjs';
 import './resources-CLP_MpK4.mjs';
-import './tools-cLOjBvPn.mjs';
-import './peerTools-CKJ-IDM4.mjs';
+import './tools-DqA2Jt2R.mjs';
+import './peerTools-DUg9RduG.mjs';
 import './ids-DU6sLx4C.mjs';
-import './remoteSessionClient-CZ7aaNgj.mjs';
+import './remoteSessionClient-mIr_9OL_.mjs';
 import '@modelcontextprotocol/sdk/server/mcp.js';
 import 'node:http';
 import '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import './limits-DIo7rEBR.mjs';
-import './downloadTarget-C0d6jRx-.mjs';
+import './downloadTarget-CVPBZMnY.mjs';
 import './terminals-Dlg0x3nY.mjs';
 import './terminalTitleSuggest-CeKsX_V6.mjs';
 import './tmuxSocket-B8Yx20sT.mjs';
-import './bootstrap-DaZ0Np7X.mjs';
-import './package-6KkRAops.mjs';
+import './bootstrap-CiWwfHB2.mjs';
+import './package-Q_ELj5DL.mjs';
 import './webPanels-B2_C2-3g.mjs';
-import './pushNotifications-DkQ0yvFs.mjs';
+import './pushNotifications-DjEl8G0a.mjs';
 import './contentLogMetadata-BlWI0egu.mjs';
 import './previewPath-CXN4Vag0.mjs';
 import 'crypto';
-import './lidState-CZOXXdzv.mjs';
+import './lidState-zy20u7T3.mjs';
 import 'os';
 import 'child_process';
 import 'node:events';
-import './registerCommonHandlers-yQ7Ru-l0.mjs';
+import './registerCommonHandlers-CND00Dpj.mjs';
 import 'util';
 import 'fs/promises';
 import 'path';
 import 'cross-spawn';
-import './sync-JoEZKRo8.mjs';
+import './sync-DVcNkv8e.mjs';
 import 'chalk';
 import './cliUpdate-Y34VGe9Y.mjs';
 import './processTreeSnapshot-CuLJDNC-.mjs';
 import 'node:readline';
 import './manager-BEsI4qt3.mjs';
 import '@anthropic-ai/sandbox-runtime';
-import './rateLimitWindows-Da5AR-4u.mjs';
+import './rateLimitWindows-a2yE3kCv.mjs';
 import './processTree-CP5IvQ2Z.mjs';
 import './detectCLI-CSGMlV51.mjs';
 import 'fs';
-import './localHappyAgentAuth-YHxDZ4x4.mjs';
+import './localHappyAgentAuth-CBsX08VJ.mjs';
 import './fsMkdir-DumgLTzR.mjs';
 import './types-CkqAACXx.mjs';
 import 'url';
-import './spawnHappyCLI-Cj_6IICe.mjs';
+import './claudeAccountEnv-BL1pR_37.mjs';
+import './spawnHappyCLI-BA1bTIiO.mjs';
 import './doctorReadiness-C208SMN9.mjs';
 
 function getStartedSubagents(state) {
@@ -1184,7 +1188,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,
@@ -1462,6 +1467,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 = readSessionBindings(happyHome);
+  if (shouldRecordSpawnAccount(spawnAccountId, sessionId in bindings)) {
+    writeSessionBinding(happyHome, sessionId, { account: spawnAccountId });
+    bindings = { ...bindings, [sessionId]: { account: spawnAccountId } };
+  }
+  const probe = defaultSecretProbe(env);
+  const resolution = resolveCodexAccount(sessionId, {
+    home: happyHome,
+    accounts: readAccounts(happyHome),
+    bindings,
+    providers: readCodexProviders(env),
+    fileReadable: probe.fileReadable,
+    env,
+    nodePath: process.execPath,
+    envKeyCopyPath: (id) => 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 } = resolution.envKeyCopy;
+    mkdirSync(dirname(path), { recursive: true, mode: 448 });
+    writeFileSync(path, (env[name] ?? "").trim() + "\n", { mode: 384 });
+    chmodSync(path, 384);
+    cleanup = () => rmSync(path, { 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: [unavailableNotice(resolution.profile)], cleanup };
+  }
+  const overrides = { env: {}, modelProvider: resolution.modelProvider, ...resolution.config ? { config: resolution.config } : {} };
+  if (resolution.codexHome) {
+    syncCodexOverlay(resolution.codexHome, 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 = 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" };
+    writeAccountsFile(happyHome, file);
+    return status;
+  } catch {
+    return null;
+  }
+}
+
 const DEFAULT_CODEX_MODEL = void 0;
 const DEFAULT_CODEX_EFFORT = "medium";
 async function runCodex(opts) {
@@ -1478,6 +1547,8 @@ async function runCodex(opts) {
     console.error("  \x1B[36mvery-happy claude\x1B[0m\n");
     process.exit(1);
   }
+  const spawnAccountId = process.env[SPAWN_ACCOUNT_ENV] || void 0;
+  delete process.env[SPAWN_ACCOUNT_ENV];
   const sessionTag = randomUUID();
   connectionState.setBackend("Codex");
   const api = await ApiClient.create(opts.credentials);
@@ -1506,7 +1577,7 @@ async function runCodex(opts) {
     dangerouslySkipPermissions: initialPermissionMode === "yolo" || initialPermissionMode === "bypassPermissions",
     ...forkedFromSessionId ? { parentSessionId: forkedFromSessionId } : {},
     ...forkedFromMessageId ? { forkedFromMessageId } : {},
-    capabilities: [PROMPT_QUEUE_CAPABILITY, FORK_BACKFILL_CAPABILITY, HIBERNATION_CAPABILITY, AUTO_RESTART_CAPABILITY, CODEX_STEER_CAPABILITY, PROJECT_SESSION_CAPABILITY, CODEX_COMPACT_CAPABILITY, RUN_INTENT_CAPABILITY]
+    capabilities: [PROMPT_QUEUE_CAPABILITY, FORK_BACKFILL_CAPABILITY, HIBERNATION_CAPABILITY, AUTO_RESTART_CAPABILITY, CODEX_STEER_CAPABILITY, PROJECT_SESSION_CAPABILITY, CODEX_COMPACT_CAPABILITY, RUN_INTENT_CAPABILITY, AGENT_PROFILE_SESSION_CAPABILITY]
   });
   metadata.attachmentKinds = [...CLAUDE_ATTACHMENT_KINDS];
   metadata.stickyModel = null;
@@ -1568,6 +1639,21 @@ async function runCodex(opts) {
     }
   }
   const resumedEffort = reconnectSeeded && response ? restoredEffort(response.metadata, { useReportedLevel: true }) : void 0;
+  let codexAccount = MACHINE_CODEX_ACCOUNT;
+  if (response) {
+    try {
+      codexAccount = loadCodexWrapperAccount(configuration.happyHomeDir, response.id, spawnAccountId);
+    } catch (error) {
+      const reason = error instanceof Error ? error.message : String(error);
+      logger.debug(`[START] B-850b account resolution failed: ${reason}`);
+      if (spawnAccountId) {
+        codexAccount = { ...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 && codexAccountSwitched(response.metadata?.agentProfile, codexAccount.profile);
+  if (accountSwitched && !codexAccount.profile) codexAccount = { ...codexAccount, overrides: { env: {}, modelProvider: readCodexDefaultProvider() } };
+  logger.debug(`[START] B-850b account: ${codexAccount.profile ? `${codexAccount.profile.id} ${codexAccount.profile.kind} ${codexAccount.profile.status}` : "machine login"}${accountSwitched ? " (switched)" : ""}`);
   let session;
   let permissionHandler;
   let client;
@@ -1596,6 +1682,25 @@ async function runCodex(opts) {
     if (!wakingFromHibernation) void session.cancelUndeliveredQueuedInputs(reconnectReplay ? { maxSeq: reconnectReplay.seq } : void 0);
     session.updateMetadata((meta) => mergeReconnectMetadata(meta, metadata, Date.now()));
   }
+  session.updateMetadata((current) => ({
+    ...current,
+    agentProfile: codexAccount.profile,
+    ...accountSwitched ? { stickyModel: null, modelIntent: null } : {}
+  }));
+  for (const notice of codexAccount.notices) {
+    session.sendSessionEvent({ type: "message", message: notice, kind: codexAccount.unavailable ? "agent-profile-unavailable" : "agent-profile-warning" });
+  }
+  let historyRejectionReported = false;
+  const noteAccountFailure = (text) => {
+    if (!codexAccount.profile || codexAccount.unavailable) return;
+    if (accountSwitched && !historyRejectionReported && isHistoryRejectedError(text)) {
+      historyRejectionReported = true;
+      session.sendSessionEvent({ type: "message", message: `This conversation's history cannot continue on account "${codexAccount.profile.label}". Start a new session on it, or switch back to the previous account.`, kind: "agent-profile-history-rejected" });
+    } else if (isCodexAuthRejection(text)) {
+      const marked = markCodexAccountRejected(configuration.happyHomeDir, codexAccount.profile.id);
+      if (marked) session.sendSessionEvent({ type: "message", message: `Account "${codexAccount.profile.label}" was rejected (${marked}). Sign in again or switch accounts.`, kind: "agent-profile-auth-failed" });
+    }
+  };
   if (response) {
     try {
       logger.debug(`[START] Reporting session ${response.id} to daemon`);
@@ -1688,6 +1793,11 @@ async function runCodex(opts) {
   };
   let userMessageDelivery = Promise.resolve();
   session.onUserMessage((message) => {
+    if (codexAccount.unavailable && codexAccount.profile) {
+      if (message.localKey) session.sendQueueCancelReason([message.localKey], "failed");
+      session.sendSessionEvent({ type: "message", message: codexAccount.notices[0] ?? `Account "${codexAccount.profile.label}" is unavailable.`, kind: "agent-profile-unavailable" });
+      return;
+    }
     const downloads = session.drainAttachmentsForUserMessage();
     userMessageDelivery = userMessageDelivery.then(async () => {
       const attachments = await downloads;
@@ -1952,6 +2062,7 @@ async function runCodex(opts) {
     process.stdin.setEncoding("utf8");
   }
   client = new CodexAppServerClient(sandboxConfig);
+  client.setAccountOverrides(codexAccount.overrides);
   const idleRelease = new CodexIdleReleaseTimer({
     delayMs: resolveCodexIdleReleaseMs(process.env[CODEX_IDLE_RELEASE_ENV]),
     isIdle: () => shouldReleaseIdleCodex({
@@ -2021,6 +2132,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");
       }
@@ -2029,6 +2141,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");
       }
@@ -2135,6 +2248,11 @@ async function runCodex(opts) {
         logger.debug("[Codex] config/read unavailable", safeCodexErrorMetadata(error));
       }
       machineDefaultModel = configured?.model ?? discoveredModels.find((model) => model.isDefault)?.model;
+      const accountDefault = codexAccountDefaultModel(codexAccount, configured?.model ?? null, discoveredModels);
+      if (codexAccount.profile && !codexAccount.unavailable) {
+        machineDefaultModel = accountDefault;
+        if (codexAccount.models?.length) discoveredModels = accountModelsAsCatalog(codexAccount.models, discoveredModels);
+      }
       if (discoveredModels.length > 0 || configured) {
         session.updateMetadata((metadata2) => ({
           ...metadata2,
@@ -2147,22 +2265,30 @@ async function runCodex(opts) {
               defaultReasoningEffort: model.defaultReasoningEffort
             }))
           } : {},
-          defaultModelCode: configured?.model ?? discoveredModels.find((model) => model.isDefault)?.model,
-          ...configured ? { configuredModel: configured.model } : {}
+          defaultModelCode: codexAccount.profile && !codexAccount.unavailable ? accountDefault : configured?.model ?? discoveredModels.find((model) => model.isDefault)?.model,
+          ...configured ? { configuredModel: codexAccount.profile && !codexAccount.unavailable ? accountDefault ?? null : configured.model } : {}
         }));
       }
     } catch (error) {
       logger.debug("[Codex] Model discovery unavailable; using compatibility fallback", safeCodexErrorMetadata(error));
     }
-    if (opts.resumeThreadId) {
-      await resumeExistingThread({
-        client,
-        session,
-        messageBuffer,
-        threadId: opts.resumeThreadId,
-        cwd: process.cwd(),
-        mcpServers
-      });
+    if (opts.resumeThreadId && !codexAccount.unavailable) {
+      try {
+        await resumeExistingThread({
+          client,
+          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;
     }
@@ -2358,7 +2484,10 @@ async function runCodex(opts) {
         }
         if (!client.hasActiveThread()) {
           const startedThread = await client.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.profile && !codexAccount.unavailable ? machineDefaultModel : void 0),
             cwd: process.cwd(),
             approvalPolicy: executionPolicy.approvalPolicy,
             sandbox: executionPolicy.sandbox,
@@ -2413,6 +2542,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");