@zhigang1992/happy-cli 0.12.4 → 0.12.6

package/dist/codex/happyMcpStdioBridge.cjs

@@ -29,10 +29,7 @@ async function main() {
   let httpClient = null;
   async function ensureHttpClient() {
     if (httpClient) return httpClient;
-    const client = new index_js.Client(
-      { name: "happy-stdio-bridge", version: "1.0.0" },
-      { capabilities: { tools: {} } }
-    );
+    const client = new index_js.Client({ name: "happy-stdio-bridge", version: "1.0.0" });
     const transport = new streamableHttp_js.StreamableHTTPClientTransport(new URL(baseUrl));
     await client.connect(transport);
     httpClient = client;
@@ -41,7 +38,7 @@ async function main() {
   const server = new mcp_js.McpServer({
     name: "Happy MCP Bridge",
     version: "1.0.0",
-    description: "STDIO bridge forwarding to Happy HTTP MCP"
+    title: "STDIO bridge forwarding to Happy HTTP MCP"
   });
   server.registerTool(
     "change_title",

package/dist/codex/happyMcpStdioBridge.mjs

@@ -27,10 +27,7 @@ async function main() {
   let httpClient = null;
   async function ensureHttpClient() {
     if (httpClient) return httpClient;
-    const client = new Client(
-      { name: "happy-stdio-bridge", version: "1.0.0" },
-      { capabilities: { tools: {} } }
-    );
+    const client = new Client({ name: "happy-stdio-bridge", version: "1.0.0" });
     const transport = new StreamableHTTPClientTransport(new URL(baseUrl));
     await client.connect(transport);
     httpClient = client;
@@ -39,7 +36,7 @@ async function main() {
   const server = new McpServer({
     name: "Happy MCP Bridge",
     version: "1.0.0",
-    description: "STDIO bridge forwarding to Happy HTTP MCP"
+    title: "STDIO bridge forwarding to Happy HTTP MCP"
   });
   server.registerTool(
     "change_title",

package/dist/{index-CHEjP0zg.cjs → index-BkDVLUcE.cjs}

@@ -3,7 +3,7 @@
 var chalk = require('chalk');
 var os = require('node:os');
 var node_crypto = require('node:crypto');
-var types = require('./types-Q-euvEmG.cjs');
+var types = require('./types-Bd_EJ8VV.cjs');
 var node_child_process = require('node:child_process');
 var node_path = require('node:path');
 var node_readline = require('node:readline');
@@ -1082,7 +1082,7 @@ class AbortError extends Error {
   }
 }
 
-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-CHEjP0zg.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-BkDVLUcE.cjs', document.baseURI).href)));
 const __dirname$1 = node_path.join(__filename$1, "..");
 function getDefaultClaudeCodePath() {
   return node_path.join(__dirname$1, "..", "..", "..", "node_modules", "@anthropic-ai", "claude-code", "cli.js");
@@ -4902,7 +4902,7 @@ async function startHappyServer(client) {
   const mcp = new mcp_js.McpServer({
     name: "Happy MCP",
     version: "1.0.0",
-    description: "Happy CLI MCP server with chat session management tools"
+    title: "Happy CLI MCP Server"
   });
   mcp.registerTool("change_title", {
     description: "Change the title of the current chat session",
@@ -6393,7 +6393,7 @@ async function handleConnectVendor(vendor, displayName) {
     return;
   } else if (subcommand === "codex") {
     try {
-      const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-DUqqO-m8.cjs'); });
+      const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-uPJ1h0J4.cjs'); });
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
@@ -6438,7 +6438,7 @@ async function handleConnectVendor(vendor, displayName) {
   } else if (subcommand === "list") {
     try {
       const { credentials } = await authAndSetupMachineIfNeeded();
-      const { listSessions } = await Promise.resolve().then(function () { return require('./list-DOsBjFRJ.cjs'); });
+      const { listSessions } = await Promise.resolve().then(function () { return require('./list-LCFlAICJ.cjs'); });
       let sessionId;
       let titleFilter;
       let recentMsgs;
@@ -6540,7 +6540,7 @@ Examples:
         process.exit(1);
       }
       const { credentials } = await authAndSetupMachineIfNeeded();
-      const { promptSession } = await Promise.resolve().then(function () { return require('./prompt-Dh_trad0.cjs'); });
+      const { promptSession } = await Promise.resolve().then(function () { return require('./prompt-B0ezty5F.cjs'); });
       await promptSession(credentials, sessionId, promptText, timeoutMinutes ?? void 0);
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");

package/dist/{index-BERBU6rR.mjs → index-h3SrsKqR.mjs}

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import os$1, { homedir } from 'node:os';
 import { randomUUID, randomBytes, createHmac } from 'node:crypto';
-import { l as logger, p as projectPath, j as backoff, k as delay, R as RawJSONLinesSchema, m as AsyncLock, c as configuration, n as readDaemonState, o as clearDaemonState, i as packageJson, r as readSettings, q as readCredentials, g as encodeBase64, u as updateSettings, s as encodeBase64Url, d as decodeBase64, w as writeCredentialsLegacy, t as writeCredentialsDataKey, v as acquireDaemonLock, x as writeDaemonState, A as ApiClient, y as releaseDaemonLock, z as authChallenge, B as clearCredentials, C as clearMachineId, D as getLatestDaemonLog } from './types-Cw6y7GyQ.mjs';
+import { l as logger, p as projectPath, j as backoff, k as delay, R as RawJSONLinesSchema, m as AsyncLock, c as configuration, n as readDaemonState, o as clearDaemonState, i as packageJson, r as readSettings, q as readCredentials, g as encodeBase64, u as updateSettings, s as encodeBase64Url, d as decodeBase64, w as writeCredentialsLegacy, t as writeCredentialsDataKey, v as acquireDaemonLock, x as writeDaemonState, A as ApiClient, y as releaseDaemonLock, z as authChallenge, B as clearCredentials, C as clearMachineId, D as getLatestDaemonLog } from './types-Cn6qSxMP.mjs';
 import { spawn, execSync, execFileSync } from 'node:child_process';
 import { resolve, join } from 'node:path';
 import { createInterface } from 'node:readline';
@@ -1059,10 +1059,10 @@ class AbortError extends Error {
   }
 }
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = join(__filename, "..");
+const __filename$1 = fileURLToPath(import.meta.url);
+const __dirname$1 = join(__filename$1, "..");
 function getDefaultClaudeCodePath() {
-  return join(__dirname, "..", "..", "..", "node_modules", "@anthropic-ai", "claude-code", "cli.js");
+  return join(__dirname$1, "..", "..", "..", "node_modules", "@anthropic-ai", "claude-code", "cli.js");
 }
 function logDebug(message) {
   if (process.env.DEBUG) {
@@ -4879,7 +4879,7 @@ async function startHappyServer(client) {
   const mcp = new McpServer({
     name: "Happy MCP",
     version: "1.0.0",
-    description: "Happy CLI MCP server with chat session management tools"
+    title: "Happy CLI MCP Server"
   });
   mcp.registerTool("change_title", {
     description: "Change the title of the current chat session",
@@ -6370,7 +6370,7 @@ async function handleConnectVendor(vendor, displayName) {
     return;
   } else if (subcommand === "codex") {
     try {
-      const { runCodex } = await import('./runCodex-CYkmZphO.mjs');
+      const { runCodex } = await import('./runCodex-BarDBoPV.mjs');
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
@@ -6415,7 +6415,7 @@ async function handleConnectVendor(vendor, displayName) {
   } else if (subcommand === "list") {
     try {
       const { credentials } = await authAndSetupMachineIfNeeded();
-      const { listSessions } = await import('./list-BvtUKVTq.mjs');
+      const { listSessions } = await import('./list-BJBPeYMn.mjs');
       let sessionId;
       let titleFilter;
       let recentMsgs;
@@ -6517,7 +6517,7 @@ Examples:
         process.exit(1);
       }
       const { credentials } = await authAndSetupMachineIfNeeded();
-      const { promptSession } = await import('./prompt-BbMNN7fl.mjs');
+      const { promptSession } = await import('./prompt-B35fwI-i.mjs');
       await promptSession(credentials, sessionId, promptText, timeoutMinutes ?? void 0);
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");

package/dist/index.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
 require('chalk');
-require('./index-CHEjP0zg.cjs');
-require('./types-Q-euvEmG.cjs');
+require('./index-BkDVLUcE.cjs');
+require('./types-Bd_EJ8VV.cjs');
 require('zod');
 require('node:child_process');
 require('node:os');

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import 'chalk';
-import './index-BERBU6rR.mjs';
-import './types-Cw6y7GyQ.mjs';
+import './index-h3SrsKqR.mjs';
+import './types-Cn6qSxMP.mjs';
 import 'zod';
 import 'node:child_process';
 import 'node:os';

package/dist/lib.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var types = require('./types-Q-euvEmG.cjs');
+var types = require('./types-Bd_EJ8VV.cjs');
 require('axios');
 require('chalk');
 require('fs');

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

package/dist/{list-BvtUKVTq.mjs → list-BJBPeYMn.mjs}

@@ -1,4 +1,4 @@
-import { c as configuration, l as logger, d as decodeBase64, b as decrypt, f as formatTimeAgo, e as libsodiumDecryptFromPublicKey } from './types-Cw6y7GyQ.mjs';
+import { c as configuration, l as logger, d as decodeBase64, b as decrypt, f as formatTimeAgo, e as libsodiumDecryptFromPublicKey } from './types-Cn6qSxMP.mjs';
 import axios from 'axios';
 import { existsSync, readdirSync, statSync, readFileSync } from 'fs';
 import { join } from 'path';

package/dist/{list-DOsBjFRJ.cjs → list-LCFlAICJ.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var types = require('./types-Q-euvEmG.cjs');
+var types = require('./types-Bd_EJ8VV.cjs');
 var axios = require('axios');
 var fs = require('fs');
 var path = require('path');

package/dist/{prompt-Dh_trad0.cjs → prompt-B0ezty5F.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var types = require('./types-Q-euvEmG.cjs');
+var types = require('./types-Bd_EJ8VV.cjs');
 var axios = require('axios');
 var socket_ioClient = require('socket.io-client');
 require('chalk');

package/dist/{prompt-BbMNN7fl.mjs → prompt-B35fwI-i.mjs}

@@ -1,4 +1,4 @@
-import { c as configuration, b as decrypt, d as decodeBase64, l as logger, g as encodeBase64, h as encrypt } from './types-Cw6y7GyQ.mjs';
+import { c as configuration, b as decrypt, d as decodeBase64, l as logger, g as encodeBase64, h as encrypt } from './types-Cn6qSxMP.mjs';
 import axios from 'axios';
 import { io } from 'socket.io-client';
 import 'chalk';

package/dist/{runCodex-CYkmZphO.mjs → runCodex-BarDBoPV.mjs}

@@ -1,16 +1,17 @@
 import { useStdout, useInput, Box, Text, render } from 'ink';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
-import { l as logger, A as ApiClient, r as readSettings, p as projectPath, c as configuration, i as packageJson } from './types-Cw6y7GyQ.mjs';
+import { l as logger, A as ApiClient, r as readSettings, p as projectPath, c as configuration, i as packageJson } from './types-Cn6qSxMP.mjs';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
 import { z } from 'zod';
 import { ElicitRequestSchema } from '@modelcontextprotocol/sdk/types.js';
 import { execSync } from 'child_process';
 import { randomUUID } from 'node:crypto';
-import { i as initialMachineMetadata, n as notifyDaemonSessionStarted, M as MessageQueue2, h as hashObject, r as registerKillSessionHandler, a as MessageBuffer, s as startHappyServer, t as trimIdent, b as stopCaffeinate } from './index-BERBU6rR.mjs';
+import { i as initialMachineMetadata, n as notifyDaemonSessionStarted, M as MessageQueue2, h as hashObject, r as registerKillSessionHandler, a as MessageBuffer, s as startHappyServer, t as trimIdent, b as stopCaffeinate } from './index-h3SrsKqR.mjs';
 import os from 'node:os';
 import { resolve, join } from 'node:path';
 import fs from 'node:fs';
+import { parse } from '@iarna/toml';
 import 'axios';
 import 'chalk';
 import 'fs';
@@ -74,7 +75,7 @@ class CodexMcpClient {
   constructor() {
     this.client = new Client(
       { name: "happy-codex-client", version: "1.0.0" },
-      { capabilities: { tools: {}, elicitation: {} } }
+      { capabilities: { elicitation: {} } }
     );
     this.client.setNotificationHandler(z.object({
       method: z.literal("codex/event"),
@@ -1139,13 +1140,39 @@ async function runCodex(opts) {
       }
     }
   });
+  let existingMcpServers = {};
+  try {
+    const codexConfigPath = join(os.homedir(), ".codex", "config.toml");
+    if (fs.existsSync(codexConfigPath)) {
+      const configContents = fs.readFileSync(codexConfigPath, "utf8");
+      const parsedConfig = parse(configContents);
+      const parsedServers = parsedConfig?.mcp_servers;
+      if (parsedServers && typeof parsedServers === "object") {
+        for (const [name, rawConfig] of Object.entries(parsedServers)) {
+          if (!rawConfig || typeof rawConfig !== "object") {
+            continue;
+          }
+          const command = rawConfig.command;
+          if (typeof command !== "string") {
+            logger.debug(`[codex] Skipping MCP server "${name}" because command is missing`);
+            continue;
+          }
+          existingMcpServers[name] = rawConfig;
+        }
+      }
+    }
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    logger.debug(`[codex] Error reading Codex config: ${message}`);
+  }
   const happyServer = await startHappyServer(session);
   const bridgeCommand = join(projectPath(), "bin", "happy-mcp.mjs");
   const mcpServers = {
     happy: {
       command: bridgeCommand,
       args: ["--url", happyServer.url]
-    }
+    },
+    ...existingMcpServers
   };
   let first = true;
   try {

package/dist/{runCodex-DUqqO-m8.cjs → runCodex-uPJ1h0J4.cjs}

@@ -2,17 +2,18 @@
 
 var ink = require('ink');
 var React = require('react');
-var types = require('./types-Q-euvEmG.cjs');
+var types = require('./types-Bd_EJ8VV.cjs');
 var index_js = require('@modelcontextprotocol/sdk/client/index.js');
 var stdio_js = require('@modelcontextprotocol/sdk/client/stdio.js');
 var z = require('zod');
 var types_js = require('@modelcontextprotocol/sdk/types.js');
 var child_process = require('child_process');
 var node_crypto = require('node:crypto');
-var index = require('./index-CHEjP0zg.cjs');
+var index = require('./index-BkDVLUcE.cjs');
 var os = require('node:os');
 var node_path = require('node:path');
 var fs = require('node:fs');
+var toml = require('@iarna/toml');
 require('axios');
 require('chalk');
 require('fs');
@@ -76,7 +77,7 @@ class CodexMcpClient {
   constructor() {
     this.client = new index_js.Client(
       { name: "happy-codex-client", version: "1.0.0" },
-      { capabilities: { tools: {}, elicitation: {} } }
+      { capabilities: { elicitation: {} } }
     );
     this.client.setNotificationHandler(z.z.object({
       method: z.z.literal("codex/event"),
@@ -1141,13 +1142,39 @@ async function runCodex(opts) {
       }
     }
   });
+  let existingMcpServers = {};
+  try {
+    const codexConfigPath = node_path.join(os.homedir(), ".codex", "config.toml");
+    if (fs.existsSync(codexConfigPath)) {
+      const configContents = fs.readFileSync(codexConfigPath, "utf8");
+      const parsedConfig = toml.parse(configContents);
+      const parsedServers = parsedConfig?.mcp_servers;
+      if (parsedServers && typeof parsedServers === "object") {
+        for (const [name, rawConfig] of Object.entries(parsedServers)) {
+          if (!rawConfig || typeof rawConfig !== "object") {
+            continue;
+          }
+          const command = rawConfig.command;
+          if (typeof command !== "string") {
+            types.logger.debug(`[codex] Skipping MCP server "${name}" because command is missing`);
+            continue;
+          }
+          existingMcpServers[name] = rawConfig;
+        }
+      }
+    }
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    types.logger.debug(`[codex] Error reading Codex config: ${message}`);
+  }
   const happyServer = await index.startHappyServer(session);
   const bridgeCommand = node_path.join(types.projectPath(), "bin", "happy-mcp.mjs");
   const mcpServers = {
     happy: {
       command: bridgeCommand,
       args: ["--url", happyServer.url]
-    }
+    },
+    ...existingMcpServers
   };
   let first = true;
   try {

package/dist/{types-Q-euvEmG.cjs → types-Bd_EJ8VV.cjs}

@@ -41,7 +41,7 @@ function _interopNamespaceDefault(e) {
 var z__namespace = /*#__PURE__*/_interopNamespaceDefault(z);
 
 var name = "@zhigang1992/happy-cli";
-var version = "0.12.4";
+var version = "0.12.6";
 var description = "Mobile and Web client for Claude Code and Codex";
 var author = "Kirill Dubovitskiy";
 var license = "MIT";
@@ -98,18 +98,19 @@ var scripts = {
 	"why do we need to build before running tests / dev?": "We need the binary to be built so we run daemon commands which directly run the binary - we don't want them to go out of sync or have custom spawn logic depending how we started happy",
 	typecheck: "tsc --noEmit",
 	build: "shx rm -rf dist && npx tsc --noEmit && pkgroll",
-	test: "yarn build && tsx --env-file .env.integration-test node_modules/.bin/vitest run",
-	start: "yarn build && ./bin/happy.mjs",
+	test: "bun run build && tsx --env-file .env.integration-test node_modules/.bin/vitest run",
+	start: "bun run build && ./bin/happy.mjs",
 	dev: "tsx src/index.ts",
-	"dev:local-server": "yarn build && tsx --env-file .env.dev-local-server src/index.ts",
-	"dev:integration-test-env": "yarn build && tsx --env-file .env.integration-test src/index.ts",
-	prepublishOnly: "yarn build && yarn test",
+	"dev:local-server": "bun run build && tsx --env-file .env.dev-local-server src/index.ts",
+	"dev:integration-test-env": "bun run build && tsx --env-file .env.integration-test src/index.ts",
+	prepublishOnly: "bun run build && bun test",
 	release: "release-it"
 };
 var dependencies = {
 	"@anthropic-ai/claude-code": "2.0.55",
 	"@anthropic-ai/sdk": "0.65.0",
 	"@elevenlabs/elevenlabs-js": "^2.25.1",
+	"@iarna/toml": "^3.0.0",
 	"@modelcontextprotocol/sdk": "^1.15.1",
 	"@stablelib/base64": "^2.0.1",
 	"@stablelib/hex": "^2.0.1",
@@ -161,7 +162,7 @@ var resolutions = {
 var publishConfig = {
 	registry: "https://registry.npmjs.org"
 };
-var packageManager = "yarn@1.22.22";
+var packageManager = "bun@1.3.3";
 var packageJson = {
 	name: name,
 	version: version,
@@ -357,6 +358,18 @@ function decryptBlobWithDataKey(bundle, dataKey) {
     return null;
   }
 }
+function decryptBlobWithSecretBox(bundle, secret) {
+  if (bundle.length < 1 + tweetnacl.secretbox.nonceLength) {
+    return null;
+  }
+  if (bundle[0] !== 0) {
+    return null;
+  }
+  const nonce = bundle.slice(1, 1 + tweetnacl.secretbox.nonceLength);
+  const ciphertext = bundle.slice(1 + tweetnacl.secretbox.nonceLength);
+  const decrypted = tweetnacl.secretbox.open(ciphertext, nonce, secret);
+  return decrypted || null;
+}
 function encrypt(key, variant, data) {
   if (variant === "legacy") {
     return encryptLegacy(data, key);
@@ -371,6 +384,13 @@ function decrypt(key, variant, data) {
     return decryptWithDataKey(data, key);
   }
 }
+function decryptBlob(key, variant, bundle) {
+  if (variant === "legacy") {
+    return decryptBlobWithSecretBox(bundle, key);
+  } else {
+    return decryptBlobWithDataKey(bundle, key);
+  }
+}
 function authChallenge(secret) {
   const keypair = tweetnacl.sign.keyPair.fromSeed(secret);
   const challenge = getRandomBytes(32);
@@ -1130,7 +1150,7 @@ class RpcHandlerManager {
   }
 }
 
-const __dirname$1 = path.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('types-Q-euvEmG.cjs', document.baseURI).href))));
+const __dirname$1 = path.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('types-Bd_EJ8VV.cjs', document.baseURI).href))));
 function projectPath() {
   const path$1 = path.resolve(__dirname$1, "..");
   return path$1;
@@ -1783,11 +1803,7 @@ class ApiSessionClient extends node_events.EventEmitter {
       const encryptedData = new Uint8Array(response.data);
       const mimeType = response.headers["x-blob-mimetype"];
       const originalSize = parseInt(response.headers["x-blob-size"], 10);
-      if (this.encryptionVariant !== "dataKey") {
-        logger.debug("[API] Cannot decrypt blob: session uses legacy encryption");
-        return null;
-      }
-      const decryptedData = decryptBlobWithDataKey(encryptedData, this.encryptionKey);
+      const decryptedData = decryptBlob(this.encryptionKey, this.encryptionVariant, encryptedData);
       if (!decryptedData) {
         logger.debug("[API] Failed to decrypt blob");
         return null;

package/dist/{types-Cw6y7GyQ.mjs → types-Cn6qSxMP.mjs}

@@ -20,7 +20,7 @@ import { fileURLToPath } from 'url';
 import { Expo } from 'expo-server-sdk';
 
 var name = "@zhigang1992/happy-cli";
-var version = "0.12.4";
+var version = "0.12.6";
 var description = "Mobile and Web client for Claude Code and Codex";
 var author = "Kirill Dubovitskiy";
 var license = "MIT";
@@ -33,9 +33,9 @@ var bin = {
 	"happy-mcp": "./bin/happy-mcp.mjs"
 };
 var main = "./dist/index.cjs";
-var module = "./dist/index.mjs";
+var module$1 = "./dist/index.mjs";
 var types = "./dist/index.d.cts";
-var exports = {
+var exports$1 = {
 	".": {
 		require: {
 			types: "./dist/index.d.cts",
@@ -77,18 +77,19 @@ var scripts = {
 	"why do we need to build before running tests / dev?": "We need the binary to be built so we run daemon commands which directly run the binary - we don't want them to go out of sync or have custom spawn logic depending how we started happy",
 	typecheck: "tsc --noEmit",
 	build: "shx rm -rf dist && npx tsc --noEmit && pkgroll",
-	test: "yarn build && tsx --env-file .env.integration-test node_modules/.bin/vitest run",
-	start: "yarn build && ./bin/happy.mjs",
+	test: "bun run build && tsx --env-file .env.integration-test node_modules/.bin/vitest run",
+	start: "bun run build && ./bin/happy.mjs",
 	dev: "tsx src/index.ts",
-	"dev:local-server": "yarn build && tsx --env-file .env.dev-local-server src/index.ts",
-	"dev:integration-test-env": "yarn build && tsx --env-file .env.integration-test src/index.ts",
-	prepublishOnly: "yarn build && yarn test",
+	"dev:local-server": "bun run build && tsx --env-file .env.dev-local-server src/index.ts",
+	"dev:integration-test-env": "bun run build && tsx --env-file .env.integration-test src/index.ts",
+	prepublishOnly: "bun run build && bun test",
 	release: "release-it"
 };
 var dependencies = {
 	"@anthropic-ai/claude-code": "2.0.55",
 	"@anthropic-ai/sdk": "0.65.0",
 	"@elevenlabs/elevenlabs-js": "^2.25.1",
+	"@iarna/toml": "^3.0.0",
 	"@modelcontextprotocol/sdk": "^1.15.1",
 	"@stablelib/base64": "^2.0.1",
 	"@stablelib/hex": "^2.0.1",
@@ -140,7 +141,7 @@ var resolutions = {
 var publishConfig = {
 	registry: "https://registry.npmjs.org"
 };
-var packageManager = "yarn@1.22.22";
+var packageManager = "bun@1.3.3";
 var packageJson = {
 	name: name,
 	version: version,
@@ -153,9 +154,9 @@ var packageJson = {
 	repository: repository,
 	bin: bin,
 	main: main,
-	module: module,
+	module: module$1,
 	types: types,
-	exports: exports,
+	exports: exports$1,
 	files: files,
 	scripts: scripts,
 	dependencies: dependencies,
@@ -336,6 +337,18 @@ function decryptBlobWithDataKey(bundle, dataKey) {
     return null;
   }
 }
+function decryptBlobWithSecretBox(bundle, secret) {
+  if (bundle.length < 1 + tweetnacl.secretbox.nonceLength) {
+    return null;
+  }
+  if (bundle[0] !== 0) {
+    return null;
+  }
+  const nonce = bundle.slice(1, 1 + tweetnacl.secretbox.nonceLength);
+  const ciphertext = bundle.slice(1 + tweetnacl.secretbox.nonceLength);
+  const decrypted = tweetnacl.secretbox.open(ciphertext, nonce, secret);
+  return decrypted || null;
+}
 function encrypt(key, variant, data) {
   if (variant === "legacy") {
     return encryptLegacy(data, key);
@@ -350,6 +363,13 @@ function decrypt(key, variant, data) {
     return decryptWithDataKey(data, key);
   }
 }
+function decryptBlob(key, variant, bundle) {
+  if (variant === "legacy") {
+    return decryptBlobWithSecretBox(bundle, key);
+  } else {
+    return decryptBlobWithDataKey(bundle, key);
+  }
+}
 function authChallenge(secret) {
   const keypair = tweetnacl.sign.keyPair.fromSeed(secret);
   const challenge = getRandomBytes(32);
@@ -1109,9 +1129,9 @@ class RpcHandlerManager {
   }
 }
 
-const __dirname = dirname(fileURLToPath(import.meta.url));
+const __dirname$1 = dirname(fileURLToPath(import.meta.url));
 function projectPath() {
-  const path = resolve(__dirname, "..");
+  const path = resolve(__dirname$1, "..");
   return path;
 }
 
@@ -1762,11 +1782,7 @@ class ApiSessionClient extends EventEmitter {
       const encryptedData = new Uint8Array(response.data);
       const mimeType = response.headers["x-blob-mimetype"];
       const originalSize = parseInt(response.headers["x-blob-size"], 10);
-      if (this.encryptionVariant !== "dataKey") {
-        logger.debug("[API] Cannot decrypt blob: session uses legacy encryption");
-        return null;
-      }
-      const decryptedData = decryptBlobWithDataKey(encryptedData, this.encryptionKey);
+      const decryptedData = decryptBlob(this.encryptionKey, this.encryptionVariant, encryptedData);
       if (!decryptedData) {
         logger.debug("[API] Failed to decrypt blob");
         return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhigang1992/happy-cli",
-  "version": "0.12.4",
+  "version": "0.12.6",
   "description": "Mobile and Web client for Claude Code and Codex",
   "author": "Kirill Dubovitskiy",
   "license": "MIT",
@@ -57,18 +57,19 @@
     "why do we need to build before running tests / dev?": "We need the binary to be built so we run daemon commands which directly run the binary - we don't want them to go out of sync or have custom spawn logic depending how we started happy",
     "typecheck": "tsc --noEmit",
     "build": "shx rm -rf dist && npx tsc --noEmit && pkgroll",
-    "test": "yarn build && tsx --env-file .env.integration-test node_modules/.bin/vitest run",
-    "start": "yarn build && ./bin/happy.mjs",
+    "test": "bun run build && tsx --env-file .env.integration-test node_modules/.bin/vitest run",
+    "start": "bun run build && ./bin/happy.mjs",
     "dev": "tsx src/index.ts",
-    "dev:local-server": "yarn build && tsx --env-file .env.dev-local-server src/index.ts",
-    "dev:integration-test-env": "yarn build && tsx --env-file .env.integration-test src/index.ts",
-    "prepublishOnly": "yarn build && yarn test",
+    "dev:local-server": "bun run build && tsx --env-file .env.dev-local-server src/index.ts",
+    "dev:integration-test-env": "bun run build && tsx --env-file .env.integration-test src/index.ts",
+    "prepublishOnly": "bun run build && bun test",
     "release": "release-it"
   },
   "dependencies": {
     "@anthropic-ai/claude-code": "2.0.55",
     "@anthropic-ai/sdk": "0.65.0",
     "@elevenlabs/elevenlabs-js": "^2.25.1",
+    "@iarna/toml": "^3.0.0",
     "@modelcontextprotocol/sdk": "^1.15.1",
     "@stablelib/base64": "^2.0.1",
     "@stablelib/hex": "^2.0.1",
@@ -120,5 +121,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "packageManager": "yarn@1.22.22"
+  "packageManager": "bun@1.3.3"
 }