@zhigang1992/happy-cli 0.12.13 → 0.12.15

package/dist/{index-VlluCzOw.cjs → index-BXhnIvhV.cjs}

@@ -3,7 +3,7 @@
 var chalk = require('chalk');
 var os = require('node:os');
 var node_crypto = require('node:crypto');
-var types = require('./types-DwjUGi0J.cjs');
+var types = require('./types-CYn1BLoj.cjs');
 var node_child_process = require('node:child_process');
 var node_path = require('node:path');
 var node_readline = require('node:readline');
@@ -782,20 +782,27 @@ async function claudeLocalLauncher(session) {
   };
   session.addSessionFoundCallback(scannerSessionCallback);
   let exitReason = null;
-  const processAbortController = new AbortController();
+  let abortRequested = false;
+  let processAbortController = new AbortController();
   let exutFuture = new Future();
   try {
+    let getAbortController2 = function() {
+      return processAbortController;
+    }, getExitFuture2 = function() {
+      return exutFuture;
+    };
+    var getAbortController = getAbortController2, getExitFuture = getExitFuture2;
     async function abort() {
-      if (!processAbortController.signal.aborted) {
-        processAbortController.abort();
+      const controller = getAbortController2();
+      const exitFuture = getExitFuture2();
+      if (!controller.signal.aborted) {
+        controller.abort();
       }
-      await exutFuture.promise;
+      await exitFuture.promise;
     }
     async function doAbort() {
       types.logger.debug("[local]: doAbort");
-      if (!exitReason) {
-        exitReason = "switch";
-      }
+      abortRequested = true;
       session.queue.reset();
       await abort();
     }
@@ -837,6 +844,13 @@ async function claudeLocalLauncher(session) {
           hookSettingsPath: session.hookSettingsPath
         });
         session.consumeOneTimeFlags();
+        if (abortRequested) {
+          types.logger.debug("[local]: Aborting current operation, continuing local mode");
+          abortRequested = false;
+          processAbortController = new AbortController();
+          exutFuture = new Future();
+          continue;
+        }
         if (!exitReason) {
           exitReason = "exit";
           break;
@@ -844,6 +858,13 @@ async function claudeLocalLauncher(session) {
       } catch (e) {
         const errorMessage = e instanceof Error ? e.message : String(e);
         types.logger.debug("[local]: launch error", e);
+        if (abortRequested) {
+          types.logger.debug("[local]: Aborting after error, continuing local mode");
+          abortRequested = false;
+          processAbortController = new AbortController();
+          exutFuture = new Future();
+          continue;
+        }
         const reason = exitReason;
         if (reason === "switch") {
           session.client.sendSessionEvent({ type: "message", message: `Error during mode switch: ${errorMessage}` });
@@ -1163,7 +1184,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-VlluCzOw.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-BXhnIvhV.cjs', document.baseURI).href)));
 const __dirname$1 = node_path.join(__filename$1, "..");
 function getGlobalClaudeVersion() {
   try {
@@ -1479,6 +1500,7 @@ function query(config) {
       fallbackModel,
       strictMcpConfig,
       canCallTool,
+      settingsPath,
       onStderr
     } = {}
   } = config;
@@ -1505,6 +1527,7 @@ function query(config) {
   }
   if (strictMcpConfig) args.push("--strict-mcp-config");
   if (permissionMode) args.push("--permission-mode", permissionMode);
+  if (settingsPath) args.push("--settings", settingsPath);
   if (fallbackModel) {
     if (model && fallbackModel === model) {
       throw new Error("Fallback model cannot be the same as the main model. Please specify a different model for fallbackModel option.");
@@ -2027,6 +2050,7 @@ Echo message: ${echoMessage}` : "");
     pathToClaudeCodeExecutable: (() => {
       return node_path.resolve(node_path.join(types.projectPath(), "scripts", "claude_remote_launcher.cjs"));
     })(),
+    settingsPath: opts.hookSettingsPath,
     onStderr: opts.onStderr
   };
   let thinking = false;
@@ -2062,6 +2086,8 @@ Echo message: ${echoMessage}` : "");
   const initialContent = await buildMessageContent(initial.message, initial.mode.imageRefs);
   messages.push({
     type: "user",
+    uuid: node_crypto.randomUUID(),
+    // UUID is required for Claude CLI streaming mode
     message: {
       role: "user",
       content: initialContent
@@ -2106,7 +2132,12 @@ Echo message: ${echoMessage}` : "");
         }
         mode = next.mode;
         const nextContent = await buildMessageContent(next.message, next.mode.imageRefs);
-        messages.push({ type: "user", message: { role: "user", content: nextContent } });
+        messages.push({
+          type: "user",
+          uuid: node_crypto.randomUUID(),
+          // UUID is required for Claude CLI streaming mode
+          message: { role: "user", content: nextContent }
+        });
       }
       if (message.type === "user") {
         const msg = message;
@@ -3027,6 +3058,7 @@ async function claudeRemoteLauncher(session) {
   let exitReason = null;
   let abortController = null;
   let abortFuture = null;
+  let abortRequested = false;
   async function abort() {
     if (abortController && !abortController.signal.aborted) {
       abortController.abort();
@@ -3035,6 +3067,7 @@ async function claudeRemoteLauncher(session) {
   }
   async function doAbort() {
     types.logger.debug("[remote]: doAbort");
+    abortRequested = true;
     await abort();
   }
   async function doSwitch() {
@@ -3220,6 +3253,7 @@ async function claudeRemoteLauncher(session) {
           path: session.path,
           allowedTools: session.allowedTools ?? [],
           mcpServers: session.mcpServers,
+          hookSettingsPath: session.hookSettingsPath,
           canCallTool: permissionHandler.handleToolCall,
           isAborted: (toolCallId) => {
             return permissionHandler.isAborted(toolCallId);
@@ -3299,16 +3333,30 @@ async function claudeRemoteLauncher(session) {
           signal: abortController.signal
         });
         session.consumeOneTimeFlags();
+        if (abortRequested && abortController.signal.aborted) {
+          types.logger.debug("[remote]: Operation aborted by user, continuing remote mode");
+          session.client.sendSessionEvent({ type: "message", message: "Aborted" });
+          abortRequested = false;
+          continue;
+        }
         if (!exitReason && abortController.signal.aborted) {
           session.client.sendSessionEvent({ type: "message", message: "Aborted by user" });
         }
       } catch (e) {
         const errorMessage = e instanceof Error ? e.message : String(e);
         types.logger.debug("[remote]: launch error", e);
+        if (abortRequested) {
+          types.logger.debug("[remote]: Aborting after error, continuing remote mode");
+          session.client.sendSessionEvent({ type: "message", message: "Aborted" });
+          abortRequested = false;
+          continue;
+        }
         if (exitReason === "switch") {
           session.client.sendSessionEvent({ type: "message", message: `Error during mode switch: ${errorMessage}` });
+          break;
         } else if (exitReason === "exit") {
           session.client.sendSessionEvent({ type: "message", message: `Error during exit: ${errorMessage}` });
+          break;
         } else {
           session.client.sendSessionEvent({ type: "message", message: `Process error: ${errorMessage}` });
           continue;
@@ -3874,6 +3922,139 @@ function extractSDKMetadataAsync(onComplete) {
   });
 }
 
+function parseFrontmatter(content) {
+  const trimmed = content.trim();
+  if (!trimmed.startsWith("---")) {
+    return { frontmatter: null, body: content };
+  }
+  const endIndex = trimmed.indexOf("---", 3);
+  if (endIndex === -1) {
+    return { frontmatter: null, body: content };
+  }
+  const frontmatterStr = trimmed.substring(3, endIndex).trim();
+  const body = trimmed.substring(endIndex + 3).trim();
+  const frontmatter = {};
+  const lines = frontmatterStr.split("\n");
+  for (const line of lines) {
+    const colonIndex = line.indexOf(":");
+    if (colonIndex === -1) continue;
+    const key = line.substring(0, colonIndex).trim();
+    let value = line.substring(colonIndex + 1).trim();
+    if (key === "allowed-tools" && value) {
+      frontmatter["allowed-tools"] = value.split(",").map((s) => s.trim());
+    } else if (key === "description") {
+      frontmatter.description = value;
+    } else if (key === "argument-hint") {
+      frontmatter["argument-hint"] = value;
+    } else if (key === "model") {
+      frontmatter.model = value;
+    }
+  }
+  return { frontmatter, body };
+}
+function extractDescriptionFromContent(content) {
+  const lines = content.split("\n");
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (trimmed && !trimmed.startsWith("#") && !trimmed.startsWith("!")) {
+      return trimmed.length > 100 ? trimmed.substring(0, 100) + "..." : trimmed;
+    }
+  }
+  return void 0;
+}
+function findMarkdownFiles(dir, baseDir = dir) {
+  const results = [];
+  if (!fs.existsSync(dir)) {
+    return results;
+  }
+  try {
+    const entries = fs.readdirSync(dir);
+    for (const entry of entries) {
+      const fullPath = node_path.join(dir, entry);
+      const stat = fs.statSync(fullPath);
+      if (stat.isDirectory()) {
+        const subResults = findMarkdownFiles(fullPath, baseDir);
+        results.push(...subResults);
+      } else if (stat.isFile() && node_path.extname(entry).toLowerCase() === ".md") {
+        const relativePath = fullPath.substring(baseDir.length + 1);
+        const namespace = relativePath.includes("/") ? relativePath.substring(0, relativePath.lastIndexOf("/")) : void 0;
+        results.push({ filePath: fullPath, namespace });
+      }
+    }
+  } catch (error) {
+    types.logger.debug("[customCommands] Error reading directory:", dir, error);
+  }
+  return results;
+}
+function parseCommandFile(filePath, namespace, scope) {
+  try {
+    const content = fs.readFileSync(filePath, "utf-8");
+    const { frontmatter, body } = parseFrontmatter(content);
+    const name = node_path.basename(filePath, ".md");
+    const description = frontmatter?.description || extractDescriptionFromContent(body);
+    let allowedTools;
+    if (frontmatter?.["allowed-tools"]) {
+      const at = frontmatter["allowed-tools"];
+      allowedTools = Array.isArray(at) ? at : [at];
+    }
+    return {
+      name,
+      description,
+      argumentHint: frontmatter?.["argument-hint"],
+      allowedTools,
+      model: frontmatter?.model,
+      scope,
+      namespace,
+      filePath,
+      content: body
+    };
+  } catch (error) {
+    types.logger.debug("[customCommands] Error parsing command file:", filePath, error);
+    return null;
+  }
+}
+function discoverCustomCommands(projectDir) {
+  const commands = [];
+  const projectCommandsDir = node_path.join(projectDir, ".claude", "commands");
+  if (fs.existsSync(projectCommandsDir)) {
+    types.logger.debug("[customCommands] Scanning project commands:", projectCommandsDir);
+    const files = findMarkdownFiles(projectCommandsDir);
+    for (const { filePath, namespace } of files) {
+      const command = parseCommandFile(filePath, namespace, "project");
+      if (command) {
+        commands.push(command);
+      }
+    }
+  }
+  const personalCommandsDir = node_path.join(os.homedir(), ".claude", "commands");
+  if (fs.existsSync(personalCommandsDir)) {
+    types.logger.debug("[customCommands] Scanning personal commands:", personalCommandsDir);
+    const files = findMarkdownFiles(personalCommandsDir);
+    for (const { filePath, namespace } of files) {
+      const command = parseCommandFile(filePath, namespace, "personal");
+      if (command) {
+        const existingIndex = commands.findIndex((c) => c.name === command.name);
+        if (existingIndex === -1) {
+          commands.push(command);
+        } else {
+          types.logger.debug(`[customCommands] Skipping personal command "${command.name}" - project command takes precedence`);
+        }
+      }
+    }
+  }
+  types.logger.debug(`[customCommands] Discovered ${commands.length} custom commands`);
+  return commands;
+}
+function commandsToMetadata(commands) {
+  return commands.map((cmd) => ({
+    name: cmd.name,
+    description: cmd.description,
+    argumentHint: cmd.argumentHint,
+    scope: cmd.scope,
+    namespace: cmd.namespace
+  }));
+}
+
 async function daemonPost(path, body) {
   const state = await types.readDaemonState();
   if (!state?.httpPort) {
@@ -4964,7 +5145,9 @@ async function startDaemon() {
           "--happy-starting-mode",
           "remote",
           "--started-by",
-          "daemon"
+          "daemon",
+          // Add --resume flag if resuming from a previous Claude session
+          ...options.resumeClaudeSessionId ? ["--resume", options.resumeClaudeSessionId] : []
         ];
         const happyProcess = spawnHappyCLI(args, {
           cwd: directory,
@@ -5469,6 +5652,20 @@ async function runClaude(credentials, options = {}) {
   } catch (error) {
     types.logger.debug("[START] Failed to report to daemon (may not be running):", error);
   }
+  const customCommands = discoverCustomCommands(workingDirectory);
+  const customCommandsMetadata = commandsToMetadata(customCommands);
+  types.logger.debug(`[start] Discovered ${customCommands.length} custom commands`);
+  if (customCommandsMetadata.length > 0) {
+    try {
+      api.sessionSyncClient(response).updateMetadata((currentMetadata) => ({
+        ...currentMetadata,
+        customCommands: customCommandsMetadata
+      }));
+      types.logger.debug("[start] Session metadata updated with custom commands");
+    } catch (error) {
+      types.logger.debug("[start] Failed to update session metadata with custom commands:", error);
+    }
+  }
   extractSDKMetadataAsync(async (sdkMetadata) => {
     types.logger.debug("[start] SDK metadata extracted, updating session:", sdkMetadata);
     try {
@@ -6833,7 +7030,7 @@ async function handleConnectVendor(vendor, displayName) {
     return;
   } else if (subcommand === "codex") {
     try {
-      const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-3jsfzjVM.cjs'); });
+      const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-CDA2a_3g.cjs'); });
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
@@ -6878,7 +7075,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-DXxyuwT9.cjs'); });
+      const { listSessions } = await Promise.resolve().then(function () { return require('./list-DnyoGVs0.cjs'); });
       let sessionId;
       let titleFilter;
       let recentMsgs;
@@ -6980,7 +7177,7 @@ Examples:
         process.exit(1);
       }
       const { credentials } = await authAndSetupMachineIfNeeded();
-      const { promptSession } = await Promise.resolve().then(function () { return require('./prompt-LEVV0Hst.cjs'); });
+      const { promptSession } = await Promise.resolve().then(function () { return require('./prompt-1J3xTRvg.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-Bzl-ixRP.mjs → index-C1S8W6hS.mjs}

@@ -1,9 +1,9 @@
 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-C1SMg54t.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-Do0vU1JP.mjs';
 import { spawn, execSync, exec as exec$1, execFileSync } from 'node:child_process';
-import { resolve, join } from 'node:path';
+import { resolve, join, extname, basename as basename$1 } from 'node:path';
 import { createInterface } from 'node:readline';
 import { existsSync, readFileSync, mkdirSync, readdirSync, statSync, writeFileSync, unlinkSync, rmSync } from 'node:fs';
 import { exec, spawn as spawn$1, execSync as execSync$1 } from 'child_process';
@@ -759,20 +759,27 @@ async function claudeLocalLauncher(session) {
   };
   session.addSessionFoundCallback(scannerSessionCallback);
   let exitReason = null;
-  const processAbortController = new AbortController();
+  let abortRequested = false;
+  let processAbortController = new AbortController();
   let exutFuture = new Future();
   try {
+    let getAbortController2 = function() {
+      return processAbortController;
+    }, getExitFuture2 = function() {
+      return exutFuture;
+    };
+    var getAbortController = getAbortController2, getExitFuture = getExitFuture2;
     async function abort() {
-      if (!processAbortController.signal.aborted) {
-        processAbortController.abort();
+      const controller = getAbortController2();
+      const exitFuture = getExitFuture2();
+      if (!controller.signal.aborted) {
+        controller.abort();
       }
-      await exutFuture.promise;
+      await exitFuture.promise;
     }
     async function doAbort() {
       logger.debug("[local]: doAbort");
-      if (!exitReason) {
-        exitReason = "switch";
-      }
+      abortRequested = true;
       session.queue.reset();
       await abort();
     }
@@ -814,6 +821,13 @@ async function claudeLocalLauncher(session) {
           hookSettingsPath: session.hookSettingsPath
         });
         session.consumeOneTimeFlags();
+        if (abortRequested) {
+          logger.debug("[local]: Aborting current operation, continuing local mode");
+          abortRequested = false;
+          processAbortController = new AbortController();
+          exutFuture = new Future();
+          continue;
+        }
         if (!exitReason) {
           exitReason = "exit";
           break;
@@ -821,6 +835,13 @@ async function claudeLocalLauncher(session) {
       } catch (e) {
         const errorMessage = e instanceof Error ? e.message : String(e);
         logger.debug("[local]: launch error", e);
+        if (abortRequested) {
+          logger.debug("[local]: Aborting after error, continuing local mode");
+          abortRequested = false;
+          processAbortController = new AbortController();
+          exutFuture = new Future();
+          continue;
+        }
         const reason = exitReason;
         if (reason === "switch") {
           session.client.sendSessionEvent({ type: "message", message: `Error during mode switch: ${errorMessage}` });
@@ -1456,6 +1477,7 @@ function query(config) {
       fallbackModel,
       strictMcpConfig,
       canCallTool,
+      settingsPath,
       onStderr
     } = {}
   } = config;
@@ -1482,6 +1504,7 @@ function query(config) {
   }
   if (strictMcpConfig) args.push("--strict-mcp-config");
   if (permissionMode) args.push("--permission-mode", permissionMode);
+  if (settingsPath) args.push("--settings", settingsPath);
   if (fallbackModel) {
     if (model && fallbackModel === model) {
       throw new Error("Fallback model cannot be the same as the main model. Please specify a different model for fallbackModel option.");
@@ -2004,6 +2027,7 @@ Echo message: ${echoMessage}` : "");
     pathToClaudeCodeExecutable: (() => {
       return resolve(join(projectPath(), "scripts", "claude_remote_launcher.cjs"));
     })(),
+    settingsPath: opts.hookSettingsPath,
     onStderr: opts.onStderr
   };
   let thinking = false;
@@ -2039,6 +2063,8 @@ Echo message: ${echoMessage}` : "");
   const initialContent = await buildMessageContent(initial.message, initial.mode.imageRefs);
   messages.push({
     type: "user",
+    uuid: randomUUID(),
+    // UUID is required for Claude CLI streaming mode
     message: {
       role: "user",
       content: initialContent
@@ -2083,7 +2109,12 @@ Echo message: ${echoMessage}` : "");
         }
         mode = next.mode;
         const nextContent = await buildMessageContent(next.message, next.mode.imageRefs);
-        messages.push({ type: "user", message: { role: "user", content: nextContent } });
+        messages.push({
+          type: "user",
+          uuid: randomUUID(),
+          // UUID is required for Claude CLI streaming mode
+          message: { role: "user", content: nextContent }
+        });
       }
       if (message.type === "user") {
         const msg = message;
@@ -3004,6 +3035,7 @@ async function claudeRemoteLauncher(session) {
   let exitReason = null;
   let abortController = null;
   let abortFuture = null;
+  let abortRequested = false;
   async function abort() {
     if (abortController && !abortController.signal.aborted) {
       abortController.abort();
@@ -3012,6 +3044,7 @@ async function claudeRemoteLauncher(session) {
   }
   async function doAbort() {
     logger.debug("[remote]: doAbort");
+    abortRequested = true;
     await abort();
   }
   async function doSwitch() {
@@ -3197,6 +3230,7 @@ async function claudeRemoteLauncher(session) {
           path: session.path,
           allowedTools: session.allowedTools ?? [],
           mcpServers: session.mcpServers,
+          hookSettingsPath: session.hookSettingsPath,
           canCallTool: permissionHandler.handleToolCall,
           isAborted: (toolCallId) => {
             return permissionHandler.isAborted(toolCallId);
@@ -3276,16 +3310,30 @@ async function claudeRemoteLauncher(session) {
           signal: abortController.signal
         });
         session.consumeOneTimeFlags();
+        if (abortRequested && abortController.signal.aborted) {
+          logger.debug("[remote]: Operation aborted by user, continuing remote mode");
+          session.client.sendSessionEvent({ type: "message", message: "Aborted" });
+          abortRequested = false;
+          continue;
+        }
         if (!exitReason && abortController.signal.aborted) {
           session.client.sendSessionEvent({ type: "message", message: "Aborted by user" });
         }
       } catch (e) {
         const errorMessage = e instanceof Error ? e.message : String(e);
         logger.debug("[remote]: launch error", e);
+        if (abortRequested) {
+          logger.debug("[remote]: Aborting after error, continuing remote mode");
+          session.client.sendSessionEvent({ type: "message", message: "Aborted" });
+          abortRequested = false;
+          continue;
+        }
         if (exitReason === "switch") {
           session.client.sendSessionEvent({ type: "message", message: `Error during mode switch: ${errorMessage}` });
+          break;
         } else if (exitReason === "exit") {
           session.client.sendSessionEvent({ type: "message", message: `Error during exit: ${errorMessage}` });
+          break;
         } else {
           session.client.sendSessionEvent({ type: "message", message: `Process error: ${errorMessage}` });
           continue;
@@ -3851,6 +3899,139 @@ function extractSDKMetadataAsync(onComplete) {
   });
 }
 
+function parseFrontmatter(content) {
+  const trimmed = content.trim();
+  if (!trimmed.startsWith("---")) {
+    return { frontmatter: null, body: content };
+  }
+  const endIndex = trimmed.indexOf("---", 3);
+  if (endIndex === -1) {
+    return { frontmatter: null, body: content };
+  }
+  const frontmatterStr = trimmed.substring(3, endIndex).trim();
+  const body = trimmed.substring(endIndex + 3).trim();
+  const frontmatter = {};
+  const lines = frontmatterStr.split("\n");
+  for (const line of lines) {
+    const colonIndex = line.indexOf(":");
+    if (colonIndex === -1) continue;
+    const key = line.substring(0, colonIndex).trim();
+    let value = line.substring(colonIndex + 1).trim();
+    if (key === "allowed-tools" && value) {
+      frontmatter["allowed-tools"] = value.split(",").map((s) => s.trim());
+    } else if (key === "description") {
+      frontmatter.description = value;
+    } else if (key === "argument-hint") {
+      frontmatter["argument-hint"] = value;
+    } else if (key === "model") {
+      frontmatter.model = value;
+    }
+  }
+  return { frontmatter, body };
+}
+function extractDescriptionFromContent(content) {
+  const lines = content.split("\n");
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (trimmed && !trimmed.startsWith("#") && !trimmed.startsWith("!")) {
+      return trimmed.length > 100 ? trimmed.substring(0, 100) + "..." : trimmed;
+    }
+  }
+  return void 0;
+}
+function findMarkdownFiles(dir, baseDir = dir) {
+  const results = [];
+  if (!existsSync(dir)) {
+    return results;
+  }
+  try {
+    const entries = readdirSync(dir);
+    for (const entry of entries) {
+      const fullPath = join(dir, entry);
+      const stat = statSync(fullPath);
+      if (stat.isDirectory()) {
+        const subResults = findMarkdownFiles(fullPath, baseDir);
+        results.push(...subResults);
+      } else if (stat.isFile() && extname(entry).toLowerCase() === ".md") {
+        const relativePath = fullPath.substring(baseDir.length + 1);
+        const namespace = relativePath.includes("/") ? relativePath.substring(0, relativePath.lastIndexOf("/")) : void 0;
+        results.push({ filePath: fullPath, namespace });
+      }
+    }
+  } catch (error) {
+    logger.debug("[customCommands] Error reading directory:", dir, error);
+  }
+  return results;
+}
+function parseCommandFile(filePath, namespace, scope) {
+  try {
+    const content = readFileSync(filePath, "utf-8");
+    const { frontmatter, body } = parseFrontmatter(content);
+    const name = basename$1(filePath, ".md");
+    const description = frontmatter?.description || extractDescriptionFromContent(body);
+    let allowedTools;
+    if (frontmatter?.["allowed-tools"]) {
+      const at = frontmatter["allowed-tools"];
+      allowedTools = Array.isArray(at) ? at : [at];
+    }
+    return {
+      name,
+      description,
+      argumentHint: frontmatter?.["argument-hint"],
+      allowedTools,
+      model: frontmatter?.model,
+      scope,
+      namespace,
+      filePath,
+      content: body
+    };
+  } catch (error) {
+    logger.debug("[customCommands] Error parsing command file:", filePath, error);
+    return null;
+  }
+}
+function discoverCustomCommands(projectDir) {
+  const commands = [];
+  const projectCommandsDir = join(projectDir, ".claude", "commands");
+  if (existsSync(projectCommandsDir)) {
+    logger.debug("[customCommands] Scanning project commands:", projectCommandsDir);
+    const files = findMarkdownFiles(projectCommandsDir);
+    for (const { filePath, namespace } of files) {
+      const command = parseCommandFile(filePath, namespace, "project");
+      if (command) {
+        commands.push(command);
+      }
+    }
+  }
+  const personalCommandsDir = join(homedir(), ".claude", "commands");
+  if (existsSync(personalCommandsDir)) {
+    logger.debug("[customCommands] Scanning personal commands:", personalCommandsDir);
+    const files = findMarkdownFiles(personalCommandsDir);
+    for (const { filePath, namespace } of files) {
+      const command = parseCommandFile(filePath, namespace, "personal");
+      if (command) {
+        const existingIndex = commands.findIndex((c) => c.name === command.name);
+        if (existingIndex === -1) {
+          commands.push(command);
+        } else {
+          logger.debug(`[customCommands] Skipping personal command "${command.name}" - project command takes precedence`);
+        }
+      }
+    }
+  }
+  logger.debug(`[customCommands] Discovered ${commands.length} custom commands`);
+  return commands;
+}
+function commandsToMetadata(commands) {
+  return commands.map((cmd) => ({
+    name: cmd.name,
+    description: cmd.description,
+    argumentHint: cmd.argumentHint,
+    scope: cmd.scope,
+    namespace: cmd.namespace
+  }));
+}
+
 async function daemonPost(path, body) {
   const state = await readDaemonState();
   if (!state?.httpPort) {
@@ -4941,7 +5122,9 @@ async function startDaemon() {
           "--happy-starting-mode",
           "remote",
           "--started-by",
-          "daemon"
+          "daemon",
+          // Add --resume flag if resuming from a previous Claude session
+          ...options.resumeClaudeSessionId ? ["--resume", options.resumeClaudeSessionId] : []
         ];
         const happyProcess = spawnHappyCLI(args, {
           cwd: directory,
@@ -5446,6 +5629,20 @@ async function runClaude(credentials, options = {}) {
   } catch (error) {
     logger.debug("[START] Failed to report to daemon (may not be running):", error);
   }
+  const customCommands = discoverCustomCommands(workingDirectory);
+  const customCommandsMetadata = commandsToMetadata(customCommands);
+  logger.debug(`[start] Discovered ${customCommands.length} custom commands`);
+  if (customCommandsMetadata.length > 0) {
+    try {
+      api.sessionSyncClient(response).updateMetadata((currentMetadata) => ({
+        ...currentMetadata,
+        customCommands: customCommandsMetadata
+      }));
+      logger.debug("[start] Session metadata updated with custom commands");
+    } catch (error) {
+      logger.debug("[start] Failed to update session metadata with custom commands:", error);
+    }
+  }
   extractSDKMetadataAsync(async (sdkMetadata) => {
     logger.debug("[start] SDK metadata extracted, updating session:", sdkMetadata);
     try {
@@ -6810,7 +7007,7 @@ async function handleConnectVendor(vendor, displayName) {
     return;
   } else if (subcommand === "codex") {
     try {
-      const { runCodex } = await import('./runCodex-DO1tAsMY.mjs');
+      const { runCodex } = await import('./runCodex-CWaOl3u2.mjs');
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
@@ -6855,7 +7052,7 @@ async function handleConnectVendor(vendor, displayName) {
   } else if (subcommand === "list") {
     try {
       const { credentials } = await authAndSetupMachineIfNeeded();
-      const { listSessions } = await import('./list-C0F4TAPa.mjs');
+      const { listSessions } = await import('./list-CXZgsrb3.mjs');
       let sessionId;
       let titleFilter;
       let recentMsgs;
@@ -6957,7 +7154,7 @@ Examples:
         process.exit(1);
       }
       const { credentials } = await authAndSetupMachineIfNeeded();
-      const { promptSession } = await import('./prompt-Br-GiaVj.mjs');
+      const { promptSession } = await import('./prompt-CvpPWx4v.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-VlluCzOw.cjs');
-require('./types-DwjUGi0J.cjs');
+require('./index-BXhnIvhV.cjs');
+require('./types-CYn1BLoj.cjs');
 require('zod');
 require('node:child_process');
 require('node:os');

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import 'chalk';
-import './index-Bzl-ixRP.mjs';
-import './types-C1SMg54t.mjs';
+import './index-C1S8W6hS.mjs';
+import './types-Do0vU1JP.mjs';
 import 'zod';
 import 'node:child_process';
 import 'node:os';

package/dist/lib.cjs

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

package/dist/lib.d.cts

@@ -715,6 +715,13 @@ type Metadata = {
     claudeSessionId?: string;
     tools?: string[];
     slashCommands?: string[];
+    customCommands?: Array<{
+        name: string;
+        description?: string;
+        argumentHint?: string;
+        scope: 'project' | 'personal';
+        namespace?: string;
+    }>;
     homeDir: string;
     happyHomeDir: string;
     happyLibDir: string;
@@ -760,6 +767,7 @@ interface SpawnSessionOptions {
     approvedNewDirectoryCreation?: boolean;
     agent?: 'claude' | 'codex';
     token?: string;
+    resumeClaudeSessionId?: string;
 }
 type SpawnSessionResult = {
     type: 'success';

package/dist/lib.d.mts

@@ -715,6 +715,13 @@ type Metadata = {
     claudeSessionId?: string;
     tools?: string[];
     slashCommands?: string[];
+    customCommands?: Array<{
+        name: string;
+        description?: string;
+        argumentHint?: string;
+        scope: 'project' | 'personal';
+        namespace?: string;
+    }>;
     homeDir: string;
     happyHomeDir: string;
     happyLibDir: string;
@@ -760,6 +767,7 @@ interface SpawnSessionOptions {
     approvedNewDirectoryCreation?: boolean;
     agent?: 'claude' | 'codex';
     token?: string;
+    resumeClaudeSessionId?: string;
 }
 type SpawnSessionResult = {
     type: 'success';

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

package/dist/{list-C0F4TAPa.mjs → list-CXZgsrb3.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-C1SMg54t.mjs';
+import { c as configuration, l as logger, d as decodeBase64, b as decrypt, f as formatTimeAgo, e as libsodiumDecryptFromPublicKey } from './types-Do0vU1JP.mjs';
 import axios from 'axios';
 import { existsSync, readdirSync, statSync, readFileSync } from 'fs';
 import { join } from 'path';

package/dist/{list-DXxyuwT9.cjs → list-DnyoGVs0.cjs}

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

package/dist/{prompt-LEVV0Hst.cjs → prompt-1J3xTRvg.cjs}

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

package/dist/{prompt-Br-GiaVj.mjs → prompt-CvpPWx4v.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-C1SMg54t.mjs';
+import { c as configuration, b as decrypt, d as decodeBase64, l as logger, g as encodeBase64, h as encrypt } from './types-Do0vU1JP.mjs';
 import axios from 'axios';
 import { io } from 'socket.io-client';
 import 'chalk';

package/dist/{runCodex-3jsfzjVM.cjs → runCodex-CDA2a_3g.cjs}

@@ -2,14 +2,14 @@
 
 var ink = require('ink');
 var React = require('react');
-var types = require('./types-DwjUGi0J.cjs');
+var types = require('./types-CYn1BLoj.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-VlluCzOw.cjs');
+var index = require('./index-BXhnIvhV.cjs');
 var os = require('node:os');
 var node_path = require('node:path');
 var fs = require('node:fs');

package/dist/{runCodex-DO1tAsMY.mjs → runCodex-CWaOl3u2.mjs}

@@ -1,13 +1,13 @@
 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-C1SMg54t.mjs';
+import { l as logger, A as ApiClient, r as readSettings, p as projectPath, c as configuration, i as packageJson } from './types-Do0vU1JP.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-Bzl-ixRP.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-C1S8W6hS.mjs';
 import os from 'node:os';
 import { resolve, join } from 'node:path';
 import fs from 'node:fs';

package/dist/{types-DwjUGi0J.cjs → types-CYn1BLoj.cjs}

@@ -41,7 +41,7 @@ function _interopNamespaceDefault(e) {
 var z__namespace = /*#__PURE__*/_interopNamespaceDefault(z);
 
 var name = "@zhigang1992/happy-cli";
-var version = "0.12.13";
+var version = "0.12.15";
 var description = "Mobile and Web client for Claude Code and Codex";
 var author = "Kirill Dubovitskiy";
 var license = "MIT";
@@ -1150,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-DwjUGi0J.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-CYn1BLoj.cjs', document.baseURI).href))));
 function projectPath() {
   const path$1 = path.resolve(__dirname$1, "..");
   return path$1;
@@ -1914,12 +1914,12 @@ class ApiMachineClient {
     requestShutdown
   }) {
     this.rpcHandlerManager.registerHandler("spawn-happy-session", async (params) => {
-      const { directory, sessionId, machineId, approvedNewDirectoryCreation, agent, token } = params || {};
+      const { directory, sessionId, machineId, approvedNewDirectoryCreation, agent, token, resumeClaudeSessionId } = params || {};
       logger.debug(`[API MACHINE] Spawning session with params: ${JSON.stringify(params)}`);
       if (!directory) {
         throw new Error("Directory is required");
       }
-      const result = await spawnSession({ directory, sessionId, machineId, approvedNewDirectoryCreation, agent, token });
+      const result = await spawnSession({ directory, sessionId, machineId, approvedNewDirectoryCreation, agent, token, resumeClaudeSessionId });
       switch (result.type) {
         case "success":
           logger.debug(`[API MACHINE] Spawned session ${result.sessionId}`);

package/dist/{types-C1SMg54t.mjs → types-Do0vU1JP.mjs}

@@ -20,7 +20,7 @@ import { fileURLToPath } from 'url';
 import { Expo } from 'expo-server-sdk';
 
 var name = "@zhigang1992/happy-cli";
-var version = "0.12.13";
+var version = "0.12.15";
 var description = "Mobile and Web client for Claude Code and Codex";
 var author = "Kirill Dubovitskiy";
 var license = "MIT";
@@ -1893,12 +1893,12 @@ class ApiMachineClient {
     requestShutdown
   }) {
     this.rpcHandlerManager.registerHandler("spawn-happy-session", async (params) => {
-      const { directory, sessionId, machineId, approvedNewDirectoryCreation, agent, token } = params || {};
+      const { directory, sessionId, machineId, approvedNewDirectoryCreation, agent, token, resumeClaudeSessionId } = params || {};
       logger.debug(`[API MACHINE] Spawning session with params: ${JSON.stringify(params)}`);
       if (!directory) {
         throw new Error("Directory is required");
       }
-      const result = await spawnSession({ directory, sessionId, machineId, approvedNewDirectoryCreation, agent, token });
+      const result = await spawnSession({ directory, sessionId, machineId, approvedNewDirectoryCreation, agent, token, resumeClaudeSessionId });
       switch (result.type) {
         case "success":
           logger.debug(`[API MACHINE] Spawned session ${result.sessionId}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhigang1992/happy-cli",
-  "version": "0.12.13",
+  "version": "0.12.15",
   "description": "Mobile and Web client for Claude Code and Codex",
   "author": "Kirill Dubovitskiy",
   "license": "MIT",

package/scripts/claude_version_utils.cjs

@@ -330,7 +330,7 @@ function getClaudeCliPath() {
 
     const version = getVersion(result.path);
     const versionStr = version ? ` v${version}` : '';
-    console.error(`\x1b[90mUsing Claude Code${versionStr} from ${result.source}\x1b[0m`);
+    console.error(`Using Claude Code${versionStr} from ${result.source}`);
 
     return result.path;
 }