very-happy-cli 0.2.161 → 0.2.162

package/dist/{runClaudeDeps-Bp20MScE.cjs → runClaudeDeps-DW-8lnHv.cjs}

@@ -1,46 +1,48 @@
 'use strict';
 
-var logger = require('./logger-Bc8-u1w0.cjs');
-var controlClient = require('./controlClient-fEHE85bH.cjs');
+var logger = require('./logger-7ucWm9wp.cjs');
+var controlClient = require('./controlClient-BXktrQ4z.cjs');
 var backgroundTaskActivity = require('./backgroundTaskActivity-CBvUdj39.cjs');
 var node_crypto = require('node:crypto');
 var messageBuffer = require('./messageBuffer-fJMH6uY8.cjs');
 var index = require('./index-D3kI0hDR.cjs');
 var claudeAgentSdk = require('@anthropic-ai/claude-agent-sdk');
 var permissionMode = require('./permissionMode-CrV-XuMs.cjs');
-var systemPrompt = require('./systemPrompt-BygJcmbi.cjs');
+var systemPrompt = require('./systemPrompt-CyEz_IfR.cjs');
 var path$1 = require('node:path');
 var specialCommands = require('./specialCommands-DSsTeRej.cjs');
 require('axios');
 require('node:events');
 require('socket.io-client');
-var attachmentLimits = require('./attachmentLimits-CzVrqgLR.cjs');
+var attachmentLimits = require('./attachmentLimits-DzlBPyJP.cjs');
 require('tweetnacl');
-var configuration = require('./configuration-v9f8LM9T.cjs');
-require('./index-DA7yINuk.cjs');
-require('./registerCommonHandlers-BjSV2Skz.cjs');
+var configuration = require('./configuration-UsI0sxEv.cjs');
+require('./index-DJ-oV52i.cjs');
+require('./registerCommonHandlers-CMROPdJz.cjs');
 require('os');
 require('child_process');
 require('@paralleldrive/cuid2');
-require('./persistence-CBNMzSa8.cjs');
+require('./persistence-i0nQMLlk.cjs');
 var contentLogMetadata = require('./contentLogMetadata-ZSFk_NjQ.cjs');
 require('chalk');
 var types = require('./types-CRS-srZK.cjs');
 var path = require('./path-B7zW-WwE.cjs');
 var fs = require('fs/promises');
-var time = require('./time-CNRE4ChD.cjs');
+var time = require('./time-CLwVAz6s.cjs');
 var node_fs = require('node:fs');
-var deterministicJson = require('./deterministicJson-DKDP_mM-.cjs');
-var sessionScanner = require('./sessionScanner-D1goKdd3.cjs');
+var deterministicJson = require('./deterministicJson-eha_oMZ2.cjs');
+var sessionScanner = require('./sessionScanner-aLEv7mD3.cjs');
 var node_child_process = require('node:child_process');
-var streamRelay = require('./streamRelay-BiKw59Cc.cjs');
-var attachmentContent = require('./attachmentContent-DMMZzevR.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-6TC2S3lf.cjs');
-var doctor = require('./doctor-hVNnSZJn.cjs');
+var streamRelay = require('./streamRelay-DnObXZZj.cjs');
+var attachmentContent = require('./attachmentContent-GHOk6Muq.cjs');
+var promises = require('node:fs/promises');
+var claudeSessionFork = require('./claudeSessionFork-D9-mANmu.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-CA9-oelM.cjs');
+var doctor = require('./doctor-DunLBgVi.cjs');
 var node_http = require('node:http');
 var editPaths = require('./editPaths-Bqp4OFPw.cjs');
 var projectPath = require('./projectPath-ChLhdOyt.cjs');
-var titleGenerator = require('./titleGenerator-CFRhU-xq.cjs');
+var titleGenerator = require('./titleGenerator-FDpdizn7.cjs');
 var oneShotPrompts = require('./oneShotPrompts-CL0dip9C.cjs');
 require('node:util');
 require('./smallFastModel-D_uxGMo3.cjs');
@@ -48,34 +50,34 @@ require('./trimIdent-4gvk9Wk6.cjs');
 require('node:os');
 require('./agentGuidance-B5NATuFa.cjs');
 require('zod');
-require('./package-Cl5BEP5x.cjs');
-require('node:fs/promises');
+require('./package-D1A-8ZJy.cjs');
 require('util');
 require('crypto');
 require('path');
 require('cross-spawn');
 require('./authRelay-BdYkC1Po.cjs');
-require('./client-C_axwRry.cjs');
-require('./context-B45vMtSZ.cjs');
-require('./sessionOps-DJdExmBy.cjs');
+require('./client-DiBTHWNU.cjs');
+require('./context-0FjjA4vJ.cjs');
+require('./sessionOps-GsELm2PZ.cjs');
 require('./resources-JDPugcDq.cjs');
-require('./tools-lMDra4Pv.cjs');
-require('./tools-CsSovyNp.cjs');
-require('./client-DOBWJL3u.cjs');
-require('./peerTools-CIeiy9wn.cjs');
+require('./tools-O5beDK-s.cjs');
+require('./tools-CGxq3I52.cjs');
+require('./client-CVQJWqjx.cjs');
+require('./peerTools-DLwNaEEV.cjs');
 require('./ids-B6ZC0HGt.cjs');
-require('./remoteSessionClient-BNx78NLb.cjs');
+require('./remoteSessionClient-DX9jHLeW.cjs');
 require('@modelcontextprotocol/sdk/server/mcp.js');
 require('@modelcontextprotocol/sdk/server/streamableHttp.js');
 require('./limits-C-a7gr04.cjs');
-require('./assistantTools-BfA0R3_m.cjs');
+require('./assistantTools-CwESq24n.cjs');
 require('./terminals-B_bfC9c2.cjs');
 require('./terminalTitleSuggest-DhvRFX3H.cjs');
 require('./tmuxSocket-D-Xt6Vn-.cjs');
-require('./bootstrap-CkgIq8N3.cjs');
+require('./bootstrap-DvZjEa9_.cjs');
 require('./previewPath-B0rBdhy1.cjs');
-require('./sync-CVk4QERO.cjs');
-require('./startFileWatcher-CKKx-8ZO.cjs');
+require('./sync-Dj92ZJ8Y.cjs');
+require('./startFileWatcher-C2HC2_Dg.cjs');
+require('node:readline');
 require('./doctor-u46qYYKX.cjs');
 require('ps-list');
 require('./doctorReadiness-BCZGcN0a.cjs');
@@ -987,6 +989,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 && !systemPrompt.claudeCheckSession(opts.sessionId, opts.path)) {
@@ -1239,6 +1245,7 @@ async function claudeRemote(opts) {
     type: "user",
     parent_tool_use_id: null,
     origin: { kind: "human" },
+    ...promptUuid(initial.uuid),
     message: {
       role: "user",
       content: initial.message
@@ -1427,6 +1434,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(() => {
@@ -2804,6 +2812,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 = path$1.join(projectDir, `${claudeSessionId}.jsonl`);
+  let raw;
+  try {
+    raw = await promises.readFile(source, "utf-8");
+  } catch (error) {
+    if (error.code === "ENOENT") throw new claudeSessionFork.ForkSourceMissingError(source);
+    throw error;
+  }
+  const kept = rewindTranscriptLines(raw.split("\n"), action, target);
+  if (kept === null) return null;
+  const newId = node_crypto.randomUUID();
+  const destination = path$1.join(projectDir, `${newId}.jsonl`);
+  const temporary = `${destination}.tmp-${process.pid}`;
+  try {
+    await promises.writeFile(temporary, kept.join("\n") + "\n", { encoding: "utf-8", flag: "wx" });
+    await promises.rename(temporary, destination);
+  } catch (error) {
+    await promises.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 claudeSessionFork.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.logger.debug("[claudeRemoteLauncher] Starting remote launcher");
@@ -2898,6 +3046,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: () => path.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(
@@ -3121,7 +3294,8 @@ async function claudeRemoteLauncher(session, onPermissionModeChange, onEffective
                 }) : [];
                 modeGate.park({
                   message: parkedStaged.length > 0 ? attachmentContent.appendStagedAttachmentsToPrompt(msg.message, parkedStaged) : msg.message,
-                  mode: msg.mode
+                  mode: msg.mode,
+                  uuid: promptUuidFor(msg.sourceIds)
                 });
                 return null;
               }
@@ -3139,14 +3313,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;
@@ -3247,7 +3423,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" });
         }
@@ -3290,6 +3466,7 @@ async function claudeRemoteLauncher(session, onPermissionModeChange, onEffective
         streamRelay$1.endTurn();
         streamRelay$1.dispose();
         abortController = null;
+        silentRelaunch = false;
         abortFuture?.resolve(void 0);
         abortFuture = null;
         logger.logger.debug("[remote]: launch done");
@@ -3347,7 +3524,7 @@ async function loop(opts) {
     logger.logger.debug(`[loop] Iteration with mode: ${mode}`);
     switch (mode) {
       case "local": {
-        const { claudeLocalLauncher } = await Promise.resolve().then(function () { return require('./claudeLocalLauncher-Bd5I2-j6.cjs'); });
+        const { claudeLocalLauncher } = await Promise.resolve().then(function () { return require('./claudeLocalLauncher-DWFWuLhY.cjs'); });
         const result = await claudeLocalLauncher(session);
         switch (result.type) {
           case "switch":