happy-coder 0.10.0-3 → 0.10.0

package/README.md

@@ -21,6 +21,15 @@ This will:
 2. Display a QR code to connect from your mobile device
 3. Allow real-time session sharing between Claude Code and your mobile app
 
+## Commands
+
+- `happy auth` – Manage authentication
+- `happy codex` – Start Codex mode
+- `happy connect` – Store AI vendor API keys in Happy cloud
+- `happy notify` – Send a push notification to your devices
+- `happy daemon` – Manage background service
+- `happy doctor` – System diagnostics & troubleshooting
+
 ## Options
 
 - `-h, --help` - Show help
@@ -40,4 +49,4 @@ This will:
 
 ## License
 
-MIT
+MIT

package/dist/{index-DPVbp4Yx.mjs → index-BI37NnoW.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 writeCredentials, n as acquireDaemonLock, o as writeDaemonState, A as ApiClient, q as releaseDaemonLock, s as clearCredentials, t as clearMachineId, v as getLatestDaemonLog } from './types-xds_c-JJ.mjs';
+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-8Ad05p3x.mjs';
 import { spawn, execSync, execFileSync } from 'node:child_process';
 import { resolve, join } from 'node:path';
 import { createInterface } from 'node:readline';
@@ -23,6 +23,7 @@ import { join as join$1 } from 'path';
 import psList from 'ps-list';
 import spawn$2 from 'cross-spawn';
 import os from 'os';
+import * as tmp from 'tmp';
 import qrcode from 'qrcode-terminal';
 import open from 'open';
 import fastify from 'fastify';
@@ -3681,7 +3682,7 @@ function displayQRCode(url) {
 
 function generateWebAuthUrl(publicKey) {
   const publicKeyBase64 = encodeBase64(publicKey, "base64url");
-  return `https://app.happy.engineering/terminal/connect#key=${publicKeyBase64}`;
+  return `${configuration.webappUrl}/terminal/connect#key=${publicKeyBase64}`;
 }
 
 async function openBrowser(url) {
@@ -3748,7 +3749,8 @@ async function doAuth() {
     console.log(`[AUTH DEBUG] Sending auth request to: ${configuration.serverUrl}/v1/auth/request`);
     console.log(`[AUTH DEBUG] Public key: ${encodeBase64(keypair.publicKey).substring(0, 20)}...`);
     await axios.post(`${configuration.serverUrl}/v1/auth/request`, {
-      publicKey: encodeBase64(keypair.publicKey)
+      publicKey: encodeBase64(keypair.publicKey),
+      supportsV2: true
     });
     console.log(`[AUTH DEBUG] Auth request sent successfully`);
   } catch (error) {
@@ -3827,20 +3829,50 @@ async function waitForAuthentication(keypair) {
     while (!cancelled) {
       try {
         const response = await axios.post(`${configuration.serverUrl}/v1/auth/request`, {
-          publicKey: encodeBase64(keypair.publicKey)
+          publicKey: encodeBase64(keypair.publicKey),
+          supportsV2: true
         });
         if (response.data.state === "authorized") {
           let token = response.data.token;
           let r = decodeBase64(response.data.response);
           let decrypted = decryptWithEphemeralKey(r, keypair.secretKey);
           if (decrypted) {
-            const credentials = {
-              secret: decrypted,
-              token
-            };
-            await writeCredentials(credentials);
-            console.log("\n\n\u2713 Authentication successful\n");
-            return credentials;
+            if (decrypted.length === 32) {
+              const credentials = {
+                secret: decrypted,
+                token
+              };
+              await writeCredentialsLegacy(credentials);
+              console.log("\n\n\u2713 Authentication successful\n");
+              return {
+                encryption: {
+                  type: "legacy",
+                  secret: decrypted
+                },
+                token
+              };
+            } else {
+              if (decrypted[0] === 0) {
+                const credentials = {
+                  publicKey: decrypted.slice(1, 33),
+                  machineKey: randomBytes(32),
+                  token
+                };
+                await writeCredentialsDataKey(credentials);
+                console.log("\n\n\u2713 Authentication successful\n");
+                return {
+                  encryption: {
+                    type: "dataKey",
+                    publicKey: credentials.publicKey,
+                    machineKey: credentials.machineKey
+                  },
+                  token
+                };
+              } else {
+                console.log("\n\nFailed to decrypt response. Please try again.");
+                return null;
+              }
+            }
           } else {
             console.log("\n\nFailed to decrypt response. Please try again.");
             return null;
@@ -3872,6 +3904,7 @@ function decryptWithEphemeralKey(encryptedBundle, recipientSecretKey) {
 async function authAndSetupMachineIfNeeded() {
   logger.debug("[AUTH] Starting auth and machine setup...");
   let credentials = await readCredentials();
+  let newAuth = false;
   if (!credentials) {
     logger.debug("[AUTH] No credentials found, starting authentication flow...");
     const authResult = await doAuth();
@@ -3879,13 +3912,12 @@ async function authAndSetupMachineIfNeeded() {
       throw new Error("Authentication failed or was cancelled");
     }
     credentials = authResult;
+    newAuth = true;
   } else {
     logger.debug("[AUTH] Using existing credentials");
   }
   const settings = await updateSettings(async (s) => {
-    if (!s.machineId) {
-      const newMachineId = randomUUID();
-      logger.debug(`[AUTH] No machine ID found, generating new one: ${newMachineId}; We will not create machine on startup since we don't have api client intialized`);
+    if (newAuth || !s.machineId) {
       return {
         ...s,
         machineId: randomUUID()
@@ -4234,7 +4266,22 @@ async function startDaemon() {
         }
       }
       try {
+        let extraEnv = {};
+        if (options.token) {
+          if (options.agent === "codex") {
+            const codexHomeDir = tmp.dirSync();
+            fs.writeFile(join$1(codexHomeDir.name, "auth.json"), options.token);
+            extraEnv = {
+              CODEX_HOME: codexHomeDir.name
+            };
+          } else {
+            extraEnv = {
+              CLAUDE_CODE_OAUTH_TOKEN: options.token
+            };
+          }
+        }
         const args = [
+          options.agent === "claude" ? "claude" : "codex",
           "--happy-starting-mode",
           "remote",
           "--started-by",
@@ -4244,9 +4291,12 @@ async function startDaemon() {
           cwd: directory,
           detached: true,
           // Sessions stay alive when daemon stops
-          stdio: ["ignore", "pipe", "pipe"]
+          stdio: ["ignore", "pipe", "pipe"],
           // Capture stdout/stderr for debugging
-          // env is inherited automatically from parent process
+          env: {
+            ...process.env,
+            ...extraEnv
+          }
         });
         if (process.env.DEBUG) {
           happyProcess.stdout?.on("data", (data) => {
@@ -4365,7 +4415,7 @@ async function startDaemon() {
       httpPort: controlPort,
       startedAt: Date.now()
     };
-    const api = new ApiClient(credentials.token, credentials.secret);
+    const api = await ApiClient.create(credentials);
     const machine = await api.getOrCreateMachine({
       machineId,
       metadata: initialMachineMetadata,
@@ -4569,7 +4619,7 @@ async function runClaude(credentials, options = {}) {
     logger.debug("Daemon spawn requested with local mode - forcing remote mode");
     options.startingMode = "remote";
   }
-  const api = new ApiClient(credentials.token, credentials.secret);
+  const api = await ApiClient.create(credentials);
   let state = {};
   const settings = await readSettings();
   let machineId = settings?.machineId;
@@ -4597,7 +4647,8 @@ async function runClaude(credentials, options = {}) {
     startedBy: options.startedBy || "terminal",
     // Initialize lifecycle state
     lifecycleState: "running",
-    lifecycleStateSince: Date.now()
+    lifecycleStateSince: Date.now(),
+    flavor: "claude"
   };
   const response = await api.getOrCreateSession({ tag: sessionTag, metadata, state });
   logger.debug(`Session created: ${response.id}`);
@@ -4939,33 +4990,6 @@ async function uninstall() {
   await uninstall$1();
 }
 
-const BASE32_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
-function bytesToBase32(bytes) {
-  let result = "";
-  let buffer = 0;
-  let bufferLength = 0;
-  for (const byte of bytes) {
-    buffer = buffer << 8 | byte;
-    bufferLength += 8;
-    while (bufferLength >= 5) {
-      bufferLength -= 5;
-      result += BASE32_ALPHABET[buffer >> bufferLength & 31];
-    }
-  }
-  if (bufferLength > 0) {
-    result += BASE32_ALPHABET[buffer << 5 - bufferLength & 31];
-  }
-  return result;
-}
-function formatSecretKeyForBackup(secretBytes) {
-  const base32 = bytesToBase32(secretBytes);
-  const groups = [];
-  for (let i = 0; i < base32.length; i += 5) {
-    groups.push(base32.slice(i, i + 5));
-  }
-  return groups.join("-");
-}
-
 async function handleAuthCommand(args) {
   const subcommand = args[0];
   if (!subcommand || subcommand === "help" || subcommand === "--help" || subcommand === "-h") {
@@ -4979,9 +5003,9 @@ async function handleAuthCommand(args) {
     case "logout":
       await handleAuthLogout();
       break;
-    case "show-backup":
-      await handleAuthShowBackup();
-      break;
+    // case 'backup':
+    //   await handleAuthShowBackup();
+    //   break;
     case "status":
       await handleAuthStatus();
       break;
@@ -5004,11 +5028,6 @@ ${chalk.bold("Usage:")}
 
 ${chalk.bold("Options:")}
   --force    Clear credentials, machine ID, and stop daemon before re-auth
-
-${chalk.bold("Notes:")} 
-  \u2022 Use 'auth login --force' when you need to re-register your machine
-  \u2022 'auth show-backup' displays the key format expected by mobile/web clients
-  \u2022 The backup key allows linking multiple devices to the same account
 `);
 }
 async function handleAuthLogin(args) {
@@ -5093,31 +5112,6 @@ async function handleAuthLogout() {
     console.log(chalk.blue("Logout cancelled"));
   }
 }
-async function handleAuthShowBackup() {
-  const credentials = await readCredentials();
-  const settings = await readSettings();
-  if (!credentials) {
-    console.log(chalk.yellow("Not authenticated"));
-    console.log(chalk.gray('Run "happy auth login" to authenticate first'));
-    return;
-  }
-  const formattedBackupKey = formatSecretKeyForBackup(credentials.secret);
-  console.log(chalk.bold("\n\u{1F4F1} Backup Key\n"));
-  console.log(chalk.cyan("Your backup key:"));
-  console.log(chalk.bold(formattedBackupKey));
-  console.log("");
-  console.log(chalk.cyan("Machine Information:"));
-  console.log(`  Machine ID: ${settings?.machineId || "not set"}`);
-  console.log(`  Host: ${os$1.hostname()}`);
-  console.log("");
-  console.log(chalk.bold("How to use this backup key:"));
-  console.log(chalk.gray("\u2022 In Happy mobile app: Go to restore/link device and enter this key"));
-  console.log(chalk.gray("\u2022 This key format matches what the mobile app expects"));
-  console.log(chalk.gray("\u2022 You can type it with or without dashes - the app will normalize it"));
-  console.log(chalk.gray("\u2022 Common typos (0\u2192O, 1\u2192I) are automatically corrected"));
-  console.log("");
-  console.log(chalk.yellow("\u26A0\uFE0F  Keep this key secure - it provides full access to your account"));
-}
 async function handleAuthStatus() {
   const credentials = await readCredentials();
   const settings = await readSettings();
@@ -5654,7 +5648,7 @@ ${chalk.bold("happy connect")} - Connect AI vendor API keys to Happy cloud
 
 ${chalk.bold("Usage:")}
   happy connect codex        Store your Codex API key in Happy cloud
-  happy connect anthropic    Store your Anthropic API key in Happy cloud
+  happy connect claude       Store your Anthropic API key in Happy cloud
   happy connect gemini       Store your Gemini API key in Happy cloud
   happy connect help         Show this help message
 
@@ -5665,7 +5659,7 @@ ${chalk.bold("Description:")}
 
 ${chalk.bold("Examples:")}
   happy connect codex
-  happy connect anthropic
+  happy connect claude
   happy connect gemini
 
 ${chalk.bold("Notes:")} 
@@ -5684,7 +5678,7 @@ async function handleConnectVendor(vendor, displayName) {
     console.log(chalk.gray('  Please run "happy auth login" first'));
     process.exit(1);
   }
-  const api = new ApiClient(credentials.token, credentials.secret);
+  const api = await ApiClient.create(credentials);
   if (vendor === "codex") {
     console.log("\u{1F680} Registering Codex token with server");
     const codexAuthTokens = await authenticateCodex();
@@ -5749,11 +5743,17 @@ async function handleConnectVendor(vendor, displayName) {
     return;
   } else if (subcommand === "codex") {
     try {
-      const { runCodex } = await import('./runCodex-C07HQlsW.mjs');
+      const { runCodex } = await import('./runCodex-HlLNepHI.mjs');
+      let startedBy = void 0;
+      for (let i = 1; i < args.length; i++) {
+        if (args[i] === "--started-by") {
+          startedBy = args[++i];
+        }
+      }
       const {
         credentials
       } = await authAndSetupMachineIfNeeded();
-      await runCodex(credentials);
+      await runCodex({ credentials, startedBy });
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
       if (process.env.DEBUG) {
@@ -5886,6 +5886,9 @@ ${chalk.bold("To clean up runaway processes:")} Use ${chalk.cyan("happy doctor c
     }
     return;
   } else {
+    if (args.length > 0 && args[0] === "claude") {
+      args.shift();
+    }
     const options = {};
     let showHelp = false;
     let showVersion = false;
@@ -5921,6 +5924,9 @@ ${chalk.bold("happy")} - Claude Code On the Go
 ${chalk.bold("Usage:")}
   happy [options]         Start Claude with mobile control
   happy auth              Manage authentication
+  happy codex             Start Codex mode
+  happy connect           Connect AI vendor API keys
+  happy notify            Send push notification
   happy daemon            Manage background service that allows
                             to spawn new sessions away from your computer
   happy doctor            System diagnostics & troubleshooting
@@ -6019,12 +6025,12 @@ ${chalk.bold("Examples:")}
   }
   let credentials = await readCredentials();
   if (!credentials) {
-    console.error(chalk.red('Error: Not authenticated. Please run "happy --auth" first.'));
+    console.error(chalk.red('Error: Not authenticated. Please run "happy auth login" first.'));
     process.exit(1);
   }
   console.log(chalk.blue("\u{1F4F1} Sending push notification..."));
   try {
-    const api = new ApiClient(credentials.token, credentials.secret);
+    const api = await ApiClient.create(credentials);
     const notificationTitle = title || "Happy";
     api.push().sendToAllDevices(
       notificationTitle,
@@ -6045,4 +6051,4 @@ ${chalk.bold("Examples:")}
   }
 }
 
-export { MessageQueue2 as M, MessageBuffer as a, hashObject as h, initialMachineMetadata as i, startHappyServer as s, trimIdent as t };
+export { MessageQueue2 as M, MessageBuffer as a, stopCaffeinate as b, hashObject as h, initialMachineMetadata as i, notifyDaemonSessionStarted as n, registerKillSessionHandler as r, startHappyServer as s, trimIdent as t };