@obenor/mcp 0.2.0 → 0.3.0

package/bundle/kernel-worker.mjs

@@ -25293,7 +25293,7 @@ var ENTRIES = [
   {
     name: "connect_model",
     summary: "Point this session at a model in the app, from a pasted link",
-    description: "Takes a share link the person copied out of the app and connects this session to the model behind it. From then on every change built here is published to that model, and a window with Follow set to Live shows it as it happens.\n\nTHE LINK IS THE WHOLE CONFIGURATION. It says which app and which model, so there is nothing else to ask for and nothing to set up: paste https://3d.obenor.com/s/XXXXXXXX and the connection is made.\n\nIT MUST BE AN EDIT LINK. A View, Measure or Comment link can read a model and cannot write one, and the refusal says which kind was given. Ask the person to use the Share sheet\u2019s Edit role.\n\nTHE CONNECTION LASTS AS LONG AS THIS PROCESS, and the link is never written to disk. Restarting the server means pasting again - which is the right trade for a credential, and the alternative is the OBENOR_LINK environment variable, which survives a restart because the person put it there themselves.\n\nA link is revoked and expires like any other. When one stops working the reply carries the app\u2019s own sentence - revoked, expired, or a model that is gone - so the fix is to make a new link rather than to debug this tool.",
+    description: "Takes a share link the person copied out of the app and connects this session to the model behind it. From then on every change built here is published to that model, and a window with Follow set to Live shows it as it happens.\n\nConnecting loads the linked model into this session WITHOUT publishing the previous document into it. Save local work before switching models. Reconnecting the same link reuses the session. Switching releases only this process\u2019s previous agent slot. Use mirror status for connection/publication status, and mirror push to await publication.\n\nTHE LINK IS THE WHOLE CONFIGURATION. It says which app and which model, so there is nothing else to ask for and nothing to set up: paste https://3d.obenor.com/s/XXXXXXXX and the connection is made.\n\nIT MUST BE AN EDIT LINK. A View, Measure or Comment link can read a model and cannot write one, and the refusal says which kind was given. Ask the person to use the Share sheet\u2019s Edit role.\n\nTHE CONNECTION LASTS AS LONG AS THIS PROCESS, and the link is never written to disk. Restarting the server means pasting again - which is the right trade for a credential, and the alternative is the OBENOR_LINK environment variable, which survives a restart because the person put it there themselves.\n\nA link is revoked and expires like any other. When one stops working the reply carries the app\u2019s own sentence - revoked, expired, or a model that is gone - so the fix is to make a new link rather than to debug this tool.",
     declaredBy: ["mcp"]
   },
   {

package/bundle/server.mjs

@@ -37159,6 +37159,11 @@ var CURVE2 = [
   "offset",
   "other"
 ];
+function reviewSoundness(topology) {
+  const minEdge = defaultMinEdge(topology);
+  const suspect = topology.edges.some((edge) => edge.faceIndices.length > 2 || !edge.seam && (edge.faceIndices.length === 1 || edge.length < minEdge));
+  return suspect ? summariseSoundness(topology, { minEdge, maxGroups: 2, maxLines: 14 }) : [];
+}
 function defaultMinEdge(topology) {
   const { min, max } = topology.bbox;
   const size = Math.max(max[0] - min[0], max[1] - min[1], max[2] - min[2]);
@@ -37964,7 +37969,7 @@ var ENTRIES = [
   {
     name: "connect_model",
     summary: "Point this session at a model in the app, from a pasted link",
-    description: "Takes a share link the person copied out of the app and connects this session to the model behind it. From then on every change built here is published to that model, and a window with Follow set to Live shows it as it happens.\n\nTHE LINK IS THE WHOLE CONFIGURATION. It says which app and which model, so there is nothing else to ask for and nothing to set up: paste https://3d.obenor.com/s/XXXXXXXX and the connection is made.\n\nIT MUST BE AN EDIT LINK. A View, Measure or Comment link can read a model and cannot write one, and the refusal says which kind was given. Ask the person to use the Share sheet\u2019s Edit role.\n\nTHE CONNECTION LASTS AS LONG AS THIS PROCESS, and the link is never written to disk. Restarting the server means pasting again - which is the right trade for a credential, and the alternative is the OBENOR_LINK environment variable, which survives a restart because the person put it there themselves.\n\nA link is revoked and expires like any other. When one stops working the reply carries the app\u2019s own sentence - revoked, expired, or a model that is gone - so the fix is to make a new link rather than to debug this tool.",
+    description: "Takes a share link the person copied out of the app and connects this session to the model behind it. From then on every change built here is published to that model, and a window with Follow set to Live shows it as it happens.\n\nConnecting loads the linked model into this session WITHOUT publishing the previous document into it. Save local work before switching models. Reconnecting the same link reuses the session. Switching releases only this process\u2019s previous agent slot. Use mirror status for connection/publication status, and mirror push to await publication.\n\nTHE LINK IS THE WHOLE CONFIGURATION. It says which app and which model, so there is nothing else to ask for and nothing to set up: paste https://3d.obenor.com/s/XXXXXXXX and the connection is made.\n\nIT MUST BE AN EDIT LINK. A View, Measure or Comment link can read a model and cannot write one, and the refusal says which kind was given. Ask the person to use the Share sheet\u2019s Edit role.\n\nTHE CONNECTION LASTS AS LONG AS THIS PROCESS, and the link is never written to disk. Restarting the server means pasting again - which is the right trade for a credential, and the alternative is the OBENOR_LINK environment variable, which survives a restart because the person put it there themselves.\n\nA link is revoked and expires like any other. When one stops working the reply carries the app\u2019s own sentence - revoked, expired, or a model that is gone - so the fix is to make a new link rather than to debug this tool.",
     declaredBy: ["mcp"]
   },
   {
@@ -39029,7 +39034,7 @@ var runScript = createScriptHost(nodeScriptWorker);
 // package.json
 var package_default = {
   name: "@obenor/mcp",
-  version: "0.2.0",
+  version: "0.3.0",
   type: "module",
   bin: {
     "obenor-mcp": "bin/obenor-mcp.mjs"
@@ -39144,6 +39149,8 @@ var ModelSlotClient = class {
   owed = null;
   status() {
     return {
+      publishedVersion: this.publishedVersion,
+      statusError: this.statusError,
       model: this.attached === null ? null : { id: this.attached.modelId, name: this.attached.modelName },
       error: this.failure,
       inFlight: this.pending > 0,
@@ -39160,6 +39167,8 @@ var ModelSlotClient = class {
   sessionOf() {
     return this.attached?.sessionId ?? null;
   }
+  publishedVersion = null;
+  statusError = null;
   /**
    * The app's document, as the slot holds it now.
    *
@@ -39282,6 +39291,8 @@ var ModelSlotClient = class {
       );
     } catch {
     }
+    this.close();
+    this.attached = null;
   }
   /**
    * The model this session is scoped to, attaching if it has not yet.
@@ -39491,6 +39502,8 @@ var ModelSlotClient = class {
           return;
         }
         this.failure = null;
+        const receipt = await response.json();
+        if (typeof receipt.version === "number") this.publishedVersion = receipt.version;
       } catch (error2) {
         this.failure = `publish failed: ${message(error2)}`;
       }
@@ -39604,15 +39617,20 @@ var ModelSlotClient = class {
         headers: this.headers(),
         signal: AbortSignal.timeout(1e4)
       });
-      if (!response.ok) return { head: null, wantsSolid: false };
+      if (!response.ok) {
+        this.statusError = await describe(response, "read model status");
+        return { head: null, wantsSolid: false };
+      }
       const body = await response.json();
+      this.statusError = null;
       return {
         head: typeof body.head === "number" ? body.head : null,
         // Absent reads as false, which is a Worker deployed before the field
         // existed and is the previous behaviour exactly.
         wantsSolid: body.wantsSolid === true
       };
-    } catch {
+    } catch (error2) {
+      this.statusError = `Could not read model status: ${message(error2)}`;
       return { head: null, wantsSolid: false };
     }
   }
@@ -78018,14 +78036,14 @@ async function ensureCurrentKernel() {
   const built = host.info();
   kernelReloaded = `Picked up a rebuilt kernel (${built.version} on OpenCASCADE ${built.occtVersion}) and replayed the model against it.`;
 }
-function rebuild() {
+function rebuild(publishChanges = true) {
   lastResult = doc.rebuild();
   invalidateSoundness(lastResult);
   if (lastResult.ok) {
     host.checkpoint(doc.toJSON());
     void autosave();
   }
-  void publish();
+  if (publishChanges) void publish();
   return lastResult;
 }
 var BRIDGE = process.env["OBENOR_BRIDGE"] ?? "http://localhost:5177";
@@ -78174,8 +78192,11 @@ This change is held. ${when}`;
     }
     if (v2.error !== null) return `Not published to the app: ${v2.error}`;
     if (v2.model !== null) {
+      if (v2.publishedVersion === null) {
+        return `Connected to "${v2.model.name}". No version published by this connection yet.` + namePrompt(v2.model.name);
+      }
       const note = bakeNote();
-      return `Published to "${v2.model.name}" - set Follow to Live in the app to watch it.` + (note === null ? "" : `
+      return `Published to "${v2.model.name}" as v${v2.publishedVersion} - set Follow to Live in the app to watch it.` + (note === null ? "" : `
 ${note}`) + namePrompt(v2.model.name);
     }
     return "Connecting to the app with OBENOR_LINK - the next reply will say which model.";
@@ -78268,10 +78289,7 @@ function soundness(featureId) {
   } catch {
     return [];
   }
-  const minEdge = defaultMinEdge(topology);
-  const defective = topology.edges.some((e) => e.faceIndices.length > 2 || !e.seam && (e.faceIndices.length === 1 || e.length < minEdge));
-  if (!defective) return [];
-  return summariseSoundness(topology, { minEdge, maxGroups: 2, maxLines: 14 });
+  return reviewSoundness(topology);
 }
 var soundnessCache = /* @__PURE__ */ new Map();
 function invalidateSoundness(result) {
@@ -83262,6 +83280,32 @@ server.registerTool("mirror", {
     )
   }
 }, async ({ action }) => {
+  if (slot2 !== null && action === "status") {
+    await slot2.ensureModel();
+    const state = slot2.status();
+    return { content: [{ type: "text", text: mirrorNote() }], structuredContent: {
+      connection: state.model === null ? "disconnected" : "connected",
+      model: state.model,
+      publication: state.deferred ? "queued" : state.inFlight ? "publishing" : state.error !== null ? "failed" : state.publishedVersion === null ? "idle" : "published",
+      publishedVersion: state.publishedVersion,
+      error: state.error,
+      /* Reported and not gated on - see `SlotStatus.statusError`. A poll that
+       * could not read the app's HEAD is worth saying out loud, because it is
+       * why `pull` may answer with nothing, and it is NOT a reason to refuse
+       * to leave this model. */
+      statusError: state.statusError
+    } };
+  }
+  if (slot2 !== null && action === "pull") {
+    const pulled = await slot2.pullIfNewer(-1);
+    if (pulled === null) return failure(slot2.status().error ?? "The connected model has no published document.");
+    host.reset(pulled.document);
+    knownVersion = pulled.version;
+    appAhead = false;
+    undoStack.length = 0;
+    redoStack.length = 0;
+    return report(`Loaded published version ${pulled.version}.`, void 0, rebuild(false));
+  }
   if (action === "push") {
     await publishNow();
     return text(slot2 !== null ? mirrorNote() : publishFailed ? `Nothing is listening at ${BRIDGE}. Start the app with \`pnpm dev\`.` : "Pushed. Turn on Follow in the app to see it.");
@@ -83621,13 +83665,16 @@ server.registerTool("connect_model", {
 }, async ({ link }) => {
   const config2 = linkConfig(link);
   if (typeof config2 === "string") return failure(config2);
+  if (slot2 !== null && slotSettings?.origin === config2.origin && slotSettings.token === config2.token) {
+    const model = await slot2.ensureModel();
+    if (model === null) return failure(slot2.status().error ?? "The connection could not be resumed.");
+    return text(`Already connected to "${slot2.status().model?.name}". ${mirrorNote()}`);
+  }
+  await slot2?.flush();
+  if (slot2?.status().error) return failure(`Could not finish the current model's publish: ${slot2.status().error}`);
+  await slot2?.end();
   const next = new ModelSlotClient({ ...config2, collapse: collapseForShare });
-  const first = baking && lastResult !== null && lastResult.bodies.length > 0 ? await bakeOnce(lastResult.bodies) : null;
-  await next.publish(
-    doc.toJSON(),
-    void 0,
-    first === null ? void 0 : { poster: first.poster, lod2: first.lod2, lod0: first.lod0 }
-  );
+  await next.ensureModel();
   const status = next.status();
   if (status.model === null) {
     next.close();
@@ -83635,10 +83682,31 @@ server.registerTool("connect_model", {
       `That link did not connect: ${status.error ?? "the app refused it, without saying why"}`
     );
   }
-  await slot2?.flush();
+  const pulled = await next.pullIfNewer(-1);
+  if (next.status().error !== null) {
+    const error2 = next.status().error;
+    await next.end();
+    return failure(`Connected, but could not read the model: ${error2}`);
+  }
+  const previous = doc.toJSON();
+  try {
+    host.reset(pulled === null ? null : pulled.document);
+    rebuild(false);
+  } catch (error2) {
+    host.reset(previous);
+    rebuild(false);
+    await next.end();
+    return failure(`The model could not be loaded: ${String(error2)}`);
+  }
   slot2?.close();
   slot2 = next;
   slotSettings = config2;
+  slotMisconfigured = null;
+  knownVersion = pulled?.version ?? 0;
+  appAhead = false;
+  undoStack.length = 0;
+  redoStack.length = 0;
+  namePromptSaid = false;
   appLink?.close();
   appLink = null;
   return {
@@ -83646,6 +83714,7 @@ server.registerTool("connect_model", {
       type: "text",
       text: [
         `Connected to "${status.model.name}" at ${config2.origin}.`,
+        `Loaded ${pulled === null ? "the empty model" : `version ${pulled.version}`}. Connecting did not publish a version.`,
         /*
          * The attach can succeed and the first publish still be refused, and
          * the commonest reason is the good one: this session is empty and the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@obenor/mcp",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "type": "module",
   "bin": {
     "obenor-mcp": "bin/obenor-mcp.mjs"