@schoolai/shipyard 3.29.0 → 3.30.0-rc.20260912.1

package/dist/{chunk-SR3T3EYE.js → chunk-RGVTFZDF.js}

@@ -18,8 +18,8 @@ function getDaemonVersion() {
   return cached;
 }
 function readDaemonVersion() {
-  if ("3.29.0".length > 0) {
-    return "3.29.0";
+  if ("3.30.0".length > 0) {
+    return "3.30.0";
   }
   try {
     const here = dirname(fileURLToPath(import.meta.url));
@@ -48,4 +48,4 @@ function readDaemonVersion() {
 export {
   getDaemonVersion
 };
-//# sourceMappingURL=chunk-SR3T3EYE.js.map
+//# sourceMappingURL=chunk-RGVTFZDF.js.map

package/dist/{chunk-SMGVXANE.js → chunk-SGFCXJJJ.js}

@@ -15,7 +15,7 @@ import {
   DevicePollResponseSchema,
   DeviceStartResponseSchema,
   ROUTES
-} from "./chunk-HIGCNT53.js";
+} from "./chunk-FARMJBC7.js";
 import {
   isDevMode,
   validateEnv
@@ -223,4 +223,4 @@ export {
   ensureAuthenticated,
   loginCommand
 };
-//# sourceMappingURL=chunk-SMGVXANE.js.map
+//# sourceMappingURL=chunk-SGFCXJJJ.js.map

package/dist/{chunk-CDOIPKD6.js → chunk-VE2ZAUIM.js}

@@ -31,7 +31,7 @@ import {
   parseShipyardDeliverableUrl,
   planEditorSerializer,
   toTaskIndexEntry
-} from "./chunk-ASK7AIJM.js";
+} from "./chunk-KFCIZHQW.js";
 import {
   logger
 } from "./chunk-FIE2FRIW.js";
@@ -34988,4 +34988,4 @@ export {
   runPlanBackfill,
   buildTaskStateStore
 };
-//# sourceMappingURL=chunk-CDOIPKD6.js.map
+//# sourceMappingURL=chunk-VE2ZAUIM.js.map

package/dist/{chunk-J5MLXWO5.js → chunk-WO5EM3BP.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   getDaemonVersion
-} from "./chunk-SR3T3EYE.js";
+} from "./chunk-RGVTFZDF.js";
 import {
   WorkerCommandCodec,
   WorkerReplyCodec
@@ -1116,4 +1116,4 @@ export {
   shutdownFileWatcherGuard,
   guardedSubscribe
 };
-//# sourceMappingURL=chunk-J5MLXWO5.js.map
+//# sourceMappingURL=chunk-WO5EM3BP.js.map

package/dist/{chunk-CB35TLO4.js → chunk-ZDJEJI62.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   SkillCompatibleAgentSchema
-} from "./chunk-HIGCNT53.js";
+} from "./chunk-FARMJBC7.js";
 
 // src/shared/capabilities/skills.ts
 import { createHash } from "crypto";
@@ -468,4 +468,4 @@ export {
   scopeEnvironmentsToActiveRepo,
   _resolveBucketForTesting
 };
-//# sourceMappingURL=chunk-CB35TLO4.js.map
+//# sourceMappingURL=chunk-ZDJEJI62.js.map

package/dist/cursor-runner.js

@@ -2,16 +2,17 @@
 import {
   buildCursorFastModeModelOption,
   countLoopbackHttpEntries,
-  parseDaemonToRunner
-} from "./chunk-AIN32UWK.js";
+  parseDaemonToRunner,
+  prependCursorSystemContext
+} from "./chunk-FWL2ZIEL.js";
 import {
   buildCursorUserPrompt
-} from "./chunk-IJGA4YA3.js";
+} from "./chunk-JQFAXWT5.js";
 import {
   ContentBlockSchema,
   HARNESS_SERVER_NAME
-} from "./chunk-ASK7AIJM.js";
-import "./chunk-HIGCNT53.js";
+} from "./chunk-KFCIZHQW.js";
+import "./chunk-FARMJBC7.js";
 import "./chunk-EHQITHQX.js";
 import "./chunk-FIE2FRIW.js";
 import "./chunk-FKOUB6H6.js";
@@ -19,11 +20,6 @@ import "./chunk-X3MULCV5.js";
 import "./chunk-XVW6VCKW.js";
 import "./chunk-2H7UOFLK.js";
 
-// src/services/session/cursor-runner.ts
-import {
-  Agent
-} from "@cursor/sdk";
-
 // src/shared/capabilities/runtime/cursor-ripgrep.ts
 import { existsSync } from "fs";
 import { createRequire } from "module";
@@ -58,6 +54,40 @@ function resolveCursorBundledRipgrepPath(deps = {}) {
   return exists(rg) ? rg : null;
 }
 
+// src/services/session/cursor-agent-acquisition.ts
+import { Agent } from "@cursor/sdk";
+async function acquireCursorAgent(options) {
+  if (options.injectedAgentId !== void 0) {
+    return {
+      agent: await Agent.resume(options.injectedAgentId, options.baseOptions),
+      resumeFallbackUsed: false
+    };
+  }
+  if (options.resumeAgentId !== void 0) {
+    try {
+      const agent = await Agent.resume(options.resumeAgentId, options.baseOptions);
+      options.log("info", "runner_resume_agent_succeeded", { agentId: options.resumeAgentId });
+      return { agent, resumeFallbackUsed: false };
+    } catch (error) {
+      options.log("warn", "runner_resume_agent_failed_falling_back_to_create", {
+        agentId: options.resumeAgentId,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      return {
+        agent: await Agent.create({
+          ...options.baseOptions,
+          name: `shipyard-task-${options.taskId}`
+        }),
+        resumeFallbackUsed: true
+      };
+    }
+  }
+  return {
+    agent: await Agent.create({ ...options.baseOptions, name: `shipyard-task-${options.taskId}` }),
+    resumeFallbackUsed: false
+  };
+}
+
 // src/services/session/cursor-init-error-reporter.ts
 import { Cursor } from "@cursor/sdk";
 
@@ -189,6 +219,7 @@ var state = {
   fastModeParam: null,
   mcpServers: {},
   initSettled: null,
+  pendingResumeFallbackSystemContext: null,
   mode: void 0
 };
 function send(msg) {
@@ -242,8 +273,8 @@ function buildAgentsOption(agents) {
     { agents }
   ) : {};
 }
-async function acquireAgent(args) {
-  const baseOptions = {
+function buildAgentOptions(args) {
+  return {
     apiKey: args.apiKey,
     model: { id: args.modelId },
     local: args.local,
@@ -252,26 +283,6 @@ async function acquireAgent(args) {
     ...args.agentsOption,
     ...args.mode !== void 0 ? { mode: args.mode } : {}
   };
-  async function createFreshAgent() {
-    return Agent.create({ ...baseOptions, name: `shipyard-task-${args.taskId}` });
-  }
-  if (args.injectedAgentId !== void 0) {
-    return Agent.resume(args.injectedAgentId, baseOptions);
-  }
-  if (args.resumeAgentId !== void 0) {
-    try {
-      const resumed = await Agent.resume(args.resumeAgentId, baseOptions);
-      log("info", "runner_resume_agent_succeeded", { agentId: args.resumeAgentId });
-      return resumed;
-    } catch (resumeErr) {
-      log("warn", "runner_resume_agent_failed_falling_back_to_create", {
-        agentId: args.resumeAgentId,
-        error: resumeErr instanceof Error ? resumeErr.message : String(resumeErr)
-      });
-      return createFreshAgent();
-    }
-  }
-  return createFreshAgent();
 }
 async function handleInit(args) {
   state.currentGeneration = args.generation;
@@ -297,18 +308,23 @@ async function handleInit(args) {
       })
     };
     state.mcpServers = mcpServers;
-    const agent = await acquireAgent({
-      apiKey: args.apiKey,
+    const acquired = await acquireCursorAgent({
       taskId: args.taskId,
-      modelId: args.modelId,
-      local: buildLocalOption(args.cwd, args.skillsDir),
-      mcpServers,
-      agentsOption: buildAgentsOption(args.agents),
+      baseOptions: buildAgentOptions({
+        apiKey: args.apiKey,
+        modelId: args.modelId,
+        local: buildLocalOption(args.cwd, args.skillsDir),
+        mcpServers,
+        agentsOption: buildAgentsOption(args.agents),
+        ...args.mode !== void 0 && { mode: args.mode }
+      }),
       ...args.injectedAgentId !== void 0 && { injectedAgentId: args.injectedAgentId },
       ...args.resumeAgentId !== void 0 && { resumeAgentId: args.resumeAgentId },
-      ...args.mode !== void 0 && { mode: args.mode }
+      log
     });
+    const { agent } = acquired;
     state.agent = agent;
+    state.pendingResumeFallbackSystemContext = acquired.resumeFallbackUsed ? args.resumeFallbackSystemContext ?? null : null;
     send({
       kind: "init_ok",
       sessionId: agent.agentId,
@@ -355,17 +371,22 @@ async function handleReinit(args) {
       })
     };
     state.mcpServers = mcpServers;
-    const agent = await acquireAgent({
-      apiKey: state.apiKey,
+    const acquired = await acquireCursorAgent({
       taskId: args.taskId,
-      modelId: args.modelId,
-      local: buildLocalOption(state.cwd, args.skillsDir),
-      mcpServers,
-      agentsOption: buildAgentsOption(args.agents),
+      baseOptions: buildAgentOptions({
+        apiKey: state.apiKey,
+        modelId: args.modelId,
+        local: buildLocalOption(state.cwd, args.skillsDir),
+        mcpServers,
+        agentsOption: buildAgentsOption(args.agents),
+        ...args.mode !== void 0 && { mode: args.mode }
+      }),
       ...args.resumeAgentId !== void 0 && { resumeAgentId: args.resumeAgentId },
-      ...args.mode !== void 0 && { mode: args.mode }
+      log
     });
+    const { agent } = acquired;
     state.agent = agent;
+    state.pendingResumeFallbackSystemContext = acquired.resumeFallbackUsed ? args.resumeFallbackSystemContext ?? null : null;
     send({ kind: "reinit_ok", sessionId: agent.agentId });
   } catch (err) {
     send({
@@ -504,8 +525,14 @@ async function handlePushMessage(args) {
     });
     return;
   }
+  const fallbackSystemContext = state.pendingResumeFallbackSystemContext;
+  const content = prependCursorSystemContext(parsedContent.data, fallbackSystemContext);
+  if (fallbackSystemContext !== null) {
+    state.pendingResumeFallbackSystemContext = null;
+    send({ kind: "initial_system_context_attached", generation: args.generation });
+  }
   const userInput = buildCursorUserPrompt(
-    parsedContent.data,
+    content,
     (entry) => log(entry.event.includes("error") ? "warn" : "info", entry.event, entry),
     { skillBodies: args.skillBodies }
   );
@@ -617,6 +644,7 @@ async function handleClose() {
     state.taskId = "";
     state.fastMode = false;
     state.fastModeParam = null;
+    state.pendingResumeFallbackSystemContext = null;
     state.mode = void 0;
     inFlightToolCount = 0;
     send({ kind: "pooled_idle" });
@@ -639,6 +667,9 @@ function buildHandleInitArgs(msg) {
     generation: msg.generation,
     ...msg.injectedAgentId !== void 0 && { injectedAgentId: msg.injectedAgentId },
     ...msg.resumeAgentId !== void 0 && { resumeAgentId: msg.resumeAgentId },
+    ...msg.resumeFallbackSystemContext !== void 0 && {
+      resumeFallbackSystemContext: msg.resumeFallbackSystemContext
+    },
     fastMode: msg.fastMode ?? false,
     fastModeParam: msg.fastModeParam ?? null,
     ...msg.agents !== void 0 && { agents: msg.agents },
@@ -655,6 +686,9 @@ function buildHandleReinitArgs(msg) {
     skillsDir: msg.skillsDir,
     generation: msg.generation,
     ...msg.resumeAgentId !== void 0 && { resumeAgentId: msg.resumeAgentId },
+    ...msg.resumeFallbackSystemContext !== void 0 && {
+      resumeFallbackSystemContext: msg.resumeFallbackSystemContext
+    },
     fastMode: msg.fastMode ?? false,
     fastModeParam: msg.fastModeParam ?? null,
     ...msg.agents !== void 0 && { agents: msg.agents },