@zhigang1992/happy-cli 0.12.1 → 0.12.4

package/dist/{types-CGco5Y-r.mjs → types-Cw6y7GyQ.mjs}

@@ -1,6 +1,6 @@
-import axios from 'axios';
+import{createRequire as _pkgrollCR}from"node:module";const require=_pkgrollCR(import.meta.url);import axios from 'axios';
 import chalk from 'chalk';
-import { appendFileSync } from 'fs';
+import { appendFileSync, existsSync as existsSync$1 } from 'fs';
 import { existsSync, mkdirSync, constants, readFileSync, unlinkSync, writeFileSync, readdirSync, statSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join, basename } from 'node:path';
@@ -11,17 +11,16 @@ import { createHash, createDecipheriv, createCipheriv, randomBytes, randomUUID }
 import tweetnacl from 'tweetnacl';
 import { EventEmitter } from 'node:events';
 import { io } from 'socket.io-client';
-import { spawn, exec } from 'child_process';
+import { spawn, spawnSync, exec } from 'child_process';
 import { promisify } from 'util';
 import { readFile as readFile$1, stat as stat$1, writeFile as writeFile$1, readdir } from 'fs/promises';
 import { createHash as createHash$1 } from 'crypto';
 import { dirname, resolve, join as join$1 } from 'path';
 import { fileURLToPath } from 'url';
-import { platform } from 'os';
 import { Expo } from 'expo-server-sdk';
 
 var name = "@zhigang1992/happy-cli";
-var version = "0.12.1";
+var version = "0.12.4";
 var description = "Mobile and Web client for Claude Code and Codex";
 var author = "Kirill Dubovitskiy";
 var license = "MIT";
@@ -72,7 +71,6 @@ var files = [
 	"dist",
 	"bin",
 	"scripts",
-	"tools",
 	"package.json"
 ];
 var scripts = {
@@ -85,8 +83,7 @@ var scripts = {
 	"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",
-	release: "release-it",
-	postinstall: "node scripts/unpack-tools.cjs"
+	release: "release-it"
 };
 var dependencies = {
 	"@anthropic-ai/claude-code": "2.0.55",
@@ -314,6 +311,31 @@ function decryptWithDataKey(bundle, dataKey) {
     return null;
   }
 }
+function decryptBlobWithDataKey(bundle, dataKey) {
+  if (bundle.length < 1) {
+    return null;
+  }
+  if (bundle[0] !== 0) {
+    return null;
+  }
+  if (bundle.length < 12 + 16 + 1) {
+    return null;
+  }
+  const nonce = bundle.slice(1, 13);
+  const authTag = bundle.slice(bundle.length - 16);
+  const ciphertext = bundle.slice(13, bundle.length - 16);
+  try {
+    const decipher = createDecipheriv("aes-256-gcm", dataKey, nonce);
+    decipher.setAuthTag(authTag);
+    const decrypted = Buffer.concat([
+      decipher.update(ciphertext),
+      decipher.final()
+    ]);
+    return new Uint8Array(decrypted);
+  } catch (error) {
+    return null;
+  }
+}
 function encrypt(key, variant, data) {
   if (variant === "legacy") {
     return encryptLegacy(data, key);
@@ -855,12 +877,27 @@ z$1.object({
     agentStateVersion: z$1.number()
   })
 });
+const TextContentSchema = z$1.object({
+  type: z$1.literal("text"),
+  text: z$1.string()
+});
+const ImageRefContentSchema = z$1.object({
+  type: z$1.literal("image_ref"),
+  blobId: z$1.string(),
+  mimeType: z$1.enum(["image/jpeg", "image/png", "image/gif", "image/webp"]),
+  width: z$1.number().optional(),
+  height: z$1.number().optional()
+});
+const ContentBlockSchema = z$1.union([TextContentSchema, ImageRefContentSchema]);
+const UserMessageContentSchema = z$1.union([
+  TextContentSchema,
+  // Legacy: single text content
+  z$1.array(ContentBlockSchema)
+  // New: array of content blocks
+]);
 const UserMessageSchema = z$1.object({
   role: z$1.literal("user"),
-  content: z$1.object({
-    type: z$1.literal("text"),
-    text: z$1.string()
-  }),
+  content: UserMessageContentSchema,
   localKey: z$1.string().optional(),
   // Mobile messages include this
   meta: MessageMetaSchema.optional()
@@ -972,12 +1009,29 @@ class RpcHandlerManager {
   encryptionVariant;
   logger;
   socket = null;
+  sessionContext = null;
   constructor(config) {
     this.scopePrefix = config.scopePrefix;
     this.encryptionKey = config.encryptionKey;
     this.encryptionVariant = config.encryptionVariant;
     this.logger = config.logger || ((msg, data) => logger.debug(msg, data));
   }
+  /**
+   * Set the session context (path and environment)
+   * This should be called after direnv environment is loaded
+   * @param context - The session context with path and environment
+   */
+  setSessionContext(context) {
+    this.sessionContext = context;
+    this.logger("[RPC] Session context set", { path: context.path, envVarCount: Object.keys(context.env).length });
+  }
+  /**
+   * Get the current session context
+   * @returns The session context or null if not set
+   */
+  getSessionContext() {
+    return this.sessionContext;
+  }
   /**
    * Register an RPC handler for a specific method
    * @param method - The method name (without prefix)
@@ -1089,14 +1143,35 @@ function run$1(args, options) {
   });
 }
 
-function getBinaryPath() {
-  const platformName = platform();
-  const binaryName = platformName === "win32" ? "difft.exe" : "difft";
-  return resolve(join$1(projectPath(), "tools", "unpacked", binaryName));
+const toolsConfig = require(join$1(projectPath(), "scripts", "tools-config.cjs"));
+require(join$1(projectPath(), "scripts", "download-tool.cjs"));
+let cachedBinaryPath = null;
+function getBinaryPathSync() {
+  if (cachedBinaryPath && existsSync$1(cachedBinaryPath)) {
+    return cachedBinaryPath;
+  }
+  const expectedPath = toolsConfig.getToolPath("difftastic");
+  if (existsSync$1(expectedPath)) {
+    cachedBinaryPath = expectedPath;
+    return expectedPath;
+  }
+  const result = spawnSync(process.execPath, [
+    join$1(projectPath(), "scripts", "download-tool.cjs"),
+    "difftastic"
+  ], {
+    encoding: "utf-8",
+    stdio: ["pipe", "pipe", "inherit"]
+    // Show download progress on stderr
+  });
+  if (result.status !== 0) {
+    throw new Error(`Failed to download difftastic: ${result.stderr || "unknown error"}`);
+  }
+  cachedBinaryPath = result.stdout.trim();
+  return cachedBinaryPath;
 }
 function run(args, options) {
-  const binaryPath = getBinaryPath();
-  return new Promise((resolve2, reject) => {
+  const binaryPath = getBinaryPathSync();
+  return new Promise((resolve, reject) => {
     const child = spawn(binaryPath, args, {
       stdio: ["pipe", "pipe", "pipe"],
       cwd: options?.cwd,
@@ -1115,7 +1190,7 @@ function run(args, options) {
       stderr += data.toString();
     });
     child.on("close", (code) => {
-      resolve2({
+      resolve({
         exitCode: code || 0,
         stdout,
         stderr
@@ -1132,10 +1207,13 @@ function registerCommonHandlers(rpcHandlerManager) {
   rpcHandlerManager.registerHandler("bash", async (data) => {
     logger.debug("Shell command request:", data.command);
     try {
+      const sessionContext = rpcHandlerManager.getSessionContext();
       const options = {
         cwd: data.cwd,
-        timeout: data.timeout || 3e4
+        timeout: data.timeout || 3e4,
         // Default 30 seconds timeout
+        // Use session environment if available, otherwise inherit process.env
+        env: sessionContext?.env ?? process.env
       };
       const { stdout, stderr } = await execAsync(data.command, options);
       return {
@@ -1665,6 +1743,64 @@ class ApiSessionClient extends EventEmitter {
     logger.debug("[API] socket.close() called");
     this.socket.close();
   }
+  /**
+   * Download and decrypt a blob from the server
+   * @param blobId - The blob ID to download
+   * @returns The decrypted binary data and metadata, or null if download/decryption fails
+   */
+  async downloadBlob(blobId) {
+    try {
+      const response = await axios.get(
+        `${configuration.serverUrl}/v1/sessions/${this.sessionId}/blobs/${blobId}`,
+        {
+          headers: {
+            "Authorization": `Bearer ${this.token}`
+          },
+          responseType: "arraybuffer"
+        }
+      );
+      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);
+      if (!decryptedData) {
+        logger.debug("[API] Failed to decrypt blob");
+        return null;
+      }
+      return {
+        data: decryptedData,
+        mimeType,
+        size: originalSize
+      };
+    } catch (error) {
+      logger.debug("[API] Failed to download blob:", error);
+      return null;
+    }
+  }
+  /**
+   * Convert an image_ref content block to a Claude API image content block
+   * Downloads, decrypts, and base64 encodes the image
+   * @param imageRef - The image reference content block
+   * @returns Claude API image content block, or null if conversion fails
+   */
+  async resolveImageRef(imageRef) {
+    const blob = await this.downloadBlob(imageRef.blobId);
+    if (!blob) {
+      return null;
+    }
+    return {
+      type: "image",
+      source: {
+        type: "base64",
+        media_type: blob.mimeType,
+        data: Buffer.from(blob.data).toString("base64")
+      }
+    };
+  }
 }
 
 class ApiMachineClient {

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

@@ -18,7 +18,6 @@ var fs$2 = require('fs/promises');
 var crypto = require('crypto');
 var path = require('path');
 var url = require('url');
-var os$1 = require('os');
 var expoServerSdk = require('expo-server-sdk');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
@@ -42,7 +41,7 @@ function _interopNamespaceDefault(e) {
 var z__namespace = /*#__PURE__*/_interopNamespaceDefault(z);
 
 var name = "@zhigang1992/happy-cli";
-var version = "0.12.1";
+var version = "0.12.4";
 var description = "Mobile and Web client for Claude Code and Codex";
 var author = "Kirill Dubovitskiy";
 var license = "MIT";
@@ -93,7 +92,6 @@ var files = [
 	"dist",
 	"bin",
 	"scripts",
-	"tools",
 	"package.json"
 ];
 var scripts = {
@@ -106,8 +104,7 @@ var scripts = {
 	"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",
-	release: "release-it",
-	postinstall: "node scripts/unpack-tools.cjs"
+	release: "release-it"
 };
 var dependencies = {
 	"@anthropic-ai/claude-code": "2.0.55",
@@ -335,6 +332,31 @@ function decryptWithDataKey(bundle, dataKey) {
     return null;
   }
 }
+function decryptBlobWithDataKey(bundle, dataKey) {
+  if (bundle.length < 1) {
+    return null;
+  }
+  if (bundle[0] !== 0) {
+    return null;
+  }
+  if (bundle.length < 12 + 16 + 1) {
+    return null;
+  }
+  const nonce = bundle.slice(1, 13);
+  const authTag = bundle.slice(bundle.length - 16);
+  const ciphertext = bundle.slice(13, bundle.length - 16);
+  try {
+    const decipher = node_crypto.createDecipheriv("aes-256-gcm", dataKey, nonce);
+    decipher.setAuthTag(authTag);
+    const decrypted = Buffer.concat([
+      decipher.update(ciphertext),
+      decipher.final()
+    ]);
+    return new Uint8Array(decrypted);
+  } catch (error) {
+    return null;
+  }
+}
 function encrypt(key, variant, data) {
   if (variant === "legacy") {
     return encryptLegacy(data, key);
@@ -876,12 +898,27 @@ z.z.object({
     agentStateVersion: z.z.number()
   })
 });
+const TextContentSchema = z.z.object({
+  type: z.z.literal("text"),
+  text: z.z.string()
+});
+const ImageRefContentSchema = z.z.object({
+  type: z.z.literal("image_ref"),
+  blobId: z.z.string(),
+  mimeType: z.z.enum(["image/jpeg", "image/png", "image/gif", "image/webp"]),
+  width: z.z.number().optional(),
+  height: z.z.number().optional()
+});
+const ContentBlockSchema = z.z.union([TextContentSchema, ImageRefContentSchema]);
+const UserMessageContentSchema = z.z.union([
+  TextContentSchema,
+  // Legacy: single text content
+  z.z.array(ContentBlockSchema)
+  // New: array of content blocks
+]);
 const UserMessageSchema = z.z.object({
   role: z.z.literal("user"),
-  content: z.z.object({
-    type: z.z.literal("text"),
-    text: z.z.string()
-  }),
+  content: UserMessageContentSchema,
   localKey: z.z.string().optional(),
   // Mobile messages include this
   meta: MessageMetaSchema.optional()
@@ -993,12 +1030,29 @@ class RpcHandlerManager {
   encryptionVariant;
   logger;
   socket = null;
+  sessionContext = null;
   constructor(config) {
     this.scopePrefix = config.scopePrefix;
     this.encryptionKey = config.encryptionKey;
     this.encryptionVariant = config.encryptionVariant;
     this.logger = config.logger || ((msg, data) => logger.debug(msg, data));
   }
+  /**
+   * Set the session context (path and environment)
+   * This should be called after direnv environment is loaded
+   * @param context - The session context with path and environment
+   */
+  setSessionContext(context) {
+    this.sessionContext = context;
+    this.logger("[RPC] Session context set", { path: context.path, envVarCount: Object.keys(context.env).length });
+  }
+  /**
+   * Get the current session context
+   * @returns The session context or null if not set
+   */
+  getSessionContext() {
+    return this.sessionContext;
+  }
   /**
    * Register an RPC handler for a specific method
    * @param method - The method name (without prefix)
@@ -1076,7 +1130,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-BsjUgWOx.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-Q-euvEmG.cjs', document.baseURI).href))));
 function projectPath() {
   const path$1 = path.resolve(__dirname$1, "..");
   return path$1;
@@ -1110,14 +1164,35 @@ function run$1(args, options) {
   });
 }
 
-function getBinaryPath() {
-  const platformName = os$1.platform();
-  const binaryName = platformName === "win32" ? "difft.exe" : "difft";
-  return path.resolve(path.join(projectPath(), "tools", "unpacked", binaryName));
+const toolsConfig = require(path.join(projectPath(), "scripts", "tools-config.cjs"));
+require(path.join(projectPath(), "scripts", "download-tool.cjs"));
+let cachedBinaryPath = null;
+function getBinaryPathSync() {
+  if (cachedBinaryPath && fs$1.existsSync(cachedBinaryPath)) {
+    return cachedBinaryPath;
+  }
+  const expectedPath = toolsConfig.getToolPath("difftastic");
+  if (fs$1.existsSync(expectedPath)) {
+    cachedBinaryPath = expectedPath;
+    return expectedPath;
+  }
+  const result = child_process.spawnSync(process.execPath, [
+    path.join(projectPath(), "scripts", "download-tool.cjs"),
+    "difftastic"
+  ], {
+    encoding: "utf-8",
+    stdio: ["pipe", "pipe", "inherit"]
+    // Show download progress on stderr
+  });
+  if (result.status !== 0) {
+    throw new Error(`Failed to download difftastic: ${result.stderr || "unknown error"}`);
+  }
+  cachedBinaryPath = result.stdout.trim();
+  return cachedBinaryPath;
 }
 function run(args, options) {
-  const binaryPath = getBinaryPath();
-  return new Promise((resolve2, reject) => {
+  const binaryPath = getBinaryPathSync();
+  return new Promise((resolve, reject) => {
     const child = child_process.spawn(binaryPath, args, {
       stdio: ["pipe", "pipe", "pipe"],
       cwd: options?.cwd,
@@ -1136,7 +1211,7 @@ function run(args, options) {
       stderr += data.toString();
     });
     child.on("close", (code) => {
-      resolve2({
+      resolve({
         exitCode: code || 0,
         stdout,
         stderr
@@ -1153,10 +1228,13 @@ function registerCommonHandlers(rpcHandlerManager) {
   rpcHandlerManager.registerHandler("bash", async (data) => {
     logger.debug("Shell command request:", data.command);
     try {
+      const sessionContext = rpcHandlerManager.getSessionContext();
       const options = {
         cwd: data.cwd,
-        timeout: data.timeout || 3e4
+        timeout: data.timeout || 3e4,
         // Default 30 seconds timeout
+        // Use session environment if available, otherwise inherit process.env
+        env: sessionContext?.env ?? process.env
       };
       const { stdout, stderr } = await execAsync(data.command, options);
       return {
@@ -1686,6 +1764,64 @@ class ApiSessionClient extends node_events.EventEmitter {
     logger.debug("[API] socket.close() called");
     this.socket.close();
   }
+  /**
+   * Download and decrypt a blob from the server
+   * @param blobId - The blob ID to download
+   * @returns The decrypted binary data and metadata, or null if download/decryption fails
+   */
+  async downloadBlob(blobId) {
+    try {
+      const response = await axios.get(
+        `${configuration.serverUrl}/v1/sessions/${this.sessionId}/blobs/${blobId}`,
+        {
+          headers: {
+            "Authorization": `Bearer ${this.token}`
+          },
+          responseType: "arraybuffer"
+        }
+      );
+      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);
+      if (!decryptedData) {
+        logger.debug("[API] Failed to decrypt blob");
+        return null;
+      }
+      return {
+        data: decryptedData,
+        mimeType,
+        size: originalSize
+      };
+    } catch (error) {
+      logger.debug("[API] Failed to download blob:", error);
+      return null;
+    }
+  }
+  /**
+   * Convert an image_ref content block to a Claude API image content block
+   * Downloads, decrypts, and base64 encodes the image
+   * @param imageRef - The image reference content block
+   * @returns Claude API image content block, or null if conversion fails
+   */
+  async resolveImageRef(imageRef) {
+    const blob = await this.downloadBlob(imageRef.blobId);
+    if (!blob) {
+      return null;
+    }
+    return {
+      type: "image",
+      source: {
+        type: "base64",
+        media_type: blob.mimeType,
+        data: Buffer.from(blob.data).toString("base64")
+      }
+    };
+  }
 }
 
 class ApiMachineClient {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhigang1992/happy-cli",
-  "version": "0.12.1",
+  "version": "0.12.4",
   "description": "Mobile and Web client for Claude Code and Codex",
   "author": "Kirill Dubovitskiy",
   "license": "MIT",
@@ -51,7 +51,6 @@
     "dist",
     "bin",
     "scripts",
-    "tools",
     "package.json"
   ],
   "scripts": {
@@ -64,8 +63,7 @@
     "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",
-    "release": "release-it",
-    "postinstall": "node scripts/unpack-tools.cjs"
+    "release": "release-it"
   },
   "dependencies": {
     "@anthropic-ai/claude-code": "2.0.55",