opencode-feishu-plugin 0.2.3 → 0.2.5

package/README.en.md

@@ -389,6 +389,7 @@ Without this relay, any clarifying question would stall the Feishu session forev
 | `logLevel` | `debug`\|`info`\|`warn`\|`error` | `info` | Log level (secrets are never logged, only their presence) |
 | `logFile` | string \| boolean | — | `true` writes `<configDir>/plugins/feishu.log`. **Plugin stderr is discarded in service mode — enable this when debugging** |
 | `gatewayLocation` | string | — | Only start the gateway in this location **or any of its subdirectories**. `~` is expanded and relative paths / trailing slashes are normalized. **Set this to your usual working directory** to avoid multiple long connections; leave empty to run in every location |
+| `gatewayMatchGraceMs` | number | `3000` | Grace window for **exact-match priority**: a subdirectory candidate waits this long and yields if a location equal to `gatewayLocation` shows up (`0` = no wait, subdirectory takes over immediately) |
 | `approvalTtlMs` | number | `600000` | Approval token / card TTL |
 | `staleExecutionMs` | number | `300000` | Watchdog threshold: an execution with no event for this long is treated as stuck and auto-interrupted; a queue stuck this long without `execution.started` also triggers a notice. Clamped to 1–60 minutes |
 | `maxResourcesShown` | number | `8` | Max resource lines shown on an approval card |

package/README.md

@@ -249,7 +249,8 @@ agent 调 `question` 等 form 类交互时，插件把它转成飞书卡片：
 | `recentDirsLimit` / `recentModelsLimit` | number | `5` | 表单「最近使用」条数（1–20） |
 | `logLevel` | `debug`\|`info`\|`warn`\|`error` | `info` | 日志级别 |
 | `logFile` | string \| boolean | — | `true` = 写 `<configDir>/plugins/feishu.log`；服务模式建议开启 |
-| `gatewayLocation` | string | — | 只在该 location（或其**子目录**）启动网关；`~` 自动展开、相对路径/尾斜杠会归一化。留空 = 任意 location 生效 |
+| `gatewayLocation` | string | — | 只在该 location（或其**子目录**兜底）启动网关；`~` 自动展开、相对路径/尾斜杠会归一化。留空 = 任意 location 生效 |
+| `gatewayMatchGraceMs` | number | `3000` | **精确匹配优先**的宽限窗口：子目录候选先等这么久，出现 `here === gatewayLocation` 就让位（0 = 不等待，子目录立即兜底） |
 | `approvalTtlMs` | number | `600000` | 审批 token / 卡片有效期 |
 | `staleExecutionMs` | number | `300000` | 看门狗阈值（夹取 1–60 分钟） |
 | `maxResourcesShown` | number | `8` | 审批卡最多展示的资源行数 |

package/dist/index.js

@@ -144033,6 +144033,7 @@ function resolveConfig2(raw, env = process.env, deps = {}) {
   const domain = merged.domain === "lark" ? "lark" : "feishu";
   const logFile = resolveLogFile(merged.logFile, env, deps);
   const gatewayLocation = normalizeGatewayLocation(asString(merged.gatewayLocation));
+  const gatewayMatchGraceMs = clamp4(asNumber(merged.gatewayMatchGraceMs, 3e3), 0, 1e4);
   const signSecretRaw = expandEnv(asString(merged.signSecret), env);
   const signSecret = signSecretRaw && signSecretRaw.length > 0 ? signSecretRaw : deriveSignSecret(appSecret);
   let enabled = true;
@@ -144062,6 +144063,7 @@ function resolveConfig2(raw, env = process.env, deps = {}) {
     logLevel,
     logFile,
     gatewayLocation,
+    gatewayMatchGraceMs,
     approvalTtlMs,
     staleExecutionMs,
     signSecret,
@@ -144276,6 +144278,45 @@ function releaseProcessGuard() {
   const g = globalThis;
   const slot = g[GUARD_SLOT];
   if (slot) slot.active = false;
+  resetExactGateway();
+}
+var GATEWAY_EXACT_SLOT = /* @__PURE__ */ Symbol.for("opencode-feishu-v2/gateway-exact");
+function electionSlot() {
+  const g = globalThis;
+  let slot = g[GATEWAY_EXACT_SLOT];
+  if (!slot) {
+    slot = { exact: false, resolvers: [] };
+    g[GATEWAY_EXACT_SLOT] = slot;
+  }
+  return slot;
+}
+function markExactGateway() {
+  const slot = electionSlot();
+  slot.exact = true;
+  if (slot.timer) {
+    clearTimeout(slot.timer);
+    slot.timer = void 0;
+  }
+  for (const resolve4 of slot.resolvers.splice(0)) resolve4(true);
+}
+function resetExactGateway() {
+  const g = globalThis;
+  const slot = g[GATEWAY_EXACT_SLOT];
+  if (slot) slot.exact = false;
+}
+function waitForExactGateway(graceMs) {
+  const slot = electionSlot();
+  if (slot.exact) return Promise.resolve(true);
+  if (!(graceMs > 0)) return Promise.resolve(false);
+  return new Promise((resolve4) => {
+    slot.resolvers.push(resolve4);
+    if (!slot.timer) {
+      slot.timer = setTimeout(() => {
+        slot.timer = void 0;
+        for (const r of slot.resolvers.splice(0)) r(false);
+      }, graceMs);
+    }
+  });
 }
 var GATEWAY_SEEN_SLOT = /* @__PURE__ */ Symbol.for("opencode-feishu-v2/gateway-seen");
 function trackGatewayLocationSeen(input) {
@@ -147161,7 +147202,11 @@ async function touchLocationOverHttp(directory, deps) {
 var WATCHDOG_SLOT = /* @__PURE__ */ Symbol.for("opencode-feishu-v2/gateway-watchdog");
 function ensureGatewayWatchdog(input) {
   const g = globalThis;
-  const existing = g[WATCHDOG_SLOT];
+  let existing = g[WATCHDOG_SLOT];
+  if (existing && !existing.state) {
+    clearWatchdogSlot(existing);
+    existing = void 0;
+  }
   if (existing) {
     if (input.authoritative && existing.target !== input.directory) {
       existing.target = input.directory;
@@ -147201,6 +147246,13 @@ function ensureGatewayWatchdog(input) {
   });
   return true;
 }
+function clearWatchdogSlot(slot) {
+  const s = slot ?? {};
+  if (s.timer) clearInterval(s.timer);
+  if (s.initial) clearTimeout(s.initial);
+  const g = globalThis;
+  if (g[WATCHDOG_SLOT] === slot) delete g[WATCHDOG_SLOT];
+}
 function startKeepalive(deps) {
   const setIntervalImpl = deps.setIntervalImpl ?? setInterval;
   const clearIntervalImpl = deps.clearIntervalImpl ?? clearInterval;
@@ -150973,29 +151025,57 @@ var index_default = plugin_exports.define({
     if (config.keepalive) {
       const watchdogTarget = config.gatewayLocation ?? here;
       if (watchdogTarget) {
-        startedWatchdog = ensureGatewayWatchdog({
-          log: log2,
-          directory: watchdogTarget,
-          intervalMs: config.keepaliveIntervalMs
-        });
+        try {
+          startedWatchdog = ensureGatewayWatchdog({
+            log: log2,
+            directory: watchdogTarget,
+            intervalMs: config.keepaliveIntervalMs
+          });
+        } catch (err2) {
+          log2.warn("\u7F51\u5173\u770B\u95E8\u72D7\u542F\u52A8\u5931\u8D25\uFF08\u5DF2\u5FFD\u7565\uFF09", { error: errorMessage(err2) });
+        }
       }
     }
     if (config.gatewayLocation) {
-      const matched = Boolean(here) && isUnder(here, config.gatewayLocation);
+      const exact = Boolean(here) && here === config.gatewayLocation;
+      const sub = Boolean(here) && !exact && isUnder(here, config.gatewayLocation);
+      const matched = exact || sub;
       const keepSink = matched || startedWatchdog;
-      trackGatewayLocationSeen({
-        here: here ?? "(unknown)",
-        expected: config.gatewayLocation,
-        matched,
-        warn: (message) => log2.warn(message),
-        ...keepSink ? {} : { onSettled: () => logSink?.close() }
-      });
+      try {
+        trackGatewayLocationSeen({
+          here: here ?? "(unknown)",
+          expected: config.gatewayLocation,
+          matched,
+          warn: (message) => log2.warn(message),
+          ...keepSink ? {} : { onSettled: () => logSink?.close() }
+        });
+      } catch (err2) {
+        log2.warn("\u7F51\u5173\u4F4D\u7F6E\u8DDF\u8E2A\u5931\u8D25\uFF08\u5DF2\u5FFD\u7565\uFF09", { error: errorMessage(err2) });
+      }
       if (!matched) {
         log2.debug("\u8DF3\u8FC7\u975E\u7F51\u5173 location", { here, expected: config.gatewayLocation });
         if (!keepSink) logSink?.close();
         return async () => {
         };
       }
+      if (exact) {
+        markExactGateway();
+      } else {
+        const exactSeen = await waitForExactGateway(config.gatewayMatchGraceMs);
+        if (exactSeen) {
+          log2.debug("\u7CBE\u786E\u5339\u914D location \u5DF2\u5C31\u7EEA\uFF0C\u5B50\u76EE\u5F55\u5019\u9009\u8BA9\u4F4D", {
+            here,
+            expected: config.gatewayLocation
+          });
+          if (!keepSink) logSink?.close();
+          return async () => {
+          };
+        }
+        log2.info("\u7CBE\u786E\u5339\u914D location \u672A\u51FA\u73B0\uFF0C\u5B50\u76EE\u5F55\u5019\u9009\u63A5\u7BA1\u7F51\u5173", {
+          here,
+          expected: config.gatewayLocation
+        });
+      }
     }
     if (!acquireProcessGuard()) {
       log2.debug("\u68C0\u6D4B\u5230\u540C\u8FDB\u7A0B\u91CD\u590D setup\uFF0C\u8DF3\u8FC7\u542F\u52A8\uFF08\u4EC5\u9996\u4E2A\u5B9E\u4F8B\u751F\u6548\uFF09");
@@ -151553,13 +151633,17 @@ async function start(ctx, config, log2, logSink) {
   const here = ctx.location?.directory;
   const keepaliveDirectory = here ?? config.gatewayLocation;
   if (config.keepalive && keepaliveDirectory) {
-    ensureGatewayWatchdog({
-      log: log2,
-      directory: keepaliveDirectory,
-      intervalMs: config.keepaliveIntervalMs,
-      authoritative: true,
-      immediateDelayMs: 0
-    });
+    try {
+      ensureGatewayWatchdog({
+        log: log2,
+        directory: keepaliveDirectory,
+        intervalMs: config.keepaliveIntervalMs,
+        authoritative: true,
+        immediateDelayMs: 0
+      });
+    } catch (err2) {
+      log2.warn("\u7F51\u5173\u770B\u95E8\u72D7\u767B\u8BB0\u5931\u8D25\uFF08\u5DF2\u5FFD\u7565\uFF09", { error: errorMessage(err2) });
+    }
   }
   const stopKeepalive = config.keepalive && keepaliveDirectory ? startKeepalive({
     log: log2,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-feishu-plugin",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "Feishu/Lark plugin for OpenCode V2 — single-user topics as sessions, in-card permission approvals, streaming cards. Minimal permissions, no public endpoint.",
   "type": "module",
   "main": "index.js",