@ian2018cs/agenthub 0.1.62 → 0.1.63

package/dist/index.html

@@ -25,7 +25,7 @@
     
     <!-- Prevent zoom on iOS -->
     <meta name="format-detection" content="telephone=no" />
-    <script type="module" crossorigin src="/assets/index-DWxvF29L.js"></script>
+    <script type="module" crossorigin src="/assets/index-Bih5jXn3.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/vendor-react-BeVl62c0.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-codemirror-C_VWDoZS.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-utils-00TdZexr.js">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ian2018cs/agenthub",
-  "version": "0.1.62",
+  "version": "0.1.63",
   "description": "A web-based UI for AI Agents",
   "type": "module",
   "main": "server/index.js",

package/server/claude-sdk.js

@@ -232,13 +232,14 @@ function mapCliOptionsToSDK(options = {}) {
  * @param {Array<string>} tempImagePaths - Temp image file paths for cleanup
  * @param {string} tempDir - Temp directory for cleanup
  */
-function addSession(sessionId, queryInstance, tempImagePaths = [], tempDir = null) {
+function addSession(sessionId, queryInstance, tempImagePaths = [], tempDir = null, abortController = null) {
   activeSessions.set(sessionId, {
     instance: queryInstance,
     startTime: Date.now(),
     status: 'active',
     tempImagePaths,
-    tempDir
+    tempDir,
+    abortController
   });
 }
 
@@ -511,6 +512,10 @@ async function queryClaudeSDK(command, options = {}, ws) {
     // Map CLI options to SDK format
     const sdkOptions = mapCliOptionsToSDK(options);
 
+    // Create AbortController for session cancellation
+    const abortController = new AbortController();
+    sdkOptions.abortController = abortController;
+
     // Load MCP configuration
     const mcpServers = await loadMcpConfig(options.cwd, userUuid);
     if (mcpServers) {
@@ -651,7 +656,7 @@ async function queryClaudeSDK(command, options = {}, ws) {
 
     // Track the query instance for abort capability
     if (capturedSessionId) {
-      addSession(capturedSessionId, queryInstance, tempImagePaths, tempDir);
+      addSession(capturedSessionId, queryInstance, tempImagePaths, tempDir, abortController);
     }
 
     // Process streaming messages
@@ -661,7 +666,7 @@ async function queryClaudeSDK(command, options = {}, ws) {
       if (message.session_id && !capturedSessionId) {
 
         capturedSessionId = message.session_id;
-        addSession(capturedSessionId, queryInstance, tempImagePaths, tempDir);
+        addSession(capturedSessionId, queryInstance, tempImagePaths, tempDir, abortController);
 
         // Set session ID on writer
         if (ws.setSessionId && typeof ws.setSessionId === 'function') {
@@ -775,17 +780,33 @@ async function queryClaudeSDK(command, options = {}, ws) {
     // Clean up temporary image files
     await cleanupTempFiles(tempImagePaths, tempDir);
 
-    // Send completion event
-    console.log('Streaming complete, sending claude-complete event');
-    ws.send({
-      type: 'claude-complete',
-      sessionId: capturedSessionId,
-      exitCode: 0,
-      isNewSession: !sessionId && !!command
-    });
-    console.log('claude-complete event sent');
+    // Only send completion event if not aborted — when the session is aborted
+    // via abortClaudeSDKSession(), that function already sends 'session-aborted'
+    // to the frontend, so we must not send a duplicate 'claude-complete'.
+    if (!abortController.signal.aborted) {
+      console.log('Streaming complete, sending claude-complete event');
+      ws.send({
+        type: 'claude-complete',
+        sessionId: capturedSessionId,
+        exitCode: 0,
+        isNewSession: !sessionId && !!command
+      });
+      console.log('claude-complete event sent');
+    } else {
+      console.log('Session was aborted, skipping claude-complete event');
+    }
 
   } catch (error) {
+    // If the session was aborted, this is expected — do not treat as an error.
+    if (abortController.signal.aborted) {
+      console.log('Session aborted, ignoring post-abort error:', error.message);
+      if (capturedSessionId) {
+        removeSession(capturedSessionId);
+      }
+      await cleanupTempFiles(tempImagePaths, tempDir);
+      return;
+    }
+
     console.error('SDK query error:', error);
 
     // Clean up session on error
@@ -822,8 +843,20 @@ async function abortClaudeSDKSession(sessionId) {
   try {
     console.log(`Aborting SDK session: ${sessionId}`);
 
-    // Call interrupt() on the query instance
-    await session.instance.interrupt();
+    // Signal abort via AbortController (stops SDK internal operations)
+    if (session.abortController) {
+      session.abortController.abort();
+    }
+
+    // Forcefully close the query and terminate the underlying process.
+    // close() is the correct method for aborting a running query — it kills the
+    // CLI subprocess and cleans up all resources (MCP transports, pending requests).
+    // interrupt() only works in streaming-input mode and is not reliable here.
+    try {
+      session.instance.close();
+    } catch (closeError) {
+      console.error(`Error closing session ${sessionId}:`, closeError);
+    }
 
     // Update session status
     session.status = 'aborted';

package/server/services/tool-guard/index.js

@@ -78,6 +78,8 @@ export async function evaluate(toolName, input, { userUuid, cwd }) {
   const rewrittenInput = rewriteClaudePaths(toolName, input, claudeDir);
   const effectiveInput = rewrittenInput || input;
 
+  if (VERBOSE) console.log(`[ToolGuard] INPUT ${toolName}:`, JSON.stringify(effectiveInput));
+
   if (rewrittenInput && VERBOSE) {
     console.log(`[ToolGuard] PATH-REWRITE ${toolName}: .claude paths → ${claudeDir}`);
   }