clay-server 4.2.0-beta.3 → 4.3.0-beta.1

package/lib/project-pair-lifecycle.js

@@ -1,18 +1,3 @@
-// Split Worker lifecycle internals: bounded status, transactional replacement,
-// and the per-generation evaluation ledger. The Driver-facing tool posts a
-// user-controlled runtime card before accepted replacement reaches this module.
-//
-// Everything is bound to the exact live pair. The Driver is re-resolved from
-// the split store on every call, its structural capability is re-checked every time, and
-// ownership must match on both sessions. No active-tab or global-session
-// fallback exists in this module.
-//
-// What replacement deliberately does NOT do: delete history. Dissolving a pair
-// leaves both sessions in the project exactly as close_partner already does, so
-// the previous Worker's conversation stays browsable and recoverable under the
-// existing session semantics. There is no archive concept in the repo to hook
-// into, and inventing a destructive one would lose work.
-
 var eligibility = require("./session-driver-eligibility");
 var replacementState = require("./project-pair-replacement-state");
 var pairUsage = require("./project-pair-usage");
@@ -66,9 +51,6 @@ function continuityStatus(session) {
   };
 }
 
-// The current task, as a bounded preview of the delegated instruction only.
-// Never the transcript: a Driver deciding reuse needs to know what the Worker
-// is on, not to re-read its conversation.
 function activityStatus(session) {
   var token = session._pairDelegation || null;
   return {
@@ -185,10 +167,6 @@ function attachPairLifecycle(ctx) {
   }
   function resolveDriverPair(caller) {
     if (!caller) throw new Error("pair lifecycle tools require a session-bound tool server");
-    // Exact live object identity, before anything is read off the caller. A
-    // tool handler captured by a query outlives the session it was bound to, so
-    // a stale object — or a different object that happens to carry the same
-    // localId — must not be able to act as the Driver.
     if (sm.sessions.get(caller.localId) !== caller) {
       throw new Error("this session is no longer live; the pair tools are bound to an exact session");
     }
@@ -268,6 +246,38 @@ function attachPairLifecycle(ctx) {
     };
   }
 
+  function sourcePairRegistered(caller, worker) {
+    try {
+      if (sm.sessions.get(caller.localId) !== caller || sm.sessions.get(worker.localId) !== worker) return false;
+      if ((caller.ownerId || null) !== (worker.ownerId || null)) return false;
+      var group = store.groupForMember(caller.localId);
+      return !!(group && group.pair && group.pair.driverId === caller.localId &&
+        group.pair.workerId === worker.localId && group.members.indexOf(caller.localId) !== -1 &&
+        group.members.indexOf(worker.localId) !== -1);
+    } catch (e) { return false; }
+  }
+
+  function restoreSourcePair(ws, caller, worker) {
+    try {
+      return store.create(ws, {
+        members: [caller.localId, worker.localId],
+        pair: { driverId: caller.localId, workerId: worker.localId },
+      });
+    } catch (e) { return { ok: false, error: e.message || String(e) }; }
+  }
+
+  function replacementTargetRegistered(caller, oldWorker) {
+    try {
+      if (sm.sessions.get(caller.localId) !== caller || sm.sessions.get(oldWorker.localId) !== oldWorker) return null;
+      var group = store.groupForMember(caller.localId);
+      if (!group || !group.pair || group.pair.driverId !== caller.localId ||
+          group.pair.workerId === oldWorker.localId) return null;
+      var target = sm.sessions.get(group.pair.workerId);
+      if (!target || sm.sessions.get(target.localId) !== target) return null;
+      return (caller.ownerId || null) === (target.ownerId || null) ? target : null;
+    } catch (e) { return null; }
+  }
+
   function replacePartner(args, caller) {
     var resolved = resolveDriverPair(caller);
     var group = resolved.group;
@@ -278,10 +288,6 @@ function attachPairLifecycle(ctx) {
     var replay = replacementState.replayValue(replacementEntry);
     if (replay) return Promise.resolve(replay);
 
-    // Validate the replacement while the old pair is still fully intact. An
-    // uninstalled vendor, an unavailable model or an unsupported effort must
-    // never cost the user their running Worker, so this precedes the interrupt,
-    // the permission cancellation and the dissolve.
     try {
       ctx.preflightWorkerForDriver(caller, {
         workerVendor: args.workerVendor,
@@ -309,51 +315,39 @@ function attachPairLifecycle(ctx) {
       throw validationError;
     }
 
-    if (blocked) {
-      replacementState.stage(replacementEntry.transaction, "stopping_source");
-      replacementEntry.transaction.sourceStopped = true;
-      if (ctx.markInterruption) ctx.markInterruption(oldWorker, "driver", "The Driver accepted replacement of this Worker generation.");
-      oldWorker.taskStopRequested = true;
-      if (oldWorker.abortController) {
-        try { oldWorker.abortController.abort(); } catch (e) {}
-      }
-      if (oldWorker._pairDelegation && typeof ctx.finishDelegation === "function") {
-        if (typeof ctx.completeInterruptedTask === "function") ctx.completeInterruptedTask(oldWorker, caller, oldWorker._pairDelegation);
-        ctx.finishDelegation(group, caller, oldWorker, oldWorker._pairDelegation);
+    var ws = { _clayUser: caller.ownerId ? { id: caller.ownerId } : null };
+    try {
+      if (blocked) {
+        replacementState.stage(replacementEntry.transaction, "stopping_source");
+        replacementEntry.transaction.sourceStopped = true;
+        if (ctx.markInterruption) ctx.markInterruption(oldWorker, "driver", "The Driver accepted replacement of this Worker generation.");
+        oldWorker.taskStopRequested = true;
+        if (oldWorker.abortController) {
+          try { oldWorker.abortController.abort(); } catch (e) {}
+        }
+        if (oldWorker._pairDelegation && typeof ctx.finishDelegation === "function") {
+          if (typeof ctx.completeInterruptedTask === "function") ctx.completeInterruptedTask(oldWorker, caller, oldWorker._pairDelegation);
+          ctx.finishDelegation(group, caller, oldWorker, oldWorker._pairDelegation);
+        }
       }
-    }
 
-    // Any permission decision the old Worker was waiting on dies with the pair.
-    replacementState.stage(replacementEntry.transaction, "cancelling_source_waits");
-    if (typeof ctx.cancelWorkerPermissions === "function") {
-      ctx.cancelWorkerPermissions(oldWorker, "The Driver replaced this Split Worker.");
-    }
+      replacementState.stage(replacementEntry.transaction, "cancelling_source_waits");
+      if (typeof ctx.cancelWorkerPermissions === "function") {
+        ctx.cancelWorkerPermissions(oldWorker, "The Driver replaced this Split Worker.");
+      }
 
-    var ws = { _clayUser: caller.ownerId ? { id: caller.ownerId } : null };
-    replacementState.stage(replacementEntry.transaction, "dissolving_source_pair");
-    var dissolved = store.dissolve(ws, { id: group.id });
-    if (!dissolved.ok) {
+      replacementState.stage(replacementEntry.transaction, "dissolving_source_pair");
+      var dissolved = store.dissolve(ws, { id: group.id });
+      if (!dissolved.ok) throw new Error(dissolved.error || "could not dissolve the existing pair");
+    } catch (precreateError) {
+      var sourceIntact = sourcePairRegistered(caller, oldWorker);
+      var precreateRestored = sourceIntact ? { ok: true } : restoreSourcePair(ws, caller, oldWorker);
+      var rollback = precreateRestored && precreateRestored.ok ? (sourceIntact ? "safe_retry" : "source_pair_restored") : "source_pair_restore_failed";
       turnControl.releaseCreation(creationTicket);
-      replacementState.fail(replacementEntry.transaction, "dissolve_failed", new Error(dissolved.error || "could not dissolve"), "not_required");
-      throw new Error(dissolved.error || "could not dissolve the existing pair");
+      replacementState.fail(replacementEntry.transaction, "precreate_failed", precreateError, rollback);
+      throw precreateError;
     }
 
-    // History is preserved: the old Worker session stays in the project.
-    //
-    // Preflight already cleared every input, but the group write itself can
-    // still fail, so the dissolve is rolled back rather than leaving the Driver
-    // with no pair at all. The restored group is an equivalent record with the
-    // same members and roles; its group id is newly issued.
-    //
-    // What rollback can and cannot undo:
-    //   - Idle replacement failure is fully recoverable. The Worker session,
-    //     its history and its still-open ledger generation are all preserved,
-    //     and the pair is restored.
-    //   - An explicit interrupt=true is NOT reversible. Stopping a mid-turn
-    //     Worker aborts its query and cancels the permission decisions it was
-    //     waiting on; a later creation failure cannot resume that turn. The
-    //     session and its history survive, but the interrupted work does not
-    //     come back. The error says so rather than implying a clean restore.
     var created;
     try {
       replacementState.stage(replacementEntry.transaction, "creating_target");
@@ -363,18 +357,26 @@ function attachPairLifecycle(ctx) {
         workerEffort: typeof args.workerEffort === "string" ? args.workerEffort : "",
       });
     } catch (e) {
-      var restored = store.create(ws, {
-        members: [caller.localId, oldWorker.localId],
-        pair: { driverId: caller.localId, workerId: oldWorker.localId },
-      });
-      var restoreNote = restored && restored.ok
+      var target = replacementTargetRegistered(caller, oldWorker);
+      if (target) {
+        var targetClosed = closeGeneration(caller, oldWorker);
+        var targetGeneration = recordGenerationStart(caller, target);
+        replacementEntry.transaction.targetWorkerId = target.localId;
+        replacementEntry.transaction.targetGeneration = targetGeneration;
+        replacementEntry.transaction.previousGeneration = targetClosed ? targetClosed.generation : null;
+        replacementState.fail(replacementEntry.transaction, "postcommit_delivery_failed", e, "target_created");
+        throw new Error("the replacement Split Worker was created, but its delivery confirmation failed. Reuse Worker " + target.localId + " generation " + targetGeneration + " with send_to_partner; do not replace it again. " + (e.message || String(e)));
+      }
+      var restored = restoreSourcePair(ws, caller, oldWorker);
+      var restoredLive = restored && restored.ok && sourcePairRegistered(caller, oldWorker);
+      var restoreNote = restoredLive
         ? "The previous pair was restored with its session, history and open generation intact."
         : "The previous pair could not be restored; both sessions are intact and unpaired.";
       var interruptNote = blocked
         ? " Its interrupted turn cannot be resumed, because stopping it was explicitly requested."
         : "";
       turnControl.releaseCreation(creationTicket);
-      replacementState.fail(replacementEntry.transaction, "creation_failed", e, restored && restored.ok ? "source_pair_restored" : "source_pair_restore_failed");
+      replacementState.fail(replacementEntry.transaction, "creation_failed", e, restoredLive ? "source_pair_restored" : "source_pair_restore_failed");
       throw new Error("could not create the replacement Split Worker: " + (e.message || String(e)) +
         ". " + restoreNote + interruptNote);
     }
@@ -384,7 +386,6 @@ function attachPairLifecycle(ctx) {
       if (typeof sm.saveSessionFile === "function") sm.saveSessionFile(caller);
     }
     var generation = recordGenerationStart(caller, created.worker);
-
     var result = {
       status: "replaced",
       previousWorkerSessionId: oldWorker.localId,
@@ -410,7 +411,6 @@ function attachPairLifecycle(ctx) {
       });
   }
 
-  // No global or cross-user ranking is formed from Worker evaluations.
   function validateEvaluation(raw) {
     var input = typeof raw === "string" ? { outcome: raw } : (raw && typeof raw === "object" ? raw : {});
     var outcome = typeof input.outcome === "string" ? input.outcome.trim().toLowerCase() : "";

package/lib/project-pair-replacement-state.js

@@ -46,7 +46,11 @@ function fail(transaction, stageName, error, rollback) {
   transaction.stage = stageName;
   transaction.updatedAt = Date.now();
   transaction.completedAt = transaction.updatedAt;
-  transaction.failure = { message: error && (error.message || String(error)) || "Unknown replacement failure", rollback: rollback || "not_required" };
+  transaction.failure = {
+    message: error && (error.message || String(error)) || "Unknown replacement failure",
+    rollback: rollback || "not_required",
+    retryable: rollback === "safe_retry" || (stageName === "creation_failed" && rollback === "source_pair_restored"),
+  };
   transaction.sourcePairRestored = rollback === "source_pair_restored" ? true : (rollback === "source_pair_restore_failed" ? false : null);
   return transaction;
 }

package/lib/project-session-handoff.js

@@ -1,13 +1,10 @@
 var yoke = require("./yoke");
 var contextBuilder = require("./session-handoff-context");
 var sessionHandoffMcp = require("./session-handoff-mcp-server");
+var discoveryModule = require("./session-handoff-discovery");
 
 var MAX_HANDOFF_CHAIN_DEPTH = 5;
 
-function toolResult(text) {
-  return Promise.resolve({ content: [{ type: "text", text: text }] });
-}
-
 function toolError(message) {
   return Promise.resolve({
     content: [{ type: "text", text: "Error: " + message }],
@@ -26,6 +23,16 @@ function hasUserContext(session) {
 
 function attachSessionHandoff(ctx) {
   var sm = ctx.sm;
+  var discovery = discoveryModule.attachSessionHandoffDiscovery({
+    sm: sm,
+    isMate: ctx.isMate,
+    projectSlug: ctx.projectSlug || "current-project",
+    isMultiUser: ctx.isMultiUser,
+    getProjectAccess: ctx.getProjectAccess,
+    canAccessSession: ctx.canAccessSession,
+    findUserById: ctx.findUserById,
+    isDriverOperatedSession: ctx.isDriverOperatedSession,
+  });
 
   function sendResult(ws, ok, details) {
     ctx.sendTo(ws, Object.assign({ type: "session_handoff_result", ok: ok }, details || {}));
@@ -172,14 +179,16 @@ function attachSessionHandoff(ctx) {
     var chain = [];
     var visited = new Set();
     var sourceSessionId = boundSession.handoff.sourceSessionId;
-    var ownerId = boundSession.ownerId || null;
     for (var depth = 0; depth < MAX_HANDOFF_CHAIN_DEPTH; depth++) {
       var visitKey = String(sourceSessionId);
       if (visited.has(visitKey)) break;
       visited.add(visitKey);
       var source = sm.sessions.get(sourceSessionId);
       if (!source) return { error: "Source session was not found: " + sourceSessionId };
-      if ((source.ownerId || null) !== ownerId) return { error: "Source session owner does not match this session" };
+      if (!discovery.authorize(boundSession, source)) {
+        if (typeof ctx.isMultiUser !== "function" || !ctx.isMultiUser()) return { error: "Source session owner does not match this session" };
+        return { error: "Source session access denied" };
+      }
       chain.push(source);
       if (!source.handoff || source.handoff.sourceSessionId === undefined || source.handoff.sourceSessionId === null) break;
       sourceSessionId = source.handoff.sourceSessionId;
@@ -195,61 +204,45 @@ function attachSessionHandoff(ctx) {
     return null;
   }
 
-  function boundedInteger(value, fallback, min, max) {
-    if (typeof value !== "number" || !Number.isFinite(value)) return fallback;
-    return Math.min(max, Math.max(min, Math.floor(value)));
-  }
-
-  function formatHistory(source, args) {
-    var history = Array.isArray(source.history) ? source.history : [];
-    var limit = boundedInteger(args.limit, 30, 1, 100);
-    var offset = typeof args.offset === "number" && Number.isFinite(args.offset)
-      ? boundedInteger(args.offset, 0, 0, history.length)
-      : Math.max(0, history.length - limit);
-    var slice = history.slice(offset, offset + limit);
-    var end = offset + slice.length;
-    var out = [];
-    out.push("# " + (source.title || "Untitled session") + " — " + (source.vendor || "unknown") + "/" + source.localId);
-    out.push("Showing entries " + (slice.length ? offset + 1 : 0) + "-" + end + " of " + history.length + "\n");
-    for (var i = 0; i < slice.length; i++) {
-      var entry = slice[i];
-      if (!entry) continue;
-      var label;
-      var text = "";
-      if (entry.type === "user_message") {
-        label = "USER";
-        text = entry.text || "";
-      } else if (entry.type === "delta") {
-        label = "ASSISTANT";
-        text = entry.text || "";
-      } else if (entry.type === "tool_executing" || entry.type === "tool_result") {
-        label = "TOOL";
-        text = (entry.name || "") + (entry.input ? " " + JSON.stringify(entry.input).substring(0, 120) : "");
-      } else {
-        continue;
-      }
-      if (text.length > 800) text = text.substring(0, 800) + "...";
-      out.push("[" + label + "] " + text);
-    }
-    return out.join("\n");
-  }
-
-  function readHandoffSource(args, boundSession) {
+  function readHandoffSource(args, boundSession, generation) {
     if (!boundSession) return toolError("read_handoff_source requires a session-bound tool server");
-    if (!boundSession.handoff) return toolError("this session does not have a handoff source");
+    if (!boundSession.handoff) return Promise.resolve(discovery.fail(boundSession, generation, "this session does not have a handoff source"));
     var resolved = resolveSourceChain(boundSession);
-    if (resolved.error) return toolError(resolved.error);
+    if (resolved.error) return Promise.resolve(discovery.fail(boundSession, generation, resolved.error));
     var source = findSource(resolved.chain, args.sourceSessionId);
-    if (!source) return toolError("sourceSessionId is not in this session's handoff chain");
-    return toolResult(formatHistory(source, args));
+    if (!source) return Promise.resolve(discovery.fail(boundSession, generation, "sourceSessionId is not in this session's handoff chain"));
+    return Promise.resolve(discovery.legacy(boundSession, source, args, generation));
   }
 
-  function getToolDefs(boundSession) {
+  function getToolDefs(boundSession, queryGeneration) {
     if (ctx.isMate) return [];
-    if (boundSession && !boundSession.handoff) return [];
-    return sessionHandoffMcp.getToolDefs({
-      read: function (args) { return readHandoffSource(args, boundSession || null); },
-    });
+    if (boundSession && !discovery.authorize(boundSession, boundSession)) return [];
+    var generation = boundSession
+      ? (Number.isInteger(queryGeneration) ? queryGeneration : discovery.captureGeneration(boundSession))
+      : null;
+    var handlers = {
+      read: function (args) {
+        if (!boundSession) return toolError("read_handoff_source requires a session-bound tool server");
+        if (!boundSession.handoff) return toolError("read_handoff_source requires a handoff session");
+        return readHandoffSource(args, boundSession, generation);
+      },
+    };
+    if (boundSession && !boundSession.handoff) delete handlers.read;
+    if (boundSession) {
+      handlers.listOtherDrivers = function (args) {
+        try { return Promise.resolve(discovery.list(boundSession, args || {}, generation)); }
+        catch (e) { return toolError(e.message || String(e)); }
+      };
+      handlers.searchOtherDrivers = function (args) {
+        try { return Promise.resolve(discovery.search(boundSession, args || {}, generation)); }
+        catch (e) { return toolError(e.message || String(e)); }
+      };
+      handlers.readOtherDriver = function (args) {
+        try { return Promise.resolve(discovery.read(boundSession, args || {}, generation)); }
+        catch (e) { return toolError(e.message || String(e)); }
+      };
+    }
+    return sessionHandoffMcp.getToolDefs(handlers);
   }
 
   function createMcpServer(adapter, boundSession) {

package/lib/project-user-message.js

@@ -1,5 +1,6 @@
 var path = require("path");
 var fs = require("fs");
+var continuationLease = require("./driver-continuation-lease");
 
 /**
  * Attach user-message handler and remaining small handlers
@@ -433,6 +434,19 @@ function attachUserMessage(ctx) {
       finishPendingEarly(false, "Pending messages cannot be delivered to a Driver-operated Split Worker");
       return true;
     }
+    if (!pendingInternal && session._driverContinuationLease && pendingMessageQueue) {
+      var continuationQueued = pendingMessageQueue.admit(session, msg, ws && ws._clayUser);
+      if (continuationQueued.ok) {
+        messageDelivery.acknowledge(ws, deliveryReceipt, null, session);
+        sendTo(ws, { type: "message_queued", clientMessageId: msg.clientMessageId || null,
+          sessionId: session.localId, projectSlug: slug, state: "pending",
+          paused: pendingMessageQueue.isPaused(session), revision: pendingMessageQueue.getRevision() });
+        continuationLease.cancelForHumanMessage(session);
+      } else {
+        sendTo(ws, { type: "error", text: continuationQueued.error || "Unable to queue message" });
+      }
+      return true;
+    }
     if (!pendingInternal && pendingMessageQueue && (pendingMessageQueue.hasActive(session) || session.isProcessing || session._queryStarting || session._awaitingTurnResult)) {
       var queuedResult = pendingMessageQueue.admit(session, msg, ws && ws._clayUser);
       if (queuedResult.ok) {

package/lib/project-worker-proposal.js

@@ -339,7 +339,7 @@ function attachWorkerProposal(ctx) {
     } else if (result.status === "running") {
       followup = "[Split Worker execution is still running]\nUse read_partner to inspect progress before completing the task.";
     } else {
-      followup = "[Split Worker execution failed]\nInspect the failure and delegate a narrower follow-up to the Split Worker when implementation work remains.\n\n" + (result.error || result.response || "Unknown Split Worker error.");
+      followup = "[Split Worker execution failed]\nThe existing Split Worker may still be reusable. Inspect partner_status and send a narrower follow-up with send_to_partner when the Worker and pair still exist; do not replace it merely because its task or transport failed. Retry replacement only when the replacement transaction reports that no new Worker was created and the failure is explicitly safe to retry.\n\n" + (result.error || result.response || "Unknown Split Worker error.");
     }
     await resumeDriver(session, followup);
   }

package/lib/project.js

@@ -56,6 +56,8 @@ var { attachCapsuleTurn } = require("./project-capsule-turn");
 var workspaceSessionRef = require("./workspace-query-service").sessionRef;
 var { attachSessionPair } = require("./project-session-pair");
 var { attachSessionHandoff } = require("./project-session-handoff");
+var { attachDriverContinuation } = require("./project-driver-continuation");
+var driverContinuationAccess = require("./driver-continuation-access");
 var { attachSessionNotes, composeSystemPrompts } = require("./project-session-notes");
 var { attachSessionDocument } = require("./project-session-document");
 var { attachCapsuleCatalog } = require("./project-capsule-catalog");
@@ -854,16 +856,41 @@ function createProjectContext(opts) {
   });
   var _sessionHandoff = attachSessionHandoff({
     cwd: cwd,
+    projectSlug: slug,
     sm: sm,
     isMate: isMate,
     splitStore: _splitGroups.store,
     getSdk: function () { return sdk; },
     sendTo: sendTo,
     usersModule: usersModule,
+    isMultiUser: usersModule.isMultiUser,
+    getProjectAccess: opts.getProjectAccess || function () { return { visibility: "public", ownerId: projectOwnerId || null }; },
+    canAccessSession: usersModule.canAccessSession,
+    findUserById: usersModule.findUserById,
+    isDriverOperatedSession: function (session) { return !isMate && _sessionPair.workerPermission.isDriverOperated(session); },
     adapters: adapters,
     getLinuxUserForSession: getLinuxUserForSession,
     onProcessingChanged: onProcessingChanged,
   });
+  var _driverContinuation = attachDriverContinuation({
+    sm: sm,
+    isMate: isMate,
+    projectSlug: slug,
+    splitStore: _splitGroups.store,
+    pendingMessageQueue: _pendingMessageQueue,
+    dangerouslySkipPermissions: dangerouslySkipPermissions,
+    isMultiUser: usersModule.isMultiUser,
+    isDriverOperatedSession: function (session) { return !isMate && _sessionPair.workerPermission.isDriverOperated(session); },
+    authorizeSession: function (session, ownerId) {
+      return driverContinuationAccess.authorize({ usersModule: usersModule, projectSlug: slug,
+        getProjectAccess: opts.getProjectAccess, canAccessProjectSlug: opts.canAccessProjectSlug }, session, ownerId);
+    },
+    getSdk: function () { return sdk; },
+    getLinuxUserForSession: getLinuxUserForSession,
+    onProcessingChanged: onProcessingChanged,
+    consumePendingMessage: function (session) { return _userMessage && _userMessage.consumePendingMessage(session); },
+    sendTo: sendTo,
+  });
   var _debate = null;
   var _debateProposal = attachDebateProposal({
     cwd: cwd,
@@ -1287,6 +1314,7 @@ function createProjectContext(opts) {
         _sessionPair.getSystemPrompt(session),
         _sessionNotes.getSystemPrompt(session),
         _sessionHandoff.getSystemPrompt(session),
+        _driverContinuation.getSystemPrompt(session),
         _sessionDocument.getSystemPrompt(session),
         _capsuleCatalog.getSystemPrompt(session),
         _projectLogs.getSystemPrompt(session),
@@ -1304,6 +1332,7 @@ function createProjectContext(opts) {
       return _sessionPair.getToolDefs(session)
         .concat(_sessionNotes.getToolDefs(session))
         .concat(_sessionHandoff.getToolDefs(session))
+        .concat(_driverContinuation.getToolDefs(session, Number(session._sdkQueryGeneration || 0)))
         .concat(_sessionDocument.getToolDefs(session))
         .concat(_debateProposal.getToolDefs(session))
         .concat(_mateCreationProposal.getToolDefs(session))
@@ -1714,6 +1743,7 @@ function createProjectContext(opts) {
     // --- Sessions, config, project mgmt (delegated to project-sessions.js) ---
     if (_sessionPair.handleMessage(ws, msg)) return;
     if (_sessionHandoff.handleMessage(ws, msg)) return;
+    if (_driverContinuation.handleMessage(ws, msg)) return;
     if (_splitGroups.handleMessage(ws, msg)) return;
     if (_models.handleMessage(ws, msg)) return;
     if (_scheduledTasks.handleMessage(ws, msg)) return;
@@ -2226,7 +2256,7 @@ function createProjectContext(opts) {
               inputSchema: normalizeToolSchema(noteTools[nti].inputSchema),
             });
           }
-          var handoffTools = _sessionHandoff.getToolDefs(boundSession);
+          var handoffTools = _sessionHandoff.getToolDefs(boundSession, queryGeneration);
           for (var hti = 0; hti < handoffTools.length; hti++) {
             tools.push({
               server: "clay-handoff",
@@ -2235,6 +2265,15 @@ function createProjectContext(opts) {
               inputSchema: normalizeToolSchema(handoffTools[hti].inputSchema),
             });
           }
+          var continuationTools = _driverContinuation.getToolDefs(boundSession, queryGeneration);
+          for (var cti = 0; cti < continuationTools.length; cti++) {
+            tools.push({
+              server: "clay-continuation",
+              name: continuationTools[cti].name,
+              description: continuationTools[cti].description || continuationTools[cti].name,
+              inputSchema: normalizeToolSchema(continuationTools[cti].inputSchema),
+            });
+          }
           var documentTools = _sessionDocument.getToolDefs(boundSession);
           for (var dti = 0; dti < documentTools.length; dti++) {
             tools.push({
@@ -2321,13 +2360,21 @@ function createProjectContext(opts) {
           }
         }
         if (boundSession && serverName === "clay-handoff") {
-          var handoffTools = _sessionHandoff.getToolDefs(boundSession);
+          var handoffTools = _sessionHandoff.getToolDefs(boundSession, queryGeneration);
           for (var hti = 0; hti < handoffTools.length; hti++) {
             if (handoffTools[hti].name === toolName && typeof handoffTools[hti].handler === "function") {
               return Promise.resolve(handoffTools[hti].handler(args || {}));
             }
           }
         }
+        if (boundSession && serverName === "clay-continuation") {
+          var continuationTools = _driverContinuation.getToolDefs(boundSession, queryGeneration);
+          for (var cti = 0; cti < continuationTools.length; cti++) {
+            if (continuationTools[cti].name === toolName && typeof continuationTools[cti].handler === "function") {
+              return Promise.resolve(continuationTools[cti].handler(args || {}));
+            }
+          }
+        }
         if (boundSession && serverName === "clay-documents") {
           var documentTools = _sessionDocument.getToolDefs(boundSession);
           for (var dti = 0; dti < documentTools.length; dti++) {

package/lib/public/css/driver-continuation.css

@@ -0,0 +1,56 @@
+.driver-continuation-card,
+.driver-continuation-context {
+  width: min(680px, calc(100% - 24px));
+  margin: 14px auto;
+  border: 1px solid var(--border);
+  border-radius: 14px;
+  background: var(--bg-alt);
+  color: var(--text);
+  box-shadow: 0 10px 28px rgba(0, 0, 0, .08);
+}
+
+.driver-continuation-card { padding: 18px; }
+.driver-continuation-card header,
+.driver-continuation-context { display: flex; align-items: flex-start; gap: 12px; }
+.driver-continuation-context { padding: 15px 17px; }
+.driver-continuation-card header > div,
+.driver-continuation-context-copy { display: grid; gap: 3px; min-width: 0; flex: 1; }
+.driver-continuation-mark { display: grid; place-items: center; width: 30px; height: 30px; flex: 0 0 auto; border-radius: 9px; color: var(--accent2); background: color-mix(in srgb, var(--accent2) 12%, transparent); }
+.driver-continuation-kicker { font-size: 10px; line-height: 1.2; font-weight: 700; letter-spacing: .1em; color: var(--text-muted); }
+.driver-continuation-status { margin-left: auto; white-space: nowrap; font-size: 12px; color: var(--text-muted); }
+.driver-continuation-reason,
+.driver-continuation-context p { margin: 12px 0; color: var(--text-secondary); line-height: 1.5; }
+.driver-continuation-summary { display: grid; grid-template-columns: 80px 1fr; gap: 7px 12px; padding: 13px; border-radius: 10px; background: var(--bg); }
+.driver-continuation-summary dt,
+.driver-continuation-details dt { font-size: 11px; font-weight: 700; color: var(--text-muted); }
+.driver-continuation-summary dd,
+.driver-continuation-details dd { margin: 0; white-space: pre-wrap; line-height: 1.45; }
+.driver-continuation-details { margin-top: 12px; color: var(--text-secondary); }
+.driver-continuation-details summary { cursor: pointer; font-size: 12px; font-weight: 600; }
+.driver-continuation-details dl { display: grid; grid-template-columns: 120px 1fr; gap: 8px 12px; margin: 12px 0 0; }
+.driver-continuation-error { padding: 10px; border-radius: 8px; color: var(--error); background: var(--error-8); }
+.driver-continuation-context .driver-continuation-error { color: var(--error); }
+.driver-continuation-actions { display: flex; justify-content: flex-end; gap: 8px; margin-top: 16px; }
+.driver-continuation-action,
+.driver-continuation-source { min-height: 36px; border: 1px solid var(--border); border-radius: 9px; padding: 8px 13px; font: inherit; cursor: pointer; }
+.driver-continuation-action.primary { display: inline-flex; align-items: center; gap: 7px; border-color: var(--accent2); background: color-mix(in srgb, var(--accent2) 16%, var(--bg)); color: var(--accent2); }
+.driver-continuation-action.secondary,
+.driver-continuation-source { background: transparent; color: var(--text); }
+.driver-continuation-action:disabled,
+.driver-continuation-source:disabled { cursor: not-allowed; opacity: .45; }
+.driver-continuation-action:focus-visible,
+.driver-continuation-source:focus-visible,
+.driver-continuation-details summary:focus-visible { outline: 2px solid var(--accent2); outline-offset: 2px; }
+.driver-continuation-source { justify-self: start; margin-top: 5px; padding: 5px 9px; min-height: 30px; font-size: 12px; }
+
+@media (max-width: 600px) {
+  .driver-continuation-card,
+  .driver-continuation-context { width: calc(100% - 16px); }
+  .driver-continuation-card { padding: 14px; }
+  .driver-continuation-card header { flex-wrap: wrap; }
+  .driver-continuation-status { width: 100%; margin-left: 42px; }
+  .driver-continuation-summary,
+  .driver-continuation-details dl { grid-template-columns: 1fr; }
+  .driver-continuation-actions { flex-direction: column-reverse; }
+  .driver-continuation-action { width: 100%; justify-content: center; }
+}