@soimy/dingtalk 3.6.11 → 3.7.0

package/src/{learning-command-service.ts → command/learning-command-service.ts}

@@ -1,5 +1,5 @@
-import { normalizeAllowFrom, isSenderOwner } from "./access-control";
-import type { DingTalkConfig } from "./types";
+import { normalizeAllowFrom, isSenderOwner } from "../platform/access-control";
+import type { DingTalkConfig } from "../platform/types";
 
 export interface ParsedLearnCommand {
   scope:
@@ -33,31 +33,29 @@ export function parseLearnCommand(text: string | undefined): ParsedLearnCommand
     return { scope: "unknown" };
   }
   const normalized = raw.toLowerCase();
-  if (
-    normalized === "/learn help"
-  ) {
+  if (normalized === "/learn help") {
     return { scope: "help" };
   }
   if (
-    normalized === "/learn whoami"
-    || normalized === "/whoami"
-    || normalized === "我是谁"
-    || normalized === "我的信息"
+    normalized === "/learn whoami" ||
+    normalized === "/whoami" ||
+    normalized === "我是谁" ||
+    normalized === "我的信息"
   ) {
     return { scope: "whoami" };
   }
   if (
-    normalized === "/learn whereami"
-    || normalized === "这里是谁"
-    || normalized === "这个群是谁"
-    || normalized === "这个会话是谁"
+    normalized === "/learn whereami" ||
+    normalized === "这里是谁" ||
+    normalized === "这个群是谁" ||
+    normalized === "这个会话是谁"
   ) {
     return { scope: "whereami" };
   }
   if (
-    normalized === "/learn owner status"
-    || normalized === "/owner status"
-    || normalized === "/owner-status"
+    normalized === "/learn owner status" ||
+    normalized === "/owner status" ||
+    normalized === "/owner-status"
   ) {
     return { scope: "owner-status" };
   }
@@ -184,7 +182,9 @@ export function formatWhereAmIReply(params: {
     params.peerId ? `- peerId: \`${params.peerId}\`` : undefined,
     "",
     "后续如果要定向注入到这里，就使用这个 conversationId。",
-  ].filter(Boolean).join("\n");
+  ]
+    .filter(Boolean)
+    .join("\n");
 }
 
 export function formatOwnerStatusReply(params: {
@@ -247,15 +247,16 @@ export function formatLearnAppliedReply(params: {
   targetIds?: string[];
   setName?: string;
 }): string {
-  const scopeLine = params.scope === "global"
-    ? "- 生效范围：同一钉钉账号下所有会话，将在下一条消息进入时自动加载"
-    : params.scope === "session"
-      ? "- 生效范围：当前会话，将在下一条消息进入时自动加载"
-      : params.scope === "target"
-        ? `- 生效范围：指定目标 \`${params.targetId}\``
-        : params.scope === "targets"
-          ? `- 生效范围：${params.targetIds?.length || 0} 个目标`
-          : `- 生效范围：目标组 \`${params.setName}\``;
+  const scopeLine =
+    params.scope === "global"
+      ? "- 生效范围：同一钉钉账号下所有会话，将在下一条消息进入时自动加载"
+      : params.scope === "session"
+        ? "- 生效范围：当前会话，将在下一条消息进入时自动加载"
+        : params.scope === "target"
+          ? `- 生效范围：指定目标 \`${params.targetId}\``
+          : params.scope === "targets"
+            ? `- 生效范围：${params.targetIds?.length || 0} 个目标`
+            : `- 生效范围：目标组 \`${params.setName}\``;
   return [
     params.scope === "global"
       ? "已注入全局知识。"
@@ -270,7 +271,9 @@ export function formatLearnAppliedReply(params: {
     params.ruleId ? `- ruleId: \`${params.ruleId}\`` : undefined,
     `- instruction: ${params.instruction}`,
     scopeLine,
-  ].filter(Boolean).join("\n");
+  ]
+    .filter(Boolean)
+    .join("\n");
 }
 
 export function formatLearnListReply(lines: string[]): string {
@@ -298,7 +301,9 @@ export function formatLearnDisabledReply(params: {
     "已停用规则。",
     "",
     `- ruleId: \`${params.ruleId}\``,
-    params.scope === "target" && params.targetId ? `- scope: target (\`${params.targetId}\`)` : "- scope: global",
+    params.scope === "target" && params.targetId
+      ? `- scope: target (\`${params.targetId}\`)`
+      : "- scope: global",
     "- 当前效果：这条规则会停止生效，但记录仍会保留，便于后续排查或恢复。",
   ].join("\n");
 }
@@ -321,7 +326,9 @@ export function formatLearnDeletedReply(params: {
     "已删除规则。",
     "",
     `- ruleId: \`${params.ruleId}\``,
-    params.scope === "target" && params.targetId ? `- scope: target (\`${params.targetId}\`)` : "- scope: global",
+    params.scope === "target" && params.targetId
+      ? `- scope: target (\`${params.targetId}\`)`
+      : "- scope: global",
   ].join("\n");
 }
 

package/src/{session-command-service.ts → command/session-command-service.ts}

@@ -18,7 +18,9 @@ export function parseSessionCommand(text: string | undefined): ParsedSessionComm
   if (!raw) {
     return { scope: "unknown" };
   }
-  const sessionAliasBindMatch = raw.match(/^\/session-alias\s+(bind|unbind)\s+(direct|group)\s+(\S+)(?:\s+(.+))?$/i);
+  const sessionAliasBindMatch = raw.match(
+    /^\/session-alias\s+(bind|unbind)\s+(direct|group)\s+(\S+)(?:\s+(.+))?$/i,
+  );
   if (sessionAliasBindMatch) {
     const action = sessionAliasBindMatch[1]?.toLowerCase();
     const sourceKind = sessionAliasBindMatch[2]?.toLowerCase() as "direct" | "group";

package/src/gateway/channel-gateway.ts

@@ -1,27 +1,25 @@
 import { DWClient, TOPIC_CARD, TOPIC_ROBOT } from "dingtalk-stream";
 import { listAgentIds } from "openclaw/plugin-sdk/agent-runtime";
-import { analyzeCardCallback } from "../card-callback-service";
-import { finalizeActiveCardsForAccount, recoverPendingCardsForAccount } from "../card-service";
+import {
+  deliveryContextFromSession,
+  sessionDeliveryChannel,
+  sessionDeliveryOrigin,
+  sessionDeliveryRoute,
+} from "openclaw/plugin-sdk/session-store-runtime";
+import type { SessionEntry } from "openclaw/plugin-sdk/session-store-runtime";
 import { recoverAskUserQuestionsForAccount } from "../card/ask-user-question";
 import { handleCardAction } from "../card/card-action-handler";
-import { resolveRobotCode, resolveRuntimeConfig } from "../config";
-import { ConnectionManager } from "../connection-manager";
-import { isMessageProcessed, markMessageProcessed } from "../dedup";
+import { analyzeCardCallback } from "../card/card-callback-service";
+import { finalizeActiveCardsForAccount, recoverPendingCardsForAccount } from "../card/card-service";
 import {
   isLearningAutoApplyEnabled,
   isLearningEnabled,
   recordExplicitFeedbackLearning,
-} from "../feedback-learning-service";
-import { handleDingTalkMessage } from "../inbound-handler";
-import { setCurrentLogger } from "../logger-context";
-import { registerPeerId } from "../peer-id-registry";
-import { getDingTalkRuntime } from "../runtime";
-import { sendProactiveTextOrMarkdown } from "../send-service";
-import {
-  listKnownGroupTargets,
-  listKnownUserTargets,
-  upsertObservedGroupTarget,
-} from "../targeting/target-directory-store";
+} from "../command/feedback-learning-service";
+import { sendProactiveTextOrMarkdown } from "../messaging/send-service";
+import { resolveRobotCode, resolveRuntimeConfig } from "../platform/config";
+import { setCurrentLogger } from "../platform/logger-context";
+import { getDingTalkRuntime } from "../platform/runtime";
 import type {
   ConnectionManagerConfig,
   DingTalkChannelPlugin,
@@ -29,8 +27,9 @@ import type {
   GatewayStartContext,
   GatewayStopResult,
   StreamClientFactory,
-} from "../types";
-import { ConnectionState } from "../types";
+} from "../platform/types";
+import { ConnectionState } from "../platform/types";
+import { isMessageProcessed, markMessageProcessed } from "../shared/dedup";
 import {
   closePluginDebugLog,
   cleanupOrphanedTempFiles,
@@ -38,7 +37,15 @@ import {
   formatDingTalkConnectionErrorLog,
   getCurrentTimestamp,
   resolvePluginDebugLog,
-} from "../utils";
+} from "../shared/utils";
+import { registerPeerId } from "../targeting/peer-id-registry";
+import {
+  listKnownGroupTargets,
+  listKnownUserTargets,
+  upsertObservedGroupTarget,
+} from "../targeting/target-directory-store";
+import { ConnectionManager } from "./connection-manager";
+import { handleDingTalkMessage } from "./inbound-handler";
 
 type InstrumentedDWClient = {
   getEndpoint?: () => Promise<unknown>;
@@ -47,6 +54,82 @@ type InstrumentedDWClient = {
   dw_url?: string;
 };
 
+/**
+ * Runtime read of a session entry that may still carry pre-`delivery`
+ * delivery fields.
+ *
+ * Session entries persist `origin` / `lastChannel` / `lastTo` / `lastAccountId`
+ * only until `openclaw doctor --fix` migrates them into the canonical
+ * `delivery` state, so both shapes can appear when the plugin scans an existing
+ * store. The index signature keeps legacy reads without reintroducing the
+ * retired fields into typed code paths.
+ */
+type SessionEntryWithLegacyDelivery = SessionEntry & Record<string, unknown>;
+
+function readLegacySessionString(
+  entry: SessionEntryWithLegacyDelivery,
+  key: string,
+): string | undefined {
+  const value = entry[key];
+  return typeof value === "string" ? value : undefined;
+}
+
+function normalizeOptionalSessionString(value: string | undefined): string | undefined {
+  return value && value.length > 0 ? value : undefined;
+}
+
+function readLegacySessionOrigin(
+  entry: SessionEntryWithLegacyDelivery,
+  key: "provider" | "surface" | "accountId" | "from" | "to",
+): string | undefined {
+  const origin = entry.origin;
+  if (!origin || typeof origin !== "object") {
+    return undefined;
+  }
+  const value = (origin as Record<string, unknown>)[key];
+  return typeof value === "string" ? value : undefined;
+}
+
+/** Reads one session entry's delivery identity across canonical and legacy shapes. */
+function readSessionDeliveryIdentity(entry: SessionEntry): {
+  channels: Array<string | undefined>;
+  accountId: string | undefined;
+  peerIds: Array<string | undefined>;
+} {
+  const legacy = entry as SessionEntryWithLegacyDelivery;
+  const origin = sessionDeliveryOrigin(entry);
+  const context = deliveryContextFromSession(entry);
+  const route = sessionDeliveryRoute(entry);
+  return {
+    channels: [
+      sessionDeliveryChannel(entry),
+      route?.channel,
+      context?.channel,
+      readLegacySessionString(legacy, "lastChannel"),
+      readLegacySessionString(legacy, "channel"),
+      origin?.provider,
+      origin?.surface,
+      readLegacySessionOrigin(legacy, "provider"),
+      readLegacySessionOrigin(legacy, "surface"),
+    ],
+    // Canonical `delivery.context` wins, then the pre-`delivery` fields. Empty
+    // strings fall through so the chain matches the original `||` semantics.
+    accountId:
+      normalizeOptionalSessionString(context?.accountId) ??
+      normalizeOptionalSessionString(readLegacySessionString(legacy, "lastAccountId")) ??
+      normalizeOptionalSessionString(origin?.accountId) ??
+      normalizeOptionalSessionString(readLegacySessionOrigin(legacy, "accountId")),
+    peerIds: [
+      context?.to,
+      readLegacySessionString(legacy, "lastTo"),
+      origin?.from,
+      origin?.to,
+      readLegacySessionOrigin(legacy, "from"),
+      readLegacySessionOrigin(legacy, "to"),
+    ],
+  };
+}
+
 function attachConnectionErrorContext(
   err: unknown,
   stage: "connect.open" | "connect.websocket",
@@ -205,17 +288,12 @@ export function createDingTalkGateway(): NonNullable<DingTalkChannelPlugin["gate
             storePath: sessionStorePath,
             readConsistency: "latest",
           })) {
-            const isDingTalkSession = [
-              entry.lastChannel,
-              entry.channel,
-              entry.origin?.provider,
-              entry.origin?.surface,
-            ].some((value) => value === "dingtalk");
-            const sessionAccountId = entry.lastAccountId || entry.origin?.accountId;
-            if (!isDingTalkSession || sessionAccountId !== account.accountId) {
+            const identity = readSessionDeliveryIdentity(entry);
+            const isDingTalkSession = identity.channels.some((value) => value === "dingtalk");
+            if (!isDingTalkSession || identity.accountId !== account.accountId) {
               continue;
             }
-            for (const peerId of [entry.lastTo, entry.origin?.from, entry.origin?.to]) {
+            for (const peerId of identity.peerIds) {
               if (typeof peerId !== "string" || !peerId.startsWith("cid")) {
                 continue;
               }

package/src/{connection-manager.ts → gateway/connection-manager.ts}

@@ -16,8 +16,8 @@ import type {
   ConnectionAttemptResult,
   Logger,
   StreamClientFactory,
-} from "./types";
-import { ConnectionState as ConnectionStateEnum } from "./types";
+} from "../platform/types";
+import { ConnectionState as ConnectionStateEnum } from "../platform/types";
 
 /**
  * Thrown when a runtime reconnection cycle exceeds the configured deadline.
@@ -98,7 +98,13 @@ export class ConnectionManager {
   // Old client pending cleanup after a warm reconnect swap.
   private pendingOldClient?: DWClient;
 
-  constructor(client: DWClient, accountId: string, config: ConnectionManagerConfig, log?: Logger, clientFactory?: StreamClientFactory) {
+  constructor(
+    client: DWClient,
+    accountId: string,
+    config: ConnectionManagerConfig,
+    log?: Logger,
+    clientFactory?: StreamClientFactory,
+  ) {
     this.client = client;
     this.accountId = accountId;
     this.config = config;
@@ -148,17 +154,17 @@ export class ConnectionManager {
       }
 
       const now = Date.now();
-      const idleMs = this.lastSocketActivityAt !== undefined
-        ? now - this.lastSocketActivityAt
-        : ConnectionManager.HEARTBEAT_INTERVAL_MS;
+      const idleMs =
+        this.lastSocketActivityAt !== undefined
+          ? now - this.lastSocketActivityAt
+          : ConnectionManager.HEARTBEAT_INTERVAL_MS;
       if (idleMs >= ConnectionManager.HEARTBEAT_INTERVAL_MS) {
         this.consecutiveHeartbeatMisses += 1;
         this.runtimeCounters.heartbeatMisses += 1;
 
         if (this.consecutiveHeartbeatMisses >= ConnectionManager.HEARTBEAT_MISS_THRESHOLD) {
-          const lastPingAgoMs = this.lastHeartbeatPingAt !== undefined
-            ? now - this.lastHeartbeatPingAt
-            : undefined;
+          const lastPingAgoMs =
+            this.lastHeartbeatPingAt !== undefined ? now - this.lastHeartbeatPingAt : undefined;
           this.log?.warn?.(
             `[${this.accountId}] Connection heartbeat missed ${this.consecutiveHeartbeatMisses}/${ConnectionManager.HEARTBEAT_MISS_THRESHOLD} checks, triggering reconnection (lastPingAgoMs=${lastPingAgoMs ?? "n/a"})`,
           );
@@ -178,9 +184,7 @@ export class ConnectionManager {
       try {
         socket.ping("", true);
       } catch (err: any) {
-        this.log?.warn?.(
-          `[${this.accountId}] Failed to send heartbeat ping: ${err.message}`,
-        );
+        this.log?.warn?.(`[${this.accountId}] Failed to send heartbeat ping: ${err.message}`);
       }
     }, ConnectionManager.HEARTBEAT_INTERVAL_MS);
   }
@@ -211,9 +215,10 @@ export class ConnectionManager {
     }
 
     const defaultOpenTimeout = 10_000;
-    const openTimeout = this.reconnectDeadline !== undefined
-      ? Math.min(defaultOpenTimeout, Math.max(1000, this.reconnectDeadline - Date.now()))
-      : defaultOpenTimeout;
+    const openTimeout =
+      this.reconnectDeadline !== undefined
+        ? Math.min(defaultOpenTimeout, Math.max(1000, this.reconnectDeadline - Date.now()))
+        : defaultOpenTimeout;
 
     await new Promise<void>((resolve, reject) => {
       const timeout = setTimeout(() => {
@@ -226,9 +231,18 @@ export class ConnectionManager {
         socket.removeListener("error", onError);
         socket.removeListener("close", onClose);
       };
-      const onOpen = () => { cleanup(); resolve(); };
-      const onError = (err: Error) => { cleanup(); reject(err); };
-      const onClose = () => { cleanup(); reject(new Error("Socket closed before open")); };
+      const onOpen = () => {
+        cleanup();
+        resolve();
+      };
+      const onError = (err: Error) => {
+        cleanup();
+        reject(err);
+      };
+      const onClose = () => {
+        cleanup();
+        reject(new Error("Socket closed before open"));
+      };
       socket.once("open", onOpen);
       socket.once("error", onError);
       socket.once("close", onClose);
@@ -370,7 +384,11 @@ export class ConnectionManager {
       // Warm-reconnect failed with new client: revert to old client so
       // subsequent retry attempts don't keep creating throwaway instances.
       if (this.pendingOldClient) {
-        try { this.client.disconnect(); } catch { /* best-effort cleanup of failed new client */ }
+        try {
+          this.client.disconnect();
+        } catch {
+          /* best-effort cleanup of failed new client */
+        }
         this.client = this.pendingOldClient;
         this.pendingOldClient = undefined;
         this.log?.debug?.(
@@ -509,10 +527,7 @@ export class ConnectionManager {
 
       this.consecutiveUnhealthyChecks += 1;
       this.runtimeCounters.healthUnhealthyChecks += 1;
-      if (
-        this.consecutiveUnhealthyChecks <
-        ConnectionManager.HEALTH_CHECK_UNHEALTHY_THRESHOLD
-      ) {
+      if (this.consecutiveUnhealthyChecks < ConnectionManager.HEALTH_CHECK_UNHEALTHY_THRESHOLD) {
         this.log?.debug?.(
           `[${this.accountId}] Connection health check unhealthy (${this.consecutiveUnhealthyChecks}/${ConnectionManager.HEALTH_CHECK_UNHEALTHY_THRESHOLD}) connected=${String(client.connected)} registered=${String(registered)} socketReadyState=${socketReadyState ?? "unknown"}`,
         );
@@ -723,7 +738,9 @@ export class ConnectionManager {
       if (err instanceof ReconnectDeadlineError) {
         this.consecutiveDeadlineTimeouts += 1;
 
-        if (this.consecutiveDeadlineTimeouts >= ConnectionManager.MAX_CONSECUTIVE_DEADLINE_TIMEOUTS) {
+        if (
+          this.consecutiveDeadlineTimeouts >= ConnectionManager.MAX_CONSECUTIVE_DEADLINE_TIMEOUTS
+        ) {
           this.log?.error?.(
             `[${this.accountId}] Max consecutive deadline timeouts (${ConnectionManager.MAX_CONSECUTIVE_DEADLINE_TIMEOUTS}) reached. Giving up.`,
           );
@@ -740,10 +757,7 @@ export class ConnectionManager {
 
         const deadlineMs = this.config.reconnectDeadlineMs ?? 50000;
         this.reconnectDeadline = Date.now() + deadlineMs;
-        const delay = Math.min(
-          this.calculateNextDelay(0),
-          ConnectionManager.MAX_CYCLE_BACKOFF_MS,
-        );
+        const delay = Math.min(this.calculateNextDelay(0), ConnectionManager.MAX_CYCLE_BACKOFF_MS);
         this.attemptCount = 0;
         this.clearReconnectTimer();
         this.log?.warn?.(
@@ -756,12 +770,13 @@ export class ConnectionManager {
       }
 
       this.runtimeReconnectCycles += 1;
-      const maxCycles = this.config.maxReconnectCycles ?? ConnectionManager.DEFAULT_MAX_RECONNECT_CYCLES;
+      const maxCycles =
+        this.config.maxReconnectCycles ?? ConnectionManager.DEFAULT_MAX_RECONNECT_CYCLES;
 
       if (this.runtimeReconnectCycles >= maxCycles) {
         this.log?.error?.(
           `[${this.accountId}] Max runtime reconnect cycles (${maxCycles}) reached. Giving up. ` +
-          `Please check network connectivity or restart the gateway.`,
+            `Please check network connectivity or restart the gateway.`,
         );
         this.state = ConnectionStateEnum.FAILED;
         this.connectedAt = undefined;

package/src/{docs-service.ts → gateway/docs-service.ts}

@@ -1,8 +1,8 @@
-import axios, { DEFAULT_HTTP_TIMEOUT_MS } from "./http-client";
-import { getAccessToken } from "./auth";
-import { getLogger } from "./logger-context";
-import { getProxyBypassOption } from "./utils";
-import type { DingTalkConfig, DocInfo, Logger } from "./types";
+import { getAccessToken } from "../platform/auth";
+import { getLogger } from "../platform/logger-context";
+import type { DingTalkConfig, DocInfo, Logger } from "../platform/types";
+import axios, { DEFAULT_HTTP_TIMEOUT_MS } from "../shared/http-client";
+import { getProxyBypassOption } from "../shared/utils";
 
 const DINGTALK_API = "https://api.dingtalk.com";