happy-coder 0.7.1-beta.2 → 0.7.1

package/dist/index.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 var chalk = require('chalk');
-var types$1 = require('./types-CzvFvJwf.cjs');
+var types$1 = require('./types-B4GgojGc.cjs');
 var node_crypto = require('node:crypto');
 var node_child_process = require('node:child_process');
 var node_path = require('node:path');
@@ -27,11 +27,11 @@ var z = require('zod');
 var child_process = require('child_process');
 var util = require('util');
 var crypto = require('crypto');
-var qrcode = require('qrcode-terminal');
-var open = require('open');
 var fastify = require('fastify');
 var fastifyTypeProviderZod = require('fastify-type-provider-zod');
 var os$1 = require('os');
+var qrcode = require('qrcode-terminal');
+var open = require('open');
 var fs = require('fs');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
@@ -2364,7 +2364,7 @@ async function loop(opts) {
 }
 
 var name = "happy-coder";
-var version = "0.7.1-beta.1";
+var version = "0.7.1";
 var description = "Claude Code session sharing CLI";
 var author = "Kirill Dubovitskiy";
 var license = "MIT";
@@ -2449,7 +2449,7 @@ var dependencies = {
 };
 var devDependencies = {
 	"@eslint/compat": "^1",
-	"@types/node": ">=18",
+	"@types/node": ">=20",
 	"cross-env": "^10.0.0",
 	eslint: "^9",
 	"eslint-config-prettier": "^10",
@@ -2460,9 +2460,10 @@ var devDependencies = {
 	typescript: "^5",
 	vitest: "^3.2.4"
 };
-var overrides = {
+var resolutions = {
 	"whatwg-url": "14.2.0"
 };
+var packageManager = "yarn@1.22.22";
 var packageJson = {
 	name: name,
 	version: version,
@@ -2482,7 +2483,8 @@ var packageJson = {
 	scripts: scripts,
 	dependencies: dependencies,
 	devDependencies: devDependencies,
-	overrides: overrides
+	resolutions: resolutions,
+	packageManager: packageManager
 };
 
 function run(args, options) {
@@ -3546,6 +3548,16 @@ async function runDoctorCommand() {
   console.log(`Platform: ${chalk.green(process.platform)} ${process.arch}`);
   console.log(`Node.js Version: ${chalk.green(process.version)}`);
   console.log("");
+  console.log(chalk.bold("\u{1F527} Daemon Spawn Diagnostics"));
+  const projectRoot = projectPath();
+  const wrapperPath = node_path.join(projectRoot, "bin", "happy.mjs");
+  const cliEntrypoint = node_path.join(projectRoot, "dist", "index.mjs");
+  console.log(`Project Root: ${chalk.blue(projectRoot)}`);
+  console.log(`Wrapper Script: ${chalk.blue(wrapperPath)}`);
+  console.log(`CLI Entrypoint: ${chalk.blue(cliEntrypoint)}`);
+  console.log(`Wrapper Exists: ${node_fs.existsSync(wrapperPath) ? chalk.green("\u2713 Yes") : chalk.red("\u274C No")}`);
+  console.log(`CLI Exists: ${node_fs.existsSync(cliEntrypoint) ? chalk.green("\u2713 Yes") : chalk.red("\u274C No")}`);
+  console.log("");
   console.log(chalk.bold("\u2699\uFE0F  Configuration"));
   console.log(`Happy Home: ${chalk.blue(types$1.configuration.happyHomeDir)}`);
   console.log(`Server URL: ${chalk.blue(types$1.configuration.serverUrl)}`);
@@ -3717,313 +3729,175 @@ var controlClient = /*#__PURE__*/Object.freeze({
     stopDaemonSession: stopDaemonSession
 });
 
-async function start(credentials, options = {}) {
-  const workingDirectory = process.cwd();
-  const sessionTag = node_crypto.randomUUID();
-  types$1.logger.debugLargeJson("[START] Happy process started", getEnvironmentInfo());
-  types$1.logger.debug(`[START] Options: startedBy=${options.startedBy}, startingMode=${options.startingMode}`);
-  if (options.startedBy === "daemon" && options.startingMode === "local") {
-    types$1.logger.debug("Daemon spawn requested with local mode - forcing remote mode");
-    options.startingMode = "remote";
-  }
-  const api = new types$1.ApiClient(credentials.token, credentials.secret);
-  let state = {};
-  const settings = await readSettings();
-  const machineId = settings?.machineId || "unknown";
-  types$1.logger.debug(`Using machineId: ${machineId}`);
-  let metadata = {
-    path: workingDirectory,
-    host: os.hostname(),
-    version: packageJson.version,
-    os: os.platform(),
-    machineId,
-    homeDir: os.homedir(),
-    happyHomeDir: types$1.configuration.happyHomeDir,
-    startedFromDaemon: options.startedBy === "daemon",
-    hostPid: process.pid,
-    startedBy: options.startedBy || "terminal"
-  };
-  const response = await api.getOrCreateSession({ tag: sessionTag, metadata, state });
-  types$1.logger.debug(`Session created: ${response.id}`);
+function startDaemonControlServer({
+  getChildren,
+  stopSession,
+  spawnSession,
+  requestShutdown,
+  onHappySessionWebhook
+}) {
+  return new Promise((resolve) => {
+    const app = fastify({
+      logger: false
+      // We use our own logger
+    });
+    app.setValidatorCompiler(fastifyTypeProviderZod.validatorCompiler);
+    app.setSerializerCompiler(fastifyTypeProviderZod.serializerCompiler);
+    const typed = app.withTypeProvider();
+    typed.post("/session-started", {
+      schema: {
+        body: z.z.object({
+          sessionId: z.z.string(),
+          metadata: z.z.any()
+          // Metadata type from API
+        })
+      }
+    }, async (request, reply) => {
+      const { sessionId, metadata } = request.body;
+      types$1.logger.debug(`[CONTROL SERVER] Session started: ${sessionId}`);
+      onHappySessionWebhook(sessionId, metadata);
+      return { status: "ok" };
+    });
+    typed.post("/list", async (request, reply) => {
+      const children = getChildren();
+      types$1.logger.debug(`[CONTROL SERVER] Listing ${children.length} sessions`);
+      return { children };
+    });
+    typed.post("/stop-session", {
+      schema: {
+        body: z.z.object({
+          sessionId: z.z.string()
+        })
+      }
+    }, async (request, reply) => {
+      const { sessionId } = request.body;
+      types$1.logger.debug(`[CONTROL SERVER] Stop session request: ${sessionId}`);
+      const success = stopSession(sessionId);
+      return { success };
+    });
+    typed.post("/spawn-session", {
+      schema: {
+        body: z.z.object({
+          directory: z.z.string(),
+          sessionId: z.z.string().optional()
+        })
+      }
+    }, async (request, reply) => {
+      const { directory, sessionId } = request.body;
+      types$1.logger.debug(`[CONTROL SERVER] Spawn session request: dir=${directory}, sessionId=${sessionId || "new"}`);
+      const session = await spawnSession(directory, sessionId);
+      if (session) {
+        return {
+          success: true,
+          pid: session.pid,
+          sessionId: session.happySessionId || "pending"
+        };
+      } else {
+        reply.code(500);
+        return { error: "Failed to spawn session" };
+      }
+    });
+    typed.post("/stop", async (request, reply) => {
+      types$1.logger.debug("[CONTROL SERVER] Stop daemon request received");
+      setTimeout(() => {
+        types$1.logger.debug("[CONTROL SERVER] Triggering daemon shutdown");
+        requestShutdown();
+      }, 50);
+      return { status: "stopping" };
+    });
+    app.listen({ port: 0, host: "127.0.0.1" }, (err, address) => {
+      if (err) {
+        types$1.logger.debug("[CONTROL SERVER] Failed to start:", err);
+        throw err;
+      }
+      const port = parseInt(address.split(":").pop());
+      types$1.logger.debug(`[CONTROL SERVER] Started on port ${port}`);
+      resolve({
+        port,
+        stop: async () => {
+          types$1.logger.debug("[CONTROL SERVER] Stopping server");
+          await app.close();
+          types$1.logger.debug("[CONTROL SERVER] Server stopped");
+        }
+      });
+    });
+  });
+}
+
+function displayQRCode(url) {
+  console.log("=".repeat(80));
+  console.log("\u{1F4F1} To authenticate, scan this QR code with your mobile device:");
+  console.log("=".repeat(80));
+  qrcode.generate(url, { small: true }, (qr) => {
+    for (let l of qr.split("\n")) {
+      console.log(" ".repeat(10) + l);
+    }
+  });
+  console.log("=".repeat(80));
+}
+
+function generateWebAuthUrl(publicKey) {
+  const publicKeyBase64 = types$1.encodeBase64(publicKey, "base64url");
+  return `https://app.happy.engineering/terminal/connect#key=${publicKeyBase64}`;
+}
+
+async function openBrowser(url) {
   try {
-    const daemonState = await getDaemonState();
-    if (daemonState?.httpPort) {
-      await notifyDaemonSessionStarted(response.id, metadata);
-      types$1.logger.debug(`[START] Reported session ${response.id} to daemon`);
+    if (!process.stdout.isTTY || process.env.CI || process.env.HEADLESS) {
+      types$1.logger.debug("[browser] Headless environment detected, skipping browser open");
+      return false;
     }
+    types$1.logger.debug(`[browser] Attempting to open URL: ${url}`);
+    await open(url);
+    types$1.logger.debug("[browser] Browser opened successfully");
+    return true;
   } catch (error) {
-    types$1.logger.debug("[START] Failed to report to daemon (may not be running):", error);
+    types$1.logger.debug("[browser] Failed to open browser:", error);
+    return false;
   }
-  extractSDKMetadataAsync(async (sdkMetadata) => {
-    types$1.logger.debug("[start] SDK metadata extracted, updating session:", sdkMetadata);
-    try {
-      api.sessionSyncClient(response).updateMetadata((currentMetadata) => ({
-        ...currentMetadata,
-        tools: sdkMetadata.tools,
-        slashCommands: sdkMetadata.slashCommands
-      }));
-      types$1.logger.debug("[start] Session metadata updated with SDK capabilities");
-    } catch (error) {
-      types$1.logger.debug("[start] Failed to update session metadata:", error);
+}
+
+const AuthSelector = ({ onSelect, onCancel }) => {
+  const [selectedIndex, setSelectedIndex] = React.useState(0);
+  const options = [
+    {
+      method: "mobile",
+      label: "Mobile App"
+    },
+    {
+      method: "web",
+      label: "Web Browser"
+    }
+  ];
+  ink.useInput((input, key) => {
+    if (key.upArrow) {
+      setSelectedIndex((prev) => Math.max(0, prev - 1));
+    } else if (key.downArrow) {
+      setSelectedIndex((prev) => Math.min(options.length - 1, prev + 1));
+    } else if (key.return) {
+      onSelect(options[selectedIndex].method);
+    } else if (key.escape || key.ctrl && input === "c") {
+      onCancel();
+    } else if (input === "1") {
+      setSelectedIndex(0);
+      onSelect("mobile");
+    } else if (input === "2") {
+      setSelectedIndex(1);
+      onSelect("web");
     }
   });
-  const session = api.sessionSyncClient(response);
-  const logPath = await types$1.logger.logFilePathPromise;
-  types$1.logger.infoDeveloper(`Session: ${response.id}`);
-  types$1.logger.infoDeveloper(`Logs: ${logPath}`);
-  session.updateAgentState((currentState) => ({
-    ...currentState,
-    controlledByUser: options.startingMode !== "remote"
-  }));
-  const caffeinateStarted = startCaffeinate();
-  if (caffeinateStarted) {
-    types$1.logger.infoDeveloper("Sleep prevention enabled (macOS)");
-  }
-  const messageQueue = new MessageQueue2((mode) => hashObject(mode));
-  registerHandlers(session);
-  let currentPermissionMode = options.permissionMode;
-  let currentModel = options.model;
-  let currentFallbackModel = void 0;
-  let currentCustomSystemPrompt = void 0;
-  let currentAppendSystemPrompt = void 0;
-  let currentAllowedTools = void 0;
-  let currentDisallowedTools = void 0;
-  session.onUserMessage((message) => {
-    let messagePermissionMode = currentPermissionMode;
-    if (message.meta?.permissionMode) {
-      const validModes = ["default", "acceptEdits", "bypassPermissions", "plan"];
-      if (validModes.includes(message.meta.permissionMode)) {
-        messagePermissionMode = message.meta.permissionMode;
-        currentPermissionMode = messagePermissionMode;
-        types$1.logger.debug(`[loop] Permission mode updated from user message to: ${currentPermissionMode}`);
-      } else {
-        types$1.logger.debug(`[loop] Invalid permission mode received: ${message.meta.permissionMode}`);
-      }
-    } else {
-      types$1.logger.debug(`[loop] User message received with no permission mode override, using current: ${currentPermissionMode}`);
-    }
-    let messageModel = currentModel;
-    if (message.meta?.hasOwnProperty("model")) {
-      messageModel = message.meta.model || void 0;
-      currentModel = messageModel;
-      types$1.logger.debug(`[loop] Model updated from user message: ${messageModel || "reset to default"}`);
-    } else {
-      types$1.logger.debug(`[loop] User message received with no model override, using current: ${currentModel || "default"}`);
-    }
-    let messageCustomSystemPrompt = currentCustomSystemPrompt;
-    if (message.meta?.hasOwnProperty("customSystemPrompt")) {
-      messageCustomSystemPrompt = message.meta.customSystemPrompt || void 0;
-      currentCustomSystemPrompt = messageCustomSystemPrompt;
-      types$1.logger.debug(`[loop] Custom system prompt updated from user message: ${messageCustomSystemPrompt ? "set" : "reset to none"}`);
-    } else {
-      types$1.logger.debug(`[loop] User message received with no custom system prompt override, using current: ${currentCustomSystemPrompt ? "set" : "none"}`);
-    }
-    let messageFallbackModel = currentFallbackModel;
-    if (message.meta?.hasOwnProperty("fallbackModel")) {
-      messageFallbackModel = message.meta.fallbackModel || void 0;
-      currentFallbackModel = messageFallbackModel;
-      types$1.logger.debug(`[loop] Fallback model updated from user message: ${messageFallbackModel || "reset to none"}`);
-    } else {
-      types$1.logger.debug(`[loop] User message received with no fallback model override, using current: ${currentFallbackModel || "none"}`);
-    }
-    let messageAppendSystemPrompt = currentAppendSystemPrompt;
-    if (message.meta?.hasOwnProperty("appendSystemPrompt")) {
-      messageAppendSystemPrompt = message.meta.appendSystemPrompt || void 0;
-      currentAppendSystemPrompt = messageAppendSystemPrompt;
-      types$1.logger.debug(`[loop] Append system prompt updated from user message: ${messageAppendSystemPrompt ? "set" : "reset to none"}`);
-    } else {
-      types$1.logger.debug(`[loop] User message received with no append system prompt override, using current: ${currentAppendSystemPrompt ? "set" : "none"}`);
-    }
-    let messageAllowedTools = currentAllowedTools;
-    if (message.meta?.hasOwnProperty("allowedTools")) {
-      messageAllowedTools = message.meta.allowedTools || void 0;
-      currentAllowedTools = messageAllowedTools;
-      types$1.logger.debug(`[loop] Allowed tools updated from user message: ${messageAllowedTools ? messageAllowedTools.join(", ") : "reset to none"}`);
-    } else {
-      types$1.logger.debug(`[loop] User message received with no allowed tools override, using current: ${currentAllowedTools ? currentAllowedTools.join(", ") : "none"}`);
-    }
-    let messageDisallowedTools = currentDisallowedTools;
-    if (message.meta?.hasOwnProperty("disallowedTools")) {
-      messageDisallowedTools = message.meta.disallowedTools || void 0;
-      currentDisallowedTools = messageDisallowedTools;
-      types$1.logger.debug(`[loop] Disallowed tools updated from user message: ${messageDisallowedTools ? messageDisallowedTools.join(", ") : "reset to none"}`);
-    } else {
-      types$1.logger.debug(`[loop] User message received with no disallowed tools override, using current: ${currentDisallowedTools ? currentDisallowedTools.join(", ") : "none"}`);
-    }
-    const specialCommand = parseSpecialCommand(message.content.text);
-    if (specialCommand.type === "compact") {
-      types$1.logger.debug("[start] Detected /compact command");
-      const enhancedMode2 = {
-        permissionMode: messagePermissionMode || "default",
-        model: messageModel,
-        fallbackModel: messageFallbackModel,
-        customSystemPrompt: messageCustomSystemPrompt,
-        appendSystemPrompt: messageAppendSystemPrompt,
-        allowedTools: messageAllowedTools,
-        disallowedTools: messageDisallowedTools
-      };
-      messageQueue.pushIsolateAndClear(specialCommand.originalMessage || message.content.text, enhancedMode2);
-      types$1.logger.debugLargeJson("[start] /compact command pushed to queue:", message);
-      return;
-    }
-    if (specialCommand.type === "clear") {
-      types$1.logger.debug("[start] Detected /clear command");
-      const enhancedMode2 = {
-        permissionMode: messagePermissionMode || "default",
-        model: messageModel,
-        fallbackModel: messageFallbackModel,
-        customSystemPrompt: messageCustomSystemPrompt,
-        appendSystemPrompt: messageAppendSystemPrompt,
-        allowedTools: messageAllowedTools,
-        disallowedTools: messageDisallowedTools
-      };
-      messageQueue.pushIsolateAndClear(specialCommand.originalMessage || message.content.text, enhancedMode2);
-      types$1.logger.debugLargeJson("[start] /compact command pushed to queue:", message);
-      return;
-    }
-    const enhancedMode = {
-      permissionMode: messagePermissionMode || "default",
-      model: messageModel,
-      fallbackModel: messageFallbackModel,
-      customSystemPrompt: messageCustomSystemPrompt,
-      appendSystemPrompt: messageAppendSystemPrompt,
-      allowedTools: messageAllowedTools,
-      disallowedTools: messageDisallowedTools
-    };
-    messageQueue.push(message.content.text, enhancedMode);
-    types$1.logger.debugLargeJson("User message pushed to queue:", message);
-  });
-  const cleanup = async () => {
-    types$1.logger.debug("[START] Received termination signal, cleaning up...");
-    try {
-      if (session) {
-        session.sendSessionDeath();
-        await session.flush();
-        await session.close();
-      }
-      stopCaffeinate();
-      types$1.logger.debug("[START] Cleanup complete, exiting");
-      process.exit(0);
-    } catch (error) {
-      types$1.logger.debug("[START] Error during cleanup:", error);
-      process.exit(1);
-    }
-  };
-  process.on("SIGTERM", cleanup);
-  process.on("SIGINT", cleanup);
-  process.on("uncaughtException", (error) => {
-    types$1.logger.debug("[START] Uncaught exception:", error);
-    cleanup();
-  });
-  process.on("unhandledRejection", (reason) => {
-    types$1.logger.debug("[START] Unhandled rejection:", reason);
-    cleanup();
-  });
-  await loop({
-    path: workingDirectory,
-    model: options.model,
-    permissionMode: options.permissionMode,
-    startingMode: options.startingMode,
-    messageQueue,
-    api,
-    onModeChange: (newMode) => {
-      session.sendSessionEvent({ type: "switch", mode: newMode });
-      session.updateAgentState((currentState) => ({
-        ...currentState,
-        controlledByUser: newMode === "local"
-      }));
-    },
-    onSessionReady: (sessionInstance) => {
-    },
-    mcpServers: {},
-    session,
-    claudeEnvVars: options.claudeEnvVars,
-    claudeArgs: options.claudeArgs
-  });
-  session.sendSessionDeath();
-  types$1.logger.debug("Waiting for socket to flush...");
-  await session.flush();
-  types$1.logger.debug("Closing session...");
-  await session.close();
-  stopCaffeinate();
-  types$1.logger.debug("Stopped sleep prevention");
-  process.exit(0);
-}
-
-function displayQRCode(url) {
-  console.log("=".repeat(80));
-  console.log("\u{1F4F1} To authenticate, scan this QR code with your mobile device:");
-  console.log("=".repeat(80));
-  qrcode.generate(url, { small: true }, (qr) => {
-    for (let l of qr.split("\n")) {
-      console.log(" ".repeat(10) + l);
-    }
-  });
-  console.log("=".repeat(80));
-}
-
-function generateWebAuthUrl(publicKey) {
-  const publicKeyBase64 = types$1.encodeBase64(publicKey, "base64url");
-  return `https://app.happy.engineering/terminal/connect#key=${publicKeyBase64}`;
-}
-
-async function openBrowser(url) {
-  try {
-    if (!process.stdout.isTTY || process.env.CI || process.env.HEADLESS) {
-      types$1.logger.debug("[browser] Headless environment detected, skipping browser open");
-      return false;
-    }
-    types$1.logger.debug(`[browser] Attempting to open URL: ${url}`);
-    await open(url);
-    types$1.logger.debug("[browser] Browser opened successfully");
-    return true;
-  } catch (error) {
-    types$1.logger.debug("[browser] Failed to open browser:", error);
-    return false;
-  }
-}
-
-const AuthSelector = ({ onSelect, onCancel }) => {
-  const [selectedIndex, setSelectedIndex] = React.useState(0);
-  const options = [
-    {
-      method: "mobile",
-      label: "Mobile App"
-    },
-    {
-      method: "web",
-      label: "Web Browser"
-    }
-  ];
-  ink.useInput((input, key) => {
-    if (key.upArrow) {
-      setSelectedIndex((prev) => Math.max(0, prev - 1));
-    } else if (key.downArrow) {
-      setSelectedIndex((prev) => Math.min(options.length - 1, prev + 1));
-    } else if (key.return) {
-      onSelect(options[selectedIndex].method);
-    } else if (key.escape || key.ctrl && input === "c") {
-      onCancel();
-    } else if (input === "1") {
-      setSelectedIndex(0);
-      onSelect("mobile");
-    } else if (input === "2") {
-      setSelectedIndex(1);
-      onSelect("web");
-    }
-  });
-  return /* @__PURE__ */ React.createElement(ink.Box, { flexDirection: "column", paddingY: 1 }, /* @__PURE__ */ React.createElement(ink.Box, { marginBottom: 1 }, /* @__PURE__ */ React.createElement(ink.Text, null, "How would you like to authenticate?")), /* @__PURE__ */ React.createElement(ink.Box, { flexDirection: "column" }, options.map((option, index) => {
-    const isSelected = selectedIndex === index;
-    return /* @__PURE__ */ React.createElement(ink.Box, { key: option.method, marginY: 0 }, /* @__PURE__ */ React.createElement(ink.Text, { color: isSelected ? "cyan" : "gray" }, isSelected ? "\u203A " : "  ", index + 1, ". ", option.label));
-  })), /* @__PURE__ */ React.createElement(ink.Box, { marginTop: 1 }, /* @__PURE__ */ React.createElement(ink.Text, { dimColor: true }, "Use arrows or 1-2 to select, Enter to confirm")));
-};
-
-async function doAuth() {
-  console.clear();
-  const authMethod = await selectAuthenticationMethod();
-  if (!authMethod) {
-    console.log("\nAuthentication cancelled.\n");
-    return null;
+  return /* @__PURE__ */ React.createElement(ink.Box, { flexDirection: "column", paddingY: 1 }, /* @__PURE__ */ React.createElement(ink.Box, { marginBottom: 1 }, /* @__PURE__ */ React.createElement(ink.Text, null, "How would you like to authenticate?")), /* @__PURE__ */ React.createElement(ink.Box, { flexDirection: "column" }, options.map((option, index) => {
+    const isSelected = selectedIndex === index;
+    return /* @__PURE__ */ React.createElement(ink.Box, { key: option.method, marginY: 0 }, /* @__PURE__ */ React.createElement(ink.Text, { color: isSelected ? "cyan" : "gray" }, isSelected ? "\u203A " : "  ", index + 1, ". ", option.label));
+  })), /* @__PURE__ */ React.createElement(ink.Box, { marginTop: 1 }, /* @__PURE__ */ React.createElement(ink.Text, { dimColor: true }, "Use arrows or 1-2 to select, Enter to confirm")));
+};
+
+async function doAuth() {
+  console.clear();
+  const authMethod = await selectAuthenticationMethod();
+  if (!authMethod) {
+    console.log("\nAuthentication cancelled.\n");
+    return null;
   }
   const secret = new Uint8Array(node_crypto.randomBytes(32));
   const keypair = tweetnacl.box.keyPair.fromSecretKey(secret);
@@ -4167,6 +4041,8 @@ async function authAndSetupMachineIfNeeded() {
   }
   const settings = await updateSettings(async (s) => {
     if (!s.machineId) {
+      const newMachineId = node_crypto.randomUUID();
+      console.log(`[AUTH] No machine ID found, generating new one: ${newMachineId}; We will not create machine on startup since we don't have api client intialized`);
       return {
         ...s,
         machineId: node_crypto.randomUUID()
@@ -4178,101 +4054,33 @@ async function authAndSetupMachineIfNeeded() {
   return { credentials, machineId: settings.machineId };
 }
 
-function startDaemonControlServer({
-  getChildren,
-  stopSession,
-  spawnSession,
-  requestShutdown,
-  onHappySessionWebhook
-}) {
-  return new Promise((resolve) => {
-    const app = fastify({
-      logger: false
-      // We use our own logger
-    });
-    app.setValidatorCompiler(fastifyTypeProviderZod.validatorCompiler);
-    app.setSerializerCompiler(fastifyTypeProviderZod.serializerCompiler);
-    const typed = app.withTypeProvider();
-    typed.post("/session-started", {
-      schema: {
-        body: z.z.object({
-          sessionId: z.z.string(),
-          metadata: z.z.any()
-          // Metadata type from API
-        })
-      }
-    }, async (request, reply) => {
-      const { sessionId, metadata } = request.body;
-      types$1.logger.debug(`[CONTROL SERVER] Session started: ${sessionId}`);
-      onHappySessionWebhook(sessionId, metadata);
-      return { status: "ok" };
-    });
-    typed.post("/list", async (request, reply) => {
-      const children = getChildren();
-      types$1.logger.debug(`[CONTROL SERVER] Listing ${children.length} sessions`);
-      return { children };
-    });
-    typed.post("/stop-session", {
-      schema: {
-        body: z.z.object({
-          sessionId: z.z.string()
-        })
-      }
-    }, async (request, reply) => {
-      const { sessionId } = request.body;
-      types$1.logger.debug(`[CONTROL SERVER] Stop session request: ${sessionId}`);
-      const success = stopSession(sessionId);
-      return { success };
-    });
-    typed.post("/spawn-session", {
-      schema: {
-        body: z.z.object({
-          directory: z.z.string(),
-          sessionId: z.z.string().optional()
-        })
-      }
-    }, async (request, reply) => {
-      const { directory, sessionId } = request.body;
-      types$1.logger.debug(`[CONTROL SERVER] Spawn session request: dir=${directory}, sessionId=${sessionId || "new"}`);
-      const session = await spawnSession(directory, sessionId);
-      if (session) {
-        return {
-          success: true,
-          pid: session.pid,
-          sessionId: session.happySessionId || "pending"
-        };
-      } else {
-        reply.code(500);
-        return { error: "Failed to spawn session" };
-      }
-    });
-    typed.post("/stop", async (request, reply) => {
-      types$1.logger.debug("[CONTROL SERVER] Stop daemon request received");
-      setTimeout(() => {
-        types$1.logger.debug("[CONTROL SERVER] Triggering daemon shutdown");
-        requestShutdown();
-      }, 50);
-      return { status: "stopping" };
-    });
-    app.listen({ port: 0, host: "127.0.0.1" }, (err, address) => {
-      if (err) {
-        types$1.logger.debug("[CONTROL SERVER] Failed to start:", err);
-        throw err;
-      }
-      const port = parseInt(address.split(":").pop());
-      types$1.logger.debug(`[CONTROL SERVER] Started on port ${port}`);
-      resolve({
-        port,
-        stop: async () => {
-          types$1.logger.debug("[CONTROL SERVER] Stopping server");
-          await app.close();
-          types$1.logger.debug("[CONTROL SERVER] Server stopped");
-        }
-      });
-    });
-  });
+function spawnHappyCLI(args, options = {}) {
+  const projectRoot = projectPath();
+  const entrypoint = node_path.join(projectRoot, "dist", "index.mjs");
+  let directory;
+  if ("cwd" in options) {
+    directory = options.cwd;
+  } else {
+    directory = process.cwd();
+  }
+  const fullCommand = `happy ${args.join(" ")}`;
+  types$1.logger.debug(`[DAEMON RUN] Spawning: ${fullCommand} in ${directory}`);
+  const nodeArgs = [
+    "--no-warnings",
+    "--no-deprecation",
+    entrypoint,
+    ...args
+  ];
+  return child_process.spawn("node", nodeArgs, options);
 }
 
+const initialMachineMetadata = {
+  host: os$1.hostname(),
+  platform: os$1.platform(),
+  happyCliVersion: packageJson.version,
+  homeDir: os$1.homedir(),
+  happyHomeDir: types$1.configuration.happyHomeDir
+};
 async function startDaemon() {
   types$1.logger.debug("[DAEMON RUN] Starting daemon process...");
   types$1.logger.debugLargeJson("[DAEMON RUN] Environment", getEnvironmentInfo());
@@ -4281,6 +4089,7 @@ async function startDaemon() {
     try {
       process.kill(runningDaemon.pid, 0);
       types$1.logger.debug("[DAEMON RUN] Daemon already running");
+      console.log(`Daemon already running (PID: ${runningDaemon.pid})`);
       process.exit(0);
     } catch {
       types$1.logger.debug("[DAEMON RUN] Stale state found, cleaning up");
@@ -4335,9 +4144,7 @@ async function startDaemon() {
           "--started-by",
           "daemon"
         ];
-        const fullCommand = `${happyBinPath} ${args.join(" ")}`;
-        types$1.logger.debug(`[DAEMON RUN] Spawning: ${fullCommand} in ${directory}`);
-        const happyProcess = child_process.spawn(happyBinPath, args, {
+        const happyProcess = spawnHappyCLI(args, {
           cwd: directory,
           detached: true,
           // Sessions stay alive when daemon stops
@@ -4442,13 +4249,6 @@ async function startDaemon() {
     };
     await writeDaemonState(fileState);
     types$1.logger.debug("[DAEMON RUN] Daemon state written");
-    const initialMetadata = {
-      host: os$1.hostname(),
-      platform: os$1.platform(),
-      happyCliVersion: packageJson.version,
-      homeDir: os$1.homedir(),
-      happyHomeDir: types$1.configuration.happyHomeDir
-    };
     const initialDaemonState = {
       status: "offline",
       pid: process.pid,
@@ -4456,9 +4256,9 @@ async function startDaemon() {
       startedAt: Date.now()
     };
     const api = new types$1.ApiClient(credentials.token, credentials.secret);
-    const machine = await api.createOrReturnExistingAsIs({
+    const machine = await api.createMachineOrGetExistingAsIs({
       machineId,
-      metadata: initialMetadata,
+      metadata: initialMachineMetadata,
       daemonState: initialDaemonState
     });
     types$1.logger.debug(`[DAEMON RUN] Machine registered: ${machine.id}`);
@@ -4523,6 +4323,247 @@ async function startDaemon() {
   }
 }
 
+async function start(credentials, options = {}) {
+  const workingDirectory = process.cwd();
+  const sessionTag = node_crypto.randomUUID();
+  types$1.logger.debugLargeJson("[START] Happy process started", getEnvironmentInfo());
+  types$1.logger.debug(`[START] Options: startedBy=${options.startedBy}, startingMode=${options.startingMode}`);
+  if (options.startedBy === "daemon" && options.startingMode === "local") {
+    types$1.logger.debug("Daemon spawn requested with local mode - forcing remote mode");
+    options.startingMode = "remote";
+  }
+  const api = new types$1.ApiClient(credentials.token, credentials.secret);
+  let state = {};
+  const settings = await readSettings();
+  let machineId = settings?.machineId;
+  if (!machineId) {
+    console.error(`[START] No machine ID found in settings, which is unexepcted since authAndSetupMachineIfNeeded should have created it, using 'unknown' id instead`);
+    machineId = "unknown";
+  }
+  types$1.logger.debug(`Using machineId: ${machineId}`);
+  let metadata = {
+    path: workingDirectory,
+    host: os.hostname(),
+    version: packageJson.version,
+    os: os.platform(),
+    machineId,
+    homeDir: os.homedir(),
+    happyHomeDir: types$1.configuration.happyHomeDir,
+    startedFromDaemon: options.startedBy === "daemon",
+    hostPid: process.pid,
+    startedBy: options.startedBy || "terminal"
+  };
+  const response = await api.getOrCreateSession({ tag: sessionTag, metadata, state });
+  types$1.logger.debug(`Session created: ${response.id}`);
+  await api.createMachineOrGetExistingAsIs({
+    machineId,
+    metadata: initialMachineMetadata
+  });
+  try {
+    const daemonState = await getDaemonState();
+    if (daemonState?.httpPort) {
+      await notifyDaemonSessionStarted(response.id, metadata);
+      types$1.logger.debug(`[START] Reported session ${response.id} to daemon`);
+    }
+  } catch (error) {
+    types$1.logger.debug("[START] Failed to report to daemon (may not be running):", error);
+  }
+  extractSDKMetadataAsync(async (sdkMetadata) => {
+    types$1.logger.debug("[start] SDK metadata extracted, updating session:", sdkMetadata);
+    try {
+      api.sessionSyncClient(response).updateMetadata((currentMetadata) => ({
+        ...currentMetadata,
+        tools: sdkMetadata.tools,
+        slashCommands: sdkMetadata.slashCommands
+      }));
+      types$1.logger.debug("[start] Session metadata updated with SDK capabilities");
+    } catch (error) {
+      types$1.logger.debug("[start] Failed to update session metadata:", error);
+    }
+  });
+  const session = api.sessionSyncClient(response);
+  const logPath = await types$1.logger.logFilePathPromise;
+  types$1.logger.infoDeveloper(`Session: ${response.id}`);
+  types$1.logger.infoDeveloper(`Logs: ${logPath}`);
+  session.updateAgentState((currentState) => ({
+    ...currentState,
+    controlledByUser: options.startingMode !== "remote"
+  }));
+  const caffeinateStarted = startCaffeinate();
+  if (caffeinateStarted) {
+    types$1.logger.infoDeveloper("Sleep prevention enabled (macOS)");
+  }
+  const messageQueue = new MessageQueue2((mode) => hashObject(mode));
+  registerHandlers(session);
+  let currentPermissionMode = options.permissionMode;
+  let currentModel = options.model;
+  let currentFallbackModel = void 0;
+  let currentCustomSystemPrompt = void 0;
+  let currentAppendSystemPrompt = void 0;
+  let currentAllowedTools = void 0;
+  let currentDisallowedTools = void 0;
+  session.onUserMessage((message) => {
+    let messagePermissionMode = currentPermissionMode;
+    if (message.meta?.permissionMode) {
+      const validModes = ["default", "acceptEdits", "bypassPermissions", "plan"];
+      if (validModes.includes(message.meta.permissionMode)) {
+        messagePermissionMode = message.meta.permissionMode;
+        currentPermissionMode = messagePermissionMode;
+        types$1.logger.debug(`[loop] Permission mode updated from user message to: ${currentPermissionMode}`);
+      } else {
+        types$1.logger.debug(`[loop] Invalid permission mode received: ${message.meta.permissionMode}`);
+      }
+    } else {
+      types$1.logger.debug(`[loop] User message received with no permission mode override, using current: ${currentPermissionMode}`);
+    }
+    let messageModel = currentModel;
+    if (message.meta?.hasOwnProperty("model")) {
+      messageModel = message.meta.model || void 0;
+      currentModel = messageModel;
+      types$1.logger.debug(`[loop] Model updated from user message: ${messageModel || "reset to default"}`);
+    } else {
+      types$1.logger.debug(`[loop] User message received with no model override, using current: ${currentModel || "default"}`);
+    }
+    let messageCustomSystemPrompt = currentCustomSystemPrompt;
+    if (message.meta?.hasOwnProperty("customSystemPrompt")) {
+      messageCustomSystemPrompt = message.meta.customSystemPrompt || void 0;
+      currentCustomSystemPrompt = messageCustomSystemPrompt;
+      types$1.logger.debug(`[loop] Custom system prompt updated from user message: ${messageCustomSystemPrompt ? "set" : "reset to none"}`);
+    } else {
+      types$1.logger.debug(`[loop] User message received with no custom system prompt override, using current: ${currentCustomSystemPrompt ? "set" : "none"}`);
+    }
+    let messageFallbackModel = currentFallbackModel;
+    if (message.meta?.hasOwnProperty("fallbackModel")) {
+      messageFallbackModel = message.meta.fallbackModel || void 0;
+      currentFallbackModel = messageFallbackModel;
+      types$1.logger.debug(`[loop] Fallback model updated from user message: ${messageFallbackModel || "reset to none"}`);
+    } else {
+      types$1.logger.debug(`[loop] User message received with no fallback model override, using current: ${currentFallbackModel || "none"}`);
+    }
+    let messageAppendSystemPrompt = currentAppendSystemPrompt;
+    if (message.meta?.hasOwnProperty("appendSystemPrompt")) {
+      messageAppendSystemPrompt = message.meta.appendSystemPrompt || void 0;
+      currentAppendSystemPrompt = messageAppendSystemPrompt;
+      types$1.logger.debug(`[loop] Append system prompt updated from user message: ${messageAppendSystemPrompt ? "set" : "reset to none"}`);
+    } else {
+      types$1.logger.debug(`[loop] User message received with no append system prompt override, using current: ${currentAppendSystemPrompt ? "set" : "none"}`);
+    }
+    let messageAllowedTools = currentAllowedTools;
+    if (message.meta?.hasOwnProperty("allowedTools")) {
+      messageAllowedTools = message.meta.allowedTools || void 0;
+      currentAllowedTools = messageAllowedTools;
+      types$1.logger.debug(`[loop] Allowed tools updated from user message: ${messageAllowedTools ? messageAllowedTools.join(", ") : "reset to none"}`);
+    } else {
+      types$1.logger.debug(`[loop] User message received with no allowed tools override, using current: ${currentAllowedTools ? currentAllowedTools.join(", ") : "none"}`);
+    }
+    let messageDisallowedTools = currentDisallowedTools;
+    if (message.meta?.hasOwnProperty("disallowedTools")) {
+      messageDisallowedTools = message.meta.disallowedTools || void 0;
+      currentDisallowedTools = messageDisallowedTools;
+      types$1.logger.debug(`[loop] Disallowed tools updated from user message: ${messageDisallowedTools ? messageDisallowedTools.join(", ") : "reset to none"}`);
+    } else {
+      types$1.logger.debug(`[loop] User message received with no disallowed tools override, using current: ${currentDisallowedTools ? currentDisallowedTools.join(", ") : "none"}`);
+    }
+    const specialCommand = parseSpecialCommand(message.content.text);
+    if (specialCommand.type === "compact") {
+      types$1.logger.debug("[start] Detected /compact command");
+      const enhancedMode2 = {
+        permissionMode: messagePermissionMode || "default",
+        model: messageModel,
+        fallbackModel: messageFallbackModel,
+        customSystemPrompt: messageCustomSystemPrompt,
+        appendSystemPrompt: messageAppendSystemPrompt,
+        allowedTools: messageAllowedTools,
+        disallowedTools: messageDisallowedTools
+      };
+      messageQueue.pushIsolateAndClear(specialCommand.originalMessage || message.content.text, enhancedMode2);
+      types$1.logger.debugLargeJson("[start] /compact command pushed to queue:", message);
+      return;
+    }
+    if (specialCommand.type === "clear") {
+      types$1.logger.debug("[start] Detected /clear command");
+      const enhancedMode2 = {
+        permissionMode: messagePermissionMode || "default",
+        model: messageModel,
+        fallbackModel: messageFallbackModel,
+        customSystemPrompt: messageCustomSystemPrompt,
+        appendSystemPrompt: messageAppendSystemPrompt,
+        allowedTools: messageAllowedTools,
+        disallowedTools: messageDisallowedTools
+      };
+      messageQueue.pushIsolateAndClear(specialCommand.originalMessage || message.content.text, enhancedMode2);
+      types$1.logger.debugLargeJson("[start] /compact command pushed to queue:", message);
+      return;
+    }
+    const enhancedMode = {
+      permissionMode: messagePermissionMode || "default",
+      model: messageModel,
+      fallbackModel: messageFallbackModel,
+      customSystemPrompt: messageCustomSystemPrompt,
+      appendSystemPrompt: messageAppendSystemPrompt,
+      allowedTools: messageAllowedTools,
+      disallowedTools: messageDisallowedTools
+    };
+    messageQueue.push(message.content.text, enhancedMode);
+    types$1.logger.debugLargeJson("User message pushed to queue:", message);
+  });
+  const cleanup = async () => {
+    types$1.logger.debug("[START] Received termination signal, cleaning up...");
+    try {
+      if (session) {
+        session.sendSessionDeath();
+        await session.flush();
+        await session.close();
+      }
+      stopCaffeinate();
+      types$1.logger.debug("[START] Cleanup complete, exiting");
+      process.exit(0);
+    } catch (error) {
+      types$1.logger.debug("[START] Error during cleanup:", error);
+      process.exit(1);
+    }
+  };
+  process.on("SIGTERM", cleanup);
+  process.on("SIGINT", cleanup);
+  process.on("uncaughtException", (error) => {
+    types$1.logger.debug("[START] Uncaught exception:", error);
+    cleanup();
+  });
+  process.on("unhandledRejection", (reason) => {
+    types$1.logger.debug("[START] Unhandled rejection:", reason);
+    cleanup();
+  });
+  await loop({
+    path: workingDirectory,
+    model: options.model,
+    permissionMode: options.permissionMode,
+    startingMode: options.startingMode,
+    messageQueue,
+    api,
+    onModeChange: (newMode) => {
+      session.sendSessionEvent({ type: "switch", mode: newMode });
+      session.updateAgentState((currentState) => ({
+        ...currentState,
+        controlledByUser: newMode === "local"
+      }));
+    },
+    onSessionReady: (sessionInstance) => {
+    },
+    mcpServers: {},
+    session,
+    claudeEnvVars: options.claudeEnvVars,
+    claudeArgs: options.claudeArgs
+  });
+  session.sendSessionDeath();
+  types$1.logger.debug("Waiting for socket to flush...");
+  await session.flush();
+  types$1.logger.debug("Closing session...");
+  await session.close();
+  stopCaffeinate();
+  types$1.logger.debug("Stopped sleep prevention");
+  process.exit(0);
+}
+
 function trimIdent(text) {
   const lines = text.split("\n");
   while (lines.length > 0 && lines[0].trim() === "") {
@@ -4868,6 +4909,34 @@ async function handleAuthStatus() {
   }
 }
 
+const DaemonPrompt = ({ onSelect }) => {
+  const [selectedIndex, setSelectedIndex] = React.useState(0);
+  const options = [
+    { value: true, label: "Yes (recommended)", key: "Y" },
+    { value: false, label: "No", key: "N" }
+  ];
+  ink.useInput((input, key) => {
+    const upperInput = input.toUpperCase();
+    if (key.upArrow || key.leftArrow) {
+      setSelectedIndex(0);
+    } else if (key.downArrow || key.rightArrow) {
+      setSelectedIndex(1);
+    } else if (key.return) {
+      onSelect(options[selectedIndex].value);
+    } else if (upperInput === "Y") {
+      onSelect(true);
+    } else if (upperInput === "N") {
+      onSelect(false);
+    } else if (key.escape || key.ctrl && input === "c") {
+      onSelect(false);
+    }
+  });
+  return /* @__PURE__ */ React.createElement(ink.Box, { flexDirection: "column" }, /* @__PURE__ */ React.createElement(ink.Box, { marginBottom: 1 }, /* @__PURE__ */ React.createElement(ink.Text, { bold: true, color: "cyan" }, "\u{1F680} Happy Daemon Setup")), /* @__PURE__ */ React.createElement(ink.Box, { flexDirection: "column", marginBottom: 1 }, /* @__PURE__ */ React.createElement(ink.Text, null, "\u{1F4F1} Happy can run a background service that allows you to:"), /* @__PURE__ */ React.createElement(ink.Text, { color: "cyan" }, "  \u2022 Spawn new conversations from your phone"), /* @__PURE__ */ React.createElement(ink.Text, { color: "cyan" }, "  \u2022 Continue closed conversations remotely"), /* @__PURE__ */ React.createElement(ink.Text, { color: "cyan" }, "  \u2022 Work with Claude while your computer has internet")), /* @__PURE__ */ React.createElement(ink.Box, { marginBottom: 1 }, /* @__PURE__ */ React.createElement(ink.Text, null, "Would you like Happy to start this service automatically?")), /* @__PURE__ */ React.createElement(ink.Box, { flexDirection: "column" }, options.map((option, index) => {
+    const isSelected = selectedIndex === index;
+    return /* @__PURE__ */ React.createElement(ink.Box, { key: option.key }, /* @__PURE__ */ React.createElement(ink.Text, { color: isSelected ? "green" : "gray" }, isSelected ? "\u203A " : "  ", "[", option.key, "] ", option.label));
+  })), /* @__PURE__ */ React.createElement(ink.Box, { marginTop: 1 }, /* @__PURE__ */ React.createElement(ink.Text, { dimColor: true }, "Press Y/N or use arrows + Enter to select")));
+};
+
 (async () => {
   const args = process.argv.slice(2);
   types$1.logger.debug("Starting happy CLI with args: ", process.argv);
@@ -4944,8 +5013,7 @@ async function handleAuthStatus() {
       }
       return;
     } else if (daemonSubcommand === "start") {
-      const happyBinPath = node_path.join(projectPath(), "bin", "happy.mjs");
-      const child = child_process.spawn(happyBinPath, ["daemon", "start-sync"], {
+      const child = spawnHappyCLI(["daemon", "start-sync"], {
         detached: true,
         stdio: "ignore",
         env: process.env
@@ -5133,38 +5201,38 @@ ${chalk.bold.cyan("Claude Code Options (from `claude --help`):")}
       const result = await authAndSetupMachineIfNeeded();
       credentials = result.credentials;
     }
+    const isExperimentalEnabled = ["true", "1", "yes"].includes(process.env.HAPPY_EXPERIMENTAL?.toLowerCase() || "");
     let settings = await readSettings();
-    if (settings && settings.daemonAutoStartWhenRunningHappy === void 0) {
-      console.log(chalk.cyan("\n\u{1F680} Happy Daemon Setup\n"));
-      const rl = node_readline.createInterface({
-        input: process.stdin,
-        output: process.stdout
-      });
-      console.log(chalk.cyan("\n\u{1F4F1} Happy can run a background service that allows you to:"));
-      console.log(chalk.cyan("  \u2022 Spawn new conversations from your phone"));
-      console.log(chalk.cyan("  \u2022 Continue closed conversations remotely"));
-      console.log(chalk.cyan("  \u2022 Work with Claude while your computer has internet\n"));
-      const answer = await new Promise((resolve) => {
-        rl.question(chalk.green("Would you like Happy to start this service automatically? (recommended) [Y/n]: "), resolve);
+    if (isExperimentalEnabled && settings && settings.daemonAutoStartWhenRunningHappy === void 0) {
+      const shouldAutoStart = await new Promise((resolve) => {
+        let hasResolved = false;
+        const onSelect = (autoStart) => {
+          if (!hasResolved) {
+            hasResolved = true;
+            app.unmount();
+            resolve(autoStart);
+          }
+        };
+        const app = ink.render(React.createElement(DaemonPrompt, { onSelect }), {
+          exitOnCtrlC: false,
+          patchConsole: false
+        });
       });
-      rl.close();
-      const shouldAutoStart = answer.toLowerCase() !== "n";
       settings = await updateSettings((settings2) => ({
         ...settings2,
         daemonAutoStartWhenRunningHappy: shouldAutoStart
       }));
       if (shouldAutoStart) {
-        console.log(chalk.green("\u2713 Happy will start the background service automatically"));
+        console.log(chalk.green("\n\u2713 Happy will start the background service automatically"));
         console.log(chalk.gray("  The service will run whenever you use the happy command"));
       } else {
-        console.log(chalk.yellow("  You can enable this later by running: happy daemon install"));
+        console.log(chalk.yellow("\n  You can enable this later by running: happy daemon install"));
       }
     }
-    if (settings && settings.daemonAutoStartWhenRunningHappy) {
+    if (isExperimentalEnabled && settings && settings.daemonAutoStartWhenRunningHappy) {
       types$1.logger.debug("Starting Happy background service...");
       if (!await isDaemonRunning()) {
-        const happyBinPath = node_path.join(projectPath(), "bin", "happy.mjs");
-        const daemonProcess = child_process.spawn(happyBinPath, ["daemon", "start-sync"], {
+        const daemonProcess = spawnHappyCLI(["daemon", "start-sync"], {
           detached: true,
           stdio: "ignore",
           env: process.env