oasis_test_v2 2.2.3 → 2.2.4

package/dist/index.js

@@ -24008,6 +24008,13 @@ function applyModelOverrides(base, overrides) {
   }
   return kept;
 }
+function clearModelDiscoveryCache(runtime, executablePath) {
+  if (!runtime) {
+    modelCache.clear();
+    return;
+  }
+  modelCache.delete(discoveryCacheKey(runtime, executablePath));
+}
 function discoveryCacheKey(runtime, executablePath) {
   return `${runtime}:${executablePath ?? ""}`;
 }
@@ -24032,8 +24039,11 @@ async function withFallback(runtime, executablePath, discover, fallback) {
 }
 function claudeStaticModels() {
   return [
-    { id: "claude-opus-4-7", label: "Claude Opus 4.7", provider: "Anthropic", default: true },
+    { id: "claude-opus-5", label: "Claude Opus 5", provider: "Anthropic" },
+    { id: "claude-fable-5-1", label: "Claude Fable 5.1", provider: "Anthropic" },
+    { id: "claude-fable-5", label: "Claude Fable 5", provider: "Anthropic" },
     { id: "claude-opus-4-8", label: "Claude Opus 4.8", provider: "Anthropic" },
+    { id: "claude-opus-4-7", label: "Claude Opus 4.7", provider: "Anthropic" },
     { id: "claude-opus-4-6", label: "Claude Opus 4.6", provider: "Anthropic" },
     { id: "claude-sonnet-5", label: "Claude Sonnet 5", provider: "Anthropic" },
     { id: "claude-sonnet-4-6", label: "Claude Sonnet 4.6", provider: "Anthropic" },
@@ -24043,14 +24053,12 @@ function claudeStaticModels() {
 }
 function codexStaticModels() {
   return [
-    { id: "gpt-5.5", label: "GPT-5.5", provider: "OpenAI", default: true },
-    { id: "gpt-5.5-mini", label: "GPT-5.5 mini", provider: "OpenAI" },
-    { id: "gpt-5.4", label: "GPT-5.4", provider: "OpenAI" },
-    { id: "gpt-5.4-mini", label: "GPT-5.4 mini", provider: "OpenAI" },
-    { id: "gpt-5.3-codex", label: "GPT-5.3 Codex", provider: "OpenAI" },
-    { id: "gpt-5", label: "GPT-5", provider: "OpenAI" },
-    { id: "o3", label: "o3", provider: "OpenAI" },
-    { id: "o3-mini", label: "o3-mini", provider: "OpenAI" }
+    { id: "gpt-6-astra", label: "GPT-6-Astra", provider: "OpenAI", default: true },
+    { id: "gpt-5.6-sol", label: "GPT-5.6-Sol", provider: "OpenAI" },
+    { id: "gpt-5.6-terra", label: "GPT-5.6-Terra", provider: "OpenAI" },
+    { id: "gpt-5.6-luna", label: "GPT-5.6-Luna", provider: "OpenAI" },
+    { id: "gpt-5.5", label: "GPT-5.5", provider: "OpenAI" },
+    { id: "gpt-5.2", label: "GPT-5.2", provider: "OpenAI" }
   ];
 }
 function geminiStaticModels() {
@@ -218483,6 +218491,31 @@ ${input.description}
       listActorConnectorConnections(actorId) {
         return this.opts.store.listActorConnectorConnections(actorId);
       }
+      /**
+       * 移除某员工与某连接器的连接（组织页连接器详情的「移除连接」，2026-09-09 原型 1600:5765）。
+       *
+       * 删两样东西，缺一不可：
+       *   ① 这名员工**自己**那份连接器凭据（`scope=personal` 且 `connectorId` 命中的变量行）——
+       *      不删的话，「移除」之后 `actorConnected` 里还有它，卡片照样在，读作「删不掉」；
+       *   ② 「员工×连接器」的连接记录——不删的话 `effective` 里还有它（enabled=false），
+       *      卡片变成一张「已停用」的僵尸卡，而人要的是它消失。
+       *
+       * **不碰组织那条 connector 行**（决策 0080 修订五的同一条理由）：组织级连接是别人配的资产，
+       * 一名员工点「移除连接」不该把全组织的连接拆掉。组织级的断开在「管理 > 连接器」。
+       * 于是：组织已连接时，移除个人连接后这名员工会**回落到组织默认**——卡片仍在，但身份那一行
+       * 变回组织账号。这是对的，不是没删干净。
+       *
+       * 幂等：没有个人凭据、没有记录时照样返回成功（`variablesDeleted: 0`）——重复点、并发点都不该报错。
+       */
+      async removeActorConnector(actorId, connectorId) {
+        const rows = await this.opts.store.listVariables(actorId);
+        const mine = rows.filter(
+          (v2) => v2.scope === "personal" && v2.actorId === actorId && v2.connectorId === connectorId
+        );
+        for (const v2 of mine) await this.opts.store.deleteVariable(v2.key, actorId);
+        await this.opts.store.deleteActorConnectorConnection(actorId, connectorId);
+        return { removed: true, variablesDeleted: mine.length };
+      }
       /**
        * 员工连接器面板所需状态：连接记录 + 组织级已连接集合 + 该员工已授权（有个人 connector 变量）集合。
        * 前端据此算每个 connector 的 hasRecord / 有效 enabled / connected（actor 或 global）。
@@ -219282,15 +219315,28 @@ var init_model_pricing = __esm({
       "gpt-4.1-nano": usd(0.1, 0.4, 0.025),
       "gpt-4.1-nano-2025-04-14": usd(0.1, 0.4, 0.025),
       "o4-mini": usd(1.1, 4.4, 0.275),
+      // o3 / o3-mini 在 codex 静态目录里可选，却一直不在价目快照里（费用记 0）。
+      // 这两行按 OpenAI 公开价填，不是智增增快照里的行；供应商价目表同步到时以 DB 为准。
+      "o3": usd(2, 8),
+      "o3-mini": usd(1.1, 4.4),
+      "claude-fable-5-1": usd(10, 50),
       "claude-fable-5": usd(10, 50),
+      "claude-mythos-5-1": usd(10, 50),
       "claude-mythos-5": usd(10, 50),
+      // claude-opus-5 是 Claude Code 当代默认款，却一直不在这张快照里：查不到价 → 费用记 0
+      // （与 2026-09-04 那次 `claude-opus-5[1m]` 记 0 同一类坑）。按 Opus 档 $5/$25 补上。
+      "claude-opus-5": usd(5, 25),
       "claude-opus-4-8": usd(5, 25),
       "claude-opus-4-7": usd(5, 25),
       "claude-sonnet-5": usd(2, 10),
       "claude-sonnet-4-6": usd(3, 15),
       "claude-opus-4-6": usd(5, 25),
       "claude-opus-4-5-20251101": usd(5, 25),
+      "claude-opus-4-5": usd(5, 25),
       "claude-sonnet-4-5-20250929": usd(3, 15),
+      // 短名同样要有：前缀比对是「表里的键是模型名的前缀」，带日期的那行匹配不上不带日期的短名。
+      // claude-sonnet-4-5 从 2026-07-04 起就在目录里可选，却一直查不到价（费用记 0），本次一并补。
+      "claude-sonnet-4-5": usd(3, 15),
       "claude-opus-4-1-20250805": usd(15, 75),
       "claude-opus-4-20250514": usd(15, 75),
       "claude-sonnet-4-20250514": usd(3, 15),
@@ -219299,6 +219345,14 @@ var init_model_pricing = __esm({
       "claude-3-5-sonnet-20240620": usd(3, 15),
       "claude-3-sonnet-20240229": usd(3, 15),
       "claude-haiku-4-5-20251001": usd(1, 5),
+      // codebuddy 目录用点号写法（claude-sonnet-4.6），与上面的连字符写法是同一批模型，
+      // 但字符串对不上就查不到价 → 记 0。同价另起别名行。
+      "claude-sonnet-4.6": usd(3, 15),
+      "claude-opus-4.7": usd(5, 25),
+      "gemini-3.1-pro": usd(2, 12),
+      "gemini-3-pro-preview": usd(2, 12),
+      // Claude Code 回报的可能是不带日期的短名，短名匹配不上带日期的那行（前缀比对是「表里的键是模型名的前缀」）。
+      "claude-haiku-4-5": usd(1, 5),
       "gemini-3.5-flash": usd(1.5, 9),
       "gemini-3.1-pro-preview": usd(2, 12),
       "gemini-3.1-pro-preview-customtools": usd(2, 12),
@@ -220432,6 +220486,11 @@ function actorsDomain(opts) {
       const conn = await service.setActorConnectorEnabled(req.params.id, req.params.connectorId, b2.enabled);
       return { status: 200, body: conn };
     });
+    router.delete("/api/actors/:id/connectors/:connectorId", async (req) => {
+      const { service } = await resolveCtx(req.auth.companyId);
+      const r = await service.removeActorConnector(req.params.id, req.params.connectorId);
+      return { status: 200, body: r };
+    });
     const requireVariableManager = (req) => {
       if (!isHumanActor(req.auth.actor)) {
         throw new ApiError(
@@ -224723,11 +224782,13 @@ async function resolveRuntimeModels(deps, runtimeId) {
   const rt = (await deps.nodeStore.listRuntimes()).find((r) => r.id === runtimeId);
   if (!rt) return [];
   try {
-    const [base, overrides] = await Promise.all([
-      listModels(rt.kind, rt.binary),
+    const reported = deps.nodeReportedModels?.(rt.nodeId, rt.kind);
+    const [discovered, overrides] = await Promise.all([
+      // 节点报过就不必再在控制面上白 spawn 一次（跨机时那次 spawn 注定 ENOENT）。
+      reported && reported.length > 0 ? Promise.resolve(reported) : listModels(rt.kind, rt.binary),
       deps.registry.listRuntimeModelOverrides(runtimeId)
     ]);
-    return applyModelOverrides(base, overrides);
+    return applyModelOverrides(discovered, overrides);
   } catch {
     const overrides = await deps.registry.listRuntimeModelOverrides(runtimeId).catch(() => []);
     return applyModelOverrides([], overrides);
@@ -225119,6 +225180,21 @@ function nodesDomain(deps) {
       if (!rt) return { status: 404, body: { error: "runtime not found" } };
       return { status: 200, body: { items: await resolveRuntimeModels(deps, runtimeId) } };
     });
+    router.post("/api/runtimes/:runtimeId/models/refresh", async (req) => {
+      const runtimeId = req.params["runtimeId"];
+      if (!runtimeId) return { status: 400, body: { error: "missing runtimeId" } };
+      const rt = (await deps.nodeStore.listRuntimes()).find((r) => r.id === runtimeId);
+      if (!rt) return { status: 404, body: { error: "runtime not found" } };
+      const outcome = deps.refreshNodeModels ? await deps.refreshNodeModels(rt.nodeId) : { ok: false, reason: "\u672C\u90E8\u7F72\u6CA1\u6709\u8282\u70B9\u7F51\u5173\uFF0C\u62FF\u4E0D\u5230\u8FD9\u53F0\u673A\u5668\u4E0A\u7684\u771F\u5B9E\u6E05\u5355" };
+      return {
+        status: 200,
+        body: {
+          items: await resolveRuntimeModels(deps, runtimeId),
+          refreshed: outcome.ok,
+          ...outcome.reason ? { reason: outcome.reason } : {}
+        }
+      };
+    });
     router.get("/api/runtimes/:runtimeId/model-overrides", async (req) => {
       const runtimeId = req.params["runtimeId"];
       if (!runtimeId) return { status: 400, body: { error: "missing runtimeId" } };
@@ -256820,6 +256896,41 @@ async function startServe(opts) {
   let nodeTokens = createNodeTokenStore(path29.join(opts.dir, "node-tokens.json"));
   const enrollTokens = createEnrollTokenStore(30 * 60 * 1e3, path29.join(opts.dir, "enroll-tokens.json"));
   let nodeStore = await FileNodeStore.open(path29.join(opts.dir, "nodes.json"));
+  const nodeReportedModelsStore = /* @__PURE__ */ new Map();
+  const modelRefreshWaiters = /* @__PURE__ */ new Map();
+  const modelRefreshInFlight = /* @__PURE__ */ new Map();
+  const modelRefreshLastAt = /* @__PURE__ */ new Map();
+  const MODELS_STALE_MS = 5 * 6e4;
+  const MODELS_BG_REFRESH_MIN_GAP_MS = 6e4;
+  const MODELS_REFRESH_TIMEOUT_MS = 45e3;
+  const refreshNodeModels = (nodeId) => {
+    const running = modelRefreshInFlight.get(nodeId);
+    if (running) return running;
+    if (!hub) return Promise.resolve({ ok: false, reason: "\u672C\u8FDB\u7A0B\u6CA1\u6709\u8282\u70B9\u7F51\u5173" });
+    const online = hub.connectedDaemons().some((d) => d.daemonId === nodeId);
+    if (!online) return Promise.resolve({ ok: false, reason: "\u8282\u70B9\u5F53\u524D\u4E0D\u5728\u7EBF\uFF0C\u7528\u7684\u662F\u5B83\u4E0A\u6B21\u62A5\u7684\u6E05\u5355" });
+    const requestId = (0, import_node_crypto75.randomUUID)();
+    const task = new Promise((resolve10) => {
+      const timer = setTimeout(() => {
+        modelRefreshWaiters.delete(requestId);
+        resolve10({ ok: false, reason: "\u8282\u70B9\u6CA1\u5728 45 \u79D2\u5185\u56DE\u8BDD\uFF08\u53EF\u80FD\u662F\u65E7\u7248\u8282\u70B9\uFF0C\u6216\u8FD9\u53F0\u673A\u5668\u4E0A\u7684 CLI \u63A2\u6D4B\u8D85\u65F6\uFF09" });
+      }, MODELS_REFRESH_TIMEOUT_MS);
+      modelRefreshWaiters.set(requestId, { resolve: () => resolve10({ ok: true }), timer });
+      hub.dispatch(nodeId, { type: "list_models", requestId });
+    }).finally(() => {
+      modelRefreshInFlight.delete(nodeId);
+      modelRefreshLastAt.set(nodeId, Date.now());
+    });
+    modelRefreshInFlight.set(nodeId, task);
+    return task;
+  };
+  const nodeReportedModels = (nodeId, runtimeKind) => {
+    const entry = nodeReportedModelsStore.get(nodeId);
+    const stale = !entry || Date.now() - entry.fetchedAt > MODELS_STALE_MS;
+    const gapOk = Date.now() - (modelRefreshLastAt.get(nodeId) ?? 0) > MODELS_BG_REFRESH_MIN_GAP_MS;
+    if (stale && gapOk) void refreshNodeModels(nodeId).catch(() => ({ ok: false }));
+    return entry?.byKind.get(runtimeKind);
+  };
   const registryAuditFile = path29.join(opts.dir, "registry-audit.ndjson");
   const registryListeners = /* @__PURE__ */ new Set();
   const registryAudit = (record8) => {
@@ -256949,7 +257060,7 @@ async function startServe(opts) {
     listBindingModelIds: async (nodeId, runtimeKind) => {
       const rt = (await nodeStore.listRuntimes(nodeId)).find((r) => r.kind === runtimeKind);
       if (!rt) return [];
-      return (await resolveRuntimeModels({ nodeStore, registry: registryStore }, rt.id)).map((m2) => m2.id);
+      return (await resolveRuntimeModels({ nodeStore, registry: registryStore, nodeReportedModels }, rt.id)).map((m2) => m2.id);
     }
   });
   assistantsService = new AssistantsService({
@@ -258487,7 +258598,7 @@ async function startServe(opts) {
     registry: registryStore,
     // 会话级模型覆盖的候选清单：与 `GET /api/runtimes/:id/models` **同一份**实现
     // （resolveRuntimeModels = discovery + 管理员 override），避免「下拉选得到、发出去被拒」。
-    listRuntimeModelIds: async (runtimeId) => (await resolveRuntimeModels({ nodeStore, registry: registryStore }, runtimeId)).map((m2) => m2.id),
+    listRuntimeModelIds: async (runtimeId) => (await resolveRuntimeModels({ nodeStore, registry: registryStore, nodeReportedModels }, runtimeId)).map((m2) => m2.id),
     // 诊断 ab94f202 Fix A：add-revision --role 写入口校验用「可分配岗位」集合（岗位目录 AND assignable）。
     // 与 GET /api/roles 的 assignable 派生同式（domains/roles/index.ts）：system=true / 已弃用一律不可分配。
     resolveAssignableRoles: async () => new Set(
@@ -258624,6 +258735,8 @@ async function startServe(opts) {
         nodeHealth,
         activeRunCountOf,
         activeRunsOf,
+        nodeReportedModels,
+        refreshNodeModels,
         fetchLatestNpmDaemonVersion
       }),
       collabDomain({
@@ -259933,6 +260046,24 @@ async function startServe(opts) {
         });
         return chatLiveSessions.has(jobKey) ? "live" : "unknown";
       });
+      hub.addMessageListener((daemonId, msg) => {
+        if (msg.type !== "runtime_models") return;
+        const prev = nodeReportedModelsStore.get(daemonId);
+        const byKind = prev?.byKind ?? /* @__PURE__ */ new Map();
+        for (const entry of msg.models) {
+          if (entry.models.length > 0) byKind.set(entry.kind, entry.models);
+        }
+        nodeReportedModelsStore.set(daemonId, { byKind, fetchedAt: Date.now() });
+        if (msg.requestId) {
+          const waiter = modelRefreshWaiters.get(msg.requestId);
+          if (waiter) {
+            clearTimeout(waiter.timer);
+            modelRefreshWaiters.delete(msg.requestId);
+            waiter.resolve();
+          }
+        }
+        console.log(`[models] \u8282\u70B9 ${daemonId} \u4E0A\u62A5\u5019\u9009\u6A21\u578B\uFF1A${msg.models.map((m2) => `${m2.kind}=${m2.models.length}`).join(" ") || "\uFF08\u4E00\u6761\u90FD\u6CA1\u63A2\u5230\uFF09"}`);
+      });
       hub.addMessageListener((daemonId, msg) => {
         if (msg.type !== "gc_query_artifacts") return;
         void (async () => {
@@ -263036,6 +263167,7 @@ var OUTBOX_MAX = 500;
 var PENDING_STREAM_MAX = 2e3;
 var AUTH_REJECT_BACKOFF_MAX_MS = 15 * 6e4;
 var AUTH_REJECT_GIVE_UP_AFTER = 3;
+var MODEL_REPORT_COOLDOWN_MS = 10 * 6e4;
 var AUTH_REJECT_RE = /Unexpected server response:\s*(401|403)/;
 var DRAIN_TIMEOUT_MS = 15e3;
 var DRAIN_POLL_MS = 50;
@@ -263129,6 +263261,12 @@ var DaemonWsClient = class {
   authRejectStreak = 0;
   /** 本次连接尝试是否因握手 401/403 失败——error 事件里置、close 事件里消费。 */
   lastErrorWasAuthReject = false;
+  /** 模型上报的轮次号：重连会再拉一轮，用它作废上一轮的迟到结果（否则旧结果可能盖住新结果）。 */
+  modelReportGeneration = 0;
+  /** 上一次**探测成功**的时刻；节点频繁掉线重连时靠它避免每分钟把十几个 CLI 重起一遍。 */
+  lastModelReportAt = 0;
+  /** 缓存上一轮结果：冷却期内重连直接重发这份，服务端重启后也能立刻拿到清单。 */
+  lastModelReport = [];
   authRejectGiveUpAfter;
   /** 放弃时的动作；默认干净退出（exit 0），测试注入以免打死测试进程。 */
   onAuthGiveUp;
@@ -263237,6 +263375,7 @@ var DaemonWsClient = class {
       this.flushPendingStream();
       this.resendOutbox();
       this.reportRuntimes = false;
+      void this.reportRuntimeModels();
       this.pingTimer = setInterval(() => {
         this.send({ type: "pong" });
         if (Date.now() - this.lastReceivedAt > this.silenceTimeoutMs) {
@@ -263403,6 +263542,10 @@ var DaemonWsClient = class {
         this.send({ type: "workdir_read_result", requestId: msg.requestId, result });
         break;
       }
+      case "list_models": {
+        void this.reportRuntimeModels({ force: true, requestId: msg.requestId });
+        break;
+      }
       case "update": {
         this.pendingUpdatePkg = msg.pkg;
         if (!this.onUpdate) {
@@ -263520,6 +263663,42 @@ var DaemonWsClient = class {
       this.onUpdate?.(this.pendingUpdatePkg);
     }
   }
+  /**
+   * 拉一遍本机各 runtime 的候选模型清单并上报（`runtime_models` 帧）。
+   *
+   * 串行而不是并发：ACP 家族每探一个都要真起一个 CLI 进程（hermes 40s、oasis-agent 30s 的超时），
+   * 十几个一起起会把节点的内存和文件句柄按住。`listModels` 自带 60 秒缓存，重连时基本是空跑。
+   * 任何一个 runtime 抛错都只丢它自己那一条，不影响其余。全空就不发帧——让服务端走老路，
+   * 而不是用一份空清单把它原本能给出的静态目录盖掉。
+   */
+  async reportRuntimeModels(opts = {}) {
+    const generation = ++this.modelReportGeneration;
+    const reply = (models) => this.send({ type: "runtime_models", models, ...opts.requestId ? { requestId: opts.requestId } : {} });
+    if (!opts.force && this.lastModelReport.length > 0 && Date.now() - this.lastModelReportAt < MODEL_REPORT_COOLDOWN_MS) {
+      reply(this.lastModelReport);
+      return;
+    }
+    const out = [];
+    for (const rt of this.runtimes) {
+      if (generation !== this.modelReportGeneration) return;
+      try {
+        const kind = rt.kind;
+        if (opts.force) clearModelDiscoveryCache(kind, rt.binary);
+        const models = await listModels(kind, rt.binary);
+        if (models.length > 0) out.push({ kind: rt.kind, models });
+      } catch {
+      }
+    }
+    if (generation !== this.modelReportGeneration) return;
+    if (out.length === 0) {
+      if (opts.requestId) reply([]);
+      return;
+    }
+    this.lastModelReport = out;
+    this.lastModelReportAt = Date.now();
+    reply(out);
+    log2("[node-cli]", `\u5DF2\u4E0A\u62A5\u5019\u9009\u6A21\u578B\uFF1A${out.map((r) => `${r.kind}=${r.models.length}`).join(" ")}`);
+  }
   buildMeta() {
     const activeSessions = this.sessions.activeSessions();
     return {
@@ -269401,7 +269580,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.3" : "dev";
+var PKG_VERSION = true ? "2.2.4" : "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.3",
+  "version": "2.2.4",
   "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": "e56cbdcade7180b0ef7fe4e089c9dd74086b3b00"
+    "sourceHead": "1488999e5b4e5658ae63be219fd34f59ae74705e"
   }
 }