@schoolai/shipyard 3.2.2 → 3.2.3-rc.20260422.0

package/dist/{serve-O4AHOTL4.js → serve-JJ4IH43W.js}

@@ -47,11 +47,11 @@ import {
   VaultKeyPutRequestSchema,
   VaultKeyPutResponseSchema,
   classifyClaudeCodeCompatibility
-} from "./chunk-N4ZTO3K3.js";
+} from "./chunk-PUSIYUI2.js";
 import "./chunk-EHQITHQX.js";
 import {
   loadAuthToken
-} from "./chunk-5RH5JP3R.js";
+} from "./chunk-GLH3V7NG.js";
 import {
   DiscoveryStateSchema,
   detectMCPServers,
@@ -62,19 +62,19 @@ import {
   redactEnv,
   resolveEnabledMcpServers,
   resolveStdioEnv
-} from "./chunk-NZFMJMJN.js";
+} from "./chunk-67VJDX7G.js";
 import {
   createChildLogger,
   flushLogger,
   logger
-} from "./chunk-DB5R6SKT.js";
+} from "./chunk-DNIC3FOH.js";
 import {
   external_exports,
   getShipyardHome,
   isVanillaAgentMode,
   toJSONSchema,
   validateEnv
-} from "./chunk-KUV4J6NI.js";
+} from "./chunk-M5M6VC5F.js";
 import {
   detectSkills
 } from "./chunk-DPMRSLYJ.js";
@@ -31690,7 +31690,7 @@ function nanoid(size2 = 21) {
 }
 
 // src/services/bootstrap/signaling.ts
-var DAEMON_NPM_VERSION = true ? "3.2.2" : "unknown";
+var DAEMON_NPM_VERSION = true ? "3.2.3" : "unknown";
 function createDaemonSignaling(config2) {
   const agentId = config2.agentId ?? nanoid();
   function send(msg) {
@@ -34005,7 +34005,6 @@ async function deleteAdvertisement(shipyardHome) {
 
 // src/services/local-direct/local-direct-wiring.ts
 async function setupLocalDirect(deps) {
-  if (!deps.env.SHIPYARD_LOCAL_DIRECT) return null;
   const token = generateLocalDirectToken();
   const server = await createLocalDirectServer({
     token,
@@ -84572,16 +84571,18 @@ async function buildRateLimitStore(dataDir, opts) {
     }
   };
 }
+function deriveWindowFromEvent(incoming, eventTime) {
+  if (!isWindowKey(incoming.rateLimitType)) return void 0;
+  const utilization = typeof incoming.utilization === "number" ? incoming.utilization : incoming.status === "rejected" ? 1 : void 0;
+  if (utilization === void 0) return void 0;
+  return { utilization, resetsAt: incoming.resetsAt, updatedAt: eventTime };
+}
 function mergeEvent(prev, incoming, eventTime) {
   const prevByWindow = prev?.byWindow ?? {};
   const byWindow = { ...prevByWindow };
-  if (isWindowKey(incoming.rateLimitType) && typeof incoming.utilization === "number") {
-    const window2 = {
-      utilization: incoming.utilization,
-      resetsAt: incoming.resetsAt,
-      updatedAt: eventTime
-    };
-    byWindow[incoming.rateLimitType] = window2;
+  const derived = deriveWindowFromEvent(incoming, eventTime);
+  if (derived && isWindowKey(incoming.rateLimitType)) {
+    byWindow[incoming.rateLimitType] = derived;
   }
   const nowInOverage = incoming.isUsingOverage === true;
   const wasInOverage = prev?.overageStartedAt !== void 0;
@@ -84635,12 +84636,15 @@ function migrateV1toV2(v1) {
   for (const [accountKey, record] of Object.entries(v1.records)) {
     const { info, updatedAt } = record;
     const byWindow = {};
-    if (isWindowKey(info.rateLimitType) && typeof info.utilization === "number") {
-      byWindow[info.rateLimitType] = {
-        utilization: info.utilization,
-        resetsAt: info.resetsAt,
-        updatedAt
-      };
+    if (isWindowKey(info.rateLimitType)) {
+      const utilization = typeof info.utilization === "number" ? info.utilization : info.status === "rejected" ? 1 : void 0;
+      if (utilization !== void 0) {
+        byWindow[info.rateLimitType] = {
+          utilization,
+          resetsAt: info.resetsAt,
+          updatedAt
+        };
+      }
     }
     const nowInOverage = info.isUsingOverage === true;
     records[accountKey] = {
@@ -91117,11 +91121,24 @@ var StructuredTaskTracker = class {
   #ccTaskWatcherDispose = null;
   #suppressWriteThrough = false;
   #ccTaskFileWriter;
-  #restoreInProgress = false;
+  /**
+   * Gate the first flush until an overlay has either been applied or the
+   * caller has explicitly signaled that none is coming. Both flags below
+   * must be false for the flush to proceed during restore.
+   */
+  #restoreNeedsOverlay = false;
+  /**
+   * Gate the first flush until the file watcher's initial disk reconcile
+   * has fired. Only set during restore for tasks with a session id.
+   */
+  #restoreNeedsDisk = false;
   constructor(deps) {
     this.#deps = deps;
     this.#ccTaskFileWriter = createCCTaskFileWriter(null, deps.log);
-    this.#restoreInProgress = deps.restoreInProgress ?? false;
+    if (deps.restoreInProgress) {
+      this.#restoreNeedsOverlay = true;
+      this.#restoreNeedsDisk = deps.restoreExpectDisk ?? false;
+    }
   }
   get currentOverlay() {
     return this.#currentOverlay;
@@ -91165,24 +91182,37 @@ var StructuredTaskTracker = class {
   }
   /**
    * Apply an overlay on top of CC tasks. Stores the overlay and re-flushes.
-   * Exits restore mode — applyOverlay is the terminal piece of restoration
-   * (disk reconcile is idempotent with the seeded overlay, so we flush once
-   * here with full inputs instead of producing a partial pre-overlay flush).
+   * Clears the overlay-pending gate. The flush still waits if a disk reconcile
+   * is expected (restoreExpectDisk=true at construction): without that second
+   * gate, the applyOverlay-first restart ordering would emit an overlay-only
+   * map to the store on every boot, bumping TaskRecord.lastActivityAt for
+   * every restored task that has an overlay.
    */
   applyOverlay(overlay) {
     this.#currentOverlay = overlay;
-    this.#restoreInProgress = false;
+    this.#restoreNeedsOverlay = false;
     this.#flushStructuredTasks();
   }
   /**
-   * Signal that restoration has finished for tasks that have no persisted
-   * overlay to apply. Unblocks #flushStructuredTasks and runs one flush with
-   * the current state (disk-only, no overlay). Must be called by the
-   * restoration caller whenever applyOverlay will not be invoked.
+   * Signal that no overlay will be applied during this restore. Clears the
+   * overlay-pending gate but NOT the disk gate — if the restored task has a
+   * session id, the file watcher's first reconcile remains the terminal
+   * signal before the store receives a flush.
+   */
+  markNoOverlay() {
+    if (!this.#restoreNeedsOverlay) return;
+    this.#restoreNeedsOverlay = false;
+    this.#flushStructuredTasks();
+  }
+  /**
+   * Clear BOTH restore gates. Used in error paths (hydration promise rejected)
+   * and by restorers that know neither an overlay nor a disk reconcile will
+   * arrive. If either signal fires after this, the natural flush handles it.
    */
   markRestoreComplete() {
-    if (!this.#restoreInProgress) return;
-    this.#restoreInProgress = false;
+    if (!this.#restoreNeedsOverlay && !this.#restoreNeedsDisk) return;
+    this.#restoreNeedsOverlay = false;
+    this.#restoreNeedsDisk = false;
     this.#flushStructuredTasks();
   }
   processStructuredTaskEvents(content) {
@@ -91292,7 +91322,7 @@ var StructuredTaskTracker = class {
    * 7. Push to updateStructuredTasks
    */
   #flushStructuredTasks() {
-    if (this.#restoreInProgress) return;
+    if (this.#restoreNeedsOverlay || this.#restoreNeedsDisk) return;
     const overlay = this.#currentOverlay ?? DEFAULT_TASK_OVERLAY;
     const merged = applyOverlayToMap(this.#structuredTasks, overlay);
     const todoProgress = computeTodoProgress(merged);
@@ -91314,6 +91344,7 @@ var StructuredTaskTracker = class {
    * - Re-flush with overlay applied
    */
   #reconcileFromDisk(ccTasks) {
+    this.#restoreNeedsDisk = false;
     const currentDiskIds = /* @__PURE__ */ new Set();
     for (const file of ccTasks) {
       currentDiskIds.add(file.id);
@@ -92497,7 +92528,12 @@ var Task = class {
       taskId: deps.taskId,
       log: deps.log,
       updateStructuredTasks: deps.updateStructuredTasks,
-      restoreInProgress: deps.restoreInProgress ?? false
+      restoreInProgress: deps.restoreInProgress ?? false,
+      /**
+       * Only wait for a disk reconcile if a CC session exists — else the file
+       * watcher never attaches and the gate would never clear.
+       */
+      restoreExpectDisk: Boolean(deps.restoreInProgress && deps.existingSessionId)
     });
     this.#pushManager = new ResourcePushManager({
       taskId: deps.taskId,
@@ -94192,6 +94228,10 @@ Use this context to maintain continuity. You have already done this work \u2014
   markStructuredTaskRestoreComplete() {
     this.#structuredTaskTracker.markRestoreComplete();
   }
+  /** See StructuredTaskTracker.markNoOverlay. */
+  markStructuredTaskNoOverlay() {
+    this.#structuredTaskTracker.markNoOverlay();
+  }
   /** ---------------------------------------------------------------- */
   /** Resource resolution                                              */
   /** ---------------------------------------------------------------- */
@@ -95132,11 +95172,14 @@ var TaskManager = class {
     const cwd = opts.cwd;
     const mode = opts.mode ?? "task";
     let orchestratorRef = null;
+    const hasSession = Boolean(opts.existingSessionId);
     const restoreHydration = async () => {
       const record = await this.#deps.taskStateStore.getTask(taskId);
       if (!orchestratorRef || !this.#tasks.has(taskId)) return;
       if (record?.taskOverlay) {
         orchestratorRef.applyOverlay(record.taskOverlay);
+      } else if (hasSession) {
+        orchestratorRef.markStructuredTaskNoOverlay();
       } else {
         orchestratorRef.markStructuredTaskRestoreComplete();
       }
@@ -99787,7 +99830,7 @@ function friendlyExecError(err) {
 async function refreshPluginCapabilities(daemon, tokenStore) {
   const [updatedMarketplace, updatedMcp, updatedSkills] = await Promise.all([
     detectMarketplacePlugins(),
-    import("./mcp-servers-YT5BADYE.js").then(
+    import("./mcp-servers-MUVTAMDT.js").then(
       (m2) => m2.detectMCPServers(daemon.capabilities.environments, tokenStore)
     ),
     import("./skills-NCKYNLUS.js").then(
@@ -105558,7 +105601,6 @@ async function serve(options = {}) {
   const peerManager = peerSetupDeps ? buildPeerManager(peerSetupDeps) : null;
   if (peerSetupDeps && !localDirectRef.current) {
     const handle = await setupLocalDirect({
-      env,
       shipyardHome,
       daemonId: daemonPeerId,
       userId: auth3.userId,
@@ -105701,4 +105743,4 @@ export {
   _testing,
   serve
 };
-//# sourceMappingURL=serve-O4AHOTL4.js.map
+//# sourceMappingURL=serve-JJ4IH43W.js.map