@zhigang1992/happy-cli 0.13.3 → 0.13.5

package/dist/{index-CK4J-T-v.mjs → index-5mjr7Isp.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-DZXtUKJF.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-kpW1rqr9.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';
@@ -1497,6 +1497,7 @@ function query(config) {
   }
   if (continueConversation) args.push("--continue");
   if (resume) args.push("--resume", resume);
+  if (config.options?.forkSession) args.push("--fork-session");
   if (allowedTools.length > 0) args.push("--allowedTools", allowedTools.join(","));
   if (disallowedTools.length > 0) args.push("--disallowedTools", disallowedTools.join(","));
   if (mcpServers && Object.keys(mcpServers).length > 0) {
@@ -1816,22 +1817,24 @@ async function claudeRemote(opts) {
   if (opts.sessionId && !claudeCheckSession(opts.sessionId, opts.path)) {
     startFrom = null;
   }
-  if (!startFrom && opts.claudeArgs) {
+  let forkSession = false;
+  if (opts.claudeArgs) {
     for (let i = 0; i < opts.claudeArgs.length; i++) {
-      if (opts.claudeArgs[i] === "--resume") {
+      if (opts.claudeArgs[i] === "--fork-session") {
+        forkSession = true;
+        logger.debug("[claudeRemote] Found --fork-session flag");
+      }
+      if (!startFrom && opts.claudeArgs[i] === "--resume") {
         if (i + 1 < opts.claudeArgs.length) {
           const nextArg = opts.claudeArgs[i + 1];
           if (!nextArg.startsWith("-") && nextArg.includes("-")) {
             startFrom = nextArg;
             logger.debug(`[claudeRemote] Found --resume with session ID: ${startFrom}`);
-            break;
           } else {
             logger.debug("[claudeRemote] Found --resume without session ID - not supported in remote mode");
-            break;
           }
         } else {
           logger.debug("[claudeRemote] Found --resume without session ID - not supported in remote mode");
-          break;
         }
       }
     }
@@ -2013,6 +2016,7 @@ Echo message: ${echoMessage}` : "");
   const sdkOptions = {
     cwd: opts.path,
     resume: startFrom ?? void 0,
+    forkSession,
     mcpServers: opts.mcpServers,
     permissionMode: initial.mode.permissionMode === "plan" ? "plan" : "default",
     model: initial.mode.model,
@@ -5133,7 +5137,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,
@@ -7019,7 +7025,7 @@ async function handleConnectVendor(vendor, displayName) {
     return;
   } else if (subcommand === "codex") {
     try {
-      const { runCodex } = await import('./runCodex-BoWqgEZr.mjs');
+      const { runCodex } = await import('./runCodex-ZrIcuFxD.mjs');
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
@@ -7064,7 +7070,7 @@ async function handleConnectVendor(vendor, displayName) {
   } else if (subcommand === "list") {
     try {
       const { credentials } = await authAndSetupMachineIfNeeded();
-      const { listSessions } = await import('./list-D6wuSw1y.mjs');
+      const { listSessions } = await import('./list-5AMxiEz4.mjs');
       let sessionId;
       let titleFilter;
       let recentMsgs;
@@ -7166,7 +7172,7 @@ Examples:
         process.exit(1);
       }
       const { credentials } = await authAndSetupMachineIfNeeded();
-      const { promptSession } = await import('./prompt-BooOOWHe.mjs');
+      const { promptSession } = await import('./prompt-DonyiXWv.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-DSexnLgz.cjs → index-BQ2exZo8.cjs}

@@ -3,7 +3,7 @@
 var chalk = require('chalk');
 var os = require('node:os');
 var node_crypto = require('node:crypto');
-var types = require('./types--5a-fy9g.cjs');
+var types = require('./types-CkkVG4rd.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-DSexnLgz.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-BQ2exZo8.cjs', document.baseURI).href)));
 const __dirname$1 = node_path.join(__filename$1, "..");
 function getGlobalClaudeVersion() {
   try {
@@ -1520,6 +1520,7 @@ function query(config) {
   }
   if (continueConversation) args.push("--continue");
   if (resume) args.push("--resume", resume);
+  if (config.options?.forkSession) args.push("--fork-session");
   if (allowedTools.length > 0) args.push("--allowedTools", allowedTools.join(","));
   if (disallowedTools.length > 0) args.push("--disallowedTools", disallowedTools.join(","));
   if (mcpServers && Object.keys(mcpServers).length > 0) {
@@ -1839,22 +1840,24 @@ async function claudeRemote(opts) {
   if (opts.sessionId && !claudeCheckSession(opts.sessionId, opts.path)) {
     startFrom = null;
   }
-  if (!startFrom && opts.claudeArgs) {
+  let forkSession = false;
+  if (opts.claudeArgs) {
     for (let i = 0; i < opts.claudeArgs.length; i++) {
-      if (opts.claudeArgs[i] === "--resume") {
+      if (opts.claudeArgs[i] === "--fork-session") {
+        forkSession = true;
+        types.logger.debug("[claudeRemote] Found --fork-session flag");
+      }
+      if (!startFrom && opts.claudeArgs[i] === "--resume") {
         if (i + 1 < opts.claudeArgs.length) {
           const nextArg = opts.claudeArgs[i + 1];
           if (!nextArg.startsWith("-") && nextArg.includes("-")) {
             startFrom = nextArg;
             types.logger.debug(`[claudeRemote] Found --resume with session ID: ${startFrom}`);
-            break;
           } else {
             types.logger.debug("[claudeRemote] Found --resume without session ID - not supported in remote mode");
-            break;
           }
         } else {
           types.logger.debug("[claudeRemote] Found --resume without session ID - not supported in remote mode");
-          break;
         }
       }
     }
@@ -2036,6 +2039,7 @@ Echo message: ${echoMessage}` : "");
   const sdkOptions = {
     cwd: opts.path,
     resume: startFrom ?? void 0,
+    forkSession,
     mcpServers: opts.mcpServers,
     permissionMode: initial.mode.permissionMode === "plan" ? "plan" : "default",
     model: initial.mode.model,
@@ -5156,7 +5160,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,
@@ -7042,7 +7048,7 @@ async function handleConnectVendor(vendor, displayName) {
     return;
   } else if (subcommand === "codex") {
     try {
-      const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-_wtZQXU0.cjs'); });
+      const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-D1H75Lvt.cjs'); });
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
@@ -7087,7 +7093,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-BPpLshMx.cjs'); });
+      const { listSessions } = await Promise.resolve().then(function () { return require('./list-Css1Nqdi.cjs'); });
       let sessionId;
       let titleFilter;
       let recentMsgs;
@@ -7189,7 +7195,7 @@ Examples:
         process.exit(1);
       }
       const { credentials } = await authAndSetupMachineIfNeeded();
-      const { promptSession } = await Promise.resolve().then(function () { return require('./prompt-CaJKwSsH.cjs'); });
+      const { promptSession } = await Promise.resolve().then(function () { return require('./prompt-BIX8B3nN.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-DSexnLgz.cjs');
-require('./types--5a-fy9g.cjs');
+require('./index-BQ2exZo8.cjs');
+require('./types-CkkVG4rd.cjs');
 require('zod');
 require('node:child_process');
 require('node:os');

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import 'chalk';
-import './index-CK4J-T-v.mjs';
-import './types-DZXtUKJF.mjs';
+import './index-5mjr7Isp.mjs';
+import './types-kpW1rqr9.mjs';
 import 'zod';
 import 'node:child_process';
 import 'node:os';

package/dist/lib.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var types = require('./types--5a-fy9g.cjs');
+var types = require('./types-CkkVG4rd.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-DZXtUKJF.mjs';
+export { A as ApiClient, a as ApiSessionClient, R as RawJSONLinesSchema, c as configuration, l as logger } from './types-kpW1rqr9.mjs';
 import 'axios';
 import 'chalk';
 import 'fs';

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

package/dist/{list-BPpLshMx.cjs → list-Css1Nqdi.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var types = require('./types--5a-fy9g.cjs');
+var types = require('./types-CkkVG4rd.cjs');
 var axios = require('axios');
 var fs = require('fs');
 var path = require('path');

package/dist/{prompt-CaJKwSsH.cjs → prompt-BIX8B3nN.cjs}

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

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

package/dist/{runCodex-_wtZQXU0.cjs → runCodex-D1H75Lvt.cjs}

@@ -2,14 +2,14 @@
 
 var ink = require('ink');
 var React = require('react');
-var types = require('./types--5a-fy9g.cjs');
+var types = require('./types-CkkVG4rd.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-DSexnLgz.cjs');
+var index = require('./index-BQ2exZo8.cjs');
 var os = require('node:os');
 var node_path = require('node:path');
 var fs = require('node:fs');

package/dist/{runCodex-BoWqgEZr.mjs → runCodex-ZrIcuFxD.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-DZXtUKJF.mjs';
+import { l as logger, A as ApiClient, r as readSettings, p as projectPath, c as configuration, i as packageJson } from './types-kpW1rqr9.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-CK4J-T-v.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-5mjr7Isp.mjs';
 import os from 'node:os';
 import { resolve, join } from 'node:path';
 import fs from 'node:fs';

package/dist/{types--5a-fy9g.cjs → types-CkkVG4rd.cjs}

@@ -41,7 +41,7 @@ function _interopNamespaceDefault(e) {
 var z__namespace = /*#__PURE__*/_interopNamespaceDefault(z);
 
 var name = "@zhigang1992/happy-cli";
-var version = "0.13.3";
+var version = "0.13.5";
 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--5a-fy9g.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-CkkVG4rd.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/dist/{types-DZXtUKJF.mjs → types-kpW1rqr9.mjs}

@@ -20,7 +20,7 @@ import { fileURLToPath } from 'url';
 import { Expo } from 'expo-server-sdk';
 
 var name = "@zhigang1992/happy-cli";
-var version = "0.13.3";
+var version = "0.13.5";
 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/package.json

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