very-happy-cli 0.2.122 → 0.2.124

package/dist/index.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
 require('chalk');
-require('./index-DKRU6E-x.cjs');
-require('./types-Jag0GwhO.cjs');
+require('./index-DI_VC3vJ.cjs');
+require('./types-CZIwVSN2.cjs');
 require('zod');
 require('node:child_process');
 require('node:os');

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import 'chalk';
-import './index-BTnlYGaP.mjs';
-import './types-q7wtjfxb.mjs';
+import './index-SQKnWyz-.mjs';
+import './types-gDOmwOKw.mjs';
 import 'zod';
 import 'node:child_process';
 import 'node:os';

package/dist/{installTerminalHooks-CGqopr1A.cjs → installTerminalHooks-CvMt8cBI.cjs}

@@ -5,8 +5,8 @@ var path = require('node:path');
 var os = require('node:os');
 var node_child_process = require('node:child_process');
 var chalk = require('chalk');
-var persistence = require('./types-Jag0GwhO.cjs');
-var index = require('./index-DKRU6E-x.cjs');
+var persistence = require('./types-CZIwVSN2.cjs');
+var index = require('./index-DI_VC3vJ.cjs');
 require('axios');
 require('node:util');
 require('node:fs/promises');

package/dist/{installTerminalHooks-DFmKhCto.mjs → installTerminalHooks-Df4hzzdM.mjs}

@@ -3,8 +3,8 @@ import { join, resolve } from 'node:path';
 import { homedir } from 'node:os';
 import { spawnSync } from 'node:child_process';
 import chalk from 'chalk';
-import { p as projectPath } from './types-q7wtjfxb.mjs';
-import { t as tmuxSupportsSessionEnv } from './index-BTnlYGaP.mjs';
+import { p as projectPath } from './types-gDOmwOKw.mjs';
+import { t as tmuxSupportsSessionEnv } from './index-SQKnWyz-.mjs';
 import 'axios';
 import 'node:util';
 import 'node:fs/promises';

package/dist/lib.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var persistence = require('./types-Jag0GwhO.cjs');
+var persistence = require('./types-CZIwVSN2.cjs');
 require('axios');
 require('chalk');
 require('node:util');

package/dist/lib.d.cts

@@ -341,6 +341,7 @@ declare const CliUpdateStateSchema: z$1.ZodObject<{
         required: "required";
     }>;
     autoUpdateVersion: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodString>>;
+    retrySupported: z$1.ZodOptional<z$1.ZodBoolean>;
     checkedAt: z$1.ZodNumber;
     handoverHold: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodObject<{
         reason: z$1.ZodString;
@@ -436,6 +437,7 @@ declare const DaemonStateSchema: z$1.ZodObject<{
             required: "required";
         }>;
         autoUpdateVersion: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodString>>;
+        retrySupported: z$1.ZodOptional<z$1.ZodBoolean>;
         checkedAt: z$1.ZodNumber;
         handoverHold: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodObject<{
             reason: z$1.ZodString;
@@ -1363,6 +1365,11 @@ declare class ApiMachineClient {
      *  and the open-terminal snapshot/replay payloads. */
     private encTerminalData;
     constructor(token: string, machine: Machine);
+    setCliUpdateRetryHandler(handler: (version: unknown) => Promise<{
+        accepted: true;
+    } | {
+        error: string;
+    }>): void;
     /** Cache the latest relay policy locally and publish it now or on the next
      * socket connect. This makes startup/offline races harmless. */
     setCliUpdateState(state: CliUpdateState | null): void;

package/dist/lib.d.mts

@@ -341,6 +341,7 @@ declare const CliUpdateStateSchema: z$1.ZodObject<{
         required: "required";
     }>;
     autoUpdateVersion: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodString>>;
+    retrySupported: z$1.ZodOptional<z$1.ZodBoolean>;
     checkedAt: z$1.ZodNumber;
     handoverHold: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodObject<{
         reason: z$1.ZodString;
@@ -436,6 +437,7 @@ declare const DaemonStateSchema: z$1.ZodObject<{
             required: "required";
         }>;
         autoUpdateVersion: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodString>>;
+        retrySupported: z$1.ZodOptional<z$1.ZodBoolean>;
         checkedAt: z$1.ZodNumber;
         handoverHold: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodObject<{
             reason: z$1.ZodString;
@@ -1363,6 +1365,11 @@ declare class ApiMachineClient {
      *  and the open-terminal snapshot/replay payloads. */
     private encTerminalData;
     constructor(token: string, machine: Machine);
+    setCliUpdateRetryHandler(handler: (version: unknown) => Promise<{
+        accepted: true;
+    } | {
+        error: string;
+    }>): void;
     /** Cache the latest relay policy locally and publish it now or on the next
      * socket connect. This makes startup/offline races harmless. */
     setCliUpdateState(state: CliUpdateState | null): void;

package/dist/lib.mjs

@@ -1,4 +1,4 @@
-export { A as ApiClient, a as ApiSessionClient, R as RawJSONLinesSchema, c as configuration, l as logger } from './types-q7wtjfxb.mjs';
+export { A as ApiClient, a as ApiSessionClient, R as RawJSONLinesSchema, c as configuration, l as logger } from './types-gDOmwOKw.mjs';
 import 'axios';
 import 'chalk';
 import 'node:util';

package/dist/{mcp-DnKBKXYa.mjs → mcp-C0oW5u-b.mjs}

@@ -1,9 +1,9 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import { z } from 'zod';
-import { p as pushClipboardViaDaemon, k as setTerminalTitleViaDaemon, m as registerAssistantSessionTools } from './index-BTnlYGaP.mjs';
+import { p as pushClipboardViaDaemon, k as setTerminalTitleViaDaemon, m as registerAssistantSessionTools } from './index-SQKnWyz-.mjs';
 import { C as CLIPBOARD_TOOL_NAME, a as CLIPBOARD_TOOL_TITLE, b as CLIPBOARD_TOOL_DESCRIPTION, c as CLIPBOARD_MAX_BYTES } from './limits-CwFb5S2b.mjs';
-import { l as logger } from './types-q7wtjfxb.mjs';
+import { l as logger } from './types-gDOmwOKw.mjs';
 import 'node:fs/promises';
 import 'node:os';
 import 'node:crypto';

package/dist/{mcp-FlbfMw6_.cjs → mcp-DnyLwSPq.cjs}

@@ -3,9 +3,9 @@
 var mcp_js = require('@modelcontextprotocol/sdk/server/mcp.js');
 var stdio_js = require('@modelcontextprotocol/sdk/server/stdio.js');
 var z = require('zod');
-var index = require('./index-DKRU6E-x.cjs');
+var index = require('./index-DI_VC3vJ.cjs');
 var limits = require('./limits-KdWKmwtH.cjs');
-var persistence = require('./types-Jag0GwhO.cjs');
+var persistence = require('./types-CZIwVSN2.cjs');
 require('node:fs/promises');
 require('node:os');
 require('node:crypto');

package/dist/{runGemini-DYawZQTu.cjs → runGemini-_FHrxuHN.cjs}

@@ -4,10 +4,10 @@ var ink = require('ink');
 var React = require('react');
 var node_crypto = require('node:crypto');
 var path = require('node:path');
-var persistence = require('./types-Jag0GwhO.cjs');
-var index = require('./index-DKRU6E-x.cjs');
-var AcpBackend = require('./AcpBackend-YPVwACkW.cjs');
-var config = require('./config-rQdv_Yr0.cjs');
+var persistence = require('./types-CZIwVSN2.cjs');
+var index = require('./index-DI_VC3vJ.cjs');
+var AcpBackend = require('./AcpBackend-au0veuIF.cjs');
+var config = require('./config-GzzqE5Ev.cjs');
 require('axios');
 require('chalk');
 require('node:util');

package/dist/{runGemini-BsfadDSa.mjs → runGemini-mqLjz-M7.mjs}

@@ -2,10 +2,10 @@ import { useStdout, useInput, Box, Text, render } from 'ink';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
 import { randomUUID } from 'node:crypto';
 import { join } from 'node:path';
-import { l as logger, d as connectionState, A as ApiClient, e as readSettings, h as errorLogMetadata, f as encodeBase64, p as projectPath, g as contentLogMetadata } from './types-q7wtjfxb.mjs';
-import { J as GEMINI_API_KEY_ENV, K as GOOGLE_API_KEY_ENV, G as GEMINI_MODEL_ENV, E as BasePermissionHandler, L as BaseReasoningProcessor, n as initialMachineMetadata, o as createSessionMetadata, u as setupOfflineReconnection, v as notifyDaemonSessionStarted, y as MessageQueue2, z as hashObject, N as MessageBuffer, O as CHANGE_TITLE_INSTRUCTION, C as registerKillSessionHandler, B as startHappyServer } from './index-BTnlYGaP.mjs';
-import { A as AcpBackend } from './AcpBackend-pgDnK76l.mjs';
-import { readGeminiLocalConfig, determineGeminiModel, getGeminiModelSource, getInitialGeminiModel, saveGeminiModelToConfig } from './config-BTEW041n.mjs';
+import { l as logger, d as connectionState, A as ApiClient, e as readSettings, h as errorLogMetadata, f as encodeBase64, p as projectPath, g as contentLogMetadata } from './types-gDOmwOKw.mjs';
+import { J as GEMINI_API_KEY_ENV, K as GOOGLE_API_KEY_ENV, G as GEMINI_MODEL_ENV, E as BasePermissionHandler, L as BaseReasoningProcessor, n as initialMachineMetadata, o as createSessionMetadata, u as setupOfflineReconnection, v as notifyDaemonSessionStarted, y as MessageQueue2, z as hashObject, N as MessageBuffer, O as CHANGE_TITLE_INSTRUCTION, C as registerKillSessionHandler, B as startHappyServer } from './index-SQKnWyz-.mjs';
+import { A as AcpBackend } from './AcpBackend-CT9TOBEM.mjs';
+import { readGeminiLocalConfig, determineGeminiModel, getGeminiModelSource, getInitialGeminiModel, saveGeminiModelToConfig } from './config-DwMic6AC.mjs';
 import 'axios';
 import 'chalk';
 import 'node:util';

package/dist/{runOpenClaw-xGtbJ7f8.mjs → runOpenClaw-Bs03yQHe.mjs}

@@ -3,9 +3,9 @@ import { execFileSync } from 'node:child_process';
 import os from 'node:os';
 import { existsSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
-import { m as ensurePrivateDirectorySync, n as hardenPrivateFileSync, w as writePrivateFileSync, h as errorLogMetadata, g as contentLogMetadata, d as connectionState, A as ApiClient, e as readSettings, f as encodeBase64, l as logger, c as configuration } from './types-q7wtjfxb.mjs';
-import { A as AcpSessionManager } from './AcpSessionManager-Bq5Tiky1.mjs';
-import { n as initialMachineMetadata, o as createSessionMetadata, u as setupOfflineReconnection, v as notifyDaemonSessionStarted, y as MessageQueue2, C as registerKillSessionHandler } from './index-BTnlYGaP.mjs';
+import { m as ensurePrivateDirectorySync, n as hardenPrivateFileSync, w as writePrivateFileSync, h as errorLogMetadata, g as contentLogMetadata, d as connectionState, A as ApiClient, e as readSettings, f as encodeBase64, l as logger, c as configuration } from './types-gDOmwOKw.mjs';
+import { A as AcpSessionManager } from './AcpSessionManager-p1tj7FxF.mjs';
+import { n as initialMachineMetadata, o as createSessionMetadata, u as setupOfflineReconnection, v as notifyDaemonSessionStarted, y as MessageQueue2, C as registerKillSessionHandler } from './index-SQKnWyz-.mjs';
 import WebSocket from 'ws';
 import * as ed from '@noble/ed25519';
 import { sha512 } from '@noble/hashes/sha2.js';

package/dist/{runOpenClaw-C2XjFP2m.cjs → runOpenClaw-C5VZQ6Na.cjs}

@@ -5,9 +5,9 @@ var node_child_process = require('node:child_process');
 var os = require('node:os');
 var node_fs = require('node:fs');
 var path = require('node:path');
-var persistence = require('./types-Jag0GwhO.cjs');
-var AcpSessionManager = require('./AcpSessionManager-6rypahwH.cjs');
-var index = require('./index-DKRU6E-x.cjs');
+var persistence = require('./types-CZIwVSN2.cjs');
+var AcpSessionManager = require('./AcpSessionManager-BCWeBKDd.cjs');
+var index = require('./index-DI_VC3vJ.cjs');
 var WebSocket = require('ws');
 var ed = require('@noble/ed25519');
 var sha2_js = require('@noble/hashes/sha2.js');

package/dist/{send-B0Wojz18.cjs → send-BD2gTVoP.cjs}

@@ -3,8 +3,8 @@
 var chalk = require('chalk');
 var node_fs = require('node:fs');
 var path = require('node:path');
-var persistence = require('./types-Jag0GwhO.cjs');
-var index = require('./index-DKRU6E-x.cjs');
+var persistence = require('./types-CZIwVSN2.cjs');
+var index = require('./index-DI_VC3vJ.cjs');
 require('axios');
 require('node:util');
 require('node:os');

package/dist/{send-DRZppEr2.mjs → send-BaLjQPZQ.mjs}

@@ -1,8 +1,8 @@
 import chalk from 'chalk';
 import { readFileSync } from 'node:fs';
 import { resolve } from 'node:path';
-import { r as readPersistedSessions, c as configuration } from './types-q7wtjfxb.mjs';
-import { d as sendUserMessage, a as sessionWebUrl } from './index-BTnlYGaP.mjs';
+import { r as readPersistedSessions, c as configuration } from './types-gDOmwOKw.mjs';
+import { d as sendUserMessage, a as sessionWebUrl } from './index-SQKnWyz-.mjs';
 import 'axios';
 import 'node:util';
 import 'node:os';

package/dist/{sessions-CTuUV0TW.cjs → sessions-B108j_Xj.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
 var chalk = require('chalk');
-var index = require('./index-DKRU6E-x.cjs');
-var persistence = require('./types-Jag0GwhO.cjs');
+var index = require('./index-DI_VC3vJ.cjs');
+var persistence = require('./types-CZIwVSN2.cjs');
 require('node:os');
 require('node:crypto');
 require('cross-spawn');

package/dist/{sessions-BuMgxuxd.mjs → sessions-ggBePfSY.mjs}

@@ -1,6 +1,6 @@
 import chalk from 'chalk';
-import { D as DEFAULT_RECENT_LIMIT, M as MAX_READ_LIMIT, l as listAccountSessions, e as listSessions, r as readSessionTranscript, f as stopSession, g as resolvePermissionRequest, h as archiveSession } from './index-BTnlYGaP.mjs';
-import { i as isValidSessionId } from './types-q7wtjfxb.mjs';
+import { D as DEFAULT_RECENT_LIMIT, M as MAX_READ_LIMIT, l as listAccountSessions, e as listSessions, r as readSessionTranscript, f as stopSession, g as resolvePermissionRequest, h as archiveSession } from './index-SQKnWyz-.mjs';
+import { i as isValidSessionId } from './types-gDOmwOKw.mjs';
 import 'node:os';
 import 'node:crypto';
 import 'cross-spawn';

package/dist/{spawn-BRdfNDsu.mjs → spawn-CORFRb9D.mjs}

@@ -1,8 +1,8 @@
 import chalk from 'chalk';
 import { readFileSync, statSync } from 'node:fs';
 import { resolve } from 'node:path';
-import { c as checkIfDaemonRunningAndCleanupStaleState, s as spawnDaemonSession, a as sessionWebUrl, i as isValidSpawnOrigin, b as sanitizeSpawnPermissionMode, A as ALLOWED_SPAWN_PERMISSION_MODES, S as SPAWN_AGENTS, w as waitForSessionKey, d as sendUserMessage } from './index-BTnlYGaP.mjs';
-import { l as logger } from './types-q7wtjfxb.mjs';
+import { c as checkIfDaemonRunningAndCleanupStaleState, s as spawnDaemonSession, a as sessionWebUrl, i as isValidSpawnOrigin, b as sanitizeSpawnPermissionMode, A as ALLOWED_SPAWN_PERMISSION_MODES, S as SPAWN_AGENTS, w as waitForSessionKey, d as sendUserMessage } from './index-SQKnWyz-.mjs';
+import { l as logger } from './types-gDOmwOKw.mjs';
 import 'node:os';
 import 'node:crypto';
 import 'cross-spawn';

package/dist/{spawn-7U_4QTHw.cjs → spawn-iI8w8sD7.cjs}

@@ -3,8 +3,8 @@
 var chalk = require('chalk');
 var node_fs = require('node:fs');
 var path = require('node:path');
-var index = require('./index-DKRU6E-x.cjs');
-var persistence = require('./types-Jag0GwhO.cjs');
+var index = require('./index-DI_VC3vJ.cjs');
+var persistence = require('./types-CZIwVSN2.cjs');
 require('node:os');
 require('node:crypto');
 require('cross-spawn');

package/dist/{types-Jag0GwhO.cjs → types-CZIwVSN2.cjs}

@@ -51,7 +51,7 @@ var z__namespace = /*#__PURE__*/_interopNamespaceDefault(z);
 var pty__namespace = /*#__PURE__*/_interopNamespaceDefault(pty);
 
 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 = [
@@ -164,12 +164,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:*",
@@ -1041,6 +1041,8 @@ const ConnectionDiagnosticEventSchema = z.z.object({
   durationMs: z.z.number().int().min(0).max(3e5),
   deviceClass: z.z.enum(["mobile", "desktop", "unknown"]),
   visibility: z.z.enum(["visible", "hidden"]),
+  relayRegion: z.z.enum(["central", "sg", "us", "other", "unknown"]).optional(),
+  timing: z.z.enum(["active", "background", "censored", "unknown"]).optional(),
   client: z.z.string().regex(/^web\/(?:[a-f0-9]{7,40}|unknown)$/)
 }).strict();
 z.z.object({
@@ -1095,6 +1097,7 @@ const CliUpdateStateSchema = z.z.object({
   /** B-351: the version this machine may install by itself. Pinned separately
    *  from `recommendedVersion`; null means no unattended install. */
   autoUpdateVersion: z.z.string().nullable().optional(),
+  retrySupported: z.z.boolean().optional(),
   checkedAt: z.z.number(),
   /**
    * B-321: a new bundle is on disk but refused to run, so the daemon is still
@@ -1705,7 +1708,7 @@ class RpcHandlerManager {
   }
 }
 
-const __dirname$1 = path$1.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('types-Jag0GwhO.cjs', document.baseURI).href))));
+const __dirname$1 = path$1.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('types-CZIwVSN2.cjs', document.baseURI).href))));
 function projectPath() {
   const path = path$1.resolve(__dirname$1, "..");
   return path;
@@ -13218,6 +13221,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 promises.unlink(jsonlPath(projectDir, claudeSessionId));
@@ -13317,23 +13332,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 promises.readFile(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 = node_crypto.randomUUID();
+  const destination = jsonlPath(projectDir, newId);
+  const temporary = `${destination}.tmp-${process.pid}`;
+  try {
+    await promises.writeFile(temporary, lines.slice(0, cut).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;
+}
 
 function serializedByteLength(value) {
   try {
@@ -14610,6 +14670,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;
@@ -14636,6 +14704,7 @@ function listCodexRewindPoints(thread) {
       points.push({
         itemId: item.id,
         text,
+        ...hasUserAttachments(item) ? { hasAttachments: true } : {},
         timestamp: timestampFromTurn(turn)
       });
     }
@@ -14693,6 +14762,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) {
@@ -14825,6 +14925,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) {
@@ -15194,6 +15297,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(() => {
@@ -16894,6 +17017,7 @@ exports.logger = logger;
 exports.mirrorLineKey = mirrorLineKey;
 exports.mirrorLocalId = mirrorLocalId;
 exports.packageJson = packageJson;
+exports.parseExactVersion = parseExactVersion;
 exports.parseTerminalHookPayload = parseTerminalHookPayload;
 exports.persistSession = persistSession;
 exports.persistence = persistence;