jefrichat-mcp 0.49.52 → 0.49.53

package/dist/index.js

@@ -75,7 +75,7 @@ from gateway.platforms.event import MessageEvent, MessageType, ProcessingOutcome
 from gateway.platforms._shared import extra_or_secret, get_scoped_secret
 from gateway.status import acquire_scoped_lock, release_scoped_lock
 
-from .native_state import NativeState, read_config, private_write
+from .native_state import NativeState, read_config
 from .sdk_client import JefriClient
 from .recovery import HistoryRecovery
 from .delivery import deliver, delivery_code, reply_chunks
@@ -132,6 +132,7 @@ class JefriAdapter(BasePlatformAdapter):
         self.waiter = None
         self.current = None
         self.last_error = None
+        self.delivery_error = None
         self.stopping = False
         self.send_index = 0
         self.sent_keys = {}
@@ -191,6 +192,8 @@ class JefriAdapter(BasePlatformAdapter):
             self.observed_revision = read_config(self.connection_file).get("controlRevision")
             self.recovery = HistoryRecovery()
             self.recovery_error = self.connection_error = self.last_error = None
+            if self.state.recovered_uncertain:
+                self.last_error = "Interrupted native tasks need attention and will not be replayed; the owner's ON/OFF setting is unchanged"
             self.next_recovery = self.next_connection_check = self.retry_work_after = 0
             try:
                 self.version = json.loads((Path(self.connection_file).parent / "runtime/package.json").read_text())["version"]
@@ -510,9 +513,8 @@ class JefriAdapter(BasePlatformAdapter):
             return
         self.last_error = detail
         await self._notice(message, "This task needs attention: execution or reply delivery could not be confirmed. I will not repeat its actions automatically.", "attention")
-        current = read_config(self.connection_file)
-        if self.state.owner() and current.get("controlRevision") == self.turn_revision:
-            private_write(self.connection_file, {**current, "enabled": False})
+        # This ID is now fenced against execution. Keep the owner's intent and
+        # the rest of the queue intact, including if a notice races an OFF/ON.
 
     async def _work(self):
         while not self.stopping:
@@ -536,6 +538,7 @@ class JefriAdapter(BasePlatformAdapter):
                 self.started_at = time.monotonic()
                 self.next_notice = self.started_at + self.notice_delay
                 self.send_index = 0
+                self.delivery_error = None
                 self.sent_keys = {}
                 self.send_receipts = {}
                 self.edits = {}
@@ -563,7 +566,7 @@ class JefriAdapter(BasePlatformAdapter):
                     self.last_error = None
                     self.last_processed = int(time.time() * 1000)
                 else:
-                    await self._uncertain(item, m, "No confirmed final delivery; inspect native session and Jefri history")
+                    await self._uncertain(item, m, self.delivery_error or "Native completion unconfirmed; inspect native session and Jefri history. This task will not be replayed; other eligible messages can continue")
                     self._warning("delivery_uncertain")
             except Exception as error:
                 if not dispatched:
@@ -571,7 +574,7 @@ class JefriAdapter(BasePlatformAdapter):
                     self.retry_work_after = time.monotonic() + 30
                     self._warning("preflight_retry")
                     continue
-                await self._uncertain(item, m, "Native execution/delivery unconfirmed (" + delivery_code(error) + "); inspect session before retrying")
+                await self._uncertain(item, m, "Native execution unconfirmed (" + delivery_code(error) + "); inspect session before retrying. This task will not be replayed; other eligible messages can continue")
                 self._warning("execution_uncertain")
             finally:
                 self._retire_questions()
@@ -588,6 +591,7 @@ class JefriAdapter(BasePlatformAdapter):
             self.waiter.set_result(outcome)
 
     async def send(self, chat_id, content, reply_to=None, metadata=None):
+        turn_id = None
         try:
             if isinstance(metadata, dict) and metadata.get("expect_edits"):
                 # Some Hermes proxy/older paths still construct a stream for
@@ -618,6 +622,8 @@ class JefriAdapter(BasePlatformAdapter):
             return SendResult(success=True, message_id=self.send_receipts[chunk_key])
         except Exception as error:
             self._warning("send_unconfirmed")
+            if turn_id and self.current and self.current["id"] == turn_id and native_turn.get() == turn_id:
+                self.delivery_error = "Native reply delivery unconfirmed (" + delivery_code(error) + "); inspect Jefri history. This task will not be replayed; other eligible messages can continue"
             # Suppress Hermes's differently formatted fallback after an unknown
             # result: changing the payload/key could duplicate an accepted send.
             return SendResult(success=False, error="Jefri send timed out or is unconfirmed (" + delivery_code(error) + "); inspect history before retrying")
@@ -757,10 +763,9 @@ class NativeState:
         self.db.execute("CREATE TABLE IF NOT EXISTS turns (id TEXT PRIMARY KEY, chat TEXT NOT NULL, message TEXT, state TEXT NOT NULL, at INTEGER NOT NULL, reply TEXT, sent INTEGER NOT NULL DEFAULT 0, detail TEXT)")
         self.db.execute("CREATE TABLE IF NOT EXISTS sibling_admissions (id TEXT PRIMARY KEY, sender TEXT NOT NULL, at INTEGER NOT NULL)")
         self.db.execute("CREATE TABLE IF NOT EXISTS group_rearm (id TEXT PRIMARY KEY, cutoff TEXT NOT NULL)")
-        recovered = self.db.execute("UPDATE turns SET state='uncertain',detail='Gateway stopped mid-turn; inspect native session and Jefri history before retrying' WHERE state IN ('running','sending')").rowcount
-        if recovered:
-            private_write(self.file, {**read_config(self.file), "enabled": False})
-            self.cancel_queued()
+        self.recovered_uncertain = self.db.execute("UPDATE turns SET state='uncertain',detail='Gateway stopped mid-turn; inspect native session and Jefri history before retrying' WHERE state IN ('running','sending')").rowcount
+        # Fence interrupted IDs, not the whole responder. A restart must not
+        # change the owner's saved choice or discard undispatched queued work.
 
     @staticmethod
     def _db(file):
@@ -63539,17 +63544,14 @@ async function startOpenClawBridge(file, timing = { heartbeatMs: 1e3, recoveryMs
   }
   const journal = new NativeJournal(path11.join(path11.dirname(file), "turns.db"));
   const questions = new NativeQuestions(path11.join(path11.dirname(file), "questions.db"));
-  if (journal.recoveredUncertain) {
-    setNativeEnabled(file, false);
-    journal.cancelQueued();
-  }
   let socket, active, busy = false, stopping = false, closed = false;
   let activeGroup;
   let activeMessage, activeStartedAt = 0, nextNoticeAt = 0;
   let noticeTask;
   const notices = /* @__PURE__ */ new Set();
   let activeRevision;
-  let turnError = null, admissionError = null, recoveryError = null;
+  let turnError = journal.recoveredUncertain ? "Interrupted native tasks need attention and will not be replayed; the owner's ON/OFF setting is unchanged." : null;
+  let admissionError = null, recoveryError = null;
   let pumpAfter = 0, lastInboundAt = null, lastProcessedAt = null;
   let observedRevision = config2.controlRevision;
   let recoveryTask, recoveryAbort, nextRecoveryAt = 0;
@@ -63626,6 +63628,7 @@ async function startOpenClawBridge(file, timing = { heartbeatMs: 1e3, recoveryMs
       while (enabled() && socket?.online && (next = journal.next())) {
         const { id: id5, chat, message } = next;
         let dispatched = false;
+        let phase = "execution";
         const revision = readNativeConfig(file).controlRevision;
         const turnAllowed = async () => revision === readNativeConfig(file).controlRevision && await check2(message) && revision === readNativeConfig(file).controlRevision;
         try {
@@ -63648,8 +63651,10 @@ async function startOpenClawBridge(file, timing = { heartbeatMs: 1e3, recoveryMs
           const answer = questions.match(message, revision ?? null);
           const modelMessage = answer ? { ...message, content: `Answer to your question ${JSON.stringify(answer.pending.question.question)}: ${answer.label}` } : message;
           const reply = await runOpenClawTurn(config2, chat, modelMessage, signal);
+          phase = "reply authorization";
           if (!await turnAllowed()) throw Error("Native admission or group eligibility changed while working; reply withheld.");
           lock2.withOwnership(() => journal.reply(id5, reply));
+          phase = "reply delivery";
           for (const [part, text6] of splitNativeReply(reply).entries()) {
             if (!await turnAllowed()) throw Error("Reply stopped because eligibility changed.");
             const result = await deliverNative(() => send(text6, part), turnAllowed);
@@ -63669,15 +63674,11 @@ async function startOpenClawBridge(file, timing = { heartbeatMs: 1e3, recoveryMs
             pumpAfter = Date.now() + timing.recoveryMs;
             break;
           }
-          turnError = e?.name === "AbortError" || e?.name === "TimeoutError" ? "Native turn interrupted; platform actions may still finish." : `Native execution/delivery uncertain (${nativeDeliveryCode(e)}). Inspect gateway session and Jefri history; no automatic retry.`;
+          turnError = e?.name === "AbortError" || e?.name === "TimeoutError" ? "Native turn interrupted; platform actions may still finish. This task will not be replayed; the owner's ON/OFF setting is unchanged." : `Native ${phase} uncertain (${nativeDeliveryCode(e)}). Inspect gateway session and Jefri history; this task will not be replayed. Other eligible messages can continue.`;
           if (lock2.isOwner()) {
             lock2.withOwnership(() => journal.mark(id5, "uncertain", turnError));
             if (readNativeConfig(file).controlRevision === revision) {
               await notice(message, "This task needs attention: execution or reply delivery could not be confirmed. I will not repeat its actions automatically.", "attention");
-              if (lock2.isOwner() && readNativeConfig(file).controlRevision === revision) {
-                setNativeEnabled(file, false);
-                journal.cancelQueued();
-              }
             } else turnError = null;
           }
         } finally {
@@ -63790,7 +63791,7 @@ async function startOpenClawBridge(file, timing = { heartbeatMs: 1e3, recoveryMs
       await Promise.allSettled([...admissions]);
       while (busy) await new Promise((resolve) => setTimeout(resolve, 50));
       await Promise.allSettled([...notices]);
-      if (lock2.isOwner()) journal.cancelQueued();
+      if (lock2.isOwner() && !readNativeConfig(file).enabled) journal.cancelQueued();
       lock2.release();
       status();
       closed = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jefrichat-mcp",
-  "version": "0.49.52",
+  "version": "0.49.53",
   "engines": {
     "node": ">=22.13"
   },