very-happy-cli 0.2.191 → 0.2.192

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

@@ -1,21 +1,21 @@
 'use strict';
 
-var spawnAgents = require('./spawnAgents-CtkkIFHd.cjs');
-var client = require('./client-C5-C0t2a.cjs');
+var spawnAgents = require('./spawnAgents-CClb7buD.cjs');
+var client = require('./client-D8XROyZc.cjs');
 var chalk = require('chalk');
 var node_fs = require('node:fs');
 var path$1 = require('node:path');
-var controlClient = require('./controlClient-C13_pSKG.cjs');
-var persistence = require('./persistence-A2NeERZJ.cjs');
-var index = require('./index-CLUHaPU8.cjs');
-var configuration = require('./configuration-DfPBa-9d.cjs');
+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 path = require('./path-B7zW-WwE.cjs');
-var claudeSessionFork = require('./claudeSessionFork-Cko4SaVi.cjs');
-var codexAppServerClient = require('./codexAppServerClient-DKXeikEe.cjs');
+var claudeSessionFork = require('./claudeSessionFork-YiktY55n.cjs');
+var codexAppServerClient = require('./codexAppServerClient-q8GHQhyC.cjs');
 var codexThreadFork = require('./codexThreadFork-5kwoKjMu.cjs');
-var sessionOps = require('./sessionOps-DXlTmS7J.cjs');
-var createSessionMetadata = require('./createSessionMetadata-Cf78KHtt.cjs');
-var logger = require('./logger-Ct2zvaq0.cjs');
+var sessionOps = require('./sessionOps-DvnEH4PL.cjs');
+var createSessionMetadata = require('./createSessionMetadata-DwdD_uVo.cjs');
+var logger = require('./logger-8su64lqR.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-9n7wd2dT.cjs');
+require('./package-iuLlSiSF.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-B2Kx6L0S.cjs');
+require('./rateLimitWindows-DBfiuYeg.cjs');
 require('./processTree-CMHWlVse.cjs');
 require('axios');
-require('./time-Cy0a-7YX.cjs');
+require('./time-CaUlWSNJ.cjs');
 require('./specialCommands-J3JFOq0J.cjs');
 require('socket.io-client');
 require('./backgroundTaskActivity-CBvUdj39.cjs');
@@ -157,6 +157,10 @@ function parseSpawnArgs(args) {
       const value = args[++i];
       if (value === void 0 || value.trim().length === 0) throw new Error("--model requires a value");
       options.model = value;
+    } else if (arg === "--account") {
+      const value = args[++i];
+      if (value === void 0 || !/^[a-z0-9][a-z0-9-]{0,47}$/.test(value)) throw new Error('--account requires an account id (see `very-happy account list`) or "machine"');
+      options.account = value;
     } else if (arg === "--fork") {
       const value = args[++i];
       if (value === void 0) throw new Error("--fork requires a session id");
@@ -192,8 +196,8 @@ ${chalk.bold("very-happy spawn")} - Spawn a remote session via the local daemon
 ${chalk.bold("Usage:")}
   very-happy spawn --dir <path> [--prompt <text> | --prompt-file <file>]
                    [--spawned-by <name>] [--permission-mode <mode>]
-                   [--agent <name>] [--model <id>] [--env KEY=VALUE]...
-                   [--project <id> | --no-project] [--json]
+                   [--agent <name>] [--model <id>] [--account <id>]
+                   [--env KEY=VALUE]... [--project <id> | --no-project] [--json]
   very-happy spawn --fork <sessionId> [--prompt \u2026] [--permission-mode <mode>]
                    [--model <id>] [--spawned-by <name>] [--project <id>]
                    [--json]
@@ -220,6 +224,10 @@ ${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
+                            list\`); 'machine' = the machine's own login.
+                            Default = the machine's default account, if set. A
+                            missing or expired account fails the spawn.
   --fork <sessionId>     Fork an existing session of THIS machine (same as the
                             web's fork): copies its conversation and continues
                             it in a new session, in the same directory and with
@@ -382,7 +390,8 @@ async function handleSpawnCommand(args) {
     // through, an old wrapper ignores it).
     environmentVariables: spawnEnvironmentVariables(options.env, prompt !== void 0),
     ...resumeIds,
-    ...forkSource ? { parentSessionId: forkSource.parentSessionId } : {}
+    ...forkSource ? { parentSessionId: forkSource.parentSessionId } : {},
+    ...options.account ? { agentProfileId: options.account === "machine" ? null : options.account } : {}
   });
   if (result?.error || !result?.success || !result?.sessionId) {
     const message = result?.error || "Daemon returned no session ID";

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

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

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

@@ -1,4 +1,4 @@
-import { u as getAgentCodeDefaults, v as isLatestModelMode, w as resolveLatestModel, L as LATEST_MODEL_MODE, E as EFFORT_INTENT_AUTO, x as normalizeAgentKey } from './index-Bq8NKSCF.mjs';
+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';
 
 function chooseProject(opts) {
   if (opts.project) return { kind: "explicit", projectId: opts.project };

package/dist/{spawnHappyCLI-CIA9Sc_5.mjs → spawnHappyCLI-Cj_6IICe.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-GcbI0eg2.mjs';
+import { l as logger } from './logger-Fd_rNvgd.mjs';
 import { existsSync } from 'node:fs';
 
 let cachedRuntime = null;

package/dist/{spawnHappyCLI-CF_gLi92.cjs → spawnHappyCLI-DJdhX_Qx.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-Ct2zvaq0.cjs');
+var logger = require('./logger-8su64lqR.cjs');
 var node_fs = require('node:fs');
 
 let cachedRuntime = null;

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

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

package/dist/{startFileWatcher-9Stpxe7p.cjs → startFileWatcher-LnOmVW6H.cjs}

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

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

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

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

@@ -1,6 +1,6 @@
-import { l as logger } from './logger-GcbI0eg2.mjs';
-import { e as evaluateWrapperIdle, j as isQuiescent, k as HIBERNATION_UNSUPPORTED_BACKOFF_MS } from './persistence-Cpw4yJs8.mjs';
-import { c as connectionState } from './api-jfeMRg5R.mjs';
+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';
 
 const PRESENCE_SETTLE_MS = 6e3;
 async function commitHibernation(deps) {

package/dist/store--XN-7MS0.mjs

@@ -0,0 +1,269 @@
+import { readFileSync, existsSync, mkdirSync, chmodSync, writeFileSync, renameSync, rmSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { join, dirname } from 'node:path';
+
+function providersPath(happyHomeDir) {
+  return join(happyHomeDir, "providers.json");
+}
+function sessionProvidersPath(happyHomeDir) {
+  return join(happyHomeDir, "session-providers.json");
+}
+function parseProvidersFile(raw) {
+  const profiles = {};
+  const src = raw && typeof raw === "object" ? raw.profiles : void 0;
+  if (src && typeof src === "object") {
+    for (const [id, p] of Object.entries(src)) {
+      if (!p || typeof p !== "object") continue;
+      const { name, baseUrl, apiKeyFile, models } = p;
+      if (typeof baseUrl !== "string" || !/^https?:\/\//.test(baseUrl) || typeof apiKeyFile !== "string" || !apiKeyFile) continue;
+      const ids = [];
+      const contextWindows = {};
+      for (const m of Array.isArray(models) ? models : []) {
+        if (typeof m === "string") ids.push(m);
+        else if (m && typeof m === "object" && typeof m.id === "string") {
+          const { id: modelId, contextWindow } = m;
+          ids.push(modelId);
+          if (typeof contextWindow === "number" && Number.isInteger(contextWindow) && contextWindow > 0) contextWindows[modelId] = contextWindow;
+        }
+      }
+      profiles[id] = {
+        ...typeof name === "string" ? { name } : {},
+        baseUrl: baseUrl.replace(/\/+$/, ""),
+        apiKeyFile,
+        ...Array.isArray(models) ? { models: ids } : {},
+        ...Object.keys(contextWindows).length > 0 ? { contextWindows } : {}
+      };
+    }
+  }
+  return { profiles };
+}
+function parseSessionProvidersFile(raw) {
+  const out = {};
+  if (!raw || typeof raw !== "object") return out;
+  for (const [sessionId, b] of Object.entries(raw)) {
+    if (!b || typeof b !== "object") continue;
+    const { profile, model } = b;
+    if (typeof profile === "string" && profile && typeof model === "string" && model) out[sessionId] = { profile, model };
+  }
+  return out;
+}
+
+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}$/;
+function accountsPath(home) {
+  return join(home, "accounts.json");
+}
+function accountSecretPath(home, id) {
+  if (!ACCOUNT_ID_PATTERN.test(id)) throw new Error(`invalid account id "${id}"`);
+  return join(home, "accounts", id, "secret");
+}
+function sessionAccountsPath(home) {
+  return join(home, "session-accounts.json");
+}
+function expandHome(path, home = homedir()) {
+  return path === "~" ? home : path.startsWith("~/") ? join(home, path.slice(2)) : path;
+}
+function readJson(path) {
+  if (!existsSync(path)) return void 0;
+  try {
+    return JSON.parse(readFileSync(path, "utf8"));
+  } catch {
+    return void 0;
+  }
+}
+function writeJson0600(path, value) {
+  mkdirSync(dirname(path), { recursive: true });
+  const tmp = `${path}.${process.pid}.${Date.now()}.tmp`;
+  writeFileSync(tmp, JSON.stringify(value, null, 2) + "\n", { mode: 384 });
+  chmodSync(tmp, 384);
+  renameSync(tmp, path);
+}
+function parseKey(raw) {
+  if (!raw || typeof raw !== "object") return void 0;
+  const k = raw;
+  if (k.source === "file" && typeof k.path === "string" && k.path) return { source: "file", path: k.path };
+  if (k.source === "env" && typeof k.name === "string" && /^[A-Za-z_][A-Za-z0-9_]*$/.test(k.name)) return { source: "env", name: k.name };
+  if (k.source === "stored") return { source: "stored" };
+  return void 0;
+}
+function parseAccountsFile(raw) {
+  const out = { version: 2, accounts: {}, defaults: {} };
+  if (!raw || typeof raw !== "object") return out;
+  const src = raw.accounts;
+  if (src && typeof src === "object") {
+    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 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 key = parseKey(a.key);
+        if (!key) continue;
+        rec.baseUrl = a.baseUrl.replace(/\/+$/, "");
+        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") {
+          const cw = {};
+          for (const [m, n] of Object.entries(a.contextWindows)) {
+            if (typeof n === "number" && Number.isInteger(n) && n > 0) cw[m] = n;
+          }
+          if (Object.keys(cw).length > 0) rec.contextWindows = cw;
+        }
+      }
+      if (typeof a.expiresAt === "number") rec.expiresAt = a.expiresAt;
+      if (a.check && typeof a.check === "object") {
+        const c = a.check;
+        if (typeof c.status === "string" && typeof c.at === "number") {
+          rec.check = { status: c.status, at: c.at, ...typeof c.detail === "string" ? { detail: c.detail } : {} };
+        }
+      }
+      out.accounts[id] = rec;
+    }
+  }
+  const defaults = raw.defaults;
+  if (defaults && typeof defaults === "object") {
+    for (const [agent, id] of Object.entries(defaults)) {
+      if (typeof id === "string" && id) out.defaults[agent] = id;
+    }
+  }
+  return out;
+}
+function legacyAccountsFromProviders(raw) {
+  const out = {};
+  for (const [id, p] of Object.entries(parseProvidersFile(raw).profiles)) {
+    if (!ACCOUNT_ID_PATTERN.test(id)) continue;
+    out[id] = {
+      label: p.name ?? id,
+      agent: "claude",
+      kind: "claude-api",
+      createdAt: 0,
+      baseUrl: p.baseUrl,
+      key: { source: "file", path: p.apiKeyFile },
+      ...p.models ? { models: p.models } : {},
+      ...p.contextWindows ? { contextWindows: p.contextWindows } : {},
+      legacy: true
+    };
+  }
+  return out;
+}
+function mergeAccounts(v2, legacy) {
+  return { ...v2, accounts: { ...legacy, ...v2.accounts } };
+}
+function readAccountsFileV2(home) {
+  return parseAccountsFile(readJson(accountsPath(home)));
+}
+function readAccounts(home) {
+  return mergeAccounts(readAccountsFileV2(home), legacyAccountsFromProviders(readJson(providersPath(home))));
+}
+function writeAccountsFile(home, file) {
+  const accounts = {};
+  for (const [id, a] of Object.entries(file.accounts)) if (!a.legacy) accounts[id] = a;
+  writeJson0600(accountsPath(home), { version: 2, accounts, defaults: file.defaults });
+}
+function mergeSessionBindings(v2Raw, v1Raw) {
+  const out = {};
+  for (const [sessionId, b] of Object.entries(parseSessionProvidersFile(v1Raw))) out[sessionId] = { account: b.profile, model: b.model };
+  if (v2Raw && typeof v2Raw === "object") {
+    for (const [sessionId, b] of Object.entries(v2Raw)) {
+      if (!b || typeof b !== "object") continue;
+      const { account, model } = b;
+      if (account !== null && (typeof account !== "string" || !account)) continue;
+      out[sessionId] = { account, ...typeof model === "string" && model ? { model } : {} };
+    }
+  }
+  return out;
+}
+function readSessionBindings(home) {
+  return mergeSessionBindings(readJson(sessionAccountsPath(home)), readJson(sessionProvidersPath(home)));
+}
+function readSessionBindingV2(home, sessionId) {
+  const raw = readJson(sessionAccountsPath(home));
+  const entry = raw && typeof raw === "object" ? raw[sessionId] : void 0;
+  return entry && typeof entry === "object" ? entry : void 0;
+}
+function writeSessionBinding(home, sessionId, binding) {
+  const raw = readJson(sessionAccountsPath(home));
+  const current = raw && typeof raw === "object" ? { ...raw } : {};
+  if (binding === void 0) delete current[sessionId];
+  else current[sessionId] = binding;
+  writeJson0600(sessionAccountsPath(home), current);
+}
+function sessionsBoundTo(bindings, accountId) {
+  return Object.entries(bindings).filter(([, b]) => b.account === accountId).map(([id]) => id);
+}
+function writeAccountSecret(home, id, secret) {
+  const path = accountSecretPath(home, id);
+  mkdirSync(dirname(path), { recursive: true, mode: 448 });
+  chmodSync(dirname(path), 448);
+  const tmp = `${path}.${process.pid}.tmp`;
+  writeFileSync(tmp, secret.trim() + "\n", { mode: 384 });
+  chmodSync(tmp, 384);
+  renameSync(tmp, path);
+}
+function removeAccountSecret(home, id) {
+  rmSync(dirname(accountSecretPath(home, id)), { recursive: true, force: true });
+}
+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";
+  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 === "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();
+  return false;
+}
+function accountStatus(home, id, a, probe, now) {
+  if (!secretPresent(home, id, a, probe)) return { status: "missing-secret" };
+  if (a.expiresAt !== void 0 && a.expiresAt <= now) return { status: "expired" };
+  if (a.check) return { status: a.check.status, ...a.check.detail ? { detail: a.check.detail } : {} };
+  return { status: "unverified" };
+}
+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 keyRef = a.key?.source === "file" ? a.key.path : a.key?.source === "env" ? a.key.name : void 0;
+  return {
+    id,
+    label: a.label,
+    agent: a.agent,
+    kind: a.kind,
+    status,
+    ...detail ? { statusDetail: detail } : {},
+    ...a.check ? { checkedAt: a.check.at } : {},
+    ...a.createdAt ? { createdAt: a.createdAt } : {},
+    ...a.expiresAt !== void 0 ? { expiresAt: a.expiresAt } : {},
+    ...a.baseUrl ? { baseUrl: a.baseUrl } : {},
+    ...a.models ? { models: a.models } : {},
+    ...keySource ? { keySource } : {},
+    ...keyRef ? { keyRef } : {},
+    ...a.legacy ? { legacy: true } : {}
+  };
+}
+function defaultSecretProbe(env = process.env) {
+  return {
+    fileReadable: (path) => {
+      try {
+        return readFileSync(path, "utf8").trim().length > 0;
+      } catch {
+        return false;
+      }
+    },
+    env
+  };
+}
+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 };
+}
+
+export { SPAWN_ACCOUNT_ENV as S, readAccounts as a, accountSecretPath as b, readAccountsFileV2 as c, defaultSecretProbe as d, expandHome as e, writeAccountsFile as f, accountsPath as g, buildAgentProfilesState as h, writeAccountSecret as i, sessionsBoundTo as j, removeAccountSecret as k, SUBSCRIPTION_TOKEN_TTL_MS as l, readSessionBindingV2 as m, newAccountId as n, providersPath as p, readSessionBindings as r, summarizeAccount as s, writeSessionBinding as w };