@canonmsg/agent-sdk 12.3.0 → 12.3.1

package/dist/chunks/{chunk-HHODEJNL.js → chunk-HI2SVCUL.js}

@@ -29,7 +29,7 @@ import {
   sendMessageWithRetryChunked,
   splitTextByUtf8Bytes,
   verifyCanonRuntimeConnection
-} from "./chunk-GJO7KULY.js";
+} from "./chunk-SKFI2MJA.js";
 import {
   CONNECTOR_RELAY_ANSWER_WITHIN_MS,
   CONNECTOR_RELAY_INSTALLATION_PATTERN,

package/dist/chunks/{chunk-GJO7KULY.js → chunk-SKFI2MJA.js}

@@ -6612,6 +6612,7 @@ var view2 = /* @__PURE__ */ __name((value) => Object.freeze({
   roster: value.roster,
   pendingOperationId: value.pending?.operationId ?? null
 }), "view");
+var CATCH_UP_MAX_AGE_MS = 6e4;
 function createMlsDevGroups(options, context, keyPackages, bridge) {
   const principal = parseMlsDevEnrollmentPrincipal(options.principal);
   const prepareProtected = options.prepareProtectedGroup ?? fail6("MLS_DEV_GROUP_UNAVAILABLE");
@@ -6626,6 +6627,7 @@ function createMlsDevGroups(options, context, keyPackages, bridge) {
   }), "transaction") };
   const fence = /* @__PURE__ */ __name(() => store.transaction(async () => {
   }), "fence");
+  const caughtUpAt = /* @__PURE__ */ new Map();
   async function initialized() {
     const ready = await context.ready();
     await fence();
@@ -6909,7 +6911,7 @@ function createMlsDevGroups(options, context, keyPackages, bridge) {
         if (!current.envelope?.head || current.envelope.removed || !same6(current.envelope.head, wire.expectedHead) || current.envelope.groupId !== wire.groupId) fail6("MLS_DEV_GROUP_HEAD_CHANGED", true);
         if (await tx.get(appMessageKey(cid, wire.messageId)) !== void 0 && await tx.get(appMessageKey(cid, wire.messageId)) !== receipt.operationId) fail6("MLS_DEV_APPLICATION_ID_CONFLICT");
         const existingMessage = await tx.get(mlsDevTextMessageKey(cid, wire.messageId));
-        if (existingMessage?.feedOrdinal !== null && existingMessage?.feedOrdinal !== void 0) fail6("MLS_DEV_APPLICATION_ID_CONFLICT");
+        if (existingMessage?.feedOrdinal !== null && existingMessage?.feedOrdinal !== void 0 && (existingMessage.feedOrdinal !== entry.ordinal || sender.deviceId !== current.device.registration.device.deviceId)) fail6("MLS_DEV_APPLICATION_ID_CONFLICT");
         if (!current.envelope.roster.some((member) => same6(member.device, sender) && member.admissionId === wire.preconditions.admissionId)) fail6("MLS_DEV_GROUP_MEMBER_REQUIRED");
         ownIntent = sender.deviceId === current.device.registration.device.deviceId ? await tx.get(appIntentKey(receipt.operationId)) : void 0;
         if (ownIntent && (!same6(ownIntent.envelope, wire) || ownIntent.envelopeHash !== receipt.envelopeHash)) fail6("MLS_DEV_APPLICATION_ID_CONFLICT");
@@ -6922,7 +6924,7 @@ function createMlsDevGroups(options, context, keyPackages, bridge) {
         let message, integrity, wrappedState = group.wrappedState;
         if (ownIntent) {
           const local = await store.transaction((tx) => tx.get(mlsDevTextMessageKey(cid, wire.messageId))) ?? fail6();
-          message = local.message.kind === "text" ? parseMlsDevTextPayload(local.message) : parseMlsDevApplicationPayload(local.message);
+          message = local.deleted ? local.message : local.message.kind === "text" ? parseMlsDevTextPayload(local.message) : parseMlsDevApplicationPayload(local.message);
         } else {
           const prepared = await native(init, current, state, cid, group.groupId, { op: "process_application", entry });
           if (prepared.payload.kind !== "text" && prepared.payload.kind !== "item" && prepared.payload.kind !== "interaction" && prepared.payload.kind !== "invalid" || prepared.payload.messageId !== wire.messageId || prepared.payload.operationId !== receipt.operationId || prepared.payload.senderDeviceId !== sender2.deviceId || prepared.payload.feedOrdinal !== entry.ordinal) fail6("MLS_DEV_GROUP_BINDING_MISMATCH");
@@ -7030,7 +7032,7 @@ function createMlsDevGroups(options, context, keyPackages, bridge) {
         let operation;
         if (prepared.own) {
           const own = await tx.get(`operation/${receipt.operationId}`) ?? fail6();
-          operation = await bridge.settle(tx, own, {
+          if (own.status !== "succeeded") operation = await bridge.settle(tx, own, {
             protocol: CANON_ENDPOINT_PROTOCOL,
             operationId: own.operationId,
             installationId: own.installationId,
@@ -7111,6 +7113,17 @@ function createMlsDevGroups(options, context, keyPackages, bridge) {
   }
   __name(reduceInteraction, "reduceInteraction");
   async function refreshFeed(cid, init) {
+    const applied = { entries: false };
+    try {
+      const view3 = await catchUpFeed(cid, init, applied);
+      caughtUpAt.set(cid, context.clock());
+      return view3;
+    } finally {
+      if (applied.entries) bridge.historyChanged?.(cid);
+    }
+  }
+  __name(refreshFeed, "refreshFeed");
+  async function catchUpFeed(cid, init, applied) {
     if (!bridge.queryFeed) fail6("MLS_DEV_GROUP_UNAVAILABLE");
     for (let page = 0; page < 8; page++) {
       const captured = await store.transaction(async (tx) => capture(tx, await readPreparationSnapshot(tx, scope4(cid)), init, cid));
@@ -7149,6 +7162,7 @@ function createMlsDevGroups(options, context, keyPackages, bridge) {
         if (entry.kind === "control") {
           if (!await applyAccepted(init, entry.accepted, void 0, entry)) fail6("MLS_DEV_GROUP_FEED_GAP", true);
         } else await applyApplication(init, entry);
+        applied.entries = true;
       }
       if (!response.hasMore) {
         await store.transaction(async (tx) => {
@@ -7166,7 +7180,7 @@ function createMlsDevGroups(options, context, keyPackages, bridge) {
     }
     return fail6("MLS_DEV_GROUP_CATCHUP_REQUIRED", true);
   }
-  __name(refreshFeed, "refreshFeed");
+  __name(catchUpFeed, "catchUpFeed");
   const canonItemReference = /* @__PURE__ */ __name((item, conversationId, environmentId) => isCanonUploadUrl(item.url, { environmentId, conversationId, uploadId: item.uploadId }) && (item.thumbnailUrl === void 0 || isCanonUploadUrl(item.thumbnailUrl, { environmentId, conversationId, uploadId: item.uploadId, poster: true })), "canonItemReference");
   function itemInput(attachment, caption) {
     const data = record5(attachment, ["kind", "url", "mimeType", "sizeBytes", "uploadId"], ["fileName", "width", "height", "durationMs", "thumbnailUrl", "processingStatus"]);
@@ -7246,7 +7260,7 @@ function createMlsDevGroups(options, context, keyPackages, bridge) {
     __name(existing, "existing");
     const previous = await store.transaction(existing);
     if (previous) return previous;
-    await refresh(cid);
+    if (!await caughtUp(cid)) await refresh(cid);
     await assertNotHeld(cid);
     const messageId = input.messageId ?? id(context.ids());
     let captured, replyTo;
@@ -7771,6 +7785,28 @@ function createMlsDevGroups(options, context, keyPackages, bridge) {
     }
   }
   __name(refresh, "refresh");
+  function textReady(conversationId) {
+    return store.transaction(async (tx) => {
+      const ready = await tx.get(`mls-dev-group/feed-ready/${encodeURIComponent(conversationId)}`);
+      return !!ready?.admitted && !ready.terminal && ready.ordinal === await tx.get(feedKey(conversationId)) && await tx.get(recoveryFailureKey(conversationId)) === void 0;
+    });
+  }
+  __name(textReady, "textReady");
+  async function caughtUp(conversationId) {
+    return !!bridge.streamLive?.() && context.clock() - (caughtUpAt.get(conversationId) ?? -Infinity) < CATCH_UP_MAX_AGE_MS && await textReady(conversationId);
+  }
+  __name(caughtUp, "caughtUp");
+  async function settleOwnApplication(tx, operation, accepted, receipt) {
+    if (operation.status === "succeeded" && same6(operation.receipt?.result, receipt.result)) return {};
+    if (operation.status === "succeeded" || operation.status === "rejected") return void 0;
+    const local = await tx.get(mlsDevTextMessageKey(accepted.conversationId, accepted.messageId));
+    if (local?.message.kind !== "text" && local?.message.kind !== "item") return void 0;
+    const intent2 = await tx.get(appIntentKey(operation.operationId));
+    if (accepted.messageId !== operation.messageId || local.message.operationId !== operation.operationId || intent2?.envelopeHash !== accepted.envelopeHash || intent2.envelope.groupId !== accepted.groupId) fail6("MLS_DEV_GROUP_BINDING_MISMATCH");
+    await putMlsDevTextMessage(tx, { ...local, status: "sent", createdAtMs: accepted.acceptedAtMs, feedOrdinal: accepted.feedOrdinal });
+    return { operation: await bridge.settle(tx, operation, receipt, true) };
+  }
+  __name(settleOwnApplication, "settleOwnApplication");
   async function existingOperation(tx, operationId, authored) {
     const intent2 = await tx.get(`mls-dev-group/intent/${operationId}`), operation = await tx.get(`operation/${operationId}`);
     if (!intent2 && !operation) return void 0;
@@ -7903,10 +7939,12 @@ function createMlsDevGroups(options, context, keyPackages, bridge) {
     const verified = await store.transaction(async (tx) => {
       const local = await tx.get(mlsDevTextMessageKey(conversationId, messageId));
       if (!local || local.feedOrdinal === null || local.message.kind !== "text" && local.message.kind !== "item" || local.deleted) return void 0;
+      const stored = await tx.get(feedEntryKey(conversationId, local.feedOrdinal));
+      if (stored === void 0) return void 0;
       const text = local.message.kind === "item" ? parseMlsDevItemPayload(local.message) : parseMlsDevTextPayload(local.message);
       const protocol2 = await tx.get(mlsDevTextProtocolKey(conversationId));
       if (!isMlsDevTextProtocol(protocol2)) fail6("MLS_DEV_VERIFIED_MESSAGE_MISMATCH");
-      const entry = parseMlsDevGroupFeedEntry(await tx.get(feedEntryKey(conversationId, local.feedOrdinal)));
+      const entry = parseMlsDevGroupFeedEntry(stored);
       if (entry.kind !== "application") fail6("MLS_DEV_VERIFIED_MESSAGE_MISMATCH");
       const { envelope: wire2, receipt: receipt2 } = entry;
       const sender2 = parseMlsDevCredentialToken(wire2.senderCredential).unsigned.claims.device;
@@ -8105,9 +8143,12 @@ function createMlsDevGroups(options, context, keyPackages, bridge) {
       const input = textInput(value), selectedId = id(operationId), selectedGuard = guardId === void 0 ? void 0 : id(guardId);
       return run(() => serializeInboundPreparation(store, input.conversationId, () => sendText(input, selectedId, selectedGuard)));
     },
+    /** A room this device holds caught up is read as it holds it: what fetches the room's new entries says so
+     * (bridge.historyChanged). Otherwise a read fetches the feed first, which the polling fallback and the connected
+     * stream's minute-long safety poll rely on. */
     queryTextHistory(conversationId, name, parameters) {
       return run(() => serializeInboundPreparation(store, id(conversationId), async () => {
-        await refresh(conversationId);
+        if (!await caughtUp(conversationId)) await refresh(conversationId);
         const init = await initialized();
         await primeIdentities(conversationId, init);
         return store.transaction(async (tx) => {
@@ -8131,12 +8172,7 @@ function createMlsDevGroups(options, context, keyPackages, bridge) {
         });
       }));
     },
-    async isTextReady(conversationId) {
-      return store.transaction(async (tx) => {
-        const ready = await tx.get(`mls-dev-group/feed-ready/${encodeURIComponent(conversationId)}`);
-        return !!ready?.admitted && !ready.terminal && ready.ordinal === await tx.get(feedKey(conversationId)) && await tx.get(recoveryFailureKey(conversationId)) === void 0;
-      });
-    },
+    isTextReady: textReady,
     async readAcceptedReceipt(operation) {
       if (!["mls_group_control", "mls_application"].includes(operation.action)) return void 0;
       return store.transaction(async (tx) => {
@@ -8152,13 +8188,18 @@ function createMlsDevGroups(options, context, keyPackages, bridge) {
         const cid = operation.conversationId;
         const accepted2 = operation.action === "mls_application" ? parseMlsDevApplicationReceipt(receipt.result) : parseMlsDevGroupAcceptedControl(receipt.result);
         if (accepted2.operationId !== operation.operationId || ("control" in accepted2 ? accepted2.control.conversationId : accepted2.conversationId) !== cid) fail6("MLS_DEV_GROUP_BINDING_MISMATCH");
-        await store.transaction(async (tx) => {
+        const own = await store.transaction(async (tx) => {
           const current = await tx.get(`operation/${operation.operationId}`) ?? fail6();
           if (receipt.installationId !== current.installationId || receipt.action !== current.action) fail6("MLS_DEV_GROUP_BINDING_MISMATCH");
           const previous = await tx.get(acceptedReceiptKey(operation.operationId));
           if (previous && !same6(previous, receipt)) fail6("MLS_DEV_GROUP_BINDING_MISMATCH");
           if (!previous) await tx.put(acceptedReceiptKey(operation.operationId), receipt);
+          return "control" in accepted2 ? void 0 : settleOwnApplication(tx, current, accepted2, receipt);
         });
+        if (own) {
+          if (own.operation) await bridge.afterReceipt(own.operation);
+          return true;
+        }
         await run(() => serializeInboundPreparation(store, cid, async () => {
           try {
             await refresh(cid);
@@ -8385,7 +8426,10 @@ function createEndpoint(options) {
       clearTimeout(admissionTimers.get(conversationId));
       admissionTimers.delete(conversationId);
       scheduleAdmission(conversationId, 0);
-    }, "controlSettled")
+    }, "controlSettled"),
+    // Whatever fetched them (a hint, the reconnect sweep, a send, recovery), the room's local reads show them now.
+    historyChanged: /* @__PURE__ */ __name((conversationId) => queryObserver.invalidate((query, parameters) => parameters.conversationId === conversationId && ["list_messages", "get_messages", "get_runtime_card_state"].includes(query)), "historyChanged"),
+    streamLive: /* @__PURE__ */ __name(() => events.isConnected(), "streamLive")
   }) : void 0;
   async function inMlsEnvironment() {
     return isMlsEnvironmentId((await initialization).environmentId);

package/dist/cli.js

@@ -22,7 +22,7 @@ import {
   runnerLockName,
   startRelayChannel,
   writeRelayCredential
-} from "./chunks/chunk-HHODEJNL.js";
+} from "./chunks/chunk-HI2SVCUL.js";
 import {
   CanonApiError,
   CanonClient,
@@ -33,7 +33,7 @@ import {
   resolveCanonRuntimeConnection,
   runCli,
   verifyCanonRuntimeConnection
-} from "./chunks/chunk-GJO7KULY.js";
+} from "./chunks/chunk-SKFI2MJA.js";
 import {
   __name,
   isCanonClientVersion

package/dist/index.js

@@ -18,7 +18,7 @@ import {
   runMlsDevSetup,
   runtimeDescriptor,
   startRelayChannel
-} from "./chunks/chunk-HHODEJNL.js";
+} from "./chunks/chunk-HI2SVCUL.js";
 import {
   CanonApiError,
   DEFAULT_ANTHROPIC_REQUEST_HEADROOM_BYTES,
@@ -43,7 +43,7 @@ import {
   toAnthropicImageBlock,
   toAnthropicImageBlocksWithinBudget,
   uploadMediaFile
-} from "./chunks/chunk-GJO7KULY.js";
+} from "./chunks/chunk-SKFI2MJA.js";
 import "./chunks/chunk-5MI6Q3VS.js";
 export {
   CanonApiError,

package/dist/internal/endpoint/mls-dev-groups.d.ts

@@ -149,6 +149,10 @@ export interface MlsDevGroupBridge {
     /** A control of this device's settled, accepted or lost to another device's: what waited on it can go on now. A hint
      * announcing the room's change may have come while it was pending, and none may follow (D2 holds the room's sends). */
     controlSettled?(conversationId: string): void;
+    /** A fetch applied entries of the room's feed: its encrypted history, read locally, has changed. */
+    historyChanged?(conversationId: string): void;
+    /** This device's event stream is connected, so each room's hints announce what Canon accepts into its feed. */
+    streamLive?(): boolean;
     /** Reads and applies the room's conversation snapshot from Canon, for openings of members admitted since. */
     readRoom?(conversationId: string): Promise<unknown>;
 }
@@ -161,13 +165,16 @@ export declare function createMlsDevGroups(options: MlsDevDeviceClientOptions, c
      * encrypted room (mls-payload-v3.md §4). Items and cards are not forwarded yet. */
     forwardText(value: unknown, operationId: string, guardId?: string): Promise<EndpointOperation>;
     sendText(value: unknown, operationId: string, guardId?: string): Promise<EndpointOperation>;
+    /** A room this device holds caught up is read as it holds it: what fetches the room's new entries says so
+     * (bridge.historyChanged). Otherwise a read fetches the feed first, which the polling fallback and the connected
+     * stream's minute-long safety poll rely on. */
     queryTextHistory(conversationId: string, name: string, parameters: Record<string, unknown>): Promise<{
         messages: Record<string, unknown>[];
         nextBefore?: string | null;
         missingMessageIds?: string[];
     }>;
     syncText(conversationId: string, options?: EndpointSyncOptions): Promise<EndpointSyncPage>;
-    isTextReady(conversationId: string): Promise<boolean>;
+    isTextReady: (conversationId: string) => Promise<boolean>;
     readAcceptedReceipt(operation: EndpointOperation): Promise<EndpointOperationReceipt | undefined>;
     settleReceipt(operation: EndpointOperation, receipt: EndpointOperationReceipt): Promise<boolean>;
 };

package/dist/internal/endpoint/mls-dev-text.d.ts

@@ -29,8 +29,8 @@ export declare const mlsDevTextDeletedKey: (conversationId: string, messageId: s
 export declare const mlsDevTextReactionsKey: (conversationId: string, messageId: string) => string;
 /**
  * Its sender deleted a message for everyone. The decrypted text is erased now, and the tombstone keeps it erased if the
- * feed brings the message again, on catch-up or replay. An own send whose echo is not applied yet keeps its text until
- * the echo applies (the echo is checked against it); the history already shows it deleted. Cards are not deleted this
+ * feed brings the message again, on catch-up or replay. An own send Canon has not accepted yet keeps its text until its
+ * receipt or echo settles it; the history already shows it deleted. Cards are not deleted this
  * way: Canon refuses to delete an encrypted card, which is withdrawn instead. Returns whether anything changed.
  */
 export declare function deleteMlsDevTextMessage(tx: EndpointStoreTransaction, conversationId: string, messageId: string): Promise<boolean>;

package/dist/media.js

@@ -18,7 +18,7 @@ import {
   toAnthropicImageBlock,
   toAnthropicImageBlocksWithinBudget,
   uploadMediaFile
-} from "./chunks/chunk-GJO7KULY.js";
+} from "./chunks/chunk-SKFI2MJA.js";
 import "./chunks/chunk-5MI6Q3VS.js";
 export {
   DEFAULT_ANTHROPIC_REQUEST_HEADROOM_BYTES,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/agent-sdk",
-  "version": "12.3.0",
+  "version": "12.3.1",
   "description": "Canon Agent SDK — build AI agents that participate in Canon conversations",
   "type": "module",
   "main": "dist/index.js",