@composer-app/mcp 0.0.4-beta.0 → 0.0.4-beta.2

package/dist/{chunk-WZIAULKX.js → chunk-D62LPVSX.js}

@@ -4371,22 +4371,22 @@ function buildFlatMap(fragment) {
       walk(node);
     }
     if (idx < topLevel.length - 1) {
-      flat += "\n";
+      flat += "\n\n";
     }
   });
   return { flat, map, blockFlatStarts };
 }
-function findNthOccurrence(flat, needle, n) {
-  if (needle.length === 0) return null;
-  let searchFrom = 0;
-  let found2 = -1;
-  for (let i = 0; i < n; i++) {
-    const idx = flat.indexOf(needle, searchFrom);
-    if (idx < 0) return null;
-    found2 = idx;
-    searchFrom = idx + 1;
+function findAllOccurrences(haystack, needle) {
+  if (needle.length === 0) return [];
+  const out = [];
+  let from2 = 0;
+  while (true) {
+    const idx = haystack.indexOf(needle, from2);
+    if (idx < 0) break;
+    out.push(idx);
+    from2 = idx + 1;
   }
-  return found2;
+  return out;
 }
 function lookupFlatIndex(map, flatIndex) {
   for (const entry of map) {
@@ -4484,13 +4484,11 @@ function resolveServerAnchor(doc, spec) {
     return {
       ok: false,
       error: "section_not_found",
-      currentSectionText: ""
+      currentSectionText: "",
+      currentSectionFlat: ""
     };
   }
   const currentSectionText = getSection(doc, spec.headingId);
-  if (!currentSectionText.includes(spec.textToFind)) {
-    return { ok: false, error: "text_not_found", currentSectionText };
-  }
   const fragment = doc.getXmlFragment("default");
   const { flat, map, blockFlatStarts } = buildFlatMap(fragment);
   const range = getSectionBlockRange(doc, spec.headingId);
@@ -4498,25 +4496,68 @@ function resolveServerAnchor(doc, spec) {
     return {
       ok: false,
       error: "section_not_found",
-      currentSectionText
+      currentSectionText,
+      currentSectionFlat: ""
     };
   }
   const sectionFlatStart = blockFlatStarts[range.start] ?? 0;
   const sectionFlatEnd = range.end < blockFlatStarts.length ? blockFlatStarts[range.end] : flat.length;
   const sectionFlat = flat.slice(sectionFlatStart, sectionFlatEnd);
-  const sectionRelStart = findNthOccurrence(sectionFlat, spec.textToFind, occurrence);
-  if (sectionRelStart === null) {
-    return { ok: false, error: "text_not_found", currentSectionText };
+  const allMatches = findAllOccurrences(sectionFlat, spec.textToFind);
+  if (allMatches.length === 0) {
+    return {
+      ok: false,
+      error: "text_not_found",
+      currentSectionText,
+      currentSectionFlat: sectionFlat
+    };
+  }
+  const topLevel = fragment.toArray();
+  const isHeadingBlockAt = (absFlatIndex) => {
+    let blockIdx = 0;
+    for (let i = 0; i < blockFlatStarts.length; i++) {
+      if (blockFlatStarts[i] <= absFlatIndex) blockIdx = i;
+      else break;
+    }
+    const block = topLevel[blockIdx];
+    return block instanceof Y4.XmlElement && block.nodeName === "heading";
+  };
+  const ranked = allMatches.map((sectionRelStart) => ({
+    sectionRelStart,
+    isHeading: isHeadingBlockAt(sectionFlatStart + sectionRelStart)
+  }));
+  ranked.sort((a, b) => {
+    if (a.isHeading !== b.isHeading) return a.isHeading ? 1 : -1;
+    return a.sectionRelStart - b.sectionRelStart;
+  });
+  const pick = ranked[occurrence - 1];
+  if (!pick) {
+    return {
+      ok: false,
+      error: "text_not_found",
+      currentSectionText,
+      currentSectionFlat: sectionFlat
+    };
   }
-  const flatStart = sectionFlatStart + sectionRelStart;
+  const flatStart = sectionFlatStart + pick.sectionRelStart;
   const flatEnd = flatStart + spec.textToFind.length;
   const startEntry = lookupFlatIndex(map, flatStart);
   if (!startEntry) {
-    return { ok: false, error: "text_not_found", currentSectionText };
+    return {
+      ok: false,
+      error: "text_not_found",
+      currentSectionText,
+      currentSectionFlat: sectionFlat
+    };
   }
   const lastCharEntry = lookupFlatIndexEnd(map, flatEnd - 1);
   if (!lastCharEntry) {
-    return { ok: false, error: "text_not_found", currentSectionText };
+    return {
+      ok: false,
+      error: "text_not_found",
+      currentSectionText,
+      currentSectionFlat: sectionFlat
+    };
   }
   const fromRelPos = Y4.createRelativePositionFromTypeIndex(
     startEntry.xmlText,
@@ -4543,15 +4584,8 @@ var COMPOSER_MCP_VERSION = pkg.version;
 // src/roomState.ts
 var HAD_UPGRADE_403 = /* @__PURE__ */ Symbol("composer.upgrade403");
 var TerminalDetectingWS = class extends WebSocket {
-  constructor(address, protocols, options) {
-    const existingHeaders = options?.headers ?? {};
-    super(address, protocols, {
-      ...options,
-      headers: {
-        ...existingHeaders,
-        "X-Composer-Client": COMPOSER_MCP_VERSION
-      }
-    });
+  constructor(...args) {
+    super(...args);
     this.on("unexpected-response", (_req, res) => {
       if (res.statusCode === 403) {
         this[HAD_UPGRADE_403] = true;
@@ -4649,6 +4683,7 @@ var RoomState = class _RoomState {
       this.provider = new YProvider(opts.serverHost, opts.roomId, this.doc, {
         party: "composer-room",
         connect: false,
+        params: { client: `mcp-${COMPOSER_MCP_VERSION}` },
         WebSocketPolyfill: TerminalDetectingWS
       });
     }
@@ -5582,7 +5617,7 @@ var TOOL_DEFS = [
   },
   {
     name: "composer_add_comment",
-    description: "Post a new top-level comment anchored to a text span anywhere in the doc. Anchor is { headingId, textToFind, occurrence? }. Use this to flag something the user didn't ask about \u2014 cross-referencing related sections, raising a concern elsewhere in the doc, or seeding a thread on a new span. Use `composer_reply_comment` instead when continuing an existing thread. Accepts optional `state` (ack-first flow: post with `state: \"thinking\"` to start the live indicator immediately) and `mentions` (array of target userIds \u2014 the invoker's userId from the mention event payload, for the `@invoker` backlink). Returns { id } on success or an isError result if the anchor cannot be resolved.",
+    description: "Post a new top-level comment anchored to a text span anywhere in the doc. Anchor is { headingId, textToFind, occurrence? }. Use this to flag something the user didn't ask about \u2014 cross-referencing related sections, raising a concern elsewhere in the doc, or seeding a thread on a new span. Use `composer_reply_comment` instead when continuing an existing thread. Accepts optional `state` (ack-first flow: post with `state: \"thinking\"` to start the live indicator immediately) and `mentions` (array of target userIds \u2014 the invoker's userId from the mention event payload, for the `@invoker` backlink).\n**`textToFind` matches the doc's stored text, not the markdown source.** Inline marks (`**bold**`, `*italic*`, `` `code` ``, `_emphasis_`, `~~strike~~`) are stored as Y.Marks \u2014 write plain text, no markers. Top-level blocks join with `\\n\\n`; list items have NO separator (three bullets `- a / - b / - c` are stored as `abc`). Copy from `Section as the matcher sees it` in any `text_not_found` error if unsure. Returns { id } on success or an isError result if the anchor cannot be resolved.",
     inputSchema: {
       type: "object",
       properties: {
@@ -5636,7 +5671,7 @@ var TOOL_DEFS = [
   },
   {
     name: "composer_add_suggestion",
-    description: "Post a text replacement suggestion. A suggestion can target ANY span anywhere in the doc \u2014 not just the span of the thread that triggered you. Pick exactly one of:\n  - `fromThreadId` \u2014 inherit the source thread's exact stored anchor. Right when the user's request is scoped to what they selected (the common case: 'rewrite this', 'make this shorter').\n  - `anchor` \u2014 specify a span yourself via `{ headingId, textToFind, occurrence? }`. Use this when the user's request targets different text ('also update the intro', 'the bullet list in Section 3 is stale') OR for proactive suggestions with no source thread.\n**Anchor = what gets deleted.** Your `textToFind` is literally cut when the user accepts and `replacementText` is inserted in its place. Anchor the whole unit you're changing (full sentence including terminal punctuation; full list item text; full paragraph), match your replacementText's shape (inline for mid-paragraph edits, full markdown block for block replacements), end replacement at the same boundary as the anchor, and include any formatting you want preserved in the replacement itself \u2014 the anchor's bold / link / heading level is gone on accept. A too-narrow or mid-token anchor leaves broken spacing or smashed-together words. See SKILL.md 'Pick the right span' for the full rubric.\n**Ripple coverage is your responsibility.** If the change requires edits nearby or elsewhere (enumeration counts, cross-references, subject/verb agreement, restated facts), call this tool MULTIPLE times in the same turn \u2014 one suggestion per span \u2014 so accepting leaves the doc correct. If you're unsure whether ripples exist elsewhere in the doc, call `composer_get_full_doc` first. Returns { id } on success or an isError result if the anchor cannot be resolved.",
+    description: "Post a text replacement suggestion. A suggestion can target ANY span anywhere in the doc \u2014 not just the span of the thread that triggered you. Pick exactly one of:\n  - `fromThreadId` \u2014 inherit the source thread's exact stored anchor. Right when the user's request is scoped to what they selected (the common case: 'rewrite this', 'make this shorter').\n  - `anchor` \u2014 specify a span yourself via `{ headingId, textToFind, occurrence? }`. Use this when the user's request targets different text ('also update the intro', 'the bullet list in Section 3 is stale') OR for proactive suggestions with no source thread.\n**Anchor = what gets deleted.** Your `textToFind` is literally cut when the user accepts and `replacementText` is inserted in its place. Anchor the whole unit you're changing (full sentence including terminal punctuation; full list item text; full paragraph), match your replacementText's shape (inline for mid-paragraph edits, full markdown block for block replacements), end replacement at the same boundary as the anchor, and include any formatting you want preserved in the replacement itself \u2014 the anchor's bold / link / heading level is gone on accept. A too-narrow or mid-token anchor leaves broken spacing or smashed-together words. See SKILL.md 'Pick the right span' for the full rubric.\n**`textToFind` matches the doc's stored text, not the markdown source.** Three rules govern the shape:\n  1. **Inline marks are stripped.** `**bold**`, `*italic*`, `` `code` ``, `_emphasis_`, `~~strike~~` are stored as Y.Marks, not as literal characters. Write the plain text \u2014 `the file back` not `` `the file back` ``.\n  2. **Top-level blocks separate with `\\n\\n`.** Heading + body, or two sibling paragraphs, are joined by a blank line. Soft line breaks WITHIN a single paragraph are preserved as single `\\n`.\n  3. **List items have NO separator.** Three bullets `- a / - b / - c` are stored as `abc` (smashed). Same for ordered list items.\n  When in doubt, copy from the `Section as the matcher sees it` block in any `text_not_found` error.\n**Ripple coverage is your responsibility.** If the change requires edits nearby or elsewhere (enumeration counts, cross-references, subject/verb agreement, restated facts), call this tool MULTIPLE times in the same turn \u2014 one suggestion per span \u2014 so accepting leaves the doc correct. If you're unsure whether ripples exist elsewhere in the doc, call `composer_get_full_doc` first. Returns { id } on success or an isError result if the anchor cannot be resolved.",
     inputSchema: {
       type: "object",
       properties: {
@@ -5793,6 +5828,12 @@ function asString(value, field) {
   }
   return value;
 }
+function asStringAllowEmpty(value, field) {
+  if (typeof value !== "string") {
+    throw new Error(`${field} must be a string`);
+  }
+  return value;
+}
 function asOptionalString(value, field) {
   if (value === void 0) return void 0;
   if (typeof value !== "string") {
@@ -6145,8 +6186,11 @@ function performAddComment(state, a) {
   const resolved = resolveServerAnchor(state.doc, anchor);
   if (!resolved.ok) {
     return errorResult(
-      `anchor ${resolved.error}. Current section:
-${resolved.currentSectionText}`
+      `anchor ${resolved.error}. Section as rendered (markdown form, with markers):
+${resolved.currentSectionText}
+
+Section as the matcher sees it (use this exact form for textToFind \u2014 inline marks like \`code\`, **bold**, *italic* are stored as marks not characters, so they're absent here; soft line breaks are preserved; list items have no separators):
+${resolved.currentSectionFlat}`
     );
   }
   const id = nanoid4();
@@ -6249,7 +6293,7 @@ function handleReplyComment(args) {
   return performReplyComment(state, a);
 }
 function performAddSuggestion(state, a) {
-  const replacementText = asString(a.replacementText, "replacementText");
+  const replacementText = asStringAllowEmpty(a.replacementText, "replacementText");
   const fromThreadId = asOptionalString(a.fromThreadId, "fromThreadId");
   const agentState = asOptionalAgentState(a.state, "state");
   let anchorFrom;

package/dist/cli.js

@@ -4,7 +4,7 @@ import {
   logError,
   startMcpHttpServer,
   startMcpServer
-} from "./chunk-WZIAULKX.js";
+} from "./chunk-D62LPVSX.js";
 
 // src/setup.ts
 import * as fs from "fs/promises";

package/dist/mcp.js

@@ -15,7 +15,7 @@ import {
   startMcpHttpServer,
   startMcpServer,
   teardownAllRooms
-} from "./chunk-WZIAULKX.js";
+} from "./chunk-D62LPVSX.js";
 export {
   __test_clearRooms,
   __test_dispatch,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@composer-app/mcp",
-  "version": "0.0.4-beta.0",
+  "version": "0.0.4-beta.2",
   "description": "Composer MCP",
   "license": "MIT",
   "author": "Josh Philpott",