openclaw-quiubo 2.6.66 → 2.6.69

package/dist/index.js

@@ -13469,7 +13469,11 @@ function extractAgentIdFromSessionKey(key) {
   return match?.[1] ?? "main";
 }
 function resolveAccountId(config, agentId) {
-  const bindings = config?.bindings ?? [];
+  let resolvedConfig = config;
+  if (!resolvedConfig?.bindings && typeof resolvedConfig?.loadConfig === "function") {
+    resolvedConfig = resolvedConfig.loadConfig();
+  }
+  const bindings = resolvedConfig?.bindings ?? [];
   const matched = bindings.find(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     (b) => b?.match?.channel === "quiubo" && b?.agentId === agentId
@@ -13481,8 +13485,10 @@ function resolveAccountId(config, agentId) {
 var activeToolCounts = /* @__PURE__ */ new Map();
 var lastSentAt = /* @__PURE__ */ new Map();
 var pendingIdle = /* @__PURE__ */ new Map();
+var orphanTimers = /* @__PURE__ */ new Map();
 var DEBOUNCE_MS = 2e3;
 var IDLE_DELAY_MS = 8e3;
+var ORPHAN_TIMEOUT_MS = 12e4;
 function isSessionWorking(sessionKey) {
   return (activeToolCounts.get(sessionKey) ?? 0) > 0 || pendingIdle.has(sessionKey);
 }
@@ -13523,6 +13529,20 @@ function generateLabel(toolName, params) {
       return "Working...";
   }
 }
+function sendIdleSignal(api, sessionKey, groupId, context) {
+  const config = api.runtime?.config ?? api.config;
+  const agentId = extractAgentIdFromSessionKey(sessionKey);
+  const accountId = resolveAccountId(config, agentId);
+  const client = clients.get(accountId);
+  const accountCfg = accounts.get(accountId);
+  if (!client || !accountCfg?.botIdentityId) return;
+  client.sendActivity(groupId, {
+    identityId: accountCfg.botIdentityId,
+    state: "idle"
+  }).catch((err) => {
+    console.warn(`[quiubo] activity-hook ${context} idle failed: ${err}`);
+  });
+}
 function registerActivityHook(api) {
   api.on(
     "before_tool_call",
@@ -13534,6 +13554,23 @@ function registerActivityHook(api) {
       const key = sessionKey;
       const prev = activeToolCounts.get(key) ?? 0;
       activeToolCounts.set(key, prev + 1);
+      const existingOrphan = orphanTimers.get(key);
+      if (existingOrphan) clearTimeout(existingOrphan);
+      orphanTimers.set(key, setTimeout(() => {
+        orphanTimers.delete(key);
+        const stuck = activeToolCounts.get(key) ?? 0;
+        if (stuck > 0) {
+          console.warn(`[quiubo] activity-hook: force-clearing ${stuck} orphaned tool count(s) for ${key}`);
+          activeToolCounts.set(key, 0);
+          lastSentAt.delete(key);
+          const pendingTimer2 = pendingIdle.get(key);
+          if (pendingTimer2) {
+            clearTimeout(pendingTimer2);
+            pendingIdle.delete(key);
+          }
+          sendIdleSignal(api, sessionKey, groupId, "orphan");
+        }
+      }, ORPHAN_TIMEOUT_MS));
       const pendingTimer = pendingIdle.get(key);
       if (pendingTimer) {
         clearTimeout(pendingTimer);
@@ -13577,22 +13614,16 @@ function registerActivityHook(api) {
       const next = Math.max(0, prev - 1);
       activeToolCounts.set(key, next);
       if (next === 0) {
+        const orphanTimer = orphanTimers.get(key);
+        if (orphanTimer) {
+          clearTimeout(orphanTimer);
+          orphanTimers.delete(key);
+        }
         const idleTimer = setTimeout(() => {
           pendingIdle.delete(key);
           lastSentAt.delete(key);
           if ((activeToolCounts.get(key) ?? 0) > 0) return;
-          const config = api.runtime?.config ?? api.config;
-          const agentId = extractAgentIdFromSessionKey(sessionKey);
-          const accountId = resolveAccountId(config, agentId);
-          const client = clients.get(accountId);
-          const accountCfg = accounts.get(accountId);
-          if (!client || !accountCfg?.botIdentityId) return;
-          client.sendActivity(groupId, {
-            identityId: accountCfg.botIdentityId,
-            state: "idle"
-          }).catch((err) => {
-            console.warn(`[quiubo] activity-hook idle failed: ${err}`);
-          });
+          sendIdleSignal(api, sessionKey, groupId, "normal");
         }, IDLE_DELAY_MS);
         pendingIdle.set(key, idleTimer);
       }