tandem-editor 0.14.3 → 0.16.0

package/dist/server/index.js

@@ -61735,6 +61735,16 @@ var init_positions2 = __esm({
   }
 });
 
+// src/server/file-io/docx-comment-id.ts
+function isCanonicalWordId(raw) {
+  return !!raw && /^\d{1,9}$/.test(raw) && String(Number(raw)) === raw;
+}
+var init_docx_comment_id = __esm({
+  "src/server/file-io/docx-comment-id.ts"() {
+    "use strict";
+  }
+});
+
 // src/server/file-io/docx-walker.ts
 function isElement3(node3) {
   return node3.type === "tag";
@@ -61871,7 +61881,7 @@ function importAnnotationId(commentId, from3, to, bodyText) {
   return `import-${hash2}`;
 }
 function importReplyId(rootCommentId, replyCommentId, bodyText) {
-  const hash2 = crypto3.createHash("sha256").update(`${rootCommentId}\0${replyCommentId}\0${bodyText}`).digest("hex").slice(0, 12);
+  const hash2 = crypto3.createHash("sha256").update(`${rootCommentId} ${replyCommentId} ${bodyText}`).digest("hex").slice(0, 12);
   return `import-reply-${hash2}`;
 }
 async function extractDocxComments(buffer4) {
@@ -62018,7 +62028,28 @@ function injectCommentsAsAnnotations(doc, comments, fileName) {
   const sourceFile = fileName ?? "unknown";
   let injected = 0;
   let migrated = 0;
+  let reanchored = 0;
   let injectedReplies = 0;
+  const byCommentId = /* @__PURE__ */ new Map();
+  for (const [key, val] of map5) {
+    const cid = val?.importSource?.commentId;
+    if (!isCanonicalWordId(cid)) continue;
+    const isPromoted = val.promotedFrom === "note";
+    if (val.author !== "import" && !isPromoted) continue;
+    const existing = byCommentId.get(cid);
+    if (!existing) {
+      byCommentId.set(cid, { key, ann: val });
+    } else if (isPromoted && existing.ann.promotedFrom !== "note") {
+      byCommentId.set(cid, { key, ann: val });
+      console.error(
+        `[docx-comments] Duplicate imported commentId ${cid}: preferred promoted record ${key} over import note ${existing.key}.`
+      );
+    } else {
+      console.error(
+        `[docx-comments] Duplicate imported commentId ${cid}: kept ${existing.key}, ignored ${key}.`
+      );
+    }
+  }
   withInternal(doc, () => {
     for (const comment of comments) {
       const result2 = anchoredRange(doc, toFlatOffset(comment.from), toFlatOffset(comment.to));
@@ -62028,60 +62059,79 @@ function injectCommentsAsAnnotations(doc, comments, fileName) {
         );
         continue;
       }
-      const id2 = importAnnotationId(comment.commentId, comment.from, comment.to, comment.bodyText);
-      if (map5.has(id2)) {
-        const existing = map5.get(id2);
+      const offsetId = importAnnotationId(
+        comment.commentId,
+        comment.from,
+        comment.to,
+        comment.bodyText
+      );
+      let effectiveKey = offsetId;
+      const importSource = {
+        author: comment.authorName,
+        file: sourceFile,
+        commentId: comment.commentId.slice(0, IMPORT_COMMENT_ID_MAX)
+      };
+      if (map5.has(offsetId)) {
+        const existing = map5.get(offsetId);
         if (existing && existing.author === "import" && (existing.type === "comment" || existing.audience !== "private")) {
-          map5.set(id2, {
+          map5.set(offsetId, {
             ...existing,
             type: "note",
             audience: "private",
             content: comment.bodyText,
-            importSource: {
-              author: comment.authorName,
-              file: sourceFile,
-              commentId: comment.commentId.slice(0, IMPORT_COMMENT_ID_MAX)
-            },
+            importSource,
             rev: nextRev(existing)
           });
           migrated++;
         } else if (existing && existing.author === "import" && existing.importSource && existing.importSource.commentId === void 0) {
-          map5.set(id2, {
+          map5.set(offsetId, {
             ...existing,
-            importSource: {
-              ...existing.importSource,
-              commentId: comment.commentId.slice(0, IMPORT_COMMENT_ID_MAX)
-            },
+            importSource: { ...existing.importSource, commentId: importSource.commentId },
             rev: nextRev(existing)
           });
         }
       } else {
-        const annotation = {
-          id: id2,
-          author: "import",
-          type: "note",
-          audience: "private",
-          range: { from: result2.range.from, to: result2.range.to },
-          content: comment.bodyText,
-          status: "pending",
-          timestamp: comment.date ? new Date(comment.date).getTime() : Date.now(),
-          rev: nextRev(),
-          importSource: {
-            author: comment.authorName,
-            file: sourceFile,
-            commentId: comment.commentId.slice(0, IMPORT_COMMENT_ID_MAX)
-          },
-          ...result2.fullyAnchored ? { relRange: result2.relRange } : {}
-        };
-        map5.set(id2, annotation);
-        injected++;
+        const drift = isCanonicalWordId(comment.commentId) ? byCommentId.get(comment.commentId) : void 0;
+        if (drift && drift.ann.author === "import") {
+          effectiveKey = drift.key;
+          const { relRange: _staleRel, textSnapshot: _staleSnap, ...existingRest } = drift.ann;
+          map5.set(drift.key, {
+            ...existingRest,
+            type: "note",
+            audience: "private",
+            content: comment.bodyText,
+            range: { from: result2.range.from, to: result2.range.to },
+            importSource,
+            rev: nextRev(drift.ann),
+            ...result2.fullyAnchored ? { relRange: result2.relRange } : {}
+          });
+          reanchored++;
+        } else if (drift && drift.ann.promotedFrom === "note") {
+          effectiveKey = drift.key;
+        } else {
+          const annotation = {
+            id: offsetId,
+            author: "import",
+            type: "note",
+            audience: "private",
+            range: { from: result2.range.from, to: result2.range.to },
+            content: comment.bodyText,
+            status: "pending",
+            timestamp: comment.date ? new Date(comment.date).getTime() : Date.now(),
+            rev: nextRev(),
+            importSource,
+            ...result2.fullyAnchored ? { relRange: result2.relRange } : {}
+          };
+          map5.set(offsetId, annotation);
+          injected++;
+        }
       }
       for (const reply of comment.replies ?? []) {
         const replyId = importReplyId(comment.commentId, reply.commentId, reply.bodyText);
         if (repliesMap.has(replyId)) continue;
         const replyRecord = {
           id: replyId,
-          annotationId: id2,
+          annotationId: effectiveKey,
           author: "import",
           text: reply.bodyText.slice(0, IMPORT_REPLY_BODY_CAP),
           timestamp: reply.date ? new Date(reply.date).getTime() : Date.now(),
@@ -62094,9 +62144,9 @@ function injectCommentsAsAnnotations(doc, comments, fileName) {
       }
     }
   });
-  if (injected > 0 || migrated > 0 || injectedReplies > 0 || comments.length > 0) {
+  if (injected > 0 || migrated > 0 || reanchored > 0 || injectedReplies > 0) {
     console.error(
-      `[docx-comments] Imported ${injected}/${comments.length} Word comments as private notes` + (injectedReplies > 0 ? ` + ${injectedReplies} threaded replies` : "") + (migrated > 0 ? ` (migrated ${migrated} legacy records to note shape)` : "")
+      `[docx-comments] Imported ${injected}/${comments.length} Word comments as private notes` + (injectedReplies > 0 ? ` + ${injectedReplies} threaded replies` : "") + (migrated > 0 ? ` (migrated ${migrated} legacy records to note shape)` : "") + (reanchored > 0 ? ` (re-anchored ${reanchored} drifted notes)` : "")
     );
   }
   return injected;
@@ -62112,6 +62162,7 @@ var init_docx_comments = __esm({
     init_types3();
     init_schema();
     init_positions2();
+    init_docx_comment_id();
     init_docx_walker();
     MAX_THREAD_DEPTH = 64;
     IMPORT_COMMENT_ID_MAX = 32;
@@ -82618,10 +82669,7 @@ function isImportReply(reply) {
   return reply.author === "import" && typeof reply.importAuthor === "string" && reply.importAuthor.length > 0;
 }
 function reusableCommentId(raw) {
-  if (!raw || !/^\d{1,9}$/.test(raw)) return null;
-  const n = Number(raw);
-  if (String(n) !== raw) return null;
-  return n;
+  return isCanonicalWordId(raw) ? Number(raw) : null;
 }
 function authorLabel(ann) {
   const imported = ann.importSource?.author?.trim();
@@ -82753,6 +82801,7 @@ var init_docx_comment_export = __esm({
     init_sanitize();
     init_document_model();
     init_positions2();
+    init_docx_comment_id();
   }
 });
 
@@ -93454,6 +93503,7 @@ __export(apply_exports, {
   refreshSkillIfStale: () => refreshSkillIfStale,
   removeConfigEntries: () => removeConfigEntries,
   resolveChannelDist: () => resolveChannelDist,
+  resolveCliVersion: () => resolveCliVersion,
   shouldRegisterChannelShim: () => shouldRegisterChannelShim,
   validateChannelShimPrereq: () => validateChannelShimPrereq
 });
@@ -93492,6 +93542,19 @@ function resolveChannelDist(env3 = process.env, exists = existsSync) {
   }
   return resolve3(PACKAGE_ROOT, "dist/channel/index.js");
 }
+function resolveCliVersion() {
+  if (true) return "0.16.0";
+  if (true) return "0.16.0";
+  for (const rel of ["../../package.json", "../../../package.json"]) {
+    try {
+      const pkg = JSON.parse(readFileSync2(resolve3(__dirname2, rel), "utf8"));
+      if (pkg.version) return pkg.version;
+    } catch {
+    }
+  }
+  console.error("[Tandem] Could not resolve CLI version for npx pin; using unpinned fallback");
+  return "0.0.0-unknown";
+}
 function applyOpsForCli(create9, opts) {
   return {
     create: create9,
@@ -93508,7 +93571,7 @@ function buildMcpEntries(channelPath, opts = {}) {
     }
     tandemEntry = {
       command: "npx",
-      args: ["-y", "tandem-editor", "mcp-stdio"],
+      args: ["-y", `tandem-editor@${CLI_VERSION}`, "mcp-stdio"],
       env: env3
     };
   } else {
@@ -93928,7 +93991,7 @@ async function applyConfigWithToken(token, opts = {}) {
   }
   return { updated, errors };
 }
-var __dirname2, PACKAGE_ROOT, CHANNEL_DIST, MCP_URL, MAX_CONFIG_BYTES, PathRejectedError, DEFAULT_ROOTS_CACHE, MSIX_PACKAGE_PATTERN, BUNDLED_SKILL_VERSION, lastSkillRefreshError;
+var __dirname2, PACKAGE_ROOT, CHANNEL_DIST, MCP_URL, CLI_VERSION, MAX_CONFIG_BYTES, PathRejectedError, DEFAULT_ROOTS_CACHE, MSIX_PACKAGE_PATTERN, BUNDLED_SKILL_VERSION, lastSkillRefreshError;
 var init_apply = __esm({
   "src/server/integrations/apply.ts"() {
     "use strict";
@@ -93945,6 +94008,7 @@ var init_apply = __esm({
     })();
     CHANNEL_DIST = resolveChannelDist();
     MCP_URL = `http://127.0.0.1:${DEFAULT_MCP_PORT}`;
+    CLI_VERSION = resolveCliVersion();
     MAX_CONFIG_BYTES = 5 * 1024 * 1024;
     PathRejectedError = class extends Error {
       constructor(path33, reason, message) {
@@ -94694,7 +94758,7 @@ var init_license_gate = __esm({
 });
 
 // src/server/mcp/output-schemas.ts
-var FlatRangeSchema, RelativeRangeSchema2, VisibleAnnotationTypeSchema, annotationBaseShape, VisibleReplySchema, openDocumentEntry, statusOutputShape, getTextContentOutputShape, annotationWithRepliesSchema, getAnnotationsOutputShape, userActionSchema, userResponseSchema, inboxChatMessageSchema, checkInboxOutputShape, listDocumentsOutputShape, searchOutputShape;
+var FlatRangeSchema, RelativeRangeSchema2, VisibleAnnotationTypeSchema, annotationBaseShape, VisibleReplySchema, openDocumentEntry, statusOutputShape, getTextContentOutputShape, annotationWithRepliesSchema, getAnnotationsOutputShape, userActionSchema, userResponseSchema, inboxChatMessageSchema, checkInboxOutputShape, listDocumentsOutputShape, searchOutputShape, doctorResultSchema, diagnosticsOutputShape;
 var init_output_schemas = __esm({
   "src/server/mcp/output-schemas.ts"() {
     "use strict";
@@ -94828,6 +94892,28 @@ var init_output_schemas = __esm({
       matches: external_exports.array(external_exports.object({ from: external_exports.number(), to: external_exports.number(), text: external_exports.string() })),
       count: external_exports.number()
     };
+    doctorResultSchema = external_exports.object({
+      check: external_exports.string(),
+      status: external_exports.enum(["pass", "warn", "fail"]),
+      message: external_exports.string(),
+      fix: external_exports.string().optional().describe("Suggested remediation when the check did not pass"),
+      data: external_exports.record(external_exports.string(), external_exports.unknown()).optional().describe("Per-check detail bag")
+    });
+    diagnosticsOutputShape = {
+      ok: external_exports.boolean().describe("True when no checks failed"),
+      crashed: external_exports.boolean().describe("True if the diagnostic collector itself threw"),
+      failures: external_exports.number(),
+      warnings: external_exports.number(),
+      summary: external_exports.string().describe("One-line human-readable summary"),
+      error: external_exports.string().nullable().describe("Collector-level error message, or null"),
+      results: external_exports.array(doctorResultSchema),
+      version: external_exports.string().describe("Running Tandem version"),
+      transport: external_exports.enum(["http", "stdio"]).describe("Transport this MCP server is serving"),
+      platform: external_exports.string().describe("process.platform"),
+      arch: external_exports.string().describe("process.arch"),
+      nodeVersion: external_exports.string().describe("process.version"),
+      tauriSidecar: external_exports.boolean().describe("True when running as the Tauri desktop sidecar")
+    };
   }
 });
 
@@ -129341,6 +129427,7 @@ var init_convert2 = __esm({
 });
 
 // src/cli/doctor.ts
+import { execFile as execFile3 } from "child_process";
 import { existsSync as existsSync2, readdirSync as readdirSync2, readFileSync as readFileSync3, statSync as statSync2 } from "fs";
 import { request } from "http";
 import { createConnection } from "net";
@@ -129716,6 +129803,58 @@ function summarizeDoctorResults(failures, warnings) {
     return `${warnings} warning(s) \u2014 Tandem should work, but check the items above.`;
   return "All checks passed. Tandem is ready.";
 }
+function globalTandemEditorVersion() {
+  return new Promise((resolve5) => {
+    execFile3(
+      "npm",
+      ["ls", "-g", "--depth=0", "--json", "tandem-editor"],
+      { shell: true, windowsHide: true, timeout: 4e3, maxBuffer: 8 * 1024 * 1024 },
+      (_err, stdout) => {
+        if (!stdout || stdout.trim().length === 0) {
+          resolve5(null);
+          return;
+        }
+        try {
+          const parsed = JSON.parse(stdout);
+          resolve5(parsed.dependencies?.["tandem-editor"]?.version ?? null);
+        } catch {
+          resolve5(null);
+        }
+      }
+    );
+  });
+}
+function evaluateStaleGlobal(bundled, globalVersion) {
+  if (globalVersion === null) {
+    return null;
+  }
+  if (globalVersion === bundled) {
+    return { status: "pass", message: `Global tandem-editor@${globalVersion} matches this build` };
+  }
+  return {
+    status: "warn",
+    message: `Global tandem-editor@${globalVersion} differs from this build (${bundled}) \u2014 a stale global can break \`npx tandem-editor\` (e.g. Claude Desktop's MCP bridge).`,
+    fix: "npm uninstall -g tandem-editor   (or: npm install -g tandem-editor@latest)",
+    data: { globalVersion, bundledVersion: bundled }
+  };
+}
+async function checkStaleGlobal(r) {
+  const bundled = true ? "0.16.0" : null;
+  if (!bundled) return;
+  let globalVersion;
+  try {
+    globalVersion = await globalTandemEditorVersion();
+  } catch {
+    return;
+  }
+  const result2 = evaluateStaleGlobal(bundled, globalVersion);
+  if (!result2) return;
+  if (result2.status === "pass") {
+    r.pass(result2.message);
+  } else {
+    r.warn(result2.message, result2.fix, result2.data);
+  }
+}
 async function runDoctor(opts = {}) {
   const wsPort2 = opts.wsPort ?? DEFAULT_WS_PORT;
   const mcpPort2 = opts.mcpPort ?? DEFAULT_MCP_PORT;
@@ -129725,6 +129864,7 @@ async function runDoctor(opts = {}) {
   await r.check("mcp-json", () => checkMcpJson(r));
   await r.check("user-mcp-config", () => checkUserMcpConfig(r));
   await r.check("annotation-store", () => checkAnnotationStore(r));
+  await r.check("stale-global", () => checkStaleGlobal(r));
   const { mcp } = await r.check("ports", () => checkPorts(r, wsPort2, mcpPort2));
   if (mcp) {
     const healthy = await r.check("health", () => checkHealth(r, mcpPort2));
@@ -129914,12 +130054,20 @@ var init_document_reload = __esm({
 async function handleResolveDocxConflict(req, res) {
   if (assertOriginAllowlisted(req, res, API_DOCX_CONFLICT_RESOLVE)) return;
   if (assertLoopbackForMutation(req, res)) return;
-  const { choice } = req.body ?? {};
+  const { documentId, choice } = req.body ?? {};
   if (choice !== "keep" && choice !== "reload") {
     res.status(400).json({ error: "BAD_REQUEST", message: 'choice must be "keep" or "reload".' });
     return;
   }
-  const docId = getActiveDocId();
+  if (documentId !== void 0 && typeof documentId !== "string") {
+    res.status(400).json({ error: "BAD_REQUEST", message: "documentId must be a string" });
+    return;
+  }
+  if (typeof documentId === "string" && documentId.length > 0 && !hasDoc(documentId)) {
+    res.status(400).json({ error: "NO_DOCUMENT", message: `Document ${documentId} is not open.` });
+    return;
+  }
+  const docId = documentId?.length ? documentId : getActiveDocId();
   if (!docId) {
     res.status(400).json({ error: "BAD_REQUEST", message: "No active document." });
     return;
@@ -130838,11 +130986,11 @@ function validateTandemEntry(entry) {
   }
   const args2 = Array.isArray(entry.args) ? entry.args : [];
   if (entry.command === "npx") {
-    const argsOk = args2.length === TANDEM_STDIO_NPX_ARGS.length && TANDEM_STDIO_NPX_ARGS.every((expected, i) => args2[i] === expected);
+    const argsOk = args2.length === 3 && args2[0] === TANDEM_STDIO_NPX_HEAD[0] && typeof args2[1] === "string" && TANDEM_EDITOR_SPEC_RE.test(args2[1]) && args2[2] === TANDEM_STDIO_NPX_TAIL[0];
     if (!argsOk) {
       return {
         status: "invalid-args",
-        reason: `npx args must be ${JSON.stringify(TANDEM_STDIO_NPX_ARGS)}; got ${JSON.stringify(args2)}`
+        reason: `npx args must be ${JSON.stringify(TANDEM_STDIO_NPX_ARGS)} (the package may be version-pinned as 'tandem-editor@<version>'); got ${JSON.stringify(args2)}`
       };
     }
     return { status: "valid" };
@@ -130929,19 +131077,22 @@ function extractEntry(mcp, name2) {
 function hasExistingTandemEntry(installs) {
   return installs.some((i) => i.tandemEntry !== void 0);
 }
-var TANDEM_STDIO_NPX_ARGS;
+var TANDEM_STDIO_NPX_HEAD, TANDEM_STDIO_NPX_TAIL, TANDEM_EDITOR_SPEC_RE, TANDEM_STDIO_NPX_ARGS;
 var init_existing_config = __esm({
   "src/server/integrations/existing-config.ts"() {
     "use strict";
     init_shared();
     init_apply();
     init_schema2();
-    TANDEM_STDIO_NPX_ARGS = ["-y", "tandem-editor", "mcp-stdio"];
+    TANDEM_STDIO_NPX_HEAD = ["-y"];
+    TANDEM_STDIO_NPX_TAIL = ["mcp-stdio"];
+    TANDEM_EDITOR_SPEC_RE = /^tandem-editor(@\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?)?$/;
+    TANDEM_STDIO_NPX_ARGS = [...TANDEM_STDIO_NPX_HEAD, "tandem-editor", ...TANDEM_STDIO_NPX_TAIL];
   }
 });
 
 // src/server/integrations/install-claude-cli.ts
-import { execFile as execFile3 } from "child_process";
+import { execFile as execFile4 } from "child_process";
 import { mkdtemp, rm as rm2, writeFile as writeFile2 } from "fs/promises";
 import { get as httpsGetDefault } from "https";
 import { tmpdir as tmpdir3 } from "os";
@@ -131139,7 +131290,7 @@ var init_install_claude_cli = __esm({
     "use strict";
     init_acl_win();
     init_apply();
-    execFileAsyncDefault = promisify3(execFile3);
+    execFileAsyncDefault = promisify3(execFile4);
     INSTALLER_HOST = "claude.ai";
     INSTALLER_URL_POSIX = "https://claude.ai/install.sh";
     INSTALLER_URL_WIN = "https://claude.ai/install.ps1";
@@ -132124,15 +132275,20 @@ var init_contract2 = __esm({
 // src/server/launcher/supervisor.ts
 var supervisor_exports = {};
 __export(supervisor_exports, {
+  RESUME_CONFIRM_MS: () => RESUME_CONFIRM_MS,
   createSupervisor: () => createSupervisor,
   resolveRouteCwd: () => resolveRouteCwd,
-  resolveSafeCwd: () => resolveSafeCwd
+  resolveSafeCwd: () => resolveSafeCwd,
+  shouldClearSession: () => shouldClearSession
 });
 import { spawn as spawn2 } from "child_process";
 import { randomUUID as randomUUID9 } from "crypto";
 import fs19 from "fs";
 import os2 from "os";
 import path28 from "path";
+function shouldClearSession(opts) {
+  return opts.resuming && opts.code !== null && opts.code !== 0 && !opts.resumeConfirmed;
+}
 function createSupervisor(opts) {
   let child = null;
   let currentCwd;
@@ -132141,6 +132297,7 @@ function createSupervisor(opts) {
   let stopRequested = false;
   let restartIndex = 0;
   let restartTimer = null;
+  let confirmTimer = null;
   let recentAttempts = [];
   let breakerTripped = false;
   let opLock = Promise.resolve();
@@ -132266,11 +132423,22 @@ function createSupervisor(opts) {
       writeSavedSession(plan.sessionId);
     }
     const spawnedAt = Date.now();
+    let resumeConfirmed = !plan.resuming;
+    if (plan.resuming) {
+      confirmTimer = setTimeout(() => {
+        resumeConfirmed = true;
+        confirmTimer = null;
+      }, RESUME_CONFIRM_MS);
+    }
     child.stderr?.on("data", (chunk2) => {
       const line = chunk2.toString().trimEnd();
       if (line) console.error(`[Claude] ${line}`);
     });
     child.on("error", (err) => {
+      if (confirmTimer) {
+        clearTimeout(confirmTimer);
+        confirmTimer = null;
+      }
       child = null;
       currentCwd = void 0;
       currentSessionId = void 0;
@@ -132291,8 +132459,12 @@ function createSupervisor(opts) {
       const ranFor = Date.now() - spawnedAt;
       console.error(`[Launcher] Reaper exited (code=${code3} signal=${signal} after ${ranFor}ms)`);
       child = null;
-      if (plan.resuming && code3 !== 0 && ranFor < RESUME_GRACE_MS) {
-        console.error("[Launcher] Resume failed within grace window \u2014 clearing saved session");
+      if (confirmTimer) {
+        clearTimeout(confirmTimer);
+        confirmTimer = null;
+      }
+      if (shouldClearSession({ resuming: plan.resuming, code: code3, resumeConfirmed })) {
+        console.error("[Launcher] Resume failed before confirmation \u2014 clearing saved session");
         clearSavedSession();
       }
       if (stopRequested) return;
@@ -132360,7 +132532,7 @@ function createSupervisor(opts) {
       await spawnOnce(plan);
       setTimeout(() => {
         if (child) restartIndex = 0;
-      }, RESUME_GRACE_MS);
+      }, RESUME_CONFIRM_MS);
     } catch (err) {
       console.error("[Launcher] Spawn failed:", err);
     }
@@ -132384,6 +132556,10 @@ function createSupervisor(opts) {
       clearTimeout(restartTimer);
       restartTimer = null;
     }
+    if (confirmTimer) {
+      clearTimeout(confirmTimer);
+      confirmTimer = null;
+    }
     const c = child;
     if (!c || c.killed) return;
     try {
@@ -132476,14 +132652,14 @@ function resolveRouteCwd(candidate, opts = {}) {
   if (rel.startsWith("..") || path28.isAbsolute(rel)) return null;
   return safe2;
 }
-var SESSION_FILE_NAME, RESUME_GRACE_MS, RESTART_BACKOFFS_MS, CIRCUIT_BREAKER_MAX_ATTEMPTS, CIRCUIT_BREAKER_WINDOW_MS, UUID_V4_PATTERN;
+var SESSION_FILE_NAME, RESUME_CONFIRM_MS, RESTART_BACKOFFS_MS, CIRCUIT_BREAKER_MAX_ATTEMPTS, CIRCUIT_BREAKER_WINDOW_MS, UUID_V4_PATTERN;
 var init_supervisor = __esm({
   "src/server/launcher/supervisor.ts"() {
     "use strict";
     init_contract2();
     init_storage2();
     SESSION_FILE_NAME = "launcher-session.json";
-    RESUME_GRACE_MS = 5e3;
+    RESUME_CONFIRM_MS = 3e4;
     RESTART_BACKOFFS_MS = [1e3, 5e3, 3e4];
     CIRCUIT_BREAKER_MAX_ATTEMPTS = 10;
     CIRCUIT_BREAKER_WINDOW_MS = 5 * 6e4;
@@ -157904,7 +158080,7 @@ var init_childProcess = __esm({
 });
 
 // node_modules/@sentry/node-core/build/esm/integrations/context.js
-import { execFile as execFile4 } from "child_process";
+import { execFile as execFile5 } from "child_process";
 import { readFile as readFile3, readdir as readdir2 } from "fs";
 import * as os3 from "os";
 import { join as join10 } from "path";
@@ -158081,7 +158257,7 @@ async function getDarwinInfo() {
   };
   try {
     const output = await new Promise((resolve5, reject2) => {
-      execFile4("/usr/bin/sw_vers", (error5, stdout) => {
+      execFile5("/usr/bin/sw_vers", (error5, stdout) => {
         if (error5) {
           reject2(error5);
           return;
@@ -187897,12 +188073,48 @@ function registerChannelRoutes(app, apiMiddleware2) {
   });
 }
 
+// src/server/mcp/diagnostics.ts
+init_doctor();
+init_constants();
+init_output_schemas();
+init_response();
+init_diagnostics();
+function registerDiagnosticsTools(server, deps = {}) {
+  const version3 = deps.version ?? "unknown";
+  const transport = deps.transport ?? "http";
+  const wsPort2 = deps.wsPort ?? DEFAULT_WS_PORT;
+  const mcpPort2 = deps.mcpPort ?? DEFAULT_MCP_PORT;
+  const collect = deps.collect ?? runDoctor;
+  server.registerTool(
+    "tandem_diagnostics",
+    {
+      description: "Read connection and boot health (Node version, config registration, port probes, /health, SSE) as a structured report. No params. Use this to self-diagnose a broken Tandem connection over MCP instead of asking the user to run `tandem doctor`.",
+      inputSchema: {},
+      outputSchema: diagnosticsOutputShape
+    },
+    withStructuredErrors(
+      withErrorBoundary("tandem_diagnostics", async () => {
+        const report = filterDevRepoChecks(await collect({ wsPort: wsPort2, mcpPort: mcpPort2 }));
+        return mcpStructured({
+          ...report,
+          version: version3,
+          transport,
+          platform: process.platform,
+          arch: process.arch,
+          nodeVersion: process.version,
+          tauriSidecar: process.env.TANDEM_TAURI_SIDECAR === "1"
+        });
+      })
+    )
+  );
+}
+
 // src/server/mcp/server.ts
 init_document2();
 init_document_service();
 init_docx_apply2();
 var esmRequire2 = createRequire2(import.meta.url);
-var APP_VERSION = true ? "0.14.3" : _readVersionFromDisk();
+var APP_VERSION = true ? "0.16.0" : _readVersionFromDisk();
 var MCP_SDK_VERSION = true ? "1.27.1" : "0.0.0-unknown";
 var __dirname3 = dirname3(fileURLToPath4(import.meta.url));
 var CLIENT_DIST = join7(__dirname3, "../client");
@@ -187928,7 +188140,7 @@ var WORKFLOWS_PATH = findRepoFile(__dirname3, "docs/workflows.md");
 var mcpServer = null;
 var currentTransport = null;
 var connectingPromise = null;
-function createMcpServer() {
+function createMcpServer(diagnostics = {}) {
   const server = new McpServer({
     name: "tandem",
     version: APP_VERSION
@@ -187938,6 +188150,7 @@ function createMcpServer() {
   registerNavigationTools(server);
   registerAwarenessTools(server);
   registerApplyTools(server);
+  registerDiagnosticsTools(server, diagnostics);
   return server;
 }
 function jsonrpcId(body) {
@@ -187973,7 +188186,7 @@ async function closeMcpSession() {
   }
 }
 async function startMcpServerStdio() {
-  const server = createMcpServer();
+  const server = createMcpServer({ version: APP_VERSION, transport: "stdio" });
   const transport = new StdioServerTransport();
   await server.connect(transport);
 }
@@ -187986,7 +188199,7 @@ function snapshotToolCount(server) {
   return Object.keys(tools).length;
 }
 async function startMcpServerHttp(port, host = DEFAULT_BIND_HOST, token, resolvedLanIP, launcher, wsPort2 = DEFAULT_WS_PORT, shutdownWiring) {
-  mcpServer = createMcpServer();
+  mcpServer = createMcpServer({ version: APP_VERSION, transport: "http", wsPort: wsPort2, mcpPort: port });
   const toolCount = snapshotToolCount(mcpServer);
   const { default: express2 } = await Promise.resolve().then(() => __toESM(require_express2(), 1));
   const app = express2();