@zhigang1992/happy-cli 0.12.3 → 0.12.5

package/dist/{index-DNeoLdzx.mjs → index-BfGA--2C.mjs}

@@ -1,11 +1,15 @@
 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-D4_aCy-H.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-BmcSXhbq.mjs';
 import { spawn, execSync, execFileSync } from 'node:child_process';
 import { resolve, join } from 'node:path';
 import { createInterface } from 'node:readline';
 import { existsSync, readFileSync, mkdirSync, watch, readdirSync, statSync, rmSync } from 'node:fs';
+import { exec, spawn as spawn$1, execSync as execSync$1 } from 'child_process';
+import { promisify } from 'util';
+import { existsSync as existsSync$1, readFileSync as readFileSync$1, writeFileSync, chmodSync, unlinkSync } from 'fs';
+import { join as join$1, dirname, basename } from 'path';
 import { readFile } from 'node:fs/promises';
 import fs, { watch as watch$1, access } from 'fs/promises';
 import { useStdout, useInput, Box, Text, render } from 'ink';
@@ -16,10 +20,7 @@ import 'node:events';
 import 'socket.io-client';
 import tweetnacl from 'tweetnacl';
 import 'expo-server-sdk';
-import { basename, join as join$1 } from 'path';
 import { createHash, randomBytes as randomBytes$1 } from 'crypto';
-import { spawn as spawn$1, execSync as execSync$1, exec } from 'child_process';
-import { readFileSync as readFileSync$1, existsSync as existsSync$1, writeFileSync, chmodSync, unlinkSync } from 'fs';
 import psList from 'ps-list';
 import spawn$2 from 'cross-spawn';
 import os from 'os';
@@ -34,7 +35,6 @@ import { createServer } from 'node:http';
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import * as hex from '@stablelib/hex';
 import { createServer as createServer$1 } from 'http';
-import { promisify } from 'util';
 
 class Session {
   path;
@@ -218,6 +218,99 @@ const systemPrompt = (() => {
   }
 })();
 
+const execAsync$1 = promisify(exec);
+let direnvAvailable = null;
+async function isDirenvAvailable() {
+  if (direnvAvailable !== null) {
+    return direnvAvailable;
+  }
+  try {
+    await execAsync$1("direnv version", { timeout: 5e3 });
+    direnvAvailable = true;
+    logger.debug("[direnv] direnv is available");
+  } catch {
+    direnvAvailable = false;
+    logger.debug("[direnv] direnv is not available");
+  }
+  return direnvAvailable;
+}
+function findEnvrcDirectory(startDir) {
+  let dir = startDir;
+  const root = "/";
+  while (dir !== root) {
+    const envrcPath = join$1(dir, ".envrc");
+    if (existsSync$1(envrcPath)) {
+      logger.debug(`[direnv] Found .envrc at: ${envrcPath}`);
+      return dir;
+    }
+    const parent = dirname(dir);
+    if (parent === dir) {
+      break;
+    }
+    dir = parent;
+  }
+  logger.debug(`[direnv] No .envrc found in directory tree for: ${startDir}`);
+  return null;
+}
+async function loadDirenvEnvironment(cwd) {
+  if (!await isDirenvAvailable()) {
+    return {};
+  }
+  const envrcDir = findEnvrcDirectory(cwd);
+  if (!envrcDir) {
+    return {};
+  }
+  try {
+    logger.debug(`[direnv] Loading environment for: ${cwd}`);
+    const { stdout, stderr } = await execAsync$1("direnv export json", {
+      cwd,
+      timeout: 1e4,
+      // 10 second timeout
+      env: {
+        ...process.env,
+        // Ensure direnv doesn't prompt for allowance interactively
+        DIRENV_LOG_FORMAT: ""
+      }
+    });
+    if (stderr) {
+      logger.debug(`[direnv] stderr: ${stderr}`);
+    }
+    const trimmed = stdout.trim();
+    if (!trimmed) {
+      logger.debug("[direnv] No environment changes from direnv");
+      return {};
+    }
+    const direnvVars = JSON.parse(trimmed);
+    const varCount = Object.keys(direnvVars).length;
+    logger.debug(`[direnv] Loaded ${varCount} environment variables`);
+    return direnvVars;
+  } catch (error) {
+    if (error instanceof Error) {
+      logger.debug(`[direnv] Failed to load environment: ${error.message}`);
+      if (error.message.includes("is blocked")) {
+        logger.debug('[direnv] Hint: Run "direnv allow" in the project directory to allow the .envrc');
+      }
+    }
+    return {};
+  }
+}
+async function loadAndMergeEnvironment(cwd, existingEnv = process.env, overrideEnv = {}) {
+  const direnvVars = await loadDirenvEnvironment(cwd);
+  const merged = {};
+  for (const [key, value] of Object.entries(existingEnv)) {
+    if (value !== void 0) {
+      merged[key] = value;
+    }
+  }
+  for (const [key, value] of Object.entries(direnvVars)) {
+    merged[key] = value;
+  }
+  for (const [key, value] of Object.entries(overrideEnv)) {
+    merged[key] = value;
+  }
+  return merged;
+}
+
 const claudeCliPath = resolve(join(projectPath(), "scripts", "claude_local_launcher.cjs"));
 async function claudeLocal(opts) {
   const projectDir = getProjectPath(opts.path);
@@ -259,6 +352,15 @@ async function claudeLocal(opts) {
     }
   };
   try {
+    const direnvVars = await loadDirenvEnvironment(opts.path);
+    if (Object.keys(direnvVars).length > 0) {
+      logger.debug(`[ClaudeLocal] Loaded ${Object.keys(direnvVars).length} direnv environment variables`);
+    }
+    const env = {
+      ...process.env,
+      ...direnvVars,
+      ...opts.claudeEnvVars
+    };
     process.stdin.pause();
     await new Promise((r, reject) => {
       const args = [];
@@ -278,10 +380,6 @@ async function claudeLocal(opts) {
       if (!claudeCliPath || !existsSync(claudeCliPath)) {
         throw new Error("Claude local launcher not found. Please ensure HAPPY_PROJECT_ROOT is set correctly for development.");
       }
-      const env = {
-        ...process.env,
-        ...opts.claudeEnvVars
-      };
       const child = spawn("node", [claudeCliPath, ...args], {
         stdio: ["inherit", "inherit", "inherit", "pipe"],
         signal: opts.abort,
@@ -1522,6 +1620,13 @@ async function claudeRemote(opts) {
       }
     }
   }
+  const direnvVars = await loadDirenvEnvironment(opts.path);
+  if (Object.keys(direnvVars).length > 0) {
+    logger.debug(`[claudeRemote] Loaded ${Object.keys(direnvVars).length} direnv environment variables`);
+  }
+  Object.entries(direnvVars).forEach(([key, value]) => {
+    process.env[key] = value;
+  });
   if (opts.claudeEnvVars) {
     Object.entries(opts.claudeEnvVars).forEach(([key, value]) => {
       process.env[key] = value;
@@ -1628,12 +1733,32 @@ Echo message: ${echoMessage}` : "");
       }
     }
   };
+  async function buildMessageContent(text, imageRefs) {
+    if (!imageRefs || imageRefs.length === 0 || !opts.resolveImageRefs) {
+      return text;
+    }
+    logger.debug(`[claudeRemote] Resolving ${imageRefs.length} image references`);
+    const resolvedImages = await opts.resolveImageRefs(imageRefs);
+    logger.debug(`[claudeRemote] Resolved ${resolvedImages.length} images`);
+    if (resolvedImages.length === 0) {
+      return text;
+    }
+    const content = [];
+    for (const img of resolvedImages) {
+      content.push(img);
+    }
+    if (text) {
+      content.push({ type: "text", text });
+    }
+    return content;
+  }
   let messages = new PushableAsyncIterable();
+  const initialContent = await buildMessageContent(initial.message, initial.mode.imageRefs);
   messages.push({
     type: "user",
     message: {
       role: "user",
-      content: initial.message
+      content: initialContent
     }
   });
   const response = query({
@@ -1674,7 +1799,8 @@ Echo message: ${echoMessage}` : "");
           return;
         }
         mode = next.mode;
-        messages.push({ type: "user", message: { role: "user", content: next.message } });
+        const nextContent = await buildMessageContent(next.message, next.mode.imageRefs);
+        messages.push({ type: "user", message: { role: "user", content: nextContent } });
       }
       if (message.type === "user") {
         const msg = message;
@@ -2780,6 +2906,18 @@ async function claudeRemoteLauncher(session) {
           isAborted: (toolCallId) => {
             return permissionHandler.isAborted(toolCallId);
           },
+          resolveImageRefs: async (imageRefs) => {
+            const resolved = [];
+            for (const imageRef of imageRefs) {
+              const image = await session.client.resolveImageRef(imageRef);
+              if (image) {
+                resolved.push(image);
+              } else {
+                logger.debug(`[remote]: Failed to resolve image ref: ${imageRef.blobId}`);
+              }
+            }
+            return resolved;
+          },
           nextMessage: async () => {
             if (pending) {
               let p = pending;
@@ -2885,6 +3023,16 @@ async function claudeRemoteLauncher(session) {
 
 async function loop(opts) {
   const logPath = logger.logFilePath;
+  const sessionEnv = await loadAndMergeEnvironment(
+    opts.path,
+    process.env,
+    opts.claudeEnvVars ?? {}
+  );
+  logger.debug(`[loop] Loaded session environment with ${Object.keys(sessionEnv).length} variables`);
+  opts.session.rpcHandlerManager.setSessionContext({
+    path: opts.path,
+    env: sessionEnv
+  });
   let session = new Session({
     api: opts.api,
     client: opts.session,
@@ -4808,6 +4956,27 @@ function registerKillSessionHandler(rpcHandlerManager, killThisHappy) {
   });
 }
 
+function extractTextFromContent(content) {
+  if (!Array.isArray(content)) {
+    if (content.type === "text") {
+      return content.text;
+    }
+    return "";
+  }
+  const textParts = [];
+  for (const block of content) {
+    if (block.type === "text") {
+      textParts.push(block.text);
+    }
+  }
+  return textParts.join("\n");
+}
+function extractImageRefs(content) {
+  if (!Array.isArray(content)) {
+    return [];
+  }
+  return content.filter((block) => block.type === "image_ref");
+}
 async function runClaude(credentials, options = {}) {
   const workingDirectory = process.cwd();
   const sessionTag = randomUUID();
@@ -4974,7 +5143,12 @@ async function runClaude(credentials, options = {}) {
     } else {
       logger.debug(`[loop] User message received with no disallowed tools override, using current: ${currentDisallowedTools ? currentDisallowedTools.join(", ") : "none"}`);
     }
-    const specialCommand = parseSpecialCommand(message.content.text);
+    const textContent = extractTextFromContent(message.content);
+    const imageRefs = extractImageRefs(message.content);
+    if (imageRefs.length > 0) {
+      logger.debug(`[loop] User message contains ${imageRefs.length} image(s)`);
+    }
+    const specialCommand = parseSpecialCommand(textContent);
     if (specialCommand.type === "compact") {
       logger.debug("[start] Detected /compact command");
       const enhancedMode2 = {
@@ -4984,9 +5158,10 @@ async function runClaude(credentials, options = {}) {
         customSystemPrompt: messageCustomSystemPrompt,
         appendSystemPrompt: messageAppendSystemPrompt,
         allowedTools: messageAllowedTools,
-        disallowedTools: messageDisallowedTools
+        disallowedTools: messageDisallowedTools,
+        imageRefs: imageRefs.length > 0 ? imageRefs : void 0
       };
-      messageQueue.pushIsolateAndClear(specialCommand.originalMessage || message.content.text, enhancedMode2);
+      messageQueue.pushIsolateAndClear(specialCommand.originalMessage || textContent, enhancedMode2);
       logger.debugLargeJson("[start] /compact command pushed to queue:", message);
       return;
     }
@@ -4999,9 +5174,10 @@ async function runClaude(credentials, options = {}) {
         customSystemPrompt: messageCustomSystemPrompt,
         appendSystemPrompt: messageAppendSystemPrompt,
         allowedTools: messageAllowedTools,
-        disallowedTools: messageDisallowedTools
+        disallowedTools: messageDisallowedTools,
+        imageRefs: imageRefs.length > 0 ? imageRefs : void 0
       };
-      messageQueue.pushIsolateAndClear(specialCommand.originalMessage || message.content.text, enhancedMode2);
+      messageQueue.pushIsolateAndClear(specialCommand.originalMessage || textContent, enhancedMode2);
       logger.debugLargeJson("[start] /compact command pushed to queue:", message);
       return;
     }
@@ -5012,9 +5188,10 @@ async function runClaude(credentials, options = {}) {
       customSystemPrompt: messageCustomSystemPrompt,
       appendSystemPrompt: messageAppendSystemPrompt,
       allowedTools: messageAllowedTools,
-      disallowedTools: messageDisallowedTools
+      disallowedTools: messageDisallowedTools,
+      imageRefs: imageRefs.length > 0 ? imageRefs : void 0
     };
-    messageQueue.push(message.content.text, enhancedMode);
+    messageQueue.push(textContent, enhancedMode);
     logger.debugLargeJson("User message pushed to queue:", message);
   });
   const cleanup = async () => {
@@ -6193,7 +6370,7 @@ async function handleConnectVendor(vendor, displayName) {
     return;
   } else if (subcommand === "codex") {
     try {
-      const { runCodex } = await import('./runCodex-B5ZlUUec.mjs');
+      const { runCodex } = await import('./runCodex-Cxhf8ktE.mjs');
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
@@ -6238,7 +6415,7 @@ async function handleConnectVendor(vendor, displayName) {
   } else if (subcommand === "list") {
     try {
       const { credentials } = await authAndSetupMachineIfNeeded();
-      const { listSessions } = await import('./list-D_NjiLPx.mjs');
+      const { listSessions } = await import('./list-B0EZS1nk.mjs');
       let sessionId;
       let titleFilter;
       let recentMsgs;
@@ -6340,7 +6517,7 @@ Examples:
         process.exit(1);
       }
       const { credentials } = await authAndSetupMachineIfNeeded();
-      const { promptSession } = await import('./prompt-CJh1Mo2A.mjs');
+      const { promptSession } = await import('./prompt-COmkBtjd.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-y8CVImEp.cjs');
-require('./types-CllU28mx.cjs');
+require('./index-B8KwpPnt.cjs');
+require('./types-0ILrOpLt.cjs');
 require('zod');
 require('node:child_process');
 require('node:os');
@@ -10,6 +10,10 @@ require('node:crypto');
 require('node:path');
 require('node:readline');
 require('node:fs');
+require('child_process');
+require('util');
+require('fs');
+require('path');
 require('node:fs/promises');
 require('fs/promises');
 require('ink');
@@ -20,10 +24,7 @@ require('node:events');
 require('socket.io-client');
 require('tweetnacl');
 require('expo-server-sdk');
-require('path');
 require('crypto');
-require('child_process');
-require('fs');
 require('ps-list');
 require('cross-spawn');
 require('os');
@@ -37,6 +38,5 @@ require('node:http');
 require('@modelcontextprotocol/sdk/server/streamableHttp.js');
 require('@stablelib/hex');
 require('http');
-require('util');
 require('url');
 

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import 'chalk';
-import './index-DNeoLdzx.mjs';
-import './types-D4_aCy-H.mjs';
+import './index-BfGA--2C.mjs';
+import './types-BmcSXhbq.mjs';
 import 'zod';
 import 'node:child_process';
 import 'node:os';
@@ -8,6 +8,10 @@ import 'node:crypto';
 import 'node:path';
 import 'node:readline';
 import 'node:fs';
+import 'child_process';
+import 'util';
+import 'fs';
+import 'path';
 import 'node:fs/promises';
 import 'fs/promises';
 import 'ink';
@@ -18,10 +22,7 @@ import 'node:events';
 import 'socket.io-client';
 import 'tweetnacl';
 import 'expo-server-sdk';
-import 'path';
 import 'crypto';
-import 'child_process';
-import 'fs';
 import 'ps-list';
 import 'cross-spawn';
 import 'os';
@@ -35,5 +36,4 @@ import 'node:http';
 import '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import '@stablelib/hex';
 import 'http';
-import 'util';
 import 'url';

package/dist/lib.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var types = require('./types-CllU28mx.cjs');
+var types = require('./types-0ILrOpLt.cjs');
 require('axios');
 require('chalk');
 require('fs');

package/dist/lib.d.cts

@@ -291,6 +291,16 @@ type RawJSONLines = z.infer<typeof RawJSONLinesSchema>;
 /**
  * Common RPC types and interfaces for both session and machine clients
  */
+/**
+ * Session context for RPC handlers
+ * Contains environment and path information for the current session
+ */
+interface RpcSessionContext {
+    /** Working directory path for the session */
+    path: string;
+    /** Environment variables (includes direnv if available) */
+    env: Record<string, string>;
+}
 /**
  * Generic RPC handler function type
  * @template TRequest - The request data type
@@ -326,7 +336,19 @@ declare class RpcHandlerManager {
     private readonly encryptionVariant;
     private readonly logger;
     private socket;
+    private sessionContext;
     constructor(config: RpcHandlerConfig);
+    /**
+     * 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: RpcSessionContext): void;
+    /**
+     * Get the current session context
+     * @returns The session context or null if not set
+     */
+    getSessionContext(): RpcSessionContext | null;
     /**
      * Register an RPC handler for a specific method
      * @param method - The method name (without prefix)
@@ -423,6 +445,30 @@ declare class ApiSessionClient extends EventEmitter {
      */
     flush(): Promise<void>;
     close(): Promise<void>;
+    /**
+     * 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
+     */
+    downloadBlob(blobId: string): Promise<{
+        data: Uint8Array;
+        mimeType: string;
+        size: number;
+    } | 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
+     */
+    resolveImageRef(imageRef: ImageRefContent): Promise<{
+        type: 'image';
+        source: {
+            type: 'base64';
+            media_type: string;
+            data: string;
+        };
+    } | null>;
 }
 
 type PermissionMode = 'default' | 'acceptEdits' | 'bypassPermissions' | 'plan';
@@ -505,9 +551,32 @@ type Machine = {
     daemonState: DaemonState | null;
     daemonStateVersion: number;
 };
+/**
+ * Image reference content block for user messages (E2E encrypted images)
+ */
+declare const ImageRefContentSchema: z.ZodObject<{
+    type: z.ZodLiteral<"image_ref">;
+    blobId: z.ZodString;
+    mimeType: z.ZodEnum<["image/jpeg", "image/png", "image/gif", "image/webp"]>;
+    width: z.ZodOptional<z.ZodNumber>;
+    height: z.ZodOptional<z.ZodNumber>;
+}, "strip", z.ZodTypeAny, {
+    type: "image_ref";
+    blobId: string;
+    mimeType: "image/jpeg" | "image/png" | "image/gif" | "image/webp";
+    width?: number | undefined;
+    height?: number | undefined;
+}, {
+    type: "image_ref";
+    blobId: string;
+    mimeType: "image/jpeg" | "image/png" | "image/gif" | "image/webp";
+    width?: number | undefined;
+    height?: number | undefined;
+}>;
+type ImageRefContent = z.infer<typeof ImageRefContentSchema>;
 declare const UserMessageSchema: z.ZodObject<{
     role: z.ZodLiteral<"user">;
-    content: z.ZodObject<{
+    content: z.ZodUnion<[z.ZodObject<{
         type: z.ZodLiteral<"text">;
         text: z.ZodString;
     }, "strip", z.ZodTypeAny, {
@@ -516,7 +585,34 @@ declare const UserMessageSchema: z.ZodObject<{
     }, {
         type: "text";
         text: string;
-    }>;
+    }>, z.ZodArray<z.ZodUnion<[z.ZodObject<{
+        type: z.ZodLiteral<"text">;
+        text: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        type: "text";
+        text: string;
+    }, {
+        type: "text";
+        text: string;
+    }>, z.ZodObject<{
+        type: z.ZodLiteral<"image_ref">;
+        blobId: z.ZodString;
+        mimeType: z.ZodEnum<["image/jpeg", "image/png", "image/gif", "image/webp"]>;
+        width: z.ZodOptional<z.ZodNumber>;
+        height: z.ZodOptional<z.ZodNumber>;
+    }, "strip", z.ZodTypeAny, {
+        type: "image_ref";
+        blobId: string;
+        mimeType: "image/jpeg" | "image/png" | "image/gif" | "image/webp";
+        width?: number | undefined;
+        height?: number | undefined;
+    }, {
+        type: "image_ref";
+        blobId: string;
+        mimeType: "image/jpeg" | "image/png" | "image/gif" | "image/webp";
+        width?: number | undefined;
+        height?: number | undefined;
+    }>]>, "many">]>;
     localKey: z.ZodOptional<z.ZodString>;
     meta: z.ZodOptional<z.ZodObject<{
         sentFrom: z.ZodOptional<z.ZodString>;
@@ -550,7 +646,16 @@ declare const UserMessageSchema: z.ZodObject<{
     content: {
         type: "text";
         text: string;
-    };
+    } | ({
+        type: "text";
+        text: string;
+    } | {
+        type: "image_ref";
+        blobId: string;
+        mimeType: "image/jpeg" | "image/png" | "image/gif" | "image/webp";
+        width?: number | undefined;
+        height?: number | undefined;
+    })[];
     role: "user";
     localKey?: string | undefined;
     meta?: {
@@ -567,7 +672,16 @@ declare const UserMessageSchema: z.ZodObject<{
     content: {
         type: "text";
         text: string;
-    };
+    } | ({
+        type: "text";
+        text: string;
+    } | {
+        type: "image_ref";
+        blobId: string;
+        mimeType: "image/jpeg" | "image/png" | "image/gif" | "image/webp";
+        width?: number | undefined;
+        height?: number | undefined;
+    })[];
     role: "user";
     localKey?: string | undefined;
     meta?: {