aai-lark-bridge 0.2.35 → 0.2.37

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/cli.js CHANGED
@@ -4,7 +4,7 @@ import { Command } from "commander";
4
4
  // package.json
5
5
  var package_default = {
6
6
  name: "aai-lark-bridge",
7
- version: "0.2.35",
7
+ version: "0.2.37",
8
8
  description: "Lark AI Native Bridge - Lark\u57FA\u7840\u8BBE\u65BD\u5C42\u548CCLI\u96C6\u6210",
9
9
  type: "module",
10
10
  main: "./dist/index.js",
@@ -7116,6 +7116,7 @@ var LOGOUT_TEXT = "\u9000\u51FA Claude \u767B\u5F55";
7116
7116
  var MIN_TOKEN_LEFT_MS = 2 * 60 * 6e4;
7117
7117
  var MIN_AFTER_REFRESH_MS = 10 * 6e4;
7118
7118
  var REFRESH_COOLDOWN_MS = 30 * 6e4;
7119
+ var READY_NUDGE_MS = 60 * 6e4;
7119
7120
  var LOGIN_MAX_MS = 10 * 6e4;
7120
7121
  var SUBMIT_MAX_MS = 3e4;
7121
7122
  function readCredentials(dir) {
@@ -7182,6 +7183,7 @@ function createClaudeSeat(opts) {
7182
7183
  const logins = /* @__PURE__ */ new Map();
7183
7184
  const starting = /* @__PURE__ */ new Set();
7184
7185
  const refreshedAt = /* @__PURE__ */ new Map();
7186
+ const nudgedAt = /* @__PURE__ */ new Map();
7185
7187
  const locks = /* @__PURE__ */ new Map();
7186
7188
  const tail62 = (id) => id.slice(-6);
7187
7189
  async function withLock(openId, fn) {
@@ -7235,13 +7237,13 @@ function createClaudeSeat(opts) {
7235
7237
  starting.delete(openId);
7236
7238
  }
7237
7239
  }
7238
- async function token(openId, proof, runId) {
7240
+ async function ensure(openId, proof, runId, nudge2 = true) {
7239
7241
  if (!covers(opts.seat, openId)) return { status: "off" };
7240
7242
  if (pending(openId)) return { status: "login_pending" };
7241
7243
  return withLock(openId, async () => {
7242
7244
  const dir = dirOf(openId);
7243
7245
  let c = readCredentials(dir);
7244
- if (!c) return { status: await startLogin(openId) };
7246
+ if (!c) return nudge2 ? { status: await startLogin(openId) } : { status: "need_login" };
7245
7247
  const recent = now() - (refreshedAt.get(openId) ?? -Infinity) < REFRESH_COOLDOWN_MS && c.expiresAt - now() >= MIN_AFTER_REFRESH_MS;
7246
7248
  if (c.expiresAt - now() < MIN_TOKEN_LEFT_MS && !recent) {
7247
7249
  const ok = await opts.cli.refresh(dir).catch(() => false);
@@ -7254,11 +7256,29 @@ function createClaudeSeat(opts) {
7254
7256
  refreshedAt.set(openId, now());
7255
7257
  log.info("user-gateway", "claude.refreshed", { sender: tail62(openId), proof, runId });
7256
7258
  }
7257
- log.info("user-gateway", "claude.token-issued", { sender: tail62(openId), proof, runId });
7258
7259
  const { accessToken: issued, expiresAt } = c;
7259
7260
  return { status: "ok", token: issued, expiresAt };
7260
7261
  });
7261
7262
  }
7263
+ async function token(openId, proof, runId) {
7264
+ const r = await ensure(openId, proof, runId);
7265
+ if (r.status === "ok") log.info("user-gateway", "claude.token-issued", { sender: tail62(openId), proof, runId });
7266
+ return r;
7267
+ }
7268
+ async function ready(openId) {
7269
+ const r = await ensure(openId, "ready", "ready", false);
7270
+ if (r.status === "ok") return { status: "ready", expiresAt: r.expiresAt };
7271
+ if (r.status === "need_login") {
7272
+ const last = nudgedAt.get(openId) ?? -Infinity;
7273
+ if (now() - last < READY_NUDGE_MS) return { status: "need_login" };
7274
+ nudgedAt.set(openId, now());
7275
+ const s = await startLogin(openId);
7276
+ if (s === "login_failed") nudgedAt.delete(openId);
7277
+ return { status: s };
7278
+ }
7279
+ log.info("user-gateway", "claude.not-ready", { sender: tail62(openId), result: r.status });
7280
+ return { status: r.status };
7281
+ }
7262
7282
  async function submitCode(openId, code, from) {
7263
7283
  const l = pending(openId);
7264
7284
  if (!l) return "not_pending";
@@ -7300,7 +7320,7 @@ function createClaudeSeat(opts) {
7300
7320
  log.info("user-gateway", "claude.logout", { sender: tail62(openId) });
7301
7321
  return "logged_out";
7302
7322
  }
7303
- return { token, submitCode, logout, covers: (openId) => covers(opts.seat, openId) };
7323
+ return { token, ready, submitCode, logout, covers: (openId) => covers(opts.seat, openId) };
7304
7324
  }
7305
7325
  function seatFromEnv(env) {
7306
7326
  const raw = (env.SDLC_CLAUDE_SEAT ?? "off").trim();
@@ -7545,15 +7565,26 @@ function seatCovers(cfg, senderId) {
7545
7565
  function isClaudeLogout(text) {
7546
7566
  return text.trim() === LOGOUT_TEXT;
7547
7567
  }
7568
+ var SEAT_REUSE_TTL_MS = 15 * 6e4;
7569
+ var issuedSeat = /* @__PURE__ */ new Map();
7548
7570
  async function requestClaudeSeat(cfg, msg, deps = {}) {
7549
7571
  if (!seatCovers(cfg, msg.senderId)) return { kind: "shared" };
7572
+ const nowMs = Date.now();
7573
+ for (const [id, v] of issuedSeat) if (nowMs - v.at > SEAT_REUSE_TTL_MS) issuedSeat.delete(id);
7574
+ const reused = issuedSeat.get(msg.messageId);
7575
+ if (reused) {
7576
+ log.info("claude-seat", "reuse", { messageId: msg.messageId });
7577
+ return { kind: "token", env: { ...reused.env } };
7578
+ }
7550
7579
  const runId = `seat-${randomBytes5(8).toString("hex")}`;
7551
7580
  try {
7552
7581
  const r = await callGateway(cfg, "POST", "/claude/token", { messageId: msg.messageId, runId }, deps);
7553
7582
  log.info("claude-seat", "token", { messageId: msg.messageId, status: String(r.status) });
7554
7583
  switch (r.status) {
7555
7584
  case "ok":
7556
- return typeof r.token === "string" && r.token ? { kind: "token", env: { [CLAUDE_TOKEN_ENV]: r.token } } : { kind: "reply", text: SEAT_TEXT.unavailable };
7585
+ if (typeof r.token !== "string" || !r.token) return { kind: "reply", text: SEAT_TEXT.unavailable };
7586
+ issuedSeat.set(msg.messageId, { env: { [CLAUDE_TOKEN_ENV]: r.token }, at: nowMs });
7587
+ return { kind: "token", env: { [CLAUDE_TOKEN_ENV]: r.token } };
7557
7588
  case "need_login":
7558
7589
  return { kind: "reply", text: SEAT_TEXT.needLogin };
7559
7590
  case "login_pending":
@@ -20051,6 +20082,7 @@ function createGateway(opts) {
20051
20082
  const userDir = (openId) => join29(tokenRoot, openId);
20052
20083
  const authorizedMark = (openId) => join29(userDir(openId), ".authorized");
20053
20084
  const isAuthorized = (openId) => existsSync10(authorizedMark(openId));
20085
+ const larkNudgedAt = /* @__PURE__ */ new Map();
20054
20086
  const brand = sourceBrand(opts.larkSourceConfig);
20055
20087
  function env(dir) {
20056
20088
  return {
@@ -20405,6 +20437,34 @@ function createGateway(opts) {
20405
20437
  }
20406
20438
  return seat.token(openId, "task", runId);
20407
20439
  },
20440
+ /**
20441
+ * POST /claude/ready:调度接任务前问负责人的令牌是否可用,只回状态不发令牌。
20442
+ * Claude:见 seat.ready。input.lark 为 true 时再看飞书用户令牌(授权过才算,intent 0046);
20443
+ * 没授权就发授权卡片,同一人 READY_NUDGE_MS 内最多一次。
20444
+ */
20445
+ async claudeReady(input) {
20446
+ let openId;
20447
+ try {
20448
+ openId = str2(input, "openId", OPEN_ID2);
20449
+ } catch {
20450
+ return { status: "bad_request" };
20451
+ }
20452
+ const claude = seat.covers(openId) ? await seat.ready(openId) : { status: "off" };
20453
+ if (input.lark !== true) return claude;
20454
+ if (isAuthorized(openId)) return { ...claude, lark: "ok" };
20455
+ const last = larkNudgedAt.get(openId) ?? -Infinity;
20456
+ if (now() - last < READY_NUDGE_MS) return { ...claude, lark: "need_auth" };
20457
+ larkNudgedAt.set(openId, now());
20458
+ try {
20459
+ await startAuth(openId);
20460
+ } catch (err) {
20461
+ larkNudgedAt.delete(openId);
20462
+ log.warn("user-gateway", "auth.start-failed", { sender: tail6(openId), detail: String(err) });
20463
+ return { ...claude, lark: "auth_failed" };
20464
+ }
20465
+ log.info("user-gateway", "auth.ready-nudge", { sender: tail6(openId) });
20466
+ return { ...claude, lark: "need_auth" };
20467
+ },
20408
20468
  /**
20409
20469
  * POST /claude/login-submit:登录卡片里提交的授权码(bridge 转来卡片回调)。
20410
20470
  * 提交人取自飞书卡片回调的 operator;网关再核对是发给这人的那张卡片、卡片里的随机串对得上,才写给登录进程。
@@ -20507,7 +20567,7 @@ function createGateway(opts) {
20507
20567
  import { createHash as createHash8, timingSafeEqual as timingSafeEqual3 } from "crypto";
20508
20568
  import { createServer as createServer2 } from "http";
20509
20569
  var MAX_BODY = 16 * 1024;
20510
- var CLAUDE_ROUTES = /* @__PURE__ */ new Set(["/claude/token", "/claude/task-token", "/claude/login-submit", "/claude/logout"]);
20570
+ var CLAUDE_ROUTES = /* @__PURE__ */ new Set(["/claude/token", "/claude/task-token", "/claude/ready", "/claude/login-submit", "/claude/logout"]);
20511
20571
  var DB_TASK_HANDLE = "/db/task-handle";
20512
20572
  var DB_QUERY = "/db/query";
20513
20573
  var digest = (s) => createHash8("sha256").update(s).digest();
@@ -20567,6 +20627,7 @@ function createGatewayServer(opts) {
20567
20627
  if (path === DB_TASK_HANDLE) return send2(res, 200, await gateway.dbTaskHandle(body));
20568
20628
  if (path === "/claude/token") return send2(res, 200, await gateway.claudeToken(body));
20569
20629
  if (path === "/claude/task-token") return send2(res, 200, await gateway.claudeTaskToken(body));
20630
+ if (path === "/claude/ready") return send2(res, 200, await gateway.claudeReady(body));
20570
20631
  if (path === "/claude/login-submit") return send2(res, 200, await gateway.claudeLoginSubmit(body));
20571
20632
  if (path === "/claude/logout") return send2(res, 200, await gateway.claudeLogout(body));
20572
20633
  if (path === "/handles") return send2(res, 200, await gateway.requestHandle(body));