very-happy-cli 0.2.150 → 0.2.151

package/dist/{index-CpNYvMTJ.mjs → index-CIyjJy8D.mjs}

@@ -1,14 +1,14 @@
 import{createRequire as _pkgrollCR}from"node:module";const require=_pkgrollCR(import.meta.url);import chalk from 'chalk';
 import os, { homedir, userInfo, tmpdir } from 'node:os';
 import { randomUUID, randomInt, randomBytes, createHash as createHash$1, timingSafeEqual } from 'node:crypto';
-import { v as notifyDaemonSessionEvent, w as getProjectPath, o as BUILTIN_TODO_DISCOVERY, x as initializeSandbox, y as wrapCommand, t as contentLogMetadata, I as InvalidateSync, R as RawJSONLinesSchema, u as delay, z as AsyncLock, S as STREAM_DELTA_MAX_CHARS, M as MAX_CHAT_ATTACHMENT_SOURCE_BYTES, C as notifyDaemonClaudeAuthFailed, D as commandOnPath, c as checkIfDaemonRunningAndCleanupStaleState, E as deriveLocalCliUpdateSummary, F as AGENT_VERSION_SOURCES, G as isClaudeSessionId, H as getLocalHappyAgentCredentialPath, J as readLocalHappyAgentCredentials, K as parseExactVersion, L as compareExactVersions, N as extractCompleteLines, O as decideBackfill, P as parseTerminalHookPayload, Q as tmuxArgs, T as scrubTmuxClientEnv, U as decideMirrorBinding, V as MIRROR_BACKFILL_LINES_DEFAULT, W as mirrorLineKey, X as mirrorLocalId, Y as listDaemonSessions, Z as stopDaemonSession, _ as detectCLIAvailability, $ as detectResumeSupport, a0 as refreshAgentHomes, d as describeAgentHome, a1 as isDaemonRunningCurrentlyInstalledHappyVersion, a2 as stopDaemon, a3 as TurnActivityTracker, a4 as summarizeSpawnSessionForLog, a5 as locateClaudeConversation, a6 as agentHomeSpawnEnv, a7 as shellescape, A as ApiClient, a8 as fetchCliUpdateState, a9 as resolveCliUpdateCheckInterval, aa as DEFAULT_CLI_UPDATE_CHECK_INTERVAL_MS, ab as cleanupDaemonState, i as isValidSessionId, s as spawnDaemonSession, ac as listVhTerminals, ad as isValidTerminalId, ae as readVhTerminal, af as sendToVhTerminal, ag as ContextUsageSchema, ah as TITLE_PROMPT_PREFIX, ai as BOARD_ANALYZER_PROMPT_PREFIX, m as connectionState, aj as startOfflineReconnection, n as notifyDaemonSessionStarted, g as createEnvelope, ak as CodexAppServerClient } from './types-BD542hb1.mjs';
-import { l as logger, F as ensurePrivateDirectory, G as hardenPrivateFile, c as configuration, p as packageJson, r as readSettings, H as readCredentials, x as credentialRelayProblem, o as readDaemonState, g as encodeBase64, I as readSettingsOutcome, u as updateSettings, J as encodeBase64Url, m as decodeBase64, K as writeCredentialsLegacy, L as writeCredentialsDataKey, e as readCredentialsForConfiguredRelay, j as encrypt, d as readPersistedSessions, w as writePrivateFileSync, M as decryptWithDataKey, N as decryptLegacy, O as persistSession, k as decrypt, h as ensurePrivateDirectorySync, P as acquireDaemonLock, Q as deletePersistedSessions, R as writeDaemonState, S as writeSettings, T as releaseDaemonLock, C as CLIPBOARD_TOOL_NAME, a as CLIPBOARD_TOOL_TITLE, b as CLIPBOARD_TOOL_DESCRIPTION, f as CLIPBOARD_MAX_BYTES, U as clearCredentials, V as clearMachineId, W as SandboxConfigSchema, X as getLatestDaemonLog } from './limits-FThmm7WR.mjs';
+import { H as notifyDaemonSessionEvent, q as getProjectPath, z as BUILTIN_TODO_DISCOVERY, I as initializeSandbox, J as wrapCommand, E as contentLogMetadata, K as InvalidateSync, R as RawJSONLinesSchema, G as delay, L as AsyncLock, S as STREAM_DELTA_MAX_CHARS, M as MAX_CHAT_ATTACHMENT_SOURCE_BYTES, N as notifyDaemonClaudeAuthFailed, O as commandOnPath, u as checkIfDaemonRunningAndCleanupStaleState, P as deriveLocalCliUpdateSummary, Q as AGENT_VERSION_SOURCES, T as isClaudeSessionId, U as getLocalHappyAgentCredentialPath, V as readLocalHappyAgentCredentials, W as parseExactVersion, X as compareExactVersions, Y as extractCompleteLines, Z as decideBackfill, _ as parseTerminalHookPayload, $ as tmuxArgs, a0 as scrubTmuxClientEnv, a1 as decideMirrorBinding, a2 as MIRROR_BACKFILL_LINES_DEFAULT, a3 as mirrorLineKey, a4 as mirrorLocalId, a5 as listDaemonSessions, w as stopDaemonSession, a6 as detectCLIAvailability, a7 as detectResumeSupport, a8 as refreshAgentHomes, d as describeAgentHome, a9 as isDaemonRunningCurrentlyInstalledHappyVersion, aa as stopDaemon, ab as TurnActivityTracker, ac as summarizeSpawnSessionForLog, ad as locateClaudeConversation, ae as agentHomeSpawnEnv, af as shellescape, A as ApiClient, ag as fetchCliUpdateState, ah as resolveCliUpdateCheckInterval, ai as DEFAULT_CLI_UPDATE_CHECK_INTERVAL_MS, aj as cleanupDaemonState, i as isValidSessionId, v as spawnDaemonSession, ak as listVhTerminals, al as isValidTerminalId, am as readVhTerminal, an as sendToVhTerminal, ao as ContextUsageSchema, ap as TITLE_PROMPT_PREFIX, aq as BOARD_ANALYZER_PROMPT_PREFIX, x as connectionState, ar as startOfflineReconnection, y as notifyDaemonSessionStarted, c as createEnvelope, C as CodexAppServerClient } from './types-BN3eiipi.mjs';
+import { l as logger, F as ensurePrivateDirectory, G as hardenPrivateFile, c as configuration, p as packageJson, r as readSettings, H as readCredentials, x as credentialRelayProblem, o as readDaemonState, g as encodeBase64, I as readSettingsOutcome, u as updateSettings, J as encodeBase64Url, m as decodeBase64, K as writeCredentialsLegacy, L as writeCredentialsDataKey, e as readCredentialsForConfiguredRelay, j as encrypt, d as readPersistedSessions, w as writePrivateFileSync, M as decryptWithDataKey, N as decryptLegacy, O as persistSession, k as decrypt, h as ensurePrivateDirectorySync, P as acquireDaemonLock, Q as deletePersistedSessions, R as writeDaemonState, S as writeSettings, T as releaseDaemonLock, C as CLIPBOARD_TOOL_NAME, a as CLIPBOARD_TOOL_TITLE, b as CLIPBOARD_TOOL_DESCRIPTION, f as CLIPBOARD_MAX_BYTES, U as clearCredentials, V as clearMachineId, W as SandboxConfigSchema, X as getLatestDaemonLog } from './limits-DS-bnYYp.mjs';
 import spawn$1, { spawn } from 'cross-spawn';
 import path, { join, resolve, basename, delimiter, isAbsolute, dirname, sep, normalize } from 'node:path';
 import { createInterface } from 'node:readline';
 import { existsSync, readFileSync, readdirSync, statSync, mkdirSync, realpathSync, unlinkSync, renameSync, writeFileSync, accessSync, constants as constants$1, openSync, fsyncSync, closeSync, rmSync as rmSync$1, chmodSync as chmodSync$1 } from 'node:fs';
 import { p as projectPath } from './projectPath-CSpqWdxp.mjs';
-import { f as trimIdent, A as AGENT_GUIDANCE, t as teamScopePath, T as TeamConnectionPreflightError, e as createTeamsClient, P as PREVIEW_TOOL_NAME, R as REPORT_PROGRESS_TOOL_NAME, g as TEAM_TOOL_NAMES, r as registerTeamsTools, a as PREVIEW_TOOL_TITLE, b as PREVIEW_TOOL_DESCRIPTION, h as REPORT_PROGRESS_TOOL_TITLE, i as REPORT_PROGRESS_TOOL_DESCRIPTION } from './agentGuidance-DrfhtVP1.mjs';
+import { f as trimIdent, A as AGENT_GUIDANCE, t as teamScopePath, T as TeamConnectionPreflightError, e as createTeamsClient, P as PREVIEW_TOOL_NAME, R as REPORT_PROGRESS_TOOL_NAME, g as TEAM_TOOL_NAMES, r as registerTeamsTools, a as PREVIEW_TOOL_TITLE, b as PREVIEW_TOOL_DESCRIPTION, h as REPORT_PROGRESS_TOOL_TITLE, i as REPORT_PROGRESS_TOOL_DESCRIPTION } from './agentGuidance-Dvo3cZMW.mjs';
 import { readFile, writeFile, rename, unlink, mkdir, access as access$1, symlink, rm, readlink, lstat, constants, stat, open as open$1, appendFile } from 'node:fs/promises';
 import fs, { watch, access } from 'fs/promises';
 import { useStdout, useInput, Box, Text, render } from 'ink';
@@ -456,17 +456,23 @@ function readClaudeSettings() {
 }
 function shouldIncludeCoAuthoredBy() {
   const settings = readClaudeSettings();
-  if (!settings || settings.includeCoAuthoredBy === void 0) {
+  if (!settings) {
+    return true;
+  }
+  if (settings.attribution?.commit === "") {
+    return false;
+  }
+  if (settings.includeCoAuthoredBy === void 0) {
     return true;
   }
   return settings.includeCoAuthoredBy;
 }
 
 const BASE_SYSTEM_PROMPT = (() => trimIdent(`
-    ALWAYS when you start a new chat - you must call a tool "mcp__happy__change_title" to set a chat title. When you think chat title is not relevant anymore - call the tool again to change it. When chat name is too generic and you have a change to make it more specific - call the tool again to change it. This title is needed to easily find the chat in the future. Help human.
+    This chat is titled automatically from the user's first message. Call "mcp__happy__change_title" only when the topic has clearly moved on or the current title is too generic to find this chat later. Do not call it as a ritual at the start of a chat, and not for a quick question you can just answer.
 `))() + "\n\n" + AGENT_GUIDANCE + "\n\n" + BUILTIN_TODO_DISCOVERY;
 const CO_AUTHORED_CREDITS = (() => trimIdent(`
-    When making commit messages, instead of just giving co-credit to Claude, also give credit to Happy like so:
+    When you yourself create a git commit, instead of just giving co-credit to Claude, also give credit to Happy like so:
 
     <main commit message>
 
@@ -474,6 +480,8 @@ const CO_AUTHORED_CREDITS = (() => trimIdent(`
     via [Very Happy](https://github.com/Mereithhh/very-happy)
 
     Co-Authored-By: Claude <noreply@anthropic.com>
+
+    Do not add these lines to commit message text you only draft for the user.
 `))();
 const systemPrompt = (() => {
   const includeCoAuthored = shouldIncludeCoAuthoredBy();
@@ -870,7 +878,7 @@ async function createSessionScanner(opts) {
   let processedMessageKeys = /* @__PURE__ */ new Set();
   let deadSessions = /* @__PURE__ */ new Set();
   if (opts.sessionId) {
-    let messages = await readSessionLog(projectDir, opts.sessionId);
+    let messages = await readSessionLog$1(projectDir, opts.sessionId);
     logger.debug(`[SESSION_SCANNER] Marking ${messages.length} existing messages as processed from session ${opts.sessionId}`);
     for (let m of messages) {
       processedMessageKeys.add(messageKey(m));
@@ -893,7 +901,7 @@ async function createSessionScanner(opts) {
       }
     }
     for (let session of sessions) {
-      const sessionMessages = await readSessionLog(projectDir, session);
+      const sessionMessages = await readSessionLog$1(projectDir, session);
       let skipped = 0;
       let sent = 0;
       for (let file of sessionMessages) {
@@ -970,7 +978,7 @@ async function createSessionScanner(opts) {
         return;
       }
       if (options?.treatExistingAsProcessed) {
-        const existing = await readSessionLog(projectDir, sessionId);
+        const existing = await readSessionLog$1(projectDir, sessionId);
         logger.debug(`[SESSION_SCANNER] Pre-marking ${existing.length} existing messages as processed for new session ${sessionId}`);
         for (const m of existing) {
           processedMessageKeys.add(messageKey(m));
@@ -998,7 +1006,7 @@ function messageKey(message) {
     throw Error();
   }
 }
-async function readSessionLog(projectDir, sessionId) {
+async function readSessionLog$1(projectDir, sessionId) {
   const expectedSessionFile = join(projectDir, `${sessionId}.jsonl`);
   logger.debug(`[SESSION_SCANNER] Reading session file: ${expectedSessionFile}`);
   let file;
@@ -5372,8 +5380,8 @@ ${typeLabels[type] || type}:`));
   }
   console.log(chalk.gray("  An external claude command is only needed for native terminal/mirror use."));
   try {
-    const { resolveAgentHomesForCli } = await import('./agentHome-Dm-Wjs38.mjs');
-    const { describeAgentHome } = await import('./types-BD542hb1.mjs').then(function (n) { return n.al; });
+    const { resolveAgentHomesForCli } = await import('./agentHome-CeFDNzvq.mjs');
+    const { describeAgentHome } = await import('./types-BN3eiipi.mjs').then(function (n) { return n.as; });
     const homes = await resolveAgentHomesForCli();
     console.log(chalk.green(`\u2713 Claude config dir: ${describeAgentHome(homes.claudeConfigDir)}`));
     console.log(chalk.green(`\u2713 Codex home: ${describeAgentHome(homes.codexHome)}`));
@@ -6084,7 +6092,9 @@ async function sendUserMessage(sessionId, persisted, text, client, options = {})
     },
     meta: {
       sentFrom: options.sentFrom ?? "cli",
-      ...options.model ? { model: options.model } : {}
+      ...options.model !== void 0 ? { model: options.model } : {},
+      ...options.permissionMode !== void 0 ? { permissionMode: options.permissionMode } : {},
+      ...options.effort !== void 0 ? { effort: options.effort } : {}
     }
   };
   const encrypted = encodeBase64(encrypt(
@@ -6395,13 +6405,22 @@ function startDaemonControlServer({
           permissionMode: z.string().optional(),
           // B-069: spawn-origin tag ('assistant' = session_spawn). Recorded on
           // the TrackedSession; old clients never send it.
-          spawnedBy: z.string().optional()
+          spawnedBy: z.string().optional(),
+          // B-492: `very-happy spawn --fork` — same fields the web's fork flow
+          // 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()
         }),
         response: {
           200: z.object({
             success: z.boolean(),
             sessionId: z.string().optional(),
-            approvedNewDirectoryCreation: z.boolean().optional()
+            approvedNewDirectoryCreation: z.boolean().optional(),
+            // B-492: true when resumeClaudeSessionId / resumeCodexThreadId was
+            // honoured. A caller that asked for a fork and does not get this
+            // back is talking to an older daemon that spawned a fresh session.
+            resumed: z.boolean().optional()
           }),
           409: z.object({
             success: z.boolean(),
@@ -6416,13 +6435,14 @@ function startDaemonControlServer({
         }
       }
     }, async (request, reply) => {
-      const { directory, sessionId, agent, environmentVariables, variant, forceNew, permissionMode, spawnedBy } = request.body;
+      const { directory, sessionId, agent, environmentVariables, variant, forceNew, permissionMode, spawnedBy, resumeClaudeSessionId, resumeCodexThreadId, parentSessionId } = 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 });
+      const result = await spawnSession({ directory, sessionId, agent, environmentVariables, variant, forceNew, permissionMode, spawnedBy, resumeClaudeSessionId, resumeCodexThreadId, parentSessionId });
+      const resumed = Boolean(resumeClaudeSessionId || resumeCodexThreadId);
       switch (result.type) {
         case "success":
           if (!result.sessionId) {
@@ -6435,7 +6455,8 @@ function startDaemonControlServer({
           return {
             success: true,
             sessionId: result.sessionId,
-            approvedNewDirectoryCreation: true
+            approvedNewDirectoryCreation: true,
+            ...resumed ? { resumed: true } : {}
           };
         case "requestToApproveDirectoryCreation":
           reply.code(409);
@@ -9367,6 +9388,8 @@ ${goal}`;
 
 const MAX_LINE_CHARS = 500;
 const MAX_ARGS_CHARS = 160;
+const DEFAULT_LIMITS = { line: MAX_LINE_CHARS, args: MAX_ARGS_CHARS };
+const NO_LIMITS = { line: Number.POSITIVE_INFINITY, args: Number.POSITIVE_INFINITY };
 function truncateText(text, max = MAX_LINE_CHARS) {
   const chars = Array.from(text);
   if (chars.length <= max) return text;
@@ -9382,12 +9405,12 @@ function safeJson(value, max) {
     return "[unserializable]";
   }
 }
-function formatMessageBody(body) {
+function formatMessageBody(body, limits = DEFAULT_LIMITS) {
   if (!body || typeof body !== "object") return null;
   const b = body;
   if (b.role === "user" && b.content?.type === "text" && typeof b.content.text === "string") {
     const text = squash(b.content.text);
-    return text.length > 0 ? `user: ${truncateText(text)}` : null;
+    return text.length > 0 ? `user: ${truncateText(text, limits.line)}` : null;
   }
   if (b.role === "session" && b.content && typeof b.content === "object") {
     const env = b.content;
@@ -9399,18 +9422,18 @@ function formatMessageBody(body) {
         const text = squash(String(ev.text ?? ""));
         if (text.length === 0) return null;
         const role = env.role === "user" ? "user" : "assistant";
-        return `${role}: ${truncateText(text)}`;
+        return `${role}: ${truncateText(text, limits.line)}`;
       }
       case "tool-call-start": {
         const name = String(ev.name ?? "tool");
         const title = squash(String(ev.title ?? ""));
-        const args = ev.args ? safeJson(ev.args, MAX_ARGS_CHARS) : "";
+        const args = ev.args ? safeJson(ev.args, limits.args) : "";
         const detail = title || args;
-        return `[tool] ${name}${detail ? `: ${truncateText(detail, MAX_ARGS_CHARS)}` : ""}`;
+        return `[tool] ${name}${detail ? `: ${truncateText(detail, limits.args)}` : ""}`;
       }
       case "service": {
         const text = squash(String(ev.text ?? ""));
-        return text.length > 0 ? `[service] ${truncateText(text, MAX_ARGS_CHARS)}` : null;
+        return text.length > 0 ? `[service] ${truncateText(text, limits.args)}` : null;
       }
       case "turn-end": {
         if (ev.status && ev.status !== "completed") return `[turn ${ev.status}]`;
@@ -9425,12 +9448,12 @@ function formatMessageBody(body) {
     switch (d.type) {
       case "message": {
         const text = squash(String(d.message ?? ""));
-        return text.length > 0 ? `assistant: ${truncateText(text)}` : null;
+        return text.length > 0 ? `assistant: ${truncateText(text, limits.line)}` : null;
       }
       case "tool-call":
-        return `[tool] ${String(d.name ?? "tool")}: ${safeJson(d.input, MAX_ARGS_CHARS)}`;
+        return `[tool] ${String(d.name ?? "tool")}: ${safeJson(d.input, limits.args)}`;
       case "permission-request":
-        return `[permission] ${String(d.toolName ?? "")}: ${truncateText(squash(String(d.description ?? "")), MAX_ARGS_CHARS)}`;
+        return `[permission] ${String(d.toolName ?? "")}: ${truncateText(squash(String(d.description ?? "")), limits.args)}`;
       default:
         return null;
     }
@@ -9441,22 +9464,111 @@ function formatMessageBody(body) {
       const texts = msg.content.filter((c) => c?.type === "text" && typeof c.text === "string").map((c) => squash(c.text)).filter((t) => t.length > 0);
       if (texts.length > 0) {
         const role = msg.role === "user" ? "user" : "assistant";
-        return `${role}: ${truncateText(texts.join(" "))}`;
+        return `${role}: ${truncateText(texts.join(" "), limits.line)}`;
       }
     }
     return null;
   }
   return null;
 }
-function formatTranscript(bodies) {
+function formatTranscript(bodies, options = {}) {
+  const limits = options.full ? NO_LIMITS : DEFAULT_LIMITS;
   const lines = [];
   for (const body of bodies) {
-    const line = formatMessageBody(body);
+    const line = formatMessageBody(body, limits);
     if (line !== null) lines.push(line);
   }
   return lines.join("\n");
 }
 
+function asRecord(value) {
+  return value && typeof value === "object" ? value : null;
+}
+function sessionEnvelope(body) {
+  const b = asRecord(body);
+  if (!b || b.role !== "session") return null;
+  const env = asRecord(b.content);
+  if (!env) return null;
+  const ev = asRecord(env.ev);
+  return ev && typeof ev.t === "string" ? { role: env.role, ev } : null;
+}
+function isUserPrompt(body) {
+  const b = asRecord(body);
+  return !!b && b.role === "user" && b.content?.type === "text" && typeof b.content.text === "string";
+}
+function agentPiece(body) {
+  const env = sessionEnvelope(body);
+  if (env && env.role !== "user") {
+    if (env.ev.t === "text" && !env.ev.thinking) {
+      const text = String(env.ev.text ?? "");
+      return text.trim().length > 0 ? { kind: "text", text } : null;
+    }
+    if (env.ev.t === "tool-call-start") return { kind: "tool" };
+    return null;
+  }
+  const b = asRecord(body);
+  if (b?.role === "agent" && b.content?.type === "acp") {
+    const d = asRecord(b.content.data);
+    if (d?.type === "message") {
+      const text = String(d.message ?? "");
+      return text.trim().length > 0 ? { kind: "text", text } : null;
+    }
+    if (d?.type === "tool-call") return { kind: "tool" };
+  }
+  return null;
+}
+function analyzeLatestTurn(entries) {
+  const lastSeq = entries.length > 0 ? entries[entries.length - 1].seq : 0;
+  let userIndex = -1;
+  for (let i = entries.length - 1; i >= 0; i--) {
+    if (isUserPrompt(entries[i].body)) {
+      userIndex = i;
+      break;
+    }
+  }
+  let ended = false;
+  let status = null;
+  let error = null;
+  let texts = [];
+  let lastMarker = null;
+  let startedAfterPrompt = false;
+  const emitsStarts = entries.some((entry) => sessionEnvelope(entry.body)?.ev?.t === "turn-start");
+  for (let i = userIndex + 1; i < entries.length; i++) {
+    const body = entries[i].body;
+    const env = sessionEnvelope(body);
+    if (env?.ev?.t === "turn-start") {
+      lastMarker = "start";
+      startedAfterPrompt = true;
+      ended = false;
+      status = null;
+      error = null;
+      texts = [];
+      continue;
+    }
+    if (env?.ev?.t === "turn-end") {
+      lastMarker = "end";
+      if (userIndex >= 0 && emitsStarts && !startedAfterPrompt) continue;
+      ended = true;
+      status = typeof env.ev.status === "string" ? env.ev.status : null;
+      error = typeof env.ev.error === "string" ? env.ev.error : null;
+      continue;
+    }
+    const piece = agentPiece(body);
+    if (!piece) continue;
+    if (piece.kind === "tool") texts = [];
+    else texts.push(piece.text);
+  }
+  if (userIndex < 0) ended = lastMarker === "end";
+  return {
+    userSeq: userIndex >= 0 ? entries[userIndex].seq : null,
+    ended,
+    status: ended ? status : null,
+    error: ended ? error : null,
+    answer: texts.join("\n\n").trim(),
+    lastSeq
+  };
+}
+
 const USER_SOCKET_CONNECT_TIMEOUT_MS = 15e3;
 async function openUserScopedSocket(token, options = {}) {
   const socket = io(configuration.serverUrl, {
@@ -9802,19 +9914,21 @@ async function bearerToken() {
   if (!credentials) throw new Error("CLI is not authenticated (no ~/.happy/access.key)");
   return credentials.token;
 }
-async function readSessionTranscript(sessionId, limit) {
+function requirePersisted(sessionId) {
   const persisted = readPersistedSessions()[sessionId];
   if (!persisted) {
     throw new Error(
       `No local key for session ${sessionId} \u2014 it was not spawned by this machine's daemon (or is older than 14 days).`
     );
   }
-  const bounded = Math.max(1, Math.min(MAX_READ_LIMIT, Math.floor(limit)));
+  return persisted;
+}
+async function readSessionLog(sessionId, persisted, limit) {
   const token = await bearerToken();
   const response = await axios.get(
     `${configuration.serverUrl}/v3/sessions/${encodeURIComponent(sessionId)}/messages`,
     {
-      params: { before_seq: 2147483647, limit: bounded },
+      params: { before_seq: 2147483647, limit },
       headers: {
         "Authorization": `Bearer ${token}`,
         "X-Happy-Client": `${SESSION_OPS_CLIENT}/${configuration.currentCliVersion}`
@@ -9825,21 +9939,62 @@ async function readSessionTranscript(sessionId, limit) {
   const messages = Array.isArray(response.data?.messages) ? response.data.messages : [];
   messages.reverse();
   const key = decodeBase64(persisted.encryptionKey);
-  const live = await listDaemonSessions();
-  const bodies = messages.map((message) => {
-    if (message.content?.t !== "encrypted") return null;
+  return messages.map((message) => {
+    if (message.content?.t !== "encrypted") return { seq: message.seq, body: null };
     try {
-      return decrypt(key, persisted.encryptionVariant, decodeBase64(message.content.c));
+      return { seq: message.seq, body: decrypt(key, persisted.encryptionVariant, decodeBase64(message.content.c)) };
     } catch {
-      return null;
+      return { seq: message.seq, body: null };
     }
   });
+}
+const TURN_WINDOW = 500;
+async function readSessionTranscript(sessionId, limit, options = {}) {
+  const persisted = requirePersisted(sessionId);
+  const bounded = Math.max(1, Math.min(MAX_READ_LIMIT, Math.floor(limit)));
+  const entries = await readSessionLog(sessionId, persisted, Math.max(bounded, TURN_WINDOW));
+  const shown = entries.slice(-bounded);
+  const live = await listDaemonSessions();
   return {
     summary: toSummary(sessionId, persisted, sessionLiveness(live, sessionId)),
-    messageCount: messages.length,
-    transcript: formatTranscript(bodies)
+    messageCount: shown.length,
+    transcript: formatTranscript(shown.map((entry) => entry.body), { full: options.full }),
+    turn: analyzeLatestTurn(entries)
   };
 }
+async function readSessionMetadata(sessionId, persisted) {
+  const token = await bearerToken();
+  const response = await axios.get(`${configuration.serverUrl}/v1/sessions/${encodeURIComponent(sessionId)}`, {
+    headers: {
+      "Authorization": `Bearer ${token}`,
+      "X-Happy-Client": `${SESSION_OPS_CLIENT}/${configuration.currentCliVersion}`
+    },
+    timeout: 15e3
+  });
+  const ciphertext = response.data?.session?.metadata;
+  if (typeof ciphertext !== "string" || ciphertext.length === 0) return null;
+  return decrypt(decodeBase64(persisted.encryptionKey), persisted.encryptionVariant, decodeBase64(ciphertext));
+}
+class TurnWaitTimeoutError extends Error {
+  constructor(sessionId, timeoutMs, turn) {
+    super(`Session ${sessionId}: the latest turn did not end within ${Math.round(timeoutMs / 1e3)}s`);
+    this.sessionId = sessionId;
+    this.timeoutMs = timeoutMs;
+    this.turn = turn;
+  }
+}
+async function waitForTurnEnd(sessionId, options) {
+  const persisted = requirePersisted(sessionId);
+  const pollMs = options.pollMs ?? 3e3;
+  const sleep = options.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
+  const deadline = Date.now() + options.timeoutMs;
+  while (true) {
+    const turn = analyzeLatestTurn(await readSessionLog(sessionId, persisted, TURN_WINDOW));
+    if (turn.ended) return turn;
+    if (Date.now() + pollMs > deadline) throw new TurnWaitTimeoutError(sessionId, options.timeoutMs, turn);
+    await sleep(pollMs);
+  }
+}
 async function stopSession(sessionId) {
   return await stopDaemonSession(sessionId);
 }
@@ -12577,7 +12732,7 @@ function registerSideQuestionHandler(rpc, deps) {
   const retainMs = deps.retainMs ?? SIDE_QUESTION_RETAIN_MS;
   const maxRunMs = deps.maxRunMs ?? SIDE_QUESTION_MAX_RUN_MS;
   const fork = deps.run ?? (async (input) => {
-    const { query } = await import('./index-BsYH1sjV.mjs');
+    const { query } = await import('./index-DYQgcgL2.mjs');
     return runSideQuestion(query, input);
   });
   const run = async (input, live) => {
@@ -17865,7 +18020,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "install-terminal-hooks") {
     try {
-      const { installTerminalHooks, parseTerminalHooksArgs, TERMINAL_HOOKS_HELP } = await import('./installTerminalHooks-BF_tmw9V.mjs');
+      const { installTerminalHooks, parseTerminalHooksArgs, TERMINAL_HOOKS_HELP } = await import('./installTerminalHooks-Ch_yTtEA.mjs');
       const command = parseTerminalHooksArgs(args.slice(1));
       if (command.action === "help") {
         console.log(TERMINAL_HOOKS_HELP);
@@ -17882,7 +18037,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     }
   } else if (subcommand === "agent-home") {
     try {
-      const { parseAgentHomeArgs, runAgentHomeCommand } = await import('./agentHome-Dm-Wjs38.mjs');
+      const { parseAgentHomeArgs, runAgentHomeCommand } = await import('./agentHome-CeFDNzvq.mjs');
       await runAgentHomeCommand(parseAgentHomeArgs(args.slice(1)));
       process.exit(0);
     } catch (error) {
@@ -17891,7 +18046,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     }
   } else if (subcommand === "spawn") {
     try {
-      const { handleSpawnCommand } = await import('./spawn-DQuOmUP7.mjs');
+      const { handleSpawnCommand } = await import('./spawn-DxHIIqhi.mjs');
       await handleSpawnCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -17903,7 +18058,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "sessions") {
     try {
-      const { handleSessionsCommand } = await import('./sessions-DoULfKui.mjs');
+      const { handleSessionsCommand } = await import('./sessions-DlU3foY_.mjs');
       await handleSessionsCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -17915,7 +18070,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "send") {
     try {
-      const { handleSendCommand } = await import('./send-Dv0km8UI.mjs');
+      const { handleSendCommand } = await import('./send-o6WM-1G8.mjs');
       await handleSendCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -18021,9 +18176,9 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     if (geminiSubcommand === "project" && args[2] === "set" && args[3]) {
       const projectId = args[3];
       try {
-        const { saveGoogleCloudProjectToConfig } = await import('./config-Dhu6LU0h.mjs');
-        const { readCredentialsForConfiguredRelay: readCredentialsForConfiguredRelay2 } = await import('./limits-FThmm7WR.mjs').then(function (n) { return n.Y; });
-        const { ApiClient: ApiClient2 } = await import('./types-BD542hb1.mjs').then(function (n) { return n.am; });
+        const { saveGoogleCloudProjectToConfig } = await import('./config-C-A1XF62.mjs');
+        const { readCredentialsForConfiguredRelay: readCredentialsForConfiguredRelay2 } = await import('./limits-DS-bnYYp.mjs').then(function (n) { return n.Y; });
+        const { ApiClient: ApiClient2 } = await import('./types-BN3eiipi.mjs').then(function (n) { return n.at; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentialsForConfiguredRelay2();
@@ -18054,7 +18209,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     }
     if (geminiSubcommand === "project" && args[2] === "get") {
       try {
-        const { readGeminiLocalConfig } = await import('./config-Dhu6LU0h.mjs');
+        const { readGeminiLocalConfig } = await import('./config-C-A1XF62.mjs');
         const config = readGeminiLocalConfig();
         if (config.googleCloudProject) {
           console.log(`Current Google Cloud Project: ${config.googleCloudProject}`);
@@ -18094,7 +18249,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
       process.exit(0);
     }
     try {
-      const { runGemini } = await import('./runGemini-D5IV1MoF.mjs');
+      const { runGemini } = await import('./runGemini-DvJwQVGp.mjs');
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
@@ -18117,7 +18272,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
   } else if (subcommand === "pi") {
     if (args[1] === "--terminal") {
       try {
-        const { runPiTerminal } = await import('./piTerminal-BlE4vbvZ.mjs');
+        const { runPiTerminal } = await import('./piTerminal-M677UP7y.mjs');
         process.exitCode = await runPiTerminal(args.slice(2));
       } catch (error) {
         console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -18134,7 +18289,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
       }
     };
     try {
-      const { runAcp, resolveAcpAgentConfig } = await import('./index-CzpooENj.mjs');
+      const { runAcp, resolveAcpAgentConfig } = await import('./index-DEp6CmmS.mjs');
       const parsed = parsePiRunnerArgs(args.slice(1));
       const resolved = resolveAcpAgentConfig(["pi", ...parsed.passthrough]);
       const { credentials } = await authAndSetupMachineIfNeeded();
@@ -18162,7 +18317,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "acp") {
     try {
-      const { runAcp, resolveAcpAgentConfig } = await import('./index-CzpooENj.mjs');
+      const { runAcp, resolveAcpAgentConfig } = await import('./index-DEp6CmmS.mjs');
       let startedBy = void 0;
       let verbose = false;
       const acpArgs = [];
@@ -18202,7 +18357,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "openclaw") {
     try {
-      const { runOpenClaw } = await import('./runOpenClaw-CWPXrKMJ.mjs');
+      const { runOpenClaw } = await import('./runOpenClaw-BG82bF18.mjs');
       let startedBy = void 0;
       let verbose = false;
       let gatewayUrl;
@@ -18253,7 +18408,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "todo") {
     try {
-      const { handleTodoCommand } = await import('./todo-C9IAUf0K.mjs');
+      const { handleTodoCommand } = await import('./todo-BhJbG5eq.mjs');
       await handleTodoCommand(args.slice(1));
     } catch (error) {
       console.error(JSON.stringify({ error: error instanceof Error ? error.message : "Todo command failed" }));
@@ -18262,7 +18417,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "teams") {
     try {
-      const { handleTeamsCommand } = await import('./teams-4mhNh5cj.mjs');
+      const { handleTeamsCommand } = await import('./teams-DoAA_CcN.mjs');
       await handleTeamsCommand(args.slice(1));
     } catch (error) {
       console.error(error instanceof Error ? error.message : "Teams command failed");
@@ -18271,7 +18426,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "mcp" && (args.length === 1 || args.length === 2 && args[1] === "--terminal-tools")) {
     try {
-      const { handleMcpCommand } = await import('./mcp-DzydgXpf.mjs');
+      const { handleMcpCommand } = await import('./mcp-zu8n8TkR.mjs');
       await handleMcpCommand(args[1] === "--terminal-tools");
     } catch (error) {
       process.stderr.write(`[very-happy mcp] Fatal: ${error instanceof Error ? error.message : String(error)}
@@ -18639,4 +18794,4 @@ ${chalk.bold("Examples:")}
   }
 }
 
-export { ALLOWED_SPAWN_PERMISSION_MODES as A, appendStagedAttachmentsToPrompt as B, CLAUDE_ATTACHMENT_KINDS as C, DEFAULT_RECENT_LIMIT as D, BasePermissionHandler as E, writeSessionModeFile as F, GEMINI_MODEL_ENV as G, normalizeAcpPermissionMode as H, removeSessionModeFile as I, TEAM_SKILL as J, GEMINI_API_KEY_ENV as K, GOOGLE_API_KEY_ENV as L, MAX_READ_LIMIT as M, BaseReasoningProcessor as N, MessageBuffer as O, PI_TEAMS_EXTENSION as P, CHANGE_TITLE_INSTRUCTION as Q, SPAWN_AGENTS as S, TitleGenerator as T, sanitizeSpawnPermissionMode as a, sendUserMessage as b, listSessions as c, stopSession as d, resolvePermissionRequest as e, archiveSession as f, DEFAULT_GEMINI_MODEL as g, checkPreviewPath as h, isValidSpawnOrigin as i, registerAssistantSessionTools as j, initialMachineMetadata as k, listAccountSessions as l, createSessionMetadata as m, setupOfflineReconnection as n, StreamRelay as o, MessageQueue2 as p, query as q, readSessionTranscript as r, sessionWebUrl as s, tmuxSupportsSessionEnv as t, hashObject as u, startHappyServer as v, waitForSessionKey as w, registerAgentAttachmentDownloads as x, registerKillSessionHandler as y, stageClaudeAttachments as z };
+export { ALLOWED_SPAWN_PERMISSION_MODES as A, TitleGenerator as B, registerKillSessionHandler as C, DEFAULT_RECENT_LIMIT as D, CLAUDE_ATTACHMENT_KINDS as E, stageClaudeAttachments as F, GEMINI_MODEL_ENV as G, appendStagedAttachmentsToPrompt as H, BasePermissionHandler as I, writeSessionModeFile as J, normalizeAcpPermissionMode as K, removeSessionModeFile as L, MAX_READ_LIMIT as M, TEAM_SKILL as N, GEMINI_API_KEY_ENV as O, PI_TEAMS_EXTENSION as P, GOOGLE_API_KEY_ENV as Q, BaseReasoningProcessor as R, SPAWN_AGENTS as S, TurnWaitTimeoutError as T, MessageBuffer as U, CHANGE_TITLE_INSTRUCTION as V, listSessions as a, resolvePermissionRequest as b, archiveSession as c, sendUserMessage as d, sessionWebUrl as e, DEFAULT_GEMINI_MODEL as f, checkPreviewPath as g, registerAssistantSessionTools as h, readSessionMetadata as i, isValidSpawnOrigin as j, sanitizeSpawnPermissionMode as k, listAccountSessions as l, waitForSessionKey as m, initialMachineMetadata as n, createSessionMetadata as o, setupOfflineReconnection as p, query as q, readSessionTranscript as r, stopSession as s, tmuxSupportsSessionEnv as t, StreamRelay as u, MessageQueue2 as v, waitForTurnEnd as w, hashObject as x, startHappyServer as y, registerAgentAttachmentDownloads as z };