@zhigang1992/happy-cli 0.13.1 → 0.13.2

package/README.md

@@ -7,7 +7,7 @@
 ## Fork Changes
 
 - Renamed package to `@zhigang1992/happy-cli` for personal npm publishing
-- Changed default server URLs to `happy-server.reily.app` and `happy.reily.app`
+- Changed default server URLs to `happy-server.innopals.com` and `happy.innopals.com`
 - Switched from yarn to bun
 - Lazy download of tools to reduce package size (~110MB to ~186KB)
 - Added image attachment support in messages
@@ -59,8 +59,8 @@ This will:
 
 ## Environment Variables
 
-- `HAPPY_SERVER_URL` - Custom server URL (default: https://happy-server.reily.app)
-- `HAPPY_WEBAPP_URL` - Custom web app URL (default: https://happy.reily.app)
+- `HAPPY_SERVER_URL` - Custom server URL (default: https://happy-server.innopals.com)
+- `HAPPY_WEBAPP_URL` - Custom web app URL (default: https://happy.innopals.com)
 - `HAPPY_HOME_DIR` - Custom home directory for Happy data (default: ~/.happy)
 - `HAPPY_DISABLE_CAFFEINATE` - Disable macOS sleep prevention (set to `true`, `1`, or `yes`)
 - `HAPPY_EXPERIMENTAL` - Enable experimental features (set to `true`, `1`, or `yes`)

package/dist/{index-BRJ9n6X5.cjs → index-DgAw_5N1.cjs}

@@ -3,7 +3,7 @@
 var chalk = require('chalk');
 var os = require('node:os');
 var node_crypto = require('node:crypto');
-var types = require('./types-CPlDgP66.cjs');
+var types = require('./types-Cd6JAaoe.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-BRJ9n6X5.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-DgAw_5N1.cjs', document.baseURI).href)));
 const __dirname$1 = node_path.join(__filename$1, "..");
 function getGlobalClaudeVersion() {
   try {
@@ -2097,6 +2097,45 @@ Echo message: ${echoMessage}` : "");
     prompt: messages,
     options: sdkOptions
   });
+  let waitingForNextMessage = false;
+  let messagePusherStopped = false;
+  const messagePusherTask = (async () => {
+    try {
+      while (!messagePusherStopped) {
+        if (!waitingForNextMessage) {
+          await new Promise((resolve2) => {
+            const checkInterval = setInterval(() => {
+              if (waitingForNextMessage || messagePusherStopped) {
+                clearInterval(checkInterval);
+                resolve2();
+              }
+            }, 10);
+          });
+        }
+        if (messagePusherStopped) {
+          break;
+        }
+        types.logger.debug("[claudeRemote] Message pusher waiting for next message");
+        const next = await opts.nextMessage();
+        if (!next) {
+          types.logger.debug("[claudeRemote] No more messages, ending message stream");
+          messages.end();
+          break;
+        }
+        types.logger.debug("[claudeRemote] Message pusher received new message, pushing to SDK");
+        mode = next.mode;
+        const nextContent = await buildMessageContent(next.message, next.mode.imageRefs);
+        messages.push({
+          type: "user",
+          uuid: node_crypto.randomUUID(),
+          message: { role: "user", content: nextContent }
+        });
+        waitingForNextMessage = false;
+      }
+    } catch (e) {
+      types.logger.debug("[claudeRemote] Message pusher error:", e);
+    }
+  })();
   updateThinking(true);
   try {
     types.logger.debug(`[claudeRemote] Starting to iterate over response`);
@@ -2116,7 +2155,7 @@ Echo message: ${echoMessage}` : "");
       }
       if (message.type === "result") {
         updateThinking(false);
-        types.logger.debug("[claudeRemote] Result received, exiting claudeRemote");
+        types.logger.debug("[claudeRemote] Result received");
         if (isCompactCommand) {
           types.logger.debug("[claudeRemote] Compaction completed");
           if (opts.onCompletionEvent) {
@@ -2125,19 +2164,7 @@ Echo message: ${echoMessage}` : "");
           isCompactCommand = false;
         }
         opts.onReady();
-        const next = await opts.nextMessage();
-        if (!next) {
-          messages.end();
-          return;
-        }
-        mode = next.mode;
-        const nextContent = await buildMessageContent(next.message, next.mode.imageRefs);
-        messages.push({
-          type: "user",
-          uuid: node_crypto.randomUUID(),
-          // UUID is required for Claude CLI streaming mode
-          message: { role: "user", content: nextContent }
-        });
+        waitingForNextMessage = true;
       }
       if (message.type === "user") {
         const msg = message;
@@ -2145,6 +2172,7 @@ Echo message: ${echoMessage}` : "");
           for (let c of msg.message.content) {
             if (c.type === "tool_result" && c.tool_use_id && opts.isAborted(c.tool_use_id)) {
               types.logger.debug("[claudeRemote] Tool aborted, exiting claudeRemote");
+              messagePusherStopped = true;
               return;
             }
           }
@@ -2159,6 +2187,11 @@ Echo message: ${echoMessage}` : "");
     }
   } finally {
     updateThinking(false);
+    messagePusherStopped = true;
+    await Promise.race([
+      messagePusherTask,
+      new Promise((resolve2) => setTimeout(resolve2, 100))
+    ]);
   }
 }
 
@@ -6985,7 +7018,7 @@ async function handleConnectVendor(vendor, displayName) {
     return;
   } else if (subcommand === "codex") {
     try {
-      const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-Djz88-rF.cjs'); });
+      const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-wtcLFv8_.cjs'); });
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
@@ -7030,7 +7063,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-CtFTdtWH.cjs'); });
+      const { listSessions } = await Promise.resolve().then(function () { return require('./list-DTZJgObu.cjs'); });
       let sessionId;
       let titleFilter;
       let recentMsgs;
@@ -7132,7 +7165,7 @@ Examples:
         process.exit(1);
       }
       const { credentials } = await authAndSetupMachineIfNeeded();
-      const { promptSession } = await Promise.resolve().then(function () { return require('./prompt-DMPO33Q2.cjs'); });
+      const { promptSession } = await Promise.resolve().then(function () { return require('./prompt-DA5MCiiO.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-CGAeCOSR.mjs → index-Uj38Af20.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-DQi1uyzQ.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-DTrmDfm5.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';
@@ -2074,6 +2074,45 @@ Echo message: ${echoMessage}` : "");
     prompt: messages,
     options: sdkOptions
   });
+  let waitingForNextMessage = false;
+  let messagePusherStopped = false;
+  const messagePusherTask = (async () => {
+    try {
+      while (!messagePusherStopped) {
+        if (!waitingForNextMessage) {
+          await new Promise((resolve2) => {
+            const checkInterval = setInterval(() => {
+              if (waitingForNextMessage || messagePusherStopped) {
+                clearInterval(checkInterval);
+                resolve2();
+              }
+            }, 10);
+          });
+        }
+        if (messagePusherStopped) {
+          break;
+        }
+        logger.debug("[claudeRemote] Message pusher waiting for next message");
+        const next = await opts.nextMessage();
+        if (!next) {
+          logger.debug("[claudeRemote] No more messages, ending message stream");
+          messages.end();
+          break;
+        }
+        logger.debug("[claudeRemote] Message pusher received new message, pushing to SDK");
+        mode = next.mode;
+        const nextContent = await buildMessageContent(next.message, next.mode.imageRefs);
+        messages.push({
+          type: "user",
+          uuid: randomUUID(),
+          message: { role: "user", content: nextContent }
+        });
+        waitingForNextMessage = false;
+      }
+    } catch (e) {
+      logger.debug("[claudeRemote] Message pusher error:", e);
+    }
+  })();
   updateThinking(true);
   try {
     logger.debug(`[claudeRemote] Starting to iterate over response`);
@@ -2093,7 +2132,7 @@ Echo message: ${echoMessage}` : "");
       }
       if (message.type === "result") {
         updateThinking(false);
-        logger.debug("[claudeRemote] Result received, exiting claudeRemote");
+        logger.debug("[claudeRemote] Result received");
         if (isCompactCommand) {
           logger.debug("[claudeRemote] Compaction completed");
           if (opts.onCompletionEvent) {
@@ -2102,19 +2141,7 @@ Echo message: ${echoMessage}` : "");
           isCompactCommand = false;
         }
         opts.onReady();
-        const next = await opts.nextMessage();
-        if (!next) {
-          messages.end();
-          return;
-        }
-        mode = next.mode;
-        const nextContent = await buildMessageContent(next.message, next.mode.imageRefs);
-        messages.push({
-          type: "user",
-          uuid: randomUUID(),
-          // UUID is required for Claude CLI streaming mode
-          message: { role: "user", content: nextContent }
-        });
+        waitingForNextMessage = true;
       }
       if (message.type === "user") {
         const msg = message;
@@ -2122,6 +2149,7 @@ Echo message: ${echoMessage}` : "");
           for (let c of msg.message.content) {
             if (c.type === "tool_result" && c.tool_use_id && opts.isAborted(c.tool_use_id)) {
               logger.debug("[claudeRemote] Tool aborted, exiting claudeRemote");
+              messagePusherStopped = true;
               return;
             }
           }
@@ -2136,6 +2164,11 @@ Echo message: ${echoMessage}` : "");
     }
   } finally {
     updateThinking(false);
+    messagePusherStopped = true;
+    await Promise.race([
+      messagePusherTask,
+      new Promise((resolve2) => setTimeout(resolve2, 100))
+    ]);
   }
 }
 
@@ -6962,7 +6995,7 @@ async function handleConnectVendor(vendor, displayName) {
     return;
   } else if (subcommand === "codex") {
     try {
-      const { runCodex } = await import('./runCodex-c_cSo6EI.mjs');
+      const { runCodex } = await import('./runCodex-C6yOfirQ.mjs');
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
@@ -7007,7 +7040,7 @@ async function handleConnectVendor(vendor, displayName) {
   } else if (subcommand === "list") {
     try {
       const { credentials } = await authAndSetupMachineIfNeeded();
-      const { listSessions } = await import('./list-DHjjInfx.mjs');
+      const { listSessions } = await import('./list-CrgHUL0f.mjs');
       let sessionId;
       let titleFilter;
       let recentMsgs;
@@ -7109,7 +7142,7 @@ Examples:
         process.exit(1);
       }
       const { credentials } = await authAndSetupMachineIfNeeded();
-      const { promptSession } = await import('./prompt-BdW97nWA.mjs');
+      const { promptSession } = await import('./prompt-DQg5bz0P.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-BRJ9n6X5.cjs');
-require('./types-CPlDgP66.cjs');
+require('./index-DgAw_5N1.cjs');
+require('./types-Cd6JAaoe.cjs');
 require('zod');
 require('node:child_process');
 require('node:os');

package/dist/index.mjs

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

package/dist/lib.cjs

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

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

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

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

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

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

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

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

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

package/dist/{runCodex-Djz88-rF.cjs → runCodex-wtcLFv8_.cjs}

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

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

@@ -41,7 +41,7 @@ function _interopNamespaceDefault(e) {
 var z__namespace = /*#__PURE__*/_interopNamespaceDefault(z);
 
 var name = "@zhigang1992/happy-cli";
-var version = "0.13.1";
+var version = "0.13.2";
 var description = "Mobile and Web client for Claude Code and Codex";
 var author = "Kirill Dubovitskiy";
 var license = "MIT";
@@ -202,8 +202,8 @@ class Configuration {
   isExperimentalEnabled;
   disableCaffeinate;
   constructor() {
-    this.serverUrl = process.env.HAPPY_SERVER_URL || "https://happy-server.reily.app";
-    this.webappUrl = process.env.HAPPY_WEBAPP_URL || "https://happy.reily.app";
+    this.serverUrl = process.env.HAPPY_SERVER_URL || "https://happy-server.innopals.com";
+    this.webappUrl = process.env.HAPPY_WEBAPP_URL || "https://happy.innopals.com";
     const args = process.argv.slice(2);
     this.isDaemonProcess = args.length >= 2 && args[0] === "daemon" && args[1] === "start-sync";
     if (process.env.HAPPY_HOME_DIR) {
@@ -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-CPlDgP66.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-Cd6JAaoe.cjs', document.baseURI).href))));
 function projectPath() {
   const path$1 = path.resolve(__dirname$1, "..");
   return path$1;

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

@@ -20,7 +20,7 @@ import { fileURLToPath } from 'url';
 import { Expo } from 'expo-server-sdk';
 
 var name = "@zhigang1992/happy-cli";
-var version = "0.13.1";
+var version = "0.13.2";
 var description = "Mobile and Web client for Claude Code and Codex";
 var author = "Kirill Dubovitskiy";
 var license = "MIT";
@@ -181,8 +181,8 @@ class Configuration {
   isExperimentalEnabled;
   disableCaffeinate;
   constructor() {
-    this.serverUrl = process.env.HAPPY_SERVER_URL || "https://happy-server.reily.app";
-    this.webappUrl = process.env.HAPPY_WEBAPP_URL || "https://happy.reily.app";
+    this.serverUrl = process.env.HAPPY_SERVER_URL || "https://happy-server.innopals.com";
+    this.webappUrl = process.env.HAPPY_WEBAPP_URL || "https://happy.innopals.com";
     const args = process.argv.slice(2);
     this.isDaemonProcess = args.length >= 2 && args[0] === "daemon" && args[1] === "start-sync";
     if (process.env.HAPPY_HOME_DIR) {

package/package.json

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