happy-coder 0.11.1 → 0.11.2-0

package/README.md

@@ -39,6 +39,14 @@ This will:
 - `--claude-env KEY=VALUE` - Set environment variable for Claude Code
 - `--claude-arg ARG` - Pass additional argument to Claude CLI
 
+## Environment Variables
+
+- `HAPPY_SERVER_URL` - Custom server URL (default: https://api.cluster-fluster.com)
+- `HAPPY_WEBAPP_URL` - Custom web app URL (default: https://app.happy.engineering)
+- `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`)
+
 ## Requirements
 
 - Node.js >= 20.0.0

package/dist/{index-SvbP5WOt.mjs → index-B6KoidwE.mjs}

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import os$1, { homedir } from 'node:os';
 import { randomUUID, randomBytes } from 'node:crypto';
-import { l as logger, p as projectPath, d as backoff, e as delay, R as RawJSONLinesSchema, f as AsyncLock, g as readDaemonState, h as clearDaemonState, b as packageJson, c as configuration, r as readSettings, i as readCredentials, j as encodeBase64, u as updateSettings, k as encodeBase64Url, m as decodeBase64, w as writeCredentialsLegacy, n as writeCredentialsDataKey, o as acquireDaemonLock, q as writeDaemonState, A as ApiClient, s as releaseDaemonLock, t as clearCredentials, v as clearMachineId, x as getLatestDaemonLog } from './types-CcqgHf_D.mjs';
+import { l as logger, p as projectPath, d as backoff, e as delay, R as RawJSONLinesSchema, f as AsyncLock, c as configuration, g as readDaemonState, h as clearDaemonState, b as packageJson, r as readSettings, i as readCredentials, j as encodeBase64, u as updateSettings, k as encodeBase64Url, m as decodeBase64, w as writeCredentialsLegacy, n as writeCredentialsDataKey, o as acquireDaemonLock, q as writeDaemonState, A as ApiClient, s as releaseDaemonLock, t as clearCredentials, v as clearMachineId, x as getLatestDaemonLog } from './types-CVOFMcT8.mjs';
 import { spawn, execSync, execFileSync } from 'node:child_process';
 import { resolve, join } from 'node:path';
 import { createInterface } from 'node:readline';
@@ -2672,15 +2672,24 @@ async function claudeRemoteLauncher(session) {
   }
   try {
     let pending = null;
+    let previousSessionId = null;
     while (!exitReason) {
       logger.debug("[remote]: launch");
       messageBuffer.addMessage("\u2550".repeat(40), "status");
-      messageBuffer.addMessage("Starting new Claude session...", "status");
+      const isNewSession = session.sessionId !== previousSessionId;
+      if (isNewSession) {
+        messageBuffer.addMessage("Starting new Claude session...", "status");
+        permissionHandler.reset();
+        sdkToLogConverter.resetParentChain();
+        logger.debug(`[remote]: New session detected (previous: ${previousSessionId}, current: ${session.sessionId})`);
+      } else {
+        messageBuffer.addMessage("Continuing Claude session...", "status");
+        logger.debug(`[remote]: Continuing existing session: ${session.sessionId}`);
+      }
+      previousSessionId = session.sessionId;
       const controller = new AbortController();
       abortController = controller;
       abortFuture = new Future();
-      permissionHandler.reset();
-      sdkToLogConverter.resetParentChain();
       let modeHash = null;
       let mode = null;
       try {
@@ -3178,6 +3187,10 @@ function hashObject(obj, options, encoding = "hex") {
 
 let caffeinateProcess = null;
 function startCaffeinate() {
+  if (configuration.disableCaffeinate) {
+    logger.debug("[caffeinate] Caffeinate disabled via HAPPY_DISABLE_CAFFEINATE environment variable");
+    return false;
+  }
   if (process.platform !== "darwin") {
     logger.debug("[caffeinate] Not on macOS, skipping caffeinate");
     return false;
@@ -3187,7 +3200,7 @@ function startCaffeinate() {
     return true;
   }
   try {
-    caffeinateProcess = spawn$1("caffeinate", ["-dim"], {
+    caffeinateProcess = spawn$1("caffeinate", ["-im"], {
       stdio: "ignore",
       detached: false
     });
@@ -3779,7 +3792,7 @@ async function doAuth() {
   const authMethod = await selectAuthenticationMethod();
   if (!authMethod) {
     console.log("\nAuthentication cancelled.\n");
-    return null;
+    process.exit(0);
   }
   const secret = new Uint8Array(randomBytes(32));
   const keypair = tweetnacl.box.keyPair.fromSecretKey(secret);
@@ -5781,7 +5794,7 @@ async function handleConnectVendor(vendor, displayName) {
     return;
   } else if (subcommand === "codex") {
     try {
-      const { runCodex } = await import('./runCodex-DJP0Q2zV.mjs');
+      const { runCodex } = await import('./runCodex-BJlyTS8v.mjs');
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {

package/dist/{index-BiTPY0Al.cjs → index-CFWfkM2k.cjs}

@@ -3,7 +3,7 @@
 var chalk = require('chalk');
 var os = require('node:os');
 var node_crypto = require('node:crypto');
-var types = require('./types-CLqX6MO0.cjs');
+var types = require('./types-D6ZewYb6.cjs');
 var node_child_process = require('node:child_process');
 var node_path = require('node:path');
 var node_readline = require('node:readline');
@@ -981,7 +981,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-BiTPY0Al.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-CFWfkM2k.cjs', document.baseURI).href)));
 const __dirname$1 = node_path.join(__filename$1, "..");
 function getDefaultClaudeCodePath() {
   return node_path.join(__dirname$1, "..", "..", "..", "node_modules", "@anthropic-ai", "claude-code", "cli.js");
@@ -2694,15 +2694,24 @@ async function claudeRemoteLauncher(session) {
   }
   try {
     let pending = null;
+    let previousSessionId = null;
     while (!exitReason) {
       types.logger.debug("[remote]: launch");
       messageBuffer.addMessage("\u2550".repeat(40), "status");
-      messageBuffer.addMessage("Starting new Claude session...", "status");
+      const isNewSession = session.sessionId !== previousSessionId;
+      if (isNewSession) {
+        messageBuffer.addMessage("Starting new Claude session...", "status");
+        permissionHandler.reset();
+        sdkToLogConverter.resetParentChain();
+        types.logger.debug(`[remote]: New session detected (previous: ${previousSessionId}, current: ${session.sessionId})`);
+      } else {
+        messageBuffer.addMessage("Continuing Claude session...", "status");
+        types.logger.debug(`[remote]: Continuing existing session: ${session.sessionId}`);
+      }
+      previousSessionId = session.sessionId;
       const controller = new AbortController();
       abortController = controller;
       abortFuture = new Future();
-      permissionHandler.reset();
-      sdkToLogConverter.resetParentChain();
       let modeHash = null;
       let mode = null;
       try {
@@ -3200,6 +3209,10 @@ function hashObject(obj, options, encoding = "hex") {
 
 let caffeinateProcess = null;
 function startCaffeinate() {
+  if (types.configuration.disableCaffeinate) {
+    types.logger.debug("[caffeinate] Caffeinate disabled via HAPPY_DISABLE_CAFFEINATE environment variable");
+    return false;
+  }
   if (process.platform !== "darwin") {
     types.logger.debug("[caffeinate] Not on macOS, skipping caffeinate");
     return false;
@@ -3209,7 +3222,7 @@ function startCaffeinate() {
     return true;
   }
   try {
-    caffeinateProcess = child_process.spawn("caffeinate", ["-dim"], {
+    caffeinateProcess = child_process.spawn("caffeinate", ["-im"], {
       stdio: "ignore",
       detached: false
     });
@@ -3801,7 +3814,7 @@ async function doAuth() {
   const authMethod = await selectAuthenticationMethod();
   if (!authMethod) {
     console.log("\nAuthentication cancelled.\n");
-    return null;
+    process.exit(0);
   }
   const secret = new Uint8Array(node_crypto.randomBytes(32));
   const keypair = tweetnacl.box.keyPair.fromSecretKey(secret);
@@ -5803,7 +5816,7 @@ async function handleConnectVendor(vendor, displayName) {
     return;
   } else if (subcommand === "codex") {
     try {
-      const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-DPfGXNTG.cjs'); });
+      const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-Dxi7L-oi.cjs'); });
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {

package/dist/index.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
 require('chalk');
-require('./index-BiTPY0Al.cjs');
-require('./types-CLqX6MO0.cjs');
+require('./index-CFWfkM2k.cjs');
+require('./types-D6ZewYb6.cjs');
 require('zod');
 require('node:child_process');
 require('node:os');

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import 'chalk';
-import './index-SvbP5WOt.mjs';
-import './types-CcqgHf_D.mjs';
+import './index-B6KoidwE.mjs';
+import './types-CVOFMcT8.mjs';
 import 'zod';
 import 'node:child_process';
 import 'node:os';

package/dist/lib.cjs

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

package/dist/lib.d.cts

@@ -807,6 +807,7 @@ declare class Configuration {
     readonly daemonLockFile: string;
     readonly currentCliVersion: string;
     readonly isExperimentalEnabled: boolean;
+    readonly disableCaffeinate: boolean;
     constructor();
 }
 declare const configuration: Configuration;

package/dist/lib.d.mts

@@ -807,6 +807,7 @@ declare class Configuration {
     readonly daemonLockFile: string;
     readonly currentCliVersion: string;
     readonly isExperimentalEnabled: boolean;
+    readonly disableCaffeinate: boolean;
     constructor();
 }
 declare const configuration: Configuration;

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

package/dist/{runCodex-DJP0Q2zV.mjs → runCodex-BJlyTS8v.mjs}

@@ -1,12 +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, b as packageJson } from './types-CcqgHf_D.mjs';
+import { l as logger, A as ApiClient, r as readSettings, p as projectPath, c as configuration, b as packageJson } from './types-CVOFMcT8.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-SvbP5WOt.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-B6KoidwE.mjs';
 import os from 'node:os';
 import { resolve, join } from 'node:path';
 import fs from 'node:fs';
@@ -17,7 +18,6 @@ import 'node:fs/promises';
 import 'tweetnacl';
 import 'node:events';
 import 'socket.io-client';
-import 'child_process';
 import 'util';
 import 'fs/promises';
 import 'crypto';
@@ -41,6 +41,27 @@ import '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import 'http';
 
 const DEFAULT_TIMEOUT = 14 * 24 * 60 * 60 * 1e3;
+function getCodexMcpCommand() {
+  try {
+    const version = execSync("codex --version", { encoding: "utf8" }).trim();
+    const match = version.match(/codex-cli\s+(\d+\.\d+\.\d+(?:-alpha\.\d+)?)/);
+    if (!match) return "mcp-server";
+    const versionStr = match[1];
+    const [major, minor, patch] = versionStr.split(/[-.]/).map(Number);
+    if (major > 0 || minor > 43) return "mcp-server";
+    if (minor === 43 && patch === 0) {
+      if (versionStr.includes("-alpha.")) {
+        const alphaNum = parseInt(versionStr.split("-alpha.")[1]);
+        return alphaNum >= 5 ? "mcp-server" : "mcp";
+      }
+      return "mcp-server";
+    }
+    return "mcp";
+  } catch (error) {
+    logger.debug("[CodexMCP] Error detecting codex version, defaulting to mcp-server:", error);
+    return "mcp-server";
+  }
+}
 class CodexMcpClient {
   client;
   transport = null;
@@ -76,10 +97,16 @@ class CodexMcpClient {
   }
   async connect() {
     if (this.connected) return;
-    logger.debug("[CodexMCP] Connecting to Codex MCP server...");
+    const mcpCommand = getCodexMcpCommand();
+    logger.debug(`[CodexMCP] Connecting to Codex MCP server using command: codex ${mcpCommand}`);
     this.transport = new StdioClientTransport({
       command: "codex",
-      args: ["mcp"]
+      args: [mcpCommand],
+      env: Object.keys(process.env).reduce((acc, key) => {
+        const value = process.env[key];
+        if (typeof value === "string") acc[key] = value;
+        return acc;
+      }, {})
     });
     this.registerPermissionHandlers();
     await this.client.connect(this.transport);

package/dist/{runCodex-DPfGXNTG.cjs → runCodex-Dxi7L-oi.cjs}

@@ -2,13 +2,14 @@
 
 var ink = require('ink');
 var React = require('react');
-var types = require('./types-CLqX6MO0.cjs');
+var types = require('./types-D6ZewYb6.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-BiTPY0Al.cjs');
+var index = require('./index-CFWfkM2k.cjs');
 var os = require('node:os');
 var node_path = require('node:path');
 var fs = require('node:fs');
@@ -19,7 +20,6 @@ require('node:fs/promises');
 require('tweetnacl');
 require('node:events');
 require('socket.io-client');
-require('child_process');
 require('util');
 require('fs/promises');
 require('crypto');
@@ -43,6 +43,27 @@ require('@modelcontextprotocol/sdk/server/streamableHttp.js');
 require('http');
 
 const DEFAULT_TIMEOUT = 14 * 24 * 60 * 60 * 1e3;
+function getCodexMcpCommand() {
+  try {
+    const version = child_process.execSync("codex --version", { encoding: "utf8" }).trim();
+    const match = version.match(/codex-cli\s+(\d+\.\d+\.\d+(?:-alpha\.\d+)?)/);
+    if (!match) return "mcp-server";
+    const versionStr = match[1];
+    const [major, minor, patch] = versionStr.split(/[-.]/).map(Number);
+    if (major > 0 || minor > 43) return "mcp-server";
+    if (minor === 43 && patch === 0) {
+      if (versionStr.includes("-alpha.")) {
+        const alphaNum = parseInt(versionStr.split("-alpha.")[1]);
+        return alphaNum >= 5 ? "mcp-server" : "mcp";
+      }
+      return "mcp-server";
+    }
+    return "mcp";
+  } catch (error) {
+    types.logger.debug("[CodexMCP] Error detecting codex version, defaulting to mcp-server:", error);
+    return "mcp-server";
+  }
+}
 class CodexMcpClient {
   client;
   transport = null;
@@ -78,10 +99,16 @@ class CodexMcpClient {
   }
   async connect() {
     if (this.connected) return;
-    types.logger.debug("[CodexMCP] Connecting to Codex MCP server...");
+    const mcpCommand = getCodexMcpCommand();
+    types.logger.debug(`[CodexMCP] Connecting to Codex MCP server using command: codex ${mcpCommand}`);
     this.transport = new stdio_js.StdioClientTransport({
       command: "codex",
-      args: ["mcp"]
+      args: [mcpCommand],
+      env: Object.keys(process.env).reduce((acc, key) => {
+        const value = process.env[key];
+        if (typeof value === "string") acc[key] = value;
+        return acc;
+      }, {})
     });
     this.registerPermissionHandlers();
     await this.client.connect(this.transport);

package/dist/{types-CcqgHf_D.mjs → types-CVOFMcT8.mjs}

@@ -21,7 +21,7 @@ import { platform } from 'os';
 import { Expo } from 'expo-server-sdk';
 
 var name = "happy-coder";
-var version = "0.11.1";
+var version = "0.11.2-0";
 var description = "Mobile and Web client for Claude Code and Codex";
 var author = "Kirill Dubovitskiy";
 var license = "MIT";
@@ -89,7 +89,7 @@ var scripts = {
 	postinstall: "node scripts/unpack-tools.cjs"
 };
 var dependencies = {
-	"@anthropic-ai/claude-code": "2.0.1",
+	"@anthropic-ai/claude-code": "^2.0.13",
 	"@anthropic-ai/sdk": "0.65.0",
 	"@modelcontextprotocol/sdk": "^1.15.1",
 	"@stablelib/base64": "^2.0.1",
@@ -180,6 +180,7 @@ class Configuration {
   daemonLockFile;
   currentCliVersion;
   isExperimentalEnabled;
+  disableCaffeinate;
   constructor() {
     this.serverUrl = process.env.HAPPY_SERVER_URL || "https://api.cluster-fluster.com";
     this.webappUrl = process.env.HAPPY_WEBAPP_URL || "https://app.happy.engineering";
@@ -197,6 +198,7 @@ class Configuration {
     this.daemonStateFile = join(this.happyHomeDir, "daemon.state.json");
     this.daemonLockFile = join(this.happyHomeDir, "daemon.state.json.lock");
     this.isExperimentalEnabled = ["true", "1", "yes"].includes(process.env.HAPPY_EXPERIMENTAL?.toLowerCase() || "");
+    this.disableCaffeinate = ["true", "1", "yes"].includes(process.env.HAPPY_DISABLE_CAFFEINATE?.toLowerCase() || "");
     this.currentCliVersion = packageJson.version;
     if (!existsSync(this.happyHomeDir)) {
       mkdirSync(this.happyHomeDir, { recursive: true });

package/dist/{types-CLqX6MO0.cjs → types-D6ZewYb6.cjs}

@@ -42,7 +42,7 @@ function _interopNamespaceDefault(e) {
 var z__namespace = /*#__PURE__*/_interopNamespaceDefault(z);
 
 var name = "happy-coder";
-var version = "0.11.1";
+var version = "0.11.2-0";
 var description = "Mobile and Web client for Claude Code and Codex";
 var author = "Kirill Dubovitskiy";
 var license = "MIT";
@@ -110,7 +110,7 @@ var scripts = {
 	postinstall: "node scripts/unpack-tools.cjs"
 };
 var dependencies = {
-	"@anthropic-ai/claude-code": "2.0.1",
+	"@anthropic-ai/claude-code": "^2.0.13",
 	"@anthropic-ai/sdk": "0.65.0",
 	"@modelcontextprotocol/sdk": "^1.15.1",
 	"@stablelib/base64": "^2.0.1",
@@ -201,6 +201,7 @@ class Configuration {
   daemonLockFile;
   currentCliVersion;
   isExperimentalEnabled;
+  disableCaffeinate;
   constructor() {
     this.serverUrl = process.env.HAPPY_SERVER_URL || "https://api.cluster-fluster.com";
     this.webappUrl = process.env.HAPPY_WEBAPP_URL || "https://app.happy.engineering";
@@ -218,6 +219,7 @@ class Configuration {
     this.daemonStateFile = node_path.join(this.happyHomeDir, "daemon.state.json");
     this.daemonLockFile = node_path.join(this.happyHomeDir, "daemon.state.json.lock");
     this.isExperimentalEnabled = ["true", "1", "yes"].includes(process.env.HAPPY_EXPERIMENTAL?.toLowerCase() || "");
+    this.disableCaffeinate = ["true", "1", "yes"].includes(process.env.HAPPY_DISABLE_CAFFEINATE?.toLowerCase() || "");
     this.currentCliVersion = packageJson.version;
     if (!fs.existsSync(this.happyHomeDir)) {
       fs.mkdirSync(this.happyHomeDir, { recursive: true });
@@ -1017,7 +1019,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-CLqX6MO0.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-D6ZewYb6.cjs', document.baseURI).href))));
 function projectPath() {
   const path$1 = path.resolve(__dirname$1, "..");
   return path$1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "happy-coder",
-  "version": "0.11.1",
+  "version": "0.11.2-0",
   "description": "Mobile and Web client for Claude Code and Codex",
   "author": "Kirill Dubovitskiy",
   "license": "MIT",
@@ -68,7 +68,7 @@
     "postinstall": "node scripts/unpack-tools.cjs"
   },
   "dependencies": {
-    "@anthropic-ai/claude-code": "2.0.1",
+    "@anthropic-ai/claude-code": "^2.0.13",
     "@anthropic-ai/sdk": "0.65.0",
     "@modelcontextprotocol/sdk": "^1.15.1",
     "@stablelib/base64": "^2.0.1",