@zonease/happy 0.6.42 → 0.6.44

package/dist/{cursorApprovalServer-DzY8yJlI.cjs → cursorApprovalServer-C_wqI7wm.cjs}

@@ -5,11 +5,62 @@ var node_crypto = require('node:crypto');
 var promises = require('node:fs/promises');
 var fs = require('node:fs');
 var path = require('node:path');
-var logger = require('./persistence-BcQmjobZ.cjs');
+var os = require('node:os');
+var logger = require('./persistence-DOgft4tZ.cjs');
 
+const TOOL_NAME_MAP = {
+  read: "Read",
+  write: "Write",
+  edit: "Edit",
+  grep: "Grep",
+  glob: "Glob",
+  ls: "LS",
+  list: "LS",
+  // Cursor calls it Shell; the app's card for running commands is Bash.
+  shell: "Bash",
+  terminal: "Bash",
+  task: "Task",
+  todowrite: "TodoWrite",
+  websearch: "WebSearch",
+  webfetch: "WebFetch"
+};
+function normalizeCursorToolName(rawName) {
+  const mapped = TOOL_NAME_MAP[rawName.toLowerCase()];
+  if (mapped) return mapped;
+  return rawName.charAt(0).toUpperCase() + rawName.slice(1);
+}
+function normalizeCursorToolInput(input) {
+  const out = { ...input };
+  if (typeof out.path === "string" && out.file_path === void 0) {
+    out.file_path = out.path;
+  }
+  if (typeof out.file_path === "string" && out.path === void 0) {
+    out.path = out.file_path;
+  }
+  if (typeof out.workingDirectory === "string" && out.cwd === void 0) {
+    out.cwd = out.workingDirectory;
+  }
+  if (typeof out.streamContent === "string" && out.content === void 0) {
+    out.content = out.streamContent;
+  }
+  return out;
+}
+function normalizeCursorTool(rawName, rawInput) {
+  const input = rawInput && typeof rawInput === "object" ? rawInput : {};
+  return {
+    name: normalizeCursorToolName(rawName),
+    input: normalizeCursorToolInput(input)
+  };
+}
+
+function approvalRegistryDir() {
+  return path.join(os.homedir(), ".happy", "cursor-approvals");
+}
 const APPROVAL_ENDPOINT_FILE = ".happy-approval.json";
 const HOOKS_FILE = "hooks.json";
 const HOOKS_BACKUP_FILE = "hooks.json.happy-backup";
+const MCP_FILE = "mcp.json";
+const MCP_BACKUP_FILE = "mcp.json.happy-backup";
 const HOOK_TIMEOUT_SECONDS = 900;
 class CursorApprovalBridge {
   cwd;
@@ -18,12 +69,17 @@ class CursorApprovalBridge {
   server = null;
   port = 0;
   hadExistingHooks = false;
+  hadExistingMcp = false;
+  mcpBridge;
   /** True when .cursor/ did not exist before this session created it. */
   createdCursorDir = false;
   started = false;
+  /** Chat ids this session has registered, so they can be cleaned up. */
+  registeredChatIds = /* @__PURE__ */ new Set();
   constructor(options) {
     this.cwd = options.cwd;
     this.handler = options.handler;
+    this.mcpBridge = options.mcpBridge ?? null;
   }
   get cursorDir() {
     return path.join(this.cwd, ".cursor");
@@ -34,6 +90,23 @@ class CursorApprovalBridge {
     this.started = true;
     logger.logger.debug(`[cursor] approval bridge listening on 127.0.0.1:${this.port}`);
   }
+  /**
+   * Claims a chat id for this session. Called as soon as cursor-agent reveals
+   * it, which is what lets the hook route an approval back to the session
+   * that actually made the call.
+   */
+  async registerChat(chatId) {
+    if (!this.started || this.registeredChatIds.has(chatId)) return;
+    const dir = approvalRegistryDir();
+    await promises.mkdir(dir, { recursive: true });
+    await promises.writeFile(path.join(dir, `${chatId}.json`), JSON.stringify({
+      port: this.port,
+      token: this.token,
+      pid: process.pid
+    }), "utf8");
+    this.registeredChatIds.add(chatId);
+    logger.logger.debug(`[cursor] chat ${chatId} routed to this session's bridge`);
+  }
   listen() {
     return new Promise((resolve, reject) => {
       const server = node_http.createServer((req, res) => {
@@ -80,9 +153,12 @@ class CursorApprovalBridge {
       logger.logger.debug("[cursor] rejecting approval request with a bad token");
       return false;
     }
-    const toolName = typeof parsed.tool_name === "string" && parsed.tool_name.length > 0 ? parsed.tool_name : "unknown tool";
+    const { name: toolName, input: toolInput } = normalizeCursorTool(
+      typeof parsed.tool_name === "string" && parsed.tool_name.length > 0 ? parsed.tool_name : "unknown",
+      parsed.tool_input
+    );
     const toolCallId = typeof parsed.tool_use_id === "string" && parsed.tool_use_id.length > 0 ? parsed.tool_use_id : `cursor-${node_crypto.randomUUID()}`;
-    return this.handler.requestApproval(toolCallId, toolName, parsed.tool_input ?? {});
+    return this.handler.requestApproval(toolCallId, toolName, toolInput);
   }
   /**
    * Writes .cursor/hooks.json pointing at this CLI. Any file already there is
@@ -98,11 +174,6 @@ class CursorApprovalBridge {
       this.hadExistingHooks = true;
       logger.logger.debug("[cursor] existing hooks.json moved aside for the session");
     }
-    await promises.writeFile(path.join(this.cursorDir, APPROVAL_ENDPOINT_FILE), JSON.stringify({
-      port: this.port,
-      token: this.token,
-      pid: process.pid
-    }), "utf8");
     const hookCommand = `${process.execPath} ${process.argv[1]} cursor-approval-hook`;
     await promises.writeFile(hooksPath, JSON.stringify({
       version: 1,
@@ -115,8 +186,24 @@ class CursorApprovalBridge {
         ]
       }
     }, null, 2), "utf8");
+    await this.installMcpConfig();
     await this.excludeFromGit();
   }
+  /** Points Cursor at Happy's tools (change_title, preview_html, devices…). */
+  async installMcpConfig() {
+    if (!this.mcpBridge) return;
+    const mcpPath = path.join(this.cursorDir, MCP_FILE);
+    if (fs.existsSync(mcpPath)) {
+      await promises.rename(mcpPath, path.join(this.cursorDir, MCP_BACKUP_FILE));
+      this.hadExistingMcp = true;
+      logger.logger.debug("[cursor] existing mcp.json moved aside for the session");
+    }
+    await promises.writeFile(mcpPath, JSON.stringify({
+      mcpServers: {
+        happy: { command: this.mcpBridge.command, args: this.mcpBridge.args }
+      }
+    }, null, 2), "utf8");
+  }
   /** Keep the session's scaffolding out of `git status`. */
   async excludeFromGit() {
     const excludePath = path.join(this.cwd, ".git", "info", "exclude");
@@ -128,6 +215,7 @@ class CursorApprovalBridge {
         excludePath,
         `${current}${current.endsWith("\n") ? "" : "\n"}# added by happy cursor session
 .cursor/hooks.json
+.cursor/mcp.json
 .cursor/.happy-approval.json
 `,
         "utf8"
@@ -140,6 +228,10 @@ class CursorApprovalBridge {
     if (!this.started) return;
     this.started = false;
     try {
+      for (const chatId of this.registeredChatIds) {
+        await promises.rm(path.join(approvalRegistryDir(), `${chatId}.json`), { force: true });
+      }
+      this.registeredChatIds.clear();
       await promises.rm(path.join(this.cursorDir, APPROVAL_ENDPOINT_FILE), { force: true });
       const hooksPath = path.join(this.cursorDir, HOOKS_FILE);
       const backupPath = path.join(this.cursorDir, HOOKS_BACKUP_FILE);
@@ -148,6 +240,13 @@ class CursorApprovalBridge {
       } else {
         await promises.rm(hooksPath, { force: true });
       }
+      const mcpPath = path.join(this.cursorDir, MCP_FILE);
+      const mcpBackup = path.join(this.cursorDir, MCP_BACKUP_FILE);
+      if (this.hadExistingMcp && fs.existsSync(mcpBackup)) {
+        await promises.rename(mcpBackup, mcpPath);
+      } else if (this.mcpBridge) {
+        await promises.rm(mcpPath, { force: true });
+      }
       if (this.createdCursorDir && (await promises.readdir(this.cursorDir)).length === 0) {
         await promises.rmdir(this.cursorDir);
       }
@@ -165,3 +264,5 @@ class CursorApprovalBridge {
 
 exports.APPROVAL_ENDPOINT_FILE = APPROVAL_ENDPOINT_FILE;
 exports.CursorApprovalBridge = CursorApprovalBridge;
+exports.approvalRegistryDir = approvalRegistryDir;
+exports.normalizeCursorTool = normalizeCursorTool;

package/dist/{cursorApprovalServer-JjPkdjGR.mjs → cursorApprovalServer-fjPBXSAb.mjs}

@@ -1,13 +1,64 @@
 import { createServer } from 'node:http';
 import { randomUUID } from 'node:crypto';
-import { mkdir, rename, writeFile, readFile, rm, readdir, rmdir } from 'node:fs/promises';
+import { mkdir, writeFile, rename, readFile, rm, readdir, rmdir } from 'node:fs/promises';
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
-import { l as logger } from './persistence-D9tMm6bj.mjs';
+import { homedir } from 'node:os';
+import { l as logger } from './persistence-BXtirP1k.mjs';
 
+const TOOL_NAME_MAP = {
+  read: "Read",
+  write: "Write",
+  edit: "Edit",
+  grep: "Grep",
+  glob: "Glob",
+  ls: "LS",
+  list: "LS",
+  // Cursor calls it Shell; the app's card for running commands is Bash.
+  shell: "Bash",
+  terminal: "Bash",
+  task: "Task",
+  todowrite: "TodoWrite",
+  websearch: "WebSearch",
+  webfetch: "WebFetch"
+};
+function normalizeCursorToolName(rawName) {
+  const mapped = TOOL_NAME_MAP[rawName.toLowerCase()];
+  if (mapped) return mapped;
+  return rawName.charAt(0).toUpperCase() + rawName.slice(1);
+}
+function normalizeCursorToolInput(input) {
+  const out = { ...input };
+  if (typeof out.path === "string" && out.file_path === void 0) {
+    out.file_path = out.path;
+  }
+  if (typeof out.file_path === "string" && out.path === void 0) {
+    out.path = out.file_path;
+  }
+  if (typeof out.workingDirectory === "string" && out.cwd === void 0) {
+    out.cwd = out.workingDirectory;
+  }
+  if (typeof out.streamContent === "string" && out.content === void 0) {
+    out.content = out.streamContent;
+  }
+  return out;
+}
+function normalizeCursorTool(rawName, rawInput) {
+  const input = rawInput && typeof rawInput === "object" ? rawInput : {};
+  return {
+    name: normalizeCursorToolName(rawName),
+    input: normalizeCursorToolInput(input)
+  };
+}
+
+function approvalRegistryDir() {
+  return join(homedir(), ".happy", "cursor-approvals");
+}
 const APPROVAL_ENDPOINT_FILE = ".happy-approval.json";
 const HOOKS_FILE = "hooks.json";
 const HOOKS_BACKUP_FILE = "hooks.json.happy-backup";
+const MCP_FILE = "mcp.json";
+const MCP_BACKUP_FILE = "mcp.json.happy-backup";
 const HOOK_TIMEOUT_SECONDS = 900;
 class CursorApprovalBridge {
   cwd;
@@ -16,12 +67,17 @@ class CursorApprovalBridge {
   server = null;
   port = 0;
   hadExistingHooks = false;
+  hadExistingMcp = false;
+  mcpBridge;
   /** True when .cursor/ did not exist before this session created it. */
   createdCursorDir = false;
   started = false;
+  /** Chat ids this session has registered, so they can be cleaned up. */
+  registeredChatIds = /* @__PURE__ */ new Set();
   constructor(options) {
     this.cwd = options.cwd;
     this.handler = options.handler;
+    this.mcpBridge = options.mcpBridge ?? null;
   }
   get cursorDir() {
     return join(this.cwd, ".cursor");
@@ -32,6 +88,23 @@ class CursorApprovalBridge {
     this.started = true;
     logger.debug(`[cursor] approval bridge listening on 127.0.0.1:${this.port}`);
   }
+  /**
+   * Claims a chat id for this session. Called as soon as cursor-agent reveals
+   * it, which is what lets the hook route an approval back to the session
+   * that actually made the call.
+   */
+  async registerChat(chatId) {
+    if (!this.started || this.registeredChatIds.has(chatId)) return;
+    const dir = approvalRegistryDir();
+    await mkdir(dir, { recursive: true });
+    await writeFile(join(dir, `${chatId}.json`), JSON.stringify({
+      port: this.port,
+      token: this.token,
+      pid: process.pid
+    }), "utf8");
+    this.registeredChatIds.add(chatId);
+    logger.debug(`[cursor] chat ${chatId} routed to this session's bridge`);
+  }
   listen() {
     return new Promise((resolve, reject) => {
       const server = createServer((req, res) => {
@@ -78,9 +151,12 @@ class CursorApprovalBridge {
       logger.debug("[cursor] rejecting approval request with a bad token");
       return false;
     }
-    const toolName = typeof parsed.tool_name === "string" && parsed.tool_name.length > 0 ? parsed.tool_name : "unknown tool";
+    const { name: toolName, input: toolInput } = normalizeCursorTool(
+      typeof parsed.tool_name === "string" && parsed.tool_name.length > 0 ? parsed.tool_name : "unknown",
+      parsed.tool_input
+    );
     const toolCallId = typeof parsed.tool_use_id === "string" && parsed.tool_use_id.length > 0 ? parsed.tool_use_id : `cursor-${randomUUID()}`;
-    return this.handler.requestApproval(toolCallId, toolName, parsed.tool_input ?? {});
+    return this.handler.requestApproval(toolCallId, toolName, toolInput);
   }
   /**
    * Writes .cursor/hooks.json pointing at this CLI. Any file already there is
@@ -96,11 +172,6 @@ class CursorApprovalBridge {
       this.hadExistingHooks = true;
       logger.debug("[cursor] existing hooks.json moved aside for the session");
     }
-    await writeFile(join(this.cursorDir, APPROVAL_ENDPOINT_FILE), JSON.stringify({
-      port: this.port,
-      token: this.token,
-      pid: process.pid
-    }), "utf8");
     const hookCommand = `${process.execPath} ${process.argv[1]} cursor-approval-hook`;
     await writeFile(hooksPath, JSON.stringify({
       version: 1,
@@ -113,8 +184,24 @@ class CursorApprovalBridge {
         ]
       }
     }, null, 2), "utf8");
+    await this.installMcpConfig();
     await this.excludeFromGit();
   }
+  /** Points Cursor at Happy's tools (change_title, preview_html, devices…). */
+  async installMcpConfig() {
+    if (!this.mcpBridge) return;
+    const mcpPath = join(this.cursorDir, MCP_FILE);
+    if (existsSync(mcpPath)) {
+      await rename(mcpPath, join(this.cursorDir, MCP_BACKUP_FILE));
+      this.hadExistingMcp = true;
+      logger.debug("[cursor] existing mcp.json moved aside for the session");
+    }
+    await writeFile(mcpPath, JSON.stringify({
+      mcpServers: {
+        happy: { command: this.mcpBridge.command, args: this.mcpBridge.args }
+      }
+    }, null, 2), "utf8");
+  }
   /** Keep the session's scaffolding out of `git status`. */
   async excludeFromGit() {
     const excludePath = join(this.cwd, ".git", "info", "exclude");
@@ -126,6 +213,7 @@ class CursorApprovalBridge {
         excludePath,
         `${current}${current.endsWith("\n") ? "" : "\n"}# added by happy cursor session
 .cursor/hooks.json
+.cursor/mcp.json
 .cursor/.happy-approval.json
 `,
         "utf8"
@@ -138,6 +226,10 @@ class CursorApprovalBridge {
     if (!this.started) return;
     this.started = false;
     try {
+      for (const chatId of this.registeredChatIds) {
+        await rm(join(approvalRegistryDir(), `${chatId}.json`), { force: true });
+      }
+      this.registeredChatIds.clear();
       await rm(join(this.cursorDir, APPROVAL_ENDPOINT_FILE), { force: true });
       const hooksPath = join(this.cursorDir, HOOKS_FILE);
       const backupPath = join(this.cursorDir, HOOKS_BACKUP_FILE);
@@ -146,6 +238,13 @@ class CursorApprovalBridge {
       } else {
         await rm(hooksPath, { force: true });
       }
+      const mcpPath = join(this.cursorDir, MCP_FILE);
+      const mcpBackup = join(this.cursorDir, MCP_BACKUP_FILE);
+      if (this.hadExistingMcp && existsSync(mcpBackup)) {
+        await rename(mcpBackup, mcpPath);
+      } else if (this.mcpBridge) {
+        await rm(mcpPath, { force: true });
+      }
       if (this.createdCursorDir && (await readdir(this.cursorDir)).length === 0) {
         await rmdir(this.cursorDir);
       }
@@ -161,4 +260,4 @@ class CursorApprovalBridge {
   }
 }
 
-export { APPROVAL_ENDPOINT_FILE as A, CursorApprovalBridge as C };
+export { APPROVAL_ENDPOINT_FILE as A, CursorApprovalBridge as C, approvalRegistryDir as a, normalizeCursorTool as n };

package/dist/{deviceKeys-B4aqjnE6.mjs → deviceKeys-BYHzWSyg.mjs}

@@ -1,6 +1,6 @@
 import axios from 'axios';
-import { h as decodeBase64, e as encodeBase64, f as encrypt, g as decrypt, c as configuration } from './persistence-D9tMm6bj.mjs';
-import { decryptWithEphemeralKey } from './auth-Q2STUNI-.mjs';
+import { h as decodeBase64, e as encodeBase64, f as encrypt, g as decrypt, c as configuration } from './persistence-BXtirP1k.mjs';
+import { decryptWithEphemeralKey } from './auth-DPe89SQx.mjs';
 import tweetnacl from 'tweetnacl';
 import { existsSync } from 'node:fs';
 import { writeFile, mkdir, readFile } from 'node:fs/promises';

package/dist/{deviceKeys-DyUn0bEx.cjs → deviceKeys-DPut1U07.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
 var axios = require('axios');
-var logger = require('./persistence-BcQmjobZ.cjs');
-var auth = require('./auth-G9fZpVJ2.cjs');
+var logger = require('./persistence-DOgft4tZ.cjs');
+var auth = require('./auth-B9kOli6i.cjs');
 var tweetnacl = require('tweetnacl');
 var fs = require('node:fs');
 var promises = require('node:fs/promises');

package/dist/{doctor-DRnft_5-.mjs → doctor-BA28TuMy.mjs}

@@ -1,6 +1,6 @@
 import chalk from 'chalk';
-import { p as packageJson, c as configuration, a as readSettings, r as readCredentials, m as readDaemonState } from './persistence-D9tMm6bj.mjs';
-import { checkIfDaemonRunningAndCleanupStaleState } from './controlClient-DoS9JqQC.mjs';
+import { p as packageJson, c as configuration, a as readSettings, r as readCredentials, m as readDaemonState } from './persistence-BXtirP1k.mjs';
+import { checkIfDaemonRunningAndCleanupStaleState } from './controlClient-DSiES8Un.mjs';
 import { findAllHappyProcesses } from './doctor-ON7pN5G5.mjs';
 import { existsSync, readdirSync, statSync } from 'node:fs';
 import { join } from 'node:path';

package/dist/{doctor-BJSuVRUZ.cjs → doctor-B_W7odmC.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
 var chalk = require('chalk');
-var logger = require('./persistence-BcQmjobZ.cjs');
-var controlClient = require('./controlClient-CEz_p1zc.cjs');
+var logger = require('./persistence-DOgft4tZ.cjs');
+var controlClient = require('./controlClient-FDsMeGVn.cjs');
 var doctor = require('./doctor-C08m5Z9f.cjs');
 var fs = require('node:fs');
 var path = require('node:path');