@react-grab/claude-code 0.0.77 → 0.0.80

package/dist/client.js

@@ -67,19 +67,33 @@ async function* streamSSE(stream, signal) {
   }
 }
 async function* streamFromServer(serverUrl, context, signal) {
-  const response = await fetch(`${serverUrl}/agent`, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify(context),
-    signal
-  });
-  if (!response.ok) {
-    throw new Error(`Server error: ${response.status}`);
-  }
-  if (!response.body) {
-    throw new Error("No response body");
+  const sessionId = context.sessionId;
+  const handleAbort = () => {
+    if (sessionId) {
+      fetch(`${serverUrl}/abort/${sessionId}`, { method: "POST" }).catch(
+        () => {
+        }
+      );
+    }
+  };
+  signal.addEventListener("abort", handleAbort);
+  try {
+    const response = await fetch(`${serverUrl}/agent`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(context),
+      signal
+    });
+    if (!response.ok) {
+      throw new Error(`Server error: ${response.status}`);
+    }
+    if (!response.body) {
+      throw new Error("No response body");
+    }
+    yield* streamSSE(response.body, signal);
+  } finally {
+    signal.removeEventListener("abort", handleAbort);
   }
-  yield* streamSSE(response.body, signal);
 }
 var createClaudeAgentProvider = (providerOptions = {}) => {
   const { serverUrl = DEFAULT_SERVER_URL, getOptions } = providerOptions;
@@ -116,6 +130,7 @@ var createClaudeAgentProvider = (providerOptions = {}) => {
       yield* streamFromServer(serverUrl, mergedContext, signal);
     },
     supportsResume: true,
+    supportsFollowUp: true,
     checkConnection: async () => {
       const now = Date.now();
       if (connectionCache && now - connectionCache.timestamp < CONNECTION_CHECK_TTL_MS) {
@@ -142,19 +157,26 @@ var createClaudeAgentProvider = (providerOptions = {}) => {
 var attachAgent = async () => {
   if (typeof window === "undefined") return;
   const provider = createClaudeAgentProvider();
+  const attach = (api2) => {
+    api2.setAgent({ provider, storage: sessionStorage });
+  };
   const api = window.__REACT_GRAB__;
   if (api) {
-    api.setAgent({ provider, storage: sessionStorage });
+    attach(api);
     return;
   }
   window.addEventListener(
     "react-grab:init",
     (event) => {
       const customEvent = event;
-      customEvent.detail.setAgent({ provider, storage: sessionStorage });
+      attach(customEvent.detail);
     },
     { once: true }
   );
+  const apiAfterListener = window.__REACT_GRAB__;
+  if (apiAfterListener) {
+    attach(apiAfterListener);
+  }
 };
 attachAgent();
 

package/dist/server.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var net = require('net');
+var child_process = require('child_process');
 var url = require('url');
 var http = require('http');
 var http2 = require('http2');
@@ -8,7 +8,6 @@ var stream = require('stream');
 var crypto = require('crypto');
 var path = require('path');
 var events = require('events');
-var child_process = require('child_process');
 var readline = require('readline');
 var fs = require('fs');
 var promises = require('fs/promises');
@@ -36,7 +35,6 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-var net__default = /*#__PURE__*/_interopDefault(net);
 var crypto__default = /*#__PURE__*/_interopDefault(crypto);
 var fs__namespace = /*#__PURE__*/_interopNamespace(fs);
 
@@ -8762,8 +8760,7 @@ var ProcessTransport = class {
         env.CLAUDE_CODE_ENTRYPOINT = "sdk-ts";
       }
       const fs2 = getFsImplementation();
-      const isPathCommand = !pathToClaudeCodeExecutable.includes('/') && !pathToClaudeCodeExecutable.includes('\\');
-      if (!isPathCommand && !fs2.existsSync(pathToClaudeCodeExecutable)) {
+      if (!fs2.existsSync(pathToClaudeCodeExecutable)) {
         const errorMessage = isNativeBinary(pathToClaudeCodeExecutable) ? `Claude Code native binary not found at ${pathToClaudeCodeExecutable}. Please ensure Claude Code is installed via native installer or specify a valid path with options.pathToClaudeCodeExecutable.` : `Claude Code executable not found at ${pathToClaudeCodeExecutable}. Is options.pathToClaudeCodeExecutable set?`;
         throw new ReferenceError(errorMessage);
       }
@@ -14577,7 +14574,12 @@ function query({
   } else if (systemPrompt.type === "preset") {
     appendSystemPrompt = systemPrompt.append;
   }
-  let pathToClaudeCodeExecutable = rest.pathToClaudeCodeExecutable || "claude";
+  let pathToClaudeCodeExecutable = rest.pathToClaudeCodeExecutable;
+  if (!pathToClaudeCodeExecutable) {
+    const filename = url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('server.cjs', document.baseURI).href)));
+    const dirname2 = path.join(filename, "..");
+    pathToClaudeCodeExecutable = path.join(dirname2, "cli.js");
+  }
   process.env.CLAUDE_AGENT_SDK_VERSION = "0.1.46";
   const {
     abortController = createAbortController(),
@@ -14696,30 +14698,55 @@ function query({
 var DEFAULT_PORT = 4567;
 
 // src/server.ts
-var VERSION = "0.0.77";
+var VERSION = "0.0.80";
+var resolveClaudePath = () => {
+  const command = process.platform === "win32" ? "where claude" : "which claude";
+  try {
+    const result = child_process.execSync(command, { encoding: "utf8" }).trim();
+    return result.split("\n")[0];
+  } catch {
+    return "claude";
+  }
+};
+var claudeSessionMap = /* @__PURE__ */ new Map();
+var abortedSessions = /* @__PURE__ */ new Set();
+var lastClaudeSessionId;
 var isTextBlock = (block) => block.type === "text";
 var createServer = () => {
   const app = new Hono2();
-  app.use("/*", cors());
+  app.use("*", cors());
   app.post("/agent", async (context) => {
     const body = await context.req.json();
-    const { content, prompt, options } = body;
-    const fullPrompt = `${prompt}
+    const { content, prompt, options, sessionId } = body;
+    const claudeSessionId = sessionId ? claudeSessionMap.get(sessionId) : void 0;
+    const isFollowUp = Boolean(claudeSessionId);
+    const userPrompt = isFollowUp ? prompt : `${prompt}
 
 ${content}`;
     return streamSSE(context, async (stream2) => {
+      const isAborted2 = () => sessionId && abortedSessions.has(sessionId);
       try {
         await stream2.writeSSE({ data: "Thinking...", event: "status" });
+        const env = { ...process.env };
+        delete env.NODE_OPTIONS;
+        delete env.VSCODE_INSPECTOR_OPTIONS;
         const queryResult = query({
-          prompt: fullPrompt,
+          prompt: userPrompt,
           options: {
-            pathToClaudeCodeExecutable: "claude",
+            pathToClaudeCodeExecutable: resolveClaudePath(),
             cwd: process.cwd(),
             includePartialMessages: true,
-            ...options
+            env,
+            ...options,
+            ...isFollowUp && claudeSessionId ? { resume: claudeSessionId } : {}
           }
         });
+        let capturedClaudeSessionId;
         for await (const message of queryResult) {
+          if (isAborted2()) break;
+          if (!capturedClaudeSessionId && message.session_id) {
+            capturedClaudeSessionId = message.session_id;
+          }
           if (message.type === "assistant") {
             const textContent = message.message.content.filter(isTextBlock).map((block) => block.text).join(" ");
             if (textContent) {
@@ -14733,37 +14760,77 @@ ${content}`;
             });
           }
         }
-        await stream2.writeSSE({ data: "", event: "done" });
+        if (!isAborted2() && capturedClaudeSessionId) {
+          lastClaudeSessionId = capturedClaudeSessionId;
+          if (sessionId) {
+            claudeSessionMap.set(sessionId, capturedClaudeSessionId);
+          }
+        }
+        if (!isAborted2()) {
+          await stream2.writeSSE({ data: "", event: "done" });
+        }
       } catch (error) {
-        const errorMessage = error instanceof Error ? error.message : "Unknown error";
-        await stream2.writeSSE({
-          data: `Error: ${errorMessage}`,
-          event: "error"
-        });
+        if (!isAborted2()) {
+          const errorMessage = error instanceof Error ? error.message : "Unknown error";
+          const stderr = error instanceof Error && "stderr" in error ? String(error.stderr) : void 0;
+          const fullError = stderr && stderr.trim() ? `${errorMessage}
+
+stderr:
+${stderr.trim()}` : errorMessage;
+          await stream2.writeSSE({
+            data: `Error: ${fullError}`,
+            event: "error"
+          });
+        }
+      } finally {
+        if (sessionId) {
+          abortedSessions.delete(sessionId);
+        }
       }
     });
   });
+  app.post("/abort/:sessionId", (context) => {
+    const { sessionId } = context.req.param();
+    abortedSessions.add(sessionId);
+    return context.json({ status: "ok" });
+  });
+  app.post("/undo", async (context) => {
+    if (!lastClaudeSessionId) {
+      return context.json({ status: "error", message: "No session to undo" });
+    }
+    try {
+      const env = { ...process.env };
+      delete env.NODE_OPTIONS;
+      delete env.VSCODE_INSPECTOR_OPTIONS;
+      const queryResult = query({
+        prompt: "/rewind",
+        options: {
+          pathToClaudeCodeExecutable: resolveClaudePath(),
+          cwd: process.cwd(),
+          env,
+          resume: lastClaudeSessionId
+        }
+      });
+      for await (const message of queryResult) {
+        if (message.type === "result") break;
+      }
+      return context.json({ status: "ok" });
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : "Unknown error";
+      return context.json({ status: "error", message: errorMessage });
+    }
+  });
   app.get("/health", (context) => {
     return context.json({ status: "ok", provider: "claude" });
   });
   return app;
 };
-var isPortInUse = (port) => new Promise((resolve) => {
-  const server = net__default.default.createServer();
-  server.once("error", () => resolve(true));
-  server.once("listening", () => {
-    server.close();
-    resolve(false);
-  });
-  server.listen(port);
-});
 var startServer = async (port = DEFAULT_PORT) => {
-  if (await isPortInUse(port)) {
-    return;
-  }
   const app = createServer();
   serve({ fetch: app.fetch, port });
-  console.log(`${import_picocolors.default.magenta("\u269B")} ${import_picocolors.default.bold("React Grab")} ${import_picocolors.default.gray(VERSION)} ${import_picocolors.default.dim("(Claude Code)")}`);
+  console.log(
+    `${import_picocolors.default.magenta("\u269B")} ${import_picocolors.default.bold("React Grab")} ${import_picocolors.default.gray(VERSION)} ${import_picocolors.default.dim("(Claude Code)")}`
+  );
   console.log(`- Local:    ${import_picocolors.default.cyan(`http://localhost:${port}`)}`);
 };
 if ((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('server.cjs', document.baseURI).href)) === url.pathToFileURL(process.argv[1]).href) {

package/dist/server.js

@@ -1,4 +1,4 @@
-import net from 'net';
+import { execSync, spawn } from 'child_process';
 import { pathToFileURL, fileURLToPath } from 'url';
 import { createServer as createServer$1 } from 'http';
 import { Http2ServerRequest } from 'http2';
@@ -6,7 +6,6 @@ import { Readable } from 'stream';
 import crypto, { randomUUID } from 'crypto';
 import { dirname, join } from 'path';
 import { setMaxListeners } from 'events';
-import { spawn } from 'child_process';
 import { createInterface } from 'readline';
 import * as fs from 'fs';
 import { realpathSync } from 'fs';
@@ -8736,8 +8735,7 @@ var ProcessTransport = class {
         env.CLAUDE_CODE_ENTRYPOINT = "sdk-ts";
       }
       const fs2 = getFsImplementation();
-      const isPathCommand = !pathToClaudeCodeExecutable.includes('/') && !pathToClaudeCodeExecutable.includes('\\');
-      if (!isPathCommand && !fs2.existsSync(pathToClaudeCodeExecutable)) {
+      if (!fs2.existsSync(pathToClaudeCodeExecutable)) {
         const errorMessage = isNativeBinary(pathToClaudeCodeExecutable) ? `Claude Code native binary not found at ${pathToClaudeCodeExecutable}. Please ensure Claude Code is installed via native installer or specify a valid path with options.pathToClaudeCodeExecutable.` : `Claude Code executable not found at ${pathToClaudeCodeExecutable}. Is options.pathToClaudeCodeExecutable set?`;
         throw new ReferenceError(errorMessage);
       }
@@ -14551,7 +14549,12 @@ function query({
   } else if (systemPrompt.type === "preset") {
     appendSystemPrompt = systemPrompt.append;
   }
-  let pathToClaudeCodeExecutable = rest.pathToClaudeCodeExecutable || "claude";
+  let pathToClaudeCodeExecutable = rest.pathToClaudeCodeExecutable;
+  if (!pathToClaudeCodeExecutable) {
+    const filename = fileURLToPath(import.meta.url);
+    const dirname2 = join(filename, "..");
+    pathToClaudeCodeExecutable = join(dirname2, "cli.js");
+  }
   process.env.CLAUDE_AGENT_SDK_VERSION = "0.1.46";
   const {
     abortController = createAbortController(),
@@ -14670,30 +14673,55 @@ function query({
 var DEFAULT_PORT = 4567;
 
 // src/server.ts
-var VERSION = "0.0.77";
+var VERSION = "0.0.80";
+var resolveClaudePath = () => {
+  const command = process.platform === "win32" ? "where claude" : "which claude";
+  try {
+    const result = execSync(command, { encoding: "utf8" }).trim();
+    return result.split("\n")[0];
+  } catch {
+    return "claude";
+  }
+};
+var claudeSessionMap = /* @__PURE__ */ new Map();
+var abortedSessions = /* @__PURE__ */ new Set();
+var lastClaudeSessionId;
 var isTextBlock = (block) => block.type === "text";
 var createServer = () => {
   const app = new Hono2();
-  app.use("/*", cors());
+  app.use("*", cors());
   app.post("/agent", async (context) => {
     const body = await context.req.json();
-    const { content, prompt, options } = body;
-    const fullPrompt = `${prompt}
+    const { content, prompt, options, sessionId } = body;
+    const claudeSessionId = sessionId ? claudeSessionMap.get(sessionId) : void 0;
+    const isFollowUp = Boolean(claudeSessionId);
+    const userPrompt = isFollowUp ? prompt : `${prompt}
 
 ${content}`;
     return streamSSE(context, async (stream2) => {
+      const isAborted2 = () => sessionId && abortedSessions.has(sessionId);
       try {
         await stream2.writeSSE({ data: "Thinking...", event: "status" });
+        const env = { ...process.env };
+        delete env.NODE_OPTIONS;
+        delete env.VSCODE_INSPECTOR_OPTIONS;
         const queryResult = query({
-          prompt: fullPrompt,
+          prompt: userPrompt,
           options: {
-            pathToClaudeCodeExecutable: "claude",
+            pathToClaudeCodeExecutable: resolveClaudePath(),
             cwd: process.cwd(),
             includePartialMessages: true,
-            ...options
+            env,
+            ...options,
+            ...isFollowUp && claudeSessionId ? { resume: claudeSessionId } : {}
           }
         });
+        let capturedClaudeSessionId;
         for await (const message of queryResult) {
+          if (isAborted2()) break;
+          if (!capturedClaudeSessionId && message.session_id) {
+            capturedClaudeSessionId = message.session_id;
+          }
           if (message.type === "assistant") {
             const textContent = message.message.content.filter(isTextBlock).map((block) => block.text).join(" ");
             if (textContent) {
@@ -14707,37 +14735,77 @@ ${content}`;
             });
           }
         }
-        await stream2.writeSSE({ data: "", event: "done" });
+        if (!isAborted2() && capturedClaudeSessionId) {
+          lastClaudeSessionId = capturedClaudeSessionId;
+          if (sessionId) {
+            claudeSessionMap.set(sessionId, capturedClaudeSessionId);
+          }
+        }
+        if (!isAborted2()) {
+          await stream2.writeSSE({ data: "", event: "done" });
+        }
       } catch (error) {
-        const errorMessage = error instanceof Error ? error.message : "Unknown error";
-        await stream2.writeSSE({
-          data: `Error: ${errorMessage}`,
-          event: "error"
-        });
+        if (!isAborted2()) {
+          const errorMessage = error instanceof Error ? error.message : "Unknown error";
+          const stderr = error instanceof Error && "stderr" in error ? String(error.stderr) : void 0;
+          const fullError = stderr && stderr.trim() ? `${errorMessage}
+
+stderr:
+${stderr.trim()}` : errorMessage;
+          await stream2.writeSSE({
+            data: `Error: ${fullError}`,
+            event: "error"
+          });
+        }
+      } finally {
+        if (sessionId) {
+          abortedSessions.delete(sessionId);
+        }
       }
     });
   });
+  app.post("/abort/:sessionId", (context) => {
+    const { sessionId } = context.req.param();
+    abortedSessions.add(sessionId);
+    return context.json({ status: "ok" });
+  });
+  app.post("/undo", async (context) => {
+    if (!lastClaudeSessionId) {
+      return context.json({ status: "error", message: "No session to undo" });
+    }
+    try {
+      const env = { ...process.env };
+      delete env.NODE_OPTIONS;
+      delete env.VSCODE_INSPECTOR_OPTIONS;
+      const queryResult = query({
+        prompt: "/rewind",
+        options: {
+          pathToClaudeCodeExecutable: resolveClaudePath(),
+          cwd: process.cwd(),
+          env,
+          resume: lastClaudeSessionId
+        }
+      });
+      for await (const message of queryResult) {
+        if (message.type === "result") break;
+      }
+      return context.json({ status: "ok" });
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : "Unknown error";
+      return context.json({ status: "error", message: errorMessage });
+    }
+  });
   app.get("/health", (context) => {
     return context.json({ status: "ok", provider: "claude" });
   });
   return app;
 };
-var isPortInUse = (port) => new Promise((resolve) => {
-  const server = net.createServer();
-  server.once("error", () => resolve(true));
-  server.once("listening", () => {
-    server.close();
-    resolve(false);
-  });
-  server.listen(port);
-});
 var startServer = async (port = DEFAULT_PORT) => {
-  if (await isPortInUse(port)) {
-    return;
-  }
   const app = createServer();
   serve({ fetch: app.fetch, port });
-  console.log(`${import_picocolors.default.magenta("\u269B")} ${import_picocolors.default.bold("React Grab")} ${import_picocolors.default.gray(VERSION)} ${import_picocolors.default.dim("(Claude Code)")}`);
+  console.log(
+    `${import_picocolors.default.magenta("\u269B")} ${import_picocolors.default.bold("React Grab")} ${import_picocolors.default.gray(VERSION)} ${import_picocolors.default.dim("(Claude Code)")}`
+  );
   console.log(`- Local:    ${import_picocolors.default.cyan(`http://localhost:${port}`)}`);
 };
 if (import.meta.url === pathToFileURL(process.argv[1]).href) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-grab/claude-code",
-  "version": "0.0.77",
+  "version": "0.0.80",
   "type": "module",
   "bin": {
     "react-grab-claude-code": "./dist/cli.js"
@@ -24,14 +24,18 @@
     "dist"
   ],
   "devDependencies": {
+    "@types/cross-spawn": "^6.0.6",
+    "@types/kill-port": "^2.0.3",
     "tsup": "^8.4.0"
   },
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.1.0",
     "@hono/node-server": "^1.19.6",
+    "cross-spawn": "^7.0.6",
     "hono": "^4.0.0",
+    "kill-port": "^2.0.1",
     "picocolors": "^1.1.1",
-    "react-grab": "0.0.77"
+    "react-grab": "0.0.80"
   },
   "scripts": {
     "dev": "tsup --watch",