very-happy-cli 0.2.75 → 0.2.77

package/dist/{AcpBackend-5CPQMP3H.mjs → AcpBackend-BFFC77vV.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-Dj9JEGDh.mjs';
+import { l as logger, d as contentLogMetadata, e as errorLogMetadata, f as packageJson, g as delay } from './types-D2qSKjsO.mjs';
 
 const DEFAULT_TIMEOUTS = {
   /** Default initialization timeout: 60 seconds */
@@ -1094,7 +1094,10 @@ class AcpBackend {
         sessionId: this.acpSessionId,
         blockCount: promptRequest.prompt.length
       });
-      await this.connection.prompt(promptRequest);
+      const response = await this.connection.prompt(promptRequest);
+      if (response.usage) {
+        this.emit({ type: "token-count", ...response.usage });
+      }
       logger.debug("[AcpBackend] Prompt request sent to ACP connection");
     } catch (error) {
       logger.debug("[AcpBackend] Error sending prompt:", errorLogMetadata(error));

package/dist/{AcpBackend-B0qCm-bY.cjs → AcpBackend-CsLnh1So.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-DEre2zxO.cjs');
+var persistence = require('./types-NwtcBgfS.cjs');
 
 const DEFAULT_TIMEOUTS = {
   /** Default initialization timeout: 60 seconds */
@@ -1096,7 +1096,10 @@ class AcpBackend {
         sessionId: this.acpSessionId,
         blockCount: promptRequest.prompt.length
       });
-      await this.connection.prompt(promptRequest);
+      const response = await this.connection.prompt(promptRequest);
+      if (response.usage) {
+        this.emit({ type: "token-count", ...response.usage });
+      }
       persistence.logger.debug("[AcpBackend] Prompt request sent to ACP connection");
     } catch (error) {
       persistence.logger.debug("[AcpBackend] Error sending prompt:", persistence.errorLogMetadata(error));

package/dist/{AcpSessionManager-B4M0y5fI.cjs → AcpSessionManager--CixPN-p.cjs}

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

package/dist/{AcpSessionManager-BTmJyKDO.mjs → AcpSessionManager-CU5vsxgF.mjs}

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

package/dist/{config-DbY2R-H7.mjs → config-CRFTYuTN.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-Dj9JEGDh.mjs';
-import { D as DEFAULT_GEMINI_MODEL, G as GEMINI_MODEL_ENV } from './index-Cq30c63l.mjs';
+import { l as logger } from './types-D2qSKjsO.mjs';
+import { D as DEFAULT_GEMINI_MODEL, G as GEMINI_MODEL_ENV } from './index-DOb57EGb.mjs';
 import 'axios';
 import 'chalk';
 import 'node:util';

package/dist/{config-DBIfKaNJ.cjs → config-pv17N6Kg.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-DEre2zxO.cjs');
-var index = require('./index-edEH95Mf.cjs');
+var persistence = require('./types-NwtcBgfS.cjs');
+var index = require('./index-Dcv1RKe8.cjs');
 require('axios');
 require('chalk');
 require('node:util');

package/dist/{index-CJaqyq4z.mjs → index-BkvUwyIU.mjs}

@@ -1,10 +1,10 @@
-import { D as DefaultTransport, A as AcpBackend } from './AcpBackend-5CPQMP3H.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-5CPQMP3H.mjs';
-import { h as connectionState, A as ApiClient, i as readSettings, j as encodeBase64, l as logger, p as projectPath } from './types-Dj9JEGDh.mjs';
-import { A as AcpSessionManager } from './AcpSessionManager-BTmJyKDO.mjs';
+import { D as DefaultTransport, A as AcpBackend } from './AcpBackend-BFFC77vV.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-BFFC77vV.mjs';
+import { h as connectionState, A as ApiClient, i as readSettings, j as encodeBase64, l as logger, p as projectPath } from './types-D2qSKjsO.mjs';
+import { A as AcpSessionManager } from './AcpSessionManager-CU5vsxgF.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-Cq30c63l.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-DOb57EGb.mjs';
 import 'node:child_process';
 import '@agentclientprotocol/sdk';
 import 'axios';
@@ -912,6 +912,9 @@ async function runAcp(opts) {
     if (frontendMessage) {
       logAcp(frontendMessage.kind, frontendMessage.text);
     }
+    if (msg.type === "token-count") {
+      session.sendAgentUsageSnapshot(resolveSessionFlavor(opts.agentName), msg);
+    }
     sendEnvelopes(sessionManager.mapMessage(msg));
   };
   backend.onMessage(onBackendMessage);

package/dist/{index-CqxywXyf.cjs → index-C1OnwMx0.cjs}

@@ -1,11 +1,11 @@
 'use strict';
 
-var AcpBackend = require('./AcpBackend-B0qCm-bY.cjs');
-var persistence = require('./types-DEre2zxO.cjs');
-var AcpSessionManager = require('./AcpSessionManager-B4M0y5fI.cjs');
+var AcpBackend = require('./AcpBackend-CsLnh1So.cjs');
+var persistence = require('./types-NwtcBgfS.cjs');
+var AcpSessionManager = require('./AcpSessionManager--CixPN-p.cjs');
 var node_crypto = require('node:crypto');
 var path = require('node:path');
-var index = require('./index-edEH95Mf.cjs');
+var index = require('./index-Dcv1RKe8.cjs');
 require('node:child_process');
 require('@agentclientprotocol/sdk');
 require('axios');
@@ -913,6 +913,9 @@ async function runAcp(opts) {
     if (frontendMessage) {
       logAcp(frontendMessage.kind, frontendMessage.text);
     }
+    if (msg.type === "token-count") {
+      session.sendAgentUsageSnapshot(resolveSessionFlavor(opts.agentName), msg);
+    }
     sendEnvelopes(sessionManager.mapMessage(msg));
   };
   backend.onMessage(onBackendMessage);

package/dist/{index-Cq30c63l.mjs → index-DOb57EGb.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-Dj9JEGDh.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-D2qSKjsO.mjs';
 import spawn$1, { spawn } from 'cross-spawn';
 import path, { join, resolve, isAbsolute, normalize, sep, dirname } from 'node:path';
 import { createInterface } from 'node:readline';
@@ -11409,6 +11409,7 @@ function createOfflineSessionStub(sessionTag) {
     },
     sendAgentMessage: () => {
     },
+    sendAgentUsageSnapshot: () => false,
     sendClaudeSessionMessage: () => {
     },
     keepAlive: () => {
@@ -12526,6 +12527,9 @@ async function runCodex(opts) {
     }
   });
   client.setEventHandler((msg) => {
+    if (msg.type === "token_count") {
+      session.sendAgentUsageSnapshot("codex", msg);
+    }
     logger.debug("[Codex] Event metadata", codexEventLogMetadata(msg));
     if (msg.type === "agent_message") {
       messageBuffer.addMessage(msg.message, "assistant");
@@ -12979,7 +12983,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-8TUdSFCY.mjs');
+      const { installTerminalHooks, parseTerminalHooksArgs, TERMINAL_HOOKS_HELP } = await import('./installTerminalHooks-IXvZMGJq.mjs');
       const command = parseTerminalHooksArgs(args.slice(1));
       if (command.action === "help") {
         console.log(TERMINAL_HOOKS_HELP);
@@ -12996,7 +13000,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-BmqqHUYI.mjs');
+      const { handleSpawnCommand } = await import('./spawn-nISXbZD5.mjs');
       await handleSpawnCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -13008,7 +13012,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-BVbiwtrQ.mjs');
+      const { handleSendCommand } = await import('./send-DM8oqJFp.mjs');
       await handleSendCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -13114,9 +13118,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-DbY2R-H7.mjs');
-        const { readCredentialsForConfiguredRelay: readCredentialsForConfiguredRelay2 } = await import('./types-Dj9JEGDh.mjs').then(function (n) { return n.af; });
-        const { ApiClient: ApiClient2 } = await import('./types-Dj9JEGDh.mjs').then(function (n) { return n.ag; });
+        const { saveGoogleCloudProjectToConfig } = await import('./config-CRFTYuTN.mjs');
+        const { readCredentialsForConfiguredRelay: readCredentialsForConfiguredRelay2 } = await import('./types-D2qSKjsO.mjs').then(function (n) { return n.af; });
+        const { ApiClient: ApiClient2 } = await import('./types-D2qSKjsO.mjs').then(function (n) { return n.ag; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentialsForConfiguredRelay2();
@@ -13147,7 +13151,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-DbY2R-H7.mjs');
+        const { readGeminiLocalConfig } = await import('./config-CRFTYuTN.mjs');
         const config = readGeminiLocalConfig();
         if (config.googleCloudProject) {
           console.log(`Current Google Cloud Project: ${config.googleCloudProject}`);
@@ -13187,7 +13191,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
       process.exit(0);
     }
     try {
-      const { runGemini } = await import('./runGemini-BD8OGMQr.mjs');
+      const { runGemini } = await import('./runGemini-D0lddF43.mjs');
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
@@ -13209,7 +13213,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-CJaqyq4z.mjs');
+      const { runAcp, resolveAcpAgentConfig } = await import('./index-BkvUwyIU.mjs');
       let startedBy = void 0;
       let verbose = false;
       const acpArgs = [];
@@ -13249,7 +13253,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-ENAgQy1E.mjs');
+      const { runOpenClaw } = await import('./runOpenClaw-BiwwYnYf.mjs');
       let startedBy = void 0;
       let verbose = false;
       let gatewayUrl;
@@ -13300,7 +13304,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-B4UxtBKQ.mjs');
+      const { handleMcpCommand } = await import('./mcp-B-GdhlKD.mjs');
       await handleMcpCommand();
     } catch (error) {
       process.stderr.write(`[very-happy mcp] Fatal: ${error instanceof Error ? error.message : String(error)}

package/dist/{index-edEH95Mf.cjs → index-Dcv1RKe8.cjs}

@@ -3,7 +3,7 @@
 var chalk = require('chalk');
 var os = require('node:os');
 var node_crypto = require('node:crypto');
-var persistence = require('./types-DEre2zxO.cjs');
+var persistence = require('./types-NwtcBgfS.cjs');
 var spawn = require('cross-spawn');
 var path = require('node:path');
 var node_readline = require('node:readline');
@@ -8274,7 +8274,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-edEH95Mf.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-Dcv1RKe8.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();
@@ -10391,9 +10391,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-edEH95Mf.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-Dcv1RKe8.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-edEH95Mf.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-Dcv1RKe8.cjs', document.baseURI).href)));
 const PRISMA_QUERY_ENGINE_FILES = {
   "arm64-darwin": "libquery_engine-darwin-arm64.dylib.node",
   "x64-darwin": "libquery_engine-darwin.dylib.node",
@@ -11431,6 +11431,7 @@ function createOfflineSessionStub(sessionTag) {
     },
     sendAgentMessage: () => {
     },
+    sendAgentUsageSnapshot: () => false,
     sendClaudeSessionMessage: () => {
     },
     keepAlive: () => {
@@ -12548,6 +12549,9 @@ async function runCodex(opts) {
     }
   });
   client.setEventHandler((msg) => {
+    if (msg.type === "token_count") {
+      session.sendAgentUsageSnapshot("codex", msg);
+    }
     persistence.logger.debug("[Codex] Event metadata", codexEventLogMetadata(msg));
     if (msg.type === "agent_message") {
       messageBuffer.addMessage(msg.message, "assistant");
@@ -13001,7 +13005,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-BvQbDFcE.cjs'); });
+      const { installTerminalHooks, parseTerminalHooksArgs, TERMINAL_HOOKS_HELP } = await Promise.resolve().then(function () { return require('./installTerminalHooks-YyT3fv6w.cjs'); });
       const command = parseTerminalHooksArgs(args.slice(1));
       if (command.action === "help") {
         console.log(TERMINAL_HOOKS_HELP);
@@ -13018,7 +13022,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-DTA6f9TE.cjs'); });
+      const { handleSpawnCommand } = await Promise.resolve().then(function () { return require('./spawn-De3b5Hsu.cjs'); });
       await handleSpawnCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -13030,7 +13034,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-o4xljyoV.cjs'); });
+      const { handleSendCommand } = await Promise.resolve().then(function () { return require('./send-DijSXAMp.cjs'); });
       await handleSendCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -13136,9 +13140,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-DBIfKaNJ.cjs'); });
-        const { readCredentialsForConfiguredRelay: readCredentialsForConfiguredRelay2 } = await Promise.resolve().then(function () { return require('./types-DEre2zxO.cjs'); }).then(function (n) { return n.persistence; });
-        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./types-DEre2zxO.cjs'); }).then(function (n) { return n.api; });
+        const { saveGoogleCloudProjectToConfig } = await Promise.resolve().then(function () { return require('./config-pv17N6Kg.cjs'); });
+        const { readCredentialsForConfiguredRelay: readCredentialsForConfiguredRelay2 } = await Promise.resolve().then(function () { return require('./types-NwtcBgfS.cjs'); }).then(function (n) { return n.persistence; });
+        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./types-NwtcBgfS.cjs'); }).then(function (n) { return n.api; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentialsForConfiguredRelay2();
@@ -13169,7 +13173,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-DBIfKaNJ.cjs'); });
+        const { readGeminiLocalConfig } = await Promise.resolve().then(function () { return require('./config-pv17N6Kg.cjs'); });
         const config = readGeminiLocalConfig();
         if (config.googleCloudProject) {
           console.log(`Current Google Cloud Project: ${config.googleCloudProject}`);
@@ -13209,7 +13213,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-LIck5ard.cjs'); });
+      const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-DuUdmlVZ.cjs'); });
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
@@ -13231,7 +13235,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-CqxywXyf.cjs'); });
+      const { runAcp, resolveAcpAgentConfig } = await Promise.resolve().then(function () { return require('./index-C1OnwMx0.cjs'); });
       let startedBy = void 0;
       let verbose = false;
       const acpArgs = [];
@@ -13271,7 +13275,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-B5XNV1zZ.cjs'); });
+      const { runOpenClaw } = await Promise.resolve().then(function () { return require('./runOpenClaw-DEMCYSoD.cjs'); });
       let startedBy = void 0;
       let verbose = false;
       let gatewayUrl;
@@ -13322,7 +13326,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-D12X7XKG.cjs'); });
+      const { handleMcpCommand } = await Promise.resolve().then(function () { return require('./mcp-CsKnmeE5.cjs'); });
       await handleMcpCommand();
     } catch (error) {
       process.stderr.write(`[very-happy mcp] Fatal: ${error instanceof Error ? error.message : String(error)}

package/dist/index.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
 require('chalk');
-require('./index-edEH95Mf.cjs');
-require('./types-DEre2zxO.cjs');
+require('./index-Dcv1RKe8.cjs');
+require('./types-NwtcBgfS.cjs');
 require('zod');
 require('node:child_process');
 require('node:os');

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import 'chalk';
-import './index-Cq30c63l.mjs';
-import './types-Dj9JEGDh.mjs';
+import './index-DOb57EGb.mjs';
+import './types-D2qSKjsO.mjs';
 import 'zod';
 import 'node:child_process';
 import 'node:os';

package/dist/{installTerminalHooks-8TUdSFCY.mjs → installTerminalHooks-IXvZMGJq.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-Dj9JEGDh.mjs';
-import { t as tmuxSupportsSessionEnv } from './index-Cq30c63l.mjs';
+import { p as projectPath } from './types-D2qSKjsO.mjs';
+import { t as tmuxSupportsSessionEnv } from './index-DOb57EGb.mjs';
 import 'axios';
 import 'node:util';
 import 'node:fs/promises';

package/dist/{installTerminalHooks-BvQbDFcE.cjs → installTerminalHooks-YyT3fv6w.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-DEre2zxO.cjs');
-var index = require('./index-edEH95Mf.cjs');
+var persistence = require('./types-NwtcBgfS.cjs');
+var index = require('./index-Dcv1RKe8.cjs');
 require('axios');
 require('node:util');
 require('node:fs/promises');

package/dist/lib.cjs

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

package/dist/lib.d.cts

@@ -545,6 +545,11 @@ declare class RpcHandlerManager {
      */
     handleRequest(request: RpcRequest): Promise<any>;
     onSocketConnect(socket: Socket): void;
+    /**
+     * Attach a candidate transport and wait until the server confirms every
+     * method before a release handover closes the old transport.
+     */
+    onSocketConnectAndWait(socket: Socket, timeoutMs?: number): Promise<void>;
     onSocketDisconnect(socket?: Socket): void;
     /**
      * Get the number of registered handlers
@@ -652,13 +657,19 @@ declare class ApiSessionClient extends EventEmitter {
     private ignoreArchiveSignal;
     private skipInitialMessages;
     private claudeSessionProtocolState;
+    private readonly seenClaudeUsageEvents;
+    private claudeUsageTotals;
     private lastSeq;
     private pendingOutbox;
     private readonly sendSync;
     private readonly receiveSync;
     private readonly directInboundLocalIds;
     private readonly routedInboundLocalIds;
+    private handoverInFlight;
     constructor(token: string, session: Session);
+    private createControlSocket;
+    private startReleaseHandover;
+    private releaseHandover;
     onUserMessage(callback: (data: UserMessage) => void): void;
     onFileEvent(callback: (data: FileEventMessage) => void): void;
     /**
@@ -787,7 +798,9 @@ declare class ApiSessionClient extends EventEmitter {
     /**
      * Send usage data to the server
      */
-    sendUsageData(usage: Usage, model?: string): void;
+    sendUsageData(usage: Usage, model?: string, eventId?: string): void;
+    /** Save a provider's cumulative session snapshot under one upsert key. */
+    sendAgentUsageSnapshot(agent: string, rawUsage: unknown): boolean;
     /**
      * Returns the latest session metadata known to the client.
      */
@@ -1009,6 +1022,7 @@ declare class ApiMachineClient {
     private stopSessionHandler;
     private listTrackedSessionIds;
     private reconnectInterval;
+    private handoverInFlight;
     private encTerminals;
     private webTerminal;
     /**
@@ -1068,7 +1082,15 @@ declare class ApiMachineClient {
      */
     updateDaemonState(handler: (state: DaemonState | null) => DaemonState): Promise<void>;
     connect(): void;
+    private createControlSocket;
+    private activateControlSocket;
+    private bindControlDataHandlers;
+    private startReleaseHandover;
+    private releaseHandover;
     private startKeepAlive;
+    private bindRpcRequestHandler;
+    private bindMachineCommandHandlers;
+    private unbindMachineCommandHandlers;
     private bindRealtimeHandlers;
     /** Reconcile commands missed while the daemon was offline. The server
      * returns only ids owned by this account and durably archived in the DB. */

package/dist/lib.d.mts

@@ -545,6 +545,11 @@ declare class RpcHandlerManager {
      */
     handleRequest(request: RpcRequest): Promise<any>;
     onSocketConnect(socket: Socket): void;
+    /**
+     * Attach a candidate transport and wait until the server confirms every
+     * method before a release handover closes the old transport.
+     */
+    onSocketConnectAndWait(socket: Socket, timeoutMs?: number): Promise<void>;
     onSocketDisconnect(socket?: Socket): void;
     /**
      * Get the number of registered handlers
@@ -652,13 +657,19 @@ declare class ApiSessionClient extends EventEmitter {
     private ignoreArchiveSignal;
     private skipInitialMessages;
     private claudeSessionProtocolState;
+    private readonly seenClaudeUsageEvents;
+    private claudeUsageTotals;
     private lastSeq;
     private pendingOutbox;
     private readonly sendSync;
     private readonly receiveSync;
     private readonly directInboundLocalIds;
     private readonly routedInboundLocalIds;
+    private handoverInFlight;
     constructor(token: string, session: Session);
+    private createControlSocket;
+    private startReleaseHandover;
+    private releaseHandover;
     onUserMessage(callback: (data: UserMessage) => void): void;
     onFileEvent(callback: (data: FileEventMessage) => void): void;
     /**
@@ -787,7 +798,9 @@ declare class ApiSessionClient extends EventEmitter {
     /**
      * Send usage data to the server
      */
-    sendUsageData(usage: Usage, model?: string): void;
+    sendUsageData(usage: Usage, model?: string, eventId?: string): void;
+    /** Save a provider's cumulative session snapshot under one upsert key. */
+    sendAgentUsageSnapshot(agent: string, rawUsage: unknown): boolean;
     /**
      * Returns the latest session metadata known to the client.
      */
@@ -1009,6 +1022,7 @@ declare class ApiMachineClient {
     private stopSessionHandler;
     private listTrackedSessionIds;
     private reconnectInterval;
+    private handoverInFlight;
     private encTerminals;
     private webTerminal;
     /**
@@ -1068,7 +1082,15 @@ declare class ApiMachineClient {
      */
     updateDaemonState(handler: (state: DaemonState | null) => DaemonState): Promise<void>;
     connect(): void;
+    private createControlSocket;
+    private activateControlSocket;
+    private bindControlDataHandlers;
+    private startReleaseHandover;
+    private releaseHandover;
     private startKeepAlive;
+    private bindRpcRequestHandler;
+    private bindMachineCommandHandlers;
+    private unbindMachineCommandHandlers;
     private bindRealtimeHandlers;
     /** Reconcile commands missed while the daemon was offline. The server
      * returns only ids owned by this account and durably archived in the DB. */

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

package/dist/{mcp-B4UxtBKQ.mjs → mcp-B-GdhlKD.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-Cq30c63l.mjs';
+import { p as pushClipboardViaDaemon } from './index-DOb57EGb.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-Dj9JEGDh.mjs';
+import { l as logger } from './types-D2qSKjsO.mjs';
 import 'chalk';
 import 'node:os';
 import 'node:crypto';

package/dist/{mcp-D12X7XKG.cjs → mcp-CsKnmeE5.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-edEH95Mf.cjs');
+var index = require('./index-Dcv1RKe8.cjs');
 var limits = require('./limits-KdWKmwtH.cjs');
-var persistence = require('./types-DEre2zxO.cjs');
+var persistence = require('./types-NwtcBgfS.cjs');
 require('chalk');
 require('node:os');
 require('node:crypto');

package/dist/{runGemini-BD8OGMQr.mjs → runGemini-D0lddF43.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-Dj9JEGDh.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-Cq30c63l.mjs';
-import { A as AcpBackend } from './AcpBackend-5CPQMP3H.mjs';
-import { readGeminiLocalConfig, determineGeminiModel, getGeminiModelSource, getInitialGeminiModel, saveGeminiModelToConfig } from './config-DbY2R-H7.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-D2qSKjsO.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-DOb57EGb.mjs';
+import { A as AcpBackend } from './AcpBackend-BFFC77vV.mjs';
+import { readGeminiLocalConfig, determineGeminiModel, getGeminiModelSource, getInitialGeminiModel, saveGeminiModelToConfig } from './config-CRFTYuTN.mjs';
 import 'axios';
 import 'chalk';
 import 'node:util';
@@ -1314,6 +1314,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           break;
         default:
           if (msg.type === "token-count") {
+            session.sendAgentUsageSnapshot("gemini", msg);
             session.sendAgentMessage("gemini", {
               type: "token_count",
               ...msg,