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

package/apps/server/dist/index.js

@@ -4149,7 +4149,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 +4169,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 +4239,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)`
         }
       ]
     };
@@ -4788,17 +4832,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? }>

package/package.json

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