claude-cup 0.2.2 → 0.2.4

package/mcp-server/dist/mcp-server.mjs

@@ -4,13 +4,15 @@
 // It supports both long-lived stdio MCP server mode and short-lived --hook mode.
 // The source path is baked in at build time so the launcher works from any directory.
 
-const SRC = 'C:/Users/itaib/nice claude iedeas/Claude-/claude-jar/mcp-server/src';
+import { pathToFileURL } from 'node:url';
+const SRC = "C:\\Users\\itaib\\nice claude iedeas\\Claude-\\claude-jar\\mcp-server\\src";
+const toURL = f => pathToFileURL(f).href;
 const isHook = process.argv.includes('--hook');
 
 if (isHook) {
-  const { runHookIngest } = await import('file:///' + SRC + '/hook-ingest.js');
+  const { runHookIngest } = await import(toURL(SRC + '/hook-ingest.js'));
   await runHookIngest(process.argv);
 } else {
-  const { startMcpServer } = await import('file:///' + SRC + '/index.js');
+  const { startMcpServer } = await import(toURL(SRC + '/index.js'));
   await startMcpServer();
 }

package/mcp-server/src/hook-ingest.js

@@ -75,13 +75,24 @@ export async function runHookIngest(argv = process.argv) {
   const pjIdx = argv.indexOf('--payload-json');
   if (pjIdx !== -1 && argv[pjIdx + 1]) {
     try { payload = JSON.parse(argv[pjIdx + 1]); } catch { /* ignore */ }
-  } else {
-    // read stdin
-    let raw = '';
-    for await (const chunk of process.stdin) raw += chunk;
-    if (raw.trim()) {
-      try { payload = JSON.parse(raw); } catch { /* ignore */ }
-    }
+  } else if (!process.stdin.isTTY) {
+    // Read stdin with a timeout so the hook doesn't hang if Claude Code
+    // closes the pipe slowly or sends an empty payload.
+    try {
+      const chunks = [];
+      const timeout = new Promise(r => setTimeout(r, 2000));
+      const read = new Promise(resolve => {
+        process.stdin.on('data', d => chunks.push(d));
+        process.stdin.on('end', resolve);
+        process.stdin.on('error', resolve);
+      });
+      await Promise.race([read, timeout]);
+      process.stdin.removeAllListeners();
+      const raw = Buffer.concat(chunks).toString('utf8');
+      if (raw.trim()) {
+        try { payload = JSON.parse(raw); } catch { /* ignore */ }
+      }
+    } catch { /* ignore stdin errors */ }
   }
 
   const configDir = process.env.CLAUDE_CONFIG_DIR || undefined;

package/mcp-server/src/registration.js

@@ -28,9 +28,9 @@ function deepMergeOnlyOurKeys(target, our) {
     result.hooks = { ...(target.hooks || {}) };
     for (const [k, arr] of Object.entries(our.hooks)) {
       const existing = Array.isArray(result.hooks[k]) ? result.hooks[k] : [];
-      const seen = new Set(existing.map(e => JSON.stringify({ c: e.command, a: e.args })));
+      const seen = new Set(existing.map(e => JSON.stringify(e)));
       for (const item of arr) {
-        const key = JSON.stringify({ c: item.command, a: item.args });
+        const key = JSON.stringify(item);
         if (!seen.has(key)) {
           existing.push(item);
           seen.add(key);
@@ -68,9 +68,9 @@ export function registerClaudeCode(configDir) {
       },
     },
     hooks: {
-      SessionStart: [{ command: 'node', args: [launcher, '--hook', 'SessionStart'] }],
-      PreToolUse:  [{ command: 'node', args: [launcher, '--hook', 'PreToolUse'] }],
-      PostToolUse: [{ command: 'node', args: [launcher, '--hook', 'PostToolUse'] }],
+      SessionStart: [{ matcher: '', hooks: [{ type: 'command', command: `node "${launcher}" --hook SessionStart` }] }],
+      PreToolUse:  [{ matcher: '', hooks: [{ type: 'command', command: `node "${launcher}" --hook PreToolUse` }] }],
+      PostToolUse: [{ matcher: '', hooks: [{ type: 'command', command: `node "${launcher}" --hook PostToolUse` }] }],
     },
   };
 
@@ -78,7 +78,7 @@ export function registerClaudeCode(configDir) {
   let backup = null;
   try {
     if (existsSync(settingsPath)) {
-      const raw = readFileSync(settingsPath, 'utf8');
+      const raw = readFileSync(settingsPath, 'utf8').replace(/^\uFEFF/, '');
       if (raw.trim()) original = JSON.parse(raw);
     }
   } catch (e) {
@@ -117,7 +117,7 @@ export function disableClaudeCode(configDir) {
 
   let settings = {};
   if (existsSync(settingsPath)) {
-    try { settings = JSON.parse(readFileSync(settingsPath, 'utf8')); } catch { return { ok: false, error: 'corrupt settings.json', didWrite: false, backupPath: null, launcherPath: launcher }; }
+    try { settings = JSON.parse(readFileSync(settingsPath, 'utf8').replace(/^\uFEFF/, '')); } catch { return { ok: false, error: 'corrupt settings.json', didWrite: false, backupPath: null, launcherPath: launcher }; }
   }
 
   let changed = false;
@@ -129,10 +129,10 @@ export function disableClaudeCode(configDir) {
   if (settings.hooks) {
     const launcherBase = 'mcp-server.mjs';
     for (const k of Object.keys(settings.hooks)) {
-      settings.hooks[k] = (settings.hooks[k] || []).filter(h => {
-        if (!h || !h.args) return true;
-        const argsStr = JSON.stringify(h.args);
-        return !argsStr.includes(launcherBase);
+      settings.hooks[k] = (settings.hooks[k] || []).filter(rule => {
+        if (!rule) return true;
+        const ruleStr = JSON.stringify(rule);
+        return !ruleStr.includes(launcherBase);
       });
       if (settings.hooks[k].length === 0) delete settings.hooks[k];
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-cup",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "Claude Jar v2 — native desktop visual companion (Tauri + Svelte) with MCP/hook integration for live Claude activity. Beautiful accumulating jar + live intensity meter. The jar is the usage meter.",
   "license": "MIT",
   "type": "module",

package/scripts/build-mcp-launcher.mjs

@@ -24,14 +24,16 @@ const launcher = `#!/usr/bin/env node
 // It supports both long-lived stdio MCP server mode and short-lived --hook mode.
 // The source path is baked in at build time so the launcher works from any directory.
 
-const SRC = '${srcAbsolute}';
+import { pathToFileURL } from 'node:url';
+const SRC = ${JSON.stringify(mcpSrc)};
+const toURL = f => pathToFileURL(f).href;
 const isHook = process.argv.includes('--hook');
 
 if (isHook) {
-  const { runHookIngest } = await import('file:///' + SRC + '/hook-ingest.js');
+  const { runHookIngest } = await import(toURL(SRC + '/hook-ingest.js'));
   await runHookIngest(process.argv);
 } else {
-  const { startMcpServer } = await import('file:///' + SRC + '/index.js');
+  const { startMcpServer } = await import(toURL(SRC + '/index.js'));
   await startMcpServer();
 }
 `;