very-happy-cli 0.2.119 → 0.2.121

package/dist/{mcp-D4N7yn98.mjs → mcp-Bx1B3uny.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-DNXCQz_A.mjs';
+import { p as pushClipboardViaDaemon, k as setTerminalTitleViaDaemon, m as registerAssistantSessionTools } from './index-Iz-M3qbz.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-DdyNuB7D.mjs';
+import { l as logger } from './types-P2cJWD0E.mjs';
 import 'node:fs/promises';
 import 'node:os';
 import 'node:crypto';

package/dist/{mcp-CxIk4Mes.cjs → mcp-Cpx9Qlch.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-CRhOD3CQ.cjs');
+var index = require('./index-DObePs_K.cjs');
 var limits = require('./limits-KdWKmwtH.cjs');
-var persistence = require('./types-Bw_6p8NP.cjs');
+var persistence = require('./types-COOYpI8_.cjs');
 require('node:fs/promises');
 require('node:os');
 require('node:crypto');

package/dist/{runGemini-Bexbg8pA.mjs → runGemini-CMgudbJs.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-DdyNuB7D.mjs';
-import { I as GEMINI_API_KEY_ENV, J as GOOGLE_API_KEY_ENV, G as GEMINI_MODEL_ENV, C as BasePermissionHandler, K as BaseReasoningProcessor, n as initialMachineMetadata, o as createSessionMetadata, u as setupOfflineReconnection, v as notifyDaemonSessionStarted, x as MessageQueue2, y as hashObject, L as MessageBuffer, N as CHANGE_TITLE_INSTRUCTION, B as registerKillSessionHandler, z as startHappyServer } from './index-DNXCQz_A.mjs';
-import { A as AcpBackend } from './AcpBackend-DpsLyp2y.mjs';
-import { readGeminiLocalConfig, determineGeminiModel, getGeminiModelSource, getInitialGeminiModel, saveGeminiModelToConfig } from './config-DpE-aSHW.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-P2cJWD0E.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-Iz-M3qbz.mjs';
+import { A as AcpBackend } from './AcpBackend-BxvQ6O4k.mjs';
+import { readGeminiLocalConfig, determineGeminiModel, getGeminiModelSource, getInitialGeminiModel, saveGeminiModelToConfig } from './config-osO37dR1.mjs';
 import 'axios';
 import 'chalk';
 import 'node:util';
@@ -960,6 +960,10 @@ async function runGemini(opts) {
     permissionMode: mode.permissionMode,
     model: mode.model
   }));
+  messageQueue.setOnDiscard((entries) => {
+    const keys = entries.map((entry) => entry.sourceId).filter((key) => typeof key === "string");
+    if (keys.length > 0) session.sendQueueCancelReason(keys, entries[0].reason);
+  });
   const conversationHistory = new ConversationHistory({ maxMessages: 20, maxCharacters: 5e4 });
   let currentPermissionMode = void 0;
   let currentModel = void 0;
@@ -1010,7 +1014,7 @@ async function runGemini(opts) {
       originalUserMessage
       // Store original message separately
     };
-    messageQueue.push(fullPrompt, mode);
+    messageQueue.push(fullPrompt, mode, void 0, message.localKey);
     conversationHistory.addUserMessage(originalUserMessage);
   });
   let thinking = false;

package/dist/{runGemini-TbGYRy0V.cjs → runGemini-DI8DipUx.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-Bw_6p8NP.cjs');
-var index = require('./index-CRhOD3CQ.cjs');
-var AcpBackend = require('./AcpBackend-BpwOAcgu.cjs');
-var config = require('./config-CtQJKe8h.cjs');
+var persistence = require('./types-COOYpI8_.cjs');
+var index = require('./index-DObePs_K.cjs');
+var AcpBackend = require('./AcpBackend-Cdj56ZfU.cjs');
+var config = require('./config-DxOhdFEx.cjs');
 require('axios');
 require('chalk');
 require('node:util');
@@ -962,6 +962,10 @@ async function runGemini(opts) {
     permissionMode: mode.permissionMode,
     model: mode.model
   }));
+  messageQueue.setOnDiscard((entries) => {
+    const keys = entries.map((entry) => entry.sourceId).filter((key) => typeof key === "string");
+    if (keys.length > 0) session.sendQueueCancelReason(keys, entries[0].reason);
+  });
   const conversationHistory = new ConversationHistory({ maxMessages: 20, maxCharacters: 5e4 });
   let currentPermissionMode = void 0;
   let currentModel = void 0;
@@ -1012,7 +1016,7 @@ async function runGemini(opts) {
       originalUserMessage
       // Store original message separately
     };
-    messageQueue.push(fullPrompt, mode);
+    messageQueue.push(fullPrompt, mode, void 0, message.localKey);
     conversationHistory.addUserMessage(originalUserMessage);
   });
   let thinking = false;

package/dist/{runOpenClaw-B-TV4EkO.cjs → runOpenClaw-CetdjTl-.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-Bw_6p8NP.cjs');
-var AcpSessionManager = require('./AcpSessionManager-Ck6heffK.cjs');
-var index = require('./index-CRhOD3CQ.cjs');
+var persistence = require('./types-COOYpI8_.cjs');
+var AcpSessionManager = require('./AcpSessionManager-DahCU78z.cjs');
+var index = require('./index-DObePs_K.cjs');
 var WebSocket = require('ws');
 var ed = require('@noble/ed25519');
 var sha2_js = require('@noble/hashes/sha2.js');

package/dist/{runOpenClaw-BpoIQWbe.mjs → runOpenClaw-DR3fLtVf.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-DdyNuB7D.mjs';
-import { A as AcpSessionManager } from './AcpSessionManager-CM0PcgwO.mjs';
-import { n as initialMachineMetadata, o as createSessionMetadata, u as setupOfflineReconnection, v as notifyDaemonSessionStarted, x as MessageQueue2, B as registerKillSessionHandler } from './index-DNXCQz_A.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-P2cJWD0E.mjs';
+import { A as AcpSessionManager } from './AcpSessionManager-DlWlQVhw.mjs';
+import { n as initialMachineMetadata, o as createSessionMetadata, u as setupOfflineReconnection, v as notifyDaemonSessionStarted, y as MessageQueue2, C as registerKillSessionHandler } from './index-Iz-M3qbz.mjs';
 import WebSocket from 'ws';
 import * as ed from '@noble/ed25519';
 import { sha512 } from '@noble/hashes/sha2.js';

package/dist/{send-U9UJvqNA.cjs → send-Cq0NZCn8.cjs}

@@ -3,8 +3,8 @@
 var chalk = require('chalk');
 var node_fs = require('node:fs');
 var path = require('node:path');
-var persistence = require('./types-Bw_6p8NP.cjs');
-var index = require('./index-CRhOD3CQ.cjs');
+var persistence = require('./types-COOYpI8_.cjs');
+var index = require('./index-DObePs_K.cjs');
 require('axios');
 require('node:util');
 require('node:os');

package/dist/{send-z5SeDtKA.mjs → send-M4b_hD7t.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-DdyNuB7D.mjs';
-import { d as sendUserMessage, a as sessionWebUrl } from './index-DNXCQz_A.mjs';
+import { r as readPersistedSessions, c as configuration } from './types-P2cJWD0E.mjs';
+import { d as sendUserMessage, a as sessionWebUrl } from './index-Iz-M3qbz.mjs';
 import 'axios';
 import 'node:util';
 import 'node:os';

package/dist/{sessions-DNALvNe8.mjs → sessions-CelkWhqX.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-DNXCQz_A.mjs';
-import { i as isValidSessionId } from './types-DdyNuB7D.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-Iz-M3qbz.mjs';
+import { i as isValidSessionId } from './types-P2cJWD0E.mjs';
 import 'node:os';
 import 'node:crypto';
 import 'cross-spawn';
@@ -286,14 +286,21 @@ async function handleSessionsCommand(args) {
       const verdict = options.action === "approve" ? { kind: "approve", forSession: options.forSession } : { kind: "deny", reason: options.reason };
       let result;
       try {
-        result = await resolvePermissionRequest(sessionId, requestId, verdict);
+        result = await resolvePermissionRequest(sessionId, requestId, verdict, {
+          // T-014: a rate refusal waits (bounded) before re-sending;
+          // say so on stderr so the wait does not look like a hang.
+          onRateLimited: ({ attempt, waitMs, serverError }) => {
+            console.error(chalk.yellow("Rate limited:"), `${serverError} \u2014 waiting ${Math.ceil(waitMs / 1e3)}s before retry ${attempt}`);
+          }
+        });
       } catch (error) {
         if (options.json) console.log(JSON.stringify(permissionFailureRecord(sessionId, requestId, error)));
         throw error;
       }
       if (result.outcome.status !== "acknowledged") {
         if (options.json) console.log(JSON.stringify(result));
-        console.error(chalk.red("Error:"), `${options.action} of ${requestId} on ${sessionId} was not delivered (${result.outcome.status}): ${result.outcome.message}`);
+        const hint = result.outcome.status === "rate-limited" ? ` \u2014 the request is still pending; re-run in ~${Math.ceil(result.outcome.retryAfterMs / 1e3)}s` : "";
+        console.error(chalk.red("Error:"), `${options.action} of ${requestId} on ${sessionId} was not delivered (${result.outcome.status}): ${result.outcome.message}${hint}`);
         process.exit(1);
       }
       if (options.json) {

package/dist/{sessions-BAZGALtl.cjs → sessions-DW4lrLOp.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
 var chalk = require('chalk');
-var index = require('./index-CRhOD3CQ.cjs');
-var persistence = require('./types-Bw_6p8NP.cjs');
+var index = require('./index-DObePs_K.cjs');
+var persistence = require('./types-COOYpI8_.cjs');
 require('node:os');
 require('node:crypto');
 require('cross-spawn');
@@ -288,14 +288,21 @@ async function handleSessionsCommand(args) {
       const verdict = options.action === "approve" ? { kind: "approve", forSession: options.forSession } : { kind: "deny", reason: options.reason };
       let result;
       try {
-        result = await index.resolvePermissionRequest(sessionId, requestId, verdict);
+        result = await index.resolvePermissionRequest(sessionId, requestId, verdict, {
+          // T-014: a rate refusal waits (bounded) before re-sending;
+          // say so on stderr so the wait does not look like a hang.
+          onRateLimited: ({ attempt, waitMs, serverError }) => {
+            console.error(chalk.yellow("Rate limited:"), `${serverError} \u2014 waiting ${Math.ceil(waitMs / 1e3)}s before retry ${attempt}`);
+          }
+        });
       } catch (error) {
         if (options.json) console.log(JSON.stringify(permissionFailureRecord(sessionId, requestId, error)));
         throw error;
       }
       if (result.outcome.status !== "acknowledged") {
         if (options.json) console.log(JSON.stringify(result));
-        console.error(chalk.red("Error:"), `${options.action} of ${requestId} on ${sessionId} was not delivered (${result.outcome.status}): ${result.outcome.message}`);
+        const hint = result.outcome.status === "rate-limited" ? ` \u2014 the request is still pending; re-run in ~${Math.ceil(result.outcome.retryAfterMs / 1e3)}s` : "";
+        console.error(chalk.red("Error:"), `${options.action} of ${requestId} on ${sessionId} was not delivered (${result.outcome.status}): ${result.outcome.message}${hint}`);
         process.exit(1);
       }
       if (options.json) {

package/dist/{spawn-CsV0SKkw.mjs → spawn-C4fF0q3Z.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-DNXCQz_A.mjs';
-import { l as logger } from './types-DdyNuB7D.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-Iz-M3qbz.mjs';
+import { l as logger } from './types-P2cJWD0E.mjs';
 import 'node:os';
 import 'node:crypto';
 import 'cross-spawn';

package/dist/{spawn-dBxu-RAv.cjs → spawn-D3cwBlWI.cjs}

@@ -3,8 +3,8 @@
 var chalk = require('chalk');
 var node_fs = require('node:fs');
 var path = require('node:path');
-var index = require('./index-CRhOD3CQ.cjs');
-var persistence = require('./types-Bw_6p8NP.cjs');
+var index = require('./index-DObePs_K.cjs');
+var persistence = require('./types-COOYpI8_.cjs');
 require('node:os');
 require('node:crypto');
 require('cross-spawn');

package/dist/{types-Bw_6p8NP.cjs → types-COOYpI8_.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.119";
+var version = "0.2.121";
 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.119",
-	"very-happy-tools-x64-darwin": "0.2.119",
-	"very-happy-tools-arm64-linux": "0.2.119",
-	"very-happy-tools-x64-linux": "0.2.119",
-	"very-happy-tools-arm64-win32": "0.2.119",
-	"very-happy-tools-x64-win32": "0.2.119"
+	"very-happy-tools-arm64-darwin": "0.2.121",
+	"very-happy-tools-x64-darwin": "0.2.121",
+	"very-happy-tools-arm64-linux": "0.2.121",
+	"very-happy-tools-x64-linux": "0.2.121",
+	"very-happy-tools-arm64-win32": "0.2.121",
+	"very-happy-tools-x64-win32": "0.2.121"
 };
 var devDependencies = {
 	"@slopus/happy-wire": "workspace:*",
@@ -742,6 +742,11 @@ const sessionProgressEventSchema = z__namespace.object({
   durationMs: z__namespace.number().optional(),
   summary: z__namespace.string().optional()
 });
+const sessionQueueCancelEventSchema = z__namespace.object({
+  t: z__namespace.literal("queue-cancel"),
+  targetLocalKeys: z__namespace.array(z__namespace.string().min(1)).min(1),
+  reason: z__namespace.string().min(1).optional()
+});
 const sessionEventSchema = z__namespace.discriminatedUnion("t", [
   sessionTextEventSchema,
   sessionServiceMessageEventSchema,
@@ -752,7 +757,8 @@ const sessionEventSchema = z__namespace.discriminatedUnion("t", [
   sessionStartEventSchema,
   sessionTurnEndEventSchema,
   sessionStopEventSchema,
-  sessionProgressEventSchema
+  sessionProgressEventSchema,
+  sessionQueueCancelEventSchema
 ]);
 const sessionEnvelopeSchema = z__namespace.object({
   id: z__namespace.string(),
@@ -1685,7 +1691,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-Bw_6p8NP.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-COOYpI8_.cjs', document.baseURI).href))));
 function projectPath() {
   const path = path$1.resolve(__dirname$1, "..");
   return path;
@@ -3135,6 +3141,48 @@ class InvalidateSync {
   };
 }
 
+function sessionEnvelopeOf(body) {
+  if (!body || typeof body !== "object") return null;
+  const record = body;
+  if (record.role !== "session" || !record.content || typeof record.content !== "object") return null;
+  const content = record.content;
+  if (content.type === "session" && content.data && typeof content.data === "object") {
+    return content.data;
+  }
+  if (content.ev !== void 0) return content;
+  return null;
+}
+function isQueuedUserText(body) {
+  if (!body || typeof body !== "object") return false;
+  const record = body;
+  return record.role === "user" && record.content?.type === "text" && typeof record.meta?.queuedAt === "number";
+}
+function scanUndeliveredQueuedInputs(records, prior) {
+  const canceled = prior?.canceled ?? /* @__PURE__ */ new Set();
+  const undelivered = [];
+  let reachedBoundary = false;
+  for (const record of records) {
+    const envelope = sessionEnvelopeOf(record.body);
+    if (envelope) {
+      const t = envelope.ev?.t;
+      if (t === "turn-end") {
+        reachedBoundary = true;
+        break;
+      }
+      if (t === "queue-cancel" && Array.isArray(envelope.ev?.targetLocalKeys)) {
+        for (const key of envelope.ev.targetLocalKeys) {
+          if (typeof key === "string") canceled.add(key);
+        }
+      }
+      continue;
+    }
+    if (isQueuedUserText(record.body) && record.localId && !canceled.has(record.localId)) {
+      undelivered.push(record.localId);
+    }
+  }
+  return { undeliveredLocalKeys: undelivered, reachedBoundary, canceled };
+}
+
 function record(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : null;
 }
@@ -3778,8 +3826,75 @@ class ApiSessionClient extends node_events.EventEmitter {
       this.sendSync.invalidate();
     }
   }
+  /** B-332: emit a queue-cancel tombstone, mirroring the web's own signal. */
+  sendQueueCancelReason(localKeys, reason) {
+    if (localKeys.length === 0) return;
+    const envelope = createEnvelope("user", { t: "queue-cancel", targetLocalKeys: localKeys, reason });
+    this.sendSessionProtocolMessage(envelope);
+  }
   /**
-   * Send message to session
+   * B-332 site ③: find queued user input this wrapper destroyed (it was still
+   * in the previous wrapper's in-memory queue when it died) and tell the web.
+   *
+   * Walks NEWEST → OLDEST via `before_seq`, decrypting each page, and stops at
+   * the first turn-end. The runner calls this on EVERY reconnect (runClaude /
+   * runCodex), seeded or not: a cursor seeded at the server's latest seq skips
+   * the undelivered tail just as thoroughly as skipExistingMessages does —
+   * and the daemon's resume/restart always seeds, so gating on the skip path
+   * would miss the common case. Best-effort: a failed scan must not take a
+   * session down. Needs no socket; POSTs through the same session-message
+   * channel so the web receives it identically to a cancel-button tombstone.
+   */
+  async cancelUndeliveredQueuedInputs() {
+    const MAX_SCAN_PAGES = 10;
+    const canceled = /* @__PURE__ */ new Set();
+    const undelivered = [];
+    let beforeSeq = 2147483647;
+    let reachedBoundary = false;
+    let pages = 0;
+    try {
+      while (!reachedBoundary && pages < MAX_SCAN_PAGES) {
+        pages += 1;
+        const response = await axios.get(
+          `${configuration.serverUrl}/v3/sessions/${encodeURIComponent(this.sessionId)}/messages`,
+          {
+            params: { before_seq: beforeSeq, limit: 100 },
+            headers: this.authHeaders(),
+            timeout: 6e4
+          }
+        );
+        const messages = Array.isArray(response.data.messages) ? response.data.messages : [];
+        if (messages.length === 0) break;
+        const records = messages.map((message) => {
+          let body = null;
+          try {
+            body = message.content?.t === "encrypted" ? decrypt(this.encryptionKey, this.encryptionVariant, decodeBase64(message.content.c)) : null;
+          } catch (error) {
+            logger.debug("[API] Failed to decrypt during undelivered scan:", error);
+          }
+          return { seq: message.seq, localId: message.localId, body };
+        });
+        const scan = scanUndeliveredQueuedInputs(records, { canceled });
+        for (const key of scan.canceled) canceled.add(key);
+        undelivered.push(...scan.undeliveredLocalKeys);
+        reachedBoundary = scan.reachedBoundary;
+        const oldest = records.at(-1)?.seq;
+        if (oldest === void 0 || messages.length < 100) break;
+        beforeSeq = oldest;
+      }
+    } catch (error) {
+      logger.debug("[API] cancelUndeliveredQueuedInputs scan failed:", error);
+      return;
+    }
+    if (!reachedBoundary) {
+      logger.debug("[API] cancelUndeliveredQueuedInputs found no turn boundary; leaving messages as-is");
+      return;
+    }
+    undelivered.reverse();
+    this.sendQueueCancelReason(undelivered, "restarted");
+  }
+  /**
+   * Send a message to session
    * @param body - Message body (can be MessageContent or raw content for agent messages)
    */
   sendClaudeSessionMessage(body, opts) {
@@ -4472,34 +4587,44 @@ function migrateSettings(raw, fromVersion) {
   let migrated = { ...raw };
   return migrated;
 }
-async function readSettings() {
+async function readSettingsOutcome() {
   if (!node_fs.existsSync(configuration.settingsFile)) {
-    return { ...defaultSettings };
+    return { kind: "absent" };
   }
   try {
-    const content = await promises.readFile(configuration.settingsFile, "utf8");
-    const raw = JSON.parse(content);
-    const schemaVersion = raw.schemaVersion ?? 1;
-    if (schemaVersion > SUPPORTED_SCHEMA_VERSION) {
-      logger.warn(
-        `\u26A0\uFE0F Settings schema v${schemaVersion} > supported v${SUPPORTED_SCHEMA_VERSION}. Update happy-cli for full functionality.`
-      );
-    }
-    const migrated = migrateSettings(raw, schemaVersion);
-    if (migrated.sandboxConfig !== void 0) {
-      try {
-        migrated.sandboxConfig = SandboxConfigSchema.parse(migrated.sandboxConfig);
-      } catch (error) {
-        logger.warn(`\u26A0\uFE0F Invalid sandbox config - skipping. Error: ${error.message}`);
-        migrated.sandboxConfig = void 0;
-      }
-    }
-    return { ...defaultSettings, ...migrated };
+    return { kind: "ok", settings: await parseSettingsFile() };
   } catch (error) {
-    logger.warn(`Failed to read settings: ${error.message}`);
-    return { ...defaultSettings };
+    return { kind: "unreadable", error: error?.message ?? String(error) };
   }
 }
+async function readSettings() {
+  const outcome = await readSettingsOutcome();
+  if (outcome.kind === "ok") return outcome.settings;
+  if (outcome.kind === "unreadable") {
+    logger.warn(`Failed to read settings: ${outcome.error}`);
+  }
+  return { ...defaultSettings };
+}
+async function parseSettingsFile() {
+  const content = await promises.readFile(configuration.settingsFile, "utf8");
+  const raw = JSON.parse(content);
+  const schemaVersion = raw.schemaVersion ?? 1;
+  if (schemaVersion > SUPPORTED_SCHEMA_VERSION) {
+    logger.warn(
+      `\u26A0\uFE0F Settings schema v${schemaVersion} > supported v${SUPPORTED_SCHEMA_VERSION}. Update happy-cli for full functionality.`
+    );
+  }
+  const migrated = migrateSettings(raw);
+  if (migrated.sandboxConfig !== void 0) {
+    try {
+      migrated.sandboxConfig = SandboxConfigSchema.parse(migrated.sandboxConfig);
+    } catch (error) {
+      logger.warn(`\u26A0\uFE0F Invalid sandbox config - skipping. Error: ${error.message}`);
+      migrated.sandboxConfig = void 0;
+    }
+  }
+  return { ...defaultSettings, ...migrated };
+}
 async function writeSettings(settings) {
   await ensurePrivateDirectory(configuration.happyHomeDir);
   const settingsWithVersion = {
@@ -4541,7 +4666,13 @@ async function updateSettings(updater) {
     throw new Error(`Failed to acquire settings lock after ${MAX_LOCK_ATTEMPTS * LOCK_RETRY_INTERVAL_MS / 1e3} seconds`);
   }
   try {
-    const current = await readSettings() || { ...defaultSettings };
+    const outcome = await readSettingsOutcome();
+    if (outcome.kind === "unreadable") {
+      throw new Error(
+        `Settings file ${configuration.settingsFile} exists but could not be read (${outcome.error}). Refusing to overwrite it \u2014 fix or remove the file (a removed file is recreated with defaults).`
+      );
+    }
+    const current = outcome.kind === "ok" ? outcome.settings : { ...defaultSettings };
     const updated = await updater(current);
     await ensurePrivateDirectory(configuration.happyHomeDir);
     await writePrivateFile(tmpFile, JSON.stringify(updated, null, 2));
@@ -4788,6 +4919,7 @@ var persistence = /*#__PURE__*/Object.freeze({
   readDaemonState: readDaemonState,
   readPersistedSessions: readPersistedSessions,
   readSettings: readSettings,
+  readSettingsOutcome: readSettingsOutcome,
   readTrackedClaudeSessionIds: readTrackedClaudeSessionIds,
   releaseDaemonLock: releaseDaemonLock,
   updateSettings: updateSettings,
@@ -14535,6 +14667,7 @@ async function withCodexAppServerClient(handler) {
     await client.disconnect();
   }
 }
+const CLI_AVAILABILITY_RECHECK_MS = 5 * 60 * 1e3;
 class ApiMachineClient {
   constructor(token, machine) {
     this.token = token;
@@ -14558,6 +14691,10 @@ class ApiMachineClient {
   keepAliveInterval = null;
   lastKnownCLIAvailability = null;
   lastKnownResumeSupport = null;
+  /** Wall-clock of the last CLI availability probe. Initialised as "already
+   *  stale" so the FIRST keep-alive tick always probes and populates the
+   *  machine metadata that a connecting/reconnecting web client reads. */
+  lastCliProbeAt = Date.now() - CLI_AVAILABILITY_RECHECK_MS;
   cliUpdateState = null;
   cliUpdatePushChain = Promise.resolve();
   claudeAuthState = null;
@@ -15425,6 +15562,10 @@ class ApiMachineClient {
       }
       this.socket.emit("machine-alive", payload);
       void this.refreshRelayConnection();
+      if (Date.now() - this.lastCliProbeAt < CLI_AVAILABILITY_RECHECK_MS) {
+        return;
+      }
+      this.lastCliProbeAt = Date.now();
       const newAvailability = detectCLIAvailability();
       const prev = this.lastKnownCLIAvailability;
       const newResumeSupport = detectResumeSupport();
@@ -16720,6 +16861,7 @@ exports.readDaemonState = readDaemonState;
 exports.readLocalHappyAgentCredentials = readLocalHappyAgentCredentials;
 exports.readPersistedSessions = readPersistedSessions;
 exports.readSettings = readSettings;
+exports.readSettingsOutcome = readSettingsOutcome;
 exports.readVhTerminal = readVhTerminal;
 exports.releaseDaemonLock = releaseDaemonLock;
 exports.resolveCliUpdateCheckInterval = resolveCliUpdateCheckInterval;
@@ -16727,6 +16869,7 @@ exports.scrubTmuxClientEnv = scrubTmuxClientEnv;
 exports.sendToVhTerminal = sendToVhTerminal;
 exports.shellescape = shellescape;
 exports.startOfflineReconnection = startOfflineReconnection;
+exports.streamKeyOf = streamKeyOf;
 exports.summarizeSpawnSessionForLog = summarizeSpawnSessionForLog;
 exports.tmuxArgs = tmuxArgs;
 exports.updateSettings = updateSettings;