@zhigang1992/happy-cli 0.13.2 → 0.13.4

package/dist/{index-Uj38Af20.mjs → index-B2EGBeeU.mjs}

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import os$1, { homedir } from 'node:os';
 import { randomUUID, randomBytes, createHmac } from 'node:crypto';
-import { l as logger, p as projectPath, j as backoff, k as delay, R as RawJSONLinesSchema, m as AsyncLock, c as configuration, n as readDaemonState, o as clearDaemonState, i as packageJson, r as readSettings, q as readCredentials, g as encodeBase64, u as updateSettings, s as encodeBase64Url, d as decodeBase64, w as writeCredentialsLegacy, t as writeCredentialsDataKey, v as acquireDaemonLock, x as writeDaemonState, A as ApiClient, y as releaseDaemonLock, z as authChallenge, B as clearCredentials, C as clearMachineId, D as getLatestDaemonLog } from './types-DTrmDfm5.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-BUeYxLoB.mjs';
 import { spawn, execSync, exec as exec$1, execFileSync } from 'node:child_process';
 import { resolve, join, extname, basename as basename$1 } from 'node:path';
 import { createInterface } from 'node:readline';
@@ -2076,6 +2076,9 @@ Echo message: ${echoMessage}` : "");
   });
   let waitingForNextMessage = false;
   let messagePusherStopped = false;
+  if (opts.onQueryCreated) {
+    opts.onQueryCreated(response, () => waitingForNextMessage);
+  }
   const messagePusherTask = (async () => {
     try {
       while (!messagePusherStopped) {
@@ -3058,6 +3061,8 @@ async function claudeRemoteLauncher(session) {
   let abortController = null;
   let abortFuture = null;
   let abortRequested = false;
+  let currentQuery = null;
+  let isSessionIdle = null;
   async function abort() {
     if (abortController && !abortController.signal.aborted) {
       abortController.abort();
@@ -3066,6 +3071,18 @@ async function claudeRemoteLauncher(session) {
   }
   async function doAbort() {
     logger.debug("[remote]: doAbort");
+    const idle = isSessionIdle?.() ?? true;
+    if (!idle && currentQuery) {
+      logger.debug("[remote]: Session is busy, attempting interrupt first");
+      try {
+        await currentQuery.interrupt();
+        logger.debug("[remote]: Interrupt sent successfully");
+        return;
+      } catch (e) {
+        logger.debug("[remote]: Interrupt failed, falling back to full abort", e);
+      }
+    }
+    logger.debug("[remote]: Session is idle or interrupt failed, performing full abort");
     abortRequested = true;
     await abort();
   }
@@ -3288,7 +3305,12 @@ async function claudeRemoteLauncher(session) {
               session.client.sendSessionEvent({ type: "message", message: trimmed });
             }
           },
-          signal: abortController.signal
+          signal: abortController.signal,
+          onQueryCreated: (query, isIdle) => {
+            currentQuery = query;
+            isSessionIdle = isIdle;
+            logger.debug("[remote]: Query created, interrupt support enabled");
+          }
         });
         session.consumeOneTimeFlags();
         if (abortRequested && abortController.signal.aborted) {
@@ -3336,6 +3358,8 @@ async function claudeRemoteLauncher(session) {
         abortController = null;
         abortFuture?.resolve(void 0);
         abortFuture = null;
+        currentQuery = null;
+        isSessionIdle = null;
         logger.debug("[remote]: launch done");
         permissionHandler.reset();
         modeHash = null;
@@ -5109,7 +5133,9 @@ async function startDaemon() {
           "--started-by",
           "daemon",
           // Add --resume flag if resuming from a previous Claude session
-          ...options.resumeClaudeSessionId ? ["--resume", options.resumeClaudeSessionId] : []
+          ...options.resumeClaudeSessionId ? ["--resume", options.resumeClaudeSessionId] : [],
+          // Add --fork-session flag to create a new session ID when resuming
+          ...options.forkSession ? ["--fork-session"] : []
         ];
         const happyProcess = spawnHappyCLI(args, {
           cwd: directory,
@@ -6995,7 +7021,7 @@ async function handleConnectVendor(vendor, displayName) {
     return;
   } else if (subcommand === "codex") {
     try {
-      const { runCodex } = await import('./runCodex-C6yOfirQ.mjs');
+      const { runCodex } = await import('./runCodex-BJaAstnJ.mjs');
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
@@ -7040,7 +7066,7 @@ async function handleConnectVendor(vendor, displayName) {
   } else if (subcommand === "list") {
     try {
       const { credentials } = await authAndSetupMachineIfNeeded();
-      const { listSessions } = await import('./list-CrgHUL0f.mjs');
+      const { listSessions } = await import('./list-DF7IVJD4.mjs');
       let sessionId;
       let titleFilter;
       let recentMsgs;
@@ -7142,7 +7168,7 @@ Examples:
         process.exit(1);
       }
       const { credentials } = await authAndSetupMachineIfNeeded();
-      const { promptSession } = await import('./prompt-DQg5bz0P.mjs');
+      const { promptSession } = await import('./prompt-D2BswByO.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-DgAw_5N1.cjs → index-BdNIt5w7.cjs}

@@ -3,7 +3,7 @@
 var chalk = require('chalk');
 var os = require('node:os');
 var node_crypto = require('node:crypto');
-var types = require('./types-Cd6JAaoe.cjs');
+var types = require('./types-CSnGRdLP.cjs');
 var node_child_process = require('node:child_process');
 var node_path = require('node:path');
 var node_readline = require('node:readline');
@@ -1184,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-DgAw_5N1.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-BdNIt5w7.cjs', document.baseURI).href)));
 const __dirname$1 = node_path.join(__filename$1, "..");
 function getGlobalClaudeVersion() {
   try {
@@ -2099,6 +2099,9 @@ Echo message: ${echoMessage}` : "");
   });
   let waitingForNextMessage = false;
   let messagePusherStopped = false;
+  if (opts.onQueryCreated) {
+    opts.onQueryCreated(response, () => waitingForNextMessage);
+  }
   const messagePusherTask = (async () => {
     try {
       while (!messagePusherStopped) {
@@ -3081,6 +3084,8 @@ async function claudeRemoteLauncher(session) {
   let abortController = null;
   let abortFuture = null;
   let abortRequested = false;
+  let currentQuery = null;
+  let isSessionIdle = null;
   async function abort() {
     if (abortController && !abortController.signal.aborted) {
       abortController.abort();
@@ -3089,6 +3094,18 @@ async function claudeRemoteLauncher(session) {
   }
   async function doAbort() {
     types.logger.debug("[remote]: doAbort");
+    const idle = isSessionIdle?.() ?? true;
+    if (!idle && currentQuery) {
+      types.logger.debug("[remote]: Session is busy, attempting interrupt first");
+      try {
+        await currentQuery.interrupt();
+        types.logger.debug("[remote]: Interrupt sent successfully");
+        return;
+      } catch (e) {
+        types.logger.debug("[remote]: Interrupt failed, falling back to full abort", e);
+      }
+    }
+    types.logger.debug("[remote]: Session is idle or interrupt failed, performing full abort");
     abortRequested = true;
     await abort();
   }
@@ -3311,7 +3328,12 @@ async function claudeRemoteLauncher(session) {
               session.client.sendSessionEvent({ type: "message", message: trimmed });
             }
           },
-          signal: abortController.signal
+          signal: abortController.signal,
+          onQueryCreated: (query, isIdle) => {
+            currentQuery = query;
+            isSessionIdle = isIdle;
+            types.logger.debug("[remote]: Query created, interrupt support enabled");
+          }
         });
         session.consumeOneTimeFlags();
         if (abortRequested && abortController.signal.aborted) {
@@ -3359,6 +3381,8 @@ async function claudeRemoteLauncher(session) {
         abortController = null;
         abortFuture?.resolve(void 0);
         abortFuture = null;
+        currentQuery = null;
+        isSessionIdle = null;
         types.logger.debug("[remote]: launch done");
         permissionHandler.reset();
         modeHash = null;
@@ -5132,7 +5156,9 @@ async function startDaemon() {
           "--started-by",
           "daemon",
           // Add --resume flag if resuming from a previous Claude session
-          ...options.resumeClaudeSessionId ? ["--resume", options.resumeClaudeSessionId] : []
+          ...options.resumeClaudeSessionId ? ["--resume", options.resumeClaudeSessionId] : [],
+          // Add --fork-session flag to create a new session ID when resuming
+          ...options.forkSession ? ["--fork-session"] : []
         ];
         const happyProcess = spawnHappyCLI(args, {
           cwd: directory,
@@ -7018,7 +7044,7 @@ async function handleConnectVendor(vendor, displayName) {
     return;
   } else if (subcommand === "codex") {
     try {
-      const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-wtcLFv8_.cjs'); });
+      const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-DKfT8c0k.cjs'); });
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
@@ -7063,7 +7089,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-DTZJgObu.cjs'); });
+      const { listSessions } = await Promise.resolve().then(function () { return require('./list-DQpBq7_O.cjs'); });
       let sessionId;
       let titleFilter;
       let recentMsgs;
@@ -7165,7 +7191,7 @@ Examples:
         process.exit(1);
       }
       const { credentials } = await authAndSetupMachineIfNeeded();
-      const { promptSession } = await Promise.resolve().then(function () { return require('./prompt-DA5MCiiO.cjs'); });
+      const { promptSession } = await Promise.resolve().then(function () { return require('./prompt-Di73cj93.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.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
 require('chalk');
-require('./index-DgAw_5N1.cjs');
-require('./types-Cd6JAaoe.cjs');
+require('./index-BdNIt5w7.cjs');
+require('./types-CSnGRdLP.cjs');
 require('zod');
 require('node:child_process');
 require('node:os');

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import 'chalk';
-import './index-Uj38Af20.mjs';
-import './types-DTrmDfm5.mjs';
+import './index-B2EGBeeU.mjs';
+import './types-BUeYxLoB.mjs';
 import 'zod';
 import 'node:child_process';
 import 'node:os';

package/dist/lib.cjs

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

package/dist/lib.d.cts

@@ -768,6 +768,8 @@ interface SpawnSessionOptions {
     agent?: 'claude' | 'codex';
     token?: string;
     resumeClaudeSessionId?: string;
+    /** When resuming, create a new session ID instead of reusing the original */
+    forkSession?: boolean;
     /** Environment variables to pass to the spawned session */
     environmentVariables?: Record<string, string>;
 }

package/dist/lib.d.mts

@@ -768,6 +768,8 @@ interface SpawnSessionOptions {
     agent?: 'claude' | 'codex';
     token?: string;
     resumeClaudeSessionId?: string;
+    /** When resuming, create a new session ID instead of reusing the original */
+    forkSession?: boolean;
     /** Environment variables to pass to the spawned session */
     environmentVariables?: Record<string, string>;
 }

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

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

package/dist/{list-DTZJgObu.cjs → list-DQpBq7_O.cjs}

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

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

package/dist/{prompt-DA5MCiiO.cjs → prompt-Di73cj93.cjs}

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

package/dist/{runCodex-C6yOfirQ.mjs → runCodex-BJaAstnJ.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-DTrmDfm5.mjs';
+import { l as logger, A as ApiClient, r as readSettings, p as projectPath, c as configuration, i as packageJson } from './types-BUeYxLoB.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-Uj38Af20.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-B2EGBeeU.mjs';
 import os from 'node:os';
 import { resolve, join } from 'node:path';
 import fs from 'node:fs';

package/dist/{runCodex-wtcLFv8_.cjs → runCodex-DKfT8c0k.cjs}

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

package/dist/{types-DTrmDfm5.mjs → types-BUeYxLoB.mjs}

@@ -20,7 +20,7 @@ import { fileURLToPath } from 'url';
 import { Expo } from 'expo-server-sdk';
 
 var name = "@zhigang1992/happy-cli";
-var version = "0.13.2";
+var version = "0.13.4";
 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, resumeClaudeSessionId, environmentVariables } = params || {};
+      const { directory, sessionId, machineId, approvedNewDirectoryCreation, agent, token, resumeClaudeSessionId, forkSession, environmentVariables } = 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, resumeClaudeSessionId, environmentVariables });
+      const result = await spawnSession({ directory, sessionId, machineId, approvedNewDirectoryCreation, agent, token, resumeClaudeSessionId, forkSession, environmentVariables });
       switch (result.type) {
         case "success":
           logger.debug(`[API MACHINE] Spawned session ${result.sessionId}`);

package/dist/{types-Cd6JAaoe.cjs → types-CSnGRdLP.cjs}

@@ -41,7 +41,7 @@ function _interopNamespaceDefault(e) {
 var z__namespace = /*#__PURE__*/_interopNamespaceDefault(z);
 
 var name = "@zhigang1992/happy-cli";
-var version = "0.13.2";
+var version = "0.13.4";
 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-Cd6JAaoe.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-CSnGRdLP.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, resumeClaudeSessionId, environmentVariables } = params || {};
+      const { directory, sessionId, machineId, approvedNewDirectoryCreation, agent, token, resumeClaudeSessionId, forkSession, environmentVariables } = 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, resumeClaudeSessionId, environmentVariables });
+      const result = await spawnSession({ directory, sessionId, machineId, approvedNewDirectoryCreation, agent, token, resumeClaudeSessionId, forkSession, environmentVariables });
       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.13.2",
+  "version": "0.13.4",
   "description": "Mobile and Web client for Claude Code and Codex",
   "author": "Kirill Dubovitskiy",
   "license": "MIT",