@ycodium-ai/plugin-im 0.2.3214 → 0.2.3216

package/dist/index.js

@@ -126336,8 +126336,16 @@ var foldConclusionEvent = (state, name, data) => {
   const pending = conclusionDebtsOf(state);
   if (name === "conclusion-delivered") {
     const { [key]: _delivered, ...rest } = pending;
-    return { ...state, conclusions: rest };
+    return {
+      ...state,
+      conclusions: rest,
+      deliveredConclusions: keepNewest(
+        { ...state.deliveredConclusions, [key]: true },
+        CONCLUSION_DEBT_LIMIT
+      )
+    };
   }
+  if (state.deliveredConclusions?.[key] === true) return state;
   const chatKey = data["chatKey"];
   const recordedAt = data["recordedAt"];
   if (typeof chatKey !== "string" || chatKey === "" || typeof recordedAt !== "string" || !Number.isFinite(Date.parse(recordedAt))) {
@@ -126354,13 +126362,13 @@ var foldConclusionEvent = (state, name, data) => {
 var makeConclusionLedger = (core) => {
   const inFlight = /* @__PURE__ */ new Set();
   const registering = /* @__PURE__ */ new Map();
-  const delivered = makeBoundedMap(CONCLUSION_DEBT_LIMIT);
+  const unpersisted = /* @__PURE__ */ new Set();
+  const delivered = (key) => core.state.deliveredConclusions?.[key] === true;
   let disposed = false;
   core.host.onDispose(() => {
     disposed = true;
   });
   const settle = (debt) => {
-    delivered.set(keyOf(debt.threadId, debt.userMessageId), true);
     core.commit("conclusion-delivered", {
       threadId: debt.threadId,
       userMessageId: debt.userMessageId
@@ -126378,15 +126386,25 @@ var makeConclusionLedger = (core) => {
         gate.resolve();
       };
     },
-    owe: (debt) => {
+    /** 重放才传 recover；只对本次成功补出的欠账调度恢复，已有欠账交给原来的收尾路径。 */
+    owe: async (debt, recover) => {
+      const key = keyOf(debt.threadId, debt.userMessageId);
+      if (delivered(key)) {
+        core.host.log.info("chat skipped a conclusion debt already delivered", { ...debt });
+        return;
+      }
       const pending = conclusionDebtsOf(core.state);
-      if (Object.keys(pending).length >= CONCLUSION_DEBT_LIMIT && pending[keyOf(debt.threadId, debt.userMessageId)] === void 0) {
+      const added = pending[key] === void 0 || unpersisted.has(key);
+      if (Object.keys(pending).length >= CONCLUSION_DEBT_LIMIT && pending[key] === void 0) {
         core.host.log.warn("chat dropped its oldest conclusion debt at capacity", {
           oldest: Object.values(pending)[0],
           limit: CONCLUSION_DEBT_LIMIT
         });
       }
-      core.commit("conclusion-owed", { ...debt });
+      if (added) unpersisted.add(key);
+      await core.commitDurably("conclusion-owed", { ...debt });
+      unpersisted.delete(key);
+      if (added) await recover?.(debt);
     },
     forTurn: async (threadId, turnId = null) => {
       await Promise.all(registering.get(threadId) ?? []);
@@ -126395,17 +126413,19 @@ var makeConclusionLedger = (core) => {
       const key = userMessageId === void 0 ? void 0 : keyOf(threadId, userMessageId);
       return {
         debt: key === void 0 ? void 0 : conclusionDebtsOf(core.state)[key],
-        handled: key !== void 0 && (delivered.get(key) === true || inFlight.has(key)),
+        handled: key !== void 0 && (delivered(key) || inFlight.has(key)),
         execution
       };
     },
     deliver: async (debt, send) => {
       const key = keyOf(debt.threadId, debt.userMessageId);
-      if (disposed || inFlight.has(key) || conclusionDebtsOf(core.state)[key] === void 0)
+      if (disposed || delivered(key) || inFlight.has(key) || conclusionDebtsOf(core.state)[key] === void 0)
         return false;
       inFlight.add(key);
       try {
-        const sent = await send(() => conclusionDebtsOf(core.state)[key] !== void 0);
+        const sent = await send(
+          () => !delivered(key) && conclusionDebtsOf(core.state)[key] !== void 0
+        );
         if (sent) settle(debt);
         return sent;
       } finally {
@@ -126414,7 +126434,7 @@ var makeConclusionLedger = (core) => {
     },
     discard: (debt) => {
       const key = keyOf(debt.threadId, debt.userMessageId);
-      if (!disposed && !inFlight.has(key) && conclusionDebtsOf(core.state)[key] !== void 0) {
+      if (!disposed && !delivered(key) && !inFlight.has(key) && conclusionDebtsOf(core.state)[key] !== void 0) {
         settle(debt);
       }
     }
@@ -134339,16 +134359,18 @@ var makeImCore = (input) => {
     }
   );
   let persisting = Promise.resolve();
-  const commit = (name, data) => {
+  const commitDurably = (name, data) => {
     state = foldImEvent(state, name, data);
-    persisting = persisting.then(
+    const saved = persisting.then(
       () => host.events.append({ name, aggregate: { kind: "plugin", id: input.pluginId }, data })
-    ).then(
-      () => void 0,
-      (error) => {
-        host.log.warn("chat could not save its state", { name, error: describeError(error) });
-      }
-    );
+    ).then(() => void 0);
+    persisting = saved.catch((error) => {
+      host.log.warn("chat could not save its state", { name, error: describeError(error) });
+    });
+    return saved;
+  };
+  const commit = (name, data) => {
+    void commitDurably(name, data);
   };
   const bindChat = (chatKey, threadId) => {
     commit("chat-updated", { chatKey, threadId });
@@ -134414,6 +134436,7 @@ var makeImCore = (input) => {
     },
     ready,
     commit,
+    commitDurably,
     bindChat,
     outbound,
     deliver,
@@ -134885,6 +134908,7 @@ import { projectOrNull } from "@ycodium-ai/plugin-api";
 
 // src/inboxProcessing.ts
 var processingFor = (store, rowId, entry, retry) => ({
+  replayed: entry.replayed === true,
   get entry() {
     return store.get(rowId, entry.key);
   },
@@ -135046,7 +135070,7 @@ var makeInboxReplay = (core, currentBot, state, enqueueForChat, resumeMessage, c
       await resumeMessage(
         bot,
         latest.message === entry.message ? message : restoreInbound(core.adapterFor(bot.platform), latest.message),
-        latest,
+        { ...latest, replayed: true },
         chatId
       );
     });
@@ -146630,7 +146654,7 @@ var enqueueConclusion = (core, ledger, binding, debt, send) => core.outbound(
 
 // src/conclusionRecovery.ts
 var MAX_AGE_MS = 7 * 24 * 60 * 60 * 1e3;
-var recoverConclusions = async (core, ledger, delivery, failures) => {
+var makeConclusionRecovery = (core, ledger, delivery, failures) => {
   let disposed = false;
   core.host.onDispose(() => {
     disposed = true;
@@ -146641,15 +146665,15 @@ var recoverConclusions = async (core, ledger, delivery, failures) => {
       error: describeError(error)
     });
   };
-  await core.ready;
-  for (const debt of Object.values(conclusionDebtsOf(core.state))) {
+  const recoverConclusion = async (debt) => {
+    await core.ready;
     if (disposed) return;
     try {
       const execution = await core.host.projections.getThreadExecution(debt.threadId);
       if (disposed) return;
       if (execution === null) {
         ledger.discard(debt);
-        continue;
+        return;
       }
       const latest = execution.latestTurn;
       if (latest?.userMessageId !== debt.userMessageId) {
@@ -146657,16 +146681,16 @@ var recoverConclusions = async (core, ledger, delivery, failures) => {
           ...debt
         });
         ledger.discard(debt);
-        continue;
+        return;
       }
-      if (latest.state === "running" || execution.session?.activeTurnId != null) continue;
+      if (latest.state === "running" || execution.session?.activeTurnId != null) return;
       if (latest.completedAt !== null && Date.parse(latest.completedAt) < Date.now() - MAX_AGE_MS) {
         core.host.log.info("chat discarded a conclusion older than seven days", { ...debt });
         ledger.discard(debt);
-        continue;
+        return;
       }
       const binding = core.bindingForChatKey(debt.chatKey);
-      if (binding === void 0) continue;
+      if (binding === void 0) return;
       enqueueConclusion(core, ledger, binding, debt, async (owed) => {
         try {
           if (latest.state === "error") {
@@ -146689,7 +146713,15 @@ var recoverConclusions = async (core, ledger, delivery, failures) => {
     } catch (error) {
       couldNotRecover(debt, error);
     }
-  }
+  };
+  const recoverConclusions = async () => {
+    await core.ready;
+    for (const debt of Object.values(conclusionDebtsOf(core.state))) {
+      if (disposed) return;
+      await recoverConclusion(debt);
+    }
+  };
+  return { recoverConclusion, recoverConclusions };
 };
 
 // src/notificationTargets.ts
@@ -146713,7 +146745,13 @@ var makeNotifications = (core, deps) => {
   const { takeWorking } = deps;
   const { turnCards } = deps.replyCards;
   const { failures, conclusions, delivery } = deps;
-  void recoverConclusions(core, conclusions, delivery, failures);
+  const { recoverConclusion, recoverConclusions } = makeConclusionRecovery(
+    core,
+    conclusions,
+    delivery,
+    failures
+  );
+  void recoverConclusions();
   const projectByThread = /* @__PURE__ */ new Map();
   const projectOfThread = async (threadId) => {
     const known = projectByThread.get(threadId);
@@ -146831,7 +146869,7 @@ var makeNotifications = (core, deps) => {
   const rememberThreadProject = (threadId, projectId) => {
     projectByThread.set(threadId, projectId);
   };
-  return { rememberThreadProject };
+  return { rememberThreadProject, recoverConclusion };
 };
 
 // src/panelCommands.ts
@@ -148211,7 +148249,7 @@ var teamGoalRequestId = (binding, messageId) => {
   return NodeCrypto5.createHash("sha256").update(identity2).digest("hex");
 };
 var makeTeamGoals = (core) => {
-  const { host, t, deliver, commit } = core;
+  const { host, t, deliver, commitDurably } = core;
   const hasRosterFor = async (binding) => {
     try {
       const roster = await host.plugins.invoke({
@@ -148255,13 +148293,16 @@ var makeTeamGoals = (core) => {
         throw new Error("team startGoal returned an invalid result");
       }
       topicRoot?.confirmConsumed();
-      commit("team-goal-started", { chatKey: chatKeyOf(binding), threadId: result2.leadThreadId });
       goal = { leadThreadId: result2.leadThreadId, leadName: result2.leadName };
     } catch (error) {
       host.log.warn("chat could not start the team goal", { error: describeError(error) });
       await deliver(binding, t("team.startFailed"));
       return null;
     }
+    await commitDurably("team-goal-started", {
+      chatKey: chatKeyOf(binding),
+      threadId: goal.leadThreadId
+    });
     await accepted?.(goal.leadThreadId);
     await deliver(
       binding,
@@ -149581,6 +149622,7 @@ var makeTurns = (core, deps) => {
   const startTurn = async (binding, message, accepted, inbox) => {
     const chatKey = chatKeyOf(binding);
     const text4 = message.text;
+    const replayed = inbox?.replayed === true || (inbox?.entry?.attempts ?? 0) > 0;
     const threadId = inbox?.entry?.threadId ?? await ensureThread(binding, message);
     if (threadId === null) {
       await inbox?.complete();
@@ -149686,12 +149728,10 @@ var makeTurns = (core, deps) => {
       if (!dispatched) return null;
       topicRoot?.confirmConsumed();
       if (intentAction?.kind !== "steer") {
-        deps.conclusions.owe({
-          chatKey,
-          threadId,
-          userMessageId,
-          recordedAt: (/* @__PURE__ */ new Date()).toISOString()
-        });
+        await deps.conclusions.owe(
+          { chatKey, threadId, userMessageId, recordedAt: (/* @__PURE__ */ new Date()).toISOString() },
+          replayed ? deps.recoverConclusion : void 0
+        );
       }
     } finally {
       registered();
@@ -152463,7 +152503,7 @@ var makeWecomAppAdapter = (deps) => {
 // src/index.ts
 var definition = {
   id: "im",
-  apiVersion: 21,
+  apiVersion: 22,
   // 第二个参数只给插件自己的测试夹具：换掉文件 IO 与派发重试的等待。宿主只传 ctx。
   activate: async (ctx, testing = {}) => {
     const { dispatchSleep } = testing;
@@ -152592,6 +152632,7 @@ var definition = {
     const turns = makeTurns(core, {
       conclusions,
       attachments: inboundAttachments,
+      recoverConclusion: notifications.recoverConclusion,
       queueFlow: interactions.queueFlow,
       rememberThreadProject: notifications.rememberThreadProject,
       noteInboundUserMessage: webSync.noteInboundUserMessage,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/plugin-im",
-  "version": "0.2.3214",
+  "version": "0.2.3216",
   "description": "Talk to your agents from Telegram, WeCom, Lark, or WeChat (experimental).",
   "keywords": [
     "im",
@@ -32,7 +32,7 @@
     "markdown-it": "^15.0.2",
     "react": "19.2.6",
     "vite-plus": "0.2.2",
-    "@ycodium-ai/plugin-api": "0.2.3214"
+    "@ycodium-ai/plugin-api": "0.2.3216"
   },
   "ycodium": {
     "plugin": "./dist/index.js",