very-happy-cli 0.2.192 → 0.2.193

package/dist/{AcpBackend-CGHTDJd9.mjs → AcpBackend-B4PwjqHt.mjs}

@@ -1,11 +1,11 @@
 import { spawn } from 'node:child_process';
 import { ndJsonStream, ClientSideConnection } from '@agentclientprotocol/sdk';
 import { randomUUID } from 'node:crypto';
-import { l as logger } from './logger-Fd_rNvgd.mjs';
-import { d as delay } from './time-bzmet4s5.mjs';
+import { l as logger } from './logger-JV7-4Q_6.mjs';
+import { d as delay } from './time-Cw0liIqB.mjs';
 import { c as contentLogMetadata, e as errorLogMetadata } from './contentLogMetadata-BlWI0egu.mjs';
 import { r as readableStderrTail, a as appendStderrRing, s as stopProcessGracefully, k as killProcessTree } from './processTree-CP5IvQ2Z.mjs';
-import { p as packageJson } from './package-6KkRAops.mjs';
+import { p as packageJson } from './package-Bw3H6VLn.mjs';
 
 function acpImageBlocks(attachments, supportsImages) {
   return attachments.filter((file) => ["image/jpeg", "image/png", "image/gif", "image/webp"].includes(file.mimeType)).map((file) => {

package/dist/{AcpBackend-BQO4ShOy.cjs → AcpBackend-DtJCgftG.cjs}

@@ -3,11 +3,11 @@
 var node_child_process = require('node:child_process');
 var sdk = require('@agentclientprotocol/sdk');
 var node_crypto = require('node:crypto');
-var logger = require('./logger-8su64lqR.cjs');
-var time = require('./time-CaUlWSNJ.cjs');
+var logger = require('./logger-CX3x2eI4.cjs');
+var time = require('./time-BTLcO8jp.cjs');
 var contentLogMetadata = require('./contentLogMetadata-ZSFk_NjQ.cjs');
 var processTree = require('./processTree-CMHWlVse.cjs');
-var _package = require('./package-iuLlSiSF.cjs');
+var _package = require('./package-uzlvxa5S.cjs');
 
 function acpImageBlocks(attachments, supportsImages) {
   return attachments.filter((file) => ["image/jpeg", "image/png", "image/gif", "image/webp"].includes(file.mimeType)).map((file) => {

package/dist/{AcpSessionManager-G0xD6Jbq.mjs → AcpSessionManager-BzKWgkdP.mjs}

@@ -1,6 +1,6 @@
 import { createId } from '@paralleldrive/cuid2';
-import { s as streamKeyOf, k as createEnvelope } from './index-DYD3GM1m.mjs';
-import { t as textResultPayload, b as toolResultPayload } from './api-_LeBScjg.mjs';
+import { s as streamKeyOf, k as createEnvelope } from './index-D1YnIih6.mjs';
+import { t as textResultPayload, b as toolResultPayload } from './api-DUfunY3x.mjs';
 
 function turnOptions(turnId, time) {
   return turnId ? { turn: turnId, time } : { time };

package/dist/{AcpSessionManager-LlUMmcpB.cjs → AcpSessionManager-D4qshX_H.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
 var cuid2 = require('@paralleldrive/cuid2');
-var index = require('./index-BzAYnYct.cjs');
-var api = require('./api-hMDsC6Wg.cjs');
+var index = require('./index-BUFrKZeQ.cjs');
+var api = require('./api-CBE_a88I.cjs');
 
 function turnOptions(turnId, time) {
   return turnId ? { turn: turnId, time } : { time };

package/dist/{BasePermissionHandler-N6Ip3tFt.cjs → BasePermissionHandler-5iG-cvA2.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var logger = require('./logger-8su64lqR.cjs');
+var logger = require('./logger-CX3x2eI4.cjs');
 
 class BasePermissionHandler {
   pendingRequests = /* @__PURE__ */ new Map();

package/dist/{BasePermissionHandler-BmTIg376.mjs → BasePermissionHandler-DV6UM6e9.mjs}

@@ -1,4 +1,4 @@
-import { l as logger } from './logger-Fd_rNvgd.mjs';
+import { l as logger } from './logger-JV7-4Q_6.mjs';
 
 class BasePermissionHandler {
   pendingRequests = /* @__PURE__ */ new Map();

package/dist/{account-CCVT-HO_.mjs → account-Dco_nGT4.mjs}

@@ -1,25 +1,27 @@
 import chalk from 'chalk';
 import { createInterface } from 'node:readline/promises';
-import { c as configuration } from './configuration-IhRiLDVe.mjs';
-import { g as getDaemonAgentProfiles, r as restartDaemonSession, l as listDaemonSessions } from './controlClient-8ILulwjc.mjs';
-import { A as AccountService, b as bindResultMessages, a as AccountError, l as localRestartFailure } from './accountService-Dd9uqde2.mjs';
+import { c as configuration } from './configuration-ThKBP_zY.mjs';
+import { g as getDaemonAgentProfiles, r as restartDaemonSession, l as listDaemonSessions } from './controlClient-Ckl8N1MS.mjs';
+import { A as AccountService, b as bindResultMessages, a as AccountError, l as localRestartFailure } from './accountService-Cd7bnkfd.mjs';
 import 'node:fs';
 import 'node:os';
 import 'node:path';
-import './package-6KkRAops.mjs';
+import './package-Bw3H6VLn.mjs';
 import 'node:fs/promises';
-import './logger-Fd_rNvgd.mjs';
+import './logger-JV7-4Q_6.mjs';
 import 'node:util';
-import './persistence-DWcHe035.mjs';
+import './persistence-Cg4sfjQV.mjs';
 import 'zod';
 import './authRelay-DhQhkBvX.mjs';
 import 'node:crypto';
 import 'tweetnacl';
-import './index-DYD3GM1m.mjs';
+import './index-D1YnIih6.mjs';
 import '@paralleldrive/cuid2';
 import 'node:child_process';
-import './claudeAccountEnv-ON24i0qv.mjs';
-import './store--XN-7MS0.mjs';
+import './claudeAccountEnv-BL1pR_37.mjs';
+import './store-Vej_738f.mjs';
+import './codexAccount-NOX5pmQf.mjs';
+import 'node:readline';
 
 const ACCOUNT_HELP = `Usage:
   very-happy account list [--json]
@@ -27,10 +29,15 @@ const ACCOUNT_HELP = `Usage:
   very-happy account login <id>                    sign an existing subscription account in again
   very-happy account login --label <name> --token-stdin   import a token from \`claude setup-token\`
   very-happy account add --label <name> --base-url <url> (--key-file <path> | --key-env <VAR> | --key-stdin) [--model <id>[:<contextWindow>]]...
+  very-happy account login --agent codex [--label <name>]   ChatGPT sign-in (device code) in its own Codex home
+  very-happy account login <id>                    sign an existing ChatGPT account in again
+  very-happy account add --agent codex --label <name> (--provider <config.toml id> | --base-url <url>) [--wire-api responses|chat]
+                         (--key-file <path> | --key-env <VAR> | --key-stdin) [--model <id>]...
+                                                   Codex API provider; the key reaches only sessions bound to it
   very-happy account test <id>
   very-happy account rename <id> <label>
   very-happy account rm <id> [--force]
-  very-happy account default <id|machine>          account new Claude sessions on this machine start on
+  very-happy account default <id|machine> [--agent codex]   account new Claude (or Codex) sessions on this machine start on
   very-happy account bind <sessionId> <id|machine> [--model <id>] [--no-restart]
 
 Accounts belong to THIS machine: tokens and keys stay in $HAPPY_HOME_DIR
@@ -42,7 +49,7 @@ function parseAccountArgs(args) {
   const flags = /* @__PURE__ */ new Map();
   const bools = /* @__PURE__ */ new Set();
   const positional = [];
-  const valued = /* @__PURE__ */ new Set(["--label", "--base-url", "--key-file", "--key-env", "--model"]);
+  const valued = /* @__PURE__ */ new Set(["--label", "--base-url", "--key-file", "--key-env", "--model", "--agent", "--provider", "--wire-api"]);
   for (let i = 0; i < rest.length; i++) {
     const arg = rest[i];
     if (arg === "-h" || arg === "--help") return { action: "help" };
@@ -61,21 +68,34 @@ function parseAccountArgs(args) {
     for (const f of flags.keys()) if (!names.includes(f)) throw new Error(`unknown option ${f}`);
   };
   const machineOr = (id) => id === "machine" || id === "default" ? null : id;
+  const agentFlag = () => {
+    const agent = one("--agent") ?? "claude";
+    if (agent !== "claude" && agent !== "codex") throw new Error("--agent must be claude or codex");
+    return agent;
+  };
   switch (sub) {
     case "list":
     case "ls":
       allowed(["--json"]);
       return { action: "list", json: bools.has("--json") };
-    case "login":
-      allowed(["--label", "--token-stdin"]);
+    case "login": {
+      allowed(["--label", "--token-stdin", "--agent"]);
+      const agent = agentFlag();
       if (positional.length > 1) throw new Error("login takes at most one account id");
-      if (!positional[0] && !one("--label")) throw new Error("login needs --label <name> (new account) or an account id (sign in again)");
-      return { action: "login", ...positional[0] ? { accountId: positional[0] } : {}, ...one("--label") ? { label: one("--label") } : {}, tokenStdin: bools.has("--token-stdin") };
+      if (agent === "claude" && !positional[0] && !one("--label")) throw new Error("login needs --label <name> (new account) or an account id (sign in again)");
+      if (agent === "codex" && bools.has("--token-stdin")) throw new Error("--token-stdin is for Claude accounts");
+      return { action: "login", agent, ...positional[0] ? { accountId: positional[0] } : {}, ...one("--label") ? { label: one("--label") } : {}, tokenStdin: bools.has("--token-stdin") };
+    }
     case "add": {
-      allowed(["--label", "--base-url", "--key-file", "--key-env", "--key-stdin", "--model"]);
+      allowed(["--label", "--base-url", "--key-file", "--key-env", "--key-stdin", "--model", "--agent", "--provider", "--wire-api"]);
+      const agent = agentFlag();
       const label = one("--label");
       const baseUrl = one("--base-url");
-      if (!label || !baseUrl) throw new Error("add needs --label and --base-url");
+      const provider = one("--provider");
+      const wireApi = one("--wire-api");
+      if (agent === "claude" && (provider || wireApi)) throw new Error("--provider / --wire-api are for Codex accounts (--agent codex)");
+      if (wireApi && wireApi !== "responses" && wireApi !== "chat") throw new Error("--wire-api must be responses or chat");
+      if (!label || !baseUrl && !provider) throw new Error(agent === "codex" ? "add --agent codex needs --label and --provider or --base-url" : "add needs --label and --base-url");
       const sources = [one("--key-file") !== void 0, one("--key-env") !== void 0, bools.has("--key-stdin")].filter(Boolean).length;
       if (sources !== 1) throw new Error("add needs exactly one of --key-file, --key-env, --key-stdin");
       const key = one("--key-file") !== void 0 ? { source: "file", path: one("--key-file") } : one("--key-env") !== void 0 ? { source: "env", name: one("--key-env") } : { source: "stdin" };
@@ -83,7 +103,7 @@ function parseAccountArgs(args) {
         const match = m.match(/^(.+):(\d+)$/);
         return match ? { id: match[1], contextWindow: Number(match[2]) } : m;
       });
-      return { action: "add", label, baseUrl, key, models };
+      return { action: "add", agent, label, ...baseUrl ? { baseUrl } : {}, ...provider ? { provider } : {}, ...wireApi ? { wireApi } : {}, key, models };
     }
     case "test":
     case "rm":
@@ -96,9 +116,9 @@ function parseAccountArgs(args) {
       if (positional.length !== 2) throw new Error("rename needs <id> <label>");
       return { action: "rename", accountId: positional[0], label: positional[1] };
     case "default":
-      allowed([]);
+      allowed(["--agent"]);
       if (positional.length !== 1) throw new Error("default needs <id|machine>");
-      return { action: "default", accountId: machineOr(positional[0]) };
+      return { action: "default", accountId: machineOr(positional[0]), ...one("--agent") ? { agent: agentFlag() } : {} };
     case "bind":
       allowed(["--model", "--no-restart"]);
       if (positional.length !== 2) throw new Error("bind needs <sessionId> <id|machine>");
@@ -108,8 +128,10 @@ function parseAccountArgs(args) {
   }
 }
 function formatAccountLine(a, isDefault, now) {
-  const kind = a.kind === "claude-subscription" ? "subscription" : a.kind === "claude-api" ? "api" : a.kind;
+  const kind = { "claude-subscription": "subscription", "claude-api": "api", "codex-chatgpt": "codex chatgpt", "codex-provider": "codex provider" }[a.kind] ?? a.kind;
   const extra = [];
+  if (a.email) extra.push(a.email + (a.planType ? ` (${a.planType})` : ""));
+  if (a.provider) extra.push(`provider: ${a.provider}`);
   if (a.baseUrl) extra.push(a.baseUrl);
   if (a.models?.length) extra.push(`models: ${a.models.join(", ")}`);
   if (a.keySource === "file" || a.keySource === "env") extra.push(`key: ${a.keySource} ${a.keyRef ?? ""}`.trim());
@@ -130,8 +152,38 @@ async function restartOutcome(sessionId) {
   const stillRunning = await listDaemonSessions().then((children) => children.some((c) => c?.happySessionId === sessionId), () => false);
   return localRestartFailure(error, stillRunning);
 }
+async function loginCodexInteractive(target) {
+  const svc = new AccountService({ home: configuration.happyHomeDir });
+  try {
+    const started = await svc.loginStart({ agent: "codex", kind: "codex-chatgpt", ...target });
+    if (started.state !== "waiting-code" || !started.url || !started.userCode) throw new Error(started.error ?? "codex did not return a device code");
+    console.log(`Open ${started.url} , sign in to ChatGPT and enter this code:
+
+    ${started.userCode}
+
+Waiting (expires in 15 minutes; Ctrl-C to cancel)\u2026`);
+    const cancel = () => {
+      svc.loginCancel(started.loginId);
+    };
+    process.once("SIGINT", cancel);
+    try {
+      for (; ; ) {
+        await new Promise((r) => setTimeout(r, 1e3));
+        const status = svc.loginStatus(started.loginId);
+        if (status.state === "waiting-code" || status.state === "starting") continue;
+        if (status.state === "succeeded" && status.account) return status.account;
+        throw new Error(status.error ?? `sign-in ${status.state}`);
+      }
+    } finally {
+      process.off("SIGINT", cancel);
+    }
+  } finally {
+    await svc.settleLogins();
+    svc.dispose();
+  }
+}
 async function loginInteractive(target) {
-  const { spawnSetupTokenPty } = await import('./daemonAccounts-BJgt6IJe.mjs');
+  const { spawnSetupTokenPty } = await import('./daemonAccounts-DwPwKxvv.mjs');
   const { homedir } = await import('node:os');
   const svc = new AccountService({ home: configuration.happyHomeDir, spawnPty: (env) => spawnSetupTokenPty(homedir(), env) });
   const started = await svc.loginStart({ agent: "claude", kind: "claude-subscription", ...target });
@@ -189,13 +241,15 @@ async function handleAccountCommand(args) {
       }
       case "login": {
         const target = { ...parsed.accountId ? { accountId: parsed.accountId } : {}, ...parsed.label ? { label: parsed.label } : {} };
-        const account = parsed.tokenStdin ? service.storeSubscriptionToken(await readStdin(), target) : await loginInteractive(target);
+        const existing = parsed.accountId ? service.state().accounts.find((a) => a.id === parsed.accountId) : void 0;
+        const codex = parsed.agent === "codex" || existing?.agent === "codex";
+        const account = codex ? await loginCodexInteractive(target) : parsed.tokenStdin ? service.storeSubscriptionToken(await readStdin(), target) : await loginInteractive(target);
         console.log(`Signed in: ${account.id} (${account.label}).`);
         return;
       }
       case "add": {
         const key = parsed.key.source === "stdin" ? { source: "paste", value: await readStdin() } : parsed.key;
-        const account = await service.add({ agent: "claude", kind: "claude-api", label: parsed.label, baseUrl: parsed.baseUrl, key, ...parsed.models.length ? { models: parsed.models } : {} });
+        const account = parsed.agent === "codex" ? await service.add({ agent: "codex", kind: "codex-provider", label: parsed.label, ...parsed.baseUrl ? { baseUrl: parsed.baseUrl } : {}, ...parsed.provider ? { provider: parsed.provider } : {}, ...parsed.wireApi ? { wireApi: parsed.wireApi } : {}, key, ...parsed.models.length ? { models: parsed.models } : {} }) : await service.add({ agent: "claude", kind: "claude-api", label: parsed.label, baseUrl: parsed.baseUrl, key, ...parsed.models.length ? { models: parsed.models } : {} });
         console.log(formatAccountLine(account, false, Date.now()));
         return;
       }
@@ -214,10 +268,13 @@ async function handleAccountCommand(args) {
         for (const [sessionId, outcome] of Object.entries(restarts ?? {})) if (outcome !== "done") console.log(chalk.dim(`  ${sessionId}: restart ${outcome}`));
         return;
       }
-      case "default":
-        service.setDefault("claude", parsed.accountId);
-        console.log(parsed.accountId ? `New Claude sessions on this machine start on ${parsed.accountId}.` : "New Claude sessions on this machine use the machine login.");
+      case "default": {
+        const agent = parsed.agent ?? (parsed.accountId ? service.state().accounts.find((a) => a.id === parsed.accountId)?.agent : void 0) ?? "claude";
+        service.setDefault(agent, parsed.accountId);
+        const name = agent === "codex" ? "Codex" : "Claude";
+        console.log(parsed.accountId ? `New ${name} sessions on this machine start on ${parsed.accountId}.` : `New ${name} sessions on this machine use the machine login.`);
         return;
+      }
       case "bind": {
         const result = await service.bind({ sessionId: parsed.sessionId, accountId: parsed.accountId, ...parsed.model ? { model: parsed.model } : {}, restart: parsed.restart });
         const shown = bindResultMessages(result, parsed.sessionId, `${parsed.accountId ?? "machine login"}${parsed.model ? ` / ${parsed.model}` : ""}`, "account");

package/dist/{account-DtaouikP.cjs → account-DvpA60oU.cjs}

@@ -2,26 +2,28 @@
 
 var chalk = require('chalk');
 var promises = require('node:readline/promises');
-var configuration = require('./configuration-CXEVKAyF.cjs');
-var controlClient = require('./controlClient-j7p5p3_7.cjs');
-var accountService = require('./accountService-Bddy0zwL.cjs');
+var configuration = require('./configuration-BBK0rmmj.cjs');
+var controlClient = require('./controlClient-DwWTns3A.cjs');
+var accountService = require('./accountService-CuUSJDhP.cjs');
 require('node:fs');
 require('node:os');
 require('node:path');
-require('./package-iuLlSiSF.cjs');
+require('./package-uzlvxa5S.cjs');
 require('node:fs/promises');
-require('./logger-8su64lqR.cjs');
+require('./logger-CX3x2eI4.cjs');
 require('node:util');
-require('./persistence-B4ttN-fR.cjs');
+require('./persistence-CsmAgN-C.cjs');
 require('zod');
 require('./authRelay-Dy1qU9td.cjs');
 require('node:crypto');
 require('tweetnacl');
-require('./index-BzAYnYct.cjs');
+require('./index-BUFrKZeQ.cjs');
 require('@paralleldrive/cuid2');
 require('node:child_process');
-require('./claudeAccountEnv-BOBpJ3k8.cjs');
-require('./store-DV__wCvP.cjs');
+require('./claudeAccountEnv-CEX_EMZr.cjs');
+require('./store-CkNa6oj4.cjs');
+require('./codexAccount-BDQjRbtI.cjs');
+require('node:readline');
 
 const ACCOUNT_HELP = `Usage:
   very-happy account list [--json]
@@ -29,10 +31,15 @@ const ACCOUNT_HELP = `Usage:
   very-happy account login <id>                    sign an existing subscription account in again
   very-happy account login --label <name> --token-stdin   import a token from \`claude setup-token\`
   very-happy account add --label <name> --base-url <url> (--key-file <path> | --key-env <VAR> | --key-stdin) [--model <id>[:<contextWindow>]]...
+  very-happy account login --agent codex [--label <name>]   ChatGPT sign-in (device code) in its own Codex home
+  very-happy account login <id>                    sign an existing ChatGPT account in again
+  very-happy account add --agent codex --label <name> (--provider <config.toml id> | --base-url <url>) [--wire-api responses|chat]
+                         (--key-file <path> | --key-env <VAR> | --key-stdin) [--model <id>]...
+                                                   Codex API provider; the key reaches only sessions bound to it
   very-happy account test <id>
   very-happy account rename <id> <label>
   very-happy account rm <id> [--force]
-  very-happy account default <id|machine>          account new Claude sessions on this machine start on
+  very-happy account default <id|machine> [--agent codex]   account new Claude (or Codex) sessions on this machine start on
   very-happy account bind <sessionId> <id|machine> [--model <id>] [--no-restart]
 
 Accounts belong to THIS machine: tokens and keys stay in $HAPPY_HOME_DIR
@@ -44,7 +51,7 @@ function parseAccountArgs(args) {
   const flags = /* @__PURE__ */ new Map();
   const bools = /* @__PURE__ */ new Set();
   const positional = [];
-  const valued = /* @__PURE__ */ new Set(["--label", "--base-url", "--key-file", "--key-env", "--model"]);
+  const valued = /* @__PURE__ */ new Set(["--label", "--base-url", "--key-file", "--key-env", "--model", "--agent", "--provider", "--wire-api"]);
   for (let i = 0; i < rest.length; i++) {
     const arg = rest[i];
     if (arg === "-h" || arg === "--help") return { action: "help" };
@@ -63,21 +70,34 @@ function parseAccountArgs(args) {
     for (const f of flags.keys()) if (!names.includes(f)) throw new Error(`unknown option ${f}`);
   };
   const machineOr = (id) => id === "machine" || id === "default" ? null : id;
+  const agentFlag = () => {
+    const agent = one("--agent") ?? "claude";
+    if (agent !== "claude" && agent !== "codex") throw new Error("--agent must be claude or codex");
+    return agent;
+  };
   switch (sub) {
     case "list":
     case "ls":
       allowed(["--json"]);
       return { action: "list", json: bools.has("--json") };
-    case "login":
-      allowed(["--label", "--token-stdin"]);
+    case "login": {
+      allowed(["--label", "--token-stdin", "--agent"]);
+      const agent = agentFlag();
       if (positional.length > 1) throw new Error("login takes at most one account id");
-      if (!positional[0] && !one("--label")) throw new Error("login needs --label <name> (new account) or an account id (sign in again)");
-      return { action: "login", ...positional[0] ? { accountId: positional[0] } : {}, ...one("--label") ? { label: one("--label") } : {}, tokenStdin: bools.has("--token-stdin") };
+      if (agent === "claude" && !positional[0] && !one("--label")) throw new Error("login needs --label <name> (new account) or an account id (sign in again)");
+      if (agent === "codex" && bools.has("--token-stdin")) throw new Error("--token-stdin is for Claude accounts");
+      return { action: "login", agent, ...positional[0] ? { accountId: positional[0] } : {}, ...one("--label") ? { label: one("--label") } : {}, tokenStdin: bools.has("--token-stdin") };
+    }
     case "add": {
-      allowed(["--label", "--base-url", "--key-file", "--key-env", "--key-stdin", "--model"]);
+      allowed(["--label", "--base-url", "--key-file", "--key-env", "--key-stdin", "--model", "--agent", "--provider", "--wire-api"]);
+      const agent = agentFlag();
       const label = one("--label");
       const baseUrl = one("--base-url");
-      if (!label || !baseUrl) throw new Error("add needs --label and --base-url");
+      const provider = one("--provider");
+      const wireApi = one("--wire-api");
+      if (agent === "claude" && (provider || wireApi)) throw new Error("--provider / --wire-api are for Codex accounts (--agent codex)");
+      if (wireApi && wireApi !== "responses" && wireApi !== "chat") throw new Error("--wire-api must be responses or chat");
+      if (!label || !baseUrl && !provider) throw new Error(agent === "codex" ? "add --agent codex needs --label and --provider or --base-url" : "add needs --label and --base-url");
       const sources = [one("--key-file") !== void 0, one("--key-env") !== void 0, bools.has("--key-stdin")].filter(Boolean).length;
       if (sources !== 1) throw new Error("add needs exactly one of --key-file, --key-env, --key-stdin");
       const key = one("--key-file") !== void 0 ? { source: "file", path: one("--key-file") } : one("--key-env") !== void 0 ? { source: "env", name: one("--key-env") } : { source: "stdin" };
@@ -85,7 +105,7 @@ function parseAccountArgs(args) {
         const match = m.match(/^(.+):(\d+)$/);
         return match ? { id: match[1], contextWindow: Number(match[2]) } : m;
       });
-      return { action: "add", label, baseUrl, key, models };
+      return { action: "add", agent, label, ...baseUrl ? { baseUrl } : {}, ...provider ? { provider } : {}, ...wireApi ? { wireApi } : {}, key, models };
     }
     case "test":
     case "rm":
@@ -98,9 +118,9 @@ function parseAccountArgs(args) {
       if (positional.length !== 2) throw new Error("rename needs <id> <label>");
       return { action: "rename", accountId: positional[0], label: positional[1] };
     case "default":
-      allowed([]);
+      allowed(["--agent"]);
       if (positional.length !== 1) throw new Error("default needs <id|machine>");
-      return { action: "default", accountId: machineOr(positional[0]) };
+      return { action: "default", accountId: machineOr(positional[0]), ...one("--agent") ? { agent: agentFlag() } : {} };
     case "bind":
       allowed(["--model", "--no-restart"]);
       if (positional.length !== 2) throw new Error("bind needs <sessionId> <id|machine>");
@@ -110,8 +130,10 @@ function parseAccountArgs(args) {
   }
 }
 function formatAccountLine(a, isDefault, now) {
-  const kind = a.kind === "claude-subscription" ? "subscription" : a.kind === "claude-api" ? "api" : a.kind;
+  const kind = { "claude-subscription": "subscription", "claude-api": "api", "codex-chatgpt": "codex chatgpt", "codex-provider": "codex provider" }[a.kind] ?? a.kind;
   const extra = [];
+  if (a.email) extra.push(a.email + (a.planType ? ` (${a.planType})` : ""));
+  if (a.provider) extra.push(`provider: ${a.provider}`);
   if (a.baseUrl) extra.push(a.baseUrl);
   if (a.models?.length) extra.push(`models: ${a.models.join(", ")}`);
   if (a.keySource === "file" || a.keySource === "env") extra.push(`key: ${a.keySource} ${a.keyRef ?? ""}`.trim());
@@ -132,8 +154,38 @@ async function restartOutcome(sessionId) {
   const stillRunning = await controlClient.listDaemonSessions().then((children) => children.some((c) => c?.happySessionId === sessionId), () => false);
   return accountService.localRestartFailure(error, stillRunning);
 }
+async function loginCodexInteractive(target) {
+  const svc = new accountService.AccountService({ home: configuration.configuration.happyHomeDir });
+  try {
+    const started = await svc.loginStart({ agent: "codex", kind: "codex-chatgpt", ...target });
+    if (started.state !== "waiting-code" || !started.url || !started.userCode) throw new Error(started.error ?? "codex did not return a device code");
+    console.log(`Open ${started.url} , sign in to ChatGPT and enter this code:
+
+    ${started.userCode}
+
+Waiting (expires in 15 minutes; Ctrl-C to cancel)\u2026`);
+    const cancel = () => {
+      svc.loginCancel(started.loginId);
+    };
+    process.once("SIGINT", cancel);
+    try {
+      for (; ; ) {
+        await new Promise((r) => setTimeout(r, 1e3));
+        const status = svc.loginStatus(started.loginId);
+        if (status.state === "waiting-code" || status.state === "starting") continue;
+        if (status.state === "succeeded" && status.account) return status.account;
+        throw new Error(status.error ?? `sign-in ${status.state}`);
+      }
+    } finally {
+      process.off("SIGINT", cancel);
+    }
+  } finally {
+    await svc.settleLogins();
+    svc.dispose();
+  }
+}
 async function loginInteractive(target) {
-  const { spawnSetupTokenPty } = await Promise.resolve().then(function () { return require('./daemonAccounts-BCjDgoNt.cjs'); });
+  const { spawnSetupTokenPty } = await Promise.resolve().then(function () { return require('./daemonAccounts-CpGDY_4k.cjs'); });
   const { homedir } = await import('node:os');
   const svc = new accountService.AccountService({ home: configuration.configuration.happyHomeDir, spawnPty: (env) => spawnSetupTokenPty(homedir(), env) });
   const started = await svc.loginStart({ agent: "claude", kind: "claude-subscription", ...target });
@@ -191,13 +243,15 @@ async function handleAccountCommand(args) {
       }
       case "login": {
         const target = { ...parsed.accountId ? { accountId: parsed.accountId } : {}, ...parsed.label ? { label: parsed.label } : {} };
-        const account = parsed.tokenStdin ? service.storeSubscriptionToken(await readStdin(), target) : await loginInteractive(target);
+        const existing = parsed.accountId ? service.state().accounts.find((a) => a.id === parsed.accountId) : void 0;
+        const codex = parsed.agent === "codex" || existing?.agent === "codex";
+        const account = codex ? await loginCodexInteractive(target) : parsed.tokenStdin ? service.storeSubscriptionToken(await readStdin(), target) : await loginInteractive(target);
         console.log(`Signed in: ${account.id} (${account.label}).`);
         return;
       }
       case "add": {
         const key = parsed.key.source === "stdin" ? { source: "paste", value: await readStdin() } : parsed.key;
-        const account = await service.add({ agent: "claude", kind: "claude-api", label: parsed.label, baseUrl: parsed.baseUrl, key, ...parsed.models.length ? { models: parsed.models } : {} });
+        const account = parsed.agent === "codex" ? await service.add({ agent: "codex", kind: "codex-provider", label: parsed.label, ...parsed.baseUrl ? { baseUrl: parsed.baseUrl } : {}, ...parsed.provider ? { provider: parsed.provider } : {}, ...parsed.wireApi ? { wireApi: parsed.wireApi } : {}, key, ...parsed.models.length ? { models: parsed.models } : {} }) : await service.add({ agent: "claude", kind: "claude-api", label: parsed.label, baseUrl: parsed.baseUrl, key, ...parsed.models.length ? { models: parsed.models } : {} });
         console.log(formatAccountLine(account, false, Date.now()));
         return;
       }
@@ -216,10 +270,13 @@ async function handleAccountCommand(args) {
         for (const [sessionId, outcome] of Object.entries(restarts ?? {})) if (outcome !== "done") console.log(chalk.dim(`  ${sessionId}: restart ${outcome}`));
         return;
       }
-      case "default":
-        service.setDefault("claude", parsed.accountId);
-        console.log(parsed.accountId ? `New Claude sessions on this machine start on ${parsed.accountId}.` : "New Claude sessions on this machine use the machine login.");
+      case "default": {
+        const agent = parsed.agent ?? (parsed.accountId ? service.state().accounts.find((a) => a.id === parsed.accountId)?.agent : void 0) ?? "claude";
+        service.setDefault(agent, parsed.accountId);
+        const name = agent === "codex" ? "Codex" : "Claude";
+        console.log(parsed.accountId ? `New ${name} sessions on this machine start on ${parsed.accountId}.` : `New ${name} sessions on this machine use the machine login.`);
         return;
+      }
       case "bind": {
         const result = await service.bind({ sessionId: parsed.sessionId, accountId: parsed.accountId, ...parsed.model ? { model: parsed.model } : {}, restart: parsed.restart });
         const shown = accountService.bindResultMessages(result, parsed.sessionId, `${parsed.accountId ?? "machine login"}${parsed.model ? ` / ${parsed.model}` : ""}`, "account");