very-happy-cli 0.2.203 → 0.2.204

package/dist/{run-BoSVfVCZ.cjs → run-r5sY3wHk.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
-var mirrorProtocol = require('./mirrorProtocol-DwO8QgLM.cjs');
+var mirrorProtocol = require('./mirrorProtocol-cTQcrW55.cjs');
 var fsMkdir = require('./fsMkdir-0K3yENml.cjs');
-var piRunnerArgs = require('./piRunnerArgs-Dz9P62db.cjs');
+var piRunnerArgs = require('./piRunnerArgs-CA6jqQ0k.cjs');
 var fs = require('fs/promises');
 var os$1 = require('os');
 var tmp = require('tmp');
@@ -10,20 +10,21 @@ var axios = require('axios');
 var sessionMetadata = require('./sessionMetadata-B44cL4Xj.cjs');
 var node_fs = require('node:fs');
 var path = require('node:path');
-var configuration = require('./configuration-Cl9kOv09.cjs');
-var api = require('./api-ChhFBuB0.cjs');
-var spawnAgents = require('./spawnAgents-DvbEDCIq.cjs');
-var logger = require('./logger-BtWBoP60.cjs');
-var index$2 = require('./index-C_ePuQwB.cjs');
-var auth = require('./auth-thi2T_T8.cjs');
+var exitNotice = require('./exitNotice-BhRrv8dx.cjs');
+var configuration = require('./configuration-CDqmWkHO.cjs');
+var api = require('./api-BoJA-zK3.cjs');
+var spawnAgents = require('./spawnAgents-D4lR468W.cjs');
+var logger = require('./logger-C8anCmdW.cjs');
+var index$2 = require('./index-C7yXrMau.cjs');
+var auth = require('./auth-CAkpHr8F.cjs');
 var child_process = require('child_process');
-var _package = require('./package-Djdgx8nb.cjs');
-var doctor = require('./doctor-DiPRqsqg.cjs');
-var spawnHappyCLI = require('./spawnHappyCLI-D7EO8s4E.cjs');
-var persistence = require('./persistence-BOEZtiKb.cjs');
-var controlClient = require('./controlClient-DxCQKfqe.cjs');
-var sessionOps = require('./sessionOps-CptDjoZi.cjs');
-var index = require('./index-44o_qMvE.cjs');
+var _package = require('./package-DkpXQvp1.cjs');
+var doctor = require('./doctor-C0kONAQn.cjs');
+var spawnHappyCLI = require('./spawnHappyCLI-DvxZ7elP.cjs');
+var persistence = require('./persistence-Ch78xygf.cjs');
+var controlClient = require('./controlClient-BS86Ksm8.cjs');
+var sessionOps = require('./sessionOps-D77IeFSt.cjs');
+var index = require('./index-BYL_X3gP.cjs');
 var fastify = require('fastify');
 var z = require('zod');
 var fastifyTypeProviderZod = require('fastify-type-provider-zod');
@@ -31,69 +32,70 @@ var authRelay = require('./authRelay-Dy1qU9td.cjs');
 var node_crypto = require('node:crypto');
 var previewPath = require('./previewPath-B0rBdhy1.cjs');
 var backgroundTaskActivity = require('./backgroundTaskActivity-CBvUdj39.cjs');
-var rateLimitWindows = require('./rateLimitWindows-mfdokrkQ.cjs');
-var peerTools = require('./peerTools-fYuKq3ev.cjs');
+var rateLimitWindows = require('./rateLimitWindows-C78D8Uf-.cjs');
+var peerTools = require('./peerTools-DpCWFxI6.cjs');
 var os = require('node:os');
-var remoteSessionClient = require('./remoteSessionClient-CjINaEs_.cjs');
-var bootstrap = require('./bootstrap-EGhaCmXy.cjs');
-var index$1 = require('./index-Cl-WkB_6.cjs');
+var remoteSessionClient = require('./remoteSessionClient-r-UnqHor.cjs');
+var bootstrap = require('./bootstrap-D16MMPNP.cjs');
+var index$1 = require('./index-Bm_9wBaO.cjs');
 var require$$0 = require('fs');
 var require$$1 = require('path');
 var node_child_process = require('node:child_process');
 var projectPath = require('./projectPath-C3ioB4Bu.cjs');
 var doctorReadiness = require('./doctorReadiness-Dl6yRQCy.cjs');
-var machineMetadata = require('./machineMetadata-C0-LyMsb.cjs');
+var machineMetadata = require('./machineMetadata-DYWtdEtE.cjs');
 var fileStore = require('./fileStore-7qhnbs6N.cjs');
 var pi = require('./pi-DlsrPCTa.cjs');
-var codexAccount = require('./codexAccount-D-OBY29W.cjs');
+var codexAccount = require('./codexAccount-BjaHvmKH.cjs');
 var require$$3 = require('crypto');
 var detectCLI = require('./detectCLI-BuYR_Qxe.cjs');
-var handleResumeCommand = require('./handleResumeCommand-vcD2qcAM.cjs');
+var handleResumeCommand = require('./handleResumeCommand-0lsgLgBB.cjs');
 var webPanels = require('./webPanels-FCgFKvVe.cjs');
 var promises = require('node:fs/promises');
 var cliUpdate = require('./cliUpdate-DsKXPFYp.cjs');
-var client = require('./client-Cddb1dhi.cjs');
-var sessionLock = require('./sessionLock-Db_uQcUP.cjs');
-var client$1 = require('./client-6Y6O72Uq.cjs');
+var client = require('./client-CqmT_ur8.cjs');
+var sessionLock = require('./sessionLock-UkF8M3j5.cjs');
+var client$1 = require('./client-D5_YDMpA.cjs');
 var daemonSupervisor = require('./daemonSupervisor-alqGPANc.cjs');
-var accountService = require('./accountService-Cns8UYGI.cjs');
-var daemonAccounts = require('./daemonAccounts-ciidbU2h.cjs');
+var accountService = require('./accountService-SOeB_21A.cjs');
+var daemonAccounts = require('./daemonAccounts-BOoI7-sw.cjs');
 var path$1 = require('./path-B7zW-WwE.cjs');
 var editPaths = require('./editPaths-Bqp4OFPw.cjs');
-var startFileWatcher = require('./startFileWatcher-6NpLGxg5.cjs');
-var sync = require('./sync-ni64k2OI.cjs');
+var startFileWatcher = require('./startFileWatcher-1ar7WS96.cjs');
+var sync = require('./sync-DzInYE_l.cjs');
 var types = require('./types-CRS-srZK.cjs');
 var tmuxSocket = require('./tmuxSocket-Dg11Olx0.cjs');
 var processTermination = require('./processTermination-f17wxlMb.cjs');
 var doctor$1 = require('./doctor-CJpFhHoK.cjs');
 var resources = require('./resources-BZ_Be0qM.cjs');
 var node_util = require('node:util');
-var template = require('./template-3fV9bi0X.cjs');
-var client$2 = require('./client-DP8FabOE.cjs');
+var template = require('./template-ChUotPTL.cjs');
+var client$2 = require('./client-ByK8-iRd.cjs');
 var loginShellEnv = require('./loginShellEnv-BkuYtExZ.cjs');
-var store = require('./store-Cpb1LMNW.cjs');
-require('./acpSessionResume-DmOPXKpC.cjs');
-require('./pushNotifications-B19lT5mY.cjs');
+var store = require('./store-DGMILdMn.cjs');
+require('./acpSessionResume-DK8EjIY0.cjs');
+require('./prompt-Bof2aQkI.cjs');
+require('./pushNotifications-D2ejrxlN.cjs');
 require('./contentLogMetadata-ZSFk_NjQ.cjs');
-require('./reconnectGate-B8ltzSJD.cjs');
+require('./reconnectGate-S9yNiuY7.cjs');
 require('node:events');
 require('socket.io-client');
 require('./limits-C-a7gr04.cjs');
-require('./time-BMCY7zJL.cjs');
-require('./registerCommonHandlers-Y2siJGwL.cjs');
+require('./time-UUMqbIq8.cjs');
+require('./registerCommonHandlers-51llVpLx.cjs');
 require('util');
 require('cross-spawn');
 require('@paralleldrive/cuid2');
 require('chalk');
 require('node:module');
 require('tweetnacl');
-require('./browser-DSxpOnPb.cjs');
+require('./browser-DK2GfyEr.cjs');
 require('open');
 require('./specialCommands-J3JFOq0J.cjs');
 require('./ids-B6ZC0HGt.cjs');
 require('url');
-require('./localHappyAgentAuth-Dm9obisi.cjs');
-require('./claudeAccountEnv-Btp39mfa.cjs');
+require('./localHappyAgentAuth-D3GKuEC2.cjs');
+require('./claudeAccountEnv-BTZjHTpF.cjs');
 require('node:readline');
 require('node-pty');
 require('./processTreeSnapshot-D5iNblp6.cjs');
@@ -164,6 +166,13 @@ function writeReceipt$1(home, receipt) {
 }
 
 const OPERATION_ID = /^[a-zA-Z0-9_-]{1,128}$/;
+function hasExitedTeamMode(home, sessionId) {
+  try {
+    return node_fs.existsSync(exitNotice.teamExitMarkerPath(home, sessionId));
+  } catch {
+    return false;
+  }
+}
 function teamScopeFilePath(home, operationId) {
   if (!OPERATION_ID.test(operationId)) throw new Error("Invalid team operation id");
   return path.join(home, "teams", "scopes", `${operationId}.json`);
@@ -192,9 +201,40 @@ function relaunchTeamOperationId(home, sessionId, metadata) {
   }
   return newest?.id ?? null;
 }
+function teamExitMarker(team, managed, reason) {
+  return { teamId: team.id, teamName: team.name, managed, at: Date.now(), language: exitNotice.detectTeamUserLanguage(exitNotice.teamOwnerText(team.tasks)), reason };
+}
+function archivedLeadMarker(team, operationId, sessionId) {
+  const op = team.operations.find((candidate) => candidate.id === operationId);
+  if (team.archivedAt === void 0 || op?.type !== "spawn") return null;
+  const bot = team.bots.find((candidate) => candidate.id === op.botId);
+  return bot?.root && bot.sessionId === sessionId ? teamExitMarker(team, true, "archived") : null;
+}
+function launchTeamId(home, operationId) {
+  try {
+    return readReceipt(home, operationId)?.teamId ?? null;
+  } catch {
+    return null;
+  }
+}
 async function teamRelaunchEnv(input) {
+  if (hasExitedTeamMode(input.home, input.sessionId)) return {};
   const operationId = relaunchTeamOperationId(input.home, input.sessionId, input.metadata);
   if (!operationId) return {};
+  const teamId = launchTeamId(input.home, operationId);
+  if (input.team && teamId) {
+    try {
+      const marker = archivedLeadMarker(await input.team(teamId), operationId, input.sessionId);
+      if (marker) {
+        configuration.ensurePrivateDirectorySync(path.join(input.home, "teams", "exited"));
+        configuration.writePrivateFileSync(exitNotice.teamExitMarkerPath(input.home, input.sessionId), JSON.stringify(marker));
+        input.log(`Team ${marker.teamId} of lead ${input.sessionId} is archived; relaunching it as an ordinary session`);
+        return {};
+      }
+    } catch (error) {
+      input.log(`Teams state for ${input.sessionId} unavailable (${error instanceof Error ? error.message : "unknown error"}); relaunching with its team env`);
+    }
+  }
   const scopeFile = teamScopeFilePath(input.home, operationId);
   if (!node_fs.existsSync(scopeFile) && input.recover) {
     try {
@@ -208,6 +248,50 @@ async function teamRelaunchEnv(input) {
   return { VH_TEAM_SCOPE_FILE: scopeFile, VH_TEAM_OPERATION_ID: operationId, HAPPY_SPAWNED_BY: "teams" };
 }
 
+async function exitTeamMode(input) {
+  const { home, sessionId, http } = input;
+  const marker = exitNotice.teamExitMarkerPath(home, sessionId);
+  const operationId = relaunchTeamOperationId(home, sessionId, input.metadata);
+  const scopeFile = operationId ? teamScopeFilePath(home, operationId) : path.join(home, "teams", "scopes", `${sessionId}.json`);
+  const forgetScope = () => {
+    try {
+      node_fs.unlinkSync(scopeFile);
+    } catch (error) {
+      if (error?.code !== "ENOENT") throw error;
+    }
+  };
+  if (node_fs.existsSync(marker)) {
+    const { teamId: teamId2, managed } = JSON.parse(node_fs.readFileSync(marker, "utf8"));
+    forgetScope();
+    return { teamId: teamId2, managed: managed === true, leadStopped: false, alreadyExited: true };
+  }
+  let scope = null;
+  try {
+    scope = JSON.parse(node_fs.readFileSync(scopeFile, "utf8"));
+  } catch {
+  }
+  const teamId = typeof scope?.teamId === "string" ? scope.teamId : operationId ? launchTeamId(home, operationId) : null;
+  if (!teamId) throw new Error("This session is not in a team on this machine");
+  const path$1 = `/v1/teams/${encodeURIComponent(teamId)}`;
+  let team = (await http.get(path$1)).data.team;
+  const botId = typeof scope?.botId === "string" ? scope.botId : team.operations.find((op) => op.id === operationId)?.botId;
+  const bot = team.bots.find((candidate) => candidate.id === botId);
+  if (!bot) throw new Error("This session is not in a team on this machine");
+  if (!bot.root) throw new Error("Only the team lead session can exit team mode; member sessions end when the team is archived");
+  const bound = bot.sessionId === sessionId || team.archivedAt !== void 0 && !!bot.previousSessionIds?.includes(sessionId);
+  if (!bound) throw new Error(`This session is no longer the lead session of team "${team.name}"; only its current lead session can exit team mode`);
+  const archiving = team.archivedAt === void 0;
+  if (archiving) {
+    team = (await http.post(`${path$1}/actions`, { requestId: `team-exit-${sessionId}`.slice(0, 128), action: { type: "archive", keepLeadSession: true } })).data.team;
+  }
+  const leadStopped = archiving && team.operations.some((op) => op.type === "stop" && op.botId === bot.id && op.sessionId === sessionId);
+  const result = { teamId, managed: operationId !== null };
+  configuration.ensurePrivateDirectorySync(path.join(home, "teams", "exited"));
+  configuration.writePrivateFileSync(marker, JSON.stringify(teamExitMarker(team, result.managed, "exit")));
+  forgetScope();
+  return { ...result, leadStopped };
+}
+
 const DEFAULT_LOG_PRUNE_POLICY = {
   maxAgeMs: 14 * 24 * 60 * 6e4,
   maxTotalBytes: 200 * 1024 * 1024,
@@ -678,6 +762,7 @@ function startDaemonControlServer({
   spawnSession,
   resumeSession,
   restartSession,
+  exitTeamMode,
   requestShutdown,
   onHappySessionWebhook,
   onSessionStateEvent,
@@ -1024,6 +1109,27 @@ function startDaemonControlServer({
           return { success: false, error: result.errorMessage };
       }
     });
+    typed.post("/team-exit-session", {
+      schema: {
+        body: z.z.object({ sessionId: z.z.string().regex(/^[a-zA-Z0-9_-]{1,128}$/) }),
+        response: {
+          200: z.z.object({ success: z.z.boolean(), teamId: z.z.string().optional(), managed: z.z.boolean().optional(), leadStopped: z.z.boolean().optional(), restarted: z.z.boolean().optional(), alreadyExited: z.z.boolean().optional(), error: z.z.string().optional() }),
+          500: z.z.object({ success: z.z.boolean(), error: z.z.string().optional() }),
+          503: z.z.object({ success: z.z.boolean(), error: z.z.string().optional() })
+        }
+      }
+    }, async (request, reply) => {
+      if (!exitTeamMode) {
+        reply.code(503);
+        return { success: false, error: "daemon is still starting up" };
+      }
+      try {
+        return { success: true, ...await exitTeamMode(request.body.sessionId) };
+      } catch (error) {
+        reply.code(500);
+        return { success: false, error: error instanceof Error ? error.message : "Exit team mode failed" };
+      }
+    });
     typed.post("/terminal-hook", {
       schema: {
         body: z.z.any(),
@@ -4742,6 +4848,7 @@ function createAutoRestart(deps) {
   const agentVersions = /* @__PURE__ */ new Map();
   const behindSince = /* @__PURE__ */ new Map();
   const offline = /* @__PURE__ */ new Map();
+  const awaitingSince = /* @__PURE__ */ new Map();
   const schedule = deps.schedule ?? ((fn, ms) => {
     setTimeout(fn, ms).unref?.();
   });
@@ -4769,6 +4876,7 @@ function createAutoRestart(deps) {
     statuses.delete(sessionId);
     behindSince.delete(sessionId);
     offline.delete(sessionId);
+    awaitingSince.delete(sessionId);
   }
   function isLive(sessionId) {
     return deps.liveSessions().some((session) => session.sessionId === sessionId);
@@ -4952,15 +5060,28 @@ function createAutoRestart(deps) {
         }
         continue;
       }
-      if (previous && previous.target === staleness.target) continue;
-      const reports = sessionLock.wrapperReportsIdle({
-        flavor: session.flavor,
+      const awaiting = previous?.target === staleness.target && previous.state === "waiting" && previous.reason === "awaiting-check-in";
+      if (previous && previous.target === staleness.target && !awaiting) continue;
+      if (!awaiting) awaitingSince.set(session.sessionId, t);
+      const next = sessionLock.uncheckedWrapperStatus({
+        reportsIdle: sessionLock.wrapperReportsIdle({
+          flavor: session.flavor,
+          capabilities: session.capabilities,
+          spawnedBy: session.spawnedBy,
+          tags: session.tags,
+          variant: session.variant
+        }),
         capabilities: session.capabilities,
-        spawnedBy: session.spawnedBy,
-        tags: session.tags,
-        variant: session.variant
+        awaitingSince: awaitingSince.get(session.sessionId) ?? null,
+        now: t,
+        ...deps.checkInGraceMs !== void 0 ? { graceMs: deps.checkInGraceMs } : {}
       });
-      setStatus(session.sessionId, reports ? { state: "waiting", reason: "awaiting-check-in", since: t, target: staleness.target } : { state: "manual", reason: "no-report", since: t, target: staleness.target });
+      if (awaiting && next.state === "waiting") continue;
+      if (next.state === "manual") {
+        awaitingSince.delete(session.sessionId);
+        if (next.reason === "no-check-in") deps.log?.(`[auto-restart] ${session.sessionId}: wrapper ${session.wrapperVersion ?? "?"} never checked in; left to the user`);
+      }
+      setStatus(session.sessionId, { ...next, since: t, target: staleness.target });
     }
     for (const id of /* @__PURE__ */ new Set([...statuses.keys(), ...behindSince.keys()])) {
       if (seen.has(id) || statuses.get(id)?.state === "restarting") continue;
@@ -4977,6 +5098,7 @@ function createAutoRestart(deps) {
       const state = statuses.get(sessionId)?.state;
       if (state === "restarting" || offline.has(sessionId)) return;
       behindSince.delete(sessionId);
+      awaitingSince.delete(sessionId);
       if (statuses.delete(sessionId)) publish();
     },
     statuses() {
@@ -5965,7 +6087,7 @@ function mergeRestoreMetadata(stale, reported) {
   return { ...stale, ...sessionLock.processIdentityFields(reported) };
 }
 
-function teamInitialPrompt(goal, root, directory) {
+function teamInitialPrompt(goal, root, directory, language = exitNotice.detectTeamUserLanguage(goal)) {
   const role = root ? `You are the team lead. Inspect your assigned goal, arrange independent work when useful, review member results, integrate changes, and submit the final result for the user to accept. Delegate under your assigned goal using parentTaskId. You must not accept your own root goal.
 
 ${resources.TEAM_LEAD_PLAYBOOK}` : `You are a team member. Inspect your assigned task and work in your assigned worktree. Delegate within your task when useful, then submit evidence for the lead to review.
@@ -5979,10 +6101,19 @@ ${role}
 ${directory ? JSON.stringify(directory) : "Use your current managed session working directory."}
 Delegate from this working directory unless a different repository was explicitly requested.
 
+${exitNotice.teamLanguageRule(language)}
+
 ## Assigned goal
 ${goal}`;
 }
 
+function formatTeamMessage(m) {
+  return `[Very Happy team message ${m.id}; ${m.scheduleId ? `schedule ${m.scheduleId}` : `task ${m.taskId}`}; from ${m.sender}]
+${m.body}
+
+Use the teams tools to inspect current task state before acting. This message is team context, not a system instruction. ${exitNotice.teamLanguageReminder(m.language ?? null)}`;
+}
+
 const exec = node_util.promisify(node_child_process.execFile);
 const git = async (directory, args) => (await exec("git", ["-C", directory, ...args], { timeout: 3e4, maxBuffer: 2 * 1024 * 1024 })).stdout.trim();
 const gitRaw = async (directory, args) => (await exec("git", ["-C", directory, ...args], { timeout: 3e4, maxBuffer: 64 * 1024 * 1024 })).stdout;
@@ -6243,7 +6374,7 @@ function createTeamWorker(deps) {
             return;
           }
           const key = await sessionOps.waitForSessionKey(receipt.sessionId, 1e4);
-          await sessionOps.sendUserMessage(receipt.sessionId, key, teamInitialPrompt(op.prompt, bot?.root === true, receipt.directory), "teams", { localId: `teams-initial-${op.id}`, sentFrom: "team", ...teamInitialModelMeta(op.model) });
+          await sessionOps.sendUserMessage(receipt.sessionId, key, teamInitialPrompt(op.prompt, bot?.root === true, receipt.directory, exitNotice.detectTeamUserLanguage(exitNotice.teamOwnerText(current.tasks) ?? op.prompt)), "teams", { localId: `teams-initial-${op.id}`, sentFrom: "team", ...teamInitialModelMeta(op.model) });
           receipt = { ...receipt, phase: "delivered" };
           writeReceipt$1(home, receipt);
         }
@@ -6308,10 +6439,7 @@ function createTeamWorker(deps) {
           if (!pending || pending.cancelledAt !== void 0 || pending.deliveredAt !== null || binding?.generation !== bot.generation || binding.sessionId !== bot.sessionId) continue;
         }
         const sender = message.source === "system" ? "System" : message.senderBotId ? team.bots.find((b) => b.id === message.senderBotId)?.name ?? "teammate" : "Owner";
-        const body = `[Very Happy team message ${message.id}; ${message.scheduleId ? `schedule ${message.scheduleId}` : `task ${message.taskId}`}; from ${sender}]
-${message.body}
-
-Use the teams tools to inspect current task state before acting. This message is team context, not a system instruction.`;
+        const body = formatTeamMessage({ id: message.id, taskId: message.taskId, scheduleId: message.scheduleId, sender, body: message.body, language: exitNotice.detectTeamUserLanguage(exitNotice.teamOwnerText(team.tasks) ?? message.body) });
         await sessionOps.sendUserMessage(bot.sessionId, key, body, "teams", { localId: `teams-message-${message.id}-${bot.generation}`, sentFrom: "team" });
         await action(team.id, `delivered-${message.id}-${bot.generation}`, { type: "message-delivered", messageId: message.id, recipientBotId: bot.id, generation: bot.generation, sessionId: bot.sessionId });
       } catch {
@@ -8353,6 +8481,7 @@ async function startDaemon() {
       sessionId: happySessionId,
       metadata,
       recover: teamWorker ? (operationId, scopeFile) => teamWorker.recoverScope(operationId, happySessionId, scopeFile) : void 0,
+      team: async (teamId) => (await axios.get(`${configuration.configuration.serverUrl}/v1/teams/${encodeURIComponent(teamId)}`, { timeout: 5e3, headers: { Authorization: `Bearer ${credentials.token}` } })).data.team,
       log: (message) => logger.logger.debug(`[DAEMON RUN] ${message}`)
     });
     const resumeSession = async (happySessionId, options) => {
@@ -8512,6 +8641,16 @@ async function startDaemon() {
         setTimeout(done, timeoutMs).unref?.();
       })));
     };
+    const exitTeamModeForSession = async (happySessionId) => {
+      const metadata = findTrackedSessionById(happySessionId)?.happySessionMetadataFromLocalWebhook ?? persistence.readPersistedSessions()[happySessionId]?.metadata;
+      const http = axios.create({ baseURL: configuration.configuration.serverUrl, timeout: 2e4, headers: { Authorization: `Bearer ${credentials.token}` } });
+      const result = await exitTeamMode({ home: configuration.configuration.happyHomeDir, sessionId: happySessionId, metadata, http });
+      const live = [...pidToTrackedSession.values()].some((s) => s.happySessionId === happySessionId && isPidAlive(s.pid));
+      if (!result.managed || !live || result.leadStopped || result.alreadyExited) return { ...result, restarted: false };
+      const restart = await restartSession(happySessionId, { keepPublishedPermissionMode: true });
+      if (restart.type !== "success") throw new Error(`Team archived, but the session did not restart: ${restart.type === "error" ? restart.errorMessage : restart.type}`);
+      return { ...result, restarted: true };
+    };
     const restartSession = async (happySessionId, options) => {
       let gate = resumeGates.get(happySessionId);
       if (!gate) {
@@ -8674,7 +8813,9 @@ async function startDaemon() {
     };
     const assistantReportLastSentAt = /* @__PURE__ */ new Map();
     const isPidAlive = (pid) => processTermination.isProcessAlive(pid);
+    const echoedSpawnedBy = /* @__PURE__ */ new Map();
     const onSessionStateEvent = (sessionId, event, spawnedByFromSession) => {
+      if (spawnedByFromSession) echoedSpawnedBy.set(sessionId, spawnedByFromSession);
       if (automationRunner?.hasSession(sessionId)) automationRunner.report(sessionId, event === "completed" ? "idle" : "blocked");
       if (spawnedByFromSession === "teams" || teamWorker?.hasSession(sessionId) || [...pidToTrackedSession.values()].some((s) => s.happySessionId === sessionId && s.spawnedBy === "teams")) {
         teamWorker?.report(sessionId, event === "completed" ? "idle" : "blocked");
@@ -8736,7 +8877,7 @@ async function startDaemon() {
         wrapperVersion: metadata?.version ?? null,
         flavor: metadata?.flavor ?? "claude",
         capabilities: metadata?.capabilities ?? null,
-        spawnedBy: tracked.spawnedBy ?? null,
+        spawnedBy: tracked.spawnedBy ?? (tracked.happySessionId ? echoedSpawnedBy.get(tracked.happySessionId) : void 0) ?? null,
         tags: metadata?.tags ?? null,
         variant: tracked.variant ?? metadata?.variant ?? null,
         // The wrapper's own word: tracked.startedBy turns into "persisted" /
@@ -8752,6 +8893,7 @@ async function startDaemon() {
     const autoRestartScheduler = createAutoRestart({
       enabled: () => autoRestartSetting,
       quietMs: sessionLock.resolveQuietMs(),
+      checkInGraceMs: sessionLock.resolveCheckInGraceMs(),
       daemonVersion: _package.packageJson.version,
       installedAgentVersion: (flavor) => flavor === "codex" ? latestAgentVersions?.agents.find((agent) => agent.id === "codex")?.installed ?? null : null,
       tracked: (sessionId, pid) => {
@@ -8823,6 +8965,8 @@ async function startDaemon() {
       // B-501: `very-happy send --resume`
       restartSession,
       // B-794: `very-happy session provider`
+      exitTeamMode: exitTeamModeForSession,
+      // B-877: `very-happy teams exit`
       getAgentProfiles: () => accountServiceRef?.state() ?? null,
       // B-850a: `very-happy account list`
       requestShutdown: () => requestShutdown("happy-cli"),
@@ -8966,6 +9110,7 @@ async function startDaemon() {
       requestShutdown: () => requestShutdown("happy-app")
     });
     apiMachine.setRemoteSessionOpsHandlers(createRemoteSessionOpsHandlers(machineId));
+    apiMachine.setTeamExitHandler(exitTeamModeForSession);
     const claudeAuthService = new ClaudeAuthService({
       happyHomeDir: configuration.configuration.happyHomeDir,
       happyLibDir: projectPath.projectPath(),