@yoooclaw/phone-notifications 1.11.2-beta.4 → 1.11.4-beta.0

package/dist/index.cjs

@@ -299,6 +299,14 @@ var init_env = __esm({
     init_credentials();
     init_host();
     ENV_CONFIG = {
+      development: {
+        lightApiUrl: "https://openclaw-service-dev.yoooclaw.com/api/message/tob/sendMessage",
+        relayTunnelUrl: "wss://openclaw-service-dev.yoooclaw.com/message/messages/ws/plugin",
+        appNameMapUrl: "https://openclaw-service-dev.yoooclaw.com/api/application-config/app-package/config-all",
+        modelProxyLongRecordingSubmitTaskUrl: "https://openclaw-service-dev.yoooclaw.com/api/model-proxy/long-recording/submit-task",
+        modelProxyLongRecordingQueryTaskResultBaseUrl: "https://openclaw-service-dev.yoooclaw.com/api/model-proxy/long-recording/query-task-result",
+        accountFileDeleteUrl: "https://openclaw-service-dev.yoooclaw.com/api/account/file/delete"
+      },
       test: {
         lightApiUrl: "https://openclaw-service-test.yoooclaw.com/api/message/tob/sendMessage",
         relayTunnelUrl: "wss://openclaw-service-test.yoooclaw.com/message/messages/ws/plugin",
@@ -5472,7 +5480,7 @@ function readBuildInjectedVersion() {
   if (false) {
     return void 0;
   }
-  const version = "1.11.2-beta.4".trim();
+  const version = "1.11.4-beta.0".trim();
   return version || void 0;
 }
 function readPluginVersionFromPackageJson() {
@@ -7343,7 +7351,7 @@ function resolveUpdateChannel(params) {
   if (params.currentVersion.includes("-")) {
     return "beta";
   }
-  return params.envName === "test" ? "beta" : "latest";
+  return params.envName === "production" ? "latest" : "beta";
 }
 
 // src/update/index.ts
@@ -11994,6 +12002,7 @@ var WsProxy = class {
 // src/tunnel/proxy.ts
 var RELAY_TUNNEL_GATEWAY_CLIENT_INSTANCE_ID = "phone-notifications-relay-tunnel";
 var MAX_AUTO_PAIRING_APPROVALS = 3;
+var RECENT_ABORTED_CHAT_RUN_TTL_MS = 6e4;
 var approveDevicePairingPromise = null;
 var approveDevicePairingWarned = false;
 function formatErrorMessage(err2) {
@@ -12049,6 +12058,10 @@ var TunnelProxy = class {
   gatewayWsAutoPairingApprovals = 0;
   /** 等待 Gateway WS 握手完成后发送的帧队列 */
   gatewayWsPending = [];
+  /** 记录已转发到 Gateway 的 req 元信息，便于回包时做定向处理。 */
+  gatewayReqMetaById = /* @__PURE__ */ new Map();
+  /** 最近由用户手动中断的 chat.run，用于过滤 runtime 误补发的 synthetic failure。 */
+  recentAbortedChatRuns = /* @__PURE__ */ new Map();
   /** 设备身份，用于 Gateway connect 握手 */
   deviceIdentity;
   stateDir;
@@ -12102,6 +12115,8 @@ var TunnelProxy = class {
     this.gatewayWsReconnectRequested = false;
     this.gatewayWsAutoPairingApprovals = 0;
     this.gatewayWsPending = [];
+    this.gatewayReqMetaById.clear();
+    this.recentAbortedChatRuns.clear();
   }
   // ─── Gateway RPC WebSocket ───
   pushGatewayPending(payload, reason) {
@@ -12122,6 +12137,10 @@ var TunnelProxy = class {
   /** 处理 Relay 转发的 Gateway RPC 请求帧，原样通过 WebSocket 发给本地 Gateway */
   handleReqFrame(frame) {
     const payload = JSON.stringify(frame);
+    this.gatewayReqMetaById.set(frame.id, {
+      method: frame.method,
+      sessionKey: this.normalizeSessionKey(frame.params?.sessionKey)
+    });
     this.opts.logger.info(
       `TunnelProxy: req id=${frame.id} method=${frame.method} \u2192 gateway WS (${payload.length} chars)`
     );
@@ -12241,6 +12260,116 @@ var TunnelProxy = class {
     }
   }
   // ─── Gateway RPC WebSocket lifecycle ───
+  normalizeSessionKey(value) {
+    return typeof value === "string" && value.trim() ? value.trim() : void 0;
+  }
+  normalizeRunId(value) {
+    return typeof value === "string" && value.trim() ? value.trim() : void 0;
+  }
+  pruneRecentAbortedChatRuns(now = Date.now()) {
+    for (const [runId, entry] of this.recentAbortedChatRuns) {
+      if (now - entry.abortedAtMs > RECENT_ABORTED_CHAT_RUN_TTL_MS) {
+        this.recentAbortedChatRuns.delete(runId);
+      }
+    }
+  }
+  rememberRecentAbortedChatRun(runId, sessionKey) {
+    const normalizedRunId = this.normalizeRunId(runId);
+    const normalizedSessionKey = this.normalizeSessionKey(sessionKey);
+    if (!normalizedRunId || !normalizedSessionKey) return;
+    this.pruneRecentAbortedChatRuns();
+    this.recentAbortedChatRuns.set(normalizedRunId, {
+      sessionKey: normalizedSessionKey,
+      abortedAtMs: Date.now()
+    });
+  }
+  getAssistantMessageText(message) {
+    if (!message || typeof message !== "object") return "";
+    if (typeof message.text === "string") return message.text;
+    if (!Array.isArray(message.content)) return "";
+    return message.content.filter(
+      (item) => item && typeof item === "object" && item.type === "text" && typeof item.text === "string"
+    ).map((item) => item.text).join("");
+  }
+  looksLikeSyntheticAbortFailureText(text) {
+    const normalized = text.trim().toLowerCase();
+    if (!normalized) return false;
+    return normalized.includes("agent failed before reply:") && normalized.includes("aborted") && normalized.includes("openclaw logs --follow");
+  }
+  isSyntheticAbortHistoryMessage(message, sessionKey) {
+    const text = this.getAssistantMessageText(message);
+    if (!this.looksLikeSyntheticAbortFailureText(text)) return false;
+    const messageTimestamp = typeof message?.timestamp === "number" ? message.timestamp : null;
+    const now = Date.now();
+    this.pruneRecentAbortedChatRuns(now);
+    for (const entry of this.recentAbortedChatRuns.values()) {
+      if (entry.sessionKey !== sessionKey) continue;
+      if (messageTimestamp === null) return true;
+      if (Math.abs(messageTimestamp - entry.abortedAtMs) <= RECENT_ABORTED_CHAT_RUN_TTL_MS) {
+        return true;
+      }
+    }
+    return false;
+  }
+  maybeRewriteGatewayFrame(text, frame) {
+    this.pruneRecentAbortedChatRuns();
+    if (frame?.type === "event" && frame?.event === "chat" && frame?.payload?.state === "aborted") {
+      this.rememberRecentAbortedChatRun(
+        frame.payload?.runId,
+        frame.payload?.sessionKey
+      );
+      return text;
+    }
+    if (frame?.type === "ack" && frame?.ok === false && typeof frame?.id === "string") {
+      this.gatewayReqMetaById.delete(frame.id);
+      return text;
+    }
+    let reqMeta;
+    if (frame?.type === "res" && typeof frame?.id === "string") {
+      reqMeta = this.gatewayReqMetaById.get(frame.id);
+      this.gatewayReqMetaById.delete(frame.id);
+    }
+    if (frame?.type === "res" && frame?.ok === true && reqMeta?.method === "chat.abort") {
+      const runIds = Array.isArray(frame?.payload?.runIds) ? frame.payload.runIds : [];
+      for (const runId of runIds) {
+        this.rememberRecentAbortedChatRun(runId, reqMeta.sessionKey);
+      }
+      return text;
+    }
+    if (frame?.type === "event" && frame?.event === "chat" && frame?.payload?.state === "final") {
+      const runId = this.normalizeRunId(frame?.payload?.runId);
+      const assistantText = this.getAssistantMessageText(frame?.payload?.message);
+      const recentAbort = runId ? this.recentAbortedChatRuns.get(runId) : void 0;
+      if (recentAbort && this.looksLikeSyntheticAbortFailureText(assistantText)) {
+        this.opts.logger.info(
+          `TunnelProxy: suppressing synthetic abort failure final for runId=${runId}`
+        );
+        return null;
+      }
+      return text;
+    }
+    if (frame?.type === "res" && frame?.ok === true && reqMeta?.method === "chat.history" && Array.isArray(frame?.payload?.messages)) {
+      const sessionKey = this.normalizeSessionKey(frame?.payload?.sessionKey) ?? reqMeta.sessionKey;
+      if (!sessionKey) return text;
+      const filteredMessages = frame.payload.messages.filter(
+        (message) => !this.isSyntheticAbortHistoryMessage(message, sessionKey)
+      );
+      if (filteredMessages.length === frame.payload.messages.length) {
+        return text;
+      }
+      this.opts.logger.info(
+        `TunnelProxy: removed ${frame.payload.messages.length - filteredMessages.length} synthetic abort history message(s) for session=${sessionKey}`
+      );
+      return JSON.stringify({
+        ...frame,
+        payload: {
+          ...frame.payload,
+          messages: filteredMessages
+        }
+      });
+    }
+    return text;
+  }
   /** 确保到本地 Gateway 的 RPC WebSocket 已连接且握手完成 */
   ensureGatewayWs() {
     if (this.gatewayWsReady && this.gatewayWs?.readyState === wrapper_default.OPEN)
@@ -12325,7 +12454,10 @@ var TunnelProxy = class {
         ws.close();
         return;
       }
-      this.opts.client.sendRaw(text);
+      const rewritten = this.maybeRewriteGatewayFrame(text, frame);
+      if (rewritten !== null) {
+        this.opts.client.sendRaw(rewritten);
+      }
     });
     ws.on("close", (code, reason) => {
       const wasReady = this.gatewayWsReady;