@insitue/claude-plugin 0.5.1 → 0.5.2

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @insitue/claude-plugin
 
+## 0.5.2
+
+- **Fix (hardcoded protocol version):** `mcp-server.ts` was sending
+  `protocolVersion: 5` as a literal in the WS hello handshake — the
+  same class of bug fixed in `@insitue/companion` 0.4.4 for the CLI
+  subscriber path. The literal would silently mismatch the next time
+  `@insitue/capture-core` bumps `PROTOCOL_VERSION`. The value is now
+  imported from `@insitue/capture-core` (added as a real dependency)
+  so there is a single source of truth. `@insitue/capture-core` is
+  bundled by tsup (not external) — no new runtime dep in the published
+  package.
+- **Fix (subscriber attach race — `start_session` / `list_recent_picks`
+  says "connected" before it is):** `connectToCompanion` previously
+  returned `void` and was not awaited in `ensureSubscriberAttached`.
+  This meant `list_recent_picks` (and therefore the `/insitue:connect`
+  slash command) could return "No picks buffered yet" before the
+  companion had added this MCP server to its `subscribers` set — so
+  the browser launcher badge stayed dark for a moment after claude
+  claimed to be listening. `connectToCompanion` now returns a
+  `Promise<boolean>` that resolves `true` when `subscribe-ok` arrives
+  (subscriber set joined, badge lit), or `false` on pre-subscribe
+  close. `ensureSubscriberAttached` awaits it and resets `attached` on
+  failure so the next explicit call retries cleanly.
+- Bumped 0.5.1 → 0.5.2.
+
 ## 0.5.1
 
 - **Docs:** the operating instructions (`commands/connect.md`) now document

package/dist/mcp-server.js

@@ -29,6 +29,7 @@ import { dirname as dirname3, join as join3 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import WebSocket from "ws";
 import { z } from "zod";
+import { PROTOCOL_VERSION } from "@insitue/capture-core";
 
 // src/file-tools.ts
 import {
@@ -388,68 +389,81 @@ var activeWs = null;
 var reconnectTimer = null;
 var disconnecting = false;
 function connectToCompanion(s) {
-  const url = `ws://127.0.0.1:${s.port}/insitue/cli`;
-  const ws = new WebSocket(url, {
-    headers: { "user-agent": "insitue-claude-plugin" }
-  });
-  activeWs = ws;
-  ws.on("open", () => {
-    ws.send(
-      JSON.stringify({
-        t: "hello",
-        // Pin to the companion's pinned protocol version. Bump
-        // when the wire format breaks.
-        protocolVersion: 5,
-        token: s.token
-      })
-    );
-  });
-  ws.on("message", (data) => {
-    let m;
-    try {
-      m = JSON.parse(String(data));
-    } catch {
-      return;
-    }
-    if (m && typeof m === "object") {
-      const tag = m.t;
-      if (tag === "hello-ok") {
-        ws.send(JSON.stringify({ t: "subscribe" }));
+  return new Promise((subscribeResolve) => {
+    let subscribed = false;
+    const url = `ws://127.0.0.1:${s.port}/insitue/cli`;
+    const ws = new WebSocket(url, {
+      headers: { "user-agent": "insitue-claude-plugin" }
+    });
+    activeWs = ws;
+    ws.on("open", () => {
+      ws.send(
+        JSON.stringify({
+          t: "hello",
+          // Imported from @insitue/capture-core — the single source of
+          // truth for the wire protocol version. A hardcoded literal here
+          // would silently drift the moment the capture-core version is
+          // bumped (same class of bug fixed in companion 0.4.4).
+          protocolVersion: PROTOCOL_VERSION,
+          token: s.token
+        })
+      );
+    });
+    ws.on("message", (data) => {
+      let m;
+      try {
+        m = JSON.parse(String(data));
+      } catch {
         return;
       }
-      if (tag === "broadcast-capture") {
-        try {
-          const summary = summariseBundle(
-            m
-          );
-          buffer.push(summary);
-          const note = summary.userNote ? summary.userNote.length > 60 ? `${summary.userNote.slice(0, 57)}\u2026` : summary.userNote : "(no description)";
-          const where = summary.source ? `${summary.source.file}:${summary.source.line}` : summary.target;
-          process.stderr.write(
-            `[insitue] \u{1F4E5} pick received \u2014 "${note}" @ ${where}
+      if (m && typeof m === "object") {
+        const tag = m.t;
+        if (tag === "hello-ok") {
+          ws.send(JSON.stringify({ t: "subscribe" }));
+          return;
+        }
+        if (tag === "subscribe-ok") {
+          if (!subscribed) {
+            subscribed = true;
+            subscribeResolve(true);
+          }
+          return;
+        }
+        if (tag === "broadcast-capture") {
+          try {
+            const summary = summariseBundle(
+              m
+            );
+            buffer.push(summary);
+            const note = summary.userNote ? summary.userNote.length > 60 ? `${summary.userNote.slice(0, 57)}\u2026` : summary.userNote : "(no description)";
+            const where = summary.source ? `${summary.source.file}:${summary.source.line}` : summary.target;
+            process.stderr.write(
+              `[insitue] \u{1F4E5} pick received \u2014 "${note}" @ ${where}
 `
-          );
-        } catch (err) {
-          process.stderr.write(
-            `[insitue-mcp] dropped malformed pick: ${err.message}
+            );
+          } catch (err) {
+            process.stderr.write(
+              `[insitue-mcp] dropped malformed pick: ${err.message}
 `
-          );
+            );
+          }
+          return;
         }
-        return;
+        if (tag === "broadcast-ask") return;
       }
-      if (tag === "broadcast-ask") return;
-    }
-  });
-  ws.on("close", () => {
-    if (activeWs === ws) activeWs = null;
-    buffer.dropWaiters();
-    if (disconnecting) return;
-    process.stderr.write(
-      "[insitue-mcp] companion link dropped \u2014 reconnecting in 2s\n"
-    );
-    reconnectTimer = setTimeout(() => connectToCompanion(s), 2e3);
-  });
-  ws.on("error", () => {
+    });
+    ws.on("close", () => {
+      if (!subscribed) subscribeResolve(false);
+      if (activeWs === ws) activeWs = null;
+      buffer.dropWaiters();
+      if (disconnecting) return;
+      process.stderr.write(
+        "[insitue-mcp] companion link dropped \u2014 reconnecting in 2s\n"
+      );
+      reconnectTimer = setTimeout(() => void connectToCompanion(s), 2e3);
+    });
+    ws.on("error", () => {
+    });
   });
 }
 var projectDir = resolveProjectDir();
@@ -473,7 +487,13 @@ async function ensureSubscriberAttached(opts = {}) {
     if (!session) return;
   }
   attached = true;
-  connectToCompanion(session);
+  const ok = await connectToCompanion(session);
+  if (!ok) {
+    attached = false;
+    process.stderr.write(
+      "[insitue-mcp] subscriber attach failed \u2014 companion handshake did not complete\n"
+    );
+  }
 }
 function endSession() {
   disconnecting = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@insitue/claude-plugin",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Drive Claude (Code AND Desktop) from the InSitue browser overlay — pick an element in your app, claude reads the file and proposes the edit.",
   "keywords": [
     "insitue",
@@ -38,7 +38,8 @@
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.29.0",
     "ws": "^8.18.0",
-    "zod": "^3.23.8"
+    "zod": "^3.23.8",
+    "@insitue/capture-core": "0.4.1"
   },
   "devDependencies": {
     "@types/ws": "^8.5.13",