happy-coder 0.1.2 → 0.1.5

package/dist/index.mjs

@@ -1,203 +1,340 @@
+import chalk from 'chalk';
 import axios from 'axios';
-import * as fs from 'node:fs';
-import { existsSync, readFileSync, mkdirSync, writeFileSync } from 'node:fs';
-import { chmod } from 'node:fs/promises';
-import { randomBytes, randomUUID } from 'node:crypto';
-import tweetnacl from 'tweetnacl';
+import { appendFileSync } from 'fs';
 import os, { homedir } from 'node:os';
-import { join, basename } from 'node:path';
-import chalk from 'chalk';
+import { join, resolve, dirname } from 'node:path';
+import { mkdir, watch as watch$1, readFile, writeFile } from 'node:fs/promises';
+import { existsSync, readFileSync, mkdirSync, watch, rmSync } from 'node:fs';
 import { EventEmitter } from 'node:events';
 import { io } from 'socket.io-client';
-import { z } from 'zod';
-import qrcode from 'qrcode-terminal';
+import * as z from 'zod';
+import { z as z$1 } from 'zod';
+import { randomBytes, randomUUID } from 'node:crypto';
+import tweetnacl from 'tweetnacl';
+import { Expo } from 'expo-server-sdk';
+import { query, AbortError } from '@anthropic-ai/claude-code';
 import { spawn } from 'node:child_process';
+import { createInterface } from 'node:readline';
+import { fileURLToPath } from 'node:url';
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { createServer } from 'node:http';
+import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
+import qrcode from 'qrcode-terminal';
 
-function encodeBase64(buffer) {
-  return Buffer.from(buffer).toString("base64");
-}
-function encodeBase64Url(buffer) {
-  return Buffer.from(buffer).toString("base64").replaceAll("+", "-").replaceAll("/", "_").replaceAll("=", "");
-}
-function decodeBase64(base64) {
-  return new Uint8Array(Buffer.from(base64, "base64"));
-}
-function getRandomBytes(size) {
-  return new Uint8Array(randomBytes(size));
-}
-function encrypt(data, secret) {
-  const nonce = getRandomBytes(tweetnacl.secretbox.nonceLength);
-  const encrypted = tweetnacl.secretbox(new TextEncoder().encode(JSON.stringify(data)), nonce, secret);
-  const result = new Uint8Array(nonce.length + encrypted.length);
-  result.set(nonce);
-  result.set(encrypted, nonce.length);
-  return result;
-}
-function decrypt(data, secret) {
-  const nonce = data.slice(0, tweetnacl.secretbox.nonceLength);
-  const encrypted = data.slice(tweetnacl.secretbox.nonceLength);
-  const decrypted = tweetnacl.secretbox.open(encrypted, nonce, secret);
-  if (!decrypted) {
-    return null;
+class Configuration {
+  serverUrl;
+  // Directories and paths (from persistence)
+  happyDir;
+  logsDir;
+  settingsFile;
+  privateKeyFile;
+  constructor(location) {
+    this.serverUrl = process.env.HANDY_SERVER_URL || "https://handy-api.korshakov.org";
+    if (location === "local") {
+      this.happyDir = join(process.cwd(), ".happy");
+    } else {
+      this.happyDir = join(homedir(), ".happy");
+    }
+    this.logsDir = join(this.happyDir, "logs");
+    this.settingsFile = join(this.happyDir, "settings.json");
+    this.privateKeyFile = join(this.happyDir, "access.key");
   }
-  return JSON.parse(new TextDecoder().decode(decrypted));
 }
-function authChallenge(secret) {
-  const keypair = tweetnacl.sign.keyPair.fromSeed(secret);
-  const challenge = getRandomBytes(32);
-  const signature = tweetnacl.sign.detached(challenge, keypair.secretKey);
-  return {
-    challenge,
-    publicKey: keypair.publicKey,
-    signature
-  };
+let configuration = void 0;
+function initializeConfiguration(location) {
+  configuration = new Configuration(location);
 }
 
-async function getOrCreateSecretKey() {
-  const keyPath = join(homedir(), ".handy", "access.key");
-  if (existsSync(keyPath)) {
-    const keyBase642 = readFileSync(keyPath, "utf8").trim();
-    return new Uint8Array(Buffer.from(keyBase642, "base64"));
-  }
-  const secret = getRandomBytes(32);
-  const keyBase64 = encodeBase64(secret);
-  mkdirSync(join(homedir(), ".handy"), { recursive: true });
-  writeFileSync(keyPath, keyBase64);
-  await chmod(keyPath, 384);
-  return secret;
-}
-async function authGetToken(secret) {
-  const { challenge, publicKey, signature } = authChallenge(secret);
-  const response = await axios.post(`https://handy-api.korshakov.org/v1/auth`, {
-    challenge: encodeBase64(challenge),
-    publicKey: encodeBase64(publicKey),
-    signature: encodeBase64(signature)
-  });
-  if (!response.data.success || !response.data.token) {
-    throw new Error("Authentication failed");
+async function getSessionLogPath() {
+  if (!existsSync(configuration.logsDir)) {
+    await mkdir(configuration.logsDir, { recursive: true });
   }
-  return response.data.token;
+  const now = /* @__PURE__ */ new Date();
+  const timestamp = now.toLocaleString("sv-SE", {
+    timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit",
+    second: "2-digit"
+  }).replace(/[: ]/g, "-").replace(/,/g, "");
+  return join(configuration.logsDir, `${timestamp}.log`);
 }
-function generateAppUrl(secret) {
-  const secretBase64Url = encodeBase64Url(secret);
-  return `handy://${secretBase64Url}`;
-}
-
 class Logger {
-  debug(message, ...args) {
-    if (process.env.DEBUG) {
-      this.log("DEBUG" /* DEBUG */, message, ...args);
-    }
+  constructor(logFilePathPromise = getSessionLogPath()) {
+    this.logFilePathPromise = logFilePathPromise;
   }
-  error(message, ...args) {
-    this.log("ERROR" /* ERROR */, message, ...args);
+  // Use local timezone for simplicity of locating the logs,
+  // in practice you will not need absolute timestamps
+  localTimezoneTimestamp() {
+    return (/* @__PURE__ */ new Date()).toLocaleTimeString("en-US", {
+      timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+      hour12: false,
+      hour: "2-digit",
+      minute: "2-digit",
+      second: "2-digit",
+      fractionalSecondDigits: 3
+    });
   }
-  info(message, ...args) {
-    this.log("INFO" /* INFO */, message, ...args);
+  debug(message, ...args) {
+    this.logToFile(`[${this.localTimezoneTimestamp()}]`, message, ...args);
   }
-  warn(message, ...args) {
-    this.log("WARN" /* WARN */, message, ...args);
+  debugLargeJson(message, object, maxStringLength = 100, maxArrayLength = 10) {
+    if (!process.env.DEBUG) {
+      this.debug(`In production, skipping message inspection`);
+    }
+    const truncateStrings = (obj) => {
+      if (typeof obj === "string") {
+        return obj.length > maxStringLength ? obj.substring(0, maxStringLength) + "... [truncated for logs]" : obj;
+      }
+      if (Array.isArray(obj)) {
+        const truncatedArray = obj.map((item) => truncateStrings(item)).slice(0, maxArrayLength);
+        if (obj.length > maxArrayLength) {
+          truncatedArray.push(`... [truncated array for logs up to ${maxArrayLength} items]`);
+        }
+        return truncatedArray;
+      }
+      if (obj && typeof obj === "object") {
+        const result = {};
+        for (const [key, value] of Object.entries(obj)) {
+          if (key === "usage") {
+            continue;
+          }
+          result[key] = truncateStrings(value);
+        }
+        return result;
+      }
+      return obj;
+    };
+    const truncatedObject = truncateStrings(object);
+    const json = JSON.stringify(truncatedObject, null, 2);
+    this.logToFile(`[${this.localTimezoneTimestamp()}]`, message, "\n", json);
   }
-  getTimestamp() {
-    return (/* @__PURE__ */ new Date()).toISOString();
+  info(message, ...args) {
+    this.logToConsole("info", "", message, ...args);
+    this.debug(message, args);
   }
-  log(level, message, ...args) {
-    const timestamp = this.getTimestamp();
-    const prefix = `[${timestamp}] [${level}]`;
+  logToConsole(level, prefix, message, ...args) {
     switch (level) {
-      case "DEBUG" /* DEBUG */: {
+      case "debug": {
         console.log(chalk.gray(prefix), message, ...args);
         break;
       }
-      case "ERROR" /* ERROR */: {
+      case "error": {
         console.error(chalk.red(prefix), message, ...args);
         break;
       }
-      case "INFO" /* INFO */: {
+      case "info": {
         console.log(chalk.blue(prefix), message, ...args);
         break;
       }
-      case "WARN" /* WARN */: {
+      case "warn": {
         console.log(chalk.yellow(prefix), message, ...args);
         break;
       }
+      default: {
+        this.debug("Unknown log level:", level);
+        console.log(chalk.blue(prefix), message, ...args);
+        break;
+      }
     }
   }
+  logToFile(prefix, message, ...args) {
+    const logLine = `${prefix} ${message} ${args.map(
+      (arg) => typeof arg === "string" ? arg : JSON.stringify(arg)
+    ).join(" ")}
+`;
+    this.logFilePathPromise.then((logFilePath) => {
+      try {
+        appendFileSync(logFilePath, logLine);
+      } catch (appendError) {
+        if (process.env.DEBUG) {
+          console.error("Failed to append to log file:", appendError);
+          throw appendError;
+        }
+      }
+    }).catch((error) => {
+      if (process.env.DEBUG) {
+        console.log("This message only visible in DEBUG mode, not in production");
+        console.error("Failed to resolve log file path:", error);
+        console.log(prefix, message, ...args);
+      }
+    });
+  }
+}
+let logger;
+function initLoggerWithGlobalConfiguration() {
+  logger = new Logger();
 }
-const logger = new Logger();
 
-const SessionMessageContentSchema = z.object({
-  c: z.string(),
+const SessionMessageContentSchema = z$1.object({
+  c: z$1.string(),
   // Base64 encoded encrypted content
-  t: z.literal("encrypted")
+  t: z$1.literal("encrypted")
 });
-const UpdateBodySchema = z.object({
-  message: z.object({
-    id: z.string(),
-    seq: z.number(),
+const UpdateBodySchema = z$1.object({
+  message: z$1.object({
+    id: z$1.string(),
+    seq: z$1.number(),
     content: SessionMessageContentSchema
   }),
-  sid: z.string(),
+  sid: z$1.string(),
   // Session ID
-  t: z.literal("new-message")
+  t: z$1.literal("new-message")
 });
-z.object({
-  id: z.string(),
-  seq: z.number(),
-  body: UpdateBodySchema,
-  createdAt: z.number()
+const UpdateSessionBodySchema = z$1.object({
+  t: z$1.literal("update-session"),
+  sid: z$1.string(),
+  metadata: z$1.object({
+    version: z$1.number(),
+    metadata: z$1.string()
+  }).nullish(),
+  agentState: z$1.object({
+    version: z$1.number(),
+    agentState: z$1.string()
+  }).nullish()
 });
-z.object({
-  createdAt: z.number(),
-  id: z.string(),
-  seq: z.number(),
-  updatedAt: z.number()
+z$1.object({
+  id: z$1.string(),
+  seq: z$1.number(),
+  body: z$1.union([UpdateBodySchema, UpdateSessionBodySchema]),
+  createdAt: z$1.number()
 });
-z.object({
+z$1.object({
+  createdAt: z$1.number(),
+  id: z$1.string(),
+  seq: z$1.number(),
+  updatedAt: z$1.number(),
+  metadata: z$1.any(),
+  metadataVersion: z$1.number(),
+  agentState: z$1.any().nullable(),
+  agentStateVersion: z$1.number()
+});
+z$1.object({
   content: SessionMessageContentSchema,
-  createdAt: z.number(),
-  id: z.string(),
-  seq: z.number(),
-  updatedAt: z.number()
+  createdAt: z$1.number(),
+  id: z$1.string(),
+  seq: z$1.number(),
+  updatedAt: z$1.number()
 });
-z.object({
-  session: z.object({
-    id: z.string(),
-    tag: z.string(),
-    seq: z.number(),
-    createdAt: z.number(),
-    updatedAt: z.number()
+z$1.object({
+  session: z$1.object({
+    id: z$1.string(),
+    tag: z$1.string(),
+    seq: z$1.number(),
+    createdAt: z$1.number(),
+    updatedAt: z$1.number(),
+    metadata: z$1.string(),
+    metadataVersion: z$1.number(),
+    agentState: z$1.string().nullable(),
+    agentStateVersion: z$1.number()
   })
 });
-const UserMessageSchema = z.object({
-  role: z.literal("user"),
-  content: z.object({
-    type: z.literal("text"),
-    text: z.string()
-  })
+const UserMessageSchema$1 = z$1.object({
+  role: z$1.literal("user"),
+  content: z$1.object({
+    type: z$1.literal("text"),
+    text: z$1.string()
+  }),
+  localKey: z$1.string().optional(),
+  // Mobile messages include this
+  sentFrom: z$1.enum(["mobile", "cli"]).optional()
+  // Source identifier
 });
-const AgentMessageSchema = z.object({
-  role: z.literal("agent"),
-  content: z.any()
+const AgentMessageSchema = z$1.object({
+  role: z$1.literal("agent"),
+  content: z$1.object({
+    type: z$1.literal("output"),
+    data: z$1.any()
+  })
 });
-z.union([UserMessageSchema, AgentMessageSchema]);
+z$1.union([UserMessageSchema$1, AgentMessageSchema]);
+
+function encodeBase64(buffer) {
+  return Buffer.from(buffer).toString("base64");
+}
+function encodeBase64Url(buffer) {
+  return Buffer.from(buffer).toString("base64").replaceAll("+", "-").replaceAll("/", "_").replaceAll("=", "");
+}
+function decodeBase64(base64) {
+  return new Uint8Array(Buffer.from(base64, "base64"));
+}
+function getRandomBytes(size) {
+  return new Uint8Array(randomBytes(size));
+}
+function encrypt(data, secret) {
+  const nonce = getRandomBytes(tweetnacl.secretbox.nonceLength);
+  const encrypted = tweetnacl.secretbox(new TextEncoder().encode(JSON.stringify(data)), nonce, secret);
+  const result = new Uint8Array(nonce.length + encrypted.length);
+  result.set(nonce);
+  result.set(encrypted, nonce.length);
+  return result;
+}
+function decrypt(data, secret) {
+  const nonce = data.slice(0, tweetnacl.secretbox.nonceLength);
+  const encrypted = data.slice(tweetnacl.secretbox.nonceLength);
+  const decrypted = tweetnacl.secretbox.open(encrypted, nonce, secret);
+  if (!decrypted) {
+    return null;
+  }
+  return JSON.parse(new TextDecoder().decode(decrypted));
+}
+
+async function delay(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+function exponentialBackoffDelay(currentFailureCount, minDelay, maxDelay, maxFailureCount) {
+  let maxDelayRet = minDelay + (maxDelay - minDelay) / maxFailureCount * Math.max(currentFailureCount, maxFailureCount);
+  return Math.round(Math.random() * maxDelayRet);
+}
+function createBackoff(opts) {
+  return async (callback) => {
+    let currentFailureCount = 0;
+    const minDelay = 250;
+    const maxDelay = 1e3;
+    const maxFailureCount = 50;
+    while (true) {
+      try {
+        return await callback();
+      } catch (e) {
+        if (currentFailureCount < maxFailureCount) {
+          currentFailureCount++;
+        }
+        let waitForRequest = exponentialBackoffDelay(currentFailureCount, minDelay, maxDelay, maxFailureCount);
+        await delay(waitForRequest);
+      }
+    }
+  };
+}
+let backoff = createBackoff();
 
 class ApiSessionClient extends EventEmitter {
   token;
   secret;
   sessionId;
+  metadata;
+  metadataVersion;
+  agentState;
+  agentStateVersion;
   socket;
-  receivedMessages = /* @__PURE__ */ new Set();
   pendingMessages = [];
   pendingMessageCallback = null;
-  constructor(token, secret, sessionId) {
+  rpcHandlers = /* @__PURE__ */ new Map();
+  constructor(token, secret, session) {
     super();
     this.token = token;
     this.secret = secret;
-    this.sessionId = sessionId;
-    this.socket = io("https://handy-api.korshakov.org", {
+    this.sessionId = session.id;
+    this.metadata = session.metadata;
+    this.metadataVersion = session.metadataVersion;
+    this.agentState = session.agentState;
+    this.agentStateVersion = session.agentStateVersion;
+    this.socket = io(configuration.serverUrl, {
       auth: {
-        token: this.token
+        token: this.token,
+        clientType: "session-scoped",
+        sessionId: this.sessionId
       },
       path: "/v1/updates",
       reconnection: true,
@@ -209,30 +346,65 @@ class ApiSessionClient extends EventEmitter {
       autoConnect: false
     });
     this.socket.on("connect", () => {
-      logger.info("Socket connected successfully");
+      logger.debug("Socket connected successfully");
+      this.reregisterHandlers();
+    });
+    this.socket.on("rpc-request", async (data, callback) => {
+      try {
+        const method = data.method;
+        const handler = this.rpcHandlers.get(method);
+        if (!handler) {
+          logger.debug("[SOCKET] [RPC] [ERROR] method not found", { method });
+          const errorResponse = { error: "Method not found" };
+          const encryptedError = encodeBase64(encrypt(errorResponse, this.secret));
+          callback(encryptedError);
+          return;
+        }
+        const decryptedParams = decrypt(decodeBase64(data.params), this.secret);
+        const result = await handler(decryptedParams);
+        const encryptedResponse = encodeBase64(encrypt(result, this.secret));
+        callback(encryptedResponse);
+      } catch (error) {
+        logger.debug("[SOCKET] [RPC] [ERROR] Error handling RPC request", { error });
+        const errorResponse = { error: error instanceof Error ? error.message : "Unknown error" };
+        const encryptedError = encodeBase64(encrypt(errorResponse, this.secret));
+        callback(encryptedError);
+      }
     });
     this.socket.on("disconnect", (reason) => {
-      logger.warn("Socket disconnected:", reason);
+      logger.debug("[API] Socket disconnected:", reason);
     });
     this.socket.on("connect_error", (error) => {
-      logger.error("Socket connection error:", error.message);
+      logger.debug("[API] Socket connection error:", error);
     });
     this.socket.on("update", (data) => {
       if (data.body.t === "new-message" && data.body.message.content.t === "encrypted") {
         const body = decrypt(decodeBase64(data.body.message.content.c), this.secret);
-        const result = UserMessageSchema.safeParse(body);
-        if (result.success) {
-          if (!this.receivedMessages.has(data.body.message.id)) {
-            this.receivedMessages.add(data.body.message.id);
-            if (this.pendingMessageCallback) {
-              this.pendingMessageCallback(result.data);
-            } else {
-              this.pendingMessages.push(result.data);
-            }
+        logger.debugLargeJson("[SOCKET] [UPDATE] Received update:", body);
+        const userResult = UserMessageSchema$1.safeParse(body);
+        if (userResult.success) {
+          if (this.pendingMessageCallback) {
+            this.pendingMessageCallback(userResult.data);
+          } else {
+            this.pendingMessages.push(userResult.data);
           }
+        } else {
+          this.emit("message", body);
+        }
+      } else if (data.body.t === "update-session") {
+        if (data.body.metadata && data.body.metadata.version > this.metadataVersion) {
+          this.metadata = decrypt(decodeBase64(data.body.metadata.metadata), this.secret);
+          this.metadataVersion = data.body.metadata.version;
+        }
+        if (data.body.agentState && data.body.agentState.version > this.agentStateVersion) {
+          this.agentState = data.body.agentState.agentState ? decrypt(decodeBase64(data.body.agentState.agentState), this.secret) : null;
+          this.agentStateVersion = data.body.agentState.version;
         }
       }
     });
+    this.socket.on("error", (error) => {
+      logger.debug("[API] Socket error:", error);
+    });
     this.socket.connect();
   }
   onUserMessage(callback) {
@@ -243,30 +415,248 @@ class ApiSessionClient extends EventEmitter {
   }
   /**
    * Send message to session
-   * @param body - Message body
+   * @param body - Message body (can be MessageContent or raw content for agent messages)
    */
-  sendMessage(body) {
-    let content = {
-      role: "agent",
-      content: body
-    };
+  sendClaudeSessionMessage(body) {
+    let content;
+    if (body.type === "user" && typeof body.message.content === "string") {
+      content = {
+        role: "user",
+        content: {
+          type: "text",
+          text: body.message.content
+        }
+      };
+    } else {
+      content = {
+        role: "agent",
+        content: {
+          type: "output",
+          data: body
+          // This wraps the entire Claude message
+        }
+      };
+    }
+    logger.debugLargeJson("[SOCKET] Sending message through socket:", content);
     const encrypted = encodeBase64(encrypt(content, this.secret));
     this.socket.emit("message", {
       sid: this.sessionId,
       message: encrypted
     });
   }
+  /**
+   * Send a ping message to keep the connection alive
+   */
+  keepAlive(thinking) {
+    this.socket.volatile.emit("session-alive", { sid: this.sessionId, time: Date.now(), thinking });
+  }
+  /**
+   * Send session death message
+   */
+  sendSessionDeath() {
+    this.socket.emit("session-end", { sid: this.sessionId, time: Date.now() });
+  }
+  /**
+   * Update session metadata
+   * @param handler - Handler function that returns the updated metadata
+   */
+  updateMetadata(handler) {
+    backoff(async () => {
+      let updated = handler(this.metadata);
+      const answer = await this.socket.emitWithAck("update-metadata", { sid: this.sessionId, expectedVersion: this.metadataVersion, metadata: encodeBase64(encrypt(updated, this.secret)) });
+      if (answer.result === "success") {
+        this.metadata = decrypt(decodeBase64(answer.metadata), this.secret);
+        this.metadataVersion = answer.version;
+      } else if (answer.result === "version-mismatch") {
+        if (answer.version > this.metadataVersion) {
+          this.metadataVersion = answer.version;
+          this.metadata = decrypt(decodeBase64(answer.metadata), this.secret);
+        }
+        throw new Error("Metadata version mismatch");
+      } else if (answer.result === "error") ;
+    });
+  }
+  /**
+   * Update session agent state
+   * @param handler - Handler function that returns the updated agent state
+   */
+  updateAgentState(handler) {
+    console.log("Updating agent state", this.agentState);
+    backoff(async () => {
+      let updated = handler(this.agentState || {});
+      const answer = await this.socket.emitWithAck("update-state", { sid: this.sessionId, expectedVersion: this.agentStateVersion, agentState: updated ? encodeBase64(encrypt(updated, this.secret)) : null });
+      if (answer.result === "success") {
+        this.agentState = answer.agentState ? decrypt(decodeBase64(answer.agentState), this.secret) : null;
+        this.agentStateVersion = answer.version;
+        console.log("Agent state updated", this.agentState);
+      } else if (answer.result === "version-mismatch") {
+        if (answer.version > this.agentStateVersion) {
+          this.agentStateVersion = answer.version;
+          this.agentState = answer.agentState ? decrypt(decodeBase64(answer.agentState), this.secret) : null;
+        }
+        throw new Error("Agent state version mismatch");
+      } else if (answer.result === "error") {
+        console.error("Agent state update error", answer);
+      }
+    });
+  }
+  /**
+   * Set a custom RPC handler for a specific method with encrypted arguments and responses
+   * @param method - The method name to handle
+   * @param handler - The handler function to call when the method is invoked
+   */
+  setHandler(method, handler) {
+    const prefixedMethod = `${this.sessionId}:${method}`;
+    this.rpcHandlers.set(prefixedMethod, handler);
+    this.socket.emit("rpc-register", { method: prefixedMethod });
+    logger.debug("Registered RPC handler", { method, prefixedMethod });
+  }
+  /**
+   * Re-register all RPC handlers after reconnection
+   */
+  reregisterHandlers() {
+    logger.debug("Re-registering RPC handlers after reconnection", {
+      totalMethods: this.rpcHandlers.size
+    });
+    for (const [prefixedMethod] of this.rpcHandlers) {
+      this.socket.emit("rpc-register", { method: prefixedMethod });
+      logger.debug("Re-registered method", { prefixedMethod });
+    }
+  }
+  /**
+   * Wait for socket buffer to flush
+   */
+  async flush() {
+    if (!this.socket.connected) {
+      return;
+    }
+    return new Promise((resolve) => {
+      this.socket.emit("ping", () => {
+        resolve();
+      });
+      setTimeout(() => {
+        resolve();
+      }, 1e4);
+    });
+  }
   async close() {
     this.socket.close();
   }
 }
 
+class PushNotificationClient {
+  token;
+  baseUrl;
+  expo;
+  constructor(token, baseUrl = "https://handy-api.korshakov.org") {
+    this.token = token;
+    this.baseUrl = baseUrl;
+    this.expo = new Expo();
+  }
+  /**
+   * Fetch all push tokens for the authenticated user
+   */
+  async fetchPushTokens() {
+    try {
+      const response = await axios.get(
+        `${this.baseUrl}/v1/push-tokens`,
+        {
+          headers: {
+            "Authorization": `Bearer ${this.token}`,
+            "Content-Type": "application/json"
+          }
+        }
+      );
+      logger.info(`Fetched ${response.data.tokens.length} push tokens`);
+      return response.data.tokens;
+    } catch (error) {
+      logger.debug("[PUSH] [ERROR] Failed to fetch push tokens:", error);
+      throw new Error(`Failed to fetch push tokens: ${error instanceof Error ? error.message : "Unknown error"}`);
+    }
+  }
+  /**
+   * Send push notification via Expo Push API with retry
+   * @param messages - Array of push messages to send
+   */
+  async sendPushNotifications(messages) {
+    logger.info(`Sending ${messages.length} push notifications`);
+    const validMessages = messages.filter((message) => {
+      if (Array.isArray(message.to)) {
+        return message.to.every((token) => Expo.isExpoPushToken(token));
+      }
+      return Expo.isExpoPushToken(message.to);
+    });
+    if (validMessages.length === 0) {
+      logger.info("No valid Expo push tokens found");
+      return;
+    }
+    const chunks = this.expo.chunkPushNotifications(validMessages);
+    for (const chunk of chunks) {
+      const startTime = Date.now();
+      const timeout = 3e5;
+      let attempt = 0;
+      while (true) {
+        try {
+          const ticketChunk = await this.expo.sendPushNotificationsAsync(chunk);
+          const errors = ticketChunk.filter((ticket) => ticket.status === "error");
+          if (errors.length > 0) {
+            logger.debug("[PUSH] Some notifications failed:", errors);
+          }
+          if (errors.length === ticketChunk.length) {
+            throw new Error("All push notifications in chunk failed");
+          }
+          break;
+        } catch (error) {
+          const elapsed = Date.now() - startTime;
+          if (elapsed >= timeout) {
+            logger.debug("[PUSH] Timeout reached after 5 minutes, giving up on chunk");
+            break;
+          }
+          attempt++;
+          const delay = Math.min(1e3 * Math.pow(2, attempt), 3e4);
+          const remainingTime = timeout - elapsed;
+          const waitTime = Math.min(delay, remainingTime);
+          if (waitTime > 0) {
+            logger.debug(`[PUSH] Retrying in ${waitTime}ms (attempt ${attempt})`);
+            await new Promise((resolve) => setTimeout(resolve, waitTime));
+          }
+        }
+      }
+    }
+    logger.info(`Push notifications sent successfully`);
+  }
+  /**
+   * Send a push notification to all registered devices for the user
+   * @param title - Notification title
+   * @param body - Notification body
+   * @param data - Additional data to send with the notification
+   */
+  async sendToAllDevices(title, body, data) {
+    const tokens = await this.fetchPushTokens();
+    if (tokens.length === 0) {
+      logger.info("No push tokens found for user");
+      return;
+    }
+    const messages = tokens.map((token) => ({
+      to: token.token,
+      title,
+      body,
+      data,
+      sound: "default",
+      priority: "high"
+    }));
+    await this.sendPushNotifications(messages);
+  }
+}
+
 class ApiClient {
   token;
   secret;
+  pushClient;
   constructor(token, secret) {
     this.token = token;
     this.secret = secret;
+    this.pushClient = new PushNotificationClient(token);
   }
   /**
    * Create a new session or load existing one with the given tag
@@ -274,8 +664,12 @@ class ApiClient {
   async getOrCreateSession(opts) {
     try {
       const response = await axios.post(
-        `https://handy-api.korshakov.org/v1/sessions`,
-        { tag: opts.tag, metadata: encodeBase64(encrypt(opts.metadata, this.secret)) },
+        `${configuration.serverUrl}/v1/sessions`,
+        {
+          tag: opts.tag,
+          metadata: encodeBase64(encrypt(opts.metadata, this.secret)),
+          agentState: opts.state ? encodeBase64(encrypt(opts.state, this.secret)) : null
+        },
         {
           headers: {
             "Authorization": `Bearer ${this.token}`,
@@ -283,10 +677,21 @@ class ApiClient {
           }
         }
       );
-      logger.info(`Session created/loaded: ${response.data.session.id} (tag: ${opts.tag})`);
-      return response.data;
+      logger.debug(`Session created/loaded: ${response.data.session.id} (tag: ${opts.tag})`);
+      let raw = response.data.session;
+      let session = {
+        id: raw.id,
+        createdAt: raw.createdAt,
+        updatedAt: raw.updatedAt,
+        seq: raw.seq,
+        metadata: decrypt(decodeBase64(raw.metadata), this.secret),
+        metadataVersion: raw.metadataVersion,
+        agentState: raw.agentState ? decrypt(decodeBase64(raw.agentState), this.secret) : null,
+        agentStateVersion: raw.agentStateVersion
+      };
+      return session;
     } catch (error) {
-      logger.error("Failed to get or create session:", error);
+      logger.debug("[API] [ERROR] Failed to get or create session:", error);
       throw new Error(`Failed to get or create session: ${error instanceof Error ? error.message : "Unknown error"}`);
     }
   }
@@ -295,272 +700,1223 @@ class ApiClient {
    * @param id - Session ID
    * @returns Session client
    */
-  session(id) {
-    return new ApiSessionClient(this.token, this.secret, id);
+  session(session) {
+    return new ApiSessionClient(this.token, this.secret, session);
+  }
+  /**
+   * Get push notification client
+   * @returns Push notification client
+   */
+  push() {
+    return this.pushClient;
   }
 }
 
-function displayQRCode(url) {
-  try {
-    logger.info("=".repeat(50));
-    logger.info("\u{1F4F1} Scan this QR code with your mobile device:");
-    logger.info("=".repeat(50));
-    qrcode.generate(url, { small: true }, (qr) => {
-      for (let l of qr.split("\n")) {
-        logger.info("         " + l);
+function formatClaudeMessage(message, onAssistantResult) {
+  logger.debugLargeJson("[CLAUDE] Message from non interactive & remote mode:", message);
+  switch (message.type) {
+    case "system": {
+      const sysMsg = message;
+      if (sysMsg.subtype === "init") {
+        console.log(chalk.gray("\u2500".repeat(60)));
+        console.log(chalk.blue.bold("\u{1F680} Session initialized:"), chalk.cyan(sysMsg.session_id));
+        console.log(chalk.gray(`  Model: ${sysMsg.model}`));
+        console.log(chalk.gray(`  CWD: ${sysMsg.cwd}`));
+        if (sysMsg.tools && sysMsg.tools.length > 0) {
+          console.log(chalk.gray(`  Tools: ${sysMsg.tools.join(", ")}`));
+        }
+        console.log(chalk.gray("\u2500".repeat(60)));
       }
-    });
-    logger.info("=".repeat(50));
-  } catch (error) {
-    logger.error("Failed to generate QR code:", error);
-    logger.info(`\u{1F4CB} Use this URL to connect: ${url}`);
+      break;
+    }
+    case "user": {
+      const userMsg = message;
+      if (userMsg.message && typeof userMsg.message === "object" && "content" in userMsg.message) {
+        const content = userMsg.message.content;
+        if (typeof content === "string") {
+          console.log(chalk.magenta.bold("\n\u{1F464} User:"), content);
+        } else if (Array.isArray(content)) {
+          for (const block of content) {
+            if (block.type === "text") {
+              console.log(chalk.magenta.bold("\n\u{1F464} User:"), block.text);
+            } else if (block.type === "tool_result") {
+              console.log(chalk.green.bold("\n\u2705 Tool Result:"), chalk.gray(`(Tool ID: ${block.tool_use_id})`));
+              if (block.content) {
+                const outputStr = typeof block.content === "string" ? block.content : JSON.stringify(block.content, null, 2);
+                const maxLength = 200;
+                if (outputStr.length > maxLength) {
+                  console.log(outputStr.substring(0, maxLength) + chalk.gray("\n... (truncated)"));
+                } else {
+                  console.log(outputStr);
+                }
+              }
+            }
+          }
+        } else {
+          console.log(chalk.magenta.bold("\n\u{1F464} User:"), JSON.stringify(content, null, 2));
+        }
+      }
+      break;
+    }
+    case "assistant": {
+      const assistantMsg = message;
+      if (assistantMsg.message && assistantMsg.message.content) {
+        console.log(chalk.cyan.bold("\n\u{1F916} Assistant:"));
+        for (const block of assistantMsg.message.content) {
+          if (block.type === "text") {
+            console.log(block.text);
+          } else if (block.type === "tool_use") {
+            console.log(chalk.yellow.bold(`
+\u{1F527} Tool: ${block.name}`));
+            if (block.input) {
+              const inputStr = JSON.stringify(block.input, null, 2);
+              const maxLength = 500;
+              if (inputStr.length > maxLength) {
+                console.log(chalk.gray("Input:"), inputStr.substring(0, maxLength) + chalk.gray("\n... (truncated)"));
+              } else {
+                console.log(chalk.gray("Input:"), inputStr);
+              }
+            }
+          }
+        }
+      }
+      break;
+    }
+    case "result": {
+      const resultMsg = message;
+      if (resultMsg.subtype === "success") {
+        if ("result" in resultMsg && resultMsg.result) {
+          console.log(chalk.green.bold("\n\u2728 Summary:"));
+          console.log(resultMsg.result);
+        }
+        if (resultMsg.usage) {
+          console.log(chalk.gray("\n\u{1F4CA} Session Stats:"));
+          console.log(chalk.gray(`  \u2022 Turns: ${resultMsg.num_turns}`));
+          console.log(chalk.gray(`  \u2022 Input tokens: ${resultMsg.usage.input_tokens}`));
+          console.log(chalk.gray(`  \u2022 Output tokens: ${resultMsg.usage.output_tokens}`));
+          if (resultMsg.usage.cache_read_input_tokens) {
+            console.log(chalk.gray(`  \u2022 Cache read tokens: ${resultMsg.usage.cache_read_input_tokens}`));
+          }
+          if (resultMsg.usage.cache_creation_input_tokens) {
+            console.log(chalk.gray(`  \u2022 Cache creation tokens: ${resultMsg.usage.cache_creation_input_tokens}`));
+          }
+          console.log(chalk.gray(`  \u2022 Cost: $${resultMsg.total_cost_usd.toFixed(4)}`));
+          console.log(chalk.gray(`  \u2022 Duration: ${resultMsg.duration_ms}ms`));
+          console.log(chalk.gray("\n\u{1F440} Back already?"));
+          console.log(chalk.green("\u{1F449} Press any key to continue your session in `claude`"));
+          if (onAssistantResult) {
+            Promise.resolve(onAssistantResult(resultMsg)).catch((err) => {
+              logger.debug("Error in onAssistantResult callback:", err);
+            });
+          }
+        }
+      } else if (resultMsg.subtype === "error_max_turns") {
+        console.log(chalk.red.bold("\n\u274C Error: Maximum turns reached"));
+        console.log(chalk.gray(`Completed ${resultMsg.num_turns} turns`));
+      } else if (resultMsg.subtype === "error_during_execution") {
+        console.log(chalk.red.bold("\n\u274C Error during execution"));
+        console.log(chalk.gray(`Completed ${resultMsg.num_turns} turns before error`));
+        logger.debugLargeJson("[RESULT] Error during execution", resultMsg);
+      }
+      break;
+    }
+    default: {
+      const exhaustiveCheck = message;
+      if (process.env.DEBUG) {
+        console.log(chalk.gray(`[Unknown message type]`), exhaustiveCheck);
+      }
+    }
   }
 }
+function printDivider() {
+  console.log(chalk.gray("\u2550".repeat(60)));
+}
 
-function claudePath() {
-  if (fs.existsSync(process.env.HOME + "/.claude/local/claude")) {
-    return process.env.HOME + "/.claude/local/claude";
-  } else {
-    return "claude";
+function claudeCheckSession(sessionId, path) {
+  const projectName = resolve(path).replace(/\//g, "-");
+  const projectDir = join(homedir(), ".claude", "projects", projectName);
+  const sessionFile = join(projectDir, `${sessionId}.jsonl`);
+  const sessionExists = existsSync(sessionFile);
+  if (!sessionExists) {
+    logger.debug(`[claudeCheckSession] Path ${sessionFile} does not exist`);
+    return false;
   }
+  const sessionData = readFileSync(sessionFile, "utf-8").split("\n");
+  const hasGoodMessage = !!sessionData.find((v) => {
+    try {
+      return typeof JSON.parse(v).uuid === "string";
+    } catch (e) {
+      return false;
+    }
+  });
+  return hasGoodMessage;
 }
 
-async function* claude(options) {
-  const args = buildArgs(options);
-  const path = claudePath();
-  logger.info("Spawning Claude CLI with args:", args);
-  const process = spawn(path, args, {
-    cwd: options.workingDirectory,
-    stdio: ["pipe", "pipe", "pipe"],
-    shell: false
-  });
-  process.stdin?.end();
-  let outputBuffer = "";
-  let stderrBuffer = "";
-  let processExited = false;
-  const outputQueue = [];
-  let outputResolve = null;
-  process.stdout?.on("data", (data) => {
-    outputBuffer += data.toString();
-    const lines = outputBuffer.split("\n");
-    outputBuffer = lines.pop() || "";
-    for (const line of lines) {
-      if (line.trim()) {
-        try {
-          const json = JSON.parse(line);
-          outputQueue.push({ type: "json", data: json });
-        } catch {
-          outputQueue.push({ type: "text", data: line });
-        }
-        if (outputResolve) {
-          outputResolve();
-          outputResolve = null;
-        }
+async function claudeRemote(opts) {
+  let startFrom = opts.sessionId;
+  if (opts.sessionId && !claudeCheckSession(opts.sessionId, opts.path)) {
+    startFrom = null;
+  }
+  const abortController = new AbortController();
+  const sdkOptions = {
+    cwd: opts.path,
+    resume: startFrom ?? void 0,
+    mcpServers: opts.mcpServers,
+    permissionPromptToolName: opts.permissionPromptToolName,
+    executable: "node",
+    abortController
+  };
+  let aborted = false;
+  let response;
+  opts.abort.addEventListener("abort", () => {
+    if (!aborted) {
+      aborted = true;
+      if (response) {
+        (async () => {
+          try {
+            const r = await response.interrupt();
+          } catch (e) {
+          }
+          abortController.abort();
+        })();
+      } else {
+        abortController.abort();
       }
     }
   });
-  process.stderr?.on("data", (data) => {
-    stderrBuffer += data.toString();
-    const lines = stderrBuffer.split("\n");
-    stderrBuffer = lines.pop() || "";
-    for (const line of lines) {
-      if (line.trim()) {
-        outputQueue.push({ type: "error", error: line });
-        if (outputResolve) {
-          outputResolve();
-          outputResolve = null;
-        }
+  logger.debug(`[claudeRemote] Starting query with messages`);
+  response = query({
+    prompt: opts.messages,
+    abortController,
+    options: sdkOptions
+  });
+  if (opts.interruptController) {
+    opts.interruptController.register(async () => {
+      logger.debug("[claudeRemote] Interrupting Claude via SDK");
+      await response.interrupt();
+    });
+  }
+  printDivider();
+  try {
+    logger.debug(`[claudeRemote] Starting to iterate over response`);
+    for await (const message of response) {
+      logger.debug(`[claudeRemote] Received message from SDK: ${message.type}`);
+      formatClaudeMessage(message, opts.onAssistantResult);
+      if (message.type === "system" && message.subtype === "init") {
+        const projectName = resolve(opts.path).replace(/\//g, "-");
+        const projectDir = join(homedir(), ".claude", "projects", projectName);
+        mkdirSync(projectDir, { recursive: true });
+        const watcher = watch(projectDir).on("change", (_, filename) => {
+          if (filename === `${message.session_id}.jsonl`) {
+            opts.onSessionFound(message.session_id);
+            watcher.close();
+          }
+        });
       }
     }
-  });
-  process.on("exit", (code, signal) => {
-    processExited = true;
-    outputQueue.push({ type: "exit", code, signal });
-    if (outputResolve) {
-      outputResolve();
-      outputResolve = null;
+    logger.debug(`[claudeRemote] Finished iterating over response`);
+  } catch (e) {
+    if (abortController.signal.aborted) {
+      logger.debug(`[claudeRemote] Aborted`);
     }
-  });
-  process.on("error", (error) => {
-    outputQueue.push({ type: "error", error: error.message });
-    processExited = true;
-    if (outputResolve) {
-      outputResolve();
-      outputResolve = null;
+    if (e instanceof AbortError) {
+      logger.debug(`[claudeRemote] Aborted`);
+    } else {
+      throw e;
+    }
+  } finally {
+    if (opts.interruptController) {
+      opts.interruptController.unregister();
+    }
+  }
+  printDivider();
+  logger.debug(`[claudeRemote] Function completed`);
+}
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+async function claudeLocal(opts) {
+  const projectName = resolve(opts.path).replace(/\//g, "-");
+  const projectDir = join(homedir(), ".claude", "projects", projectName);
+  mkdirSync(projectDir, { recursive: true });
+  const watcher = watch(projectDir);
+  let resolvedSessionId = null;
+  const detectedIdsRandomUUID = /* @__PURE__ */ new Set();
+  const detectedIdsFileSystem = /* @__PURE__ */ new Set();
+  watcher.on("change", (event, filename) => {
+    if (typeof filename === "string" && filename.toLowerCase().endsWith(".jsonl")) {
+      logger.debug("change", event, filename);
+      const sessionId = filename.replace(".jsonl", "");
+      if (detectedIdsFileSystem.has(sessionId)) {
+        return;
+      }
+      detectedIdsFileSystem.add(sessionId);
+      if (resolvedSessionId) {
+        return;
+      }
+      if (detectedIdsRandomUUID.has(sessionId)) {
+        resolvedSessionId = sessionId;
+        opts.onSessionFound(sessionId);
+      }
     }
   });
-  while (!processExited || outputQueue.length > 0) {
-    if (outputQueue.length === 0) {
-      await new Promise((resolve) => {
-        outputResolve = resolve;
-        if (outputQueue.length > 0 || processExited) {
-          resolve();
-          outputResolve = null;
+  let startFrom = opts.sessionId;
+  if (opts.sessionId && !claudeCheckSession(opts.sessionId, opts.path)) {
+    startFrom = null;
+  }
+  try {
+    process.stdin.pause();
+    await new Promise((r, reject) => {
+      const args = [];
+      if (startFrom) {
+        args.push("--resume", startFrom);
+      }
+      const claudeCliPath = process.env.HAPPY_CLAUDE_CLI_PATH || resolve(join(__dirname, "..", "scripts", "claudeInteractiveLaunch.cjs"));
+      const child = spawn("node", [claudeCliPath, ...args], {
+        stdio: ["inherit", "inherit", "inherit", "pipe"],
+        signal: opts.abort,
+        cwd: opts.path
+      });
+      if (child.stdio[3]) {
+        const rl = createInterface({
+          input: child.stdio[3],
+          crlfDelay: Infinity
+        });
+        rl.on("line", (line) => {
+          const sessionMatch = line.match(/[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}/i);
+          if (sessionMatch) {
+            detectedIdsRandomUUID.add(sessionMatch[0]);
+            if (resolvedSessionId) {
+              return;
+            }
+            if (detectedIdsFileSystem.has(sessionMatch[0])) {
+              resolvedSessionId = sessionMatch[0];
+              opts.onSessionFound(sessionMatch[0]);
+            }
+          }
+        });
+        rl.on("error", (err) => {
+          console.error("Error reading from fd 3:", err);
+        });
+      }
+      child.on("error", (error) => {
+      });
+      child.on("exit", (code, signal) => {
+        if (signal === "SIGTERM" && opts.abort.aborted) {
+          r();
+        } else if (signal) {
+          reject(new Error(`Process terminated with signal: ${signal}`));
+        } else {
+          r();
         }
       });
+    });
+  } finally {
+    watcher.close();
+    process.stdin.resume();
+  }
+  return resolvedSessionId;
+}
+
+class MessageQueue {
+  queue = [];
+  waiters = [];
+  closed = false;
+  closePromise;
+  closeResolve;
+  constructor() {
+    this.closePromise = new Promise((resolve) => {
+      this.closeResolve = resolve;
+    });
+  }
+  /**
+   * Push a message to the queue
+   */
+  push(message) {
+    if (this.closed) {
+      throw new Error("Cannot push to closed queue");
     }
-    while (outputQueue.length > 0) {
-      const output = outputQueue.shift();
-      yield output;
+    logger.debug(`[MessageQueue] push() called. Waiters: ${this.waiters.length}, Queue size before: ${this.queue.length}`);
+    const waiter = this.waiters.shift();
+    if (waiter) {
+      logger.debug(`[MessageQueue] Found waiter! Delivering message directly: "${message}"`);
+      waiter({
+        type: "user",
+        message: {
+          role: "user",
+          content: message
+        },
+        parent_tool_use_id: null,
+        session_id: ""
+      });
+    } else {
+      logger.debug(`[MessageQueue] No waiter found. Adding to queue: "${message}"`);
+      this.queue.push({
+        type: "user",
+        message: {
+          role: "user",
+          content: message
+        },
+        parent_tool_use_id: null,
+        session_id: ""
+      });
     }
+    logger.debug(`[MessageQueue] push() completed. Waiters: ${this.waiters.length}, Queue size after: ${this.queue.length}`);
   }
-  if (outputBuffer.trim()) {
-    try {
-      const json = JSON.parse(outputBuffer);
-      yield { type: "json", data: json };
-    } catch {
-      yield { type: "text", data: outputBuffer };
-    }
-  }
-  if (stderrBuffer.trim()) {
-    yield { type: "error", error: stderrBuffer };
-  }
-}
-function buildArgs(options) {
-  const args = [
-    "--print",
-    options.command,
-    "--output-format",
-    "stream-json",
-    "--verbose"
-  ];
-  if (options.model) {
-    args.push("--model", options.model);
-  }
-  if (options.permissionMode) {
-    const modeMap = {
-      "auto": "acceptEdits",
-      "default": "default",
-      "plan": "bypassPermissions"
-    };
-    args.push("--permission-mode", modeMap[options.permissionMode]);
+  /**
+   * Close the queue - no more messages can be pushed
+   */
+  close() {
+    logger.debug(`[MessageQueue] close() called. Waiters: ${this.waiters.length}`);
+    this.closed = true;
+    this.closeResolve?.();
   }
-  if (options.skipPermissions) {
-    args.push("--dangerously-skip-permissions");
+  /**
+   * Check if the queue is closed
+   */
+  isClosed() {
+    return this.closed;
   }
-  if (options.sessionId) {
-    args.push("--resume", options.sessionId);
+  /**
+   * Get the current queue size
+   */
+  size() {
+    return this.queue.length;
+  }
+  /**
+   * Async iterator implementation
+   */
+  async *[Symbol.asyncIterator]() {
+    logger.debug(`[MessageQueue] Iterator started`);
+    while (true) {
+      const message = this.queue.shift();
+      if (message !== void 0) {
+        logger.debug(`[MessageQueue] Iterator yielding queued message`);
+        yield message;
+        continue;
+      }
+      if (this.closed) {
+        logger.debug(`[MessageQueue] Iterator ending - queue closed`);
+        return;
+      }
+      logger.debug(`[MessageQueue] Iterator waiting for next message...`);
+      const nextMessage = await this.waitForNext();
+      if (nextMessage === void 0) {
+        logger.debug(`[MessageQueue] Iterator ending - no more messages`);
+        return;
+      }
+      logger.debug(`[MessageQueue] Iterator yielding waited message`);
+      yield nextMessage;
+    }
+  }
+  /**
+   * Wait for the next message or queue closure
+   */
+  waitForNext() {
+    return new Promise((resolve) => {
+      if (this.closed) {
+        logger.debug(`[MessageQueue] waitForNext() called but queue is closed`);
+        resolve(void 0);
+        return;
+      }
+      const waiter = (value) => resolve(value);
+      this.waiters.push(waiter);
+      logger.debug(`[MessageQueue] waitForNext() adding waiter. Total waiters: ${this.waiters.length}`);
+      this.closePromise?.then(() => {
+        const index = this.waiters.indexOf(waiter);
+        if (index !== -1) {
+          this.waiters.splice(index, 1);
+          logger.debug(`[MessageQueue] waitForNext() waiter removed due to close. Remaining waiters: ${this.waiters.length}`);
+          resolve(void 0);
+        }
+      });
+    });
   }
-  return args;
 }
 
-function startClaudeLoop(opts, session) {
-  let exiting = false;
-  const messageQueue = [];
-  let messageResolve = null;
-  let sessionId;
-  let promise = (async () => {
-    session.onUserMessage((message) => {
-      messageQueue.push(message);
-      if (messageResolve) {
-        messageResolve();
-        messageResolve = null;
+class InvalidateSync {
+  _invalidated = false;
+  _invalidatedDouble = false;
+  _stopped = false;
+  _command;
+  _pendings = [];
+  constructor(command) {
+    this._command = command;
+  }
+  invalidate() {
+    if (this._stopped) {
+      return;
+    }
+    if (!this._invalidated) {
+      this._invalidated = true;
+      this._invalidatedDouble = false;
+      this._doSync();
+    } else {
+      if (!this._invalidatedDouble) {
+        this._invalidatedDouble = true;
       }
+    }
+  }
+  async invalidateAndAwait() {
+    if (this._stopped) {
+      return;
+    }
+    await new Promise((resolve) => {
+      this._pendings.push(resolve);
+      this.invalidate();
     });
-    while (!exiting) {
-      if (messageQueue.length > 0) {
-        const message = messageQueue.shift();
-        if (message) {
-          for await (const output of claude({
-            command: message.content.text,
-            workingDirectory: opts.path,
-            model: opts.model,
-            permissionMode: opts.permissionMode,
-            sessionId
-          })) {
-            if (output.type === "exit") {
-              if (output.code !== 0 || output.code === void 0) {
-                session.sendMessage({
-                  content: {
-                    type: "error",
-                    error: output.error,
-                    code: output.code
-                  },
-                  role: "assistant"
-                });
-              }
-              break;
-            }
-            if (output.type === "json") {
-              session.sendMessage({
-                data: output.data,
-                type: "output"
-              });
-            }
-            if (output.type === "json" && output.data.type === "system" && output.data.subtype === "init") {
-              sessionId = output.data.sessionId;
-            }
+  }
+  stop() {
+    if (this._stopped) {
+      return;
+    }
+    this._notifyPendings();
+    this._stopped = true;
+  }
+  _notifyPendings = () => {
+    for (let pending of this._pendings) {
+      pending();
+    }
+    this._pendings = [];
+  };
+  _doSync = async () => {
+    await backoff(async () => {
+      if (this._stopped) {
+        return;
+      }
+      await this._command();
+    });
+    if (this._stopped) {
+      this._notifyPendings();
+      return;
+    }
+    if (this._invalidatedDouble) {
+      this._invalidatedDouble = false;
+      this._doSync();
+    } else {
+      this._invalidated = false;
+      this._notifyPendings();
+    }
+  };
+}
+
+const UsageSchema = z$1.object({
+  input_tokens: z$1.number().int().nonnegative(),
+  cache_creation_input_tokens: z$1.number().int().nonnegative().optional(),
+  cache_read_input_tokens: z$1.number().int().nonnegative().optional(),
+  output_tokens: z$1.number().int().nonnegative(),
+  service_tier: z$1.string().optional()
+});
+const TextContentSchema = z$1.object({
+  type: z$1.literal("text"),
+  text: z$1.string()
+});
+const ThinkingContentSchema = z$1.object({
+  type: z$1.literal("thinking"),
+  thinking: z$1.string(),
+  signature: z$1.string()
+});
+const ToolUseContentSchema = z$1.object({
+  type: z$1.literal("tool_use"),
+  id: z$1.string(),
+  name: z$1.string(),
+  input: z$1.unknown()
+  // Tool-specific input parameters
+});
+const ToolResultContentSchema = z$1.object({
+  tool_use_id: z$1.string(),
+  type: z$1.literal("tool_result"),
+  content: z$1.union([
+    z$1.string(),
+    // For simple string responses
+    z$1.array(TextContentSchema)
+    // For structured content blocks (typically text)
+  ]),
+  is_error: z$1.boolean().optional()
+});
+const ContentSchema = z$1.union([
+  TextContentSchema,
+  ThinkingContentSchema,
+  ToolUseContentSchema,
+  ToolResultContentSchema
+]);
+const UserMessageSchema = z$1.object({
+  role: z$1.literal("user"),
+  content: z$1.union([
+    z$1.string(),
+    // Simple string content
+    z$1.array(z$1.union([ToolResultContentSchema, TextContentSchema]))
+  ])
+});
+const AssistantMessageSchema = z$1.object({
+  id: z$1.string(),
+  type: z$1.literal("message"),
+  role: z$1.literal("assistant"),
+  model: z$1.string(),
+  content: z$1.array(ContentSchema),
+  stop_reason: z$1.string().nullable(),
+  stop_sequence: z$1.string().nullable(),
+  usage: UsageSchema
+});
+const BaseEntrySchema = z$1.object({
+  cwd: z$1.string(),
+  sessionId: z$1.string(),
+  version: z$1.string(),
+  uuid: z$1.string(),
+  timestamp: z$1.string().datetime(),
+  parent_tool_use_id: z$1.string().nullable().optional()
+});
+const SummaryEntrySchema = z$1.object({
+  type: z$1.literal("summary"),
+  summary: z$1.string(),
+  leafUuid: z$1.string()
+});
+const UserEntrySchema = BaseEntrySchema.extend({
+  type: z$1.literal("user"),
+  message: UserMessageSchema,
+  isMeta: z$1.boolean().optional(),
+  toolUseResult: z$1.unknown().optional()
+  // Present when user responds to tool use
+});
+const AssistantEntrySchema = BaseEntrySchema.extend({
+  type: z$1.literal("assistant"),
+  message: AssistantMessageSchema,
+  requestId: z$1.string().optional()
+});
+const SystemEntrySchema = BaseEntrySchema.extend({
+  type: z$1.literal("system"),
+  content: z$1.string(),
+  isMeta: z$1.boolean().optional(),
+  level: z$1.string().optional(),
+  parentUuid: z$1.string().optional(),
+  isSidechain: z$1.boolean().optional(),
+  userType: z$1.string().optional()
+});
+const RawJSONLinesSchema = z$1.discriminatedUnion("type", [
+  UserEntrySchema,
+  AssistantEntrySchema,
+  SummaryEntrySchema,
+  SystemEntrySchema
+]);
+
+function createSessionScanner(opts) {
+  const projectName = resolve(opts.workingDirectory).replace(/\//g, "-");
+  const projectDir = join(homedir(), ".claude", "projects", projectName);
+  let finishedSessions = /* @__PURE__ */ new Set();
+  let pendingSessions = /* @__PURE__ */ new Set();
+  let currentSessionId = null;
+  let currentSessionWatcherAbortController = null;
+  let processedMessages = /* @__PURE__ */ new Set();
+  const sync = new InvalidateSync(async () => {
+    let sessions = [];
+    for (let p of pendingSessions) {
+      sessions.push(p);
+    }
+    if (currentSessionId) {
+      sessions.push(currentSessionId);
+    }
+    let processSessionFile = async (sessionId) => {
+      const expectedSessionFile = join(projectDir, `${sessionId}.jsonl`);
+      let file;
+      try {
+        file = await readFile(expectedSessionFile, "utf-8");
+      } catch (error) {
+        return;
+      }
+      let lines = file.split("\n");
+      for (let l of lines) {
+        try {
+          let message = JSON.parse(l);
+          let parsed = RawJSONLinesSchema.safeParse(message);
+          if (!parsed.success) {
+            logger.debugLargeJson(`[SESSION_SCANNER] Failed to parse message`, message);
+            continue;
           }
+          let key = getMessageKey(parsed.data);
+          if (processedMessages.has(key)) {
+            continue;
+          }
+          processedMessages.add(key);
+          logger.debugLargeJson(`[SESSION_SCANNER] Processing message`, parsed.data);
+          logger.debug(`[SESSION_SCANNER] Message key (new): ${key}`);
+          opts.onMessage(parsed.data);
+        } catch (e) {
+          continue;
         }
       }
-      await new Promise((resolve) => {
-        messageResolve = resolve;
+    };
+    for (let session of sessions) {
+      await processSessionFile(session);
+    }
+    for (let p of sessions) {
+      if (pendingSessions.has(p)) {
+        pendingSessions.delete(p);
+        finishedSessions.add(p);
+      }
+    }
+    currentSessionWatcherAbortController?.abort();
+    currentSessionWatcherAbortController = new AbortController();
+    void (async () => {
+      if (currentSessionId) {
+        const sessionFile = join(projectDir, `${currentSessionId}.jsonl`);
+        try {
+          for await (const change of watch$1(sessionFile, { persistent: true, signal: currentSessionWatcherAbortController.signal })) {
+            await processSessionFile(currentSessionId);
+          }
+        } catch (error) {
+          if (error.name !== "AbortError") {
+            logger.debug(`[SESSION_SCANNER] Watch error: ${error.message}`);
+          }
+        }
+      }
+    })();
+  });
+  const intervalId = setInterval(() => {
+    sync.invalidate();
+  }, 3e3);
+  return {
+    refresh: () => sync.invalidate(),
+    cleanup: () => {
+      clearInterval(intervalId);
+      currentSessionWatcherAbortController?.abort();
+    },
+    onNewSession: (sessionId) => {
+      if (currentSessionId === sessionId) {
+        return;
+      }
+      if (finishedSessions.has(sessionId)) {
+        return;
+      }
+      if (pendingSessions.has(sessionId)) {
+        return;
+      }
+      if (currentSessionId) {
+        pendingSessions.add(currentSessionId);
+      }
+      currentSessionId = sessionId;
+      sync.invalidate();
+    }
+  };
+}
+function getMessageKey(message) {
+  if (message.type === "user") {
+    return `user:${message.uuid}`;
+  } else if (message.type === "assistant") {
+    const { usage, ...messageWithoutUsage } = message.message;
+    return stableStringify(messageWithoutUsage);
+  } else if (message.type === "summary") {
+    return `summary:${message.leafUuid}`;
+  } else if (message.type === "system") {
+    return `system:${message.uuid}`;
+  }
+  return `unknown:<error, this should be unreachable>`;
+}
+function stableStringify(obj) {
+  return JSON.stringify(sortKeys(obj), null, 2);
+}
+function sortKeys(value) {
+  if (Array.isArray(value)) {
+    return value.map(sortKeys);
+  } else if (value && typeof value === "object" && value.constructor === Object) {
+    return Object.keys(value).sort().reduce((result, key) => {
+      result[key] = sortKeys(value[key]);
+      return result;
+    }, {});
+  } else {
+    return value;
+  }
+}
+
+async function loop(opts) {
+  let mode = "interactive";
+  let currentMessageQueue = new MessageQueue();
+  let sessionId = null;
+  let onMessage = null;
+  let seenRemoteUserMessageCounters = /* @__PURE__ */ new Map();
+  opts.session.onUserMessage((message) => {
+    logger.debugLargeJson("User message pushed to queue:", message);
+    currentMessageQueue.push(message.content.text);
+    seenRemoteUserMessageCounters.set(message.content.text, (seenRemoteUserMessageCounters.get(message.content.text) || 0) + 1);
+    if (onMessage) {
+      onMessage();
+    }
+  });
+  const sessionScanner = createSessionScanner({
+    workingDirectory: opts.path,
+    onMessage: (message) => {
+      if (message.type === "user" && typeof message.message.content === "string") {
+        const currentCounter = seenRemoteUserMessageCounters.get(message.message.content);
+        if (currentCounter && currentCounter > 0) {
+          seenRemoteUserMessageCounters.set(message.message.content, currentCounter - 1);
+          return;
+        }
+      }
+      opts.session.sendClaudeSessionMessage(message);
+    }
+  });
+  let onSessionFound = (newSessionId) => {
+    sessionId = newSessionId;
+    sessionScanner.onNewSession(newSessionId);
+  };
+  while (true) {
+    if (currentMessageQueue.size() > 0) {
+      mode = "remote";
+      continue;
+    }
+    if (mode === "interactive") {
+      let abortedOutside = false;
+      const interactiveAbortController = new AbortController();
+      opts.session.setHandler("switch", () => {
+        if (!interactiveAbortController.signal.aborted) {
+          abortedOutside = true;
+          mode = "remote";
+          interactiveAbortController.abort();
+        }
+      });
+      onMessage = () => {
+        if (!interactiveAbortController.signal.aborted) {
+          abortedOutside = true;
+          mode = "remote";
+          interactiveAbortController.abort();
+        }
+        onMessage = null;
+      };
+      await claudeLocal({
+        path: opts.path,
+        sessionId,
+        onSessionFound,
+        abort: interactiveAbortController.signal
       });
+      onMessage = null;
+      if (!abortedOutside) {
+        return;
+      }
+      if (mode !== "interactive") {
+        console.log("Switching to remote mode...");
+      }
+    }
+    if (mode === "remote") {
+      logger.debug("Starting " + sessionId);
+      const remoteAbortController = new AbortController();
+      opts.session.setHandler("abort", () => {
+        if (!remoteAbortController.signal.aborted) {
+          remoteAbortController.abort();
+        }
+      });
+      const abortHandler = () => {
+        if (!remoteAbortController.signal.aborted) {
+          mode = "interactive";
+          remoteAbortController.abort();
+        }
+        process.stdin.setRawMode(false);
+      };
+      process.stdin.resume();
+      process.stdin.setRawMode(true);
+      process.stdin.setEncoding("utf8");
+      process.stdin.on("data", abortHandler);
+      try {
+        logger.debug(`Starting claudeRemote with messages: ${currentMessageQueue.size()}`);
+        await claudeRemote({
+          abort: remoteAbortController.signal,
+          sessionId,
+          path: opts.path,
+          mcpServers: opts.mcpServers,
+          permissionPromptToolName: opts.permissionPromptToolName,
+          onSessionFound,
+          messages: currentMessageQueue,
+          onAssistantResult: opts.onAssistantResult,
+          interruptController: opts.interruptController
+        });
+      } finally {
+        process.stdin.off("data", abortHandler);
+        process.stdin.setRawMode(false);
+        currentMessageQueue.close();
+        currentMessageQueue = new MessageQueue();
+      }
+      if (mode !== "remote") {
+        console.log("Switching back to good old claude...");
+      }
     }
-  })();
-  return async () => {
-    exiting = true;
-    if (messageResolve) {
-      messageResolve();
+  }
+}
+
+async function startPermissionServerV2(handler) {
+  const mcp = new McpServer({
+    name: "Permission Server",
+    version: "1.0.0",
+    description: "A server that allows you to request permissions from the user"
+  });
+  mcp.registerTool("ask_permission", {
+    description: "Request permission to execute a tool",
+    title: "Request Permission",
+    inputSchema: {
+      tool_name: z$1.string().describe("The tool that needs permission"),
+      input: z$1.any().describe("The arguments for the tool")
+    }
+    // outputSchema: {
+    //     approved: z.boolean().describe('Whether the tool was approved'),
+    //     reason: z.string().describe('The reason for the approval or denial'),
+    // },
+  }, async (args) => {
+    const response = await handler({ name: args.tool_name, arguments: args.input });
+    const result = response.approved ? { behavior: "allow", updatedInput: args.input || {} } : { behavior: "deny", message: response.reason || "Permission denied by user" };
+    return {
+      content: [
+        {
+          type: "text",
+          text: JSON.stringify(result)
+        }
+      ],
+      isError: false
+    };
+  });
+  const transport = new StreamableHTTPServerTransport({
+    // NOTE: Returning session id here will result in claude
+    // sdk spawn to fail with `Invalid Request: Server already initialized`
+    sessionIdGenerator: void 0
+  });
+  await mcp.connect(transport);
+  const server = createServer(async (req, res) => {
+    try {
+      await transport.handleRequest(req, res);
+    } catch (error) {
+      logger.debug("Error handling request:", error);
+      if (!res.headersSent) {
+        res.writeHead(500).end();
+      }
     }
-    await promise;
+  });
+  const baseUrl = await new Promise((resolve) => {
+    server.listen(0, "127.0.0.1", () => {
+      const addr = server.address();
+      resolve(new URL(`http://127.0.0.1:${addr.port}`));
+    });
+  });
+  return {
+    url: baseUrl.toString(),
+    toolName: "ask_permission"
   };
 }
 
-async function start(options = {}) {
+class InterruptController {
+  interruptFn;
+  isInterrupting = false;
+  /**
+   * Register an interrupt function from claudeRemote
+   */
+  register(fn) {
+    this.interruptFn = fn;
+  }
+  /**
+   * Unregister the interrupt function (cleanup)
+   */
+  unregister() {
+    this.interruptFn = void 0;
+    this.isInterrupting = false;
+  }
+  /**
+   * Trigger the interrupt - can be called from anywhere
+   */
+  async interrupt() {
+    if (!this.interruptFn || this.isInterrupting) {
+      return false;
+    }
+    this.isInterrupting = true;
+    try {
+      await this.interruptFn();
+      return true;
+    } catch (error) {
+      logger.debug("Failed to interrupt Claude:", error);
+      return false;
+    } finally {
+      this.isInterrupting = false;
+    }
+  }
+  /**
+   * Check if interrupt is available
+   */
+  canInterrupt() {
+    return !!this.interruptFn && !this.isInterrupting;
+  }
+}
+
+async function start(credentials, options = {}) {
   const workingDirectory = process.cwd();
-  const projectName = basename(workingDirectory);
   const sessionTag = randomUUID();
-  logger.info(`Starting happy session for project: ${projectName}`);
-  const secret = await getOrCreateSecretKey();
-  logger.info("Secret key loaded");
-  const token = await authGetToken(secret);
-  logger.info("Authenticated with handy server");
-  const api = new ApiClient(token, secret);
-  const response = await api.getOrCreateSession({ tag: sessionTag, metadata: { path: workingDirectory, host: os.hostname() } });
-  logger.info(`Session created: ${response.session.id}`);
-  const handyUrl = generateAppUrl(secret);
-  displayQRCode(handyUrl);
-  const session = api.session(response.session.id);
-  const loopDestroy = startClaudeLoop({ path: workingDirectory }, session);
-  const shutdown = async () => {
-    logger.info("Shutting down...");
-    await loopDestroy();
-    await session.close();
-    process.exit(0);
+  const api = new ApiClient(credentials.token, credentials.secret);
+  let state = {};
+  let metadata = { path: workingDirectory, host: os.hostname() };
+  const response = await api.getOrCreateSession({ tag: sessionTag, metadata, state });
+  logger.debug(`Session created: ${response.id}`);
+  const session = api.session(response);
+  const pushClient = api.push();
+  const interruptController = new InterruptController();
+  let requests = /* @__PURE__ */ new Map();
+  const permissionServer = await startPermissionServerV2(async (request) => {
+    const id = randomUUID();
+    let promise = new Promise((resolve) => {
+      requests.set(id, resolve);
+    });
+    let timeout = setTimeout(async () => {
+      logger.info("Permission timeout - attempting to interrupt Claude");
+      const interrupted = await interruptController.interrupt();
+      if (interrupted) {
+        logger.info("Claude interrupted successfully");
+      }
+      requests.delete(id);
+      session.updateAgentState((currentState) => {
+        let r = { ...currentState.requests };
+        delete r[id];
+        return {
+          ...currentState,
+          requests: r
+        };
+      });
+    }, 1e3 * 60 * 4.5);
+    logger.info("Permission request" + id + " " + JSON.stringify(request));
+    try {
+      await pushClient.sendToAllDevices(
+        "Permission Request",
+        `Claude wants to use ${request.name}`,
+        {
+          sessionId: response.id,
+          requestId: id,
+          tool: request.name,
+          type: "permission_request"
+        }
+      );
+      logger.info("Push notification sent for permission request");
+    } catch (error) {
+      logger.debug("Failed to send push notification:", error);
+    }
+    session.updateAgentState((currentState) => ({
+      ...currentState,
+      requests: {
+        ...currentState.requests,
+        [id]: {
+          tool: request.name,
+          arguments: request.arguments
+        }
+      }
+    }));
+    promise.then(() => clearTimeout(timeout)).catch(() => clearTimeout(timeout));
+    return promise;
+  });
+  session.setHandler("permission", (message) => {
+    logger.info("Permission response" + JSON.stringify(message));
+    const id = message.id;
+    const resolve = requests.get(id);
+    if (resolve) {
+      resolve({ approved: message.approved, reason: message.reason });
+    } else {
+      logger.info("Permission request stale, likely timed out");
+      return;
+    }
+    session.updateAgentState((currentState) => {
+      let r = { ...currentState.requests };
+      delete r[id];
+      return {
+        ...currentState,
+        requests: r
+      };
+    });
+  });
+  session.setHandler("abort", async () => {
+    logger.info("Abort request - interrupting Claude");
+    await interruptController.interrupt();
+  });
+  let thinking = false;
+  const pingInterval = setInterval(() => {
+    session.keepAlive(thinking);
+  }, 15e3);
+  const onAssistantResult = async (result) => {
+    try {
+      const summary = "result" in result && result.result ? result.result.substring(0, 100) + (result.result.length > 100 ? "..." : "") : "";
+      await pushClient.sendToAllDevices(
+        "Your move :D",
+        summary,
+        {
+          sessionId: response.id,
+          type: "assistant_result",
+          turns: result.num_turns,
+          duration_ms: result.duration_ms,
+          cost_usd: result.total_cost_usd
+        }
+      );
+      logger.debug("Push notification sent: Assistant result");
+    } catch (error) {
+      logger.debug("Failed to send assistant result push notification:", error);
+    }
   };
-  process.on("SIGINT", shutdown);
-  process.on("SIGTERM", shutdown);
-  logger.info("Happy CLI is running. Press Ctrl+C to stop.");
-  await new Promise(() => {
+  await loop({
+    path: workingDirectory,
+    model: options.model,
+    permissionMode: options.permissionMode,
+    mcpServers: {
+      "permission": {
+        type: "http",
+        url: permissionServer.url
+      }
+    },
+    permissionPromptToolName: "mcp__permission__" + permissionServer.toolName,
+    onThinking: (t) => {
+      thinking = t;
+      session.keepAlive(t);
+    },
+    session,
+    onAssistantResult,
+    interruptController
   });
+  clearInterval(pingInterval);
+  process.exit(0);
 }
 
-const args = process.argv.slice(2);
-const options = {};
-let showHelp = false;
-let showVersion = false;
-for (let i = 0; i < args.length; i++) {
-  const arg = args[i];
-  if (arg === "-h" || arg === "--help") {
-    showHelp = true;
-  } else if (arg === "-v" || arg === "--version") {
-    showVersion = true;
-  } else if (arg === "-m" || arg === "--model") {
-    options.model = args[++i];
-  } else if (arg === "-p" || arg === "--permission-mode") {
-    options.permissionMode = args[++i];
-  } else {
-    console.error(chalk.red(`Unknown argument: ${arg}`));
-    process.exit(1);
+const credentialsSchema = z.object({
+  secret: z.string().base64(),
+  token: z.string()
+});
+async function readCredentials() {
+  if (!existsSync(configuration.privateKeyFile)) {
+    return null;
+  }
+  try {
+    const keyBase64 = await readFile(configuration.privateKeyFile, "utf8");
+    const credentials = credentialsSchema.parse(JSON.parse(keyBase64));
+    return {
+      secret: new Uint8Array(Buffer.from(credentials.secret, "base64")),
+      token: credentials.token
+    };
+  } catch {
+    return null;
+  }
+}
+async function writeCredentials(credentials) {
+  if (!existsSync(configuration.happyDir)) {
+    await mkdir(configuration.happyDir, { recursive: true });
   }
+  await writeFile(configuration.privateKeyFile, JSON.stringify({
+    secret: encodeBase64(credentials.secret),
+    token: credentials.token
+  }, null, 2));
+}
+
+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));
 }
-if (showHelp) {
-  console.log(`
+
+async function doAuth() {
+  console.log("Starting authentication...");
+  const secret = new Uint8Array(randomBytes(32));
+  const keypair = tweetnacl.box.keyPair.fromSecretKey(secret);
+  try {
+    await axios.post(`${configuration.serverUrl}/v1/auth/request`, {
+      publicKey: encodeBase64(keypair.publicKey)
+    });
+  } catch (error) {
+    console.log("Failed to create authentication request, please try again later.");
+    return null;
+  }
+  console.log("Please, authenticate using mobile app");
+  displayQRCode("happy://terminal?" + encodeBase64Url(keypair.publicKey));
+  let credentials = null;
+  while (true) {
+    try {
+      const response = await axios.post(`${configuration.serverUrl}/v1/auth/request`, {
+        publicKey: encodeBase64(keypair.publicKey)
+      });
+      if (response.data.state === "authorized") {
+        let token = response.data.token;
+        let r = decodeBase64(response.data.response);
+        let decrypted = decryptWithEphemeralKey(r, keypair.secretKey);
+        if (decrypted) {
+          credentials = {
+            secret: decrypted,
+            token
+          };
+          await writeCredentials(credentials);
+          return credentials;
+        } else {
+          console.log("Failed to decrypt response, please try again later.");
+          return null;
+        }
+      }
+    } catch (error) {
+      console.log("Failed to create authentication request, please try again later.");
+      return null;
+    }
+    await delay(1e3);
+  }
+  return null;
+}
+function decryptWithEphemeralKey(encryptedBundle, recipientSecretKey) {
+  const ephemeralPublicKey = encryptedBundle.slice(0, 32);
+  const nonce = encryptedBundle.slice(32, 32 + tweetnacl.box.nonceLength);
+  const encrypted = encryptedBundle.slice(32 + tweetnacl.box.nonceLength);
+  const decrypted = tweetnacl.box.open(encrypted, nonce, ephemeralPublicKey, recipientSecretKey);
+  if (!decrypted) {
+    return null;
+  }
+  return decrypted;
+}
+
+(async () => {
+  const args = process.argv.slice(2);
+  let installationLocation = args.includes("--local") || process.env.HANDY_LOCAL ? "local" : "global";
+  initializeConfiguration(installationLocation);
+  initLoggerWithGlobalConfiguration();
+  logger.debug("Starting happy CLI with args: ", process.argv);
+  const subcommand = args[0];
+  if (subcommand === "logout") {
+    try {
+      await cleanKey();
+    } catch (error) {
+      console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
+      if (process.env.DEBUG) {
+        console.error(error);
+      }
+      process.exit(1);
+    }
+    return;
+  } else if (subcommand === "login" || subcommand === "auth") {
+    await doAuth();
+    return;
+  } else {
+    const options = {};
+    let showHelp = false;
+    let showVersion = false;
+    for (let i = 0; i < args.length; i++) {
+      const arg = args[i];
+      if (arg === "-h" || arg === "--help") {
+        showHelp = true;
+      } else if (arg === "-v" || arg === "--version") {
+        showVersion = true;
+      } else if (arg === "-m" || arg === "--model") {
+        options.model = args[++i];
+      } else if (arg === "-p" || arg === "--permission-mode") {
+        options.permissionMode = args[++i];
+      } else if (arg === "--local") {
+        i++;
+      } else {
+        console.error(chalk.red(`Unknown argument: ${arg}`));
+        process.exit(1);
+      }
+    }
+    if (showHelp) {
+      console.log(`
 ${chalk.bold("happy")} - Claude Code session sharing
 
 ${chalk.bold("Usage:")}
   happy [options]
+  happy logout     Logs out of your account and removes data directory
+  happy login      Show your secret QR code
+  happy auth       Same as login
 
 ${chalk.bold("Options:")}
   -h, --help              Show this help message
@@ -568,21 +1924,68 @@ ${chalk.bold("Options:")}
   -m, --model <model>     Claude model to use (default: sonnet)
   -p, --permission-mode   Permission mode: auto, default, or plan
 
+  [Advanced]
+  --local < global | local >
+      Will use .happy folder in the current directory for storing your private key and debug logs. 
+      You will require re-login each time you run this in a new directory.
+      Use with login to show either global or local QR code.
+
 ${chalk.bold("Examples:")}
   happy                   Start a session with default settings
   happy -m opus           Use Claude Opus model
   happy -p plan           Use plan permission mode
+  happy logout            Logs out of your account and removes data directory
 `);
-  process.exit(0);
-}
-if (showVersion) {
-  console.log("0.1.0");
-  process.exit(0);
-}
-start(options).catch((error) => {
-  console.error(chalk.red("Error:"), error.message);
-  if (process.env.DEBUG) {
-    console.error(error);
+      process.exit(0);
+    }
+    if (showVersion) {
+      console.log("0.1.3");
+      process.exit(0);
+    }
+    let credentials = await readCredentials();
+    if (!credentials) {
+      let res = await doAuth();
+      if (!res) {
+        process.exit(1);
+      }
+      credentials = res;
+    }
+    try {
+      await start(credentials, options);
+    } catch (error) {
+      console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
+      if (process.env.DEBUG) {
+        console.error(error);
+      }
+      process.exit(1);
+    }
   }
-  process.exit(1);
-});
+})();
+async function cleanKey() {
+  const happyDir = configuration.happyDir;
+  if (!existsSync(happyDir)) {
+    console.log(chalk.yellow("No happy data directory found at:"), happyDir);
+    return;
+  }
+  console.log(chalk.blue("Found happy data directory at:"), happyDir);
+  console.log(chalk.yellow("\u26A0\uFE0F  This will remove all authentication data and require reconnecting your phone."));
+  const rl = createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  const answer = await new Promise((resolve) => {
+    rl.question(chalk.yellow("Are you sure you want to remove the happy data directory? (y/N): "), resolve);
+  });
+  rl.close();
+  if (answer.toLowerCase() === "y" || answer.toLowerCase() === "yes") {
+    try {
+      rmSync(happyDir, { recursive: true, force: true });
+      console.log(chalk.green("\u2713 Happy data directory removed successfully"));
+      console.log(chalk.blue("\u2139\uFE0F  You will need to reconnect your phone on the next session"));
+    } catch (error) {
+      throw new Error(`Failed to remove data directory: ${error instanceof Error ? error.message : "Unknown error"}`);
+    }
+  } else {
+    console.log(chalk.blue("Operation cancelled"));
+  }
+}