@schoolai/shipyard 3.1.0 → 3.1.1-nightly.20260415.0

package/dist/index.js

@@ -106,7 +106,7 @@ async function handleSubcommand() {
     return true;
   }
   if (subcommand === "start") {
-    const { startCommand } = await import("./start-IG5ZGAVH.js");
+    const { startCommand } = await import("./start-D67TQIGL.js");
     await startCommand();
     return true;
   }
@@ -118,7 +118,7 @@ async function main() {
   const args = parseCliArgs();
   if (args.serve) {
     await loadAuthFromConfig(env);
-    const { serve } = await import("./serve-5Z6GSYVH.js");
+    const { serve } = await import("./serve-2F6SKPPO.js");
     return serve({ isDev: env.SHIPYARD_DEV });
   }
   logger.error("Use `shipyard start` to run the daemon. Use --help for usage.");

package/dist/{serve-5Z6GSYVH.js → serve-2F6SKPPO.js}

@@ -24998,6 +24998,10 @@ var PRDataSchema = external_exports.object({
   autoMergeEnabled: external_exports.boolean(),
   headRefSha: external_exports.string().nullable(),
   headCommitInBase: external_exports.boolean().default(false),
+  labels: external_exports.array(external_exports.object({ name: external_exports.string(), color: external_exports.string().default("") })).default([]),
+  assignees: external_exports.array(external_exports.object({ login: external_exports.string(), avatarUrl: external_exports.string().nullable() })).default([]),
+  reviewDecision: external_exports.string().nullable().default(null),
+  mergeable: external_exports.string().nullable().default(null),
   checks: external_exports.array(CICheckSchema),
   reviewers: external_exports.array(PRReviewerSchema),
   comments: external_exports.array(PRCommentSchema)
@@ -25027,6 +25031,26 @@ var PRActionSchema = external_exports.discriminatedUnion("action", [
     action: external_exports.literal("add_reviewers"),
     prNumber: external_exports.number(),
     reviewers: external_exports.array(external_exports.string())
+  }),
+  external_exports.object({
+    action: external_exports.literal("add_labels"),
+    prNumber: external_exports.number(),
+    labels: external_exports.array(external_exports.string())
+  }),
+  external_exports.object({
+    action: external_exports.literal("remove_labels"),
+    prNumber: external_exports.number(),
+    labels: external_exports.array(external_exports.string())
+  }),
+  external_exports.object({
+    action: external_exports.literal("add_assignees"),
+    prNumber: external_exports.number(),
+    assignees: external_exports.array(external_exports.string())
+  }),
+  external_exports.object({
+    action: external_exports.literal("remove_assignees"),
+    prNumber: external_exports.number(),
+    assignees: external_exports.array(external_exports.string())
   })
 ]);
 var WORKFLOW_RUN_STATUSES = [
@@ -28184,7 +28208,7 @@ async function detectModels() {
 }
 
 // src/shared/capabilities/git-pr.ts
-var GH_PR_JSON_FIELDS = "number,title,state,author,url,baseRefName,headRefName,headRefOid,body,isDraft,additions,deletions,changedFiles,createdAt,updatedAt,mergedAt,mergeCommit,mergeStateStatus,autoMergeRequest,statusCheckRollup,reviews,reviewRequests,comments";
+var GH_PR_JSON_FIELDS = "number,title,state,author,url,baseRefName,headRefName,headRefOid,body,isDraft,additions,deletions,changedFiles,createdAt,updatedAt,mergedAt,mergeCommit,mergeStateStatus,autoMergeRequest,statusCheckRollup,reviews,reviewRequests,comments,labels,assignees,reviewDecision,mergeable";
 var GH_STATE_MAP = {
   OPEN: "open",
   CLOSED: "closed",
@@ -28367,7 +28391,34 @@ function mapGhPRToPRData(raw) {
   const comments = extractArrayOrNodes(raw.comments).map(
     (c) => mapGhComment(toRecord2(c))
   );
-  return { ...extractScalarFields(raw), state, isDraft: isDraft2, checks, reviewers, comments };
+  const labels = extractArrayOrNodes(raw.labels).map((l) => {
+    const rec = toRecord2(l);
+    return {
+      name: typeof rec.name === "string" ? rec.name : "",
+      color: typeof rec.color === "string" && rec.color !== "" ? `#${rec.color}` : ""
+    };
+  });
+  const assignees = extractArrayOrNodes(raw.assignees).map((a) => {
+    const rec = toRecord2(a);
+    return {
+      login: extractLogin(rec),
+      avatarUrl: extractStringField(rec, "avatarUrl")
+    };
+  });
+  const reviewDecision = typeof raw.reviewDecision === "string" ? raw.reviewDecision : null;
+  const mergeable = typeof raw.mergeable === "string" ? raw.mergeable : null;
+  return {
+    ...extractScalarFields(raw),
+    state,
+    isDraft: isDraft2,
+    checks,
+    reviewers,
+    comments,
+    labels,
+    assignees,
+    reviewDecision,
+    mergeable
+  };
 }
 async function getPRForCurrentBranch(cwd) {
   try {
@@ -28497,6 +28548,38 @@ async function addReviewers(cwd, prNumber, reviewers) {
     15e3
   );
 }
+async function addLabels(cwd, prNumber, labels) {
+  await runWithTimeout(
+    "gh",
+    ["pr", "edit", String(prNumber), "--add-label", labels.join(",")],
+    cwd,
+    15e3
+  );
+}
+async function removeLabels(cwd, prNumber, labels) {
+  await runWithTimeout(
+    "gh",
+    ["pr", "edit", String(prNumber), "--remove-label", labels.join(",")],
+    cwd,
+    15e3
+  );
+}
+async function addAssignees(cwd, prNumber, assignees) {
+  await runWithTimeout(
+    "gh",
+    ["pr", "edit", String(prNumber), "--add-assignee", assignees.join(",")],
+    cwd,
+    15e3
+  );
+}
+async function removeAssignees(cwd, prNumber, assignees) {
+  await runWithTimeout(
+    "gh",
+    ["pr", "edit", String(prNumber), "--remove-assignee", assignees.join(",")],
+    cwd,
+    15e3
+  );
+}
 async function markPRReady(cwd, prNumber) {
   await runWithTimeout("gh", ["pr", "ready", String(prNumber)], cwd, 15e3);
 }
@@ -29505,7 +29588,7 @@ function nanoid(size2 = 21) {
 }
 
 // src/services/bootstrap/signaling.ts
-var DAEMON_NPM_VERSION = true ? "3.1.0" : "unknown";
+var DAEMON_NPM_VERSION = true ? "3.1.1" : "unknown";
 function createDaemonSignaling(config2) {
   const agentId = config2.agentId ?? nanoid();
   function send(msg) {
@@ -29752,11 +29835,17 @@ function handleBrowserPreviewChannel(port, send, sendBinary, log, options) {
       mergeCookies(cookieJar, setCookieRaw);
     }
     const responseHeaders = collectResponseHeaders2(res.headers);
-    const isHtml = (res.headers["content-type"] ?? "").includes("text/html");
+    const contentType = res.headers["content-type"] ?? "";
+    const isHtml = contentType.includes("text/html");
+    const isRewritableScript = contentType.includes("javascript") || contentType.includes("text/jsx") || contentType.includes("text/tsx") || contentType.includes("text/typescript");
     if (isHtml) {
       bufferAndInjectHtml(requestId, res, responseHeaders);
       return;
     }
+    if (isRewritableScript) {
+      bufferAndRewriteJs(requestId, res, responseHeaders);
+      return;
+    }
     const contentLength = res.headers["content-length"];
     const bodyLength = contentLength !== void 0 ? Number(contentLength) : -1;
     respond({
@@ -29802,6 +29891,29 @@ function handleBrowserPreviewChannel(port, send, sendBinary, log, options) {
       activeRequests.delete(requestId);
     });
   }
+  function bufferAndRewriteJs(requestId, res, headers) {
+    const chunks = [];
+    res.on("data", (chunk) => chunks.push(chunk));
+    res.on("end", () => {
+      const rawJs = Buffer.concat(chunks).toString("utf-8");
+      const rewritten = rewriteJsImportPaths(rawJs);
+      const body = new TextEncoder().encode(rewritten);
+      headers["content-length"] = String(body.byteLength);
+      respond({
+        type: "response-head",
+        id: requestId,
+        status: res.statusCode ?? 500,
+        headers,
+        bodyLength: body.byteLength
+      });
+      sendChunkedBody(requestId, body);
+      activeRequests.delete(requestId);
+    });
+    res.on("error", (err) => {
+      respondError(requestId, err.message);
+      activeRequests.delete(requestId);
+    });
+  }
   function buildRequestHeaders(msgHeaders) {
     const headers = { host: `localhost:${port}` };
     for (const [k2, v2] of Object.entries(msgHeaders)) {
@@ -29907,6 +30019,9 @@ function injectBaseHref(html, origin) {
 function rewriteRootRelativePaths(html) {
   return html.replace(/((?:src|href|action)\s*=\s*["'])\/(?!\/)/gi, "$1./");
 }
+function rewriteJsImportPaths(js) {
+  return js.replace(/((?:from|import)\s*\(\s*["'])\/(?!\/)/g, "$1./").replace(/(from\s+["'])\/(?!\/)/g, "$1./");
+}
 function handleBrowserPreviewUrlChannel(send, sendBinary, log, options) {
   const requestTimeoutMs = options?.timeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS;
   const activeControllers = /* @__PURE__ */ new Map();
@@ -29989,10 +30104,19 @@ function handleBrowserPreviewUrlChannel(send, sendBinary, log, options) {
     });
     const responseHeaders = collectSafeResponseHeaders(res);
     const rawBody = new Uint8Array(await res.arrayBuffer());
-    const isHtml = (res.headers.get("content-type") ?? "").includes("text/html");
-    const body = isHtml ? new TextEncoder().encode(
-      injectBaseHref(new TextDecoder().decode(rawBody), targetUrl.origin)
-    ) : rawBody;
+    const contentType = res.headers.get("content-type") ?? "";
+    const isHtml = contentType.includes("text/html");
+    const isJs = contentType.includes("javascript") || contentType.includes("text/jsx") || contentType.includes("text/tsx") || contentType.includes("text/typescript");
+    let body;
+    if (isHtml) {
+      body = new TextEncoder().encode(
+        injectBaseHref(new TextDecoder().decode(rawBody), targetUrl.origin)
+      );
+    } else if (isJs) {
+      body = new TextEncoder().encode(rewriteJsImportPaths(new TextDecoder().decode(rawBody)));
+    } else {
+      body = rawBody;
+    }
     sendResponseWithBody(msg.id, res.status, responseHeaders, body);
   }
   async function handleUrlRequest(msg) {
@@ -32177,8 +32301,7 @@ async function sweepStaleTasks(taskStateStore, taskManager, log) {
   const noBroadcast = { broadcast: false };
   for (const action of actions) {
     if (action.kind === "mark_input_required") {
-      await taskStateStore.updateTaskStatus(action.taskId, "input_required", noBroadcast);
-      await taskStateStore.acknowledge(action.taskId, noBroadcast);
+      await taskStateStore.sweepToInputRequired(action.taskId, noBroadcast);
       log({
         event: "stale_task_swept",
         taskId: action.taskId,
@@ -80249,9 +80372,9 @@ var StructuredTaskTracker = class {
   /**
    * Apply an overlay on top of CC tasks. Stores the overlay and re-flushes.
    */
-  applyOverlay(overlay) {
+  applyOverlay(overlay, options) {
     this.#currentOverlay = overlay;
-    this.#flushStructuredTasks();
+    this.#flushStructuredTasks(options);
   }
   processStructuredTaskEvents(content) {
     const events = extractStructuredTaskEvents(content);
@@ -80376,11 +80499,11 @@ var StructuredTaskTracker = class {
     applyDepEdgeAdditions(merged, overlay.depEdges);
     return merged;
   }
-  #flushStructuredTasks() {
+  #flushStructuredTasks(options) {
     const overlay = this.#currentOverlay ?? DEFAULT_TASK_OVERLAY;
     const merged = this.#applyOverlayToMap(this.#structuredTasks, overlay);
     const todoProgress = this.#computeTodoProgress(merged);
-    this.#deps.updateStructuredTasks(Object.fromEntries(merged), todoProgress);
+    this.#deps.updateStructuredTasks(Object.fromEntries(merged), todoProgress, options);
     if (!this.#suppressWriteThrough) {
       this.#ccTaskFileWriter?.writeMergedTasks(merged);
     }
@@ -82400,8 +82523,8 @@ Use this context to maintain continuity. You have already done this work \u2014
       }
     }
   }
-  applyOverlay(overlay) {
-    this.#structuredTaskTracker.applyOverlay(overlay);
+  applyOverlay(overlay, options) {
+    this.#structuredTaskTracker.applyOverlay(overlay, options);
   }
   /** ---------------------------------------------------------------- */
   /** Resource resolution                                              */
@@ -83078,7 +83201,8 @@ var TaskManager = class {
     this.#tasks.set(taskId, { taskId, channelId, cwd, mode, orchestrator });
     this.#flushPendingStreamSubs(taskId, orchestrator);
     this.#deps.taskStateStore.getTask(taskId).then((record) => {
-      if (record?.taskOverlay) orchestrator.applyOverlay(record.taskOverlay);
+      if (record?.taskOverlay)
+        orchestrator.applyOverlay(record.taskOverlay, { preserveUpdatedAt: true });
     }).catch((err) => {
       this.#deps.log({
         event: "overlay_restore_failed",
@@ -83443,8 +83567,13 @@ var TaskManager = class {
           });
         });
       },
-      updateStructuredTasks: (tasks, todoProgress) => {
-        this.#deps.taskStateStore.updateStructuredTasks(taskId, tasks, todoProgress).catch((err) => {
+      updateStructuredTasks: (tasks, todoProgress, options) => {
+        this.#deps.taskStateStore.updateStructuredTasks(
+          taskId,
+          tasks,
+          todoProgress,
+          options ? { preserveUpdatedAt: options.preserveUpdatedAt } : void 0
+        ).catch((err) => {
           this.#deps.log({
             event: "task_state_store_structured_tasks_failed",
             taskId,
@@ -83591,52 +83720,29 @@ function buildTaskStateStore(dataDir) {
       });
     },
     async updateTaskStatus(taskId, status, options) {
-      const task = await store.get(taskId);
-      if (!task) return;
-      pushBroadcast(options);
-      await store.set(taskId, applyStatusTransition(task, status, Date.now()));
+      await safeUpdate(taskId, (task) => applyStatusTransition(task, status, Date.now()), options);
     },
     async updateTitle(taskId, title, options) {
-      const task = await store.get(taskId);
-      if (!task) return;
-      pushBroadcast(options);
-      await store.set(taskId, {
-        ...task,
-        title,
-        updatedAt: Date.now()
-      });
+      await safeUpdate(taskId, (task) => ({ ...task, title, updatedAt: Date.now() }), options);
     },
     async updateCwd(taskId, cwd, options) {
-      const task = await store.get(taskId);
-      if (!task) return;
-      pushBroadcast(options);
-      await store.set(taskId, {
-        ...task,
-        cwd,
-        updatedAt: Date.now()
-      });
+      await safeUpdate(taskId, (task) => ({ ...task, cwd, updatedAt: Date.now() }), options);
     },
     async updateMode(taskId, mode, options) {
-      const task = await store.get(taskId);
-      if (!task) return;
-      pushBroadcast(options);
-      await store.set(taskId, {
-        ...task,
-        mode,
-        updatedAt: Date.now()
-      });
+      await safeUpdate(taskId, (task) => ({ ...task, mode, updatedAt: Date.now() }), options);
     },
     async updateTodoProgress(taskId, progress, options) {
-      const task = await store.get(taskId);
-      if (!task) return;
-      pushBroadcast(options);
-      await store.set(taskId, {
-        ...task,
-        todoCompleted: progress.todoCompleted,
-        todoTotal: progress.todoTotal,
-        currentActivity: progress.currentActivity,
-        updatedAt: Date.now()
-      });
+      await safeUpdate(
+        taskId,
+        (task) => ({
+          ...task,
+          todoCompleted: progress.todoCompleted,
+          todoTotal: progress.todoTotal,
+          currentActivity: progress.currentActivity,
+          updatedAt: Date.now()
+        }),
+        options
+      );
     },
     async acknowledge(taskId, options) {
       await safeUpdate(taskId, (task) => ({ ...task, acknowledgedAt: Date.now() }), options);
@@ -83645,39 +83751,42 @@ function buildTaskStateStore(dataDir) {
       await safeUpdate(taskId, (task) => ({ ...task, pinned: !task.pinned }), options);
     },
     async updateStructuredTasks(taskId, tasks, todoProgress, options) {
-      const task = await store.get(taskId);
-      if (!task) return;
-      pushBroadcast(options);
-      await store.set(taskId, {
-        ...task,
-        structuredTasks: tasks,
-        ...todoProgress && {
-          todoCompleted: todoProgress.todoCompleted,
-          todoTotal: todoProgress.todoTotal,
-          currentActivity: todoProgress.currentActivity
-        },
-        updatedAt: Date.now()
-      });
+      await safeUpdate(
+        taskId,
+        (task) => ({
+          ...task,
+          structuredTasks: tasks,
+          ...todoProgress && {
+            todoCompleted: todoProgress.todoCompleted,
+            todoTotal: todoProgress.todoTotal,
+            currentActivity: todoProgress.currentActivity
+          },
+          updatedAt: options?.preserveUpdatedAt ? task.updatedAt : Date.now()
+        }),
+        options
+      );
     },
     async updateTaskOverlay(taskId, overlay, options) {
-      const task = await store.get(taskId);
-      if (!task) return;
-      pushBroadcast(options);
-      await store.set(taskId, {
-        ...task,
-        taskOverlay: overlay,
-        updatedAt: Date.now()
-      });
+      await safeUpdate(
+        taskId,
+        (task) => ({
+          ...task,
+          taskOverlay: overlay,
+          updatedAt: options?.preserveUpdatedAt ? task.updatedAt : Date.now()
+        }),
+        options
+      );
     },
     async updateComposerSettings(taskId, settings, options) {
-      const task = await store.get(taskId);
-      if (!task) return;
-      pushBroadcast(options);
-      await store.set(taskId, {
-        ...task,
-        composerSettings: { ...task.composerSettings, ...settings },
-        updatedAt: Date.now()
-      });
+      await safeUpdate(
+        taskId,
+        (task) => ({
+          ...task,
+          composerSettings: { ...task.composerSettings, ...settings },
+          updatedAt: Date.now()
+        }),
+        options
+      );
     },
     async updateCostStats(taskId, stats, options) {
       await safeUpdate(
@@ -83703,12 +83812,27 @@ function buildTaskStateStore(dataDir) {
         options
       );
     },
+    async sweepToInputRequired(taskId, options) {
+      await safeUpdate(
+        taskId,
+        (task) => ({
+          ...task,
+          status: "input_required",
+          taskStartedAt: null
+        }),
+        options
+      );
+    },
     async getTask(taskId) {
       return store.get(taskId);
     },
     async listTasks() {
       return store.list();
     },
+    async listTasksWithVersion() {
+      const tasks = await store.list();
+      return { tasks, version: _version };
+    },
     subscribe(listener) {
       taskListeners.add(listener);
       return () => {
@@ -86843,6 +86967,18 @@ function wireControlChannel(rawChannel, daemon, logAdapter, deps) {
             case "add_reviewers":
               await addReviewers(cwd, action.prNumber, action.reviewers);
               break;
+            case "add_labels":
+              await addLabels(cwd, action.prNumber, action.labels);
+              break;
+            case "remove_labels":
+              await removeLabels(cwd, action.prNumber, action.labels);
+              break;
+            case "add_assignees":
+              await addAssignees(cwd, action.prNumber, action.assignees);
+              break;
+            case "remove_assignees":
+              await removeAssignees(cwd, action.prNumber, action.assignees);
+              break;
             case "reply_to_comment":
             case "resolve_thread":
               throw new Error(`${action.action} not yet implemented`);
@@ -87192,12 +87328,11 @@ function wireControlChannel(rawChannel, daemon, logAdapter, deps) {
         });
       },
       onRequestTaskIndex: () => {
-        const snapshotVersion = daemon.taskStateStore.version;
-        daemon.taskStateStore.listTasks().then((tasks) => {
+        daemon.taskStateStore.listTasksWithVersion().then(({ tasks, version }) => {
           controlHandler.sendControl({
             type: "task_index_snapshot",
             tasks,
-            version: snapshotVersion
+            version
           });
         }).catch((err) => {
           logAdapter({
@@ -87411,19 +87546,6 @@ function wireControlChannel(rawChannel, daemon, logAdapter, deps) {
     }
   };
   pushMcpStatus(5);
-  const initialSnapshotVersion = daemon.taskStateStore.version;
-  daemon.taskStateStore.listTasks().then((tasks) => {
-    controlHandler.sendControl({
-      type: "task_index_snapshot",
-      tasks,
-      version: initialSnapshotVersion
-    });
-  }).catch((err) => {
-    logAdapter({
-      event: "task_index_initial_push_failed",
-      error: err instanceof Error ? err.message : String(err)
-    });
-  });
   daemon.userSettingsStore.getSettings().then((settings) => {
     controlHandler.sendControl({ type: "user_settings_snapshot", settings });
   }).catch((err) => {
@@ -91560,4 +91682,4 @@ export {
   classifyLogLevel,
   serve
 };
-//# sourceMappingURL=serve-5Z6GSYVH.js.map
+//# sourceMappingURL=serve-2F6SKPPO.js.map