tandem-editor 0.5.0 → 0.6.0

package/dist/server/index.js

@@ -8428,13 +8428,13 @@ var require_thenables = __commonJS({
         promise._captureStackTrace();
         if (context) context._popContext();
         var synchronous = true;
-        var result2 = util2.tryCatch(then).call(x, resolve2, reject2);
+        var result2 = util2.tryCatch(then).call(x, resolve3, reject2);
         synchronous = false;
         if (promise && result2 === errorObj2) {
           promise._rejectCallback(result2.e, true, true);
           promise = null;
         }
-        function resolve2(value) {
+        function resolve3(value) {
           if (!promise) return;
           promise._resolveCallback(value);
           promise = null;
@@ -8969,9 +8969,9 @@ var require_debuggability = __commonJS({
         return false;
       }
       Promise2.prototype._fireEvent = defaultFireEvent;
-      Promise2.prototype._execute = function(executor, resolve2, reject2) {
+      Promise2.prototype._execute = function(executor, resolve3, reject2) {
         try {
-          executor(resolve2, reject2);
+          executor(resolve3, reject2);
         } catch (e) {
           return e;
         }
@@ -8994,10 +8994,10 @@ var require_debuggability = __commonJS({
         ;
         ;
       };
-      function cancellationExecute(executor, resolve2, reject2) {
+      function cancellationExecute(executor, resolve3, reject2) {
         var promise = this;
         try {
-          executor(resolve2, reject2, function(onCancel) {
+          executor(resolve3, reject2, function(onCancel) {
             if (typeof onCancel !== "function") {
               throw new TypeError("onCancel must be a function, got: " + util2.toString(onCancel));
             }
@@ -12644,14 +12644,14 @@ var require_promises = __commonJS({
       });
     };
     function defer() {
-      var resolve2;
+      var resolve3;
       var reject2;
       var promise = new bluebird.Promise(function(resolveArg, rejectArg) {
-        resolve2 = resolveArg;
+        resolve3 = resolveArg;
         reject2 = rejectArg;
       });
       return {
-        resolve: resolve2,
+        resolve: resolve3,
         reject: reject2,
         promise
       };
@@ -15325,8 +15325,8 @@ var require_lib2 = __commonJS({
         return this;
       }
       var p = this.constructor;
-      return this.then(resolve3, reject3);
-      function resolve3(value) {
+      return this.then(resolve4, reject3);
+      function resolve4(value) {
         function yes() {
           return value;
         }
@@ -15479,8 +15479,8 @@ var require_lib2 = __commonJS({
       }
       return out;
     }
-    Promise2.resolve = resolve2;
-    function resolve2(value) {
+    Promise2.resolve = resolve3;
+    function resolve3(value) {
       if (value instanceof this) {
         return value;
       }
@@ -16012,10 +16012,10 @@ var require_utils = __commonJS({
       var promise = external.Promise.resolve(inputData).then(function(data) {
         var isBlob = support.blob && (data instanceof Blob || ["[object File]", "[object Blob]"].indexOf(Object.prototype.toString.call(data)) !== -1);
         if (isBlob && typeof FileReader !== "undefined") {
-          return new external.Promise(function(resolve2, reject2) {
+          return new external.Promise(function(resolve3, reject2) {
             var reader = new FileReader();
             reader.onload = function(e) {
-              resolve2(e.target.result);
+              resolve3(e.target.result);
             };
             reader.onerror = function(e) {
               reject2(e.target.error);
@@ -16570,7 +16570,7 @@ var require_StreamHelper = __commonJS({
       }
     }
     function accumulate(helper, updateCallback) {
-      return new external.Promise(function(resolve2, reject2) {
+      return new external.Promise(function(resolve3, reject2) {
         var dataArray = [];
         var chunkType = helper._internalType, resultType = helper._outputType, mimeType = helper._mimeType;
         helper.on("data", function(data, meta2) {
@@ -16584,7 +16584,7 @@ var require_StreamHelper = __commonJS({
         }).on("end", function() {
           try {
             var result2 = transformZipOutput(resultType, concat(chunkType, dataArray), mimeType);
-            resolve2(result2);
+            resolve3(result2);
           } catch (e) {
             reject2(e);
           }
@@ -22697,7 +22697,7 @@ var require_load = __commonJS({
     var Crc32Probe = require_Crc32Probe();
     var nodejsUtils = require_nodejsUtils();
     function checkEntryCRC32(zipEntry) {
-      return new external.Promise(function(resolve2, reject2) {
+      return new external.Promise(function(resolve3, reject2) {
         var worker = zipEntry.decompressed.getContentWorker().pipe(new Crc32Probe());
         worker.on("error", function(e) {
           reject2(e);
@@ -22705,7 +22705,7 @@ var require_load = __commonJS({
           if (worker.streamInfo.crc32 !== zipEntry.decompressed.crc32) {
             reject2(new Error("Corrupted zip : CRC32 mismatch"));
           } else {
-            resolve2();
+            resolve3();
           }
         }).resume();
       });
@@ -32473,7 +32473,7 @@ var require_files = __commonJS({
     var fs9 = __require("fs");
     var url = __require("url");
     var os2 = __require("os");
-    var dirname3 = __require("path").dirname;
+    var dirname4 = __require("path").dirname;
     var resolvePath = __require("path").resolve;
     var isAbsolutePath = require_path_is_absolute();
     var promises = require_promises();
@@ -32488,7 +32488,7 @@ var require_files = __commonJS({
           }
         };
       }
-      var base = options.relativeToFile ? dirname3(options.relativeToFile) : null;
+      var base = options.relativeToFile ? dirname4(options.relativeToFile) : null;
       function read(uri, encoding) {
         return resolveUri(uri).then(function(path13) {
           return readFile(path13, encoding).caught(function(error2) {
@@ -36917,17 +36917,17 @@ var init_yjs = __esm({
         this.isLoaded = false;
         this.isSynced = false;
         this.isDestroyed = false;
-        this.whenLoaded = create5((resolve2) => {
+        this.whenLoaded = create5((resolve3) => {
           this.on("load", () => {
             this.isLoaded = true;
-            resolve2(this);
+            resolve3(this);
           });
         });
-        const provideSyncedPromise = () => create5((resolve2) => {
+        const provideSyncedPromise = () => create5((resolve3) => {
           const eventHandler = (isSynced) => {
             if (isSynced === void 0 || isSynced === true) {
               this.off("sync", eventHandler);
-              resolve2();
+              resolve3();
             }
           };
           this.on("sync", eventHandler);
@@ -49050,10 +49050,10 @@ function resolveAll(constructs2, events, context) {
   const called = [];
   let index2 = -1;
   while (++index2 < constructs2.length) {
-    const resolve2 = constructs2[index2].resolveAll;
-    if (resolve2 && !called.includes(resolve2)) {
-      events = resolve2(events, context);
-      called.push(resolve2);
+    const resolve3 = constructs2[index2].resolveAll;
+    if (resolve3 && !called.includes(resolve3)) {
+      events = resolve3(events, context);
+      called.push(resolve3);
     }
   }
   return events;
@@ -55684,10 +55684,10 @@ var init_lib21 = __esm({
        * @returns {undefined}
        *   Nothing.
        */
-      set basename(basename) {
-        assertNonEmpty(basename, "basename");
-        assertPart(basename, "basename");
-        this.path = default2.join(this.dirname || "", basename);
+      set basename(basename2) {
+        assertNonEmpty(basename2, "basename");
+        assertPart(basename2, "basename");
+        this.path = default2.join(this.dirname || "", basename2);
       }
       /**
        * Get the parent path (example: `'~'`).
@@ -55708,9 +55708,9 @@ var init_lib21 = __esm({
        * @returns {undefined}
        *   Nothing.
        */
-      set dirname(dirname3) {
+      set dirname(dirname4) {
         assertPath(this.basename, "dirname");
-        this.path = default2.join(dirname3 || "", this.basename);
+        this.path = default2.join(dirname4 || "", this.basename);
       }
       /**
        * Get the extname (including dot) (example: `'.js'`).
@@ -56357,7 +56357,7 @@ var init_lib22 = __esm({
         assertParser("process", this.parser || this.Parser);
         assertCompiler("process", this.compiler || this.Compiler);
         return done ? executor(void 0, done) : new Promise(executor);
-        function executor(resolve2, reject2) {
+        function executor(resolve3, reject2) {
           const realFile = vfile(file);
           const parseTree = (
             /** @type {HeadTree extends undefined ? Node : HeadTree} */
@@ -56388,8 +56388,8 @@ var init_lib22 = __esm({
           function realDone(error2, file2) {
             if (error2 || !file2) {
               reject2(error2);
-            } else if (resolve2) {
-              resolve2(file2);
+            } else if (resolve3) {
+              resolve3(file2);
             } else {
               ok(done, "`done` is defined if `resolve` is not");
               done(void 0, file2);
@@ -56491,7 +56491,7 @@ var init_lib22 = __esm({
           file = void 0;
         }
         return done ? executor(void 0, done) : new Promise(executor);
-        function executor(resolve2, reject2) {
+        function executor(resolve3, reject2) {
           ok(
             typeof file !== "function",
             "`file` can\u2019t be a `done` anymore, we checked"
@@ -56505,8 +56505,8 @@ var init_lib22 = __esm({
             );
             if (error2) {
               reject2(error2);
-            } else if (resolve2) {
-              resolve2(resultingTree);
+            } else if (resolve3) {
+              resolve3(resultingTree);
             } else {
               ok(done, "`done` is defined if `resolve` is not");
               done(void 0, resultingTree, file2);
@@ -60817,8 +60817,8 @@ var require_lib7 = __commonJS({
       if (typeof cb2 !== "function") {
         opts = cb2;
         cb2 = null;
-        deferred = new this.Promise(function(resolve2, reject2) {
-          deferredResolve = resolve2;
+        deferred = new this.Promise(function(resolve3, reject2) {
+          deferredResolve = resolve3;
           deferredReject = reject2;
         });
       }
@@ -60966,17 +60966,17 @@ var require_lib7 = __commonJS({
       if (typeof cb2 === "function") {
         fnx(cb2);
       } else {
-        return new this.Promise(function(resolve2, reject2) {
+        return new this.Promise(function(resolve3, reject2) {
           if (fnx.length === 1) {
             fnx(function(err, ret2) {
               if (err) {
                 reject2(err);
               } else {
-                resolve2(ret2);
+                resolve3(ret2);
               }
             });
           } else {
-            resolve2(fnx());
+            resolve3(fnx());
           }
         });
       }
@@ -66737,7 +66737,7 @@ var init_hocuspocus_server_esm = __esm({
           process.on("SIGQUIT", signalHandler);
           process.on("SIGTERM", signalHandler);
         }
-        return new Promise((resolve2, reject2) => {
+        return new Promise((resolve3, reject2) => {
           var _a;
           (_a = this.server) === null || _a === void 0 ? void 0 : _a.httpServer.listen({
             port: this.configuration.port,
@@ -66753,7 +66753,7 @@ var init_hocuspocus_server_esm = __esm({
             };
             try {
               await this.hooks("onListen", onListenPayload);
-              resolve2(this);
+              resolve3(this);
             } catch (e) {
               reject2(e);
             }
@@ -66837,19 +66837,19 @@ var init_hocuspocus_server_esm = __esm({
        * Destroy the server
        */
       async destroy() {
-        await new Promise(async (resolve2) => {
+        await new Promise(async (resolve3) => {
           var _a, _b, _c, _d;
           (_b = (_a = this.server) === null || _a === void 0 ? void 0 : _a.httpServer) === null || _b === void 0 ? void 0 : _b.close();
           try {
             this.configuration.extensions.push({
               async afterUnloadDocument({ instance }) {
                 if (instance.getDocumentsCount() === 0)
-                  resolve2("");
+                  resolve3("");
               }
             });
             (_d = (_c = this.server) === null || _c === void 0 ? void 0 : _c.webSocketServer) === null || _d === void 0 ? void 0 : _d.close();
             if (this.getDocumentsCount() === 0)
-              resolve2("");
+              resolve3("");
             this.closeConnections();
           } catch (error2) {
             console.error(error2);
@@ -67314,19 +67314,19 @@ async function waitForPort(port, timeoutMs = 5e3) {
   throw new Error(`Port ${port} still not available after ${timeoutMs}ms`);
 }
 function tryBind(port) {
-  return new Promise((resolve2, reject2) => {
+  return new Promise((resolve3, reject2) => {
     const srv = net.createServer();
     srv.once("error", (err) => {
       srv.close(() => {
         if (err.code === "EADDRINUSE") {
-          resolve2(false);
+          resolve3(false);
         } else {
           reject2(err);
         }
       });
     });
     srv.listen(port, "127.0.0.1", () => {
-      srv.close(() => resolve2(true));
+      srv.close(() => resolve3(true));
     });
   });
 }
@@ -75970,10 +75970,10 @@ var require_raw_body = __commonJS({
       if (done) {
         return readStream(stream, encoding, length3, limit, wrap3(done));
       }
-      return new Promise(function executor(resolve2, reject2) {
+      return new Promise(function executor(resolve3, reject2) {
         readStream(stream, encoding, length3, limit, function onRead(err, buf) {
           if (err) return reject2(err);
-          resolve2(buf);
+          resolve3(buf);
         });
       });
     }
@@ -89309,11 +89309,11 @@ var require_view = __commonJS({
     var debug = require_src()("express:view");
     var path13 = __require("path");
     var fs9 = __require("fs");
-    var dirname3 = path13.dirname;
-    var basename = path13.basename;
+    var dirname4 = path13.dirname;
+    var basename2 = path13.basename;
     var extname = path13.extname;
     var join4 = path13.join;
-    var resolve2 = path13.resolve;
+    var resolve3 = path13.resolve;
     module3.exports = View;
     function View(name2, options) {
       var opts = options || {};
@@ -89347,9 +89347,9 @@ var require_view = __commonJS({
       debug('lookup "%s"', name2);
       for (var i = 0; i < roots.length && !path14; i++) {
         var root3 = roots[i];
-        var loc = resolve2(root3, name2);
-        var dir = dirname3(loc);
-        var file = basename(loc);
+        var loc = resolve3(root3, name2);
+        var dir = dirname4(loc);
+        var file = basename2(loc);
         path14 = this.resolve(dir, file);
       }
       return path14;
@@ -89372,14 +89372,14 @@ var require_view = __commonJS({
       });
       sync = false;
     };
-    View.prototype.resolve = function resolve3(dir, file) {
+    View.prototype.resolve = function resolve4(dir, file) {
       var ext = this.ext;
       var path14 = join4(dir, file);
       var stat = tryStat(path14);
       if (stat && stat.isFile()) {
         return path14;
       }
-      path14 = join4(dir, basename(file, ext), "index" + ext);
+      path14 = join4(dir, basename2(file, ext), "index" + ext);
       stat = tryStat(path14);
       if (stat && stat.isFile()) {
         return path14;
@@ -91555,7 +91555,7 @@ var require_application = __commonJS({
     var compileETag = require_utils4().compileETag;
     var compileQueryParser = require_utils4().compileQueryParser;
     var compileTrust = require_utils4().compileTrust;
-    var resolve2 = __require("path").resolve;
+    var resolve3 = __require("path").resolve;
     var once = require_once();
     var Router = require_router();
     var slice2 = Array.prototype.slice;
@@ -91609,7 +91609,7 @@ var require_application = __commonJS({
       this.mountpath = "/";
       this.locals.settings = this.settings;
       this.set("view", View);
-      this.set("views", resolve2("views"));
+      this.set("views", resolve3("views"));
       this.set("jsonp callback name", "callback");
       if (env3 === "production") {
         this.enable("view cache");
@@ -92705,7 +92705,7 @@ var require_content_disposition = __commonJS({
     "use strict";
     module3.exports = contentDisposition;
     module3.exports.parse = parse4;
-    var basename = __require("path").basename;
+    var basename2 = __require("path").basename;
     var ENCODE_URL_ATTR_CHAR_REGEXP = /[\x00-\x20"'()*,/:;<=>?@[\\\]{}\x7f]/g;
     var HEX_ESCAPE_REGEXP = /%[0-9A-Fa-f]{2}/;
     var HEX_ESCAPE_REPLACE_REGEXP = /%([0-9A-Fa-f]{2})/g;
@@ -92740,9 +92740,9 @@ var require_content_disposition = __commonJS({
       if (typeof fallback === "string" && NON_LATIN1_REGEXP.test(fallback)) {
         throw new TypeError("fallback must be ISO-8859-1 string");
       }
-      var name2 = basename(filename);
+      var name2 = basename2(filename);
       var isQuotedString = TEXT_REGEXP.test(name2);
-      var fallbackName = typeof fallback !== "string" ? fallback && getlatin1(name2) : basename(fallback);
+      var fallbackName = typeof fallback !== "string" ? fallback && getlatin1(name2) : basename2(fallback);
       var hasFallback = typeof fallbackName === "string" && fallbackName !== name2;
       if (hasFallback || !isQuotedString || HEX_ESCAPE_REGEXP.test(name2)) {
         params2["filename*"] = name2;
@@ -93069,7 +93069,7 @@ var require_send = __commonJS({
     var extname = path13.extname;
     var join4 = path13.join;
     var normalize = path13.normalize;
-    var resolve2 = path13.resolve;
+    var resolve3 = path13.resolve;
     var sep = path13.sep;
     var BYTES_RANGE_REGEXP = /^ *bytes=/;
     var MAX_MAXAGE = 60 * 60 * 24 * 365 * 1e3;
@@ -93098,7 +93098,7 @@ var require_send = __commonJS({
       this._maxage = opts.maxAge || opts.maxage;
       this._maxage = typeof this._maxage === "string" ? ms(this._maxage) : Number(this._maxage);
       this._maxage = !isNaN(this._maxage) ? Math.min(Math.max(0, this._maxage), MAX_MAXAGE) : 0;
-      this._root = opts.root ? resolve2(opts.root) : null;
+      this._root = opts.root ? resolve3(opts.root) : null;
     }
     util2.inherits(SendStream, Stream);
     SendStream.prototype.error = function error2(status, err) {
@@ -93247,7 +93247,7 @@ var require_send = __commonJS({
           return res;
         }
         parts = normalize(path14).split(sep);
-        path14 = resolve2(path14);
+        path14 = resolve3(path14);
       }
       if (containsDotFile(parts)) {
         debug('%s dotfile "%s"', this._dotfiles, path14);
@@ -93625,7 +93625,7 @@ var require_response = __commonJS({
     var cookie = require_cookie();
     var send = require_send();
     var extname = path13.extname;
-    var resolve2 = path13.resolve;
+    var resolve3 = path13.resolve;
     var vary = require_vary();
     var { Buffer: Buffer2 } = __require("buffer");
     var res = Object.create(http.ServerResponse.prototype);
@@ -93831,7 +93831,7 @@ var require_response = __commonJS({
       }
       opts = Object.create(opts);
       opts.headers = headers;
-      var fullPath = !opts.root ? resolve2(path14) : path14;
+      var fullPath = !opts.root ? resolve3(path14) : path14;
       return this.sendFile(fullPath, opts, done);
     };
     res.contentType = res.type = function contentType(type2) {
@@ -94080,7 +94080,7 @@ var require_serve_static = __commonJS({
     var encodeUrl = require_encodeurl();
     var escapeHtml = require_escape_html();
     var parseUrl = require_parseurl();
-    var resolve2 = __require("path").resolve;
+    var resolve3 = __require("path").resolve;
     var send = require_send();
     var url = __require("url");
     module3.exports = serveStatic;
@@ -94099,7 +94099,7 @@ var require_serve_static = __commonJS({
         throw new TypeError("option setHeaders must be function");
       }
       opts.maxage = opts.maxage || opts.maxAge || 0;
-      opts.root = resolve2(root3);
+      opts.root = resolve3(root3);
       var onDirectory = redirect ? createRedirectDirectoryListener() : createNotFoundDirectoryListener();
       return function serveStatic2(req, res, next) {
         if (req.method !== "GET" && req.method !== "HEAD") {
@@ -97176,7 +97176,7 @@ var require_compile = __commonJS({
       const schOrFunc = root3.refs[ref];
       if (schOrFunc)
         return schOrFunc;
-      let _sch = resolve2.call(this, root3, ref);
+      let _sch = resolve3.call(this, root3, ref);
       if (_sch === void 0) {
         const schema = (_a = root3.localRefs) === null || _a === void 0 ? void 0 : _a[ref];
         const { schemaId } = this.opts;
@@ -97203,7 +97203,7 @@ var require_compile = __commonJS({
     function sameSchemaEnv(s1, s2) {
       return s1.schema === s2.schema && s1.root === s2.root && s1.baseId === s2.baseId;
     }
-    function resolve2(root3, ref) {
+    function resolve3(root3, ref) {
       let sch;
       while (typeof (sch = this.refs[ref]) == "string")
         ref = sch;
@@ -97778,7 +97778,7 @@ var require_fast_uri = __commonJS({
       }
       return uri;
     }
-    function resolve2(baseURI, relativeURI, options) {
+    function resolve3(baseURI, relativeURI, options) {
       const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
       const resolved = resolveComponent(parse4(baseURI, schemelessOptions), parse4(relativeURI, schemelessOptions), schemelessOptions, true);
       schemelessOptions.skipEscape = true;
@@ -98005,7 +98005,7 @@ var require_fast_uri = __commonJS({
     var fastUri = {
       SCHEMES,
       normalize,
-      resolve: resolve2,
+      resolve: resolve3,
       resolveComponent,
       equal,
       serialize: serialize2,
@@ -101086,7 +101086,7 @@ var init_launcher = __esm({
 // src/server/index.ts
 init_constants();
 import path12 from "path";
-import { fileURLToPath as fileURLToPath4 } from "url";
+import { fileURLToPath as fileURLToPath5 } from "url";
 
 // src/server/error-filter.ts
 function isKnownHocuspocusError(err) {
@@ -101114,8 +101114,8 @@ init_file_opener();
 
 // src/server/mcp/server.ts
 import { existsSync as existsSync2 } from "fs";
-import { dirname as dirname2, join as join3 } from "path";
-import { fileURLToPath as fileURLToPath3 } from "url";
+import { dirname as dirname3, join as join3 } from "path";
+import { fileURLToPath as fileURLToPath4 } from "url";
 
 // node_modules/@modelcontextprotocol/sdk/dist/esm/server/express.js
 var import_express = __toESM(require_express2(), 1);
@@ -109218,7 +109218,7 @@ var Protocol = class {
           return;
         }
         const pollInterval = task2.pollInterval ?? this._options?.defaultTaskPollInterval ?? 1e3;
-        await new Promise((resolve2) => setTimeout(resolve2, pollInterval));
+        await new Promise((resolve3) => setTimeout(resolve3, pollInterval));
         options?.signal?.throwIfAborted();
       }
     } catch (error2) {
@@ -109235,7 +109235,7 @@ var Protocol = class {
    */
   request(request, resultSchema, options) {
     const { relatedRequestId, resumptionToken, onresumptiontoken, task, relatedTask } = options ?? {};
-    return new Promise((resolve2, reject2) => {
+    return new Promise((resolve3, reject2) => {
       const earlyReject = (error2) => {
         reject2(error2);
       };
@@ -109313,7 +109313,7 @@ var Protocol = class {
           if (!parseResult.success) {
             reject2(parseResult.error);
           } else {
-            resolve2(parseResult.data);
+            resolve3(parseResult.data);
           }
         } catch (error2) {
           reject2(error2);
@@ -109574,12 +109574,12 @@ var Protocol = class {
       }
     } catch {
     }
-    return new Promise((resolve2, reject2) => {
+    return new Promise((resolve3, reject2) => {
       if (signal.aborted) {
         reject2(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
         return;
       }
-      const timeoutId = setTimeout(resolve2, interval);
+      const timeoutId = setTimeout(resolve3, interval);
       signal.addEventListener("abort", () => {
         clearTimeout(timeoutId);
         reject2(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
@@ -110680,7 +110680,7 @@ var McpServer = class {
     let task = createTaskResult.task;
     const pollInterval = task.pollInterval ?? 5e3;
     while (task.status !== "completed" && task.status !== "failed" && task.status !== "cancelled") {
-      await new Promise((resolve2) => setTimeout(resolve2, pollInterval));
+      await new Promise((resolve3) => setTimeout(resolve3, pollInterval));
       const updatedTask = await extra.taskStore.getTask(taskId);
       if (!updatedTask) {
         throw new McpError(ErrorCode.InternalError, `Task ${taskId} not found during polling`);
@@ -111323,12 +111323,12 @@ var StdioServerTransport = class {
     this.onclose?.();
   }
   send(message) {
-    return new Promise((resolve2) => {
+    return new Promise((resolve3) => {
       const json = serializeMessage(message);
       if (this._stdout.write(json)) {
-        resolve2();
+        resolve3();
       } else {
-        this._stdout.once("drain", resolve2);
+        this._stdout.once("drain", resolve3);
       }
     });
   }
@@ -111805,7 +111805,7 @@ var responseViaResponseObject = async (res, outgoing, options = {}) => {
         });
         if (!chunk2) {
           if (i === 1) {
-            await new Promise((resolve2) => setTimeout(resolve2));
+            await new Promise((resolve3) => setTimeout(resolve3));
             maxReadCount = 3;
             continue;
           }
@@ -112305,9 +112305,9 @@ data:
       const initRequest = messages.find((m) => isInitializeRequest(m));
       const clientProtocolVersion = initRequest ? initRequest.params.protocolVersion : req.headers.get("mcp-protocol-version") ?? DEFAULT_NEGOTIATED_PROTOCOL_VERSION;
       if (this._enableJsonResponse) {
-        return new Promise((resolve2) => {
+        return new Promise((resolve3) => {
           this._streamMapping.set(streamId, {
-            resolveJson: resolve2,
+            resolveJson: resolve3,
             cleanup: () => {
               this._streamMapping.delete(streamId);
             }
@@ -112670,124 +112670,37 @@ init_annotations();
 // src/cli/setup.ts
 init_constants();
 import { randomUUID as randomUUID4 } from "crypto";
-import { existsSync, readFileSync } from "fs";
+import { existsSync, readFileSync as readFileSync2 } from "fs";
 import { copyFile, mkdir, rename, unlink, writeFile } from "fs/promises";
 import { homedir as homedir2 } from "os";
-import { dirname, join as join2, resolve } from "path";
-import { fileURLToPath as fileURLToPath2 } from "url";
+import { basename, dirname as dirname2, join as join2, resolve as resolve2 } from "path";
+import { fileURLToPath as fileURLToPath3 } from "url";
 
 // src/cli/skill-content.ts
-var SKILL_CONTENT = `---
-name: tandem
-description: >
-  Use when tandem_* MCP tools are available, the user asks about Tandem
-  document editing, or iterating on text collaboratively. Provides workflow
-  guidance, annotation strategy, and tool usage patterns for the Tandem
-  collaborative editor.
----
-
-# Tandem \u2014 Collaborative Document Editor
-
-Tandem lets you annotate and edit documents alongside the user in real time. The user sees your changes in a browser editor; you interact via the tandem_* MCP tool suite.
-
-## Hard Rules
-
-These prevent the most common failures. Follow them always.
-
-1. **Resolve before mutating.** Call \`tandem_resolveRange\` (or \`tandem_search\`) to get offsets before calling \`tandem_edit\`, \`tandem_highlight\`, \`tandem_comment\`, \`tandem_suggest\`, or \`tandem_flag\`. Never compute offsets by counting characters in previously-read text \u2014 they go stale when the user edits.
-2. **Pass \`textSnapshot\`.** Include the matched text as \`textSnapshot\` on mutations and annotations. If the text moved, the server returns \`RANGE_MOVED\` with relocated coordinates instead of corrupting the document.
-3. **Use \`tandem_getTextContent\`, not \`tandem_getContent\`.** \`getContent\` returns ProseMirror JSON and burns tokens. Use \`getTextContent({ section: "Section Name" })\` for targeted reads. The \`section\` parameter is case-insensitive.
-4. **\`tandem_edit\` cannot create paragraphs.** Newlines become literal characters. For multi-paragraph changes, use multiple \`tandem_edit\` calls or \`tandem_suggest\`.
-5. **\`.docx\` files are read-only.** Use annotations instead of \`tandem_edit\`. Offer \`tandem_convertToMarkdown\` if the user wants an editable copy.
-
-## Workflow
-
-Standard workflow:
-
-1. \`tandem_status\` \u2014 check for already-open documents (sessions restore automatically)
-2. \`tandem_getOutline\` \u2014 understand document structure
-3. \`tandem_setStatus("Working on [section]...", { focusParagraph: N })\` \u2014 show progress (use \`index\` from outline)
-4. \`tandem_getTextContent({ section: "..." })\` \u2014 read one section at a time
-5. Annotate or edit as needed (see annotation guide below)
-6. \`tandem_checkInbox\` \u2014 check for user messages and actions
-7. Repeat steps 3-6 for each section
-8. \`tandem_save\` \u2014 persist edits to disk when done
-
-## Annotation Guide
-
-Choose the right type for each finding:
-
-- **\`tandem_highlight\`** \u2014 Visual marker with a short note. Colors: green (verified/good), red (problem), yellow (needs attention). Use when the finding is self-evident from the color and a brief note.
-- **\`tandem_comment\`** \u2014 Observation requiring explanation. Use when you need more than one sentence to convey reasoning.
-- **\`tandem_suggest\`** \u2014 Specific text replacement. **Prefer over comment when you can provide replacement text** \u2014 the user gets one-click accept/reject. Cannot create new paragraphs.
-- **\`tandem_flag\`** \u2014 Factual errors, compliance risks, missing required content. Signals a blocking issue the user must address before the document ships.
-
-**User-created types:** \`question\` annotation is created by users, not Claude. When you see a \`question\` in \`tandem_checkInbox\` or \`tandem_getAnnotations\`, respond with a \`tandem_comment\` on the same range or \`tandem_reply\` for conversational answers.
-
-## Collaboration Mode
-
-Check \`mode\` from \`tandem_status\` or \`tandem_checkInbox\` and adapt:
-
-- **Tandem** (\`"tandem"\`, default) \u2014 Full collaboration. Annotate freely and react to selections and document changes.
-- **Solo** (\`"solo"\`) \u2014 The user wants to write undisturbed. Only respond when the user sends a chat message. Do not proactively annotate or react to document activity.
-
-## Reacting to Document Events
-
-Selections are **not** sent as standalone events. Instead, when the user sends a chat message, any buffered selection is attached as a \`selection\` field on the \`chat:message\` payload. This gives you context about what text the user was looking at when they wrote their message. When polling via \`tandem_checkInbox\`, the current selection shows up under \`activity.selectedText\`. Use \`tandem_reply\` for any document-context reaction (chat messages, question annotations); reserve terminal output for non-document work the user explicitly requests. In Solo mode, hold reactions until the user sends a chat message.
-
-## Collaboration Etiquette
-
-- Check \`tandem_getActivity()\` before annotating near the user's cursor. If \`isTyping\` is true, wait for typing to stop before annotating that area.
-- Use \`tandem_setStatus\` to show what you're working on \u2014 the user sees it in the browser status bar.
-- **Call \`tandem_checkInbox\` every 2-3 tool calls**, not just at the end of a task. The real-time channel is often not connected; polling is the reliable path.
-- Reply to chat messages with \`tandem_reply\`, not annotations.
-
-## .docx Review Workflow
-
-1. \`tandem_open\` \u2014 opens in read-only mode (\`readOnly: true\`)
-2. \`tandem_getAnnotations({ author: "import" })\` \u2014 check for imported Word comments; read and act on them
-3. Annotate with findings (highlight, comment, suggest, flag)
-4. \`tandem_exportAnnotations\` \u2014 generate a review summary the user can share
-5. If the user wants editable text, offer \`tandem_convertToMarkdown\`
-
-## Error Recovery
-
-- **\`RANGE_MOVED\`** \u2014 Text shifted since you read it. The response includes \`resolvedFrom\`/\`resolvedTo\` \u2014 use those coordinates for your next call.
-- **\`RANGE_GONE\`** \u2014 The text was deleted. Re-read the section with \`tandem_getTextContent\` and re-assess.
-- **\`INVALID_RANGE\`** \u2014 You hit heading markup (e.g., \`## \`). Target text content only, not the heading prefix.
-- **\`FORMAT_ERROR\`** \u2014 Attempted \`tandem_edit\` on a read-only \`.docx\`. Use annotations instead.
-
-## Session Handoff
-
-When starting a new Claude session with Tandem already running:
-
-1. \`tandem_status()\` \u2014 check \`openDocuments\` array for restored sessions
-2. \`tandem_listDocuments()\` \u2014 see all open docs with details
-3. \`tandem_getOutline()\` \u2014 orient on the active document
-4. \`tandem_getAnnotations()\` \u2014 see what was already reviewed
-5. Continue where the previous session left off
-
-## Multi-Document
-
-When multiple documents are open, always pass \`documentId\` explicitly \u2014 omitting it targets the active document, which may have changed since your last call. Use \`tandem_listDocuments\` to see what's available. Cross-reference by reading both docs via \`tandem_getTextContent({ documentId: "..." })\` and annotating the relevant one.
-`;
+import { readFileSync } from "fs";
+import { dirname, resolve } from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
+var __dirname = dirname(fileURLToPath2(import.meta.url));
+var SKILL_PATH = resolve(__dirname, "../../skills/tandem/SKILL.md");
+var SKILL_CONTENT = readFileSync(SKILL_PATH, "utf-8");
 
 // src/cli/setup.ts
-var __dirname = dirname(fileURLToPath2(import.meta.url));
-var CHANNEL_DIST = resolve(__dirname, "../channel/index.js");
+var __dirname2 = dirname2(fileURLToPath3(import.meta.url));
+var PACKAGE_ROOT = resolve2(__dirname2, "../..");
+var CHANNEL_DIST = resolve2(PACKAGE_ROOT, "dist/channel/index.js");
 var MCP_URL = `http://localhost:${DEFAULT_MCP_PORT}`;
-function buildMcpEntries(channelPath, nodeBinary = "node") {
-  return {
-    tandem: {
-      type: "http",
-      url: `${MCP_URL}/mcp`
-    },
-    "tandem-channel": {
-      command: nodeBinary,
+function buildMcpEntries(channelPath, opts = {}) {
+  const entries = {
+    tandem: { type: "http", url: `${MCP_URL}/mcp` }
+  };
+  if (opts.withChannelShim) {
+    entries["tandem-channel"] = {
+      command: opts.nodeBinary ?? "node",
       args: [channelPath],
       env: { TANDEM_URL: MCP_URL }
-    }
-  };
+    };
+  }
+  return entries;
 }
 function detectTargets(opts = {}) {
   const home = opts.homeOverride ?? homedir2();
@@ -112818,7 +112731,7 @@ function detectTargets(opts = {}) {
   return targets;
 }
 async function atomicWrite3(content3, dest) {
-  const tmp = join2(dirname(dest), `.tandem-setup-${randomUUID4()}.tmp`);
+  const tmp = join2(dirname2(dest), `.tandem-setup-${randomUUID4()}.tmp`);
   await writeFile(tmp, content3, "utf-8");
   try {
     await rename(tmp, dest);
@@ -112839,14 +112752,23 @@ async function atomicWrite3(content3, dest) {
 async function applyConfig(configPath, entries) {
   let existing = {};
   try {
-    existing = JSON.parse(readFileSync(configPath, "utf-8"));
+    existing = JSON.parse(readFileSync2(configPath, "utf-8"));
   } catch (err) {
     const code3 = err.code;
     if (code3 === "ENOENT") {
     } else if (err instanceof SyntaxError) {
-      console.error(
-        `  Warning: ${configPath} contains malformed JSON \u2014 replacing with fresh config`
-      );
+      const backupPath = `${configPath}.broken-${Date.now()}`;
+      try {
+        await copyFile(configPath, backupPath);
+        console.error(
+          `  Warning: ${configPath} contains malformed JSON \u2014 backed up to ${basename(backupPath)}, replacing with fresh config`
+        );
+      } catch (copyErr) {
+        console.error(
+          `  Warning: ${configPath} contains malformed JSON and backup failed (${copyErr instanceof Error ? copyErr.message : copyErr}) \u2014 refusing to overwrite. Fix the JSON manually and rerun 'tandem setup'.`
+        );
+        throw copyErr;
+      }
     } else {
       throw err;
     }
@@ -112858,13 +112780,13 @@ async function applyConfig(configPath, entries) {
       ...entries
     }
   };
-  await mkdir(dirname(configPath), { recursive: true });
+  await mkdir(dirname2(configPath), { recursive: true });
   await atomicWrite3(JSON.stringify(updated, null, 2) + "\n", configPath);
 }
 async function installSkill(opts = {}) {
   const home = opts.homeOverride ?? homedir2();
   const skillPath = join2(home, ".claude", "skills", "tandem", "SKILL.md");
-  await mkdir(dirname(skillPath), { recursive: true });
+  await mkdir(dirname2(skillPath), { recursive: true });
   await atomicWrite3(SKILL_CONTENT, skillPath);
 }
 
@@ -113116,7 +113038,7 @@ async function runSetupHandler(input, homeOverride) {
     };
   }
   const targets = detectTargets({ homeOverride });
-  const entries = buildMcpEntries(channelPath, nodeBinary);
+  const entries = buildMcpEntries(channelPath, { withChannelShim: true, nodeBinary });
   const configured = [];
   const errors = [];
   for (const target of targets) {
@@ -113124,7 +113046,9 @@ async function runSetupHandler(input, homeOverride) {
       await applyConfig(target.configPath, entries);
       configured.push(target.label);
     } catch (err) {
-      errors.push(`${target.label}: ${err instanceof Error ? err.message : String(err)}`);
+      const msg = err instanceof Error ? err.message : String(err);
+      errors.push(`${target.label}: ${msg}`);
+      console.error(`[Setup] target=${target.label} failed: ${msg}`);
     }
   }
   let skillInstalled = false;
@@ -113132,10 +113056,17 @@ async function runSetupHandler(input, homeOverride) {
     await installSkill({ homeOverride });
     skillInstalled = true;
   } catch (err) {
-    errors.push(`Skill install: ${err instanceof Error ? err.message : String(err)}`);
-  }
+    const msg = err instanceof Error ? err.message : String(err);
+    errors.push(`Skill install: ${msg}`);
+    console.error(`[Setup] skill install failed: ${msg}`);
+  }
+  const totalFailed = configured.length === 0 && !skillInstalled;
+  const anyFailed = errors.length > 0;
+  let status = 200;
+  if (totalFailed) status = 500;
+  else if (anyFailed) status = 207;
   return {
-    status: 200,
+    status,
     body: { data: { targets, configured, errors, skillInstalled } }
   };
 }
@@ -113969,8 +113900,8 @@ try {
     `[Tandem] Could not read version from package.json: ${err instanceof Error ? err.message : err}`
   );
 }
-var __dirname2 = dirname2(fileURLToPath3(import.meta.url));
-var CLIENT_DIST = join3(__dirname2, "../client");
+var __dirname3 = dirname3(fileURLToPath4(import.meta.url));
+var CLIENT_DIST = join3(__dirname3, "../client");
 var mcpServer = null;
 var currentTransport = null;
 var connectingPromise = null;
@@ -114108,7 +114039,7 @@ async function startMcpServerHttp(port, host = "127.0.0.1") {
   } else {
     console.error(`[Tandem] No client dist at ${CLIENT_DIST} \u2014 run 'npm run build' first`);
   }
-  return new Promise((resolve2, reject2) => {
+  return new Promise((resolve3, reject2) => {
     const httpServer2 = app.listen(port, host, () => {
       httpServer2.removeListener("error", reject2);
       httpServer2.on("error", (err) => console.error("[Tandem] HTTP server error:", err));
@@ -114120,7 +114051,7 @@ async function startMcpServerHttp(port, host = "127.0.0.1") {
           console.error("[Tandem] Skipping browser open \u2014 no client assets found");
         }
       }
-      resolve2(httpServer2);
+      resolve3(httpServer2);
     });
     httpServer2.on("error", reject2);
   });
@@ -114338,7 +114269,7 @@ async function main2() {
     } catch (err) {
       console.error(`[Tandem] ${err instanceof Error ? err.message : err} \u2014 proceeding anyway`);
     }
-    const projectRoot = path12.resolve(path12.dirname(fileURLToPath4(import.meta.url)), "../..");
+    const projectRoot = path12.resolve(path12.dirname(fileURLToPath5(import.meta.url)), "../..");
     try {
       const versionStatus = await checkVersionChange(APP_VERSION, LAST_SEEN_VERSION_FILE);
       if (versionStatus === "upgraded") {