very-happy-cli 0.2.81 → 0.2.83

package/dist/{AcpBackend-cBt4R6ce.mjs → AcpBackend-DbS9-r10.mjs}

@@ -1,7 +1,7 @@
 import { spawn } from 'node:child_process';
 import { ndJsonStream, ClientSideConnection } from '@agentclientprotocol/sdk';
 import { randomUUID } from 'node:crypto';
-import { l as logger, d as contentLogMetadata, e as errorLogMetadata, f as packageJson, g as delay } from './types-DFKdwxE-.mjs';
+import { l as logger, d as contentLogMetadata, e as errorLogMetadata, f as packageJson, g as delay } from './types-RASD9X96.mjs';
 
 const DEFAULT_TIMEOUTS = {
   /** Default initialization timeout: 60 seconds */

package/dist/{AcpBackend-B7Z1Gk_l.cjs → AcpBackend-sS5ln9nS.cjs}

@@ -3,7 +3,7 @@
 var node_child_process = require('node:child_process');
 var sdk = require('@agentclientprotocol/sdk');
 var node_crypto = require('node:crypto');
-var persistence = require('./types-DJC5rGtd.cjs');
+var persistence = require('./types-sFcb_Sfz.cjs');
 
 const DEFAULT_TIMEOUTS = {
   /** Default initialization timeout: 60 seconds */

package/dist/{AcpSessionManager-D3-rBUxk.cjs → AcpSessionManager-DX5IvruC.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 var cuid2 = require('@paralleldrive/cuid2');
-var persistence = require('./types-DJC5rGtd.cjs');
+var persistence = require('./types-sFcb_Sfz.cjs');
 
 function turnOptions(turnId, time) {
   return turnId ? { turn: turnId, time } : { time };

package/dist/{AcpSessionManager-AyrINTu7.mjs → AcpSessionManager-DuZN34yy.mjs}

@@ -1,5 +1,5 @@
 import { createId } from '@paralleldrive/cuid2';
-import { b as createEnvelope } from './types-DFKdwxE-.mjs';
+import { b as createEnvelope } from './types-RASD9X96.mjs';
 
 function turnOptions(turnId, time) {
   return turnId ? { turn: turnId, time } : { time };

package/dist/{config-CZdNxl3d.mjs → config-3BOBElkv.mjs}

@@ -2,8 +2,8 @@ import { existsSync, readFileSync, mkdirSync, writeFileSync } from 'fs';
 import { join } from 'path';
 import { homedir } from 'os';
 import { execSync } from 'child_process';
-import { l as logger } from './types-DFKdwxE-.mjs';
-import { D as DEFAULT_GEMINI_MODEL, G as GEMINI_MODEL_ENV } from './index-W3oj-d6C.mjs';
+import { l as logger } from './types-RASD9X96.mjs';
+import { D as DEFAULT_GEMINI_MODEL, G as GEMINI_MODEL_ENV } from './index-BDhR8Zbc.mjs';
 import 'axios';
 import 'chalk';
 import 'node:util';

package/dist/{config-B2TBK1UZ.cjs → config-BkxNWcwM.cjs}

@@ -4,8 +4,8 @@ var fs = require('fs');
 var path = require('path');
 var os = require('os');
 var child_process = require('child_process');
-var persistence = require('./types-DJC5rGtd.cjs');
-var index = require('./index-SjWW0gIt.cjs');
+var persistence = require('./types-sFcb_Sfz.cjs');
+var index = require('./index-BVlYjP10.cjs');
 require('axios');
 require('chalk');
 require('node:util');

package/dist/{index-DuvoxKEM.mjs → index-08H6z21h.mjs}

@@ -1,10 +1,10 @@
-import { D as DefaultTransport, A as AcpBackend } from './AcpBackend-cBt4R6ce.mjs';
-export { a as DEFAULT_IDLE_TIMEOUT_MS, b as DEFAULT_TOOL_CALL_TIMEOUT_MS, e as extractErrorDetail, f as formatDuration, c as formatDurationMinutes, h as handleAgentMessageChunk, d as handleAgentThoughtChunk, g as handleLegacyMessageChunk, i as handlePlanUpdate, j as handleThinkingUpdate, k as handleToolCall, l as handleToolCallUpdate, p as parseArgsFromContent } from './AcpBackend-cBt4R6ce.mjs';
-import { h as connectionState, A as ApiClient, i as readSettings, j as encodeBase64, l as logger, p as projectPath } from './types-DFKdwxE-.mjs';
-import { A as AcpSessionManager } from './AcpSessionManager-AyrINTu7.mjs';
+import { D as DefaultTransport, A as AcpBackend } from './AcpBackend-DbS9-r10.mjs';
+export { a as DEFAULT_IDLE_TIMEOUT_MS, b as DEFAULT_TOOL_CALL_TIMEOUT_MS, e as extractErrorDetail, f as formatDuration, c as formatDurationMinutes, h as handleAgentMessageChunk, d as handleAgentThoughtChunk, g as handleLegacyMessageChunk, i as handlePlanUpdate, j as handleThinkingUpdate, k as handleToolCall, l as handleToolCallUpdate, p as parseArgsFromContent } from './AcpBackend-DbS9-r10.mjs';
+import { h as connectionState, A as ApiClient, i as readSettings, j as encodeBase64, l as logger, p as projectPath } from './types-RASD9X96.mjs';
+import { A as AcpSessionManager } from './AcpSessionManager-DuZN34yy.mjs';
 import { randomUUID } from 'node:crypto';
 import { join } from 'node:path';
-import { i as initialMachineMetadata, d as createSessionMetadata, e as setupOfflineReconnection, n as notifyDaemonSessionStarted, M as MessageQueue2, h as hashObject, f as startHappyServer, r as registerKillSessionHandler, B as BasePermissionHandler } from './index-W3oj-d6C.mjs';
+import { i as initialMachineMetadata, d as createSessionMetadata, e as setupOfflineReconnection, n as notifyDaemonSessionStarted, M as MessageQueue2, h as hashObject, f as startHappyServer, r as registerKillSessionHandler, B as BasePermissionHandler } from './index-BDhR8Zbc.mjs';
 import 'node:child_process';
 import '@agentclientprotocol/sdk';
 import 'axios';

package/dist/{index-W3oj-d6C.mjs → index-BDhR8Zbc.mjs}

@@ -1,7 +1,7 @@
 import{createRequire as _pkgrollCR}from"node:module";const require=_pkgrollCR(import.meta.url);import chalk from 'chalk';
 import os, { homedir } from 'node:os';
 import { randomUUID, randomBytes, createHash as createHash$1, timingSafeEqual } from 'node:crypto';
-import { n as readDaemonState, l as logger, c as configuration, o as clearDaemonState, q as getProjectPath, p as projectPath, s as initializeSandbox, t as wrapCommand, d as contentLogMetadata, I as InvalidateSync, R as RawJSONLinesSchema, g as delay, u as AsyncLock, f as packageJson, i as readSettings, v as readCredentials, x as credentialRelayProblem, y as deriveLocalCliUpdateSummary, j as encodeBase64, z as updateSettings, B as encodeBase64Url, C as decodeBase64, D as writeCredentialsLegacy, E as writeCredentialsDataKey, F as readCredentialsForConfiguredRelay, G as encrypt, r as readPersistedSessions, H as getLocalHappyAgentCredentialPath, J as readLocalHappyAgentCredentials, K as decryptWithDataKey, L as decryptLegacy, M as extractCompleteLines, N as decideBackfill, O as parseTerminalHookPayload, P as decideMirrorBinding, Q as persistSession, S as MIRROR_BACKFILL_LINES_DEFAULT, T as mirrorLineKey, U as mirrorLocalId, V as detectResumeSupport, W as detectCLIAvailability, X as acquireDaemonLock, Y as summarizeSpawnSessionForLog, Z as deletePersistedSessions, _ as decrypt, $ as writeDaemonState, A as ApiClient, a0 as fetchCliUpdateState, a1 as resolveCliUpdateCheckInterval, a2 as DEFAULT_CLI_UPDATE_CHECK_INTERVAL_MS, a3 as releaseDaemonLock, a4 as isValidSessionId, a5 as listVhTerminals, a6 as isValidTerminalId, a7 as readVhTerminal, a8 as sendToVhTerminal, h as connectionState, a9 as startOfflineReconnection, aa as clearCredentials, ab as clearMachineId, k as ensurePrivateDirectorySync, w as writePrivateFileSync, ac as SandboxConfigSchema, b as createEnvelope, ad as CodexAppServerClient, ae as getLatestDaemonLog } from './types-DFKdwxE-.mjs';
+import { n as readDaemonState, l as logger, c as configuration, o as clearDaemonState, q as getProjectPath, p as projectPath, s as initializeSandbox, t as wrapCommand, d as contentLogMetadata, I as InvalidateSync, R as RawJSONLinesSchema, g as delay, u as AsyncLock, f as packageJson, i as readSettings, v as readCredentials, x as credentialRelayProblem, y as deriveLocalCliUpdateSummary, j as encodeBase64, z as updateSettings, B as encodeBase64Url, C as decodeBase64, D as writeCredentialsLegacy, E as writeCredentialsDataKey, F as readCredentialsForConfiguredRelay, G as encrypt, r as readPersistedSessions, H as getLocalHappyAgentCredentialPath, J as readLocalHappyAgentCredentials, K as decryptWithDataKey, L as decryptLegacy, M as extractCompleteLines, N as decideBackfill, O as parseTerminalHookPayload, P as decideMirrorBinding, Q as persistSession, S as MIRROR_BACKFILL_LINES_DEFAULT, T as mirrorLineKey, U as mirrorLocalId, V as detectResumeSupport, W as detectCLIAvailability, X as acquireDaemonLock, Y as summarizeSpawnSessionForLog, Z as deletePersistedSessions, _ as decrypt, $ as writeDaemonState, A as ApiClient, a0 as fetchCliUpdateState, a1 as resolveCliUpdateCheckInterval, a2 as DEFAULT_CLI_UPDATE_CHECK_INTERVAL_MS, a3 as releaseDaemonLock, a4 as isValidSessionId, a5 as listVhTerminals, a6 as isValidTerminalId, a7 as readVhTerminal, a8 as sendToVhTerminal, h as connectionState, a9 as startOfflineReconnection, aa as clearCredentials, ab as clearMachineId, k as ensurePrivateDirectorySync, w as writePrivateFileSync, ac as SandboxConfigSchema, b as createEnvelope, ad as CodexAppServerClient, ae as getLatestDaemonLog } from './types-RASD9X96.mjs';
 import spawn$1, { spawn } from 'cross-spawn';
 import path, { join, resolve, isAbsolute, normalize, sep, dirname } from 'node:path';
 import { createInterface } from 'node:readline';
@@ -2982,6 +2982,49 @@ function applyClaudeResultLifecycle(result, callbacks) {
   callbacks.onCompleted();
 }
 
+const CLAUDE_ATTACHMENT_KINDS = [
+  "image/jpeg",
+  "image/png",
+  "image/gif",
+  "image/webp",
+  "application/pdf"
+];
+function detectClaudeImageMime(bytes) {
+  if (bytes.length >= 4 && bytes[0] === 137 && bytes[1] === 80 && bytes[2] === 78 && bytes[3] === 71) {
+    return "image/png";
+  }
+  if (bytes.length >= 3 && bytes[0] === 255 && bytes[1] === 216 && bytes[2] === 255) {
+    return "image/jpeg";
+  }
+  if (bytes.length >= 4 && bytes[0] === 71 && bytes[1] === 73 && bytes[2] === 70 && bytes[3] === 56) {
+    return "image/gif";
+  }
+  if (bytes.length >= 12 && bytes[0] === 82 && bytes[1] === 73 && bytes[2] === 70 && bytes[3] === 70 && bytes[8] === 87 && bytes[9] === 69 && bytes[10] === 66 && bytes[11] === 80) {
+    return "image/webp";
+  }
+  return null;
+}
+function isPdf(bytes) {
+  return bytes.length >= 5 && bytes[0] === 37 && bytes[1] === 80 && bytes[2] === 68 && bytes[3] === 70 && bytes[4] === 45;
+}
+function attachmentToClaudeContentBlock(bytes) {
+  const data = Buffer.from(bytes).toString("base64");
+  const imageMime = detectClaudeImageMime(bytes);
+  if (imageMime) {
+    return {
+      type: "image",
+      source: { type: "base64", media_type: imageMime, data }
+    };
+  }
+  if (isPdf(bytes)) {
+    return {
+      type: "document",
+      source: { type: "base64", media_type: "application/pdf", data }
+    };
+  }
+  return null;
+}
+
 function applyClaudeSdkMetadata(current, update) {
   return {
     ...current,
@@ -2989,6 +3032,8 @@ function applyClaudeSdkMetadata(current, update) {
     slashCommands: update.slashCommands,
     mcpServers: update.mcpServers,
     skills: update.skills,
+    attachmentKinds: [...CLAUDE_ATTACHMENT_KINDS],
+    queueCancellation: true,
     ...update.modelIsDefault && update.model ? { defaultModelCode: update.model } : {}
   };
 }
@@ -3264,23 +3309,23 @@ async function claudeRemoteLauncher(session) {
               const attachments = msg.attachments ?? [];
               if (attachments.length > 0) {
                 const contentBlocks = [];
+                let acceptedAttachments = 0;
                 for (const att of attachments) {
-                  const detected = detectClaudeImageMime(att.data);
-                  if (!detected) {
+                  const block = attachmentToClaudeContentBlock(att.data);
+                  if (!block) {
                     logger.debug(`[remote] Skipping unsupported attachment (no magic-byte match): ${att.name}, claimed mimeType=${att.mimeType}`);
                     continue;
                   }
-                  contentBlocks.push({
-                    type: "image",
-                    source: {
-                      type: "base64",
-                      media_type: detected,
-                      data: Buffer.from(att.data).toString("base64")
-                    }
-                  });
+                  contentBlocks.push(block);
+                  acceptedAttachments++;
+                }
+                if (msg.message.trim().length > 0) {
+                  contentBlocks.push({ type: "text", text: msg.message });
+                }
+                if (contentBlocks.length === 0) {
+                  throw new Error("No supported attachment content was available to send");
                 }
-                contentBlocks.push({ type: "text", text: msg.message });
-                logger.debug(`[remote] Combined ${contentBlocks.length - 1} image(s) with text message`);
+                logger.debug(`[remote] Combined ${acceptedAttachments} attachment(s) with${msg.message.trim() ? "" : "out"} text message`);
                 return {
                   message: contentBlocks,
                   mode: msg.mode
@@ -3412,21 +3457,6 @@ async function claudeRemoteLauncher(session) {
   }
   return exitReason || "exit";
 }
-function detectClaudeImageMime(bytes) {
-  if (bytes.length >= 4 && bytes[0] === 137 && bytes[1] === 80 && bytes[2] === 78 && bytes[3] === 71) {
-    return "image/png";
-  }
-  if (bytes.length >= 3 && bytes[0] === 255 && bytes[1] === 216 && bytes[2] === 255) {
-    return "image/jpeg";
-  }
-  if (bytes.length >= 4 && bytes[0] === 71 && bytes[1] === 73 && bytes[2] === 70 && bytes[3] === 56) {
-    return "image/gif";
-  }
-  if (bytes.length >= 12 && bytes[0] === 82 && bytes[1] === 73 && bytes[2] === 70 && bytes[3] === 70 && bytes[8] === 87 && bytes[9] === 69 && bytes[10] === 66 && bytes[11] === 80) {
-    return "image/webp";
-  }
-  return null;
-}
 
 async function loop(opts) {
   const logPath = logger.logFilePath;
@@ -3502,7 +3532,7 @@ class MessageQueue2 {
    * Push a message to the queue with a mode and an optional list of
    * attachments that travel with this message.
    */
-  push(message, mode, attachments) {
+  push(message, mode, attachments, sourceId) {
     if (this.closed) {
       throw new Error("Cannot push to closed queue");
     }
@@ -3513,7 +3543,8 @@ class MessageQueue2 {
       mode,
       modeHash,
       isolate: false,
-      attachments
+      attachments,
+      sourceId
     });
     if (this.onMessageHandler) {
       this.onMessageHandler(message, mode);
@@ -3558,7 +3589,7 @@ class MessageQueue2 {
    * Clears any pending messages and ensures this message is never batched with others.
    * Used for special commands that require dedicated processing.
    */
-  pushIsolateAndClear(message, mode, attachments) {
+  pushIsolateAndClear(message, mode, attachments, sourceId) {
     if (this.closed) {
       throw new Error("Cannot push to closed queue");
     }
@@ -3570,7 +3601,8 @@ class MessageQueue2 {
       mode,
       modeHash,
       isolate: true,
-      attachments
+      attachments,
+      sourceId
     });
     if (this.onMessageHandler) {
       this.onMessageHandler(message, mode);
@@ -3642,6 +3674,21 @@ class MessageQueue2 {
   size() {
     return this.queue.length;
   }
+  /**
+   * Remove one message that has not yet been collected by the agent loop.
+   * Source id is authoritative. Exact-text fallback only covers items that
+   * entered this live process before transport ids were introduced.
+   */
+  cancelPending(sourceId, exactText) {
+    let index = sourceId ? this.queue.findIndex((item) => item.sourceId === sourceId) : -1;
+    if (index < 0 && exactText !== void 0) {
+      index = this.queue.findIndex((item) => item.sourceId === void 0 && item.message === exactText);
+    }
+    if (index < 0) return false;
+    this.queue.splice(index, 1);
+    logger.debug(`[MessageQueue2] Cancelled pending item. Queue size: ${this.queue.length}`);
+    return true;
+  }
   /**
    * Wait for messages and return all messages with the same mode as a single string
    * Returns { message: string, mode: T } or null if aborted/closed
@@ -8934,6 +8981,10 @@ async function runClaude(credentials, options = {}) {
     lifecycleState: "running",
     lifecycleStateSince: Date.now(),
     flavor: "claude",
+    // Advertise composer support before the first SDK response. Otherwise
+    // a brand-new session cannot pick a PDF until after sending once.
+    attachmentKinds: [...CLAUDE_ATTACHMENT_KINDS],
+    queueCancellation: true,
     sandbox: sandboxConfig?.enabled ? sandboxConfig : null,
     dangerouslySkipPermissions,
     ...forkedFromSessionId ? { parentSessionId: forkedFromSessionId } : {},
@@ -9037,7 +9088,8 @@ async function runClaude(credentials, options = {}) {
     session.updateMetadata((meta) => ({
       ...meta,
       lifecycleState: "running",
-      archivedBy: void 0
+      archivedBy: void 0,
+      queueCancellation: true
     }));
   }
   const forkClaudeSessionId = process.env.HAPPY_FORK_CLAUDE_SESSION_ID;
@@ -9162,6 +9214,12 @@ async function runClaude(credentials, options = {}) {
     disallowedTools: mode.disallowedTools,
     effort: mode.effort
   }));
+  session.rpcHandlerManager.registerHandler("cancelQueuedMessage", async (params) => ({
+    removed: messageQueue.cancelPending(
+      typeof params?.localKey === "string" ? params.localKey : void 0,
+      typeof params?.text === "string" ? params.text : void 0
+    )
+  }));
   let currentPermissionMode = initialPermissionMode;
   let currentModel = options.model ?? DEFAULT_CLAUDE_MODEL;
   let currentFallbackModel = void 0;
@@ -9304,7 +9362,7 @@ async function runClaude(credentials, options = {}) {
         disallowedTools: messageDisallowedTools,
         effort: messageEffort
       };
-      messageQueue.pushIsolateAndClear(specialCommand.originalMessage || message.content.text, enhancedMode2, attachmentsForThisMessage);
+      messageQueue.pushIsolateAndClear(specialCommand.originalMessage || message.content.text, enhancedMode2, attachmentsForThisMessage, message.localKey);
       logger.debug("[start] /compact command pushed to queue:", {
         ...contentLogMetadata(message.content.text),
         attachmentCount: attachmentsForThisMessage?.length ?? 0,
@@ -9324,7 +9382,7 @@ async function runClaude(credentials, options = {}) {
         disallowedTools: messageDisallowedTools,
         effort: messageEffort
       };
-      messageQueue.pushIsolateAndClear(specialCommand.originalMessage || message.content.text, enhancedMode2, attachmentsForThisMessage);
+      messageQueue.pushIsolateAndClear(specialCommand.originalMessage || message.content.text, enhancedMode2, attachmentsForThisMessage, message.localKey);
       logger.debug("[start] /clear command pushed to queue:", {
         ...contentLogMetadata(message.content.text),
         attachmentCount: attachmentsForThisMessage?.length ?? 0,
@@ -9380,7 +9438,7 @@ async function runClaude(credentials, options = {}) {
       disallowedTools: messageDisallowedTools,
       effort: messageEffort
     };
-    messageQueue.push(message.content.text, enhancedMode, attachmentsForThisMessage);
+    messageQueue.push(message.content.text, enhancedMode, attachmentsForThisMessage, message.localKey);
     logger.debug("User message pushed to queue:", {
       ...contentLogMetadata(message.content.text),
       attachmentCount: attachmentsForThisMessage?.length ?? 0,
@@ -13212,7 +13270,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     process.exit(0);
   } else if (subcommand === "install-terminal-hooks") {
     try {
-      const { installTerminalHooks, parseTerminalHooksArgs, TERMINAL_HOOKS_HELP } = await import('./installTerminalHooks-BqpxXB8n.mjs');
+      const { installTerminalHooks, parseTerminalHooksArgs, TERMINAL_HOOKS_HELP } = await import('./installTerminalHooks-C0X114sp.mjs');
       const command = parseTerminalHooksArgs(args.slice(1));
       if (command.action === "help") {
         console.log(TERMINAL_HOOKS_HELP);
@@ -13229,7 +13287,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     }
   } else if (subcommand === "spawn") {
     try {
-      const { handleSpawnCommand } = await import('./spawn-BLbFNopc.mjs');
+      const { handleSpawnCommand } = await import('./spawn-D8K3uJEp.mjs');
       await handleSpawnCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -13241,7 +13299,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "send") {
     try {
-      const { handleSendCommand } = await import('./send-By1xNQ6E.mjs');
+      const { handleSendCommand } = await import('./send-C6Uqkmxr.mjs');
       await handleSendCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -13347,9 +13405,9 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     if (geminiSubcommand === "project" && args[2] === "set" && args[3]) {
       const projectId = args[3];
       try {
-        const { saveGoogleCloudProjectToConfig } = await import('./config-CZdNxl3d.mjs');
-        const { readCredentialsForConfiguredRelay: readCredentialsForConfiguredRelay2 } = await import('./types-DFKdwxE-.mjs').then(function (n) { return n.af; });
-        const { ApiClient: ApiClient2 } = await import('./types-DFKdwxE-.mjs').then(function (n) { return n.ag; });
+        const { saveGoogleCloudProjectToConfig } = await import('./config-3BOBElkv.mjs');
+        const { readCredentialsForConfiguredRelay: readCredentialsForConfiguredRelay2 } = await import('./types-RASD9X96.mjs').then(function (n) { return n.af; });
+        const { ApiClient: ApiClient2 } = await import('./types-RASD9X96.mjs').then(function (n) { return n.ag; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentialsForConfiguredRelay2();
@@ -13380,7 +13438,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     }
     if (geminiSubcommand === "project" && args[2] === "get") {
       try {
-        const { readGeminiLocalConfig } = await import('./config-CZdNxl3d.mjs');
+        const { readGeminiLocalConfig } = await import('./config-3BOBElkv.mjs');
         const config = readGeminiLocalConfig();
         if (config.googleCloudProject) {
           console.log(`Current Google Cloud Project: ${config.googleCloudProject}`);
@@ -13420,7 +13478,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
       process.exit(0);
     }
     try {
-      const { runGemini } = await import('./runGemini-Ctc5nKHC.mjs');
+      const { runGemini } = await import('./runGemini-Cvww7ebI.mjs');
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
@@ -13442,7 +13500,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "acp") {
     try {
-      const { runAcp, resolveAcpAgentConfig } = await import('./index-DuvoxKEM.mjs');
+      const { runAcp, resolveAcpAgentConfig } = await import('./index-08H6z21h.mjs');
       let startedBy = void 0;
       let verbose = false;
       const acpArgs = [];
@@ -13482,7 +13540,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "openclaw") {
     try {
-      const { runOpenClaw } = await import('./runOpenClaw-CF0133Vk.mjs');
+      const { runOpenClaw } = await import('./runOpenClaw-BXmi-UcV.mjs');
       let startedBy = void 0;
       let verbose = false;
       let gatewayUrl;
@@ -13533,7 +13591,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "mcp" && args.length === 1) {
     try {
-      const { handleMcpCommand } = await import('./mcp-DqaW6nz5.mjs');
+      const { handleMcpCommand } = await import('./mcp-B9UtB3lP.mjs');
       await handleMcpCommand();
     } catch (error) {
       process.stderr.write(`[very-happy mcp] Fatal: ${error instanceof Error ? error.message : String(error)}

package/dist/{index-SjWW0gIt.cjs → index-BVlYjP10.cjs}

@@ -3,7 +3,7 @@
 var chalk = require('chalk');
 var os = require('node:os');
 var node_crypto = require('node:crypto');
-var persistence = require('./types-DJC5rGtd.cjs');
+var persistence = require('./types-sFcb_Sfz.cjs');
 var spawn = require('cross-spawn');
 var path = require('node:path');
 var node_readline = require('node:readline');
@@ -3004,6 +3004,49 @@ function applyClaudeResultLifecycle(result, callbacks) {
   callbacks.onCompleted();
 }
 
+const CLAUDE_ATTACHMENT_KINDS = [
+  "image/jpeg",
+  "image/png",
+  "image/gif",
+  "image/webp",
+  "application/pdf"
+];
+function detectClaudeImageMime(bytes) {
+  if (bytes.length >= 4 && bytes[0] === 137 && bytes[1] === 80 && bytes[2] === 78 && bytes[3] === 71) {
+    return "image/png";
+  }
+  if (bytes.length >= 3 && bytes[0] === 255 && bytes[1] === 216 && bytes[2] === 255) {
+    return "image/jpeg";
+  }
+  if (bytes.length >= 4 && bytes[0] === 71 && bytes[1] === 73 && bytes[2] === 70 && bytes[3] === 56) {
+    return "image/gif";
+  }
+  if (bytes.length >= 12 && bytes[0] === 82 && bytes[1] === 73 && bytes[2] === 70 && bytes[3] === 70 && bytes[8] === 87 && bytes[9] === 69 && bytes[10] === 66 && bytes[11] === 80) {
+    return "image/webp";
+  }
+  return null;
+}
+function isPdf(bytes) {
+  return bytes.length >= 5 && bytes[0] === 37 && bytes[1] === 80 && bytes[2] === 68 && bytes[3] === 70 && bytes[4] === 45;
+}
+function attachmentToClaudeContentBlock(bytes) {
+  const data = Buffer.from(bytes).toString("base64");
+  const imageMime = detectClaudeImageMime(bytes);
+  if (imageMime) {
+    return {
+      type: "image",
+      source: { type: "base64", media_type: imageMime, data }
+    };
+  }
+  if (isPdf(bytes)) {
+    return {
+      type: "document",
+      source: { type: "base64", media_type: "application/pdf", data }
+    };
+  }
+  return null;
+}
+
 function applyClaudeSdkMetadata(current, update) {
   return {
     ...current,
@@ -3011,6 +3054,8 @@ function applyClaudeSdkMetadata(current, update) {
     slashCommands: update.slashCommands,
     mcpServers: update.mcpServers,
     skills: update.skills,
+    attachmentKinds: [...CLAUDE_ATTACHMENT_KINDS],
+    queueCancellation: true,
     ...update.modelIsDefault && update.model ? { defaultModelCode: update.model } : {}
   };
 }
@@ -3286,23 +3331,23 @@ async function claudeRemoteLauncher(session) {
               const attachments = msg.attachments ?? [];
               if (attachments.length > 0) {
                 const contentBlocks = [];
+                let acceptedAttachments = 0;
                 for (const att of attachments) {
-                  const detected = detectClaudeImageMime(att.data);
-                  if (!detected) {
+                  const block = attachmentToClaudeContentBlock(att.data);
+                  if (!block) {
                     persistence.logger.debug(`[remote] Skipping unsupported attachment (no magic-byte match): ${att.name}, claimed mimeType=${att.mimeType}`);
                     continue;
                   }
-                  contentBlocks.push({
-                    type: "image",
-                    source: {
-                      type: "base64",
-                      media_type: detected,
-                      data: Buffer.from(att.data).toString("base64")
-                    }
-                  });
+                  contentBlocks.push(block);
+                  acceptedAttachments++;
+                }
+                if (msg.message.trim().length > 0) {
+                  contentBlocks.push({ type: "text", text: msg.message });
+                }
+                if (contentBlocks.length === 0) {
+                  throw new Error("No supported attachment content was available to send");
                 }
-                contentBlocks.push({ type: "text", text: msg.message });
-                persistence.logger.debug(`[remote] Combined ${contentBlocks.length - 1} image(s) with text message`);
+                persistence.logger.debug(`[remote] Combined ${acceptedAttachments} attachment(s) with${msg.message.trim() ? "" : "out"} text message`);
                 return {
                   message: contentBlocks,
                   mode: msg.mode
@@ -3434,21 +3479,6 @@ async function claudeRemoteLauncher(session) {
   }
   return exitReason || "exit";
 }
-function detectClaudeImageMime(bytes) {
-  if (bytes.length >= 4 && bytes[0] === 137 && bytes[1] === 80 && bytes[2] === 78 && bytes[3] === 71) {
-    return "image/png";
-  }
-  if (bytes.length >= 3 && bytes[0] === 255 && bytes[1] === 216 && bytes[2] === 255) {
-    return "image/jpeg";
-  }
-  if (bytes.length >= 4 && bytes[0] === 71 && bytes[1] === 73 && bytes[2] === 70 && bytes[3] === 56) {
-    return "image/gif";
-  }
-  if (bytes.length >= 12 && bytes[0] === 82 && bytes[1] === 73 && bytes[2] === 70 && bytes[3] === 70 && bytes[8] === 87 && bytes[9] === 69 && bytes[10] === 66 && bytes[11] === 80) {
-    return "image/webp";
-  }
-  return null;
-}
 
 async function loop(opts) {
   const logPath = persistence.logger.logFilePath;
@@ -3524,7 +3554,7 @@ class MessageQueue2 {
    * Push a message to the queue with a mode and an optional list of
    * attachments that travel with this message.
    */
-  push(message, mode, attachments) {
+  push(message, mode, attachments, sourceId) {
     if (this.closed) {
       throw new Error("Cannot push to closed queue");
     }
@@ -3535,7 +3565,8 @@ class MessageQueue2 {
       mode,
       modeHash,
       isolate: false,
-      attachments
+      attachments,
+      sourceId
     });
     if (this.onMessageHandler) {
       this.onMessageHandler(message, mode);
@@ -3580,7 +3611,7 @@ class MessageQueue2 {
    * Clears any pending messages and ensures this message is never batched with others.
    * Used for special commands that require dedicated processing.
    */
-  pushIsolateAndClear(message, mode, attachments) {
+  pushIsolateAndClear(message, mode, attachments, sourceId) {
     if (this.closed) {
       throw new Error("Cannot push to closed queue");
     }
@@ -3592,7 +3623,8 @@ class MessageQueue2 {
       mode,
       modeHash,
       isolate: true,
-      attachments
+      attachments,
+      sourceId
     });
     if (this.onMessageHandler) {
       this.onMessageHandler(message, mode);
@@ -3664,6 +3696,21 @@ class MessageQueue2 {
   size() {
     return this.queue.length;
   }
+  /**
+   * Remove one message that has not yet been collected by the agent loop.
+   * Source id is authoritative. Exact-text fallback only covers items that
+   * entered this live process before transport ids were introduced.
+   */
+  cancelPending(sourceId, exactText) {
+    let index = sourceId ? this.queue.findIndex((item) => item.sourceId === sourceId) : -1;
+    if (index < 0 && exactText !== void 0) {
+      index = this.queue.findIndex((item) => item.sourceId === void 0 && item.message === exactText);
+    }
+    if (index < 0) return false;
+    this.queue.splice(index, 1);
+    persistence.logger.debug(`[MessageQueue2] Cancelled pending item. Queue size: ${this.queue.length}`);
+    return true;
+  }
   /**
    * Wait for messages and return all messages with the same mode as a single string
    * Returns { message: string, mode: T } or null if aborted/closed
@@ -8503,7 +8550,7 @@ const MAX_TITLE_CHARS = 60;
 const GENERATION_TIMEOUT_MS = 3e4;
 function resolveClaudeBinary() {
   try {
-    const require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-SjWW0gIt.cjs', document.baseURI).href)));
+    const require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-BVlYjP10.cjs', document.baseURI).href)));
     const utilsPath = path.resolve(path.join(persistence.projectPath(), "scripts", "claude_version_utils.cjs"));
     const { getClaudeCliPath } = require$1(utilsPath);
     const path$1 = getClaudeCliPath();
@@ -8956,6 +9003,10 @@ async function runClaude(credentials, options = {}) {
     lifecycleState: "running",
     lifecycleStateSince: Date.now(),
     flavor: "claude",
+    // Advertise composer support before the first SDK response. Otherwise
+    // a brand-new session cannot pick a PDF until after sending once.
+    attachmentKinds: [...CLAUDE_ATTACHMENT_KINDS],
+    queueCancellation: true,
     sandbox: sandboxConfig?.enabled ? sandboxConfig : null,
     dangerouslySkipPermissions,
     ...forkedFromSessionId ? { parentSessionId: forkedFromSessionId } : {},
@@ -9059,7 +9110,8 @@ async function runClaude(credentials, options = {}) {
     session.updateMetadata((meta) => ({
       ...meta,
       lifecycleState: "running",
-      archivedBy: void 0
+      archivedBy: void 0,
+      queueCancellation: true
     }));
   }
   const forkClaudeSessionId = process.env.HAPPY_FORK_CLAUDE_SESSION_ID;
@@ -9184,6 +9236,12 @@ async function runClaude(credentials, options = {}) {
     disallowedTools: mode.disallowedTools,
     effort: mode.effort
   }));
+  session.rpcHandlerManager.registerHandler("cancelQueuedMessage", async (params) => ({
+    removed: messageQueue.cancelPending(
+      typeof params?.localKey === "string" ? params.localKey : void 0,
+      typeof params?.text === "string" ? params.text : void 0
+    )
+  }));
   let currentPermissionMode = initialPermissionMode;
   let currentModel = options.model ?? DEFAULT_CLAUDE_MODEL;
   let currentFallbackModel = void 0;
@@ -9326,7 +9384,7 @@ async function runClaude(credentials, options = {}) {
         disallowedTools: messageDisallowedTools,
         effort: messageEffort
       };
-      messageQueue.pushIsolateAndClear(specialCommand.originalMessage || message.content.text, enhancedMode2, attachmentsForThisMessage);
+      messageQueue.pushIsolateAndClear(specialCommand.originalMessage || message.content.text, enhancedMode2, attachmentsForThisMessage, message.localKey);
       persistence.logger.debug("[start] /compact command pushed to queue:", {
         ...persistence.contentLogMetadata(message.content.text),
         attachmentCount: attachmentsForThisMessage?.length ?? 0,
@@ -9346,7 +9404,7 @@ async function runClaude(credentials, options = {}) {
         disallowedTools: messageDisallowedTools,
         effort: messageEffort
       };
-      messageQueue.pushIsolateAndClear(specialCommand.originalMessage || message.content.text, enhancedMode2, attachmentsForThisMessage);
+      messageQueue.pushIsolateAndClear(specialCommand.originalMessage || message.content.text, enhancedMode2, attachmentsForThisMessage, message.localKey);
       persistence.logger.debug("[start] /clear command pushed to queue:", {
         ...persistence.contentLogMetadata(message.content.text),
         attachmentCount: attachmentsForThisMessage?.length ?? 0,
@@ -9402,7 +9460,7 @@ async function runClaude(credentials, options = {}) {
       disallowedTools: messageDisallowedTools,
       effort: messageEffort
     };
-    messageQueue.push(message.content.text, enhancedMode, attachmentsForThisMessage);
+    messageQueue.push(message.content.text, enhancedMode, attachmentsForThisMessage, message.localKey);
     persistence.logger.debug("User message pushed to queue:", {
       ...persistence.contentLogMetadata(message.content.text),
       attachmentCount: attachmentsForThisMessage?.length ?? 0,
@@ -10620,9 +10678,9 @@ function resolveLocalSignupBootstrap(configuredMode, configuredInviteCodes, gene
   };
 }
 
-const __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-SjWW0gIt.cjs', document.baseURI).href)));
+const __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-BVlYjP10.cjs', document.baseURI).href)));
 const __dirname$1 = path.dirname(__filename$1);
-const require_ = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-SjWW0gIt.cjs', document.baseURI).href)));
+const require_ = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-BVlYjP10.cjs', document.baseURI).href)));
 const PRISMA_QUERY_ENGINE_FILES = {
   "arm64-darwin": "libquery_engine-darwin-arm64.dylib.node",
   "x64-darwin": "libquery_engine-darwin.dylib.node",
@@ -13234,7 +13292,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     process.exit(0);
   } else if (subcommand === "install-terminal-hooks") {
     try {
-      const { installTerminalHooks, parseTerminalHooksArgs, TERMINAL_HOOKS_HELP } = await Promise.resolve().then(function () { return require('./installTerminalHooks-Xtl0pMWH.cjs'); });
+      const { installTerminalHooks, parseTerminalHooksArgs, TERMINAL_HOOKS_HELP } = await Promise.resolve().then(function () { return require('./installTerminalHooks-DC2wMq-X.cjs'); });
       const command = parseTerminalHooksArgs(args.slice(1));
       if (command.action === "help") {
         console.log(TERMINAL_HOOKS_HELP);
@@ -13251,7 +13309,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     }
   } else if (subcommand === "spawn") {
     try {
-      const { handleSpawnCommand } = await Promise.resolve().then(function () { return require('./spawn-BnvqaVCf.cjs'); });
+      const { handleSpawnCommand } = await Promise.resolve().then(function () { return require('./spawn-CZAHiPE6.cjs'); });
       await handleSpawnCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -13263,7 +13321,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "send") {
     try {
-      const { handleSendCommand } = await Promise.resolve().then(function () { return require('./send-D0U0T_bK.cjs'); });
+      const { handleSendCommand } = await Promise.resolve().then(function () { return require('./send-C5dWPbV6.cjs'); });
       await handleSendCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -13369,9 +13427,9 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     if (geminiSubcommand === "project" && args[2] === "set" && args[3]) {
       const projectId = args[3];
       try {
-        const { saveGoogleCloudProjectToConfig } = await Promise.resolve().then(function () { return require('./config-B2TBK1UZ.cjs'); });
-        const { readCredentialsForConfiguredRelay: readCredentialsForConfiguredRelay2 } = await Promise.resolve().then(function () { return require('./types-DJC5rGtd.cjs'); }).then(function (n) { return n.persistence; });
-        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./types-DJC5rGtd.cjs'); }).then(function (n) { return n.api; });
+        const { saveGoogleCloudProjectToConfig } = await Promise.resolve().then(function () { return require('./config-BkxNWcwM.cjs'); });
+        const { readCredentialsForConfiguredRelay: readCredentialsForConfiguredRelay2 } = await Promise.resolve().then(function () { return require('./types-sFcb_Sfz.cjs'); }).then(function (n) { return n.persistence; });
+        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./types-sFcb_Sfz.cjs'); }).then(function (n) { return n.api; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentialsForConfiguredRelay2();
@@ -13402,7 +13460,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     }
     if (geminiSubcommand === "project" && args[2] === "get") {
       try {
-        const { readGeminiLocalConfig } = await Promise.resolve().then(function () { return require('./config-B2TBK1UZ.cjs'); });
+        const { readGeminiLocalConfig } = await Promise.resolve().then(function () { return require('./config-BkxNWcwM.cjs'); });
         const config = readGeminiLocalConfig();
         if (config.googleCloudProject) {
           console.log(`Current Google Cloud Project: ${config.googleCloudProject}`);
@@ -13442,7 +13500,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
       process.exit(0);
     }
     try {
-      const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-DZay2CN7.cjs'); });
+      const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-Cqstl6qb.cjs'); });
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
@@ -13464,7 +13522,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "acp") {
     try {
-      const { runAcp, resolveAcpAgentConfig } = await Promise.resolve().then(function () { return require('./index-C9UnJZEo.cjs'); });
+      const { runAcp, resolveAcpAgentConfig } = await Promise.resolve().then(function () { return require('./index-fFNtiTSl.cjs'); });
       let startedBy = void 0;
       let verbose = false;
       const acpArgs = [];
@@ -13504,7 +13562,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "openclaw") {
     try {
-      const { runOpenClaw } = await Promise.resolve().then(function () { return require('./runOpenClaw-W3Ogud1U.cjs'); });
+      const { runOpenClaw } = await Promise.resolve().then(function () { return require('./runOpenClaw-CHu488uC.cjs'); });
       let startedBy = void 0;
       let verbose = false;
       let gatewayUrl;
@@ -13555,7 +13613,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "mcp" && args.length === 1) {
     try {
-      const { handleMcpCommand } = await Promise.resolve().then(function () { return require('./mcp-BxO80DMH.cjs'); });
+      const { handleMcpCommand } = await Promise.resolve().then(function () { return require('./mcp-CuDdOqST.cjs'); });
       await handleMcpCommand();
     } catch (error) {
       process.stderr.write(`[very-happy mcp] Fatal: ${error instanceof Error ? error.message : String(error)}

package/dist/{index-C9UnJZEo.cjs → index-fFNtiTSl.cjs}

@@ -1,11 +1,11 @@
 'use strict';
 
-var AcpBackend = require('./AcpBackend-B7Z1Gk_l.cjs');
-var persistence = require('./types-DJC5rGtd.cjs');
-var AcpSessionManager = require('./AcpSessionManager-D3-rBUxk.cjs');
+var AcpBackend = require('./AcpBackend-sS5ln9nS.cjs');
+var persistence = require('./types-sFcb_Sfz.cjs');
+var AcpSessionManager = require('./AcpSessionManager-DX5IvruC.cjs');
 var node_crypto = require('node:crypto');
 var path = require('node:path');
-var index = require('./index-SjWW0gIt.cjs');
+var index = require('./index-BVlYjP10.cjs');
 require('node:child_process');
 require('@agentclientprotocol/sdk');
 require('axios');

package/dist/index.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
 require('chalk');
-require('./index-SjWW0gIt.cjs');
-require('./types-DJC5rGtd.cjs');
+require('./index-BVlYjP10.cjs');
+require('./types-sFcb_Sfz.cjs');
 require('zod');
 require('node:child_process');
 require('node:os');

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import 'chalk';
-import './index-W3oj-d6C.mjs';
-import './types-DFKdwxE-.mjs';
+import './index-BDhR8Zbc.mjs';
+import './types-RASD9X96.mjs';
 import 'zod';
 import 'node:child_process';
 import 'node:os';

package/dist/{installTerminalHooks-BqpxXB8n.mjs → installTerminalHooks-C0X114sp.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-DFKdwxE-.mjs';
-import { t as tmuxSupportsSessionEnv } from './index-W3oj-d6C.mjs';
+import { p as projectPath } from './types-RASD9X96.mjs';
+import { t as tmuxSupportsSessionEnv } from './index-BDhR8Zbc.mjs';
 import 'axios';
 import 'node:util';
 import 'node:fs/promises';

package/dist/{installTerminalHooks-Xtl0pMWH.cjs → installTerminalHooks-DC2wMq-X.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-DJC5rGtd.cjs');
-var index = require('./index-SjWW0gIt.cjs');
+var persistence = require('./types-sFcb_Sfz.cjs');
+var index = require('./index-BVlYjP10.cjs');
 require('axios');
 require('node:util');
 require('node:fs/promises');

package/dist/lib.cjs

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

package/dist/lib.d.cts

@@ -427,6 +427,10 @@ type Metadata = {
         status: string;
     }>;
     skills?: string[];
+    /** Attachment content blocks this daemon can forward to the active SDK. */
+    attachmentKinds?: string[];
+    /** Pending user messages can be canceled by stable transport id. */
+    queueCancellation?: boolean;
     homeDir: string;
     happyHomeDir: string;
     happyLibDir: string;

package/dist/lib.d.mts

@@ -427,6 +427,10 @@ type Metadata = {
         status: string;
     }>;
     skills?: string[];
+    /** Attachment content blocks this daemon can forward to the active SDK. */
+    attachmentKinds?: string[];
+    /** Pending user messages can be canceled by stable transport id. */
+    queueCancellation?: boolean;
     homeDir: string;
     happyHomeDir: string;
     happyLibDir: string;

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-DFKdwxE-.mjs';
+export { A as ApiClient, a as ApiSessionClient, R as RawJSONLinesSchema, c as configuration, l as logger } from './types-RASD9X96.mjs';
 import 'axios';
 import 'chalk';
 import 'node:util';

package/dist/{mcp-DqaW6nz5.mjs → mcp-B9UtB3lP.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 } from './index-W3oj-d6C.mjs';
+import { p as pushClipboardViaDaemon } from './index-BDhR8Zbc.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-DFKdwxE-.mjs';
+import { l as logger } from './types-RASD9X96.mjs';
 import 'chalk';
 import 'node:os';
 import 'node:crypto';

package/dist/{mcp-BxO80DMH.cjs → mcp-CuDdOqST.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-SjWW0gIt.cjs');
+var index = require('./index-BVlYjP10.cjs');
 var limits = require('./limits-KdWKmwtH.cjs');
-var persistence = require('./types-DJC5rGtd.cjs');
+var persistence = require('./types-sFcb_Sfz.cjs');
 require('chalk');
 require('node:os');
 require('node:crypto');

package/dist/{runGemini-DZay2CN7.cjs → runGemini-Cqstl6qb.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-DJC5rGtd.cjs');
-var index = require('./index-SjWW0gIt.cjs');
-var AcpBackend = require('./AcpBackend-B7Z1Gk_l.cjs');
-var config = require('./config-B2TBK1UZ.cjs');
+var persistence = require('./types-sFcb_Sfz.cjs');
+var index = require('./index-BVlYjP10.cjs');
+var AcpBackend = require('./AcpBackend-sS5ln9nS.cjs');
+var config = require('./config-BkxNWcwM.cjs');
 require('axios');
 require('chalk');
 require('node:util');

package/dist/{runGemini-Ctc5nKHC.mjs → runGemini-Cvww7ebI.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, h as connectionState, A as ApiClient, i as readSettings, e as errorLogMetadata, j as encodeBase64, p as projectPath, d as contentLogMetadata } from './types-DFKdwxE-.mjs';
-import { g as GEMINI_API_KEY_ENV, j as GOOGLE_API_KEY_ENV, G as GEMINI_MODEL_ENV, B as BasePermissionHandler, k as BaseReasoningProcessor, i as initialMachineMetadata, d as createSessionMetadata, e as setupOfflineReconnection, n as notifyDaemonSessionStarted, M as MessageQueue2, h as hashObject, l as MessageBuffer, C as CHANGE_TITLE_INSTRUCTION, r as registerKillSessionHandler, f as startHappyServer } from './index-W3oj-d6C.mjs';
-import { A as AcpBackend } from './AcpBackend-cBt4R6ce.mjs';
-import { readGeminiLocalConfig, determineGeminiModel, getGeminiModelSource, getInitialGeminiModel, saveGeminiModelToConfig } from './config-CZdNxl3d.mjs';
+import { l as logger, h as connectionState, A as ApiClient, i as readSettings, e as errorLogMetadata, j as encodeBase64, p as projectPath, d as contentLogMetadata } from './types-RASD9X96.mjs';
+import { g as GEMINI_API_KEY_ENV, j as GOOGLE_API_KEY_ENV, G as GEMINI_MODEL_ENV, B as BasePermissionHandler, k as BaseReasoningProcessor, i as initialMachineMetadata, d as createSessionMetadata, e as setupOfflineReconnection, n as notifyDaemonSessionStarted, M as MessageQueue2, h as hashObject, l as MessageBuffer, C as CHANGE_TITLE_INSTRUCTION, r as registerKillSessionHandler, f as startHappyServer } from './index-BDhR8Zbc.mjs';
+import { A as AcpBackend } from './AcpBackend-DbS9-r10.mjs';
+import { readGeminiLocalConfig, determineGeminiModel, getGeminiModelSource, getInitialGeminiModel, saveGeminiModelToConfig } from './config-3BOBElkv.mjs';
 import 'axios';
 import 'chalk';
 import 'node:util';

package/dist/{runOpenClaw-CF0133Vk.mjs → runOpenClaw-BXmi-UcV.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 { k as ensurePrivateDirectorySync, m as hardenPrivateFileSync, w as writePrivateFileSync, e as errorLogMetadata, d as contentLogMetadata, h as connectionState, A as ApiClient, i as readSettings, j as encodeBase64, l as logger, c as configuration } from './types-DFKdwxE-.mjs';
-import { A as AcpSessionManager } from './AcpSessionManager-AyrINTu7.mjs';
-import { i as initialMachineMetadata, d as createSessionMetadata, e as setupOfflineReconnection, n as notifyDaemonSessionStarted, M as MessageQueue2, r as registerKillSessionHandler } from './index-W3oj-d6C.mjs';
+import { k as ensurePrivateDirectorySync, m as hardenPrivateFileSync, w as writePrivateFileSync, e as errorLogMetadata, d as contentLogMetadata, h as connectionState, A as ApiClient, i as readSettings, j as encodeBase64, l as logger, c as configuration } from './types-RASD9X96.mjs';
+import { A as AcpSessionManager } from './AcpSessionManager-DuZN34yy.mjs';
+import { i as initialMachineMetadata, d as createSessionMetadata, e as setupOfflineReconnection, n as notifyDaemonSessionStarted, M as MessageQueue2, r as registerKillSessionHandler } from './index-BDhR8Zbc.mjs';
 import WebSocket from 'ws';
 import * as ed from '@noble/ed25519';
 import { sha512 } from '@noble/hashes/sha2.js';

package/dist/{runOpenClaw-W3Ogud1U.cjs → runOpenClaw-CHu488uC.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-DJC5rGtd.cjs');
-var AcpSessionManager = require('./AcpSessionManager-D3-rBUxk.cjs');
-var index = require('./index-SjWW0gIt.cjs');
+var persistence = require('./types-sFcb_Sfz.cjs');
+var AcpSessionManager = require('./AcpSessionManager-DX5IvruC.cjs');
+var index = require('./index-BVlYjP10.cjs');
 var WebSocket = require('ws');
 var ed = require('@noble/ed25519');
 var sha2_js = require('@noble/hashes/sha2.js');

package/dist/{send-D0U0T_bK.cjs → send-C5dWPbV6.cjs}

@@ -3,8 +3,8 @@
 var chalk = require('chalk');
 var node_fs = require('node:fs');
 var path = require('node:path');
-var persistence = require('./types-DJC5rGtd.cjs');
-var index = require('./index-SjWW0gIt.cjs');
+var persistence = require('./types-sFcb_Sfz.cjs');
+var index = require('./index-BVlYjP10.cjs');
 require('axios');
 require('node:util');
 require('node:os');

package/dist/{send-By1xNQ6E.mjs → send-C6Uqkmxr.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-DFKdwxE-.mjs';
-import { b as sendUserMessage, a as sessionWebUrl } from './index-W3oj-d6C.mjs';
+import { r as readPersistedSessions, c as configuration } from './types-RASD9X96.mjs';
+import { b as sendUserMessage, a as sessionWebUrl } from './index-BDhR8Zbc.mjs';
 import 'axios';
 import 'node:util';
 import 'node:os';

package/dist/{spawn-BnvqaVCf.cjs → spawn-CZAHiPE6.cjs}

@@ -3,8 +3,8 @@
 var chalk = require('chalk');
 var node_fs = require('node:fs');
 var path = require('node:path');
-var index = require('./index-SjWW0gIt.cjs');
-var persistence = require('./types-DJC5rGtd.cjs');
+var index = require('./index-BVlYjP10.cjs');
+var persistence = require('./types-sFcb_Sfz.cjs');
 require('node:os');
 require('node:crypto');
 require('cross-spawn');

package/dist/{spawn-BLbFNopc.mjs → spawn-D8K3uJEp.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, w as waitForSessionKey, b as sendUserMessage } from './index-W3oj-d6C.mjs';
-import { l as logger } from './types-DFKdwxE-.mjs';
+import { c as checkIfDaemonRunningAndCleanupStaleState, s as spawnDaemonSession, a as sessionWebUrl, w as waitForSessionKey, b as sendUserMessage } from './index-BDhR8Zbc.mjs';
+import { l as logger } from './types-RASD9X96.mjs';
 import 'node:os';
 import 'node:crypto';
 import 'cross-spawn';

package/dist/{types-DFKdwxE-.mjs → types-RASD9X96.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.81";
+var version = "0.2.83";
 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.81",
-	"very-happy-tools-x64-darwin": "0.2.81",
-	"very-happy-tools-arm64-linux": "0.2.81",
-	"very-happy-tools-x64-linux": "0.2.81",
-	"very-happy-tools-arm64-win32": "0.2.81",
-	"very-happy-tools-x64-win32": "0.2.81"
+	"very-happy-tools-arm64-darwin": "0.2.83",
+	"very-happy-tools-x64-darwin": "0.2.83",
+	"very-happy-tools-arm64-linux": "0.2.83",
+	"very-happy-tools-x64-linux": "0.2.83",
+	"very-happy-tools-arm64-win32": "0.2.83",
+	"very-happy-tools-x64-win32": "0.2.83"
 };
 var devDependencies = {
 	"@slopus/happy-wire": "workspace:*",
@@ -2915,7 +2915,7 @@ class ApiSessionClient extends EventEmitter {
           }
           const body = decrypt(this.encryptionKey, this.encryptionVariant, decodeBase64(data.body.message.content.c));
           logger.debugLargeJson("[SOCKET] [UPDATE] Received update:", body);
-          this.routeIncomingMessage(body);
+          this.routeIncomingMessage(body, localId);
           if (localId) this.rememberRoutedInbound(localId);
           this.lastSeq = messageSeq;
         } else if (data.body.t === "update-session") {
@@ -3143,8 +3143,9 @@ class ApiSessionClient extends EventEmitter {
       "X-Happy-Client": `cli-coding-session/${configuration.currentCliVersion}`
     };
   }
-  routeIncomingMessage(message) {
-    const userResult = UserMessageSchema.safeParse(message);
+  routeIncomingMessage(message, sourceLocalId) {
+    const messageWithSource = sourceLocalId && typeof message === "object" && message !== null ? { ...message, localKey: message.localKey ?? sourceLocalId } : message;
+    const userResult = UserMessageSchema.safeParse(messageWithSource);
     if (userResult.success) {
       if (this.pendingMessageCallback) {
         this.pendingMessageCallback(userResult.data);
@@ -3199,7 +3200,7 @@ class ApiSessionClient extends EventEmitter {
         }
         try {
           const body = decrypt(this.encryptionKey, this.encryptionVariant, decodeBase64(message.content.c));
-          this.routeIncomingMessage(body);
+          this.routeIncomingMessage(body, message.localId);
           if (message.localId) this.rememberRoutedInbound(message.localId);
         } catch (error) {
           logger.debug("[API] Failed to decrypt fetched message", {
@@ -3319,7 +3320,7 @@ class ApiSessionClient extends EventEmitter {
           for (const item of batch) {
             if (this.routedInboundLocalIds.has(item.localId)) continue;
             const body = decrypt(this.encryptionKey, this.encryptionVariant, decodeBase64(item.content));
-            this.routeIncomingMessage(body);
+            this.routeIncomingMessage(body, item.localId);
             this.rememberRoutedInbound(item.localId);
           }
           callback({ ok: true, messages: stored });

package/dist/{types-DJC5rGtd.cjs → types-sFcb_Sfz.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.81";
+var version = "0.2.83";
 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.81",
-	"very-happy-tools-x64-darwin": "0.2.81",
-	"very-happy-tools-arm64-linux": "0.2.81",
-	"very-happy-tools-x64-linux": "0.2.81",
-	"very-happy-tools-arm64-win32": "0.2.81",
-	"very-happy-tools-x64-win32": "0.2.81"
+	"very-happy-tools-arm64-darwin": "0.2.83",
+	"very-happy-tools-x64-darwin": "0.2.83",
+	"very-happy-tools-arm64-linux": "0.2.83",
+	"very-happy-tools-x64-linux": "0.2.83",
+	"very-happy-tools-arm64-win32": "0.2.83",
+	"very-happy-tools-x64-win32": "0.2.83"
 };
 var devDependencies = {
 	"@slopus/happy-wire": "workspace:*",
@@ -1480,7 +1480,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-DJC5rGtd.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-sFcb_Sfz.cjs', document.baseURI).href))));
 function projectPath() {
   const path = path$1.resolve(__dirname$1, "..");
   return path;
@@ -2937,7 +2937,7 @@ class ApiSessionClient extends node_events.EventEmitter {
           }
           const body = decrypt(this.encryptionKey, this.encryptionVariant, decodeBase64(data.body.message.content.c));
           logger.debugLargeJson("[SOCKET] [UPDATE] Received update:", body);
-          this.routeIncomingMessage(body);
+          this.routeIncomingMessage(body, localId);
           if (localId) this.rememberRoutedInbound(localId);
           this.lastSeq = messageSeq;
         } else if (data.body.t === "update-session") {
@@ -3165,8 +3165,9 @@ class ApiSessionClient extends node_events.EventEmitter {
       "X-Happy-Client": `cli-coding-session/${configuration.currentCliVersion}`
     };
   }
-  routeIncomingMessage(message) {
-    const userResult = UserMessageSchema.safeParse(message);
+  routeIncomingMessage(message, sourceLocalId) {
+    const messageWithSource = sourceLocalId && typeof message === "object" && message !== null ? { ...message, localKey: message.localKey ?? sourceLocalId } : message;
+    const userResult = UserMessageSchema.safeParse(messageWithSource);
     if (userResult.success) {
       if (this.pendingMessageCallback) {
         this.pendingMessageCallback(userResult.data);
@@ -3221,7 +3222,7 @@ class ApiSessionClient extends node_events.EventEmitter {
         }
         try {
           const body = decrypt(this.encryptionKey, this.encryptionVariant, decodeBase64(message.content.c));
-          this.routeIncomingMessage(body);
+          this.routeIncomingMessage(body, message.localId);
           if (message.localId) this.rememberRoutedInbound(message.localId);
         } catch (error) {
           logger.debug("[API] Failed to decrypt fetched message", {
@@ -3341,7 +3342,7 @@ class ApiSessionClient extends node_events.EventEmitter {
           for (const item of batch) {
             if (this.routedInboundLocalIds.has(item.localId)) continue;
             const body = decrypt(this.encryptionKey, this.encryptionVariant, decodeBase64(item.content));
-            this.routeIncomingMessage(body);
+            this.routeIncomingMessage(body, item.localId);
             this.rememberRoutedInbound(item.localId);
           }
           callback({ ok: true, messages: stored });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "very-happy-cli",
-  "version": "0.2.81",
+  "version": "0.2.83",
   "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.81",
-    "very-happy-tools-x64-darwin": "0.2.81",
-    "very-happy-tools-arm64-linux": "0.2.81",
-    "very-happy-tools-x64-linux": "0.2.81",
-    "very-happy-tools-arm64-win32": "0.2.81",
-    "very-happy-tools-x64-win32": "0.2.81"
+    "very-happy-tools-arm64-darwin": "0.2.83",
+    "very-happy-tools-x64-darwin": "0.2.83",
+    "very-happy-tools-arm64-linux": "0.2.83",
+    "very-happy-tools-x64-linux": "0.2.83",
+    "very-happy-tools-arm64-win32": "0.2.83",
+    "very-happy-tools-x64-win32": "0.2.83"
   },
   "devDependencies": {
     "@slopus/happy-wire": "workspace:*",