very-happy-cli 0.2.191 → 0.2.193

package/dist/{run-Bt0AklUU.mjs → run-HtvH6BLi.mjs}

@@ -1,25 +1,26 @@
-import { i as isClaudeSessionId, g as extractCompleteLines, h as decideBackfill, j as parseTerminalHookPayload, k as decideMirrorBinding, M as MIRROR_BACKFILL_LINES_DEFAULT, m as mirrorLineKey, n as mirrorLocalId, o as initializeOwnedWorktree, e as summarizeSpawnSessionForLog, q as startAgentVersionChecks, W as WORKTREE_CAPABILITY_VERSION, t as currentWorktreeService } from './mirrorProtocol-Lcx20Oby.mjs';
+import { i as isClaudeSessionId, g as extractCompleteLines, h as decideBackfill, j as parseTerminalHookPayload, k as decideMirrorBinding, M as MIRROR_BACKFILL_LINES_DEFAULT, m as mirrorLineKey, n as mirrorLocalId, o as initializeOwnedWorktree, e as summarizeSpawnSessionForLog, q as startAgentVersionChecks, W as WORKTREE_CAPABILITY_VERSION, t as currentWorktreeService } from './mirrorProtocol-CD4ntuZJ.mjs';
 import { F as FS_MKDIR_CAPABILITY_VERSION } from './fsMkdir-DumgLTzR.mjs';
-import { P as PI_ADAPTER_INSTALL_HINT, s as sanitizeSpawnModel } from './piRunnerArgs-Bqmu16He.mjs';
+import { P as PI_ADAPTER_INSTALL_HINT, s as sanitizeSpawnModel } from './piRunnerArgs-BbaAQvb4.mjs';
 import fs from 'fs/promises';
 import os from 'os';
 import * as tmp from 'tmp';
 import axios from 'axios';
-import { readFileSync, openSync, fsyncSync, closeSync, renameSync, existsSync, readdirSync, statSync, unlinkSync, realpathSync, promises, constants as constants$1, writeFileSync, mkdirSync, accessSync, readSync, rmdirSync } from 'node:fs';
+import { readFileSync, openSync, fsyncSync, closeSync, renameSync, existsSync, readdirSync, statSync, unlinkSync, readSync, writeSync, ftruncateSync, utimesSync, realpathSync, promises, constants as constants$1, writeFileSync, mkdirSync, accessSync, rmdirSync } from 'node:fs';
 import { join, isAbsolute, resolve, dirname, sep, basename, relative } from 'node:path';
-import { f as ensurePrivateDirectorySync, w as writePrivateFileSync, c as configuration } from './configuration-ECqXu34R.mjs';
-import { T as TurnActivityTracker, A as ApiClient } from './api-jfeMRg5R.mjs';
-import { S as SPAWN_AGENTS, i as isSpawnAgent, s as sanitizeSpawnPermissionMode, r as resolveSpawnPermissionMode, a as resolveFirstMessageMeta, j as joinProject } from './spawnAgents-CjoU6ZOS.mjs';
-import { l as logger } from './logger-GcbI0eg2.mjs';
-import { p as pruneStaleCompileCaches } from './index-BjZnpGWX.mjs';
-import { a as authAndSetupMachineIfNeeded } from './auth-DC6rg8lJ.mjs';
+import { f as ensurePrivateDirectorySync, w as writePrivateFileSync, c as configuration } from './configuration-ThKBP_zY.mjs';
+import { T as TurnActivityTracker, A as ApiClient } from './api-DUfunY3x.mjs';
+import { S as SPAWN_AGENTS, i as isSpawnAgent, s as sanitizeSpawnPermissionMode, r as resolveSpawnPermissionMode, a as resolveFirstMessageMeta, j as joinProject } from './spawnAgents-I29H9nO8.mjs';
+import { l as logger } from './logger-JV7-4Q_6.mjs';
+import { p as pruneStaleCompileCaches } from './index-BbdV2mzy.mjs';
+import { a as authAndSetupMachineIfNeeded } from './auth-jN5dNqTO.mjs';
 import { spawn, execSync } from 'child_process';
-import { p as packageJson } from './package-BsUHyqWe.mjs';
-import { a as globalPrefixForPackage, N as NPM_SAFE_ARG, g as getEnvironmentInfo } from './doctor-lsxmAK4o.mjs';
-import { s as spawnHappyCLI } from './spawnHappyCLI-CIA9Sc_5.mjs';
-import { c as readPersistedSessions, r as readSettings, l as latchKeepAwake, s as reportSignature, t as decideDaemonHibernation, v as nextCheckDelay, x as persistSession, d as readDaemonState, y as acquireDaemonLock, a as resolveCheckMs, z as resolveIdleMs, A as deletePersistedSessions, B as writeDaemonState, C as writeSettings, D as settingIdleMs, u as updateSettings, E as rewriteCredentialsForRelay, g as readCredentials, F as releaseDaemonLock } from './persistence-Cpw4yJs8.mjs';
-import { i as isDaemonRunningCurrentlyInstalledHappyVersion, s as stopDaemon, u as cleanupDaemonState } from './controlClient-ClI7A0qE.mjs';
-import { e as sendUserMessage, f as readSessionMetadata, r as readSessionTranscript, l as listAccountSessions, a as listSessions, M as MAX_READ_LIMIT, s as sessionWebUrl, j as lineageOf, g as waitForSessionKey, d as archiveSession, k as analyzeLatestTurn, m as readSessionLog, n as TURN_WINDOW, p as userPromptText } from './sessionOps-DPw5k8vV.mjs';
+import { p as packageJson } from './package-Bw3H6VLn.mjs';
+import { a as globalPrefixForPackage, N as NPM_SAFE_ARG, g as getEnvironmentInfo } from './doctor-C1zyOSXw.mjs';
+import { s as spawnHappyCLI } from './spawnHappyCLI-CnMwzjWX.mjs';
+import { c as readPersistedSessions, r as readSettings, l as latchKeepAwake, s as reportSignature, t as decideDaemonHibernation, v as nextCheckDelay, x as persistSession, d as readDaemonState, y as acquireDaemonLock, a as resolveCheckMs, z as resolveIdleMs, A as deletePersistedSessions, B as writeDaemonState, C as writeSettings, D as settingIdleMs, u as updateSettings, E as rewriteCredentialsForRelay, g as readCredentials, F as releaseDaemonLock } from './persistence-Cg4sfjQV.mjs';
+import { i as isDaemonRunningCurrentlyInstalledHappyVersion, s as stopDaemon, w as cleanupDaemonState } from './controlClient-Ckl8N1MS.mjs';
+import { e as sendUserMessage, f as readSessionMetadata, r as readSessionTranscript, l as listAccountSessions, a as listSessions, M as MAX_READ_LIMIT, s as sessionWebUrl, j as lineageOf, g as waitForSessionKey, d as archiveSession, k as analyzeLatestTurn, m as readSessionLog, n as TURN_WINDOW, p as userPromptText } from './sessionOps-C65Iej_C.mjs';
+import { E as AgentProfilesStateSchema, a9 as ServerMigrateNoticeSchema, aa as isHarnessInstallId, ab as agentProfileUnavailableReason, ac as MODEL_INTENT_CONFIG, j as AUTOMATION_SUMMARY_MAX_CHARS, ad as AUTOMATION_PRECHECK_OUTPUT_MAX_CHARS, ae as AUTOMATION_PRECHECK_DEFAULT_TIMEOUT_MS, d as AUTOMATION_PRECHECK_MAX_TIMEOUT_MS, af as AUTOMATION_CLAIM_MAX_RUNS, ag as AUTOMATION_DAEMON_CAPABILITY_PRECHECK, ah as AUTOMATION_DEFAULT_LEASE_MS, i as isAutomationRunTerminal, v as resolveLaunchAgentProfile, ai as HARNESS_INSTALL_CAPABILITY_VERSION } from './index-D1YnIih6.mjs';
 import fastify from 'fastify';
 import { z } from 'zod';
 import { validatorCompiler, serializerCompiler } from 'fastify-type-provider-zod';
@@ -27,64 +28,70 @@ import { d as decodeBase64, s as sameRelay, e as encodeBase64, h as decrypt } fr
 import { randomBytes, createHash, timingSafeEqual, randomUUID } from 'node:crypto';
 import { c as checkPreviewPath } from './previewPath-CXN4Vag0.mjs';
 import { a as BACKGROUND_TASKS_MAX, d as BACKGROUND_TASK_DESCRIPTION_MAX, e as BackgroundTaskTracker } from './backgroundTaskActivity-8PdPxrvy.mjs';
-import { b as sanitizeRateLimitReport } from './rateLimitWindows-j_qQk0KY.mjs';
-import { f as formatEditConflictNotice, b as SESSION_PEER_SENT_FROM, s as sendPeerMessage, l as listPeerSessions, C as CLI_PEER_SENDER_ID } from './peerTools-CwCe6tmJ.mjs';
+import { b as sanitizeRateLimitReport } from './rateLimitWindows-CRARnKaI.mjs';
+import { f as formatEditConflictNotice, b as SESSION_PEER_SENT_FROM, s as sendPeerMessage, l as listPeerSessions, C as CLI_PEER_SENDER_ID } from './peerTools-WtRgTSqG.mjs';
 import os$1, { hostname, homedir, tmpdir } from 'node:os';
-import { c as RemoteCallBudget, e as REMOTE_WRITE_CALLS_PER_MINUTE, d as deliverToSession, g as guardRemoteSessionOpsRequest, h as remoteError, i as REMOTE_OP_DEADLINE_MS, j as formatRemoteAuditLine, k as REMOTE_SEND_COMMIT_DEADLINE_MS, m as REMOTE_RESUME_WAIT_MS, n as capRemoteTranscript, o as capRemoteText, p as REMOTE_ANSWER_MAX_BYTES, q as REMOTE_TITLE_MAX_BYTES } from './remoteSessionClient-BdnJ_n8C.mjs';
-import { assistantHome, bootstrapAssistantHome } from './bootstrap-rLaL3kTa.mjs';
-import { refreshAgentHomes, locateClaudeConversation, agentHomeSpawnEnv } from './index-DuK9XYbZ.mjs';
+import { c as RemoteCallBudget, e as REMOTE_WRITE_CALLS_PER_MINUTE, d as deliverToSession, g as guardRemoteSessionOpsRequest, h as remoteError, i as REMOTE_OP_DEADLINE_MS, j as formatRemoteAuditLine, k as REMOTE_SEND_COMMIT_DEADLINE_MS, m as REMOTE_RESUME_WAIT_MS, n as capRemoteTranscript, o as capRemoteText, p as REMOTE_ANSWER_MAX_BYTES, q as REMOTE_TITLE_MAX_BYTES } from './remoteSessionClient--0vfA7I5.mjs';
+import { assistantHome, bootstrapAssistantHome } from './bootstrap-B3gMpU9e.mjs';
+import { refreshAgentHomes, locateClaudeConversation, agentHomeSpawnEnv } from './index-Cn73rdtQ.mjs';
 import require$$0, { existsSync as existsSync$1, statSync as statSync$1, mkdtempSync, rmSync } from 'fs';
 import require$$1, { join as join$1 } from 'path';
 import { spawn as spawn$1, execFile, spawnSync } from 'node:child_process';
 import { p as projectPath } from './projectPath-BTBIMB57.mjs';
 import { d as daemonEndpointsMatch, r as resolveClaudeCredentialReadiness } from './doctorReadiness-C208SMN9.mjs';
-import { o as ownerRetryPending, c as consumeOwnerRetry, s as spawnGate, a as afterStartupFailure, b as startupFailureMessage, T as TEAM_SPAWN_MAX_ATTEMPTS, d as TEAM_CLEANUP_RETRY_MS, g as getInitialMachineMetadata, e as getStartupCliAvailability, f as TEAM_RETRY_CAPABILITY_VERSION, w as withRunningCliFacts } from './machineMetadata-CXRmFNOV.mjs';
+import { o as ownerRetryPending, c as consumeOwnerRetry, s as spawnGate, a as afterStartupFailure, b as startupFailureMessage, T as TEAM_SPAWN_MAX_ATTEMPTS, d as TEAM_CLEANUP_RETRY_MS, g as getInitialMachineMetadata, e as getStartupCliAvailability, f as TEAM_RETRY_CAPABILITY_VERSION, w as withRunningCliFacts } from './machineMetadata-D5-SW9kv.mjs';
 import { M as ModelConfigError, B as BackupStore, r as readConfigFile, s as sha256, a as atomicWriteFile } from './fileStore-5qpetZS0.mjs';
 import { c as collectSecretValues, a as parseJsonObject, b as childObject, s as setOrDelete, d as changedPaths, e as stringifyLike, f as fail, n as normalizeModelList, g as normalizeModelId, h as normalizeSecret, i as normalizeBaseUrl, u as uniq, j as baseUrlWarnings, m as maskSecret, k as getPath$1, l as normalizeProviderId, o as piAdapter, r as redactText } from './pi-CqyoZMjI.mjs';
+import { p as parse } from './codexAccount-NOX5pmQf.mjs';
 import require$$3 from 'crypto';
 import { c as commandOnPath } from './detectCLI-CSGMlV51.mjs';
-import { buildResumeLaunch } from './handleResumeCommand-BK9XKH_l.mjs';
+import { buildResumeLaunch } from './handleResumeCommand-CrlqDuz7.mjs';
 import { n as normalizeWebPanels } from './webPanels-B2_C2-3g.mjs';
-import { $ as ServerMigrateNoticeSchema, a0 as isHarnessInstallId, a1 as MODEL_INTENT_CONFIG, f as AUTOMATION_SUMMARY_MAX_CHARS, a2 as AUTOMATION_PRECHECK_OUTPUT_MAX_CHARS, a3 as AUTOMATION_PRECHECK_DEFAULT_TIMEOUT_MS, c as AUTOMATION_PRECHECK_MAX_TIMEOUT_MS, a4 as AUTOMATION_CLAIM_MAX_RUNS, a5 as AUTOMATION_DAEMON_CAPABILITY_PRECHECK, a6 as AUTOMATION_DEFAULT_LEASE_MS, i as isAutomationRunTerminal, a7 as HARNESS_INSTALL_CAPABILITY_VERSION } from './index-Bq8NKSCF.mjs';
 import { access, symlink, readFile, rm, unlink, readlink, lstat, constants, rename, mkdir, copyFile, readdir, stat, open } from 'node:fs/promises';
 import { p as parseExactVersion, c as compareExactVersions, f as fetchCliUpdateState, r as resolveCliUpdateCheckInterval, D as DEFAULT_CLI_UPDATE_CHECK_INTERVAL_MS } from './cliUpdate-Y34VGe9Y.mjs';
-import { P as ProjectsUnsupportedError, c as createProjectsClient } from './client-Bi20Ka0h.mjs';
-import { d as wrapperReportsIdle, f as decideAutoRestart, s as statusFromVerdict, g as autoRestartNextCheck, h as wrapperStaleness, r as recordAttempt, i as AUTO_RESTART_MAX_ATTEMPTS, j as AUTO_RESTART_MIN_GAP_MS, p as processIdentityFields, k as readSessionLock, l as terminateProcess, n as terminateProcessTree, o as AUTO_RESTARTED_ENV, q as encodeAutoRestarted, u as resolveQuietMs, v as AUTO_RESTART_RECHECK_CAP_MS } from './sessionLock-G2PMqvsh.mjs';
-import { c as createAutomationsClient, i as isAutomationsUnavailable, d as AutomationsRequestError } from './client-BXD66ZF5.mjs';
+import { P as ProjectsUnsupportedError, c as createProjectsClient } from './client-Bde4QVIn.mjs';
+import { d as wrapperReportsIdle, f as decideAutoRestart, s as statusFromVerdict, g as autoRestartNextCheck, h as wrapperStaleness, r as recordAttempt, i as AUTO_RESTART_MAX_ATTEMPTS, j as AUTO_RESTART_MIN_GAP_MS, p as processIdentityFields, k as readSessionLock, l as terminateProcess, n as terminateProcessTree, o as AUTO_RESTARTED_ENV, q as encodeAutoRestarted, u as pendingUpgradeVersion, v as resolveQuietMs, x as AUTO_RESTART_RECHECK_CAP_MS } from './sessionLock-B73fhgQN.mjs';
+import { c as createAutomationsClient, i as isAutomationsUnavailable, d as AutomationsRequestError } from './client-7RnI9J0W.mjs';
 import { w as withKeychainOffPath, a as keychainIdentityFor, i as interpretSecurityRead, s as securityReadArgs, b as securityDeleteArgs, c as keychainOffShimDir, d as interpretCredentialsFile, C as CREDENTIALS_REJECTED_DETAIL, e as buildClaudeAuthState, f as claudeAuthStateChanged, r as resolveSdkClaudeBinary, g as classifyAuthStatus, h as diagnoseStores, p as parseLaunchctlPid, H as HAPPY_DAEMON_LAUNCHD_LABEL, j as classifyLineage, l as probeLaunchdJob, m as detectDaemonSupervisor, n as daemonLineage, o as probeSystemdKillMode, q as wrappersSurviveHandover, t as handoverWaitsForSessions } from './daemonSupervisor-BxohggqN.mjs';
+import { A as AccountService } from './accountService-Cd7bnkfd.mjs';
+import { spawnSetupTokenPty, watchAccountFiles } from './daemonAccounts-DwPwKxvv.mjs';
 import { g as getProjectPath } from './path-D2wdaNSk.mjs';
 import { b as extractClaudeEditPaths } from './editPaths-BVfS_FFL.mjs';
-import { s as startFileWatcher } from './startFileWatcher-CDO6fb2m.mjs';
-import { I as InvalidateSync } from './sync-C0PRuTMj.mjs';
+import { s as startFileWatcher } from './startFileWatcher-DePAY1T5.mjs';
+import { I as InvalidateSync } from './sync-BP6vnxVP.mjs';
 import { R as RawJSONLinesSchema } from './types-CkqAACXx.mjs';
 import { t as tmuxArgs, a as scrubTmuxClientEnv, s as shellescape } from './tmuxSocket-B8Yx20sT.mjs';
 import { findAllHappyProcesses } from './doctor-BPkYWSuq.mjs';
 import { T as TEAM_SKILL, a as TEAM_LEAD_PLAYBOOK, b as TEAM_MEMBER_RULES } from './resources-CLP_MpK4.mjs';
 import { promisify } from 'node:util';
-import { b as clipText, r as renderAction, c as clipAutomationReport, e as renderTemplate } from './template-DLR_0hfj.mjs';
+import { b as clipText, r as renderAction, c as clipAutomationReport, e as renderTemplate } from './template-CL9EvQLQ.mjs';
 import { d as describeAgentHome } from './loginShellEnv-Dw8M7tkI.mjs';
-import './acpSessionResume-Bi7pA1n_.mjs';
-import './lidState-CD81ryTy.mjs';
+import { S as SPAWN_ACCOUNT_ENV } from './store-Vej_738f.mjs';
+import './acpSessionResume-TQwN9ZZE.mjs';
+import './lidState-B6yYKjNK.mjs';
 import 'node:events';
 import 'socket.io-client';
-import './pushNotifications-XAM8__Pg.mjs';
+import './pushNotifications-BbE-qV9I.mjs';
 import './contentLogMetadata-BlWI0egu.mjs';
 import './limits-DIo7rEBR.mjs';
-import './time-D0jvDRhn.mjs';
-import './registerCommonHandlers-DRRfinzK.mjs';
+import './time-Cw0liIqB.mjs';
+import './registerCommonHandlers-Cj3Nl9y-.mjs';
 import 'util';
 import 'cross-spawn';
 import '@paralleldrive/cuid2';
 import 'chalk';
 import 'node:module';
 import 'tweetnacl';
-import './browser-CHpVgyni.mjs';
+import './browser-LHW2hBH8.mjs';
 import 'open';
 import './specialCommands-MXUN0wfI.mjs';
 import './ids-DU6sLx4C.mjs';
 import 'url';
-import './localHappyAgentAuth-Cg-m1lwm.mjs';
+import './localHappyAgentAuth-KRlg_aI0.mjs';
 import './processTreeSnapshot-CuLJDNC-.mjs';
+import './claudeAccountEnv-BL1pR_37.mjs';
+import 'node:readline';
+import 'node-pty';
 import 'ps-list';
 
 async function resolveRelaunchMetadata(snapshot, fetchServer) {
@@ -180,8 +187,34 @@ async function teamRelaunchEnv(input) {
 const DEFAULT_LOG_PRUNE_POLICY = {
   maxAgeMs: 14 * 24 * 60 * 6e4,
   maxTotalBytes: 200 * 1024 * 1024,
-  keepRecentCount: 10
+  keepRecentCount: 10,
+  keepDaemonLogs: 3,
+  maxDaemonLogBytes: 64 * 1024 * 1024
 };
+const DAEMON_LOG_SUFFIX = "-daemon.log";
+function planDaemonLogRetention(files, policy = DEFAULT_LOG_PRUNE_POLICY, protectedPaths = /* @__PURE__ */ new Set()) {
+  const keep = /* @__PURE__ */ new Set();
+  let trim = null;
+  const count = policy.keepDaemonLogs ?? 0;
+  let budget = policy.maxDaemonLogBytes ?? 0;
+  if (count <= 0 || budget <= 0) return { keep, trim };
+  const daemonLogs = files.filter((f) => f.path.endsWith(DAEMON_LOG_SUFFIX) && !protectedPaths.has(f.path)).sort((a, b) => b.mtimeMs - a.mtimeMs);
+  for (const f of daemonLogs) {
+    if (keep.size >= count || budget <= 0) break;
+    if (keep.size === 0) {
+      keep.add(f.path);
+      if (f.size > budget) {
+        trim = { path: f.path, keepBytes: budget };
+        budget = 0;
+      } else budget -= f.size;
+      continue;
+    }
+    if (f.size > budget) break;
+    keep.add(f.path);
+    budget -= f.size;
+  }
+  return { keep, trim };
+}
 function planLogPrune(files, now, policy = DEFAULT_LOG_PRUNE_POLICY, protectedPaths = /* @__PURE__ */ new Set()) {
   const sorted = [...files].sort((a, b) => b.mtimeMs - a.mtimeMs);
   const doomed = /* @__PURE__ */ new Set();
@@ -210,7 +243,9 @@ function pruneLogsDir(logsDir, protectedPaths = /* @__PURE__ */ new Set(), polic
   } catch {
     return 0;
   }
-  const doomed = planLogPrune(files, Date.now(), policy, protectedPaths);
+  const daemonLogs = planDaemonLogRetention(files, policy, protectedPaths);
+  if (daemonLogs.trim) trimToTail(daemonLogs.trim.path, daemonLogs.trim.keepBytes);
+  const doomed = planLogPrune(files.filter((f) => !daemonLogs.keep.has(f.path)), Date.now(), policy, protectedPaths);
   let deleted = 0;
   for (const p of doomed) {
     try {
@@ -221,6 +256,36 @@ function pruneLogsDir(logsDir, protectedPaths = /* @__PURE__ */ new Set(), polic
   }
   return deleted;
 }
+function trimToTail(path, keepBytes) {
+  let fd = null;
+  try {
+    const st = statSync(path);
+    if (st.size <= keepBytes) return;
+    const marker = Buffer.from(`[log trimmed to its last ${keepBytes} bytes by the daemon log retention]
+`);
+    const tailBytes = Math.max(0, keepBytes - marker.length);
+    fd = openSync(path, "r+");
+    const tail = Buffer.alloc(tailBytes);
+    let read = 0;
+    while (read < tailBytes) {
+      const n = readSync(fd, tail, read, tailBytes - read, st.size - tailBytes + read);
+      if (n <= 0) break;
+      read += n;
+    }
+    writeSync(fd, marker, 0, marker.length, 0);
+    writeSync(fd, tail, 0, read, marker.length);
+    ftruncateSync(fd, marker.length + read);
+    closeSync(fd);
+    fd = null;
+    utimesSync(path, st.atime, st.mtime);
+  } catch {
+  } finally {
+    if (fd !== null) try {
+      closeSync(fd);
+    } catch {
+    }
+  }
+}
 
 function createSpawnTimer(clock = Date.now) {
   const requestAt = clock();
@@ -506,6 +571,7 @@ function sanitizeResumeModel(value) {
 }
 
 const DEFAULT_MAX_RESTARTS = 3;
+const DEFAULT_MAX_ACCOUNT_RESTARTS = 50;
 function decideRestart(priorAttempts, max = DEFAULT_MAX_RESTARTS) {
   if (priorAttempts >= max) {
     return {
@@ -562,6 +628,19 @@ const BackgroundTaskInfoSchema = z.object({
   description: z.string().max(BACKGROUND_TASK_DESCRIPTION_MAX + 1),
   startedAt: z.number()
 });
+const AutoRestartStatusSchema = z.object({
+  state: z.string(),
+  reason: z.string().optional(),
+  since: z.number(),
+  target: z.string(),
+  offline: z.boolean().optional(),
+  retryAt: z.number().optional()
+});
+const DaemonListInfoSchema = z.object({
+  version: z.string(),
+  upgradePending: z.string().nullable(),
+  autoRestartEnabled: z.boolean()
+});
 const BackgroundTasksReportSchema = z.object({
   count: z.number().int().nonnegative(),
   tasks: z.array(BackgroundTaskInfoSchema),
@@ -590,8 +669,11 @@ function startDaemonControlServer({
   onSessionEdit,
   listPeers,
   isTurnActive,
+  getAutoRestartStatus,
+  getDaemonInfo,
   onRateLimits,
-  onHibernateCheck
+  onHibernateCheck,
+  getAgentProfiles
 }) {
   return new Promise((resolve) => {
     const app = fastify({
@@ -697,6 +779,16 @@ function startDaemonControlServer({
         }
       });
     }
+    typed.post("/agent-profiles", {
+      schema: { response: { 200: AgentProfilesStateSchema, 503: z.object({ error: z.string() }) } }
+    }, async (_request, reply) => {
+      const state = getAgentProfiles?.() ?? null;
+      if (!state) {
+        reply.code(503);
+        return { error: "accounts are not available in this daemon yet" };
+      }
+      return state;
+    });
     typed.post("/list", {
       schema: {
         response: {
@@ -707,8 +799,12 @@ function startDaemonControlServer({
               pid: z.number(),
               turnActive: z.boolean(),
               // B-507: in-flight background tasks per the wrapper's last report (lease-expired = count 0).
-              backgroundTasks: BackgroundTasksReportSchema.optional()
-            }))
+              backgroundTasks: BackgroundTasksReportSchema.optional(),
+              // B-856: the wrapper's own CLI version and its auto-restart status (null = nothing pending).
+              cliVersion: z.string().optional(),
+              autoRestart: AutoRestartStatusSchema.nullable().optional()
+            })),
+            daemon: DaemonListInfoSchema.optional()
           })
         }
       }
@@ -721,8 +817,11 @@ function startDaemonControlServer({
           happySessionId: child.happySessionId,
           pid: child.pid,
           turnActive: isTurnActive ? isTurnActive(child.happySessionId) : false,
-          ...getBackgroundTasks ? { backgroundTasks: getBackgroundTasks(child.happySessionId) } : {}
-        }))
+          ...getBackgroundTasks ? { backgroundTasks: getBackgroundTasks(child.happySessionId) } : {},
+          ...child.happySessionMetadataFromLocalWebhook?.version ? { cliVersion: child.happySessionMetadataFromLocalWebhook.version } : {},
+          ...getAutoRestartStatus ? { autoRestart: getAutoRestartStatus(child.happySessionId) ?? null } : {}
+        })),
+        ...getDaemonInfo ? { daemon: getDaemonInfo() } : {}
       };
     });
     typed.post("/stop-session", {
@@ -765,7 +864,9 @@ function startDaemonControlServer({
           // sends over the machine RPC. Old CLIs never send them.
           resumeClaudeSessionId: z.string().regex(/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i).optional(),
           resumeCodexThreadId: z.string().min(1).max(200).optional(),
-          parentSessionId: z.string().min(1).max(200).optional()
+          parentSessionId: z.string().min(1).max(200).optional(),
+          // B-850a: `very-happy spawn --account` (null = machine login; absent = machine default).
+          agentProfileId: z.string().min(1).max(64).nullable().optional()
         }),
         response: {
           200: z.object({
@@ -790,13 +891,13 @@ function startDaemonControlServer({
         }
       }
     }, async (request, reply) => {
-      const { directory, sessionId, agent, environmentVariables, variant, forceNew, permissionMode, spawnedBy, resumeClaudeSessionId, resumeCodexThreadId, parentSessionId } = request.body;
+      const { directory, sessionId, agent, environmentVariables, variant, forceNew, permissionMode, spawnedBy, resumeClaudeSessionId, resumeCodexThreadId, parentSessionId, agentProfileId } = request.body;
       if (!directory && variant !== "assistant") {
         reply.code(500);
         return { success: false, error: "directory is required" };
       }
       logger.debug(`[CONTROL SERVER] Spawn session request: dir=${directory}, sessionId=${sessionId || "new"}, agent=${agent || "default"}, variant=${variant || "none"}, forceNew=${forceNew === true}, spawnedBy=${spawnedBy || "unset"}`);
-      const result = await spawnSession({ directory, sessionId, agent, environmentVariables, variant, forceNew, permissionMode, spawnedBy, resumeClaudeSessionId, resumeCodexThreadId, parentSessionId });
+      const result = await spawnSession({ directory, sessionId, agent, environmentVariables, variant, forceNew, permissionMode, spawnedBy, resumeClaudeSessionId, resumeCodexThreadId, parentSessionId, ...agentProfileId !== void 0 ? { agentProfileId } : {} });
       const resumed = Boolean(resumeClaudeSessionId || resumeCodexThreadId);
       switch (result.type) {
         case "success":
@@ -887,7 +988,7 @@ function startDaemonControlServer({
         return { success: false, error: "daemon is still starting up" };
       }
       logger.debug(`[CONTROL SERVER] Restart session request: ${sessionId}`);
-      const result = await restartSession(sessionId, { keepPublishedPermissionMode: true });
+      const result = await restartSession(sessionId, { keepPublishedPermissionMode: true, account: true });
       switch (result.type) {
         case "success":
           return { success: true, sessionId: result.sessionId };
@@ -2468,806 +2569,6 @@ const claudeAdapter = {
   }
 };
 
-/*!
- * Copyright (c) Squirrel Chat et al., All rights reserved.
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors
- *    may be used to endorse or promote products derived from this software without
- *    specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-function getLineColFromPtr(string, ptr) {
-  let lines = string.slice(0, ptr).split(/\r?\n/);
-  return [lines.length, lines.pop().length + 1];
-}
-function makeCodeBlock(string, line, column) {
-  let lines = string.split(/\r?\n/);
-  let codeblock = "";
-  let numberLen = (Math.log10(line + 1) | 0) + 1;
-  for (let i = line - 1; i <= line + 1; i++) {
-    let l = lines[i - 1];
-    if (!l)
-      continue;
-    codeblock += i.toString().padEnd(numberLen, " ");
-    codeblock += ":  ";
-    codeblock += l;
-    codeblock += "\n";
-    if (i === line) {
-      codeblock += " ".repeat(numberLen + column + 2);
-      codeblock += "^\n";
-    }
-  }
-  return codeblock;
-}
-class TomlError extends Error {
-  line;
-  column;
-  codeblock;
-  constructor(message, options) {
-    const [line, column] = getLineColFromPtr(options.toml, options.ptr);
-    const codeblock = makeCodeBlock(options.toml, line, column);
-    super(`Invalid TOML document: ${message}
-
-${codeblock}`, options);
-    this.line = line;
-    this.column = column;
-    this.codeblock = codeblock;
-  }
-  /** @internal */
-  static x(message, ctx, ptr) {
-    throw new TomlError(message, { toml: ctx.s, ptr: ptr ?? ctx.p });
-  }
-}
-
-function parseString(ctx) {
-  let startPtr = ctx.p;
-  let c = ctx.s.charCodeAt(ctx.p++);
-  let first = c;
-  let isLiteral = c === 39;
-  let isMultiline = c === ctx.s.charCodeAt(ctx.p) && c === ctx.s.charCodeAt(ctx.p + 1);
-  if (isMultiline) {
-    if ((c = ctx.s.charCodeAt(ctx.p += 2)) === 10)
-      ctx.p++;
-    else if (c === 13 && ctx.s.charCodeAt(ctx.p + 1) === 10)
-      ctx.p += 2;
-  }
-  let parsed = "";
-  let sliceStart = ctx.p;
-  let state = 0;
-  for (; ctx.p < ctx.s.length; ctx.p++) {
-    c = ctx.s.charCodeAt(ctx.p);
-    if (isMultiline && (c === 10 || c === 13 && ctx.s.charCodeAt(ctx.p + 1) === 10)) {
-      state = state && 3;
-    } else if (c < 32 && c !== 9 || c === 127) {
-      TomlError.x("control characters are not allowed in strings", ctx);
-    } else if ((!state || state === 3) && c === first && (!isMultiline || ctx.s.charCodeAt(ctx.p + 1) === first && ctx.s.charCodeAt(ctx.p + 2) === first)) {
-      if (isMultiline) {
-        if (ctx.s.charCodeAt(ctx.p + 3) === first)
-          ctx.p++;
-        if (ctx.s.charCodeAt(ctx.p + 3) === first)
-          ctx.p++;
-      }
-      if (!state) {
-        let s = ctx.s.slice(sliceStart, ctx.p);
-        parsed = parsed ? parsed + s : s;
-      }
-      ctx.p += isMultiline ? 3 : 1;
-      return parsed;
-    } else if (!state) {
-      if (!isLiteral && c === 92) {
-        parsed += ctx.s.slice(sliceStart, sliceStart = ctx.p);
-        state = 1;
-      }
-    } else if (state === 1) {
-      if (c === 120 || c === 117 || c === 85) {
-        let errPtr = ctx.p++ - 1;
-        let value = 0;
-        let len = c === 120 ? 2 : c === 117 ? 4 : 8;
-        for (let j = 0; j < len; j++, ctx.p++) {
-          let hex = ctx.s.charCodeAt(ctx.p);
-          let digit = (
-            /* 0-9 */
-            hex >= 48 && hex <= 57 ? hex - 48 : (
-              /* A-F */
-              hex >= 65 && hex <= 70 ? hex - 65 + 10 : (
-                /* a-f */
-                hex >= 97 && hex <= 102 ? hex - 97 + 10 : -1
-              )
-            )
-          );
-          if (digit < 0)
-            TomlError.x("invalid non-hex character in unicode escape", ctx);
-          value = value << 4 | digit;
-        }
-        if (value < 0 || value > 1114111 || value >= 55296 && value <= 57343) {
-          TomlError.x("invalid unicode escape", ctx, errPtr);
-        }
-        parsed += String.fromCodePoint(value);
-        sliceStart = ctx.p--;
-        state = 0;
-      } else if (isMultiline && (c === 32 || c === 9)) {
-        state = 2;
-      } else {
-        if (c === 98)
-          parsed += "\b";
-        else if (c === 116)
-          parsed += "	";
-        else if (c === 110)
-          parsed += "\n";
-        else if (c === 102)
-          parsed += "\f";
-        else if (c === 114)
-          parsed += "\r";
-        else if (c === 101)
-          parsed += "\x1B";
-        else if (c === 34)
-          parsed += '"';
-        else if (c === 92)
-          parsed += "\\";
-        else
-          TomlError.x("unrecognised escape sequence", ctx);
-        sliceStart = ctx.p + 1;
-        state = 0;
-      }
-    } else if (c !== 32 && c !== 9) {
-      if (state === 2)
-        TomlError.x("invalid escape: only line-ending whitespace may be escaped", ctx, sliceStart);
-      state = !isLiteral && c === 92 ? 1 : 0;
-      sliceStart = ctx.p;
-    }
-  }
-  TomlError.x("unfinished string", ctx, startPtr);
-}
-
-/*!
- * Copyright (c) Squirrel Chat et al., All rights reserved.
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors
- *    may be used to endorse or promote products derived from this software without
- *    specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-let DATE_TIME_RE = /^(\d{4}-\d{2}-\d{2})?[Tt ]?(?:(\d{2}):\d{2}(?::\d{2}(?:\.\d+)?)?)?(Z|z|[-+]\d{2}:\d{2})?$/i;
-class TomlDate extends Date {
-  #hasDate = false;
-  #hasTime = false;
-  #offset = null;
-  constructor(date, fasttype, unsafeDelim) {
-    let hasDate = true;
-    let hasTime = true;
-    let offset = "Z";
-    let c;
-    if (typeof date === "string") {
-      if (fasttype)
-        prep: {
-          if (fasttype < 3) {
-            if (+date.slice(11, 13) > 23) {
-              date = "";
-              break prep;
-            }
-            if (fasttype === 2) {
-              offset = null;
-              date += "Z";
-            } else if ((c = date.charCodeAt(date.length - 1)) !== 90 && c !== 122) {
-              offset = date.slice(date.length - 6);
-            }
-            if (unsafeDelim)
-              date = date.slice(0, 10) + "T" + date.slice(11);
-          } else if (fasttype === 4) {
-            date = +date.slice(0, 2) > 23 ? "" : `0000-01-01T${date}Z`;
-          }
-          hasDate = fasttype !== 4;
-          hasTime = fasttype !== 3;
-        }
-      else {
-        let match = date.match(DATE_TIME_RE);
-        if (match) {
-          if (!match[1]) {
-            hasDate = false;
-            date = `0000-01-01T${date}`;
-          }
-          hasTime = !!match[2];
-          hasTime && date[10] === " " && (date = date.replace(" ", "T"));
-          if (match[2] && +match[2] > 23) {
-            date = "";
-          } else {
-            offset = match[3] || null;
-            if (!offset && hasTime)
-              date += "Z";
-          }
-        } else {
-          date = "";
-        }
-      }
-    }
-    super(date);
-    if (!isNaN(this.getTime())) {
-      this.#hasDate = hasDate;
-      this.#hasTime = hasTime;
-      this.#offset = offset;
-    }
-  }
-  isDateTime() {
-    return this.#hasDate && this.#hasTime;
-  }
-  isLocal() {
-    return !this.#hasDate || !this.#hasTime || !this.#offset;
-  }
-  isDate() {
-    return this.#hasDate && !this.#hasTime;
-  }
-  isTime() {
-    return this.#hasTime && !this.#hasDate;
-  }
-  isValid() {
-    return this.#hasDate || this.#hasTime;
-  }
-  toISOString() {
-    let iso = super.toISOString();
-    if (this.isDate())
-      return iso.slice(0, 10);
-    if (this.isTime())
-      return iso.slice(11, 23);
-    if (this.#offset === null)
-      return iso.slice(0, -1);
-    if (this.#offset === "Z" || this.#offset === "z")
-      return iso;
-    let offset = +this.#offset.slice(1, 3) * 60 + +this.#offset.slice(4, 6);
-    offset = this.#offset[0] === "-" ? offset : -offset;
-    let offsetDate = new Date(this.getTime() - offset * 6e4);
-    return offsetDate.toISOString().slice(0, -1) + this.#offset;
-  }
-  static wrapAsOffsetDateTime(jsDate, offset = "Z") {
-    let date = new TomlDate(jsDate);
-    date.#offset = offset;
-    return date;
-  }
-  static wrapAsLocalDateTime(jsDate) {
-    let date = new TomlDate(jsDate);
-    date.#offset = null;
-    return date;
-  }
-  static wrapAsLocalDate(jsDate) {
-    let date = new TomlDate(jsDate);
-    date.#hasTime = false;
-    date.#offset = null;
-    return date;
-  }
-  static wrapAsLocalTime(jsDate) {
-    let date = new TomlDate(jsDate);
-    date.#hasDate = false;
-    date.#offset = null;
-    return date;
-  }
-}
-
-function isDigit(char, base = 10) {
-  return base === 16 ? char > 47 && char < 58 || char > 64 && char < 71 || char > 96 && char < 103 : char > 47 && char < 48 + base;
-}
-function isEndOfValue(char, delim) {
-  return char === 32 || char === 9 || char === 10 || char === 13 || // Structure end or next value delimiter
-  delim && (char === delim || char === 44) || // Comment
-  char === 35;
-}
-function extractValue(ctx, end) {
-  let errPtr = ctx.p;
-  let c = ctx.s.charCodeAt(ctx.p);
-  if (c === 91 || c === 123) {
-    ctx.d-- || TomlError.x("document contains excessively nested structures. aborting.", ctx);
-    let value = c === 91 ? parseArray(ctx) : parseInlineTable(ctx);
-    ctx.d++;
-    return value;
-  }
-  if (c === 34 || c === 39) {
-    return parseString(ctx);
-  }
-  if (c === 116) {
-    if (ctx.s.charCodeAt(++ctx.p) !== 114 || ctx.s.charCodeAt(++ctx.p) !== 117 || ctx.s.charCodeAt(++ctx.p) !== 101)
-      TomlError.x("invalid value", ctx, errPtr);
-    return ctx.p++, true;
-  }
-  if (c === 102) {
-    if (ctx.s.charCodeAt(++ctx.p) !== 97 || ctx.s.charCodeAt(++ctx.p) !== 108 || ctx.s.charCodeAt(++ctx.p) !== 115 || ctx.s.charCodeAt(++ctx.p) !== 101)
-      TomlError.x("invalid value", ctx, errPtr);
-    return ctx.p++, false;
-  }
-  if (c === 43 || c === 45) {
-    return parseNumber(ctx, ctx.p, ctx.s.charCodeAt(++ctx.p), 44 - c, end);
-  }
-  if (ctx.s.charCodeAt(ctx.p + 4) === 45 && ctx.s.charCodeAt(ctx.p + 7) === 45) {
-    return parseDate(ctx, c, end);
-  }
-  if (ctx.s.charCodeAt(ctx.p + 2) === 58) {
-    return parseTime(ctx, c, end);
-  }
-  return parseNumber(ctx, ctx.p, c, 0, end);
-}
-function parseNumber(ctx, startPtr, startChr, sign, endChr) {
-  let c = startChr;
-  let state = 0;
-  let hasUnderscores = false;
-  if (c === 105) {
-    if (ctx.s.charCodeAt(++ctx.p) !== 110 || ctx.s.charCodeAt(++ctx.p) !== 102)
-      TomlError.x("invalid value", ctx, startPtr);
-    return ctx.p++, (sign || 1) / 0;
-  }
-  if (c === 110) {
-    if (ctx.s.charCodeAt(++ctx.p) !== 97 || ctx.s.charCodeAt(++ctx.p) !== 110)
-      TomlError.x("invalid value", ctx, startPtr);
-    return ctx.p++, NaN;
-  }
-  if (c === 48) {
-    if (++ctx.p >= ctx.s.length || isEndOfValue(c = ctx.s.charCodeAt(ctx.p), endChr))
-      return ctx.bi === true ? 0n : 0;
-    if (!sign) {
-      if (c === 120)
-        return parseIntegerBaseN(ctx, startPtr, 16, endChr);
-      else if (c === 98)
-        return parseIntegerBaseN(ctx, startPtr, 2, endChr);
-      else if (c === 111)
-        return parseIntegerBaseN(ctx, startPtr, 8, endChr);
-    }
-    if (c === 46)
-      state = 2;
-    else if (c === 101 || c === 69)
-      state = 4;
-    else
-      TomlError.x("illegal leading zero", ctx, startPtr);
-  } else if (!isDigit(c))
-    TomlError.x("invalid value", ctx, startPtr);
-  while (++ctx.p < ctx.s.length && (c = ctx.s.charCodeAt(ctx.p), !isEndOfValue(c, endChr))) {
-    if (!state)
-      state = 1;
-    if (c === 95) {
-      if (!(state & 1))
-        TomlError.x("illegal underscore", ctx);
-      state += 11;
-      hasUnderscores = true;
-    } else if (state === 1 && c === 46)
-      state = 2;
-    else if ((state === 1 || state === 3) && (c === 101 || c === 69))
-      state = 4;
-    else if (state === 4 && (c === 43 || c === 45)) ; else if (!isDigit(c))
-      TomlError.x(`illegal character in numeric literal`, ctx);
-    else if (state > 9)
-      state -= 11;
-    else if (!(state & 1))
-      state++;
-  }
-  if (!state) {
-    let val = (startChr - 48) * (sign || 1);
-    return ctx.bi === true ? BigInt(val) : val;
-  }
-  if (!(state & 1))
-    TomlError.x("unfinished numeric value", ctx, startPtr);
-  let str = ctx.s.slice(startPtr, ctx.p);
-  if (hasUnderscores)
-    str = str.replaceAll("_", "");
-  return state > 1 ? parseFloat(str) : parseInteger(ctx, str, 10, startPtr);
-}
-function parseIntegerBaseN(ctx, startPtr, base, endChr) {
-  let c, underscore = 1;
-  while (++ctx.p < ctx.s.length && (c = ctx.s.charCodeAt(ctx.p), !isEndOfValue(c, endChr))) {
-    if (c === 95) {
-      if (underscore & 1)
-        TomlError.x("illegal underscore", ctx);
-      underscore = 3;
-    } else if (!isDigit(c, base))
-      TomlError.x(`illegal character in numeric literal`, ctx);
-    else if (underscore & 1)
-      underscore--;
-  }
-  if (underscore & 1)
-    TomlError.x("unfinished numeric value", ctx);
-  let str = ctx.s.slice(startPtr + 2, ctx.p);
-  if (underscore)
-    str = str.replaceAll("_", "");
-  return parseInteger(ctx, str, base, startPtr);
-}
-function parseInteger(ctx, str, base, startPtr) {
-  if (ctx.bi !== true)
-    int: {
-      let val = parseInt(str, base);
-      if (!Number.isSafeInteger(val)) {
-        if (ctx.bi)
-          break int;
-        TomlError.x("integer value cannot be represented losslessly", ctx, startPtr);
-      }
-      return val;
-    }
-  return base === 10 ? BigInt(str) : BigInt((base === 2 ? "0b" : base === 8 ? "0o" : "0x") + str);
-}
-function parseDate(ctx, c, endChr) {
-  let startPtr = ctx.p++, unsafeSeparator;
-  if (!isDigit(c) || !isDigit(ctx.s.charCodeAt(ctx.p++)) || !isDigit(ctx.s.charCodeAt(ctx.p++)) || !isDigit(ctx.s.charCodeAt(ctx.p++))) {
-    return parseNumber(ctx, ctx.p = startPtr, c, 0, endChr);
-  }
-  ctx.p += 5;
-  if (!isDigit(ctx.s.charCodeAt(ctx.p++)))
-    TomlError.x("invalid date-time: date part is malformed", ctx, startPtr);
-  if (ctx.p >= ctx.s.length || ((c = ctx.s.charCodeAt(ctx.p)) !== 32 || (unsafeSeparator = true, !isDigit(ctx.s.charCodeAt(ctx.p + 1)))) && c !== 84 && c !== 116) {
-    let t2 = ctx.s.slice(startPtr, ctx.p);
-    return readDate(ctx, t2, 3, false, startPtr);
-  }
-  if (ctx.s.charCodeAt(ctx.p += 3) !== 58)
-    TomlError.x("invalid date-time: time part is malformed", ctx, startPtr);
-  if (ctx.s.charCodeAt(ctx.p += 3) === 58)
-    ctx.p += 3;
-  if (ctx.s.charCodeAt(ctx.p) === 46)
-    while (isDigit(ctx.s.charCodeAt(++ctx.p)))
-      ;
-  if (c = ctx.s.charCodeAt(ctx.p)) {
-    if (c === 90 || c === 122) {
-      let t2 = ctx.s.slice(startPtr, ++ctx.p);
-      return readDate(ctx, t2, 1, unsafeSeparator, startPtr, "[+00:00]");
-    }
-    if (c === 43 || c === 45) {
-      let t2 = ctx.s.slice(startPtr, ctx.p += 6);
-      return readDate(ctx, t2, 1, unsafeSeparator, startPtr, !ctx.ld && "[" + ctx.s.slice(ctx.p - 6, ctx.p) + "]");
-    }
-  }
-  let t = ctx.s.slice(startPtr, ctx.p);
-  return readDate(ctx, t, 2, unsafeSeparator, startPtr);
-}
-function parseTime(ctx, c, endChr) {
-  let start = ctx.p;
-  if (!isDigit(c) || !isDigit(ctx.s.charCodeAt(++ctx.p))) {
-    return parseNumber(ctx, --ctx.p, c, 0, endChr);
-  }
-  if (ctx.s.charCodeAt(ctx.p += 4) === 58)
-    ctx.p += 3;
-  if (ctx.s.charCodeAt(ctx.p) === 46)
-    while (isDigit(ctx.s.charCodeAt(++ctx.p)))
-      ;
-  let t = ctx.s.slice(start, ctx.p);
-  return readDate(ctx, t, 4, false, start);
-}
-function readDate(ctx, str, type, unsafeDelim, errPtr, temporalSuffix) {
-  if (ctx.ld) {
-    let date = new TomlDate(str, type, unsafeDelim);
-    if (!date.isValid())
-      TomlError.x("invalid date", ctx, errPtr);
-    return date;
-  }
-  try {
-    if (temporalSuffix)
-      str += temporalSuffix;
-    switch (type) {
-      case 1:
-        return Temporal.ZonedDateTime.from(str);
-      case 2:
-        return Temporal.PlainDateTime.from(str);
-      case 3:
-        return Temporal.PlainDate.from(str);
-      case 4:
-        return Temporal.PlainTime.from(str);
-    }
-  } catch (e) {
-    TomlError.x(e instanceof Error ? e.message : "" + e, ctx, errPtr);
-  }
-}
-
-function skipComment(ctx) {
-  for (; ctx.p < ctx.s.length; ctx.p++) {
-    let c = ctx.s.charCodeAt(ctx.p);
-    if (c === 10)
-      break;
-    if (c === 13 && ctx.s.charCodeAt(ctx.p + 1) === 10) {
-      ctx.p++;
-      break;
-    }
-    if (c < 32 && c !== 9 || c === 127) {
-      TomlError.x("control characters are not allowed in comments", ctx);
-    }
-  }
-}
-function skipVoid(ctx, banNewLines, banComments) {
-  let c;
-  while (ctx.p < ctx.s.length) {
-    while (ctx.p < ctx.s.length && ((c = ctx.s.charCodeAt(ctx.p)) === 32 || c === 9 || !banNewLines && (c === 10 || c === 13 && ctx.s.charCodeAt(ctx.p + 1) === 10)))
-      ctx.p++;
-    if (banComments || c !== 35)
-      break;
-    skipComment(ctx);
-  }
-}
-
-function parseKey(ctx, end = 61) {
-  let startPtr;
-  let state = 0;
-  let parsed = [];
-  let sliceStart;
-  let c = ctx.s.charCodeAt(startPtr = ctx.p);
-  do {
-    if (c === end) {
-      if (!state)
-        TomlError.x("unexpected end of key", ctx);
-      if (state === 1)
-        parsed.push(ctx.s.slice(sliceStart, ctx.p));
-      return ctx.p++, parsed;
-    } else if (c === 46) {
-      if (!state)
-        TomlError.x("illegal empty bare key", ctx);
-      if (state === 1)
-        parsed.push(ctx.s.slice(sliceStart, ctx.p));
-      state = 0;
-    } else if (!state && (c === 34 || c === 39)) {
-      if (c === ctx.s.charCodeAt(ctx.p + 1) && c === ctx.s.charCodeAt(ctx.p + 2))
-        TomlError.x("illegal quoted key: multiline strings are not allowed", ctx);
-      parsed.push(parseString(ctx));
-      state = 2;
-      ctx.p--;
-    } else if (c === 32 || c === 9) {
-      if (state === 1) {
-        parsed.push(ctx.s.slice(sliceStart, ctx.p));
-        state = 2;
-      }
-    } else if (state === 2 || c < 48 && c !== 45 || c > 57 && c < 65 || c > 90 && c < 97 && c !== 95 || c > 122) {
-      TomlError.x("illegal character in key", ctx);
-    } else if (!state) {
-      state = 1;
-      sliceStart = ctx.p;
-    }
-  } while (c = ctx.s.charCodeAt(++ctx.p));
-  TomlError.x("incomplete key-value: cannot find end of key", ctx, startPtr);
-}
-function parseInlineTable(ctx) {
-  let startPtr = ctx.p++;
-  let res = /* @__PURE__ */ Object.create(null);
-  let seen = /* @__PURE__ */ new Set();
-  let c;
-  while (ctx.p < ctx.s.length) {
-    skipVoid(ctx);
-    if ((c = ctx.s.charCodeAt(ctx.p)) === 125) {
-      ctx.p++;
-      return res;
-    }
-    let k;
-    let t = res;
-    let hasOwn = false;
-    let errPtr = ctx.p;
-    let key = parseKey(ctx);
-    for (let i = 0; i < key.length; i++) {
-      if (i)
-        t = hasOwn ? t[k] : t[k] = /* @__PURE__ */ Object.create(null);
-      k = key[i];
-      if ((hasOwn = Object.hasOwn(t, k)) && (typeof t[k] !== "object" || seen.has(t[k]))) {
-        TomlError.x("trying to redefine an already defined value", ctx, errPtr);
-      }
-      let unsafe = k === "__proto__";
-      if (ctx.uk && (unsafe || k === "constructor")) {
-        t = ctx.uk !== 1 && TomlError.x("document contains an unsafe property", ctx, errPtr);
-        break;
-      }
-      if (!hasOwn && unsafe) {
-        Object.defineProperty(t, k, { enumerable: true, configurable: true, writable: true });
-      }
-    }
-    if (hasOwn) {
-      TomlError.x("trying to redefine an already defined value", ctx, errPtr);
-    }
-    skipVoid(ctx, true, true);
-    let value = extractValue(
-      ctx,
-      125
-      /* } */
-    );
-    if (t && typeof (t[k] = value) === "object")
-      seen.add(value);
-    skipVoid(ctx);
-    if ((c = ctx.s.charCodeAt(ctx.p++)) === 125) {
-      return res;
-    }
-    if (c !== 44)
-      TomlError.x("expected comma or end of structure", ctx, ctx.p - 1);
-  }
-  TomlError.x("unfinished table", ctx, startPtr);
-}
-function parseArray(ctx) {
-  let startPtr = ctx.p++;
-  let res = [];
-  let c;
-  while (ctx.p < ctx.s.length) {
-    skipVoid(ctx);
-    if ((c = ctx.s.charCodeAt(ctx.p)) === 93) {
-      ctx.p++;
-      return res;
-    }
-    res.push(extractValue(
-      ctx,
-      93
-      /* ] */
-    ));
-    skipVoid(ctx);
-    if ((c = ctx.s.charCodeAt(ctx.p++)) === 93) {
-      return res;
-    }
-    if (c !== 44)
-      TomlError.x("expected comma or end of structure", ctx, ctx.p - 1);
-  }
-  TomlError.x("unfinished array", ctx, startPtr);
-}
-
-function peekTable(ctx, key, table, meta, type) {
-  let t = table;
-  let m = meta;
-  let k;
-  let hasOwn = false;
-  let state;
-  for (let i = 0; i < key.length; i++) {
-    if (i) {
-      t = hasOwn ? t[k] : t[k] = /* @__PURE__ */ Object.create(null);
-      m = (state = m[k]).c;
-      if (type === 0 && (state.t === 1 || state.t === 2)) {
-        return null;
-      }
-      if (state.t === 2) {
-        let l = t.length - 1;
-        t = t[l];
-        m = m[l].c;
-      }
-    }
-    k = key[i];
-    if ((hasOwn = Object.hasOwn(t, k)) && m[k]?.t === 0 && m[k]?.d) {
-      return null;
-    }
-    if (!hasOwn) {
-      let unsafe = k === "__proto__";
-      if (ctx.uk && (unsafe || k === "constructor"))
-        return false;
-      if (unsafe) {
-        Object.defineProperty(t, k, { enumerable: true, configurable: true, writable: true });
-        Object.defineProperty(m, k, { enumerable: true, configurable: true, writable: true });
-      }
-      m[k] = {
-        t: i < key.length - 1 && type === 2 ? 3 : type,
-        d: false,
-        i: 0,
-        c: /* @__PURE__ */ Object.create(null)
-      };
-    }
-  }
-  state = m[k];
-  if (state.t !== type && !(type === 1 && state.t === 3)) {
-    return null;
-  }
-  if (type === 2) {
-    if (!state.d) {
-      state.d = true;
-      t[k] = [];
-    }
-    t[k].push(t = /* @__PURE__ */ Object.create(null));
-    state.c[state.i++] = state = { t: 1, d: false, i: 0, c: /* @__PURE__ */ Object.create(null) };
-  }
-  if (state.d) {
-    return null;
-  }
-  state.d = true;
-  if (type === 1) {
-    t = hasOwn ? t[k] : t[k] = /* @__PURE__ */ Object.create(null);
-  } else if (type === 0 && hasOwn) {
-    return null;
-  }
-  return [k, t, state.c];
-}
-function validateTablePeek(ctx, peek, ptr) {
-  if (peek === null || ctx.uk === 2)
-    TomlError.x(peek === null ? "trying to redefine an already defined table or value" : "document contains an unsafe property", ctx, ptr);
-}
-function parse(toml, options = {}) {
-  let ctx = {
-    s: toml,
-    p: 0,
-    d: options.maxDepth ?? 1e3,
-    bi: options.integersAsBigInt ?? false,
-    ld: options.useLegacyDate ?? true,
-    uk: options.unsafeKeyBehaviour === "throw" ? 2 : options.unsafeKeyBehaviour === "drop" ? 1 : 0
-  };
-  let res = /* @__PURE__ */ Object.create(null);
-  let meta = /* @__PURE__ */ Object.create(null);
-  let tmp;
-  let skipping = false;
-  let tbl = res;
-  let m = meta;
-  if (toml.charCodeAt(0) === 65279)
-    ctx.p++;
-  skipVoid(ctx);
-  while (ctx.p < toml.length) {
-    if (toml.charCodeAt(ctx.p) === 91) {
-      let isTableArray = toml.charCodeAt(++ctx.p) === 91;
-      tmp = ctx.p += +isTableArray;
-      skipping = false;
-      let k = parseKey(
-        ctx,
-        93
-        /* ] */
-      );
-      if (isTableArray) {
-        if (toml.charCodeAt(ctx.p) !== 93) {
-          TomlError.x("expected end of table array declaration", ctx);
-        }
-        ctx.p++;
-      }
-      let p = peekTable(
-        ctx,
-        k,
-        res,
-        meta,
-        isTableArray ? 2 : 1
-        /* Type.EXPLICIT */
-      );
-      if (!p) {
-        validateTablePeek(ctx, p, tmp);
-        skipping = true;
-      } else {
-        m = p[2];
-        tbl = p[1];
-      }
-    } else {
-      tmp = ctx.p;
-      let k = parseKey(ctx);
-      let p = peekTable(
-        ctx,
-        k,
-        tbl,
-        m,
-        0
-        /* Type.DOTTED */
-      );
-      if (!p && !skipping)
-        validateTablePeek(ctx, p, tmp);
-      skipVoid(ctx, true, true);
-      let v = extractValue(ctx, void 0);
-      if (p && !skipping)
-        p[1][p[0]] = v;
-    }
-    skipVoid(ctx, true);
-    if (ctx.p < toml.length && (tmp = toml.charCodeAt(ctx.p)) !== 10 && (tmp !== 13 || toml.charCodeAt(ctx.p + 1) !== 10)) {
-      TomlError.x("each key-value declaration must be followed by an end-of-line", ctx);
-    }
-    skipVoid(ctx);
-  }
-  return res;
-}
-
 const BARE_KEY = /^[A-Za-z0-9_-]+$/;
 function formatTomlKey(key) {
   return BARE_KEY.test(key) ? key : JSON.stringify(key);
@@ -5334,6 +4635,12 @@ function createAutoRestart(deps) {
         setStatus(sessionId, { state: "waiting", reason: "turn-active", since, target: staleness.target });
         return;
       }
+      const pending = deps.upgradePending?.() ?? null;
+      if (pending) {
+        deps.log?.(`[auto-restart] ${sessionId} left to the next daemon: upgrade to ${pending} pending`);
+        setStatus(sessionId, { state: "waiting", reason: "upgrade-pending", since, target: staleness.target });
+        return;
+      }
       let result;
       try {
         result = await deps.restart(sessionId, staleness);
@@ -5423,6 +4730,7 @@ function createAutoRestart(deps) {
       automationRunning: deps.automationRunning(request.sessionId),
       resumable: false,
       attempt,
+      upgradePending: deps.upgradePending?.() ?? null,
       inFlight,
       lastStartedAt
     };
@@ -5439,6 +4747,7 @@ function createAutoRestart(deps) {
         automationRunning: deps.automationRunning(request.sessionId),
         resumable,
         attempt: attempts.get(request.sessionId) ?? null,
+        upgradePending: deps.upgradePending?.() ?? null,
         inFlight,
         lastStartedAt
       };
@@ -5780,6 +5089,28 @@ class ClaudeAuthService {
   }
 }
 
+function forkSpawnAccount(requested, parentSessionId, parentAccount) {
+  if (requested !== void 0) return requested;
+  if (!parentSessionId) return void 0;
+  return parentAccount(parentSessionId);
+}
+const REASON_TEXT = {
+  "missing": "does not exist on this machine",
+  "missing-secret": "has no key / token on this machine",
+  "expired": "sign-in has expired",
+  "invalid": "key was rejected",
+  "agent-mismatch": "is for a different agent"
+};
+function accountUnavailableError(error, scope) {
+  const reason = agentProfileUnavailableReason(error);
+  if (!reason) return null;
+  const detail = error.replace(/^agent-profile-unavailable:[a-z-]+:?\s*/, "");
+  return `Account unavailable (${reason}): ${detail ? `${detail} \u2014 ` : ""}${accountUnavailableHint(reason, scope)}`;
+}
+function accountUnavailableHint(reason, scope) {
+  return `${REASON_TEXT[reason] ?? reason}. Not run on the machine login. Fix: sign in again (Settings \u2192 Models & accounts, or \`very-happy account login\` / \`very-happy account test\`), or choose another account for this ${scope}.`;
+}
+
 const INTERNAL_CLAUDE_EVENT_TYPES = /* @__PURE__ */ new Set(["file-history-snapshot", "change", "queue-operation"]);
 function parseLines(lines) {
   const out = [];
@@ -6600,6 +5931,27 @@ async function removeTeamWorktree(resource) {
 function teamInitialModelMeta(model) {
   return model ? { model, modelIntent: model } : { modelIntent: MODEL_INTENT_CONFIG };
 }
+function teamOperationAccount(op) {
+  if (op.agentProfile === void 0) return void 0;
+  return op.agentProfile === null ? null : op.agentProfile.id;
+}
+function teamAccountRefusal(resolve, op) {
+  const agent = op.assistant === "claude" || op.assistant === "codex" ? op.assistant : null;
+  const requested = teamOperationAccount(op);
+  if (!resolve) return null;
+  if (!agent) return typeof requested === "string" ? `agent-profile-unavailable:agent-mismatch: accounts are not supported for ${op.assistant} yet` : null;
+  try {
+    resolve(agent, requested);
+    return null;
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    return agentProfileUnavailableReason(message) ? teamAccountError(message) : null;
+  }
+}
+function teamAccountError(raw) {
+  const reason = agentProfileUnavailableReason(raw);
+  return `${raw}${reason ? ` \u2014 ${accountUnavailableHint(reason, "team member")}` : ""}`.slice(0, 1e3);
+}
 function refusalCode(error) {
   const code = axios.isAxiosError(error) ? error.response?.data?.error : void 0;
   return typeof code === "string" && /^[a-z_]{1,64}$/.test(code) ? ` (${code})` : "";
@@ -6620,6 +5972,14 @@ function createTeamWorker(deps) {
     await action(op.teamId, `complete-${op.id}`, { type: "complete-operation", operationId: op.id, machineId: deps.machineId, claimId: receipt.claimId, ...receipt.sessionId ? { sessionId: receipt.sessionId } : {}, ...op.type === "spawn" && receipt.directory ? { workingDirectory: receipt.directory } : {} });
     writeReceipt$1(home, { ...receipt, phase: "completed" });
   }
+  async function refuseForAccount(op, receipt, error) {
+    const { retryAt: _retryAt, sessionId: _sessionId, ...rest } = receipt;
+    const next = { ...rest, phase: "prepared", spawnFailures: (receipt.spawnFailures ?? 0) + 1 };
+    writeReceipt$1(home, next);
+    await action(op.teamId, `account-refused-${op.id}-${receipt.retryConsumed ?? 0}`, { type: "fail-operation", operationId: op.id, machineId: deps.machineId, claimId: receipt.claimId, error }).catch(() => {
+    });
+    deps.log(`Teams operation ${op.id} refused: account unavailable`);
+  }
   async function execute(op) {
     let receipt = readReceipt(home, op.id);
     let credential;
@@ -6659,6 +6019,11 @@ function createTeamWorker(deps) {
             return;
           }
           if (!op.directory) throw new Error("No repository selected for worker");
+          const refusal = teamAccountRefusal(deps.resolveAccount, op);
+          if (refusal) {
+            await refuseForAccount(op, receipt, refusal);
+            return;
+          }
           let resource;
           try {
             const repository = await resolveTeamRepository(home, op.directory, (id) => {
@@ -6685,7 +6050,12 @@ function createTeamWorker(deps) {
           writePrivateFileSync(scopeFile, JSON.stringify({ serverUrl: server, scopeToken: credential.token, teamId: op.teamId, botId: op.botId, taskId: op.taskId, attemptId: op.attemptId }));
           receipt = { ...receipt, ...resource, scopeFile, phase: "spawning" };
           writeReceipt$1(home, receipt);
-          const spawned = await deps.spawn({ directory: resource.directory, agent: op.assistant === "pi-acp" ? "pi" : op.assistant, permissionMode: op.permissionMode === "bypassPermissions" ? "bypassPermissions" : "default", spawnedBy: "teams", environmentVariables: { VH_TEAM_SCOPE_FILE: scopeFile, VH_TEAM_OPERATION_ID: op.id } });
+          const account = teamOperationAccount(op);
+          const spawned = await deps.spawn({ directory: resource.directory, agent: op.assistant === "pi-acp" ? "pi" : op.assistant, permissionMode: op.permissionMode === "bypassPermissions" ? "bypassPermissions" : "default", spawnedBy: "teams", environmentVariables: { VH_TEAM_SCOPE_FILE: scopeFile, VH_TEAM_OPERATION_ID: op.id }, ...account !== void 0 ? { agentProfileId: account } : {} });
+          if (spawned.type === "error" && agentProfileUnavailableReason(spawned.errorMessage)) {
+            await refuseForAccount(op, receipt, teamAccountError(spawned.errorMessage));
+            return;
+          }
           if (spawned.type === "error" && spawned.startupExit?.exited) {
             const now = Date.now();
             receipt = afterStartupFailure(receipt, now);
@@ -7132,6 +6502,30 @@ const AUTOMATION_LOG_READ_MS = 3e4;
 const AUTOMATION_UNAVAILABLE_LOG_MS = 10 * 6e4;
 const AUTOMATION_MAX_CONCURRENT = AUTOMATION_CLAIM_MAX_RUNS;
 const AUTOMATION_SPAWNED_BY = "automation";
+const AUTOMATION_ACCOUNT_UNAVAILABLE = "account_unavailable";
+const AUTOMATION_ACCOUNT_HISTORY_REJECTED = "account_history_rejected";
+function turnFailureReason(turn) {
+  if (turn.refusal === "agent-profile-unavailable") return AUTOMATION_ACCOUNT_UNAVAILABLE;
+  if (turn.refusal === "agent-profile-history-rejected") return AUTOMATION_ACCOUNT_HISTORY_REJECTED;
+  return `turn_${turn.status}`;
+}
+async function alignStickyAccount(accounts, agent, sessionId, requested) {
+  const current = accounts.sessionAccount(sessionId);
+  let target;
+  try {
+    target = accounts.resolve(agent, requested !== void 0 ? requested : current);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    return { error: accountUnavailableError(message, "automation") ?? message, reason: AUTOMATION_ACCOUNT_UNAVAILABLE };
+  }
+  if (target === current) return null;
+  try {
+    await accounts.rebind(sessionId, target);
+  } catch (error) {
+    return { error: `Could not move the sticky session to the run's account: ${error instanceof Error ? error.message : String(error)}`, reason: "send_failed" };
+  }
+  return null;
+}
 function automationPromptHeader(name, runId) {
   return `[Very Happy automation "${name}" run ${runId}; finish with automation_report (runId ${runId}) or \`very-happy auto report --run ${runId}\`]`;
 }
@@ -7295,6 +6689,7 @@ function createAutomationRunner(deps) {
   function wakeThenSend(claimed, sessionId, text, stickyKey) {
     const { run, automation } = claimed;
     const item = track(claimed, "send", sessionId);
+    if (stickyKey) item.stickyKey = stickyKey;
     item.waking = true;
     gating++;
     void (async () => {
@@ -7379,8 +6774,17 @@ ${action.prompt}`, { localId: `automation-${run.id}` });
     }
     const permissionMode = resolveSpawnPermissionMode(agent, action.permissionMode ?? void 0);
     const stickyKey = action.sticky ? renderTemplate(action.sticky.key, context) : void 0;
+    const requestedAccount = resolveLaunchAgentProfile({ explicit: action.agentProfile, project: claimed.projectAgentProfiles, agent, machineId: deps.machineId }).agentProfileId;
+    const accountAgent = agent === "claude" || agent === "codex" ? agent : null;
     if (stickyKey) {
       const bound = claimed.stickies.find((sticky) => sticky.key === stickyKey);
+      if (bound && (wakeable(bound.sessionId) || deps.live(bound.sessionId)) && deps.accounts && accountAgent) {
+        const problem = await alignStickyAccount(deps.accounts, accountAgent, bound.sessionId, requestedAccount);
+        if (problem) {
+          await failNow(claimed, "send", problem.error, problem.reason, bound.sessionId);
+          return;
+        }
+      }
       if (bound && wakeable(bound.sessionId)) {
         wakeThenSend(claimed, bound.sessionId, `${header}
 ${action.prompt}`, stickyKey);
@@ -7395,7 +6799,9 @@ ${action.prompt}`, { localId: `automation-${run.id}` });
           await failNow(claimed, "send", `Sticky session delivery failed: ${error instanceof Error ? error.message : String(error)}`, "send_failed", bound.sessionId);
           return;
         }
-        await reportRunning(track(claimed, "send", bound.sessionId), bound.sessionId, stickyKey);
+        const item2 = track(claimed, "send", bound.sessionId);
+        item2.stickyKey = stickyKey;
+        await reportRunning(item2, bound.sessionId, stickyKey);
         return;
       }
       if (bound) await client.deleteSticky(automation.id, stickyKey).catch(() => deps.log(`Automation ${automation.name}: stale sticky ${stickyKey} not cleared`));
@@ -7414,8 +6820,13 @@ ${action.prompt}`, { localId: `automation-${run.id}` });
       }
     }
     persist({ runId: run.id, automationId: automation.id, kind: "spawn", phase: "starting", claimId: run.claimId, stickyKey, ...action.worktree ? { directory } : {} });
-    const spawned = await deps.spawn({ directory, agent, permissionMode, spawnedBy: AUTOMATION_SPAWNED_BY, environmentVariables: stickyKey ? { ...env, VH_AUTOMATION_STICKY: "1" } : env });
+    const spawned = await deps.spawn({ directory, agent, permissionMode, spawnedBy: AUTOMATION_SPAWNED_BY, environmentVariables: stickyKey ? { ...env, VH_AUTOMATION_STICKY: "1" } : env, ...requestedAccount !== void 0 ? { agentProfileId: requestedAccount } : {} });
     if (spawned.type !== "success") {
+      const accountError = spawned.type === "error" ? accountUnavailableError(spawned.errorMessage, "automation") : null;
+      if (accountError) {
+        await failNow(claimed, "spawn", accountError, AUTOMATION_ACCOUNT_UNAVAILABLE);
+        return;
+      }
       await failNow(claimed, "spawn", spawned.type === "error" ? spawned.errorMessage : "Directory approval required", "spawn_failed");
       return;
     }
@@ -7464,7 +6875,11 @@ ${action.prompt}`, { localId: `automation-${run.id}`, ...meta });
         continue;
       }
       item.waitingOnBackground = false;
-      if (turn.status === "failed" || turn.status === "cancelled") await finish(item, { claimId: item.claimId, status: "failed", sessionId, error: turn.error ?? `Turn ${turn.status}`, needsAttention: true, attentionReason: `turn_${turn.status}` });
+      const reason = turn.status === "failed" || turn.status === "cancelled" ? turnFailureReason(turn) : null;
+      if (reason === AUTOMATION_ACCOUNT_HISTORY_REJECTED && item.stickyKey) {
+        await client.deleteSticky(item.automationId, item.stickyKey).catch(() => deps.log(`Automation run ${item.runId}: sticky ${item.stickyKey} not cleared`));
+      }
+      if (reason) await finish(item, { claimId: item.claimId, status: "failed", sessionId, error: turn.error ?? `Turn ${turn.status}`, needsAttention: true, attentionReason: reason });
       else await finish(item, { claimId: item.claimId, status: "done", sessionId, summary: clipText(turn.answer, AUTOMATION_SUMMARY_MAX_CHARS) });
     }
   }
@@ -7656,6 +7071,7 @@ async function startDaemon() {
   const initialMachineMetadata = getInitialMachineMetadata();
   const startupCliAvailability = getStartupCliAvailability();
   let claudeAuthServiceRef = null;
+  let accountServiceRef = null;
   let cliUpdateStateRef = null;
   let lastHandoverHold = null;
   let claudeCredentialStoreSetting = (await readSettings()).claudeCredentialStore === "file" ? "file" : "auto";
@@ -7784,6 +7200,7 @@ async function startDaemon() {
     const sessionIdToFinishedSession = /* @__PURE__ */ new Map();
     let teamWorker;
     let autoRestart;
+    let bundleReplacedSeen = false;
     let automationRunner;
     let projectPresence;
     const persisted = readPersistedSessions();
@@ -8079,8 +7496,22 @@ async function startDaemon() {
         if (options.spawnedBy) {
           extraEnv.HAPPY_SPAWNED_BY = options.spawnedBy;
         }
+        let spawnAccountId = null;
+        delete extraEnv[SPAWN_ACCOUNT_ENV];
+        const accountAgent = (options.agent ?? "claude") === "claude" ? "claude" : options.agent === "codex" ? "codex" : null;
+        if (accountAgent && accountServiceRef) {
+          try {
+            const requested = forkSpawnAccount(options.agentProfileId, options.parentSessionId, (id) => accountServiceRef.sessionAccount(id));
+            spawnAccountId = accountServiceRef.resolveSpawnAccount(accountAgent, requested);
+          } catch (error) {
+            return { type: "error", errorMessage: error instanceof Error ? error.message : String(error) };
+          }
+          if (spawnAccountId) extraEnv[SPAWN_ACCOUNT_ENV] = spawnAccountId;
+        } else if (options.agentProfileId) {
+          return { type: "error", errorMessage: `agent-profile-unavailable:agent-mismatch: accounts are not supported for ${options.agent} yet` };
+        }
         const claudeAuthStatus = claudeAuthServiceRef?.current()?.status;
-        if ((options.agent ?? "claude") === "claude" && claudeAuthStatus) {
+        if ((options.agent ?? "claude") === "claude" && claudeAuthStatus && !spawnAccountId) {
           extraEnv.HAPPY_CLAUDE_AUTH_STATUS = claudeAuthStatus;
         }
         logger.debug(`[DAEMON RUN] Environment variable keys (before expansion) (${Object.keys(extraEnv).length}): ${Object.keys(extraEnv).join(", ")}`);
@@ -8524,6 +7955,7 @@ async function startDaemon() {
       }
     };
     const restartCounts = /* @__PURE__ */ new Map();
+    const accountRestartCounts = /* @__PURE__ */ new Map();
     const autoRestartExits = /* @__PURE__ */ new Set();
     const stopSessionAndWait = async (happySessionId, timeoutMs = 8e3) => {
       const targets = /* @__PURE__ */ new Set();
@@ -8573,8 +8005,9 @@ async function startDaemon() {
     };
     const restartSessionImpl = async (happySessionId, options) => {
       try {
-        const prior = restartCounts.get(happySessionId) ?? 0;
-        const decision = options?.auto ? { allowed: true } : decideRestart(prior, DEFAULT_MAX_RESTARTS);
+        const counts = options?.account ? accountRestartCounts : restartCounts;
+        const prior = counts.get(happySessionId) ?? 0;
+        const decision = options?.auto ? { allowed: true } : decideRestart(prior, options?.account ? DEFAULT_MAX_ACCOUNT_RESTARTS : DEFAULT_MAX_RESTARTS);
         if (!decision.allowed) {
           return { type: "error", errorMessage: `restart:${decision.reason}` };
         }
@@ -8625,7 +8058,7 @@ async function startDaemon() {
         if (model) args.push("--model", model);
         const permissionMode = sanitizeSpawnPermissionMode(options?.permissionMode ?? (options?.keepPublishedPermissionMode ? publishedRelaunchPermissionMode(metadata) : void 0));
         if (permissionMode) args.push("--permission-mode", permissionMode);
-        if (!options?.auto) restartCounts.set(happySessionId, recordRestartAttempt(prior));
+        if (!options?.auto) counts.set(happySessionId, recordRestartAttempt(prior));
         const teamEnv = await teamRelaunchEnvFor(happySessionId, metadata);
         const result = await spawnTrackedHappyProcess({
           args,
@@ -8791,6 +8224,11 @@ async function startDaemon() {
         startedBy: metadata?.startedBy ?? null
       };
     };
+    const upgradePending = () => pendingUpgradeVersion({
+      daemonVersion: packageJson.version,
+      autoUpdate: cliUpdateStateRef?.autoUpdate,
+      bundleReplaced: bundleReplacedSeen
+    });
     const autoRestartScheduler = createAutoRestart({
       enabled: () => autoRestartSetting,
       quietMs: resolveQuietMs(),
@@ -8845,6 +8283,7 @@ async function startDaemon() {
         if (!row || typeof row.active !== "boolean") return null;
         return { active: row.active, archived: row.archivedAt != null };
       },
+      upgradePending,
       publish: (sessions) => {
         void apiMachineRef?.setAutoRestartSessions(sessions);
       },
@@ -8864,6 +8303,8 @@ async function startDaemon() {
       // B-501: `very-happy send --resume`
       restartSession,
       // B-794: `very-happy session provider`
+      getAgentProfiles: () => accountServiceRef?.state() ?? null,
+      // B-850a: `very-happy account list`
       requestShutdown: () => requestShutdown("happy-cli"),
       onHappySessionWebhook,
       onSessionStateEvent,
@@ -8891,6 +8332,9 @@ async function startDaemon() {
       // B-505: `daemon list` shows which sessions have a turn in flight, so an
       // operator can check the WHOLE machine before a supervised restart.
       isTurnActive: (sessionId) => turnActivity.activeSessions().includes(sessionId),
+      // B-856: the auto-restart classification, readable locally (it is encrypted on the server).
+      getAutoRestartStatus: (sessionId) => autoRestartScheduler.statuses()[sessionId],
+      getDaemonInfo: () => ({ version: packageJson.version, upgradePending: upgradePending(), autoRestartEnabled: autoRestartSetting }),
       pushClipboard: (text, terminalId) => {
         if (!apiMachineRef) {
           return { delivered: false, truncated: false, totalBytes: 0, error: "daemon is still starting up" };
@@ -9045,6 +8489,36 @@ async function startDaemon() {
       return autoRestartSetting;
     });
     setTimeout(() => autoRestartScheduler.sweep(), 5e3).unref?.();
+    const accountService = new AccountService({
+      home: configuration.happyHomeDir,
+      env: process.env,
+      daemonPid: process.pid,
+      spawnPty: (env) => spawnSetupTokenPty(os.homedir(), env),
+      restartSession: async (sessionId) => {
+        const result = await restartSession(sessionId, { keepPublishedPermissionMode: true, account: true });
+        if (result.type === "success") return { ok: true };
+        const error = result.type === "error" ? result.errorMessage : "unexpected restart result";
+        const stillRunning = [...pidToTrackedSession.values()].some((s) => s.happySessionId === sessionId && isPidAlive(s.pid));
+        return { ok: false, notRunning: error.startsWith("restart-precheck:not-tracked"), stillRunning, error };
+      },
+      onChanged: () => {
+        void apiMachine.publishAgentProfiles();
+      },
+      // B-850b: a Codex account never binds to a Claude session and vice versa.
+      sessionAgent: (sessionId) => {
+        for (const tracked of pidToTrackedSession.values()) {
+          if (tracked.happySessionId !== sessionId) continue;
+          const flavor = tracked.happySessionMetadataFromLocalWebhook?.flavor ?? "claude";
+          return flavor === "codex" ? "codex" : flavor === "claude" ? "claude" : flavor;
+        }
+        return void 0;
+      }
+    });
+    accountServiceRef = accountService;
+    apiMachine.setAgentProfileService(accountService);
+    const stopAccountWatch = watchAccountFiles(configuration.happyHomeDir, () => {
+      void apiMachine.publishAgentProfiles();
+    });
     const webPanelsSync = startWebPanelsSync({
       statMtime: async () => (await fs.stat(configuration.settingsFile).catch(() => null))?.mtimeMs ?? null,
       readRaw: async () => (await readSettings()).webPanels,
@@ -9179,6 +8653,7 @@ async function startDaemon() {
               try {
                 const currentMtimeMs = statSync$1(bundlePath).mtimeMs;
                 bundleReplaced = currentMtimeMs !== initialBundleMtimeMs;
+                if (bundleReplaced) bundleReplacedSeen = true;
               } catch {
               }
             }
@@ -9205,6 +8680,8 @@ async function startDaemon() {
               policyAnnouncements.stop();
               stopAgentVersionChecks();
               claudeAuthService.stop();
+              stopAccountWatch();
+              accountService.dispose();
               apiMachine.shutdown();
               await stopControlServer();
               await cleanupDaemonState();
@@ -9257,6 +8734,7 @@ async function startDaemon() {
         if (remaining.some(isPidAlive)) throw new Error("Worker still running; cleanup retained");
       },
       live: (id) => [...pidToTrackedSession.values()].some((s) => s.happySessionId === id && isPidAlive(s.pid)),
+      ...accountServiceRef ? { resolveAccount: (agent, requested) => accountServiceRef.resolveSpawnAccount(agent, requested) } : {},
       log: (message) => logger.debug(`[DAEMON RUN] ${message}`)
     });
     automationRunner = createAutomationRunner({
@@ -9278,6 +8756,17 @@ async function startDaemon() {
         return waitForSessionLive(id, (sid) => [...pidToTrackedSession.values()].some((s) => s.happySessionId === sid && isPidAlive(s.pid)));
       },
       joinProject: (sessionId, projectId) => joinProject(projectsClient, sessionId, { kind: "explicit", projectId }, { via: "automation" }),
+      // B-850d: sticky sessions follow the run's account; unusable → refused.
+      ...accountServiceRef ? {
+        accounts: {
+          sessionAccount: (id) => accountServiceRef.sessionAccount(id),
+          resolve: (agent, requested) => accountServiceRef.resolveSpawnAccount(agent, requested),
+          rebind: async (sessionId, accountId) => {
+            const result = await accountServiceRef.bind({ sessionId, accountId });
+            if (result.restart === "failed") throw new Error(result.error ?? "restart failed");
+          }
+        }
+      } : {},
       log: (message) => logger.debug(`[DAEMON RUN] ${message}`)
     });
     projectPresence = createProjectPresenceReporter({
@@ -9336,6 +8825,8 @@ async function startDaemon() {
       } catch (error) {
         logger.debug("[DAEMON RUN] Mirror shutdown failed:", error);
       }
+      stopAccountWatch();
+      accountService.dispose();
       apiMachine.shutdown();
       await stopControlServer();
       await cleanupDaemonState();