very-happy-cli 0.2.191 → 0.2.192

package/dist/{reportProgressTool-tzQLCLIw.cjs → reportProgressTool-DpFs7pSe.cjs}

@@ -1,10 +1,10 @@
 'use strict';
 
 var z = require('zod');
-var index = require('./index-CLUHaPU8.cjs');
-var client = require('./client-BscskEBk.cjs');
+var index = require('./index-BzAYnYct.cjs');
+var client = require('./client-Crh8_cNx.cjs');
 var precheckCompat = require('./precheckCompat-CWOi5c9L.cjs');
-var client$1 = require('./client-C5-C0t2a.cjs');
+var client$1 = require('./client-D8XROyZc.cjs');
 var prompt = require('./prompt-Bof2aQkI.cjs');
 var agentGuidance = require('./agentGuidance-BtBx2xxE.cjs');
 

package/dist/{run-Bt0AklUU.mjs → run-CwN28mcj.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-DXT3rv7T.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-Bl5GpBoN.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-IhRiLDVe.mjs';
+import { T as TurnActivityTracker, A as ApiClient } from './api-_LeBScjg.mjs';
+import { S as SPAWN_AGENTS, i as isSpawnAgent, s as sanitizeSpawnPermissionMode, r as resolveSpawnPermissionMode, a as resolveFirstMessageMeta, j as joinProject } from './spawnAgents-CRMfOJhh.mjs';
+import { l as logger } from './logger-Fd_rNvgd.mjs';
+import { p as pruneStaleCompileCaches } from './index-JQDyJ3Li.mjs';
+import { a as authAndSetupMachineIfNeeded } from './auth-DL8_J9vu.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-6KkRAops.mjs';
+import { a as globalPrefixForPackage, N as NPM_SAFE_ARG, g as getEnvironmentInfo } from './doctor-B_UwMcVT.mjs';
+import { s as spawnHappyCLI } from './spawnHappyCLI-Cj_6IICe.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-DWcHe035.mjs';
+import { i as isDaemonRunningCurrentlyInstalledHappyVersion, s as stopDaemon, w as cleanupDaemonState } from './controlClient-8ILulwjc.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-gU88-W9F.mjs';
+import { G as AgentProfilesStateSchema, a6 as ServerMigrateNoticeSchema, a7 as isHarnessInstallId, a8 as MODEL_INTENT_CONFIG, j as AUTOMATION_SUMMARY_MAX_CHARS, a9 as AUTOMATION_PRECHECK_OUTPUT_MAX_CHARS, aa as AUTOMATION_PRECHECK_DEFAULT_TIMEOUT_MS, d as AUTOMATION_PRECHECK_MAX_TIMEOUT_MS, ab as AUTOMATION_CLAIM_MAX_RUNS, ac as AUTOMATION_DAEMON_CAPABILITY_PRECHECK, ad as AUTOMATION_DEFAULT_LEASE_MS, i as isAutomationRunTerminal, ae as HARNESS_INSTALL_CAPABILITY_VERSION } from './index-DYD3GM1m.mjs';
 import fastify from 'fastify';
 import { z } from 'zod';
 import { validatorCompiler, serializerCompiler } from 'fastify-type-provider-zod';
@@ -27,64 +28,68 @@ 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-Da5AR-4u.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-CKJ-IDM4.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-CZ7aaNgj.mjs';
+import { assistantHome, bootstrapAssistantHome } from './bootstrap-DaZ0Np7X.mjs';
+import { refreshAgentHomes, locateClaudeConversation, agentHomeSpawnEnv } from './index-v5EmjT8l.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-1HIIC7Bc.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 require$$3 from 'crypto';
 import { c as commandOnPath } from './detectCLI-CSGMlV51.mjs';
-import { buildResumeLaunch } from './handleResumeCommand-BK9XKH_l.mjs';
+import { buildResumeLaunch } from './handleResumeCommand-BGhVo3QH.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-Bm4oKvW7.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-Dl6i7IgA.mjs';
+import { c as createAutomationsClient, i as isAutomationsUnavailable, d as AutomationsRequestError } from './client-Cxlp_D4I.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-Dd9uqde2.mjs';
+import { spawnSetupTokenPty, watchAccountFiles } from './daemonAccounts-BJgt6IJe.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-DikVa8kg.mjs';
+import { I as InvalidateSync } from './sync-JoEZKRo8.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-CJ8BWSsc.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--XN-7MS0.mjs';
+import './acpSessionResume-BWEUxNtC.mjs';
+import './lidState-CZOXXdzv.mjs';
 import 'node:events';
 import 'socket.io-client';
-import './pushNotifications-XAM8__Pg.mjs';
+import './pushNotifications-DkQ0yvFs.mjs';
 import './contentLogMetadata-BlWI0egu.mjs';
 import './limits-DIo7rEBR.mjs';
-import './time-D0jvDRhn.mjs';
-import './registerCommonHandlers-DRRfinzK.mjs';
+import './time-bzmet4s5.mjs';
+import './registerCommonHandlers-yQ7Ru-l0.mjs';
 import 'util';
 import 'cross-spawn';
 import '@paralleldrive/cuid2';
 import 'chalk';
 import 'node:module';
 import 'tweetnacl';
-import './browser-CHpVgyni.mjs';
+import './browser-BUIaSHK2.mjs';
 import 'open';
 import './specialCommands-MXUN0wfI.mjs';
 import './ids-DU6sLx4C.mjs';
 import 'url';
-import './localHappyAgentAuth-Cg-m1lwm.mjs';
+import './localHappyAgentAuth-YHxDZ4x4.mjs';
 import './processTreeSnapshot-CuLJDNC-.mjs';
+import './claudeAccountEnv-ON24i0qv.mjs';
+import 'node-pty';
 import 'ps-list';
 
 async function resolveRelaunchMetadata(snapshot, fetchServer) {
@@ -180,8 +185,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 +241,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 +254,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 +569,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 +626,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 +667,11 @@ function startDaemonControlServer({
   onSessionEdit,
   listPeers,
   isTurnActive,
+  getAutoRestartStatus,
+  getDaemonInfo,
   onRateLimits,
-  onHibernateCheck
+  onHibernateCheck,
+  getAgentProfiles
 }) {
   return new Promise((resolve) => {
     const app = fastify({
@@ -697,6 +777,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 +797,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 +815,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 +862,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 +889,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 +986,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 };
@@ -5334,6 +5433,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 +5528,7 @@ function createAutoRestart(deps) {
       automationRunning: deps.automationRunning(request.sessionId),
       resumable: false,
       attempt,
+      upgradePending: deps.upgradePending?.() ?? null,
       inFlight,
       lastStartedAt
     };
@@ -5439,6 +5545,7 @@ function createAutoRestart(deps) {
         automationRunning: deps.automationRunning(request.sessionId),
         resumable,
         attempt: attempts.get(request.sessionId) ?? null,
+        upgradePending: deps.upgradePending?.() ?? null,
         inFlight,
         lastStartedAt
       };
@@ -7656,6 +7763,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 +7892,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 +8188,20 @@ async function startDaemon() {
         if (options.spawnedBy) {
           extraEnv.HAPPY_SPAWNED_BY = options.spawnedBy;
         }
+        let spawnAccountId = null;
+        delete extraEnv[SPAWN_ACCOUNT_ENV];
+        if ((options.agent ?? "claude") === "claude" && accountServiceRef) {
+          try {
+            spawnAccountId = accountServiceRef.resolveSpawnAccount("claude", options.agentProfileId);
+          } 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 +8645,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 +8695,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 +8748,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 +8914,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 +8973,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 +8993,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 +9022,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 +9179,27 @@ 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();
+      }
+    });
+    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 +9334,7 @@ async function startDaemon() {
               try {
                 const currentMtimeMs = statSync$1(bundlePath).mtimeMs;
                 bundleReplaced = currentMtimeMs !== initialBundleMtimeMs;
+                if (bundleReplaced) bundleReplacedSeen = true;
               } catch {
               }
             }
@@ -9205,6 +9361,8 @@ async function startDaemon() {
               policyAnnouncements.stop();
               stopAgentVersionChecks();
               claudeAuthService.stop();
+              stopAccountWatch();
+              accountService.dispose();
               apiMachine.shutdown();
               await stopControlServer();
               await cleanupDaemonState();
@@ -9336,6 +9494,8 @@ async function startDaemon() {
       } catch (error) {
         logger.debug("[DAEMON RUN] Mirror shutdown failed:", error);
       }
+      stopAccountWatch();
+      accountService.dispose();
       apiMachine.shutdown();
       await stopControlServer();
       await cleanupDaemonState();