@myspec/mcp-server 0.5.0-next.117 → 0.5.0-next.118

package/dist/index.js

@@ -1353,7 +1353,11 @@ var KNOWN_CONFLICT_REASONS = [
   "precondition_malformed",
   "slug_taken",
   "blob_reclaimed",
-  "lock_timeout"
+  "lock_timeout",
+  "content_moved",
+  "file_trashed",
+  "thread_not_orphaned",
+  "version_conflict"
 ];
 var PlatformHttpError = class extends Error {
   status;
@@ -5135,6 +5139,26 @@ function threadSummary(thread, opts = {}) {
 function uuidField(what) {
   return z24.uuid().describe(what);
 }
+var CONFLICT_REASON = {
+  fileTrashed: "file_trashed",
+  lockTimeout: "lock_timeout",
+  contentMoved: "content_moved",
+  threadNotOrphaned: "thread_not_orphaned",
+  versionConflict: "version_conflict"
+};
+function conflictAdvice(err, parts) {
+  const reason = conflictOf(err)?.reason;
+  switch (reason) {
+    case CONFLICT_REASON.lockTimeout:
+      return "Nothing was written: another write held the file briefly and this one timed out waiting. Retry the same call unchanged.";
+    case CONFLICT_REASON.contentMoved:
+      return "Nothing was written: the file changed while the passage was being located, so the anchor would have pointed at text that is no longer current. Re-read the file, find the passage again, and retry.";
+    case CONFLICT_REASON.fileTrashed:
+      return parts.whenTrashed;
+    default:
+      return parts.otherwise;
+  }
+}
 var listInputSchema = {
   file_id: uuidField("UUID of the spec file whose comments to list."),
   status: z24.enum(["open", "resolved", "orphaned"]).optional().describe(
@@ -5195,7 +5219,16 @@ var createSpecFileCommentThreadTool = {
     } catch (err) {
       if (isPlatformConflictError(err)) {
         return errorResult(
-          `No thread was created on ${args.file_id}: the file is in the Trash Bin, so it gathers no new discussion. Restore it with restore_spec_file_from_trash first.`
+          `No thread was created on ${args.file_id}. ` + conflictAdvice(err, {
+            // CONFIRMED trashed: the platform said so, so this states it.
+            whenTrashed: "The file is in the Trash Bin, so it gathers no new discussion. Restore it with restore_spec_file_from_trash first.",
+            // NOT confirmed — an older platform, or a reason this build does
+            // not know. Worded as a hypothesis with a way to check it, which
+            // is also what keeps the two branches distinguishable in a test:
+            // asserting the trashed wording alone would pass against this one
+            // too, so deleting the branch above would go unnoticed.
+            otherwise: "The write was refused as a conflict, and the platform gave no reason. The usual cause is a trashed file \u2014 confirm with get_spec_file before doing anything else."
+          })
         );
       }
       throw err;
@@ -5222,7 +5255,10 @@ var replySpecFileCommentThreadTool = {
     } catch (err) {
       if (isPlatformConflictError(err)) {
         return errorResult(
-          `No reply was posted to ${args.thread_id}: the file is in the Trash Bin, so it gathers no new discussion. Restore it with restore_spec_file_from_trash first.`
+          `No reply was posted to ${args.thread_id}. ` + conflictAdvice(err, {
+            whenTrashed: "The file is in the Trash Bin, so it gathers no new discussion. Restore it with restore_spec_file_from_trash first.",
+            otherwise: "The reply was refused as a conflict, and the platform gave no reason. The usual cause is a trashed file \u2014 confirm with get_spec_file before doing anything else."
+          })
         );
       }
       throw err;
@@ -5258,7 +5294,13 @@ var updateSpecFileCommentTool = {
     } catch (err) {
       if (isPlatformConflictError(err)) {
         return errorResult(
-          `${args.comment_id} was NOT edited: it has changed since the version you passed. Re-read it with list_spec_file_comments, re-apply your change, and retry with the new content_version.`
+          `${args.comment_id} was NOT edited. ` + conflictAdvice(err, {
+            // An edit is allowed on a trashed file (AR-PRJ-45), so the
+            // trashed reason cannot reach this route — both branches below
+            // describe the version race, which is the only conflict it emits.
+            whenTrashed: "It has changed since the version you passed. Re-read it with list_spec_file_comments, re-apply your change, and retry with the new content_version.",
+            otherwise: "It has changed since the version you passed. Re-read it with list_spec_file_comments, re-apply your change, and retry with the new content_version."
+          })
         );
       }
       throw err;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myspec/mcp-server",
-  "version": "0.5.0-next.117",
+  "version": "0.5.0-next.118",
   "description": "MySpec MCP server — exposes MySpec platform projects, files and attachments to MCP-aware clients via OAuth-authenticated access tokens.",
   "type": "module",
   "repository": {