@aidotnet/nextcowork-device-service 2.8.6 → 2.8.7

package/RUNTIME.json

@@ -1,7 +1,7 @@
 {
   "entry": "bin.mjs",
   "node": ">=24",
-  "version": "2.8.6",
+  "version": "2.8.7",
   "note": "Dependencies are external; install them with the repository package.json before running.",
   "files": [
     "BUNDLE_IMPORTS.json",

package/bin.mjs

@@ -6008,6 +6008,14 @@ class RunHandle {
   depth;
   /** Metadata of a detached Task run, kept with its authoritative run handle. */
   backgroundTask;
+  /**
+   * 用户按了停止,驱动却在宽限期内一直没收尾,被 `launch` 强行收口了(#187)。
+   *
+   * ★ 置位之后这个 run 在注册表里已经是 `aborted`、会话互斥也已放开 —— 下一轮可能
+   * 已经开跑。驱动哪天自己醒过来,它手里那份转录是**过期的**:不能再逐条落盘,
+   * 也不能在收尾时整份覆盖库里的历史(那会抹掉下一轮的消息)。
+   */
+  abandoned = false;
   status = "running";
   startedAt = Date.now();
   endedAt;
@@ -6290,6 +6298,63 @@ class RunRegistry {
     }
     return void 0;
   }
+  /**
+   * 这几条会话此刻「到底谁占着」—— 删除会话前的**活体检查**,按真实 run 状态分类,
+   * 而不是只看 `isSessionBusy` 那一个布尔值。
+   *
+   * 需求:删除被「会话忙」挡住时,要分得清是真的有 Agent 在跑(该问用户要不要停),
+   * 还是注册表里残留的条目(该清掉、照删)。只有一个布尔值的时候,一条中断了却没
+   * 收尾的 run、或一把收尾时没放掉的互斥,会把删除永久挡住 —— 表现为「删不掉,
+   * 重启后就能删」(重启清空的正是这张进程内的表)。
+   *
+   * - `live`:status 是 running,且没被中断 —— 真在跑;
+   * - `stopping`:已经按过停止(signal 已 abort),status 却还停在 running ——
+   *   驱动要么正在退,要么卡死了(`abort()` 不改 status,只有 `finish()` 改);
+   * - `finalizing`:互斥被一个**已经结束**(或已不在表里)的 run 占着 —— 驱动收尾落盘中,
+   *   正常是毫秒级,长时间不放就是漏了;
+   * - `operations`:没有 run 的历史操作(手动压缩)占着会话。
+   */
+  sessionActivity(sessionIds) {
+    const ids = new Set(sessionIds);
+    const activity = { live: [], stopping: [], finalizing: [], operations: [] };
+    for (const handle2 of this.runs.values()) {
+      if (!ids.has(handle2.sessionId) || handle2.status !== "running") continue;
+      if (handle2.signal.aborted) activity.stopping.push(handle2);
+      else activity.live.push(handle2);
+    }
+    for (const [sessionId, reservation] of this.sessionOperations) {
+      if (!ids.has(sessionId)) continue;
+      if (reservation.runId === void 0) {
+        activity.operations.push(sessionId);
+        continue;
+      }
+      const owner = this.runs.get(reservation.runId);
+      if (owner === void 0 || owner.status !== "running") activity.finalizing.push(sessionId);
+    }
+    return activity;
+  }
+  /**
+   * 删除会话的最后一步:把这些会话名下还挂着的 run 强制判成 `aborted`、互斥强制放掉。
+   *
+   * ★ 只在「已经中断过、等过一段宽限期仍没收尾」之后调用(见 `ipc/sessions.ts` 的
+   * `deleteSession`)。被强制收掉的驱动如果之后还醒过来:`emit` 会丢掉迟到事件,
+   * 收尾写库撞上已删除的会话会抛并在它自己的 catch 里记日志,`release()` 的 token
+   * 已经对不上、是空操作 —— 都不会把会话复活。
+   */
+  forceSettleSessions(sessionIds) {
+    const ids = new Set(sessionIds);
+    let n = 0;
+    for (const handle2 of [...this.runs.values()]) {
+      if (!ids.has(handle2.sessionId) || handle2.status !== "running") continue;
+      handle2.abort({ by: "user" });
+      handle2.finish("aborted");
+      n++;
+    }
+    for (const sessionId of ids) {
+      if (this.sessionOperations.delete(sessionId)) n++;
+    }
+    return n;
+  }
   hasSessionOperations() {
     return this.sessionOperations.size > 0;
   }
@@ -7453,6 +7518,21 @@ const PROVIDER_PRESETS = [
     notes: "模型 ID 带厂商前缀(如 deepseek-ai/deepseek-v4-flash),请使用模型列表返回的完整 ID。模型列表免鉴权就能拉,没填 key 也能先看有哪些模型(因此列表能拉到不代表 key 有效)。同一个 key 也可走 OpenAI Responses 与 Anthropic 协议。",
     verification: "documented"
   },
+  {
+    id: "cheaperinference",
+    name: "Cheaper Inference",
+    category: "aggregator",
+    endpoints: [
+      oa("https://api.cheaperinference.com/v1", true),
+      resp("https://api.cheaperinference.com/v1", true),
+      anth$1("https://api.cheaperinference.com")
+    ],
+    docsUrl: "https://cheaperinference.com/docs",
+    apiKeyUrl: "https://cheaperinference.com/signup",
+    suggestedModels: ["gpt-5.4-mini", "claude-sonnet-5", "deepseek-v4-flash"],
+    notes: "模型 ID 用不带厂商前缀的短名(如 gpt-5.4-mini、claude-sonnet-5),用模型列表返回的完整 ID 即可。模型列表要先填 key 才能拉。同一个 key 也可走 OpenAI Responses 与 Anthropic 协议。",
+    verification: "probed"
+  },
   {
     id: "siliconflow",
     name: "硅基流动(国内)",
@@ -35067,6 +35147,7 @@ ${injected}
         acceptsGoalInput: (goalId) => primary && getActiveGoal(req.sessionId)?.id === goalId,
         prepareMessage: (message2) => primary ? prepareGoalMessage(req.sessionId, message2) : message2,
         onMessageCommit: (message2) => {
+          if (handle2.abandoned) return;
           store.commitMessage(req.sessionId, message2, req.runId);
           if (req.parentSessionId === void 0) sessionOnChange?.({ kind: "messages", sessionIds: [req.sessionId], workspaceId: req.workspaceId });
         },
@@ -35215,6 +35296,7 @@ ${injected}
     }
     let writtenSkills = [];
     try {
+      if (handle2.abandoned) return;
       const latest = store.getHistory(req.sessionId);
       store.setHistory(req.sessionId, mergeGoalStatusHistory(mergeLatestSubagentReceipts(agentSession.history, latest), latest));
       store.setRunRecord(req.runId, req.sessionId, handle2.status, startedAt, getHost().clock.now());
@@ -35681,7 +35763,7 @@ function statIfPresent(path) {
     throw error;
   }
 }
-function checkedPath(root, path, allowRoot = false) {
+function checkedPath(root, path, allowRoot = false, links = "reject") {
   if (typeof path !== "string" || path.includes("\0")) fail$2("invalid-path");
   if (path === "" && allowRoot) return root;
   if (isAbsolute(path)) {
@@ -35699,7 +35781,7 @@ function checkedPath(root, path, allowRoot = false) {
   for (let index = 1; index <= segments.length; index++) {
     const component = resolve(root, ...segments.slice(0, index));
     const stat2 = statIfPresent(component);
-    if (stat2?.isSymbolicLink()) fail$2("symlink");
+    if (stat2?.isSymbolicLink() && (links === "reject" || links === "follow-dirs" && index === segments.length)) fail$2("symlink");
     if (!stat2) break;
   }
   return target;
@@ -35728,7 +35810,7 @@ function readBounded(path, limit) {
   }
 }
 function readFileAt(root, path) {
-  const target = checkedPath(root, path);
+  const target = checkedPath(root, path, false, "follow-dirs");
   const extension = extname(path).toLowerCase();
   const { bytes, stat: stat2 } = readBounded(target, workspaceReadLimit(extension));
   return classifyWorkspaceFile(path, extension, bytes, stat2);
@@ -35781,7 +35863,7 @@ function readWorkspaceFile(req) {
 function writeWorkspaceFile(req) {
   try {
     const root = workspaceRoot(req.workspaceId);
-    const target = checkedPath(root, req.path);
+    const target = checkedPath(root, req.path, false, "follow-dirs");
     if (typeof req.content !== "string" || typeof req.revision !== "string") fail$2("invalid-encoding");
     if (req.encoding === "base64") return writeBase64File(root, req, target);
     if (req.content.length > WORKSPACE_TEXT_LIMIT) fail$2("too-large");
@@ -35803,7 +35885,7 @@ function writeWorkspaceFile(req) {
       } finally {
         closeSync(fd);
       }
-      checkedPath(root, req.path);
+      checkedPath(root, req.path, false, "follow-dirs");
       if (readFileAt(root, req.path).revision !== req.revision) fail$2("conflict");
       renameSync(temporary, target);
       created = false;
@@ -35837,7 +35919,7 @@ function writeBase64File(root, req, target) {
     } finally {
       closeSync(fd);
     }
-    checkedPath(root, req.path);
+    checkedPath(root, req.path, false, "follow-dirs");
     if (readFileAt(root, req.path).revision !== req.revision) fail$2("conflict");
     renameSync(temporary, target);
     created = false;
@@ -36925,7 +37007,13 @@ function launch(req, driver) {
   const release2 = runs.retainSessionForRun(handle2);
   pumps.set(req.runId, new RunPump(handle2));
   sessionRuntime.runStarted(handle2, req);
+  let settled = false;
+  let abandonTimer;
   const settle = () => {
+    if (abandonTimer !== void 0) clearTimeout(abandonTimer);
+    handle2.signal.removeEventListener("abort", watchAbort);
+    if (settled) return;
+    settled = true;
     release2();
     try {
       sessionRuntime.runSettled(handle2);
@@ -36938,6 +37026,19 @@ function launch(req, driver) {
     if (handle2.signal.aborted) handle2.finish("aborted");
     else handle2.finish("error", toAgentError(error));
   };
+  function watchAbort() {
+    abandonTimer = setTimeout(() => {
+      abandonTimer = void 0;
+      if (settled || handle2.status !== "running") return;
+      console.warn(`[run] ${handle2.runId} 停止后 ${String(ABORT_SETTLE_GRACE_MS / 1e3)} 秒仍未收尾,强制结束`);
+      handle2.abandoned = true;
+      handle2.finish("aborted");
+      settle();
+    }, ABORT_SETTLE_GRACE_MS);
+    abandonTimer.unref?.();
+  }
+  if (handle2.signal.aborted) watchAbort();
+  else handle2.signal.addEventListener("abort", watchAbort, { once: true });
   ensureReapTimer();
   try {
     void Promise.resolve(driver(handle2, req)).catch(failed).finally(settle);
@@ -36950,6 +37051,7 @@ function launch(req, driver) {
   }
   return handle2;
 }
+const ABORT_SETTLE_GRACE_MS = 5e3;
 const REAP_INTERVAL_MS = 3e4;
 let reapTimer = null;
 function reapFinishedRuns(now2 = Date.now()) {
@@ -38796,7 +38898,7 @@ async function listWorkspaceDir(req) {
 function readWorkspaceRange(req) {
   let fd = null;
   try {
-    const target = checkedPath(workspaceRoot(req.workspaceId), req.path);
+    const target = checkedPath(workspaceRoot(req.workspaceId), req.path, false, "follow-dirs");
     fd = openSync(target, constants.O_RDONLY | (constants.O_NOFOLLOW ?? 0));
     const stat2 = fstatSync(fd);
     if (!stat2.isFile()) fail$2("not-file");