@hanna84/mcp-writing 2.18.1 → 3.1.0

package/src/scripts/manual/run_mcp_test.js

@@ -2,6 +2,7 @@ import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
 import path from "path";
 import process from "process";
+import { callToolParsed } from "./mcp-result.mjs";
 
 function usage() {
   console.log("Usage: node src/scripts/manual/run_mcp_test.js <source_project_dir> [project_id] [sync_dir]");
@@ -30,17 +31,18 @@ async function runCase(env, args) {
     await client.connect(transport);
     
     // Start the async merge job
-    const startResult = await client.callTool({
-      name: "merge_scrivener_project_beta",
-      arguments: args
-    });
+    const startResult = await callToolParsed(client, "merge_scrivener_project_beta", args);
 
     if (startResult.isError) {
-      console.log(`error: ${startResult.content[0].text}`);
+      console.log(`error: ${startResult.text}`);
       return;
     }
 
-    const startData = JSON.parse(startResult.content[0].text);
+    const startData = startResult.data;
+    if (!startData) {
+      console.log("error: invalid start payload");
+      return;
+    }
     if (!startData.ok) {
       console.log(`error: ${startData.error?.code || 'unknown'}`);
       return;
@@ -57,22 +59,20 @@ async function runCase(env, args) {
     while (!settled && attempts < maxAttempts) {
       await new Promise(resolve => setTimeout(resolve, 500));
       
-      const statusResult = await client.callTool({
-        name: "get_async_job_status",
-        arguments: { job_id: jobId, include_result: true }
+      const statusResult = await callToolParsed(client, "get_async_job_status", {
+        job_id: jobId,
+        include_result: true,
       });
 
       if (statusResult.isError) {
-        console.log(`error.code/message: ${statusResult.content?.[0]?.text || "status query failed"}`);
+        console.log(`error.code/message: ${statusResult.text || "status query failed"}`);
         settled = true;
         break;
       }
 
-      let statusData;
-      try {
-        statusData = JSON.parse(statusResult.content[0].text);
-      } catch (parseError) {
-        console.log(`error.code/message: invalid status payload: ${parseError instanceof Error ? parseError.message : String(parseError)}`);
+      const statusData = statusResult.data;
+      if (!statusData) {
+        console.log("error.code/message: invalid status payload");
         settled = true;
         break;
       }

package/src/scripts/manual/test-scenarios.mjs

@@ -1,5 +1,6 @@
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
+import { callToolParsed } from "./mcp-result.mjs";
 
 const BASE_URL = "http://localhost:3000";
 
@@ -22,8 +23,8 @@ async function connect() {
 }
 
 async function callTool(client, name, args = {}) {
-  const result = await client.callTool({ name, arguments: args });
-  return result.content?.[0]?.text ?? "";
+  const result = await callToolParsed(client, name, args);
+  return result.text;
 }
 
 const results = [];
@@ -45,12 +46,9 @@ async function runScenarios() {
     try {
       const text = await callTool(client, "find_scenes", { project_id: "the-lamb" });
       const parsed = JSON.parse(text);
-      const isArray = Array.isArray(parsed);
-      const isEnvelope = !isArray && parsed.results && parsed.total_count !== undefined;
-      
-      if (isArray) {
-        log("1a", "PASS", `Got array of ${parsed.length} scenes (backward compat)`);
-      } else if (isEnvelope) {
+      const isEnvelope = parsed && parsed.results && parsed.total_count !== undefined;
+
+      if (isEnvelope) {
         log("1b", "PASS", `Got envelope with results: ${parsed.results.length}, total_count: ${parsed.total_count}`);
       } else {
         log("1c", "FAIL", `Unknown shape: ${JSON.stringify(parsed).slice(0, 100)}`);
@@ -241,17 +239,23 @@ async function runScenarios() {
       const ga = JSON.parse(await callTool(client, "get_arc", { character_id: "char-mira-nystrom", page_size: 1 }));
       const sm = JSON.parse(await callTool(client, "search_metadata", { query: "scene", page_size: 1 }));
       const lt = JSON.parse(await callTool(client, "list_threads", { project_id: "the-lamb" }));
+      const lc = JSON.parse(await callTool(client, "list_characters", { project_id: "the-lamb" }));
+      const lp = JSON.parse(await callTool(client, "list_places", { project_id: "the-lamb" }));
+      const sr = JSON.parse(await callTool(client, "search_reference", { query: "scene" }));
 
       const commonFields = ["results", "total_count"];
       const fsHas = commonFields.every(f => f in fs);
       const gaHas = commonFields.every(f => f in ga);
       const smHas = commonFields.every(f => f in sm);
       const ltHas = commonFields.every(f => f in lt);
+      const lcHas = commonFields.every(f => f in lc);
+      const lpHas = commonFields.every(f => f in lp);
+      const srHas = commonFields.every(f => f in sr);
 
-      if (fsHas && gaHas && smHas && ltHas) {
-        log("11", "PASS", `All tools have results + total_count envelope`);
+      if (fsHas && gaHas && smHas && ltHas && lcHas && lpHas && srHas) {
+        log("11", "PASS", `All metadata-read tools have results + total_count envelope`);
       } else {
-        log("11", "FAIL", `Missing fields: fs=${fsHas}, ga=${gaHas}, sm=${smHas}, lt=${ltHas}`);
+        log("11", "FAIL", `Missing fields: fs=${fsHas}, ga=${gaHas}, sm=${smHas}, lt=${ltHas}, lc=${lcHas}, lp=${lpHas}, sr=${srHas}`);
       }
     } catch (err) {
       log("11", "FAIL", err.message);
@@ -267,14 +271,22 @@ async function runScenarios() {
         ga: JSON.parse(await callTool(client, "get_arc", { character_id: "char-mira-nystrom" })),
         sm: JSON.parse(await callTool(client, "search_metadata", { query: "scene" })),
         lt: JSON.parse(await callTool(client, "list_threads", { project_id: "the-lamb" })),
+        lc: JSON.parse(await callTool(client, "list_characters", { project_id: "the-lamb" })),
+        lp: JSON.parse(await callTool(client, "list_places", { project_id: "the-lamb" })),
+        sr: JSON.parse(await callTool(client, "search_reference", { query: "scene" })),
       };
 
-      const allValid = Object.values(smoke).every(obj => obj !== null && typeof obj === "object");
+      const allValid = Object.values(smoke).every(obj => (
+        obj !== null
+        && typeof obj === "object"
+        && "results" in obj
+        && "total_count" in obj
+      ));
       
       if (allValid) {
-        log("12", "PASS", `All 4 tools parsed as valid JSON objects`);
+        log("12", "PASS", `All sampled metadata-read tools returned envelope responses`);
       } else {
-        log("12", "FAIL", `Some responses did not parse as JSON`);
+        log("12", "FAIL", `Some responses did not match envelope shape`);
       }
     } catch (err) {
       log("12", "FAIL", err.message);

package/src/scripts/manual/test.mjs

@@ -1,5 +1,6 @@
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
+import { callToolParsed } from "./mcp-result.mjs";
 
 const BASE_URL = "http://localhost:3000";
 
@@ -12,9 +13,10 @@ let failed = 0;
 
 async function test(label, toolName, args, check) {
   try {
-    const result = await client.callTool({ name: toolName, arguments: args });
-    const text = result.content?.[0]?.text ?? "";
-    const ok = check(text);
+    const parsed = await callToolParsed(client, toolName, args);
+    const text = parsed.text;
+    const result = parsed.raw;
+    const ok = check(text, result);
     if (ok) {
       console.log(`  ✓  ${label}`);
       passed++;
@@ -77,7 +79,12 @@ console.log("\n── get_scene_prose ──────────────
 await test(
   "returns prose for sc-001",
   "get_scene_prose", { scene_id: "sc-001" },
-  t => t.includes("gangway") && t.includes("Marcus")
+  (t, result) => {
+    if (result.structuredContent?.warning) {
+      console.log(`     warning: ${result.structuredContent.warning}`);
+    }
+    return t.includes("gangway") && t.includes("Marcus");
+  }
 );
 
 await test(

package/src/scripts/manual-validation.mjs

@@ -7,6 +7,7 @@ import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
 import { URL as NodeURL } from "node:url";
 import { execSync } from "node:child_process";
 import fs from "node:fs";
+import { callToolParsed } from "./manual/mcp-result.mjs";
 
 const ROOT = process.cwd();
 
@@ -38,7 +39,8 @@ async function connectClient(url) {
 
 async function callTool(client, name, args = {}) {
   try {
-    return await client.callTool({ name, arguments: args });
+    const parsed = await callToolParsed(client, name, args);
+    return parsed.raw;
   } catch (e) {
     return { error: e.message };
   }
@@ -48,12 +50,14 @@ function parseResponse(result) {
   if (result.error) return { error: result.error };
   try {
     const text = result.content?.[0]?.text;
+    const structured = result.structuredContent;
     if (!text) return { raw: result };
     // Try to parse as JSON
     try {
-      return JSON.parse(text);
+      const parsed = JSON.parse(text);
+      return structured ? { ...parsed, _structured: structured } : parsed;
     } catch {
-      return { text };
+      return structured ? { text, _structured: structured } : { text };
     }
   } catch {
     return { raw: result };
@@ -218,7 +222,10 @@ async function runPhaseB() {
       const proseRes = await callTool(client, "get_scene_prose", { scene_id: results.firstSceneId });
       const proseData = parseResponse(proseRes);
       results.proseExcerpt = proseData.prose?.slice(0, 200) || proseData.text?.slice(0, 200) || proseRes.content?.[0]?.text?.slice(0, 200) || "(no prose)";
+      results.proseWarning = proseData._structured?.warning || null;
+      results.proseNextStep = proseData._structured?.next_step || null;
       console.log("get_scene_prose excerpt:", results.proseExcerpt.slice(0, 150) + "...");
+      if (results.proseWarning) console.log("get_scene_prose warning:", results.proseWarning);
     } else {
       results.proseExcerpt = "(no scene_id available)";
     }
@@ -260,6 +267,7 @@ async function main() {
   console.log("  Place count:", phaseB.placeCount);
   console.log("  Airport search count:", phaseB.airportSearchCount);
   console.log("  First scene_id:", phaseB.firstSceneId || "N/A");
+  if (phaseB.proseWarning) console.log("  Prose warning:", phaseB.proseWarning);
   console.log("  Prose excerpt (200 chars):", phaseB.proseExcerpt?.slice(0, 200) || "N/A");
   if (phaseB.warnings.length) console.log("  Lint warnings:", phaseB.warnings.length > 0 ? "Yes (see above)" : "None");
   if (phaseB.errors.length) console.log("  Errors:", phaseB.errors);

package/src/scripts/mcp-debug-client.mjs

@@ -2,6 +2,7 @@ import { spawn } from "node:child_process";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
 import { URL as NodeURL } from "node:url";
+import { callToolParsed } from "./manual/mcp-result.mjs";
 
 const ROOT = process.cwd();
 
@@ -31,11 +32,11 @@ try {
   const transport = new SSEClientTransport(new NodeURL(`${BASE}/sse`));
   await client.connect(transport);
   
-  await client.callTool({ name: "sync", arguments: {} });
+  await callToolParsed(client, "sync", {});
   
-  const scenes = await client.callTool({ name: "find_scenes", arguments: { project_id: "scrivener-export", page_size: 3, page: 1 } });
+  const scenes = await callToolParsed(client, "find_scenes", { project_id: "scrivener-export", page_size: 3, page: 1 });
   console.log("=== find_scenes raw response ===");
-  console.log(JSON.stringify(scenes, null, 2));
+  console.log(JSON.stringify(scenes.raw, null, 2));
   
   await client.close();
 } finally {

package/src/sync/sync.js

@@ -919,13 +919,10 @@ function pruneMissingScenes(db, seenSceneKeys, syncDir) {
       WHERE source_kind = 'scene' AND source_project_id = ? AND source_id = ?
     `).run(row.project_id ?? "", row.scene_id);
     db.prepare(`DELETE FROM scenes WHERE scene_id = ? AND project_id = ?`).run(row.scene_id, row.project_id);
-
-    const remainingScene = db.prepare(`SELECT 1 FROM scenes WHERE scene_id = ? LIMIT 1`).get(row.scene_id);
-    if (!remainingScene) {
-      db.prepare(`DELETE FROM scene_characters WHERE scene_id = ?`).run(row.scene_id);
-      db.prepare(`DELETE FROM scene_places WHERE scene_id = ?`).run(row.scene_id);
-      db.prepare(`DELETE FROM scene_tags WHERE scene_id = ?`).run(row.scene_id);
-    }
+    db.prepare(`DELETE FROM scene_characters WHERE scene_id = ? AND project_id = ?`).run(row.scene_id, row.project_id);
+    db.prepare(`DELETE FROM scene_places WHERE scene_id = ? AND project_id = ?`).run(row.scene_id, row.project_id);
+    db.prepare(`DELETE FROM scene_tags WHERE scene_id = ? AND project_id = ?`).run(row.scene_id, row.project_id);
+    db.prepare(`DELETE FROM scene_threads WHERE scene_id = ? AND project_id = ?`).run(row.scene_id, row.project_id);
   }
 }
 
@@ -994,14 +991,14 @@ export function indexSceneFile(db, syncDir, file, meta, prose) {
     new Date().toISOString()
   );
 
-  db.prepare(`DELETE FROM scene_characters WHERE scene_id = ?`).run(meta.scene_id);
-  db.prepare(`DELETE FROM scene_places WHERE scene_id = ?`).run(meta.scene_id);
-  db.prepare(`DELETE FROM scene_tags WHERE scene_id = ?`).run(meta.scene_id);
+  db.prepare(`DELETE FROM scene_characters WHERE scene_id = ? AND project_id = ?`).run(meta.scene_id, project_id);
+  db.prepare(`DELETE FROM scene_places WHERE scene_id = ? AND project_id = ?`).run(meta.scene_id, project_id);
+  db.prepare(`DELETE FROM scene_tags WHERE scene_id = ? AND project_id = ?`).run(meta.scene_id, project_id);
 
   for (const c of (meta.characters ?? [])) {
     // Version continuity markers (e.g. v7.3, v3.3b) are tracked as tags, not characters
     if (/^v\d[\d.a-z]*$/i.test(c)) {
-      db.prepare(`INSERT OR IGNORE INTO scene_tags (scene_id, tag) VALUES (?, ?)`).run(meta.scene_id, c);
+      db.prepare(`INSERT OR IGNORE INTO scene_tags (scene_id, project_id, tag) VALUES (?, ?, ?)`).run(meta.scene_id, project_id, c);
       continue;
     }
     let cid = c;
@@ -1021,23 +1018,23 @@ export function indexSceneFile(db, syncDir, file, meta, prose) {
       }
       if (row) cid = row.character_id;
     }
-    db.prepare(`INSERT OR IGNORE INTO scene_characters (scene_id, character_id) VALUES (?, ?)`).run(
-      meta.scene_id, cid
+    db.prepare(`INSERT OR IGNORE INTO scene_characters (scene_id, project_id, character_id) VALUES (?, ?, ?)`).run(
+      meta.scene_id, project_id, cid
     );
   }
   for (const p of (meta.places ?? [])) {
-    db.prepare(`INSERT OR IGNORE INTO scene_places (scene_id, place_id) VALUES (?, ?)`).run(
-      meta.scene_id, p
+    db.prepare(`INSERT OR IGNORE INTO scene_places (scene_id, project_id, place_id) VALUES (?, ?, ?)`).run(
+      meta.scene_id, project_id, p
     );
   }
   for (const t of (meta.tags ?? [])) {
-    db.prepare(`INSERT OR IGNORE INTO scene_tags (scene_id, tag) VALUES (?, ?)`).run(
-      meta.scene_id, t
+    db.prepare(`INSERT OR IGNORE INTO scene_tags (scene_id, project_id, tag) VALUES (?, ?, ?)`).run(
+      meta.scene_id, project_id, t
     );
   }
   for (const v of (meta.versions ?? [])) {
-    db.prepare(`INSERT OR IGNORE INTO scene_tags (scene_id, tag) VALUES (?, ?)`).run(
-      meta.scene_id, v
+    db.prepare(`INSERT OR IGNORE INTO scene_tags (scene_id, project_id, tag) VALUES (?, ?, ?)`).run(
+      meta.scene_id, project_id, v
     );
   }