@zonease/happy 0.6.41 → 0.6.43

package/dist/{downloadImage-B_ygLAXY.cjs → registerKillSessionHandler-MoLdSQxM.cjs}

@@ -1,7 +1,5 @@
 'use strict';
 
-var logger = require('./persistence-DrfN7TzY.cjs');
-var crypto = require('crypto');
 var path = require('node:path');
 var projectPath = require('./projectPath-ChLhdOyt.cjs');
 var mcp_js = require('@modelcontextprotocol/sdk/server/mcp.js');
@@ -9,18 +7,20 @@ var node_http = require('node:http');
 var streamableHttp_js = require('@modelcontextprotocol/sdk/server/streamableHttp.js');
 var types_js = require('@modelcontextprotocol/sdk/types.js');
 var z = require('zod');
-var deviceKeys = require('./deviceKeys-BpIAWz13.cjs');
+var logger = require('./persistence-D7zNFI-d.cjs');
+var deviceKeys = require('./deviceKeys-CdW-HPnz.cjs');
 var node_crypto = require('node:crypto');
 var prompt = require('./prompt-BTWDZZO0.cjs');
 require('./mcpToolSchemas-DK42yoZ_.cjs');
-require('./index-CDTNgfUf.cjs');
+require('./index-BeKrqPYR.cjs');
 var node_child_process = require('node:child_process');
-var axios = require('axios');
+require('axios');
 require('node:events');
 require('socket.io-client');
-require('./api-XeHlmApX.cjs');
+require('./api-B-PlVQY6.cjs');
 require('tweetnacl');
 require('ws');
+require('crypto');
 require('@stablelib/base64');
 require('node:os');
 require('node:fs/promises');
@@ -30,403 +30,6 @@ require('expo-server-sdk');
 require('chalk');
 require('./types-DWeB7aqh.cjs');
 
-function parseCompact(message) {
-  const trimmed = message.trim();
-  if (trimmed === "/compact") {
-    return {
-      isCompact: true,
-      originalMessage: trimmed
-    };
-  }
-  if (trimmed.startsWith("/compact ")) {
-    return {
-      isCompact: true,
-      originalMessage: trimmed
-    };
-  }
-  return {
-    isCompact: false,
-    originalMessage: message
-  };
-}
-function parseClear(message) {
-  const trimmed = message.trim();
-  return {
-    isClear: trimmed === "/clear"
-  };
-}
-function parseSpecialCommand(message) {
-  const compactResult = parseCompact(message);
-  if (compactResult.isCompact) {
-    return {
-      type: "compact",
-      originalMessage: compactResult.originalMessage
-    };
-  }
-  const clearResult = parseClear(message);
-  if (clearResult.isClear) {
-    return {
-      type: "clear"
-    };
-  }
-  return {
-    type: null
-  };
-}
-
-class MessageQueue2 {
-  queue = [];
-  // Made public for testing
-  waiter = null;
-  closed = false;
-  onMessageHandler = null;
-  modeHasher;
-  constructor(modeHasher, onMessageHandler = null) {
-    this.modeHasher = modeHasher;
-    this.onMessageHandler = onMessageHandler;
-    logger.logger.debug(`[MessageQueue2] Initialized`);
-  }
-  /**
-   * Set a handler that will be called when a message arrives
-   */
-  setOnMessage(handler) {
-    this.onMessageHandler = handler;
-  }
-  /**
-   * Push a message to the queue with a mode.
-   */
-  push(message, mode) {
-    if (this.closed) {
-      throw new Error("Cannot push to closed queue");
-    }
-    const modeHash = this.modeHasher(mode);
-    logger.logger.debug(`[MessageQueue2] push() called with mode hash: ${modeHash}`);
-    this.queue.push({
-      message,
-      mode,
-      modeHash,
-      isolate: false
-    });
-    if (this.onMessageHandler) {
-      this.onMessageHandler(message, mode);
-    }
-    if (this.waiter) {
-      logger.logger.debug(`[MessageQueue2] Notifying waiter`);
-      const waiter = this.waiter;
-      this.waiter = null;
-      waiter(true);
-    }
-    logger.logger.debug(`[MessageQueue2] push() completed. Queue size: ${this.queue.length}`);
-  }
-  /**
-   * Push a message immediately without batching delay.
-   * Does not clear the queue or enforce isolation.
-   */
-  pushImmediate(message, mode) {
-    if (this.closed) {
-      throw new Error("Cannot push to closed queue");
-    }
-    const modeHash = this.modeHasher(mode);
-    logger.logger.debug(`[MessageQueue2] pushImmediate() called with mode hash: ${modeHash}`);
-    this.queue.push({
-      message,
-      mode,
-      modeHash,
-      isolate: false
-    });
-    if (this.onMessageHandler) {
-      this.onMessageHandler(message, mode);
-    }
-    if (this.waiter) {
-      logger.logger.debug(`[MessageQueue2] Notifying waiter for immediate message`);
-      const waiter = this.waiter;
-      this.waiter = null;
-      waiter(true);
-    }
-    logger.logger.debug(`[MessageQueue2] pushImmediate() completed. Queue size: ${this.queue.length}`);
-  }
-  /**
-   * Push a message that must be processed in complete isolation.
-   * Clears any pending messages and ensures this message is never batched with others.
-   * Used for special commands that require dedicated processing.
-   */
-  pushIsolateAndClear(message, mode) {
-    if (this.closed) {
-      throw new Error("Cannot push to closed queue");
-    }
-    const modeHash = this.modeHasher(mode);
-    logger.logger.debug(`[MessageQueue2] pushIsolateAndClear() called with mode hash: ${modeHash} - clearing ${this.queue.length} pending messages`);
-    this.queue = [];
-    this.queue.push({
-      message,
-      mode,
-      modeHash,
-      isolate: true
-    });
-    if (this.onMessageHandler) {
-      this.onMessageHandler(message, mode);
-    }
-    if (this.waiter) {
-      logger.logger.debug(`[MessageQueue2] Notifying waiter for isolated message`);
-      const waiter = this.waiter;
-      this.waiter = null;
-      waiter(true);
-    }
-    logger.logger.debug(`[MessageQueue2] pushIsolateAndClear() completed. Queue size: ${this.queue.length}`);
-  }
-  /**
-   * Push a message to the beginning of the queue with a mode.
-   */
-  unshift(message, mode) {
-    if (this.closed) {
-      throw new Error("Cannot unshift to closed queue");
-    }
-    const modeHash = this.modeHasher(mode);
-    logger.logger.debug(`[MessageQueue2] unshift() called with mode hash: ${modeHash}`);
-    this.queue.unshift({
-      message,
-      mode,
-      modeHash,
-      isolate: false
-    });
-    if (this.onMessageHandler) {
-      this.onMessageHandler(message, mode);
-    }
-    if (this.waiter) {
-      logger.logger.debug(`[MessageQueue2] Notifying waiter`);
-      const waiter = this.waiter;
-      this.waiter = null;
-      waiter(true);
-    }
-    logger.logger.debug(`[MessageQueue2] unshift() completed. Queue size: ${this.queue.length}`);
-  }
-  /**
-   * Reset the queue - clears all messages and resets to empty state
-   */
-  reset() {
-    logger.logger.debug(`[MessageQueue2] reset() called. Clearing ${this.queue.length} messages`);
-    this.queue = [];
-    this.closed = false;
-    this.waiter = null;
-  }
-  /**
-   * Close the queue - no more messages can be pushed
-   */
-  close() {
-    logger.logger.debug(`[MessageQueue2] close() called`);
-    this.closed = true;
-    if (this.waiter) {
-      const waiter = this.waiter;
-      this.waiter = null;
-      waiter(false);
-    }
-  }
-  /**
-   * Check if the queue is closed
-   */
-  isClosed() {
-    return this.closed;
-  }
-  /**
-   * Get the current queue size
-   */
-  size() {
-    return this.queue.length;
-  }
-  /**
-   * Wait for messages and return all messages with the same mode.
-   * For string messages, multiple messages are joined with newlines.
-   * For object messages (e.g., mixed content with images), returns them one at a time.
-   * Returns { message: M, mode: T } or null if aborted/closed
-   */
-  async waitForMessagesAndGetAsString(abortSignal) {
-    if (this.queue.length > 0) {
-      return this.collectBatch();
-    }
-    if (this.closed || abortSignal?.aborted) {
-      return null;
-    }
-    const hasMessages = await this.waitForMessages(abortSignal);
-    if (!hasMessages) {
-      return null;
-    }
-    return this.collectBatch();
-  }
-  /**
-   * Collect a batch of messages with the same mode, respecting isolation requirements.
-   * For string messages, joins them with newlines.
-   * For object messages (like mixed content with images), returns one at a time.
-   */
-  collectBatch() {
-    if (this.queue.length === 0) {
-      return null;
-    }
-    const firstItem = this.queue[0];
-    let mode = firstItem.mode;
-    let isolate = firstItem.isolate ?? false;
-    const targetModeHash = firstItem.modeHash;
-    if (firstItem.isolate) {
-      const item = this.queue.shift();
-      logger.logger.debug(`[MessageQueue2] Collected isolated message with mode hash: ${targetModeHash}`);
-      return {
-        message: item.message,
-        mode,
-        hash: targetModeHash,
-        isolate
-      };
-    }
-    if (typeof firstItem.message !== "string") {
-      const item = this.queue.shift();
-      logger.logger.debug(`[MessageQueue2] Collected single object message with mode hash: ${targetModeHash}`);
-      return {
-        message: item.message,
-        mode,
-        hash: targetModeHash,
-        isolate
-      };
-    }
-    const sameModeMessages = [];
-    while (this.queue.length > 0 && this.queue[0].modeHash === targetModeHash && !this.queue[0].isolate && typeof this.queue[0].message === "string") {
-      const item = this.queue.shift();
-      sameModeMessages.push(item.message);
-    }
-    logger.logger.debug(`[MessageQueue2] Collected batch of ${sameModeMessages.length} messages with mode hash: ${targetModeHash}`);
-    const combinedMessage = sameModeMessages.join("\n");
-    return {
-      message: combinedMessage,
-      mode,
-      hash: targetModeHash,
-      isolate
-    };
-  }
-  /**
-   * Wait for messages to arrive
-   */
-  waitForMessages(abortSignal) {
-    return new Promise((resolve) => {
-      let abortHandler = null;
-      if (abortSignal) {
-        abortHandler = () => {
-          logger.logger.debug("[MessageQueue2] Wait aborted");
-          if (this.waiter === waiterFunc) {
-            this.waiter = null;
-          }
-          resolve(false);
-        };
-        abortSignal.addEventListener("abort", abortHandler);
-      }
-      const waiterFunc = (hasMessages) => {
-        if (abortHandler && abortSignal) {
-          abortSignal.removeEventListener("abort", abortHandler);
-        }
-        resolve(hasMessages);
-      };
-      if (this.queue.length > 0) {
-        if (abortHandler && abortSignal) {
-          abortSignal.removeEventListener("abort", abortHandler);
-        }
-        resolve(true);
-        return;
-      }
-      if (this.closed || abortSignal?.aborted) {
-        if (abortHandler && abortSignal) {
-          abortSignal.removeEventListener("abort", abortHandler);
-        }
-        resolve(false);
-        return;
-      }
-      this.waiter = waiterFunc;
-      logger.logger.debug("[MessageQueue2] Waiting for messages...");
-    });
-  }
-}
-
-function deterministicStringify(obj, options = {}) {
-  const {
-    undefinedBehavior = "omit",
-    sortArrays = false,
-    replacer,
-    includeSymbols = false
-  } = options;
-  const seen = /* @__PURE__ */ new WeakSet();
-  function processValue(value, key) {
-    if (replacer && key !== void 0) {
-      value = replacer(key, value);
-    }
-    if (value === null) return null;
-    if (value === void 0) {
-      switch (undefinedBehavior) {
-        case "omit":
-          return void 0;
-        case "null":
-          return null;
-        case "throw":
-          throw new Error(`Undefined value at key: ${key}`);
-      }
-    }
-    if (typeof value === "boolean" || typeof value === "number" || typeof value === "string") {
-      return value;
-    }
-    if (value instanceof Date) {
-      return value.toISOString();
-    }
-    if (value instanceof RegExp) {
-      return value.toString();
-    }
-    if (typeof value === "function") {
-      return void 0;
-    }
-    if (typeof value === "symbol") {
-      return includeSymbols ? value.toString() : void 0;
-    }
-    if (typeof value === "bigint") {
-      return value.toString() + "n";
-    }
-    if (seen.has(value)) {
-      throw new Error("Circular reference detected");
-    }
-    seen.add(value);
-    if (Array.isArray(value)) {
-      const processed2 = value.map((item, index) => processValue(item, String(index))).filter((item) => item !== void 0);
-      if (sortArrays) {
-        processed2.sort((a, b) => {
-          const aStr = JSON.stringify(processValue(a));
-          const bStr = JSON.stringify(processValue(b));
-          return aStr.localeCompare(bStr);
-        });
-      }
-      seen.delete(value);
-      return processed2;
-    }
-    if (value.constructor === Object || value.constructor === void 0) {
-      const processed2 = {};
-      const keys = Object.keys(value).sort();
-      for (const k of keys) {
-        const processedValue = processValue(value[k], k);
-        if (processedValue !== void 0) {
-          processed2[k] = processedValue;
-        }
-      }
-      seen.delete(value);
-      return processed2;
-    }
-    try {
-      const plain = { ...value };
-      seen.delete(value);
-      return processValue(plain, key);
-    } catch {
-      seen.delete(value);
-      return String(value);
-    }
-  }
-  const processed = processValue(obj);
-  return JSON.stringify(processed);
-}
-function hashObject(obj, options, encoding = "hex") {
-  const jsonString = deterministicStringify(obj, options);
-  return crypto.createHash("sha256").update(jsonString).digest(encoding);
-}
-
 function createMcpServer(client, options) {
   const mcp = new mcp_js.McpServer({
     name: "Happy MCP",
@@ -792,76 +395,6 @@ function detectGitWorktree(cwd) {
   }
 }
 
-class MessageBuffer {
-  messages = [];
-  listeners = [];
-  nextId = 1;
-  addMessage(content, type = "assistant") {
-    const message = {
-      id: `msg-${this.nextId++}`,
-      timestamp: /* @__PURE__ */ new Date(),
-      content,
-      type
-    };
-    this.messages.push(message);
-    this.notifyListeners();
-  }
-  /**
-   * Update the last message of a specific type by appending content to it
-   * Useful for streaming responses where deltas should accumulate in one message
-   */
-  updateLastMessage(contentDelta, type = "assistant") {
-    for (let i = this.messages.length - 1; i >= 0; i--) {
-      if (this.messages[i].type === type) {
-        const oldMessage = this.messages[i];
-        const updatedMessage = {
-          ...oldMessage,
-          content: oldMessage.content + contentDelta
-        };
-        this.messages[i] = updatedMessage;
-        this.notifyListeners();
-        return;
-      }
-    }
-    this.addMessage(contentDelta, type);
-  }
-  /**
-   * Remove the last message of a specific type
-   * Useful for removing placeholder messages like "Thinking..." when actual response starts
-   */
-  removeLastMessage(type) {
-    for (let i = this.messages.length - 1; i >= 0; i--) {
-      if (this.messages[i].type === type) {
-        this.messages.splice(i, 1);
-        this.notifyListeners();
-        return true;
-      }
-    }
-    return false;
-  }
-  getMessages() {
-    return [...this.messages];
-  }
-  clear() {
-    this.messages = [];
-    this.nextId = 1;
-    this.notifyListeners();
-  }
-  onUpdate(listener) {
-    this.listeners.push(listener);
-    return () => {
-      const index = this.listeners.indexOf(listener);
-      if (index > -1) {
-        this.listeners.splice(index, 1);
-      }
-    };
-  }
-  notifyListeners() {
-    const messages = this.getMessages();
-    this.listeners.forEach((listener) => listener(messages));
-  }
-}
-
 function registerKillSessionHandler(rpcHandlerManager, killThisHappy) {
   rpcHandlerManager.registerHandler("killSession", async () => {
     logger.logger.debug("Kill session request received");
@@ -873,25 +406,6 @@ function registerKillSessionHandler(rpcHandlerManager, killThisHappy) {
   });
 }
 
-async function downloadImage(url) {
-  const response = await axios.get(url, {
-    responseType: "arraybuffer"
-  });
-  const buffer = Buffer.from(response.data);
-  const base64 = buffer.toString("base64");
-  let mimeType = response.headers["content-type"] || "image/jpeg";
-  if (mimeType.includes(";")) {
-    mimeType = mimeType.split(";")[0].trim();
-  }
-  return { base64, mimeType };
-}
-
-exports.MessageBuffer = MessageBuffer;
-exports.MessageQueue2 = MessageQueue2;
 exports.createMcpContext = createMcpContext;
 exports.detectGitWorktree = detectGitWorktree;
-exports.downloadImage = downloadImage;
-exports.hashObject = hashObject;
-exports.parseClear = parseClear;
-exports.parseSpecialCommand = parseSpecialCommand;
 exports.registerKillSessionHandler = registerKillSessionHandler;

package/dist/{run-Dy6KX6m-.mjs → run-BFnSUK1o.mjs}

@@ -1,15 +1,15 @@
 import fs from 'fs/promises';
 import os from 'os';
 import * as tmp from 'tmp';
-import { A as ApiClient } from './api-K2-jr9ar.mjs';
-import { c as configuration, l as logger, p as packageJson, v as acquireDaemonLock, a as readSettings, i as isDebug, e as encodeBase64, x as writeDaemonState, m as readDaemonState, y as releaseDaemonLock, z as validateProfileForAgent, A as getProfileEnvironmentVariables } from './persistence-CIUFyOwz.mjs';
-import { authAndSetupMachineIfNeeded } from './auth-DS8fzlin.mjs';
+import { A as ApiClient } from './api-BUCtd3cB.mjs';
+import { c as configuration, l as logger, p as packageJson, v as acquireDaemonLock, a as readSettings, i as isDebug, e as encodeBase64, x as writeDaemonState, m as readDaemonState, y as releaseDaemonLock, z as validateProfileForAgent, A as getProfileEnvironmentVariables } from './persistence-DbLMvLvk.mjs';
+import { authAndSetupMachineIfNeeded } from './auth-qM2eojWx.mjs';
 import { spawn, execSync, exec } from 'child_process';
-import { getEnvironmentInfo } from './doctor-B-LCMVN9.mjs';
-import { s as spawnHappyCLI } from './spawnHappyCLI-D3EkTFIn.mjs';
-import { isDaemonRunningCurrentlyInstalledHappyVersion, stopDaemon, cleanupDaemonState } from './controlClient-DgjVRN8D.mjs';
-import { a as readCachedDeviceKey, d as deviceExec } from './deviceKeys-CejCdWpw.mjs';
-import { P as PLIST_LABEL } from './install-B3mMGISS.mjs';
+import { getEnvironmentInfo } from './doctor-DDT2TXHH.mjs';
+import { s as spawnHappyCLI } from './spawnHappyCLI-Dt7fbmbk.mjs';
+import { isDaemonRunningCurrentlyInstalledHappyVersion, stopDaemon, cleanupDaemonState } from './controlClient-BzzTNSfl.mjs';
+import { a as readCachedDeviceKey, d as deviceExec } from './deviceKeys-CQyFFPtt.mjs';
+import { P as PLIST_LABEL } from './install-BOIcR_Wr.mjs';
 import fastify from 'fastify';
 import { createReadStream } from 'node:fs';
 import { stat } from 'node:fs/promises';
@@ -1759,7 +1759,7 @@ ${error.message}
           logger.debug(`[DAEMON RUN] Attempting to spawn session in tmux: ${sessionDesc}`);
           const tmux = getTmuxUtilities(tmuxSessionName);
           const cliPath = join(projectPath(), "dist", "index.mjs");
-          const agent = options.agent === "gemini" ? "gemini" : options.agent === "codex" ? "codex" : "claude";
+          const agent = options.agent === "gemini" ? "gemini" : options.agent === "codex" ? "codex" : options.agent === "cursor" ? "cursor" : "claude";
           const forkFlag = skipForkSession ? "" : " --fork-session";
           const resumeArgs = resumeSessionId && isClaudeAgent ? ` --resume ${resumeSessionId}${forkFlag}` : "";
           const fullCommand = `node --no-warnings --no-deprecation ${cliPath} ${agent} --happy-starting-mode remote --started-by daemon${resumeArgs}`;
@@ -1830,6 +1830,9 @@ ${error.message}
             case "gemini":
               agentCommand = "gemini";
               break;
+            case "cursor":
+              agentCommand = "cursor";
+              break;
             default:
               return {
                 type: "error",
@@ -1848,6 +1851,8 @@ ${error.message}
             if (!skipForkSession) {
               args.push("--fork-session");
             }
+          } else if (resumeSessionId && options.agent === "cursor") {
+            args.push("--resume", resumeSessionId);
           }
           const happyProcess = spawnHappyCLI(args, {
             cwd: directory,

package/dist/{run-D3CopmEb.cjs → run-C5StYRIB.cjs}

@@ -3,15 +3,15 @@
 var fs$1 = require('fs/promises');
 var os = require('os');
 var tmp = require('tmp');
-var api = require('./api-XeHlmApX.cjs');
-var logger = require('./persistence-DrfN7TzY.cjs');
-var auth = require('./auth-BQvEuSs5.cjs');
+var api = require('./api-B-PlVQY6.cjs');
+var logger = require('./persistence-D7zNFI-d.cjs');
+var auth = require('./auth-BqGkUXvq.cjs');
 var child_process = require('child_process');
-var doctor = require('./doctor-DznasgP3.cjs');
-var spawnHappyCLI = require('./spawnHappyCLI-CarRI4GM.cjs');
-var controlClient = require('./controlClient-DgELDZgM.cjs');
-var deviceKeys = require('./deviceKeys-BpIAWz13.cjs');
-var install = require('./install-Ck22tYHP.cjs');
+var doctor = require('./doctor-D4xWXiE7.cjs');
+var spawnHappyCLI = require('./spawnHappyCLI-C2uY9WV-.cjs');
+var controlClient = require('./controlClient-yTkpwcOq.cjs');
+var deviceKeys = require('./deviceKeys-CdW-HPnz.cjs');
+var install = require('./install-Jrs6YUu8.cjs');
 var fastify = require('fastify');
 var fs = require('node:fs');
 var promises = require('node:fs/promises');
@@ -1780,7 +1780,7 @@ ${error.message}
           logger.logger.debug(`[DAEMON RUN] Attempting to spawn session in tmux: ${sessionDesc}`);
           const tmux = getTmuxUtilities(tmuxSessionName);
           const cliPath = path$1.join(projectPath.projectPath(), "dist", "index.mjs");
-          const agent = options.agent === "gemini" ? "gemini" : options.agent === "codex" ? "codex" : "claude";
+          const agent = options.agent === "gemini" ? "gemini" : options.agent === "codex" ? "codex" : options.agent === "cursor" ? "cursor" : "claude";
           const forkFlag = skipForkSession ? "" : " --fork-session";
           const resumeArgs = resumeSessionId && isClaudeAgent ? ` --resume ${resumeSessionId}${forkFlag}` : "";
           const fullCommand = `node --no-warnings --no-deprecation ${cliPath} ${agent} --happy-starting-mode remote --started-by daemon${resumeArgs}`;
@@ -1851,6 +1851,9 @@ ${error.message}
             case "gemini":
               agentCommand = "gemini";
               break;
+            case "cursor":
+              agentCommand = "cursor";
+              break;
             default:
               return {
                 type: "error",
@@ -1869,6 +1872,8 @@ ${error.message}
             if (!skipForkSession) {
               args.push("--fork-session");
             }
+          } else if (resumeSessionId && options.agent === "cursor") {
+            args.push("--resume", resumeSessionId);
           }
           const happyProcess = spawnHappyCLI.spawnHappyCLI(args, {
             cwd: directory,