opencode-feishu-plugin 0.2.4 → 0.2.6

package/README.en.md

@@ -360,6 +360,7 @@ When the agent calls the `question` tool (or any form interaction), OpenCode cre
 
 - **Two equivalent ways to answer**: tap an option button, or just **send text in the topic** (no need to tap "✍️ reply directly" first). Text is matched intelligently — option label/value are matched to their value, booleans accept 是/否 & yes/no & 1/0, numbers are parsed, multiselect splits on commas, anything else counts as a **manual answer**;
 - multi-field forms can be answered with a mix of taps and a text reply; they submit automatically once every field is filled;
+- **Option-only questions** (options present, custom input not allowed): you may reply with the **option number/letter** (e.g. `1`, `B`) or the option label. Any **other** text is treated as "you meant something else": the plugin **skips that form** and passes your message to the AI as a **normal message** instead of a bogus answer.
 - **the card is recalled once answered/cancelled**; if it is past Feishu's recall window, it degrades to a "submitted/cancelled" result card instead.
 
 Without this relay, any clarifying question would stall the Feishu session forever and every later message would queue behind it — a common cause of "stuck sessions".
@@ -389,6 +390,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

@@ -215,6 +215,7 @@ agent 调 `question` 等 form 类交互时，插件把它转成飞书卡片：
 
 - **两种作答方式等价**：直接点选项按钮，或**直接在话题里发文字**（无需先点「✍️ 直接回复答案」）。文本会智能匹配——命中选项 label/value 用选项值，`boolean` 认「是/否、yes/no、1/0」，`number`/`integer` 转数值，多选按顿号/逗号拆分，其余视为**手动输入**。
 - 多字段表单可以混合作答：点几个按钮 + 补一条文字，填满即自动提交。
+- **纯选项题**（有选项且不允许自填）：可以直接**回复序号/字母**（如 `1`、`B`）或选项原文；若你发的是**其它内容**，插件会视为「你想说别的」——**自动跳过该表单**并把这条消息当**普通消息**交给 AI 处理，不再被误当成答案。
 - **作答 / 取消后卡片会被撤回**（不再残留待填卡）；若超出飞书撤回时限，降级为「已提交 / 已取消」结果卡。
 - **没有这层转发，agent 一反问飞书会话就会永久卡住**——这也是会话卡死的常见原因。
 
@@ -249,7 +250,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) {
@@ -146696,14 +146737,24 @@ function buildFormCard(form, answers, opts = {}) {
       elements.push(cardButton("\u270D\uFE0F \u76F4\u63A5\u56DE\u590D\u7B54\u6848", "default", { f: form.id, k: field.key, free: true }));
     }
   }
-  const missing2 = missingFields(form, answers).map((k) => {
+  const missingKeys = missingFields(form, answers);
+  const missing2 = missingKeys.map((k) => {
     const f = form.fields.find((x) => x.key === k);
     return f ? fieldTitle(f) : k;
   });
+  const optionOnly = missingKeys.length > 0 && missingKeys.every((k) => {
+    const f = form.fields.find((x) => x.key === k);
+    return (f?.options?.length ?? 0) > 0 && f?.custom !== true;
+  });
   const hints = [];
   if (opts.notice) hints.push(opts.notice);
-  if (missing2.length > 0 && visible.length > 1) hints.push(`\u8FD8\u9700\u56DE\u7B54\uFF1A${missing2.join("\u3001")}\uFF08\u53EF\u76F4\u63A5\u53D1\u6587\u5B57\u56DE\u7B54\uFF09`);
-  else if (missing2.length > 0) hints.push("\u53EF\u76F4\u63A5\u53D1\u6587\u5B57\u56DE\u7B54\uFF0C\u6216\u70B9\u4E0A\u65B9\u9009\u9879\u3002");
+  if (missing2.length > 0 && visible.length > 1) {
+    hints.push(`\u8FD8\u9700\u56DE\u7B54\uFF1A${missing2.join("\u3001")}${optionOnly ? "\uFF08\u70B9\u9009\u9879\u6216\u56DE\u590D\u5E8F\u53F7\uFF09" : "\uFF08\u53EF\u76F4\u63A5\u53D1\u6587\u5B57\u56DE\u7B54\uFF09"}`);
+  } else if (missing2.length > 0) {
+    hints.push(
+      optionOnly ? "\u8BF7\u70B9\u51FB\u4E0A\u65B9\u9009\u9879\uFF08\u6216\u56DE\u590D\u5E8F\u53F7\uFF0C\u5982 1\uFF09\uFF1B\u53D1\u9001\u5176\u5B83\u5185\u5BB9\u4F1A\u4F5C\u4E3A\u666E\u901A\u6D88\u606F\u5904\u7406\u3002" : "\u53EF\u76F4\u63A5\u53D1\u6587\u5B57\u56DE\u7B54\uFF0C\u6216\u70B9\u4E0A\u65B9\u9009\u9879\u3002"
+    );
+  }
   if (hints.length > 0) elements.push({ tag: "markdown", content: truncateCardContent(hints.join("\n\n")) });
   const header = headerFor(form);
   return {
@@ -146848,6 +146899,17 @@ var FormRelay = class {
       return false;
     }
     const field = pending.form.fields.find((f) => f.key === fieldKey);
+    if (!fieldAcceptsText(field, text)) {
+      this.deps.log.info("\u9009\u9879\u9898\u6536\u5230\u975E\u9009\u9879\u6587\u672C\uFF0C\u8DF3\u8FC7\u8868\u5355\u5E76\u6309\u666E\u901A\u6D88\u606F\u5904\u7406", {
+        sessionID,
+        formID: pending.form.id,
+        fieldKey
+      });
+      this.awaiting.delete(sessionID);
+      this.forms.delete(pending.form.id);
+      void this.cancelPending(pending);
+      return false;
+    }
     pending.answers[fieldKey] = coerceAnswer(field, text);
     pending.awaitingField = void 0;
     this.awaiting.delete(sessionID);
@@ -146920,6 +146982,24 @@ var FormRelay = class {
     this.forms.delete(pending.form.id);
     await this.finish(pending, "answered");
   }
+  /** 取消 pending form（best-effort），随后撤回卡片。 */
+  async cancelPending(pending) {
+    if (this.deps.cancel) {
+      try {
+        await this.deps.cancel({
+          sessionID: pending.sessionID,
+          formID: pending.form.id,
+          ...pending.directory ? { directory: pending.directory } : {}
+        });
+      } catch (err2) {
+        this.deps.log.warn("form.cancel \u5931\u8D25\uFF08\u8BE5\u6D88\u606F\u53EF\u80FD\u4ECD\u6392\u961F\uFF09", {
+          formID: pending.form.id,
+          error: errorMessage(err2)
+        });
+      }
+    }
+    await this.finish(pending, "cancelled");
+  }
   /**
    * 表单收敛：**优先撤回卡片**（作答/取消后不再残留待填卡），撤回失败（超时限/无权限）
    * 才降级 patch 成结果卡，避免卡片永久停在待填态。
@@ -146970,9 +147050,28 @@ function coerceAnswer(field, text) {
       return matchOption(field, trimmed) ?? trimmed;
   }
 }
+function fieldAcceptsText(field, text) {
+  if (!field) return true;
+  const hasOptions = (field.options?.length ?? 0) > 0;
+  if (!hasOptions) return true;
+  if (field.custom === true) return true;
+  return matchOption(field, text) !== void 0;
+}
 function matchOption(field, text) {
   if (!field.options?.length) return void 0;
   const trimmed = text.trim();
+  const byNumber = /^(\d{1,2})[.、)）]?$/.exec(trimmed);
+  if (byNumber) {
+    const index2 = Number(byNumber[1]) - 1;
+    const option3 = field.options[index2];
+    if (option3) return option3.value;
+  }
+  const byLetter = /^([A-Za-z])[.、)）]?$/.exec(trimmed);
+  if (byLetter) {
+    const index2 = byLetter[1].toUpperCase().charCodeAt(0) - 65;
+    const option3 = field.options[index2];
+    if (option3) return option3.value;
+  }
   const lower = trimmed.toLowerCase();
   const hit = field.options.find(
     (o) => o.value === trimmed || o.label.trim() === trimmed || o.label.trim().toLowerCase() === lower
@@ -147019,6 +147118,27 @@ function authHeaders(service3) {
   const token = Buffer.from(`opencode:${service3.password}`, "utf8").toString("base64");
   return { authorization: `Basic ${token}` };
 }
+async function cancelFormOverHttp(input, deps) {
+  const discover = deps.discover ?? (() => discoverLocalService());
+  const doFetch = deps.fetchImpl ?? fetch;
+  const service3 = await discover();
+  if (!service3) throw new Error("\u672A\u53D1\u73B0\u672C\u673A opencode \u670D\u52A1\u6CE8\u518C\uFF08service.json \u7F3A\u5931\u6216\u635F\u574F\uFF09");
+  const path2 = `/api/session/${encodeURIComponent(input.sessionID)}/form/${encodeURIComponent(input.formID)}`;
+  const headers = { ...authHeaders(service3) };
+  if (input.directory) headers["x-opencode-directory"] = encodeURIComponent(input.directory);
+  const response2 = await doFetch(`${service3.url}${path2}`, {
+    method: "DELETE",
+    headers,
+    signal: AbortSignal.timeout(deps.timeoutMs ?? 8e3)
+  });
+  if (!response2.ok) {
+    const detail = await response2.text().catch(() => "");
+    deps.log.debug("\u8868\u5355 HTTP \u53D6\u6D88\u5931\u8D25", { status: response2.status, formID: input.formID });
+    throw new Error(
+      `\u8868\u5355\u53D6\u6D88\u5931\u8D25 HTTP ${response2.status}${detail ? `: ${detail.slice(0, 200)}` : ""}`
+    );
+  }
+}
 async function replyFormOverHttp(input, deps) {
   const discover = deps.discover ?? (() => discoverLocalService());
   const doFetch = deps.fetchImpl ?? fetch;
@@ -150996,7 +151116,9 @@ var index_default = plugin_exports.define({
       }
     }
     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;
       try {
         trackGatewayLocationSeen({
@@ -151015,6 +151137,24 @@ var index_default = plugin_exports.define({
         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");
@@ -151099,7 +151239,9 @@ async function start(ctx, config, log2, logSink) {
     log: log2,
     getLink: (sessionID) => sessionMap.resolveBySession(sessionID),
     isAllowed: (openId) => owner.isAllowed(openId),
-    reply: (input) => replyForm(ctx, input, log2)
+    reply: (input) => replyForm(ctx, input, log2),
+    // 选项题收到非选项文本 → 取消表单（解除阻塞），让该消息按普通 prompt 处理。
+    cancel: (input) => cancelFormOverHttp(input, { log: log2 })
   });
   const wizard = new WizardStore(storage, log2);
   const recent = new RecentStore(storage, log2, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-feishu-plugin",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "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",