@schoolai/shipyard 3.16.0 → 3.16.1-rc.20260616.0

package/dist/{chunk-5PBWS7BB.js → chunk-URRNZGFO.js}

@@ -38,7 +38,7 @@ import {
   formatTaskFeedback,
   toRecord,
   toSdkContent
-} from "./chunk-6SK6FBYC.js";
+} from "./chunk-WMD76UPS.js";
 import {
   AGENT_IDS,
   AGENT_SYSTEM_CLAUDE_CODE,
@@ -50,14 +50,14 @@ import {
   REASONING_EFFORTS,
   inflateToolResultContent,
   isImageMimeType
-} from "./chunk-VTALUCDB.js";
+} from "./chunk-4FVMGXFP.js";
 import {
   AnthropicAuthStatusSchema,
   CodexAuthStatusSchema,
   CursorAuthStatusSchema,
   PermissionModeSchema,
   TESTED_CODEX_VERSION
-} from "./chunk-AXHG3QQA.js";
+} from "./chunk-FJXRLZZI.js";
 import {
   logger
 } from "./chunk-X53VIV2J.js";
@@ -8207,4 +8207,4 @@ export {
   refreshInstalledAgents,
   refreshCodexAuthSlice
 };
-//# sourceMappingURL=chunk-5PBWS7BB.js.map
+//# sourceMappingURL=chunk-URRNZGFO.js.map

package/dist/{chunk-HPDRJ4VZ.js → chunk-UZT6JIJ5.js}

@@ -30,7 +30,7 @@ import {
   parseShipyardDeliverableUrl,
   planEditorSerializer,
   toTaskIndexEntry
-} from "./chunk-VTALUCDB.js";
+} from "./chunk-4FVMGXFP.js";
 import {
   assertNever
 } from "./chunk-X3MULCV5.js";
@@ -34718,4 +34718,4 @@ export {
   runPlanBackfill,
   buildTaskStateStore
 };
-//# sourceMappingURL=chunk-HPDRJ4VZ.js.map
+//# sourceMappingURL=chunk-UZT6JIJ5.js.map

package/dist/{chunk-6SK6FBYC.js → chunk-WMD76UPS.js}

@@ -2,7 +2,7 @@
 import {
   isImageMimeType,
   parseAssetUri
-} from "./chunk-VTALUCDB.js";
+} from "./chunk-4FVMGXFP.js";
 import {
   assertNever
 } from "./chunk-X3MULCV5.js";
@@ -588,4 +588,4 @@ export {
   toRecord,
   buildCursorUserPrompt
 };
-//# sourceMappingURL=chunk-6SK6FBYC.js.map
+//# sourceMappingURL=chunk-WMD76UPS.js.map

package/dist/{chunk-RHHRJR3L.js → chunk-X3TOIQUD.js}

@@ -15,7 +15,7 @@ import {
   DevicePollResponseSchema,
   DeviceStartResponseSchema,
   ROUTES
-} from "./chunk-AXHG3QQA.js";
+} from "./chunk-FJXRLZZI.js";
 import {
   isDevMode,
   validateEnv
@@ -223,4 +223,4 @@ export {
   ensureAuthenticated,
   loginCommand
 };
-//# sourceMappingURL=chunk-RHHRJR3L.js.map
+//# sourceMappingURL=chunk-X3TOIQUD.js.map

package/dist/cursor-runner.js

@@ -4,12 +4,12 @@ import {
 } from "./chunk-D3JA5MXR.js";
 import {
   buildCursorUserPrompt
-} from "./chunk-6SK6FBYC.js";
+} from "./chunk-WMD76UPS.js";
 import {
   ContentBlockSchema,
   HARNESS_SERVER_NAME
-} from "./chunk-VTALUCDB.js";
-import "./chunk-AXHG3QQA.js";
+} from "./chunk-4FVMGXFP.js";
+import "./chunk-FJXRLZZI.js";
 import "./chunk-EHQITHQX.js";
 import "./chunk-X3MULCV5.js";
 import "./chunk-X53VIV2J.js";

package/dist/electron-utility.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   getDaemonVersion
-} from "./chunk-M6VDKNFY.js";
+} from "./chunk-5WJSHXUB.js";
 import {
   enableNativeCrashReports
 } from "./chunk-TSJOSKN3.js";
@@ -71,7 +71,7 @@ async function main() {
   await loadAuthFromConfig(env);
   crumb("post-auth-load");
   crumb("pre-serve-import");
-  const { serve } = await import("./serve-HGXTONFE.js");
+  const { serve } = await import("./serve-JDYY2S3C.js");
   crumb("post-serve-import");
   const portQueue = [];
   let acceptor = null;

package/dist/index.js

@@ -113,7 +113,7 @@ async function loadAuthFromConfig(env) {
 async function handleSubcommand() {
   const subcommand = process.argv[2];
   if (subcommand === "login") {
-    const { loginCommand } = await import("./login-EYGYOEXL.js");
+    const { loginCommand } = await import("./login-7YFYG2ZB.js");
     const hasCheck = process.argv.includes("--check");
     await loginCommand({ check: hasCheck });
     return true;
@@ -124,7 +124,7 @@ async function handleSubcommand() {
     return true;
   }
   if (subcommand === "start") {
-    const { startCommand } = await import("./start-CUWE2FYT.js");
+    const { startCommand } = await import("./start-VJOHZ5BC.js");
     await startCommand();
     return true;
   }
@@ -134,7 +134,7 @@ async function handleSubcommand() {
     return true;
   }
   if (subcommand === "plan-backfill") {
-    const { planBackfillCommand } = await import("./plan-backfill-SMJEKTMM.js");
+    const { planBackfillCommand } = await import("./plan-backfill-DVXCXD3E.js");
     await planBackfillCommand();
     return true;
   }
@@ -146,7 +146,7 @@ async function main() {
   const args = parseCliArgs();
   if (args.serve) {
     await loadAuthFromConfig(env);
-    const { serve } = await import("./serve-HGXTONFE.js");
+    const { serve } = await import("./serve-JDYY2S3C.js");
     return serve({ isDev: env.SHIPYARD_DEV });
   }
   logger.error("Use `shipyard start` to run the daemon. Use --help for usage.");

package/dist/{login-EYGYOEXL.js → login-7YFYG2ZB.js}

@@ -3,10 +3,10 @@ import {
   ensureAuthenticated,
   getSignalingUrl,
   loginCommand
-} from "./chunk-RHHRJR3L.js";
+} from "./chunk-X3TOIQUD.js";
 import "./chunk-ZHLJRR5O.js";
 import "./chunk-TFWDJCUJ.js";
-import "./chunk-AXHG3QQA.js";
+import "./chunk-FJXRLZZI.js";
 import "./chunk-EHQITHQX.js";
 import "./chunk-X53VIV2J.js";
 import "./chunk-UTL5PF43.js";
@@ -17,4 +17,4 @@ export {
   getSignalingUrl,
   loginCommand
 };
-//# sourceMappingURL=login-EYGYOEXL.js.map
+//# sourceMappingURL=login-7YFYG2ZB.js.map

package/dist/{plan-backfill-SMJEKTMM.js → plan-backfill-DVXCXD3E.js}

@@ -2,10 +2,10 @@
 import {
   buildTaskStateStore,
   runPlanBackfill
-} from "./chunk-HPDRJ4VZ.js";
+} from "./chunk-UZT6JIJ5.js";
 import "./chunk-RR6V6SNM.js";
-import "./chunk-VTALUCDB.js";
-import "./chunk-AXHG3QQA.js";
+import "./chunk-4FVMGXFP.js";
+import "./chunk-FJXRLZZI.js";
 import "./chunk-EHQITHQX.js";
 import "./chunk-X3MULCV5.js";
 import {
@@ -65,4 +65,4 @@ async function planBackfillCommand(argv = process.argv.slice(3)) {
 export {
   planBackfillCommand
 };
-//# sourceMappingURL=plan-backfill-SMJEKTMM.js.map
+//# sourceMappingURL=plan-backfill-DVXCXD3E.js.map

package/dist/{serve-HGXTONFE.js → serve-JDYY2S3C.js}

@@ -12,7 +12,7 @@ import {
   guardedSubscribe,
   makeInitialAttemptState,
   shutdownFileWatcherGuard
-} from "./chunk-E2NXVJUG.js";
+} from "./chunk-CZPRQJ46.js";
 import {
   TRAILER_SCHEMA_VERSION,
   appendTrailerToMessage,
@@ -39,13 +39,13 @@ import {
   startPlanBackfillForDaemon,
   sync,
   validatePeerId
-} from "./chunk-HPDRJ4VZ.js";
+} from "./chunk-UZT6JIJ5.js";
 import {
   loadAuthToken
 } from "./chunk-TFWDJCUJ.js";
 import {
   getDaemonVersion
-} from "./chunk-M6VDKNFY.js";
+} from "./chunk-5WJSHXUB.js";
 import {
   collectPriorCrashDetail,
   getRecentWasmPanicMessages
@@ -168,7 +168,7 @@ import {
   translateWarningNotification,
   unresolveReviewThread,
   writeCursorApiKeyToVault
-} from "./chunk-5PBWS7BB.js";
+} from "./chunk-URRNZGFO.js";
 import {
   buildNodeSpawnEnv,
   nodeSpawnEnvOverlay,
@@ -229,7 +229,7 @@ import {
   createAssetResolver,
   toSdkContent,
   toSdkPermissionMode
-} from "./chunk-6SK6FBYC.js";
+} from "./chunk-WMD76UPS.js";
 import {
   AGENT_IDS,
   AGENT_SYSTEM_CLAUDE_CODE,
@@ -411,7 +411,7 @@ import {
   unsafeAssertSourceId,
   vizFileExtension,
   withPreferredRuntimeAuthMethod
-} from "./chunk-VTALUCDB.js";
+} from "./chunk-4FVMGXFP.js";
 import {
   AuthGitHubCallbackRequestSchema,
   AuthGitHubCallbackResponseSchema,
@@ -459,7 +459,7 @@ import {
   VaultKeyPutResponseSchema,
   classifyClaudeCodeCompatibility,
   classifyCodexCompatibility
-} from "./chunk-AXHG3QQA.js";
+} from "./chunk-FJXRLZZI.js";
 import {
   external_exports as external_exports2
 } from "./chunk-EHQITHQX.js";
@@ -5769,7 +5769,7 @@ function nanoid(size = 21) {
 }
 
 // src/services/bootstrap/signaling.ts
-var DAEMON_NPM_VERSION = true ? "3.16.0" : "unknown";
+var DAEMON_NPM_VERSION = true ? "3.16.1" : "unknown";
 function createDaemonSignaling(config) {
   const agentId = config.agentId ?? nanoid();
   function send(msg) {
@@ -30218,10 +30218,24 @@ function assertNever4(x2) {
 function machineIdToPeerId(machineId) {
   return machineId;
 }
+var MAX_REINITIATE_ATTEMPTS = 5;
+function computeReinitiateDelayMs(attempt) {
+  const clamped = Math.min(Math.max(attempt, 1), MAX_REINITIATE_ATTEMPTS);
+  return 2 ** (clamped - 1) * 1e3;
+}
+function hasTurnServer(iceServers) {
+  return iceServers.some((server) => {
+    const urls = Array.isArray(server.urls) ? server.urls : [server.urls];
+    return urls.some((url) => url.startsWith("turn:") || url.startsWith("turns:"));
+  });
+}
 async function loadDefaultFactory(iceServers) {
   const { RTCPeerConnection } = await import("node-datachannel/polyfill");
-  return () => {
-    const pc = new RTCPeerConnection({ iceServers: iceServers ?? DEFAULT_ICE_SERVERS });
+  return (iceTransportPolicy) => {
+    const pc = new RTCPeerConnection({
+      iceServers: iceServers ?? DEFAULT_ICE_SERVERS,
+      ...iceTransportPolicy ? { iceTransportPolicy } : {}
+    });
     return pc;
   };
 }
@@ -30371,6 +30385,10 @@ function createPeerManager(config) {
   const peers = /* @__PURE__ */ new Map();
   const pendingCreates = /* @__PURE__ */ new Map();
   const loroGuards = /* @__PURE__ */ new Map();
+  const initiatorTargets = /* @__PURE__ */ new Set();
+  const relayPreferred = /* @__PURE__ */ new Set();
+  const reinitiateAttempts = /* @__PURE__ */ new Map();
+  const reinitiateTimers = /* @__PURE__ */ new Map();
   let factoryPromise = null;
   function disposeLoroGuard(peerId) {
     const guard = loroGuards.get(peerId);
@@ -30537,6 +30555,24 @@ function createPeerManager(config) {
     });
     return true;
   }
+  function flushPendingCandidates(fromMachineId, entry) {
+    const buffered = entry.pendingCandidates;
+    entry.pendingCandidates = [];
+    for (const candidate of buffered) {
+      entry.pc.addIceCandidate(candidate).catch((err3) => {
+        config.logAdapter?.({
+          event: "webrtc_ice_apply_failed",
+          fromMachineId,
+          generationId: entry.generationId,
+          err: String(err3)
+        });
+        config.log.warn(
+          { fromMachineId, generationId: entry.generationId, err: String(err3) },
+          "addIceCandidate (buffered flush) failed"
+        );
+      });
+    }
+  }
   function tearDownPeer(machineId, reason) {
     const peerId = machineIdToPeerId(machineId);
     disposeLoroGuard(peerId);
@@ -30722,6 +30758,44 @@ function createPeerManager(config) {
       );
     }
   }
+  function clearReinitiateState(targetMachineId) {
+    relayPreferred.delete(targetMachineId);
+    reinitiateAttempts.delete(targetMachineId);
+    const timer = reinitiateTimers.get(targetMachineId);
+    if (timer) {
+      clearTimeout(timer);
+      reinitiateTimers.delete(targetMachineId);
+    }
+  }
+  function scheduleReinitiate(targetMachineId) {
+    if (!initiatorTargets.has(targetMachineId)) return;
+    const attempts = reinitiateAttempts.get(targetMachineId) ?? 0;
+    if (attempts >= MAX_REINITIATE_ATTEMPTS) {
+      config.logAdapter?.({ event: "collab_reinitiate_exhausted", targetMachineId });
+      config.log.warn({ targetMachineId, attempts }, "collab re-initiate exhausted");
+      return;
+    }
+    const attempt = attempts + 1;
+    reinitiateAttempts.set(targetMachineId, attempt);
+    relayPreferred.add(targetMachineId);
+    const existing = reinitiateTimers.get(targetMachineId);
+    if (existing) clearTimeout(existing);
+    const delayMs = computeReinitiateDelayMs(attempt);
+    const timer = setTimeout(() => {
+      reinitiateTimers.delete(targetMachineId);
+      if (!initiatorTargets.has(targetMachineId)) return;
+      void initiateOfferImpl(targetMachineId).catch(() => {
+        scheduleReinitiate(targetMachineId);
+      });
+    }, delayMs);
+    reinitiateTimers.set(targetMachineId, timer);
+    config.logAdapter?.({
+      event: "collab_reinitiate_scheduled",
+      targetMachineId,
+      attempt,
+      delayMs
+    });
+  }
   function applyDisconnectWatchdog(machineId, entry, newState) {
     if (newState === "disconnected") {
       if (entry.disconnectWatchdog) clearTimeout(entry.disconnectWatchdog);
@@ -30730,6 +30804,7 @@ function createPeerManager(config) {
         if (stillCurrent !== entry) return;
         if (stillCurrent.lastState !== "disconnected") return;
         tearDownPeer(machineId, "disconnect_watchdog");
+        scheduleReinitiate(machineId);
       }, DISCONNECT_WATCHDOG_MS);
       return;
     }
@@ -30791,11 +30866,105 @@ function createPeerManager(config) {
       currentEntry.lastStateAt = Date.now();
       if (isClose) {
         tearDownPeer(machineId, newState);
+        scheduleReinitiate(machineId);
         return;
       }
+      if (newState === "connected") {
+        clearReinitiateState(machineId);
+      }
       applyDisconnectWatchdog(machineId, currentEntry, newState);
     };
   }
+  async function initiateOfferImpl(targetMachineId) {
+    const generationId = crypto.randomUUID();
+    initiatorTargets.add(targetMachineId);
+    const useRelay = relayPreferred.has(targetMachineId) && hasTurnServer(config.iceServers ?? DEFAULT_ICE_SERVERS);
+    const relayPolicy = useRelay ? "relay" : void 0;
+    config.log.info(
+      { targetMachineId, generationId, iceTransportPolicy: useRelay ? "relay" : "all" },
+      "Initiating WebRTC offer"
+    );
+    config.logAdapter?.({
+      event: "webrtc_initiate",
+      targetMachineId,
+      generationId,
+      iceTransportPolicy: useRelay ? "relay" : "all"
+    });
+    const existing = peers.get(targetMachineId);
+    if (existing) {
+      tearDownPeer(targetMachineId, "replaced_by_initiate");
+    }
+    const now = Date.now();
+    let promise;
+    promise = (async () => {
+      try {
+        const factory = await getFactory();
+        const pc = factory(relayPolicy);
+        setupPeerHandlers(targetMachineId, pc, generationId);
+        if (!pc.createOffer) {
+          throw new Error("PeerConnection does not support createOffer");
+        }
+        setupInitiatorDataChannel(pc, targetMachineId, generationId);
+        const offer = await pc.createOffer();
+        await pc.setLocalDescription(offer);
+        const entry = {
+          pc,
+          generationId,
+          createdAt: now,
+          lastState: "new",
+          lastStateAt: now,
+          offerSdp: offer.sdp,
+          /** Initiator has only its local offer; the remote answer lands later via handleAnswer. */
+          remoteDescriptionApplied: false,
+          pendingCandidates: []
+        };
+        if (pendingCreates.get(targetMachineId) !== promise) {
+          disposeLoroGuard(machineIdToPeerId(targetMachineId));
+          discardSupersededPc(pc, "webrtc_initiate_superseded", {
+            targetMachineId,
+            generationId
+          });
+          return entry;
+        }
+        peers.set(targetMachineId, entry);
+        pendingCreates.delete(targetMachineId);
+        config.onOffer?.(targetMachineId, { type: "offer", sdp: offer.sdp }, generationId);
+        return entry;
+      } catch (err3) {
+        if (pendingCreates.get(targetMachineId) === promise) {
+          pendingCreates.delete(targetMachineId);
+        }
+        config.logAdapter?.({
+          event: "webrtc_initiate_handshake_failed",
+          targetMachineId,
+          generationId,
+          err: String(err3)
+        });
+        throw err3;
+      }
+    })();
+    pendingCreates.set(targetMachineId, promise);
+    setTimeout(() => {
+      handleInitiateHandshakeTimeout(targetMachineId, generationId, promise);
+    }, HANDSHAKE_TIMEOUT_MS);
+    await promise;
+  }
+  function handleInitiateHandshakeTimeout(targetMachineId, generationId, promise) {
+    if (pendingCreates.get(targetMachineId) === promise) {
+      pendingCreates.delete(targetMachineId);
+      config.logAdapter?.({
+        event: "webrtc_handshake_timeout",
+        machineId: targetMachineId,
+        generationId
+      });
+      config.log.warn({ targetMachineId, generationId }, "WebRTC handshake timed out (initiator)");
+    }
+    const entry = peers.get(targetMachineId);
+    if (!entry || entry.generationId !== generationId) return;
+    if (entry.lastState === "connected") return;
+    tearDownPeer(targetMachineId, "handshake_timeout");
+    scheduleReinitiate(targetMachineId);
+  }
   return {
     async handleOffer(fromMachineId, offer, generationId) {
       const existing = peers.get(fromMachineId);
@@ -30841,7 +31010,10 @@ function createPeerManager(config) {
             generationId,
             createdAt: now,
             lastState: "new",
-            lastStateAt: now
+            lastStateAt: now,
+            /** Answerer applied the offer above; no separate remote-answer step follows. */
+            remoteDescriptionApplied: true,
+            pendingCandidates: []
           };
           if (pendingCreates.get(fromMachineId) !== promise) {
             discardSupersededPc(pc, "webrtc_offer_superseded", { fromMachineId, generationId });
@@ -30879,74 +31051,7 @@ function createPeerManager(config) {
       await promise;
     },
     async initiateOffer(targetMachineId) {
-      const generationId = crypto.randomUUID();
-      config.log.info({ targetMachineId, generationId }, "Initiating WebRTC offer");
-      const existing = peers.get(targetMachineId);
-      if (existing) {
-        tearDownPeer(targetMachineId, "replaced_by_initiate");
-      }
-      const now = Date.now();
-      let promise;
-      promise = (async () => {
-        try {
-          const factory = await getFactory();
-          const pc = factory();
-          setupPeerHandlers(targetMachineId, pc, generationId);
-          if (!pc.createOffer) {
-            throw new Error("PeerConnection does not support createOffer");
-          }
-          setupInitiatorDataChannel(pc, targetMachineId, generationId);
-          const offer = await pc.createOffer();
-          await pc.setLocalDescription(offer);
-          const entry = {
-            pc,
-            generationId,
-            createdAt: now,
-            lastState: "new",
-            lastStateAt: now,
-            offerSdp: offer.sdp
-          };
-          if (pendingCreates.get(targetMachineId) !== promise) {
-            disposeLoroGuard(machineIdToPeerId(targetMachineId));
-            discardSupersededPc(pc, "webrtc_initiate_superseded", {
-              targetMachineId,
-              generationId
-            });
-            return entry;
-          }
-          peers.set(targetMachineId, entry);
-          pendingCreates.delete(targetMachineId);
-          config.onOffer?.(targetMachineId, { type: "offer", sdp: offer.sdp }, generationId);
-          return entry;
-        } catch (err3) {
-          if (pendingCreates.get(targetMachineId) === promise) {
-            pendingCreates.delete(targetMachineId);
-          }
-          config.logAdapter?.({
-            event: "webrtc_initiate_handshake_failed",
-            targetMachineId,
-            generationId,
-            err: String(err3)
-          });
-          throw err3;
-        }
-      })();
-      pendingCreates.set(targetMachineId, promise);
-      setTimeout(() => {
-        if (pendingCreates.get(targetMachineId) === promise) {
-          pendingCreates.delete(targetMachineId);
-          config.logAdapter?.({
-            event: "webrtc_handshake_timeout",
-            machineId: targetMachineId,
-            generationId
-          });
-          config.log.warn(
-            { targetMachineId, generationId },
-            "WebRTC handshake timed out (initiator)"
-          );
-        }
-      }, HANDSHAKE_TIMEOUT_MS);
-      await promise;
+      await initiateOfferImpl(targetMachineId);
     },
     async handleAnswer(fromMachineId, answer, generationId) {
       const entry = await resolveLiveEntry(fromMachineId, "answer", generationId);
@@ -30969,6 +31074,8 @@ function createPeerManager(config) {
           return assertNever4(decision);
       }
       await entry.pc.setRemoteDescription(answer);
+      entry.remoteDescriptionApplied = true;
+      flushPendingCandidates(fromMachineId, entry);
     },
     async handleIce(fromMachineId, candidate, generationId) {
       const entry = await resolveLiveEntry(fromMachineId, "ice", generationId);
@@ -30990,6 +31097,16 @@ function createPeerManager(config) {
         default:
           return assertNever4(decision);
       }
+      if (!entry.remoteDescriptionApplied) {
+        entry.pendingCandidates.push(candidate);
+        config.logAdapter?.({
+          event: "webrtc_ice_buffered",
+          fromMachineId,
+          generationId,
+          pendingCount: entry.pendingCandidates.length
+        });
+        return;
+      }
       try {
         await entry.pc.addIceCandidate(candidate);
       } catch (err3) {
@@ -31011,6 +31128,8 @@ function createPeerManager(config) {
     },
     closePeer(targetId) {
       tearDownPeer(targetId, "close_peer");
+      initiatorTargets.delete(targetId);
+      clearReinitiateState(targetId);
     },
     destroy() {
       for (const machineId of [...peers.keys()]) {
@@ -31019,9 +31138,16 @@ function createPeerManager(config) {
       for (const guard of loroGuards.values()) {
         guard.dispose();
       }
+      for (const timer of reinitiateTimers.values()) {
+        clearTimeout(timer);
+      }
       peers.clear();
       pendingCreates.clear();
       loroGuards.clear();
+      initiatorTargets.clear();
+      relayPreferred.clear();
+      reinitiateAttempts.clear();
+      reinitiateTimers.clear();
     }
   };
 }
@@ -101186,4 +101312,4 @@ export {
   decideWorkspaceScope,
   serve
 };
-//# sourceMappingURL=serve-HGXTONFE.js.map
+//# sourceMappingURL=serve-JDYY2S3C.js.map