clay-server 5.2.0-beta.3 → 5.2.0-beta.5

package/lib/shared-browser-worker.js

@@ -10,11 +10,14 @@ var epoch = 0;
 var queue = Promise.resolve();
 var pending = 0;
 var timer = null;
+var cookieSync = null;
+var cookieTimer = null;
+var closeRequested = false;
 var activeActivity = null;
 var pointerSequence = 0;
 var viewport = { width: 1280, height: 800 };
 function emit(message) {
-  if (!closing && process.stdout.writableLength < 3 * 1024 * 1024) process.stdout.write(JSON.stringify(message) + "\n");
+  if (!closing && process.stdout.writableLength < 32 * 1024 * 1024) process.stdout.write(JSON.stringify(message) + "\n");
 }
 function state() {
   return { url: page ? policy.visibleUrl(page.url()) : "", width: viewport.width, height: viewport.height };
@@ -33,7 +36,7 @@ async function capture() {
   } catch (e) {}
   if (!closing) timer = setTimeout(capture, 250);
 }
-async function start() {
+async function start(message) {
   var channels = ["chrome", "msedge", null];
   for (var i = 0; i < channels.length; i++) {
     try { browser = await chromium.launch({ channel: channels[i] || undefined, headless: true, chromiumSandbox: true, timeout: 15000 }); break; }
@@ -45,6 +48,15 @@ async function start() {
   var version = await cdp.send("Browser.getVersion");
   await cdp.detach();
   context = await browser.newContext({ viewport: viewport, acceptDownloads: false, userAgent: version.userAgent.replace("HeadlessChrome/", "Chrome/") });
+  if (message.storage) {
+    cookieSync = require("./shared-browser-storage-sync").attachStorageSync(context, message.storage, emit);
+    await cookieSync.start();
+    scheduleCookieSync();
+  } else if (message.cookies) {
+    cookieSync = require("./shared-browser-cookie-sync").attachCookieSync(context, message.cookies, emit);
+    await cookieSync.start();
+    scheduleCookieSync();
+  }
   await context.addInitScript(require("./vendor-login-browser-passkeys").disableLoginPasskeys);
   await context.route("**/*", function (route) {
     var protocol = new URL(route.request().url()).protocol;
@@ -55,13 +67,19 @@ async function start() {
     opened.setDefaultTimeout(10000);
     opened.on("dialog", function (dialog) { dialog.dismiss().catch(function () {}); });
     opened.on("download", function (download) { download.cancel().catch(function () {}); });
-    opened.on("framenavigated", function (frame) { if (frame === opened.mainFrame() && page === opened) emit(Object.assign({ type: "state" }, state())); });
+    opened.on("framenavigated", function (frame) { if (frame === opened.mainFrame() && page === opened) emit(Object.assign({ type: "navigation", navigationUrl: opened.url() }, state())); });
     opened.on("close", function () { var pages = context.pages(); page = pages.length ? pages[pages.length - 1] : null; emit(Object.assign({ type: "state" }, state())); });
   });
   page = await context.newPage();
   emit(Object.assign({ type: "ready" }, state()));
   capture();
 }
+function scheduleCookieSync() {
+  if (closeRequested || closing) return;
+  cookieTimer = setTimeout(function () {
+    queue = queue.then(function () { return cookieSync.sync(); }).catch(function () { emit({ type: "error", error: "Could not save personal browser site data" }); }).finally(scheduleCookieSync);
+  }, 2000);
+}
 function reportActivity(phase) {
   if (activeActivity) emit({ type: "activity", epoch: activeActivity.epoch, generation: activeActivity.generation,
     activity: { id: activeActivity.id, text: activeActivity.text, phase: phase } });
@@ -126,6 +144,9 @@ async function command(message) {
 }
 async function close() {
   if (closing) return;
+  closeRequested = true;
+  clearTimeout(cookieTimer);
+  if (cookieSync) await cookieSync.sync().catch(function () {});
   closing = true;
   clearTimeout(timer);
   if (browser) await browser.close().catch(function () {});
@@ -133,11 +154,14 @@ async function close() {
 }
 var lines = require("readline").createInterface({ input: process.stdin });
 lines.on("line", function (line) {
-  if (line.length > 30000 || closing) return;
+  if (line.length > 32 * 1024 * 1024 || closing) return;
   var msg;
   try { msg = JSON.parse(line); } catch (e) { return; }
+  if (msg.type === "cookies" || msg.type === "storage") { if (cookieSync) cookieSync.receive(msg); return; }
+  if (msg.type === "close") { closeRequested = true; clearTimeout(cookieTimer); queue = queue.then(close); return; }
+  if (closeRequested) return;
   if (msg.type === "start") {
-    if (!browser) queue = queue.then(start).catch(function (e) { emit({ type: "error", error: e.message }); });
+    if (!browser) queue = queue.then(function () { return start(msg); }).catch(function (e) { emit({ type: "error", error: e.message }); });
   } else if (msg.type === "viewing") viewing = !!msg.value;
   else if (msg.type === "control") {
     epoch = msg.epoch;
@@ -147,17 +171,29 @@ lines.on("line", function (line) {
     });
   } else if (msg.type === "settle") {
     // Resolves only after every earlier queued command has finished and reported its telemetry.
-    queue = queue.then(function () { emit({ type: "result", id: msg.id, value: { through: msg.id } }); });
+    queue = queue.then(async function () {
+      if (cookieSync) await cookieSync.sync();
+      emit({ type: "result", id: msg.id, value: { through: msg.id } });
+    }).catch(function (error) { emit({ type: "result", id: msg.id, error: error.message }); });
   } else if (msg.type === "command") {
     if (pending >= 80) { emit({ type: "result", id: msg.id, error: "Browser is busy; retry shortly" }); return; }
     pending++;
-    queue = queue.then(function () { return command(msg); }).then(function (value) {
+    queue = queue.then(async function () {
+      if (cookieSync) await cookieSync.sync();
+      try { return await command(msg); }
+      finally { if (cookieSync) await cookieSync.sync(); }
+    }).then(function (value) {
       reportActivity("complete"); activeActivity = null;
       emit({ type: "result", id: msg.id, value: value });
       emit(Object.assign({ type: "state" }, state()));
     }, function (e) { reportActivity("failed"); activeActivity = null; emit({ type: "result", id: msg.id, error: e.message }); }).finally(function () { pending--; });
   }
 });
-lines.on("close", close);
-process.on("SIGTERM", close);
-process.on("SIGINT", close);
+function requestClose() {
+  if (closeRequested) return;
+  closeRequested = true; clearTimeout(cookieTimer);
+  queue = queue.then(close);
+}
+lines.on("close", requestClose);
+process.on("SIGTERM", requestClose);
+process.on("SIGINT", requestClose);

package/lib/terminal-manager.js

@@ -1,4 +1,5 @@
 var { createTerminal } = require("./terminal");
+var crypto = require("crypto");
 
 var MAX_TERMINALS = 10;
 var SCROLLBACK_MAX = 50 * 1024; // 50 KB per terminal
@@ -48,6 +49,7 @@ function createTerminalManager(opts) {
     var id = nextId++;
     var session = {
       id: id,
+      identity: crypto.randomUUID(),
       pty: pty,
       scrollback: [],
       scrollbackSize: 0,
@@ -59,8 +61,11 @@ function createTerminalManager(opts) {
       lastActivityAt: Date.now(),
       exited: false,
       exitCode: null,
+      exitWaiters: [],
       subscribers: new Set(),
       ownerWs: ownerWs || null,
+      ownerId: ownerWs && ownerWs._clayUser ? ownerWs._clayUser.id : opts && opts.ownerId || null,
+      osIdentity: osUserInfo ? JSON.stringify([osUserInfo.user, osUserInfo.uid, osUserInfo.gid, osUserInfo.home]) : null,
       onExitHook: (opts && typeof opts.onExit === "function") ? opts.onExit : null,
       onDataHook: (opts && typeof opts.onData === "function") ? opts.onData : null,
     };
@@ -95,6 +100,7 @@ function createTerminalManager(opts) {
       session.exited = true;
       session.exitCode = e && e.exitCode != null ? e.exitCode : null;
       session.pty = null;
+      session.exitWaiters.splice(0).forEach(function (resolve) { resolve(true); });
 
       var msg = JSON.stringify({ type: "term_exited", id: id });
       for (var ws of session.subscribers) {
@@ -204,6 +210,34 @@ function createTerminalManager(opts) {
     if (terminals.size === 0) nextId = 1;
   }
 
+  // Keep the terminal registered until its actual exit acknowledges shutdown.
+  async function closeAndWait(id, control) {
+    var session = terminals.get(id);
+    if (!session) throw new Error("Terminal closure cannot be confirmed: runtime is missing.");
+    if (control) { control.revalidate(); if (session.identity !== control.identity) throw new Error('The exact terminal identity changed.'); }
+    if (!session.exited) {
+      if (!session.pty) throw new Error("Terminal closure is unconfirmed.");
+      var timer, waiter;
+      var exited = new Promise(function (resolve, reject) {
+        waiter = resolve; session.exitWaiters.push(waiter);
+        timer = setTimeout(function () { reject(new Error("Terminal exit acknowledgement timed out.")); }, 5000);
+      });
+      try { session.pty.kill(); await exited; }
+      catch (error) { exited.catch(function () {}); throw error; }
+      finally { clearTimeout(timer); var index = session.exitWaiters.indexOf(waiter); if (index >= 0) session.exitWaiters.splice(index, 1); }
+    }
+    if (terminals.get(id) !== session) {
+      var replaced = new Error('Terminal was replaced during shutdown.');
+      if (control) replaced.productControlResult = { runtimeEffect: session.exited ? 'exited' : 'closure_unconfirmed', replacementRetained: true, retrySafe: false };
+      throw replaced;
+    }
+    if (control) {
+      try { control.revalidate(); }
+      catch (error) { error.productControlResult = { runtimeEffect: 'exited', retained: true, retrySafe: false }; throw error; }
+    }
+    close(id); return true;
+  }
+
   function rename(id, title) {
     var session = terminals.get(id);
     if (!session) return;
@@ -298,6 +332,24 @@ function createTerminalManager(opts) {
     write: write,
     resize: resize,
     close: close,
+    closeAndWait: closeAndWait,
+    inspect: function (id) {
+      var terminal = terminals.get(id);
+      return terminal ? { id: id, identity: terminal.identity, ownerId: terminal.ownerId, osIdentity: terminal.osIdentity, title: terminal.title, kind: terminal.kind, exited: terminal.exited, cols: terminal.cols, rows: terminal.rows, totalBytesWritten: terminal.totalBytesWritten } : null;
+    },
+    resizeExact: function (id, cols, rows, identity, revalidate) {
+      revalidate();
+      var terminal = terminals.get(id);
+      if (!terminal || terminal.identity !== identity || !terminal.pty) throw new Error('The exact terminal is unavailable for resizing.');
+      terminal.pty.resize(cols, rows);
+      revalidate();
+      if (terminals.get(id) !== terminal) throw new Error('Terminal was replaced during resize.');
+      terminal.cols = cols; terminal.rows = rows;
+      var message = JSON.stringify({ type: 'term_resized', id: id, cols: cols, rows: rows });
+      terminal.subscribers.forEach(function (ws) { if (ws.readyState === 1) ws.send(message); });
+      return true;
+    },
+    identity: function (id) { var terminal = terminals.get(id); return terminal ? terminal.identity : null; },
     rename: rename,
     list: list,
     getScrollback: getScrollback,

package/lib/users-permissions.js

@@ -64,15 +64,12 @@ function attachPermissions(deps) {
   // --- Project access helpers ---
 
   function canAccessProject(userId, project) {
-    if (!project) return false;
+    if (!project || !userId || !findUserById(userId) || project.ownershipRecovery === "required") return false;
     if (project.isMate === true || (typeof project.slug === "string" && project.slug.indexOf("mate-") === 0)) {
       return !!userId && !!project.ownerId && project.ownerId === userId;
     }
     // Public projects are accessible to all authenticated users
     if (!project.visibility || project.visibility === "public") return true;
-    // Admin always has access
-    var user = findUserById(userId);
-    if (user && user.role === "admin") return true;
     // Owner always has access to their own project
     if (project.ownerId && project.ownerId === userId) return true;
     // Private project -- check allowedUsers
@@ -96,10 +93,7 @@ function attachPermissions(deps) {
       return !!userId && !!session.ownerId && session.ownerId === userId;
     }
     if (session.userKnowledgeOwnerId) return !!userId && session.userKnowledgeOwnerId === userId && session.ownerId === userId;
-    // Resolve the stored user record so client-supplied roles cannot elevate access.
-    var user = findUserById(userId);
-    if (user && user.role === "admin") return true;
-    // Sessions without ownerId are legacy -- only admin can see them
+    // Unowned historical sessions require explicit recovery; role is not ownership.
     if (!session.ownerId) return false;
     // Owner can always see their own sessions
     if (session.ownerId === userId) return true;

package/lib/users.js

@@ -155,6 +155,10 @@ function getOtherUsers(excludeUserId) {
 }
 
 function removeUser(userId) {
+  var registered = require("./config").loadConfig();
+  if (registered && (registered.projects || []).some(function (project) {
+    return !require("./project-ownership").isPersonal(project) && project.ownerId === userId;
+  })) return { error: "Transfer ordinary owned projects before deleting this account." };
   var data = loadUsers();
   var before = data.users.length;
   data.users = data.users.filter(function (u) { return u.id !== userId; });

package/lib/workspace-query-access.js

@@ -96,7 +96,10 @@ function attachWorkspaceQueryAccess(deps) {
     // as ownership would let a stale status skip the authoritative record.
     var access = record(status);
     if (!access) return denied;
-    if (access.ownerId && access.ownerId === principal.userId) return { owned: true, accessible: true };
+    if (access.ownerId && access.ownerId === principal.userId) {
+      var ownerPermitted = permitted(principal.userId, access);
+      return { owned: ownerPermitted, accessible: ownerPermitted };
+    }
     return { owned: false, accessible: permitted(principal.userId, access) };
   }
 

package/lib/ws-schema.js

@@ -495,10 +495,11 @@ var schema = {
   "note_written":             { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Agent created or updated a sticky note" },
   "note_update":              { direction: "c2s", handler: "lib/project-user-message.js", description: "Update a sticky note" },
   "note_updated":             { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Sticky note was updated" },
-  "note_close":               { direction: "c2s", handler: "lib/project-user-message.js", description: "Close a sticky note (reversible; never deletes)" },
+  "note_update_result":        { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Correlated sticky note update result" },
+  "note_close":               { direction: "c2s", handler: "lib/project-user-message.js", description: "Close a sticky note; human draft-aware requests remove empty notes, tool and legacy closes stay reversible" },
   "note_reopen":              { direction: "c2s", handler: "lib/project-user-message.js", description: "Reopen a closed sticky note" },
   "note_delete":              { direction: "c2s", handler: "lib/project-user-message.js", description: "Retired: older clients still send this; handled as a non-destructive close" },
-  "note_deleted":             { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Retired: never sent. Closing broadcasts note_updated instead" },
+  "note_deleted":             { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "A sticky note was permanently removed after a human-authorized storage transaction" },
   "note_list_request":        { direction: "c2s", handler: "lib/project-user-message.js", description: "Request the full notes list" },
   "note_bring_front":         { direction: "c2s", handler: "lib/project-user-message.js", description: "Bring a note to front (update z-order)" },
   "notes_list":               { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Full list of sticky notes" },
@@ -809,6 +810,11 @@ var schema = {
   "default_vendor_get":       { direction: "c2s", handler: "lib/server-default-vendor.js", description: "Read the authenticated user's New session vendor preference" },
   "default_vendor_set":       { direction: "c2s", handler: "lib/server-default-vendor.js", description: "Validate and persist the authenticated user's New session vendor preference" },
   "default_vendor_state":     { direction: "s2c", handler: "lib/public/modules/default-vendor.js", description: "Correlated or same-user-broadcast New session vendor preference" },
+  "clay_ui_ready":            { direction: "c2s", handler: "lib/server-owner-ui.js", description: "Advertise exact owner UI navigation support on this socket" },
+  "clay_navigation_offer":    { direction: "s2c", handler: "lib/public/modules/clay-owner-navigation.js", description: "Offer one exact reviewed navigation to a selected owner connection" },
+  "clay_navigation_claim":    { direction: "c2s", handler: "lib/server-owner-ui.js", description: "Claim an offered navigation with live source/target revalidation" },
+  "clay_navigation_apply":    { direction: "s2c", handler: "lib/public/modules/clay-owner-navigation.js", description: "Invoke the shared conversation navigator after live claim" },
+  "clay_navigation_ack":      { direction: "c2s", handler: "lib/server-owner-ui.js", description: "Client invocation acknowledgement; never proof of visible rendering" },
   "context_view_get":         { direction: "c2s", handler: "lib/server-context-view.js", description: "Read the authenticated user's context display preference" },
   "context_view_set":         { direction: "c2s", handler: "lib/server-context-view.js", description: "Persist the authenticated user's context display preference" },
   "context_view_state":       { direction: "s2c", handler: "lib/public/modules/context-view-preference.js", description: "Correlated or same-user-broadcast context display preference" },

package/lib/yoke/acp-agent-profiles.js

@@ -50,7 +50,7 @@ function fetchOpenCodeResolvedConfig(binaryPath, cwd, env) {
   return new Promise(function(resolve, reject) {
     execFile(binaryPath, ["debug", "config"], {
       cwd: cwd || process.cwd(),
-      env: Object.assign({}, process.env, env || {}),
+      env: env ? Object.assign({}, env) : process.env,
       timeout: 30000,
       maxBuffer: 4 * 1024 * 1024,
     }, function(err, stdout) {
@@ -141,7 +141,7 @@ var ACP_AGENT_PROFILES = {
       });
     },
     buildProcessOptions: function(ctx, base) {
-      var existing = (base.env && base.env.OPENCODE_CONFIG_CONTENT) || process.env.OPENCODE_CONFIG_CONTENT;
+      var existing = base.env ? base.env.OPENCODE_CONFIG_CONTENT : process.env.OPENCODE_CONFIG_CONTENT;
       var config = {};
       if (existing) config = JSON.parse(existing);
       var agent = Object.assign({}, config.agent || {});

package/lib/yoke/adapters/claude.js

@@ -4,6 +4,7 @@
 // This is the ONLY file (besides claude-worker.js) that imports the SDK.
 // Also manages worker processes for OS-level user isolation.
 
+var attachWorkerStartup = require("../claude-worker-startup").attachWorkerStartup;
 var bindQueryAbort = require("../query-abort").bindAbort;
 var path = require("path");
 var fs = require("fs");
@@ -600,6 +601,8 @@ function createQueryHandle(rawQuery, messageQueue, abortController) {
   var correlation = claudeCorrelation.createCorrelation();
   var closed = false;
   var removeAbort = function () {};
+  var resolveStopped;
+  var stopped = new Promise(function(resolve) { resolveStopped = resolve; });
   var handle = {
     // Opaque adapter state (null for in-process queries)
     _adapterState: null,
@@ -610,12 +613,13 @@ function createQueryHandle(rawQuery, messageQueue, abortController) {
       return {
         next: function() {
           return rawIter.next().then(function(result) {
-            if (result.done) { closed = true; removeAbort(); }
+            if (result.done) { closed = true; removeAbort(); resolveStopped(); }
             if (result.done) return result;
             return { value: correlation.result(result.value, flattenEvent(result.value)), done: false };
           }, function(err) {
             closed = true;
             removeAbort();
+            resolveStopped();
             throw err;
           });
         },
@@ -715,6 +719,11 @@ function createQueryHandle(rawQuery, messageQueue, abortController) {
       }
     },
 
+    stopAndWait: function() {
+      handle.abort();
+      return stopped;
+    },
+
     close: function() {
       closed = true;
       removeAbort();
@@ -818,9 +827,7 @@ function spawnWorker(linuxUser, workerScriptPath, cwd) {
     buffer: "",
   };
 
-  worker.readyPromise = new Promise(function(resolve) {
-    worker._readyResolve = resolve;
-  });
+  attachWorkerStartup(worker);
 
   // Resolves when the worker process actually exits.
   // Used to prevent spawning a new worker before the old one finishes
@@ -860,7 +867,15 @@ function spawnWorker(linuxUser, workerScriptPath, cwd) {
     });
     connection.on("error", function(err) {
       console.error("[yoke/claude] Worker connection error:", err.message);
+      if (worker._readyReject) worker._readyReject(err);
     });
+    connection.on("close", function() {
+      if (worker._readyReject) worker._readyReject(new Error("Claude worker connection closed before ready."));
+    });
+  });
+  worker.server.on("error", function(error) {
+    if (worker._readyReject) worker._readyReject(error);
+    cleanupWorker(worker);
   });
 
   worker.server.listen(socketPath, function() {
@@ -892,6 +907,14 @@ function spawnWorker(linuxUser, workerScriptPath, cwd) {
     });
     worker.process = spawn(workerSpawn.command, workerSpawn.args, workerSpawn.options);
 
+    worker.process.on("error", function(error) {
+      if (worker._readyReject) worker._readyReject(error);
+      worker.messageHandlers.forEach(function(handler) { handler({ type: "query_error", error: error.message, _fallback: true }); });
+      cleanupWorker(worker);
+      // Only a spawn failure proves that no child execution exists. Other
+      // ChildProcess errors (for example a failed signal) are not exit evidence.
+      if (!worker.process.pid && worker._exitResolve) { worker._exitResolve(); worker._exitResolve = null; }
+    });
     worker.process.stdout.on("data", function(data) {
       console.log("[sdk-worker:" + linuxUser + "] " + data.toString().trim());
     });
@@ -905,9 +928,8 @@ function spawnWorker(linuxUser, workerScriptPath, cwd) {
     worker.process.on("exit", function(code, signal) {
       console.log("[yoke/claude] Worker for " + linuxUser + " exited (code=" + code + ", signal=" + signal + ")" + (worker._stderrBuf ? " stderr: " + worker._stderrBuf.trim() : ""));
       // Reject readyPromise if worker dies before becoming ready
-      if (!worker.ready && worker._readyResolve) {
-        worker._readyResolve = null;
-        // Let the readyPromise hang; the query_error handler will clean up
+      if (!worker.ready && worker._readyReject) {
+        worker._readyReject(new Error("Claude worker exited before ready (code=" + code + ")."));
       }
       // Notify message handlers about unexpected exit so sessions don't hang.
       // Always dispatch a fallback query_error. The handler is idempotent:
@@ -1082,6 +1104,9 @@ function createWorkerQueryHandle(worker, canUseTool, onElicitation, callMcpTool,
   var iterWaiting = null;
   var iterEnded = false;
   var iterError = null;
+  var resolveStopped;
+  var stopped = new Promise(function(resolve) { resolveStopped = resolve; });
+  if (worker.exitPromise) worker.exitPromise.then(resolveStopped);
 
   // Pending request/response correlation for handle methods that need a
   // result from the worker (e.g. rewindFiles). Each entry is keyed by a
@@ -1299,6 +1324,8 @@ function createWorkerQueryHandle(worker, canUseTool, onElicitation, callMcpTool,
       }
 
       case "query_done":
+        if (worker._abortTimeout) { clearTimeout(worker._abortTimeout); worker._abortTimeout = null; }
+        resolveStopped();
         rejectPendingPermissionModes(new Error("Worker query ended while changing permission mode"));
         console.log("[yoke/claude] IPC query_done received, pid=" + (worker.process ? worker.process.pid : "?"));
         worker._queryEnded = true;
@@ -1306,6 +1333,10 @@ function createWorkerQueryHandle(worker, canUseTool, onElicitation, callMcpTool,
         break;
 
       case "query_error": {
+        if (!msg._fallback) {
+          if (worker._abortTimeout) { clearTimeout(worker._abortTimeout); worker._abortTimeout = null; }
+          resolveStopped();
+        }
         rejectPendingPermissionModes(new Error(msg.error || "Worker exited while changing permission mode"));
         console.log("[yoke/claude] IPC query_error received, pid=" + (worker.process ? worker.process.pid : "?") + " _fallback=" + !!msg._fallback + " _queryEnded=" + worker._queryEnded + " error=" + (msg.error || "").substring(0, 100));
         // Skip fallback errors from exit handler if we already handled the real one
@@ -1472,6 +1503,11 @@ function createWorkerQueryHandle(worker, canUseTool, onElicitation, callMcpTool,
       }, 5000);
     },
 
+    stopAndWait: function() {
+      handle.abort();
+      return stopped;
+    },
+
     close: function() {
       rejectPendingPermissionModes(new Error("Worker query closed while changing permission mode"));
       // End the iterator
@@ -1909,7 +1945,10 @@ function createClaudeAdapter(opts) {
 
     // Wait for worker to be ready before sending query_start
     if (!reusingWorker) {
-      await worker.readyPromise;
+      try { await worker.readyPromise; } catch (error) {
+        worker.kill();
+        throw error;
+      }
     }
 
     // Build serializable query options (no callbacks, no AbortController).