@schoolai/shipyard-mcp 0.1.0-next.435 → 0.1.0-next.436

package/apps/hook/dist/index.js

@@ -2394,10 +2394,20 @@ var registryConfig = loadEnv(schema2);
 
 // src/trpc-client.ts
 import { createTRPCClient, httpBatchLink } from "@trpc/client";
+import { Agent } from "undici";
 var cachedClient = null;
 var cachedBaseUrl = null;
+function createLongPollingAgent(timeoutMs) {
+  return new Agent({
+    headersTimeout: timeoutMs,
+    bodyTimeout: timeoutMs,
+    keepAliveTimeout: timeoutMs,
+    keepAliveMaxTimeout: timeoutMs
+  });
+}
 function getTRPCClient(baseUrl, timeoutMs = DEFAULT_TRPC_TIMEOUT_MS) {
   if (timeoutMs !== DEFAULT_TRPC_TIMEOUT_MS) {
+    const agent = createLongPollingAgent(timeoutMs);
     return createTRPCClient({
       links: [
         httpBatchLink({
@@ -2405,7 +2415,8 @@ function getTRPCClient(baseUrl, timeoutMs = DEFAULT_TRPC_TIMEOUT_MS) {
           fetch: (url, options) => {
             return fetch(url, {
               ...options,
-              signal: AbortSignal.timeout(timeoutMs)
+              signal: AbortSignal.timeout(timeoutMs),
+              dispatcher: agent
             });
           }
         })

package/apps/server/dist/index.js

@@ -899,15 +899,17 @@ async function waitForApprovalHandler(planId, _reviewRequestIdParam, ctx) {
     throw err;
   }
   const metadata = ydoc.getMap(YDOC_KEYS.METADATA);
-  const reviewRequestId = nanoid2();
   const planMetadata = getPlanMetadata(ydoc);
   const ownerId = planMetadata?.ownerId ?? "unknown";
-  if (planMetadata?.status === "pending_review") {
-    ctx.logger.warn(
-      { planId, currentStatus: planMetadata.status },
-      "Status already pending_review, another hook may be waiting. Skipping reviewRequestId update."
+  let reviewRequestId;
+  if (planMetadata?.status === "pending_review" && planMetadata.reviewRequestId) {
+    reviewRequestId = planMetadata.reviewRequestId;
+    ctx.logger.info(
+      { planId, currentStatus: planMetadata.status, reviewRequestId },
+      "Status already pending_review, reusing existing reviewRequestId for observer"
     );
   } else {
+    reviewRequestId = nanoid2();
     const result = transitionPlanStatus(
       ydoc,
       {
@@ -1174,11 +1176,15 @@ function extractFeedbackFromYDoc(ydoc, ctx) {
       return "Changes requested. Check the plan for reviewer comments.";
     }
     const contentFragment = ydoc.getXmlFragment(YDOC_KEYS.DOCUMENT_FRAGMENT);
-    const blocks = contentFragment.toJSON();
-    const planText = blocks.map((block) => {
-      if (!block.content || !Array.isArray(block.content)) return "";
-      return block.content.map((item) => typeof item === "object" && item && "text" in item ? item.text : "").join("");
-    }).filter(Boolean).join("\n");
+    const fragmentJson = contentFragment.toJSON();
+    let planText = "";
+    if (Array.isArray(fragmentJson)) {
+      const blocks = fragmentJson;
+      planText = blocks.map((block) => {
+        if (!block.content || !Array.isArray(block.content)) return "";
+        return block.content.map((item) => typeof item === "object" && item && "text" in item ? item.text : "").join("");
+      }).filter(Boolean).join("\n");
+    }
     const resolveUser = createUserResolver(ydoc);
     const feedbackText = formatThreadsForLLM(threads, {
       includeResolved: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schoolai/shipyard-mcp",
-  "version": "0.1.0-next.435",
+  "version": "0.1.0-next.436",
   "description": "Shipyard MCP server and CLI tools for distributed planning with CRDTs",
   "type": "module",
   "bin": {