@schoolai/shipyard-mcp 0.1.3-next.464 → 0.1.3-next.467

package/apps/hook/dist/index.js

@@ -28494,7 +28494,7 @@ init_cjs_shims();
 // ../../packages/schema/dist/index.mjs
 init_cjs_shims();
 
-// ../../packages/schema/dist/yjs-helpers-CFQmkNYl.mjs
+// ../../packages/schema/dist/yjs-helpers-BBG4tC2R.mjs
 init_cjs_shims();
 
 // ../../packages/schema/dist/plan.mjs
@@ -42665,7 +42665,7 @@ var PRReviewCommentSchema = external_exports.object({
   resolved: external_exports.boolean().optional()
 });
 
-// ../../packages/schema/dist/yjs-helpers-CFQmkNYl.mjs
+// ../../packages/schema/dist/yjs-helpers-BBG4tC2R.mjs
 function assertNever2(value) {
   throw new Error(`Unhandled discriminated union member: ${JSON.stringify(value)}`);
 }

package/apps/server/dist/{chunk-75NZRAN5.js → chunk-76JWRTPI.js}

@@ -863,7 +863,7 @@ function createHandedOffConversationVersion(params) {
   return ConversationVersionSchema.parse(version);
 }
 
-// ../../packages/schema/dist/yjs-helpers-CFQmkNYl.mjs
+// ../../packages/schema/dist/yjs-helpers-BBG4tC2R.mjs
 import { z as z2 } from "zod";
 import { nanoid as nanoid2 } from "nanoid";
 import * as Y from "yjs";
@@ -1176,6 +1176,30 @@ function applyStatusTransitionFields(map, transition) {
       assertNever(transition);
   }
 }
+function resetPlanToDraft(ydoc, actor) {
+  const metadataResult = getPlanMetadataWithValidation(ydoc);
+  if (!metadataResult.success) return {
+    success: false,
+    error: metadataResult.error
+  };
+  if (metadataResult.data.status === "draft") return {
+    success: false,
+    error: "Plan is already in draft status"
+  };
+  ydoc.transact(() => {
+    const map = ydoc.getMap(YDOC_KEYS.METADATA);
+    map.set("status", "draft");
+    map.delete("reviewRequestId");
+    map.delete("reviewedAt");
+    map.delete("reviewedBy");
+    map.delete("reviewComment");
+    map.delete("completedAt");
+    map.delete("completedBy");
+    map.delete("snapshotUrl");
+    map.set("updatedAt", Date.now());
+  }, actor ? { actor } : void 0);
+  return { success: true };
+}
 function transitionPlanStatus(ydoc, transition, actor) {
   const metadataResult = getPlanMetadataWithValidation(ydoc);
   if (!metadataResult.success) return {
@@ -2816,6 +2840,7 @@ export {
   getPlanMetadata,
   getPlanMetadataWithValidation,
   setPlanMetadata,
+  resetPlanToDraft,
   transitionPlanStatus,
   initPlanMetadata,
   getStepCompletions,

package/apps/server/dist/{chunk-MZTJGBLT.js → chunk-BWP37ADP.js}

@@ -3,7 +3,7 @@ import {
   YDOC_KEYS,
   createInputRequest,
   logPlanEvent
-} from "./chunk-75NZRAN5.js";
+} from "./chunk-76JWRTPI.js";
 import {
   logger
 } from "./chunk-GSGLHRWX.js";

package/apps/server/dist/{dist-HIDISXZO.js → dist-ORKL4P3L.js}

@@ -187,6 +187,7 @@ import {
   removePlanIndexEntry,
   removePlanTag,
   removeViewedByFromIndex,
+  resetPlanToDraft,
   resolvePRReviewComment,
   revokeUser,
   setAgentPresence,
@@ -203,7 +204,7 @@ import {
   updateLinkedPRStatus,
   updatePlanIndexViewedBy,
   validateA2AMessages
-} from "./chunk-75NZRAN5.js";
+} from "./chunk-76JWRTPI.js";
 import "./chunk-JSBRDJBE.js";
 export {
   A2ADataPartSchema,
@@ -394,6 +395,7 @@ export {
   removePlanIndexEntry,
   removePlanTag,
   removeViewedByFromIndex,
+  resetPlanToDraft,
   resolvePRReviewComment,
   revokeUser,
   setAgentPresence,

package/apps/server/dist/index.js

@@ -19,7 +19,7 @@ import {
 } from "./chunk-EBNL5ZX7.js";
 import {
   InputRequestManager
-} from "./chunk-MZTJGBLT.js";
+} from "./chunk-BWP37ADP.js";
 import {
   ArtifactSchema,
   DeliverableSchema,
@@ -63,12 +63,13 @@ import {
   logPlanEvent,
   parseClaudeCodeOrigin,
   parseThreads,
+  resetPlanToDraft,
   setAgentPresence,
   setPlanIndexEntry,
   setPlanMetadata,
   touchPlanIndexEntry,
   transitionPlanStatus
-} from "./chunk-75NZRAN5.js";
+} from "./chunk-76JWRTPI.js";
 import {
   loadEnv,
   logger
@@ -4149,7 +4150,9 @@ USAGE (for non-hook agents):
 1. Call this tool to get monitoring script
 2. Run script in background: bash <script> &
 3. Script polls registry server for status changes
-4. Exits when status becomes 'approved' or 'changes_requested'`,
+4. Exits when status becomes 'in_progress' (approved) or 'changes_requested' (needs work)
+
+REQUIREMENTS: The script requires 'jq' for URL encoding. Install with: brew install jq (macOS) or apt install jq (Linux)`,
     inputSchema: {
       type: "object",
       properties: {
@@ -4167,25 +4170,64 @@ USAGE (for non-hook agents):
     const { planId, pollIntervalSeconds = 30 } = input;
     const registryPort2 = registryConfig.REGISTRY_PORT[0];
     const trpcUrl = `http://localhost:${registryPort2}/trpc`;
-    const script = `# Subscribe to status and comment changes via tRPC
-CLIENT_ID=$(curl -sf -X POST "${trpcUrl}/subscription.create" \\
+    const statusInProgress = PlanStatusValues.find((s) => s === "in_progress");
+    const statusChangesRequested = PlanStatusValues.find((s) => s === "changes_requested");
+    if (!statusInProgress || !statusChangesRequested) {
+      throw new Error("Required status values not found in PlanStatusValues");
+    }
+    const script = `#!/bin/bash
+# Monitor plan "${planId}" for approval status changes
+# Polls the Shipyard registry server and exits when approved/rejected
+
+# Check for required dependency
+if ! command -v jq &> /dev/null; then
+  echo "Error: jq is required but not installed."
+  echo "Install with: brew install jq (macOS) or apt install jq (Linux)"
+  exit 1
+fi
+
+TRPC_URL="${trpcUrl}"
+PLAN_ID="${planId}"
+POLL_INTERVAL=${pollIntervalSeconds}
+
+# Subscribe to status changes via tRPC mutation
+echo "Subscribing to plan changes..."
+RESPONSE=$(curl -sf -X POST "$TRPC_URL/subscription.create" \\
   -H "Content-Type: application/json" \\
-  -d '{"planId":"${planId}","subscribe":["status","comments"],"windowMs":5000,"threshold":1}' \\
-  | grep -o '"clientId":"[^"]*"' | cut -d'"' -f4)
-
-echo "Subscribed. Monitoring plan..."
-
-# Poll for changes via tRPC
-while sleep ${pollIntervalSeconds}; do
-  result=$(curl -sf -X POST "${trpcUrl}/subscription.getChanges" \\
-    -H "Content-Type: application/json" \\
-    -d '{"planId":"${planId}","clientId":"'"$CLIENT_ID"'"}' 2>/dev/null)
-  ready=$(echo "$result" | grep -o '"ready":true')
-  if [ -n "$ready" ]; then
-    changes=$(echo "$result" | grep -o '"changes":"[^"]*"' | cut -d'"' -f4)
-    echo "Changes: $changes"
-    # Exit on status change to approved/changes_requested
-    echo "$changes" | grep -qE "Status:.*(approved|changes_requested)" && exit 0
+  -d '{"planId":"'"$PLAN_ID"'","subscribe":["status","comments"],"windowMs":5000,"threshold":1}')
+
+# Extract clientId from response: {"result":{"data":{"clientId":"..."}}}
+CLIENT_ID=$(echo "$RESPONSE" | sed -n 's/.*"clientId":"\\([^"]*\\)".*/\\1/p')
+
+if [ -z "$CLIENT_ID" ]; then
+  echo "Failed to subscribe. Is the Shipyard registry server running?"
+  echo "Response: $RESPONSE"
+  exit 1
+fi
+
+echo "Subscribed with clientId: $CLIENT_ID"
+echo "Polling every $POLL_INTERVAL seconds..."
+
+# Poll for changes via tRPC query (GET with url-encoded input)
+while true; do
+  sleep $POLL_INTERVAL
+
+  # URL-encode the input JSON for GET request
+  INPUT='{"planId":"'"$PLAN_ID"'","clientId":"'"$CLIENT_ID"'"}'
+  ENCODED_INPUT=$(printf '%s' "$INPUT" | jq -sRr @uri)
+
+  RESULT=$(curl -sf "$TRPC_URL/subscription.getChanges?input=$ENCODED_INPUT" 2>/dev/null)
+
+  # Check if changes are ready: {"result":{"data":{"ready":true,"changes":"..."}}}
+  if echo "$RESULT" | grep -q '"ready":true'; then
+    CHANGES=$(echo "$RESULT" | sed -n 's/.*"changes":"\\([^"]*\\)".*/\\1/p')
+    echo "Changes detected: $CHANGES"
+
+    # Exit on status change to in_progress (approved) or changes_requested (needs work)
+    if echo "$CHANGES" | grep -qE "Status:.*(${statusInProgress}|${statusChangesRequested})"; then
+      echo "Plan status changed. Exiting."
+      exit 0
+    fi
   fi
 done`;
     return {
@@ -4198,10 +4240,13 @@ done`;
 ${script}
 \`\`\`
 
-> Subscribes to status and comment changes with server-side batching.
-> Batching: 5s window or 1 change threshold (whichever comes first).
-> Exits when status becomes approved/changes_requested.
-> Most agent environments support background bash notifications.`
+**Usage:** Save to a file and run in background: \`bash script.sh &\`
+
+The script:
+- Subscribes to status/comment changes via tRPC
+- Polls every ${pollIntervalSeconds} seconds
+- Exits when status becomes in_progress (approved) or changes_requested (needs work)
+- Requires \`jq\` for URL encoding (install: brew install jq)`
         }
       ]
     };
@@ -4495,7 +4540,40 @@ async function applyOperation(blocks, operation, editor) {
 
 // src/tools/update-plan.ts
 import { ServerBlockNoteEditor as ServerBlockNoteEditor7 } from "@blocknote/server-util";
+import { nanoid as nanoid7 } from "nanoid";
 import { z as z11 } from "zod";
+function buildStatusTransition(targetStatus, actorName) {
+  const now = Date.now();
+  switch (targetStatus) {
+    case "pending_review":
+      return {
+        status: "pending_review",
+        reviewRequestId: nanoid7()
+      };
+    case "changes_requested":
+      return {
+        status: "changes_requested",
+        reviewedAt: now,
+        reviewedBy: actorName
+      };
+    case "in_progress":
+      return {
+        status: "in_progress",
+        reviewedAt: now,
+        reviewedBy: actorName
+      };
+    case "completed":
+      return {
+        status: "completed",
+        completedAt: now,
+        completedBy: actorName
+      };
+    case "draft":
+      return null;
+    default:
+      return null;
+  }
+}
 var UpdatePlanInput = z11.object({
   planId: z11.string().describe("The plan ID to update"),
   sessionToken: z11.string().describe("Session token from create_plan"),
@@ -4545,6 +4623,7 @@ STATUSES:
       required: ["planId", "sessionToken"]
     }
   },
+  // biome-ignore lint/complexity/noExcessiveCognitiveComplexity: tool handler orchestrates validation, snapshots, and state transitions
   handler: async (args) => {
     const input = UpdatePlanInput.parse(args);
     const doc = await getOrCreateDoc3(input.planId);
@@ -4572,12 +4651,6 @@ STATUSES:
         isError: true
       };
     }
-    const updates = {
-      updatedAt: Date.now()
-    };
-    if (input.title) updates.title = input.title;
-    if (input.status) updates.status = input.status;
-    if (input.tags !== void 0) updates.tags = input.tags;
     const statusChanged = input.status && input.status !== existingMetadata.status;
     if (statusChanged && input.status) {
       const editor = ServerBlockNoteEditor7.create();
@@ -4586,8 +4659,52 @@ STATUSES:
       const reason = `Status changed to ${input.status}`;
       const snapshot = createPlanSnapshot(doc, reason, actorName, input.status, blocks);
       addSnapshot(doc, snapshot);
+      if (input.status === "draft") {
+        const resetResult = resetPlanToDraft(doc, actorName);
+        if (!resetResult.success) {
+          return {
+            content: [
+              {
+                type: "text",
+                text: `Failed to reset plan to draft: ${resetResult.error}`
+              }
+            ],
+            isError: true
+          };
+        }
+      } else {
+        const transition = buildStatusTransition(input.status, actorName);
+        if (!transition) {
+          return {
+            content: [
+              {
+                type: "text",
+                text: `Invalid status: ${input.status}`
+              }
+            ],
+            isError: true
+          };
+        }
+        const transitionResult = transitionPlanStatus(doc, transition, actorName);
+        if (!transitionResult.success) {
+          return {
+            content: [
+              {
+                type: "text",
+                text: `Failed to transition status: ${transitionResult.error}`
+              }
+            ],
+            isError: true
+          };
+        }
+      }
+    }
+    const updates = {};
+    if (input.title) updates.title = input.title;
+    if (input.tags !== void 0) updates.tags = input.tags;
+    if (Object.keys(updates).length > 0) {
+      setPlanMetadata(doc, updates, actorName);
     }
-    setPlanMetadata(doc, updates, actorName);
     const indexDoc = await getOrCreateDoc3(PLAN_INDEX_DOC_NAME);
     if (existingMetadata.ownerId) {
       setPlanIndexEntry(indexDoc, {
@@ -4788,17 +4905,36 @@ Parameters:
 - pollIntervalSeconds (number, optional): Polling interval (default: 30)
 
 Returns:
-- script: Bash script that polls registry server and exits when status becomes 'changes_requested' or 'in_progress'
+- script: Bash script that polls registry server and exits when status becomes 'in_progress' (approved) or 'changes_requested' (needs work)
 
-Use this for agents WITHOUT hook support (Cursor, Devin, etc). The script can be run in background.
+**IMPORTANT:** This is ONLY for agents WITHOUT hook support (Cursor, Devin, Windsurf, etc).
+Claude Code users have automatic blocking via the shipyard hook - you don't need this.
 
-Example:
+**Complete workflow for non-hook agents (example user code):**
 \`\`\`typescript
+// 1. Create plan and get the monitoring script in ONE code block
+const plan = await createPlan({
+  title: "My Feature Implementation",
+  content: "- [ ] Screenshot of working feature {#deliverable}"
+});
+
+// 2. Get the polling script (returns bash script as string)
 const { script } = await setupReviewNotification(plan.planId, 15);
-// Agent runs this script in background to wait for approval
-console.log(script);
+
+// 3. Return both so the agent can run the script
+return {
+  planId: plan.planId,
+  sessionToken: plan.sessionToken,
+  monitoringScript: script,
+  instructions: "Run the monitoring script in background: bash <script> &"
+};
 \`\`\`
 
+The agent then runs the returned bash script in the background. The script will:
+- Poll the registry server every N seconds
+- Print status changes to stdout
+- Exit with code 0 when the plan is approved/rejected
+
 ---
 
 ### requestUserInput(opts): Promise<{ success, response?, status, reason? }>
@@ -5085,7 +5221,7 @@ async function setupReviewNotification(planId, pollIntervalSeconds) {
   return { script, fullResponse: text };
 }
 async function requestUserInput(opts) {
-  const { InputRequestManager: InputRequestManager2 } = await import("./input-request-manager-43QSOJS3.js");
+  const { InputRequestManager: InputRequestManager2 } = await import("./input-request-manager-73GSTOIB.js");
   const ydoc = await getOrCreateDoc3(PLAN_INDEX_DOC_NAME);
   const manager = new InputRequestManager2();
   const params = opts.type === "choice" ? {
@@ -5129,12 +5265,12 @@ async function requestUserInput(opts) {
   };
 }
 async function postActivityUpdate(opts) {
-  const { logPlanEvent: logPlanEvent2 } = await import("./dist-HIDISXZO.js");
+  const { logPlanEvent: logPlanEvent2 } = await import("./dist-ORKL4P3L.js");
   const { getGitHubUsername: getGitHubUsername2 } = await import("./server-identity-6PHKR2FY.js");
-  const { nanoid: nanoid7 } = await import("nanoid");
+  const { nanoid: nanoid8 } = await import("nanoid");
   const doc = await getOrCreateDoc3(opts.planId);
   const actorName = await getGitHubUsername2();
-  const requestId = nanoid7();
+  const requestId = nanoid8();
   const eventId = logPlanEvent2(
     doc,
     "agent_activity",
@@ -5152,7 +5288,7 @@ async function postActivityUpdate(opts) {
   return { success: true, eventId, requestId };
 }
 async function resolveActivityRequest(opts) {
-  const { logPlanEvent: logPlanEvent2, getPlanEvents } = await import("./dist-HIDISXZO.js");
+  const { logPlanEvent: logPlanEvent2, getPlanEvents } = await import("./dist-ORKL4P3L.js");
   const { getGitHubUsername: getGitHubUsername2 } = await import("./server-identity-6PHKR2FY.js");
   const doc = await getOrCreateDoc3(opts.planId);
   const actorName = await getGitHubUsername2();

package/apps/server/dist/{input-request-manager-43QSOJS3.js → input-request-manager-73GSTOIB.js}

@@ -1,7 +1,7 @@
 import {
   InputRequestManager
-} from "./chunk-MZTJGBLT.js";
-import "./chunk-75NZRAN5.js";
+} from "./chunk-BWP37ADP.js";
+import "./chunk-76JWRTPI.js";
 import "./chunk-GSGLHRWX.js";
 import "./chunk-JSBRDJBE.js";
 export {

package/package.json

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