@schoolai/shipyard 0.7.0-rc.20260221 → 0.8.0-rc.20260221

package/dist/index.js

@@ -11337,7 +11337,8 @@ var TaskDocumentSchema = Shape.doc({
   plans: Shape.list(PlanVersionShape),
   planEditorDocs: Shape.record(Shape.any()),
   diffComments: Shape.record(DiffCommentShape),
-  planComments: Shape.record(PlanCommentShape)
+  planComments: Shape.record(PlanCommentShape),
+  deliveredCommentIds: Shape.list(Shape.plain.string())
 });
 var TERMINAL_TASK_STATES = ["completed", "failed", "canceled"];
 var TOOL_RISK_LEVELS = ["low", "medium", "high"];
@@ -11394,7 +11395,10 @@ var WorktreeScriptShape = Shape.plain.struct({
   script: Shape.plain.string()
 });
 var UserSettingsShape = Shape.struct({
-  worktreeScripts: Shape.record(WorktreeScriptShape)
+  worktreeScripts: Shape.record(WorktreeScriptShape),
+  composerModel: Shape.plain.string().nullable(),
+  composerReasoning: Shape.plain.string(...REASONING_EFFORTS).nullable(),
+  composerPermission: Shape.plain.string(...PERMISSION_MODES).nullable()
 });
 var TaskIndexDocumentSchema = Shape.doc({
   taskIndex: Shape.record(TaskIndexEntryShape),
@@ -12761,13 +12765,17 @@ function recoverOrphanedTask(taskDoc, log) {
 
 // src/peer-manager.ts
 var ICE_SERVERS = [{ urls: "stun:stun.l.google.com:19302" }];
+var MAX_MESSAGE_SIZE = 16 * 1024 * 1024;
 function machineIdToPeerId(machineId) {
   return machineId;
 }
 async function loadDefaultFactory() {
   const { RTCPeerConnection } = await import("node-datachannel/polyfill");
   return () => {
-    const pc = new RTCPeerConnection({ iceServers: ICE_SERVERS });
+    const pc = new RTCPeerConnection({
+      iceServers: ICE_SERVERS,
+      maxMessageSize: MAX_MESSAGE_SIZE
+    });
     return pc;
   };
 }
@@ -12911,6 +12919,40 @@ function createPeerManager(config2) {
   };
 }
 
+// src/plan-editor/format-diff-feedback.ts
+function formatDiffFeedbackForClaudeCode(comments, generalFeedback) {
+  const sections = [];
+  if (generalFeedback) {
+    sections.push("## General Feedback\n");
+    sections.push(generalFeedback);
+    sections.push("");
+  }
+  if (comments.length > 0) {
+    appendCommentSection(sections, comments);
+  }
+  return sections.join("\n").trim();
+}
+function appendCommentSection(sections, comments) {
+  sections.push("## Inline Comments on Code Changes\n");
+  sections.push("The user left the following comments on the diff:\n");
+  const byFile = /* @__PURE__ */ new Map();
+  for (const c of comments) {
+    const existing = byFile.get(c.filePath) ?? [];
+    existing.push(c);
+    byFile.set(c.filePath, existing);
+  }
+  for (const [filePath, fileComments] of byFile) {
+    sections.push(`### ${filePath}
+`);
+    const sorted = [...fileComments].sort((a, b) => a.lineNumber - b.lineNumber);
+    for (const comment2 of sorted) {
+      const sideLabel = comment2.side === "old" ? "before change" : "after change";
+      sections.push(`> Line ${comment2.lineNumber} (${sideLabel}): ${comment2.body}`);
+    }
+    sections.push("");
+  }
+}
+
 // src/plan-editor/format-plan-feedback.ts
 function formatPlanFeedbackForClaudeCode(original, edited, comments, generalFeedback) {
   const sections = [];
@@ -12920,7 +12962,7 @@ function formatPlanFeedbackForClaudeCode(original, edited, comments, generalFeed
     sections.push("");
   }
   if (comments.length > 0) {
-    appendCommentSection(sections, comments, edited);
+    appendCommentSection2(sections, comments, edited);
   }
   if (original !== edited) {
     sections.push("## Edits Made\n");
@@ -12932,7 +12974,7 @@ function formatPlanFeedbackForClaudeCode(original, edited, comments, generalFeed
   }
   return sections.join("\n").trim();
 }
-function appendCommentSection(sections, comments, edited) {
+function appendCommentSection2(sections, comments, edited) {
   sections.push("## Inline Comments\n");
   sections.push("The user left the following comments on specific parts of the plan:\n");
   const editedLines = edited.split("\n");
@@ -41781,6 +41823,9 @@ var SessionManager = class {
     await this.#activeQuery?.setModel(model);
     this.#currentModel = model;
   }
+  async setPermissionMode(mode) {
+    await this.#activeQuery?.setPermissionMode(mode);
+  }
   /**
    * Resume an existing Claude Code session using streaming input mode.
    * Looks up the agentSessionId from the task doc and passes it as `resume`.
@@ -43719,10 +43764,6 @@ function promotePendingFollowUps(taskHandle, activeTask, taskLog) {
     taskLog.debug("Task is being aborted, skipping pending follow-up promotion");
     return;
   }
-  if (!activeTask.sessionManager.isStreaming) {
-    taskLog.debug("Task not streaming, skipping pending follow-up promotion");
-    return;
-  }
   const json = taskHandle.doc.toJSON();
   const pending = json.pendingFollowUps ?? [];
   if (pending.length === 0) return;
@@ -43735,17 +43776,32 @@ function promotePendingFollowUps(taskHandle, activeTask, taskLog) {
       draft.pendingFollowUps.delete(0, draft.pendingFollowUps.length);
     }
   });
+  taskLog.info({ pendingCount: pending.length }, "Promoted pending follow-ups to conversation");
+  if (!activeTask.sessionManager.isStreaming) {
+    taskLog.debug("Task not streaming, skipping follow-up dispatch");
+    return;
+  }
   const allContentBlocks = pending.flatMap(
     (msg) => msg.content.filter((block2) => block2.type === "text" || block2.type === "image")
   );
-  if (allContentBlocks.length > 0) {
+  if (allContentBlocks.length === 0) return;
+  const dispatchFollowUp = () => {
     try {
-      taskLog.info({ pendingCount: pending.length }, "Promoted pending follow-ups to conversation");
       activeTask.lastDispatchedConvLen = json.conversation.length + pending.length;
       activeTask.sessionManager.sendFollowUp(allContentBlocks);
     } catch (err) {
       taskLog.warn({ err }, "Failed to send promoted follow-up");
     }
+  };
+  const lastPending = pending[pending.length - 1];
+  const mappedMode = lastPending?.permissionMode ? mapPermissionMode(lastPending.permissionMode) : void 0;
+  if (mappedMode) {
+    activeTask.sessionManager.setPermissionMode(mappedMode).then(dispatchFollowUp).catch((err) => {
+      taskLog.warn({ err }, "Failed to update permission mode from queued message");
+      dispatchFollowUp();
+    });
+  } else {
+    dispatchFollowUp();
   }
 }
 function onTaskDocChanged(taskId, taskHandle, taskLog, ctx) {
@@ -43974,6 +44030,19 @@ function resolveExitPlanMode(taskHandle, taskLog, toolUseID, value) {
     "Updated plan reviewStatus in CRDT with rich feedback"
   );
 }
+function resolveAskUserQuestion(taskLog, toolUseID, input, value) {
+  if (value.decision !== "approved" || !value.message) return input;
+  try {
+    const parsed = JSON.parse(value.message);
+    if ("answers" in parsed && parsed.answers && typeof parsed.answers === "object" && !Array.isArray(parsed.answers)) {
+      taskLog.info({ toolUseID }, "Merged AskUserQuestion answers into input");
+      return { ...input, answers: parsed.answers };
+    }
+  } catch {
+    taskLog.warn({ toolUseID }, "Failed to parse AskUserQuestion answers from message");
+  }
+  return input;
+}
 function resolvePermissionResponse(ctx) {
   const { taskHandle, roomDoc, taskId, taskLog, toolName, toolUseID, input, suggestions, value } = ctx;
   taskHandle.permReqs.delete(toolUseID);
@@ -43986,6 +44055,10 @@ function resolvePermissionResponse(ctx) {
   if (toolName === "ExitPlanMode") {
     resolveExitPlanMode(taskHandle, taskLog, toolUseID, value);
   }
+  let resolvedInput = input;
+  if (toolName === "AskUserQuestion") {
+    resolvedInput = resolveAskUserQuestion(taskLog, toolUseID, input, value);
+  }
   taskLog.info(
     {
       toolName,
@@ -43997,7 +44070,8 @@ function resolvePermissionResponse(ctx) {
     "Permission response received"
   );
   const decision = value.decision === "approved" ? "approved" : "denied";
-  return toPermissionResult(decision, input, suggestions, value.message);
+  const resultMessage = toolName === "AskUserQuestion" && decision === "approved" ? null : value.message;
+  return toPermissionResult(decision, resolvedInput, suggestions, resultMessage);
 }
 function buildCanUseTool(taskHandle, taskLog, roomDoc, taskId) {
   return async (toolName, input, options) => {
@@ -44078,6 +44152,76 @@ function buildCanUseTool(taskHandle, taskLog, roomDoc, taskId) {
     });
   };
 }
+function collectPlanFeedback(unresolvedPlan, plans, loroDoc) {
+  const parts = [];
+  const byPlanId = /* @__PURE__ */ new Map();
+  for (const c of unresolvedPlan) {
+    const existing = byPlanId.get(c.planId) ?? [];
+    existing.push(c);
+    byPlanId.set(c.planId, existing);
+  }
+  for (const [planId, comments] of byPlanId) {
+    const plan = plans.find((p) => p.planId === planId);
+    const originalMarkdown = plan?.markdown ?? "";
+    const editedMarkdown = serializePlanEditorDoc(loroDoc, planId) || originalMarkdown;
+    const feedback = formatPlanFeedbackForClaudeCode(
+      originalMarkdown,
+      editedMarkdown,
+      comments,
+      null
+    );
+    if (feedback) {
+      parts.push(feedback);
+    }
+  }
+  return parts;
+}
+function harvestUndeliveredComments(taskHandle, contentBlocks, log) {
+  const json = taskHandle.doc.toJSON();
+  const deliveredSet = new Set(json.deliveredCommentIds ?? []);
+  const unresolvedDiff = Object.values(json.diffComments).filter(
+    (c) => c.resolvedAt === null && !deliveredSet.has(c.commentId)
+  );
+  const unresolvedPlan = Object.values(json.planComments).filter(
+    (c) => c.resolvedAt === null && !deliveredSet.has(c.commentId)
+  );
+  if (unresolvedDiff.length === 0 && unresolvedPlan.length === 0) {
+    return;
+  }
+  const feedbackParts = [];
+  if (unresolvedDiff.length > 0) {
+    const diffFeedback = formatDiffFeedbackForClaudeCode(unresolvedDiff, null);
+    if (diffFeedback) {
+      feedbackParts.push(diffFeedback);
+    }
+  }
+  if (unresolvedPlan.length > 0) {
+    feedbackParts.push(...collectPlanFeedback(unresolvedPlan, json.plans, taskHandle.loroDoc));
+  }
+  if (feedbackParts.length === 0) {
+    return;
+  }
+  const feedbackText = `
+
+---
+**User feedback on your changes (comments from code review):**
+
+${feedbackParts.join("\n\n")}`;
+  contentBlocks.push({ type: "text", text: feedbackText });
+  const harvestedIds = [
+    ...unresolvedDiff.map((c) => c.commentId),
+    ...unresolvedPlan.map((c) => c.commentId)
+  ];
+  change(taskHandle.doc, (draft) => {
+    for (const id of harvestedIds) {
+      draft.deliveredCommentIds.push(id);
+    }
+  });
+  log.info(
+    { diffCommentCount: unresolvedDiff.length, planCommentCount: unresolvedPlan.length },
+    "Harvested undelivered comments as safety net"
+  );
+}
 async function runTask(opts) {
   const {
     sessionManager: manager,
@@ -44096,13 +44240,14 @@ async function runTask(opts) {
   if (!contentBlocks || contentBlocks.length === 0) {
     throw new Error(`No user message found in task ${taskId}`);
   }
+  harvestUndeliveredComments(taskHandle, contentBlocks, log);
   const textPreview = contentBlocks.filter((b) => b.type === "text").map((b) => b.text).join(" ").slice(0, 100);
   const imageCount = contentBlocks.filter((b) => b.type === "image").length;
   log.info(
     { prompt: textPreview || "(images only)", imageCount },
     "Running task with prompt from CRDT"
   );
-  const canUseTool = permissionMode === "bypassPermissions" ? void 0 : buildCanUseTool(taskHandle, log, roomDoc, taskId);
+  const canUseTool = buildCanUseTool(taskHandle, log, roomDoc, taskId);
   const stderr = (data) => {
     const trimmed = data.trim();
     if (!trimmed) return;
@@ -44123,7 +44268,7 @@ async function runTask(opts) {
       effort,
       canUseTool,
       stderr,
-      allowDangerouslySkipPermissions: permissionMode === "bypassPermissions" ? true : void 0
+      allowDangerouslySkipPermissions: true
     });
   }
   return manager.createSession({
@@ -44136,7 +44281,7 @@ async function runTask(opts) {
     abortController,
     canUseTool,
     stderr,
-    allowDangerouslySkipPermissions: permissionMode === "bypassPermissions" ? true : void 0
+    allowDangerouslySkipPermissions: true
   });
 }