oasis_test_v2 2.2.78 → 2.2.79

package/dist/index.js

@@ -1054,12 +1054,13 @@ function sanitizeRuntimeQuotas(value2, now = Date.now()) {
   }
   return result;
 }
-var RUNTIME_QUOTA_POLL_MS, RUNTIME_QUOTA_STALE_MS, statuses;
+var RUNTIME_QUOTA_POLL_MS, RUNTIME_QUOTA_STALE_MS, RUNTIME_QUOTA_REFRESH_MIN_GAP_MS, statuses;
 var init_runtime_quota = __esm({
   "../contract/src/runtime-quota.ts"() {
     "use strict";
     RUNTIME_QUOTA_POLL_MS = 5 * 6e4;
     RUNTIME_QUOTA_STALE_MS = 2 * RUNTIME_QUOTA_POLL_MS;
+    RUNTIME_QUOTA_REFRESH_MIN_GAP_MS = 3e4;
     statuses = /* @__PURE__ */ new Set(["ok", "unavailable", "unauthenticated", "unsupported", "error", "rate_limited"]);
   }
 });
@@ -234828,6 +234829,9 @@ function isDispatchLayerFailure(detail) {
   const reason = detail?.reason;
   return typeof reason === "string" && reason.startsWith("dispatch ");
 }
+function externalRefOf(a) {
+  return a.contentKind === "external" && a.contentRef ? { externalRef: a.contentRef } : {};
+}
 function buildWorkorderActivity(input) {
   const { workorderId, snap, events } = input;
   const ref2 = input.ref ?? ((id) => ({ id }));
@@ -234855,7 +234859,7 @@ function buildWorkorderActivity(input) {
     } else if (isRootBrief) {
       list2.push({ id: a.id, revisionId: a.workId, name: "\u4EFB\u52A1\u76EE\u6807", path: "\u4EFB\u52A1\u76EE\u6807.md", nodeId });
     } else {
-      list2.push({ id: a.id, revisionId: a.workId, name: a.name, nodeId });
+      list2.push({ id: a.id, revisionId: a.workId, name: a.name, nodeId, ...externalRefOf(a) });
     }
     artifactsByWork.set(a.workId, list2);
   }
@@ -235214,6 +235218,7 @@ function buildWorkorderActivity(input) {
   const workOfIssue = /* @__PURE__ */ new Map();
   const reasonWorksOfIssue = /* @__PURE__ */ new Map();
   const recoveryLetterIssueIds = /* @__PURE__ */ new Set();
+  const backpressureIssueIds = /* @__PURE__ */ new Set();
   const plainComments = [];
   const escalations = [];
   const gapCreatedSeq = /* @__PURE__ */ new Map();
@@ -235445,6 +235450,7 @@ function buildWorkorderActivity(input) {
         const isGap = issueKind === "gap";
         const raisedFrom = str5(ev.raisedByNodeId);
         const isBackpressure = !isEscalation && !isGap && !!raisedFrom && raisedFrom !== nodeId;
+        if (isBackpressure) backpressureIssueIds.add(issueId);
         const body2 = str5(ev.body) ?? "";
         if (isEscalation) {
           const linkedGapId = str5(ev.gapId);
@@ -235492,6 +235498,11 @@ function buildWorkorderActivity(input) {
           /* 回压是**执行中断**（这一轮走不下去了，要外部介入）；唤醒信那档不是中断，仍是进行中。
              缺口走不到这里了（F4 在上面 break）。 */
           phase: isBackpressure ? "stuck" : "running",
+          /* 回压卡**不喊**：砖红只给「此刻等人动手」的那张（奕璇 2026-09-22）。轮到动手的是被回压节点的
+             负责人——真人时由他那一轮喊（砖红 + 去处理），agent 时它自己在跑（暖橙）。提要求这一段在
+             开口那一刻就结束了，与缺口中断的执行卡同一条先例（F1：上一段结束就转灰，该喊的是下游那张）。
+             不写这两个字段时前端退回老规则（开着 + stuck ⇒ 砖红），同一件事页面上会有两张红卡。 */
+          ...isBackpressure ? { segmentOpen: false, awaitingHuman: false } : {},
           status: isBackpressure ? ACTIVITY_COPY.backpressure(
             nameOf2(authorId),
             nodeName(nodeId),
@@ -235501,11 +235512,15 @@ function buildWorkorderActivity(input) {
              此前只有缺口/回压被排除，留言仍是「正文当小状态 + 展开区再印一遍」，
              全库实测最长 8096 字印两遍（`ws:wo-56bba3c1`），一张卡顶掉整屏。 */
           artifacts: [],
-          /* 缺口不出按钮（处置在缺口线上，由「任务内沟通」那一列进）；
-             留言给「查看沟通」直达留言线——线是投影出来的、恒存在，id 这里就能算；
-             回压仍给「去处理」落到产物预览栏（那儿才有批注的处置面）。
-             留言算不出对面是谁（该产物没负责人）时退回「去处理」，别给一个开不了的落点。 */
-          actions: isBackpressure || !commentTargetId ? [{ kind: "open_issue", label: BUTTON.handle, target: issueId }] : [{ kind: "open_thread", label: BUTTON.view, target: commentThreadSessionId(authorId, commentTargetId), variant: "quiet" }]
+          /* 按钮只长在「人能点、而且轮到人动手」的那张卡上（奕璇 2026-09-22）：
+             · 回压卡**一个按钮都没有**：它署名的是提要求的一方（多为 agent），轮到动手的是被回压节点的
+               负责人。负责人是真人时「去处理」挂在系统给他开的那一轮上（见事件循环之后
+               `backpressureAwaitingOwner` 那一段），落点、target 与原先这颗一样；负责人是 agent 时
+               它自己会跑，没有人要动手。
+             · 唤醒信给「查看沟通」直达留言线——线是投影出来的、恒存在，id 这里就能算。
+             · 唤醒信算不出对面是谁（该产物没负责人 / 负责人就是作者）时退回「去处理」，但**只在署名的
+               是真人时**给：agent / 系统署名的卡挂「去处理」，点的人进去没有一件是他该做的事。 */
+          actions: isBackpressure ? [] : !commentTargetId ? isHumanActorId(authorId) ? [{ kind: "open_issue", label: BUTTON.handle, target: issueId }] : [] : [{ kind: "open_thread", label: BUTTON.view, target: commentThreadSessionId(authorId, commentTargetId), variant: "quiet" }]
         });
         break;
       }
@@ -235816,6 +235831,18 @@ function buildWorkorderActivity(input) {
     const message = (input.runFailures ?? []).filter((f2) => f2.nodeId === card2.nodeId && f2.startedAt >= card2.at && f2.startedAt <= trip.at && f2.message.trim()).sort((a, b2) => a.startedAt.localeCompare(b2.startedAt)).at(-1)?.message;
     return message ? firstSentence(message) : void 0;
   };
+  for (const card2 of executionCards) {
+    const workId = card2.openWorkId;
+    if (!workId || !isHumanActorId(card2.executorId)) continue;
+    const issueId = [...backpressureIssueIds].find((id) => reasonWorksOfIssue.get(id)?.includes(workId) && !issueById.get(id)?.resolvedAt && !plainResolveEvents.has(id));
+    if (!issueId) continue;
+    card2.phase = "not_started";
+    card2.phaseLabel = PHASE_LABEL.escalationPending;
+    card2.segmentOpen = true;
+    card2.awaitingHuman = true;
+    card2.status = ACTIVITY_COPY.backpressureAwaitingOwner(nameOf2(card2.executorId), nodeName(card2.nodeId));
+    card2.actions = [{ kind: "open_issue", label: BUTTON.handle, target: issueId, variant: "primary" }];
+  }
   for (const card2 of executionCards) {
     const trips = card2.stopLossTrips;
     if (!trips?.length) continue;
@@ -236327,6 +236354,11 @@ var init_activity2 = __esm({
          ①「缺口卡」也删掉（F4）：它和执行卡挂的是同一段运行、同一份轨迹，点哪张打开的都一样。 */
       /** 回压（下游对上游提修改要求）——发起人 2026-09-08 认可的措辞。 */
       backpressure: (raiser, upstream, owner) => `${raiser} \u5BF9\u300A${upstream}\u300B\u63D0\u51FA\u4FEE\u6539\u8981\u6C42\uFF0C\u9700\u8981 @${owner} \u5904\u7406\u3002`,
+      /**
+       * 被回压节点的负责人是**真人**时，系统为他开的那一轮（奕璇 2026-09-22 定）：这一轮不会自己跑，
+       * 是在等他动手——不能再说「正在根据反馈调整」（`issueDriven`），那句会让一张没人在动的卡挂成「进行中」。
+       */
+      backpressureAwaitingOwner: (owner, node2) => `\u7B49 @${owner} \u6839\u636E\u4FEE\u6539\u8981\u6C42\u8C03\u6574\u300A${node2}\u300B\u3002`,
       /**
        * 留言 / 批注——**一句索引，正文不上卡**（发起人 2026-09-09 定）。
        *
@@ -236410,7 +236442,10 @@ var init_activity2 = __esm({
        * 所以仍然要 override，只是换成和 `stuck` 一族同一个词。
        */
       failed: "\u6267\u884C\u4E2D\u65AD",
-      /** 升级卡没人处理那一档。**不写「待你处理」**：别人看到的字要和该处理的人看到的一样。 */
+      /**
+       * 升级卡没人处理那一档。**不写「待你处理」**：别人看到的字要和该处理的人看到的一样。
+       * 被回压的真人负责人那一轮（等他按修改要求动手）也用这个词——同样是「这一段卡在人身上」。
+       */
       escalationPending: "\u5F85\u5904\u7406"
     };
     COORDINATOR_CARD_PREFIX = "coordinator:";
@@ -236569,7 +236604,7 @@ function artifactsOfWork(work, input) {
     } else if (isRootBrief) {
       list2.push({ id: a.id, revisionId: a.workId, name: "\u4EFB\u52A1\u76EE\u6807", path: "\u4EFB\u52A1\u76EE\u6807.md", nodeId: artifactNodeId });
     } else {
-      list2.push({ id: a.id, revisionId: a.workId, name: a.name, nodeId: artifactNodeId });
+      list2.push({ id: a.id, revisionId: a.workId, name: a.name, nodeId: artifactNodeId, ...externalRefOf(a) });
     }
   }
   return list2;
@@ -243748,6 +243783,10 @@ function nodesDomain(deps) {
     }
     if (rows.length > 0) console.log(`[nodes] \u989D\u5EA6\u6C34\u5408\uFF1A\u4ECE\u5E93\u91CC\u8BFB\u56DE ${rows.length} \u6761\u8FD0\u884C\u65F6\u989D\u5EA6`);
   }).catch((err) => console.warn(`[nodes] \u989D\u5EA6\u6C34\u5408\u5931\u8D25\uFF08\u7167\u65E7\u7B49\u4E0B\u4E00\u6B21\u91C7\u96C6\uFF09\uFF1A${err instanceof Error ? err.message : String(err)}`));
+  const quotaRefreshWaiters = /* @__PURE__ */ new Map();
+  const quotaRefreshInFlight = /* @__PURE__ */ new Map();
+  const QUOTA_REFRESH_TIMEOUT_MS = 4e4;
+  const QUOTA_CAPABLE_KINDS = /* @__PURE__ */ new Set(["codex", "claude-code"]);
   const UPDATE_TIMEOUT_MS = 15e4;
   const nodeUpdates = /* @__PURE__ */ new Map();
   function runtimeInfoOf(r) {
@@ -243829,6 +243868,45 @@ function nodesDomain(deps) {
     }
     return { version: null, source: null };
   }
+  async function refreshNodeQuotas(nodeId) {
+    const running = quotaRefreshInFlight.get(nodeId);
+    if (running) return running;
+    const hub = deps.getHub();
+    if (!hub) return { ok: false, code: "no-gateway", reason: "\u672C\u90E8\u7F72\u6CA1\u6709\u8282\u70B9\u7F51\u5173\uFF0C\u591F\u4E0D\u5230\u90A3\u53F0\u673A\u5668" };
+    const daemon = hub.connectedDaemons().find((d) => d.daemonId === nodeId);
+    if (!daemon) {
+      return { ok: false, code: "offline", reason: "\u8FD9\u53F0\u8282\u70B9\u5F53\u524D\u4E0D\u5728\u7EBF\uFF0C\u770B\u5230\u7684\u662F\u5B83\u6700\u540E\u4E00\u6B21\u4E0A\u62A5\u7684\u989D\u5EA6\uFF1B\u628A\u673A\u5668\u8FDE\u56DE\u6765\u4E4B\u540E\u624D\u80FD\u91CD\u91C7" };
+    }
+    if (!daemon.meta.supportsQuotaRefresh) {
+      return { ok: false, code: "unsupported-version", reason: "\u8FD9\u53F0\u8282\u70B9\u7684\u7A0B\u5E8F\u7248\u672C\u8FD8\u4E0D\u652F\u6301\u989D\u5EA6\u91CD\u91C7\uFF0C\u66F4\u65B0\u8282\u70B9\u4E4B\u540E\u53EF\u7528" };
+    }
+    if (!daemon.meta.adapters.some((kind) => QUOTA_CAPABLE_KINDS.has(kind))) {
+      return { ok: false, code: "no-quota-runtime", reason: "\u8FD9\u53F0\u673A\u5668\u4E0A\u6CA1\u6709\u4F1A\u4E0A\u62A5\u989D\u5EA6\u7684\u8FD0\u884C\u65F6\uFF08\u53EA\u6709 Claude Code \u548C Codex \u80FD\u67E5\u5230\u8BA2\u9605\u989D\u5EA6\uFF09" };
+    }
+    const requestId = (0, import_node_crypto62.randomUUID)();
+    const task = new Promise((resolve12) => {
+      const timer = setTimeout(() => {
+        quotaRefreshWaiters.delete(requestId);
+        resolve12({ ok: false, code: "timeout", reason: `\u8FD9\u53F0\u8282\u70B9\u6CA1\u5728 ${Math.round(QUOTA_REFRESH_TIMEOUT_MS / 1e3)} \u79D2\u5185\u56DE\u8BDD\uFF0C\u9875\u9762\u4E0A\u4ECD\u662F\u5B83\u4E0A\u6B21\u62A5\u7684\u989D\u5EA6` });
+      }, QUOTA_REFRESH_TIMEOUT_MS);
+      quotaRefreshWaiters.set(requestId, {
+        // 节点自己说没采（连点被最小间隔挡下、这台机器上采集出错）→ 原样把它那句话带回前端。
+        resolve: (r) => resolve12(r.ok ? { ok: true } : { ok: false, code: "node", ...r.reason ? { reason: r.reason } : {} }),
+        timer
+      });
+      const sent = hub.dispatch(nodeId, { type: "refresh_quotas", requestId });
+      if (sent) return;
+      const waiter = quotaRefreshWaiters.get(requestId);
+      if (!waiter) return;
+      quotaRefreshWaiters.delete(requestId);
+      clearTimeout(waiter.timer);
+      resolve12({ ok: false, code: "offline", reason: "\u6307\u4EE4\u6CA1\u9001\u5230\u8FD9\u53F0\u8282\u70B9\uFF08\u8FDE\u63A5\u521A\u65AD\u5F00\uFF09\uFF0C\u9875\u9762\u4E0A\u4ECD\u662F\u5B83\u4E0A\u6B21\u62A5\u7684\u989D\u5EA6" });
+    }).finally(() => {
+      quotaRefreshInFlight.delete(nodeId);
+    });
+    quotaRefreshInFlight.set(nodeId, task);
+    return task;
+  }
   let hubWired = false;
   function wireHub(hub) {
     if (hubWired) return;
@@ -243865,6 +243943,14 @@ function nodesDomain(deps) {
         }
       })().catch((err) => console.warn(`[nodes] \u6545\u969C\u81EA\u52A8\u89E3\u9664\u5931\u8D25(node=${daemonId})\uFF1A${err instanceof Error ? err.message : String(err)}`));
     });
+    hub.addMessageListener((_daemonId, msg) => {
+      if (msg.type !== "quota_refresh_result") return;
+      const waiter = quotaRefreshWaiters.get(msg.requestId);
+      if (!waiter) return;
+      quotaRefreshWaiters.delete(msg.requestId);
+      clearTimeout(waiter.timer);
+      waiter.resolve({ ok: msg.ok, ...msg.reason ? { reason: msg.reason } : {} });
+    });
     hub.addMessageListener(async (daemonId, msg) => {
       if (msg.type !== "hello") return;
       const d = hub.connectedDaemons().find((c) => c.daemonId === daemonId);
@@ -244286,6 +244372,22 @@ function nodesDomain(deps) {
       nodeUpdates.set(nodeId, tracked);
       return { status: 200, body: { ok: true, alreadyLatest: false, updateStatus: publicUpdateStatus(tracked, activeRunCount) } };
     });
+    router.post("/api/nodes/:nodeId/quotas/refresh", async (req) => {
+      const nodeId = req.params["nodeId"];
+      if (!nodeId) return { status: 400, body: { error: "missing nodeId" } };
+      const scope2 = req.auth.companyId !== void 0 ? { companyId: req.auth.companyId } : void 0;
+      const node2 = (await deps.nodeStore.listNodes(scope2)).find((n) => n.id === nodeId);
+      if (!node2) return { status: 404, body: { error: "NODE_NOT_FOUND", message: "\u8282\u70B9\u4E0D\u5B58\u5728\u6216\u4E0D\u5C5E\u4E8E\u5F53\u524D\u7EC4\u7EC7" } };
+      const outcome = await refreshNodeQuotas(nodeId);
+      return {
+        status: 200,
+        body: {
+          refreshed: outcome.ok,
+          ...outcome.code ? { code: outcome.code } : {},
+          ...outcome.reason ? { reason: outcome.reason } : {}
+        }
+      };
+    });
     router.delete("/api/runtimes/:runtimeId", async (req) => {
       const runtimeId = req.params["runtimeId"];
       if (!runtimeId) return { status: 400, body: { error: "missing runtimeId" } };
@@ -287960,11 +288062,12 @@ async function readClaudeQuota(binary, signal, deps = {}) {
 // ../cli/src/daemon/quota/monitor.ts
 var read2 = (runtime, signal) => runtime.kind === "codex" ? readCodexQuota(runtime.binary ?? "codex", signal) : readClaudeQuota(runtime.binary ?? "claude", signal, { version: runtime.version });
 var RuntimeQuotaMonitor = class {
-  constructor(runtimes, send, reader = read2, intervalMs = RUNTIME_QUOTA_POLL_MS) {
+  constructor(runtimes, send, reader = read2, intervalMs = RUNTIME_QUOTA_POLL_MS, minGapMs = RUNTIME_QUOTA_REFRESH_MIN_GAP_MS) {
     this.runtimes = runtimes;
     this.send = send;
     this.reader = reader;
     this.intervalMs = intervalMs;
+    this.minGapMs = minGapMs;
   }
   cache = [];
   collectedAt;
@@ -287994,6 +288097,41 @@ var RuntimeQuotaMonitor = class {
     });
     return this.pending;
   }
+  /**
+   * 人点了页面上的「刷新」（服务端下发 `refresh_quotas`，ADR 0620）：**现在就去问上游**。
+   *
+   * 与 {@link refresh} 的唯一区别就是**不看那 5 分钟**——那条节流是背景轮询的节奏，
+   * 对一个正盯着页面等结果的人没有任何意义。换上的是一条窄得多的闸：
+   * {@link RUNTIME_QUOTA_REFRESH_MIN_GAP_MS}（30 秒）。连点被它挡下，且挡下时**如实说**
+   * 「刚在 N 秒前采过」，不假装采了一次（发起人方申的定则：会静默降级的动作必须回报走了哪条路）。
+   *
+   * provider 自己给的 `retryAt` 退避**不在**绕过范围内：那是上游明说的「别来了」，
+   * 谁点按钮都不该越过它。被它挡住的那个 runtime 在 `collect` 里照旧沿用上一次的结果。
+   */
+  forceRefresh() {
+    if (this.stopped) return Promise.resolve({ ok: false, reason: "\u8FD9\u53F0\u8282\u70B9\u6B63\u5728\u505C\u673A\uFF0C\u6CA1\u6709\u91CD\u91C7\u989D\u5EA6" });
+    if (this.collectableKinds().length === 0) {
+      return Promise.resolve({ ok: false, reason: "\u8FD9\u53F0\u673A\u5668\u4E0A\u6CA1\u6709\u4F1A\u4E0A\u62A5\u989D\u5EA6\u7684\u8FD0\u884C\u65F6\uFF08\u53EA\u6709 Claude Code \u548C Codex \u80FD\u67E5\u5230\u8BA2\u9605\u989D\u5EA6\uFF09" });
+    }
+    if (this.pending) return this.pending.then(() => ({ ok: true }));
+    const sinceMs = this.collectedAt === void 0 ? Number.POSITIVE_INFINITY : Date.now() - this.collectedAt;
+    if (sinceMs < this.minGapMs) {
+      return Promise.resolve({
+        ok: false,
+        reason: `\u989D\u5EA6\u521A\u5728 ${Math.max(1, Math.round(sinceMs / 1e3))} \u79D2\u524D\u91C7\u8FC7\uFF0C\u9875\u9762\u4E0A\u5C31\u662F\u6700\u65B0\u6570\u636E\uFF1B${Math.ceil((this.minGapMs - sinceMs) / 1e3)} \u79D2\u540E\u53EF\u4EE5\u518D\u91C7\u4E00\u6B21`
+      });
+    }
+    this.pending = this.collect().finally(() => {
+      this.pending = void 0;
+    });
+    return this.pending.then(() => ({ ok: true }));
+  }
+  /** 这台机器上真的会上报额度的 runtime（白名单硬编码在 collect 里，两处取同一份判据）。 */
+  collectableKinds() {
+    const kinds = [];
+    for (const r of this.runtimes) if (r.kind === "codex" || r.kind === "claude-code") kinds.push(r.kind);
+    return kinds;
+  }
   async collect() {
     const result = [];
     for (const runtime of this.runtimes) {
@@ -288843,6 +288981,13 @@ var DaemonWsClient = class {
         void this.reportRuntimeModels({ force: true, requestId: msg.requestId });
         break;
       }
+      case "refresh_quotas": {
+        const requestId = msg.requestId;
+        void this.quotaMonitor.forceRefresh().catch((err) => ({ ok: false, reason: `\u91CD\u91C7\u989D\u5EA6\u65F6\u51FA\u9519\uFF1A${err instanceof Error ? err.message : String(err)}` })).then((r) => {
+          this.send({ type: "quota_refresh_result", requestId, ok: r.ok, ...r.reason ? { reason: r.reason } : {} });
+        });
+        break;
+      }
       case "update": {
         this.pendingUpdatePkg = msg.pkg;
         if (!this.onUpdate) {
@@ -289069,6 +289214,9 @@ var DaemonWsClient = class {
       supportsChunkedMessages: true,
       // Bug 0107：本 daemon 认 `input_receipt_query`。恒 true——handler 随包发。
       supportsInputReceiptQuery: true,
+      // ADR 0620：本 daemon 认 `refresh_quotas`（人点刷新时现去问一遍上游额度）。恒 true——
+      // 采集器随包发。服务端据此对老节点当场回「升级后可用」，不必发一帧出去等超时。
+      supportsQuotaRefresh: true,
       ...activeSessions.length > 0 ? { activeSessions } : {},
       // 始终带字段（空数组也带）作为新协议能力标志；服务端仅对支持该字段的节点做缺席确认。
       pendingDispatchIds: [...this.pendingDispatchIds]
@@ -291915,7 +292063,7 @@ async function waitForCommandAuthorization(base, headers, draftId, fallback) {
     }
   }
 }
-var CLI_VERSION = "2.2.78" ? "2.2.78" : "dev";
+var CLI_VERSION = "2.2.79" ? "2.2.79" : "dev";
 function apiHeaders(token, company) {
   const headers = {
     authorization: `Bearer ${token}`,
@@ -295814,7 +295962,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.78" : "dev";
+var PKG_VERSION = true ? "2.2.79" : "dev";
 var LOCAL_BIN = localBin();
 var NPM_PREFIX = npmPrefix();
 var INSTANCE = DEFAULT_INSTANCE;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test_v2",
-  "version": "2.2.78",
+  "version": "2.2.79",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": {
     "oasis": "./dist/index.js"
@@ -26,6 +26,6 @@
     "node": ">=20"
   },
   "oasisRelease": {
-    "sourceHead": "aeb1027a34d130a7b5595af797c540036767963f"
+    "sourceHead": "eff5efb149ef3cf0f6ee828e0380936a97e7657c"
   }
 }