@cabane/companion 0.6.168 → 0.6.169

package/dist/cli.js

@@ -4169,7 +4169,6 @@ async function* decodeOpencodeStream(events, ctx2) {
   let reason;
   let settled = false;
   const userMessageIds = /* @__PURE__ */ new Set();
-  if (ctx2.skipMessageId) userMessageIds.add(ctx2.skipMessageId);
   for await (const ev of events) {
     if (ctx2.signal.aborted) return;
     if (ev.type === "message.updated") {
@@ -4345,8 +4344,6 @@ function buildRunSpec(req, resumeSessionId) {
     parts: buildParts(req),
     tools,
     allowAllHostTools,
-    // Fresh session → mint + send a client id; resumed → let opencode mint it.
-    sendClientMessageId: resumeSessionId == null,
     ...dialect.agent ? { agent: dialect.agent } : {},
     mcp: buildMcp(req),
     // Every server this turn installs with a credential resolved into it: a remote one's
@@ -4521,14 +4518,12 @@ function createHttpOpencodeTransport(opts) {
           created = true;
         }
         await installMcp(doFetch, base, spec, signal);
-        const userMessageId = spec.sendClientMessageId ? newOpencodeMessageId() : null;
         const promptRes = await doFetch(
           `${base}/session/${encodeURIComponent(sessionId)}/prompt_async`,
           {
             method: "POST",
             headers: { "content-type": "application/json" },
             body: JSON.stringify({
-              ...userMessageId ? { messageID: userMessageId } : {},
               ...spec.model ? { model: spec.model } : {},
               system: spec.systemPrompt,
               parts: spec.parts,
@@ -4554,7 +4549,6 @@ function createHttpOpencodeTransport(opts) {
           sessionId,
           created,
           directory: spec.directory,
-          userMessageId,
           // The lock is released when this stream finishes draining.
           events: releaseAfter(parseSseStream(eventRes.body, sessionId, signal), release)
         };
@@ -4657,9 +4651,6 @@ function belongsToSession(ev, sessionId) {
   if (typeof infoSid === "string") return infoSid === sessionId;
   return true;
 }
-function newOpencodeMessageId() {
-  return `msg_${crypto.randomUUID().replace(/-/g, "")}`;
-}
 function trimSlash(s) {
   return s.endsWith("/") ? s.slice(0, -1) : s;
 }
@@ -4723,8 +4714,7 @@ function createOpencodeAdapter(deps = {}) {
       }
       yield* decodeOpencodeStream(result.events, {
         signal,
-        sessionId: result.sessionId,
-        skipMessageId: result.userMessageId
+        sessionId: result.sessionId
       });
     }
   };
@@ -5149,8 +5139,7 @@ var init_conformance3 = __esm({
         ]
       },
       {
-        // On a resumed turn the transport mints no client message id (doing so no-ops the turn), so the
-        // decoder gets no `skipMessageId`. It learns the user-message id from the stream — the
+        // On resume, as on a fresh turn, the decoder learns the user-message id from the stream:
         // `message.updated` user frame precedes the echoed part — and drops the echo, so the injected
         // per-turn context can't leak into Steps. Only the reply surfaces; no session event.
         name: "session resume \u2014 prompt echo filtered via stream-derived user id",

package/dist/runtime.js

@@ -4988,7 +4988,6 @@ async function* decodeOpencodeStream(events, ctx) {
   let reason;
   let settled = false;
   const userMessageIds = /* @__PURE__ */ new Set();
-  if (ctx.skipMessageId) userMessageIds.add(ctx.skipMessageId);
   for await (const ev of events) {
     if (ctx.signal.aborted) return;
     if (ev.type === "message.updated") {
@@ -5148,8 +5147,6 @@ function buildRunSpec(req, resumeSessionId) {
     parts: buildParts(req),
     tools,
     allowAllHostTools,
-    // Fresh session → mint + send a client id; resumed → let opencode mint it.
-    sendClientMessageId: resumeSessionId == null,
     ...dialect.agent ? { agent: dialect.agent } : {},
     mcp: buildMcp(req),
     // Every server this turn installs with a credential resolved into it: a remote one's
@@ -5308,14 +5305,12 @@ function createHttpOpencodeTransport(opts) {
           created = true;
         }
         await installMcp(doFetch, base, spec, signal);
-        const userMessageId = spec.sendClientMessageId ? newOpencodeMessageId() : null;
         const promptRes = await doFetch(
           `${base}/session/${encodeURIComponent(sessionId)}/prompt_async`,
           {
             method: "POST",
             headers: { "content-type": "application/json" },
             body: JSON.stringify({
-              ...userMessageId ? { messageID: userMessageId } : {},
               ...spec.model ? { model: spec.model } : {},
               system: spec.systemPrompt,
               parts: spec.parts,
@@ -5341,7 +5336,6 @@ function createHttpOpencodeTransport(opts) {
           sessionId,
           created,
           directory: spec.directory,
-          userMessageId,
           // The lock is released when this stream finishes draining.
           events: releaseAfter(parseSseStream(eventRes.body, sessionId, signal), release)
         };
@@ -5449,9 +5443,6 @@ function belongsToSession(ev, sessionId) {
   if (typeof infoSid === "string") return infoSid === sessionId;
   return true;
 }
-function newOpencodeMessageId() {
-  return `msg_${crypto.randomUUID().replace(/-/g, "")}`;
-}
 function trimSlash(s) {
   return s.endsWith("/") ? s.slice(0, -1) : s;
 }
@@ -5503,8 +5494,7 @@ function createOpencodeAdapter(deps = {}) {
       }
       yield* decodeOpencodeStream(result.events, {
         signal,
-        sessionId: result.sessionId,
-        skipMessageId: result.userMessageId
+        sessionId: result.sessionId
       });
     }
   };
@@ -5903,8 +5893,7 @@ var OPENCODE_CONFORMANCE_FIXTURES = [
     ]
   },
   {
-    // On a resumed turn the transport mints no client message id (doing so no-ops the turn), so the
-    // decoder gets no `skipMessageId`. It learns the user-message id from the stream — the
+    // On resume, as on a fresh turn, the decoder learns the user-message id from the stream:
     // `message.updated` user frame precedes the echoed part — and drops the echo, so the injected
     // per-turn context can't leak into Steps. Only the reply surfaces; no session event.
     name: "session resume \u2014 prompt echo filtered via stream-derived user id",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabane/companion",
-  "version": "0.6.168",
+  "version": "0.6.169",
   "type": "module",
   "description": "The Cabane Companion (headless): connect an agent on your machine to your Cabane workspace as a responder — drive work against your own codebase, files, and MCP servers without putting any of it in Cabane.",
   "license": "UNLICENSED",