very-happy-cli 0.2.122 → 0.2.124

package/dist/{types-q7wtjfxb.mjs → types-gDOmwOKw.mjs}

@@ -29,7 +29,7 @@ import { SandboxManager } from '@anthropic-ai/sandbox-runtime';
 import { Expo } from 'expo-server-sdk';
 
 var name = "very-happy-cli";
-var version = "0.2.122";
+var version = "0.2.124";
 var description = "Remote multi-agent workspace CLI with deep Claude integration, native terminal streaming, and self-hosting.";
 var author = "Kirill Dubovitskiy";
 var contributors = [
@@ -142,12 +142,12 @@ var dependencies = {
 	zod: "^4.0.0"
 };
 var optionalDependencies = {
-	"very-happy-tools-arm64-darwin": "0.2.122",
-	"very-happy-tools-x64-darwin": "0.2.122",
-	"very-happy-tools-arm64-linux": "0.2.122",
-	"very-happy-tools-x64-linux": "0.2.122",
-	"very-happy-tools-arm64-win32": "0.2.122",
-	"very-happy-tools-x64-win32": "0.2.122"
+	"very-happy-tools-arm64-darwin": "0.2.124",
+	"very-happy-tools-x64-darwin": "0.2.124",
+	"very-happy-tools-arm64-linux": "0.2.124",
+	"very-happy-tools-x64-linux": "0.2.124",
+	"very-happy-tools-arm64-win32": "0.2.124",
+	"very-happy-tools-x64-win32": "0.2.124"
 };
 var devDependencies = {
 	"@slopus/happy-wire": "workspace:*",
@@ -1019,6 +1019,8 @@ const ConnectionDiagnosticEventSchema = z$1.object({
   durationMs: z$1.number().int().min(0).max(3e5),
   deviceClass: z$1.enum(["mobile", "desktop", "unknown"]),
   visibility: z$1.enum(["visible", "hidden"]),
+  relayRegion: z$1.enum(["central", "sg", "us", "other", "unknown"]).optional(),
+  timing: z$1.enum(["active", "background", "censored", "unknown"]).optional(),
   client: z$1.string().regex(/^web\/(?:[a-f0-9]{7,40}|unknown)$/)
 }).strict();
 z$1.object({
@@ -1073,6 +1075,7 @@ const CliUpdateStateSchema = z$1.object({
   /** B-351: the version this machine may install by itself. Pinned separately
    *  from `recommendedVersion`; null means no unattended install. */
   autoUpdateVersion: z$1.string().nullable().optional(),
+  retrySupported: z$1.boolean().optional(),
   checkedAt: z$1.number(),
   /**
    * B-321: a new bundle is on disk but refused to run, so the daemon is still
@@ -13196,6 +13199,18 @@ function isUserPrompt(parsed) {
   const content = parsed.message?.content;
   return typeof content === "string";
 }
+function hasPromptAttachments(parsed) {
+  const content = parsed.message?.content;
+  return typeof content === "string" && content.includes("<attached_files>") || Array.isArray(content) && content.some((block) => block?.type !== "text" || typeof block.text === "string" && block.text.includes("<attached_files>"));
+}
+function userPromptText(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");
+  return text.trim() ? text : null;
+}
 async function discardForkedSession(projectDir, claudeSessionId) {
   try {
     await unlink$1(jsonlPath(projectDir, claudeSessionId));
@@ -13295,23 +13310,68 @@ async function listClaudeRewindPoints(projectDir, claudeSessionId) {
     } catch {
       continue;
     }
-    if (parsed?.type !== "user") continue;
-    if (parsed.isSidechain) continue;
+    const content = userPromptText(parsed);
+    if (content === null) continue;
     if (typeof parsed.uuid !== "string" || parsed.uuid.length === 0) continue;
-    const content = parsed.message?.content;
-    if (typeof content !== "string") continue;
-    const trimmed = content.trim();
-    if (trimmed.length === 0) continue;
     const timestampRaw = parsed.timestamp;
     const timestamp = typeof timestampRaw === "string" ? Date.parse(timestampRaw) : typeof timestampRaw === "number" ? timestampRaw : Date.now();
     points.push({
       uuid: parsed.uuid,
       text: content,
+      ...hasPromptAttachments(parsed) ? { hasAttachments: true } : {},
       timestamp: Number.isFinite(timestamp) ? timestamp : Date.now()
     });
   }
   return points;
 }
+async function forkBeforeUserMessage(projectDir, sourceClaudeSessionId, cutBeforeUuid) {
+  const src = jsonlPath(projectDir, sourceClaudeSessionId);
+  let raw;
+  try {
+    raw = await readFile$1(src, "utf-8");
+  } catch (error) {
+    if (error.code === "ENOENT") throw new ForkSourceMissingError(src);
+    throw error;
+  }
+  const lines = raw.split("\n");
+  let hasPreviousConversation = false;
+  let hasPreviousPrompt = false;
+  let cut = -1;
+  for (let i = 0; i < lines.length; i++) {
+    let entry;
+    try {
+      entry = JSON.parse(lines[i]);
+    } catch {
+      continue;
+    }
+    if (userPromptText(entry) !== null && entry.uuid === cutBeforeUuid) {
+      if (hasPromptAttachments(entry)) throw new Error("Cannot edit and rerun a message with attachments");
+      cut = i;
+      break;
+    }
+    if (!entry?.isSidechain && !entry?.isMeta && !entry?.isSynthetic && (entry?.type === "user" || entry?.type === "assistant")) {
+      hasPreviousConversation = true;
+      const content = entry.message?.content;
+      if (entry.type === "user" && (typeof content === "string" || Array.isArray(content) && content.length > 0 && !content.some((block) => block?.type === "tool_result"))) {
+        hasPreviousPrompt = true;
+      }
+    }
+  }
+  if (cut < 0) throw new ForkTruncateUuidNotFoundError(cutBeforeUuid, src);
+  if (!hasPreviousConversation) return null;
+  if (!hasPreviousPrompt) throw new Error("Cannot safely rewind: earlier history has no user prompt");
+  const newId = randomUUID$1();
+  const destination = jsonlPath(projectDir, newId);
+  const temporary = `${destination}.tmp-${process.pid}`;
+  try {
+    await writeFile(temporary, lines.slice(0, cut).join("\n") + "\n", { encoding: "utf-8", flag: "wx" });
+    await rename$1(temporary, destination);
+  } catch (error) {
+    await unlink$1(temporary).catch(() => void 0);
+    throw error;
+  }
+  return newId;
+}
 
 function serializedByteLength(value) {
   try {
@@ -14588,6 +14648,14 @@ class CodexForkRewindPointNotFoundError extends Error {
     this.name = "CodexForkRewindPointNotFoundError";
   }
 }
+function hasUserAttachments(item) {
+  const content = item.content;
+  return Array.isArray(content) && content.some((part) => !part || typeof part !== "object" || part.type !== "text" || typeof part.text === "string" && part.text.includes("<attached_files>"));
+}
+function rejectAttachedTarget(thread, itemId) {
+  const item = thread.turns?.flatMap((turn) => turn.items ?? []).find((item2) => item2.id === itemId);
+  if (item && hasUserAttachments(item)) throw new Error("Cannot edit and rerun a message with attachments");
+}
 function textFromUserItem(item) {
   if (item.type !== "userMessage") {
     return null;
@@ -14614,6 +14682,7 @@ function listCodexRewindPoints(thread) {
       points.push({
         itemId: item.id,
         text,
+        ...hasUserAttachments(item) ? { hasAttachments: true } : {},
         timestamp: timestampFromTurn(turn)
       });
     }
@@ -14671,6 +14740,37 @@ async function forkCodexThread(client, opts) {
     newCodexThreadId: forked.threadId
   };
 }
+async function forkCodexBeforeUserMessage(client, opts) {
+  const { thread: source } = await client.readThread({ threadId: opts.threadId, includeTurns: true });
+  rejectAttachedTarget(source, opts.cutBeforeItemId);
+  const sourceCut = findCutTurn(source, opts.cutBeforeItemId);
+  if (!sourceCut) throw new CodexForkRewindPointNotFoundError(opts.cutBeforeItemId, opts.threadId);
+  if ((source.turns?.[sourceCut.index].items ?? []).findIndex((item) => item.id === opts.cutBeforeItemId) !== 0) {
+    throw new Error("Cannot safely rewind a user message inside an existing turn");
+  }
+  if (sourceCut.index === 0) return { type: "success", startFresh: true };
+  const forked = await client.forkThread({ threadId: opts.threadId, cwd: opts.cwd });
+  if (forked.threadId === opts.threadId) throw new Error("Codex did not create an independent fork");
+  rejectAttachedTarget(forked.thread, opts.cutBeforeItemId);
+  const cut = findCutTurn(forked.thread, opts.cutBeforeItemId);
+  if (!cut) throw new CodexForkRewindPointNotFoundError(opts.cutBeforeItemId, opts.threadId);
+  const turns = forked.thread.turns ?? [];
+  const items = turns[cut.index].items ?? [];
+  if (items.findIndex((item) => item.id === opts.cutBeforeItemId) !== 0) {
+    throw new Error("Cannot safely rewind a user message inside an existing turn");
+  }
+  if (cut.index === 0) return { type: "success", startFresh: true };
+  const expectedTurnIds = turns.slice(0, cut.index).map((turn) => turn.id);
+  const { thread } = await client.rollbackThread({
+    threadId: forked.threadId,
+    numTurns: turns.length - cut.index
+  });
+  const remaining = thread.turns ?? [];
+  if (remaining.length !== cut.index || remaining.some((turn, index) => turn.id !== expectedTurnIds[index])) {
+    throw new Error("Codex rollback did not preserve the expected history");
+  }
+  return { type: "success", newCodexThreadId: forked.threadId };
+}
 
 const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 function requireNonEmptyString(value, name) {
@@ -14803,6 +14903,9 @@ class ApiMachineClient {
   encTerminalData(dataBase64) {
     return encodeBase64(encrypt(this.machine.encryptionKey, this.machine.encryptionVariant, dataBase64));
   }
+  setCliUpdateRetryHandler(handler) {
+    this.rpcHandlerManager.registerHandler("cli-update-retry", (params) => handler(params && typeof params === "object" ? params.version : void 0));
+  }
   /** Cache the latest relay policy locally and publish it now or on the next
    * socket connect. This makes startup/offline races harmless. */
   setCliUpdateState(state) {
@@ -15172,6 +15275,26 @@ class ApiMachineClient {
         throw error;
       }
     });
+    this.rpcHandlerManager.registerHandler("claude-rewind-before-message", async (params) => {
+      const directory = requireNonEmptyString(params?.directory, "directory");
+      const claudeSessionId = requireNonEmptyString(params?.claudeSessionId, "claudeSessionId");
+      const cutBeforeUuid = requireNonEmptyString(params?.cutBeforeUuid, "cutBeforeUuid");
+      if (!UUID_RE.test(claudeSessionId) || !UUID_RE.test(cutBeforeUuid)) {
+        throw new Error("claudeSessionId and cutBeforeUuid must be valid UUIDs");
+      }
+      const newClaudeSessionId = await forkBeforeUserMessage(getProjectPath(directory), claudeSessionId, cutBeforeUuid);
+      return newClaudeSessionId === null ? { type: "success", startFresh: true } : { type: "success", newClaudeSessionId };
+    });
+    this.rpcHandlerManager.registerHandler("codex-rewind-before-message", async (params) => {
+      const directory = requireNonEmptyString(params?.directory, "directory");
+      const codexThreadId = requireNonEmptyString(params?.codexThreadId, "codexThreadId");
+      const cutBeforeItemId = requireNonEmptyString(params?.cutBeforeItemId, "cutBeforeItemId");
+      return withCodexAppServerClient((client) => forkCodexBeforeUserMessage(client, {
+        threadId: codexThreadId,
+        cwd: directory,
+        cutBeforeItemId
+      }));
+    });
     this.rpcHandlerManager.registerHandler("stop-daemon", () => {
       logger.debug("[API MACHINE] Received stop-daemon RPC request");
       setTimeout(() => {
@@ -16814,4 +16937,4 @@ const RawJSONLinesSchema = z$1.discriminatedUnion("type", [
   }).passthrough()
 ]);
 
-export { scrubTmuxClientEnv as $, ApiClient as A, commandOnPath as B, readCredentials as C, credentialRelayProblem as D, deriveLocalCliUpdateSummary as E, readSettingsOutcome as F, updateSettings as G, encodeBase64Url as H, InvalidateSync as I, decodeBase64 as J, writeCredentialsLegacy as K, writeCredentialsDataKey as L, MAX_CHAT_ATTACHMENT_SOURCE_BYTES as M, readCredentialsForConfiguredRelay as N, encrypt as O, isClaudeSessionId as P, getLocalHappyAgentCredentialPath as Q, RawJSONLinesSchema as R, STREAM_DELTA_MAX_CHARS as S, readLocalHappyAgentCredentials as T, decryptWithDataKey as U, decryptLegacy as V, compareExactVersions as W, extractCompleteLines as X, decideBackfill as Y, parseTerminalHookPayload as Z, tmuxArgs as _, ApiSessionClient as a, decideMirrorBinding as a0, MIRROR_BACKFILL_LINES_DEFAULT as a1, persistSession as a2, mirrorLineKey as a3, mirrorLocalId as a4, detectCLIAvailability as a5, detectResumeSupport as a6, acquireDaemonLock as a7, summarizeSpawnSessionForLog as a8, deletePersistedSessions as a9, shellescape as aa, decrypt as ab, writeDaemonState as ac, writeSettings as ad, fetchCliUpdateState as ae, resolveCliUpdateCheckInterval as af, DEFAULT_CLI_UPDATE_CHECK_INTERVAL_MS as ag, releaseDaemonLock as ah, listVhTerminals as ai, isValidTerminalId as aj, readVhTerminal as ak, sendToVhTerminal as al, TITLE_PROMPT_PREFIX as am, BOARD_ANALYZER_PROMPT_PREFIX as an, startOfflineReconnection as ao, clearCredentials as ap, clearMachineId as aq, SandboxConfigSchema as ar, CodexAppServerClient as as, getLatestDaemonLog as at, persistence as au, api as av, createEnvelope as b, configuration as c, connectionState as d, readSettings as e, encodeBase64 as f, contentLogMetadata as g, errorLogMetadata as h, isValidSessionId as i, packageJson as j, delay as k, logger as l, ensurePrivateDirectorySync as m, hardenPrivateFileSync as n, readDaemonState as o, projectPath as p, clearDaemonState as q, readPersistedSessions as r, streamKeyOf as s, getProjectPath as t, initializeSandbox as u, wrapCommand as v, writePrivateFileSync as w, AsyncLock as x, ensurePrivateDirectory as y, hardenPrivateFile as z };
+export { tmuxArgs as $, ApiClient as A, commandOnPath as B, readCredentials as C, credentialRelayProblem as D, deriveLocalCliUpdateSummary as E, readSettingsOutcome as F, updateSettings as G, encodeBase64Url as H, InvalidateSync as I, decodeBase64 as J, writeCredentialsLegacy as K, writeCredentialsDataKey as L, MAX_CHAT_ATTACHMENT_SOURCE_BYTES as M, readCredentialsForConfiguredRelay as N, encrypt as O, isClaudeSessionId as P, getLocalHappyAgentCredentialPath as Q, RawJSONLinesSchema as R, STREAM_DELTA_MAX_CHARS as S, readLocalHappyAgentCredentials as T, decryptWithDataKey as U, decryptLegacy as V, parseExactVersion as W, compareExactVersions as X, extractCompleteLines as Y, decideBackfill as Z, parseTerminalHookPayload as _, ApiSessionClient as a, scrubTmuxClientEnv as a0, decideMirrorBinding as a1, MIRROR_BACKFILL_LINES_DEFAULT as a2, persistSession as a3, mirrorLineKey as a4, mirrorLocalId as a5, detectCLIAvailability as a6, detectResumeSupport as a7, acquireDaemonLock as a8, summarizeSpawnSessionForLog as a9, deletePersistedSessions as aa, shellescape as ab, decrypt as ac, writeDaemonState as ad, writeSettings as ae, fetchCliUpdateState as af, resolveCliUpdateCheckInterval as ag, DEFAULT_CLI_UPDATE_CHECK_INTERVAL_MS as ah, releaseDaemonLock as ai, listVhTerminals as aj, isValidTerminalId as ak, readVhTerminal as al, sendToVhTerminal as am, TITLE_PROMPT_PREFIX as an, BOARD_ANALYZER_PROMPT_PREFIX as ao, startOfflineReconnection as ap, clearCredentials as aq, clearMachineId as ar, SandboxConfigSchema as as, CodexAppServerClient as at, getLatestDaemonLog as au, persistence as av, api as aw, createEnvelope as b, configuration as c, connectionState as d, readSettings as e, encodeBase64 as f, contentLogMetadata as g, errorLogMetadata as h, isValidSessionId as i, packageJson as j, delay as k, logger as l, ensurePrivateDirectorySync as m, hardenPrivateFileSync as n, readDaemonState as o, projectPath as p, clearDaemonState as q, readPersistedSessions as r, streamKeyOf as s, getProjectPath as t, initializeSandbox as u, wrapCommand as v, writePrivateFileSync as w, AsyncLock as x, ensurePrivateDirectory as y, hardenPrivateFile as z };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "very-happy-cli",
-  "version": "0.2.122",
+  "version": "0.2.124",
   "description": "Remote multi-agent workspace CLI with deep Claude integration, native terminal streaming, and self-hosting.",
   "author": "Kirill Dubovitskiy",
   "contributors": [
@@ -113,12 +113,12 @@
     "zod": "^4.0.0"
   },
   "optionalDependencies": {
-    "very-happy-tools-arm64-darwin": "0.2.122",
-    "very-happy-tools-x64-darwin": "0.2.122",
-    "very-happy-tools-arm64-linux": "0.2.122",
-    "very-happy-tools-x64-linux": "0.2.122",
-    "very-happy-tools-arm64-win32": "0.2.122",
-    "very-happy-tools-x64-win32": "0.2.122"
+    "very-happy-tools-arm64-darwin": "0.2.124",
+    "very-happy-tools-x64-darwin": "0.2.124",
+    "very-happy-tools-arm64-linux": "0.2.124",
+    "very-happy-tools-x64-linux": "0.2.124",
+    "very-happy-tools-arm64-win32": "0.2.124",
+    "very-happy-tools-x64-win32": "0.2.124"
   },
   "devDependencies": {
     "@slopus/happy-wire": "workspace:*",