@zhigang1992/happy-cli 0.12.3 → 0.12.5

package/dist/{index-y8CVImEp.cjs → index-B8KwpPnt.cjs}

@@ -3,13 +3,17 @@
 var chalk = require('chalk');
 var os = require('node:os');
 var node_crypto = require('node:crypto');
-var types = require('./types-CllU28mx.cjs');
+var types = require('./types-0ILrOpLt.cjs');
 var node_child_process = require('node:child_process');
 var node_path = require('node:path');
 var node_readline = require('node:readline');
 var fs = require('node:fs');
+var child_process = require('child_process');
+var util = require('util');
+var fs$1 = require('fs');
+var path = require('path');
 var promises = require('node:fs/promises');
-var fs$1 = require('fs/promises');
+var fs$2 = require('fs/promises');
 var ink = require('ink');
 var React = require('react');
 var node_url = require('node:url');
@@ -18,10 +22,7 @@ require('node:events');
 require('socket.io-client');
 var tweetnacl = require('tweetnacl');
 require('expo-server-sdk');
-var path = require('path');
 var crypto = require('crypto');
-var child_process = require('child_process');
-var fs$2 = require('fs');
 var psList = require('ps-list');
 var spawn = require('cross-spawn');
 var os$1 = require('os');
@@ -36,7 +37,6 @@ var node_http = require('node:http');
 var streamableHttp_js = require('@modelcontextprotocol/sdk/server/streamableHttp.js');
 var hex = require('@stablelib/hex');
 var http = require('http');
-var util = require('util');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 function _interopNamespaceDefault(e) {
@@ -241,6 +241,99 @@ const systemPrompt = (() => {
   }
 })();
 
+const execAsync$1 = util.promisify(child_process.exec);
+let direnvAvailable = null;
+async function isDirenvAvailable() {
+  if (direnvAvailable !== null) {
+    return direnvAvailable;
+  }
+  try {
+    await execAsync$1("direnv version", { timeout: 5e3 });
+    direnvAvailable = true;
+    types.logger.debug("[direnv] direnv is available");
+  } catch {
+    direnvAvailable = false;
+    types.logger.debug("[direnv] direnv is not available");
+  }
+  return direnvAvailable;
+}
+function findEnvrcDirectory(startDir) {
+  let dir = startDir;
+  const root = "/";
+  while (dir !== root) {
+    const envrcPath = path.join(dir, ".envrc");
+    if (fs$1.existsSync(envrcPath)) {
+      types.logger.debug(`[direnv] Found .envrc at: ${envrcPath}`);
+      return dir;
+    }
+    const parent = path.dirname(dir);
+    if (parent === dir) {
+      break;
+    }
+    dir = parent;
+  }
+  types.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 {
+    types.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) {
+      types.logger.debug(`[direnv] stderr: ${stderr}`);
+    }
+    const trimmed = stdout.trim();
+    if (!trimmed) {
+      types.logger.debug("[direnv] No environment changes from direnv");
+      return {};
+    }
+    const direnvVars = JSON.parse(trimmed);
+    const varCount = Object.keys(direnvVars).length;
+    types.logger.debug(`[direnv] Loaded ${varCount} environment variables`);
+    return direnvVars;
+  } catch (error) {
+    if (error instanceof Error) {
+      types.logger.debug(`[direnv] Failed to load environment: ${error.message}`);
+      if (error.message.includes("is blocked")) {
+        types.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 = node_path.resolve(node_path.join(types.projectPath(), "scripts", "claude_local_launcher.cjs"));
 async function claudeLocal(opts) {
   const projectDir = getProjectPath(opts.path);
@@ -282,6 +375,15 @@ async function claudeLocal(opts) {
     }
   };
   try {
+    const direnvVars = await loadDirenvEnvironment(opts.path);
+    if (Object.keys(direnvVars).length > 0) {
+      types.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 = [];
@@ -301,10 +403,6 @@ async function claudeLocal(opts) {
       if (!claudeCliPath || !fs.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 = node_child_process.spawn("node", [claudeCliPath, ...args], {
         stdio: ["inherit", "inherit", "inherit", "pipe"],
         signal: opts.abort,
@@ -485,7 +583,7 @@ function startFileWatcher(file, onFileChange) {
     while (true) {
       try {
         types.logger.debug(`[FILE_WATCHER] Starting watcher for ${file}`);
-        const watcher = fs$1.watch(file, { persistent: true, signal: abortController.signal });
+        const watcher = fs$2.watch(file, { persistent: true, signal: abortController.signal });
         for await (const event of watcher) {
           if (abortController.signal.aborted) {
             return;
@@ -984,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-y8CVImEp.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-B8KwpPnt.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");
@@ -1511,7 +1609,7 @@ async function awaitFileExist(file, timeout = 1e4) {
   const startTime = Date.now();
   while (Date.now() - startTime < timeout) {
     try {
-      await fs$1.access(file);
+      await fs$2.access(file);
       return true;
     } catch (e) {
       await types.delay(1e3);
@@ -1545,6 +1643,13 @@ async function claudeRemote(opts) {
       }
     }
   }
+  const direnvVars = await loadDirenvEnvironment(opts.path);
+  if (Object.keys(direnvVars).length > 0) {
+    types.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;
@@ -1651,12 +1756,32 @@ Echo message: ${echoMessage}` : "");
       }
     }
   };
+  async function buildMessageContent(text, imageRefs) {
+    if (!imageRefs || imageRefs.length === 0 || !opts.resolveImageRefs) {
+      return text;
+    }
+    types.logger.debug(`[claudeRemote] Resolving ${imageRefs.length} image references`);
+    const resolvedImages = await opts.resolveImageRefs(imageRefs);
+    types.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({
@@ -1697,7 +1822,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;
@@ -2803,6 +2929,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 {
+                types.logger.debug(`[remote]: Failed to resolve image ref: ${imageRef.blobId}`);
+              }
+            }
+            return resolved;
+          },
           nextMessage: async () => {
             if (pending) {
               let p = pending;
@@ -2908,6 +3046,16 @@ async function claudeRemoteLauncher(session) {
 
 async function loop(opts) {
   const logPath = types.logger.logFilePath;
+  const sessionEnv = await loadAndMergeEnvironment(
+    opts.path,
+    process.env,
+    opts.claudeEnvVars ?? {}
+  );
+  types.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,
@@ -3504,7 +3652,7 @@ async function isDaemonRunningCurrentlyInstalledHappyVersion() {
   }
   try {
     const packageJsonPath = path.join(types.projectPath(), "package.json");
-    const packageJson = JSON.parse(fs$2.readFileSync(packageJsonPath, "utf-8"));
+    const packageJson = JSON.parse(fs$1.readFileSync(packageJsonPath, "utf-8"));
     const currentCliVersion = packageJson.version;
     types.logger.debug(`[DAEMON CONTROL] Current CLI version: ${currentCliVersion}, Daemon started with version: ${state.startedWithCliVersion}`);
     return currentCliVersion === state.startedWithCliVersion;
@@ -4451,7 +4599,7 @@ async function startDaemon() {
       const { directory, sessionId, machineId: machineId2, approvedNewDirectoryCreation = true } = options;
       let directoryCreated = false;
       try {
-        await fs$1.access(directory);
+        await fs$2.access(directory);
         types.logger.debug(`[DAEMON RUN] Directory exists: ${directory}`);
       } catch (error) {
         types.logger.debug(`[DAEMON RUN] Directory doesn't exist, creating: ${directory}`);
@@ -4463,7 +4611,7 @@ async function startDaemon() {
           };
         }
         try {
-          await fs$1.mkdir(directory, { recursive: true });
+          await fs$2.mkdir(directory, { recursive: true });
           types.logger.debug(`[DAEMON RUN] Successfully created directory: ${directory}`);
           directoryCreated = true;
         } catch (mkdirError) {
@@ -4491,7 +4639,7 @@ async function startDaemon() {
         if (options.token) {
           if (options.agent === "codex") {
             const codexHomeDir = tmp__namespace.dirSync();
-            fs$1.writeFile(path.join(codexHomeDir.name, "auth.json"), options.token);
+            fs$2.writeFile(path.join(codexHomeDir.name, "auth.json"), options.token);
             extraEnv = {
               CODEX_HOME: codexHomeDir.name
             };
@@ -4668,7 +4816,7 @@ async function startDaemon() {
           pidToTrackedSession.delete(pid);
         }
       }
-      const projectVersion = JSON.parse(fs$2.readFileSync(path.join(types.projectPath(), "package.json"), "utf-8")).version;
+      const projectVersion = JSON.parse(fs$1.readFileSync(path.join(types.projectPath(), "package.json"), "utf-8")).version;
       if (projectVersion !== types.configuration.currentCliVersion) {
         types.logger.debug("[DAEMON RUN] Daemon is outdated, triggering self-restart with latest version, clearing heartbeat interval");
         clearInterval(restartOnStaleVersionAndHeartbeat);
@@ -4831,6 +4979,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 = node_crypto.randomUUID();
@@ -4997,7 +5166,12 @@ async function runClaude(credentials, options = {}) {
     } else {
       types.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) {
+      types.logger.debug(`[loop] User message contains ${imageRefs.length} image(s)`);
+    }
+    const specialCommand = parseSpecialCommand(textContent);
     if (specialCommand.type === "compact") {
       types.logger.debug("[start] Detected /compact command");
       const enhancedMode2 = {
@@ -5007,9 +5181,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);
       types.logger.debugLargeJson("[start] /compact command pushed to queue:", message);
       return;
     }
@@ -5022,9 +5197,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);
       types.logger.debugLargeJson("[start] /compact command pushed to queue:", message);
       return;
     }
@@ -5035,9 +5211,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);
     types.logger.debugLargeJson("User message pushed to queue:", message);
   });
   const cleanup = async () => {
@@ -5118,7 +5295,7 @@ const PLIST_LABEL$1 = "com.happy-cli.daemon";
 const PLIST_FILE$1 = `/Library/LaunchDaemons/${PLIST_LABEL$1}.plist`;
 async function install$1() {
   try {
-    if (fs$2.existsSync(PLIST_FILE$1)) {
+    if (fs$1.existsSync(PLIST_FILE$1)) {
       types.logger.info("Daemon plist already exists. Uninstalling first...");
       child_process.execSync(`launchctl unload ${PLIST_FILE$1}`, { stdio: "inherit" });
     }
@@ -5162,8 +5339,8 @@ async function install$1() {
             </dict>
             </plist>
         `);
-    fs$2.writeFileSync(PLIST_FILE$1, plistContent);
-    fs$2.chmodSync(PLIST_FILE$1, 420);
+    fs$1.writeFileSync(PLIST_FILE$1, plistContent);
+    fs$1.chmodSync(PLIST_FILE$1, 420);
     types.logger.info(`Created daemon plist at ${PLIST_FILE$1}`);
     child_process.execSync(`launchctl load ${PLIST_FILE$1}`, { stdio: "inherit" });
     types.logger.info("Daemon installed and started successfully");
@@ -5189,7 +5366,7 @@ const PLIST_LABEL = "com.happy-cli.daemon";
 const PLIST_FILE = `/Library/LaunchDaemons/${PLIST_LABEL}.plist`;
 async function uninstall$1() {
   try {
-    if (!fs$2.existsSync(PLIST_FILE)) {
+    if (!fs$1.existsSync(PLIST_FILE)) {
       types.logger.info("Daemon plist not found. Nothing to uninstall.");
       return;
     }
@@ -5199,7 +5376,7 @@ async function uninstall$1() {
     } catch (error) {
       types.logger.info("Failed to unload daemon (it might not be running)");
     }
-    fs$2.unlinkSync(PLIST_FILE);
+    fs$1.unlinkSync(PLIST_FILE);
     types.logger.info(`Removed daemon plist from ${PLIST_FILE}`);
     types.logger.info("Daemon uninstalled successfully");
   } catch (error) {
@@ -6216,7 +6393,7 @@ async function handleConnectVendor(vendor, displayName) {
     return;
   } else if (subcommand === "codex") {
     try {
-      const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-DErgypij.cjs'); });
+      const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-CLxMptoC.cjs'); });
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
@@ -6261,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-DiamEbqL.cjs'); });
+      const { listSessions } = await Promise.resolve().then(function () { return require('./list-BmyKI4UO.cjs'); });
       let sessionId;
       let titleFilter;
       let recentMsgs;
@@ -6363,7 +6540,7 @@ Examples:
         process.exit(1);
       }
       const { credentials } = await authAndSetupMachineIfNeeded();
-      const { promptSession } = await Promise.resolve().then(function () { return require('./prompt-Cu47wZlI.cjs'); });
+      const { promptSession } = await Promise.resolve().then(function () { return require('./prompt-SOUeW7vB.cjs'); });
       await promptSession(credentials, sessionId, promptText, timeoutMinutes ?? void 0);
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");