clay-server 2.9.3-beta.3 → 2.9.3-beta.4

package/bin/cli.js

@@ -23,7 +23,11 @@ var net = require("net");
 
 // Detect dev mode — dev and prod use separate daemon files so they can run simultaneously
 var _isDev = (process.argv[1] && path.basename(process.argv[1]) === "clay-dev") || process.argv.includes("--dev");
-if (_isDev) process.env.CLAY_DEV = "1";
+if (_isDev) {
+  process.env.CLAY_DEV = "1";
+  // Preserve console output in dev mode so logs remain readable
+  console.clear = function() {};
+}
 
 var { loadConfig, saveConfig, configPath, socketPath, logPath, ensureConfigDir, isDaemonAlive, isDaemonAliveAsync, generateSlug, clearStaleConfig, loadClayrc, saveClayrc, readCrashInfo } = require("../lib/config");
 var { sendIPCCommand } = require("../lib/ipc");

package/lib/project.js

@@ -3047,6 +3047,7 @@ function createProjectContext(opts) {
     stopAllDirWatches();
     // Abort all active sessions
     sm.sessions.forEach(function (session) {
+      session.destroying = true;
       if (session.abortController) {
         try { session.abortController.abort(); } catch (e) {}
       }

package/lib/public/app.js

@@ -2557,6 +2557,10 @@ import { initAdmin, checkAdminAccess } from './modules/admin.js';
           break;
 
         case "info":
+          if (msg.text && !msg.project && !msg.cwd) {
+            addSystemMessage(msg.text, false);
+            break;
+          }
           projectName = msg.project || msg.cwd;
           if (msg.slug) currentSlug = msg.slug;
           try { localStorage.setItem("clay-project-name-" + (currentSlug || "default"), projectName); } catch (e) {}
@@ -2994,10 +2998,6 @@ import { initAdmin, checkAdminAccess } from './modules/admin.js';
           addSystemMessage(msg.text, false);
           break;
 
-        case "info":
-          addSystemMessage(msg.text, false);
-          break;
-
         case "error":
           setActivity(null);
           addSystemMessage(msg.text, true);

package/lib/sdk-bridge.js

@@ -626,13 +626,27 @@ function createSDKBridge(opts) {
       for await (var msg of session.queryInstance) {
         processSDKMessage(session, msg);
       }
+      // Stream ended normally after a task stop — no "result" message was sent,
+      // so the session is still marked as processing. Send interrupted feedback.
+      if (session.isProcessing && session.taskStopRequested) {
+        session.isProcessing = false;
+        onProcessingChanged();
+        sendAndRecord(session, { type: "info", text: "Interrupted \u00b7 What should Claude do instead?" });
+        sendAndRecord(session, { type: "done", code: 0 });
+        sm.broadcastSessionList();
+      }
     } catch (err) {
       if (session.isProcessing) {
         session.isProcessing = false;
         onProcessingChanged();
-        if (err.name === "AbortError" || (session.abortController && session.abortController.signal.aborted)) {
-          sendAndRecord(session, { type: "info", text: "Interrupted \u00b7 What should Claude do instead?" });
-          sendAndRecord(session, { type: "done", code: 0 });
+        if (err.name === "AbortError" || (session.abortController && session.abortController.signal.aborted) || session.taskStopRequested) {
+          if (!session.destroying) {
+            sendAndRecord(session, { type: "info", text: "Interrupted \u00b7 What should Claude do instead?" });
+            sendAndRecord(session, { type: "done", code: 0 });
+          }
+        } else if (session.destroying) {
+          // Suppress error messages during shutdown
+          console.log("[sdk-bridge] Suppressing stream error during shutdown for session " + session.localId);
         } else {
           var errDetail = err.message || String(err);
           if (err.stderr) errDetail += "\nstderr: " + err.stderr;
@@ -681,6 +695,7 @@ function createSDKBridge(opts) {
       session.queryInstance = null;
       session.messageQueue = null;
       session.abortController = null;
+      session.taskStopRequested = false;
       session.pendingPermissions = {};
       session.pendingAskUser = {};
     }
@@ -1007,11 +1022,17 @@ function createSDKBridge(opts) {
   async function stopTask(taskId) {
     var session = sm.getActiveSession();
     if (!session || !session.queryInstance) return;
+    session.taskStopRequested = true;
     try {
       await session.queryInstance.stopTask(taskId);
     } catch (e) {
       console.error("[sdk-bridge] stopTask error:", e.message);
     }
+    // SDK stopTask doesn't reliably stop the sub-agent, so abort the entire
+    // session as a fallback to ensure the process actually stops.
+    if (session.abortController) {
+      session.abortController.abort();
+    }
   }
 
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "2.9.3-beta.3",
+  "version": "2.9.3-beta.4",
   "description": "Web UI for Claude Code. Any device. Push notifications.",
   "bin": {
     "clay-server": "./bin/cli.js",