very-happy-cli 0.2.161 → 0.2.163

package/dist/{runClaudeDeps-COBBhD9o.mjs → runClaudeDeps-CpAiml84.mjs}

@@ -1,48 +1,50 @@
-import { l as logger } from './logger-fXoNzNuB.mjs';
-import { k as notifyDaemonSessionEvent, m as notifyDaemonClaudeAuthFailed } from './controlClient-DjoKTtgK.mjs';
-export { g as reportSessionEditToDaemon } from './controlClient-DjoKTtgK.mjs';
+import { l as logger } from './logger-BIzr7JN0.mjs';
+import { k as notifyDaemonSessionEvent, m as notifyDaemonClaudeAuthFailed } from './controlClient-BKmjlbGs.mjs';
+export { g as reportSessionEditToDaemon } from './controlClient-BKmjlbGs.mjs';
 import { s as sameBackgroundTasks, c as createBackgroundTaskTracker } from './backgroundTaskActivity-8PdPxrvy.mjs';
 import { randomInt, randomUUID, createHash } from 'node:crypto';
 import { M as MessageBuffer } from './messageBuffer-BWlGgR3A.mjs';
 import { query } from './index-B6UGRQ7h.mjs';
 import { AbortError } from '@anthropic-ai/claude-agent-sdk';
 import { m as mapToClaudeMode, p as parseClaudePermissionMode, c as resolveRemoteClaudePermissionMode } from './permissionMode-CH4FoZfU.mjs';
-import { c as claudeCheckSession, s as systemPrompt } from './systemPrompt-DmtypUc7.mjs';
+import { c as claudeCheckSession, s as systemPrompt } from './systemPrompt-Db9O7KGe.mjs';
 import { join, resolve, dirname } from 'node:path';
 import { p as parseSpecialCommand } from './specialCommands-BSqhYg5X.mjs';
 import 'axios';
 import 'node:events';
 import 'socket.io-client';
-import { A as AsyncLock } from './attachmentLimits-yba1uHFO.mjs';
+import { A as AsyncLock } from './attachmentLimits-D5pgmASK.mjs';
 import 'tweetnacl';
-import { c as configuration, e as ensurePrivateDirectory } from './configuration-DoWFJUPm.mjs';
-import './index-qdS1friN.mjs';
-import './registerCommonHandlers-CrgvJsOy.mjs';
+import { c as configuration, e as ensurePrivateDirectory } from './configuration-B0c-OP_h.mjs';
+import './index-BBg9j0XK.mjs';
+import './registerCommonHandlers-t15dS7xt.mjs';
 import 'os';
 import 'child_process';
 import '@paralleldrive/cuid2';
-import './persistence-oET5n61f.mjs';
+import './persistence-DgBhXxu7.mjs';
 import { c as contentLogMetadata } from './contentLogMetadata-BlWI0egu.mjs';
 import 'chalk';
 export { R as RawJSONLinesSchema } from './types-CkqAACXx.mjs';
 import { g as getProjectPath } from './path-D2wdaNSk.mjs';
 import { access } from 'fs/promises';
-import { d as delay } from './time-BZNdNiIV.mjs';
+import { d as delay } from './time-TxDyvAKk.mjs';
 import { mkdirSync, writeFileSync, readFileSync, unlinkSync, renameSync, statSync, existsSync } from 'node:fs';
-import { h as hashObject, i as isSelfReportFresh } from './deterministicJson-p835AdAU.mjs';
-export { c as createSelfReportState, s as startHappyServer } from './deterministicJson-p835AdAU.mjs';
-import { F as Future } from './sessionScanner-CaAHLyNV.mjs';
-export { c as createSessionScanner } from './sessionScanner-CaAHLyNV.mjs';
+import { h as hashObject, i as isSelfReportFresh } from './deterministicJson-CaWami7M.mjs';
+export { c as createSelfReportState, s as startHappyServer } from './deterministicJson-CaWami7M.mjs';
+import { F as Future } from './sessionScanner-jilpq2aE.mjs';
+export { c as createSessionScanner } from './sessionScanner-jilpq2aE.mjs';
 import { execSync } from 'node:child_process';
-import { S as StreamRelay } from './streamRelay-FPVbHpbM.mjs';
-import { C as CLAUDE_ATTACHMENT_KINDS, c as chatAttachmentDirectory, a as stageClaudeAttachments, b as appendStagedAttachmentsToPrompt } from './attachmentContent-CSGxr71v.mjs';
-export { M as MessageQueue2, r as registerKillSessionHandler } from './registerKillSessionHandler-Cbc8Rgtd.mjs';
-export { g as getEnvironmentInfo } from './doctor-BeUuQXFs.mjs';
+import { S as StreamRelay } from './streamRelay-BLgU9X3R.mjs';
+import { C as CLAUDE_ATTACHMENT_KINDS, c as chatAttachmentDirectory, a as stageClaudeAttachments, b as appendStagedAttachmentsToPrompt } from './attachmentContent-CCE0Y3gR.mjs';
+import { readFile, writeFile, rename, unlink } from 'node:fs/promises';
+import { F as ForkSourceMissingError } from './claudeSessionFork-DABSCbkf.mjs';
+export { M as MessageQueue2, r as registerKillSessionHandler } from './registerKillSessionHandler-BS5afGeA.mjs';
+export { g as getEnvironmentInfo } from './doctor-DX2P7IlL.mjs';
 import { createServer } from 'node:http';
 export { E as EditReportThrottle, b as extractClaudeEditPaths } from './editPaths-BVfS_FFL.mjs';
 import { p as projectPath } from './projectPath-BTBIMB57.mjs';
-import { r as resolveClaudeBinary, a as runClaudeOneShot } from './titleGenerator-ox6ptCsp.mjs';
-export { T as TitleGenerator } from './titleGenerator-ox6ptCsp.mjs';
+import { r as resolveClaudeBinary, a as runClaudeOneShot } from './titleGenerator-oK414IZc.mjs';
+export { T as TitleGenerator } from './titleGenerator-oK414IZc.mjs';
 import { B as BOARD_ANALYZER_PROMPT_PREFIX } from './oneShotPrompts-DT4p6RNd.mjs';
 import 'node:util';
 import './smallFastModel-BLNgMrwR.mjs';
@@ -50,34 +52,34 @@ import './trimIdent-BAjmv_TG.mjs';
 import 'node:os';
 import './agentGuidance-CQuNlNx8.mjs';
 import 'zod';
-import './package-uOg9SCKi.mjs';
-import 'node:fs/promises';
+import './package-D-W_r_pd.mjs';
 import 'util';
 import 'crypto';
 import 'path';
 import 'cross-spawn';
 import './authRelay-DSAvg1uv.mjs';
-import './client-Brn-UwVk.mjs';
-import './context-C9GHPLEm.mjs';
-import './sessionOps-C_f1wKOr.mjs';
+import './client-BbNFS1WW.mjs';
+import './context-mMg17HJv.mjs';
+import './sessionOps-DJSwzwP-.mjs';
 import './resources-BdFBQi8r.mjs';
-import './tools-BmQQUATY.mjs';
-import './tools-BZabNIid.mjs';
-import './client-CXb1VJui.mjs';
-import './peerTools-Dz3_7Bkk.mjs';
+import './tools-sPgOmLr_.mjs';
+import './tools-BSzD246o.mjs';
+import './client-CyUhxs-0.mjs';
+import './peerTools-C1cELmtZ.mjs';
 import './ids-DU6sLx4C.mjs';
-import './remoteSessionClient-CO7qOjR0.mjs';
+import './remoteSessionClient-N7JsQ0XS.mjs';
 import '@modelcontextprotocol/sdk/server/mcp.js';
 import '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import './limits-DIo7rEBR.mjs';
-import './assistantTools-CgiTbnWb.mjs';
+import './assistantTools-BvKH9eRc.mjs';
 import './terminals-Dlg0x3nY.mjs';
 import './terminalTitleSuggest-CeKsX_V6.mjs';
 import './tmuxSocket-B8Yx20sT.mjs';
-import './bootstrap-BNQq05jR.mjs';
+import './bootstrap-DSWZAtGy.mjs';
 import './previewPath-CXN4Vag0.mjs';
-import './sync-CxD-w_40.mjs';
-import './startFileWatcher-CdegMbJj.mjs';
+import './sync-DnmsgL3w.mjs';
+import './startFileWatcher-C1wjDI_o.mjs';
+import 'node:readline';
 import './doctor-BPkYWSuq.mjs';
 import 'ps-list';
 import './doctorReadiness-C208SMN9.mjs';
@@ -989,6 +991,10 @@ function withTimeout(promise, ms) {
     if (timer) clearTimeout(timer);
   });
 }
+const PROMPT_UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+function promptUuid(uuid) {
+  return uuid && PROMPT_UUID_RE.test(uuid) ? { uuid } : {};
+}
 async function claudeRemote(opts) {
   let startFrom = opts.sessionId;
   if (opts.sessionId && !claudeCheckSession(opts.sessionId, opts.path)) {
@@ -1241,6 +1247,7 @@ async function claudeRemote(opts) {
     type: "user",
     parent_tool_use_id: null,
     origin: { kind: "human" },
+    ...promptUuid(initial.uuid),
     message: {
       role: "user",
       content: initial.message
@@ -1429,6 +1436,7 @@ async function claudeRemote(opts) {
             type: "user",
             parent_tool_use_id: null,
             origin: { kind: "human" },
+            ...promptUuid(next.uuid),
             message: { role: "user", content: next.message }
           });
         }).catch(() => {
@@ -2806,6 +2814,146 @@ class LaunchModeGate {
   }
 }
 
+class ConversationRewindError extends Error {
+  constructor(code, message) {
+    super(message);
+    this.code = code;
+    this.name = "ConversationRewindError";
+  }
+}
+function transcriptPromptText(parsed) {
+  if (parsed?.type !== "user" || parsed.isSidechain || parsed.isMeta || parsed.isSynthetic) return null;
+  const content = parsed.message?.content;
+  if (typeof content === "string") return content.trim() ? content : null;
+  if (!Array.isArray(content) || content.some((block) => block?.type === "tool_result")) return null;
+  const text = content.filter((block) => block?.type === "text" && typeof block.text === "string").map((block) => block.text).join("\n");
+  if (!text.trim()) return content.length > 0 ? "" : null;
+  return text;
+}
+function isConversationEntry(parsed) {
+  return !parsed?.isSidechain && !parsed?.isMeta && !parsed?.isSynthetic && (parsed?.type === "user" || parsed?.type === "assistant");
+}
+function resolveRewindTarget(entries, target) {
+  for (const uuid of target.uuids) {
+    const index = entries.findIndex((entry) => entry.parsed?.uuid === uuid && transcriptPromptText(entry.parsed) !== null);
+    if (index >= 0) return index;
+  }
+  const wanted = target.text?.trim();
+  if (!wanted) throw new ConversationRewindError("not-found", "This message is not in the agent conversation");
+  const matches = [];
+  entries.forEach((entry, index) => {
+    if (transcriptPromptText(entry.parsed)?.trim() === wanted) matches.push(index);
+  });
+  if (matches.length === 1) return matches[0];
+  if (matches.length === 0) throw new ConversationRewindError("not-found", "This message is not in the agent conversation");
+  throw new ConversationRewindError("ambiguous", "Several earlier messages have the same text; cannot tell which one to change");
+}
+function rewindTranscriptLines(lines, action, target) {
+  const entries = [];
+  for (const line of lines) {
+    if (!line) continue;
+    let parsed = null;
+    try {
+      parsed = JSON.parse(line);
+    } catch {
+    }
+    entries.push({ line, parsed });
+  }
+  const cut = resolveRewindTarget(entries, target);
+  let end = entries.length;
+  for (let i = cut + 1; i < entries.length; i++) {
+    if (transcriptPromptText(entries[i].parsed) !== null) {
+      end = i;
+      break;
+    }
+  }
+  const before = entries.slice(0, cut);
+  const after = action === "delete" ? entries.slice(end) : [];
+  if (![...before, ...after].some((entry) => isConversationEntry(entry.parsed))) return null;
+  if (before.some((entry) => isConversationEntry(entry.parsed)) && !before.some((entry) => transcriptPromptText(entry.parsed) !== null)) {
+    throw new ConversationRewindError("unsafe", "Cannot safely rewind: earlier history has no user prompt");
+  }
+  if (after.length === 0) return before.map((entry) => entry.line);
+  const dropped = /* @__PURE__ */ new Set();
+  for (const entry of entries.slice(cut, end)) {
+    if (typeof entry.parsed?.uuid === "string") dropped.add(entry.parsed.uuid);
+  }
+  const reparentTo = typeof entries[cut].parsed?.parentUuid === "string" ? entries[cut].parsed.parentUuid : null;
+  const relinked = after.map((entry) => {
+    const parsed = entry.parsed;
+    if (!parsed || typeof parsed !== "object") return entry.line;
+    let next = parsed;
+    for (const key of ["parentUuid", "logicalParentUuid"]) {
+      if (typeof parsed[key] === "string" && dropped.has(parsed[key])) {
+        next = next === parsed ? { ...parsed } : next;
+        next[key] = reparentTo;
+      }
+    }
+    return next === parsed ? entry.line : JSON.stringify(next);
+  });
+  return [...before.map((entry) => entry.line), ...relinked];
+}
+async function rewindClaudeTranscript(projectDir, claudeSessionId, action, target) {
+  const source = join(projectDir, `${claudeSessionId}.jsonl`);
+  let raw;
+  try {
+    raw = await readFile(source, "utf-8");
+  } catch (error) {
+    if (error.code === "ENOENT") throw new ForkSourceMissingError(source);
+    throw error;
+  }
+  const kept = rewindTranscriptLines(raw.split("\n"), action, target);
+  if (kept === null) return null;
+  const newId = randomUUID();
+  const destination = join(projectDir, `${newId}.jsonl`);
+  const temporary = `${destination}.tmp-${process.pid}`;
+  try {
+    await writeFile(temporary, kept.join("\n") + "\n", { encoding: "utf-8", flag: "wx" });
+    await rename(temporary, destination);
+  } catch (error) {
+    await unlink(temporary).catch(() => void 0);
+    throw error;
+  }
+  return newId;
+}
+
+const STOP_WAIT_MS = 8e3;
+function createConversationRewind(deps) {
+  let inFlight = false;
+  const rewrite = deps.rewrite ?? rewindClaudeTranscript;
+  return async (input) => {
+    const request = input && typeof input === "object" ? input : {};
+    const action = request.action;
+    const sourceId = typeof request.sourceId === "string" && request.sourceId.length > 0 && request.sourceId.length <= 200 ? request.sourceId : void 0;
+    const text = typeof request.text === "string" && request.text.length <= 2e5 ? request.text : void 0;
+    if (action !== "edit" && action !== "delete" || !sourceId && !text?.trim()) {
+      return { ok: false, code: "invalid", error: "Invalid rewind request" };
+    }
+    if (inFlight) return { ok: false, code: "busy", error: "Another edit is still being applied" };
+    inFlight = true;
+    try {
+      if (deps.isThinking()) {
+        await deps.stopTurn();
+        if (!await deps.waitIdle(STOP_WAIT_MS)) {
+          return { ok: false, code: "running", error: "The agent did not stop; try again after it finishes" };
+        }
+      }
+      const current = deps.claudeSessionId();
+      if (!current) return { ok: false, code: "no-conversation", error: "The agent has no conversation to change yet" };
+      const uuids = sourceId ? [sourceId, ...deps.aliases(sourceId)] : [];
+      const next = await rewrite(deps.projectDir(), current, action, { uuids, text });
+      await deps.switchConversation(next);
+      return { ok: true, action, freshConversation: next === null };
+    } catch (error) {
+      if (error instanceof ConversationRewindError) return { ok: false, code: error.code, error: error.message };
+      if (error instanceof ForkSourceMissingError) return { ok: false, code: "no-conversation", error: "The agent conversation file is missing on this machine" };
+      throw error;
+    } finally {
+      inFlight = false;
+    }
+  };
+}
+
 const ABORT_INTERRUPT_GRACE_MS = 4e3;
 async function claudeRemoteLauncher(session, onPermissionModeChange, onEffectivePermissionMode, onPromptFinalized) {
   logger.debug("[claudeRemoteLauncher] Starting remote launcher");
@@ -2900,6 +3048,31 @@ async function claudeRemoteLauncher(session, onPermissionModeChange, onEffective
     await turnSteering.steer();
   });
   session.client.rpcHandlerManager.registerHandler("switch", doSwitch);
+  const promptAliases = /* @__PURE__ */ new Map();
+  const promptUuidFor = (sourceIds) => {
+    const [first, ...rest] = sourceIds ?? [];
+    if (first) for (const id of rest) promptAliases.set(id, first);
+    if (promptAliases.size > 2e3) promptAliases.delete(promptAliases.keys().next().value);
+    return first;
+  };
+  let silentRelaunch = false;
+  session.client.rpcHandlerManager.registerHandler("conversation-rewind", createConversationRewind({
+    claudeSessionId: () => session.sessionId,
+    projectDir: () => getProjectPath(session.path),
+    isThinking: () => session.thinking,
+    stopTurn: doAbort,
+    waitIdle: waitForThinkingToStop,
+    aliases: (sourceId) => {
+      const alias = promptAliases.get(sourceId);
+      return alias ? [alias] : [];
+    },
+    switchConversation: async (claudeSessionId) => {
+      if (claudeSessionId) session.onSessionFound(claudeSessionId);
+      else session.clearSessionId();
+      silentRelaunch = true;
+      await abort();
+    }
+  }));
   let livePermissionModeHandler = null;
   let idlePermissionModeHandler = null;
   session.client.rpcHandlerManager.registerHandler(
@@ -3123,7 +3296,8 @@ async function claudeRemoteLauncher(session, onPermissionModeChange, onEffective
                 }) : [];
                 modeGate.park({
                   message: parkedStaged.length > 0 ? appendStagedAttachmentsToPrompt(msg.message, parkedStaged) : msg.message,
-                  mode: msg.mode
+                  mode: msg.mode,
+                  uuid: promptUuidFor(msg.sourceIds)
                 });
                 return null;
               }
@@ -3141,14 +3315,16 @@ async function claudeRemoteLauncher(session, onPermissionModeChange, onEffective
                 return {
                   message: withAttachments,
                   mode: msg.mode,
-                  enqueuedAt: msg.enqueuedAt
+                  enqueuedAt: msg.enqueuedAt,
+                  uuid: promptUuidFor(msg.sourceIds)
                 };
               }
               onPromptFinalized?.(msg.message);
               return {
                 message: msg.message,
                 mode: msg.mode,
-                enqueuedAt: msg.enqueuedAt
+                enqueuedAt: msg.enqueuedAt,
+                uuid: promptUuidFor(msg.sourceIds)
               };
             }
             return null;
@@ -3249,7 +3425,7 @@ async function claudeRemoteLauncher(session, onPermissionModeChange, onEffective
           signal: abortController.signal
         });
         session.consumeOneTimeFlags();
-        if (!exitReason && abortController.signal.aborted) {
+        if (!exitReason && abortController.signal.aborted && !silentRelaunch) {
           session.client.closeClaudeSessionTurn("cancelled");
           session.client.sendSessionEvent({ type: "message", message: "Aborted by user" });
         }
@@ -3292,6 +3468,7 @@ async function claudeRemoteLauncher(session, onPermissionModeChange, onEffective
         streamRelay.endTurn();
         streamRelay.dispose();
         abortController = null;
+        silentRelaunch = false;
         abortFuture?.resolve(void 0);
         abortFuture = null;
         logger.debug("[remote]: launch done");
@@ -3349,7 +3526,7 @@ async function loop(opts) {
     logger.debug(`[loop] Iteration with mode: ${mode}`);
     switch (mode) {
       case "local": {
-        const { claudeLocalLauncher } = await import('./claudeLocalLauncher-CDqQI9ak.mjs');
+        const { claudeLocalLauncher } = await import('./claudeLocalLauncher-DFkwLMqU.mjs');
         const result = await claudeLocalLauncher(session);
         switch (result.type) {
           case "switch":