very-happy-cli 0.2.91 → 0.2.92

package/dist/{types-BKyjG23_.mjs → types-B_8X_rZk.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.91";
+var version = "0.2.92";
 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.91",
-	"very-happy-tools-x64-darwin": "0.2.91",
-	"very-happy-tools-arm64-linux": "0.2.91",
-	"very-happy-tools-x64-linux": "0.2.91",
-	"very-happy-tools-arm64-win32": "0.2.91",
-	"very-happy-tools-x64-win32": "0.2.91"
+	"very-happy-tools-arm64-darwin": "0.2.92",
+	"very-happy-tools-x64-darwin": "0.2.92",
+	"very-happy-tools-arm64-linux": "0.2.92",
+	"very-happy-tools-x64-linux": "0.2.92",
+	"very-happy-tools-arm64-win32": "0.2.92",
+	"very-happy-tools-x64-win32": "0.2.92"
 };
 var devDependencies = {
 	"@slopus/happy-wire": "workspace:*",
@@ -858,7 +858,11 @@ const UpdateSessionBodySchema = z.object({
   t: z.literal("update-session"),
   id: z.string(),
   metadata: VersionedEncryptedValueSchema.nullish(),
-  agentState: VersionedNullableEncryptedValueSchema.nullish()
+  agentState: VersionedNullableEncryptedValueSchema.nullish(),
+  /** B-265: server-owned archive intent (ms epoch, null = not archived).
+   *  Present only on the archive / unarchive transitions; absent elsewhere.
+   *  Old clients strip it (default z.object) and fall back to `active`. */
+  archivedAt: z.number().nullable().optional()
 });
 const VersionedMachineEncryptedValueSchema = z.object({
   version: z.number(),
@@ -997,7 +1001,9 @@ const WebTerminalListItemSchema = z$1.object({
   mirrorSessionId: z$1.string().optional(),
   /** B-150: auto-restored after a restart (ms epoch) — the directory and the
    *  conversation carried over, the processes did not. Cleared once opened. */
-  restoredAt: z$1.number().optional()
+  restoredAt: z$1.number().optional(),
+  /** B-265: @vh_title_manual is set (user renamed it). */
+  manual: z$1.boolean().optional()
 });
 const ClosedTerminalRecordSchema = z$1.object({
   id: z$1.string(),
@@ -1011,6 +1017,9 @@ const ClosedTerminalRecordSchema = z$1.object({
   /** B-149: 'daemon-gap' = died while no daemon was watching (restart/reboot);
    *  absent means an ordinary observed close. */
   reason: z$1.enum(["closed", "daemon-gap"]).optional(),
+  /** B-265: tags + manual-rename flag at close time (restored verbatim). */
+  tags: z$1.array(z$1.string()).optional(),
+  manual: z$1.boolean().optional(),
   closedAt: z$1.number()
 });
 z$1.object({
@@ -1055,6 +1064,15 @@ z$1.object({
    * ignore the field; old daemons never write it (web renders nothing).
    */
   closedTerminals: z$1.array(ClosedTerminalRecordSchema).optional(),
+  /**
+   * B-265 capability flag: this daemon answers `restore-terminal`. Same trust
+   * rule as webTerminals — only `detectedAt >= startedAt` counts, because a
+   * downgraded daemon spreads the stale field forward on connect.
+   */
+  terminalRestore: z$1.object({
+    rpcAvailable: z$1.boolean(),
+    detectedAt: z$1.number()
+  }).optional(),
   /** Relay-owned CLI compatibility/update policy last checked by this daemon. */
   cliUpdate: CliUpdateStateSchema.optional()
 });
@@ -3081,10 +3099,19 @@ class ApiSessionClient extends EventEmitter {
   directInboundLocalIds = /* @__PURE__ */ new Set();
   routedInboundLocalIds = /* @__PURE__ */ new Set();
   handoverInFlight = null;
-  constructor(token, session) {
+  /** B-265 reconnect: the message cursor was seeded from the server, so
+   *  nothing before it is history to replay — but socket fast-path routing
+   *  must wait for the first fetch, otherwise a message that lands between
+   *  the seed and the first fetch is routed twice (socket + fetch). */
+  awaitingInitialFetch = false;
+  constructor(token, session, opts) {
     super();
     this.token = token;
     this.sessionId = session.id;
+    if (opts?.initialSeq !== void 0 && opts.initialSeq >= 0) {
+      this.lastSeq = opts.initialSeq;
+      this.awaitingInitialFetch = true;
+    }
     this.metadata = session.metadata;
     this.metadataVersion = session.metadataVersion;
     this.agentState = session.agentState;
@@ -3144,7 +3171,7 @@ class ApiSessionClient extends EventEmitter {
         }
         if (data.body.t === "new-message") {
           const messageSeq = data.body.message?.seq;
-          if (this.lastSeq === 0) {
+          if (this.lastSeq === 0 || this.awaitingInitialFetch) {
             this.receiveSync.invalidate();
             return;
           }
@@ -3440,6 +3467,9 @@ class ApiSessionClient extends EventEmitter {
         if (message.localId && this.directInboundLocalIds.delete(message.localId)) {
           continue;
         }
+        if (message.localId && this.routedInboundLocalIds.has(message.localId)) {
+          continue;
+        }
         if (message.content?.t !== "encrypted") {
           continue;
         }
@@ -3469,6 +3499,7 @@ class ApiSessionClient extends EventEmitter {
         break;
       }
     }
+    this.awaitingInitialFetch = false;
   }
   static MAX_OUTBOX_BATCH_SIZE = 50;
   async flushOutbox() {
@@ -4716,6 +4747,101 @@ function registerTodoHandlers(manager) {
   });
 }
 
+function sanitizeTagList(value) {
+  if (!Array.isArray(value)) return void 0;
+  const out = [];
+  for (const tag of value) {
+    if (typeof tag !== "string") continue;
+    const clean = tag.trim();
+    if (clean && !out.includes(clean)) out.push(clean);
+    if (out.length >= 64) break;
+  }
+  return out;
+}
+const LIVE_SNAPSHOT_TTL_MS = 14 * 24 * 60 * 60 * 1e3;
+const LIVE_SNAPSHOT_MAX = 100;
+function sanitizeLiveSnapshot(raw, now, ttlMs = LIVE_SNAPSHOT_TTL_MS, max = LIVE_SNAPSHOT_MAX) {
+  const out = /* @__PURE__ */ new Map();
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) return out;
+  const rows = [];
+  for (const [id, value] of Object.entries(raw)) {
+    if (!id || !value || typeof value !== "object") continue;
+    const { title, cwd, seenAt, tags, manual } = value;
+    if (typeof seenAt !== "number" || !Number.isFinite(seenAt)) continue;
+    if (now - seenAt >= ttlMs) continue;
+    const tagList = sanitizeTagList(tags);
+    rows.push([id, {
+      title: typeof title === "string" && title.trim() ? title : void 0,
+      cwd: typeof cwd === "string" && cwd ? cwd : void 0,
+      ...tagList !== void 0 ? { tags: tagList } : {},
+      ...manual === true ? { manual: true } : {},
+      seenAt
+    }]);
+  }
+  rows.sort((a, b) => b[1].seenAt - a[1].seenAt);
+  for (const [id, info] of rows.slice(0, max)) out.set(id, info);
+  return out;
+}
+function serializeLiveSnapshot(map, max = LIVE_SNAPSHOT_MAX) {
+  const rows = [...map.entries()].sort((a, b) => b[1].seenAt - a[1].seenAt).slice(0, max);
+  const out = {};
+  for (const [id, info] of rows) out[id] = info;
+  return out;
+}
+function liveSnapshotChanged(prev, next) {
+  if (prev.size !== next.size) return true;
+  for (const [id, info] of next) {
+    const before = prev.get(id);
+    if (!before) return true;
+    if (before.title !== info.title || before.cwd !== info.cwd) return true;
+    if (!!before.manual !== !!info.manual) return true;
+    if ((before.tags ?? []).join("\0") !== (info.tags ?? []).join("\0")) return true;
+  }
+  return false;
+}
+const CLAUDE_SESSION_ID_RE = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/;
+function isClaudeSessionId(value) {
+  return typeof value === "string" && CLAUDE_SESSION_ID_RE.test(value);
+}
+function pickMirrorForTerminal(sessions, terminalId) {
+  if (!terminalId) return null;
+  let best = null;
+  for (const [id, session] of Object.entries(sessions || {})) {
+    const meta = session?.metadata;
+    if (!meta || meta.terminalId !== terminalId) continue;
+    const savedAt = typeof session.savedAt === "number" ? session.savedAt : 0;
+    if (best && savedAt <= best.savedAt) continue;
+    best = {
+      id,
+      savedAt,
+      claude: isClaudeSessionId(meta.claudeSessionId) ? meta.claudeSessionId : void 0
+    };
+  }
+  return best ? { sessionId: best.id, claudeSessionId: best.claude } : null;
+}
+
+const TERMINAL_ID_RE$1 = /^[a-zA-Z0-9_-]{1,64}$/;
+function planTerminalRestore(record, facts) {
+  if (facts.tmuxAlive) return { kind: "already-live" };
+  if (!record.cwd || !facts.cwdExists(record.cwd)) return { kind: "error", reason: "missing-cwd" };
+  const resumable = isClaudeSessionId(record.claudeSessionId) && facts.conversationExists(record.cwd, record.claudeSessionId);
+  return {
+    kind: "create",
+    terminalId: record.id,
+    cwd: record.cwd,
+    title: record.title,
+    manual: record.manual === true,
+    tags: record.tags,
+    ...resumable ? { command: `claude --resume ${record.claudeSessionId}` } : {}
+  };
+}
+
+function getProjectPath(workingDirectory) {
+  const projectId = resolve$1(workingDirectory).replace(/[^a-zA-Z0-9-]/g, "-");
+  const claudeConfigDir = process.env.CLAUDE_CONFIG_DIR || join(homedir(), ".claude");
+  return join(claudeConfigDir, "projects", projectId);
+}
+
 var xtermHeadless = {};
 
 var hasRequiredXtermHeadless;
@@ -9766,63 +9892,6 @@ function sendTerminalNotification(opts) {
   });
 }
 
-const LIVE_SNAPSHOT_TTL_MS = 14 * 24 * 60 * 60 * 1e3;
-const LIVE_SNAPSHOT_MAX = 100;
-function sanitizeLiveSnapshot(raw, now, ttlMs = LIVE_SNAPSHOT_TTL_MS, max = LIVE_SNAPSHOT_MAX) {
-  const out = /* @__PURE__ */ new Map();
-  if (!raw || typeof raw !== "object" || Array.isArray(raw)) return out;
-  const rows = [];
-  for (const [id, value] of Object.entries(raw)) {
-    if (!id || !value || typeof value !== "object") continue;
-    const { title, cwd, seenAt } = value;
-    if (typeof seenAt !== "number" || !Number.isFinite(seenAt)) continue;
-    if (now - seenAt >= ttlMs) continue;
-    rows.push([id, {
-      title: typeof title === "string" && title.trim() ? title : void 0,
-      cwd: typeof cwd === "string" && cwd ? cwd : void 0,
-      seenAt
-    }]);
-  }
-  rows.sort((a, b) => b[1].seenAt - a[1].seenAt);
-  for (const [id, info] of rows.slice(0, max)) out.set(id, info);
-  return out;
-}
-function serializeLiveSnapshot(map, max = LIVE_SNAPSHOT_MAX) {
-  const rows = [...map.entries()].sort((a, b) => b[1].seenAt - a[1].seenAt).slice(0, max);
-  const out = {};
-  for (const [id, info] of rows) out[id] = info;
-  return out;
-}
-function liveSnapshotChanged(prev, next) {
-  if (prev.size !== next.size) return true;
-  for (const [id, info] of next) {
-    const before = prev.get(id);
-    if (!before) return true;
-    if (before.title !== info.title || before.cwd !== info.cwd) return true;
-  }
-  return false;
-}
-const CLAUDE_SESSION_ID_RE = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/;
-function isClaudeSessionId(value) {
-  return typeof value === "string" && CLAUDE_SESSION_ID_RE.test(value);
-}
-function pickMirrorForTerminal(sessions, terminalId) {
-  if (!terminalId) return null;
-  let best = null;
-  for (const [id, session] of Object.entries(sessions || {})) {
-    const meta = session?.metadata;
-    if (!meta || meta.terminalId !== terminalId) continue;
-    const savedAt = typeof session.savedAt === "number" ? session.savedAt : 0;
-    if (best && savedAt <= best.savedAt) continue;
-    best = {
-      id,
-      savedAt,
-      claude: isClaudeSessionId(meta.claudeSessionId) ? meta.claudeSessionId : void 0
-    };
-  }
-  return best ? { sessionId: best.id, claudeSessionId: best.claude } : null;
-}
-
 const AUTO_RESTORE_DEFAULT_MAX = 6;
 const AUTO_RESTORE_DEFAULT_WINDOW_HOURS = 24;
 const AUTO_RESTORE_HARD_MAX = 20;
@@ -9881,6 +9950,8 @@ function selectAutoRestore(candidates, opts) {
     }
     plans.push({
       terminalId: c.id,
+      ...c.tags !== void 0 ? { tags: c.tags } : {},
+      ...c.manual ? { manual: true } : {},
       cwd: c.cwd,
       title: c.title,
       claudeSessionId: c.claudeSessionId,
@@ -9929,10 +10000,11 @@ function sanitizeClosedTerminals(raw, max = CLOSED_TERMINALS_MAX) {
   const out = [];
   for (const item of raw) {
     if (!item || typeof item !== "object") continue;
-    const { id, title, cwd, mirrorSessionId, claudeSessionId, reason, closedAt } = item;
+    const { id, title, cwd, mirrorSessionId, claudeSessionId, reason, closedAt, tags, manual } = item;
     if (typeof id !== "string" || id.length === 0 || typeof closedAt !== "number") continue;
     if (seen.has(id)) continue;
     seen.add(id);
+    const tagList = sanitizeTagList(tags);
     out.push({
       id,
       title: typeof title === "string" ? title : void 0,
@@ -9940,6 +10012,8 @@ function sanitizeClosedTerminals(raw, max = CLOSED_TERMINALS_MAX) {
       mirrorSessionId: typeof mirrorSessionId === "string" ? mirrorSessionId : void 0,
       claudeSessionId: typeof claudeSessionId === "string" ? claudeSessionId : void 0,
       reason: reason === "daemon-gap" || reason === "closed" ? reason : void 0,
+      ...tagList !== void 0 ? { tags: tagList } : {},
+      ...manual === true ? { manual: true } : {},
       closedAt
     });
   }
@@ -10063,6 +10137,9 @@ function startupInjectionArgs(tmuxSession, command) {
     ["send-keys", "-t", `=${tmuxSession}:`, "Enter"]
   ];
 }
+function seenInfoOf(t) {
+  return { title: t.title, cwd: t.cwd, tags: t.tags, manual: t.manual };
+}
 function terminalListSignature(items) {
   const canon = [...items].sort((a, b) => a.id < b.id ? -1 : a.id > b.id ? 1 : 0).map((t) => [
     t.id,
@@ -10699,7 +10776,7 @@ class WebTerminalManager {
   }
   /** Refresh the per-id {title, cwd} cache from an observed live list. */
   noteSeen(list) {
-    this.lastSeenInfo = new Map(list.map((t) => [t.id, { title: t.title, cwd: t.cwd }]));
+    this.lastSeenInfo = new Map(list.map((t) => [t.id, seenInfoOf(t)]));
   }
   /** Record one terminal as closed (dedupe/cap in the pure module) and
    *  persist. The confirming daemonState push rides the list refresh that
@@ -10773,7 +10850,7 @@ class WebTerminalManager {
     const liveIds = new Set(list.map((t) => t.id));
     this.reconcileRestoredSnapshot(liveIds);
     const next = new Map(
-      list.map((t) => [t.id, { title: t.title, cwd: t.cwd }])
+      list.map((t) => [t.id, seenInfoOf(t)])
     );
     let changed = false;
     const now = Date.now();
@@ -10790,6 +10867,8 @@ class WebTerminalManager {
         id,
         title: info.title,
         cwd: info.cwd,
+        tags: info.tags,
+        manual: info.manual,
         // Live binding first (authoritative while it exists), persisted
         // metadata as the fallback once the mirror has been torn down.
         mirrorSessionId: this.mirrorResolver?.(id) ?? mirror?.sessionId,
@@ -10840,6 +10919,8 @@ class WebTerminalManager {
         id,
         title: info.title,
         cwd: info.cwd,
+        tags: info.tags,
+        manual: info.manual,
         mirrorSessionId: mirror?.sessionId,
         claudeSessionId: mirror?.claudeSessionId,
         reason: "daemon-gap",
@@ -10850,6 +10931,8 @@ class WebTerminalManager {
         id,
         title: info.title,
         cwd: info.cwd,
+        tags: info.tags,
+        manual: info.manual,
         seenAt: info.seenAt,
         claudeSessionId: mirror?.claudeSessionId
       });
@@ -10925,6 +11008,51 @@ class WebTerminalManager {
    * exactly like a terminal whose pty was reaped.
    */
   restoreOneTerminal(plan) {
+    return this.createDetachedTerminal(plan);
+  }
+  /**
+   * B-265: `restore-terminal` — bring ONE closed terminal back with its
+   * original id / cwd / title (+ manual flag) / tags and, when the record
+   * knows a claude conversation whose JSONL is still on disk, `claude
+   * --resume` injected. Idempotent: an id whose tmux session already exists
+   * is a success. The closed record is left to `pruneClosedAgainstLive` (the
+   * next tick sees the id live again); the tombstone is deliberately kept —
+   * a live tmux session attaches regardless, and dropping it would re-open
+   * the stale-client resurrection hole B-149 closed.
+   */
+  restoreClosedTerminal(terminalId) {
+    if (typeof terminalId !== "string" || !TERMINAL_ID_RE$1.test(terminalId)) return { type: "error", reason: "invalid-id" };
+    if (!isTmuxAvailable()) return { type: "error", reason: "no-tmux" };
+    const record = this.closedTerminals.find((r) => r.id === terminalId);
+    if (!record) return { type: "error", reason: "no-record" };
+    const env = ptyEnv();
+    const alive = spawnSync(
+      "tmux",
+      tmuxArgs(["has-session", "-t", `=vh-${terminalId}:`]),
+      { stdio: "ignore", timeout: TMUX_PROBE_TIMEOUT_MS, env }
+    ).status === 0;
+    const plan = planTerminalRestore(record, {
+      tmuxAlive: alive,
+      cwdExists: (cwd) => {
+        try {
+          return existsSync(cwd) && statSync(cwd).isDirectory();
+        } catch {
+          return false;
+        }
+      },
+      conversationExists: (cwd, claudeSessionId) => existsSync(join(getProjectPath(cwd), `${claudeSessionId}.jsonl`))
+    });
+    if (plan.kind === "already-live") return { type: "success", terminalId };
+    if (plan.kind === "error") return { type: "error", reason: plan.reason };
+    if (!this.createDetachedTerminal(plan)) return { type: "error", reason: "create-failed" };
+    logger.info(`[WEB TERMINAL] restored closed terminal ${terminalId} in ${plan.cwd}${plan.command ? " (conversation resumed)" : ""}`);
+    this.kickListRefresh();
+    return { type: "success", terminalId };
+  }
+  /** Shared cold-create for auto-restore (B-150) and restore-terminal
+   *  (B-265): same create-only env as the interactive path, title/tags
+   *  written back, optional startup command injected. */
+  createDetachedTerminal(plan) {
     const env = ptyEnv();
     const name = `vh-${plan.terminalId}`;
     const exists = spawnSync(
@@ -10961,18 +11089,35 @@ class WebTerminalManager {
         tmuxArgs(["set-option", "-t", `=${name}:`, "@vh_title", plan.title]),
         { stdio: "ignore", timeout: TMUX_PROBE_TIMEOUT_MS, env }
       );
+      if (plan.manual) {
+        spawnSync(
+          "tmux",
+          tmuxArgs(["set-option", "-t", `=${name}:`, "@vh_title_manual", "1"]),
+          { stdio: "ignore", timeout: TMUX_PROBE_TIMEOUT_MS, env }
+        );
+      }
+    }
+    const tags = plan.tags !== void 0 ? validateTerminalTags(plan.tags) : void 0;
+    if (tags && tags.length > 0) {
+      spawnSync(
+        "tmux",
+        tmuxArgs(["set-option", "-t", `=${name}:`, "@vh_tags", JSON.stringify(tags)]),
+        { stdio: "ignore", timeout: TMUX_PROBE_TIMEOUT_MS, env }
+      );
     }
-    for (const argv of startupInjectionArgs(name, plan.command)) {
-      spawnSync("tmux", tmuxArgs(argv), { stdio: "ignore", timeout: TMUX_PROBE_TIMEOUT_MS, env });
+    if (plan.command) {
+      for (const argv of startupInjectionArgs(name, plan.command)) {
+        spawnSync("tmux", tmuxArgs(argv), { stdio: "ignore", timeout: TMUX_PROBE_TIMEOUT_MS, env });
+      }
     }
-    logger.info(`[WEB TERMINAL] auto-restored ${plan.terminalId} in ${plan.cwd}`);
+    logger.info(`[WEB TERMINAL] cold-created ${plan.terminalId} in ${plan.cwd}`);
     return true;
   }
   /** Mirror the in-memory cache to disk, but only when something a restart
    *  would care about changed (see liveSnapshotChanged). */
   persistLiveSnapshot(live, now) {
     const candidate = /* @__PURE__ */ new Map();
-    for (const [id, info] of live) candidate.set(id, { title: info.title, cwd: info.cwd, seenAt: now });
+    for (const [id, info] of live) candidate.set(id, { title: info.title, cwd: info.cwd, tags: info.tags, manual: info.manual, seenAt: now });
     if (!liveSnapshotChanged(this.lastPersistedSnapshot, candidate)) return;
     this.lastPersistedSnapshot = candidate;
     saveLiveSnapshot(candidate);
@@ -11547,6 +11692,8 @@ class WebTerminalManager {
         id: terminalId,
         title: info.title,
         cwd: info.cwd,
+        tags: info.tags,
+        manual: info.manual,
         mirrorSessionId: this.mirrorResolver?.(terminalId) ?? mirror?.sessionId,
         claudeSessionId: mirror?.claudeSessionId,
         reason: "closed",
@@ -11630,7 +11777,8 @@ class WebTerminalManager {
           // tmux last-activity (epoch s) → ms; optional so old daemons
           // simply omit it and web clients fall back to createdAt.
           activityAt: s.activity,
-          agentState: this.probeAgentState(s.name, s.paneCurrentCommand)
+          agentState: this.probeAgentState(s.name, s.paneCurrentCommand),
+          manual: s.manual
         });
       }
       return out;
@@ -12080,12 +12228,6 @@ function detectResumeSupport(happyHomeDir = configuration.happyHomeDir) {
   };
 }
 
-function getProjectPath(workingDirectory) {
-  const projectId = resolve$1(workingDirectory).replace(/[^a-zA-Z0-9-]/g, "-");
-  const claudeConfigDir = process.env.CLAUDE_CONFIG_DIR || join(homedir(), ".claude");
-  return join(claudeConfigDir, "projects", projectId);
-}
-
 class ForkTruncateUuidNotFoundError extends Error {
   constructor(cutAfterUuid, sourcePath) {
     super(`Truncation UUID ${cutAfterUuid} not found in ${sourcePath}`);
@@ -13590,6 +13732,7 @@ class ApiMachineClient {
   cliUpdatePushChain = Promise.resolve();
   rpcHandlerManager;
   resumeSessionHandler = null;
+  restartSessionHandler = null;
   stopSessionHandler = null;
   listTrackedSessionIds = null;
   reconnectInterval = null;
@@ -13656,11 +13799,13 @@ class ApiMachineClient {
   setRPCHandlers({
     spawnSession,
     resumeSession,
+    restartSession,
     stopSession,
     listTrackedSessionIds,
     requestShutdown
   }) {
     this.resumeSessionHandler = resumeSession ?? null;
+    this.restartSessionHandler = restartSession ?? null;
     this.stopSessionHandler = stopSession;
     this.listTrackedSessionIds = listTrackedSessionIds ?? null;
     this.rpcHandlerManager.registerHandler("spawn-happy-session", async (params) => {
@@ -13682,6 +13827,7 @@ class ApiMachineClient {
       }
     });
     this.syncResumeSessionRpcRegistration();
+    this.syncRestartSessionRpcRegistration();
     this.rpcHandlerManager.registerHandler("open-terminal", async (params) => {
       const { terminalId, cols, rows, cwd, fromSeq, encStream, startupCommand, resub, attachOnly, streamMode } = params || {};
       const result = await this.webTerminal.open({
@@ -13757,6 +13903,14 @@ class ApiMachineClient {
       this.encTerminals.delete(terminalId);
       return { type: "success" };
     });
+    this.rpcHandlerManager.registerHandler("restore-terminal", async (params) => {
+      const { terminalId } = params || {};
+      const result = this.webTerminal.restoreClosedTerminal(terminalId);
+      if (result.type === "error") {
+        return { type: "error", reason: result.reason, errorMessage: `restore-terminal: ${result.reason}` };
+      }
+      return { type: "success", terminalId: result.terminalId };
+    });
     this.rpcHandlerManager.registerHandler("list-terminals", async () => {
       return { type: "success", terminals: this.webTerminal.buildTerminalList() };
     });
@@ -13908,6 +14062,40 @@ class ApiMachineClient {
       return { message: "Daemon stop request acknowledged, starting shutdown sequence..." };
     });
   }
+  // B-264: symmetric to resume, but the handler stops a live-but-broken
+  // wrapper first. Old web never calls it; new web calling an old daemon that
+  // lacks the handler gets "method not found" and shows an upgrade hint —
+  // never a double-spawn.
+  syncRestartSessionRpcRegistration() {
+    const method = "restart-session";
+    if (this.restartSessionHandler) {
+      if (!this.rpcHandlerManager.hasHandler(method)) {
+        this.rpcHandlerManager.registerHandler(method, async (params) => {
+          const { sessionId, model, permissionMode } = params || {};
+          if (!sessionId || typeof sessionId !== "string") {
+            throw new Error("Session ID is required");
+          }
+          const handler = this.restartSessionHandler;
+          if (!handler) {
+            throw new Error("Restart session handler not available");
+          }
+          const result = await handler(sessionId, { model, permissionMode });
+          switch (result.type) {
+            case "success":
+              return { type: "success", sessionId: result.sessionId };
+            case "requestToApproveDirectoryCreation":
+              return result;
+            case "error":
+              throw new Error(result.errorMessage);
+          }
+        });
+      }
+      return;
+    }
+    if (this.rpcHandlerManager.hasHandler(method)) {
+      this.rpcHandlerManager.unregisterHandler(method);
+    }
+  }
   syncResumeSessionRpcRegistration() {
     const method = "resume-happy-session";
     if (this.resumeSessionHandler) {
@@ -14115,6 +14303,9 @@ class ApiMachineClient {
         httpPort: this.machine.daemonState?.httpPort,
         startedAt: now,
         webTerminals: { updatedAt: now, terminals: initialTerminals },
+        // B-265 capability flag; restamped every connect so the
+        // web's `detectedAt >= startedAt` trust rule holds.
+        terminalRestore: { rpcAvailable: true, detectedAt: now },
         // B-084: closed records survive daemon restarts (persisted
         // in closed-terminals.json), so the connect snapshot ships
         // them too — not just the incremental pushes.
@@ -14124,6 +14315,7 @@ class ApiMachineClient {
     this.webTerminal.startListTracking((terminals) => this.pushTerminalList(terminals));
     if (!rpcAlreadyRegistered) this.rpcHandlerManager.onSocketConnect(socket);
     this.syncResumeSessionRpcRegistration();
+    this.syncRestartSessionRpcRegistration();
     this.startKeepAlive();
     void this.reconcileArchivedSessions();
     void this.refreshRelayConnection();
@@ -14359,6 +14551,7 @@ class ApiMachineClient {
         if (this.relaySocket !== relaySocket) return;
         this.rpcHandlerManager.onSocketConnect(relaySocket);
         this.syncResumeSessionRpcRegistration();
+        this.syncRestartSessionRpcRegistration();
         logger.debug(`[API MACHINE] Connected to regional relay ${selected.assignment.relayId}`);
       });
       relaySocket.on("disconnect", () => {
@@ -15133,8 +15326,8 @@ class ApiClient {
       throw error;
     }
   }
-  sessionSyncClient(session) {
-    return new ApiSessionClient(this.credential.token, session);
+  sessionSyncClient(session, opts) {
+    return new ApiSessionClient(this.credential.token, session, opts);
   }
   machineSyncClient(machine) {
     return new ApiMachineClient(this.credential.token, machine);
@@ -15310,6 +15503,56 @@ class ApiClient {
       return false;
     }
   }
+  /**
+   * B-265: one session by id — the message cursor (`seq`), metadata and
+   * agent state with their versions, decrypted with the session key the
+   * reconnecting process already holds. `unsupported` = the server has no
+   * such route (or the row is gone): callers fall back to the legacy
+   * skip-all-history reconnect. Transient failures are retried a few times
+   * first, because falling back silently discards the very message a restore
+   * is meant to deliver.
+   */
+  async getSession(sessionId, encryptionKey, encryptionVariant, opts) {
+    const attempts = opts?.attempts ?? 3;
+    const delays = opts?.delaysMs ?? [500, 1500];
+    for (let attempt = 0; attempt < attempts; attempt += 1) {
+      try {
+        const response = await axios.get(
+          `${configuration.serverUrl}/v1/sessions/${encodeURIComponent(sessionId)}`,
+          {
+            headers: {
+              "Authorization": `Bearer ${this.credential.token}`,
+              "X-Happy-Client": `cli-coding-session/${configuration.currentCliVersion}`
+            },
+            timeout: opts?.timeoutMs ?? 4e3,
+            validateStatus: () => true
+          }
+        );
+        if (response.status === 404 || response.status === 401 || response.status === 403) {
+          return { ok: false, reason: "unsupported" };
+        }
+        if (response.status >= 200 && response.status < 300) {
+          const row = response.data.session;
+          if (!row || typeof row.seq !== "number" || typeof row.metadata !== "string") {
+            return { ok: false, reason: "unsupported" };
+          }
+          const metadata = decrypt(encryptionKey, encryptionVariant, decodeBase64(row.metadata));
+          if (!metadata) return { ok: false, reason: "unavailable" };
+          const agentState = row.agentState ? decrypt(encryptionKey, encryptionVariant, decodeBase64(row.agentState)) : null;
+          return {
+            ok: true,
+            session: { seq: row.seq, metadata, metadataVersion: row.metadataVersion, agentState, agentStateVersion: row.agentStateVersion }
+          };
+        }
+        logger.debug(`[API] getSession ${sessionId}: status ${response.status} (attempt ${attempt + 1}/${attempts})`);
+      } catch (error) {
+        logger.debug(`[API] getSession ${sessionId} failed (attempt ${attempt + 1}/${attempts}):`, error);
+      }
+      const delayMs = delays[Math.min(attempt, delays.length - 1)];
+      if (attempt < attempts - 1 && delayMs > 0) await new Promise((r) => setTimeout(r, delayMs));
+    }
+    return { ok: false, reason: "unavailable" };
+  }
   /** Clear the server-owned archive tombstone before an intentional resume.
    * Older servers return 404 because the endpoint does not exist; that is a
    * compatible no-op because those servers also have no durable tombstone. */
@@ -15401,4 +15644,4 @@ const RawJSONLinesSchema = z$1.discriminatedUnion("type", [
   }).passthrough()
 ]);
 
-export { detectCLIAvailability as $, ApiClient as A, deriveLocalCliUpdateSummary as B, updateSettings as C, encodeBase64Url as D, decodeBase64 as E, writeCredentialsLegacy as F, writeCredentialsDataKey as G, readCredentialsForConfiguredRelay as H, InvalidateSync as I, encrypt as J, getLocalHappyAgentCredentialPath as K, readLocalHappyAgentCredentials as L, MAX_CHAT_ATTACHMENT_SOURCE_BYTES as M, decryptWithDataKey as N, decryptLegacy as O, extractCompleteLines as P, decideBackfill as Q, RawJSONLinesSchema as R, parseTerminalHookPayload as S, tmuxArgs as T, scrubTmuxClientEnv as U, decideMirrorBinding as V, persistSession as W, MIRROR_BACKFILL_LINES_DEFAULT as X, mirrorLineKey as Y, mirrorLocalId as Z, detectResumeSupport as _, ApiSessionClient as a, acquireDaemonLock as a0, summarizeSpawnSessionForLog as a1, deletePersistedSessions as a2, decrypt as a3, writeDaemonState as a4, fetchCliUpdateState as a5, resolveCliUpdateCheckInterval as a6, DEFAULT_CLI_UPDATE_CHECK_INTERVAL_MS as a7, releaseDaemonLock as a8, isValidSessionId as a9, listVhTerminals as aa, isValidTerminalId as ab, readVhTerminal as ac, sendToVhTerminal as ad, startOfflineReconnection as ae, clearCredentials as af, clearMachineId as ag, SandboxConfigSchema as ah, CodexAppServerClient as ai, getLatestDaemonLog as aj, persistence as ak, api as al, createEnvelope as b, configuration as c, contentLogMetadata as d, errorLogMetadata as e, packageJson as f, delay as g, connectionState as h, readSettings as i, encodeBase64 as j, ensurePrivateDirectorySync as k, logger as l, hardenPrivateFileSync as m, readDaemonState as n, clearDaemonState as o, projectPath as p, getProjectPath as q, readPersistedSessions as r, initializeSandbox as s, wrapCommand as t, AsyncLock as u, ensurePrivateDirectory as v, writePrivateFileSync as w, hardenPrivateFile as x, readCredentials as y, credentialRelayProblem as z };
+export { detectResumeSupport as $, ApiClient as A, deriveLocalCliUpdateSummary as B, updateSettings as C, encodeBase64Url as D, decodeBase64 as E, writeCredentialsLegacy as F, writeCredentialsDataKey as G, readCredentialsForConfiguredRelay as H, InvalidateSync as I, encrypt as J, isClaudeSessionId as K, getLocalHappyAgentCredentialPath as L, MAX_CHAT_ATTACHMENT_SOURCE_BYTES as M, readLocalHappyAgentCredentials as N, decryptWithDataKey as O, decryptLegacy as P, extractCompleteLines as Q, RawJSONLinesSchema as R, decideBackfill as S, parseTerminalHookPayload as T, tmuxArgs as U, scrubTmuxClientEnv as V, decideMirrorBinding as W, persistSession as X, MIRROR_BACKFILL_LINES_DEFAULT as Y, mirrorLineKey as Z, mirrorLocalId as _, ApiSessionClient as a, detectCLIAvailability as a0, acquireDaemonLock as a1, summarizeSpawnSessionForLog as a2, deletePersistedSessions as a3, decrypt as a4, writeDaemonState as a5, fetchCliUpdateState as a6, resolveCliUpdateCheckInterval as a7, DEFAULT_CLI_UPDATE_CHECK_INTERVAL_MS as a8, releaseDaemonLock as a9, isValidSessionId as aa, listVhTerminals as ab, isValidTerminalId as ac, readVhTerminal as ad, sendToVhTerminal as ae, startOfflineReconnection as af, clearCredentials as ag, clearMachineId as ah, SandboxConfigSchema as ai, CodexAppServerClient as aj, getLatestDaemonLog as ak, persistence as al, api as am, createEnvelope as b, configuration as c, contentLogMetadata as d, errorLogMetadata as e, packageJson as f, delay as g, connectionState as h, readSettings as i, encodeBase64 as j, ensurePrivateDirectorySync as k, logger as l, hardenPrivateFileSync as m, readDaemonState as n, clearDaemonState as o, projectPath as p, getProjectPath as q, readPersistedSessions as r, initializeSandbox as s, wrapCommand as t, AsyncLock as u, ensurePrivateDirectory as v, writePrivateFileSync as w, hardenPrivateFile as x, readCredentials as y, credentialRelayProblem as z };