very-happy-cli 0.2.149 → 0.2.151

package/dist/{index-CyfXsCXl.cjs → index-CqtfRzug.cjs}

@@ -3,14 +3,14 @@
 var chalk = require('chalk');
 var os = require('node:os');
 var node_crypto = require('node:crypto');
-var index = require('./types-t1gxALVE.cjs');
-var persistence = require('./limits-FZWhlsBu.cjs');
+var index = require('./types-CPubg05Z.cjs');
+var persistence = require('./limits-DwcY3kyi.cjs');
 var spawn = require('cross-spawn');
 var path = require('node:path');
 var node_readline = require('node:readline');
 var node_fs = require('node:fs');
 var projectPath = require('./projectPath-ChLhdOyt.cjs');
-var agentGuidance = require('./agentGuidance--QIi_rZ2.cjs');
+var agentGuidance = require('./agentGuidance-BXa9ikrZ.cjs');
 var promises = require('node:fs/promises');
 var fs = require('fs/promises');
 var ink = require('ink');
@@ -478,17 +478,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 = (() => agentGuidance.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" + agentGuidance.AGENT_GUIDANCE + "\n\n" + index.BUILTIN_TODO_DISCOVERY;
 const CO_AUTHORED_CREDITS = (() => agentGuidance.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>
 
@@ -496,6 +502,8 @@ const CO_AUTHORED_CREDITS = (() => agentGuidance.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();
@@ -892,7 +900,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);
     persistence.logger.debug(`[SESSION_SCANNER] Marking ${messages.length} existing messages as processed from session ${opts.sessionId}`);
     for (let m of messages) {
       processedMessageKeys.add(messageKey(m));
@@ -915,7 +923,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) {
@@ -992,7 +1000,7 @@ async function createSessionScanner(opts) {
         return;
       }
       if (options?.treatExistingAsProcessed) {
-        const existing = await readSessionLog(projectDir, sessionId);
+        const existing = await readSessionLog$1(projectDir, sessionId);
         persistence.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));
@@ -1020,7 +1028,7 @@ function messageKey(message) {
     throw Error();
   }
 }
-async function readSessionLog(projectDir, sessionId) {
+async function readSessionLog$1(projectDir, sessionId) {
   const expectedSessionFile = path.join(projectDir, `${sessionId}.jsonl`);
   persistence.logger.debug(`[SESSION_SCANNER] Reading session file: ${expectedSessionFile}`);
   let file;
@@ -5126,6 +5134,61 @@ function shareSafeEnvironmentInfo(env = process.env, runtime = process) {
   };
 }
 
+const NPM_SAFE_ARG = /^[A-Za-z0-9@=.,+/_-]+$/;
+function globalPrefixForPackage(packageDir) {
+  if (!path.isAbsolute(packageDir)) return null;
+  const dir = path.resolve(packageDir);
+  const nodeModules = path.dirname(dir);
+  const lib = path.dirname(nodeModules);
+  const prefix = path.dirname(lib);
+  if (path.basename(dir) !== "very-happy-cli" || path.basename(nodeModules) !== "node_modules" || path.basename(lib) !== "lib") return null;
+  if (prefix === lib || path.resolve(prefix) === "/" || !NPM_SAFE_ARG.test(prefix)) return null;
+  return prefix;
+}
+function packageDirForBin(realBin) {
+  const packageDir = path.dirname(path.dirname(realBin));
+  return path.basename(path.dirname(realBin)) === "bin" && path.basename(packageDir) === "very-happy-cli" ? packageDir : null;
+}
+function installLocationWarnings(facts, version) {
+  const warnings = [];
+  const running = path.resolve(facts.runningPackageDir);
+  const packages = [...new Set(facts.onPath.map(packageDirForBin).filter((dir) => Boolean(dir)).map((dir) => path.resolve(dir)))];
+  if (packages.length > 1) {
+    warnings.push(`Found ${packages.length} very-happy installs on PATH (first one wins): ${packages.join(", ")}. Updating one does not update the others; remove the ones you do not use.`);
+  }
+  if (packages[0] && packages[0] !== running) {
+    warnings.push(`The very-happy command runs ${packages[0]}, but this CLI runs from ${running}.`);
+  }
+  const prefix = globalPrefixForPackage(running);
+  if (prefix && facts.npmGlobalPrefix && path.resolve(facts.npmGlobalPrefix) !== path.resolve(prefix)) {
+    const target = version ? `very-happy-cli@${version}` : "very-happy-cli@latest";
+    warnings.push(`npm install -g writes to ${facts.npmGlobalPrefix}, but this CLI runs from ${prefix}; a plain update will not take effect. Update with: npm install -g --prefix ${prefix} --allow-scripts=very-happy-cli,node-pty ${target} && very-happy daemon start`);
+  }
+  return warnings;
+}
+function gatherInstallLocationFacts(runningPackageDir, env = process.env) {
+  if (process.platform === "win32") return null;
+  const onPath = [];
+  for (const dir of (env.PATH ?? "").split(path.delimiter)) {
+    if (!dir) continue;
+    try {
+      const candidate = path.join(dir, "very-happy");
+      if (!node_fs.statSync(candidate).isFile()) continue;
+      const real = node_fs.realpathSync(candidate);
+      if (!onPath.includes(real)) onPath.push(real);
+    } catch {
+    }
+  }
+  let npmGlobalPrefix = null;
+  try {
+    const result = node_child_process.spawnSync("npm", ["prefix", "-g"], { encoding: "utf8", timeout: 5e3, env });
+    const out = result.status === 0 ? result.stdout.trim() : "";
+    npmGlobalPrefix = out && path.isAbsolute(out) && !out.includes("\n") ? out : null;
+  } catch {
+  }
+  return { runningPackageDir, onPath, npmGlobalPrefix };
+}
+
 function printCliUpdateStatus(state) {
   const installed = persistence.configuration.currentCliVersion;
   const running = state?.startedWithCliVersion ?? null;
@@ -5143,6 +5206,10 @@ function printCliUpdateStatus(state) {
     console.log(chalk.yellow("  \u25B3 A newer CLI is available."));
   }
   if (summary.installCommand) console.log(`  Update: ${summary.installCommand}`);
+  const facts = gatherInstallLocationFacts(projectPath.projectPath());
+  for (const warning of facts ? installLocationWarnings(facts, state?.cliUpdate?.recommendedVersion ?? void 0) : []) {
+    console.log(chalk.yellow(`  \u26A0 ${warning}`));
+  }
 }
 function getEnvironmentInfo() {
   return shareSafeEnvironmentInfo();
@@ -5335,8 +5402,8 @@ ${typeLabels[type] || type}:`));
   }
   console.log(chalk.gray("  An external claude command is only needed for native terminal/mirror use."));
   try {
-    const { resolveAgentHomesForCli } = await Promise.resolve().then(function () { return require('./agentHome-3kRCtzOL.cjs'); });
-    const { describeAgentHome } = await Promise.resolve().then(function () { return require('./types-t1gxALVE.cjs'); }).then(function (n) { return n.index; });
+    const { resolveAgentHomesForCli } = await Promise.resolve().then(function () { return require('./agentHome-D6MSfwnp.cjs'); });
+    const { describeAgentHome } = await Promise.resolve().then(function () { return require('./types-CPubg05Z.cjs'); }).then(function (n) { return n.index; });
     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)}`));
@@ -6047,7 +6114,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 = persistence.encodeBase64(persistence.encrypt(
@@ -6358,13 +6427,22 @@ function startDaemonControlServer({
           permissionMode: z.z.string().optional(),
           // B-069: spawn-origin tag ('assistant' = session_spawn). Recorded on
           // the TrackedSession; old clients never send it.
-          spawnedBy: z.z.string().optional()
+          spawnedBy: z.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.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.z.string().min(1).max(200).optional(),
+          parentSessionId: z.z.string().min(1).max(200).optional()
         }),
         response: {
           200: z.z.object({
             success: z.z.boolean(),
             sessionId: z.z.string().optional(),
-            approvedNewDirectoryCreation: z.z.boolean().optional()
+            approvedNewDirectoryCreation: z.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.z.boolean().optional()
           }),
           409: z.z.object({
             success: z.z.boolean(),
@@ -6379,13 +6457,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" };
       }
       persistence.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) {
@@ -6398,7 +6477,8 @@ function startDaemonControlServer({
           return {
             success: true,
             sessionId: result.sessionId,
-            approvedNewDirectoryCreation: true
+            approvedNewDirectoryCreation: true,
+            ...resumed ? { resumed: true } : {}
           };
         case "requestToApproveDirectoryCreation":
           reply.code(409);
@@ -7639,8 +7719,8 @@ function serialTask(task) {
   };
 }
 
-function autoUpdateInstallArgs(version) {
-  return ["i", "-g", "--allow-scripts=very-happy-cli,node-pty", `very-happy-cli@${version}`];
+function autoUpdateInstallArgs(version, prefix) {
+  return ["i", "-g", ...prefix ? [`--prefix=${prefix}`] : [], "--allow-scripts=very-happy-cli,node-pty", `very-happy-cli@${version}`];
 }
 
 const processDefaults = {
@@ -7700,7 +7780,34 @@ const runNpmProcess = (args, deps = processDefaults) => new Promise((resolveResu
   child.on("close", (code) => done({ code: timedOut ? null : code, stdout, stderr, terminationConfirmed: !timedOut || treeKilled }));
 });
 const runNpm = (args) => runNpmProcess(args);
-const defaults = { npm: runNpm, fs: { lstat: promises.lstat, readlink: promises.readlink, unlink: promises.unlink, rm: promises.rm, readFile: promises.readFile, symlink: promises.symlink }, platform: process.platform };
+const defaults = {
+  npm: runNpm,
+  fs: { lstat: promises.lstat, readlink: promises.readlink, unlink: promises.unlink, rm: promises.rm, readFile: promises.readFile, symlink: promises.symlink, access: promises.access },
+  platform: process.platform,
+  runningPackageDir: projectPath.projectPath()
+};
+async function runningVersion(deps) {
+  if (!deps.runningPackageDir) return null;
+  try {
+    const manifest = JSON.parse(await deps.fs.readFile(path.join(deps.runningPackageDir, "package.json"), "utf8"));
+    return manifest?.name === "very-happy-cli" && typeof manifest.version === "string" ? manifest.version : null;
+  } catch {
+    return null;
+  }
+}
+async function verifyRunningCopy(code, version, deps) {
+  if (code !== 0 || !deps.runningPackageDir) return code;
+  return await runningVersion(deps) === version ? 0 : { failed: "installed_elsewhere" };
+}
+async function writable(path, deps) {
+  if (!deps.fs.access) return true;
+  try {
+    await deps.fs.access(path, promises.constants.W_OK);
+    return true;
+  } catch (error) {
+    return error.code === "ENOENT";
+  }
+}
 function ownedCliLink(link, target, packageDir) {
   const resolved = path.resolve(path.dirname(link), target);
   return resolved.startsWith(path.join(packageDir, "bin") + path.sep);
@@ -7708,14 +7815,27 @@ function ownedCliLink(link, target, packageDir) {
 async function installCliSafely(version, deps = defaults) {
   const parsed = index.parseExactVersion(version);
   if (!parsed) throw new Error("Invalid exact CLI version");
-  const args = autoUpdateInstallArgs(parsed.exact);
   if (deps.platform === "win32") {
-    const result2 = await deps.npm(args);
-    return result2.terminationConfirmed === false ? "blocked" : result2.code;
+    const result2 = await deps.npm(autoUpdateInstallArgs(parsed.exact));
+    return result2.terminationConfirmed === false ? "blocked" : verifyRunningCopy(result2.code, parsed.exact, deps);
   }
-  const rootResult = await deps.npm(["root", "-g"]);
+  let pinnedPrefix;
+  if (deps.runningPackageDir) {
+    const running = globalPrefixForPackage(deps.runningPackageDir);
+    const runningStat = running ? await deps.fs.lstat(deps.runningPackageDir).catch(() => null) : null;
+    if (!running || !runningStat?.isDirectory() || runningStat.isSymbolicLink() || !await runningVersion(deps)) {
+      return { manual: "install_location_unverified" };
+    }
+    for (const path$1 of [path.dirname(deps.runningPackageDir), deps.runningPackageDir, path.join(running, "bin")]) {
+      if (!await writable(path$1, deps)) return { manual: "install_location_not_writable" };
+    }
+    pinnedPrefix = running;
+  }
+  const prefixArgs = pinnedPrefix ? [`--prefix=${pinnedPrefix}`] : [];
+  const args = autoUpdateInstallArgs(parsed.exact, pinnedPrefix);
+  const rootResult = await deps.npm(["root", "-g", ...prefixArgs]);
   if (rootResult.terminationConfirmed === false) return "blocked";
-  const prefixResult = await deps.npm(["prefix", "-g"]);
+  const prefixResult = await deps.npm(["prefix", "-g", ...prefixArgs]);
   if (prefixResult.terminationConfirmed === false) return "blocked";
   const root = rootResult.stdout.trim();
   const prefix = prefixResult.stdout.trim();
@@ -7724,6 +7844,9 @@ async function installCliSafely(version, deps = defaults) {
   }
   if (path.resolve(root) !== path.resolve(prefix, "lib/node_modules")) throw new Error("Unexpected npm root/prefix relationship");
   const packageDir = path.join(root, "very-happy-cli");
+  if (deps.runningPackageDir && path.resolve(packageDir) !== path.resolve(deps.runningPackageDir)) {
+    return { manual: "install_location_unverified" };
+  }
   const packageStat = await deps.fs.lstat(packageDir).catch((error) => {
     if (error.code === "ENOENT") return null;
     throw error;
@@ -7758,7 +7881,7 @@ async function installCliSafely(version, deps = defaults) {
       return "blocked";
     }
     result = first.code;
-    if (first.code === 0 || first.code === null) return first.code;
+    if (first.code === 0 || first.code === null) return await verifyRunningCopy(first.code, parsed.exact, deps);
     if (!/\b(?:EEXIST|ENOTEMPTY)\b/.test(first.stderr ?? "")) return first.code;
     const failedStat = await deps.fs.lstat(packageDir).catch((error) => {
       if (error.code === "ENOENT") return null;
@@ -7774,7 +7897,7 @@ async function installCliSafely(version, deps = defaults) {
       safeToRestore = false;
       return "blocked";
     }
-    return result;
+    return await verifyRunningCopy(result, parsed.exact, deps);
   } finally {
     if (result !== 0 && safeToRestore) {
       for (const { link, target } of ownLinks) {
@@ -7810,7 +7933,7 @@ function createUpdateController(deps) {
   async function evaluate() {
     if (!policy || running) return;
     const target = manualVersion ?? policy.autoUpdateVersion ?? null;
-    if (outcome?.version === target && ["failed", "installed"].includes(outcome.state)) {
+    if (outcome?.version === target && ["failed", "installed", "manual_required"].includes(outcome.state)) {
       const fingerprint = JSON.stringify([policy.checkedAt, outcome.state, outcome.version, outcome.detail, manualVersion]);
       if (fingerprint !== lastPublished) {
         lastPublished = fingerprint;
@@ -7848,6 +7971,11 @@ function createUpdateController(deps) {
     publish("installing", target);
     try {
       const code = await deps.install(target);
+      if (code && typeof code === "object") {
+        if ("manual" in code) publish("manual_required", target, code.manual);
+        else publish("failed", target, code.failed);
+        return;
+      }
       blocked = code === "blocked";
       publish(
         blocked ? "manual_required" : code === 0 ? "installed" : "failed",
@@ -8016,7 +8144,7 @@ function parseJsonObject(text) {
     return null;
   }
 }
-function resolveSdkClaudeBinary(platform = process.platform, arch = process.arch, resolver = (s) => node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-CyfXsCXl.cjs', document.baseURI).href))).resolve(s)) {
+function resolveSdkClaudeBinary(platform = process.platform, arch = process.arch, resolver = (s) => node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-CqtfRzug.cjs', document.baseURI).href))).resolve(s)) {
   const platformArch = `${platform}-${arch}`;
   const candidates = [
     `@anthropic-ai/claude-agent-sdk-${platformArch}/claude`,
@@ -9282,6 +9410,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;
@@ -9297,12 +9427,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;
@@ -9314,18 +9444,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}]`;
@@ -9340,12 +9470,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;
     }
@@ -9356,22 +9486,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 = socket_ioClient.io(persistence.configuration.serverUrl, {
@@ -9717,19 +9936,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 = persistence.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(
     `${persistence.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}/${persistence.configuration.currentCliVersion}`
@@ -9740,21 +9961,62 @@ async function readSessionTranscript(sessionId, limit) {
   const messages = Array.isArray(response.data?.messages) ? response.data.messages : [];
   messages.reverse();
   const key = persistence.decodeBase64(persisted.encryptionKey);
-  const live = await index.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 persistence.decrypt(key, persisted.encryptionVariant, persistence.decodeBase64(message.content.c));
+      return { seq: message.seq, body: persistence.decrypt(key, persisted.encryptionVariant, persistence.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 index.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(`${persistence.configuration.serverUrl}/v1/sessions/${encodeURIComponent(sessionId)}`, {
+    headers: {
+      "Authorization": `Bearer ${token}`,
+      "X-Happy-Client": `${SESSION_OPS_CLIENT}/${persistence.configuration.currentCliVersion}`
+    },
+    timeout: 15e3
+  });
+  const ciphertext = response.data?.session?.metadata;
+  if (typeof ciphertext !== "string" || ciphertext.length === 0) return null;
+  return persistence.decrypt(persistence.decodeBase64(persisted.encryptionKey), persisted.encryptionVariant, persistence.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 index.stopDaemonSession(sessionId);
 }
@@ -12492,7 +12754,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 Promise.resolve().then(function () { return require('./index-DBN2Zpqc.cjs'); });
+    const { query } = await Promise.resolve().then(function () { return require('./index-vyRqLjDv.cjs'); });
     return runSideQuestion(query, input);
   });
   const run = async (input, live) => {
@@ -12611,7 +12873,7 @@ const MAX_TITLE_CHARS = 60;
 const GENERATION_TIMEOUT_MS = 3e4;
 function resolveClaudeBinary() {
   try {
-    const require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-CyfXsCXl.cjs', document.baseURI).href)));
+    const require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-CqtfRzug.cjs', document.baseURI).href)));
     const utilsPath = path.resolve(path.join(projectPath.projectPath(), "scripts", "claude_version_utils.cjs"));
     const { getClaudeCliPath } = require$1(utilsPath);
     const path$1 = getClaudeCliPath();
@@ -14840,9 +15102,9 @@ function resolveLocalSignupBootstrap(configuredMode, configuredInviteCodes, gene
   };
 }
 
-const __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-CyfXsCXl.cjs', document.baseURI).href)));
+const __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-CqtfRzug.cjs', document.baseURI).href)));
 const __dirname$1 = path.dirname(__filename$1);
-const require_ = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-CyfXsCXl.cjs', document.baseURI).href)));
+const require_ = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-CqtfRzug.cjs', document.baseURI).href)));
 const PRISMA_QUERY_ENGINE_FILES = {
   "arm64-darwin": "libquery_engine-darwin-arm64.dylib.node",
   "x64-darwin": "libquery_engine-darwin.dylib.node",
@@ -17780,7 +18042,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 Promise.resolve().then(function () { return require('./installTerminalHooks-kdAoTfNT.cjs'); });
+      const { installTerminalHooks, parseTerminalHooksArgs, TERMINAL_HOOKS_HELP } = await Promise.resolve().then(function () { return require('./installTerminalHooks-Bf_adbl3.cjs'); });
       const command = parseTerminalHooksArgs(args.slice(1));
       if (command.action === "help") {
         console.log(TERMINAL_HOOKS_HELP);
@@ -17797,7 +18059,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 Promise.resolve().then(function () { return require('./agentHome-3kRCtzOL.cjs'); });
+      const { parseAgentHomeArgs, runAgentHomeCommand } = await Promise.resolve().then(function () { return require('./agentHome-D6MSfwnp.cjs'); });
       await runAgentHomeCommand(parseAgentHomeArgs(args.slice(1)));
       process.exit(0);
     } catch (error) {
@@ -17806,7 +18068,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     }
   } else if (subcommand === "spawn") {
     try {
-      const { handleSpawnCommand } = await Promise.resolve().then(function () { return require('./spawn-Cm3Da8Ge.cjs'); });
+      const { handleSpawnCommand } = await Promise.resolve().then(function () { return require('./spawn-DH6_p4-f.cjs'); });
       await handleSpawnCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -17818,7 +18080,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "sessions") {
     try {
-      const { handleSessionsCommand } = await Promise.resolve().then(function () { return require('./sessions-2Bkau9T4.cjs'); });
+      const { handleSessionsCommand } = await Promise.resolve().then(function () { return require('./sessions-B3vP18kz.cjs'); });
       await handleSessionsCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -17830,7 +18092,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "send") {
     try {
-      const { handleSendCommand } = await Promise.resolve().then(function () { return require('./send-0LrSwGgr.cjs'); });
+      const { handleSendCommand } = await Promise.resolve().then(function () { return require('./send-aUkjhey7.cjs'); });
       await handleSendCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -17936,9 +18198,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 Promise.resolve().then(function () { return require('./config-CzJZcvTO.cjs'); });
-        const { readCredentialsForConfiguredRelay: readCredentialsForConfiguredRelay2 } = await Promise.resolve().then(function () { return require('./limits-FZWhlsBu.cjs'); }).then(function (n) { return n.persistence; });
-        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./types-t1gxALVE.cjs'); }).then(function (n) { return n.api; });
+        const { saveGoogleCloudProjectToConfig } = await Promise.resolve().then(function () { return require('./config-Cadw1sAk.cjs'); });
+        const { readCredentialsForConfiguredRelay: readCredentialsForConfiguredRelay2 } = await Promise.resolve().then(function () { return require('./limits-DwcY3kyi.cjs'); }).then(function (n) { return n.persistence; });
+        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./types-CPubg05Z.cjs'); }).then(function (n) { return n.api; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentialsForConfiguredRelay2();
@@ -17969,7 +18231,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 Promise.resolve().then(function () { return require('./config-CzJZcvTO.cjs'); });
+        const { readGeminiLocalConfig } = await Promise.resolve().then(function () { return require('./config-Cadw1sAk.cjs'); });
         const config = readGeminiLocalConfig();
         if (config.googleCloudProject) {
           console.log(`Current Google Cloud Project: ${config.googleCloudProject}`);
@@ -18009,7 +18271,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
       process.exit(0);
     }
     try {
-      const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-ComTu0EB.cjs'); });
+      const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-DuwdVV1O.cjs'); });
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
@@ -18032,7 +18294,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 Promise.resolve().then(function () { return require('./piTerminal-qQAzQwIU.cjs'); });
+        const { runPiTerminal } = await Promise.resolve().then(function () { return require('./piTerminal-kDSd_r9X.cjs'); });
         process.exitCode = await runPiTerminal(args.slice(2));
       } catch (error) {
         console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -18049,7 +18311,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
       }
     };
     try {
-      const { runAcp, resolveAcpAgentConfig } = await Promise.resolve().then(function () { return require('./index-DgK4KX-Z.cjs'); });
+      const { runAcp, resolveAcpAgentConfig } = await Promise.resolve().then(function () { return require('./index-BKGspSWk.cjs'); });
       const parsed = parsePiRunnerArgs(args.slice(1));
       const resolved = resolveAcpAgentConfig(["pi", ...parsed.passthrough]);
       const { credentials } = await authAndSetupMachineIfNeeded();
@@ -18077,7 +18339,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 Promise.resolve().then(function () { return require('./index-DgK4KX-Z.cjs'); });
+      const { runAcp, resolveAcpAgentConfig } = await Promise.resolve().then(function () { return require('./index-BKGspSWk.cjs'); });
       let startedBy = void 0;
       let verbose = false;
       const acpArgs = [];
@@ -18117,7 +18379,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "openclaw") {
     try {
-      const { runOpenClaw } = await Promise.resolve().then(function () { return require('./runOpenClaw-M3YlDt8z.cjs'); });
+      const { runOpenClaw } = await Promise.resolve().then(function () { return require('./runOpenClaw-BsvtCE_H.cjs'); });
       let startedBy = void 0;
       let verbose = false;
       let gatewayUrl;
@@ -18168,7 +18430,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "todo") {
     try {
-      const { handleTodoCommand } = await Promise.resolve().then(function () { return require('./todo-8RgCTDxH.cjs'); });
+      const { handleTodoCommand } = await Promise.resolve().then(function () { return require('./todo-Bcc2XxGh.cjs'); });
       await handleTodoCommand(args.slice(1));
     } catch (error) {
       console.error(JSON.stringify({ error: error instanceof Error ? error.message : "Todo command failed" }));
@@ -18177,7 +18439,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "teams") {
     try {
-      const { handleTeamsCommand } = await Promise.resolve().then(function () { return require('./teams-DKKeIG-u.cjs'); });
+      const { handleTeamsCommand } = await Promise.resolve().then(function () { return require('./teams-BW8D1n3o.cjs'); });
       await handleTeamsCommand(args.slice(1));
     } catch (error) {
       console.error(error instanceof Error ? error.message : "Teams command failed");
@@ -18186,7 +18448,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 Promise.resolve().then(function () { return require('./mcp-DoLZbbZp.cjs'); });
+      const { handleMcpCommand } = await Promise.resolve().then(function () { return require('./mcp-CMxEZ6-0.cjs'); });
       await handleMcpCommand(args[1] === "--terminal-tools");
     } catch (error) {
       process.stderr.write(`[very-happy mcp] Fatal: ${error instanceof Error ? error.message : String(error)}
@@ -18572,6 +18834,7 @@ exports.SPAWN_AGENTS = SPAWN_AGENTS;
 exports.StreamRelay = StreamRelay;
 exports.TEAM_SKILL = TEAM_SKILL;
 exports.TitleGenerator = TitleGenerator;
+exports.TurnWaitTimeoutError = TurnWaitTimeoutError;
 exports.appendStagedAttachmentsToPrompt = appendStagedAttachmentsToPrompt;
 exports.archiveSession = archiveSession;
 exports.checkPreviewPath = checkPreviewPath;
@@ -18583,6 +18846,7 @@ exports.listAccountSessions = listAccountSessions;
 exports.listSessions = listSessions;
 exports.normalizeAcpPermissionMode = normalizeAcpPermissionMode;
 exports.query = query;
+exports.readSessionMetadata = readSessionMetadata;
 exports.readSessionTranscript = readSessionTranscript;
 exports.registerAgentAttachmentDownloads = registerAgentAttachmentDownloads;
 exports.registerAssistantSessionTools = registerAssistantSessionTools;
@@ -18598,4 +18862,5 @@ exports.startHappyServer = startHappyServer;
 exports.stopSession = stopSession;
 exports.tmuxSupportsSessionEnv = tmuxSupportsSessionEnv;
 exports.waitForSessionKey = waitForSessionKey;
+exports.waitForTurnEnd = waitForTurnEnd;
 exports.writeSessionModeFile = writeSessionModeFile;